From eaf5c2637d5e3ea9bdac62f456c482b42845eb00 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Tue, 16 Feb 2021 19:44:41 +0000
Subject: [PATCH 001/578] Translated using Weblate (Czech)

Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
---
 vector/src/main/res/values-cs/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 4fe9a905aa..2277157028 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -41,10 +41,10 @@
 \nPřipojit se jako %1$s nebo %2$s</string>
     <string name="ongoing_conference_call_voice">Hlasem</string>
     <string name="ongoing_conference_call_video">Videem</string>
-    <string name="cannot_start_call">Nemohu spustit hovor, zkuste, prosím, později</string>
+    <string name="cannot_start_call">Nemohu zahájit hovor, zkuste, prosím, později</string>
     <string name="missing_permissions_warning">Z důvodu chybějících práv mohou některé funkce chybět…</string>
     <string name="missing_permissions_to_start_conf_call">Potřebujete práva k pozvání pro spuštění konference v této místnosti</string>
-    <string name="missing_permissions_title_to_start_conf_call">Nemohu spustit hovor</string>
+    <string name="missing_permissions_title_to_start_conf_call">Nemohu zahájit hovor</string>
     <string name="device_information">Informace o relaci</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Konferenční hovory nejsou podporovány v šifrovaných místnostech</string>
     <string name="send_anyway">Přesto poslat</string>
@@ -1947,8 +1947,8 @@
     <string name="video_meeting">Zahájit video schůzku</string>
     <string name="audio_meeting">Zahájit hlasovou schůzku</string>
     <string name="audio_video_meeting_description">Schůzky používají pravidla zabezpečení a přístupu Jitsi. Všichni lidé nyní v místnosti uvidí pozvánku k připojení, zatímco Vaše schůzka probíhá.</string>
-    <string name="cannot_call_yourself">Nemůžete spustit hovor se sebou</string>
-    <string name="cannot_call_yourself_with_invite">Nemůžete spustit hovor se sebou, počkejte, až účastníci přijmou pozvánku</string>
+    <string name="cannot_call_yourself">Nemůžete zahájit hovor se sebou</string>
+    <string name="cannot_call_yourself_with_invite">Nemůžete zahájit hovor se sebou, počkejte, až účastníci přijmou pozvánku</string>
     <string name="failed_to_add_widget">Přidání widgetu se nezdařilo</string>
     <string name="failed_to_remove_widget">Odstranění widgetu se nezdařilo</string>
     <string name="call_notification_answer">Přijmout</string>

From ed51c865efc851950667725b0c8fc9a24d64cc28 Mon Sep 17 00:00:00 2001
From: Torben <torben@herborn.me>
Date: Tue, 16 Feb 2021 14:08:31 +0000
Subject: [PATCH 002/578] Translated using Weblate (German)

Currently translated at 99.9% (2080 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 43eef6909f..a5015b2117 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1894,7 +1894,7 @@
 \nElement Android</string>
     <string name="or_other_mx_capabale_client">oder einen anderen cross-signing fähigen Matrix Client</string>
     <string name="use_latest_app">Nutze die neueste Version von Element auf deinen anderen Geräten:</string>
-    <string name="command_description_discard_session">Erzwingt das Verferfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum</string>
+    <string name="command_description_discard_session">Erzwingt das Verwerfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum</string>
     <string name="command_description_discard_session_not_handled">Wird nur in verschlüsselten Räumen unterstützt</string>
     <string name="enter_secret_storage_passphrase_or_key">Benutze deine %1$s oder deinen %2$s um fortzufahren.</string>
     <string name="use_recovery_key">Wiederherstellungsschlüssel verwenden</string>

From 1ae0f93e14d6e3df450a5ff5cc77b577a9ad36a4 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Wed, 17 Feb 2021 19:52:49 +0000
Subject: [PATCH 003/578] Translated using Weblate (Swedish)

Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index c203e48839..c8aa5824db 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2320,4 +2320,32 @@
     <string name="re_authentication_activity_title">Omautentisering krävs</string>
     <string name="failed_to_initialize_cross_signing">Mislyckades att ställa in korssignering</string>
     <string name="error_unauthorized">Obehörig, saknar giltiga autentiseringsuppgifter</string>
+    <string name="call_transfer_users_tab_title">Användare</string>
+    <string name="call_transfer_failure">Ett fel inträffade när samtalet flyttades</string>
+    <string name="call_transfer_title">Flytta</string>
+    <string name="call_transfer_connect_action">Anslut</string>
+    <string name="call_transfer_consult_first">Rådfråga först</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 aktivt samtal (%1$s) - 1 pausat samtal</item>
+        <item quantity="other">1 aktivt samtal (%1$s) - %2$d pausade samtal</item>
+    </plurals>
+    <plurals name="call_only_paused">
+        <item quantity="one">Pausat samtal</item>
+        <item quantity="other">%1$d pausade samtal</item>
+    </plurals>
+    <string name="call_only_active">Aktivt samtal (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">Ett fel inträffade när telefonnumret slogs upp</string>
+    <string name="call_dial_pad_title">Knappsats</string>
+    <string name="call_tile_call_back">Ring tillbaka</string>
+    <string name="call_tile_ended">Det här samtalet har avslutats</string>
+    <string name="call_tile_other_declined">%1$s avböjde det här samtalet</string>
+    <string name="call_tile_you_declined">Du avböjde det här samtalet %1$s</string>
+    <string name="call_tile_in_call">Du är för närvarande i det här samtalet</string>
+    <string name="call_tile_other_started_call">%1$s startade ett samtal</string>
+    <string name="call_tile_you_started_call">Du startade ett samtal</string>
+    <string name="call_held_by_you">Du parkerade samtalet</string>
+    <string name="call_held_by_user">%s parkerade samtalet</string>
+    <string name="call_hold_action">Parkera</string>
+    <string name="call_resume_action">Återuppta</string>
+    <string name="action_return">Tillbaka</string>
 </resources>
\ No newline at end of file

From 7d8c184ddabe5765d64569d74d4f6441aa9bbb99 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 17 Feb 2021 02:29:08 +0000
Subject: [PATCH 004/578] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index e4368652bf..7121c8f570 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -385,7 +385,7 @@
         <item quantity="other">%d 個聊天室</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
-        <item quantity="other">有 %1$d 個聊天室匹配 “%2$s”</item>
+        <item quantity="other">%2$s 找到 %1$s 個聊天室</item>
     </plurals>
     <string name="directory_searching_title">正在搜尋目錄……</string>
     <string name="room_settings_all_messages_noisy">所有訊息（通知並震動）</string>
@@ -2096,7 +2096,7 @@
     <string name="settings_security_application_protection_summary">使用 PIN 碼與生物識別技術來保護存取權。</string>
     <string name="settings_security_application_protection_title">保護存取權</string>
     <plurals name="secure_backup_reset_devices_you_can_verify">
-        <item quantity="other">顯示您現在可以驗證的 %s 個裝置</item>
+        <item quantity="other">顯示您現在可以驗證的 %d 個裝置</item>
     </plurals>
     <string name="secure_backup_reset_no_history">您將會重新啟動，沒有歷史紀錄，已信任的裝置或已信任的使用者</string>
     <string name="secure_backup_reset_if_you_reset_all">如果您重設了所有東西</string>
@@ -2282,4 +2282,30 @@
     <string name="re_authentication_activity_title">需要重新驗證</string>
     <string name="failed_to_initialize_cross_signing">未能設定交叉簽章</string>
     <string name="error_unauthorized">未授權，缺少有效的身份驗證憑證</string>
+    <string name="call_transfer_users_tab_title">使用者</string>
+    <string name="call_transfer_failure">轉移電話時發生錯誤</string>
+    <string name="call_transfer_title">轉移</string>
+    <string name="call_transfer_connect_action">連線</string>
+    <string name="call_transfer_consult_first">先諮詢</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="other">1 個通話中 (%1$s) · %2$d 暫停的通話</item>
+    </plurals>
+    <plurals name="call_only_paused">
+        <item quantity="other">%1$d 暫停了通話</item>
+    </plurals>
+    <string name="call_only_active">通話中 (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">查詢電話號碼時發生錯誤</string>
+    <string name="call_dial_pad_title">撥號鍵盤</string>
+    <string name="call_tile_call_back">回撥</string>
+    <string name="call_tile_ended">此通話已結束</string>
+    <string name="call_tile_other_declined">%1$s 婉拒了此通話</string>
+    <string name="call_tile_you_declined">您婉拒了此通話 %1$s</string>
+    <string name="call_tile_in_call">您目前在此通話中</string>
+    <string name="call_tile_other_started_call">%1$s 開始了通話</string>
+    <string name="call_tile_you_started_call">您開始了通話</string>
+    <string name="call_held_by_you">您保留了通話</string>
+    <string name="call_held_by_user">%s 保留了通話</string>
+    <string name="call_hold_action">保留</string>
+    <string name="call_resume_action">恢復</string>
+    <string name="action_return">返回</string>
 </resources>
\ No newline at end of file

From 5547f1119205dfc5608c62f2fa00ae5d50e0d357 Mon Sep 17 00:00:00 2001
From: zer0-x <1rn0kmrwo@relay.firefox.com>
Date: Wed, 17 Feb 2021 19:33:20 +0000
Subject: [PATCH 005/578] Translated using Weblate (Arabic)

Currently translated at 84.5% (191 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ar/
---
 .../src/main/res/values-ar/strings.xml        | 340 +++++++++++-------
 1 file changed, 204 insertions(+), 136 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-ar/strings.xml b/matrix-sdk-android/src/main/res/values-ar/strings.xml
index 0da4dc8f8e..6e017f9d23 100644
--- a/matrix-sdk-android/src/main/res/values-ar/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ar/strings.xml
@@ -1,150 +1,218 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="summary_user_sent_image">%1$s قد أرسل صورة.</string>
-    <string name="notice_room_invite_no_invitee">دعوة من %s</string>
-    <string name="notice_room_invite">%1$s قد دعى %2$s</string>
-    <string name="notice_room_invite_you">%1$s قد دعاك أنت</string>
-    <string name="notice_room_join">%1$s قد إنضّم إلى الغرفة</string>
-    <string name="notice_room_leave">%1$s قد غادر الغرفة</string>
-    <string name="notice_room_reject">%1$s قد رفض الدعوة</string>
-    <string name="notice_room_kick">%1$s قد طرد %2$s</string>
-    <string name="notice_room_unban">%1$s قد رفع الحظر عن %2$s</string>
-    <string name="notice_room_ban">%1$s قد حظر %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s قد غيّر صورته الشخصية</string>
-    <string name="notice_display_name_set">%1$s قد عيّن اسمه الظاهر إلى %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s قد غيّر اسمه الظاهر من %2$s إلى %3$s</string>
-    <string name="notice_display_name_removed">%1$s قد أزال اسمه الظاهر (لقد كان %2$s)</string>
-    <string name="notice_room_topic_changed">%1$s قد غيّر الموضوع إلى: %2$s</string>
-    <string name="notice_room_name_changed">%1$s قد غيّر اسم الغرفة إلى: %2$s</string>
-    <string name="notice_answered_call">%s قد أجاب على المُكالمة.</string>
-    <string name="notice_ended_call">%s قد أنهى المُكالمة.</string>
-    <string name="notice_made_future_room_visibility">%1$s قد جعل التأريخ المُستقبلي للغرفة مرئيًا لـ %2$s</string>
-    <string name="notice_room_visibility_invited">جميع أعضاء الغرفة، من اللحظة التي تمت دعوتهم.</string>
-    <string name="notice_room_visibility_joined">جميع أعضاء الغرفة، من لحظة انضمامهم.</string>
-    <string name="notice_room_visibility_shared">جميع أعضاء الغرفة.</string>
+    <string name="summary_user_sent_image">إنَّ %1$s قد أرسلَ صُّورة.</string>
+    <string name="notice_room_invite_no_invitee">دعوة مِن %s</string>
+    <string name="notice_room_invite">إنَّ %1$s قد دَعى %2$s</string>
+    <string name="notice_room_invite_you">إنَّ %1$s قد دعاكَ أنت</string>
+    <string name="notice_room_join">إنَّ %1$s قد إنضّم إلى الغُرفة</string>
+    <string name="notice_room_leave">إنَّ %1$s قد غادر الغرفة</string>
+    <string name="notice_room_reject">إنَّ %1$s قد رفضَ الدعوة</string>
+    <string name="notice_room_kick">إنَّ %1$s قد طردَ %2$s</string>
+    <string name="notice_room_unban">إنَّ %1$s قد رفعَ الحظر عن %2$s</string>
+    <string name="notice_room_ban">إنَّ %1$s قد حظرَ %2$s</string>
+    <string name="notice_avatar_url_changed">إنَّ %1$s قد غيَّرَ صورته الشخصية</string>
+    <string name="notice_display_name_set">إنَّ %1$s قد عيَّنَ اسمه الظاهر إلى %2$s</string>
+    <string name="notice_display_name_changed_from">إنَّ %1$s قد غيَّرَ اسمه الظاهر من %2$s إلى %3$s</string>
+    <string name="notice_display_name_removed">إنَّ %1$s قد أزالَ اسمه الظاهر (لقد كان %2$s)</string>
+    <string name="notice_room_topic_changed">إنَّ %1$s قد غيَّرَ الموضوع إلى: %2$s</string>
+    <string name="notice_room_name_changed">إنَّ %1$s قد غيَّرَ اسم الغُرفة إلى: %2$s</string>
+    <string name="notice_answered_call">إنَّ %s قد أجابَ على المُكالمة.</string>
+    <string name="notice_ended_call">إنَّ %s قد أنهى المُكالمة.</string>
+    <string name="notice_made_future_room_visibility">إنَّ %1$s قد جعلَ التأريخ المُستقبلي للغُرفة مرئيًا لـ %2$s</string>
+    <string name="notice_room_visibility_invited">جميع أعضاء الغُرفة، مِنَ اللَّحظة التي تمَّت دعوتهم.</string>
+    <string name="notice_room_visibility_joined">جميع أعضاء الغُرفة، مِن لحظة انضمامهم.</string>
+    <string name="notice_room_visibility_shared">جميع أعضاء الغُرفة.</string>
     <string name="notice_room_visibility_world_readable">أيُّ شخص.</string>
     <string name="notice_room_visibility_unknown">غير معروف (%s).</string>
-    <string name="notice_end_to_end">%1$s قد فعّل تعمية النهاية-إلى-النهاية (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s قد طلب اجتماع VoIP</string>
-    <string name="notice_voip_started">اجتماع VoIP قد بدأ</string>
-    <string name="notice_voip_finished">اجتماع VoIP قد انتهى</string>
-    <string name="notice_room_name_removed">%1$s قد أزال اسم الغرفة</string>
-    <string name="notice_room_topic_removed">%1$s قد أزال موضوع الغرفة</string>
-    <string name="notice_profile_change_redacted">حدّث ⁨%1$s⁩ اللاحة ⁨%2$s⁩</string>
-    <string name="notice_room_third_party_invite">أرسل ⁨%1$s⁩ دعوة إلى ⁨%2$s⁩ للانضمام إلى الغرفة</string>
-    <string name="notice_crypto_unable_to_decrypt">** تعذّر فك التعمية: ⁨%s⁩ **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">لم يُرسل جهاز المرسل مفاتيح هذه الرسالة.</string>
-    <string name="unable_to_send_message">تعذّر إرسال الرسالة</string>
-    <string name="message_failed_to_upload">فشل رفع الصورة</string>
-    <string name="network_error">خطأ في الشبكة</string>
-    <string name="matrix_error">خطأ في «ماترِكس»</string>
-    <string name="room_error_join_failed_empty_room">لا يمكنك حاليًا الانضمام ثانيةً إلى غرفة فارغة.</string>
-    <string name="encrypted_message">رسالة معمّاة</string>
-    <string name="medium_email">عنوان البريد الإلكتروني</string>
+    <string name="notice_end_to_end">إنَّ %1$s قد فعَّلَ تعمية النهاية-إلى-النهاية (%2$s)</string>
+    <string name="notice_requested_voip_conference">إنَّ %1$s قد طلبَ اجتماع VoIP</string>
+    <string name="notice_voip_started">إنَّ اجتماع VoIP قد بدأ</string>
+    <string name="notice_voip_finished">إنَّ اجتماع VoIP قد انتهى</string>
+    <string name="notice_room_name_removed">إنَّ %1$s قد أزالَ اسم الغُرفة</string>
+    <string name="notice_room_topic_removed">إنَّ %1$s قد أزالَ موضوع الغُرفة</string>
+    <string name="notice_profile_change_redacted">إنَّ %1$s قد حدَّثَ ملفه الشخصي %2$s</string>
+    <string name="notice_room_third_party_invite">إنَّ %1$s قد أرسلَ دعوة إلى %2$s للإنضمام إلى الغُرفة</string>
+    <string name="notice_crypto_unable_to_decrypt">** يتعذَّر فك تعمية: ⁨%s⁩ **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">إنَّ جِهاز المُرسل لم يُرسل لنا المفاتيح لهذه الرِّسالة.</string>
+    <string name="unable_to_send_message">يتعذَّ إرسال الرِّسالة</string>
+    <string name="message_failed_to_upload">فَشلَ رفع الصُّورة</string>
+    <string name="network_error">خطأ في الشَّبكة</string>
+    <string name="matrix_error">خطأ في Matrix</string>
+    <string name="room_error_join_failed_empty_room">حاليًا مِن غير المُمكِن إعادة الاِنضمام إلى غُرفة فارِغة.</string>
+    <string name="encrypted_message">رِسالة مُعمَّاة</string>
+    <string name="medium_email">عُنوان البريد الإلكتروني</string>
     <string name="medium_phone_number">رقم الهاتف</string>
     <string name="summary_message">‏‏⁨%1$s⁩: ‏⁨%2$s⁩</string>
-    <string name="notice_room_withdraw">%1$s قد سحب دعوة %2$s</string>
-    <string name="notice_placed_video_call">%s قد أجرى مُكالمة مرئية.</string>
-    <string name="notice_placed_voice_call">%s قد أجرى مُكالمة صوتية.</string>
-    <string name="notice_room_third_party_registered_invite">قَبِل ⁨%1$s⁩ دعوة ⁨%2$s⁩</string>
-    <string name="could_not_redact">تعذر التهذيب</string>
-    <string name="summary_user_sent_sticker">%1$s قد أرسل مُلصقًا.</string>
-    <string name="notice_avatar_changed_too">(تمَّ تغيير الصورة أيضًا)</string>
-    <string name="room_displayname_invite_from">دعوة من ⁨%s⁩</string>
-    <string name="room_displayname_empty_room">غرفة فارغة</string>
-    <string name="room_displayname_two_members">‏⁨%1$s⁩ و ⁨%2$s⁩</string>
-    <string name="room_displayname_room_invite">دعوة إلى غرفة</string>
+    <string name="notice_room_withdraw">إنَّ %1$s قد سحبَ دعوة %2$s</string>
+    <string name="notice_placed_video_call">إنَّ %s قد أجرى مُكالمة مرئية.</string>
+    <string name="notice_placed_voice_call">إنَّ %s قد أجرى مُكالمة صوتية.</string>
+    <string name="notice_room_third_party_registered_invite">إنَّ %1$s قد قَبَل دعوة %2$s</string>
+    <string name="could_not_redact">يتعذَّر التنقيح</string>
+    <string name="summary_user_sent_sticker">إنَّ %1$s قد أرسلَ مُلصقًا.</string>
+    <string name="notice_avatar_changed_too">(تمَّ تغيِّير الصُّورة أيضًا)</string>
+    <string name="room_displayname_invite_from">دَعوة مِن ⁨%s⁩</string>
+    <string name="room_displayname_empty_room">غُرفة فارِغة</string>
+    <string name="room_displayname_two_members">%1$s وَ %2$s</string>
+    <string name="room_displayname_room_invite">دَعوة غُرفة</string>
     <plurals name="room_displayname_three_and_more_members">
-        <item quantity="zero"/>
-        <item quantity="one"/>
-        <item quantity="two"/>
-        <item quantity="few"/>
-        <item quantity="many"/>
-        <item quantity="other"/>
+        <item quantity="zero"></item>
+        <item quantity="one">%1$s وواحد آخر</item>
+        <item quantity="two">%1$s و%2$d آخران</item>
+        <item quantity="few">%1$s و%2$d آخرين</item>
+        <item quantity="many">%1$s و%2$d آخرون</item>
+        <item quantity="other">%1$s و%2$d آخرون</item>
     </plurals>
-    <string name="summary_you_sent_image">أنت قد أرسلت صورة.</string>
-    <string name="summary_you_sent_sticker">أنت قد أرسلت مُلصقًا.</string>
-    <string name="notice_room_invite_no_invitee_by_you">دعوة منك أنت</string>
-    <string name="notice_room_created">%1$s قد أنشأ الغرفة</string>
-    <string name="notice_room_created_by_you">أنت قد أنشأت الغرفة</string>
-    <string name="notice_room_invite_by_you">أنت قد دعوت %1$s</string>
-    <string name="notice_room_join_by_you">أنت قد انضممت إلى الغرفة</string>
-    <string name="notice_room_leave_by_you">أنت قد غادرت الغرفة</string>
+    <string name="summary_you_sent_image">أنتَ قد أرسلتَ صُّورة.</string>
+    <string name="summary_you_sent_sticker">أنتَ قد أرسلتَ مُلصقًا.</string>
+    <string name="notice_room_invite_no_invitee_by_you">دعوة مِنكَ أنت</string>
+    <string name="notice_room_created">إنَّ %1$s قد أنشأ الغُرفة</string>
+    <string name="notice_room_created_by_you">أنتَ قد أنشأتَ الغُرفة</string>
+    <string name="notice_room_invite_by_you">أنتَ قد دعوتَ %1$s</string>
+    <string name="notice_room_join_by_you">أنتَ قد انضممت إلى الغُرفة</string>
+    <string name="notice_room_leave_by_you">أنتَ قد غادرتَ الغُرفة</string>
     <string name="notice_room_reject_by_you">أنت قد رفضت الدعوة</string>
-    <string name="notice_room_kick_by_you">أنت قد طردت %1$s</string>
-    <string name="notice_room_unban_by_you">أنت قد رفعت الحظر عن %1$s</string>
-    <string name="notice_room_ban_by_you">أنت قد حظرت %1$s</string>
-    <string name="notice_room_withdraw_by_you">أنت قد سحبت دعوة %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">أنت قد غيّرت صورتك الشخصية</string>
-    <string name="notice_display_name_set_by_you">أنت قد عيّنت اسمك الظاهر إلى %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">أنت قد غيّرت اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
-    <string name="notice_display_name_removed_by_you">أنت قد أزلت اسمك الظاهر (لقد كان ⁨%1$s⁩)</string>
-    <string name="notice_room_topic_changed_by_you">أنت قد غيّرت الموضوع إلى: ⁨%1$s⁩</string>
-    <string name="notice_room_avatar_changed">%1$s قد غيّر صورة الغرفة</string>
-    <string name="notice_room_avatar_changed_by_you">أنت قد غيّرت صورة الغرفة</string>
-    <string name="notice_room_name_changed_by_you">أنت قد غيّرت اسم الغرفة إلى: %1$s</string>
-    <string name="notice_placed_video_call_by_you">أنت قد أجريت مُكالمة مرئية.</string>
-    <string name="notice_placed_voice_call_by_you">أنت قد أجريت مُكالمة صوتية.</string>
-    <string name="notice_call_candidates">%s قد أرسل بيانات لإعداد مُكالمة.</string>
-    <string name="notice_call_candidates_by_you">أنت قد أرسلت بيانات لإعداد مُكالمة.</string>
-    <string name="notice_answered_call_by_you">أنت قد أجبت على المُكالمة.</string>
-    <string name="notice_ended_call_by_you">أنت قد أنهيت المُكالمة.</string>
-    <string name="notice_made_future_room_visibility_by_you">أنت قد جعلت التأريخ المُستقبلي للغرفة مرئيًا لـ %1$s</string>
-    <string name="notice_end_to_end_by_you">أنت قد فعّلت تعيمية النهاية-إلى-النهاية (%1$s)</string>
-    <string name="notice_room_update">%s قد قام بترقية هذه الغرفة.</string>
-    <string name="notice_room_update_by_you">أنت قد رقّيتَ هذه الغرفة.</string>
-    <string name="notice_requested_voip_conference_by_you">أنت قد طلبت اجتماع VoIP</string>
-    <string name="notice_room_name_removed_by_you">أنت قد أزلت اسم الغرفة</string>
-    <string name="notice_room_topic_removed_by_you">أنت قد أزلت موضوع الغرفة</string>
-    <string name="notice_room_avatar_removed">%1$s قد أزال صورة الغرفة</string>
-    <string name="notice_room_avatar_removed_by_you">أنت قد أزلت صورة الغرفة</string>
-    <string name="notice_event_redacted">تمت إزالة الرسالة</string>
+    <string name="notice_room_kick_by_you">أنتَ قد طردتَ %1$s</string>
+    <string name="notice_room_unban_by_you">أنتَ قد رفعتَ الحظر عن %1$s</string>
+    <string name="notice_room_ban_by_you">أنتَ قد حظرتَ %1$s</string>
+    <string name="notice_room_withdraw_by_you">أنتَ قد سحبتَ دعوة %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">أنتَ قد غيّرتَ صورتك الشخصية</string>
+    <string name="notice_display_name_set_by_you">أنتَ قد عيَّنتَ اسمك الظاهر إلى %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">أنتَ قد غيّرتَ اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
+    <string name="notice_display_name_removed_by_you">أنتَ قد أزلتَ اسمك الظاهر (لقد كان ⁨%1$s⁩)</string>
+    <string name="notice_room_topic_changed_by_you">أنتَ قد غيَّرتَ الموضوع إلى: ⁨%1$s⁩</string>
+    <string name="notice_room_avatar_changed">إنَّ %1$s قد غيَّرَ صورة الغُرفة</string>
+    <string name="notice_room_avatar_changed_by_you">أنتَ قد غيَّرتَ صورة الغُرفة</string>
+    <string name="notice_room_name_changed_by_you">أنتَ قد غيَّرتَ اسم الغُرفة إلى: %1$s</string>
+    <string name="notice_placed_video_call_by_you">أنتَ قد أجريتَ مُكالمة مرئية.</string>
+    <string name="notice_placed_voice_call_by_you">أنتَ قد أجريتَ مُكالمة صوتية.</string>
+    <string name="notice_call_candidates">إنَّ %s قد أرسلَ بيانات لإعداد مُكالمة.</string>
+    <string name="notice_call_candidates_by_you">أنتَ قد أرسلتَ بيانات لإعداد مُكالمة.</string>
+    <string name="notice_answered_call_by_you">أنتَ قد أجبتَ على المُكالمة.</string>
+    <string name="notice_ended_call_by_you">أنتَ قد أنهيتَ المُكالمة.</string>
+    <string name="notice_made_future_room_visibility_by_you">أنتَ قد جعلتَ التأريخ المُستقبلي للغُرفة مرئيًا لـ %1$s</string>
+    <string name="notice_end_to_end_by_you">أنتَ قد فعَّلتَ تعيمية النهاية-إلى-النهاية (%1$s)</string>
+    <string name="notice_room_update">إنَّ %s قد قامَ بترقية هذه الغرفة.</string>
+    <string name="notice_room_update_by_you">أنتَ قد رقَّيتَ هذه الغرفة.</string>
+    <string name="notice_requested_voip_conference_by_you">أنتَ قد طلبتَ اجتماع VoIP</string>
+    <string name="notice_room_name_removed_by_you">أنتَ قد أزلتَ اسم الغُرفة</string>
+    <string name="notice_room_topic_removed_by_you">أنتَ قد أزلتَ موضوع الغُرفة</string>
+    <string name="notice_room_avatar_removed">إنَّ %1$s قد أزالَ صورة الغُرفة</string>
+    <string name="notice_room_avatar_removed_by_you">أنتَ قد أزلتَ صورة الغُرفة</string>
+    <string name="notice_event_redacted">تمَّت إزالة الرسالة</string>
     <string name="notice_event_redacted_by">الرسالة قد أُزيلت بواسطة %1$s</string>
     <string name="notice_event_redacted_with_reason">أُزيلت الرسالة [السبب: ⁨%1$s⁩]</string>
-    <string name="notice_event_redacted_by_with_reason">أزال ⁨%1$s⁩ الرسالة [السبب: ⁨%2$s⁩]</string>
-    <string name="notice_room_third_party_invite_by_you">أرسلت دعوة إلى ⁨%1$s⁩ للانضمام إلى الغرفة</string>
-    <string name="notice_room_third_party_revoked_invite">سحب ⁨%1$s⁩ دعوة ⁨%2$s⁩ للانضمام إلى الغرفة</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">سحبت دعوة ⁨%1$s⁩ للانضمام إلى الغرفة</string>
-    <string name="notice_room_third_party_registered_invite_by_you">قَبِلت دعوة ⁨%1$s⁩</string>
-    <string name="notice_widget_added">أضاف ⁨%1$s⁩ الودجة ⁨%2$s⁩</string>
-    <string name="notice_widget_added_by_you">أضفت الودجة ⁨%1$s⁩</string>
-    <string name="notice_widget_removed">أزال ⁨%1$s⁩ الودجة ⁨%2$s⁩</string>
-    <string name="notice_widget_removed_by_you">أزلت الودجة ⁨%1$s⁩</string>
-    <string name="notice_widget_modified">عدّل ⁨%1$s⁩ الودجة ⁨%2$s⁩</string>
-    <string name="notice_widget_modified_by_you">عدّلت الودجة ⁨%1$s⁩</string>
-    <string name="power_level_admin">مدير</string>
-    <string name="power_level_default">المبدئي</string>
-    <string name="power_level_custom">مخصّص (⁨%1$d⁩)</string>
-    <string name="power_level_custom_no_value">مخصّص</string>
-    <string name="notice_power_level_changed_by_you">غيّرت مستوى قوّة %1$s⁩.</string>
-    <string name="notice_power_level_changed">غيّر ⁨%1$s⁩ مستوى قوّة %2$s⁩.</string>
-    <string name="notice_power_level_diff">‏⁨%1$s⁩ من ⁨%2$s⁩ إلى ⁨%3$s⁩</string>
-    <string name="initial_sync_start_importing_account">المزامنة الأولية:
-\nيستورد الحساب…</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 جميع الخوادم محظورة من المُشاركة! لم يعُد من الممكن استخدام هذه الغرفة.</string>
+    <string name="notice_event_redacted_by_with_reason">الرِّسالة أُزيلت بِواسطة %1$s [السبب: ⁨%2$s⁩]</string>
+    <string name="notice_room_third_party_invite_by_you">أنتَ قد أرسلتَ دعوة إلى %1$s للإنضمام إلى الغُرفة</string>
+    <string name="notice_room_third_party_revoked_invite">إنَّ %1$s قد سحب دعوة %2$s للإنضمام إلى الغُرفة</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">أنتَ قد سحبت دعوة %1$s للإنضمام إلى الغُرفة</string>
+    <string name="notice_room_third_party_registered_invite_by_you">أنتَ قد قبلتَ دعوة %1$s</string>
+    <string name="notice_widget_added">إنَّ %1$s قد أضافَ القطعة %2$s</string>
+    <string name="notice_widget_added_by_you">أنتَّ قد أضفتَ القطعة %1$s</string>
+    <string name="notice_widget_removed">إنَّ %1$s قد أزال القطعة %2$s</string>
+    <string name="notice_widget_removed_by_you">أنتَ قد أزلتَ القطعة %1$s</string>
+    <string name="notice_widget_modified">إنَّ %1$s قد عدَّلَ القطعة %2$s</string>
+    <string name="notice_widget_modified_by_you">أنتَ قد عدَّلتَ القطعة %1$s</string>
+    <string name="power_level_admin">مسؤول</string>
+    <string name="power_level_default">الاِفتراضي</string>
+    <string name="power_level_custom">مُخصَّص (⁨%1$d⁩)</string>
+    <string name="power_level_custom_no_value">مخصَّص</string>
+    <string name="notice_power_level_changed_by_you">أنتَ قد غيَّرتَ مُستوى قوة %1$s.</string>
+    <string name="notice_power_level_changed">إنَّ %1$s قد غيَّرَ مُستوى قوة %2$s.</string>
+    <string name="notice_power_level_diff">%1$s مِن %2$s إلى %3$s</string>
+    <string name="initial_sync_start_importing_account">المُزامنة الأولية:
+\nيجري إستيرد الحِساب…</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 جميع الخوادِم محظورة مِنَ المُشاركة! لم يعُد من المُمكِن استخدام هذه الغُرفة.</string>
     <string name="notice_room_server_acl_updated_no_change">لا تغيير.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• خوادم مُطابقة IP الحرفية محظورة الآن.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• الخادم المُطابق لـ %s قد أُزيل من قائمة السماح.</string>
-    <string name="notice_room_server_acl_updated_allowed">• الخادم المُطابق لـ %s مسموح الآن.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• الخادم المُطابق لـ %s قد أُزيل من قائمة الحظر.</string>
-    <string name="notice_room_server_acl_updated_banned">• الخادم المُطابق لـ %s محظور الآن.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• خوادم مُطابقة IP الحرفية مسموحة الآن.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">أنت قد غيّرت خادم الـACLs لهذه الغرفة.</string>
-    <string name="notice_room_server_acl_updated_title">%s قد غيّر خادم الـACLs لهذه الغرفة.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• الخادم يحظر مُطابقة القيم الحرفية للـIP.</string>
-    <string name="notice_room_server_acl_set_allowed">• الخادم المُطابق لـ %s مسموح.</string>
-    <string name="notice_room_server_acl_set_banned">• الخادم المُطابق لـ %s محظور.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• الخادم يسمح بمُطابقة القيم الحرفية للـIP.</string>
-    <string name="notice_room_server_acl_set_title_by_you">أنت قد عيّنت خادم الـACLs لهذه الغرفة.</string>
-    <string name="notice_room_server_acl_set_title">%s قد عيّن خادم الـACLs لهذه الغرفة.</string>
-    <string name="notice_direct_room_update_by_you">أنت قد قمت بالترقية هُنا.</string>
-    <string name="notice_direct_room_update">%s قد قام بالترقية هُنا.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">أنت قد جعلت الرسائل المُستقبلية مرئية لـ %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s قد جعل الرسائل المُستقبلية مرئية لـ %2$s</string>
-    <string name="notice_direct_room_leave_by_you">أنت قد غادرت الغرفة</string>
-    <string name="notice_direct_room_leave">%1$s قد غادر الغرفة</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• خوادِم مُطابقة IP الحرفية محظورة الآن.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• الخادِم المُطابق لـ %s قد أُزيل مِن قائمة السماح.</string>
+    <string name="notice_room_server_acl_updated_allowed">• الخادِم المُطابق لـ %s مسموح الآن.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• الخادِم المُطابق لـ %s قد أُزيل مِن قائمة الحظر.</string>
+    <string name="notice_room_server_acl_updated_banned">• الخادِم المُطابق لـ %s محظور الآن.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• خوادِم مُطابقة IP الحرفية مسموحة الآن.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">أنتَ قد غيَّرتَ خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_updated_title">إنَّ %s قد غيَّرَ خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• الخادِم يحظُر مُطابقة القيم الحرفية للـIP.</string>
+    <string name="notice_room_server_acl_set_allowed">• الخادِم المُطابق لـ %s مسموح.</string>
+    <string name="notice_room_server_acl_set_banned">• الخادِم المُطابق لـ %s محظور.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• الخادِم يسمح بمُطابقة القيم الحرفية للـIP.</string>
+    <string name="notice_room_server_acl_set_title_by_you">أنتَ قد عيَّنتَ خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_set_title">إنَّ %s قد عيَّنَ خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_direct_room_update_by_you">أنتَ قد قمتَ بالترقية هُنا.</string>
+    <string name="notice_direct_room_update">إنَّ %s قد قامَ بالترقية هُنا.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">أنتَ قد جعلتَ الرسائل المُستقبلية مرئية لـ %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">إنَّ %1$s قد جعلَ الرسائل المُستقبلية مرئية لـ %2$s</string>
+    <string name="notice_direct_room_leave_by_you">أنتَ قد غادرتَ الغُرفة</string>
+    <string name="notice_direct_room_leave">إنَّ %1$s قد غادر الغرفة</string>
     <string name="notice_direct_room_join_by_you">أنت قد انضممت</string>
-    <string name="notice_direct_room_join">%1$s قد انضم</string>
-    <string name="notice_direct_room_created_by_you">أنت قد أنشأت المُناقشة</string>
-    <string name="notice_direct_room_created">%1$s قد أنشأ المُناقشة</string>
+    <string name="notice_direct_room_join">إنَّ %1$s قد انضم</string>
+    <string name="notice_direct_room_created_by_you">أنتَ قد أنشأتَ المُناقشة</string>
+    <string name="notice_direct_room_created">إنَّ %1$s قد أنشأ المُناقشة</string>
+    <string name="notice_room_withdraw_with_reason_by_you">أنتَ قد سحبتَ دعوة %1$s. السبب: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">إنَّ %1$s قد سحبَ دعوة %2$s. السبب: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">أنتَ قد ألغيتَ دعوة %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">إنَّ %1$s قد ألغيت دعوة %2$s للإنضمام إلى الغُرفة. السبب: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">أنتَ قد قبلتَ دعوة %1$s. السبب: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">إنَّ %1$s قد قبلَ دعوة %2$s. السبب: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">أنتَ قد أرسلتَ دعوة إلى %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">إنَّ %1$s قد أرسل دعوة إلى %2$s للإنضمام إلى الغُرغة. السبب: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">أنتَ قد حظرتَ %1$s. السبب: %2$s</string>
+    <string name="notice_room_ban_with_reason">إنَّ %1$s قد حَظر %2$s. السبب: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">أنتَ قد رفعتَ الحظر عن %1$s. السبب: %2$s</string>
+    <string name="notice_room_unban_with_reason">إنَّ %1$s قد رفع الحظر عن %2$s. السبب: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">أنتَ قد طردتَ %1$s. السبب: %2$s</string>
+    <string name="notice_room_kick_with_reason">إنَّ %1$s قد طرد %2$s. السبب: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">أنتَ قد رفضتَ الدعوة. السبب: %1$s</string>
+    <string name="notice_room_reject_with_reason">إنَّ %1$s قد رفض الدعوة. السبب: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">أنتَ قد غادرت. السبب: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">إنَّ %1$s قد غادر. السبب: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">أنتَ قد غادرتَ الغُرفة. السبب: %1$s</string>
+    <string name="notice_room_leave_with_reason">إنَّ %1$s قد غادر الغُرفة. السبب: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">أنتَ قد إنضممت. السبب: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">إنَّ %1$s قد إنضم. السبب: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">أنتَ قد إنضممتَ إلى الغُرفة. السبب: %1$s</string>
+    <string name="notice_room_join_with_reason">إنَّ %1$s قد إنضم إلى الغُرفة. السبب: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">إنَّ %1$s قد دعاكَ أنت. السبب: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">أنتَ قد دعوتَ %1$s. السبب: %2$s</string>
+    <string name="notice_room_invite_with_reason">إنَّ %1$s قد دعا %2$s. السبب: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">دعوتُكَ أنت. السبب: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">دعوة %1$s. السبب: %2$s</string>
+    <string name="clear_timeline_send_queue">محو قائمة انتظار الإرسال</string>
+    <string name="event_status_sending_message">يجري إرسال الرِّسالة…</string>
+    <string name="initial_sync_start_importing_account_data">المُزامنة الأولية:
+\nيجري إستيرد مَعلومات الحِساب</string>
+    <string name="initial_sync_start_importing_account_groups">المُزامنة الأولية:
+\nيجري إستيرد المُجتمعات</string>
+    <string name="initial_sync_start_importing_account_left_rooms">المُزامنة الأولية:
+\nيجري إستيرد الغُرف المُغادَر مِنها</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">المُزامنة الأولية:
+\nيجري إستيرد الغُرف المَدعو إليها</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">المُزامنة الأولية:
+\nيجري إستيرد الغُرف المُنضم فيها</string>
+    <string name="initial_sync_start_importing_account_rooms">المُزامنة الأولية:
+\nيجري إستيرد الغُرف</string>
+    <string name="initial_sync_start_importing_account_crypto">المُزامنة الأولية:
+\nيجري إستيرد التَعمية</string>
+    <string name="room_displayname_empty_room_was">غُرفة فارِغة (كانت %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="zero">%1$s، %2$s و%3$s</item>
+        <item quantity="one">%1$s، %2$s، %3$s و%4$d آخر</item>
+        <item quantity="two">%1$s، %2$s، %3$s و%4$d آخران</item>
+        <item quantity="few">%1$s، %2$s، %3$s و%4$d آخرين</item>
+        <item quantity="many">%1$s، %2$s، %3$s و%4$d آخرون</item>
+        <item quantity="other">%1$s،%2$s،%3$s و%4$d آخرون</item>
+    </plurals>
+    <string name="room_displayname_4_members">الأعضاء %1$s، %2$s، %3$s و %4$s</string>
+    <string name="room_displayname_3_members">الأعضاء %1$s، %2$s و %3$s</string>
+    <string name="power_level_moderator">مُشرِف</string>
+    <string name="notice_widget_jitsi_modified_by_you">أنتَ قد عدَّلتَ اجتماع الفيديو</string>
+    <string name="notice_widget_jitsi_modified">لقد عُدِّلَ اجتماع الفيديو بواسطة %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">أنتَ قد أنهيتَ اجتماع الفيديو</string>
+    <string name="notice_widget_jitsi_removed">لقد أُنهيَ اجتماع الفيديو بواسطة %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">أنتَ قد بدأتَ اجتماع الفيديو</string>
+    <string name="notice_widget_jitsi_added">لقد بدأ اجتماع الفيديو بواسطة %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">أنتَ قد سحبتَ دعوة %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">إنَّ %1$s قد سحب دعوة %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">أنتَ قد دعوتَ %1$s</string>
+    <string name="notice_direct_room_third_party_invite">إنَّ %1$s قد دعى %2$s</string>
+    <string name="notice_profile_change_redacted_by_you">أنتَ قد حدَّثتَ ملفك الشخصي %1$s</string>
 </resources>
\ No newline at end of file

From ca2c4a64e9ac567e6d1aba8a380a4d53795d9c32 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Wed, 17 Feb 2021 15:13:49 +0000
Subject: [PATCH 006/578] Translated using Weblate (German)

Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
---
 matrix-sdk-android/src/main/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-de/strings.xml b/matrix-sdk-android/src/main/res/values-de/strings.xml
index 81cf01983d..fdfb264f49 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -236,8 +236,8 @@
         <item quantity="other">%1$s entfernte die alternativen Adressen %2$s für diesen Raum.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Du fügtest die alternative Adresse %2$s für diesen Raum hinzu.</item>
-        <item quantity="other">Du fügtest die alternativen Adressen %2$s für diesen Raum hinzu.</item>
+        <item quantity="one">Du hast die alternative Adresse %1$s für diesen Raum hinzugefügt.</item>
+        <item quantity="other">Du hast die alternativen Adressen %1$s für diesen Raum hinzufügt.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added">
         <item quantity="one">%1$s fügte die alternative Adresse %2$s für diesen Raum hinzu.</item>

From 263b8b1e77de926c4ab6d6e16ca5479551fce79b Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Wed, 17 Feb 2021 07:10:03 +0000
Subject: [PATCH 007/578] Translated using Weblate (Galician)

Currently translated at 85.3% (193 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
---
 .../src/main/res/values-gl/strings.xml        | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-gl/strings.xml b/matrix-sdk-android/src/main/res/values-gl/strings.xml
index 6ae9b33b66..def8af44c7 100644
--- a/matrix-sdk-android/src/main/res/values-gl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-gl/strings.xml
@@ -98,4 +98,113 @@
     <string name="notice_answered_call_by_you">Respondeches á chamada.</string>
     <string name="notice_call_candidates_by_you">Enviaches datos para configurar a chamada.</string>
     <string name="notice_call_candidates">%s enviou datos para configurar a chamada.</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Retiraches o convite de %1$s. Razón: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s retirou o convite de %2$s. Razón: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Aceptaches o convite para %1$s. Razón: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s aceptou o convite para %2$s. Razón: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Revogaches o convite para que %1$s se una á sala. Razón: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revogou o convite para que %2$s se una á sala. Razón: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Convidaches a %1$s para que se una á sala. Razón: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s convidou a %2$s para que se una á sala. Razón: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Vetaches a %1$s. Razón: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s vetou a %2$s. Razón: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Retirácheslle o veto a %1$s. Razón: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s retirou o veto a %2$s. Razón: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Expulsaches a %1$s. Razón: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s expulsou a %2$s. Razón: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Rexeitaches o convite. Razón: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s rexeitou o convite. Razón: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Saíches. Razón: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s saíu. Razón: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Saíches da sala. Razón: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s deixou a sala. Razón: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Unícheste. Razón: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s uníuse. Razón: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Unícheste á sala. Razón: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s uniuse á sala. Razón: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s convidoute. Razón: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Convidaches a %1$s. Razón: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s convidou a %2$s. Razón: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">O teu convite. Razón: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Razón: %2$s</string>
+    <string name="clear_timeline_send_queue">Baleirar cola de envíos</string>
+    <string name="event_status_sending_message">Enviando mensaxe…</string>
+    <string name="initial_sync_start_importing_account_data">Sincr. inicial:
+\nImportando datos da conta</string>
+    <string name="initial_sync_start_importing_account_groups">Sincr. inicial:
+\nImportando comunidades</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sincr. inicial:
+\nImportando salas das que saíches</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Sincr. inicial:
+\nImportando convites a salas</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Sincr. inicial:
+\nImportando Salas</string>
+    <string name="initial_sync_start_importing_account_rooms">Sincr. inicial:
+\nImportando salas</string>
+    <string name="initial_sync_start_importing_account_crypto">Sincr. inicial:
+\nImportando cifrado</string>
+    <string name="initial_sync_start_importing_account">Sincr. inicial:
+\nImportando conta…</string>
+    <string name="room_displayname_empty_room_was">Sala baleira (estaba %s)</string>
+    <string name="room_displayname_empty_room">Sala baleira</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s e 1 máis</item>
+        <item quantity="other">%1$s e %2$d outras</item>
+    </plurals>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s e %4$d máis</item>
+        <item quantity="other">%1$s, %2$s, %3$s e %4$d outras</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s e %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s e %3$s</string>
+    <string name="room_displayname_room_invite">Convite de sala</string>
+    <string name="room_displayname_invite_from">Convite desde %s</string>
+    <string name="notice_power_level_diff">%1$s de %2$s a %3$s</string>
+    <string name="notice_power_level_changed">%1$s cambiou de categoría a %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Cambiaches a categoría de %1$s.</string>
+    <string name="power_level_custom_no_value">Personalizado</string>
+    <string name="power_level_custom">Personalizado (%1$d)</string>
+    <string name="power_level_default">Por defecto</string>
+    <string name="power_level_moderator">Moderadora</string>
+    <string name="power_level_admin">Admin</string>
+    <string name="notice_widget_jitsi_modified_by_you">Modificaches a conferencia de vídeo</string>
+    <string name="notice_widget_jitsi_modified">Conferencia de vídeo modificada por %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Finalizaches a conferencia de vídeo</string>
+    <string name="notice_widget_jitsi_removed">Conferencia de vídeo finalizada por %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Iniciaches unha conferencia de vídeo</string>
+    <string name="notice_widget_jitsi_added">Conferencia de vídeo iniciada por %1$s</string>
+    <string name="notice_widget_modified_by_you">Modificaches o widget %1$s</string>
+    <string name="notice_widget_modified">%1$s modificou o widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Eliminaches o widget %1$s</string>
+    <string name="notice_widget_removed">%1$s eliminou o widget %2$s</string>
+    <string name="notice_widget_added_by_you">Engadiches o widget %1$s</string>
+    <string name="notice_widget_added">%1$s engadiu o widget %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Aceptaches o convite para %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Revogaches o convite para %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s revogou o convite para %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Revogaches o convite para que %1$s se una á sala</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s revogou o convite para que %2$s se una á sala</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Convidaches a %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s convidou a %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Enviácheslle un convite a %1$s para unirse á sala</string>
+    <string name="notice_profile_change_redacted_by_you">Actualizaches o teu perfil %1$s</string>
+    <string name="notice_event_redacted_by_with_reason">Mensaxe eliminada por %1$s [razón: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">Mensaxe eliminada [razón: %1$s]</string>
+    <string name="notice_event_redacted_by">Mensaxe eliminada por %1$s</string>
+    <string name="notice_event_redacted">Mensaxe eliminada</string>
+    <string name="notice_room_avatar_removed_by_you">Eliminaches o avatar da sala</string>
+    <string name="notice_room_avatar_removed">%1$s eliminou o avatar da sala</string>
+    <string name="notice_room_topic_removed_by_you">Eliminaches o asunto da sala</string>
+    <string name="notice_room_name_removed_by_you">Eliminaches o nome da sala</string>
+    <string name="notice_requested_voip_conference_by_you">Solicitaches unha conferencia VoIP</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Vetouse a participación de tódolos servidores! Xa non se pode utilizar esta sala.</string>
+    <string name="notice_room_server_acl_updated_no_change">Sen cambio.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Os servidores con literais IP concordantes están vetados.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Os servidores cos literais IP concordantes están permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servidores con %s foron eliminados da lista de permitidos.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Os servidores con %s agora están permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Os servidores con %s xa non están la lista de vetados.</string>
+    <string name="notice_room_server_acl_updated_banned">• Os servidores con %s están agora vetados.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Cambiaches os ACLs do servidor para esta sala.</string>
+    <string name="notice_room_server_acl_updated_title">%s cambiou os ACLs do servidor para esta sala.</string>
 </resources>
\ No newline at end of file

From a66f609a07179e1332261ce15382c5b370feb5c0 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 17 Feb 2021 02:30:12 +0000
Subject: [PATCH 008/578] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hant/
---
 matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
index 5038e8aab2..6f73f88279 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
@@ -248,4 +248,10 @@
     <plurals name="notice_room_canonical_alias_alternative_added">
         <item quantity="other">%1$s 已為此聊天室新增了備用地址 %2$s。</item>
     </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">您修改了視訊會議</string>
+    <string name="notice_widget_jitsi_modified">%1$s 修改了視訊會議</string>
+    <string name="notice_widget_jitsi_removed_by_you">您結束了視訊會議</string>
+    <string name="notice_widget_jitsi_removed">%1$s 結束了視訊會議</string>
+    <string name="notice_widget_jitsi_added_by_you">您開始了視訊會議</string>
+    <string name="notice_widget_jitsi_added">由 %1$s 開始的視訊會議</string>
 </resources>
\ No newline at end of file

From 04c1cbd38e7448a3baffbb0ac984208cf924bd46 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Wed, 17 Feb 2021 19:45:03 +0000
Subject: [PATCH 009/578] Translated using Weblate (Swedish)

Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sv/
---
 matrix-sdk-android/src/main/res/values-sv/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-sv/strings.xml b/matrix-sdk-android/src/main/res/values-sv/strings.xml
index 91d874591f..df36a47533 100644
--- a/matrix-sdk-android/src/main/res/values-sv/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sv/strings.xml
@@ -258,4 +258,10 @@
     <string name="notice_room_server_acl_set_banned">• Servrar som matchar %s är bannade.</string>
     <string name="notice_room_server_acl_set_title_by_you">Du satte server-ACLer för det här rummet.</string>
     <string name="notice_room_server_acl_set_title">%s satte server-ACLer för det här rummet.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Du ändrade videogruppsamtal</string>
+    <string name="notice_widget_jitsi_modified">Videogruppsamtal ändrades av %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Du avslutade videogruppsamtal</string>
+    <string name="notice_widget_jitsi_removed">Videogruppsamtal avslutades av %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Du startade videogruppsamtal</string>
+    <string name="notice_widget_jitsi_added">Videogruppsamtal startades av %1$s</string>
 </resources>
\ No newline at end of file

From be1febef41f1bd3d6a63c69361db7fd45e60ed8e Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Tue, 16 Feb 2021 13:17:36 +0000
Subject: [PATCH 010/578] Translated using Weblate (Swedish)

Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
---
 fastlane/metadata/android/sv/changelogs/40100170.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/sv/changelogs/40100170.txt

diff --git a/fastlane/metadata/android/sv/changelogs/40100170.txt b/fastlane/metadata/android/sv/changelogs/40100170.txt
new file mode 100644
index 0000000000..37f027d054
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Buggfixar!
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.17

From 85a053838e92b5bac764b40beb1c9df617bcf611 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 17 Feb 2021 02:34:11 +0000
Subject: [PATCH 011/578] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
---
 fastlane/metadata/android/zh_Hant/changelogs/40100170.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/zh_Hant/changelogs/40100170.txt

diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100170.txt b/fastlane/metadata/android/zh_Hant/changelogs/40100170.txt
new file mode 100644
index 0000000000..35b8a54110
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hant/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：錯誤修復！
+完整變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.0.17

From 4267e33d196231712c1206048281ddff679cef9a Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Tue, 16 Feb 2021 11:35:39 +0000
Subject: [PATCH 012/578] Translated using Weblate (Czech)

Currently translated at 63.6% (7 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
---
 fastlane/metadata/android/cs/changelogs/40100130.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/cs/changelogs/40100130.txt b/fastlane/metadata/android/cs/changelogs/40100130.txt
index 0e90f17e8b..bf44ad40e0 100644
--- a/fastlane/metadata/android/cs/changelogs/40100130.txt
+++ b/fastlane/metadata/android/cs/changelogs/40100130.txt
@@ -1,2 +1,2 @@
 Hlavní změny v této verzi: Náhled URL, nová klávesice s Emoji, nové možnosti nastavení místností a sníh na vánoce!
-Plné znění změn: https://github.com/vector-im/element-android/releases/tag/v1.0.12
+Plné znění změn: https://github.com/vector-im/element-android/releases/tag/v1.0.13

From 21ea461c1c3e3fa033975ef5df8c933e292b5bce Mon Sep 17 00:00:00 2001
From: vachan-maker <revsamtp@hotmail.com>
Date: Wed, 17 Feb 2021 02:28:22 +0000
Subject: [PATCH 013/578] Translated using Weblate (Malayalam)

Currently translated at 5.7% (120 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 64a5cfbe7b..b191484568 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -93,4 +93,31 @@
     <string name="title_activity_home">സന്ദേശങ്ങൾ</string>
     <string name="notification_silent_notifications">നിശബ്‌ദ അറിയിപ്പുകൾ</string>
     <string name="notification_sync_in_progress">സമന്വയിപ്പിക്കുന്നു</string>
+    <string name="auth_opt_phone_number_placeholder">ഫോൺ നമ്പർ (നിർബന്ധമല്ല)</string>
+    <string name="auth_phone_number_placeholder">ഫോൺ നമ്പർ</string>
+    <string name="auth_skip">ഒഴിവാക്കൂ</string>
+    <string name="auth_submit">സമർപ്പിക്കൂ</string>
+    <string name="auth_register">അക്കൗണ്ട് സൃഷ്ടിക്കൂ</string>
+    <string name="option_take_video">വീഡിയോ എടുക്കുക</string>
+    <string name="option_take_photo">ഫോട്ടോ എടുക്കുക</string>
+    <string name="sound_device_speaker">സ്പീക്കർ</string>
+    <string name="sound_device_phone">ഫോൺ</string>
+    <string name="call_failed_dont_ask_again">എന്നോട് ഇനിയും ചോദിക്കരുത്</string>
+    <string name="start_new_chat">പുതിയ ചാറ്റ് ആരംഭിക്കുക</string>
+    <string name="login">പ്രവേശിക്കൂ</string>
+    <string name="create_account">അക്കൗണ്ട് സൃഷ്ടിക്കൂ</string>
+    <string name="username">ഉപയോക്തൃനാമം</string>
+    <string name="join_room">മുറിയിൽ ചേരുക</string>
+    <string name="send_bug_report_include_screenshot">സ്ക്രീൻഷോട്ട് അയയ്ക്കൂ</string>
+    <string name="groups_invite_header">ക്ഷണിക്കുക</string>
+    <string name="copied_to_clipboard">ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി</string>
+    <string name="call_notification_reject">നിരസിക്കുക</string>
+    <string name="call_notification_answer">സ്വീകരിക്കുക</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">ഒരു കോൾ ആരംഭിക്കാൻ നിങ്ങളെ അനുവദിച്ചിട്ടില്ല</string>
+    <string name="dismiss">ഒഴിവാക്കൂ</string>
+    <string name="rename">പേരുമാറ്റുക</string>
+    <string name="speak">സംസാരിക്കൂ</string>
+    <string name="redact">നീക്കംചെയ്യൂ</string>
+    <string name="backup">ബാക്കപ്പ്</string>
+    <string name="title_activity_member_details">അംഗ വിശദാംശങ്ങൾ</string>
 </resources>
\ No newline at end of file

From 14fc31be07ef3c672330b1777ce7e98d0a06c70c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Feb 2021 14:05:01 +0100
Subject: [PATCH 014/578] Add homeserver version check

---
 tools/hs_diag.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/hs_diag.py b/tools/hs_diag.py
index ded10a562d..7d7a947c4c 100755
--- a/tools/hs_diag.py
+++ b/tools/hs_diag.py
@@ -48,7 +48,8 @@ print("Get information from " + baseUrl)
 items = [
     # [Title, URL, True for GET request and False for POST request]
     ["Well-known", baseUrl + ".well-known/matrix/client", True]
-    , ["Version", baseUrl + "_matrix/client/versions", True]
+    , ["API version", baseUrl + "_matrix/client/versions", True]
+    , ["Homeserver version", baseUrl + "_matrix/federation/v1/version", True]
     , ["Login flow", baseUrl + "_matrix/client/r0/login", True]
     , ["Registration flow", baseUrl + "_matrix/client/r0/register", False]
     # Useless , ["Username availability", baseUrl + "_matrix/client/r0/register/available?username=benoit", True]

From a8be5ed6b02b942e2059cdb3f3ce4e01ad26817c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Feb 2021 14:50:50 +0100
Subject: [PATCH 015/578] Create FederationModule

---
 .../sdk/api/federation/FederationService.kt   | 24 +++++++++
 .../sdk/api/federation/FederationVersion.kt   | 31 ++++++++++++
 .../matrix/android/sdk/api/session/Session.kt |  6 +++
 .../federation/DefaultFederationService.kt    | 29 +++++++++++
 .../sdk/internal/federation/FederationAPI.kt  | 27 ++++++++++
 .../federation/FederationGetVersionResult.kt  | 37 ++++++++++++++
 .../internal/federation/FederationModule.kt   | 49 +++++++++++++++++++
 .../federation/GetFederationVersionTask.kt    | 40 +++++++++++++++
 .../sdk/internal/network/NetworkConstants.kt  |  3 ++
 .../sdk/internal/session/DefaultSession.kt    |  4 ++
 .../sdk/internal/session/SessionComponent.kt  |  2 +
 11 files changed, 252 insertions(+)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationService.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationVersion.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/DefaultFederationService.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationAPI.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationGetVersionResult.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationService.kt
new file mode 100644
index 0000000000..0761ef8d21
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationService.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.federation
+
+interface FederationService {
+    /**
+     * Get information about the homeserver
+     */
+    suspend fun getFederationVersion(): FederationVersion
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationVersion.kt
new file mode 100644
index 0000000000..2ed3f848b6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/federation/FederationVersion.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.federation
+
+/**
+ * Ref: https://matrix.org/docs/spec/server_server/latest#get-matrix-federation-v1-version
+ */
+data class FederationVersion(
+        /**
+         * Arbitrary name that identify this implementation.
+         */
+        val name: String?,
+        /**
+         * Version of this implementation. The version format depends on the implementation.
+         */
+        val version: String?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 039025e0df..86ac0056e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -21,6 +21,7 @@ import androidx.lifecycle.LiveData
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.federation.FederationService
 import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.account.AccountService
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
@@ -213,6 +214,11 @@ interface Session :
      */
     fun searchService(): SearchService
 
+    /**
+     * Returns the federation service associated with the session
+     */
+    fun federationService(): FederationService
+
     /**
      * Returns the third party service associated with the session
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/DefaultFederationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/DefaultFederationService.kt
new file mode 100644
index 0000000000..862a4855cc
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/DefaultFederationService.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.federation
+
+import org.matrix.android.sdk.api.federation.FederationService
+import org.matrix.android.sdk.api.federation.FederationVersion
+import javax.inject.Inject
+
+internal class DefaultFederationService @Inject constructor(
+        private val getFederationVersionTask: GetFederationVersionTask
+) : FederationService {
+    override suspend fun getFederationVersion(): FederationVersion {
+        return getFederationVersionTask.execute(Unit)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationAPI.kt
new file mode 100644
index 0000000000..1816616336
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationAPI.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.matrix.android.sdk.internal.federation
+
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import retrofit2.Call
+import retrofit2.http.GET
+
+internal interface FederationAPI {
+    @GET(NetworkConstants.URI_FEDERATION_PATH + "version")
+    fun getVersion(): Call<FederationGetVersionResult>
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationGetVersionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationGetVersionResult.kt
new file mode 100644
index 0000000000..4e436c0da2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationGetVersionResult.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.federation
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * Ref: https://matrix.org/docs/spec/server_server/latest#get-matrix-federation-v1-version
+ */
+@JsonClass(generateAdapter = true)
+internal data class FederationGetVersionResult(
+        /**
+         * Arbitrary name that identify this implementation.
+         */
+        @Json(name = "name")
+        val name: String?,
+        /**
+         * Version of this implementation. The version format depends on the implementation.
+         */
+        @Json(name = "version")
+        val version: String?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt
new file mode 100644
index 0000000000..320bf1d445
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationModule.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.matrix.android.sdk.internal.federation
+
+import dagger.Binds
+import dagger.Lazy
+import dagger.Module
+import dagger.Provides
+import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.federation.FederationService
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+
+@Module
+internal abstract class FederationModule {
+
+    @Module
+    companion object {
+        @Provides
+        @JvmStatic
+        fun providesFederationAPI(@Unauthenticated okHttpClient: Lazy<OkHttpClient>,
+                                  sessionParams: SessionParams,
+                                  retrofitFactory: RetrofitFactory): FederationAPI {
+            return retrofitFactory.create(okHttpClient, sessionParams.homeServerUrl).create(FederationAPI::class.java)
+        }
+    }
+
+    @Binds
+    abstract fun bindFederationService(service: DefaultFederationService): FederationService
+
+    @Binds
+    abstract fun bindGetFederationVersionTask(task: DefaultGetFederationVersionTask): GetFederationVersionTask
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt
new file mode 100644
index 0000000000..6000ff6d31
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.federation
+
+import org.matrix.android.sdk.api.federation.FederationVersion
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface GetFederationVersionTask : Task<Unit, FederationVersion>
+
+internal class DefaultGetFederationVersionTask @Inject constructor(
+        private val federationAPI: FederationAPI
+) : GetFederationVersionTask {
+
+    override suspend fun execute(params: Unit): FederationVersion {
+        val result = executeRequest<FederationGetVersionResult>(null) {
+            apiCall = federationAPI.getVersion()
+        }
+
+        return FederationVersion(
+                name = result.name,
+                version = result.version
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
index a14c86efb6..99c12255cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
@@ -36,4 +36,7 @@ internal object NetworkConstants {
 
     // Integration
     const val URI_INTEGRATION_MANAGER_PATH = "_matrix/integrations/v1/"
+
+    // Federation
+    const val URI_FEDERATION_PATH = "_matrix/federation/v1/"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 890f3a6ac3..06bb4bd929 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -22,6 +22,7 @@ import io.realm.RealmConfiguration
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.federation.FederationService
 import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.Session
@@ -88,6 +89,7 @@ internal class DefaultSession @Inject constructor(
         private val groupService: Lazy<GroupService>,
         private val userService: Lazy<UserService>,
         private val filterService: Lazy<FilterService>,
+        private val federationService: Lazy<FederationService>,
         private val cacheService: Lazy<CacheService>,
         private val signOutService: Lazy<SignOutService>,
         private val pushRuleService: Lazy<PushRuleService>,
@@ -260,6 +262,8 @@ internal class DefaultSession @Inject constructor(
 
     override fun searchService(): SearchService = searchService.get()
 
+    override fun federationService(): FederationService = federationService.get()
+
     override fun thirdPartyService(): ThirdPartyService = thirdPartyService.get()
 
     override fun getOkHttpClient(): OkHttpClient {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index 9279c5c97a..7e1e3d0f70 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -27,6 +27,7 @@ import org.matrix.android.sdk.internal.crypto.SendGossipWorker
 import org.matrix.android.sdk.internal.crypto.crosssigning.UpdateTrustWorker
 import org.matrix.android.sdk.internal.crypto.verification.SendVerificationMessageWorker
 import org.matrix.android.sdk.internal.di.MatrixComponent
+import org.matrix.android.sdk.internal.federation.FederationModule
 import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
 import org.matrix.android.sdk.internal.session.account.AccountModule
 import org.matrix.android.sdk.internal.session.cache.CacheModule
@@ -87,6 +88,7 @@ import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
             AccountDataModule::class,
             ProfileModule::class,
             AccountModule::class,
+            FederationModule::class,
             CallModule::class,
             SearchModule::class,
             ThirdPartyModule::class

From 531beb0a86d6f923b83ce7e0e8098a80d26c0534 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Feb 2021 17:01:35 +0100
Subject: [PATCH 016/578] Add a screen to view details about the homeserver

---
 .../federation/FederationGetVersionResult.kt  |  6 ++
 .../federation/GetFederationVersionTask.kt    |  4 +-
 .../im/vector/app/core/di/FragmentModule.kt   |  6 ++
 .../discovery/SettingsCenteredImageItem.kt    | 41 ++++++++
 .../homeserver/HomeServerSettingsViewState.kt | 27 +++++
 .../homeserver/HomeserverSettingsAction.kt    | 23 +++++
 .../HomeserverSettingsController.kt           | 98 +++++++++++++++++++
 .../homeserver/HomeserverSettingsFragment.kt  | 73 ++++++++++++++
 .../homeserver/HomeserverSettingsViewModel.kt | 92 +++++++++++++++++
 vector/src/main/res/drawable/ic_layers.xml    | 27 +++++
 .../layout/item_settings_centered_image.xml   | 11 +++
 vector/src/main/res/values/strings.xml        |  3 +
 .../main/res/xml/vector_settings_general.xml  |  1 +
 13 files changed, 410 insertions(+), 2 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/discovery/SettingsCenteredImageItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
 create mode 100644 vector/src/main/res/drawable/ic_layers.xml
 create mode 100644 vector/src/main/res/layout/item_settings_centered_image.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationGetVersionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationGetVersionResult.kt
index 4e436c0da2..3d84008be6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationGetVersionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationGetVersionResult.kt
@@ -24,6 +24,12 @@ import com.squareup.moshi.JsonClass
  */
 @JsonClass(generateAdapter = true)
 internal data class FederationGetVersionResult(
+        @Json(name = "server")
+        val server: FederationGetVersionServer?
+)
+
+@JsonClass(generateAdapter = true)
+internal data class FederationGetVersionServer(
         /**
          * Arbitrary name that identify this implementation.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt
index 6000ff6d31..ce35e48f6b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt
@@ -33,8 +33,8 @@ internal class DefaultGetFederationVersionTask @Inject constructor(
         }
 
         return FederationVersion(
-                name = result.name,
-                version = result.version
+                name = result.server?.name,
+                version = result.server?.version
         )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index eff484fb9a..430aee5468 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -109,6 +109,7 @@ import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailFragmen
 import im.vector.app.features.settings.devtools.IncomingKeyRequestListFragment
 import im.vector.app.features.settings.devtools.KeyRequestsFragment
 import im.vector.app.features.settings.devtools.OutgoingKeyRequestListFragment
+import im.vector.app.features.settings.homeserver.HomeserverSettingsFragment
 import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment
 import im.vector.app.features.settings.locale.LocalePickerFragment
 import im.vector.app.features.settings.push.PushGatewaysFragment
@@ -284,6 +285,11 @@ interface FragmentModule {
     @FragmentKey(VectorSettingsLabsFragment::class)
     fun bindVectorSettingsLabsFragment(fragment: VectorSettingsLabsFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(HomeserverSettingsFragment::class)
+    fun bindHomeserverSettingsFragment(fragment: HomeserverSettingsFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(VectorSettingsPinFragment::class)
diff --git a/vector/src/main/java/im/vector/app/features/discovery/SettingsCenteredImageItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsCenteredImageItem.kt
new file mode 100644
index 0000000000..af79dd8bb5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsCenteredImageItem.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.app.features.discovery
+
+import android.widget.ImageView
+import androidx.annotation.DrawableRes
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.airbnb.epoxy.EpoxyModelWithHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+
+@EpoxyModelClass(layout = R.layout.item_settings_centered_image)
+abstract class SettingsCenteredImageItem : EpoxyModelWithHolder<SettingsCenteredImageItem.Holder>() {
+
+    @EpoxyAttribute
+    @DrawableRes
+    var drawableRes: Int = 0
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.image.setImageResource(drawableRes)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val image by bind<ImageView>(R.id.itemSettingsImage)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
new file mode 100644
index 0000000000..7c1a78d0cf
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.homeserver
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.federation.FederationVersion
+
+data class HomeServerSettingsViewState(
+        val baseUrl: String = "",
+        val federationVersion: Async<FederationVersion> = Uninitialized
+) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsAction.kt
new file mode 100644
index 0000000000..6ab097f4bf
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsAction.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.homeserver
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class HomeserverSettingsAction : VectorViewModelAction {
+    object Refresh : HomeserverSettingsAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
new file mode 100644
index 0000000000..4f648309f0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.homeserver
+
+import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.features.discovery.settingsCenteredImageItem
+import im.vector.app.features.discovery.settingsInfoItem
+import im.vector.app.features.discovery.settingsSectionTitleItem
+import org.matrix.android.sdk.api.federation.FederationVersion
+import javax.inject.Inject
+
+class HomeserverSettingsController @Inject constructor(
+        private val errorFormatter: ErrorFormatter
+) : TypedEpoxyController<HomeServerSettingsViewState>() {
+
+    var callback: Callback? = null
+
+    interface Callback {
+        fun retry()
+    }
+
+    override fun buildModels(data: HomeServerSettingsViewState?) {
+        data ?: return
+
+        buildHeader(data)
+        when (val federationVersion = data.federationVersion) {
+            is Loading,
+            is Uninitialized ->
+                loadingItem {
+                    id("loading")
+                }
+            is Fail ->
+                errorWithRetryItem {
+                    id("error")
+                    text(errorFormatter.toHumanReadable(federationVersion.error))
+                    listener { callback?.retry() }
+                }
+            is Success ->
+                buildFederationVersion(federationVersion())
+        }
+    }
+
+    private fun buildHeader(state: HomeServerSettingsViewState) {
+        settingsCenteredImageItem {
+            id("icon")
+            drawableRes(R.drawable.ic_layers)
+        }
+        settingsSectionTitleItem {
+            id("urlTitle")
+            titleResId(R.string.hs_url)
+        }
+        settingsInfoItem {
+            id("urlValue")
+            helperText(state.baseUrl)
+        }
+    }
+
+    private fun buildFederationVersion(federationVersion: FederationVersion) {
+        settingsSectionTitleItem {
+            id("nameTitle")
+            titleResId(R.string.settings_server_name)
+        }
+        settingsInfoItem {
+            id("nameValue")
+            helperText(federationVersion.name)
+        }
+        settingsSectionTitleItem {
+            id("versionTitle")
+            titleResId(R.string.settings_server_version)
+        }
+        settingsInfoItem {
+            id("versionValue")
+            helperText(federationVersion.version)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsFragment.kt
new file mode 100644
index 0000000000..20541a1ebb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsFragment.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.homeserver
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentGenericRecyclerBinding
+import javax.inject.Inject
+
+/**
+ * Display some information about the homeserver
+ */
+class HomeserverSettingsFragment @Inject constructor(
+        val homeserverSettingsViewModelFactory: HomeserverSettingsViewModel.Factory,
+        private val homeserverSettingsController: HomeserverSettingsController
+) : VectorBaseFragment<FragmentGenericRecyclerBinding>(),
+        HomeserverSettingsController.Callback {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGenericRecyclerBinding {
+        return FragmentGenericRecyclerBinding.inflate(inflater, container, false)
+    }
+
+    private val viewModel: HomeserverSettingsViewModel by fragmentViewModel()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        homeserverSettingsController.callback = this
+        views.genericRecyclerView.configureWith(homeserverSettingsController)
+    }
+
+    override fun onDestroyView() {
+        homeserverSettingsController.callback = null
+        views.genericRecyclerView.cleanup()
+        super.onDestroyView()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        (activity as? AppCompatActivity)?.supportActionBar?.setTitle(R.string.settings_home_server)
+    }
+
+    override fun retry() {
+        viewModel.handle(HomeserverSettingsAction.Refresh)
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        homeserverSettingsController.setData(state)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
new file mode 100644
index 0000000000..19578aea81
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.homeserver
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+
+class HomeserverSettingsViewModel @AssistedInject constructor(
+        @Assisted initialState: HomeServerSettingsViewState,
+        private val session: Session
+) : VectorViewModel<HomeServerSettingsViewState, HomeserverSettingsAction, EmptyViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: HomeServerSettingsViewState): HomeserverSettingsViewModel
+    }
+
+    companion object : MvRxViewModelFactory<HomeserverSettingsViewModel, HomeServerSettingsViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: HomeServerSettingsViewState): HomeserverSettingsViewModel? {
+            val fragment: HomeserverSettingsFragment = (viewModelContext as FragmentViewModelContext).fragment()
+            return fragment.homeserverSettingsViewModelFactory.create(state)
+        }
+    }
+
+    init {
+        setState {
+            copy(
+                    baseUrl = session.sessionParams.homeServerUrl
+            )
+        }
+        fetchHomeserverVersion()
+    }
+
+    private fun fetchHomeserverVersion() {
+        setState {
+            copy(
+                    federationVersion = Loading()
+            )
+        }
+
+        viewModelScope.launch {
+            try {
+                val federationVersion = session.federationService().getFederationVersion()
+                setState {
+                    copy(
+                            federationVersion = Success(federationVersion)
+                    )
+                }
+            } catch (failure: Throwable) {
+                setState {
+                    copy(
+                            federationVersion = Fail(failure)
+                    )
+                }
+            }
+        }
+    }
+
+    override fun handle(action: HomeserverSettingsAction) {
+        when (action) {
+            HomeserverSettingsAction.Refresh -> fetchHomeserverVersion()
+        }
+    }
+}
diff --git a/vector/src/main/res/drawable/ic_layers.xml b/vector/src/main/res/drawable/ic_layers.xml
new file mode 100644
index 0000000000..658630add0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_layers.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M12,2L2,7L12,12L22,7L12,2Z"
+        android:strokeWidth="2"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M2,17L12,22L22,17"
+        android:strokeWidth="2"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M2,12L12,17L22,12"
+        android:strokeWidth="2"
+        android:strokeColor="#000000"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/vector/src/main/res/layout/item_settings_centered_image.xml b/vector/src/main/res/layout/item_settings_centered_image.xml
new file mode 100644
index 0000000000..ee249448e7
--- /dev/null
+++ b/vector/src/main/res/layout/item_settings_centered_image.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemSettingsImage"
+    android:layout_width="match_parent"
+    android:layout_height="120dp"
+    android:layout_margin="16dp"
+    android:importantForAccessibility="no"
+    app:tint="@color/riotx_accent"
+    tools:src="@drawable/ic_layers" />
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 79f1514b2a..d71720f64a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2336,6 +2336,9 @@
     <string name="settings_active_sessions_manage">Manage Sessions</string>
     <string name="settings_active_sessions_signout_device">Sign out of this session</string>
 
+    <string name="settings_server_name">Server name</string>
+    <string name="settings_server_version">Server version</string>
+
     <string name="settings_failed_to_get_crypto_device_info">No cryptographic information available</string>
 
     <string name="settings_active_sessions_verified_device_desc">This session is trusted for secure messaging because you verified it:</string>
diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index c1fe82e4c2..73ce09eb22 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -81,6 +81,7 @@
         <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_HOME_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_home_server"
+            app:fragment="im.vector.app.features.settings.homeserver.HomeserverSettingsFragment"
             tools:summary="https://homeserver.org" />
 
         <im.vector.app.core.preference.VectorPreference

From b8ba4637353caeb92902a630cbfb808f2cc92fe6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Feb 2021 18:52:48 +0100
Subject: [PATCH 017/578] Add server version in rageshakes

---
 .../features/rageshake/BugReportActivity.kt   | 10 ++-
 .../app/features/rageshake/BugReportState.kt  | 24 ++++++
 .../features/rageshake/BugReportViewModel.kt  | 76 +++++++++++++++++++
 .../app/features/rageshake/BugReporter.kt     |  2 +
 4 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/rageshake/BugReportState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/rageshake/BugReportViewModel.kt

diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index 930e41e0d9..024d84f27b 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -21,12 +21,15 @@ import android.view.MenuItem
 import android.widget.Toast
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
+import com.airbnb.mvrx.viewModel
+import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityBugReportBinding
 
 import timber.log.Timber
+import javax.inject.Inject
 
 /**
  * Form to send a bug report
@@ -39,6 +42,10 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
     override fun getBinding() = ActivityBugReportBinding.inflate(layoutInflater)
 
+    @Inject lateinit var bugReportViewModelFactory: BugReportViewModel.Factory
+
+    private val viewModel: BugReportViewModel by viewModel()
+
     private var forSuggestion: Boolean = false
 
     override fun initUiAndData() {
@@ -114,7 +121,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
     /**
      * Send the bug report
      */
-    private fun sendBugReport() {
+    private fun sendBugReport() = withState(viewModel) { state ->
         views.bugReportScrollview.alpha = 0.3f
         views.bugReportMaskView.isVisible = true
 
@@ -133,6 +140,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                 views.bugReportButtonIncludeKeyShareHistory.isChecked,
                 views.bugReportButtonIncludeScreenshot.isChecked,
                 views.bugReportEditText.text.toString(),
+                state.serverVersion,
                 object : BugReporter.IMXBugReportListener {
                     override fun onUploadFailed(reason: String?) {
                         try {
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportState.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportState.kt
new file mode 100644
index 0000000000..1dc316a5e2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportState.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.rageshake
+
+import com.airbnb.mvrx.MvRxState
+
+data class BugReportState(
+        val serverVersion: String = ""
+) : MvRxState
+
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportViewModel.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportViewModel.kt
new file mode 100644
index 0000000000..c71a89553e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportViewModel.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.rageshake
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.tryOrNull
+
+class BugReportViewModel @AssistedInject constructor(
+        @Assisted initialState: BugReportState,
+        val activeSessionHolder: ActiveSessionHolder
+) : VectorViewModel<BugReportState, EmptyAction, EmptyViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: BugReportState): BugReportViewModel
+    }
+
+    companion object : MvRxViewModelFactory<BugReportViewModel, BugReportState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: BugReportState): BugReportViewModel? {
+            val activity: BugReportActivity = (viewModelContext as ActivityViewModelContext).activity()
+            return activity.bugReportViewModelFactory.create(state)
+        }
+    }
+
+    init {
+        fetchHomeserverVersion()
+    }
+
+    private fun fetchHomeserverVersion() {
+        viewModelScope.launch {
+            val version = tryOrNull {
+                activeSessionHolder.getSafeActiveSession()
+                        ?.federationService()
+                        ?.getFederationVersion()
+                        ?.let { "${it.name} - ${it.version}" }
+            } ?: "undefined"
+
+            setState {
+                copy(
+                        serverVersion = version
+                )
+            }
+        }
+    }
+
+    override fun handle(action: EmptyAction) {
+        // No op
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index a43aca488d..15fd18039b 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -165,6 +165,7 @@ class BugReporter @Inject constructor(
                       withKeyRequestHistory: Boolean,
                       withScreenshot: Boolean,
                       theBugDescription: String,
+                      serverVersion: String,
                       listener: IMXBugReportListener?) {
         // enumerate files to delete
         val mBugReportFiles: MutableList<File> = ArrayList()
@@ -273,6 +274,7 @@ class BugReporter @Inject constructor(
                             .addFormDataPart("app_language", VectorLocale.applicationLocale.toString())
                             .addFormDataPart("default_app_language", systemLocaleProvider.getSystemLocale().toString())
                             .addFormDataPart("theme", ThemeUtils.getApplicationTheme(context))
+                            .addFormDataPart("server_version", serverVersion)
 
                     val buildNumber = context.getString(R.string.build_number)
                     if (buildNumber.isNotEmpty() && buildNumber != "0") {

From e1f778e21add98853a6ee7c19695a7ed9ca0035a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Feb 2021 18:56:49 +0100
Subject: [PATCH 018/578] Changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index b67e33f9ad..cfff2756ef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Fetch homeserver type and version and display in a new wetting screen and add info in rageshakes (#2831)
 
 Bugfix 🐛:
  -

From 80524fb8c1fee3fa5326326e0e42f1a11d455054 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Feb 2021 19:34:26 +0100
Subject: [PATCH 019/578] Cleanup

---
 CHANGES.md                                                      | 2 +-
 .../java/im/vector/app/features/rageshake/BugReportState.kt     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cfff2756ef..422d94ff06 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- - Fetch homeserver type and version and display in a new wetting screen and add info in rageshakes (#2831)
+ - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831)
 
 Bugfix 🐛:
  -
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportState.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportState.kt
index 1dc316a5e2..a5019115fb 100644
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportState.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportState.kt
@@ -21,4 +21,3 @@ import com.airbnb.mvrx.MvRxState
 data class BugReportState(
         val serverVersion: String = ""
 ) : MvRxState
-

From f9f54cabdd396e6daab19c7c08e0aa920913ec8e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Feb 2021 23:40:03 +0100
Subject: [PATCH 020/578] Add upload capability on the screen and give
 possibility to refresh the data

---
 .../HomeServerCapabilitiesService.kt          |  5 ++++
 .../DefaultHomeServerCapabilitiesService.kt   | 11 ++++++--
 .../GetHomeServerCapabilitiesTask.kt          | 20 +++++++++-----
 .../sdk/internal/session/sync/SyncTask.kt     |  2 +-
 .../homeserver/HomeServerSettingsViewState.kt |  2 ++
 .../HomeserverSettingsController.kt           | 26 +++++++++++++++++--
 .../homeserver/HomeserverSettingsViewModel.kt | 18 ++++++++++++-
 vector/src/main/res/values/strings.xml        |  3 +++
 8 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
index 2c9121ce4a..f12cbcd6db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
@@ -21,6 +21,11 @@ package org.matrix.android.sdk.api.session.homeserver
  */
 interface HomeServerCapabilitiesService {
 
+    /**
+     * Force a refresh of the stored data
+     */
+    suspend fun refreshHomeServerCapabilities()
+
     /**
      * Get the HomeServer capabilities
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
index 27396aac80..0ed690d972 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
@@ -17,16 +17,23 @@
 package org.matrix.android.sdk.internal.session.homeserver
 
 import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.internal.database.mapper.HomeServerCapabilitiesMapper
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
 import org.matrix.android.sdk.internal.database.query.get
 import org.matrix.android.sdk.internal.di.SessionDatabase
-import io.realm.Realm
 import javax.inject.Inject
 
-internal class DefaultHomeServerCapabilitiesService @Inject constructor(@SessionDatabase private val monarchy: Monarchy) : HomeServerCapabilitiesService {
+internal class DefaultHomeServerCapabilitiesService @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val getHomeServerCapabilitiesTask: GetHomeServerCapabilitiesTask
+) : HomeServerCapabilitiesService {
+
+    override suspend fun refreshHomeServerCapabilities() {
+        getHomeServerCapabilitiesTask.execute(GetHomeServerCapabilitiesTask.Params(forceRefresh = true))
+    }
 
     override fun getHomeServerCapabilities(): HomeServerCapabilities {
         return Realm.getInstance(monarchy.realmConfiguration).use { realm ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 845cfb392e..84c9132d61 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -38,7 +38,11 @@ import timber.log.Timber
 import java.util.Date
 import javax.inject.Inject
 
-internal interface GetHomeServerCapabilitiesTask : Task<Unit, Unit>
+internal interface GetHomeServerCapabilitiesTask : Task<GetHomeServerCapabilitiesTask.Params, Unit> {
+    data class Params(
+            val forceRefresh: Boolean
+    )
+}
 
 internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
         private val capabilitiesAPI: CapabilitiesAPI,
@@ -52,12 +56,14 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
         private val userId: String
 ) : GetHomeServerCapabilitiesTask {
 
-    override suspend fun execute(params: Unit) {
-        var doRequest = false
-        monarchy.awaitTransaction { realm ->
-            val homeServerCapabilitiesEntity = HomeServerCapabilitiesEntity.getOrCreate(realm)
+    override suspend fun execute(params: GetHomeServerCapabilitiesTask.Params) {
+        var doRequest = params.forceRefresh
+        if (!doRequest) {
+            monarchy.awaitTransaction { realm ->
+                val homeServerCapabilitiesEntity = HomeServerCapabilitiesEntity.getOrCreate(realm)
 
-            doRequest = homeServerCapabilitiesEntity.lastUpdatedTimestamp + MIN_DELAY_BETWEEN_TWO_REQUEST_MILLIS < Date().time
+                doRequest = homeServerCapabilitiesEntity.lastUpdatedTimestamp + MIN_DELAY_BETWEEN_TWO_REQUEST_MILLIS < Date().time
+            }
         }
 
         if (!doRequest) {
@@ -123,7 +129,7 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
     }
 
     companion object {
-        // 8 hours like on Riot Web
+        // 8 hours like on Element Web
         private const val MIN_DELAY_BETWEEN_TWO_REQUEST_MILLIS = 8 * 60 * 60 * 1000
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 7c38230065..bfe3799771 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -77,7 +77,7 @@ internal class DefaultSyncTask @Inject constructor(
             initialSyncProgressService.startTask(R.string.initial_sync_start_importing_account, 100)
         }
         // Maybe refresh the home server capabilities data we know
-        getHomeServerCapabilitiesTask.execute(Unit)
+        getHomeServerCapabilitiesTask.execute(GetHomeServerCapabilitiesTask.Params(forceRefresh = false))
 
         val readTimeOut = (params.timeout + TIMEOUT_MARGIN).coerceAtLeast(TimeOutInterceptor.DEFAULT_LONG_TIMEOUT)
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
index 7c1a78d0cf..abd823fa99 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeServerSettingsViewState.kt
@@ -20,8 +20,10 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.federation.FederationVersion
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 
 data class HomeServerSettingsViewState(
         val baseUrl: String = "",
+        val homeServerCapabilities: HomeServerCapabilities = HomeServerCapabilities(),
         val federationVersion: Async<FederationVersion> = Uninitialized
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
index 4f648309f0..e90f711edc 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
@@ -25,13 +25,16 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.errorWithRetryItem
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.discovery.settingsCenteredImageItem
 import im.vector.app.features.discovery.settingsInfoItem
 import im.vector.app.features.discovery.settingsSectionTitleItem
 import org.matrix.android.sdk.api.federation.FederationVersion
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import javax.inject.Inject
 
 class HomeserverSettingsController @Inject constructor(
+        private val stringProvider: StringProvider,
         private val errorFormatter: ErrorFormatter
 ) : TypedEpoxyController<HomeServerSettingsViewState>() {
 
@@ -51,15 +54,16 @@ class HomeserverSettingsController @Inject constructor(
                 loadingItem {
                     id("loading")
                 }
-            is Fail ->
+            is Fail          ->
                 errorWithRetryItem {
                     id("error")
                     text(errorFormatter.toHumanReadable(federationVersion.error))
                     listener { callback?.retry() }
                 }
-            is Success ->
+            is Success       ->
                 buildFederationVersion(federationVersion())
         }
+        buildCapabilities(data)
     }
 
     private fun buildHeader(state: HomeServerSettingsViewState) {
@@ -95,4 +99,22 @@ class HomeserverSettingsController @Inject constructor(
             helperText(federationVersion.version)
         }
     }
+
+    private fun buildCapabilities(data: HomeServerSettingsViewState) {
+        settingsSectionTitleItem {
+            id("uploadTitle")
+            titleResId(R.string.settings_server_upload_size_title)
+        }
+
+        val limit = data.homeServerCapabilities.maxUploadFileSize
+
+        settingsInfoItem {
+            id("uploadValue")
+            if (limit == HomeServerCapabilities.MAX_UPLOAD_FILE_SIZE_UNKNOWN) {
+                helperTextResId(R.string.settings_server_upload_size_unknown)
+            } else {
+                helperText(stringProvider.getString(R.string.settings_server_upload_size_content, "${limit / 1048576L} MB"))
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
index 19578aea81..17f03a3456 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsViewModel.kt
@@ -53,10 +53,26 @@ class HomeserverSettingsViewModel @AssistedInject constructor(
     init {
         setState {
             copy(
-                    baseUrl = session.sessionParams.homeServerUrl
+                    baseUrl = session.sessionParams.homeServerUrl,
+                    homeServerCapabilities = session.getHomeServerCapabilities()
             )
         }
         fetchHomeserverVersion()
+        refreshHomeServerCapabilities()
+    }
+
+    private fun refreshHomeServerCapabilities() {
+        viewModelScope.launch {
+            runCatching {
+                session.refreshHomeServerCapabilities()
+            }
+
+            setState {
+                copy(
+                        homeServerCapabilities = session.getHomeServerCapabilities()
+                )
+            }
+        }
     }
 
     private fun fetchHomeserverVersion() {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index d71720f64a..a1e7b01cda 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2338,6 +2338,9 @@
 
     <string name="settings_server_name">Server name</string>
     <string name="settings_server_version">Server version</string>
+    <string name="settings_server_upload_size_title">Server file upload limit</string>
+    <string name="settings_server_upload_size_content">Your homeserver accepts attachments (files, media, etc.) with a size up to %s.</string>
+    <string name="settings_server_upload_size_unknown">The limit is unknown.</string>
 
     <string name="settings_failed_to_get_crypto_device_info">No cryptographic information available</string>
 

From 0f328fda440f179f8906764f3ac44bb61e76eb3c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Feb 2021 11:59:33 +0100
Subject: [PATCH 021/578] Add the new screen to the sanity test

---
 .../java/im/vector/app/ui/UiAllScreensSanityTest.kt            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index 338d57fea8..a0b8e08885 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -483,6 +483,9 @@ class UiAllScreensSanityTest {
         clickOn(R.string.add_identity_server)
         pressBack()
         pressBack()
+        // Home server
+        clickOnPreference(R.string.settings_home_server)
+        pressBack()
         // Identity server
         clickOnPreference(R.string.settings_identity_server)
         pressBack()

From 490a8551aca76bf0013f377e630138f686fa0e93 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Feb 2021 12:18:14 +0100
Subject: [PATCH 022/578] Items have been reordered

---
 .../java/im/vector/app/ui/UiAllScreensSanityTest.kt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index a0b8e08885..0b93e58ee2 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -277,13 +277,18 @@ class UiAllScreensSanityTest {
 
         assertDisplayed(R.id.roomProfileAvatarView)
 
-        // Room addresses
+        // Leave
         clickListItem(R.id.matrixProfileRecyclerView, 13)
+        clickDialogNegativeButton()
+
+        // Advanced
+        // Room addresses
+        clickListItem(R.id.matrixProfileRecyclerView, 15)
         onView(isRoot()).perform(waitForView(withText(R.string.room_alias_published_alias_title)))
         pressBack()
 
         // Room permissions
-        clickListItem(R.id.matrixProfileRecyclerView, 15)
+        clickListItem(R.id.matrixProfileRecyclerView, 17)
         onView(isRoot()).perform(waitForView(withText(R.string.room_permissions_title)))
         clickOn(R.string.room_permissions_change_room_avatar)
         clickDialogNegativeButton()
@@ -292,10 +297,6 @@ class UiAllScreensSanityTest {
         clickOn(R.string.hide_advanced)
         pressBack()
 
-        // Leave
-        clickListItem(R.id.matrixProfileRecyclerView, 17)
-        clickDialogNegativeButton()
-
         // Menu share
         // clickMenu(R.id.roomProfileShareAction)
         // pressBack()

From 8580f46ec19fcab4807b7d58d35b2090e265c145 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Feb 2021 12:45:52 +0100
Subject: [PATCH 023/578] Fix other issue in test

---
 .../java/im/vector/app/ui/UiAllScreensSanityTest.kt   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index 0b93e58ee2..6f8056de13 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -23,7 +23,6 @@ import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
 import androidx.test.espresso.action.ViewActions.longClick
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
-import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -145,7 +144,7 @@ class UiAllScreensSanityTest {
     }
 
     private fun ignoreVerification() {
-        Thread.sleep(6000)
+        sleep(6000)
         val activity = EspressoHelper.getCurrentActivity()!!
 
         val popup = activity.findViewById<View>(com.tapadoo.alerter.R.id.llAlertBackground)
@@ -155,7 +154,7 @@ class UiAllScreensSanityTest {
 
         assertDisplayed(R.id.bottomSheetFragmentContainer)
 
-        onView(ViewMatchers.isRoot()).perform(SleepViewAction.sleep(2000))
+        onView(isRoot()).perform(SleepViewAction.sleep(2000))
 
         clickOn(R.string.skip)
         assertDisplayed(R.string.are_you_sure)
@@ -206,12 +205,12 @@ class UiAllScreensSanityTest {
         // Test quick reaction
         longClickOnMessage()
         // Add quick reaction
-        clickOn("👍")
+        clickOn("\uD83D\uDC4D️") // 👍
 
         sleep(1000)
 
         // Open reactions
-        longClickOn("👍")
+        longClickOn("\uD83D\uDC4D️") // 👍
         pressBack()
 
         // Test add reaction
@@ -226,6 +225,8 @@ class UiAllScreensSanityTest {
         clickOn(R.string.edit)
         // TODO Cancel action
         writeTo(R.id.composerEditText, "Hello universe!")
+        // Wait a bit for the keyboard layout to update
+        sleep(30)
         clickOn(R.id.sendButton)
         // Open edit history
         longClickOnMessage("Hello universe! (edited)")

From e511e7e02ed36195acacc5f80dd4a77fb0fce3f8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Feb 2021 21:26:01 +0100
Subject: [PATCH 024/578] Add menu entry for dev tools (to complete existing
 /devtools command)

---
 .../features/roomprofile/RoomProfileController.kt  | 14 ++++++++++++--
 .../features/roomprofile/RoomProfileFragment.kt    |  4 ++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 5ab86f7138..820f6848d8 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -57,6 +57,7 @@ class RoomProfileController @Inject constructor(
         fun onRoomAliasesClicked()
         fun onRoomPermissionsClicked()
         fun onRoomIdClicked()
+        fun onRoomDevToolsClicked()
         fun onUrlInTopicLongClicked(url: String)
     }
 
@@ -193,7 +194,7 @@ class RoomProfileController @Inject constructor(
                 title = stringProvider.getString(R.string.room_settings_permissions_title),
                 subtitle = stringProvider.getString(R.string.room_settings_permissions_subtitle),
                 dividerColor = dividerColor,
-                divider = true,
+                divider = false,
                 editable = true,
                 action = { callback?.onRoomPermissionsClicked() }
         )
@@ -204,10 +205,19 @@ class RoomProfileController @Inject constructor(
                     title = stringProvider.getString(R.string.room_settings_room_internal_id),
                     subtitle = roomSummary.roomId,
                     dividerColor = dividerColor,
-                    divider = false,
+                    divider = true,
                     editable = false,
                     action = { callback?.onRoomIdClicked() }
             )
+            buildProfileAction(
+                    id = "devTools",
+                    title = stringProvider.getString(R.string.dev_tools_menu_name),
+                    subtitle = roomSummary.roomId,
+                    dividerColor = dividerColor,
+                    divider = false,
+                    editable = true,
+                    action = { callback?.onRoomDevToolsClicked() }
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 154483652b..16c703ea48 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -295,6 +295,10 @@ class RoomProfileFragment @Inject constructor(
         copyToClipboard(requireContext(), roomProfileArgs.roomId)
     }
 
+    override fun onRoomDevToolsClicked() {
+        navigator.openDevTools(requireContext(), roomProfileArgs.roomId)
+    }
+
     override fun onUrlInTopicLongClicked(url: String) {
         copyToClipboard(requireContext(), url, true)
     }

From 8793d263d45a712d0f3260cfe6faccc29133268d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Feb 2021 21:53:10 +0100
Subject: [PATCH 025/578] Add info about room version

---
 .../features/roomprofile/RoomProfileController.kt  | 10 ++++++++++
 .../features/roomprofile/RoomProfileViewModel.kt   | 14 ++++++++++++++
 .../features/roomprofile/RoomProfileViewState.kt   |  2 ++
 vector/src/main/res/values/strings.xml             |  1 +
 4 files changed, 27 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 820f6848d8..bb7d041199 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -209,6 +209,16 @@ class RoomProfileController @Inject constructor(
                     editable = false,
                     action = { callback?.onRoomIdClicked() }
             )
+            data.roomCreateContent()?.roomVersion?.let {
+                buildProfileAction(
+                        id = "roomVersion",
+                        title = stringProvider.getString(R.string.room_settings_room_version_title),
+                        subtitle = it,
+                        dividerColor = dividerColor,
+                        divider = true,
+                        editable = false
+                )
+            }
             buildProfileAction(
                     id = "devTools",
                     title = stringProvider.getString(R.string.dev_tools_menu_name),
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index 02a648287f..c8bb6b5b5c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -33,13 +33,17 @@ import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.state.isPublic
 import org.matrix.android.sdk.rx.RxRoom
+import org.matrix.android.sdk.rx.mapOptional
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
 
@@ -69,10 +73,20 @@ class RoomProfileViewModel @AssistedInject constructor(
     init {
         val rxRoom = room.rx()
         observeRoomSummary(rxRoom)
+        observeRoomCreateContent(rxRoom)
         observeBannedRoomMembers(rxRoom)
         observePermissions()
     }
 
+    private fun observeRoomCreateContent(rxRoom: RxRoom) {
+        rxRoom.liveStateEvent(EventType.STATE_ROOM_CREATE, QueryStringValue.NoCondition)
+                .mapOptional { it.content.toModel<RoomCreateContent>() }
+                .unwrap()
+                .execute {
+                    copy(roomCreateContent = it)
+                }
+    }
+
     private fun observeRoomSummary(rxRoom: RxRoom) {
         rxRoom.liveRoomSummary()
                 .unwrap()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
index 398982ede1..bf7cd732ef 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt
@@ -22,10 +22,12 @@ import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 
 data class RoomProfileViewState(
         val roomId: String,
         val roomSummary: Async<RoomSummary> = Uninitialized,
+        val roomCreateContent: Async<RoomCreateContent> = Uninitialized,
         val bannedMembership: Async<List<RoomMemberSummary>> = Uninitialized,
         val actionPermissions: ActionPermissions = ActionPermissions(),
         val isLoading: Boolean = false
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index a1e7b01cda..a3eade1f02 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1117,6 +1117,7 @@
     <!-- advanced -->
     <string name="room_settings_category_advanced_title">Advanced</string>
     <string name="room_settings_room_internal_id">This room’s internal ID</string>
+    <string name="room_settings_room_version_title">Room version</string>
     <string name="room_settings_addresses_pref_title">Addresses</string>
     <string name="room_settings_labs_pref_title">Labs</string>
     <string name="room_settings_labs_warning_message">These are experimental features that may break in unexpected ways. Use with caution.</string>

From 5a4915e81716240aabfd8063486e935a6c1a0424 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Feb 2021 23:21:14 +0000
Subject: [PATCH 026/578] Bump flexbox from 1.1.1 to 2.0.1

Bumps [flexbox](https://github.com/google/flexbox-layout) from 1.1.1 to 2.0.1.
- [Release notes](https://github.com/google/flexbox-layout/releases)
- [Commits](https://github.com/google/flexbox-layout/compare/1.1.1...2.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index fe7fd5094b..50689de1ae 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -375,7 +375,7 @@ dependencies {
     implementation "io.noties.markwon:html:$markwon_version"
     implementation 'com.googlecode.htmlcompressor:htmlcompressor:1.5.2'
     implementation 'me.saket:better-link-movement-method:2.2.0'
-    implementation 'com.google.android:flexbox:1.1.1'
+    implementation 'com.google.android:flexbox:2.0.1'
     implementation "androidx.autofill:autofill:$autofill_version"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
     implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'

From 6f01e3b99b6f0228abdfa6db72493e4d3d2935b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Feb 2021 23:23:31 +0000
Subject: [PATCH 027/578] Bump mockk-android from 1.9.2.kotlin12 to 1.10.6

Bumps [mockk-android](https://github.com/mockk/mockk) from 1.9.2.kotlin12 to 1.10.6.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.9.2.kotlin12...1.10.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 8ff16cb159..5eb9d3eb28 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -186,7 +186,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'org.amshove.kluent:kluent-android:1.61'
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
-    androidTestImplementation 'io.mockk:mockk-android:1.9.2.kotlin12'
+    androidTestImplementation 'io.mockk:mockk-android:1.10.6'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test

From 5aa50a6c6068405a3a27508d416367e64034fa7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:07:19 +0000
Subject: [PATCH 028/578] Bump mockk from 1.9.2.kotlin12 to 1.10.6

Bumps [mockk](https://github.com/mockk/mockk) from 1.9.2.kotlin12 to 1.10.6.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.9.2.kotlin12...1.10.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 20f526643c..9e5ad2b94f 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -172,7 +172,7 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.3'
     //testImplementation 'org.robolectric:shadows-support-v4:3.0'
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
-    testImplementation 'io.mockk:mockk:1.9.2.kotlin12'
+    testImplementation 'io.mockk:mockk:1.10.6'
     testImplementation 'org.amshove.kluent:kluent-android:1.65'
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test

From c06958200702f81bfd64a9b58e9331a09c2cabab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:19:23 +0000
Subject: [PATCH 029/578] Bump fragment-ktx from 1.3.0-beta01 to 1.3.0

Bumps fragment-ktx from 1.3.0-beta01 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 multipicker/build.gradle | 2 +-
 vector/build.gradle      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 5b24388aae..89a692a782 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -43,7 +43,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.fragment:fragment-ktx:1.3.0-beta01"
+    implementation "androidx.fragment:fragment-ktx:1.3.0"
     implementation 'androidx.exifinterface:exifinterface:1.3.2'
 
     // Log
diff --git a/vector/build.gradle b/vector/build.gradle
index 0ed71ba1b2..fe2c577057 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -288,7 +288,7 @@ android {
 dependencies {
 
     def epoxy_version = '4.4.0'
-    def fragment_version = '1.3.0-beta01'
+    def fragment_version = '1.3.0'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.6.2'

From a5a857f03649060e32a3f82dc5ecf4ea4143fcd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:19:35 +0000
Subject: [PATCH 030/578] Bump recyclerview from 1.2.0-alpha06 to 1.2.0-beta01

Bumps recyclerview from 1.2.0-alpha06 to 1.2.0-beta01.

Signed-off-by: dependabot[bot] <support@github.com>
---
 attachment-viewer/build.gradle | 2 +-
 vector/build.gradle            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index a92eb11212..f07f418602 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-beta01"
 
     implementation 'com.google.android.material:material:1.3.0'
 }
\ No newline at end of file
diff --git a/vector/build.gradle b/vector/build.gradle
index 0ed71ba1b2..e7c68bd7ad 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -316,7 +316,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha06"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-beta01"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

From a7adcbcd789a6f415ecdaa2f02df15fa45bfaabd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:20:10 +0000
Subject: [PATCH 031/578] Bump rxkotlin from 2.3.0 to 2.4.0

Bumps [rxkotlin](https://github.com/ReactiveX/RxKotlin) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/ReactiveX/RxKotlin/releases)
- [Commits](https://github.com/ReactiveX/RxKotlin/compare/2.3.0...2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 attachment-viewer/build.gradle     | 2 +-
 matrix-sdk-android-rx/build.gradle | 2 +-
 vector/build.gradle                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index a92eb11212..1c9e88cc5b 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -63,7 +63,7 @@ android {
 dependencies {
     implementation 'com.github.chrisbanes:PhotoView:2.1.4'
 
-    implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
+    implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle
index 0e899e21ff..37b0ff8d00 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -36,7 +36,7 @@ android {
 dependencies {
     implementation project(":matrix-sdk-android")
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
+    implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$kotlin_coroutines_version"
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 92f3e151dc..e57ee57d35 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -341,7 +341,7 @@ dependencies {
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.18'
 
     // rx
-    implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
+    implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.jakewharton.rxrelay2:rxrelay:2.1.1'
     // RXBinding

From 94faa2dc116415b9f20bb2ba4999440cb8221a33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:22:09 +0000
Subject: [PATCH 032/578] Bump rxbinding-material from 3.0.0 to 3.1.0

Bumps [rxbinding-material](https://github.com/JakeWharton/RxBinding) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/JakeWharton/RxBinding/releases)
- [Changelog](https://github.com/JakeWharton/RxBinding/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JakeWharton/RxBinding/compare/3.0.0...3.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index ae2a88081b..e1f2facf3e 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -347,7 +347,7 @@ dependencies {
     // RXBinding
     implementation 'com.jakewharton.rxbinding3:rxbinding:3.1.0'
     implementation 'com.jakewharton.rxbinding3:rxbinding-appcompat:3.1.0'
-    implementation 'com.jakewharton.rxbinding3:rxbinding-material:3.0.0'
+    implementation 'com.jakewharton.rxbinding3:rxbinding-material:3.1.0'
 
     implementation("com.airbnb.android:epoxy:$epoxy_version")
     implementation "com.airbnb.android:epoxy-glide-preloading:$epoxy_version"

From 5320d16406926daeff1ec8368a03de9f72ce5f61 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:22:58 +0000
Subject: [PATCH 033/578] Bump work-runtime-ktx from 2.4.0 to 2.5.0

Bumps work-runtime-ktx from 2.4.0 to 2.5.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 03145ec257..fa59bc189e 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -113,7 +113,7 @@ dependencies {
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
     def daggerVersion = '2.32'
-    def work_version = '2.4.0'
+    def work_version = '2.5.0'
     def retrofit_version = '2.9.0'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/vector/build.gradle b/vector/build.gradle
index ae2a88081b..6e2f88a24f 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -296,7 +296,7 @@ dependencies {
     def moshi_version = '1.11.0'
     def daggerVersion = '2.32'
     def autofill_version = "1.1.0"
-    def work_version = '2.4.0'
+    def work_version = '2.5.0'
     def arch_version = '2.1.0'
     def lifecycle_version = '2.2.0'
 

From 471620c4c653f2d5bebd5d9889d727a6927f0079 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 23:12:11 +0000
Subject: [PATCH 034/578] Bump robolectric from 4.3 to 4.5.1

Bumps [robolectric](https://github.com/robolectric/robolectric) from 4.3 to 4.5.1.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.3...robolectric-4.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 3cce7c8195..cd3fe0b83b 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -169,7 +169,7 @@ dependencies {
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.18'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.3'
+    testImplementation 'org.robolectric:robolectric:4.5.1'
     //testImplementation 'org.robolectric:shadows-support-v4:3.0'
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     testImplementation 'io.mockk:mockk:1.10.6'

From 823ba386d9e0f2fe0774463c646d6ff65f36534a Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Sat, 20 Feb 2021 07:15:41 +0000
Subject: [PATCH 035/578] Translated using Weblate (Russian)

Currently translated at 99.5% (2072 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
---
 vector/src/main/res/values-ru/strings.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 32039144d6..8764831970 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2431,4 +2431,18 @@
     <string name="re_authentication_default_confirm_text">Element требует от вас ввести свои учетные данные для выполнения этого действия.</string>
     <string name="re_authentication_activity_title">Требуется повторная аутентификация</string>
     <string name="failed_to_initialize_cross_signing">Не удалось настроить перекрестную подпись</string>
+    <string name="call_only_active">Активный звонок (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">При поиске номера телефона произошла ошибка</string>
+    <string name="call_dial_pad_title">Панель набора номера</string>
+    <string name="call_tile_call_back">Перезвонить</string>
+    <string name="call_tile_ended">Этот вызов закончился</string>
+    <string name="call_tile_other_declined">%1$s отменил(а) этот вызов</string>
+    <string name="call_tile_you_declined">Вы отклонили этот вызов %1$s</string>
+    <string name="call_tile_in_call">Вы сейчас в этом вызове</string>
+    <string name="call_tile_you_started_call">Вы начали вызов</string>
+    <string name="call_tile_other_started_call">%1$s начал(а) вызов</string>
+    <string name="call_held_by_you">Вы поставили вызов на удержание</string>
+    <string name="call_held_by_user">%s поставил вызов на удержание</string>
+    <string name="call_hold_action">Удерживать</string>
+    <string name="call_resume_action">Возобновить</string>
 </resources>
\ No newline at end of file

From eb14341f9fec56aa2cea6e77f674d95fb8ad2ce2 Mon Sep 17 00:00:00 2001
From: GokdenizK <gokdeniz_6167@hotmail.com>
Date: Thu, 18 Feb 2021 09:37:16 +0000
Subject: [PATCH 036/578] Translated using Weblate (Turkish)

Currently translated at 72.1% (1502 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
---
 vector/src/main/res/values-tr/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 2f4c163d6d..1d5b8ed277 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -1709,4 +1709,8 @@
         <item quantity="one">%1$d/%2$d anahtar başarıyla içe aktarıldı.</item>
         <item quantity="other">%1$d/%2$d anahtar başarıyla içe aktarıldı.</item>
     </plurals>
+    <string name="call_held_by_you">Aramayı beklettiniz</string>
+    <string name="call_held_by_user">%s aramayı bekletti</string>
+    <string name="call_hold_action">Beklet</string>
+    <string name="call_resume_action">Devam et</string>
 </resources>
\ No newline at end of file

From 2f8169c26d9f4adc10d3610a288731f32b1dcb96 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 19 Feb 2021 01:48:24 +0000
Subject: [PATCH 037/578] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 7121c8f570..e246c0ae8a 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2105,7 +2105,7 @@
     <string name="bad_passphrase_key_reset_all_action">忘記或遺失所有復原選項？重設所有東西</string>
     <string name="direct_room_created_summary_item_by_you">您已加入。</string>
     <string name="direct_room_created_summary_item">%s 已加入。</string>
-    <string name="direct_room_encryption_enabled_tile_description">此聊天適中的訊息有端到端加密。</string>
+    <string name="direct_room_encryption_enabled_tile_description">此聊天室中的訊息有端到端加密。</string>
     <string name="direct_room_profile_section_more_leave">離開</string>
     <string name="direct_room_profile_section_more_settings">設定</string>
     <string name="direct_room_profile_encrypted_subtitle">這裡的訊息有端到端加密。
@@ -2115,7 +2115,7 @@
     <string name="login_error_outdated_homeserver_warning_content">此家伺服器正在執行較舊的版本。請要求您的家伺服器管理原升級。您可以繼續，但某些功能可能無法正常運作。</string>
     <string name="direct_room_join_rules_invite_by_you">您讓此變為僅邀請。</string>
     <string name="direct_room_join_rules_invite">%1$s 讓此變為僅邀請。</string>
-    <string name="settings_labs_show_complete_history_in_encrypted_room">在已加密的聊天適中顯示完整歷史紀錄</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">在已加密的聊天室中顯示完整歷史紀錄</string>
     <string name="notification_unread_notified_messages_and_invitation">%1$s 與 %2$s</string>
     <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s 在 %2$s 與 %3$s</string>
     <plurals name="notification_invitations">

From 58ab82a47765677ab117dd0e5ba841881cd4d9f9 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Fri, 19 Feb 2021 11:13:07 +0000
Subject: [PATCH 038/578] Translated using Weblate (Czech)

Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/cs/
---
 matrix-sdk-android/src/main/res/values-cs/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-cs/strings.xml b/matrix-sdk-android/src/main/res/values-cs/strings.xml
index d92959ac4c..b1ab4ea77f 100644
--- a/matrix-sdk-android/src/main/res/values-cs/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-cs/strings.xml
@@ -268,4 +268,10 @@
         <item quantity="few">%1$s přidali alternativní adresy %2$s pro tuto místnost.</item>
         <item quantity="other">%1$s přidali alternativní adresy %2$s pro tuto místnost.</item>
     </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">Upravili jste videokonferenci</string>
+    <string name="notice_widget_jitsi_modified">Videokonference byla upravena uživatelem %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Ukončili jste videokonferenci</string>
+    <string name="notice_widget_jitsi_removed">Videokonference byla ukončena uživatelem %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Zahájili jste videokonferenci</string>
+    <string name="notice_widget_jitsi_added">Videokonference byla zahájena uživatelem %1$s</string>
 </resources>
\ No newline at end of file

From 8250a64e34431f28899eb8906dad6731fec4fe1e Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Sat, 20 Feb 2021 07:12:15 +0000
Subject: [PATCH 039/578] Translated using Weblate (Galician)

Currently translated at 85.8% (194 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
---
 matrix-sdk-android/src/main/res/values-gl/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-gl/strings.xml b/matrix-sdk-android/src/main/res/values-gl/strings.xml
index def8af44c7..55d59065c9 100644
--- a/matrix-sdk-android/src/main/res/values-gl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-gl/strings.xml
@@ -207,4 +207,8 @@
     <string name="notice_room_server_acl_updated_banned">• Os servidores con %s están agora vetados.</string>
     <string name="notice_room_server_acl_updated_title_by_you">Cambiaches os ACLs do servidor para esta sala.</string>
     <string name="notice_room_server_acl_updated_title">%s cambiou os ACLs do servidor para esta sala.</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s engadiu %2$s como enderezo desta sala.</item>
+        <item quantity="other">%1$s engadiu %2$s como enderezos desta sala.</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 60dad590250e282bc0e64f5326c71372f3879db9 Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Sat, 20 Feb 2021 07:08:55 +0000
Subject: [PATCH 040/578] Translated using Weblate (Russian)

Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
---
 fastlane/metadata/android/ru/changelogs/40100170.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/ru/changelogs/40100170.txt

diff --git a/fastlane/metadata/android/ru/changelogs/40100170.txt b/fastlane/metadata/android/ru/changelogs/40100170.txt
new file mode 100644
index 0000000000..0e636dc4dc
--- /dev/null
+++ b/fastlane/metadata/android/ru/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: Исправлены ошибки!
+Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.0.17

From b37505112b5f8eb3fa6a66acee4c7c95a1c33016 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Fri, 19 Feb 2021 11:33:40 +0000
Subject: [PATCH 041/578] Translated using Weblate (Czech)

Currently translated at 63.6% (7 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
---
 .../metadata/android/cs/full_description.txt  | 36 +++++++++----------
 .../metadata/android/cs/short_description.txt |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/fastlane/metadata/android/cs/full_description.txt b/fastlane/metadata/android/cs/full_description.txt
index 50ca0ac171..f9c1f2ad0c 100644
--- a/fastlane/metadata/android/cs/full_description.txt
+++ b/fastlane/metadata/android/cs/full_description.txt
@@ -1,30 +1,30 @@
-Element je nový typ aplikace pro výměnu zpráv a kolaboraci, která:
+Element je nový typ aplikace pro výměnu zpráv a spolupráci, která:
 
-1. Vám dá moc zachovat si soukromí
-2. Vás nechá komunikovat s kýmkoli v síti Matrix a dokonce dále integrací s aplikacemi jako Slack
-3. Vás ochrání před inzercí, těžbou dat a uzavřenými zahradami
-4. Vás zabezpečí šifrováním end-to-end s křížovým podepisováním pro ověření ostatních
+1. Vám dá kontrolu nad ochranou vašeho soukromí
+2. Umožní vám komunikovat s kýmkoli v síti Matrix a dokonce i mimo ni pomocí integrací s aplikacemi, jako je Slack
+3. Ochrání vás před inzercí, dataminingem a uzavřenými zahradami
+4. Zabezpečí vás end-to-end šifrováním s křížovým podpisem pro ověření ostatních
 
-Element is completely different from other messaging and collaboration apps because it is decentralised and open source.
+Element je zcela odlišný od ostatních aplikací pro zasílání zpráv a spolupráci, protože je decentralizovaný a otevřený.
 
-Element lets you self-host - or choose a host - so that you have privacy, ownership and control of your data and conversations. It gives you access to an open network; so you’re not just stuck speaking to other Element users only. And it is very secure.
+Element vám umožňuje použít vlastní domovský server - nebo si vybrat hostitele - abyste měli soukromí, vlastnictví a kontrolu nad svými daty a konverzacemi. Poskytuje vám přístup k otevřené síti; takže nejste zaseknuti jen při konverzaci s ostatními uživateli Elementu. A je velmi bezpečný.
 
-Element is able to do all this because it operates on Matrix - the standard for open, decentralised communication.
+Element je toho všeho schopen, protože pracuje na Matrixu - standardu otevřené, decentralizované komunikace.
 
-Element puts you in control by letting you choose who hosts your conversations. From the Element app, you can choose to host in different ways:
+Element vám dává kontrolu nad tím, že si můžete vybrat, kdo bude hostovat vaše konverzace. Z aplikace Element si můžete vybrat hostování různými způsoby:
 
-1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
-2. Self-host your account by running a server on your own hardware
-3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
+1. Získejte zdarma účet na veřejném serveru matrix.org hostovaném vývojáři Matrixu, nebo si vyberte z tisíců veřejných serverů hostovaných dobrovolníky
+2. Hostujte svůj účet spuštěním serveru na svém vlastním hardwaru
+3. Zaregistrujte si účet na vlastním serveru jednoduchým přihlášením k hostitelské platformě Element Matrix Services
 
-<b>Why choose Element?</b>
+<b>Proč zvolit Element?</b>
 
-<b>OWN YOUR DATA</b>: You decide where to keep your data and messages. You own it and control it, not some MEGACORP that mines your data or gives access to third parties.
+<b>VLASTNĚTE SVÁ DATA</b>: Vy rozhodnete, kde svá data a zprávy ponecháte. Vlastníte je a jsou pod vaší kontrolou, ne nějaký MEGACORP, který těží vaše data nebo poskytuje přístup třetím stranám.
 
-<b>OPEN MESSAGING AND COLLABORATION</b>: You can chat with anyone else in the Matrix network, whether they’re using Element or another Matrix app, and even if they are using a different messaging system of the likes of Slack, IRC or XMPP.
+<b>ZPRÁVY A SPOLUPRÁCE</b>: Můžete chatovat s kýmkoli v síti Matrix, ať už používá Element nebo jinou aplikaci, a to i v případě, že používají jiný systém zasílání zpráv, jako je Slack, IRC nebo XMPP.
 
-<b>SUPER-SECURE</b>: Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signing to verify the devices of conversation participants.
+<b>MAXIMÁLNĚ BEZPEČNÉ</b>: Skutečné šifrování typu end-to-end (pouze ti v konverzaci mohou dešifrovat zprávy) a křížové podepisování k ověření zařízení účastníků konverzace.
 
-<b>COMPLETE COMMUNICATION</b>: Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
+<b>KOMPLETNÍ KOMUNIKACE</b>: Zprávy, hlasové hovory a videohovory, sdílení souborů, sdílení obrazovky a celá řada integrací, robotů a widgetů. Budujte místnosti, komunity, zůstaňte v kontaktu a spolupracujte.
 
-<b>EVERYWHERE YOU ARE</b>: Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io.
+<b>KDEKOLIV JSTE</b>: Zůstaňte v kontaktu, ať jste kdekoli, s plně synchronizovanou historií zpráv na všech vašich zařízeních a na webu na adrese https://app.element.io.
diff --git a/fastlane/metadata/android/cs/short_description.txt b/fastlane/metadata/android/cs/short_description.txt
index 0e62a3e249..a654a9ea6a 100644
--- a/fastlane/metadata/android/cs/short_description.txt
+++ b/fastlane/metadata/android/cs/short_description.txt
@@ -1 +1 @@
-Zabezpečený decentralizovaný chat & VoIP. Uchovejte svá data v bezpečí.
+Zabezpečený decentralizovaný chat a VoIP. Uchovejte svá data v bezpečí.

From 206f19401f87ebc83449444d1dfd75c382de3def Mon Sep 17 00:00:00 2001
From: vachan-maker <revsamtp@hotmail.com>
Date: Fri, 19 Feb 2021 07:16:11 +0000
Subject: [PATCH 042/578] Translated using Weblate (Malayalam)

Currently translated at 9.5% (198 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 87 +++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index b191484568..1f66b9ec40 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -120,4 +120,91 @@
     <string name="redact">നീക്കംചെയ്യൂ</string>
     <string name="backup">ബാക്കപ്പ്</string>
     <string name="title_activity_member_details">അംഗ വിശദാംശങ്ങൾ</string>
+    <string name="login_a11y_choose_matrix_org">matrix.org തിരഞ്ഞെടുക്കൂ</string>
+    <string name="login_signup_submit">അടുത്തത്</string>
+    <string name="login_signup_username_hint">ഉപയോക്തൃനാമം</string>
+    <string name="login_msisdn_confirm_submit">അടുത്തത്</string>
+    <string name="login_msisdn_confirm_send_again">വീണ്ടും അയയ്ക്കൂ</string>
+    <string name="login_msisdn_confirm_hint">കോഡ് നൽകൂ</string>
+    <string name="login_msisdn_confirm_title">ഫോൺ നമ്പർ ഉറപ്പാക്കൂ</string>
+    <string name="login_set_msisdn_submit">അടുത്തത്</string>
+    <string name="login_set_msisdn_optional_hint">ഫോൺ നമ്പർ (നിർബന്ധമല്ല)</string>
+    <string name="login_set_msisdn_mandatory_hint">ഫോൺ നമ്പർ</string>
+    <string name="login_set_msisdn_title">ഫോൺ നമ്പർ സജ്ജമാക്കൂ</string>
+    <string name="login_set_email_submit">അടുത്തത്</string>
+    <string name="login_reset_password_success_title">വിജയകരം!</string>
+    <string name="login_reset_password_warning_title">മുന്നറിയിപ്പ്!</string>
+    <string name="login_server_url_form_other_hint">വിലാസം</string>
+    <string name="login_social_continue_with">%s-ൽ തുടരുക</string>
+    <string name="login_social_continue">അല്ലെങ്കിൽ</string>
+    <string name="login_server_other_title">മറ്റുള്ളവ</string>
+    <string name="login_server_modular_learn_more">കൂടുതൽ അറിയുക</string>
+    <string name="login_server_title">ഒരു സെർവർ തിരഞ്ഞെടുക്കുക</string>
+    <string name="login_continue">തുടരുക</string>
+    <string name="login_clear_homeserver_history">ചരിത്രം മായ്ക്കൂ</string>
+    <string name="login_reset_password_submit">അടുത്തത്</string>
+    <string name="login_reset_password_cancel_confirmation_title">മുന്നറിയിപ്പ്</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="one">%d പുതിയ സന്ദേശങ്ങൾ</item>
+        <item quantity="other">%d പുതിയ സന്ദേശം</item>
+    </plurals>
+    <string name="room_prompt_cancel">എല്ലാം റദ്ദാക്കൂ</string>
+    <string name="room_prompt_resend">എല്ലാം വീണ്ടും അയയ്ക്കൂ</string>
+    <string name="room_message_placeholder_not_encrypted">ഒരു സന്ദേശം അയക്കൂ (എൻ‌ക്രിപ്റ്റ് ചെയ്യാത്ത)…</string>
+    <string name="room_one_user_is_typing">%s ടൈപ്പുചെയ്യുന്നു…</string>
+    <string name="room_menu_search">തിരയുക</string>
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="room_participants_action_set_admin">അഡ്മിൻ ആക്കൂ</string>
+    <string name="room_participants_action_cancel_invite">ക്ഷണം റദ്ദാക്കൂ</string>
+    <string name="room_participants_action_invite">ക്ഷണിക്കുക</string>
+    <string name="room_participants_now">ഇപ്പോൾ %1$s</string>
+    <string name="room_participants_offline">ഓഫ്‌ലൈൻ</string>
+    <string name="room_participants_online">ഓൺ‌ലൈൻ</string>
+    <string name="room_participants_create">സൃഷ്ടിക്കൂ</string>
+    <string name="room_title_one_member">1 അംഗം</string>
+    <plurals name="room_title_members">
+        <item quantity="one">%d അംഗം</item>
+        <item quantity="other">%d അംഗങ്ങൾ</item>
+    </plurals>
+    <plurals name="room_header_active_members_count">
+        <item quantity="one">%d സജീവ അംഗം</item>
+        <item quantity="other">%d സജീവ അംഗങ്ങൾ</item>
+    </plurals>
+    <string name="room_creation_add_member">അംഗത്തെ ചേർക്കുക</string>
+    <string name="room_creation_title">പുതിയ ചാറ്റ്</string>
+    <string name="room_preview_try_join_an_unknown_room_default">ഒരു മുറി</string>
+    <string name="room_sync_in_progress">സമന്വയിപ്പിക്കുന്നു…</string>
+    <string name="reject">നിരസിക്കുക</string>
+    <string name="join">ചേരുക</string>
+    <string name="remove">നീക്കംചെയ്യൂ</string>
+    <string name="_continue">തുടരുക</string>
+    <string name="no">ഇല്ല</string>
+    <string name="yes">അതെ</string>
+    <string name="media_slider_saved">സംരക്ഷിച്ചു</string>
+    <string name="permissions_rationale_popup_title">വിവരം</string>
+    <string name="settings_call_category">കോളുകൾ</string>
+    <string name="room_info_room_topic">മുറിയുടെ വിഷയം</string>
+    <string name="room_info_room_name">മുറിയുടെ പേര്</string>
+    <string name="today">ഇന്ന്</string>
+    <string name="yesterday">ഇന്നലെ</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">അഭ്യർത്ഥന അയച്ചൂ</string>
+    <string name="auth_identity_server">തിരിച്ചറിയൽ സെർവർ:</string>
+    <string name="auth_home_server">ഹോം സെർവർ:</string>
+    <string name="auth_email_placeholder">ഈ - മെയില് വിലാസം</string>
+    <string name="auth_login">പ്രവേശിക്കൂ</string>
+    <string name="option_take_photo_video">ഫോട്ടോ അല്ലെങ്കിൽ വീഡിയോ എടുക്കൂ</string>
+    <string name="option_send_sticker">സ്റ്റിക്കർ അയയ്ക്കൂ</string>
+    <string name="option_send_files">ഫയലുകൾ അയയ്ക്കൂ</string>
+    <string name="call_select_sound_device">ശബ്‌ദ ഉപകരണം തിരഞ്ഞെടുക്കുക</string>
+    <string name="start_video_call">വീഡിയോ കോൾ ആരംഭിക്കുക</string>
+    <string name="start_voice_call">വോയ്സ് കോൾ ആരംഭിക്കുക</string>
+    <string name="send_bug_report_progress">പുരോഗതി (%s%%)</string>
+    <string name="send_bug_report_placeholder">നിങ്ങളുടെ പ്രശ്നം ഇവിടെ വിവരിക്കുക</string>
+    <string name="no_group_placeholder">ഗ്രൂപ്പുകളില്ല</string>
+    <string name="no_room_placeholder">മുറികളില്ല</string>
+    <string name="rooms_header">മുറികൾ</string>
+    <string name="dialog_title_confirmation">ഉറപ്പാക്കൽ</string>
+    <string name="accept">സ്വീകരിക്കുക</string>
+    <string name="later">പിന്നീട്</string>
+    <string name="ongoing_conference_call_voice">വോയ്സ്</string>
 </resources>
\ No newline at end of file

From 370651ab567519965313ab6f2f0937101b40bbdf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sun, 21 Feb 2021 10:43:35 +0100
Subject: [PATCH 043/578] Dependabot will create only 1 PR to upgrade RxBinding
 dependencies

---
 vector/build.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 6e279bd959..08dadf6745 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -299,6 +299,7 @@ dependencies {
     def work_version = '2.5.0'
     def arch_version = '2.1.0'
     def lifecycle_version = '2.2.0'
+    def rxbinding_version = '3.1.0'
 
     // Tests
     def kluent_version = '1.65'
@@ -345,9 +346,9 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.jakewharton.rxrelay2:rxrelay:2.1.1'
     // RXBinding
-    implementation 'com.jakewharton.rxbinding3:rxbinding:3.1.0'
-    implementation 'com.jakewharton.rxbinding3:rxbinding-appcompat:3.1.0'
-    implementation 'com.jakewharton.rxbinding3:rxbinding-material:3.1.0'
+    implementation "com.jakewharton.rxbinding3:rxbinding:$rxbinding_version"
+    implementation "com.jakewharton.rxbinding3:rxbinding-appcompat:$rxbinding_version"
+    implementation "com.jakewharton.rxbinding3:rxbinding-material:$rxbinding_version"
 
     implementation("com.airbnb.android:epoxy:$epoxy_version")
     implementation "com.airbnb.android:epoxy-glide-preloading:$epoxy_version"

From fd3c41a2503ea95e7be9ca0ce5eb44e5af6426a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Feb 2021 23:21:43 +0000
Subject: [PATCH 044/578] Bump realmfieldnameshelper from 1.1.1 to 2.0.0

Bumps [realmfieldnameshelper](https://github.com/cmelchior/realmfieldnameshelper) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/cmelchior/realmfieldnameshelper/releases)
- [Changelog](https://github.com/cmelchior/realmfieldnameshelper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cmelchior/realmfieldnameshelper/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index cd3fe0b83b..3ade9f7214 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -145,7 +145,7 @@ dependencies {
 
     // Database
     implementation 'com.github.Zhuinden:realm-monarchy:0.7.1'
-    kapt 'dk.ilios:realmfieldnameshelper:1.1.1'
+    kapt 'dk.ilios:realmfieldnameshelper:2.0.0'
 
     // Work
     implementation "androidx.work:work-runtime-ktx:$work_version"

From bf48978065059cd5de882645990ab81305dc0cf1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sun, 21 Feb 2021 11:08:42 +0100
Subject: [PATCH 045/578] Fix compilation issue after upgrade of
 realmfieldnameshelper from 1.1.1 to 2.0.0

---
 .../database/query/ChunkEntityQueries.kt        |  3 +--
 .../internal/database/query/PushersQueries.kt   |  2 +-
 .../database/query/UserDraftsEntityQueries.kt   |  3 +--
 .../session/room/timeline/DefaultTimeline.kt    |  5 ++---
 .../room/timeline/TimelineHiddenReadReceipts.kt | 17 +++++++++--------
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
index 6028697054..f7d2823303 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.database.query
 
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
-import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.RealmResults
@@ -27,7 +26,7 @@ import io.realm.kotlin.where
 
 internal fun ChunkEntity.Companion.where(realm: Realm, roomId: String): RealmQuery<ChunkEntity> {
     return realm.where<ChunkEntity>()
-            .equalTo("${ChunkEntityFields.ROOM}.${RoomEntityFields.ROOM_ID}", roomId)
+            .equalTo(ChunkEntityFields.ROOM.ROOM_ID, roomId)
 }
 
 internal fun ChunkEntity.Companion.find(realm: Realm, roomId: String, prevToken: String? = null, nextToken: String? = null): ChunkEntity? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
index d78bda2317..359b256844 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
@@ -48,6 +48,6 @@ internal fun PushRuleEntity.Companion.where(realm: Realm,
                                             scope: String,
                                             ruleId: String): RealmQuery<PushRuleEntity> {
     return realm.where<PushRuleEntity>()
-            .equalTo("${PushRuleEntityFields.PARENT}.${PushRulesEntityFields.SCOPE}", scope)
+            .equalTo(PushRuleEntityFields.PARENT.SCOPE, scope)
             .equalTo(PushRuleEntityFields.RULE_ID, ruleId)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
index 35f317f192..4af4da0a22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.database.query
 
-import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.UserDraftsEntity
 import org.matrix.android.sdk.internal.database.model.UserDraftsEntityFields
 import io.realm.Realm
@@ -26,7 +25,7 @@ import io.realm.kotlin.where
 internal fun UserDraftsEntity.Companion.where(realm: Realm, roomId: String? = null): RealmQuery<UserDraftsEntity> {
     val query = realm.where<UserDraftsEntity>()
     if (roomId != null) {
-        query.equalTo(UserDraftsEntityFields.ROOM_SUMMARY_ENTITY + "." + RoomSummaryEntityFields.ROOM_ID, roomId)
+        query.equalTo(UserDraftsEntityFields.ROOM_SUMMARY_ENTITY.ROOM_ID, roomId)
     }
     return query
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index ae90282d52..ca272a3520 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -43,7 +43,6 @@ import org.matrix.android.sdk.api.util.CancelableBag
 import org.matrix.android.sdk.internal.database.RealmSessionProvider
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
-import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
@@ -688,11 +687,11 @@ internal class DefaultTimeline(
         return if (initialEventId == null) {
             TimelineEventEntity
                     .whereRoomId(realm, roomId = roomId)
-                    .equalTo("${TimelineEventEntityFields.CHUNK}.${ChunkEntityFields.IS_LAST_FORWARD}", true)
+                    .equalTo(TimelineEventEntityFields.CHUNK.IS_LAST_FORWARD, true)
         } else {
             TimelineEventEntity
                     .whereRoomId(realm, roomId = roomId)
-                    .`in`("${TimelineEventEntityFields.CHUNK}.${ChunkEntityFields.TIMELINE_EVENTS.EVENT_ID}", arrayOf(initialEventId))
+                    .`in`("${TimelineEventEntityFields.CHUNK.TIMELINE_EVENTS}.${TimelineEventEntityFields.EVENT_ID}", arrayOf(initialEventId))
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
index fa517bebf2..0ade8ad3b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
@@ -24,6 +24,7 @@ import io.realm.RealmResults
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.internal.database.mapper.ReadReceiptsSummaryMapper
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
 import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
 import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
@@ -121,7 +122,7 @@ internal class TimelineHiddenReadReceipts constructor(private val readReceiptsSu
         // We are looking for read receipts set on hidden events.
         // We only accept those with a timelineEvent (so coming from pagination/sync).
         this.hiddenReadReceipts = ReadReceiptsSummaryEntity.whereInRoom(realm, roomId)
-                .isNotEmpty(ReadReceiptsSummaryEntityFields.TIMELINE_EVENT)
+                .isNotEmpty(ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.`$`)
                 .isNotEmpty(ReadReceiptsSummaryEntityFields.READ_RECEIPTS.`$`)
                 .filterReceiptsWithSettings()
                 .findAllAsync()
@@ -157,12 +158,12 @@ internal class TimelineHiddenReadReceipts constructor(private val readReceiptsSu
             // Result: D, F, H, I
             settings.filters.allowedTypes.forEachIndexed { index, filter ->
                 if (filter.stateKey == null) {
-                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT}.${TimelineEventEntityFields.ROOT.TYPE}", filter.eventType)
+                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.TYPE}", filter.eventType)
                 } else {
                     beginGroup()
-                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT}.${TimelineEventEntityFields.ROOT.TYPE}", filter.eventType)
+                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.TYPE}", filter.eventType)
                     or()
-                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT}.${TimelineEventEntityFields.ROOT.STATE_KEY}", filter.stateKey)
+                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.STATE_KEY}", filter.stateKey)
                     endGroup()
                 }
                 if (index != settings.filters.allowedTypes.size - 1) {
@@ -174,19 +175,19 @@ internal class TimelineHiddenReadReceipts constructor(private val readReceiptsSu
         }
         if (settings.filters.filterUseless) {
             if (needOr) or()
-            equalTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT}.${TimelineEventEntityFields.ROOT.IS_USELESS}", true)
+            equalTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.IS_USELESS}", true)
             needOr = true
         }
         if (settings.filters.filterEdits) {
             if (needOr) or()
-            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT}.${TimelineEventEntityFields.ROOT.CONTENT}", TimelineEventFilter.Content.EDIT)
+            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.CONTENT}", TimelineEventFilter.Content.EDIT)
             or()
-            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT}.${TimelineEventEntityFields.ROOT.CONTENT}", TimelineEventFilter.Content.RESPONSE)
+            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.CONTENT}", TimelineEventFilter.Content.RESPONSE)
             needOr = true
         }
         if (settings.filters.filterRedacted) {
             if (needOr) or()
-            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT}.${TimelineEventEntityFields.ROOT.UNSIGNED_DATA}", TimelineEventFilter.Unsigned.REDACTED)
+            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.UNSIGNED_DATA}", TimelineEventFilter.Unsigned.REDACTED)
         }
         endGroup()
         return this

From 4465d87eb825674348104491cac1e552d79bf281 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:27:17 +0000
Subject: [PATCH 046/578] Bump browser from 1.2.0 to 1.3.0

Bumps browser from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 08dadf6745..c8fbc20cee 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -382,7 +382,7 @@ dependencies {
     implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
 
     // Custom Tab
-    implementation 'androidx.browser:browser:1.2.0'
+    implementation 'androidx.browser:browser:1.3.0'
 
     // Passphrase strength helper
     implementation 'com.nulab-inc:zxcvbn:1.4.0'

From dd3a395d11125e644d1974a220bc4d6a246894d8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sun, 21 Feb 2021 16:11:49 +0100
Subject: [PATCH 047/578] Fix compilation issue after upgrade of browser from
 1.2.0 to 1.3.0

---
 .../core/utils/ExternalApplicationsUtil.kt    | 28 ++++++++++++-------
 .../vector/app/features/themes/ThemeUtils.kt  |  8 ++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index 45db8ea91d..fa1c50f419 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -33,14 +33,15 @@ import android.provider.Settings
 import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
+import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.browser.customtabs.CustomTabsSession
-import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.content.getSystemService
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.themes.ThemeUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -92,17 +93,24 @@ fun openUrlInExternalBrowser(context: Context, uri: Uri?) {
  * If several compatible browsers are installed, the user will be proposed to choose one.
  * Ref: https://developer.chrome.com/multidevice/android/customtabs
  */
-fun openUrlInChromeCustomTab(context: Context, session: CustomTabsSession?, url: String) {
+fun openUrlInChromeCustomTab(context: Context,
+                             session: CustomTabsSession?,
+                             url: String) {
     try {
         CustomTabsIntent.Builder()
-                .setToolbarColor(ContextCompat.getColor(context, R.color.riotx_background_light))
-                .apply {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                        setNavigationBarColor(ContextCompat.getColor(context, R.color.riotx_header_panel_background_light))
-                    }
-                }
-                .setNavigationBarColor(ContextCompat.getColor(context, R.color.riotx_background_light))
-                .setColorScheme(CustomTabsIntent.COLOR_SCHEME_LIGHT)
+                .setDefaultColorSchemeParams(
+                        CustomTabColorSchemeParams.Builder()
+                                .setToolbarColor(ThemeUtils.getColor(context, R.attr.riotx_background))
+                                .setNavigationBarColor(ThemeUtils.getColor(context, R.attr.riotx_background))
+                                .build()
+                )
+                .setColorScheme(
+                        when {
+                            ThemeUtils.isSystemTheme(context) -> CustomTabsIntent.COLOR_SCHEME_SYSTEM
+                            ThemeUtils.isLightTheme(context)  -> CustomTabsIntent.COLOR_SCHEME_LIGHT
+                            else                              -> CustomTabsIntent.COLOR_SCHEME_DARK
+                        }
+                )
                 // Note: setting close button icon does not work
                 .setCloseButtonIcon(BitmapFactory.decodeResource(context.resources, R.drawable.ic_back_24dp))
                 .setStartAnimations(context, R.anim.enter_fade_in, R.anim.exit_fade_out)
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index 0856ac4b35..3bf58ab709 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -59,6 +59,14 @@ object ThemeUtils {
         setApplicationTheme(context, theme)
     }
 
+    /**
+     * @return true if current theme is System
+     */
+    fun isSystemTheme(context: Context): Boolean {
+        val theme = getApplicationTheme(context)
+        return theme == SYSTEM_THEME_VALUE
+    }
+
     /**
      * @return true if current theme is Light or current theme is System and system theme is light
      */

From 76923ad88a71e70b1e5ba74644e4079698a88b72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 10:27:05 +0000
Subject: [PATCH 048/578] Bump alerter from 5.1.2 to 7.0.1

Bumps [alerter](https://github.com/Tapadoo/Alerter) from 5.1.2 to 7.0.1.
- [Release notes](https://github.com/Tapadoo/Alerter/releases)
- [Changelog](https://github.com/Tapadoo/Alerter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Tapadoo/Alerter/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index c8fbc20cee..2c5dc01e37 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -388,7 +388,7 @@ dependencies {
     implementation 'com.nulab-inc:zxcvbn:1.4.0'
 
     //Alerter
-    implementation 'com.tapadoo.android:alerter:5.1.2'
+    implementation 'com.tapadoo.android:alerter:7.0.1'
 
     implementation 'com.otaliastudios:autocomplete:1.1.0'
 

From f617a8d77f1732ab47a444a0e5e9ba1a1324101a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sun, 21 Feb 2021 16:20:57 +0100
Subject: [PATCH 049/578] Fix compilation issue after upgrade of alerter from
 5.1.2 to 7.0.1

---
 .../main/java/im/vector/app/features/popup/PopupAlertManager.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 6952d5f653..67ef0514f2 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -99,7 +99,7 @@ class PopupAlertManager @Inject constructor() {
         // we want to remove existing popup on previous activity and display it on new one
         if (currentAlerter != null) {
             weakCurrentActivity?.get()?.let {
-                Alerter.clearCurrent(it)
+                Alerter.clearCurrent(it, null)
                 if (currentAlerter?.isLight == false) {
                     setLightStatusBar()
                 }

From d444e91ba8bc7baf066ce0e6e0caaf9eadb37251 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Feb 2021 23:10:37 +0000
Subject: [PATCH 050/578] Bump kotlin_version from 1.4.21 to 1.4.30

Bumps `kotlin_version` from 1.4.21 to 1.4.30.

Updates `kotlin-gradle-plugin` from 1.4.21 to 1.4.30

Updates `kotlin-stdlib-jdk7` from 1.4.21 to 1.4.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.21...v1.4.30)

Updates `kotlin-stdlib` from 1.4.21 to 1.4.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.21...v1.4.30)

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 18a0564943..9c1a912924 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     // Ref: https://kotlinlang.org/releases.html
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.4.30'
     ext.kotlin_coroutines_version = "1.4.1"
     repositories {
         google()

From 88964d8cf7ff1f247c5441d3d8103c8102eec14a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sun, 21 Feb 2021 16:24:40 +0100
Subject: [PATCH 051/578] Also bump kotlin_coroutines_version to recommended
 version 1.4.2

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9c1a912924..5f4650ee23 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     // Ref: https://kotlinlang.org/releases.html
     ext.kotlin_version = '1.4.30'
-    ext.kotlin_coroutines_version = "1.4.1"
+    ext.kotlin_coroutines_version = "1.4.2"
     repositories {
         google()
         jcenter()

From ef3d8f365acfbc2a0dbf3b755dcb24a93b14cbf6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sun, 21 Feb 2021 16:52:19 +0100
Subject: [PATCH 052/578] Changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index b67e33f9ad..811347934d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@ SDK API changes ⚠️:
  -
 
 Build 🧱:
- -
+ - Update a lot of dependencies, with the help of dependabot.
 
 Test:
  -

From a348571e325e5f40e17f4ade1a01ecb5ddac83ab Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathandejong02@gmail.com>
Date: Sun, 21 Feb 2021 19:19:46 +0100
Subject: [PATCH 053/578] Fix spelling

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3464fd9e76..dd32991051 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ To create a new screen:
 - Then right click on the package, and select `New/New Vector/RiotX Feature`.
 - Follow the Wizard, especially replace `Main` by something more relevant to your feature.
 - Click on `Finish`.
-- Remaining steps are described as TODO in the generated files, or will be pointed out by the compilator, or at runtime :)
+- Remaining steps are described as TODO in the generated files, or will be pointed out by the compiler, or at runtime :)
 
 Note that if the templates are modified, the only things to do is to restart Android Studio for the change to take effect.
 

From bebb9560053e08ec072deff452b05f95ac443c2d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Feb 2021 17:44:11 +0100
Subject: [PATCH 054/578] Try to fix crash about UrlPreview (#2640)

---
 CHANGES.md                                            |  2 +-
 .../features/home/room/detail/RoomDetailViewModel.kt  |  4 ++--
 .../room/detail/timeline/url/PreviewUrlRetriever.kt   | 11 +++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 46057a37ec..4c87e88e47 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831)
 
 Bugfix 🐛:
- -
+ - Try to fix crash about UrlPreview (#2640)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index c7a5873a65..601891b15a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -132,7 +132,7 @@ class RoomDetailViewModel @AssistedInject constructor(
     val timeline = room.createTimeline(eventId, timelineSettings)
 
     // Same lifecycle than the ViewModel (survive to screen rotation)
-    val previewUrlRetriever = PreviewUrlRetriever(session)
+    val previewUrlRetriever = PreviewUrlRetriever(session, viewModelScope)
 
     // Slot to keep a pending action during permission request
     var pendingAction: RoomDetailAction? = null
@@ -1425,7 +1425,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                 snapshot
                         .takeIf { state.asyncRoomSummary.invoke()?.isEncrypted == false }
                         ?.forEach {
-                            previewUrlRetriever.getPreviewUrl(it, viewModelScope)
+                            previewUrlRetriever.getPreviewUrl(it)
                         }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
index 54d5fd9eb3..df75c0094b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
@@ -16,17 +16,17 @@
 
 package im.vector.app.features.home.room.detail.timeline.url
 
-import android.os.Handler
-import android.os.Looper
 import im.vector.app.BuildConfig
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.cache.CacheStrategy
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLatestEventId
 
-class PreviewUrlRetriever(session: Session) {
+class PreviewUrlRetriever(session: Session,
+                          private val coroutineScope: CoroutineScope) {
     private val mediaService = session.mediaService()
 
     private data class EventIdPreviewUrlUiState(
@@ -38,12 +38,11 @@ class PreviewUrlRetriever(session: Session) {
     // Keys are the main eventId
     private val data = mutableMapOf<String, EventIdPreviewUrlUiState>()
     private val listeners = mutableMapOf<String, MutableSet<PreviewUrlRetrieverListener>>()
-    private val uiHandler = Handler(Looper.getMainLooper())
 
     // In memory list
     private val blockedUrl = mutableSetOf<String>()
 
-    fun getPreviewUrl(event: TimelineEvent, coroutineScope: CoroutineScope) {
+    fun getPreviewUrl(event: TimelineEvent) {
         val eventId = event.root.eventId ?: return
         val latestEventId = event.getLatestEventId()
 
@@ -115,7 +114,7 @@ class PreviewUrlRetriever(session: Session) {
     private fun updateState(eventId: String, latestEventId: String, state: PreviewUrlUiState) {
         data[eventId] = EventIdPreviewUrlUiState(latestEventId, state)
         // Notify the listener
-        uiHandler.post {
+        coroutineScope.launch(Dispatchers.Main) {
             listeners[eventId].orEmpty().forEach {
                 it.onStateUpdated(state)
             }

From 24c5e727cead45e04cbe0916fe06f44484cb62c6 Mon Sep 17 00:00:00 2001
From: gradle-update-robot <gradle-update-robot@regolo.cc>
Date: Tue, 23 Feb 2021 00:48:50 +0000
Subject: [PATCH 055/578] Update Gradle Wrapper from 6.8.2 to 6.8.3.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 gradle/wrapper/gradle-wrapper.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 30d5f428d7..6e61ea7487 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Fri Jan 29 18:05:42 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=1433372d903ffba27496f8d5af24265310d2da0d78bf6b4e5138831d4fe066e9
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 6b55960c92ca209fcfab8b2d37b2ceb60fad52da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexia=20=C5=ACerner?= <jadedctrl@teknik.io>
Date: Mon, 22 Feb 2021 22:24:02 +0000
Subject: [PATCH 056/578] Translated using Weblate (Esperanto)

Currently translated at 92.3% (1922 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
---
 vector/src/main/res/values-eo/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 776dbdf076..6ac0b9ce47 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -845,7 +845,7 @@
     <string name="settings_discovery_no_mails">Elektebloj pri trovado aperos post aldono de retpoŝtadreso.</string>
     <string name="settings_discovery_emails_title">Troveblaj retpoŝtadresoj</string>
     <string name="settings_discovery_identity_server_info_none">Vi nun ne uzas identigan servilon. Por trovi kaj troviĝi de jamaj kontaktoj, kiujn vi konas, agordu tian servilon sube.</string>
-    <string name="settings_discovery_identity_server_info">Vi nun uzas %1$s por trovi kaj troviĝi de jamaj kontaktoj, kiujn vi trovas.</string>
+    <string name="settings_discovery_identity_server_info">Vi nun uzas %1$s por trovi kaj troviĝi de jamaj kontaktoj, kiujn vi konas.</string>
     <string name="change_identity_server">Ŝanĝi identigan servilon</string>
     <string name="add_identity_server">Agordi identigan servilon</string>
     <string name="disconnect_identity_server">Malkonekti identigan servilon</string>
@@ -1186,7 +1186,7 @@
 \nSe vi ne salutis alian salutaĵon, malatentu ĉi tiun peton.</string>
     <string name="your_unverified_device_requesting">Via nekontrolita salutaĵo «%s» petas ĉifrajn ŝlosilojn.</string>
     <string name="you_added_a_new_device">Vi aldonis novan salutaĵon «%s», kiu petas ĉifrajn ŝlosilojn.</string>
-    <string name="widget_integration_review_terms">Por daŭrigi vi bezonas akcepti la uzokondiĉojn de tiu ĉi servo.</string>
+    <string name="widget_integration_review_terms">Por daŭrigi vi devas akcepti la uzokondiĉojn de tiu ĉi servo.</string>
     <string name="settings_labs_enable_send_voice_summary">Ĉi tiu elekteblo postulas aplikaĵon de ekstera liveranto por registri la mesaĝojn.</string>
     <string name="settings_labs_enable_send_voice">Sendi voĉmesaĝojn</string>
     <string name="settings_labs_keyboard_options_to_send_message">Uzi enigan klavon por sendi mesaĝon</string>

From d062a23d857fe0fba6503cbeaa231bb29e1e0253 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 22 Feb 2021 18:46:50 +0000
Subject: [PATCH 057/578] Translated using Weblate (Esperanto)

Currently translated at 92.3% (1922 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
---
 vector/src/main/res/values-eo/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 6ac0b9ce47..51c0c4ee50 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -2169,4 +2169,21 @@
     <string name="autodiscover_well_known_autofill_dialog_message">Element trovis propran servilan agordaron per la retnomo «%1$s» el via identigilo de uzanto:
 \n%2$s</string>
     <string name="autodiscover_invalid_response">Nevalidas hejmservil-serĉanta respondo</string>
+    <string name="room_permissions_notice">Elektu la rolojn bezonatajn por ŝanĝi diversajn partojn de la ĉambro</string>
+    <string name="room_permissions_title">Permesoj</string>
+    <string name="room_settings_permissions_subtitle">Montri kaj ĝisdatigi la rolojn bezonatajn por ŝanĝi diversajn partojn de la ĉambro.</string>
+    <string name="room_participants_leave_private_warning">Ĉi tiu ĉambro ne estas publika. Vi ne povos re-aliĝi sen invito.</string>
+    <string name="permissions_denied_add_contact">Permesi aliron al viaj kontaktoj.</string>
+    <string name="permissions_denied_qr_code">Por skani rapidrespondan kodon, vi bezonas permesi aliron al filmilo.</string>
+    <string name="call_held_by_you">Vi paŭzigis la vokon</string>
+    <string name="call_held_by_user">%s paŭzigis la vokon</string>
+    <string name="call_hold_action">Paŭzigi</string>
+    <string name="call_resume_action">Daŭrigi</string>
+    <string name="send_bug_report_include_key_share_history">Sendi historion de petoj havigi ŝlosilojn</string>
+    <string name="no_more_results">Neniu pliaj rezultoj</string>
+    <string name="action_return">Reiri</string>
+    <string name="action_unpublish">Malpublikigi</string>
+    <string name="action_add">Aldoni</string>
+    <string name="start_chatting">Ekbabili</string>
+    <string name="system_theme">Implicita de sistemo</string>
 </resources>
\ No newline at end of file

From 316bcd728e99bb8887d962fdb42bece3057c6156 Mon Sep 17 00:00:00 2001
From: Martin Johansen <hdsumo@protonmail.ch>
Date: Mon, 22 Feb 2021 16:04:23 +0000
Subject: [PATCH 058/578] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 69.4% (1445 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 400 +++++++++++++++++-
 1 file changed, 397 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index f84414ced6..c9161369cb 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -121,7 +121,7 @@
         <item quantity="other">%dt</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="one">1d</item>
+        <item quantity="one">%dd</item>
         <item quantity="other">%dd</item>
     </plurals>
     <string name="room_participants_create">Lag</string>
@@ -934,7 +934,7 @@
     <string name="alert_push_are_disabled_description">Gjennomgå innstillingene dine for å aktivere push-varsler</string>
     <plurals name="wrong_pin_message_remaining_attempts">
         <item quantity="one">Feil kode, %d gjenværende forsøk</item>
-        <item quantity="other">Feil kode, %d gjenværende forsøk</item>
+        <item quantity="other">Feil kode, %d gjenværende forsøker</item>
     </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Advarsel! Siste gjenværende forsøk før avlogging!</string>
     <string name="too_many_pin_failures">For mange feil, du er logget ut</string>
@@ -1022,7 +1022,7 @@
     <string name="room_settings_all_messages_noisy">Alle meldinger (støyende)</string>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s rom funnet for %2$s</item>
-        <item quantity="other">%1$s rom funnet for %2$s</item>
+        <item quantity="other">%1$s rommer funnet for %2$s</item>
     </plurals>
     <string name="directory_search_results_title">Bla gjennom katalogen</string>
     <string name="room_recents_join_room_prompt">Skriv inn et rom-ID eller et romalias</string>
@@ -1170,4 +1170,398 @@
 \n
 \nMerk at denne handlingen starter appen på nytt, og det kan ta litt tid.</string>
     <string name="room_participants_invite_prompt_msg">Er du sikker på at du vil invitere %s til denne chatten\?</string>
+    <string name="call_error_user_not_responding">ekstern side kunne ikke plukke opp.</string>
+    <string name="video_call_in_progress">Videoanrop i prosess…</string>
+    <string name="call_in_progress">Anrop i prosess…</string>
+    <string name="sas_error_m_user">Brukeren kansellerte bekreftelsen</string>
+    <string name="identity_server_not_defined_for_password_reset">Ingen identitetsserver er konfigurert, det er nødvendig å tilbakestille passordet ditt.</string>
+    <string name="error_user_already_logged_in">Det ser ut til at du prøver å koble til en annen hjemmeserver. Vil du logge av\?</string>
+    <string name="room_list_empty">Bli med i et rom for å begynne å bruke appen.</string>
+    <string name="room_list_catchup_empty_body">Du har ikke flere uleste meldinger</string>
+    <string name="room_list_catchup_welcome_title">Velkommen hjem!</string>
+    <string name="room_list_people_empty_body">Dine direktemeldingssamtaler vises her. Trykk på + nederst til høyre for å starte noen.</string>
+    <string name="room_list_rooms_empty_body">Rommene dine vises her. Trykk på + nederst til høyre for å finne eksisterende eller starte noen av dine egne.</string>
+    <string name="reactions_agree">Godta</string>
+    <string name="message_view_reaction">Se reaksjoner</string>
+    <string name="event_redacted_by_user_reason">Arrangement slettet av bruker</string>
+    <string name="last_edited_info_message">Sist redigert av %1$s på %2$s</string>
+    <string name="error_no_network">Ingen nettverk. Kontroller Internett-tilkoblingen din.</string>
+    <string name="change_room_directory_network">Bytt nettverk</string>
+    <string name="room_preview_no_preview">Dette rommet kan ikke forhåndsvises</string>
+    <string name="room_preview_no_preview_join">Dette rommet kan ikke forhåndsvises. Vil du bli med på det\?</string>
+    <string name="create_room_action_create">OPPRETT</string>
+    <string name="create_room_name_section">Romnavn</string>
+    <string name="create_room_topic_section">Romemne (valgfritt)</string>
+    <string name="create_room_topic_hint">Emne</string>
+    <string name="create_room_public_description">Alle vil være med på dette rommet</string>
+    <string name="create_room_settings_section">Rominnstillinger</string>
+    <string name="settings_other_third_party_notices">Andre tredjepartsmeldinger</string>
+    <string name="navigate_to_room_when_already_in_the_room">Du ser allerede på dette rommet!</string>
+    <string name="send_suggestion_content">Vennligst skriv ditt forslag nedenfor.</string>
+    <string name="send_suggestion_report_placeholder">Beskriv ditt forslag her</string>
+    <string name="send_suggestion_sent">Takk, forslaget er sendt</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Vis fullstendig historie i krypterte rom</string>
+    <string name="send_file_step_encrypting_thumbnail">Krypterer miniatyrbilde…</string>
+    <string name="downloading_file">Laster ned fil %1$s…</string>
+    <string name="downloaded_file">Filen %1$s er lastet ned!</string>
+    <string name="no_message_edits_found">Ingen endringer funnet</string>
+    <string name="room_filtering_footer_title">Finner du ikke det du leter etter\?</string>
+    <string name="room_filtering_footer_create_new_direct_message">Send en ny direkte melding</string>
+    <string name="user_directory_search_hint">Søk etter navn eller ID</string>
+    <string name="labs_swipe_to_reply_in_timeline">Aktiver sveip for å svare på tidslinjen</string>
+    <string name="link_copied_to_clipboard">Link kopiert til utklippstavlen</string>
+    <string name="add_by_matrix_id">Legg til etter matrix-ID</string>
+    <string name="qr_code">QR kode</string>
+    <string name="add_by_qr_code">Legg til med QR-kode</string>
+    <string name="creating_direct_room">Oppretter rom…</string>
+    <string name="direct_room_no_known_users">Ingen resultater funnet, bruk Legg til etter matrix-ID for å søke på serveren.</string>
+    <string name="direct_room_start_search">Begynn å skrive for å få resultater</string>
+    <string name="direct_room_user_list_recent_title">Nylig</string>
+    <string name="direct_room_user_list_known_title">Kjente brukere</string>
+    <string name="direct_room_user_list_contacts_title">Kontakter</string>
+    <string name="direct_room_user_list_suggestions_title">Forslag</string>
+    <string name="review_terms">Gjennomgå vilkårene</string>
+    <string name="terms_description_for_identity_server">Vær oppdagelig av andre</string>
+    <string name="add_identity_server">Konfigurer identitetsserver</string>
+    <string name="settings_discovery_identity_server_info_none">Du bruker for øyeblikket ikke en identitetsserver. For å oppdage og bli oppdaget av eksisterende kontakter du kjenner, konfigurer du en nedenfor.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Hvis du kobler fra identitetsserveren din, vil du ikke kunne oppdages av andre brukere, og du vil ikke kunne invitere andre via e-post eller telefon.</string>
+    <string name="settings_discovery_msisdn_title">Synlige telefonnumre</string>
+    <string name="settings_discovery_confirm_mail">Vi sendte deg en bekreftelses-e-post til %s, sjekk e-posten din og klikk på bekreftelseskoblingen</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Vi sendte deg en bekreftelses-e-post til %s. Sjekk først e-posten din og klikk på bekreftelseskoblingen</string>
+    <string name="settings_discovery_consent_title">Send e-post og telefonnummer</string>
+    <string name="settings_discovery_consent_notice_on">Du har gitt ditt samtykke til å sende e-post og telefonnummer til denne identitetsserveren for å oppdage andre brukere fra kontaktene dine.</string>
+    <string name="settings_discovery_consent_notice_off">Du har ikke gitt ditt samtykke til å sende e-post og telefonnummer til denne identitetsserveren for å oppdage andre brukere fra kontaktene dine.</string>
+    <string name="settings_discovery_consent_action_revoke">Opphev mitt samtykke</string>
+    <string name="settings_discovery_consent_action_give_consent">Gi samtykke</string>
+    <string name="identity_server_consent_dialog_title">Send e-post og telefonnummer</string>
+    <string name="settings_discovery_bad_identity_server">Kunne ikke koble til identitetsserveren</string>
+    <string name="settings_discovery_please_enter_server">Vennligst skriv inn nettadressen til identitetsserveren</string>
+    <string name="settings_discovery_no_terms">Identitetsserveren du har valgt har ingen tjenestevilkår. Fortsett bare hvis du stoler på eieren av tjenesten</string>
+    <string name="settings_text_message_sent">En tekstmelding er sendt til %s. Vennligst skriv inn bekreftelseskoden den inneholder.</string>
+    <string name="settings_text_message_sent_hint">Kode</string>
+    <string name="settings_text_message_sent_wrong_code">Bekreftelseskoden er ikke riktig.</string>
+    <string name="settings_agree_to_terms">Godta vilkårene for identitetsserveren (%s) for å la deg bli oppdaget via e-postadresse eller telefonnummer.</string>
+    <string name="error_terms_not_accepted">Prøv på nytt når du har godtatt vilkårene til hjemmeserveren din.</string>
+    <string name="error_network_timeout">Ser ut som det tar for lang tid å svare på serveren, dette kan skyldes enten dårlig tilkobling eller en feil med serveren. Prøv igjen om en stund.</string>
+    <string name="a11y_create_menu_open">Åpne menyen for opprett rom</string>
+    <string name="a11y_create_menu_close">Lukk menyen for opprett rom…</string>
+    <string name="a11y_create_direct_message">Lag en ny direkte samtale</string>
+    <string name="a11y_create_direct_message_by_mxid">Lag en ny direkte samtale etter Matrix ID</string>
+    <string name="a11y_create_direct_message_by_qr_code">Opprett en ny direkte samtale ved å skanne en QR-kode</string>
+    <string name="a11y_jump_to_bottom">Gå til bunnen</string>
+    <string name="error_attachment">Det oppstod en feil under henting av vedlegget.</string>
+    <string name="attachment_type_dialog_title">Legg til bilde fra</string>
+    <string name="rotate_and_crop_screen_title">Roter og beskjær</string>
+    <string name="error_handling_incoming_share">Kunne ikke håndtere delingsdata</string>
+    <string name="attachment_viewer_item_x_of_y">%1$d av %2$d</string>
+    <string name="uploads_media_no_result">Det er ingen medier i dette rommet</string>
+    <string name="uploads_files_no_result">Det er ingen filer i dette rommet</string>
+    <string name="report_content_custom">Tilpasset rapport…</string>
+    <string name="report_content_custom_title">Rapporter dette innholdet</string>
+    <string name="report_content_custom_hint">Årsak til å rapportere dette innholdet</string>
+    <string name="report_content_custom_submit">RAPPORTERE</string>
+    <string name="content_reported_title">Innhold rapportert</string>
+    <string name="content_reported_content">Dette innholdet ble rapportert.
+\n
+\nHvis du ikke vil se mer innhold fra denne brukeren, kan du ignorere dem for å skjule meldingene sine.</string>
+    <string name="content_reported_as_spam_title">Rapportert som spam</string>
+    <string name="content_reported_as_spam_content">Dette innholdet ble rapportert som spam.
+\n
+\nHvis du ikke vil se mer innhold fra denne brukeren, kan du ignorere dem for å skjule meldingene sine.</string>
+    <string name="content_reported_as_inappropriate_title">Rapportert som upassende</string>
+    <string name="content_reported_as_inappropriate_content">Dette innholdet ble rapportert som upassende.
+\n
+\nHvis du ikke vil se mer innhold fra denne brukeren, kan du ignorere dem for å skjule meldingene sine.</string>
+    <string name="no_network_indicator">Det er ingen nettverkstilkobling akkurat nå</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">Alle meldinger (støyende)</string>
+    <string name="room_list_quick_actions_favorite_add">Legg til i favoritter</string>
+    <string name="room_list_quick_actions_favorite_remove">Fjern fra favoritter</string>
+    <string name="room_list_quick_actions_low_priority_add">Legg til lav prioritet</string>
+    <string name="room_list_quick_actions_low_priority_remove">Fjern fra lav prioritet</string>
+    <string name="notice_member_no_changes">%1$s gjorde ingen endringer</string>
+    <string name="reaction_search_type_hint">Skriv inn nøkkelord for å finne en reaksjon.</string>
+    <string name="room_join_rules_public">%1$s gjorde rommet offentlig for den som kjenner lenken.</string>
+    <string name="room_join_rules_public_by_you">Du gjorde rommet offentlig for den som kjenner lenken.</string>
+    <string name="login_connect_to_a_custom_server">Koble til en tilpasset server</string>
+    <string name="login_server_url_form_other_notice">Skriv inn adressen til en server eller et Element du vil koble til</string>
+    <string name="login_server_url_form_common_notice">Skriv inn adressen til serveren du vil bruke</string>
+    <string name="login_reset_password_warning_content">Hvis du endrer passordet, tilbakestilles alle krypteringsnøkler fra ende-til-ende på alle øktene dine, noe som gjør kryptert chatlogg uleselig. Konfigurer sikkerhetskopiering av nøkkel eller eksporter romnøklene fra en annen økt før du tilbakestiller passordet.</string>
+    <string name="login_reset_password_success_notice_2">Du er logget ut av alle økter og vil ikke lenger motta push-varsler. Logg på igjen på hver enhet for å aktivere varsler på nytt.</string>
+    <string name="login_reset_password_cancel_confirmation_content">Passordet ditt er ikke endret ennå.
+\n
+\nStoppe passordendringsprosessen\?</string>
+    <string name="login_signup_cancel_confirmation_content">Kontoen din er ikke opprettet ennå.
+\n
+\nStoppe registreringsprosessen\?</string>
+    <string name="login_a11y_choose_other">Velg en tilpasset hjemmeserver</string>
+    <string name="login_a11y_captcha_container">Vennligst utfør captcha-utfordringen</string>
+    <string name="login_wait_for_email_notice">Vi har nettopp sendt en e-post til %1$s.
+\nKlikk på lenken den inneholder for å fortsette opprettelsen av kontoen.</string>
+    <string name="login_validation_code_is_not_correct">Den angitte koden er ikke riktig. Vennligst sjekk.</string>
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="one">Det er sendt for mange forespørsler. Du kan prøve på nytt %1$d sekund…</item>
+        <item quantity="other">Det er sendt for mange forespørsler. Du kan prøve på nytt %1$d sekunder…</item>
+    </plurals>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Dette er ikke en gyldig brukeridentifikator. Forventet format: \'@bruker:homeserver.org\'</string>
+    <string name="soft_logout_signin_e2e_warning_notice">Logg på for å gjenopprette krypteringsnøkler som er lagret eksklusivt på denne enheten. Du trenger dem for å lese alle dine sikre meldinger på hvilken som helst enhet.</string>
+    <string name="soft_logout_clear_data_title">Fjern personlige data</string>
+    <string name="permalink_malformed">Linken din til matrix.to var feil</string>
+    <string name="bug_report_error_too_short">Beskrivelsen er for kort</string>
+    <string name="autocomplete_limited_results">Viser bare de første resultatene, skriv flere bokstaver…</string>
+    <string name="hide_advanced">Skjul avansert</string>
+    <string name="show_advanced">Vis avansert</string>
+    <string name="verification_sent">Bekreftelse sendt</string>
+    <string name="notice_member_no_changes_by_you">Du gjorde ingen endringer</string>
+    <string name="login_splash_title">Det er samtalen din. Ei det.</string>
+    <string name="login_splash_text1">Chat med folk direkte eller i grupper</string>
+    <string name="login_splash_text2">Hold samtaler private med kryptering</string>
+    <string name="login_server_text">Akkurat som e-post har kontoer ett hjem, selv om du kan snakke med hvem som helst</string>
+    <string name="login_server_matrix_org_text">Bli med millioner gratis på den største offentlige serveren</string>
+    <string name="login_social_continue">Eller</string>
+    <string name="login_social_continue_with">Fortsett med %s</string>
+    <string name="login_social_signup_with">Registrer deg med %s</string>
+    <string name="login_social_signin_with">Logg inn med %s</string>
+    <string name="login_signin_to">Logg på %1$s</string>
+    <string name="login_clear_homeserver_history">Slett logg</string>
+    <string name="login_sso_error_message">Det oppsto en feil under innlasting av siden: %1$s (%2$d)</string>
+    <string name="login_registration_disabled">Beklager, denne tjeneren godtar ikke nye kontoer.</string>
+    <string name="login_login_with_email_error">Denne e-postadressen er ikke tilknyttet noen konto.</string>
+    <string name="login_reset_password_notice">En bekreftelses-e-post vil bli sendt til innboksen din for å bekrefte innstillingen av ditt nye passord.</string>
+    <string name="login_reset_password_error_not_found">Denne e-postadressen er ikke knyttet til noen konto</string>
+    <string name="login_reset_password_mail_confirmation_notice">En bekreftelses-e-post ble sendt til %1$s.</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Trykk på lenken for å bekrefte det nye passordet ditt. Når du har fulgt lenken den inneholder, klikker du nedenfor.</string>
+    <string name="login_reset_password_success_submit">Tilbake til Logg inn</string>
+    <string name="login_set_email_notice">Angi en e-post for å gjenopprette kontoen din. Senere, kan du eventuelt la folk du kjenner oppdage deg via e-posten din.</string>
+    <string name="login_set_msisdn_notice">Angi et telefonnummer slik at folk du kjenner kan oppdage deg.</string>
+    <string name="login_set_msisdn_notice2">Vennligst bruk det internasjonale formatet.</string>
+    <string name="login_msisdn_confirm_notice">Vi har nettopp sendt en kode til %1$s. Skriv det inn nedenfor for å bekrefte at det er deg.</string>
+    <string name="login_msisdn_confirm_send_again">Send igjen</string>
+    <string name="login_msisdn_notice">Vennligst bruk det internasjonale formatet (telefonnummeret må starte med \'+\')</string>
+    <string name="login_msisdn_error_not_international">Internasjonale telefonnumre må starte med \'+\'</string>
+    <string name="login_msisdn_error_other">Telefonnummeret virker ugyldig. Vennligst sjekk det</string>
+    <string name="login_a11y_choose_matrix_org">Velg matrix.org</string>
+    <string name="login_a11y_choose_modular">Velg Element Matrix Services</string>
+    <string name="login_connect_using_matrix_id_notice">Alternativt, hvis du allerede har en konto og du kjenner din Matrix-identifikator og passordet ditt, kan du bruke denne metoden:</string>
+    <string name="login_connect_using_matrix_id_submit">Logg på med Matrix ID</string>
+    <string name="login_signin_matrix_id_notice">Hvis du oppretter en konto på en hjemmeserver, bruker du Matrix-ID (f.eks. @Bruker:domene.com) og passord nedenfor.</string>
+    <string name="login_signin_matrix_id_title">Logg på med Matrix ID</string>
+    <string name="login_signin_matrix_id_password_notice">Hvis du ikke vet passordet ditt, kan du gå tilbake for å tilbakestille det.</string>
+    <string name="signed_out_submit">Logg på igjen</string>
+    <string name="soft_logout_clear_data_dialog_title">Slett data</string>
+    <string name="soft_logout_clear_data_dialog_content">Vil du slette alle data som er lagret på denne enheten\?
+\nLogg på igjen for å få tilgang til kontodataene og meldingene dine.</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Du mister tilgangen til sikre meldinger med mindre du logger på for å gjenopprette krypteringsnøklene.</string>
+    <string name="soft_logout_clear_data_dialog_submit">Slett data</string>
+    <string name="devices_other_devices">Andre økter</string>
+    <string name="rageshake_detected">Riste oppdaget!</string>
+    <string name="settings_developer_mode_fail_fast_summary">Element kan krasje oftere når en uventet feil oppstår</string>
+    <string name="create_room_alias_hint">Romadresse</string>
+    <string name="create_room_alias_already_in_use">Denne adressen er allerede i bruk</string>
+    <string name="create_room_alias_empty">Oppgi romadresse</string>
+    <string name="create_room_alias_invalid">Noen tegn er ikke tillatt</string>
+    <string name="create_room_in_progress">Oppretter rom…</string>
+    <string name="verification_conclusion_warning">Ikke klarert pålogging</string>
+    <string name="verify_user_sas_emoji_security_tip">For ytterligere sikkerhet, bruk et annet pålitelig kommunikasjonsmiddel eller gjør dette personlig.</string>
+    <string name="verification_green_shield">Se etter det grønne skjoldet for å sikre at en bruker er klarert. Stol på alle brukere i et rom for å sikre at rommet er sikkert.</string>
+    <string name="sent_a_reaction">Reagerte med: %s</string>
+    <string name="verification_request_other_cancelled">%s avbrutt</string>
+    <string name="verification_request_other_accepted">%s akseptert</string>
+    <string name="verification_scan_notice">Skann koden med den andre brukerens enhet for å verifisere hverandre på en sikker måte</string>
+    <string name="verification_scan_emoji_title">Kan ikke skanne</string>
+    <string name="verification_scan_their_code">Skann koden deres</string>
+    <string name="verification_request_waiting_for">Venter på %s…</string>
+    <string name="room_profile_not_encrypted_subtitle">Meldinger i dette rommet er ikke kryptert fra ende-til-ende.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Meldinger her er ikke kryptert fra ende-til-ende.</string>
+    <string name="room_profile_encrypted_subtitle">Meldinger i dette rommet er kryptert fra ende-til-ende.
+\n
+\nMeldingene dine er sikret med låser, og bare du og mottakeren har de unike nøklene for å låse dem opp.</string>
+    <string name="direct_room_profile_encrypted_subtitle">Meldinger her er kryptert fra ende-til-ende.
+\n
+\nMeldingene dine er sikret med låser, og bare du og mottakeren har de unike nøklene for å låse dem opp.</string>
+    <string name="room_profile_section_more_settings">Rominnstillinger</string>
+    <string name="direct_room_profile_section_more_settings">Innstillinger</string>
+    <string name="direct_room_profile_section_more_leave">Forlat</string>
+    <string name="room_member_power_level_admins">Administratorer</string>
+    <string name="room_member_power_level_admin_in">Administrator i %1$s</string>
+    <string name="room_member_power_level_moderator_in">Moderator i %1$s</string>
+    <string name="room_member_power_level_default_in">Standard i %1$s</string>
+    <string name="room_member_open_or_create_dm">Direkte melding</string>
+    <string name="room_list_sharing_header_recent_rooms">Nylige rom</string>
+    <string name="room_list_sharing_header_other_rooms">Andre rom</string>
+    <string name="room_settings_enable_encryption">Aktiver end-to-end-kryptering…</string>
+    <string name="room_settings_enable_encryption_no_permission">Du har ikke tillatelse til å aktivere kryptering i dette rommet.</string>
+    <string name="room_settings_enable_encryption_dialog_content">Når det er aktivert, kan ikke kryptering for et rom deaktiveres. Meldinger sendt i et kryptert rom kan ikke sees av serveren, bare av deltakerne i rommet. Aktivering av kryptering kan forhindre at mange bots og broer fungerer som de skal.</string>
+    <string name="verification_request_start_notice">For å være trygg, gjør dette personlig eller bruk en annen måte å kommunisere på.</string>
+    <string name="verification_emoji_notice">Sammenlign den unike emojien, slik at de vises i samme rekkefølge.</string>
+    <string name="verification_code_notice">Sammenlign koden med den som vises på den andre brukerens skjerm.</string>
+    <string name="verification_conclusion_ok_notice">Meldinger med denne brukeren er kryptert fra ende-til-ende og kan ikke leses av tredjeparter.</string>
+    <string name="verification_conclusion_ok_self_notice">Den nye økten din er nå bekreftet. Den har tilgang til de krypterte meldingene dine, og andre brukere vil se det som pålitelig.</string>
+    <string name="settings_active_sessions_signout_device">Logg av denne økten</string>
+    <string name="settings_active_sessions_verified_device_desc">Denne økten er klarert for sikker meldingstjeneste fordi du bekreftet den:</string>
+    <string name="settings_active_sessions_unverified_device_desc">Bekreft denne økten for å merke den som klarert og gi den tilgang til krypterte meldinger. Hvis du ikke logget på denne økten, kan det hende at kontoen din er kompromittert:</string>
+    <string name="crosssigning_other_user_not_trust">Andre brukere stoler kanskje ikke på det</string>
+    <string name="complete_security">Fullstendig sikkerhet</string>
+    <string name="verification_open_other_to_verify">Bruk en eksisterende økt for å bekrefte denne, og gi den tilgang til krypterte meldinger.</string>
+    <string name="verification_profile_device_untrust_info">Inntil denne brukeren stoler på denne økten, blir meldinger sendt til og fra den merket med advarsler. Alternativt kan du bekrefte det manuelt.</string>
+    <string name="no_connectivity_to_the_server_indicator">Tilkoblingen til serveren har gått tapt</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">Flymodus er på</string>
+    <string name="settings_account_data">Kontodata</string>
+    <string name="share_confirm_room">Vil du sende dette vedlegget til %1$s\?</string>
+    <string name="delete_event_dialog_reason_checkbox">Inkluder en grunn</string>
+    <string name="login_default_session_public_name">Element Android</string>
+    <string name="new_session">Ny pålogging. Var dette deg\?</string>
+    <string name="new_session_review">Trykk for å se gjennom og bekrefte</string>
+    <string name="verify_new_session_notice">Bruk denne økten til å bekrefte den nye, og gi den tilgang til krypterte meldinger.</string>
+    <string name="verify_new_session_was_not_me">Dette var ikke meg</string>
+    <string name="verify_new_session_compromized">Kontoen din kan være kompromittert</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Hvis du avbryter, vil du ikke kunne lese krypterte meldinger på denne enheten, og andre brukere stoler ikke på det</string>
+    <string name="verify_cancel_self_verification_from_trusted">Hvis du avbryter, vil du ikke kunne lese krypterte meldinger på den nye enheten din, og andre brukere stoler ikke på det</string>
+    <string name="verify_cancelled_notice">Bekreft enhetene dine fra Innstillinger.</string>
+    <string name="verification_cancelled">Bekreftelsen avbrutt</string>
+    <string name="account_password">Bruker passord</string>
+    <string name="enter_account_password">Skriv inn %s for å fortsette.</string>
+    <string name="bootstrap_dont_reuse_pwd">Ikke bruk kontopassordet ditt.</string>
+    <string name="bootstrap_info_text_2">Skriv inn en sikkerhetsfrase bare du kjenner, brukt til å sikre hemmeligheter på serveren din.</string>
+    <string name="bootstrap_loading_text">Dette kan ta flere sekunder, vær tålmodig.</string>
+    <string name="bootstrap_finish_title">Du er ferdig!</string>
+    <string name="auth_flow_not_supported">Du kan ikke gjøre det fra mobil</string>
+    <string name="encryption_enabled_tile_description">Meldinger i dette rommet er kryptert fra ende-til-ende. Lær mer og verifiser brukere i profilen deres.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Meldinger i dette rommet er kryptert fra ende-til-ende.</string>
+    <string name="encryption_unknown_algorithm_tile_description">Kryptering som brukes av dette rommet støttes ikke</string>
+    <string name="room_created_summary_item">%s opprettet og konfigurert rommet.</string>
+    <string name="room_created_summary_item_by_you">Du opprettet og konfigurerte rommet.</string>
+    <string name="direct_room_created_summary_item">%s ble med.</string>
+    <string name="direct_room_created_summary_item_by_you">Du ble med.</string>
+    <string name="this_is_the_beginning_of_room">Dette er begynnelsen på %s.</string>
+    <string name="this_is_the_beginning_of_room_no_name">Dette er begynnelsen på denne samtalen.</string>
+    <string name="this_is_the_beginning_of_dm">Dette er begynnelsen på historien om direkte meldinger med %s.</string>
+    <string name="room_created_summary_no_topic_creation_text">%s for å fortelle folk hva dette rommet handler om.</string>
+    <string name="add_a_topic_link_text">Legg til et emne</string>
+    <string name="topic_prefix">"Emne: "</string>
+    <string name="qr_code_scanned_self_verif_notice">Nesten der! Viser den andre enheten det samme skjoldet\?</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Nesten der! Venter på bekreftelse…</string>
+    <string name="qr_code_scanned_verif_waiting">Venter på %s…</string>
+    <string name="auth_invalid_login_param_space_in_password">Feil brukernavn og/eller passord. Det angitte passordet starter eller slutter med mellomrom, sjekk det.</string>
+    <string name="auth_invalid_login_deactivated_account">Denne kontoen har blitt deaktivert.</string>
+    <string name="room_message_placeholder">Beskjed…</string>
+    <string name="upgrade_security">Krypteringsoppgradering tilgjengelig</string>
+    <string name="security_prompt_text">Bekreft deg selv og andre for å sikre chattene dine</string>
+    <string name="settings_security_prevent_screenshots_title">Forhindre skjermbilder av applikasjonen</string>
+    <string name="use_latest_app">Bruk det nyeste Element på de andre enhetene dine:</string>
+    <string name="bad_passphrase_key_reset_all_action">Har du glemt eller mistet alle gjenopprettingsalternativene\? Tilbakestill alt</string>
+    <string name="secure_backup_reset_all">Tilbakestill alt</string>
+    <string name="secure_backup_reset_all_no_other_devices">Gjør dette bare hvis du ikke har noen annen enhet du kan bekrefte denne enheten med.</string>
+    <string name="secure_backup_reset_if_you_reset_all">Hvis du tilbakestiller alt</string>
+    <string name="secure_backup_reset_no_history">Du starter på nytt uten historikk, ingen meldinger, pålitelige enheter eller pålitelige brukere</string>
+    <string name="encrypted_unverified">Kryptert av en ubekreftet enhet</string>
+    <string name="review_logins">Gjennomgå hvor du er logget inn</string>
+    <string name="verify_other_sessions">Bekreft alle øktene dine for å sikre at kontoen og meldingene dine er trygge</string>
+    <string name="verify_this_session">Bekreft den nye påloggingen som får tilgang til kontoen din: %1$s</string>
+    <string name="crosssigning_verify_session">Bekreft pålogging</string>
+    <string name="confirm_your_identity">Bekreft identiteten din ved å bekrefte denne påloggingen fra en av de andre øktene dine, og gi den tilgang til krypterte meldinger.</string>
+    <string name="confirm_your_identity_quad_s">Bekreft identiteten din ved å bekrefte denne påloggingen, og gi den tilgang til krypterte meldinger.</string>
+    <string name="error_empty_field_choose_user_name">Velg et brukernavn.</string>
+    <string name="error_empty_field_choose_password">Velg passord.</string>
+    <string name="add_people">Legg til personer</string>
+    <string name="invite_friends_rich_title">🔐️ Bli med meg på element</string>
+    <string name="invitation_sent_to_one_user">Invitasjon sendt til %1$s</string>
+    <string name="not_a_valid_qr_code">Det er ikke en gyldig QR-kode for matrix</string>
+    <string name="invite_users_to_room_failure">Vi kunne ikke invitere brukere. Kontroller brukerne du vil invitere, og prøv på nytt.</string>
+    <string name="user_code_scan">Skann en QR-kode</string>
+    <string name="user_code_share">Del koden min</string>
+    <string name="user_code_my_code">Koden min</string>
+    <string name="user_code_info_text">Del denne koden med folk slik at de kan skanne den for å legge til deg og begynne å chatte.</string>
+    <string name="choose_locale_loading_locales">Laster inn tilgjengelige språk…</string>
+    <string name="identity_server_error_terms_not_signed">Godta først vilkårene for identitetsserveren i innstillingene.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">For ditt privatliv støtter Element bare sending av hash-bruker-e-post og telefonnummer.</string>
+    <string name="power_level_edit_title">Sett rolle</string>
+    <string name="a11y_open_chat">Åpne chat</string>
+    <string name="add_from_phone_book">Legg til fra telefonboken min</string>
+    <string name="share_by_text">Del på tekst</string>
+    <string name="call_tile_you_started_call">Du startet en samtale</string>
+    <string name="call_tile_other_started_call">%1$s startet en samtale</string>
+    <string name="call_tile_in_call">Du er for øyeblikket i denne samtalen</string>
+    <string name="call_tile_you_declined">Du avviste denne samtalen %1$s</string>
+    <string name="call_tile_other_declined">%1$s avviste denne samtalen</string>
+    <string name="call_tile_ended">Denne samtalen er avsluttet</string>
+    <string name="call_tile_call_back">Ring tilbake</string>
+    <string name="call_dial_pad_lookup_error">Det oppsto en feil med å slå opp telefonnummeret</string>
+    <string name="call_only_active">Aktiv samtale (%1$s)</string>
+    <string name="call_transfer_title">Overfør</string>
+    <string name="call_transfer_failure">Det oppstod en feil under overføring av samtalen</string>
+    <string name="call_transfer_users_tab_title">Brukere</string>
+    <string name="re_authentication_default_confirm_text">Element krever at du oppgir legitimasjonen din for å utføre denne handlingen.</string>
+    <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
+    <string name="startup_notification_fdroid_battery_optim_title">Bakgrunnsforbindelse</string>
+    <string name="startup_notification_privacy_message">Element kan kjøre i bakgrunnen for å administrere varslene dine sikkert og privat. Dette kan påvirke batteriforbruket.</string>
+    <string name="reset_secure_backup_warning">Dette vil erstatte din nåværende nøkkel eller frase.</string>
+    <string name="reset_secure_backup_title">Generer en ny sikkerhetsnøkkel eller sett en ny sikkerhetsfrase for din eksisterende sikkerhetskopi.</string>
+    <string name="settings_secure_backup_section_info">Beskytt deg mot å miste tilgang til krypterte meldinger og data ved å sikkerhetskopiere krypteringsnøkler på serveren din.</string>
+    <string name="settings_secure_backup_reset">Tilbakestill sikker sikkerhetskopiering</string>
+    <string name="settings_secure_backup_setup">Konfigurer sikker sikkerhetskopiering</string>
+    <string name="settings_secure_backup_section_title">Sikker sikkerhetskopiering</string>
+    <string name="settings_show_emoji_keyboard_summary">Legg til en knapp på meldingskomponisten for å åpne emoji-tastaturet</string>
+    <string name="settings_show_emoji_keyboard">Vis emoji-tastatur</string>
+    <string name="settings_send_message_with_enter_summary">Enter-knappen på det myke tastaturet vil sende melding i stedet for å legge til en linjeskift</string>
+    <string name="settings_preview_media_before_sending">Forhåndsvis media før sending</string>
+    <string name="settings_vibrate_on_mention">Vibrer når du nevner en bruker</string>
+    <string name="settings_chat_effects_description">Bruk kommandoen /confetti eller send en melding som inneholder ❄️ eller 🎉</string>
+    <string name="settings_show_read_receipts_summary">Klikk på lest kvitteringene for en detaljert liste.</string>
+    <string name="settings_always_show_timestamps">Vis tidsstempler for alle meldinger</string>
+    <string name="settings_send_markdown_summary">Formater meldinger med markdown-syntaksen før de sendes. Dette gir avansert formatering, for eksempel å bruke stjerner for å vise kursiv tekst.</string>
+    <string name="settings_send_typing_notifs_summary">La andre brukere vite at du skriver.</string>
+    <string name="settings_contacts_phonebook_country">Telefonbok land</string>
+    <string name="settings_contacts_app_permission">Kontakter tillatelse</string>
+    <string name="settings_keep_media">Behold media</string>
+    <string name="settings_third_party_notices">Tredjeparts varsler</string>
+    <plurals name="seconds">
+        <item quantity="one">%d sekund</item>
+        <item quantity="other">%d sekunder</item>
+    </plurals>
+    <string name="settings_background_sync_update_error">Kunne ikke oppdatere innstillingene.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Ingen bakgrunnssynkronisering</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimalisert for sanntid</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimalisert for batteri</string>
+    <string name="settings_background_sync">Bakgrunnssynkronisering</string>
+    <string name="settings_messages_sent_by_bot">Meldinger sendt av bot</string>
+    <string name="settings_call_invitations">Ring invitasjoner</string>
+    <string name="settings_invited_to_room">Når jeg blir invitert til et rom</string>
+    <string name="settings_system_preferences_summary">Velg LED-farge, vibrasjon, lyd…</string>
+    <string name="settings_notification_privacy_metadata">• Varsler inneholder bare metadata</string>
+    <string name="settings_notification_privacy_fcm">• Meldinger sendes via Firebase Cloud Messaging</string>
+    <string name="settings_notification_privacy_need_permission">Appen trenger tillatelse for å kjøre i bakgrunnen</string>
+    <string name="settings_troubleshoot_test_battery_failed">Hvis en bruker lar en enhet være frakoblet og stasjonær i en periode, mens skjermen er slått av, går enheten i Døsemodus. Dette forhindrer apper i å få tilgang til nettverket og avviser jobber, synkroniseringer og standardalarmer.</string>
+    <string name="settings_troubleshoot_test_battery_success">Element påvirkes ikke av batterioptimalisering.</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">Meldingen er klikket!</string>
+    <string name="settings_troubleshoot_test_notification_notice">Klikk på varselet. Hvis du ikke ser varselet, må du sjekke systeminnstillingene.</string>
+    <string name="settings_troubleshoot_test_notification_title">Varslingsvisning</string>
+    <string name="room_permissions_change_topic">Bytte tema</string>
+    <string name="room_permissions_upgrade_the_room">Oppgrader rommet</string>
+    <string name="room_permissions_change_permissions">Endre tillatelser</string>
+    <string name="room_permissions_change_room_name">Endre romnavn</string>
+    <string name="room_permissions_change_history_visibility">Endre historie synlighet</string>
+    <string name="room_permissions_enable_room_encryption">Aktiver romkryptering</string>
+    <string name="room_permissions_change_main_address_for_the_room">Endre hovedadresse for rommet</string>
+    <string name="room_permissions_change_room_avatar">Bytt romavatar</string>
+    <string name="room_permissions_notify_everyone">Gi beskjed til alle</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Fjern meldinger sendt av andre</string>
+    <string name="room_permissions_ban_users">Utesteng brukere</string>
+    <string name="room_permissions_kick_users">Spark brukere</string>
+    <string name="room_permissions_change_settings">Endre innstillinger</string>
+    <string name="room_permissions_invite_users">Inviter brukere</string>
+    <string name="room_permissions_send_messages">Send meldinger</string>
+    <string name="room_permissions_default_role">Standard rolle</string>
+    <string name="room_permissions_notice_read_only">Du har ikke tillatelse til å oppdatere rollene som kreves for å endre forskjellige deler av rommet</string>
+    <string name="room_permissions_notice">Velg rollene som kreves for å endre forskjellige deler av rommet</string>
+    <string name="room_permissions_title">Tillatelser</string>
+    <string name="room_settings_permissions_subtitle">Se og oppdater rollene som kreves for å endre forskjellige deler av rommet.</string>
+    <string name="room_settings_permissions_title">Romtillatelser</string>
+    <string name="room_participants_leave_private_warning">Dette rommet er ikke offentlig. Du vil ikke kunne bli med uten invitasjon.</string>
+    <string name="call_held_by_you">Du holdt samtalen</string>
+    <string name="call_held_by_user">%s holdt samtalen</string>
+    <string name="call_hold_action">Sett på vent</string>
+    <string name="call_resume_action">Gjenoppta</string>
+    <string name="error_unauthorized">Uautorisert, mangler gyldig autentiseringslegitimasjon</string>
+    <string name="action_return">Tilbake</string>
+    <string name="system_theme">System standard</string>
 </resources>
\ No newline at end of file

From 28d1510306f82c7ae68d315cf1a5e5f51e448587 Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Sun, 21 Feb 2021 18:36:18 +0000
Subject: [PATCH 059/578] Translated using Weblate (Russian)

Currently translated at 99.8% (2077 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
---
 vector/src/main/res/values-ru/strings.xml | 131 +++++++++++++---------
 1 file changed, 78 insertions(+), 53 deletions(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 8764831970..5025da3bdd 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -146,9 +146,9 @@
     <string name="auth_forgot_password">Забыли пароль?</string>
     <string name="auth_use_server_options">Использовать особые параметры сервера</string>
     <string name="auth_email_validation_message">Проверьте email для продолжения регистрации</string>
-    <string name="auth_threepid_warning_message">Регистрация одновременно по email и номеру телефона пока не поддерживается. Только номер телефона будет связан с аккаунтом.
-
-Вы можете добавить свой email в настройках профиля.</string>
+    <string name="auth_threepid_warning_message">Регистрация одновременно по email и номеру телефона пока не поддерживается. Только номер телефона будет связан с аккаунтом. 
+\n
+\nВы можете добавить свой email в настройках профиля.</string>
     <string name="auth_recaptcha_message">Проверка не являетесь ли вы роботом</string>
     <string name="auth_username_in_use">Логин уже используется</string>
     <string name="auth_home_server">Сервер:</string>
@@ -159,7 +159,9 @@
     <string name="auth_reset_password_missing_password">Должен быть введен новый пароль.</string>
     <string name="auth_reset_password_email_validation_message">На адрес %s было отправлено письмо. После перехода по ссылке в письме, нажмите ниже.</string>
     <string name="auth_reset_password_error_unauthorized">Не удалось проверить email: убедитесь, что вы перешли по присланной ссылке</string>
-    <string name="auth_reset_password_success_message">Ваш пароль сброшен. Осуществлен выход на всех сессиях - вы не будете получать push уведомления. Для включения push уведомлений заново войдите на каждом из ваших устройств.</string>
+    <string name="auth_reset_password_success_message">Ваш пароль сброшен. 
+\n
+\nОсуществлен выход на всех сессиях - вы не будете получать push уведомления. Для включения push уведомлений заново войдите на каждом из ваших устройств.</string>
     <!-- Login Screen -->
     <string name="login_error_must_start_http">URL должен начинаться с http[s]://</string>
     <string name="login_error_network_error">Сбой входа: сетевая ошибка</string>
@@ -222,8 +224,8 @@
     <string name="permissions_rationale_msg_record_audio">Element необходимы разрешения на доступ к микрофону, чтобы выполнять звонки.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность совершать звонки.</string>
     <string name="permissions_rationale_msg_camera_and_audio">Element необходимы разрешения на доступ к камере и микрофону для видеовызовов.
-
-Пожалуйста дайте разрешение в следующем окне для звонка.</string>
+\n
+\nПожалуйста дайте разрешение в следующем окне для звонка.</string>
     <string name="permissions_rationale_msg_contacts">Element может проверить вашу адресную книгу, чтобы найти других пользователей Matrix по их электронной почте и номерам телефонов. Если вы согласны поделиться своей адресной книгой для этой цели, пожалуйста, откройте доступ на следующем всплывающем окне.</string>
     <string name="permissions_msg_contacts_warning_other_androids">Element может проверить Вашу адресную книгу, чтобы найти других пользователей сети по email или телефонному номеру.
 \n
@@ -278,7 +280,8 @@
     <string name="room_participants_invite_search_another_user">ID пользователя, имя или email</string>
     <string name="room_participants_action_mention">Упомянуть</string>
     <string name="room_participants_action_devices_list">Отобразить список сессий</string>
-    <string name="room_participants_power_level_prompt">Вы не сможете отменить это действие, поскольку пользователь получит такой же уровень доступа, как и у вас. Вы уверены?</string>
+    <string name="room_participants_power_level_prompt">Вы не сможете отменить это действие, поскольку пользователь получит такой же уровень доступа, как и у вас. 
+\nВы уверены\?</string>
     <string name="room_participants_invite_prompt_msg">"Вы уверены что хотите пригласить %s в этот чат?"</string>
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Пригласить по ID</u></string>
@@ -325,9 +328,9 @@
     <string name="room_details_people_present_group_name">ПРИСОЕДИНИЛИСЬ</string>
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Причина отчета о контенте</string>
-    <string name="room_event_action_report_prompt_ignore_user">Вы хотите скрыть все сообщения этого пользователя?
-
-Учтите, что это действие перезапустит приложение и может занять некоторое время.</string>
+    <string name="room_event_action_report_prompt_ignore_user">Вы хотите скрыть все сообщения этого пользователя\? 
+\n
+\nУчтите, что это действие перезапустит приложение и может занять некоторое время.</string>
     <string name="room_event_action_cancel_upload">Отменить загрузку</string>
     <string name="room_event_action_cancel_download">Отменить загрузку</string>
     <!-- Search -->
@@ -416,8 +419,8 @@
     <string name="devices_details_device_name">Обновить публичное имя</string>
     <string name="devices_details_last_seen_title">Последнее подключение</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
-    <string name="devices_delete_dialog_text">Для этой операции требуется дополнительная проверка подлинности.
-Чтобы продолжить, введите пароль.</string>
+    <string name="devices_delete_dialog_text">Для этой операции требуется дополнительная проверка подлинности. 
+\nЧтобы продолжить, введите пароль.</string>
     <string name="devices_delete_dialog_title">Аутентификация</string>
     <string name="devices_delete_pswd">Пароль:</string>
     <string name="devices_delete_submit_button_label">Отправить</string>
@@ -436,9 +439,9 @@
     <string name="settings_confirm_password">Подтвердите новый пароль</string>
     <string name="settings_fail_to_update_password">Не удалось обновить пароль</string>
     <string name="settings_password_updated">Пароль был обновлен</string>
-    <string name="settings_unignore_user">Отображать сообщения пользователя %s?
-
-Учтите, что это действие перезапустит приложение и может занять некоторое время.</string>
+    <string name="settings_unignore_user">Отображать сообщения пользователя %s\? 
+\n
+\nУчтите, что это действие перезапустит приложение и может занять некоторое время.</string>
     <string name="settings_delete_notification_targets_confirmation">Вы уверены, что хотите удалить устройство для получения уведомлений?</string>
     <string name="settings_delete_threepid_confirmation">Вы уверены, что хотите удалить %1$s %2$s?</string>
     <string name="settings_select_country">Выберите страну</string>
@@ -533,9 +536,9 @@
     <string name="encryption_export_export">Экспорт</string>
     <string name="passphrase_enter_passphrase">Введите парольную фразу</string>
     <string name="passphrase_confirm_passphrase">Подтвердите парольную фразу</string>
-    <string name="encryption_export_saved_as">E2E ключи комнаты сохранены в \'%s\'.
-
-Предупреждение: этот файл может быть удален после деинсталляции приложения.</string>
+    <string name="encryption_export_saved_as">E2E ключи комнаты сохранены в \'%s\'. 
+\n
+\nПредупреждение: этот файл может быть удален после деинсталляции приложения.</string>
     <string name="encryption_import_e2e_room_keys">Импорт E2E ключей комнаты</string>
     <string name="encryption_import_room_keys">Импорт ключей комнаты</string>
     <string name="encryption_import_room_keys_summary">Импортировать ключи из локального файла</string>
@@ -774,9 +777,9 @@
     <string name="settings_notification_privacy_secure_message_content"><b> надежно от Matrix-Homeserver получено </b></string>
     <string name="title_activity_choose_sticker">Отправить стикер</string>
     <string name="option_send_sticker">Отправить стикер</string>
-    <string name="no_sticker_application_dialog_content">У вас сейчас нет доступных стикеров.
-
-Добавить сейчас?</string>
+    <string name="no_sticker_application_dialog_content">У вас сейчас нет доступных стикеров. 
+\n
+\nДобавить сейчас\?</string>
     <string name="settings_deactivate_account_section">Деактивация аккаунта</string>
     <string name="settings_deactivate_my_account">Деактивировать мой аккаунт</string>
     <string name="settings_opt_in_of_analytics">Отправка аналитических данных</string>
@@ -791,11 +794,11 @@
     <string name="deactivate_account_delete_checkbox">Пожалуйста, удалите все сообщения, которые я отправил, после деактивации моего аккаунта (предупреждение: будущие участники увидят неполную историю разговоров)</string>
     <string name="deactivate_account_prompt_password">Чтобы продолжить, введите пароль:</string>
     <string name="deactivate_account_submit">Деактивировать аккаунт</string>
-    <string name="deactivate_account_content">Это действие сделает вашу учетную запись непригодной для дальнейшего использования. Вы не сможете войти в систему и никто другой не сможет заново зарегистрировать учетную запись с вашим идентификатором. Также, это приведет к тому, что вы покинете все комнаты, в которых участвовали и данные о вашей учетной записи будут удалены с сервера идентификации. <b>Это действие необратимо</b>.
-
-По умолчанию, деактивация вашей учетной записи <b>не удаляет отправленные вами сообщения</b>. Если вы хотите, чтобы мы удалили все ваши сообщения - поставьте отметку в поле ниже.
-
-Видимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут показаны новым или не зарегистрированным пользователям, но те пользователи, которые уже получили эти сообщения - по прежнему будут их видеть.</string>
+    <string name="deactivate_account_content">Это действие сделает вашу учетную запись непригодной для дальнейшего использования. Вы не сможете войти в систему и никто другой не сможет заново зарегистрировать учетную запись с вашим идентификатором. Также, это приведет к тому, что вы покинете все комнаты, в которых участвовали и данные о вашей учетной записи будут удалены с сервера идентификации. <b>Это действие необратимо</b>. 
+\n
+\nПо умолчанию, деактивация вашей учетной записи <b>не удаляет отправленные вами сообщения</b>. Если вы хотите, чтобы мы удалили все ваши сообщения - поставьте отметку в поле ниже. 
+\n
+\nВидимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут показаны новым или не зарегистрированным пользователям, но те пользователи, которые уже получили эти сообщения - по прежнему будут их видеть.</string>
     <string name="dialog_title_third_party_licences">Лицензии сторонних производителей</string>
     <string name="download">Скачать</string>
     <string name="speak">Говорить</string>
@@ -937,13 +940,13 @@
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Один или несколько тестов не пройдены, пожалуйста, отправьте отчет об ошибке, чтобы помочь нам исследовать проблему.</string>
     <string name="settings_troubleshoot_test_system_settings_title">Настройки системы.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Уведомления включены в настройках системы.</string>
-    <string name="settings_troubleshoot_test_system_settings_failed">Уведомления отключены в настройках системы.
-Пожалуйста, проверьте настройки системы.</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">Уведомления отключены в настройках системы. 
+\nПожалуйста, проверьте настройки системы.</string>
     <string name="open_settings">Открыть настройки</string>
     <string name="settings_troubleshoot_test_account_settings_title">Настройки аккаунта.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Уведомления включены для вашей учетной записи.</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">Уведомления отключены для вашей учетной записи.
-Пожалуйста, проверьте настройки аккаунта.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Уведомления отключены для вашей учетной записи. 
+\nПожалуйста, проверьте настройки аккаунта.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Включить</string>
     <string name="settings_troubleshoot_test_device_settings_title">Настройки сессии.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Уведомления включены для этой сессии.</string>
@@ -952,22 +955,22 @@
     <string name="settings_troubleshoot_test_device_settings_quickfix">Включить</string>
     <string name="settings_troubleshoot_test_play_services_title">Проверка сервисов Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Google Play сервисов доступен и обновлён.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element использует сервисы Google Play для доставки push-сообщений, но не похоже что он настроен правильно:
-%1$s</string>
+    <string name="settings_troubleshoot_test_play_services_failed">Element использует сервисы Google Play для доставки push-сообщений, но не похоже что он настроен правильно: 
+\n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Исправить сервисы Play</string>
     <string name="settings_troubleshoot_test_fcm_title">Токен Firebase</string>
     <string name="settings_troubleshoot_test_fcm_success">Токен FCM успешно получен:
-%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed">Не удалось получить токен FCM:
-%1$s</string>
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed">Не удалось получить токен FCM: 
+\n%1$s</string>
     <string name="settings_troubleshoot_test_token_registration_title">Регистрация токена</string>
     <string name="settings_troubleshoot_test_token_registration_success">Токен FCM успешно зарегистрирован на сервере.</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">Не удалось зарегистрировать токен FCM на сервере:
-%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">Не удалось зарегистрировать токен FCM на сервере: 
+\n%1$s</string>
     <string name="settings_troubleshoot_test_foreground_service_started_title">Служба уведомлений</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Служба уведомлений запущена.</string>
-    <string name="settings_troubleshoot_test_foreground_service_started_failed">Служба уведомлений не запущена.
-Попробуйте перезапустить приложение.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">Служба уведомлений не запущена. 
+\nПопробуйте перезапустить приложение.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Запустить службу</string>
     <string name="settings_troubleshoot_test_service_restart_title">Автоматический перезапуск службы уведомлений</string>
     <string name="settings_troubleshoot_test_service_restart_success">Служба была убита и перезапущена автоматически.</string>
@@ -977,11 +980,11 @@
     <string name="settings_troubleshoot_test_service_boot_failed">При перезагрузке устройства служба не будет запущена , вы не будете получать уведомления, пока Element не будет открыт один раз.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Включить запуск при загрузке</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Проверьте фоновые ограничения</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Фоновые ограничения отключены для Element. Этот тест должен быть запущен с использованием мобильных данных (без WIFI).
-%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Фоновые ограничения включены для Element.
-Работа приложения будет жестко ограничена, пока оно находится в фоновом режиме, и это может повлиять на уведомления.
-%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">Фоновые ограничения отключены для Element. Этот тест должен быть запущен с использованием мобильных данных (без WIFI). 
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_failed">Фоновые ограничения включены для Element. 
+\nРабота приложения будет жестко ограничена, пока оно находится в фоновом режиме, и это может повлиять на уведомления. 
+\n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Отключить ограничения</string>
     <string name="settings_troubleshoot_test_battery_title">Оптимизация батареи</string>
     <string name="settings_troubleshoot_test_battery_success">Оптимизация батареи не влияет на Element.</string>
@@ -995,8 +998,8 @@
     <string name="settings_show_join_leave_messages">Показывать события о вступлении/выходе</string>
     <string name="settings_show_avatar_display_name_changes_messages">Показывать события аккаунта</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Включает изменения аватара и отображаемого имени.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений.
-На следующем экране вам будет предложено разрешить Райоту всегда работать в фоновом режиме, пожалуйста, примите.</string>
+    <string name="startup_notification_fdroid_battery_optim_message">Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений. 
+\nНа следующем экране вам будет предложено разрешить Райоту всегда работать в фоновом режиме, пожалуйста, примите.</string>
     <string name="settings_labs_native_camera_summary">Использовать системную камеру вместо камеры Element.</string>
     <string name="settings_info_area_show">Показать информацию</string>
     <string name="generic_label">%1$s:</string>
@@ -1091,14 +1094,15 @@
     <string name="keys_backup_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью данного пароля: убедитесь, что вы ввели верный пароль.</string>
     <string name="keys_backup_setup_backup_started_message">Ключи шифрования копируются на сервер в фоновом режиме. Первое копирование может занять несколько минут.</string>
     <string name="keys_backup_setup_step3_generating_key_status">Генерация ключей восстановления с использованием парольной фразы может занять несколько секунд.</string>
-    <string name="recovery_key_export_saved_as_warning">Ключ восстановления был сохранен в \'%s\'.
-
-Предупреждение: этот файл может быть удален при удалении приложения.</string>
+    <string name="recovery_key_export_saved_as_warning">Ключ восстановления был сохранен в \'%s\'. 
+\n
+\nПредупреждение: этот файл может быть удален при удалении приложения.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
 \nЭта ошибка вне контроля Element. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-Эта ошибка вне контроля Element. Причины могут быть разными. Возможно, это будет работать, если вы повторите попытку позже, вы также можете проверить, что службы Google Play не ограничены в использовании данных в настройках системы, или что часы вашего устройства установлены правильно, или это может произойти на модифицированных прошивках.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] Эта ошибка вне контроля Element, и, по словам Google, эта ошибка означает, что на устройстве слишком много приложений, зарегистрированных в FCM. Ошибка возникает только в тех случаях, когда существует огромное количество приложений, поэтому она не должна влиять на обычного пользователя.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s] 
+\nЭта ошибка вне контроля Element. Причины могут быть разными. Возможно, это будет работать, если вы повторите попытку позже, вы также можете проверить, что службы Google Play не ограничены в использовании данных в настройках системы, или что часы вашего устройства установлены правильно, или это может произойти на модифицированных прошивках.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] 
+\nЭта ошибка вне контроля Element, и, по словам Google, эта ошибка означает, что на устройстве слишком много приложений, зарегистрированных в FCM. Ошибка возникает только в тех случаях, когда существует огромное количество приложений, поэтому она не должна влиять на обычного пользователя.</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Ваши зашифрованные сообщения будут потеряны, если выйдете сейчас</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Выполняется резервное копирование ключа. Если выйти сейчас, Вы потеряете доступ к Вашим зашифрованным сообщениям.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Мне не нужны мои зашифрованные сообщения</string>
@@ -1151,7 +1155,8 @@
     <string name="keys_backup_setup_step2_text_description">Зашифрованная копия ключей будет храниться на вашем сервере. Для безопасности защитите её парольной фразой.
 \n
 \nДля максимальной безопасности парольная фраза должна отличаться от пароля вашей учётной записи.</string>
-    <string name="keys_backup_setup_step3_text_line2">Ключ восстановления — это страховка, вы можете использовать его для восстановления доступа к вашим зашифрованным сообщениям, если забудете вашу парольную фразу. Храните ключ восстановления в надёжном месте, например, в диспетчере паролей (или в сейфе)</string>
+    <string name="keys_backup_setup_step3_text_line2">Ключ восстановления — это страховка, вы можете использовать его для восстановления доступа к вашим зашифрованным сообщениям, если забудете вашу парольную фразу. 
+\nХраните ключ восстановления в надёжном месте, например, в диспетчере паролей (или в сейфе)</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Импортирование ключей…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Скачивание ключей…</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление ключа восстановления…</string>
@@ -1504,6 +1509,7 @@
     <string name="login_server_url_form_modular_notice">Введите адрес Modular Element или сервера, который вы хотите использовать</string>
     <string name="login_sso_error_message">Произошла ошибка при загрузке страницы: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Приложение не может войти на этот сервер, так как он поддерживает следующие типы входа: %1$s.
+\n
 \nВы хотите войти с помощью веб-клиента\?</string>
     <string name="login_registration_disabled">Извините, этот сервер не принимает новые учётные записи.</string>
     <string name="login_registration_not_supported">Приложение не может создать учётную запись на этом домашнем сервере. 
@@ -2445,4 +2451,23 @@
     <string name="call_held_by_user">%s поставил вызов на удержание</string>
     <string name="call_hold_action">Удерживать</string>
     <string name="call_resume_action">Возобновить</string>
+    <string name="call_transfer_users_tab_title">Пользователи</string>
+    <string name="call_transfer_failure">Произошла ошибка при переводе вызова</string>
+    <string name="call_transfer_title">Перевод</string>
+    <string name="call_transfer_connect_action">Соединиться</string>
+    <string name="call_transfer_consult_first">Сначала спросить</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 активный вызов (%1$s) · 1 приостановленный вызов</item>
+        <item quantity="few">1 активный вызов (%1$s) · %2$d приостановленных вызова</item>
+        <item quantity="many">1 активный вызов (%1$s) · %2$d приостановленных вызовов</item>
+        <item quantity="other">1 активный вызов (%1$s) · %2$d приостановленных вызовов</item>
+    </plurals>
+    <plurals name="call_only_paused">
+        <item quantity="one">Приостановленный вызов</item>
+        <item quantity="few">%1$d приостановленных вызова</item>
+        <item quantity="many">%1$d приостановленных вызовов</item>
+        <item quantity="other">%1$d приостановленных вызовов</item>
+    </plurals>
+    <string name="error_unauthorized">Нет учётных данных, неправильная учётная запись пользователя и/или пароль</string>
+    <string name="action_return">Вернуть</string>
 </resources>
\ No newline at end of file

From 5317f26791d3875570385a9428b1d8e5bbcb8225 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Sun, 21 Feb 2021 12:24:44 +0000
Subject: [PATCH 060/578] Translated using Weblate (Swedish)

Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index c8aa5824db..b2bf64234c 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -40,7 +40,7 @@
     <string name="send">Skicka</string>
     <string name="resend">Skicka igen</string>
     <string name="redact">Ta bort</string>
-    <string name="quote">Citat</string>
+    <string name="quote">Citera</string>
     <string name="download">Ladda ner</string>
     <string name="share">Dela</string>
     <string name="speak">Prata</string>
@@ -256,7 +256,7 @@
     <string name="groups_list">Grupplista</string>
     <plurals name="membership_changes">
         <item quantity="one">%d medlemsskapsändring</item>
-        <item quantity="other">%s medlemsskapsändringar</item>
+        <item quantity="other">%d medlemsskapsändringar</item>
     </plurals>
     <string name="compression_options">Skicka som</string>
     <string name="compression_opt_list_original">Original</string>
@@ -849,11 +849,11 @@
     <string name="select_room_directory">Välj en rumskatalog</string>
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d oläst aviserat meddelande</item>
-        <item quantity="other">%s olästa aviserade meddelanden</item>
+        <item quantity="other">%d olästa aviserade meddelanden</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d oläst aviserat meddelande</item>
-        <item quantity="other">%s olästa aviserade meddelanden</item>
+        <item quantity="other">%d olästa aviserade meddelanden</item>
     </plurals>
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: %2$d meddelande</item>

From d476dbcdda0240665b6e677217b8a0702708b017 Mon Sep 17 00:00:00 2001
From: ppnplusdf0eb2eb726b4bb3 <djbestppntube@icloud.com>
Date: Tue, 23 Feb 2021 02:49:09 +0000
Subject: [PATCH 061/578] Translated using Weblate (Thai)

Currently translated at 7.7% (161 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/th/
---
 vector/src/main/res/values-th/strings.xml | 95 +++++++++++++++++++----
 1 file changed, 81 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index ed3cd5614c..f583723f75 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -1,14 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="or">หรือ</string>
     <string name="action_open">เปิด</string>
     <string name="action_close">ปิด</string>
     <string name="disable">ปิดใช้งาน</string>
-
     <string name="dialog_title_warning">คำเตือน</string>
-
     <string name="read_receipt">อ่านแล้ว</string>
-
     <string name="auth_skip">ข้าม</string>
     <string name="auth_password_placeholder">รหัสผ่าน</string>
     <string name="auth_new_password_placeholder">รหัสผ่านใหม่</string>
@@ -28,10 +25,8 @@
     <string name="delete">ลบ</string>
     <string name="rename">เปลี่ยนชื่อ</string>
     <string name="skip">ข้าม</string>
-
     <string name="title_activity_choose_sticker">ส่งสติกเกอร์</string>
     <string name="loading">กำลังโหลด…</string>
-
     <string name="forward">ส่งต่อ</string>
     <string name="none">ไม่มี</string>
     <string name="report_content">รายงานเนื้อหา</string>
@@ -44,21 +39,17 @@
     <string name="bottom_action_people">ผู้คน</string>
     <string name="bottom_action_rooms">ห้อง</string>
     <string name="bottom_action_groups">ชุมชน</string>
-
     <string name="invitations_header">การเชิญ</string>
     <string name="system_alerts_header">การแจ้งเตือนจากระบบ</string>
-
     <string name="no_contact_access_placeholder">คุณไม่ได้อนุญาตให้ Element เข้าถึงรายชื่อผู้ติดต่อในเครื่อง</string>
     <string name="no_result_placeholder">ไม่มีผลลัพธ์</string>
     <string name="no_room_placeholder">ไม่มีห้อง</string>
     <plurals name="public_room_nb_users">
         <item quantity="other">ผู้ใช้ %d คน</item>
     </plurals>
-
     <string name="groups_invite_header">เชิญ</string>
     <string name="groups_header">ชุมชน</string>
     <string name="no_group_placeholder">ไม่มีกลุ่ม</string>
-
     <string name="send_bug_report_description_in_english">ถ้าเป็นไปได้ โปรดเขียนคำอธิบายเป็นภาษาอังกฤษ</string>
     <string name="send_bug_report_placeholder">อธิบายปัญหาของคุณที่นี่</string>
     <string name="send_files_in">ส่งไปยัง</string>
@@ -68,11 +59,9 @@
     <string name="login">เข้าสู่ระบบ</string>
     <string name="logout">ออกจากระบบ</string>
     <string name="search">ค้นหา</string>
-
     <string name="start_new_chat">เริ่มแชทใหม่</string>
     <string name="call_failed_no_ice_use_alt">ลองโดยใช้ %s</string>
     <string name="call_failed_dont_ask_again">ไม่ต้องถามฉันอีก</string>
-
     <string name="call_select_sound_device">เลือกอุปกรณ์เสียง</string>
     <string name="sound_device_phone">โทรศัพท์</string>
     <string name="sound_device_speaker">ลำโพง</string>
@@ -83,7 +72,6 @@
     <string name="call_camera_back">หลัง</string>
     <string name="call_format_turn_hd_off">ปิด HD</string>
     <string name="call_format_turn_hd_on">เปิด HD</string>
-
     <string name="option_send_sticker">ส่งสติกเกอร์</string>
     <string name="auth_login">เข้าสู่ระบบ</string>
     <string name="auth_register">สร้างบัญชี</string>
@@ -97,4 +85,83 @@
     <string name="auth_phone_number_placeholder">หมายเลขโทรศัพท์</string>
     <string name="auth_opt_phone_number_placeholder">หมายเลขโทรศัพท์ (ไม่จำเป็น)</string>
     <string name="auth_invalid_password">รหัสผ่านสั้นเกินไป (อย่างน้อย 6 ตัว)</string>
-</resources>
+    <string name="permissions_rationale_popup_title">ข้อมูล</string>
+    <string name="media_picker_both_capture_title">ถ่ายภาพหรือวิดีโอ</string>
+    <string name="call_ring">กำลังโทร…</string>
+    <string name="call">โทร</string>
+    <string name="settings_call_category">การโทร</string>
+    <string name="room_info_room_name">ชื่อห้อง</string>
+    <string name="today">วันนี้</string>
+    <string name="yesterday">เมื่อวาน</string>
+    <string name="attachment_remaining_time_minutes">%1$d นาที %2$d วิ</string>
+    <string name="attachment_remaining_time_seconds">%d วิ</string>
+    <string name="compression_opt_list_small">ขนาดเล็ก</string>
+    <string name="compression_opt_list_medium">ขนาดกลาง</string>
+    <string name="compression_opt_list_large">ขนาดใหญ่</string>
+    <string name="compression_opt_list_original">ต้นฉบับ</string>
+    <string name="compression_options">ส่งเป็น</string>
+    <string name="groups_list">รายการกลุ่ม</string>
+    <string name="login_error_user_in_use">ชื่อผู้ใช้นี้ถูกใช้ไปแล้ว</string>
+    <string name="login_error_forbidden">ชื่อผู้ใช้/รหัสผ่านไม่ถูกต้อง</string>
+    <string name="login_error_ssl_other">ข้อผิดพลาด SSL</string>
+    <string name="login_error_unable_login">ไม่สามารถเข้าสู่ระบบ</string>
+    <string name="auth_username_in_use">ชื่อผู้ใช้ถูกใช้แล้ว</string>
+    <string name="auth_email_validation_message">กรุณาตรวจสอบอีเมลเพื่อดำเนินการลงทะเบียนต่อไป</string>
+    <string name="auth_forgot_password">ลืมรหัสผ่าน\?</string>
+    <string name="auth_password_dont_match">รหัสผ่านไม่ตรงกัน</string>
+    <string name="auth_missing_password">ไม่ได้ใส่รหัสผ่าน</string>
+    <string name="auth_invalid_login_param">ชื่อผู้ใช้ และ/หรือ รหัสผ่านไม่ถูกต้อง</string>
+    <string name="auth_repeat_new_password_placeholder">ยืนยันรหัสผ่านใหม่</string>
+    <string name="auth_repeat_password_placeholder">ใส่รหัสผ่านอีกครั้ง</string>
+    <string name="option_take_video">ถ่ายวิดีโอ</string>
+    <string name="option_take_photo">ถ่ายภาพ</string>
+    <string name="start_video_call">เริ่มการโทรวิดีโอ</string>
+    <string name="start_voice_call">เริ่มการโทรเสียง</string>
+    <string name="send_bug_report_progress">ความคืบหน้า (%s%%)</string>
+    <string name="rooms_directory_header">ไดเรกทอรีห้อง</string>
+    <string name="rooms_header">ห้อง</string>
+    <string name="no_more_results">ไม่มีผลลัพธ์เพิ่มเติม</string>
+    <string name="no_conversation_placeholder">ไม่มีการสนทนา</string>
+    <string name="direct_chats_header">การสนทนา</string>
+    <string name="low_priority_header">ลำดับความสำคัญต่ำ</string>
+    <string name="bottom_action_favourites">รายการโปรด</string>
+    <string name="dialog_title_error">ข้อผิดพลาด</string>
+    <string name="dialog_title_success">สำเร็จ</string>
+    <string name="dialog_title_confirmation">การยืนยัน</string>
+    <string name="copied_to_clipboard">คัดลอกไปยังคลิปบอร์ดแล้ว</string>
+    <string name="action_unpublish">เลิกเผยแพร่</string>
+    <string name="action_add">เพิ่ม</string>
+    <string name="action_copy">คัดลอก</string>
+    <string name="action_quick_reply">ตอบกลับด่วน</string>
+    <string name="action_video_call">การโทรวิดีโอ</string>
+    <string name="action_voice_call">การโทรเสียง</string>
+    <string name="action_sign_out">ออกจากระบบ</string>
+    <string name="action_exit">ออก</string>
+    <string name="call_notification_hangup">วางสาย</string>
+    <string name="call_notification_reject">ปฏิเสธ</string>
+    <string name="call_notification_answer">ยอมรับ</string>
+    <string name="decline">ปฏิเสธ</string>
+    <string name="ignore">เพิกเฉย</string>
+    <string name="done">เรียบร้อย</string>
+    <string name="accept">ยอมรับ</string>
+    <string name="offline">ออฟไลน์</string>
+    <string name="invite">เชิญ</string>
+    <string name="device_information">ข้อมูลเซสชั่น</string>
+    <string name="missing_permissions_title_to_start_conf_call">ไม่สามารถเริ่มการโทร</string>
+    <string name="audio_meeting">เริ่มการประชุมเสียง</string>
+    <string name="video_meeting">เริ่มการประชุมวิดีโอ</string>
+    <string name="start_chatting">เริ่มสนทนา</string>
+    <string name="reset">รีเซ็ต</string>
+    <string name="dismiss">ปิดทิ้ง</string>
+    <string name="disconnect">เลิกเชื่อมต่อ</string>
+    <string name="view_decrypted_source">ดูต้นฉบับที่ถอดรหัสแล้ว</string>
+    <string name="view_source">ดูต้นฉบับ</string>
+    <string name="later">ไว้ภายหลัง</string>
+    <string name="redact">ลบออก</string>
+    <string name="resend">ส่งซ้ำ</string>
+    <string name="stay">อยู่</string>
+    <string name="backup">สำรองข้อมูล</string>
+    <string name="are_you_sure">คุณแน่ใจหรือไม่\?</string>
+    <string name="title_activity_group_details">ข้อมูลชุมชน</string>
+    <string name="system_theme">ค่าเริ่มต้นของระบบ</string>
+</resources>
\ No newline at end of file

From dc4d2fc15decb0928064eb0d481a4603cfff6643 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Mon, 22 Feb 2021 06:37:04 +0000
Subject: [PATCH 062/578] Translated using Weblate (Galician)

Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/gl/
---
 .../src/main/res/values-gl/strings.xml        | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-gl/strings.xml b/matrix-sdk-android/src/main/res/values-gl/strings.xml
index 55d59065c9..208b1e9d13 100644
--- a/matrix-sdk-android/src/main/res/values-gl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-gl/strings.xml
@@ -211,4 +211,57 @@
         <item quantity="one">%1$s engadiu %2$s como enderezo desta sala.</item>
         <item quantity="other">%1$s engadiu %2$s como enderezos desta sala.</item>
     </plurals>
+    <string name="key_verification_request_fallback_message">%s solicita verificar a túa chave, pero o teu cliente non soporta a verificación de chaves nos chats. Necesitarás usar o método antigo de verificación de chaves.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Activaches o cifrado extremo-a-extremo (algoritmo non recoñecido %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s activou o cifrado extremo-a-extrem (algoritmo non recoñecible %2$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Activaches o cifrado extremo-a-extremo.</string>
+    <string name="notice_end_to_end_ok">%1$s activou o cifrado extremo-a-extremo.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Non permites que as convidadas se unan á sala.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s non permite que as usuarias se unan á sala.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Non permites que as convidadas se unan á sala.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s non permite que as convidadas se unan á sala.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Permitiches que as convidadas se unan aquí.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s permitiu que as convidadas se unan aquí.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Permitiches que as convidadas se unan á sala.</string>
+    <string name="notice_room_guest_access_can_join">%1$s permite que as convidadas se unan á sala.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Cambiaches os enderezos desta sala.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s cambiou os enderezos desta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Cambiaches os enderezos principal e alternativo para esta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s cambiou os enderezos alternativo e principal para esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Cambiaches os enderezos alternativos para esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s cambiou os enderezos alternativos para esta sala.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Eliminaches o enderezo alternativo %1$s para esta sala.</item>
+        <item quantity="other">Eliminaches os enderezos alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s eliminou o enderezo alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s eliminou os enderezos alternativos %2$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Engadiches o enderezo alternativo %1$s para esta sala.</item>
+        <item quantity="other">Engadiches os enderezos alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s engadiu o enderezo alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s engadiu os enderezos alternativos %2$s para esta sala.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">Eliminaches o enderezo principal desta sala.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s eliminou o enderezo principal desta sala.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Estableceches %1$s como enderezo principal desta sala.</string>
+    <string name="notice_room_canonical_alias_set">%1$s estableceu %2$s como enderezo principal desta sala.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Engadiches %1$s e eliminaches %2$s como enderezos desta sala.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s engadiu %2$s e eliminou %3$s como enderezos desta sala.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Eliminaches %1$s como enderezo desta sala.</item>
+        <item quantity="other">Eliminaches %1$s como enderezos desta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s eliminou %2$s como enderezo desta sala.</item>
+        <item quantity="other">%1$s eliminou %2$s como enderezos desta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Engadiches %1$s como enderezo para esta sala.</item>
+        <item quantity="other">Engadiches %1$s como enderezos para esta sala.</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 8f02c52a2687ce60e78e605a198248a0a8ecd10c Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Sun, 21 Feb 2021 18:40:28 +0000
Subject: [PATCH 063/578] Translated using Weblate (Russian)

Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ru/
---
 matrix-sdk-android/src/main/res/values-ru/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-ru/strings.xml b/matrix-sdk-android/src/main/res/values-ru/strings.xml
index f2e0bd668f..b317e04908 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -282,4 +282,10 @@
         <item quantity="many">%1$s добавил(а) альтернативные адреса %2$s для этой комнаты.</item>
         <item quantity="other">%1$s добавил(а) альтернативные адреса %2$s для этой комнаты.</item>
     </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">Вы изменили видеоконференцию</string>
+    <string name="notice_widget_jitsi_modified">%1$s изменил(а) видеоконференцию</string>
+    <string name="notice_widget_jitsi_removed_by_you">Вы завершили видеоконференцию</string>
+    <string name="notice_widget_jitsi_removed">%1$s завершил(а) видеоконференцию</string>
+    <string name="notice_widget_jitsi_added_by_you">Вы начали видеоконференцию</string>
+    <string name="notice_widget_jitsi_added">%1$s начал(а) видеоконференцию</string>
 </resources>
\ No newline at end of file

From ae4062828d13b12a785947fa7fb62d955eede790 Mon Sep 17 00:00:00 2001
From: Martin Johansen <hdsumo@protonmail.ch>
Date: Sun, 21 Feb 2021 23:07:47 +0000
Subject: [PATCH 064/578] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l=20(nb))?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 3.9% (9 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/nb/
---
 matrix-sdk-android/src/main/res/values-nb/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/matrix-sdk-android/src/main/res/values-nb/strings.xml b/matrix-sdk-android/src/main/res/values-nb/strings.xml
index 07cf4226e0..3a7caefc55 100644
--- a/matrix-sdk-android/src/main/res/values-nb/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nb/strings.xml
@@ -8,4 +8,5 @@
     <string name="summary_you_sent_image">Du sendte et bilde.</string>
     <string name="summary_user_sent_image">%1$s sendte et bilde.</string>
     <string name="summary_message">%1$s: %2$s</string>
+    <string name="notice_room_created">%1$s skapte rommet</string>
 </resources>
\ No newline at end of file

From ab52395d1a8f19a66c7ad00f5bc0a3817cb5f773 Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Mon, 22 Feb 2021 18:30:23 +0000
Subject: [PATCH 065/578] Translated using Weblate (Czech)

Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
---
 fastlane/metadata/android/cs/changelogs/40100140.txt | 2 ++
 fastlane/metadata/android/cs/changelogs/40100150.txt | 2 ++
 fastlane/metadata/android/cs/changelogs/40100160.txt | 2 ++
 fastlane/metadata/android/cs/changelogs/40100170.txt | 2 ++
 4 files changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/cs/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/cs/changelogs/40100150.txt
 create mode 100644 fastlane/metadata/android/cs/changelogs/40100160.txt
 create mode 100644 fastlane/metadata/android/cs/changelogs/40100170.txt

diff --git a/fastlane/metadata/android/cs/changelogs/40100140.txt b/fastlane/metadata/android/cs/changelogs/40100140.txt
new file mode 100644
index 0000000000..2c9c568c8d
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Úpravy práv místností, automatický tmavý/světlý vzhled a řada oprav chyb.
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/cs/changelogs/40100150.txt b/fastlane/metadata/android/cs/changelogs/40100150.txt
new file mode 100644
index 0000000000..7976d97411
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Podpora přihlášení v sociálních sítích.
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/cs/changelogs/40100160.txt b/fastlane/metadata/android/cs/changelogs/40100160.txt
new file mode 100644
index 0000000000..2cc6c65207
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Podpora přihlášení v sociálních sítích.
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.0.15 a https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/cs/changelogs/40100170.txt b/fastlane/metadata/android/cs/changelogs/40100170.txt
new file mode 100644
index 0000000000..693ff3fbaf
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.0.17

From cccaf669a5ee4112e235e3338c7fd5756bc0dfcf Mon Sep 17 00:00:00 2001
From: vachan-maker <revsamtp@hotmail.com>
Date: Mon, 22 Feb 2021 09:02:37 +0000
Subject: [PATCH 066/578] Translated using Weblate (Malayalam)

Currently translated at 16.3% (340 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 151 +++++++++++++++++++++-
 1 file changed, 150 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 1f66b9ec40..c09b6a5649 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -92,7 +92,7 @@
     <string name="title_activity_room">മുറി</string>
     <string name="title_activity_home">സന്ദേശങ്ങൾ</string>
     <string name="notification_silent_notifications">നിശബ്‌ദ അറിയിപ്പുകൾ</string>
-    <string name="notification_sync_in_progress">സമന്വയിപ്പിക്കുന്നു</string>
+    <string name="notification_sync_in_progress">സമന്വയിപ്പിക്കുന്നു…</string>
     <string name="auth_opt_phone_number_placeholder">ഫോൺ നമ്പർ (നിർബന്ധമല്ല)</string>
     <string name="auth_phone_number_placeholder">ഫോൺ നമ്പർ</string>
     <string name="auth_skip">ഒഴിവാക്കൂ</string>
@@ -207,4 +207,153 @@
     <string name="accept">സ്വീകരിക്കുക</string>
     <string name="later">പിന്നീട്</string>
     <string name="ongoing_conference_call_voice">വോയ്സ്</string>
+    <string name="people_search_filter_text">Matrix ഉപയോക്താക്കൾ മാത്രം</string>
+    <string name="room_participants_action_cancel_invite_title">ക്ഷണം റദ്ദാക്കൂ</string>
+    <string name="room_participants_action_mention">സൂചിപ്പിക്കൂ</string>
+    <string name="room_participants_header_direct_chats">നേരിട്ടുള്ള സന്ദേശങ്ങൾ</string>
+    <string name="room_participants_header_call">വിളിക്കൂ</string>
+    <string name="room_participants_header_admin_tools">അഡ്മിൻ ഉപകരണ്ങ്ങൾ</string>
+    <string name="list_members">അംഗങ്ങളെ കാണിക്കൂ</string>
+    <string name="media_picker_both_capture_title">ഒരു ചിത്രം അല്ലെങ്കിൽ വീഡിയോ എടുക്കൂ</string>
+    <string name="call_ended">കോൾ അവസാനിച്ചൂ</string>
+    <string name="call_ring">വിളിക്കുന്നൂ…</string>
+    <string name="call">വിളിക്കൂ</string>
+    <string name="attachment_cancel_download">ഡൗൺലോഡ് റദ്ദാക്കണോ\?</string>
+    <string name="auth_reset_password_missing_password">ഒരു പുതിയ രഹസ്യവാക്ക് നൽകണം.</string>
+    <string name="auth_reset_password_next_step_button">ഞാൻ എന്റെ ഈമെയിൽ വിലാസം ഉറപ്പാക്കി</string>
+    <string name="auth_forgot_password">രഹസ്യവാക്ക് മറന്നോ\?</string>
+    <string name="auth_password_dont_match">രഹസ്യവാക്കുകൾ പൊരുത്തപെടുന്നില്ല</string>
+    <string name="auth_repeat_new_password_placeholder">നിങ്ങളുടെ പുതിയ രഹസ്യവാക്ക് ഉറപ്പാക്കൂ</string>
+    <string name="auth_repeat_password_placeholder">രഹസ്യവാക്ക് ആവർത്തിക്കൂ</string>
+    <string name="auth_opt_email_placeholder">ഈ - മെയിൽ വിലാസം (നിർബന്ധമല്ല)</string>
+    <string name="call_switch_camera">ക്യാമറ മാറ്റുക</string>
+    <string name="auth_user_name_placeholder">ഉപയോക്തൃനാമം</string>
+    <string name="auth_new_password_placeholder">പുതിയ രഹസ്യവാക്ക്</string>
+    <string name="auth_password_placeholder">രഹസ്യവാക്ക്</string>
+    <string name="auth_user_id_placeholder">ഇമെയിൽ അല്ലെങ്കിൽ ഉപയോക്തൃനാമം</string>
+    <string name="go_on_with">തുടരുക…</string>
+    <string name="call_failed_no_connection">Element കോൾ പരാജയപ്പെട്ടു</string>
+    <string name="option_send_voice">ശബ്ദം അയയ്ക്കൂ</string>
+    <string name="hs_url">ഹോം സെർവർ URL</string>
+    <string name="no_public_room_placeholder">പൊതു മുറിക‍ൾ ഒന്നും ലഭ്യമല്ല</string>
+    <string name="action_return">മടങ്ങുക</string>
+    <string name="no_permissions_to_start_webrtc_call">ഈ മുറിയിൽ ഒരു കോൾ ആരംഭിക്കാൻ നിങ്ങൾക്ക് അനുവാദമില്ല</string>
+    <string name="active_call">സജീവ കോൾ</string>
+    <string name="call_format_turn_hd_on">HD ഓൺ ആക്കൂ</string>
+    <string name="call_format_turn_hd_off">HD ഓഫ് ആക്കൂ</string>
+    <string name="call_failed_no_ice_use_alt">%s ഉപയോഗിച്ച് നോക്കൂ</string>
+    <string name="send_bug_report">ബഗ്ഗ് റിപ്പോർട്ട് ചെയ്യൂ</string>
+    <plurals name="public_room_nb_users">
+        <item quantity="one">%d ഉപയോക്താവ്</item>
+        <item quantity="other">%d ഉപയോക്താക്കൾ</item>
+    </plurals>
+    <string name="home_filter_placeholder_home">മുറി നാമങ്ങൾ ഫിൽറ്റർ ചെയ്യൂ</string>
+    <string name="send_anyway">എന്തായാലും അയയ്ക്കൂ</string>
+    <string name="title_activity_keys_backup_setup">കീ ബാക്കപ്പ്</string>
+    <string name="status_theme">Status.im തീം</string>
+    <string name="black_them">കറുത്ത തീം</string>
+    <string name="dark_theme">ഡാ൪ക്ക് തീം</string>
+    <string name="light_theme">ലൈറ്റ് തീം</string>
+    <string name="notification_sync_init">സേവനം സമാരംഭിക്കുന്നു</string>
+    <string name="system_theme">സിസ്റ്റം സ്ഥിരസ്ഥിതി</string>
+    <string name="room_settings_topic">വിഷയം</string>
+    <string name="settings_phone_number_code">കോഡ്</string>
+    <string name="settings_phone_number_country_label">രാജ്യം</string>
+    <string name="settings_interface_language">ഭാഷ</string>
+    <string name="devices_delete_submit_button_label">സമർപ്പിക്കൂ</string>
+    <string name="settings_devices_list">സെഷനുകൾ</string>
+    <string name="settings_advanced">വിപുലമായ</string>
+    <string name="settings_other">മറ്റുള്ളവ</string>
+    <string name="settings_notifications">അറിയിപ്പുകൾ</string>
+    <string name="settings_notification_privacy_normal">സാധാരണ</string>
+    <string name="room_sliding_menu_settings">ക്രമീകരണങ്ങൾ</string>
+    <string name="room_sliding_menu_messages">സന്ദേശങ്ങൾ</string>
+    <string name="room_settings_forget">മറക്കൂ</string>
+    <string name="room_recents_conversations">മുറികൾ</string>
+    <string name="tab_title_search_files">ഫയലുകൾ</string>
+    <string name="tab_title_search_people">ആളുകൾ</string>
+    <string name="tab_title_search_messages">സന്ദേശങ്ങൾ</string>
+    <string name="tab_title_search_rooms">മുറികൾ</string>
+    <string name="room_details_people_present_group_name">ചേർന്നു</string>
+    <string name="room_details_people_invited_group_name">ക്ഷണിച്ചു</string>
+    <string name="room_details_settings">ക്രമീകരണങ്ങൾ</string>
+    <string name="room_details_files">ഫയലുകൾ</string>
+    <string name="room_details_people">ആളുകൾ</string>
+    <string name="room_permissions_title">അനുമതികൾ</string>
+    <string name="reason_hint">കാരണം</string>
+    <string name="room_participants_action_kick">പുറത്താക്കൂ</string>
+    <string name="room_participants_action_ban">നിരോധിക്കൂ</string>
+    <string name="reset">പുനഃസജ്ജമാക്കൂ</string>
+    <string name="none">ഒന്നുമില്ല</string>
+    <string name="call_only_active">സജീവ കോൾ ()</string>
+    <string name="call_tile_other_declined">%1$s ഈ കോൾ നിരസിച്ചു</string>
+    <string name="new_recovery_method_popup_was_me">അത് ഞാൻ ആയിരുന്നു</string>
+    <string name="finish">പൂർത്തിയാക്കൂ</string>
+    <string name="bootstrap_finish_title">നിങ്ങൾ ചെയ്തു!</string>
+    <string name="confirm_recovery_passphrase">%s ഉറപ്പാക്കൂ</string>
+    <string name="new_session">പുതിയ പ്രവേശനം. ഇത് നിങ്ങളാണോ\?</string>
+    <string name="search">തിരയുക</string>
+    <string name="no_more_results">കൂടുതൽ ഫലങ്ങളൊന്നുമില്ല</string>
+    <string name="system_alerts_header">സിസ്റ്റം അലേർട്ടുകൾ</string>
+    <string name="bottom_action_home">ഹോം</string>
+    <string name="call_anyway">എന്തായാലും വിളിക്കൂ</string>
+    <string name="action_global_search">ആഗോള തിരയൽ</string>
+    <string name="decline">നിരസിക്കുക</string>
+    <string name="play_video">പ്ലേ</string>
+    <string name="permalink">പെർമാലിങ്ക്</string>
+    <string name="dialog_title_third_party_licences">മൂന്നാം കക്ഷി ലൈസൻസുകൾ</string>
+    <string name="verification_profile_warning">മുന്നറിയിപ്പ്</string>
+    <string name="verification_profile_verify">ഉറപ്പാക്കൂ</string>
+    <string name="crosssigning_verify_this_session">ഈ പ്രവേശനം ഉറപ്പാക്കൂ</string>
+    <string name="settings_active_sessions_show_all">എല്ലാ സെഷനുകളും കാണിക്കൂ</string>
+    <string name="settings_active_sessions_list">സജീവ സെഷനുകൾ</string>
+    <string name="room_settings_enable_encryption_dialog_submit">എൻ‌ക്രിപ്ഷൻ പ്രാപ്തമാക്കൂ</string>
+    <string name="settings_category_timeline">സമയരേഖ</string>
+    <string name="room_list_sharing_header_other_rooms">മറ്റ് മുറികൾ</string>
+    <string name="room_list_sharing_header_recent_rooms">സമീപകാല മുറികൾ</string>
+    <string name="room_member_open_or_create_dm">നേരിട്ടുള്ള സന്ദേശം</string>
+    <string name="room_member_power_level_admin_in">%1$s-ലെ അഡ്മിൻ</string>
+    <string name="room_member_power_level_users">ഉപയോക്താക്കൾ</string>
+    <string name="room_member_power_level_admins">അഡ്‌മിനുകൾ</string>
+    <string name="room_profile_section_more_uploads">അപ്‌ലോഡുകൾ</string>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="one">ഒരു വ്യക്തി</item>
+        <item quantity="other">%1$d ആളുകൾ</item>
+    </plurals>
+    <string name="room_profile_section_more_notifications">അറിയിപ്പുകൾ</string>
+    <string name="direct_room_profile_section_more_settings">ക്രമീകരണങ്ങൾ</string>
+    <string name="room_profile_section_more_settings">മുറി ക്രമീകരണങ്ങൾ</string>
+    <string name="room_profile_section_admin">അഡ്മിൻ പ്രവർത്തനങ്ങൾ</string>
+    <string name="room_profile_section_more">കൂടുതൽ</string>
+    <string name="room_profile_section_security_learn_more">കൂടുതൽ അറിയുക</string>
+    <string name="verification_scan_their_code">അവരുടെ കോഡ് സ്കാൻ ചെയ്യൂ</string>
+    <string name="you">നിങ്ങൾ</string>
+    <string name="send_a_sticker">സ്റ്റിക്കർ</string>
+    <string name="sent_a_file">ഫയൽ</string>
+    <string name="sent_an_audio_file">ഓഡിയോ</string>
+    <string name="verification_conclusion_not_secure">സുരക്ഷിതമല്ല</string>
+    <string name="verification_sas_match">അവ പൊരുത്തപ്പെടുന്നു</string>
+    <string name="create_room_in_progress">മുറി സൃഷ്ടിക്കുന്നൂ…</string>
+    <string name="create_room_alias_hint">മുറിയുടെ വിലാസം</string>
+    <string name="hide_advanced">വിപുലമായത് കാണിക്കൂ</string>
+    <string name="show_advanced">വിപുലമായത് കാണിക്കൂ</string>
+    <string name="create_room_encryption_title">എൻ‌ക്രിപ്ഷൻ പ്രാപ്തമാക്കൂ</string>
+    <string name="settings">ക്രമീകരണങ്ങൾ</string>
+    <string name="settings_advanced_settings">വിപുല ക്രമീകരണങ്ങൾ</string>
+    <string name="settings_show_devices_list">എന്റെ എല്ലാ സെഷനുകളും കാണുക</string>
+    <string name="soft_logout_clear_data_title">സ്വകാര്യ ഡാറ്റ മായ്ക്കൂ</string>
+    <string name="seen_by">കണ്ടവർ</string>
+    <string name="soft_logout_clear_data_dialog_title">ഡാറ്റ മായ്ക്കൂ</string>
+    <string name="soft_logout_clear_data_submit">എല്ലാ ഡാറ്റയും മായ്ക്കൂ</string>
+    <string name="bug_report_error_too_short">വിവരണം വളരെ ചെറുതാണ്</string>
+    <string name="devices_other_devices">മറ്റ് സെഷനുകൾ</string>
+    <string name="devices_current_device">നിലവിലെ സെഷൻ</string>
+    <string name="create_room_alias_empty">ദയവായി ഒരു മുറിയുടെ വിലാസം നൽകുക</string>
+    <string name="sent_an_image">ചിത്രം.</string>
+    <string name="sent_a_video">വീഡിയോ.</string>
+    <string name="verification_request_you_accepted">നിങ്ങൾ സ്വീകരിച്ചു</string>
+    <string name="verification_request_other_accepted">%s സ്വീകരിച്ചു</string>
+    <string name="verification_request_you_cancelled">നിങ്ങൾ റദ്ദാക്കി</string>
+    <string name="verification_request_other_cancelled">%s റദ്ദാക്കി</string>
+    <string name="verification_request_waiting">കാത്തിരിക്കുന്നൂ…</string>
 </resources>
\ No newline at end of file

From c938795576b098a4288a1f4025e59a689ed64701 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 22 Jan 2021 17:17:42 +0100
Subject: [PATCH 067/578] Read init sync to a file and split into smaller files
 to handle it

---
 CHANGES.md                                    |   1 +
 ...ventInsertType.java => EventInsertType.kt} |   4 +-
 .../android/sdk/internal/di/MoshiProvider.kt  |   2 +
 .../notification/ProcessEventForPushTask.kt   |   4 +-
 .../sync/InitialSyncStatusRepository.kt       | 111 +++++++++++++
 .../session/sync/InitialSyncStrategy.kt       |  53 ++++++
 .../internal/session/sync/RoomSyncHandler.kt  |  70 ++++++--
 .../sdk/internal/session/sync/SyncAPI.kt      |  13 ++
 .../sdk/internal/session/sync/SyncTask.kt     | 152 +++++++++++++++++-
 .../session/sync/model/LazyRoomSync.kt        |  44 +++++
 .../sync/model/LazyRoomSyncJsonAdapter.kt     |  90 +++++++++++
 .../session/sync/model/RoomsSyncResponse.kt   |   2 +-
 .../android/sdk/internal/util/LogUtil.kt      |  29 ++++
 .../src/main/res/values/strings.xml           |   2 +
 .../vector/app/features/home/HomeActivity.kt  |  18 +++
 vector/src/main/res/menu/home.xml             |  13 +-
 16 files changed, 583 insertions(+), 25 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/{EventInsertType.java => EventInsertType.kt} (88%)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncJsonAdapter.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt

diff --git a/CHANGES.md b/CHANGES.md
index 46057a37ec..930068dd6c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -90,6 +90,7 @@ Improvements 🙌:
  - SSO support for cross signing (#1062)
  - Deactivate account when logged in with SSO (#1264)
  - SSO UIA doesn't work (#2754)
+ - Improve initial sync performance (#983)
 
 Bugfix 🐛:
  - Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.kt
index 05153c5734..463ccb2f46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.database.model;
+package org.matrix.android.sdk.internal.database.model
 
-public enum EventInsertType {
+internal enum class EventInsertType {
     INITIAL_SYNC,
     INCREMENTAL_SYNC,
     PAGINATION,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index 48fa41b350..c0595a9273 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -36,6 +36,7 @@ import org.matrix.android.sdk.internal.network.parsing.ForceToBooleanJsonAdapter
 import org.matrix.android.sdk.internal.network.parsing.RuntimeJsonAdapterFactory
 import org.matrix.android.sdk.internal.network.parsing.TlsVersionMoshiAdapter
 import org.matrix.android.sdk.internal.network.parsing.UriMoshiAdapter
+import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncJsonAdapter
 
 object MoshiProvider {
 
@@ -44,6 +45,7 @@ object MoshiProvider {
             .add(ForceToBooleanJsonAdapter())
             .add(CipherSuiteMoshiAdapter())
             .add(TlsVersionMoshiAdapter())
+            .add(LazyRoomSyncJsonAdapter())
             .add(RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java)
                     .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT)
                     .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
index 7763251a01..4754265c49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
@@ -50,7 +50,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
         }
         val newJoinEvents = params.syncResponse.join
                 .mapNotNull { (key, value) ->
-                    value.timeline?.events?.map { it.copy(roomId = key) }
+                    value.roomSync.timeline?.events?.map { it.copy(roomId = key) }
                 }
                 .flatten()
         val inviteEvents = params.syncResponse.invite
@@ -80,7 +80,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
 
         val allRedactedEvents = params.syncResponse.join
                 .asSequence()
-                .mapNotNull { (_, value) -> value.timeline?.events }
+                .mapNotNull { (_, value) -> value.roomSync.timeline?.events }
                 .flatten()
                 .filter { it.type == EventType.REDACTION }
                 .mapNotNull { it.redacts }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
new file mode 100644
index 0000000000..4b82ecc3e5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+import com.squareup.moshi.JsonClass
+import okio.buffer
+import okio.source
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import timber.log.Timber
+import java.io.File
+
+@JsonClass(generateAdapter = true)
+internal data class InitialSyncStatus(
+        val step: Int = STEP_INIT,
+        val downloadedDate: Long = 0
+) {
+    companion object {
+        const val STEP_INIT = 0
+        const val STEP_DOWNLOADING = 1
+        const val STEP_DOWNLOADED = 2
+        const val STEP_PARSED = 3
+        const val STEP_SUCCESS = 4
+    }
+}
+
+internal interface InitialSyncStatusRepository {
+    fun getStep(): Int
+
+    fun setStep(step: Int)
+}
+
+/**
+ * This class handle the current status of an initial sync and persist it on the disk, to be robust against crash
+ */
+internal class FileInitialSyncStatusRepository(directory: File) : InitialSyncStatusRepository {
+
+    companion object {
+        // After 2 hours, we consider that the downloaded file is outdated:
+        // - if a problem occurs, it's for big accounts, and big accounts have lots of new events in 2 hours
+        // - For small accounts, there should be no problem, so 2 hours delay will never be used.
+        private const val INIT_SYNC_FILE_LIFETIME = 2 * 60 * 60 * 1_000L
+    }
+
+    private val file = File(directory, "status.json")
+    private val jsonAdapter = MoshiProvider.providesMoshi().adapter(InitialSyncStatus::class.java)
+
+    private var cache: InitialSyncStatus? = null
+
+    override fun getStep(): Int {
+        ensureCache()
+        val state = cache?.step ?: InitialSyncStatus.STEP_INIT
+        return if (state >= InitialSyncStatus.STEP_DOWNLOADED
+                && System.currentTimeMillis() > (cache?.downloadedDate ?: 0) + INIT_SYNC_FILE_LIFETIME) {
+            Timber.v("INIT_SYNC downloaded file is outdated, download it again")
+            // The downloaded file is outdated
+            setStep(InitialSyncStatus.STEP_INIT)
+            InitialSyncStatus.STEP_INIT
+        } else {
+            state
+        }
+    }
+
+    override fun setStep(step: Int) {
+        var newStatus = cache?.copy(step = step) ?: InitialSyncStatus(step = step)
+        if (step == InitialSyncStatus.STEP_DOWNLOADED) {
+            // Also store the downloaded date
+            newStatus = newStatus.copy(
+                    downloadedDate = System.currentTimeMillis()
+            )
+        }
+        cache = newStatus
+        writeFile()
+    }
+
+    private fun ensureCache() {
+        if (cache == null) readFile()
+    }
+
+    /**
+     * File -> Cache
+     */
+    private fun readFile() {
+        cache = file
+                .takeIf { it.exists() }
+                ?.let { jsonAdapter.fromJson(it.source().buffer()) }
+    }
+
+    /**
+     * Cache -> File
+     */
+    private fun writeFile() {
+        file.delete()
+        cache
+                ?.let { jsonAdapter.toJson(it) }
+                ?.let { file.writeText(it) }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
new file mode 100644
index 0000000000..fca92870ca
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+var initialSyncStrategy: InitialSyncStrategy = InitialSyncStrategy.Optimized()
+
+sealed class InitialSyncStrategy {
+    /**
+     * Parse the result in its entirety
+     * Pros:
+     * - Faster to handle parsed data
+     * Cons:
+     * - Slower to download and parse data
+     * - big RAM usage
+     * - not robust to crash
+     */
+    object Legacy : InitialSyncStrategy()
+
+    /**
+     * Optimized.
+     * First store the request result in a file, to avoid doing it again in case of crash
+     */
+    data class Optimized(
+            /**
+             * Limit to reach to decide to split the init sync response into smaller files
+             * Empiric value: 1 megabytes
+             */
+            val minSizeToSplit: Long = 1024 * 1024,
+            /**
+             * Limit per room to reach to decide to store a join room into a file
+             * Empiric value: 10 kilobytes
+             */
+            val minSizeToStoreInFile: Long = 10 * 1024,
+            /**
+             * Max number of rooms to insert at a time in database (to avoid too much RAM usage)
+             */
+            val maxRoomsToInsert: Int = 100
+    ) : InitialSyncStrategy()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 6d1b3ae034..979c2888d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -51,6 +51,7 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.extensions.clearWith
 import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
 import org.matrix.android.sdk.internal.session.mapWithProgress
+import org.matrix.android.sdk.internal.session.reportSubtask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberEventHandler
 import org.matrix.android.sdk.internal.session.room.read.FullyReadContent
@@ -59,12 +60,14 @@ import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.internal.session.room.timeline.TimelineInput
 import org.matrix.android.sdk.internal.session.room.typing.TypingEventContent
 import org.matrix.android.sdk.internal.session.sync.model.InvitedRoomSync
+import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
 import org.matrix.android.sdk.internal.session.sync.model.RoomSync
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncAccountData
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral
 import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
 import timber.log.Timber
 import javax.inject.Inject
+import kotlin.math.ceil
 
 internal class RoomSyncHandler @Inject constructor(private val readReceiptHandler: ReadReceiptHandler,
                                                    private val roomSummaryUpdater: RoomSummaryUpdater,
@@ -78,7 +81,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                                    private val timelineInput: TimelineInput) {
 
     sealed class HandlingStrategy {
-        data class JOINED(val data: Map<String, RoomSync>) : HandlingStrategy()
+        data class JOINED(val data: Map<String, LazyRoomSync>) : HandlingStrategy()
         data class INVITED(val data: Map<String, InvitedRoomSync>) : HandlingStrategy()
         data class LEFT(val data: Map<String, RoomSync>) : HandlingStrategy()
     }
@@ -105,10 +108,17 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         }
         val syncLocalTimeStampMillis = System.currentTimeMillis()
         val rooms = when (handlingStrategy) {
-            is HandlingStrategy.JOINED  ->
-                handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_joined_rooms, 0.6f) {
-                    handleJoinedRoom(realm, it.key, it.value, isInitialSync, insertType, syncLocalTimeStampMillis)
+            is HandlingStrategy.JOINED  -> {
+                if (isInitialSync && initialSyncStrategy is InitialSyncStrategy.Optimized) {
+                    insertJoinRooms(realm, handlingStrategy, insertType, syncLocalTimeStampMillis, reporter)
+                    // Rooms are already inserted, return an empty list
+                    emptyList()
+                } else {
+                    handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_joined_rooms, 0.6f) {
+                        handleJoinedRoom(realm, it.key, it.value.roomSync, insertType, syncLocalTimeStampMillis)
+                    }
                 }
+            }
             is HandlingStrategy.INVITED ->
                 handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_invited_rooms, 0.1f) {
                     handleInvitedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
@@ -123,17 +133,57 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         realm.insertOrUpdate(rooms)
     }
 
+    private fun insertJoinRooms(realm: Realm,
+                                handlingStrategy: HandlingStrategy.JOINED,
+                                insertType: EventInsertType,
+                                syncLocalTimeStampMillis: Long,
+                                reporter: DefaultInitialSyncProgressService?) {
+        val maxSize = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
+        val listSize = handlingStrategy.data.keys.size
+        val numberOfChunks = ceil(listSize / maxSize.toDouble()).toInt()
+
+        if (numberOfChunks > 1) {
+            reportSubtask(reporter, R.string.initial_sync_start_importing_account_joined_rooms, numberOfChunks, 0.6f) {
+                val chunkSize = listSize / numberOfChunks
+                Timber.v("INIT_SYNC $listSize rooms to insert, split into $numberOfChunks sublists of $chunkSize items")
+                // I cannot find a better way to chunk a map, so chunk the keys and then create new maps
+                handlingStrategy.data.keys
+                        .chunked(chunkSize)
+                        .forEachIndexed { index, roomIds ->
+                            val roomEntities = roomIds
+                                    .also { Timber.v("INIT_SYNC insert ${roomIds.size} rooms") }
+                                    .map {
+                                        handleJoinedRoom(
+                                                realm,
+                                                it,
+                                                (handlingStrategy.data[it] ?: error("Should not happen")).roomSync,
+                                                insertType,
+                                                syncLocalTimeStampMillis
+                                        )
+                                    }
+                            realm.insertOrUpdate(roomEntities)
+                            reporter?.reportProgress(index + 1)
+                        }
+            }
+        } else {
+            // No need to split
+            val rooms = handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_joined_rooms, 0.6f) {
+                handleJoinedRoom(realm, it.key, it.value.roomSync, insertType, syncLocalTimeStampMillis)
+            }
+            realm.insertOrUpdate(rooms)
+        }
+    }
+
     private fun handleJoinedRoom(realm: Realm,
                                  roomId: String,
                                  roomSync: RoomSync,
-                                 isInitialSync: Boolean,
                                  insertType: EventInsertType,
                                  syncLocalTimestampMillis: Long): RoomEntity {
         Timber.v("Handle join sync for room $roomId")
 
         var ephemeralResult: EphemeralResult? = null
         if (roomSync.ephemeral?.events?.isNotEmpty() == true) {
-            ephemeralResult = handleEphemeral(realm, roomId, roomSync.ephemeral, isInitialSync)
+            ephemeralResult = handleEphemeral(realm, roomId, roomSync.ephemeral, insertType == EventInsertType.INITIAL_SYNC)
         }
 
         if (roomSync.accountData?.events?.isNotEmpty() == true) {
@@ -173,8 +223,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                     roomSync.timeline.prevToken,
                     roomSync.timeline.limited,
                     insertType,
-                    syncLocalTimestampMillis,
-                    isInitialSync
+                    syncLocalTimestampMillis
             )
             roomEntity.addIfNecessary(chunkEntity)
         }
@@ -278,8 +327,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                      prevToken: String? = null,
                                      isLimited: Boolean = true,
                                      insertType: EventInsertType,
-                                     syncLocalTimestampMillis: Long,
-                                     isInitialSync: Boolean): ChunkEntity {
+                                     syncLocalTimestampMillis: Long): ChunkEntity {
         val lastChunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomEntity.roomId)
         val chunkEntity = if (!isLimited && lastChunk != null) {
             lastChunk
@@ -299,7 +347,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
             }
             eventIds.add(event.eventId)
 
-            if (event.isEncrypted() && !isInitialSync) {
+            if (event.isEncrypted() && insertType != EventInsertType.INITIAL_SYNC) {
                 decryptIfNeeded(event, roomId)
             }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
index 77289f04b4..8e3523bc57 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.sync
 
+import okhttp3.ResponseBody
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.network.TimeOutInterceptor
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
@@ -23,6 +24,7 @@ import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.QueryMap
+import retrofit2.http.Streaming
 
 internal interface SyncAPI {
     /**
@@ -34,4 +36,15 @@ internal interface SyncAPI {
              @Header(TimeOutInterceptor.READ_TIMEOUT) readTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
              @Header(TimeOutInterceptor.WRITE_TIMEOUT) writeTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT
     ): Call<SyncResponse>
+
+    /**
+     * Set all the timeouts to 1 minute by default
+     */
+    @Streaming
+    @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sync")
+    fun syncStream(@QueryMap params: Map<String, String>,
+                   @Header(TimeOutInterceptor.CONNECT_TIMEOUT) connectTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
+                   @Header(TimeOutInterceptor.READ_TIMEOUT) readTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
+                   @Header(TimeOutInterceptor.WRITE_TIMEOUT) writeTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT
+    ): Call<ResponseBody>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index bfe3799771..ef766f6d42 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -16,18 +16,32 @@
 
 package org.matrix.android.sdk.internal.session.sync
 
+import okhttp3.ResponseBody
+import okio.buffer
+import okio.source
 import org.matrix.android.sdk.R
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.SessionFilesDirectory
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.TimeOutInterceptor
 import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.toFailure
 import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
 import org.matrix.android.sdk.internal.session.filter.FilterRepository
 import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask
+import org.matrix.android.sdk.internal.session.reportSubtask
+import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
+import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncJsonAdapter
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.session.user.UserStore
 import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.logDuration
+import retrofit2.Response
+import retrofit2.awaitResponse
 import timber.log.Timber
+import java.io.File
+import java.net.SocketTimeoutException
 import javax.inject.Inject
 
 internal interface SyncTask : Task<SyncTask.Params, Unit> {
@@ -48,9 +62,14 @@ internal class DefaultSyncTask @Inject constructor(
         private val getHomeServerCapabilitiesTask: GetHomeServerCapabilitiesTask,
         private val userStore: UserStore,
         private val syncTaskSequencer: SyncTaskSequencer,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        @SessionFilesDirectory
+        private val fileDirectory: File
 ) : SyncTask {
 
+    private val workingDir = File(fileDirectory, "is")
+    private val initialSyncStatusRepository: InitialSyncStatusRepository = FileInitialSyncStatusRepository(workingDir)
+
     override suspend fun execute(params: SyncTask.Params) = syncTaskSequencer.post {
         doSync(params)
     }
@@ -81,20 +100,137 @@ internal class DefaultSyncTask @Inject constructor(
 
         val readTimeOut = (params.timeout + TIMEOUT_MARGIN).coerceAtLeast(TimeOutInterceptor.DEFAULT_LONG_TIMEOUT)
 
-        val syncResponse = executeRequest<SyncResponse>(globalErrorReceiver) {
-            apiCall = syncAPI.sync(
-                    params = requestParams,
-                    readTimeOut = readTimeOut
-            )
-        }
-        syncResponseHandler.handleResponse(syncResponse, token)
         if (isInitialSync) {
+            logDuration("INIT_SYNC strategy: $initialSyncStrategy") {
+                if (initialSyncStrategy is InitialSyncStrategy.Optimized) {
+                    safeInitialSync(requestParams)
+                } else {
+                    val syncResponse = logDuration("INIT_SYNC Request") {
+                        executeRequest<SyncResponse>(globalErrorReceiver) {
+                            apiCall = syncAPI.sync(
+                                    params = requestParams,
+                                    readTimeOut = readTimeOut
+                            )
+                        }
+                    }
+
+                    logDuration("INIT_SYNC Database insertion") {
+                        syncResponseHandler.handleResponse(syncResponse, token)
+                    }
+                }
+            }
             initialSyncProgressService.endAll()
+        } else {
+            val syncResponse = executeRequest<SyncResponse>(globalErrorReceiver) {
+                apiCall = syncAPI.sync(
+                        params = requestParams,
+                        readTimeOut = readTimeOut
+                )
+            }
+            syncResponseHandler.handleResponse(syncResponse, token)
         }
         Timber.v("Sync task finished on Thread: ${Thread.currentThread().name}")
     }
 
+    private suspend fun safeInitialSync(requestParams: Map<String, String>) {
+        workingDir.mkdirs()
+        val workingFile = File(workingDir, "initSync.json")
+        val status = initialSyncStatusRepository.getStep()
+        if (workingFile.exists() && status >= InitialSyncStatus.STEP_DOWNLOADED) {
+            // Go directly to the parse step
+            Timber.v("INIT_SYNC file is already here")
+        } else {
+            initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADING)
+            val syncResponse = logDuration("INIT_SYNC Perform server request") {
+                reportSubtask(initialSyncProgressService, R.string.initial_sync_start_server_computing, 0, 0.5f) {
+                    getSyncResponse(requestParams, MAX_NUMBER_OF_RETRY_AFTER_TIMEOUT)
+                }
+            }
+
+            if (syncResponse.isSuccessful) {
+                logDuration("INIT_SYNC Download and save to file") {
+                    reportSubtask(initialSyncProgressService, R.string.initial_sync_start_downloading, 0, 0.5f) {
+                        syncResponse.body()?.byteStream()?.use { inputStream ->
+                            workingFile.outputStream().use { outputStream ->
+                                inputStream.copyTo(outputStream)
+                            }
+                        }
+                    }
+                }
+            } else {
+                throw syncResponse.toFailure(globalErrorReceiver)
+                        .also { Timber.w("INIT_SYNC request failure: $this") }
+            }
+            initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADED)
+        }
+        handleSyncFile(workingFile)
+
+        // Delete all files
+        workingDir.deleteRecursively()
+    }
+
+    private suspend fun getSyncResponse(requestParams: Map<String, String>, maxNumberOfRetries: Int): Response<ResponseBody> {
+        var retry = maxNumberOfRetries
+        while (true) {
+            retry--
+            try {
+                return syncAPI.syncStream(
+                        params = requestParams
+                ).awaitResponse()
+            } catch (throwable: Throwable) {
+                if (throwable is SocketTimeoutException && retry > 0) {
+                    Timber.w("INIT_SYNC timeout retry left: $retry")
+                } else {
+                    Timber.e(throwable, "INIT_SYNC timeout, no retry left, or other error")
+                    throw throwable
+                }
+            }
+        }
+    }
+
+    private suspend fun handleSyncFile(workingFile: File) {
+        val syncResponseLength = workingFile.length().toInt()
+
+        logDuration("INIT_SYNC handleSyncFile() file size $syncResponseLength bytes") {
+            if (syncResponseLength < (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.minSizeToSplit ?: Long.MAX_VALUE) {
+                // OK, no need to split just handle as a regular sync response
+                Timber.v("INIT_SYNC no need to split")
+                handleInitialSyncFile(workingFile)
+            } else {
+                Timber.v("INIT_SYNC Split into several smaller files")
+                // Set file mode
+                // TODO This is really ugly, I should improve that
+                LazyRoomSyncJsonAdapter.initWith(workingFile)
+
+                handleInitialSyncFile(workingFile)
+
+                // Reset file mode
+                LazyRoomSyncJsonAdapter.reset()
+            }
+        }
+    }
+
+    private suspend fun handleInitialSyncFile(workingFile: File) {
+        val syncResponse = logDuration("INIT_SYNC Read file and parse") {
+            MoshiProvider.providesMoshi().adapter(SyncResponse::class.java)
+                    .fromJson(workingFile.source().buffer())!!
+        }
+        initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_PARSED)
+
+        // Log some stats
+        val nbOfJoinedRooms = syncResponse.rooms?.join?.size ?: 0
+        val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it is LazyRoomSync.Stored }
+        Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile stored into files")
+
+        logDuration("INIT_SYNC Database insertion") {
+            syncResponseHandler.handleResponse(syncResponse, null)
+        }
+        initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
+    }
+
     companion object {
+        private const val MAX_NUMBER_OF_RETRY_AFTER_TIMEOUT = 50
+
         private const val TIMEOUT_MARGIN: Long = 10_000
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt
new file mode 100644
index 0000000000..e7e0dcb8b9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync.model
+
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.JsonReader
+import okio.buffer
+import okio.source
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import java.io.File
+
+@JsonClass(generateAdapter = false)
+internal sealed class LazyRoomSync {
+    data class Parsed(val _roomSync: RoomSync) : LazyRoomSync()
+    data class Stored(val file: File) : LazyRoomSync()
+
+    val roomSync: RoomSync
+        get() {
+            return when (this) {
+                is Parsed -> _roomSync
+                is Stored -> {
+                    // Parse the file now
+                    file.inputStream().use { pos ->
+                        MoshiProvider.providesMoshi().adapter(RoomSync::class.java)
+                                .fromJson(JsonReader.of(pos.source().buffer()))!!
+                    }
+                }
+            }
+        }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncJsonAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncJsonAdapter.kt
new file mode 100644
index 0000000000..edf76d2e77
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncJsonAdapter.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync.model
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
+import org.matrix.android.sdk.internal.session.sync.initialSyncStrategy
+import timber.log.Timber
+import java.io.File
+import java.util.concurrent.atomic.AtomicInteger
+
+internal class LazyRoomSyncJsonAdapter : JsonAdapter<LazyRoomSync>() {
+
+    @FromJson
+    override fun fromJson(reader: JsonReader): LazyRoomSync {
+        return if (workingDirectory != null) {
+            val path = reader.path
+            // val roomId = reader.path.substringAfter("\$.rooms.join.")
+
+            // inputStream.available() return 0... So read it to a String then decide to store in a file or to parse it now
+            val json = reader.nextSource().inputStream().bufferedReader().use {
+                it.readText()
+            }
+
+            val limit = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.minSizeToStoreInFile ?: Long.MAX_VALUE
+            if (json.length > limit) {
+                Timber.v("INIT_SYNC $path content length: ${json.length} copy to a file")
+                // Copy the source to a file
+                val file = createFile()
+                file.writeText(json)
+                LazyRoomSync.Stored(file)
+            } else {
+                Timber.v("INIT_SYNC $path content length: ${json.length} parse it now")
+                // Parse it now
+                val roomSync = MoshiProvider.providesMoshi().adapter(RoomSync::class.java).fromJson(json)!!
+                LazyRoomSync.Parsed(roomSync)
+            }
+        } else {
+            // Parse it now
+            val roomSync = MoshiProvider.providesMoshi().adapter(RoomSync::class.java).fromJson(reader)!!
+            LazyRoomSync.Parsed(roomSync)
+        }
+    }
+
+    @ToJson
+    override fun toJson(writer: JsonWriter, value: LazyRoomSync?) {
+        // This Adapter is not supposed to serialize object
+        throw UnsupportedOperationException()
+    }
+
+    companion object {
+        fun initWith(file: File) {
+            workingDirectory = file.parentFile
+            atomicInteger.set(0)
+        }
+
+        fun reset() {
+            workingDirectory = null
+        }
+
+        private fun createFile(): File {
+            val parent = workingDirectory ?: error("workingDirectory is not initialized")
+            val index = atomicInteger.getAndIncrement()
+
+            return File(parent, "room_$index.json")
+        }
+
+        private var workingDirectory: File? = null
+        private val atomicInteger = AtomicInteger(0)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
index dd2f96c988..a62d80a088 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
@@ -24,7 +24,7 @@ internal data class RoomsSyncResponse(
         /**
          * Joined rooms: keys are rooms ids.
          */
-        @Json(name = "join") val join: Map<String, RoomSync> = emptyMap(),
+        @Json(name = "join") val join: Map<String, LazyRoomSync> = emptyMap(),
 
         /**
          * Invitations. The rooms that the user has been invited to: keys are rooms ids.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
new file mode 100644
index 0000000000..1a4f42a533
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util
+
+import timber.log.Timber
+
+internal suspend fun <T> logDuration(message: String,
+                                     block: suspend () -> T): T {
+    Timber.v("$message -- BEGIN")
+    val start = System.currentTimeMillis()
+    val result = block()
+    val duration = System.currentTimeMillis() - start
+    Timber.v("$message -- END duration: $duration ms")
+    return result
+}
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index 26b9bc19d9..b93d9b680e 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -199,6 +199,8 @@
     <string name="room_displayname_empty_room">Empty room</string>
     <string name="room_displayname_empty_room_was">Empty room (was %s)</string>
 
+    <string name="initial_sync_start_server_computing">Initial Sync:\nWaiting for server response…</string>
+    <string name="initial_sync_start_downloading">Initial Sync:\nDownloading data…</string>
     <string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
     <string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
     <string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 6a381ec049..2d884f1ba7 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -40,6 +40,8 @@ import im.vector.app.core.platform.ToolbarConfigurable
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.pushers.PushersManager
 import im.vector.app.databinding.ActivityHomeBinding
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.disclaimer.showDisclaimerDialog
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.notifications.NotificationDrawerManager
@@ -60,6 +62,8 @@ import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
+import org.matrix.android.sdk.internal.session.sync.initialSyncStrategy
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -368,6 +372,20 @@ class HomeActivity :
                 bugReporter.openBugReportScreen(this, false)
                 return true
             }
+            R.id.menu_home_init_sync_legacy -> {
+                // Configure the SDK
+                initialSyncStrategy = InitialSyncStrategy.Legacy
+                // And clear cache
+                MainActivity.restartApp(this, MainActivityArgs(clearCache = true))
+                return true
+            }
+            R.id.menu_home_init_sync_optimized -> {
+                // Configure the SDK
+                initialSyncStrategy = InitialSyncStrategy.Optimized()
+                // And clear cache
+                MainActivity.restartApp(this, MainActivityArgs(clearCache = true))
+                return true
+            }
             R.id.menu_home_filter -> {
                 navigator.openRoomsFiltering(this)
                 return true
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/home.xml
index 7a77c45240..66cbf53bfd 100644
--- a/vector/src/main/res/menu/home.xml
+++ b/vector/src/main/res/menu/home.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <item
         android:id="@+id/menu_home_setting"
@@ -18,6 +19,16 @@
         android:icon="@drawable/ic_material_bug_report"
         android:title="@string/send_bug_report" />
 
+    <item
+        android:id="@+id/menu_home_init_sync_legacy"
+        android:title="Init sync legacy"
+        tools:ignore="HardcodedText" />
+
+    <item
+        android:id="@+id/menu_home_init_sync_optimized"
+        android:title="Init sync optimized"
+        tools:ignore="HardcodedText" />
+
     <item
         android:id="@+id/menu_home_filter"
         android:icon="@drawable/ic_search"

From 39e66555f4664a5f57b1746415e3b8c8a0367311 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 26 Jan 2021 13:45:17 +0100
Subject: [PATCH 068/578] Try to log RAM usage

---
 .../org/matrix/android/sdk/internal/util/LogUtil.kt    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
index 1a4f42a533..2bd9f46a4c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
@@ -20,10 +20,18 @@ import timber.log.Timber
 
 internal suspend fun <T> logDuration(message: String,
                                      block: suspend () -> T): T {
+    val runtime = Runtime.getRuntime()
+    runtime.gc()
+    val usedMemInMBStart = (runtime.totalMemory() - runtime.freeMemory()) / 1048576L
+
     Timber.v("$message -- BEGIN")
     val start = System.currentTimeMillis()
     val result = block()
     val duration = System.currentTimeMillis() - start
-    Timber.v("$message -- END duration: $duration ms")
+    runtime.gc()
+    val usedMemInMBEnd = (runtime.totalMemory() - runtime.freeMemory()) / 1048576L
+    val usedMemInMBDiff = usedMemInMBEnd - usedMemInMBStart
+
+    Timber.v("$message -- END duration: $duration ms RAM usage: $usedMemInMBDiff MB")
     return result
 }

From 8e2161bd9ee71823473f5e2ba97e3cd85d296c0e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Feb 2021 15:37:46 +0100
Subject: [PATCH 069/578] Log free memory before starting a task

---
 .../java/org/matrix/android/sdk/internal/util/LogUtil.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
index 2bd9f46a4c..4dc71655ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
@@ -22,9 +22,10 @@ internal suspend fun <T> logDuration(message: String,
                                      block: suspend () -> T): T {
     val runtime = Runtime.getRuntime()
     runtime.gc()
-    val usedMemInMBStart = (runtime.totalMemory() - runtime.freeMemory()) / 1048576L
+    val freeMemoryInMb = runtime.freeMemory() / 1048576L
+    val usedMemInMBStart = runtime.totalMemory() / 1048576L - freeMemoryInMb
 
-    Timber.v("$message -- BEGIN")
+    Timber.v("$message -- BEGIN (free memory: $freeMemoryInMb MB)")
     val start = System.currentTimeMillis()
     val result = block()
     val duration = System.currentTimeMillis() - start

From 3633199e683cfc308167d8dda4e5cc3890724d57 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Thu, 4 Feb 2021 14:01:21 +0100
Subject: [PATCH 070/578] Sync : clean a bit by introducing 2 moshi adapters

---
 matrix-sdk-android/build.gradle               |  2 +
 .../android/sdk/internal/di/MoshiProvider.kt  |  5 +-
 .../sdk/internal/session/sync/SyncTask.kt     | 67 +++++---------
 .../session/sync/model/LazyRoomSync.kt        |  7 +-
 .../sync/model/LazyRoomSyncJsonAdapter.kt     | 90 -------------------
 .../sync/parsing/InitialSyncResponseParser.kt | 48 ++++++++++
 .../sync/parsing/LazyRoomSyncJsonAdapters.kt  | 85 ++++++++++++++++++
 7 files changed, 163 insertions(+), 141 deletions(-)
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncJsonAdapter.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 3ade9f7214..4f8604bfc1 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -13,6 +13,7 @@ buildscript {
     }
 }
 
+
 android {
     compileSdkVersion 30
     testOptions.unitTests.includeAndroidResources = true
@@ -88,6 +89,7 @@ android {
             java.srcDirs += "src/sharedTest/java"
         }
     }
+
 }
 
 static def gitRevision() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index c0595a9273..b6bc17eaa0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -36,7 +36,7 @@ import org.matrix.android.sdk.internal.network.parsing.ForceToBooleanJsonAdapter
 import org.matrix.android.sdk.internal.network.parsing.RuntimeJsonAdapterFactory
 import org.matrix.android.sdk.internal.network.parsing.TlsVersionMoshiAdapter
 import org.matrix.android.sdk.internal.network.parsing.UriMoshiAdapter
-import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncJsonAdapter
+import org.matrix.android.sdk.internal.session.sync.parsing.DefaultLazyRoomSyncJsonAdapter
 
 object MoshiProvider {
 
@@ -45,7 +45,8 @@ object MoshiProvider {
             .add(ForceToBooleanJsonAdapter())
             .add(CipherSuiteMoshiAdapter())
             .add(TlsVersionMoshiAdapter())
-            .add(LazyRoomSyncJsonAdapter())
+            // Use addLast here so we can inject a SplitLazyRoomSyncJsonAdapter later to override the default parsing.
+            .addLast(DefaultLazyRoomSyncJsonAdapter())
             .add(RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java)
                     .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT)
                     .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index ef766f6d42..dde3da48c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -17,10 +17,7 @@
 package org.matrix.android.sdk.internal.session.sync
 
 import okhttp3.ResponseBody
-import okio.buffer
-import okio.source
 import org.matrix.android.sdk.R
-import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.di.SessionFilesDirectory
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
@@ -32,8 +29,8 @@ import org.matrix.android.sdk.internal.session.filter.FilterRepository
 import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask
 import org.matrix.android.sdk.internal.session.reportSubtask
 import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
-import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncJsonAdapter
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
+import org.matrix.android.sdk.internal.session.sync.parsing.InitialSyncResponseParser
 import org.matrix.android.sdk.internal.session.user.UserStore
 import org.matrix.android.sdk.internal.task.Task
 import org.matrix.android.sdk.internal.util.logDuration
@@ -64,7 +61,8 @@ internal class DefaultSyncTask @Inject constructor(
         private val syncTaskSequencer: SyncTaskSequencer,
         private val globalErrorReceiver: GlobalErrorReceiver,
         @SessionFilesDirectory
-        private val fileDirectory: File
+        private val fileDirectory: File,
+        private val syncResponseParser: InitialSyncResponseParser
 ) : SyncTask {
 
     private val workingDir = File(fileDirectory, "is")
@@ -101,9 +99,10 @@ internal class DefaultSyncTask @Inject constructor(
         val readTimeOut = (params.timeout + TIMEOUT_MARGIN).coerceAtLeast(TimeOutInterceptor.DEFAULT_LONG_TIMEOUT)
 
         if (isInitialSync) {
-            logDuration("INIT_SYNC strategy: $initialSyncStrategy") {
-                if (initialSyncStrategy is InitialSyncStrategy.Optimized) {
-                    safeInitialSync(requestParams)
+            val initSyncStrategy = initialSyncStrategy
+            logDuration("INIT_SYNC strategy: $initSyncStrategy") {
+                if (initSyncStrategy is InitialSyncStrategy.Optimized) {
+                    safeInitialSync(requestParams, initSyncStrategy)
                 } else {
                     val syncResponse = logDuration("INIT_SYNC Request") {
                         executeRequest<SyncResponse>(globalErrorReceiver) {
@@ -132,7 +131,7 @@ internal class DefaultSyncTask @Inject constructor(
         Timber.v("Sync task finished on Thread: ${Thread.currentThread().name}")
     }
 
-    private suspend fun safeInitialSync(requestParams: Map<String, String>) {
+    private suspend fun safeInitialSync(requestParams: Map<String, String>, initSyncStrategy: InitialSyncStrategy.Optimized) {
         workingDir.mkdirs()
         val workingFile = File(workingDir, "initSync.json")
         val status = initialSyncStatusRepository.getStep()
@@ -163,7 +162,7 @@ internal class DefaultSyncTask @Inject constructor(
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADED)
         }
-        handleSyncFile(workingFile)
+        handleSyncFile(workingFile, initSyncStrategy)
 
         // Delete all files
         workingDir.deleteRecursively()
@@ -188,44 +187,22 @@ internal class DefaultSyncTask @Inject constructor(
         }
     }
 
-    private suspend fun handleSyncFile(workingFile: File) {
-        val syncResponseLength = workingFile.length().toInt()
-
-        logDuration("INIT_SYNC handleSyncFile() file size $syncResponseLength bytes") {
-            if (syncResponseLength < (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.minSizeToSplit ?: Long.MAX_VALUE) {
-                // OK, no need to split just handle as a regular sync response
-                Timber.v("INIT_SYNC no need to split")
-                handleInitialSyncFile(workingFile)
-            } else {
-                Timber.v("INIT_SYNC Split into several smaller files")
-                // Set file mode
-                // TODO This is really ugly, I should improve that
-                LazyRoomSyncJsonAdapter.initWith(workingFile)
-
-                handleInitialSyncFile(workingFile)
-
-                // Reset file mode
-                LazyRoomSyncJsonAdapter.reset()
+    private suspend fun handleSyncFile(workingFile: File, initSyncStrategy: InitialSyncStrategy.Optimized) {
+        logDuration("INIT_SYNC handleSyncFile()") {
+            val syncResponse = logDuration("INIT_SYNC Read file and parse") {
+                syncResponseParser.parse(initSyncStrategy, workingFile)
             }
-        }
-    }
+            initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_PARSED)
+            // Log some stats
+            val nbOfJoinedRooms = syncResponse.rooms?.join?.size ?: 0
+            val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it is LazyRoomSync.Stored }
+            Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile stored into files")
 
-    private suspend fun handleInitialSyncFile(workingFile: File) {
-        val syncResponse = logDuration("INIT_SYNC Read file and parse") {
-            MoshiProvider.providesMoshi().adapter(SyncResponse::class.java)
-                    .fromJson(workingFile.source().buffer())!!
+            logDuration("INIT_SYNC Database insertion") {
+                syncResponseHandler.handleResponse(syncResponse, null)
+            }
+            initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
         }
-        initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_PARSED)
-
-        // Log some stats
-        val nbOfJoinedRooms = syncResponse.rooms?.join?.size ?: 0
-        val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it is LazyRoomSync.Stored }
-        Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile stored into files")
-
-        logDuration("INIT_SYNC Database insertion") {
-            syncResponseHandler.handleResponse(syncResponse, null)
-        }
-        initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
     }
 
     companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt
index e7e0dcb8b9..1f6e3de9a4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt
@@ -16,17 +16,17 @@
 
 package org.matrix.android.sdk.internal.session.sync.model
 
+import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.JsonReader
 import okio.buffer
 import okio.source
-import org.matrix.android.sdk.internal.di.MoshiProvider
 import java.io.File
 
 @JsonClass(generateAdapter = false)
 internal sealed class LazyRoomSync {
     data class Parsed(val _roomSync: RoomSync) : LazyRoomSync()
-    data class Stored(val file: File) : LazyRoomSync()
+    data class Stored(val roomSyncAdapter: JsonAdapter<RoomSync>, val file: File) : LazyRoomSync()
 
     val roomSync: RoomSync
         get() {
@@ -35,8 +35,7 @@ internal sealed class LazyRoomSync {
                 is Stored -> {
                     // Parse the file now
                     file.inputStream().use { pos ->
-                        MoshiProvider.providesMoshi().adapter(RoomSync::class.java)
-                                .fromJson(JsonReader.of(pos.source().buffer()))!!
+                        roomSyncAdapter.fromJson(JsonReader.of(pos.source().buffer()))!!
                     }
                 }
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncJsonAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncJsonAdapter.kt
deleted file mode 100644
index edf76d2e77..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncJsonAdapter.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.session.sync.model
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.JsonReader
-import com.squareup.moshi.JsonWriter
-import com.squareup.moshi.ToJson
-import org.matrix.android.sdk.internal.di.MoshiProvider
-import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
-import org.matrix.android.sdk.internal.session.sync.initialSyncStrategy
-import timber.log.Timber
-import java.io.File
-import java.util.concurrent.atomic.AtomicInteger
-
-internal class LazyRoomSyncJsonAdapter : JsonAdapter<LazyRoomSync>() {
-
-    @FromJson
-    override fun fromJson(reader: JsonReader): LazyRoomSync {
-        return if (workingDirectory != null) {
-            val path = reader.path
-            // val roomId = reader.path.substringAfter("\$.rooms.join.")
-
-            // inputStream.available() return 0... So read it to a String then decide to store in a file or to parse it now
-            val json = reader.nextSource().inputStream().bufferedReader().use {
-                it.readText()
-            }
-
-            val limit = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.minSizeToStoreInFile ?: Long.MAX_VALUE
-            if (json.length > limit) {
-                Timber.v("INIT_SYNC $path content length: ${json.length} copy to a file")
-                // Copy the source to a file
-                val file = createFile()
-                file.writeText(json)
-                LazyRoomSync.Stored(file)
-            } else {
-                Timber.v("INIT_SYNC $path content length: ${json.length} parse it now")
-                // Parse it now
-                val roomSync = MoshiProvider.providesMoshi().adapter(RoomSync::class.java).fromJson(json)!!
-                LazyRoomSync.Parsed(roomSync)
-            }
-        } else {
-            // Parse it now
-            val roomSync = MoshiProvider.providesMoshi().adapter(RoomSync::class.java).fromJson(reader)!!
-            LazyRoomSync.Parsed(roomSync)
-        }
-    }
-
-    @ToJson
-    override fun toJson(writer: JsonWriter, value: LazyRoomSync?) {
-        // This Adapter is not supposed to serialize object
-        throw UnsupportedOperationException()
-    }
-
-    companion object {
-        fun initWith(file: File) {
-            workingDirectory = file.parentFile
-            atomicInteger.set(0)
-        }
-
-        fun reset() {
-            workingDirectory = null
-        }
-
-        private fun createFile(): File {
-            val parent = workingDirectory ?: error("workingDirectory is not initialized")
-            val index = atomicInteger.getAndIncrement()
-
-            return File(parent, "room_$index.json")
-        }
-
-        private var workingDirectory: File? = null
-        private val atomicInteger = AtomicInteger(0)
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
new file mode 100644
index 0000000000..760f25270f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync.parsing
+
+import com.squareup.moshi.Moshi
+import okio.buffer
+import okio.source
+import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
+import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
+import timber.log.Timber
+import java.io.File
+import javax.inject.Inject
+
+internal class InitialSyncResponseParser @Inject constructor(private val moshi: Moshi) {
+
+    fun parse(syncStrategy: InitialSyncStrategy.Optimized, workingFile: File): SyncResponse {
+        val syncResponseLength = workingFile.length().toInt()
+        Timber.v("Sync file size is $syncResponseLength bytes")
+        val shouldSplit = syncResponseLength >= syncStrategy.minSizeToSplit
+        Timber.v("INIT_SYNC should split in several files: $shouldSplit")
+        return getMoshi(syncStrategy, workingFile, shouldSplit)
+                .adapter(SyncResponse::class.java)
+                .fromJson(workingFile.source().buffer())!!
+    }
+
+    private fun getMoshi(syncStrategy: InitialSyncStrategy.Optimized, workingFile: File, shouldSplit: Boolean): Moshi {
+        // If we don't have to split we'll rely on the already default moshi
+        if (!shouldSplit) return moshi
+        // Otherwise, we create a new adapter for handling Map of Lazy sync
+        return moshi.newBuilder()
+                .add(SplitLazyRoomSyncJsonAdapter(workingFile, syncStrategy))
+                .build()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
new file mode 100644
index 0000000000..232e2fe99e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync.parsing
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
+import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
+import org.matrix.android.sdk.internal.session.sync.model.RoomSync
+import timber.log.Timber
+import java.io.File
+import java.util.concurrent.atomic.AtomicInteger
+
+internal class DefaultLazyRoomSyncJsonAdapter() {
+
+    @FromJson
+    fun fromJson(reader: JsonReader, delegate: JsonAdapter<RoomSync>): LazyRoomSync? {
+        val roomSync = delegate.fromJson(reader) ?: return null
+        return LazyRoomSync.Parsed(roomSync)
+    }
+
+    @ToJson
+    fun toJson(writer: JsonWriter, value: LazyRoomSync?) {
+        // This Adapter is not supposed to serialize object
+        Timber.v("To json $value with $writer")
+        throw UnsupportedOperationException()
+    }
+}
+
+internal class SplitLazyRoomSyncJsonAdapter(
+        private val workingDirectory: File,
+        private val syncStrategy: InitialSyncStrategy.Optimized
+) {
+
+    private val atomicInteger = AtomicInteger(0)
+
+    private fun createFile(): File {
+        val index = atomicInteger.getAndIncrement()
+        return File(workingDirectory.parentFile, "room_$index.json")
+    }
+
+    @FromJson
+    fun fromJson(reader: JsonReader, delegate: JsonAdapter<RoomSync>): LazyRoomSync? {
+        val path = reader.path
+        val json = reader.nextSource().inputStream().bufferedReader().use {
+            it.readText()
+        }
+        val limit = syncStrategy.minSizeToStoreInFile
+        return if (json.length > limit) {
+            Timber.v("INIT_SYNC $path content length: ${json.length} copy to a file")
+            // Copy the source to a file
+            val file = createFile()
+            file.writeText(json)
+            LazyRoomSync.Stored(delegate, file)
+        } else {
+            Timber.v("INIT_SYNC $path content length: ${json.length} parse it now")
+            val roomSync = delegate.fromJson(json) ?: return null
+            LazyRoomSync.Parsed(roomSync)
+        }
+    }
+
+    @ToJson
+    fun toJson(writer: JsonWriter, value: LazyRoomSync?) {
+        // This Adapter is not supposed to serialize object
+        Timber.v("To json $value with $writer")
+        throw UnsupportedOperationException()
+    }
+}

From 218be86c683cadc6c864214df9287367da881c87 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Feb 2021 18:14:57 +0100
Subject: [PATCH 071/578] Cleanup

---
 matrix-sdk-android/build.gradle                              | 2 --
 .../session/sync/parsing/InitialSyncResponseParser.kt        | 2 +-
 .../session/sync/parsing/LazyRoomSyncJsonAdapters.kt         | 5 ++---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 4f8604bfc1..3ade9f7214 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -13,7 +13,6 @@ buildscript {
     }
 }
 
-
 android {
     compileSdkVersion 30
     testOptions.unitTests.includeAndroidResources = true
@@ -89,7 +88,6 @@ android {
             java.srcDirs += "src/sharedTest/java"
         }
     }
-
 }
 
 static def gitRevision() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
index 760f25270f..8368351419 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
index 232e2fe99e..2d25d0bc2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import timber.log.Timber
 import java.io.File
 import java.util.concurrent.atomic.AtomicInteger
 
-internal class DefaultLazyRoomSyncJsonAdapter() {
+internal class DefaultLazyRoomSyncJsonAdapter {
 
     @FromJson
     fun fromJson(reader: JsonReader, delegate: JsonAdapter<RoomSync>): LazyRoomSync? {
@@ -48,7 +48,6 @@ internal class SplitLazyRoomSyncJsonAdapter(
         private val workingDirectory: File,
         private val syncStrategy: InitialSyncStrategy.Optimized
 ) {
-
     private val atomicInteger = AtomicInteger(0)
 
     private fun createFile(): File {

From 440d01c5525c3848b7a4cb78daf45d6ffad3e449 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Feb 2021 18:29:22 +0100
Subject: [PATCH 072/578] Do not log RAM usage in release

---
 .../android/sdk/internal/util/LogUtil.kt      | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
index 4dc71655ab..fe68b49a5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
@@ -16,23 +16,36 @@
 
 package org.matrix.android.sdk.internal.util
 
+import org.matrix.android.sdk.BuildConfig
 import timber.log.Timber
 
 internal suspend fun <T> logDuration(message: String,
                                      block: suspend () -> T): T {
-    val runtime = Runtime.getRuntime()
-    runtime.gc()
-    val freeMemoryInMb = runtime.freeMemory() / 1048576L
-    val usedMemInMBStart = runtime.totalMemory() / 1048576L - freeMemoryInMb
-
-    Timber.v("$message -- BEGIN (free memory: $freeMemoryInMb MB)")
+    Timber.v("$message -- BEGIN")
     val start = System.currentTimeMillis()
-    val result = block()
+    val result = logRamUsage(message) {
+        block()
+    }
     val duration = System.currentTimeMillis() - start
-    runtime.gc()
-    val usedMemInMBEnd = (runtime.totalMemory() - runtime.freeMemory()) / 1048576L
-    val usedMemInMBDiff = usedMemInMBEnd - usedMemInMBStart
+    Timber.v("$message -- END duration: $duration ms")
 
-    Timber.v("$message -- END duration: $duration ms RAM usage: $usedMemInMBDiff MB")
     return result
 }
+
+internal suspend fun <T> logRamUsage(message: String, block: suspend () -> T): T {
+    return if (BuildConfig.DEBUG) {
+        val runtime = Runtime.getRuntime()
+        runtime.gc()
+        val freeMemoryInMb = runtime.freeMemory() / 1048576L
+        val usedMemInMBStart = runtime.totalMemory() / 1048576L - freeMemoryInMb
+        Timber.v("$message -- BEGIN (free memory: $freeMemoryInMb MB)")
+        val result = block()
+        runtime.gc()
+        val usedMemInMBEnd = (runtime.totalMemory() - runtime.freeMemory()) / 1048576L
+        val usedMemInMBDiff = usedMemInMBEnd - usedMemInMBStart
+        Timber.v("$message -- END RAM usage: $usedMemInMBDiff MB")
+        result
+    } else {
+        block()
+    }
+}

From e069e196af71e4c3d0a737f9cf3add080f699f5d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Feb 2021 18:42:49 +0100
Subject: [PATCH 073/578] Improve log

---
 .../internal/session/sync/parsing/InitialSyncResponseParser.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
index 8368351419..6145793178 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
@@ -29,7 +29,7 @@ internal class InitialSyncResponseParser @Inject constructor(private val moshi:
 
     fun parse(syncStrategy: InitialSyncStrategy.Optimized, workingFile: File): SyncResponse {
         val syncResponseLength = workingFile.length().toInt()
-        Timber.v("Sync file size is $syncResponseLength bytes")
+        Timber.v("INIT_SYNC Sync file size is $syncResponseLength bytes")
         val shouldSplit = syncResponseLength >= syncStrategy.minSizeToSplit
         Timber.v("INIT_SYNC should split in several files: $shouldSplit")
         return getMoshi(syncStrategy, workingFile, shouldSplit)

From a2225b3f760ae56702719ec44a48f1e39de3db23 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Feb 2021 18:56:41 +0100
Subject: [PATCH 074/578] Improve code about path

---
 .../session/sync/parsing/InitialSyncResponseParser.kt       | 6 +++---
 .../session/sync/parsing/LazyRoomSyncJsonAdapters.kt        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
index 6145793178..ae7b2a4468 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
@@ -32,17 +32,17 @@ internal class InitialSyncResponseParser @Inject constructor(private val moshi:
         Timber.v("INIT_SYNC Sync file size is $syncResponseLength bytes")
         val shouldSplit = syncResponseLength >= syncStrategy.minSizeToSplit
         Timber.v("INIT_SYNC should split in several files: $shouldSplit")
-        return getMoshi(syncStrategy, workingFile, shouldSplit)
+        return getMoshi(syncStrategy, workingFile.parentFile!!, shouldSplit)
                 .adapter(SyncResponse::class.java)
                 .fromJson(workingFile.source().buffer())!!
     }
 
-    private fun getMoshi(syncStrategy: InitialSyncStrategy.Optimized, workingFile: File, shouldSplit: Boolean): Moshi {
+    private fun getMoshi(syncStrategy: InitialSyncStrategy.Optimized, workingDirectory: File, shouldSplit: Boolean): Moshi {
         // If we don't have to split we'll rely on the already default moshi
         if (!shouldSplit) return moshi
         // Otherwise, we create a new adapter for handling Map of Lazy sync
         return moshi.newBuilder()
-                .add(SplitLazyRoomSyncJsonAdapter(workingFile, syncStrategy))
+                .add(SplitLazyRoomSyncJsonAdapter(workingDirectory, syncStrategy))
                 .build()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
index 2d25d0bc2e..951fdf86aa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
@@ -52,7 +52,7 @@ internal class SplitLazyRoomSyncJsonAdapter(
 
     private fun createFile(): File {
         val index = atomicInteger.getAndIncrement()
-        return File(workingDirectory.parentFile, "room_$index.json")
+        return File(workingDirectory, "room_$index.json")
     }
 
     @FromJson

From 4e1fcf87ae2c4e4cd276fd24875642f1809554ea Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Feb 2021 19:44:02 +0100
Subject: [PATCH 075/578] Improve DefaultInitialSyncProgressService

---
 .../DefaultInitialSyncProgressService.kt      | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
index 9918e83fbc..9c816964db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
@@ -19,11 +19,14 @@ import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.internal.util.StringProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 @SessionScope
-class DefaultInitialSyncProgressService @Inject constructor() : InitialSyncProgressService {
+internal class DefaultInitialSyncProgressService @Inject constructor(
+        private val stringProvider: StringProvider
+) : InitialSyncProgressService {
 
     private val status = MutableLiveData<InitialSyncProgressService.Status>()
 
@@ -40,10 +43,12 @@ class DefaultInitialSyncProgressService @Inject constructor() : InitialSyncProgr
         } else {
             val currentLeaf = rootTask!!.leaf()
 
-            val newTask = TaskInfo(nameRes,
-                    totalProgress,
-                    currentLeaf,
-                    parentWeight)
+            val newTask = TaskInfo(
+                    nameRes = nameRes,
+                    totalProgress = totalProgress,
+                    parent = currentLeaf,
+                    parentWeight = parentWeight
+            )
 
             currentLeaf.child = newTask
         }
@@ -72,11 +77,11 @@ class DefaultInitialSyncProgressService @Inject constructor() : InitialSyncProgr
         status.postValue(InitialSyncProgressService.Status.Idle)
     }
 
-    private inner class TaskInfo(@StringRes var nameRes: Int,
-                                 var totalProgress: Int,
-                                 var parent: TaskInfo? = null,
-                                 var parentWeight: Float = 1f,
-                                 var offset: Int = parent?.currentProgress ?: 0) {
+    private inner class TaskInfo(@StringRes val nameRes: Int,
+                                 val totalProgress: Int,
+                                 val parent: TaskInfo? = null,
+                                 val parentWeight: Float = 1f,
+                                 val offset: Int = parent?.currentProgress ?: 0) {
         var child: TaskInfo? = null
         var currentProgress: Int = 0
 
@@ -97,32 +102,32 @@ class DefaultInitialSyncProgressService @Inject constructor() : InitialSyncProgr
         fun setProgress(progress: Int) {
             currentProgress = progress
 //            val newProgress = Math.min(currentProgress + progress, totalProgress)
-            parent?.let {
+            if (parent != null) {
                 val parentProgress = (currentProgress * parentWeight).toInt()
-                it.setProgress(offset + parentProgress)
-            } ?: run {
-                Timber.v("--- ${leaf().nameRes}: $currentProgress")
+                parent.setProgress(offset + parentProgress)
+            } else {
+                Timber.v("--- ${stringProvider.getString(leaf().nameRes)}: $currentProgress")
                 status.postValue(InitialSyncProgressService.Status.Progressing(leaf().nameRes, currentProgress))
             }
         }
     }
 }
 
-inline fun <T> reportSubtask(reporter: DefaultInitialSyncProgressService?,
-                             @StringRes nameRes: Int,
-                             totalProgress: Int,
-                             parentWeight: Float = 1f,
-                             block: () -> T): T {
+internal inline fun <T> reportSubtask(reporter: DefaultInitialSyncProgressService?,
+                                      @StringRes nameRes: Int,
+                                      totalProgress: Int,
+                                      parentWeight: Float = 1f,
+                                      block: () -> T): T {
     reporter?.startTask(nameRes, totalProgress, parentWeight)
     return block().also {
         reporter?.endTask(nameRes)
     }
 }
 
-inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: DefaultInitialSyncProgressService?,
-                                                   taskId: Int,
-                                                   weight: Float,
-                                                   transform: (Map.Entry<K, V>) -> R): List<R> {
+internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: DefaultInitialSyncProgressService?,
+                                                            taskId: Int,
+                                                            weight: Float,
+                                                            transform: (Map.Entry<K, V>) -> R): List<R> {
     val total = count().toFloat()
     var current = 0
     reporter?.startTask(taskId, 100, weight)

From 5e7b36d319d54920610af47d6b49871376754c40 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 8 Feb 2021 22:49:07 +0100
Subject: [PATCH 076/578] Fix issue with progress

---
 .../DefaultInitialSyncProgressService.kt      | 40 +++++++++----------
 .../session/sync/CryptoSyncHandler.kt         |  2 +-
 .../internal/session/sync/RoomSyncHandler.kt  |  2 +-
 .../session/sync/SyncResponseHandler.kt       | 12 +++---
 .../sdk/internal/session/sync/SyncTask.kt     | 19 +++++----
 5 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
index 9c816964db..d84a39f462 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
@@ -36,7 +36,7 @@ internal class DefaultInitialSyncProgressService @Inject constructor(
         return status
     }
 
-    fun startTask(@StringRes nameRes: Int, totalProgress: Int, parentWeight: Float = 1f) {
+    fun startTask(@StringRes nameRes: Int, totalProgress: Int, parentWeight: Float) {
         // Create a rootTask, or add a child to the leaf
         if (rootTask == null) {
             rootTask = TaskInfo(nameRes, totalProgress)
@@ -52,20 +52,20 @@ internal class DefaultInitialSyncProgressService @Inject constructor(
 
             currentLeaf.child = newTask
         }
-        reportProgress(0)
+        reportProgress(0F)
     }
 
-    fun reportProgress(progress: Int) {
+    fun reportProgress(progress: Float) {
         rootTask?.leaf()?.setProgress(progress)
     }
 
     fun endTask(nameRes: Int) {
         val endedTask = rootTask?.leaf()
         if (endedTask?.nameRes == nameRes) {
-            // close it
-            val parent = endedTask.parent
-            parent?.child = null
-            parent?.setProgress(endedTask.offset + (endedTask.totalProgress * endedTask.parentWeight).toInt())
+            // Ensure the task progress is complete
+            endedTask.setProgress(endedTask.totalProgress.toFloat())
+            // And close it
+            endedTask.parent?.child = null
         }
         if (endedTask?.parent == null) {
             status.postValue(InitialSyncProgressService.Status.Idle)
@@ -81,9 +81,9 @@ internal class DefaultInitialSyncProgressService @Inject constructor(
                                  val totalProgress: Int,
                                  val parent: TaskInfo? = null,
                                  val parentWeight: Float = 1f,
-                                 val offset: Int = parent?.currentProgress ?: 0) {
+                                 val offset: Float = parent?.currentProgress ?: 0F) {
         var child: TaskInfo? = null
-        var currentProgress: Int = 0
+        private var currentProgress: Float = 0F
 
         /**
          * Get the further child
@@ -97,17 +97,18 @@ internal class DefaultInitialSyncProgressService @Inject constructor(
         }
 
         /**
-         * Set progress of the parent if any (which will post value), or post the value
+         * Set progress of this task and update the parent progress. Last parent will post value.
          */
-        fun setProgress(progress: Int) {
+        fun setProgress(progress: Float) {
+            Timber.v("setProgress: $progress / $totalProgress")
             currentProgress = progress
 //            val newProgress = Math.min(currentProgress + progress, totalProgress)
             if (parent != null) {
-                val parentProgress = (currentProgress * parentWeight).toInt()
+                val parentProgress = (currentProgress / totalProgress) * (parentWeight * parent.totalProgress)
                 parent.setProgress(offset + parentProgress)
             } else {
-                Timber.v("--- ${stringProvider.getString(leaf().nameRes)}: $currentProgress")
-                status.postValue(InitialSyncProgressService.Status.Progressing(leaf().nameRes, currentProgress))
+                Timber.v("--- ${stringProvider.getString(leaf().nameRes)}: ${currentProgress.toInt()}")
+                status.postValue(InitialSyncProgressService.Status.Progressing(leaf().nameRes, currentProgress.toInt()))
             }
         }
     }
@@ -116,7 +117,7 @@ internal class DefaultInitialSyncProgressService @Inject constructor(
 internal inline fun <T> reportSubtask(reporter: DefaultInitialSyncProgressService?,
                                       @StringRes nameRes: Int,
                                       totalProgress: Int,
-                                      parentWeight: Float = 1f,
+                                      parentWeight: Float,
                                       block: () -> T): T {
     reporter?.startTask(nameRes, totalProgress, parentWeight)
     return block().also {
@@ -126,13 +127,12 @@ internal inline fun <T> reportSubtask(reporter: DefaultInitialSyncProgressServic
 
 internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: DefaultInitialSyncProgressService?,
                                                             taskId: Int,
-                                                            weight: Float,
+                                                            parentWeight: Float,
                                                             transform: (Map.Entry<K, V>) -> R): List<R> {
-    val total = count().toFloat()
-    var current = 0
-    reporter?.startTask(taskId, 100, weight)
+    var current = 0F
+    reporter?.startTask(taskId, count() + 1, parentWeight)
     return map {
-        reporter?.reportProgress((current / total * 100).toInt())
+        reporter?.reportProgress(current)
         current++
         transform.invoke(it)
     }.also {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
index fc476a3dd6..42477e1dd8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
@@ -38,7 +38,7 @@ internal class CryptoSyncHandler @Inject constructor(private val cryptoService:
     fun handleToDevice(toDevice: ToDeviceSyncResponse, initialSyncProgressService: DefaultInitialSyncProgressService? = null) {
         val total = toDevice.events?.size ?: 0
         toDevice.events?.forEachIndexed { index, event ->
-            initialSyncProgressService?.reportProgress(((index / total.toFloat()) * 100).toInt())
+            initialSyncProgressService?.reportProgress(index * 100F / total)
             // Decrypt event if necessary
             Timber.i("## CRYPTO | To device event from ${event.senderId} of type:${event.type}")
             decryptToDeviceEvent(event, null)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 979c2888d3..ef2212cdab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -162,7 +162,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                         )
                                     }
                             realm.insertOrUpdate(roomEntities)
-                            reporter?.reportProgress(index + 1)
+                            reporter?.reportProgress(index + 1F)
                         }
             }
         } else {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index a80b062427..c9376eb9f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -51,13 +51,11 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
                                                        private val cryptoService: DefaultCryptoService,
                                                        private val tokenStore: SyncTokenStore,
                                                        private val processEventForPushTask: ProcessEventForPushTask,
-                                                       private val pushRuleService: PushRuleService,
-                                                       private val initialSyncProgressService: DefaultInitialSyncProgressService) {
+                                                       private val pushRuleService: PushRuleService) {
 
-    suspend fun handleResponse(syncResponse: SyncResponse, fromToken: String?) {
+    suspend fun handleResponse(syncResponse: SyncResponse, fromToken: String?, reporter: DefaultInitialSyncProgressService?) {
         val isInitialSync = fromToken == null
         Timber.v("Start handling sync, is InitialSync: $isInitialSync")
-        val reporter = initialSyncProgressService.takeIf { isInitialSync }
 
         measureTimeMillis {
             if (!cryptoService.isStarted()) {
@@ -85,7 +83,7 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
         monarchy.awaitTransaction { realm ->
             measureTimeMillis {
                 Timber.v("Handle rooms")
-                reportSubtask(reporter, R.string.initial_sync_start_importing_account_rooms, 100, 0.7f) {
+                reportSubtask(reporter, R.string.initial_sync_start_importing_account_rooms, 1, 0.7f) {
                     if (syncResponse.rooms != null) {
                         roomSyncHandler.handle(realm, syncResponse.rooms, isInitialSync, reporter)
                     }
@@ -95,7 +93,7 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
             }
 
             measureTimeMillis {
-                reportSubtask(reporter, R.string.initial_sync_start_importing_account_groups, 100, 0.1f) {
+                reportSubtask(reporter, R.string.initial_sync_start_importing_account_groups, 1, 0.1f) {
                     Timber.v("Handle groups")
                     if (syncResponse.groups != null) {
                         groupSyncHandler.handle(realm, syncResponse.groups, reporter)
@@ -106,7 +104,7 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
             }
 
             measureTimeMillis {
-                reportSubtask(reporter, R.string.initial_sync_start_importing_account_data, 100, 0.1f) {
+                reportSubtask(reporter, R.string.initial_sync_start_importing_account_data, 1, 0.1f) {
                     Timber.v("Handle accountData")
                     userAccountDataSyncHandler.handle(realm, syncResponse.accountData)
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index dde3da48c6..ea06db7071 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -91,7 +91,7 @@ internal class DefaultSyncTask @Inject constructor(
             // We might want to get the user information in parallel too
             userStore.createOrUpdate(userId)
             initialSyncProgressService.endAll()
-            initialSyncProgressService.startTask(R.string.initial_sync_start_importing_account, 100)
+            initialSyncProgressService.startTask(R.string.initial_sync_start_importing_account, 100, 1F)
         }
         // Maybe refresh the home server capabilities data we know
         getHomeServerCapabilitiesTask.execute(GetHomeServerCapabilitiesTask.Params(forceRefresh = false))
@@ -114,7 +114,7 @@ internal class DefaultSyncTask @Inject constructor(
                     }
 
                     logDuration("INIT_SYNC Database insertion") {
-                        syncResponseHandler.handleResponse(syncResponse, token)
+                        syncResponseHandler.handleResponse(syncResponse, token, initialSyncProgressService)
                     }
                 }
             }
@@ -126,7 +126,7 @@ internal class DefaultSyncTask @Inject constructor(
                         readTimeOut = readTimeOut
                 )
             }
-            syncResponseHandler.handleResponse(syncResponse, token)
+            syncResponseHandler.handleResponse(syncResponse, token, null)
         }
         Timber.v("Sync task finished on Thread: ${Thread.currentThread().name}")
     }
@@ -138,17 +138,20 @@ internal class DefaultSyncTask @Inject constructor(
         if (workingFile.exists() && status >= InitialSyncStatus.STEP_DOWNLOADED) {
             // Go directly to the parse step
             Timber.v("INIT_SYNC file is already here")
+            reportSubtask(initialSyncProgressService, R.string.initial_sync_start_downloading, 1, 0.3f) {
+                // Empty task
+            }
         } else {
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADING)
             val syncResponse = logDuration("INIT_SYNC Perform server request") {
-                reportSubtask(initialSyncProgressService, R.string.initial_sync_start_server_computing, 0, 0.5f) {
+                reportSubtask(initialSyncProgressService, R.string.initial_sync_start_server_computing, 1, 0.2f) {
                     getSyncResponse(requestParams, MAX_NUMBER_OF_RETRY_AFTER_TIMEOUT)
                 }
             }
 
             if (syncResponse.isSuccessful) {
                 logDuration("INIT_SYNC Download and save to file") {
-                    reportSubtask(initialSyncProgressService, R.string.initial_sync_start_downloading, 0, 0.5f) {
+                    reportSubtask(initialSyncProgressService, R.string.initial_sync_start_downloading, 1, 0.1f) {
                         syncResponse.body()?.byteStream()?.use { inputStream ->
                             workingFile.outputStream().use { outputStream ->
                                 inputStream.copyTo(outputStream)
@@ -162,7 +165,9 @@ internal class DefaultSyncTask @Inject constructor(
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADED)
         }
-        handleSyncFile(workingFile, initSyncStrategy)
+        reportSubtask(initialSyncProgressService, R.string.initial_sync_start_importing_account, 1, 0.7F) {
+            handleSyncFile(workingFile, initSyncStrategy)
+        }
 
         // Delete all files
         workingDir.deleteRecursively()
@@ -199,7 +204,7 @@ internal class DefaultSyncTask @Inject constructor(
             Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile stored into files")
 
             logDuration("INIT_SYNC Database insertion") {
-                syncResponseHandler.handleResponse(syncResponse, null)
+                syncResponseHandler.handleResponse(syncResponse, null, initialSyncProgressService)
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
         }

From 1c83ee086a2db25acb3364f01733513611d0036f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Feb 2021 09:55:28 +0100
Subject: [PATCH 077/578] More rework of DefaultInitialSyncProgressService

---
 .../DefaultInitialSyncProgressService.kt      | 109 +++++++++---------
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
index d84a39f462..fb7ba7c58f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
@@ -19,14 +19,11 @@ import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import org.matrix.android.sdk.api.session.InitialSyncProgressService
-import org.matrix.android.sdk.internal.util.StringProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 @SessionScope
-internal class DefaultInitialSyncProgressService @Inject constructor(
-        private val stringProvider: StringProvider
-) : InitialSyncProgressService {
+internal class DefaultInitialSyncProgressService @Inject constructor() : InitialSyncProgressService {
 
     private val status = MutableLiveData<InitialSyncProgressService.Status>()
 
@@ -36,39 +33,47 @@ internal class DefaultInitialSyncProgressService @Inject constructor(
         return status
     }
 
-    fun startTask(@StringRes nameRes: Int, totalProgress: Int, parentWeight: Float) {
+    fun startTask(@StringRes nameRes: Int,
+                  totalProgress: Int,
+                  parentWeight: Float) {
         // Create a rootTask, or add a child to the leaf
         if (rootTask == null) {
-            rootTask = TaskInfo(nameRes, totalProgress)
+            rootTask = TaskInfo(nameRes, totalProgress, null, 1F)
         } else {
             val currentLeaf = rootTask!!.leaf()
-
-            val newTask = TaskInfo(
+            currentLeaf.child = TaskInfo(
                     nameRes = nameRes,
                     totalProgress = totalProgress,
                     parent = currentLeaf,
                     parentWeight = parentWeight
             )
-
-            currentLeaf.child = newTask
         }
         reportProgress(0F)
     }
 
     fun reportProgress(progress: Float) {
-        rootTask?.leaf()?.setProgress(progress)
+        rootTask?.let { root ->
+            root.leaf().let { leaf ->
+                // Update the progress of the leaf and all its parents
+                leaf.setProgress(progress)
+                // Then update the live data using leaf wording and root progress
+                status.postValue(InitialSyncProgressService.Status.Progressing(leaf.nameRes, root.currentProgress.toInt()))
+            }
+        }
     }
 
-    fun endTask(nameRes: Int) {
-        val endedTask = rootTask?.leaf()
-        if (endedTask?.nameRes == nameRes) {
+    fun endTask() {
+        rootTask?.leaf()?.let { endedTask ->
             // Ensure the task progress is complete
-            endedTask.setProgress(endedTask.totalProgress.toFloat())
-            // And close it
+            reportProgress(endedTask.totalProgress.toFloat())
             endedTask.parent?.child = null
-        }
-        if (endedTask?.parent == null) {
-            status.postValue(InitialSyncProgressService.Status.Idle)
+
+            if (endedTask.parent != null) {
+                // And close it
+                endedTask.parent.child = null
+            } else {
+                status.postValue(InitialSyncProgressService.Status.Idle)
+            }
         }
     }
 
@@ -76,40 +81,38 @@ internal class DefaultInitialSyncProgressService @Inject constructor(
         rootTask = null
         status.postValue(InitialSyncProgressService.Status.Idle)
     }
+}
 
-    private inner class TaskInfo(@StringRes val nameRes: Int,
-                                 val totalProgress: Int,
-                                 val parent: TaskInfo? = null,
-                                 val parentWeight: Float = 1f,
-                                 val offset: Float = parent?.currentProgress ?: 0F) {
-        var child: TaskInfo? = null
-        private var currentProgress: Float = 0F
+private class TaskInfo(@StringRes val nameRes: Int,
+                       val totalProgress: Int,
+                       val parent: TaskInfo?,
+                       val parentWeight: Float) {
+    var child: TaskInfo? = null
+    var currentProgress = 0F
+        private set
+    private val offset = parent?.currentProgress ?: 0F
 
-        /**
-         * Get the further child
-         */
-        fun leaf(): TaskInfo {
-            var last = this
-            while (last.child != null) {
-                last = last.child!!
-            }
-            return last
+    /**
+     * Get the further child
+     */
+    fun leaf(): TaskInfo {
+        var last = this
+        while (last.child != null) {
+            last = last.child!!
         }
+        return last
+    }
 
-        /**
-         * Set progress of this task and update the parent progress. Last parent will post value.
-         */
-        fun setProgress(progress: Float) {
-            Timber.v("setProgress: $progress / $totalProgress")
-            currentProgress = progress
-//            val newProgress = Math.min(currentProgress + progress, totalProgress)
-            if (parent != null) {
-                val parentProgress = (currentProgress / totalProgress) * (parentWeight * parent.totalProgress)
-                parent.setProgress(offset + parentProgress)
-            } else {
-                Timber.v("--- ${stringProvider.getString(leaf().nameRes)}: ${currentProgress.toInt()}")
-                status.postValue(InitialSyncProgressService.Status.Progressing(leaf().nameRes, currentProgress.toInt()))
-            }
+    /**
+     * Set progress of this task and update the parent progress iteratively
+     */
+    fun setProgress(progress: Float) {
+        Timber.v("setProgress: $progress / $totalProgress")
+        currentProgress = progress
+
+        parent?.let {
+            val parentProgress = (currentProgress / totalProgress) * (parentWeight * it.totalProgress)
+            it.setProgress(offset + parentProgress)
         }
     }
 }
@@ -121,21 +124,21 @@ internal inline fun <T> reportSubtask(reporter: DefaultInitialSyncProgressServic
                                       block: () -> T): T {
     reporter?.startTask(nameRes, totalProgress, parentWeight)
     return block().also {
-        reporter?.endTask(nameRes)
+        reporter?.endTask()
     }
 }
 
 internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: DefaultInitialSyncProgressService?,
-                                                            taskId: Int,
+                                                            @StringRes nameRes: Int,
                                                             parentWeight: Float,
                                                             transform: (Map.Entry<K, V>) -> R): List<R> {
     var current = 0F
-    reporter?.startTask(taskId, count() + 1, parentWeight)
+    reporter?.startTask(nameRes, count() + 1, parentWeight)
     return map {
         reporter?.reportProgress(current)
         current++
         transform.invoke(it)
     }.also {
-        reporter?.endTask(taskId)
+        reporter?.endTask()
     }
 }

From b870a8b791c040afdca121cb16e6487dad74a08d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Feb 2021 10:30:11 +0100
Subject: [PATCH 078/578] Create ProgressReporter interface

---
 .../DefaultInitialSyncProgressService.kt      | 28 +++++++++++++------
 .../session/sync/CryptoSyncHandler.kt         |  8 +++---
 .../internal/session/sync/GroupSyncHandler.kt | 14 ++++------
 .../internal/session/sync/RoomSyncHandler.kt  | 16 +++++------
 .../session/sync/SyncResponseHandler.kt       |  6 ++--
 5 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
index fb7ba7c58f..e74d905436 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
@@ -22,8 +22,20 @@ import org.matrix.android.sdk.api.session.InitialSyncProgressService
 import timber.log.Timber
 import javax.inject.Inject
 
+internal interface ProgressReporter {
+    fun startTask(@StringRes nameRes: Int,
+                  totalProgress: Int,
+                  parentWeight: Float)
+
+    fun reportProgress(progress: Float)
+
+    fun endTask()
+}
+
 @SessionScope
-internal class DefaultInitialSyncProgressService @Inject constructor() : InitialSyncProgressService {
+internal class DefaultInitialSyncProgressService @Inject constructor()
+    : InitialSyncProgressService,
+        ProgressReporter {
 
     private val status = MutableLiveData<InitialSyncProgressService.Status>()
 
@@ -33,9 +45,9 @@ internal class DefaultInitialSyncProgressService @Inject constructor() : Initial
         return status
     }
 
-    fun startTask(@StringRes nameRes: Int,
-                  totalProgress: Int,
-                  parentWeight: Float) {
+    override fun startTask(@StringRes nameRes: Int,
+                           totalProgress: Int,
+                           parentWeight: Float) {
         // Create a rootTask, or add a child to the leaf
         if (rootTask == null) {
             rootTask = TaskInfo(nameRes, totalProgress, null, 1F)
@@ -51,7 +63,7 @@ internal class DefaultInitialSyncProgressService @Inject constructor() : Initial
         reportProgress(0F)
     }
 
-    fun reportProgress(progress: Float) {
+    override fun reportProgress(progress: Float) {
         rootTask?.let { root ->
             root.leaf().let { leaf ->
                 // Update the progress of the leaf and all its parents
@@ -62,7 +74,7 @@ internal class DefaultInitialSyncProgressService @Inject constructor() : Initial
         }
     }
 
-    fun endTask() {
+    override fun endTask() {
         rootTask?.leaf()?.let { endedTask ->
             // Ensure the task progress is complete
             reportProgress(endedTask.totalProgress.toFloat())
@@ -117,7 +129,7 @@ private class TaskInfo(@StringRes val nameRes: Int,
     }
 }
 
-internal inline fun <T> reportSubtask(reporter: DefaultInitialSyncProgressService?,
+internal inline fun <T> reportSubtask(reporter: ProgressReporter?,
                                       @StringRes nameRes: Int,
                                       totalProgress: Int,
                                       parentWeight: Float,
@@ -128,7 +140,7 @@ internal inline fun <T> reportSubtask(reporter: DefaultInitialSyncProgressServic
     }
 }
 
-internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: DefaultInitialSyncProgressService?,
+internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: ProgressReporter?,
                                                             @StringRes nameRes: Int,
                                                             parentWeight: Float,
                                                             transform: (Map.Entry<K, V>) -> R): List<R> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
index 42477e1dd8..a244e7a273 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
@@ -26,7 +26,7 @@ import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.crypto.model.event.OlmEventContent
 import org.matrix.android.sdk.internal.crypto.verification.DefaultVerificationService
-import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.ProgressReporter
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.session.sync.model.ToDeviceSyncResponse
 import timber.log.Timber
@@ -35,10 +35,10 @@ import javax.inject.Inject
 internal class CryptoSyncHandler @Inject constructor(private val cryptoService: DefaultCryptoService,
                                                      private val verificationService: DefaultVerificationService) {
 
-    fun handleToDevice(toDevice: ToDeviceSyncResponse, initialSyncProgressService: DefaultInitialSyncProgressService? = null) {
+    fun handleToDevice(toDevice: ToDeviceSyncResponse, progressReporter: ProgressReporter? = null) {
         val total = toDevice.events?.size ?: 0
         toDevice.events?.forEachIndexed { index, event ->
-            initialSyncProgressService?.reportProgress(index * 100F / total)
+            progressReporter?.reportProgress(index * 100F / total)
             // Decrypt event if necessary
             Timber.i("## CRYPTO | To device event from ${event.senderId} of type:${event.type}")
             decryptToDeviceEvent(event, null)
@@ -75,7 +75,7 @@ internal class CryptoSyncHandler @Inject constructor(private val cryptoService:
                 // try to find device id to ease log reading
                 val deviceId = cryptoService.getCryptoDeviceInfo(event.senderId!!).firstOrNull {
                     it.identityKey() == senderKey
-                 }?.deviceId ?: senderKey
+                }?.deviceId ?: senderKey
                 Timber.e("## CRYPTO | Failed to decrypt to device event from ${event.senderId}|$deviceId reason:<${event.mCryptoError ?: exception}>")
             }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
index 135f711a6c..03ad76e19a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
@@ -16,17 +16,17 @@
 
 package org.matrix.android.sdk.internal.session.sync
 
+import io.realm.Realm
 import org.matrix.android.sdk.R
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.internal.database.model.GroupEntity
 import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
-import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.ProgressReporter
 import org.matrix.android.sdk.internal.session.mapWithProgress
 import org.matrix.android.sdk.internal.session.sync.model.GroupsSyncResponse
 import org.matrix.android.sdk.internal.session.sync.model.InvitedGroupSync
-import io.realm.Realm
 import javax.inject.Inject
 
 internal class GroupSyncHandler @Inject constructor() {
@@ -37,11 +37,9 @@ internal class GroupSyncHandler @Inject constructor() {
         data class LEFT(val data: Map<String, Any>) : HandlingStrategy()
     }
 
-    fun handle(
-            realm: Realm,
-            roomsSyncResponse: GroupsSyncResponse,
-            reporter: DefaultInitialSyncProgressService? = null
-    ) {
+    fun handle(realm: Realm,
+               roomsSyncResponse: GroupsSyncResponse,
+               reporter: ProgressReporter? = null) {
         handleGroupSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), reporter)
         handleGroupSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), reporter)
         handleGroupSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), reporter)
@@ -49,7 +47,7 @@ internal class GroupSyncHandler @Inject constructor() {
 
     // PRIVATE METHODS *****************************************************************************
 
-    private fun handleGroupSync(realm: Realm, handlingStrategy: HandlingStrategy, reporter: DefaultInitialSyncProgressService?) {
+    private fun handleGroupSync(realm: Realm, handlingStrategy: HandlingStrategy, reporter: ProgressReporter?) {
         val groups = when (handlingStrategy) {
             is HandlingStrategy.JOINED  ->
                 handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_groups, 0.6f) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index ef2212cdab..7d8966579e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -49,7 +49,7 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.extensions.clearWith
-import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.ProgressReporter
 import org.matrix.android.sdk.internal.session.mapWithProgress
 import org.matrix.android.sdk.internal.session.reportSubtask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
@@ -86,12 +86,10 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         data class LEFT(val data: Map<String, RoomSync>) : HandlingStrategy()
     }
 
-    fun handle(
-            realm: Realm,
-            roomsSyncResponse: RoomsSyncResponse,
-            isInitialSync: Boolean,
-            reporter: DefaultInitialSyncProgressService? = null
-    ) {
+    fun handle(realm: Realm,
+               roomsSyncResponse: RoomsSyncResponse,
+               isInitialSync: Boolean,
+               reporter: ProgressReporter? = null) {
         Timber.v("Execute transaction from $this")
         handleRoomSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), isInitialSync, reporter)
         handleRoomSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), isInitialSync, reporter)
@@ -100,7 +98,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
 
     // PRIVATE METHODS *****************************************************************************
 
-    private fun handleRoomSync(realm: Realm, handlingStrategy: HandlingStrategy, isInitialSync: Boolean, reporter: DefaultInitialSyncProgressService?) {
+    private fun handleRoomSync(realm: Realm, handlingStrategy: HandlingStrategy, isInitialSync: Boolean, reporter: ProgressReporter?) {
         val insertType = if (isInitialSync) {
             EventInsertType.INITIAL_SYNC
         } else {
@@ -137,7 +135,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                 handlingStrategy: HandlingStrategy.JOINED,
                                 insertType: EventInsertType,
                                 syncLocalTimeStampMillis: Long,
-                                reporter: DefaultInitialSyncProgressService?) {
+                                reporter: ProgressReporter?) {
         val maxSize = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
         val listSize = handlingStrategy.data.keys.size
         val numberOfChunks = ceil(listSize / maxSize.toDouble()).toInt()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index c9376eb9f2..a80b733dcc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -25,7 +25,7 @@ import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
-import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.ProgressReporter
 import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker
 import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
 import org.matrix.android.sdk.internal.session.reportSubtask
@@ -53,7 +53,9 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
                                                        private val processEventForPushTask: ProcessEventForPushTask,
                                                        private val pushRuleService: PushRuleService) {
 
-    suspend fun handleResponse(syncResponse: SyncResponse, fromToken: String?, reporter: DefaultInitialSyncProgressService?) {
+    suspend fun handleResponse(syncResponse: SyncResponse,
+                               fromToken: String?,
+                               reporter: ProgressReporter?) {
         val isInitialSync = fromToken == null
         Timber.v("Start handling sync, is InitialSync: $isInitialSync")
 

From 649edffa30cbdadf5d2009f5072841e84160220f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Feb 2021 11:04:47 +0100
Subject: [PATCH 079/578] Hide menu if not in developer mode

---
 .../main/java/im/vector/app/features/home/HomeActivity.kt  | 7 +++++++
 vector/src/main/res/menu/home.xml                          | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 2d884f1ba7..2a0ef0bdd6 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -21,6 +21,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.os.Parcelable
+import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
@@ -362,6 +363,12 @@ class HomeActivity :
 
     override fun getMenuRes() = R.menu.home
 
+    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
+        menu.findItem(R.id.menu_home_init_sync_legacy)?.isVisible = vectorPreferences.developerMode()
+        menu.findItem(R.id.menu_home_init_sync_optimized)?.isVisible = vectorPreferences.developerMode()
+        return super.onPrepareOptionsMenu(menu)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_home_suggestion -> {
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/home.xml
index 66cbf53bfd..463b8a9e0d 100644
--- a/vector/src/main/res/menu/home.xml
+++ b/vector/src/main/res/menu/home.xml
@@ -21,12 +21,12 @@
 
     <item
         android:id="@+id/menu_home_init_sync_legacy"
-        android:title="Init sync legacy"
+        android:title="Do a legacy init sync"
         tools:ignore="HardcodedText" />
 
     <item
         android:id="@+id/menu_home_init_sync_optimized"
-        android:title="Init sync optimized"
+        android:title="Do an optimized init sync"
         tools:ignore="HardcodedText" />
 
     <item

From 24e9e6bbd77adc6b2e73288d28bc3fa38f900427 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Feb 2021 11:36:04 +0100
Subject: [PATCH 080/578] Move to dedicated package and split into several
 files

---
 .../matrix/android/sdk/api/session/Session.kt |  1 +
 .../InitialSyncProgressService.kt             |  4 +-
 .../sdk/internal/session/DefaultSession.kt    |  2 +-
 .../sdk/internal/session/SessionModule.kt     |  3 +-
 .../DefaultInitialSyncProgressService.kt      | 78 +------------------
 .../internal/session/initsync/Extensions.kt   | 45 +++++++++++
 .../session/initsync/ProgressReporter.kt      | 29 +++++++
 .../sdk/internal/session/initsync/TaskInfo.kt | 54 +++++++++++++
 .../session/sync/CryptoSyncHandler.kt         |  2 +-
 .../internal/session/sync/GroupSyncHandler.kt |  4 +-
 .../internal/session/sync/RoomSyncHandler.kt  |  6 +-
 .../session/sync/SyncResponseHandler.kt       |  4 +-
 .../sdk/internal/session/sync/SyncTask.kt     |  4 +-
 .../vector/app/features/home/HomeActivity.kt  |  2 +-
 .../features/home/HomeActivityViewModel.kt    |  4 +-
 .../features/home/HomeActivityViewState.kt    |  2 +-
 16 files changed, 152 insertions(+), 92 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/{ => initsync}/InitialSyncProgressService.kt (90%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{ => initsync}/DefaultInitialSyncProgressService.kt (54%)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 86ac0056e2..7a24ccac11 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.group.GroupService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.identity.IdentityService
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.media.MediaService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
index 09c6b8e94c..0953696bc1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.api.session
+package org.matrix.android.sdk.api.session.initsync
 
 import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 06bb4bd929..1204a9ccac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -24,7 +24,7 @@ import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.federation.FederationService
 import org.matrix.android.sdk.api.pushrules.PushRuleService
-import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.account.AccountService
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index 468c193ad3..57c2336331 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -32,7 +32,7 @@ import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.auth.data.sessionId
 import org.matrix.android.sdk.api.crypto.MXCryptoConfig
-import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
@@ -77,6 +77,7 @@ import org.matrix.android.sdk.internal.session.call.CallEventProcessor
 import org.matrix.android.sdk.internal.session.download.DownloadProgressInterceptor
 import org.matrix.android.sdk.internal.session.homeserver.DefaultHomeServerCapabilitiesService
 import org.matrix.android.sdk.internal.session.identity.DefaultIdentityService
+import org.matrix.android.sdk.internal.session.initsync.DefaultInitialSyncProgressService
 import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
 import org.matrix.android.sdk.internal.session.permalinks.DefaultPermalinkService
 import org.matrix.android.sdk.internal.session.room.EventRelationsAggregationProcessor
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
similarity index 54%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
index e74d905436..fd3c629866 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,25 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.internal.session
+package org.matrix.android.sdk.internal.session.initsync
 
 import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import org.matrix.android.sdk.api.session.InitialSyncProgressService
-import timber.log.Timber
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
+import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 
-internal interface ProgressReporter {
-    fun startTask(@StringRes nameRes: Int,
-                  totalProgress: Int,
-                  parentWeight: Float)
-
-    fun reportProgress(progress: Float)
-
-    fun endTask()
-}
-
 @SessionScope
 internal class DefaultInitialSyncProgressService @Inject constructor()
     : InitialSyncProgressService,
@@ -94,63 +84,3 @@ internal class DefaultInitialSyncProgressService @Inject constructor()
         status.postValue(InitialSyncProgressService.Status.Idle)
     }
 }
-
-private class TaskInfo(@StringRes val nameRes: Int,
-                       val totalProgress: Int,
-                       val parent: TaskInfo?,
-                       val parentWeight: Float) {
-    var child: TaskInfo? = null
-    var currentProgress = 0F
-        private set
-    private val offset = parent?.currentProgress ?: 0F
-
-    /**
-     * Get the further child
-     */
-    fun leaf(): TaskInfo {
-        var last = this
-        while (last.child != null) {
-            last = last.child!!
-        }
-        return last
-    }
-
-    /**
-     * Set progress of this task and update the parent progress iteratively
-     */
-    fun setProgress(progress: Float) {
-        Timber.v("setProgress: $progress / $totalProgress")
-        currentProgress = progress
-
-        parent?.let {
-            val parentProgress = (currentProgress / totalProgress) * (parentWeight * it.totalProgress)
-            it.setProgress(offset + parentProgress)
-        }
-    }
-}
-
-internal inline fun <T> reportSubtask(reporter: ProgressReporter?,
-                                      @StringRes nameRes: Int,
-                                      totalProgress: Int,
-                                      parentWeight: Float,
-                                      block: () -> T): T {
-    reporter?.startTask(nameRes, totalProgress, parentWeight)
-    return block().also {
-        reporter?.endTask()
-    }
-}
-
-internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: ProgressReporter?,
-                                                            @StringRes nameRes: Int,
-                                                            parentWeight: Float,
-                                                            transform: (Map.Entry<K, V>) -> R): List<R> {
-    var current = 0F
-    reporter?.startTask(nameRes, count() + 1, parentWeight)
-    return map {
-        reporter?.reportProgress(current)
-        current++
-        transform.invoke(it)
-    }.also {
-        reporter?.endTask()
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt
new file mode 100644
index 0000000000..f58559117c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.initsync
+
+import androidx.annotation.StringRes
+
+internal inline fun <T> reportSubtask(reporter: ProgressReporter?,
+                                      @StringRes nameRes: Int,
+                                      totalProgress: Int,
+                                      parentWeight: Float,
+                                      block: () -> T): T {
+    reporter?.startTask(nameRes, totalProgress, parentWeight)
+    return block().also {
+        reporter?.endTask()
+    }
+}
+
+internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: ProgressReporter?,
+                                                            @StringRes nameRes: Int,
+                                                            parentWeight: Float,
+                                                            transform: (Map.Entry<K, V>) -> R): List<R> {
+    var current = 0F
+    reporter?.startTask(nameRes, count() + 1, parentWeight)
+    return map {
+        reporter?.reportProgress(current)
+        current++
+        transform.invoke(it)
+    }.also {
+        reporter?.endTask()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt
new file mode 100644
index 0000000000..5361d107d2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.initsync
+
+import androidx.annotation.StringRes
+
+internal interface ProgressReporter {
+    fun startTask(@StringRes nameRes: Int,
+                  totalProgress: Int,
+                  parentWeight: Float)
+
+    fun reportProgress(progress: Float)
+
+    fun endTask()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt
new file mode 100644
index 0000000000..37c2b152a9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.initsync
+
+import androidx.annotation.StringRes
+import timber.log.Timber
+
+internal class TaskInfo(@StringRes val nameRes: Int,
+                        val totalProgress: Int,
+                        val parent: TaskInfo?,
+                        val parentWeight: Float) {
+    var child: TaskInfo? = null
+    var currentProgress = 0F
+        private set
+    private val offset = parent?.currentProgress ?: 0F
+
+    /**
+     * Get the further child
+     */
+    fun leaf(): TaskInfo {
+        var last = this
+        while (last.child != null) {
+            last = last.child!!
+        }
+        return last
+    }
+
+    /**
+     * Set progress of this task and update the parent progress iteratively
+     */
+    fun setProgress(progress: Float) {
+        Timber.v("setProgress: $progress / $totalProgress")
+        currentProgress = progress
+
+        parent?.let {
+            val parentProgress = (currentProgress / totalProgress) * (parentWeight * it.totalProgress)
+            it.setProgress(offset + parentProgress)
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
index a244e7a273..ae60faf905 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
@@ -26,7 +26,7 @@ import org.matrix.android.sdk.internal.crypto.MXEventDecryptionResult
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.crypto.model.event.OlmEventContent
 import org.matrix.android.sdk.internal.crypto.verification.DefaultVerificationService
-import org.matrix.android.sdk.internal.session.ProgressReporter
+import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.session.sync.model.ToDeviceSyncResponse
 import timber.log.Timber
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
index 03ad76e19a..112236b14f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
@@ -23,8 +23,8 @@ import org.matrix.android.sdk.internal.database.model.GroupEntity
 import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
-import org.matrix.android.sdk.internal.session.ProgressReporter
-import org.matrix.android.sdk.internal.session.mapWithProgress
+import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
+import org.matrix.android.sdk.internal.session.initsync.mapWithProgress
 import org.matrix.android.sdk.internal.session.sync.model.GroupsSyncResponse
 import org.matrix.android.sdk.internal.session.sync.model.InvitedGroupSync
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 7d8966579e..648dd2d88f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -49,9 +49,9 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.extensions.clearWith
-import org.matrix.android.sdk.internal.session.ProgressReporter
-import org.matrix.android.sdk.internal.session.mapWithProgress
-import org.matrix.android.sdk.internal.session.reportSubtask
+import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
+import org.matrix.android.sdk.internal.session.initsync.mapWithProgress
+import org.matrix.android.sdk.internal.session.initsync.reportSubtask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberEventHandler
 import org.matrix.android.sdk.internal.session.room.read.FullyReadContent
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index a80b733dcc..3f501858b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -25,10 +25,10 @@ import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
-import org.matrix.android.sdk.internal.session.ProgressReporter
+import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
 import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker
 import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
-import org.matrix.android.sdk.internal.session.reportSubtask
+import org.matrix.android.sdk.internal.session.initsync.reportSubtask
 import org.matrix.android.sdk.internal.session.sync.model.GroupsSyncResponse
 import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index ea06db7071..bc63b991b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -24,10 +24,10 @@ import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.TimeOutInterceptor
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.network.toFailure
-import org.matrix.android.sdk.internal.session.DefaultInitialSyncProgressService
+import org.matrix.android.sdk.internal.session.initsync.DefaultInitialSyncProgressService
 import org.matrix.android.sdk.internal.session.filter.FilterRepository
 import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask
-import org.matrix.android.sdk.internal.session.reportSubtask
+import org.matrix.android.sdk.internal.session.initsync.reportSubtask
 import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.session.sync.parsing.InitialSyncResponseParser
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 2a0ef0bdd6..74399d9215 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -60,7 +60,7 @@ import im.vector.app.features.workers.signout.ServerBackupStatusViewState
 import im.vector.app.push.fcm.FcmHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index 62bdc61b63..ad61928509 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -40,7 +40,7 @@ import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.auth.registration.nextUncompletedStage
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.util.toMatrixItem
@@ -130,7 +130,7 @@ class HomeActivityViewModel @AssistedInject constructor(
                             // Schedule a check of the bootstrap when the init sync will be finished
                             checkBootstrap = true
                         }
-                        is InitialSyncProgressService.Status.Idle -> {
+                        is InitialSyncProgressService.Status.Idle        -> {
                             if (checkBootstrap) {
                                 checkBootstrap = false
                                 maybeBootstrapCrossSigningAfterInitialSync()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
index 0f80fa29ef..d4df7cd073 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.home
 
 import com.airbnb.mvrx.MvRxState
-import org.matrix.android.sdk.api.session.InitialSyncProgressService
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 
 data class HomeActivityViewState(
         val initialSyncProgressServiceStatus: InitialSyncProgressService.Status = InitialSyncProgressService.Status.Idle

From c3192d9f7cc5b8c44b7f252c63b86b962aa56634 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Feb 2021 11:41:26 +0100
Subject: [PATCH 081/578] Latest improvement

---
 .../DefaultInitialSyncProgressService.kt      | 32 ++++++++++++-------
 .../sdk/internal/session/sync/SyncTask.kt     |  5 ++-
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
index fd3c629866..dc069d3e5e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
@@ -35,21 +35,29 @@ internal class DefaultInitialSyncProgressService @Inject constructor()
         return status
     }
 
+    /**
+     * Create a rootTask
+     */
+    fun startRoot(@StringRes nameRes: Int,
+                  totalProgress: Int) {
+        endAll()
+        rootTask = TaskInfo(nameRes, totalProgress, null, 1F)
+        reportProgress(0F)
+    }
+
+    /**
+     * Add a child to the leaf
+     */
     override fun startTask(@StringRes nameRes: Int,
                            totalProgress: Int,
                            parentWeight: Float) {
-        // Create a rootTask, or add a child to the leaf
-        if (rootTask == null) {
-            rootTask = TaskInfo(nameRes, totalProgress, null, 1F)
-        } else {
-            val currentLeaf = rootTask!!.leaf()
-            currentLeaf.child = TaskInfo(
-                    nameRes = nameRes,
-                    totalProgress = totalProgress,
-                    parent = currentLeaf,
-                    parentWeight = parentWeight
-            )
-        }
+        val currentLeaf = rootTask?.leaf() ?: return
+        currentLeaf.child = TaskInfo(
+                nameRes = nameRes,
+                totalProgress = totalProgress,
+                parent = currentLeaf,
+                parentWeight = parentWeight
+        )
         reportProgress(0F)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index bc63b991b2..dea047f7d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -24,9 +24,9 @@ import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.TimeOutInterceptor
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.network.toFailure
-import org.matrix.android.sdk.internal.session.initsync.DefaultInitialSyncProgressService
 import org.matrix.android.sdk.internal.session.filter.FilterRepository
 import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask
+import org.matrix.android.sdk.internal.session.initsync.DefaultInitialSyncProgressService
 import org.matrix.android.sdk.internal.session.initsync.reportSubtask
 import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
@@ -90,8 +90,7 @@ internal class DefaultSyncTask @Inject constructor(
         if (isInitialSync) {
             // We might want to get the user information in parallel too
             userStore.createOrUpdate(userId)
-            initialSyncProgressService.endAll()
-            initialSyncProgressService.startTask(R.string.initial_sync_start_importing_account, 100, 1F)
+            initialSyncProgressService.startRoot(R.string.initial_sync_start_importing_account, 100)
         }
         // Maybe refresh the home server capabilities data we know
         getHomeServerCapabilitiesTask.execute(GetHomeServerCapabilitiesTask.Params(forceRefresh = false))

From 29359ad119f96cf58563eef0851a31b5152fe650 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Feb 2021 12:04:00 +0100
Subject: [PATCH 082/578] Update change after rebase

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 930068dd6c..9d1ba6ce07 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Features ✨:
 
 Improvements 🙌:
  - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831)
+ - Improve initial sync performance (#983)
 
 Bugfix 🐛:
  -
@@ -90,7 +91,6 @@ Improvements 🙌:
  - SSO support for cross signing (#1062)
  - Deactivate account when logged in with SSO (#1264)
  - SSO UIA doesn't work (#2754)
- - Improve initial sync performance (#983)
 
 Bugfix 🐛:
  - Fix clear cache issue: sometimes, after a clear cache, there is still a token, so the init sync service is not started.

From c181f7e4218e5cfc684723320dd5ad4874727fad Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 17 Feb 2021 11:06:32 +0100
Subject: [PATCH 083/578] Please code quality check

---
 tools/check/forbidden_strings_in_code.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index e9b29d99ba..a5127dc8aa 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===88
+enum class===89
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From 486815b9ab4535c059c218d69a8a8b7cd8fd08c3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 23 Feb 2021 10:31:00 +0100
Subject: [PATCH 084/578] Pip

---
 CHANGES.md                                    |  1 +
 vector/src/main/AndroidManifest.xml           | 39 +++++++-------
 .../call/conference/JitsiCallViewEvents.kt    | 11 +++-
 .../call/conference/JitsiCallViewModel.kt     | 53 +++++++++++--------
 .../call/conference/JitsiCallViewState.kt     |  6 ---
 .../call/conference/VectorJitsiActivity.kt    | 27 ++++++----
 6 files changed, 79 insertions(+), 58 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9d1ba6ce07..036bec8537 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@ Features ✨:
 Improvements 🙌:
  - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831)
  - Improve initial sync performance (#983)
+ - PIP support for Jitsi call (#2418)
 
 Bugfix 🐛:
  -
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 52932920d4..bb56c4532e 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
         tools:node="remove" />
 
     <!-- Jitsi SDK is now API23+ -->
-    <uses-sdk tools:overrideLibrary="org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg"/>
+    <uses-sdk tools:overrideLibrary="org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg" />
 
     <!-- Adding CAMERA permission prevents Chromebooks to see the application on the PlayStore -->
     <!-- Tell that the Camera is not mandatory to install the application -->
@@ -83,8 +83,7 @@
                 android:resource="@xml/shortcuts" />
         </activity-alias>
 
-        <activity
-            android:name=".features.home.HomeActivity" />
+        <activity android:name=".features.home.HomeActivity" />
         <activity
             android:name=".features.login.LoginActivity"
             android:launchMode="singleTask"
@@ -233,11 +232,14 @@
         <activity
             android:name=".features.attachments.preview.AttachmentsPreviewActivity"
             android:theme="@style/AppTheme.AttachmentsPreview" />
-        <activity android:name=".features.call.VectorCallActivity"
-            android:excludeFromRecents="true"/>
+        <activity
+            android:name=".features.call.VectorCallActivity"
+            android:excludeFromRecents="true" />
         <activity
             android:name=".features.call.conference.VectorJitsiActivity"
-            android:configChanges="orientation|screenSize" />
+            android:configChanges="orientation|smallestScreenSize|screenLayout|screenSize"
+            android:resizeableActivity="true"
+            android:supportsPictureInPicture="true" />
 
         <activity android:name=".features.terms.ReviewTermsActivity" />
         <activity android:name=".features.widgets.WidgetActivity" />
@@ -247,27 +249,28 @@
         <activity android:name=".features.call.transfer.CallTransferActivity" />
 
         <!-- Single instance is very important for the custom scheme callback-->
-        <activity android:name=".features.auth.ReAuthActivity"
-            android:launchMode="singleInstance"
-            android:exported="false">
+        <activity
+            android:name=".features.auth.ReAuthActivity"
+            android:exported="false"
+            android:launchMode="singleInstance">
 
             <!-- XXX: UIA SSO has only web fallback, i.e no url redirect, so for now we comment this out
             hopefully, we would use it when finally available
             -->
             <!-- Add intent filter to handle redirection URL after SSO login in external browser -->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.VIEW" />-->
+            <!--            <intent-filter>-->
+            <!--                <action android:name="android.intent.action.VIEW" />-->
 
-<!--                <category android:name="android.intent.category.DEFAULT" />-->
-<!--                <category android:name="android.intent.category.BROWSABLE" />-->
+            <!--                <category android:name="android.intent.category.DEFAULT" />-->
+            <!--                <category android:name="android.intent.category.BROWSABLE" />-->
 
-<!--                <data-->
-<!--                    android:host="reauth"-->
-<!--                    android:scheme="element" />-->
-<!--            </intent-filter>-->
+            <!--                <data-->
+            <!--                    android:host="reauth"-->
+            <!--                    android:scheme="element" />-->
+            <!--            </intent-filter>-->
         </activity>
 
-        <activity android:name=".features.devtools.RoomDevToolActivity"/>
+        <activity android:name=".features.devtools.RoomDevToolActivity" />
         <!-- Services -->
 
         <service
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt
index 319322daba..4c62e34da1 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt
@@ -17,5 +17,14 @@
 package im.vector.app.features.call.conference
 
 import im.vector.app.core.platform.VectorViewEvents
+import org.jitsi.meet.sdk.JitsiMeetUserInfo
 
-sealed class JitsiCallViewEvents : VectorViewEvents
+sealed class JitsiCallViewEvents : VectorViewEvents {
+    data class StartConference(
+            val enableVideo: Boolean,
+            val jitsiUrl: String,
+            val subject: String,
+            val confId: String,
+            val userInfo: JitsiMeetUserInfo
+    ) : JitsiCallViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
index 1525ca6dfe..b46bdd50e5 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
@@ -28,6 +28,7 @@ import im.vector.app.features.themes.ThemeProvider
 import org.jitsi.meet.sdk.JitsiMeetUserInfo
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.rx.asObservable
@@ -35,7 +36,7 @@ import java.net.URL
 
 class JitsiCallViewModel @AssistedInject constructor(
         @Assisted initialState: JitsiCallViewState,
-        @Assisted val args: VectorJitsiActivity.Args,
+        @Assisted private val args: VectorJitsiActivity.Args,
         private val session: Session,
         private val jitsiMeetPropertiesFactory: JitsiWidgetPropertiesFactory,
         private val themeProvider: ThemeProvider
@@ -48,33 +49,22 @@ class JitsiCallViewModel @AssistedInject constructor(
 
     private val widgetService = session.widgetService()
 
+    private var confIsStarted = false
+
     init {
-        val me = session.getRoomMember(session.myUserId, args.roomId)?.toMatrixItem()
-        val userInfo = JitsiMeetUserInfo().apply {
-            displayName = me?.getBestName()
-            avatar = me?.avatarUrl?.let { session.contentUrlResolver().resolveFullSize(it) }?.let { URL(it) }
-        }
-        val roomName = session.getRoomSummary(args.roomId)?.displayName
-
-        setState {
-            copy(userInfo = userInfo)
-        }
-
         widgetService.getRoomWidgetsLive(args.roomId, QueryStringValue.Equals(args.widgetId), WidgetType.Jitsi.values())
                 .asObservable()
                 .distinctUntilChanged()
                 .subscribe {
                     val jitsiWidget = it.firstOrNull()
                     if (jitsiWidget != null) {
-                        val ppt = widgetService.getWidgetComputedUrl(jitsiWidget, themeProvider.isLightTheme())
-                                ?.let { url -> jitsiMeetPropertiesFactory.create(url) }
                         setState {
-                            copy(
-                                    widget = Success(jitsiWidget),
-                                    jitsiUrl = "https://${ppt?.domain}",
-                                    confId = ppt?.confId ?: "",
-                                    subject = roomName ?: ""
-                            )
+                            copy(widget = Success(jitsiWidget))
+                        }
+
+                        if (!confIsStarted) {
+                            confIsStarted = true
+                            startConference(jitsiWidget)
                         }
                     } else {
                         setState {
@@ -87,6 +77,26 @@ class JitsiCallViewModel @AssistedInject constructor(
                 .disposeOnClear()
     }
 
+    private fun startConference(jitsiWidget: Widget) {
+        val me = session.getRoomMember(session.myUserId, args.roomId)?.toMatrixItem()
+        val userInfo = JitsiMeetUserInfo().apply {
+            displayName = me?.getBestName()
+            avatar = me?.avatarUrl?.let { session.contentUrlResolver().resolveFullSize(it) }?.let { URL(it) }
+        }
+        val roomName = session.getRoomSummary(args.roomId)?.displayName
+
+        val ppt = widgetService.getWidgetComputedUrl(jitsiWidget, themeProvider.isLightTheme())
+                ?.let { url -> jitsiMeetPropertiesFactory.create(url) }
+
+        _viewEvents.post(JitsiCallViewEvents.StartConference(
+                enableVideo = args.enableVideo,
+                jitsiUrl = "https://${ppt?.domain}",
+                subject = roomName ?: "",
+                confId = ppt?.confId ?: "",
+                userInfo = userInfo
+        ))
+    }
+
     override fun handle(action: JitsiCallViewActions) {
     }
 
@@ -106,8 +116,7 @@ class JitsiCallViewModel @AssistedInject constructor(
 
             return JitsiCallViewState(
                     roomId = args.roomId,
-                    widgetId = args.widgetId,
-                    enableVideo = args.enableVideo
+                    widgetId = args.widgetId
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
index 72b87e7f1b..fe327f5867 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
@@ -19,16 +19,10 @@ package im.vector.app.features.call.conference
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import org.jitsi.meet.sdk.JitsiMeetUserInfo
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 
 data class JitsiCallViewState(
         val roomId: String = "",
         val widgetId: String = "",
-        val enableVideo: Boolean = true,
-        val jitsiUrl: String = "",
-        val subject: String = "",
-        val confId: String = "",
-        val userInfo: JitsiMeetUserInfo = JitsiMeetUserInfo(),
         val widget: Async<Widget> = Uninitialized
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index caece858aa..7fe2c2da0b 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -80,6 +80,12 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
             renderState(it)
         }
 
+        jitsiViewModel.observeViewEvents {
+            when(it) {
+                is JitsiCallViewEvents.StartConference -> configureJitsiView(it)
+            }
+        }
+
         registerForBroadcastMessages()
     }
 
@@ -96,7 +102,6 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
             is Success -> {
                 views.jitsiProgressLayout.isVisible = false
                 jitsiMeetView?.isVisible = true
-                configureJitsiView(viewState)
             }
             else       -> {
                 jitsiMeetView?.isVisible = false
@@ -105,12 +110,12 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         }
     }
 
-    private fun configureJitsiView(viewState: JitsiCallViewState) {
+    private fun configureJitsiView(startConference: JitsiCallViewEvents.StartConference) {
         val jitsiMeetConferenceOptions = JitsiMeetConferenceOptions.Builder()
-                .setVideoMuted(!viewState.enableVideo)
-                .setUserInfo(viewState.userInfo)
+                .setVideoMuted(!startConference.enableVideo)
+                .setUserInfo(startConference.userInfo)
                 .apply {
-                    tryOrNull { URL(viewState.jitsiUrl) }?.let {
+                    tryOrNull { URL(startConference.jitsiUrl) }?.let {
                         setServerURL(it)
                     }
                 }
@@ -120,8 +125,8 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
                 .setFeatureFlag("add-people.enabled", false)
                 .setFeatureFlag("video-share.enabled", false)
                 .setFeatureFlag("call-integration.enabled", false)
-                .setRoom(viewState.confId)
-                .setSubject(viewState.subject)
+                .setRoom(startConference.confId)
+                .setSubject(startConference.subject)
                 .build()
         jitsiMeetView?.join(jitsiMeetConferenceOptions)
     }
@@ -147,10 +152,10 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         super.onDestroy()
     }
 
-//    override fun onUserLeaveHint() {
-//        super.onUserLeaveHint()
-//        jitsiMeetView?.enterPictureInPicture()
-//    }
+    override fun onUserLeaveHint() {
+        super.onUserLeaveHint()
+        jitsiMeetView?.enterPictureInPicture()
+    }
 
     override fun onNewIntent(intent: Intent?) {
         JitsiMeetActivityDelegate.onNewIntent(intent)

From 9c1475d2f19c5c3924784add9d29cb5c326c8a9a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 23 Feb 2021 11:27:04 +0100
Subject: [PATCH 085/578] To squash

---
 vector/src/main/AndroidManifest.xml           |  3 ++-
 .../call/conference/VectorJitsiActivity.kt    | 21 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index bb56c4532e..07606d315c 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -235,10 +235,11 @@
         <activity
             android:name=".features.call.VectorCallActivity"
             android:excludeFromRecents="true" />
+        <!-- PIP Support https://developer.android.com/guide/topics/ui/picture-in-picture -->
         <activity
             android:name=".features.call.conference.VectorJitsiActivity"
             android:configChanges="orientation|smallestScreenSize|screenLayout|screenSize"
-            android:resizeableActivity="true"
+            android:launchMode="singleTask"
             android:supportsPictureInPicture="true" />
 
         <activity android:name=".features.terms.ReviewTermsActivity" />
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 7fe2c2da0b..a8b3230954 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -20,6 +20,8 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Parcelable
 import android.widget.FrameLayout
@@ -31,6 +33,7 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.viewModel
 import com.facebook.react.modules.core.PermissionListener
 import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityJitsiBinding
 import kotlinx.parcelize.Parcelize
@@ -81,14 +84,20 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         }
 
         jitsiViewModel.observeViewEvents {
-            when(it) {
+            when (it) {
                 is JitsiCallViewEvents.StartConference -> configureJitsiView(it)
-            }
+            }.exhaustive
         }
 
         registerForBroadcastMessages()
     }
 
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean,
+                                               newConfig: Configuration) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+        Timber.w("onPictureInPictureModeChanged($isInPictureInPictureMode)")
+    }
+
     override fun initUiAndData() {
         super.initUiAndData()
         jitsiMeetView = JitsiMeetView(this)
@@ -131,9 +140,9 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         jitsiMeetView?.join(jitsiMeetConferenceOptions)
     }
 
-    override fun onPause() {
+    override fun onStop() {
         JitsiMeetActivityDelegate.onHostPause(this)
-        super.onPause()
+        super.onStop()
     }
 
     override fun onResume() {
@@ -154,7 +163,9 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
     override fun onUserLeaveHint() {
         super.onUserLeaveHint()
-        jitsiMeetView?.enterPictureInPicture()
+        if (packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+            jitsiMeetView?.enterPictureInPicture()
+        }
     }
 
     override fun onNewIntent(intent: Intent?) {

From d2a1041a51c381363d914e5a068d7933d75d30a6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Feb 2021 15:39:14 +0100
Subject: [PATCH 086/578] Simpler code

---
 .../app/core/ui/views/ActiveConferenceView.kt  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
index 00c7bc16df..256f2d963e 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ActiveConferenceView.kt
@@ -46,7 +46,7 @@ class ActiveConferenceView @JvmOverloads constructor(
     }
 
     var callback: Callback? = null
-    var jitsiWidget: Widget? = null
+    private var jitsiWidget: Widget? = null
 
     private lateinit var views: ViewActiveConferenceViewBinding
 
@@ -95,18 +95,12 @@ class ActiveConferenceView @JvmOverloads constructor(
         val summary = state.asyncRoomSummary()
         if (summary?.membership == Membership.JOIN) {
             // We only display banner for 'live' widgets
-            val activeConf =
-                    state.activeRoomWidgets()?.firstOrNull {
-                        // for now only jitsi?
-                        it.type == WidgetType.Jitsi
-                    }
-
-            if (activeConf == null) {
-                isVisible = false
-            } else {
-                isVisible = true
-                jitsiWidget = activeConf
+            jitsiWidget = state.activeRoomWidgets()?.firstOrNull {
+                // for now only jitsi?
+                it.type == WidgetType.Jitsi
             }
+
+            isVisible = jitsiWidget != null
             // if sent by me or if i can moderate?
             views.deleteWidgetButton.isVisible = state.isAllowedToManageWidgets
         } else {

From 0607f835aa554be90c577768993edb2993b98cf3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 23 Feb 2021 11:39:56 +0100
Subject: [PATCH 087/578] It's now in the manifest

---
 .../vector/app/features/call/conference/VectorJitsiActivity.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index a8b3230954..45e5f5a2da 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -219,7 +219,6 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         fun newIntent(context: Context, roomId: String, widgetId: String, enableVideo: Boolean): Intent {
             return Intent(context, VectorJitsiActivity::class.java).apply {
                 putExtra(MvRx.KEY_ARG, Args(roomId, widgetId, enableVideo))
-                addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
             }
         }
     }

From d5f0a6d66a31c9acd2be1ac763408a5b9d7f1666 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 23 Feb 2021 11:52:15 +0100
Subject: [PATCH 088/578] Remove log, I do not understand when this code has
 disappeared.

---
 vector/src/main/java/im/vector/app/VectorApplication.kt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index 1a7fe35745..f8cda2c417 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -58,6 +58,7 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.version.VersionProvider
 import im.vector.app.push.fcm.FcmHelper
+import org.jitsi.meet.sdk.log.JitsiMeetDefaultLogHandler
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.auth.AuthenticationService
@@ -117,6 +118,11 @@ class VectorApplication :
         vectorUncaughtExceptionHandler.activate(this)
         rxConfig.setupRxPlugin()
 
+        // Remove Log handler statically added by Jitsi
+        Timber.forest()
+                .filterIsInstance(JitsiMeetDefaultLogHandler::class.java)
+                .forEach { Timber.uproot(it) }
+
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }

From 5e4219cf8e9e0884bdc2bb70cb0e442e698bbf7c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 23 Feb 2021 12:36:45 +0100
Subject: [PATCH 089/578] Jitsi: handle switch to another conference, now
 possible since we support PiP

---
 .../call/conference/JitsiCallViewActions.kt   | 10 ++-
 .../call/conference/JitsiCallViewEvents.kt    |  7 ++
 .../call/conference/JitsiCallViewModel.kt     | 71 ++++++++++++++++---
 .../call/conference/JitsiCallViewState.kt     |  1 +
 .../call/conference/VectorJitsiActivity.kt    | 32 ++++++++-
 vector/src/main/res/values/strings.xml        |  3 +
 6 files changed, 110 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt
index 6554e50d63..830af7de01 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewActions.kt
@@ -18,4 +18,12 @@ package im.vector.app.features.call.conference
 
 import im.vector.app.core.platform.VectorViewModelAction
 
-sealed class JitsiCallViewActions : VectorViewModelAction
+sealed class JitsiCallViewActions : VectorViewModelAction {
+    data class SwitchTo(val args: VectorJitsiActivity.Args,
+                        val withConfirmation: Boolean) : JitsiCallViewActions()
+
+    /**
+     * The ViewModel will either ask the View to finish, or to join another conf.
+     */
+    object OnConferenceLeft: JitsiCallViewActions()
+}
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt
index 4c62e34da1..d41f758f52 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewEvents.kt
@@ -27,4 +27,11 @@ sealed class JitsiCallViewEvents : VectorViewEvents {
             val confId: String,
             val userInfo: JitsiMeetUserInfo
     ) : JitsiCallViewEvents()
+
+    data class ConfirmSwitchingConference(
+            val args: VectorJitsiActivity.Args
+    ) : JitsiCallViewEvents()
+
+    object LeaveConference : JitsiCallViewEvents()
+    object Finish : JitsiCallViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
index b46bdd50e5..cf330ee4d6 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
@@ -19,12 +19,15 @@ package im.vector.app.features.call.conference
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.themes.ThemeProvider
+import io.reactivex.disposables.Disposable
 import org.jitsi.meet.sdk.JitsiMeetUserInfo
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
@@ -36,7 +39,6 @@ import java.net.URL
 
 class JitsiCallViewModel @AssistedInject constructor(
         @Assisted initialState: JitsiCallViewState,
-        @Assisted private val args: VectorJitsiActivity.Args,
         private val session: Session,
         private val jitsiMeetPropertiesFactory: JitsiWidgetPropertiesFactory,
         private val themeProvider: ThemeProvider
@@ -44,15 +46,23 @@ class JitsiCallViewModel @AssistedInject constructor(
 
     @AssistedFactory
     interface Factory {
-        fun create(initialState: JitsiCallViewState, args: VectorJitsiActivity.Args): JitsiCallViewModel
+        fun create(initialState: JitsiCallViewState): JitsiCallViewModel
     }
 
+    private var currentWidgetObserver: Disposable? = null
     private val widgetService = session.widgetService()
 
     private var confIsStarted = false
+    private var pendingArgs: VectorJitsiActivity.Args? = null
 
     init {
-        widgetService.getRoomWidgetsLive(args.roomId, QueryStringValue.Equals(args.widgetId), WidgetType.Jitsi.values())
+        observeWidget(initialState.roomId, initialState.widgetId)
+    }
+
+    private fun observeWidget(roomId: String, widgetId: String) {
+        confIsStarted = false
+        currentWidgetObserver?.dispose()
+        currentWidgetObserver = widgetService.getRoomWidgetsLive(roomId, QueryStringValue.Equals(widgetId), WidgetType.Jitsi.values())
                 .asObservable()
                 .distinctUntilChanged()
                 .subscribe {
@@ -77,19 +87,19 @@ class JitsiCallViewModel @AssistedInject constructor(
                 .disposeOnClear()
     }
 
-    private fun startConference(jitsiWidget: Widget) {
-        val me = session.getRoomMember(session.myUserId, args.roomId)?.toMatrixItem()
+    private fun startConference(jitsiWidget: Widget) = withState { state ->
+        val me = session.getRoomMember(session.myUserId, state.roomId)?.toMatrixItem()
         val userInfo = JitsiMeetUserInfo().apply {
             displayName = me?.getBestName()
             avatar = me?.avatarUrl?.let { session.contentUrlResolver().resolveFullSize(it) }?.let { URL(it) }
         }
-        val roomName = session.getRoomSummary(args.roomId)?.displayName
+        val roomName = session.getRoomSummary(state.roomId)?.displayName
 
         val ppt = widgetService.getWidgetComputedUrl(jitsiWidget, themeProvider.isLightTheme())
                 ?.let { url -> jitsiMeetPropertiesFactory.create(url) }
 
         _viewEvents.post(JitsiCallViewEvents.StartConference(
-                enableVideo = args.enableVideo,
+                enableVideo = state.enableVideo,
                 jitsiUrl = "https://${ppt?.domain}",
                 subject = roomName ?: "",
                 confId = ppt?.confId ?: "",
@@ -98,6 +108,45 @@ class JitsiCallViewModel @AssistedInject constructor(
     }
 
     override fun handle(action: JitsiCallViewActions) {
+        when (action) {
+            is JitsiCallViewActions.SwitchTo      -> handleSwitchTo(action)
+            JitsiCallViewActions.OnConferenceLeft -> handleOnConferenceLeft()
+        }.exhaustive
+    }
+
+    private fun handleSwitchTo(action: JitsiCallViewActions.SwitchTo) = withState { state ->
+        // Check if it is the same conf
+        if (action.args.roomId != state.roomId
+                || action.args.widgetId != state.widgetId) {
+            if (action.withConfirmation) {
+                // Ask confirmation to switch
+                _viewEvents.post(JitsiCallViewEvents.ConfirmSwitchingConference(action.args))
+            } else {
+                // Ask the view to leave the conf, then the view will tell us when it's done, to join the new conf
+                pendingArgs = action.args
+                _viewEvents.post(JitsiCallViewEvents.LeaveConference)
+            }
+        }
+    }
+
+    private fun handleOnConferenceLeft() {
+        val safePendingArgs = pendingArgs
+        pendingArgs = null
+
+        if (safePendingArgs == null) {
+            // Quit
+            _viewEvents.post(JitsiCallViewEvents.Finish)
+        } else {
+            setState {
+                copy(
+                        roomId = safePendingArgs.roomId,
+                        widgetId = safePendingArgs.widgetId,
+                        enableVideo = safePendingArgs.enableVideo,
+                        widget = Uninitialized
+                )
+            }
+            observeWidget(safePendingArgs.roomId, safePendingArgs.widgetId)
+        }
     }
 
     companion object : MvRxViewModelFactory<JitsiCallViewModel, JitsiCallViewState> {
@@ -107,8 +156,7 @@ class JitsiCallViewModel @AssistedInject constructor(
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: JitsiCallViewState): JitsiCallViewModel? {
             val callActivity: VectorJitsiActivity = viewModelContext.activity()
-            val callArgs: VectorJitsiActivity.Args = viewModelContext.args()
-            return callActivity.viewModelFactory.create(state, callArgs)
+            return callActivity.viewModelFactory.create(state)
         }
 
         override fun initialState(viewModelContext: ViewModelContext): JitsiCallViewState? {
@@ -116,7 +164,8 @@ class JitsiCallViewModel @AssistedInject constructor(
 
             return JitsiCallViewState(
                     roomId = args.roomId,
-                    widgetId = args.widgetId
+                    widgetId = args.widgetId,
+                    enableVideo = args.enableVideo
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
index fe327f5867..1fd04542e0 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewState.kt
@@ -24,5 +24,6 @@ import org.matrix.android.sdk.api.session.widgets.model.Widget
 data class JitsiCallViewState(
         val roomId: String = "",
         val widgetId: String = "",
+        val enableVideo: Boolean = false,
         val widget: Async<Widget> = Uninitialized
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 45e5f5a2da..16478192f7 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -25,6 +25,7 @@ import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Parcelable
 import android.widget.FrameLayout
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.airbnb.mvrx.Fail
@@ -32,6 +33,7 @@ import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.viewModel
 import com.facebook.react.modules.core.PermissionListener
+import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseActivity
@@ -85,13 +87,31 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
         jitsiViewModel.observeViewEvents {
             when (it) {
-                is JitsiCallViewEvents.StartConference -> configureJitsiView(it)
+                is JitsiCallViewEvents.StartConference            -> configureJitsiView(it)
+                is JitsiCallViewEvents.ConfirmSwitchingConference -> handleConfirmSwitching(it)
+                JitsiCallViewEvents.Finish                        -> finish()
+                JitsiCallViewEvents.LeaveConference               -> handleLeaveConference()
             }.exhaustive
         }
 
         registerForBroadcastMessages()
     }
 
+    private fun handleLeaveConference() {
+        jitsiMeetView?.leave()
+    }
+
+    private fun handleConfirmSwitching(action: JitsiCallViewEvents.ConfirmSwitchingConference) {
+        AlertDialog.Builder(this)
+                .setTitle(R.string.dialog_title_warning)
+                .setMessage(R.string.jitsi_leave_conf_to_join_another_one_content)
+                .setPositiveButton(R.string.action_switch) { _, _ ->
+                    jitsiViewModel.handle(JitsiCallViewActions.SwitchTo(action.args, false))
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+    }
+
     override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean,
                                                newConfig: Configuration) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
@@ -170,6 +190,14 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
     override fun onNewIntent(intent: Intent?) {
         JitsiMeetActivityDelegate.onNewIntent(intent)
+
+        // Is it a switch to another conf?
+        intent?.takeIf { it.hasExtra(MvRx.KEY_ARG) }
+                ?.let { intent.getParcelableExtra<Args>(MvRx.KEY_ARG) }
+                ?.let {
+                    jitsiViewModel.handle(JitsiCallViewActions.SwitchTo(it, true))
+                }
+
         super.onNewIntent(intent)
     }
 
@@ -211,7 +239,7 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         Timber.v("JitsiMeetViewListener.onConferenceTerminated()")
         // Do not finish if there is an error
         if (data["error"] == null) {
-            finish()
+            jitsiViewModel.handle(JitsiCallViewActions.OnConferenceLeft)
         }
     }
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index a3eade1f02..320f14eccd 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -133,6 +133,7 @@
     <string name="action_close">Close</string>
     <string name="action_copy">Copy</string>
     <string name="action_add">Add</string>
+    <string name="action_switch">Switch</string>
     <string name="action_unpublish">Unpublish</string>
     <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="disable">Disable</string>
@@ -1318,6 +1319,8 @@
 
 
     <string name="error_jitsi_not_supported_on_old_device">Sorry, conference calls with Jitsi are not supported on old devices (devices with Android OS below 6.0)</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Leave the current conference and switch to the other one?</string>
+
     <string name="room_widget_resource_permission_title">This widget wants to use the following resources:</string>
     <string name="room_widget_resource_grant_permission">Allow</string>
     <string name="room_widget_resource_decline_permission">Block All</string>

From dee3676640e6447c52176392366d27759a81288d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 23 Feb 2021 13:13:15 +0100
Subject: [PATCH 090/578] Add a delay to avoid glitch when displaying the
 dialog

---
 .../app/features/call/conference/JitsiCallViewModel.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
index cf330ee4d6..92dd2ebcd0 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/JitsiCallViewModel.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.call.conference
 
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
@@ -28,6 +29,8 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.themes.ThemeProvider
 import io.reactivex.disposables.Disposable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.jitsi.meet.sdk.JitsiMeetUserInfo
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
@@ -119,8 +122,11 @@ class JitsiCallViewModel @AssistedInject constructor(
         if (action.args.roomId != state.roomId
                 || action.args.widgetId != state.widgetId) {
             if (action.withConfirmation) {
-                // Ask confirmation to switch
-                _viewEvents.post(JitsiCallViewEvents.ConfirmSwitchingConference(action.args))
+                // Ask confirmation to switch, but wait a bit for the Activity to quit the PiP mode
+                viewModelScope.launch {
+                    delay(500)
+                    _viewEvents.post(JitsiCallViewEvents.ConfirmSwitchingConference(action.args))
+                }
             } else {
                 // Ask the view to leave the conf, then the view will tell us when it's done, to join the new conf
                 pendingArgs = action.args

From ba1c9aa5cd59422f672569516707eaaabbcdd3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99+GitHub@gmail.com>
Date: Tue, 23 Feb 2021 17:06:50 +0000
Subject: [PATCH 091/578] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 69.4% (1446 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index c9161369cb..091ad16fa8 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1158,7 +1158,7 @@
     <string name="e2e_re_request_encryption_key_sent">Nøkkelforespørsel sendt.</string>
     <string name="login_error_ssl_peer_unverified">SSL-feil: identiteten til jevnaldrende er ikke bekreftet.</string>
     <string name="login_error_homeserver_not_found">Kan ikke nå en hjemmeserver på denne URL-en, sjekk den</string>
-    <string name="login_error_no_homeserver_found">Dette er ikke en gyldig Matrix-serveradresse</string>
+    <string name="login_error_no_homeserver_found">Dette er ikke en gyldig adresse for en Matrix tjener</string>
     <string name="login_error_unknown_host">Denne URL-en er ikke tilgjengelig, sjekk den</string>
     <string name="login_error_unable_register_mail_ownership">Kan ikke registrere: e-post eierskap feil</string>
     <string name="action_unpublish">Fjern publiseringen</string>

From ec99b952312746600b7fb2b2d80556349ab75495 Mon Sep 17 00:00:00 2001
From: William <williamaak@protonmail.com>
Date: Tue, 23 Feb 2021 17:01:27 +0000
Subject: [PATCH 092/578] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 69.4% (1446 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 091ad16fa8..1ff7b91ee8 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -596,7 +596,7 @@
     <string name="send_bug_report_description_in_english">Om mulig, vennligst beskriv på engelsk.</string>
     <string name="send_bug_report_placeholder">Forklar problemet ditt her</string>
     <string name="send_bug_report_logs_description">For å diagnotisere feil, logger fra denne klienten vil bli sendt med denne feilmeldingen. Feilmeldingen, som inkluderer loggene og skjermdumper, blir ikke offentlig synlig. Hvis du foretrekker å bare sende teksten over, vennligst fjern merkene fra boksene:</string>
-    <string name="send_bug_report_alert_message">Det ser ut som du rister på telefonen i frustrasjon. Har du list til å åpne feilrapporteringsskjermen\?</string>
+    <string name="send_bug_report_alert_message">Det ser ut som du rister på telefonen i frustrasjon. Har du lyst til å åpne feilrapporteringsskjermen\?</string>
     <string name="send_bug_report_app_crashed">Applikasjonen kræsjet sist gang. Har du lyst til å åpne kræsjskjermen\?</string>
     <string name="send_bug_report_rage_shake">Sinnarist for å rapportere feil</string>
     <string name="send_bug_report_sent">Feilrapport har blitt sendt</string>
@@ -934,7 +934,7 @@
     <string name="alert_push_are_disabled_description">Gjennomgå innstillingene dine for å aktivere push-varsler</string>
     <plurals name="wrong_pin_message_remaining_attempts">
         <item quantity="one">Feil kode, %d gjenværende forsøk</item>
-        <item quantity="other">Feil kode, %d gjenværende forsøker</item>
+        <item quantity="other">Feil kode, %d gjenværende forsøk</item>
     </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Advarsel! Siste gjenværende forsøk før avlogging!</string>
     <string name="too_many_pin_failures">For mange feil, du er logget ut</string>
@@ -1022,7 +1022,7 @@
     <string name="room_settings_all_messages_noisy">Alle meldinger (støyende)</string>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s rom funnet for %2$s</item>
-        <item quantity="other">%1$s rommer funnet for %2$s</item>
+        <item quantity="other">%1$s rom funnet for %2$s</item>
     </plurals>
     <string name="directory_search_results_title">Bla gjennom katalogen</string>
     <string name="room_recents_join_room_prompt">Skriv inn et rom-ID eller et romalias</string>
@@ -1170,17 +1170,17 @@
 \n
 \nMerk at denne handlingen starter appen på nytt, og det kan ta litt tid.</string>
     <string name="room_participants_invite_prompt_msg">Er du sikker på at du vil invitere %s til denne chatten\?</string>
-    <string name="call_error_user_not_responding">ekstern side kunne ikke plukke opp.</string>
-    <string name="video_call_in_progress">Videoanrop i prosess…</string>
-    <string name="call_in_progress">Anrop i prosess…</string>
-    <string name="sas_error_m_user">Brukeren kansellerte bekreftelsen</string>
+    <string name="call_error_user_not_responding">Ekstern vert kunne ikke plukke opp.</string>
+    <string name="video_call_in_progress">Pågående videosamtale…</string>
+    <string name="call_in_progress">Pågående samtale…</string>
+    <string name="sas_error_m_user">Brukeren kansellerte verifikasjonen</string>
     <string name="identity_server_not_defined_for_password_reset">Ingen identitetsserver er konfigurert, det er nødvendig å tilbakestille passordet ditt.</string>
     <string name="error_user_already_logged_in">Det ser ut til at du prøver å koble til en annen hjemmeserver. Vil du logge av\?</string>
     <string name="room_list_empty">Bli med i et rom for å begynne å bruke appen.</string>
     <string name="room_list_catchup_empty_body">Du har ikke flere uleste meldinger</string>
     <string name="room_list_catchup_welcome_title">Velkommen hjem!</string>
-    <string name="room_list_people_empty_body">Dine direktemeldingssamtaler vises her. Trykk på + nederst til høyre for å starte noen.</string>
-    <string name="room_list_rooms_empty_body">Rommene dine vises her. Trykk på + nederst til høyre for å finne eksisterende eller starte noen av dine egne.</string>
+    <string name="room_list_people_empty_body">Dine direktemeldinger vises her. Trykk på + nederst til høyre for å starte noen.</string>
+    <string name="room_list_rooms_empty_body">Rommene dine vises her. Trykk på + nederst til høyre for å finne eksisterende eller start din egen.</string>
     <string name="reactions_agree">Godta</string>
     <string name="message_view_reaction">Se reaksjoner</string>
     <string name="event_redacted_by_user_reason">Arrangement slettet av bruker</string>
@@ -1193,7 +1193,7 @@
     <string name="create_room_name_section">Romnavn</string>
     <string name="create_room_topic_section">Romemne (valgfritt)</string>
     <string name="create_room_topic_hint">Emne</string>
-    <string name="create_room_public_description">Alle vil være med på dette rommet</string>
+    <string name="create_room_public_description">Hvem som helst kan bli med i dette rommet</string>
     <string name="create_room_settings_section">Rominnstillinger</string>
     <string name="settings_other_third_party_notices">Andre tredjepartsmeldinger</string>
     <string name="navigate_to_room_when_already_in_the_room">Du ser allerede på dette rommet!</string>
@@ -1210,11 +1210,11 @@
     <string name="user_directory_search_hint">Søk etter navn eller ID</string>
     <string name="labs_swipe_to_reply_in_timeline">Aktiver sveip for å svare på tidslinjen</string>
     <string name="link_copied_to_clipboard">Link kopiert til utklippstavlen</string>
-    <string name="add_by_matrix_id">Legg til etter matrix-ID</string>
+    <string name="add_by_matrix_id">Legg til med matrix-ID</string>
     <string name="qr_code">QR kode</string>
     <string name="add_by_qr_code">Legg til med QR-kode</string>
     <string name="creating_direct_room">Oppretter rom…</string>
-    <string name="direct_room_no_known_users">Ingen resultater funnet, bruk Legg til etter matrix-ID for å søke på serveren.</string>
+    <string name="direct_room_no_known_users">Ingen resultater funnet, bruk Legg til med matrix-ID for å søke på serveren.</string>
     <string name="direct_room_start_search">Begynn å skrive for å få resultater</string>
     <string name="direct_room_user_list_recent_title">Nylig</string>
     <string name="direct_room_user_list_known_title">Kjente brukere</string>
@@ -1564,4 +1564,6 @@
     <string name="error_unauthorized">Uautorisert, mangler gyldig autentiseringslegitimasjon</string>
     <string name="action_return">Tilbake</string>
     <string name="system_theme">System standard</string>
+    <string name="search_banned_user_hint">Filtrer utestengte brukere</string>
+    <string name="room_permissions_modify_widgets">Endre widgets</string>
 </resources>
\ No newline at end of file

From f49777ef566feb00cfb3fbaa7e91151331f46e79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 07:15:07 +0000
Subject: [PATCH 093/578] Bump olm from 3.2.1 to 3.2.2

Bumps olm from 3.2.1 to 3.2.2.

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 3ade9f7214..62db4a5a9f 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -155,7 +155,7 @@ dependencies {
     implementation "io.arrow-kt:arrow-instances-core:$arrow_version"
 
     // olm lib is now hosted by jitpack: https://jitpack.io/#org.matrix.gitlab.matrix-org/olm
-    implementation 'org.matrix.gitlab.matrix-org:olm:3.2.1'
+    implementation 'org.matrix.gitlab.matrix-org:olm:3.2.2'
 
     // DI
     implementation "com.google.dagger:dagger:$daggerVersion"

From 368e1fe9c18deb3ffaf8816d8696371a42448b63 Mon Sep 17 00:00:00 2001
From: William <williamaak@protonmail.com>
Date: Tue, 23 Feb 2021 18:52:39 +0000
Subject: [PATCH 094/578] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 70.4% (1466 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 54 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 1ff7b91ee8..6865537fbb 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1193,7 +1193,7 @@
     <string name="create_room_name_section">Romnavn</string>
     <string name="create_room_topic_section">Romemne (valgfritt)</string>
     <string name="create_room_topic_hint">Emne</string>
-    <string name="create_room_public_description">Hvem som helst kan bli med i dette rommet</string>
+    <string name="create_room_public_description">Hvem som helst vil kunne bli med i dette rommet</string>
     <string name="create_room_settings_section">Rominnstillinger</string>
     <string name="settings_other_third_party_notices">Andre tredjepartsmeldinger</string>
     <string name="navigate_to_room_when_already_in_the_room">Du ser allerede på dette rommet!</string>
@@ -1566,4 +1566,56 @@
     <string name="system_theme">System standard</string>
     <string name="search_banned_user_hint">Filtrer utestengte brukere</string>
     <string name="room_permissions_modify_widgets">Endre widgets</string>
+    <string name="settings_opt_in_of_analytics_prompt">Aktiver analyse for å hjelpe med å forbedre Element.</string>
+    <string name="startup_notification_privacy_title">Varsel Personvern</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Inkluderer avatar og visningsnavnendringer.</string>
+    <string name="settings_show_avatar_display_name_changes_messages">Vis kontohendelser</string>
+    <string name="settings_show_join_leave_messages_summary">Invitasjoner, spark og utestengelser er ikke påvirket.</string>
+    <string name="settings_show_join_leave_messages">Vis delta og forlate arrangementer</string>
+    <string name="settings_show_room_member_state_events_summary">Inkluderer invitasjoner/delta/forlot/spark/utesteng hendelser og avatar/visningsnavnendringer.</string>
+    <string name="settings_chat_effects_title">Vis chateffekter</string>
+    <string name="settings_show_room_member_state_events">Vis statens medlemsarrangementer</string>
+    <string name="settings_12_24_timestamps">Vis tidsstempler i 12-timers format</string>
+    <string name="settings_send_markdown">Markdown formatering</string>
+    <string name="settings_inline_url_preview_summary">Forhåndsvis lenker i chatten når hjemmeserveren din støtter denne funksjonen.</string>
+    <string name="settings_inline_url_preview">Forhåndsvisning av innebygd URL</string>
+    <string name="settings_pin_unread_messages">Fest rom med uleste meldinger</string>
+    <string name="settings_pin_missed_notifications">Fest rom med tapte varsler</string>
+    <string name="settings_home_display">Hjemmeskjerm</string>
+    <string name="settings_notifications_targets">Varslingsmål</string>
+    <string name="settings_cryptography_manage_keys">Administrer kryptografinøkler</string>
+    <string name="settings_integrations_summary">Bruk en Integration Manager til å administrere roboter, broer, widgets og klistremerkepakker.
+\nIntegration Managers mottar konfigurasjonsdata, og kan endre moduler, sende rominvitasjoner og angi strømnivåer på dine vegne.</string>
+    <string name="settings_set_sync_delay">Forsinkelse mellom hver synkronisering</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nSynkroniseringen kan bli utsatt avhengig av ressursene (batteriet) eller enhetens tilstand (hvilemodus).</string>
+    <string name="settings_set_workmanager_delay">Foretrukket synkroniseringsintervall</string>
+    <string name="settings_set_sync_timeout">Tidsavbrudd for synkronisering forespørsel</string>
+    <string name="settings_enable_background_sync">Aktiver synkronisering i bakgrunnen</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Du vil ikke bli varslet om innkommende meldinger når appen er i bakgrunnen.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time_description">Element vil synkroniseres i bakgrunnen med jevne mellomrom på presis tid (konfigurerbar).
+\nDette vil påvirke radio og batteribruk, det vises en permanent melding om at Element lytter etter hendelser.</string>
+    <string name="settings_background_fdroid_sync_mode_battery_description">Element synkroniseres i bakgrunnen på en måte som bevarer enhetens begrensede ressurser (batteri).
+\nAvhengig av enhetens ressurstilstand, kan synkroniseringen bli utsatt av operativsystemet.</string>
+    <string name="settings_messages_in_group_chat">Msgs i gruppechatter</string>
+    <string name="settings_containing_my_user_name">Msgs som inneholder brukernavnet mitt</string>
+    <string name="settings_containing_my_display_name">Msgs som inneholder visningsnavnet mitt</string>
+    <string name="settings_silent_notifications_preferences">Konfigurer stille varsler</string>
+    <string name="settings_call_notifications_preferences">Konfigurer anropsvarsler</string>
+    <string name="settings_noisy_notifications_preferences">Konfigurer lyd varsler</string>
+    <string name="settings_notification_privacy_message_content_not_shown">• Varsler vil &lt;b&gt;ikke vise meldingsinnhold&lt;b&gt;</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Ignorer optimalisering</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">Aktiver Start ved oppstart</string>
+    <string name="settings_troubleshoot_test_service_boot_success">Tjenesten starter når enheten startes på nytt.</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">Tjenesten kunne ikke startes på nytt</string>
+    <string name="settings_troubleshoot_test_service_restart_success">Tjenesten stoppet og startet på nytt automatisk.</string>
+    <string name="settings_troubleshoot_test_service_restart_title">Varslingstjeneste automatisk omstart</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Start Tjeneste</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">Varslingstjenesten kjører ikke.
+\nPrøv å starte programmet på nytt.</string>
+    <string name="settings_troubleshoot_test_foreground_service_startedt_success">Varslingstjenesten kjører.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_title">Varslingstjeneste</string>
+    <string name="settings_troubleshoot_test_play_services_title">Play Tjenester Sjekk</string>
+    <string name="directory_searching_title">Søker i katalogen…</string>
+    <string name="room_recents_invites">INVITASJONER</string>
 </resources>
\ No newline at end of file

From 6b0e66ce1f5cca13d5bc41dcacc3e7c58e65c585 Mon Sep 17 00:00:00 2001
From: ppnplusdf0eb2eb726b4bb3 <djbestppntube@icloud.com>
Date: Tue, 23 Feb 2021 12:21:43 +0000
Subject: [PATCH 095/578] Translated using Weblate (Thai)

Currently translated at 11.7% (244 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/th/
---
 vector/src/main/res/values-th/strings.xml | 99 +++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index f583723f75..ac0b01b91d 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -164,4 +164,103 @@
     <string name="are_you_sure">คุณแน่ใจหรือไม่\?</string>
     <string name="title_activity_group_details">ข้อมูลชุมชน</string>
     <string name="system_theme">ค่าเริ่มต้นของระบบ</string>
+    <string name="settings_add_email_address">เพิ่มที่อยู่อีเมล</string>
+    <string name="settings_phone_number">หมายเลขโทรศัพท์</string>
+    <plurals name="directory_search_rooms_for">
+        <item quantity="other">พบ %1$s ห้องสำหรับ %2$s</item>
+    </plurals>
+    <plurals name="directory_search_rooms">
+        <item quantity="other">%d ห้อง</item>
+    </plurals>
+    <string name="room_recents_join">เข้าร่วม</string>
+    <string name="search_is_not_supported_in_e2e_room">ยังไม่รองรับการค้นหาในห้องที่เข้ารหัส</string>
+    <string name="tab_title_search_files">ไฟล์</string>
+    <string name="tab_title_search_people">ผู้คน</string>
+    <string name="tab_title_search_messages">ข้อความ</string>
+    <string name="tab_title_search_rooms">ห้อง</string>
+    <string name="search_no_results">ไม่มีผลลัพธ์</string>
+    <string name="search_hint">ค้นหา</string>
+    <string name="room_event_action_report_prompt_reason">เหตุผลที่รายงานเนื้อหานี้</string>
+    <string name="room_details_people_invited_group_name">เชิญแล้ว</string>
+    <plurals name="room_details_selected">
+        <item quantity="other">เลือก %d รายการ</item>
+    </plurals>
+    <string name="room_details_settings">การตั้งค่า</string>
+    <string name="room_details_files">ไฟล์</string>
+    <string name="room_details_people">ผู้คน</string>
+    <string name="room_details_title">ข้อมูลห้อง</string>
+    <string name="room_permissions_change_topic">เปลี่ยนหัวข้อ</string>
+    <string name="room_permissions_upgrade_the_room">อัปเกรดห้อง</string>
+    <string name="room_permissions_enable_room_encryption">เปิดใช้การเข้ารหัสห้อง</string>
+    <string name="room_permissions_change_settings">เปลี่ยนการตั้งค่า</string>
+    <string name="room_permissions_invite_users">เชิญผู้ใช้</string>
+    <string name="room_permissions_send_messages">ส่งข้อความ</string>
+    <string name="ssl_do_not_trust">ไม่เชื่อถือ</string>
+    <string name="ssl_trust">เชื่อถือ</string>
+    <string name="ssl_logout_account">ออกจากระบบ</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="other">%d ข้อความใหม่</item>
+    </plurals>
+    <string name="room_message_placeholder_not_encrypted">ส่งข้อความ (ไม่เข้ารหัส)…</string>
+    <string name="room_message_placeholder_encrypted">ส่งข้อความที่เข้ารหัส…</string>
+    <string name="room_many_users_are_typing">%1$s และ %2$s และคนอื่น ๆ กำลังพิมพ์…</string>
+    <string name="room_two_users_are_typing">%1$s และ %2$s กำลังพิมพ์…</string>
+    <string name="room_one_user_is_typing">%s กำลังพิมพ์…</string>
+    <string name="room_menu_search">ค้นหา</string>
+    <string name="room_participants_invite_join_names_and">%1$s และ %2$s</string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+    <string name="reason_hint">เหตุผล</string>
+    <string name="room_participants_action_kick">เตะ</string>
+    <string name="room_participants_action_unban">เลิกแบน</string>
+    <string name="room_participants_action_ban">แบน</string>
+    <string name="room_participants_action_leave">ออกจากห้องนี้</string>
+    <string name="room_participants_action_invite">เชิญ</string>
+    <string name="room_participants_header_direct_chats">ข้อความโดยตรง</string>
+    <string name="room_participants_header_call">โทร</string>
+    <string name="room_participants_header_admin_tools">เครื่องมือผู้ดูแล</string>
+    <string name="room_participants_ago">%1$s %2$s ที่ผ่านมา</string>
+    <string name="room_participants_now">%1$s ตอนนี้</string>
+    <string name="room_participants_idle">ว่าง</string>
+    <string name="room_participants_offline">ออฟไลน์</string>
+    <string name="room_participants_online">ออนไลน์</string>
+    <string name="room_participants_create">สร้าง</string>
+    <string name="room_participants_leave_prompt_msg">คุณแน่ใจหรือไม่ว่าต้องการออกจากห้อง</string>
+    <string name="room_participants_leave_prompt_title">ออกจากห้อง</string>
+    <plurals name="format_time_s">
+        <item quantity="other">%d วิ</item>
+    </plurals>
+    <plurals name="format_time_m">
+        <item quantity="other">%d นาที</item>
+    </plurals>
+    <plurals name="format_time_h">
+        <item quantity="other">%d ชม.</item>
+    </plurals>
+    <plurals name="format_time_d">
+        <item quantity="other">%d วัน</item>
+    </plurals>
+    <string name="room_creation_add_member">เพิ่มสมาชิก</string>
+    <string name="room_creation_title">แชทใหม่</string>
+    <string name="room_preview_try_join_an_unknown_room_default">ห้อง</string>
+    <string name="room_jump_to_first_unread">ไปที่ข้อความแรกที่ยังไม่ได้อ่าน</string>
+    <string name="list_members">แสดงรายชื่อสมาชิก</string>
+    <string name="reject">ปฏิเสธ</string>
+    <string name="preview">ตัวอย่าง</string>
+    <string name="join">เข้าร่วม</string>
+    <string name="_continue">ดำเนินการต่อ</string>
+    <string name="no">ไม่</string>
+    <string name="yes">ใช่</string>
+    <string name="media_slider_saved">บันทึกแล้ว</string>
+    <string name="settings_call_show_confirmation_dialog_summary">ต้องยืนยันว่าต้องการโทรจริง ๆ ก่อนที่จะเริ่มการโทร</string>
+    <string name="settings_call_show_confirmation_dialog_title">ป้องกันการโทรโดยไม่ได้ตั้งใจ</string>
+    <string name="room_info_room_topic">หัวข้อห้อง</string>
+    <string name="attachment_cancel_upload">ยกเลิกการอัปโหลดหรือไม่\?</string>
+    <string name="attachment_cancel_download">ยกเลิกการดาวน์โหลดหรือไม่\?</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">ส่งคำขอแล้ว</string>
+    <string name="login_error_invalid_home_server">โปรดระบุ URL ที่ถูกต้อง</string>
+    <string name="login_error_must_start_http">URL ต้องขึ้นต้นด้วย http[s]://</string>
+    <string name="option_send_voice">ส่งข้อความเสียง</string>
+    <string name="matrix_only_filter">เฉพาะรายชื่อผู้ติดต่อ Matrix</string>
+    <string name="no_public_room_placeholder">ไม่มีห้องสาธารณะ</string>
+    <string name="abort">ยกเลิก</string>
+    <string name="action_mark_all_as_read">ระบุทั้งหมดว่าอ่านแล้ว</string>
 </resources>
\ No newline at end of file

From 20c692fddfbf3b8ca863ce3e8745cbe4263bf028 Mon Sep 17 00:00:00 2001
From: Argetlami <argetlam@haxaa.net>
Date: Wed, 24 Feb 2021 14:19:33 +0000
Subject: [PATCH 096/578] Translated using Weblate (Finnish)

Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
---
 fastlane/metadata/android/fi/changelogs/40100120.txt | 2 +-
 fastlane/metadata/android/fi/changelogs/40100130.txt | 4 ++--
 fastlane/metadata/android/fi/changelogs/40100140.txt | 2 ++
 fastlane/metadata/android/fi/changelogs/40100150.txt | 2 ++
 fastlane/metadata/android/fi/changelogs/40100160.txt | 2 ++
 fastlane/metadata/android/fi/changelogs/40100170.txt | 2 ++
 6 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 fastlane/metadata/android/fi/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/fi/changelogs/40100150.txt
 create mode 100644 fastlane/metadata/android/fi/changelogs/40100160.txt
 create mode 100644 fastlane/metadata/android/fi/changelogs/40100170.txt

diff --git a/fastlane/metadata/android/fi/changelogs/40100120.txt b/fastlane/metadata/android/fi/changelogs/40100120.txt
index 19b06d436a..cc47bb0ceb 100644
--- a/fastlane/metadata/android/fi/changelogs/40100120.txt
+++ b/fastlane/metadata/android/fi/changelogs/40100120.txt
@@ -1,2 +1,2 @@
-Tärkeimmät muutokset tässä versiossa: URL-esikatselu, uusi emoji-näppäimistö, uudet huoneasetukset ja lunta jouluna!
+Tärkeimmät muutokset tässä versiossa: URL-esikatselu, uusi emoji-näppäimistö, uudet huoneasetukset ja lunta jouluksi!
 Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/fi/changelogs/40100130.txt b/fastlane/metadata/android/fi/changelogs/40100130.txt
index 19b06d436a..f96792957b 100644
--- a/fastlane/metadata/android/fi/changelogs/40100130.txt
+++ b/fastlane/metadata/android/fi/changelogs/40100130.txt
@@ -1,2 +1,2 @@
-Tärkeimmät muutokset tässä versiossa: URL-esikatselu, uusi emoji-näppäimistö, uudet huoneasetukset ja lunta jouluna!
-Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.12
+Tärkeimmät muutokset tässä versiossa: URL-esikatselu, uusi emoji-näppäimistö, uudet huoneasetukset ja lunta jouluksi!
+Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/fi/changelogs/40100140.txt b/fastlane/metadata/android/fi/changelogs/40100140.txt
new file mode 100644
index 0000000000..b01b7e7325
--- /dev/null
+++ b/fastlane/metadata/android/fi/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+Tärkeimmät muutokset tässä versiossa: Huoneoikeuksien muokkaus, automaattinen valoisa/tumma teema ja läjäpäin virheenkorjauksia.
+Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/fi/changelogs/40100150.txt b/fastlane/metadata/android/fi/changelogs/40100150.txt
new file mode 100644
index 0000000000..6ae0b1abf4
--- /dev/null
+++ b/fastlane/metadata/android/fi/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+Tärkeimmät muutokset tässä versiossa: Social Login -tuki.
+Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/fi/changelogs/40100160.txt b/fastlane/metadata/android/fi/changelogs/40100160.txt
new file mode 100644
index 0000000000..ab143642a8
--- /dev/null
+++ b/fastlane/metadata/android/fi/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+Tärkeimmät muutokset tässä versiossa: Social Login -tuki.
+Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.15 and https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/fi/changelogs/40100170.txt b/fastlane/metadata/android/fi/changelogs/40100170.txt
new file mode 100644
index 0000000000..22a851b495
--- /dev/null
+++ b/fastlane/metadata/android/fi/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Tärkeimmät muutokset tässä versiossa: Virheenkorjauksia!
+Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.0.17

From 6ec8be0d3595f475bc37060e6f0c9322cc182c47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Feb 2021 07:18:51 +0000
Subject: [PATCH 097/578] Bump epoxy_version from 4.4.0 to 4.4.1

Bumps `epoxy_version` from 4.4.0 to 4.4.1.

Updates `epoxy` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-glide-preloading` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-processor` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Updates `epoxy-paging` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.0...4.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 2c5dc01e37..41da51a32c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -287,7 +287,7 @@ android {
 
 dependencies {
 
-    def epoxy_version = '4.4.0'
+    def epoxy_version = '4.4.1'
     def fragment_version = '1.3.0'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'

From 8c23b0561b6aae1f1fa9acc4d488517d78aa0dd5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Feb 2021 07:20:31 +0000
Subject: [PATCH 098/578] Bump recyclerview from 1.2.0-beta01 to 1.2.0-beta02

Bumps recyclerview from 1.2.0-beta01 to 1.2.0-beta02.

Signed-off-by: dependabot[bot] <support@github.com>
---
 attachment-viewer/build.gradle | 2 +-
 vector/build.gradle            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 8f9785e77c..7725bf23db 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.recyclerview:recyclerview:1.2.0-beta01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-beta02"
 
     implementation 'com.google.android.material:material:1.3.0'
 }
\ No newline at end of file
diff --git a/vector/build.gradle b/vector/build.gradle
index 2c5dc01e37..f797ccc608 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -317,7 +317,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0-beta01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-beta02"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

From c54a9a3b88b2f331acdd29668fab3bf0aa7e0738 Mon Sep 17 00:00:00 2001
From: Lucas_c <l_carratala@outlook.com>
Date: Thu, 25 Feb 2021 22:11:07 +0000
Subject: [PATCH 099/578] Translated using Weblate (Spanish)

Currently translated at 95.9% (1997 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
---
 vector/src/main/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 8a05b0dfd3..0ecfc2c098 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2301,5 +2301,5 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_permissions_change_history_visibility">Editar historial de visibilidad</string>
     <string name="room_permissions_change_permissions">Editar permisos</string>
     <string name="room_permissions_change_room_name">Cambiar el nombre de la sala</string>
-    <string name="room_settings_permissions_title">Administración de sala</string>
+    <string name="room_settings_permissions_title">Permisos de chat</string>
 </resources>
\ No newline at end of file

From e8a461dbb0ead3da33477671b91a462d42a4705a Mon Sep 17 00:00:00 2001
From: Ricardo <me@ricardosa.nz>
Date: Thu, 25 Feb 2021 22:09:54 +0000
Subject: [PATCH 100/578] Translated using Weblate (Spanish)

Currently translated at 95.9% (1997 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
---
 vector/src/main/res/values-es/strings.xml | 26 +++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 0ecfc2c098..58f15010c0 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -503,8 +503,8 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' no es un formato de alias válido</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">No tendrás una dirección principal especificada para esta sala.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Advertencias de la dirección principal</string>
-    <string name="room_settings_set_main_address">Establecer como Dirección Principal</string>
-    <string name="room_settings_unset_main_address">Dejar de Establecer como Dirección Principal</string>
+    <string name="room_settings_set_main_address">Establecer como dirección principal</string>
+    <string name="room_settings_unset_main_address">Dejar de Establecer como dirección principal</string>
     <string name="room_settings_copy_room_id">Copiar ID de Sala</string>
     <string name="room_settings_copy_room_address">Copiar Dirección de Sala</string>
     <string name="room_settings_addresses_e2e_enabled">La encriptación está habilitada en esta sala.</string>
@@ -1221,7 +1221,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_list_people_empty_title">Conversaciones</string>
     <string name="room_list_people_empty_body">Tus conversaciones se mostrarán aquí. Toque + en la derecha para comenzar.</string>
     <string name="room_list_rooms_empty_title">Salas</string>
-    <string name="room_list_rooms_empty_body">Tus salas se mostrarán aquí</string>
+    <string name="room_list_rooms_empty_body">Tus salas se mostrarán aquí. Pulsa el botón + abajo a la derecha para buscar o crear salas propias.</string>
     <string name="title_activity_emoji_reaction_picker">Reacciones</string>
     <string name="reactions_agree">De acuerdo</string>
     <string name="reactions_like">Me gusta</string>
@@ -2267,9 +2267,9 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="add_a_topic_link_text">Agregar un tema</string>
     <string name="room_created_summary_no_topic_creation_text">%s para dar a saber de qué se trata la sala.</string>
     <string name="this_is_the_beginning_of_dm">Este es el inicio de mensajes con %s.</string>
-    <string name="start_chatting">Iniciar Chat</string>
+    <string name="start_chatting">Empieza a hablar</string>
     <string name="action_unpublish">Despublicar</string>
-    <string name="action_add">Adicionar</string>
+    <string name="action_add">Añadir</string>
     <string name="room_settings_enable_encryption_no_permission">No tiene permisos para encryptar esta sala.</string>
     <string name="not_a_valid_qr_code">No es un ID matrix valido</string>
     <string name="user_code_my_code">Mi codigo</string>
@@ -2291,15 +2291,27 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="direct_room_user_list_contacts_title">Contactos</string>
     <string name="direct_room_user_list_known_title">Usuarios conocidos</string>
     <string name="settings_chat_effects_title">Mostrar efectos de chat</string>
-    <string name="permissions_denied_qr_code">Para escanear el codigo QR , necesita darle permisos a su cámara.</string>
+    <string name="permissions_denied_qr_code">Para leer el código QR , necesita dar permisos de acceso a su cámara.</string>
     <string name="invite_friends">Invitar contactos</string>
     <string name="room_settings_permissions_subtitle">Modifique los roles y privilegios de la sala.</string>
     <string name="room_participants_leave_private_warning">Sala no pública. No puede acceder sin una invitacion.</string>
     <string name="room_permissions_upgrade_the_room">Actualizar sala</string>
     <string name="room_permissions_change_topic">Cambiar tema</string>
     <string name="room_permissions_send_messages">Enviar mensajes</string>
-    <string name="room_permissions_change_history_visibility">Editar historial de visibilidad</string>
+    <string name="room_permissions_change_history_visibility">Editar visibilidad del historial</string>
     <string name="room_permissions_change_permissions">Editar permisos</string>
     <string name="room_permissions_change_room_name">Cambiar el nombre de la sala</string>
     <string name="room_settings_permissions_title">Permisos de chat</string>
+    <string name="room_permissions_enable_room_encryption">Habilitar cifrado de la sala</string>
+    <string name="room_permissions_change_main_address_for_the_room">Cambiar la dirección principal de la sala</string>
+    <string name="room_permissions_change_room_avatar">Cambiar el avatar de la sala</string>
+    <string name="room_permissions_modify_widgets">Modificar widgets</string>
+    <string name="room_permissions_notify_everyone">Notificar a todos</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Eliminar mensajes enviados por otros</string>
+    <string name="room_permissions_ban_users">Banear usuarios</string>
+    <string name="room_permissions_kick_users">Echar usuarios</string>
+    <string name="room_permissions_change_settings">Cambiar ajustes</string>
+    <string name="room_permissions_invite_users">Invitar usuarios</string>
+    <string name="room_permissions_default_role">Rol por defecto</string>
+    <string name="room_permissions_title">Permisos</string>
 </resources>
\ No newline at end of file

From f6123d8dfd77db0a133304a2720640def3931e23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Feb 2021 07:14:10 +0000
Subject: [PATCH 101/578] Bump daggerVersion from 2.32 to 2.33

Bumps `daggerVersion` from 2.32 to 2.33.

Updates `dagger` from 2.32 to 2.33
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33)

Updates `dagger-compiler` from 2.32 to 2.33
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.32...dagger-2.33)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 3ade9f7214..7a8a2e8dfb 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -112,7 +112,7 @@ dependencies {
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
-    def daggerVersion = '2.32'
+    def daggerVersion = '2.33'
     def work_version = '2.5.0'
     def retrofit_version = '2.9.0'
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 2c5dc01e37..1061a5caee 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -294,7 +294,7 @@ dependencies {
     def big_image_viewer_version = '1.7.0'
     def glide_version = '4.12.0'
     def moshi_version = '1.11.0'
-    def daggerVersion = '2.32'
+    def daggerVersion = '2.33'
     def autofill_version = "1.1.0"
     def work_version = '2.5.0'
     def arch_version = '2.1.0'

From bcf5481ad589efb834fd34672cff8a0992f7e3c8 Mon Sep 17 00:00:00 2001
From: Mouath Ibrahim <translate-element@mouath.com>
Date: Sat, 27 Feb 2021 17:14:54 +0000
Subject: [PATCH 102/578] Translated using Weblate (Arabic)

Currently translated at 34.7% (723 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
---
 vector/src/main/res/values-ar/strings.xml | 190 +++-------------------
 1 file changed, 22 insertions(+), 168 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 247801ae12..390a68c24b 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -1,10 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="light_theme">السمة الفاتحة</string>
     <string name="dark_theme">السمة الداكنة</string>
     <string name="black_them">السمة السوداء</string>
-
     <string name="notification_sync_in_progress">يُزامن</string>
     <string name="notification_listening_for_events">يستمع للأحداث</string>
     <string name="title_activity_home">الرسائل</string>
@@ -12,7 +10,6 @@
     <string name="title_activity_member_details">تفاصيل الأعضاء</string>
     <string name="title_activity_historical">الأرشيف</string>
     <string name="title_activity_bug_report">أبلِغ عن علة</string>
-
     <string name="ok">حسنا</string>
     <string name="cancel">ألغِ</string>
     <string name="save">احفظ</string>
@@ -47,14 +44,11 @@
     <string name="action_close">أغلِق</string>
     <string name="copied_to_clipboard">نُسخ إلى الحافظة</string>
     <string name="disable">عطّل</string>
-
     <string name="dialog_title_confirmation">أكّد</string>
     <string name="dialog_title_warning">تحذير</string>
-
     <string name="bottom_action_home">الرئيسيّة</string>
     <string name="bottom_action_favourites">المفضلة</string>
     <string name="bottom_action_rooms">الغرف</string>
-
     <string name="invitations_header">الدعوات</string>
     <string name="direct_chats_header">المحادثات</string>
     <string name="local_address_book_header">دفتر العناوين المحلي</string>
@@ -62,7 +56,6 @@
     <string name="no_conversation_placeholder">لا محادثات</string>
     <string name="no_contact_access_placeholder">لم تسمح لِ‍ Element بمطالعة متراسليك المحليين</string>
     <string name="no_result_placeholder">لا نتائج</string>
-
     <string name="rooms_header">الغرف</string>
     <string name="rooms_directory_header">دليل الغرف</string>
     <string name="no_room_placeholder">لا غرف</string>
@@ -75,7 +68,6 @@
         <item quantity="many">%d مستخدما</item>
         <item quantity="other">%d مستخدم</item>
     </plurals>
-
     <string name="send_bug_report_include_logs">أرسِل السجلات</string>
     <string name="send_bug_report_include_crash_logs">أرسِل سجلات الانهيار</string>
     <string name="send_bug_report_include_screenshot">أرسِل لقطة شاشة</string>
@@ -83,7 +75,6 @@
     <string name="send_bug_report_placeholder">صِف المشكلة هنا</string>
     <string name="send_bug_report_logs_description">لنقدر على تحليل المشاكل، ستُرسل السجلات من هذا العميل مع بلاغ العلة هذا. سوف لن يُنشر بلاغ العلة (وذلك يشمل السجلات ولقطات الشاشة) لعموم الناس. إن أردت إرسال النص أعلاه فقط، رجاءً أزل تأشير:</string>
     <string name="send_bug_report_app_crashed">انهار التطبيق في آخر مرة. أتريد إرسال بلاغ انهيار؟</string>
-
     <string name="send_bug_report_sent">أُرسل بلاغ العلة بنجاح</string>
     <string name="send_bug_report_failed">فشل إرسال بلاغ العلة (%s)</string>
     <string name="username">اسم المستخدم</string>
@@ -93,12 +84,10 @@
     <string name="start_new_chat">ابدأ دردشة جديدة</string>
     <string name="start_voice_call">ابدأ مكالمة صوتية</string>
     <string name="start_video_call">ابدأ مكالمة صورية</string>
-
     <string name="option_send_files">أرسِل ملفات</string>
     <string name="option_take_photo_video">خُذ صورة أو ڤديو</string>
     <string name="option_take_photo">خُذ صورة</string>
     <string name="option_take_video">خُذ ڤديو</string>
-
     <string name="auth_login">لِج</string>
     <string name="auth_register">سجّل</string>
     <string name="auth_submit">أرسِل</string>
@@ -136,70 +125,53 @@
     <string name="auth_reset_password_success_message">لقد صُفّرت كلمة السر.
 
 لقد خرجت من كل الأجهزة ولم تعد تستقبل الإخطارات بعد الآن. لإعادة تفعيل الإخطارات عليك الولوج في كل جهاز ثانيةً.</string>
-
     <string name="login_error_network_error">تعذّر الولوج: خطأ في الشبكة</string>
     <string name="login_error_unable_login">تعذّر الولوج</string>
     <string name="login_error_registration_network_error">تعذّر التسجيل: خطأ في الشبكة</string>
     <string name="login_error_unable_register">تعذّر التسجيل</string>
     <string name="login_error_unable_register_mail_ownership">تعذّر التسجيل: فشل في ملكية البريد</string>
     <string name="login_error_invalid_home_server">أدخِل مسارا صالحا</string>
-
     <string name="login_error_forbidden">اسم المستخدم/كلمة السر غير صالحة</string>
     <string name="login_error_not_json">لم يحتوي JSON صالح</string>
     <string name="login_error_limit_exceeded">أُرسلت الكثير من الطلبات</string>
     <string name="login_error_user_in_use">اسم المستخدم هذا مستخدم بالفعل</string>
     <string name="login_error_login_email_not_yet">لم يُنقر بعد على الرابط في البريد</string>
-
     <string name="attachment_cancel_download">أأُلغي التنزيل؟</string>
     <string name="attachment_cancel_upload">أأُلغي الرفع؟</string>
     <string name="attachment_remaining_time_seconds">%d ثا</string>
     <string name="attachment_remaining_time_minutes">%1$dدق %2$dثا</string>
-
     <string name="yesterday">الأمس</string>
     <string name="today">اليوم</string>
-
     <string name="room_info_room_name">اسم الغرفة</string>
     <string name="room_info_room_topic">موضوع الغرفة</string>
-
     <string name="call_ended">انتهت المكالمة</string>
     <string name="incoming_call">مكالمة واردة</string>
     <string name="incoming_video_call">مكالمة صورية واردة</string>
     <string name="incoming_voice_call">مكالمة صوتية واردة</string>
     <string name="call_in_progress">المكالمة جارية</string>
-
     <string name="call_error_camera_init_failed">تعذّر تمهيد الكمرة</string>
-
     <string name="media_picker_both_capture_title">خُذ صورة أو ڤديو</string>
     <string name="media_picker_cannot_record_video">تعذّر تسجيل الڤديو</string>
-
     <string name="permissions_rationale_popup_title">معلومات</string>
     <string name="permissions_action_not_performed_missing_permissions">نأسف، لم يُنفّذ الإجراء بسبب عدم وجود بعض التصاريح</string>
-
     <string name="media_slider_saved_message">أأحفظ في التنزيلات؟</string>
     <string name="yes">نعم</string>
     <string name="no">لا</string>
     <string name="_continue">تابع</string>
-
     <string name="remove">أزِل</string>
     <string name="join">انضم</string>
     <string name="reject">ارفض</string>
-
     <string name="room_jump_to_first_unread">انتقل إلى أول رسالة غير مقروءة.</string>
-
     <string name="room_preview_invitation_format">لقد دعاك ⁨%s⁩ للانضمام إلى هذه الغرفة</string>
     <string name="room_preview_room_interactions_disabled">هذه معاينة عن الغرفة. عُطّل التفاعل مع الغرفة.</string>
-
     <string name="room_creation_title">دردشة جديدة</string>
     <string name="room_creation_add_member">أضِف عضوا</string>
-
     <string name="room_participants_leave_prompt_title">ترك الغرفة</string>
     <string name="room_participants_leave_prompt_msg">أمتأكّد من ترك الغرفة؟</string>
     <string name="room_participants_remove_prompt_msg">أمتأكّد من إزالة ⁨%s⁩ من هذه الدردشة؟</string>
     <string name="room_participants_create">أنشئ</string>
-
     <string name="room_participants_header_admin_tools">أدوات الإدارة</string>
     <string name="room_participants_header_devices">الأجهزة</string>
-
     <string name="room_participants_action_leave">اترك هذه الغرفة</string>
     <string name="room_participants_action_remove">أزِل من هذه الغرفة</string>
     <string name="room_participants_action_ban">امنع</string>
@@ -211,10 +183,8 @@
     <string name="room_participants_action_unignore">اعرض كل رسائل هذا المستخدم</string>
     <string name="room_participants_action_devices_list">اعرض قائمة الأجهزة</string>
     <string name="room_participants_invite_prompt_msg">أمتأكد من دعوة ⁨%s⁩ لهذه الدردشة؟</string>
-
     <string name="people_search_local_contacts">المتراسلون المحليون (%d)</string>
     <string name="people_search_filter_text">مستخدمو «ماترِكس» فقط</string>
-
     <string name="room_one_user_is_typing">‏⁨%1$s⁩ يكتب…</string>
     <string name="room_message_placeholder_encrypted">أرسِل رسالة معمّاة…</string>
     <string name="room_message_placeholder_not_encrypted">أرسِل رسالة (غير معمّاة)…</string>
@@ -229,24 +199,20 @@
     <string name="ssl_logout_account">اخرج</string>
     <string name="ssl_fingerprint_hash">البصمة (⁨%s⁩):</string>
     <string name="ssl_could_not_verify">تعذّر التحقق من معرّف الخادوم البعيد.</string>
-
     <string name="room_details_title">تفاصيل الغرفة</string>
     <string name="room_details_files">الملفات</string>
     <string name="room_details_settings">إعدادات</string>
     <string name="room_details_people_invited_group_name">المدعوّون</string>
     <string name="room_details_people_present_group_name">المنضمون</string>
-
     <string name="room_event_action_report_prompt_ignore_user">أتريد إخفاء كل رسائل هذا العضو؟
 
 سيُعيد هذا الإجراء تشغيل التطبيق وقد يأخذ بعض الوقت.</string>
     <string name="room_event_action_cancel_upload">ألغِ الرفع</string>
     <string name="room_event_action_cancel_download">ألغِ التنزيل</string>
-
     <string name="search_no_results">لا نتائج</string>
     <string name="tab_title_search_rooms">الغرف</string>
     <string name="tab_title_search_messages">الرسائل</string>
     <string name="tab_title_search_files">الملفات</string>
-
     <string name="room_recents_directory">الدليل</string>
     <string name="room_recents_favourites">المفضلة</string>
     <string name="room_recents_conversations">الغرف</string>
@@ -255,18 +221,14 @@
     <string name="room_recents_join_room">انضم إلى غرفة</string>
     <string name="room_recents_join_room_title">انضم إلى غرفة</string>
     <string name="room_recents_join_room_prompt">اكتب معرّف غرفة أو اختصارها</string>
-
     <string name="directory_searching_title">يبحث في الدليل..</string>
-
     <string name="room_settings_leave_conversation">اترك المحادثة</string>
     <string name="room_settings_forget">انسَ</string>
-
     <string name="room_sliding_menu_messages">الرسائل</string>
     <string name="room_sliding_menu_settings">إعدادات</string>
     <string name="room_sliding_menu_version">الإصدارة</string>
     <string name="room_sliding_menu_copyright">حقوق النسخ</string>
     <string name="room_sliding_menu_privacy_policy">سياسة الخصوصية</string>
-
     <string name="settings_profile_picture">صورة اللاحة</string>
     <string name="settings_display_name">اسم العرض</string>
     <string name="settings_email_address">البريد الإلكتروني</string>
@@ -274,10 +236,8 @@
     <string name="settings_phone_number">الهاتف</string>
     <string name="settings_add_phone_number">أضِف رقم هاتف</string>
     <string name="settings_app_info_link_title">معلومات التطبيق</string>
-
     <string name="settings_notification_ringtone">صوت الإخطارات</string>
     <string name="settings_turn_screen_on">شغّل الشاشة لمدة ٣ ثواني</string>
-
     <string name="settings_containing_my_display_name">الرسائل التي فيها اسم العرض</string>
     <string name="settings_containing_my_user_name">الرسائل التي فيها اسم المستخدم</string>
     <string name="settings_messages_in_one_to_one">الرسائل في محادثات الطرفين</string>
@@ -298,9 +258,7 @@
     <string name="settings_devices_list">الأجهزة</string>
     <string name="settings_always_show_timestamps">اعرض أختام الرسائل الزمنية دائما</string>
     <string name="settings_12_24_timestamps">اعرض الأختام الزمنية بنسق ١٢ ساعة (مثلا ٢:٣٠م)</string>
-
     <string name="settings_data_save_mode">وضع حفظ البيانات</string>
-
     <string name="devices_details_dialog_title">تفاصيل الجهاز</string>
     <string name="devices_details_id_title">المعرّف</string>
     <string name="devices_details_name_title">الاسم</string>
@@ -308,11 +266,9 @@
     <string name="devices_details_last_seen_title">آخر ظهور</string>
     <string name="devices_delete_pswd">كلمة السر:</string>
     <string name="devices_delete_submit_button_label">أرسِل</string>
-
     <string name="settings_user_interface">واجهة المستخدم</string>
     <string name="settings_interface_language">لغة الواجهة</string>
     <string name="settings_select_language">اختر لغة</string>
-
     <string name="settings_change_password">غيّر كلمة السر</string>
     <string name="settings_old_password">كلمة السر القديمة</string>
     <string name="settings_new_password">كلمة السر الجديدة</string>
@@ -322,34 +278,27 @@
     <string name="settings_unignore_user">أأعرض كل رسائل ⁨%s⁩؟
 
 سيُعيد هذا الإجراء تشغيل التطبيق وقد يأخذ بعض الوقت.</string>
-
     <string name="settings_select_country">اختر دولة</string>
-
     <string name="settings_phone_number_country_label">الدولة</string>
     <string name="settings_phone_number_country_error">رجاءً اختر دولة</string>
     <string name="settings_phone_number_label">رقم الهاتف</string>
     <string name="settings_phone_number_verification_error_empty_code">أدخِل رمز التأكيد</string>
     <string name="settings_phone_number_verification_error">خطأ في التحقق من رقم الهاتف</string>
     <string name="settings_phone_number_code">الرمز</string>
-
     <string name="media_saving_period_3_days">٣ أيام</string>
     <string name="media_saving_period_1_week">أسبوع واحد</string>
     <string name="media_saving_period_1_month">شهر واحد</string>
     <string name="media_saving_period_forever">للأبد</string>
-
     <string name="room_settings_room_photo">صورة الغرفة</string>
     <string name="room_settings_room_name">اسم الغرفة</string>
     <string name="room_settings_topic">الموضوع</string>
-
     <string name="room_settings_room_read_history_rules_pref_title">إمكانيّة قراءة تأريخ الغرفة</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">من يمكنه قراءة التأريخ؟</string>
     <string name="room_settings_read_history_entry_anyone">الكل</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">الأعضاء فقط (من لحظة اختيار هذا الخيار)</string>
     <string name="room_settings_read_history_entry_members_only_invited">الأعضاء فقط (من لحظة دعوتهم)</string>
     <string name="room_settings_read_history_entry_members_only_joined">الأعضاء فقط (من لحظة انضمامهم)</string>
-
     <string name="room_settings_banned_users_title">المستخدمون الممنوعون</string>
-
     <string name="room_settings_category_advanced_title">متقدم</string>
     <string name="room_settings_labs_pref_title">مختبرات</string>
     <string name="room_settings_labs_end_to_end">تعمية الطرفية</string>
@@ -362,35 +311,28 @@
     <string name="widget_integration_must_be_in_room">لست في هذه الغرفة.</string>
     <string name="widget_integration_no_permission_in_room">ليس لديك تصريح لفعل هذا في هذه الغرفة.</string>
     <string name="settings_labs_native_camera">استخدم الكمرة الأصيلة</string>
-
     <!-- share keys -->
     <string name="conference_call_warning_title">تحذير!</string>
-
     <string name="room_unknown_devices_messages_notification">لم تُرسل الرسائل بسبب وجود أجهزة مجهولة. ماذا أفعل؟ %1$s. ‏%2$s.</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">ليس ’⁨%s⁩‘ تنسيقا صالحا لاختصار</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">لن يُحدّد عنوان رئيسي. سيُنتقى العنوان الرئيسي المبدئي لهذه الغرفة عشوائيا</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">تحذيرات بشأن العنوان الرئيسي</string>
-
     <string name="room_settings_set_main_address">اضبطه كعنوان رئيسي</string>
     <string name="room_settings_unset_main_address">ألغِ ضبطه كعنوان رئيسي</string>
     <string name="room_settings_copy_room_id">انسخ معرّف الغرفة</string>
     <string name="room_settings_copy_room_address">انسخ عنوان الغرفة</string>
-
     <string name="room_settings_addresses_e2e_enabled">التعمية مفعّلة في هذه الغرفة.</string>
     <string name="room_settings_addresses_e2e_disabled">التعمية معطّلة في هذه الغرفة.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">فعّل التعمية
 (احترس: لا يمكنك تعطيلها ثانيةً!)</string>
     <string name="directory_title">الدليل</string>
     <string name="settings_theme">السمة</string>
-
     <string name="encryption_information_title">معلومات تعمية الطرفين</string>
-
     <string name="encryption_information_device_info">معلومات الحدث</string>
     <string name="encryption_information_user_id">معرّف المستخدم</string>
     <string name="encryption_information_algorithm">الخوارزميّة</string>
     <string name="encryption_information_session_id">معرّف الجلسة</string>
     <string name="encryption_information_decryption_error">خطأ في فكّ التعمية</string>
-
     <string name="encryption_information_sender_device_information">معلومات الجهاز المرسل</string>
     <string name="encryption_information_device_name">اسم الجهاز</string>
     <string name="encryption_information_name">الاسم</string>
@@ -403,21 +345,18 @@
     <string name="encryption_export_saved_as">حُفظت مفاتيح الطرفين للغرفة في ’⁨%s⁩‘
 
 تحذير: يمكن أن يُحذف الملف إن أزلت تثبيت التطبيق.</string>
-
     <string name="encryption_import_e2e_room_keys">استورد مفاتيح الطرفين لغرفة</string>
     <string name="encryption_import_room_keys">استورد مفاتيح الغرفة</string>
     <string name="encryption_import_room_keys_summary">استورد المفاتيح من ملف محلي</string>
     <string name="encryption_information_unknown_device">جهاز مجهول</string>
     <string name="encryption_information_block">امنع</string>
     <string name="encryption_information_unblock">أزِل المنع</string>
-
     <string name="encryption_information_verify_device">أكّد الجهاز</string>
     <string name="directory_server_fail_to_retrieve_server">قد لا يكون الخادوم متوفّرا أو أنه مشغول</string>
     <string name="directory_server_type_homeserver">اكتب خادوم منزل لسرد الغرف العمومية فيه</string>
     <string name="directory_server_placeholder">مسار خادوم المنزل</string>
     <string name="directory_server_all_rooms_on_server">كل الغرف في خادوم ⁨%s⁩</string>
     <string name="directory_server_native_rooms">كل غرف ⁨%s⁩ الأصيلة</string>
-
     <string name="font_size">حجم الخط</string>
     <string name="tiny">ضئيل</string>
     <string name="small">صغير</string>
@@ -426,18 +365,15 @@
     <string name="larger">كبير جدا</string>
     <string name="largest">ضخم</string>
     <string name="huge">ضخم جدا</string>
-
     <string name="widget_no_power_to_manage">تحتاج تصريحا لإدارة الودجات في هذه الغرفة</string>
     <string name="widget_integration_missing_room_id">المعرّف room_id ناقص في الطلب.</string>
     <string name="widget_integration_missing_user_id">المعرّف user_id ناقص في الطلب.</string>
     <string name="widget_integration_room_not_visible">الغرفة ⁨%s⁩ غير ظاهرة.</string>
     <string name="you_added_a_new_device">لقد أضفت جهازا جديدا ’⁨%s⁩‘ يطلب مفاتيح التعمية.</string>
     <string name="ignore_request">تجاهل الطلب</string>
-
     <!-- conference call -->
     <string name="command_error">خطأ في الأمر</string>
     <string name="unrecognized_command">لم يُفهم الأمر: ⁨%s⁩</string>
-
     <!-- notification statuses -->
     <string name="redact">هذّب</string>
     <string name="missing_permissions_to_start_conf_call">تحتاج تصريح الدعوة لبدء اجتماع في هذه الغرفة</string>
@@ -448,17 +384,14 @@
     <string name="home_filter_placeholder_favorites">ابحث في المفضّلة</string>
     <string name="home_filter_placeholder_people">ابحث في الأشخاص</string>
     <string name="home_filter_placeholder_rooms">ابحث في الغرف</string>
-
     <string name="user_directory_header">دليل المستخدمين</string>
     <string name="send_bug_report">بلاغ علة</string>
     <string name="send_bug_report_alert_message">يبدو أنك تهزّ الهاتف وأنت مُحبط. أتريد إرسال بلاغ علة؟</string>
     <string name="send_bug_report_progress">التقدم (%s٪)</string>
-
     <string name="permissions_rationale_msg_camera_explanation">
 
 رجاءً اسمح بالنفاذ في المنبثقة الآتية لتتمكن من إجراء محادثة.</string>
     <string name="loading">يحمّل…</string>
-
     <plurals name="room_header_active_members_count">
         <item quantity="zero">لا أعضاء نشطين</item>
         <item quantity="one">عضو واحد نشط</item>
@@ -485,8 +418,6 @@
         <item quantity="many">%d رسالة جديدة</item>
         <item quantity="other">%d رسالة جديدة</item>
     </plurals>
-
-
     <plurals name="directory_search_rooms">
         <item quantity="zero">لا غرف</item>
         <item quantity="one">غرفة واحدة</item>
@@ -497,33 +428,23 @@
     </plurals>
     <string name="action_historical">الأرشيف</string>
     <string name="bottom_action_groups">المجتمعات</string>
-
     <string name="home_filter_placeholder_groups">ابحث عن مجتمعات</string>
-
     <string name="low_priority_header">أولوية منخفضة</string>
-
     <string name="groups_header">المجتمعات</string>
     <string name="no_group_placeholder">لا مجموعات</string>
-
     <string name="send_bug_report_rage_shake">هزّ الجهاز بجنون يُرسل بلاغًا بعلة</string>
-
     <string name="notification_noisy_notifications">الإخطارات المزعجة</string>
     <string name="notification_silent_notifications">الإخطارات الصامتة</string>
-
     <string name="title_activity_group_details">تفاصيل المجتمع</string>
-
     <string name="later">لاحقا</string>
     <string name="action_exit">اخرج</string>
     <string name="read_receipt">قُرأت</string>
-
     <string name="hs_url">عنوان خادوم المنزل</string>
     <string name="identity_url">عنوان خادوم التعريف</string>
     <string name="search">ابحث</string>
-
     <string name="start_new_chat_prompt_msg">أمتأكد من بدء دردشة جديدة مع ⁨%s⁩؟</string>
     <string name="start_voice_call_prompt_msg">أمتأكد من بدء محادثة صوتية؟</string>
     <string name="start_video_call_prompt_msg">أمتأكد من بدء محادثة صورية؟</string>
-
     <string name="auth_email_already_defined">عنوان البريد مُعرّف بالفعل.</string>
     <string name="auth_invalid_token">الأمارة غير صالحة</string>
     <string name="auth_threepid_warning_message">التسجيل عبر البريد ورقم الهاتف معا ليس مدعوما إلى حين توفر واجهة API لذلك. سيُستخدم رقم الهاتف فقط دون البريد.
@@ -537,7 +458,6 @@
     <string name="login_error_unknown_token">تعذر التعرف على أمارة الوصول المحددة</string>
     <string name="login_error_bad_json">JSON‏ معطوب</string>
     <string name="groups_list">قائمة المجموعات</string>
-
     <plurals name="membership_changes">
         <item quantity="zero">لا تغييرات ملكية</item>
         <item quantity="one">تغيير واحد على الملكية</item>
@@ -546,11 +466,9 @@
         <item quantity="many">%d تغييرا على الملكية</item>
         <item quantity="other">%d تغيير على الملكية</item>
     </plurals>
-
     <string name="compression_options">"أرسِل كَ‍ "</string>
     <string name="call_error_ice_failed">فشل اتصال الوسائط</string>
     <string name="call_error_answered_elsewhere">رُدّ على المكالة في مكان آخر</string>
-
     <string name="permissions_rationale_msg_storage">يحتاج Element تصريحا منك للوصول إلى مكتبتي الصور والفديو لإرسال المرفقات وحفظها.
 
 رجاءً اسمح بالوصول في المنبثقة التالية لتقدر على إرسال الملفات من هاتفك.</string>
@@ -577,26 +495,21 @@
     <string name="join_room">انضم إلى الغرفة</string>
     <string name="auth_reset_password_next_step_button">لقد أكّدت عنوان بريدي الإلكتروني</string>
     <string name="read_receipts_list">قائمة علامات القراءة</string>
-
     <string name="compression_opt_list_original">الأصلي</string>
     <string name="call_error_user_not_responding">لم يُجب الطرف البعيد.</string>
     <string name="permissions_msg_contacts_warning_other_androids">يحتاج Element تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
 
 أتسمح بأن يصل Element إلى متراسليك؟</string>
-
     <string name="room_participants_header_direct_chats">الدردشات المباشرة</string>
     <string name="room_participants_invite_search_another_user">معرّف المستخدم أو اسمه أو بريده</string>
     <string name="room_participants_action_mention">أشِر إليه</string>
     <string name="room_participants_power_level_prompt">لن تستطيع العودة عن هذا التغيير إذ أنك تمنح المستخدم نفس مستوى السلطة الذي لك.
 أمتأكد؟</string>
-
     <string name="room_participants_ban_prompt_msg">أمتأكد من منع هذا المستخدم من هذه الدردشة؟</string>
-
     <string name="people_search_invite_by_id"><u>ادعُ باستخدام المعرّف</u></string>
     <string name="people_search_invite_by_id_dialog_title">دعوة المستخدم حسب معرّفه</string>
     <string name="people_search_invite_by_id_dialog_description">رجاءً أدخِل عنوان بريد أو معرّف ماترِكس واحد أو أكثر</string>
     <string name="people_search_invite_by_id_dialog_hint">عنوان البريد أو معرّف ماترِكس</string>
-
     <string name="room_menu_search">ابحث</string>
     <string name="ssl_trust">ثِق</string>
     <string name="ssl_do_not_trust">لا تثق</string>
@@ -621,26 +534,20 @@
     <string name="room_settings_room_access_entry_only_invited">المدعوّون فقط</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">كل من يجد رابط الغرفة، عدى الزوار</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">كل من يجد رابط الغرفة، مع الزوار</string>
-
     <string name="room_settings_room_internal_id">معرّف الغرفة الداخلي</string>
     <string name="room_settings_addresses_pref_title">العناوين</string>
     <string name="room_settings_labs_warning_message">هذه مزايا اختبارية قد تعطب وبشكل غير متوقع. احتط وأنت تستخدمها.</string>
     <string name="room_settings_addresses_no_local_addresses">ليس لهذه الغرفة عناوين محلية</string>
     <string name="room_settings_addresses_add_new_address">عنوان جديد (مثلا ⁨#foo:matrix.org⁩)</string>
-
     <string name="room_settings_add_new_group">معرّف مجتمع جديد (مثلا ⁨+foo:matrix.org⁩)</string>
     <string name="room_settings_invalid_group_format_dialog_title">معرّف المجتمع غير صالح</string>
     <string name="room_settings_invalid_group_format_dialog_body">‏”⁨%s⁩“ ليس معرّف مجتمع صالح</string>
-
-
     <string name="failed_to_load_timeline_position">حاول ‏⁨%s⁩ أن يحمّل نقطة معينة في الخط الزمني ولكن تعذر عليه العثور عليها.</string>
-
     <string name="encryption_information_verify_device_warning">للتحقق فيما إذا كان يمكن الوثوق بالجهاز أم لا، رجاءً راسل مالكه مستخدما طريقة أخرى (وجها لوجه أو عبر مكالمة هاتفية) واسأله فيما إذا كان المفتاح في صفحة ”إعدادات المستخدم“ على جهازه يطابق المفتاح أدناه أم لا:</string>
     <string name="encryption_information_verify_device_warning2">إن كان يتطابق، فانقر زر التأكيد أدناه.
 وإلا فناك من يعترض هذا الجهاز وأغلب الظن أنه من الأفضل منعه.
 ستتحسن عملية التأكيد في المستقبل وتصبح أفضل وأرقى.</string>
     <string name="encryption_information_verify_key_match">أؤكّد بأن المفتاح يتطابق</string>
-
     <string name="unknown_devices_alert_title">تحتوي الغرفة أجهزة مجهولة</string>
     <string name="select_room_directory">اختر دليل غرف</string>
     <string name="settings_labs_create_conference_with_jitsi">ابدأ مكالمات الاجتماعات مستخدما Jitsi</string>
@@ -652,14 +559,12 @@
         <item quantity="many">%d ودجة نشطة</item>
         <item quantity="other">%d ودجة نشطة</item>
     </plurals>
-
     <!-- Widget Integration Manager -->
     <string name="room_add_matrix_apps">أضِف تطبيقات ماترِكس</string>
     <string name="your_unverified_device_requesting">يطلب جهازك غير المؤكّد ”‏⁨%s⁩“ مفاتيح التعمية.</string>
     <string name="start_verification">ابدأ التأكيد</string>
     <string name="share_without_verifying">شارِك دون تأكيد</string>
     <string name="encrypted_message">رسالة معمّاة</string>
-
     <!-- groups creation -->
     <string name="create">أنشئ</string>
     <string name="community_name">اسم المجتمع</string>
@@ -668,29 +573,23 @@
     <string name="group_details_people">الناس</string>
     <string name="group_details_rooms">الغرف</string>
     <string name="no_users_placeholder">لا مستخدمين</string>
-
     <string name="rooms">الغرف</string>
     <string name="joined">المنضمّون</string>
     <string name="invited">المدعوّون</string>
     <string name="filter_group_members">رشّح أعضاء المجموعة</string>
     <string name="filter_group_rooms">رشّح غرف المجموعة</string>
-
     <string name="group_no_long_description">لم يقدّم مدير المجتمع وصفا طويلا عن مجتمعه.</string>
-
     <string name="has_been_kicked">لقد طُردت من ⁨%1$s⁩ على يد ⁨%2$s⁩</string>
     <string name="has_been_banned">لقد مُنعت من ⁨%1$s⁩ على يد ⁨%2$s⁩</string>
     <string name="reason_colon">السبب: ⁨%1$s⁩</string>
     <string name="rejoin">أعِد الانضمام</string>
     <string name="forget_room">انسَ الغرفة</string>
-
     <string name="actions">الإجراءات</string>
     <string name="compression_opt_list_large">كبير</string>
     <string name="compression_opt_list_medium">متوسط</string>
     <string name="compression_opt_list_small">صغير</string>
-
     <string name="call">مكالمة</string>
     <string name="open_chat_header">افتح الترويسة</string>
-
     <string name="room_participants_header_call">المكالمة</string>
     <string name="settings_set_sync_delay">التأخير بين كل طلبي مزامنة</string>
     <string name="settings_version">الإصدارة</string>
@@ -698,7 +597,6 @@
     <string name="settings_app_term_conditions">الأحكام والشروط</string>
     <string name="settings_third_party_notices">إشعارات الأطراف الثالثة</string>
     <string name="settings_keep_media">أبقِ الوسائط</string>
-
     <string name="settings_ignored_users">المستخدمون المتجاهلون</string>
     <string name="settings_other">أخرى</string>
     <string name="settings_cryptography">التعمية</string>
@@ -708,9 +606,7 @@
     <string name="settings_pin_unread_messages">ثبّت الغرف التي فيها رسائل غير مقروءة</string>
     <string name="settings_inline_url_preview">فعّل معاينات العناوين ضمن السياق مبدئيا</string>
     <string name="settings_vibrate_on_mention">هُزّ الجهاز عند الإشارة إليّ</string>
-
     <string name="settings_analytics">التحاليل</string>
-
     <string name="devices_details_last_seen_format">‏⁨%1$s⁩ في ⁨%2$s⁩</string>
     <string name="devices_delete_dialog_text">تطلب هذه العملية تخويلا إضافيا.
 رجاءً أدخِل كلمة السر للمتابعة.</string>
@@ -718,19 +614,15 @@
     <string name="settings_logged_in">والج كَ‍</string>
     <string name="settings_home_server">خادوم المنزل</string>
     <string name="settings_identity_server">خادوم التعريف</string>
-
     <string name="account_email_validation_message">رجاءً افحص بريدك وانقر على الرابط في الرسالة. ما إن تفعل انقر ”تابع“.</string>
     <string name="account_email_validation_error">تعذر تأكيد عنوان البريد الإلكتروني. رجاءً افحص بريدك وانقر على الرابط في الرسالة. ما إن تفعل انقر ”تابع“</string>
     <string name="account_email_already_used_error">عنوان البريد مستخدم بالفعل</string>
     <string name="account_email_not_found_error">فشل إرسال البريد: لم يُعثر على عنوان البريد الإلكتروني</string>
     <string name="account_phone_number_already_used_error">رقم الهاتف مستخدم بالفعل</string>
-
     <string name="settings_delete_notification_targets_confirmation">أمتأكد من إزالة هدف الإخطار هذا؟</string>
-
     <string name="settings_phone_number_verification_instruction">لقد أرسلنا رسالة نصية فيها رمز التنشيط. رجاءً أدخِل هذا الرمز أدناه.</string>
     <string name="room_settings_room_tag">وسم الغرفة</string>
     <string name="room_settings_tag_pref_dialog_title">موسومة بِ‍:</string>
-
     <string name="room_settings_tag_pref_entry_favourite">مفضلة</string>
     <string name="room_settings_tag_pref_entry_low_priority">أولوية منخفضة</string>
     <string name="room_settings_tag_pref_entry_none">بلا</string>
@@ -739,26 +631,20 @@
     <string name="room_settings_room_notifications_title">الإخطارات</string>
     <string name="room_settings_room_access_rules_pref_title">الوصول إلى الغرفة</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">مَن يمكنه أن يصل إلى هذه الغرفة؟</string>
-
     <string name="room_settings_never_send_to_unverified_devices_title">عمِّ إلى الأجهزة المؤكّدة فقط</string>
     <string name="room_settings_no_flair">لا تميل هذه الغرفة إلى أي من المجتمعات</string>
     <string name="settings_flair">الميل</string>
-
     <string name="create_community">إنشاء مجتمع</string>
     <string name="notification_off">معطّل</string>
     <string name="notification_noisy">مزعج</string>
-
     <string name="conference_call_warning_message">ما زالت مكالمات الاجتماعات قيد التطوير وقد لا يُعتمد عليها.</string>
-
     <!-- slash commands -->
     <string name="unknown_devices_alert_message">تحتوي هذه الغرفة أجهزة مجهولة لم يُتأكّد منها.
 يعني هذا عدم وجود أي ضمانات بأن الأجهزة هي فعلا ملك لمن يستخدمها.
 ننصحك بأن تبدأ عملية التأكيد لكل جهاز وذلك قبل أن تتابع. يمكنك طبعا إرسال الرسالة دون تأكيد إن أردت ذلك.
 
 الأجهزة المجهولة:</string>
-
     <string name="encryption_never_send_to_unverified_devices_summary">لا ترسل من هذا الجهاز الرسائل المعمّاة إلى الأجهزة غير المؤكّدة</string>
-
     <string name="encryption_never_send_to_unverified_devices_title">عمِّ إلى الأجهزة المؤكّدة فقط</string>
     <string name="account_email_validation_title">التأكيد مُرجأ</string>
     <string name="settings_phone_number_verification">تأكيد الهاتف</string>
@@ -768,14 +654,12 @@
     <string name="encryption_information_verify">أكّد</string>
     <string name="encryption_information_unverify">ألغِ التأكيد</string>
     <string name="offline">غير متّصل</string>
-
     <string name="list_members">اسرد الأعضاء</string>
     <string name="room_participants_action_invite">ادعُ</string>
     <string name="people_search_user_directory">دليل المستخدمين (⁨%s⁩)</string>
     <string name="ssl_cert_not_trust">قد يعني هذا بأن أحدهم يعترض الاتصال بعدوانية، أو أن هاتفك لا يثق بالشهادة التي قدّمها الخادوم البعيد.</string>
     <string name="ssl_cert_new_account_expl">إن قال مدير الخادوم بأن هذا متوقع، فتأكد من أن البصمة أدناه تطابق البصمة التي وفّرها.</string>
     <string name="ssl_expected_existing_expl">تغيّرت الشهادة من شهادة كنت تثق بها إلى شهادة لا تثق بها. لربما جدّد الخادوم شهادته. راسل إدارة الخادوم واسألهم عن البصمة المتوقعة.</string>
-
     <string name="room_recents_join">انضم</string>
     <string name="room_recents_start_chat">ابدأ دردشة</string>
     <string name="directory_search_results_title">تصفح الدليل</string>
@@ -789,31 +673,23 @@
     </plurals>
     <string name="room_settings_direct_chat">دردشة مباشرة</string>
     <string name="room_settings_add_homescreen_shortcut">أضِف اختصارا إلى الشاشة الرئيسية</string>
-
     <string name="room_sliding_menu_term_and_conditions">الأحكام والشروط</string>
     <string name="room_sliding_menu_third_party_notices">إشعارات الأطراف الثالثة</string>
     <string name="settings_app_info_link_summary">شاشة معلومات التطبيق في النظام</string>
     <string name="settings_call_invitations">دعوات المكالمات</string>
     <string name="settings_start_on_boot">ابدأ عن الإقلاع</string>
     <string name="settings_delete_threepid_confirmation">أمتأكّد من إزالة ⁨%1$s⁩ ⁨%2$s⁩؟</string>
-
     <string name="settings_phone_number_error">رقم الهاتف غير صالح حسب الدولة المنتقاة</string>
-
     <string name="room_settings_room_access_warning">يجب أن يكون للغرفة عنوان للربط بها.</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">لا ترسل من هذا الجهاز الرسائل المعمّاة في هذه الغرفة إلى الأجهزة غير المؤكّدة.</string>
-
     <string name="room_settings_addresses_invalid_format_dialog_title">تنسيق الاسم المختصر غير صالح</string>
-
     <string name="encryption_information_curve25519_identity_key">مفتاح تعريف Curve25519</string>
     <string name="encryption_information_ed25519_fingerprint">بصمة Ed25519</string>
-
     <string name="encryption_export_e2e_room_keys">صدّر مفاتيح تعمية الطرفين لغرفة</string>
     <string name="encryption_export_export">صدّر</string>
     <string name="encryption_import_import">استورد</string>
     <string name="encryption_information_blocked">في القائمة السوداء</string>
-
     <string name="encryption_information_none">بلا</string>
-
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="zero">صفر غرفة</item>
         <item quantity="one">غرفة واحدة</item>
@@ -823,44 +699,32 @@
         <item quantity="other">%d غرفة</item>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">‏⁨%1$s⁩ في ‏⁨%2$s⁩</string>
-
     <string name="historical_placeholder">ابحث في الأرشيف</string>
-
     <string name="widget_integration_positive_power_level">يجب أن يكون مستوى السلطة عددا صحيحا موجبا.</string>
     <string name="community_name_hint">مثال</string>
     <string name="community_id_hint">مثال</string>
-
     <!-- group details -->
     <string name="title_activity_room">الغرفة</string>
     <string name="groups_invite_header">دعوة</string>
     <string name="send_files_in">أرسل إلى</string>
     <string name="title_activity_choose_sticker">أرسِل ملصقا</string>
-
     <string name="dialog_title_third_party_licences">رُخص الأطراف الثالثة</string>
-
     <string name="download">نزِّل</string>
     <string name="option_send_voice">أرسِل صوتًا</string>
-
     <string name="option_send_sticker">أرسِل ملصقًا</string>
     <string name="no_sticker_application_dialog_content">ليس ثمة أية حزمة ملصقات مفعّلة حاليًا.
 
 أتريد إضافة حزمة الآن؟</string>
-
     <string name="error_no_external_application_found">نأسف، لم نجد أي تطبيق خارجي لإكمال هذا الإجراء.</string>
-
     <string name="e2e_re_request_encryption_key"><u>أعِد طلب مفاتيح التعمية</u>من أجهزتك الأخرى.</string>
-
     <string name="e2e_re_request_encryption_key_sent">أُرسل طلب المفتاح.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">أُرسل الطلب</string>
     <string name="e2e_re_request_encryption_key_dialog_content">رجاءً أطلِق Element في جهاز آخر يقدر على فك تعمية الرسالة ليُرسل المفاتيح إلى هذا الجهاز.</string>
-
     <string name="speak">انطِق</string>
     <string name="clear">امسح</string>
     <string name="room_participants_online">متّصل</string>
     <string name="room_participants_offline">غير متّصل</string>
     <string name="room_participants_idle">خامل</string>
-
     <string name="settings_notification_privacy">خصوصيّة الإخطارات</string>
     <string name="settings_notification_privacy_normal">طبيعية</string>
     <string name="settings_notification_privacy_reduced">خصوصية أقل</string>
@@ -869,39 +733,29 @@
     <string name="settings_notification_privacy_metadata">• تحتوي الإخطارات بيانات وصفية فحسب</string>
     <string name="settings_notification_privacy_nosecure_message_content">• تحتوي الإخطارات <b>بيانات وصفية وبيانات الرسائل</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• سوف <b>لن تعرض الإخطارات محتوى الرسائل</b></string>
-
     <string name="settings_messages_sent_by_bot">الرسائل التي أرسلها بوت</string>
-
     <string name="settings_set_sync_timeout">انتهت مهلة طلب المزامنة</string>
     <string name="settings_deactivate_account_section">ألغِ تنشيط الحساب</string>
     <string name="settings_deactivate_my_account">ألغِ تنشيط حسابي</string>
-
     <string name="startup_notification_privacy_title">خصوصيّة الإخطارات</string>
     <string name="startup_notification_privacy_button_grant">امنح التصريح</string>
     <string name="startup_notification_privacy_button_other">اختر خيارا آخر</string>
-
     <string name="settings_opt_in_of_analytics">أرسِل بيانات التحاليل</string>
     <string name="settings_opt_in_of_analytics_summary">يجمع Element التحاليل بشكل مجهّل فيتيح لنا ذلك تحسين التطبيق.</string>
     <string name="settings_opt_in_of_analytics_prompt">رجاءً فعّل التحاليل لمساعدتنا في تحسين Element.</string>
     <string name="settings_opt_in_of_analytics_ok">نعم أريد المساعدة!</string>
-
     <string name="lock_screen_hint">اكتب هنا…</string>
-
     <string name="widget_integration_missing_parameter">ثمة معامل مطلوب ناقص.</string>
     <string name="widget_integration_invalid_parameter">ثمة معامل غير صالح.</string>
     <string name="settings_labs_enable_send_voice">أرسِل رسالة صوتية (يتطلب تطبيقا من طرف ثالث لتسجيل الرسائل الصوتية)</string>
-
     <string name="dialog_user_consent_content">لمتابعة استخدام خادوم المنزل ⁨%1$s⁩ عليك مراجعة الشروط والقوانين والموافقة عليها.</string>
     <string name="dialog_user_consent_submit">سأراجعها الآن</string>
-
     <string name="deactivate_account_title">ألغِ تفعيل الحساب</string>
     <string name="deactivate_account_prompt_password">رجاءً اكتب كلمة السر للمتابعة:</string>
     <string name="error_empty_field_your_password">رجاءً اكتب كلمة السر.</string>
-
     <string name="send_bug_report_description_in_english">رجاءً اكتب الوصف بالإنجليزية إن أمكن.</string>
     <string name="missing_permissions_error">نظرًا لكون بعض التصاريح ناقصة، هذا الإجراء ليس ممكنًا.</string>
     <string name="system_alerts_header">تنبيهات النظام</string>
-
     <plurals name="format_time_s">
         <item quantity="zero">%d ثانية</item>
         <item quantity="one">ثانية واحدة</item>
@@ -934,14 +788,11 @@
         <item quantity="many">%d يومًا</item>
         <item quantity="other">%d يوم</item>
     </plurals>
-
     <string name="room_participants_now">%1$s الآن</string>
     <string name="room_participants_ago">%1$s منذ %2$s</string>
-
     <string name="room_participants_invite_join_names">"⁨%1$s⁩ و "</string>
     <string name="room_participants_invite_join_names_and">⁨%1$s⁩ و ⁨%2$s⁩</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <string name="room_message_placeholder_reply_to_encrypted">أرسِل ردًا غير معمّى…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">أرسِل ردًا (بلا تعمية)…</string>
     <plurals name="room_details_selected">
@@ -952,12 +803,9 @@
         <item quantity="many">%d محدّدة</item>
         <item quantity="other">%d محدّدة</item>
     </plurals>
-
     <string name="settings_preview_media_before_sending">عايِن الوسيط قبل إرساله</string>
-
     <string name="startup_notification_privacy_message">يمكن أن يعمل Element في الخلفية ليُدير الإخطارات بأمان وخصوصية (قد يؤثّر هذا على استهلاك البطارية).</string>
     <string name="settings_without_flair">لست عضوًا في أي مجتمع حاليًا.</string>
-
     <plurals name="notification_unread_notified_messages">
         <item quantity="zero">لا رسائل إخطار غير مقروءة</item>
         <item quantity="one">رسالة إخطار واحدة غير مقروءة</item>
@@ -988,7 +836,6 @@
         <item quantity="many">%d عضوًا</item>
         <item quantity="other">%d عضو</item>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="zero">لا غرف</item>
         <item quantity="one">غرفة واحدة</item>
@@ -998,19 +845,14 @@
         <item quantity="other">%d غرفة</item>
     </plurals>
     <string name="deactivate_account_submit">ألغِ تفعيل الحساب</string>
-
     <string name="room_tombstone_versioned_description">استُبدلت هذه الغرفة ولم تعد نشطة بعد الآن</string>
     <string name="room_tombstone_continuation_description">هذه الغرفة هي استمرار لمحادثة أخرى</string>
     <string name="room_tombstone_predecessor_link">انقر هنا لرؤية الرسائل الأقدم</string>
-
     <string name="resource_limit_exceeded_title">وصلت إلى حدّ الموارد</string>
     <string name="resource_limit_contact_action">راسِل المدير</string>
-
     <string name="resource_limit_contact_admin">راسِل مدير الخدمة</string>
-
     <string name="resource_limit_soft_contact">رجاءً %s لزيادة هذا الحدّ.</string>
     <string name="resource_limit_hard_contact">رجاءً %s لمتابعة استخدام هذه الخدمة.</string>
-
     <string name="go_on_with">تابِع مستخدمًا…</string>
     <string name="command_description_emote">يعرض إجراءً</string>
     <string name="command_description_deop_user">يُلغي إدارية المستخدم حسب المعرّف المعطى</string>
@@ -1020,19 +862,15 @@
     <string name="command_description_kick_user">يطرد المستخدم حسب المعرّف المعطى</string>
     <string name="command_description_nick">يُغيّر اسم العرض لحسابك</string>
     <string name="command_description_clear_scalar_token">لإصلاح إدارة تطبيقات «ماترِكس»</string>
-
     <string name="receipt_avatar">شعار الرصيد</string>
     <string name="notice_avatar">شعار إخطار</string>
     <string name="avatar">شعار</string>
-
     <string name="deactivate_account_delete_checkbox">رجاءً انسَ كل الرسائل التي أرسلتها عندما كان حسابي غير مفعّل (تحذير: سيتسبب هذا بأن يرى المستخدمون اللاحقون عرضًا غير كاملًا للمحادثات)</string>
     <string name="room_tombstone_continuation_link">استمرت المحادثة هنا</string>
     <string name="resource_limit_soft_default">تخطّ خادوم المنزل هذا حدود الموارد لديه بذلك <b>لن يستطيع بعض المستخدمين الولوج</b>.</string>
     <string name="resource_limit_hard_default">تخطّ خادوم المنزل هذا أحد حدود الموارد لديه.</string>
-
     <string name="resource_limit_soft_mau"> وصل خادوم المنزل هذا حدّ المستخدمين النشطين شهريًا بذلك <b>لن يستطيع بعض المستخدمين الولوج</b>.</string>
     <string name="resource_limit_hard_mau">وصل خادوم المنزل هذا حدّ المستخدمين النشطين شهريًا.</string>
-
     <string name="call_connected">جرى وصل الاتصال</string>
     <string name="call_connecting">يجري وصل الاتصال…</string>
     <string name="call_ring">يُجري الاتصال…</string>
@@ -1046,20 +884,36 @@
     <string name="title_activity_keys_backup_restore">الرسائل الآمنة</string>
     <string name="skip">تخطي</string>
     <string name="done">تم</string>
-
     <string name="dialog_title_error">خطأ</string>
-
     <string name="settings_call_category">المكالمات</string>
     <string name="room_participants_action_kick">طرد</string>
     <string name="reason_hint">السبب</string>
-
     <string name="room_sliding_menu_version_x">الإصدار %s</string>
     <string name="settings_notification_advanced">الإعدادات المتقدمة للإشعارات</string>
     <string name="title_activity_verify_device">توثق من الجهاز</string>
-
     <string name="keys_backup_is_not_finished_please_wait">تأمين المفاتيح لم ينته، يرجى الانتظار</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">عند تسجيل الخروج الآن ستخسر مفاتيحك</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">تأمين المفاتيح ما زال جاريا. في حال خروجك الآن لن تتمكن لاحقا من قراءة الرسائل المشفرة</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">تأكد من تفعيل تأمين المفاتيح على كل أجهزتك كي لا تخسر رسائلك المشفرة</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">يتم تأمين المفاتيح</string>
-</resources>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">لا يوجد لديك أذن لبدء مكالمة إجتماع</string>
+    <string name="no_permissions_to_start_conf_call">لا يوجد لديك أذن لبدء إجتماع في هذه الغرفة</string>
+    <string name="start_chatting">إبدأ بالمحادثة</string>
+    <string name="reset">إعادة ضبط</string>
+    <string name="dismiss">إصرف</string>
+    <string name="pause_video">أوقف</string>
+    <string name="play_video">شغل</string>
+    <string name="disconnect">إفصل</string>
+    <string name="revoke">أبّطل</string>
+    <string name="none">لاشيء</string>
+    <string name="stay">إبقى</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">ستفقد الوصول إلى رسائلك المشفرة إلا إذا أخذت نسخة إحتياطية من مفاتيحك قبل تسجيلك للخروج.</string>
+    <string name="backup">نسخة إحتياطية</string>
+    <string name="are_you_sure">هل أنت متأكد؟</string>
+    <string name="keys_backup_activate">إستخدم المفتاح الإحتياطي</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">لا أريد رسائلي المشفرة</string>
+    <string name="title_activity_keys_backup_setup">نسخ إحتياطي للمفتاح</string>
+    <string name="notification_sync_init">جاري إعداد الخدمة</string>
+    <string name="status_theme">سمة Status.im</string>
+    <string name="system_theme">إفتراضي النظام</string>
+</resources>
\ No newline at end of file

From 2f55bb7e524d7284cf3be4640eda15ccef09a4e9 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Wed, 24 Feb 2021 23:17:14 +0000
Subject: [PATCH 103/578] Translated using Weblate (Catalan)

Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
---
 vector/src/main/res/values-ca/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 20eb222f83..961a2b8731 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -161,7 +161,7 @@
     <string name="auth_missing_email_or_phone">Falta el correu electrònic o el número de telefon</string>
     <string name="auth_invalid_token">El token és invàlid</string>
     <string name="auth_password_dont_match">Les contrasenyes no coincideixen</string>
-    <string name="auth_forgot_password">Heu oblidat la contrasenya?</string>
+    <string name="auth_forgot_password">Contrasenya oblidada\?</string>
     <string name="auth_use_server_options">Usa les opcions personalitzades del servidor (avançat)</string>
     <string name="auth_email_validation_message">Comproveu el correu electrònic per continuar el procés de registre</string>
     <string name="auth_threepid_warning_message">Registrar-se amb correu electrònic i número de telèfon alhora no es podrà fer fins que existeixi l\'api. Només es tindrà en compte el número de telèfon.

From 7de9993204ab4ae3d01079519d678a690a80c12d Mon Sep 17 00:00:00 2001
From: Ricardo <me@ricardosa.nz>
Date: Sat, 27 Feb 2021 11:21:14 +0000
Subject: [PATCH 104/578] Translated using Weblate (Spanish)

Currently translated at 96.3% (2006 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
---
 vector/src/main/res/values-es/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 58f15010c0..a0f66d1af9 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2314,4 +2314,13 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_permissions_invite_users">Invitar usuarios</string>
     <string name="room_permissions_default_role">Rol por defecto</string>
     <string name="room_permissions_title">Permisos</string>
+    <string name="settings_chat_effects_description">Usa el comando /confetti o envía un mensaje que contenga ❄️ o 🎉</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Envía los eventos m.room.server_acl</string>
+    <string name="room_permissions_notice_read_only">No tienes permiso para actualizar los roles necesarios para cambiar varias partes de la sala</string>
+    <string name="room_permissions_notice">Seleciona los roles necesarios para cambiar varias partes de la sala</string>
+    <string name="call_held_by_you">Tú has puesto la llamada en espera</string>
+    <string name="call_held_by_user">%s ha puesto la llamada en espera</string>
+    <string name="call_hold_action">Esperar</string>
+    <string name="call_resume_action">Continuar</string>
+    <string name="action_return">Volver</string>
 </resources>
\ No newline at end of file

From a10b14dcc3079a5f72ddd7e7b3d6a74172ce7492 Mon Sep 17 00:00:00 2001
From: Lucas_c <l_carratala@outlook.com>
Date: Thu, 25 Feb 2021 22:13:09 +0000
Subject: [PATCH 105/578] Translated using Weblate (Spanish)

Currently translated at 96.3% (2006 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
---
 vector/src/main/res/values-es/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index a0f66d1af9..9dec86234d 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2267,7 +2267,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="add_a_topic_link_text">Agregar un tema</string>
     <string name="room_created_summary_no_topic_creation_text">%s para dar a saber de qué se trata la sala.</string>
     <string name="this_is_the_beginning_of_dm">Este es el inicio de mensajes con %s.</string>
-    <string name="start_chatting">Empieza a hablar</string>
+    <string name="start_chatting">Empezar a chatear</string>
     <string name="action_unpublish">Despublicar</string>
     <string name="action_add">Añadir</string>
     <string name="room_settings_enable_encryption_no_permission">No tiene permisos para encryptar esta sala.</string>
@@ -2298,7 +2298,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_permissions_upgrade_the_room">Actualizar sala</string>
     <string name="room_permissions_change_topic">Cambiar tema</string>
     <string name="room_permissions_send_messages">Enviar mensajes</string>
-    <string name="room_permissions_change_history_visibility">Editar visibilidad del historial</string>
+    <string name="room_permissions_change_history_visibility">Cambiar la visibilidad del historial</string>
     <string name="room_permissions_change_permissions">Editar permisos</string>
     <string name="room_permissions_change_room_name">Cambiar el nombre de la sala</string>
     <string name="room_settings_permissions_title">Permisos de chat</string>
@@ -2306,11 +2306,11 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_permissions_change_main_address_for_the_room">Cambiar la dirección principal de la sala</string>
     <string name="room_permissions_change_room_avatar">Cambiar el avatar de la sala</string>
     <string name="room_permissions_modify_widgets">Modificar widgets</string>
-    <string name="room_permissions_notify_everyone">Notificar a todos</string>
-    <string name="room_permissions_remove_messages_sent_by_others">Eliminar mensajes enviados por otros</string>
+    <string name="room_permissions_notify_everyone">Notificar a todos los participantes</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Eliminar mensajes enviados por otros usuarios</string>
     <string name="room_permissions_ban_users">Banear usuarios</string>
     <string name="room_permissions_kick_users">Echar usuarios</string>
-    <string name="room_permissions_change_settings">Cambiar ajustes</string>
+    <string name="room_permissions_change_settings">Modificar ajustes</string>
     <string name="room_permissions_invite_users">Invitar usuarios</string>
     <string name="room_permissions_default_role">Rol por defecto</string>
     <string name="room_permissions_title">Permisos</string>

From 4091a8612d8d8b3367e479a5a99c5569eabef0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 25 Feb 2021 16:44:41 +0000
Subject: [PATCH 106/578] Translated using Weblate (Estonian)

Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
---
 vector/src/main/res/values-et/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 539d5d4017..928aa9a9b3 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -1003,7 +1003,7 @@
         <item quantity="other">%d jututuba</item>
     </plurals>
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="one">%1$s: %d sõnum</item>
+        <item quantity="one">%1$s: %2$d sõnum</item>
         <item quantity="other">%1$s: %2$d sõnumit</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
@@ -1264,7 +1264,7 @@
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d lugemata teavitatud sõnum</item>
-        <item quantity="other">%s lugemata teavitatud sõnumit</item>
+        <item quantity="other">%d lugemata teavitatud sõnumit</item>
     </plurals>
     <string name="settings_labs_enable_send_voice_summary">Selle valiku kasutamine eeldab kolmanda osapoole rakendust sõnumite salvestamiseks.</string>
     <string name="widget_integration_review_terms">Jätkamaks pead nõustuma kasutustingimustega.</string>

From 03cf89f8cd01633f7ad9e4eb6a5dc8f227b440a5 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Fri, 26 Feb 2021 17:11:59 +0000
Subject: [PATCH 107/578] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2081 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
---
 vector/src/main/res/values-pt-rBR/strings.xml | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index cb34acd429..ff35ff868c 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2037,7 +2037,7 @@
     <string name="invitations_sent_to_two_users">Convites enviados para %1$s e %2$s</string>
     <plurals name="invitations_sent_to_one_and_more_users">
         <item quantity="one">Convites enviados para %1$s e mais um</item>
-        <item quantity="other">Convites enviados para %1$s e %2$s e mais</item>
+        <item quantity="other">Convites enviados para %1$s e %2$d mais</item>
     </plurals>
     <string name="invite_users_to_room_failure">Não foi possível convidar os usuários. Por favor, verifique os usuários que você deseja convidar e tente novamente.</string>
     <string name="choose_locale_current_locale_title">Idioma atual</string>
@@ -2380,4 +2380,33 @@
     <string name="re_authentication_default_confirm_text">O Element precisa que você insira suas credenciais para executar esta ação.</string>
     <string name="re_authentication_activity_title">Necessário autenticar-se novamente</string>
     <string name="error_unauthorized">Não autorizado, sem credenciais de autenticação válidas</string>
+    <string name="call_transfer_users_tab_title">Pessoas</string>
+    <string name="call_transfer_failure">Ocorreu um erro ao transferir a chamada</string>
+    <string name="call_transfer_title">Transferir</string>
+    <string name="call_transfer_connect_action">Conectar</string>
+    <string name="call_transfer_consult_first">Consultar primeiro</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 chamada em andamento (%1$s) · 1 chamada pausada</item>
+        <item quantity="other">1 chamada em andamento (%1$s) · %2$d chamadas pausadas</item>
+    </plurals>
+    <plurals name="call_only_paused">
+        <item quantity="one">Chamada pausada</item>
+        <item quantity="other">%1$d chamadas pausadas</item>
+    </plurals>
+    <string name="call_only_active">Chamada em andamento (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">Ocorreu um erro ao pesquisar o número de telefone</string>
+    <string name="call_dial_pad_title">Teclado de discagem</string>
+    <string name="call_tile_call_back">Ligar de volta</string>
+    <string name="call_tile_ended">Essa chamada foi encerrada</string>
+    <string name="call_tile_other_declined">%1$s recusou essa chamada</string>
+    <string name="call_tile_you_declined">Você recusou essa chamada %1$s</string>
+    <string name="call_tile_in_call">Você está nessa chamada</string>
+    <string name="call_tile_other_started_call">%1$s começou uma chamada</string>
+    <string name="call_tile_you_started_call">Você começou uma chamada</string>
+    <string name="failed_to_initialize_cross_signing">Falha ao fazer a autoverificação</string>
+    <string name="call_held_by_you">Você pausou a chamada</string>
+    <string name="call_held_by_user">%s pausou a chamada</string>
+    <string name="call_hold_action">Pausar</string>
+    <string name="call_resume_action">Retomar</string>
+    <string name="action_return">Voltar</string>
 </resources>
\ No newline at end of file

From 71a8d46e29166b471cb5766a8322ca822effcab6 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 26 Feb 2021 16:40:27 +0000
Subject: [PATCH 108/578] Translated using Weblate (Albanian)

Currently translated at 99.6% (2073 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
---
 vector/src/main/res/values-sq/strings.xml | 72 +++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 27245ea122..cc94d538e8 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2269,4 +2269,76 @@
     <string name="room_settings_room_read_history_dialog_subtitle">Ndryshimet se cili mund të lexojë historikun do të aplikohen vetëm për mesazhe të ardhshëm në këtë dhomë. Dukshmëria e historikut ekzistues do të mbesë e pandryshuar.</string>
     <string name="action_unpublish">Hiqi botimin</string>
     <string name="action_add">Shto</string>
+    <string name="authentication_error">S’u arrit të bëhej mirëfilltësimi</string>
+    <string name="re_authentication_default_confirm_text">Që të kryejë këtë veprim, Element-i lyp dhënien prej jush të kredencialeve tuaja.</string>
+    <string name="re_authentication_activity_title">Lypset Rimirëfilltësim</string>
+    <string name="call_transfer_users_tab_title">Përdorues</string>
+    <string name="call_transfer_failure">Ndodhi një gabim teksa shpërngulej thirrja</string>
+    <string name="call_transfer_title">Shpërngule</string>
+    <string name="call_transfer_connect_action">Lidhe</string>
+    <string name="call_transfer_consult_first">Konsultohu së pari</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 thirrje aktive (%1$s) · 1 thirrje e ndalur</item>
+        <item quantity="other">1 thirrje aktive (%1$s) · %2$d thirrje të ndalura</item>
+    </plurals>
+    <plurals name="call_only_paused">
+        <item quantity="one">Thirrja u ndal</item>
+        <item quantity="other">U ndalën %1$d thirrje</item>
+    </plurals>
+    <string name="call_only_active">Thirrje aktive (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">Pati një gabim gjatë kërkimit të numrit të telefonit</string>
+    <string name="call_dial_pad_title">Pjesa e numrave</string>
+    <string name="call_tile_call_back">Ktheji thirrjen</string>
+    <string name="call_tile_ended">Kjo thirrje ka përfunduar</string>
+    <string name="call_tile_other_declined">%1$d hodhi poshtë këtë thirrje</string>
+    <string name="call_tile_you_declined">Hodhët poshtë këtë thirrje %1$s</string>
+    <string name="call_tile_in_call">Gjendeni në këtë thirrje</string>
+    <string name="call_tile_other_started_call">%1$s nisi një thirrje</string>
+    <string name="call_tile_you_started_call">Filluat një thirrje</string>
+    <string name="failed_to_initialize_cross_signing">S’u arrit të ujdisej “Cross Signing”</string>
+    <string name="default_message_emote_snow">dërgon dëborë ❄️</string>
+    <string name="default_message_emote_confetti">dërgon bonbone 🎉</string>
+    <string name="command_snow">E dërgon mesazhin e dhënë me dëborë</string>
+    <string name="command_confetti">E dërgon mesazhin e dhënë me bonbone</string>
+    <string name="setup_cross_signing">Aktivizoni <em>Cross Signing</em></string>
+    <string name="login_clear_homeserver_history">Spastroje historikun</string>
+    <string name="login_social_sso">hyrje njëshe</string>
+    <string name="login_social_signin_with">Hyni me %s</string>
+    <string name="login_social_signup_with">Regjistrohuni me %s</string>
+    <string name="login_social_continue_with">Vazhdo me %s</string>
+    <string name="login_social_continue">Ose</string>
+    <string name="settings_show_emoji_keyboard_summary">Shtoni një buton te hartuesi i mesazheve për të hapur tastierën e emoji-ve</string>
+    <string name="settings_show_emoji_keyboard">Shfaq tastierë emoji-sh</string>
+    <string name="settings_chat_effects_description">Përdorni urdhrin /confetti ose dërgoni një mesazh që përmban ❄️ ose 🎉</string>
+    <string name="settings_chat_effects_title">Shfaq efekte fjalosjeje</string>
+    <string name="room_permissions_change_topic">Të ndryshojë temë</string>
+    <string name="room_permissions_upgrade_the_room">Të përmirësojë dhomën</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Të dërgojë akte m.room.server_acl</string>
+    <string name="room_permissions_change_permissions">Të ndryshojë leje</string>
+    <string name="room_permissions_change_room_name">Të ndryshojë emër dhome</string>
+    <string name="room_permissions_change_history_visibility">Të ndryshojë dukshmëri historiku</string>
+    <string name="room_permissions_enable_room_encryption">Të aktivizojë fshehtëzim dhome</string>
+    <string name="room_permissions_change_main_address_for_the_room">Të ndryshojë adresë kryesore për dhomën</string>
+    <string name="room_permissions_change_room_avatar">Të ndryshojë avatar dhome</string>
+    <string name="room_permissions_modify_widgets">Të ndryshojë widget-e</string>
+    <string name="room_permissions_notify_everyone">Të njoftojë gjithkënd</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Të heqë mesazhe dërguar nga të tjerët</string>
+    <string name="room_permissions_ban_users">Të dëbojë përdorues</string>
+    <string name="room_permissions_kick_users">Të përzërë përdorues</string>
+    <string name="room_permissions_change_settings">Të ndryshojë rregullime</string>
+    <string name="room_permissions_invite_users">Të ftojë përdorues</string>
+    <string name="room_permissions_send_messages">Të dërgojë mesazhe</string>
+    <string name="room_permissions_default_role">Rol parazgjedhje</string>
+    <string name="room_permissions_notice_read_only">S’keni leje të përditësoni rolet e domosdoshëm për të ndryshuar anë të ndryshme të dhomës</string>
+    <string name="room_permissions_notice">Të përzgjedhë rolet e domosdoshme për të ndryshuar anë të ndryshme të dhomës</string>
+    <string name="room_permissions_title">Leje</string>
+    <string name="room_settings_permissions_subtitle">Të shohë dhe përditësojë role të domosdoshëm për të ndryshuar anë të ndryshme të dhomës.</string>
+    <string name="room_settings_permissions_title">Leje dhome</string>
+    <string name="room_participants_leave_private_warning">Kjo dhomë s’është publike. S’do të jeni në gjendje të rihyni në të pa një ftesë.</string>
+    <string name="call_held_by_you">E mbajtët thirrjen</string>
+    <string name="call_held_by_user">%s e mbajti thirrjen</string>
+    <string name="call_hold_action">Mbaje</string>
+    <string name="call_resume_action">Rimerre</string>
+    <string name="error_unauthorized">E paautorizuar, i mungojnë kredenciale të vlefshme mirëfilltësimi</string>
+    <string name="system_theme">Parazgjedhje Sistemi</string>
 </resources>
\ No newline at end of file

From c6426565773bceb39a2c79911c73d96ff28f6632 Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Thu, 25 Feb 2021 05:42:09 +0000
Subject: [PATCH 109/578] Translated using Weblate (Chinese (Simplified))

Currently translated at 97.9% (2039 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 vector/src/main/res/values-zh-rCN/strings.xml | 107 +++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 8bffa6e437..6bb20eb94f 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -698,7 +698,7 @@
     <string name="settings_opt_in_of_analytics_prompt">请允许资料分析以帮助我们改进 Element。</string>
     <string name="settings_opt_in_of_analytics_ok">是的，我愿意帮助！</string>
     <string name="deactivate_account_title">停用账户</string>
-    <string name="deactivate_account_content"/>
+    <string name="deactivate_account_content">这将使您的账户永远不再可用。您将不能登录，或使用相同的用户 ID 重新注册。您的账户将退出所有已加入的聊天室，身份服务器上的账户信息也会被删除。<b>此操作是不可逆的。</b> 停用您的账户<b>不会默认忘记您发送的消息</b>。如果您希望我们忘记您发送的消息，请勾选下面的选择框。 Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意味着您发送的消息不会被发给新注册或未注册的用户，但是已收到您的消息的注册用户依旧可以看到他们的副本。</string>
     <string name="deactivate_account_delete_checkbox">请在我停用账户的同时忘记我发送的所有消息（警告：这将导致未来的用户看到残缺的对话）</string>
     <string name="deactivate_account_prompt_password">请输入您的密码以继续：</string>
     <string name="deactivate_account_submit">停用账户</string>
@@ -2164,4 +2164,109 @@
     <string name="send_bug_report_include_key_share_history">发送密钥共享请求历史记录</string>
     <string name="action_unpublish">取消发布</string>
     <string name="action_add">添加</string>
+    <string name="failed_to_initialize_cross_signing">设置交叉签名失败</string>
+    <string name="default_message_emote_snow">发送雪花 ❄️</string>
+    <string name="default_message_emote_confetti">发送撒花 🎉</string>
+    <string name="command_snow">发送带有雪花的给定消息</string>
+    <string name="command_confetti">使用 confetti 发送给定消息</string>
+    <string name="topic_prefix">"话题： "</string>
+    <string name="add_a_topic_link_text">添加一个话题</string>
+    <string name="room_created_summary_no_topic_creation_text">%s 使人们知道此聊天室关于什么。</string>
+    <string name="this_is_the_beginning_of_dm">这是您和 %s 的私聊消息历史记录的开始。</string>
+    <string name="this_is_the_beginning_of_room_no_name">这是此对话的开始。</string>
+    <string name="this_is_the_beginning_of_room">这是 %s 的开始。</string>
+    <string name="settings_export_trail">导出审计</string>
+    <string name="room_settings_enable_encryption_no_permission">您没有权限在此聊天室启用加密。</string>
+    <string name="room_member_open_or_create_dm">私聊消息</string>
+    <string name="create_room_in_progress">正在创建聊天室…</string>
+    <string name="create_room_alias_invalid">一些字符不被允许</string>
+    <string name="create_room_alias_empty">请提供一个聊天室地址</string>
+    <string name="create_room_alias_already_in_use">此地址已被使用</string>
+    <string name="create_room_alias_hint">聊天室地址</string>
+    <string name="create_room_disable_federation_description">您可以启用此选项如果此聊天室将仅用于您的主服务器上的内部团队协作。此选项之后无法更改。</string>
+    <string name="create_room_disable_federation_title">屏蔽不是 %s 一部分的任何人加入此聊天室</string>
+    <string name="hide_advanced">隐藏高级</string>
+    <string name="show_advanced">显示高级</string>
+    <string name="login_clear_homeserver_history">清除历史记录</string>
+    <string name="login_social_sso">单点登录</string>
+    <string name="login_social_signin_with">通过 %s 登录</string>
+    <string name="login_social_signup_with">通过 %s 登录</string>
+    <string name="login_social_continue_with">以 %s 继续</string>
+    <string name="login_social_continue">或</string>
+    <string name="room_list_quick_actions_low_priority_remove">从低优先级移除</string>
+    <string name="room_list_quick_actions_low_priority_add">添加到低优先级</string>
+    <string name="attachment_viewer_item_x_of_y">%2$d 的 %1$d</string>
+    <string name="rotate_and_crop_screen_title">旋转和裁剪</string>
+    <string name="attachment_type_dialog_title">添加图像自</string>
+    <string name="a11y_create_direct_message_by_qr_code">通过扫描二维码创建新的私聊对话</string>
+    <string name="a11y_create_direct_message_by_mxid">通过 Matrix ID 创建新的私聊对话</string>
+    <string name="identity_server_consent_dialog_content">为发现您已知的现存联系人，您是否接受发送您的联系人数据（电话号码和/或电子邮件）到已配置的身份服务器（%1$s）？
+\n
+\n为加强隐私，发送的数据将在发送前计算散列值。</string>
+    <string name="identity_server_consent_dialog_title">发送电子邮件和电话号码</string>
+    <string name="settings_discovery_consent_action_give_consent">授予许可</string>
+    <string name="settings_discovery_consent_action_revoke">撤销我的许可</string>
+    <string name="settings_discovery_consent_notice_off">您尚未同意发送电子邮件和电话号码到身份服务器以从您的联系人发现其他用户。</string>
+    <string name="settings_discovery_consent_notice_on">您已同意发送电子邮件和电话号码到身份服务器以从您的联系人发现其他用户。</string>
+    <string name="settings_discovery_consent_title">发送电子邮件和电话号码</string>
+    <string name="direct_room_user_list_suggestions_title">建议</string>
+    <string name="direct_room_user_list_contacts_title">联系人</string>
+    <string name="direct_room_user_list_known_title">已知用户</string>
+    <string name="direct_room_user_list_recent_title">最近</string>
+    <string name="qr_code">二维码</string>
+    <string name="add_by_qr_code">通过二维码添加</string>
+    <string name="user_directory_search_hint">通过名称或 ID 搜索</string>
+    <string name="create_room_settings_section">聊天室设置</string>
+    <string name="create_room_topic_hint">主题</string>
+    <string name="create_room_topic_section">聊天室话题（可选）</string>
+    <string name="create_room_name_section">聊天室名称</string>
+    <string name="room_preview_no_preview_join">此聊天室无法预览。您想加入吗？</string>
+    <string name="room_preview_not_found">此聊天室当前不可访问。请稍候重试，或向聊天室管理员询问以检查您是否拥有访问权限。</string>
+    <string name="room_alias_publish_to_directory_error">无法获取当前聊天室目录可见性（%1$s）。</string>
+    <string name="room_alias_publish_to_directory">是否将此聊天室发布至 %1$s 的聊天室目录中？</string>
+    <string name="room_alias_action_unpublish">取消发布此地址</string>
+    <string name="room_alias_action_publish">发布此地址</string>
+    <string name="room_alias_local_address_add">添加本地地址</string>
+    <string name="room_alias_local_address_empty">此聊天室没有本地地址</string>
+    <string name="room_alias_local_address_subtitle">为此聊天室设置地址以便用户通过您的主服务器（%1$s）找到此聊天室</string>
+    <string name="room_alias_local_address_title">本地地址</string>
+    <string name="room_alias_address_hint">新的发布的地址（例如 #alias:server）</string>
+    <string name="room_alias_address_empty">尚无其他已发布地址。</string>
+    <string name="room_alias_address_empty_can_add">还没有别的发布的地址，可在下方添加。</string>
+    <string name="room_alias_publish">是否将此聊天室发布至 %1$s 的聊天室目录中？</string>
+    <string name="settings_show_emoji_keyboard_summary">在消息框添加打开表情键盘的按钮</string>
+    <string name="settings_show_emoji_keyboard">显示表情键盘</string>
+    <string name="settings_chat_effects_description">使用 /confetti 命令或发送包含 ❄️ 或 🎉 的消息</string>
+    <string name="settings_chat_effects_title">显示聊天效果</string>
+    <string name="room_permissions_change_topic">更改话题</string>
+    <string name="room_permissions_upgrade_the_room">更新聊天室</string>
+    <string name="room_permissions_send_m_room_server_acl_events">发送 m.room.server_acl 事件</string>
+    <string name="room_permissions_change_permissions">更改权限</string>
+    <string name="room_permissions_change_room_name">更改聊天室名称</string>
+    <string name="room_permissions_change_history_visibility">更改历史记录可见性</string>
+    <string name="room_permissions_enable_room_encryption">启用聊天室加密</string>
+    <string name="room_permissions_change_main_address_for_the_room">更改聊天室主地址</string>
+    <string name="room_permissions_change_room_avatar">更改聊天室头像</string>
+    <string name="room_permissions_modify_widgets">修改小部件</string>
+    <string name="room_permissions_notify_everyone">通知每个人</string>
+    <string name="room_permissions_remove_messages_sent_by_others">移除其他人发送的消息</string>
+    <string name="room_permissions_ban_users">封禁用户</string>
+    <string name="room_permissions_kick_users">踢掉用户</string>
+    <string name="room_permissions_change_settings">更改设置</string>
+    <string name="room_permissions_invite_users">邀请用户</string>
+    <string name="room_permissions_send_messages">发送消息</string>
+    <string name="room_permissions_default_role">默认角色</string>
+    <string name="room_permissions_notice_read_only">您没有权限更新更改聊天室多个部分所需角色</string>
+    <string name="room_permissions_notice">选择更改聊天室各个部分所需的角色</string>
+    <string name="room_permissions_title">权限</string>
+    <string name="room_settings_permissions_subtitle">需要查看和更新角色以更改聊天室多个部分。</string>
+    <string name="room_settings_permissions_title">聊天室权限</string>
+    <string name="room_participants_leave_private_warning">此聊天室不公开。您没有邀请将无法重新加入。</string>
+    <string name="call_held_by_you">您保持通话</string>
+    <string name="call_held_by_user">%s 保持通话</string>
+    <string name="call_hold_action">保持</string>
+    <string name="call_resume_action">继续</string>
+    <string name="error_unauthorized">未验证，缺少有效验证凭证</string>
+    <string name="action_return">返回</string>
+    <string name="system_theme">系统默认</string>
 </resources>
\ No newline at end of file

From 152397baad0bad3527e52aa08f2b08a0e8c6ae54 Mon Sep 17 00:00:00 2001
From: sr093906 <spice2wolf@gmail.com>
Date: Thu, 25 Feb 2021 00:42:36 +0000
Subject: [PATCH 110/578] Translated using Weblate (Chinese (Simplified))

Currently translated at 97.9% (2039 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 vector/src/main/res/values-zh-rCN/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 6bb20eb94f..a854fbaa7f 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1952,7 +1952,7 @@
     <string name="invitation_sent_to_one_user">邀请已发送到 %1$s</string>
     <string name="invitations_sent_to_two_users">邀请已发送到 %1$s 和 %2$s</string>
     <plurals name="invitations_sent_to_one_and_more_users">
-        <item quantity="other">邀请已发送到 %1$s 和 %2$s 等</item>
+        <item quantity="other">邀请已发送到 %1$s 和 %2$d等</item>
     </plurals>
     <string name="invite_users_to_room_failure">我们无法邀请用户，请检查您想要邀请的用户并重试。</string>
     <string name="choose_locale_current_locale_title">当前语言</string>
@@ -2105,7 +2105,7 @@
     <string name="settings_security_application_protection_summary">使用 PIN 和生物特征识别保护访问。</string>
     <string name="settings_security_application_protection_title">保护访问</string>
     <plurals name="secure_backup_reset_devices_you_can_verify">
-        <item quantity="other">显示您现在可以验证的 ％d 个设备</item>
+        <item quantity="other">显示 %d 部设备，这些设备是你现在可以验证的</item>
     </plurals>
     <string name="secure_backup_reset_no_history">您将重新启动，没有历史记录，消息，受信任的设备或受信任的用户</string>
     <string name="secure_backup_reset_if_you_reset_all">如果您重置一切</string>

From 257fc08404bbdfd2a1bfc61d1c5566f5871a3738 Mon Sep 17 00:00:00 2001
From: Ricardo <me@ricardosa.nz>
Date: Thu, 25 Feb 2021 22:04:51 +0000
Subject: [PATCH 111/578] Translated using Weblate (Spanish)

Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/es/
---
 .../src/main/res/values-es/strings.xml        | 63 +++++++++++++++++--
 1 file changed, 57 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-es/strings.xml b/matrix-sdk-android/src/main/res/values-es/strings.xml
index 3648ca3a72..22b640e58b 100644
--- a/matrix-sdk-android/src/main/res/values-es/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-es/strings.xml
@@ -29,9 +29,9 @@
     <string name="notice_room_visibility_world_readable">todos.</string>
     <string name="notice_room_visibility_unknown">desconocido (%s).</string>
     <string name="notice_end_to_end">%1$s ha activado la encriptación de Extremo-a-Extremo (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s solicitó una conferencia de vozIP</string>
-    <string name="notice_voip_started">conferencia de vozIP iniciada</string>
-    <string name="notice_voip_finished">conferencia de vozIP finalizada</string>
+    <string name="notice_requested_voip_conference">%1$s solicitó una conferencia de VozIP</string>
+    <string name="notice_voip_started">Conferencia de VozIP iniciada</string>
+    <string name="notice_voip_finished">Conferencia de VozIP finalizada</string>
     <string name="notice_avatar_changed_too">(el avatar también se cambió)</string>
     <string name="notice_room_name_removed">%1$s eliminó el nombre de la sala</string>
     <string name="notice_room_topic_removed">%1$s eliminó el tema de la sala</string>
@@ -148,7 +148,7 @@
     <string name="notice_made_future_room_visibility_by_you">Hiciste visible el futuro historial de la %1$s</string>
     <string name="notice_end_to_end_by_you">Has activado la encriptación de Extremo-a-Extremo (%1$s)</string>
     <string name="notice_room_update_by_you">Has actualizado esta sala.</string>
-    <string name="notice_requested_voip_conference_by_you">Solicitaste una conferencia de VoIP</string>
+    <string name="notice_requested_voip_conference_by_you">Solicitaste una conferencia de VozIP</string>
     <string name="notice_room_name_removed_by_you">Quitaste el nombre de la sala</string>
     <string name="notice_room_topic_removed_by_you">Quitaste el tema de la sala</string>
     <string name="notice_room_avatar_removed">%1$s eliminó el avatar de la sala</string>
@@ -168,8 +168,8 @@
     <string name="power_level_default">Por defecto</string>
     <string name="power_level_custom">Personalizado (%1$d)</string>
     <string name="power_level_custom_no_value">Personalizado</string>
-    <string name="notice_power_level_changed_by_you">Cambiaste el nivel de potencia de %1$s.</string>
-    <string name="notice_power_level_changed">%1$s cambió el nivel de potencia de %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Cambiaste el nivel de permisos de %1$s.</string>
+    <string name="notice_power_level_changed">%1$s cambió el nivel de permisos de %2$s.</string>
     <string name="notice_power_level_diff">%1$s de %2$s a %3$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Tu invitación. Razón: %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Invitaste a %1$s. Razón: %2$s</string>
@@ -221,4 +221,55 @@
     <string name="notice_direct_room_leave">%1$s ha salido de la sala</string>
     <string name="notice_direct_room_join">%1$s se ha unido</string>
     <string name="notice_direct_room_created">%1$s ha creado la conversación</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Cambiaste el alias de esta sala.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s cambió el alias de esta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Cambiaste los alias principal y alternativos de esta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s cambió los alias principal y alternativos de esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Cambiaste los alias alternativos de esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s cambió los alias alternativos de esta sala.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Eliminaste el alias alternativo %1$s para esta sala.</item>
+        <item quantity="other">Eliminaste los alias alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s eliminó el alias alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s eliminó los alias alternativos %2$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Añadiste el alias alternativo %1$s para esta sala.</item>
+        <item quantity="other">Añadiste los alias alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s añadió el alias alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s añadió los alias alternativos %2$s para esta sala.</item>
+    </plurals>
+    <string name="room_displayname_empty_room_was">Sala vacía (%s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s y %4$d otro</item>
+        <item quantity="other">%1$s, %2$s, %3$s y %4$d otros</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s y %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s y %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Todos los servidores tienen prohibido participar! Esta sala ya no puede ser usada.</string>
+    <string name="notice_room_server_acl_updated_no_change">Sin cambios.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Los servidores con literales IP coincidentes ahora están prohibidos.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Los servidores con literales IP coincidentes ahora están permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Los servidores con %s coincidentes se han eliminado de la lista de permitidos.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Los servidores con %s coincidentes ahora están permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Los servidores con %s coincidentes se han eliminado de la lista de baneos.</string>
+    <string name="notice_room_server_acl_updated_banned">• Los servidores con %s coincidentes ahora están prohibidos.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Has cambiado la lista de control de acceso para esta sala.</string>
+    <string name="notice_room_server_acl_updated_title">%s ha cambiado la lista de control de acceso para esta sala.</string>
+    <string name="notice_room_server_acl_set_allowed">• Los servidores con %s coincidentes están permitidos.</string>
+    <string name="notice_room_server_acl_set_banned">• Los servidores con %s coincidentes están prohibidos.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Los servidores con literales IP coincidentes están prohibidos.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Los servidores con literales IP coincidentes están permitidos.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Has fijado la lista de control de acceso para esta sala.</string>
+    <string name="notice_room_server_acl_set_title">%s ha fijado la lista de control de acceso para esta sala.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Has modificado la videoconferencia</string>
+    <string name="notice_widget_jitsi_modified">Videoconferencia modificada por %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Has terminado la videoconferencia</string>
+    <string name="notice_widget_jitsi_removed">Videoconferencia terminada por %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Has empezado una videoconferencia</string>
+    <string name="notice_widget_jitsi_added">Videoconferencia empezada por %1$s</string>
 </resources>
\ No newline at end of file

From 3d5a15fb1b530ada5e89859bd0bef1e3e5993b13 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Fri, 26 Feb 2021 17:04:27 +0000
Subject: [PATCH 112/578] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (226 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/pt_BR/
---
 matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
index 5e3282a305..af4004666c 100644
--- a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
@@ -266,4 +266,10 @@
     <string name="notice_room_canonical_alias_no_change">%1$s alterou os endereços desta sala.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Você alterou os endereços principal e alternativos desta sala.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s alterou os endereços principal e alternativos desta sala.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Você modificou a chamada de vídeo</string>
+    <string name="notice_widget_jitsi_modified">Chamada de vídeo modificada por %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Você encerrou a chamada de vídeo</string>
+    <string name="notice_widget_jitsi_removed">Chamada de vídeo encerrada por %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Você começou uma chamada de vídeo</string>
+    <string name="notice_widget_jitsi_added">Chamada de vídeo iniciada por %1$s</string>
 </resources>
\ No newline at end of file

From f65c9cf81240b0ac1c74439a9cd1930166623216 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 26 Feb 2021 20:03:24 +0000
Subject: [PATCH 113/578] Translated using Weblate (Albanian)

Currently translated at 98.2% (222 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sq/
---
 matrix-sdk-android/src/main/res/values-sq/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/matrix-sdk-android/src/main/res/values-sq/strings.xml b/matrix-sdk-android/src/main/res/values-sq/strings.xml
index 0d4b2888ba..11734bf16a 100644
--- a/matrix-sdk-android/src/main/res/values-sq/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sq/strings.xml
@@ -254,4 +254,10 @@
         <item quantity="one">%1$s shtoi adresën alternative %2$s për këtë dhomë.</item>
         <item quantity="other">%1$s shtoi adresat alternative %2$s për këtë dhomë.</item>
     </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">Ndryshuat konferencën video</string>
+    <string name="notice_widget_jitsi_modified">Konferenca video u ndryshua nga %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Përfunduat konferencën video</string>
+    <string name="notice_widget_jitsi_removed">Konferenca video u përfundua nga %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Nisët një konferencë video</string>
+    <string name="notice_widget_jitsi_added">Konferencë video nisur nga %1$s</string>
 </resources>
\ No newline at end of file

From ba74faa562b78c8d2cbb92e3e432f8b1cb27ea1f Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Fri, 26 Feb 2021 17:03:37 +0000
Subject: [PATCH 114/578] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (11 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
---
 fastlane/metadata/android/pt_BR/changelogs/40100170.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/pt_BR/changelogs/40100170.txt

diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100170.txt b/fastlane/metadata/android/pt_BR/changelogs/40100170.txt
new file mode 100644
index 0000000000..15081f160f
--- /dev/null
+++ b/fastlane/metadata/android/pt_BR/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Principais mudanças nessa versão: correções de erros!
+Registro de todas as alterações: https://github.com/vector-im/element-android/releases/tag/v1.0.17

From 5cf904fb4af4d4c2377cc3ff232314ee7c7d948d Mon Sep 17 00:00:00 2001
From: vachan-maker <revsamtp@hotmail.com>
Date: Fri, 26 Feb 2021 05:19:00 +0000
Subject: [PATCH 115/578] Translated using Weblate (Malayalam)

Currently translated at 16.6% (346 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index c09b6a5649..867f91d586 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -356,4 +356,11 @@
     <string name="verification_request_you_cancelled">നിങ്ങൾ റദ്ദാക്കി</string>
     <string name="verification_request_other_cancelled">%s റദ്ദാക്കി</string>
     <string name="verification_request_waiting">കാത്തിരിക്കുന്നൂ…</string>
+    <string name="auth_return_to_login">പ്രവേശന സ്ക്രീനിലേക്ക് മടങ്ങുക</string>
+    <string name="start_video_call_prompt_msg">നിങ്ങൾക്ക് ഒരു വിഡിയോ കോൾ ആരംഭിക്കണമെന്ന് ഉറപ്പാണോ\?</string>
+    <string name="identity_url">തിരിച്ചറിയൽ സെർവറിന്റെ URL</string>
+    <string name="send_bug_report_description_in_english">കഴിയുമെങ്കിൽ, വിവരണം ഇംഗ്ലീഷിൽ എഴുതുക.</string>
+    <string name="home_filter_placeholder_people">ആളുകളെ ഫിൽറ്റർ</string>
+    <string name="keys_backup_activate">കീ ബാക്കപ്പ് ഉപയൊഗിക്കുക</string>
+    <string name="keys_backup_is_not_finished_please_wait">കീ ബാക്കപ്പ് പൂർത്തിയായിട്ടില്ല, കാത്തിരിക്കൂ…</string>
 </resources>
\ No newline at end of file

From 6f6f76b36b5b37893c310d8f6902cac56e54f4a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Mar 2021 08:55:44 +0000
Subject: [PATCH 116/578] Bump kotlin_version from 1.4.30 to 1.4.31

Bumps `kotlin_version` from 1.4.30 to 1.4.31.

Updates `kotlin-gradle-plugin` from 1.4.30 to 1.4.31
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.31/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.30...v1.4.31)

Updates `kotlin-stdlib-jdk7` from 1.4.30 to 1.4.31
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.31/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.30...v1.4.31)

Updates `kotlin-stdlib` from 1.4.30 to 1.4.31
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.4.31/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.30...v1.4.31)

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5f4650ee23..b918750a08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     // Ref: https://kotlinlang.org/releases.html
-    ext.kotlin_version = '1.4.30'
+    ext.kotlin_version = '1.4.31'
     ext.kotlin_coroutines_version = "1.4.2"
     repositories {
         google()

From 8b34caa0b1b773b2e62c433ec0e2f0ea48d91cb8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 1 Mar 2021 11:51:56 +0100
Subject: [PATCH 117/578] Move capability section above Server name and version
 section

---
 .../settings/homeserver/HomeserverSettingsController.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
index e90f711edc..514311315d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/homeserver/HomeserverSettingsController.kt
@@ -48,6 +48,7 @@ class HomeserverSettingsController @Inject constructor(
         data ?: return
 
         buildHeader(data)
+        buildCapabilities(data)
         when (val federationVersion = data.federationVersion) {
             is Loading,
             is Uninitialized ->
@@ -63,7 +64,6 @@ class HomeserverSettingsController @Inject constructor(
             is Success       ->
                 buildFederationVersion(federationVersion())
         }
-        buildCapabilities(data)
     }
 
     private fun buildHeader(state: HomeServerSettingsViewState) {

From d3b2306b3d8c45183bf66ba774dec4044469fdc4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 1 Mar 2021 14:33:52 +0100
Subject: [PATCH 118/578] Remove unused file

---
 .../main/res/layout/view_image_attachment.xml   | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 attachment-viewer/src/main/res/layout/view_image_attachment.xml

diff --git a/attachment-viewer/src/main/res/layout/view_image_attachment.xml b/attachment-viewer/src/main/res/layout/view_image_attachment.xml
deleted file mode 100644
index 3518a4472d..0000000000
--- a/attachment-viewer/src/main/res/layout/view_image_attachment.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/design_default_color_primary">
-
-    <TextView
-        android:id="@+id/testPage"
-        android:layout_centerInParent="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="1"
-        android:textSize="80sp"
-        android:textStyle="bold" />
-
-
-</RelativeLayout>
\ No newline at end of file

From 9a635dd906e31c8033626da4e927d951b380d9af Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 1 Mar 2021 15:10:27 +0100
Subject: [PATCH 119/578] Move VerificationState to a dedicated file and in the
 correct package

---
 .../sdk/api/crypto/VerificationState.kt       | 25 +++++++++++++++++++
 .../room/model/ReferencesAggregatedContent.kt |  2 +-
 .../EventRelationsAggregationProcessor.kt     |  9 +------
 .../factory/VerificationItemFactory.kt        |  2 +-
 .../helper/MessageInformationDataFactory.kt   |  2 +-
 .../timeline/item/MessageInformationData.kt   |  2 +-
 .../timeline/item/VerificationRequestItem.kt  |  2 +-
 7 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt
new file mode 100644
index 0000000000..8a3515740b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.crypto
+
+enum class VerificationState {
+    REQUEST,
+    WAITING,
+    CANCELED_BY_ME,
+    CANCELED_BY_OTHER,
+    DONE
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
index 0947c96bb0..664d042e18 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
@@ -17,7 +17,7 @@ package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.internal.session.room.VerificationState
+import org.matrix.android.sdk.api.crypto.VerificationState
 
 /**
  * Contains an aggregated summary info of the references.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index d090ba5296..eefab74136 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -16,6 +16,7 @@
 package org.matrix.android.sdk.internal.session.room
 
 import io.realm.Realm
+import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.session.events.model.AggregatedAnnotation
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -50,14 +51,6 @@ import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import timber.log.Timber
 import javax.inject.Inject
 
-enum class VerificationState {
-    REQUEST,
-    WAITING,
-    CANCELED_BY_ME,
-    CANCELED_BY_OTHER,
-    DONE
-}
-
 fun VerificationState.isCanceled(): Boolean {
     return this == VerificationState.CANCELED_BY_ME || this == VerificationState.CANCELED_BY_OTHER
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
index 0b623d78f1..eb539d2b8a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
@@ -26,6 +26,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.MessageInformatio
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
 import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem
 import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem_
+import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
 import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf
@@ -35,7 +36,6 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationCancelContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
-import org.matrix.android.sdk.internal.session.room.VerificationState
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 802c177197..951a4d3fa0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -26,6 +26,7 @@ import im.vector.app.features.home.room.detail.timeline.item.ReactionInfoData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.ReferencesInfoData
 import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -37,7 +38,6 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.hasBeenEdited
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
-import org.matrix.android.sdk.internal.session.room.VerificationState
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index 38575f0cc9..48bd4db94c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -18,9 +18,9 @@ package im.vector.app.features.home.room.detail.timeline.item
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.util.MatrixItem
-import org.matrix.android.sdk.internal.session.room.VerificationState
 
 @Parcelize
 data class MessageInformationData(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
index c7a279979b..9ec1d825df 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt
@@ -35,8 +35,8 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
-import org.matrix.android.sdk.internal.session.room.VerificationState
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_state)
 abstract class VerificationRequestItem : AbsBaseMessageItem<VerificationRequestItem.Holder>() {

From c7e7bf4d2c6debc327e0ddd86da0bcf9fd099c1a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 1 Mar 2021 15:14:03 +0100
Subject: [PATCH 120/578] Move VerificationState?.toState() to a dedicated file
 and in the correct package

---
 .../sdk/api/crypto/VerificationState.kt       |  4 +++
 .../verification/VerificationStateExt.kt      | 36 +++++++++++++++++++
 .../EventRelationsAggregationProcessor.kt     | 20 +----------
 3 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationStateExt.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt
index 8a3515740b..54276a6b51 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/VerificationState.kt
@@ -23,3 +23,7 @@ enum class VerificationState {
     CANCELED_BY_OTHER,
     DONE
 }
+
+fun VerificationState.isCanceled(): Boolean {
+    return this == VerificationState.CANCELED_BY_ME || this == VerificationState.CANCELED_BY_OTHER
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationStateExt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationStateExt.kt
new file mode 100644
index 0000000000..b5fba0d54c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationStateExt.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.verification
+
+import org.matrix.android.sdk.api.crypto.VerificationState
+import org.matrix.android.sdk.api.crypto.isCanceled
+
+// State transition with control
+internal fun VerificationState?.toState(newState: VerificationState): VerificationState {
+    // Cancel is always prioritary ?
+    // Eg id i found that mac or keys mismatch and send a cancel and the other send a done, i have to
+    // consider as canceled
+    if (newState.isCanceled()) {
+        return newState
+    }
+    // never move out of cancel
+    if (this?.isCanceled() == true) {
+        return this
+    }
+    return newState
+}
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index eefab74136..8df865b104 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -32,6 +32,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponse
 import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
 import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.verification.toState
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.mapper.EventMapper
 import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntity
@@ -51,25 +52,6 @@ import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import timber.log.Timber
 import javax.inject.Inject
 
-fun VerificationState.isCanceled(): Boolean {
-    return this == VerificationState.CANCELED_BY_ME || this == VerificationState.CANCELED_BY_OTHER
-}
-
-// State transition with control
-private fun VerificationState?.toState(newState: VerificationState): VerificationState {
-    // Cancel is always prioritary ?
-    // Eg id i found that mac or keys mismatch and send a cancel and the other send a done, i have to
-    // consider as canceled
-    if (newState.isCanceled()) {
-        return newState
-    }
-    // never move out of cancel
-    if (this?.isCanceled() == true) {
-        return this
-    }
-    return newState
-}
-
 internal class EventRelationsAggregationProcessor @Inject constructor(@UserId private val userId: String)
     : EventInsertLiveProcessor {
 

From bdec23f740608915538b0d164b05f86926918d2c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 1 Mar 2021 15:03:47 +0100
Subject: [PATCH 121/578] Rework edition of event management

---
 .../EventAnnotationsSummaryEntityQuery.kt     |  2 +-
 .../EventRelationsAggregationProcessor.kt     | 44 +++++++++++++------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
index 9a298b7e79..b96fc54a42 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
@@ -50,5 +50,5 @@ internal fun EventAnnotationsSummaryEntity.Companion.create(realm: Realm, roomId
 
 internal fun EventAnnotationsSummaryEntity.Companion.getOrCreate(realm: Realm, roomId: String, eventId: String): EventAnnotationsSummaryEntity {
     return EventAnnotationsSummaryEntity.where(realm, eventId).findFirst()
-            ?: EventAnnotationsSummaryEntity.create(realm, roomId, eventId).apply { this.roomId = roomId }
+            ?: EventAnnotationsSummaryEntity.create(realm, roomId, eventId)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 8df865b104..dd6b16de59 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -191,29 +191,45 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
     // OPT OUT serer aggregation until API mature enough
     private val SHOULD_HANDLE_SERVER_AGREGGATION = false
 
-    private fun handleReplace(realm: Realm, event: Event, content: MessageContent, roomId: String, isLocalEcho: Boolean, relatedEventId: String? = null) {
+    private fun handleReplace(realm: Realm,
+                              event: Event,
+                              content: MessageContent,
+                              roomId: String,
+                              isLocalEcho: Boolean,
+                              relatedEventId: String? = null) {
         val eventId = event.eventId ?: return
         val targetEventId = relatedEventId ?: content.relatesTo?.eventId ?: return
         val newContent = content.newContent ?: return
+
+        // Check that the sender is the same
+        val editedEvent = EventEntity.where(realm, targetEventId).findFirst()
+        if (editedEvent == null) {
+            // We do not know yet about the edited event
+        } else if (editedEvent.sender != event.senderId) {
+            // Edited by someone else, ignore
+            Timber.w("Ignore edition by someone else")
+            return
+        }
+
         // ok, this is a replace
-        val existing = EventAnnotationsSummaryEntity.getOrCreate(realm, roomId, targetEventId)
+        val eventAnnotationsSummaryEntity = EventAnnotationsSummaryEntity.getOrCreate(realm, roomId, targetEventId)
 
         // we have it
-        val existingSummary = existing.editSummary
+        val existingSummary = eventAnnotationsSummaryEntity.editSummary
         if (existingSummary == null) {
             Timber.v("###REPLACE new edit summary for $targetEventId, creating one (localEcho:$isLocalEcho)")
             // create the edit summary
-            val editSummary = realm.createObject(EditAggregatedSummaryEntity::class.java)
-            editSummary.aggregatedContent = ContentMapper.map(newContent)
-            if (isLocalEcho) {
-                editSummary.lastEditTs = 0
-                editSummary.sourceLocalEchoEvents.add(eventId)
-            } else {
-                editSummary.lastEditTs = event.originServerTs ?: 0
-                editSummary.sourceEvents.add(eventId)
-            }
-
-            existing.editSummary = editSummary
+            eventAnnotationsSummaryEntity.editSummary = realm.createObject(EditAggregatedSummaryEntity::class.java)
+                    .also { editSummary ->
+                        editSummary.aggregatedContent = ContentMapper.map(newContent)
+                        if (isLocalEcho) {
+                            editSummary.lastEditTs = 0
+                            editSummary.sourceLocalEchoEvents.add(eventId)
+                        } else {
+                            editSummary.lastEditTs = event.originServerTs ?: 0
+                            editSummary.sourceEvents.add(eventId)
+                        }
+                    }
         } else {
             if (existingSummary.sourceEvents.contains(eventId)) {
                 // ignore this event, we already know it (??)

From 1bfd78753a825d8739b98fb0030eeb3fa705d567 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 1 Mar 2021 17:52:56 +0100
Subject: [PATCH 122/578] Ensure we do not edit an Event from another room

---
 .../database/helper/ChunkEntityHelper.kt      |  2 +-
 .../EventAnnotationsSummaryEntityQuery.kt     | 18 ++++---------
 .../EventRelationsAggregationProcessor.kt     | 25 ++++++++-----------
 .../room/relation/DefaultRelationService.kt   |  4 +--
 .../relation/FindReactionEventForUndoTask.kt  |  8 +++---
 .../room/relation/UpdateQuickReactionTask.kt  | 14 +++++------
 6 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
index b4935cfdcc..c2b729e593 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
@@ -97,7 +97,7 @@ internal fun ChunkEntity.addTimelineEvent(roomId: String,
         this.root = eventEntity
         this.eventId = eventId
         this.roomId = roomId
-        this.annotations = EventAnnotationsSummaryEntity.where(realm, eventId).findFirst()
+        this.annotations = EventAnnotationsSummaryEntity.where(realm, roomId, eventId).findFirst()
         this.readReceipts = readReceiptsSummaryEntity
         this.displayIndex = displayIndex
         val roomMemberContent = roomMemberContentsByUser[senderId]
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
index b96fc54a42..c3cae3d268 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
@@ -23,18 +23,10 @@ import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.kotlin.where
 
-internal fun EventAnnotationsSummaryEntity.Companion.where(realm: Realm, eventId: String): RealmQuery<EventAnnotationsSummaryEntity> {
-    val query = realm.where<EventAnnotationsSummaryEntity>()
-    query.equalTo(EventAnnotationsSummaryEntityFields.EVENT_ID, eventId)
-    return query
-}
-
-internal fun EventAnnotationsSummaryEntity.Companion.whereInRoom(realm: Realm, roomId: String?): RealmQuery<EventAnnotationsSummaryEntity> {
-    val query = realm.where<EventAnnotationsSummaryEntity>()
-    if (roomId != null) {
-        query.equalTo(EventAnnotationsSummaryEntityFields.ROOM_ID, roomId)
-    }
-    return query
+internal fun EventAnnotationsSummaryEntity.Companion.where(realm: Realm, roomId: String, eventId: String): RealmQuery<EventAnnotationsSummaryEntity> {
+    return realm.where<EventAnnotationsSummaryEntity>()
+            .equalTo(EventAnnotationsSummaryEntityFields.ROOM_ID, roomId)
+            .equalTo(EventAnnotationsSummaryEntityFields.EVENT_ID, eventId)
 }
 
 internal fun EventAnnotationsSummaryEntity.Companion.create(realm: Realm, roomId: String, eventId: String): EventAnnotationsSummaryEntity {
@@ -49,6 +41,6 @@ internal fun EventAnnotationsSummaryEntity.Companion.create(realm: Realm, roomId
 }
 
 internal fun EventAnnotationsSummaryEntity.Companion.getOrCreate(realm: Realm, roomId: String, eventId: String): EventAnnotationsSummaryEntity {
-    return EventAnnotationsSummaryEntity.where(realm, eventId).findFirst()
+    return EventAnnotationsSummaryEntity.where(realm, roomId, eventId).findFirst()
             ?: EventAnnotationsSummaryEntity.create(realm, roomId, eventId)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index dd6b16de59..c274ccb244 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -93,13 +93,11 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                         Timber.v("###REACTION Agreggation in room $roomId for event ${event.eventId}")
                         handleInitialAggregatedRelations(event, roomId, event.unsignedData.relations.annotations, realm)
 
-                        EventAnnotationsSummaryEntity.where(realm, event.eventId
-                                ?: "").findFirst()?.let {
-                            TimelineEventEntity.where(realm, roomId = roomId, eventId = event.eventId
-                                    ?: "").findFirst()?.let { tet ->
-                                tet.annotations = it
-                            }
-                        }
+                        EventAnnotationsSummaryEntity.where(realm, roomId, event.eventId ?: "").findFirst()
+                                ?.let {
+                                    TimelineEventEntity.where(realm, roomId = roomId, eventId = event.eventId ?: "").findFirst()
+                                            ?.let { tet -> tet.annotations = it }
+                                }
                     }
 
                     val content: MessageContent? = event.content.toModel()
@@ -281,7 +279,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
         val eventTimestamp = event.originServerTs ?: return
 
         // ok, this is a poll response
-        var existing = EventAnnotationsSummaryEntity.where(realm, targetEventId).findFirst()
+        var existing = EventAnnotationsSummaryEntity.where(realm, roomId, targetEventId).findFirst()
         if (existing == null) {
             Timber.v("## POLL creating new relation summary for $targetEventId")
             existing = EventAnnotationsSummaryEntity.create(realm, roomId, targetEventId)
@@ -361,7 +359,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
             aggregation.chunk?.forEach {
                 if (it.type == EventType.REACTION) {
                     val eventId = event.eventId ?: ""
-                    val existing = EventAnnotationsSummaryEntity.where(realm, eventId).findFirst()
+                    val existing = EventAnnotationsSummaryEntity.where(realm, roomId, eventId).findFirst()
                     if (existing == null) {
                         val eventSummary = EventAnnotationsSummaryEntity.create(realm, roomId, eventId)
                         val sum = realm.createObject(ReactionAggregatedSummaryEntity::class.java)
@@ -445,7 +443,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
      */
     private fun handleRedactionOfReplace(redacted: EventEntity, relatedEventId: String, realm: Realm) {
         Timber.d("Handle redaction of m.replace")
-        val eventSummary = EventAnnotationsSummaryEntity.where(realm, relatedEventId).findFirst()
+        val eventSummary = EventAnnotationsSummaryEntity.where(realm, redacted.roomId, relatedEventId).findFirst()
         if (eventSummary == null) {
             Timber.w("Redaction of a replace targeting an unknown event $relatedEventId")
             return
@@ -475,16 +473,15 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
         }
     }
 
-    fun handleReactionRedact(eventToPrune: EventEntity, realm: Realm, userId: String) {
+    private fun handleReactionRedact(eventToPrune: EventEntity, realm: Realm, userId: String) {
         Timber.v("REDACTION of reaction ${eventToPrune.eventId}")
         // delete a reaction, need to update the annotation summary if any
-        val reactionContent: ReactionContent = EventMapper.map(eventToPrune).content.toModel()
-                ?: return
+        val reactionContent: ReactionContent = EventMapper.map(eventToPrune).content.toModel() ?: return
         val eventThatWasReacted = reactionContent.relatesTo?.eventId ?: return
 
         val reactionKey = reactionContent.relatesTo.key
         Timber.v("REMOVE reaction for key $reactionKey")
-        val summary = EventAnnotationsSummaryEntity.where(realm, eventThatWasReacted).findFirst()
+        val summary = EventAnnotationsSummaryEntity.where(realm, eventToPrune.roomId, eventThatWasReacted).findFirst()
         if (summary != null) {
             summary.reactionsSummary.where()
                     .equalTo(ReactionAggregatedSummaryEntityFields.KEY, reactionKey)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index b7caf62865..bbcad3a4fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -159,7 +159,7 @@ internal class DefaultRelationService @AssistedInject constructor(
 
     override fun getEventAnnotationsSummary(eventId: String): EventAnnotationsSummary? {
         return monarchy.fetchCopyMap(
-                { EventAnnotationsSummaryEntity.where(it, eventId).findFirst() },
+                { EventAnnotationsSummaryEntity.where(it, roomId, eventId).findFirst() },
                 { entity, _ ->
                     entity.asDomain()
                 }
@@ -168,7 +168,7 @@ internal class DefaultRelationService @AssistedInject constructor(
 
     override fun getEventAnnotationsSummaryLive(eventId: String): LiveData<Optional<EventAnnotationsSummary>> {
         val liveData = monarchy.findAllMappedWithChanges(
-                { EventAnnotationsSummaryEntity.where(it, eventId) },
+                { EventAnnotationsSummaryEntity.where(it, roomId, eventId) },
                 { it.asDomain() }
         )
         return Transformations.map(liveData) { results ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
index fa6db2ee37..863ae4f5ce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
@@ -45,16 +45,16 @@ internal class DefaultFindReactionEventForUndoTask @Inject constructor(
 
     override suspend fun execute(params: FindReactionEventForUndoTask.Params): FindReactionEventForUndoTask.Result {
         val eventId = Realm.getInstance(monarchy.realmConfiguration).use { realm ->
-            getReactionToRedact(realm, params.reaction, params.eventId)?.eventId
+            getReactionToRedact(realm, params)?.eventId
         }
         return FindReactionEventForUndoTask.Result(eventId)
     }
 
-    private fun getReactionToRedact(realm: Realm, reaction: String, eventId: String): EventEntity? {
-        val summary = EventAnnotationsSummaryEntity.where(realm, eventId).findFirst() ?: return null
+    private fun getReactionToRedact(realm: Realm, params: FindReactionEventForUndoTask.Params): EventEntity? {
+        val summary = EventAnnotationsSummaryEntity.where(realm, params.roomId, params.eventId).findFirst() ?: return null
 
         val rase = summary.reactionsSummary.where()
-                .equalTo(ReactionAggregatedSummaryEntityFields.KEY, reaction)
+                .equalTo(ReactionAggregatedSummaryEntityFields.KEY, params.reaction)
                 .findFirst() ?: return null
 
         // want to find the event originated by me!
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
index 1f68a700ad..32d6c5aa7e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
@@ -47,22 +47,22 @@ internal class DefaultUpdateQuickReactionTask @Inject constructor(@SessionDataba
     override suspend fun execute(params: UpdateQuickReactionTask.Params): UpdateQuickReactionTask.Result {
         var res: Pair<String?, List<String>?>? = null
         monarchy.doWithRealm { realm ->
-            res = updateQuickReaction(realm, params.reaction, params.oppositeReaction, params.eventId)
+            res = updateQuickReaction(realm, params)
         }
         return UpdateQuickReactionTask.Result(res?.first, res?.second.orEmpty())
     }
 
-    private fun updateQuickReaction(realm: Realm, reaction: String, oppositeReaction: String, eventId: String): Pair<String?, List<String>?> {
+    private fun updateQuickReaction(realm: Realm, params: UpdateQuickReactionTask.Params): Pair<String?, List<String>?> {
         // the emoji reaction has been selected, we need to check if we have reacted it or not
-        val existingSummary = EventAnnotationsSummaryEntity.where(realm, eventId).findFirst()
-                ?: return Pair(reaction, null)
+        val existingSummary = EventAnnotationsSummaryEntity.where(realm, params.roomId, params.eventId).findFirst()
+                ?: return Pair(params.reaction, null)
 
         // Ok there is already reactions on this event, have we reacted to it
         val aggregationForReaction = existingSummary.reactionsSummary.where()
-                .equalTo(ReactionAggregatedSummaryEntityFields.KEY, reaction)
+                .equalTo(ReactionAggregatedSummaryEntityFields.KEY, params.reaction)
                 .findFirst()
         val aggregationForOppositeReaction = existingSummary.reactionsSummary.where()
-                .equalTo(ReactionAggregatedSummaryEntityFields.KEY, oppositeReaction)
+                .equalTo(ReactionAggregatedSummaryEntityFields.KEY, params.oppositeReaction)
                 .findFirst()
 
         if (aggregationForReaction == null || !aggregationForReaction.addedByMe) {
@@ -72,7 +72,7 @@ internal class DefaultUpdateQuickReactionTask @Inject constructor(@SessionDataba
                 val entity = EventEntity.where(realm, it).findFirst()
                 if (entity?.sender == userId) entity.eventId else null
             }
-            return Pair(reaction, toRedact)
+            return Pair(params.reaction, toRedact)
         } else {
             // I already added it, so i need to undo it (like a toggle)
             // find all m.redaction coming from me to readact them

From 097668b762d7426c4e1ca175f1e09ac0c9e2e4ce Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 1 Mar 2021 19:59:55 +0100
Subject: [PATCH 123/578] Rework edition of event management - step 2

---
 CHANGES.md                                    |  2 +-
 .../database/RealmSessionStoreMigration.kt    | 30 ++++++-
 .../database/helper/ChunkEntityHelper.kt      |  1 +
 .../mapper/EventAnnotationsSummaryMapper.kt   | 55 ++----------
 .../model/EditAggregatedSummaryEntity.kt      | 19 +++--
 .../model/EventAnnotationsSummaryEntity.kt    | 16 ++++
 .../database/model/SessionRealmModule.kt      |  1 +
 .../EventRelationsAggregationProcessor.kt     | 84 ++++++++-----------
 8 files changed, 102 insertions(+), 106 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5125d158ec..d9c2c01bea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -25,7 +25,7 @@ Test:
  -
 
 Other changes:
- -
+ - Rework edition of event management
 
 Changes in Element 1.1.0 (2021-02-19)
 ===================================================
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 57002b5a60..820588b1ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -18,6 +18,8 @@ package org.matrix.android.sdk.internal.database
 
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
+import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.EditionOfEventFields
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
 import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
 import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntityFields
@@ -30,7 +32,7 @@ import javax.inject.Inject
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 7L
+        const val SESSION_STORE_SCHEMA_VERSION = 8L
     }
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -43,6 +45,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 4) migrateTo5(realm)
         if (oldVersion <= 5) migrateTo6(realm)
         if (oldVersion <= 6) migrateTo7(realm)
+        if (oldVersion <= 7) migrateTo8(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -122,4 +125,29 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 }
                 ?.removeField("areAllMembersLoaded")
     }
+
+    private fun migrateTo8(realm: DynamicRealm) {
+        Timber.d("Step 7 -> 8")
+
+        val editionOfEventSchema = realm.schema.create("EditionOfEvent")
+                .apply {
+                    // setEmbedded does not return `this`...
+                    isEmbedded = true
+                }
+                .addField(EditionOfEventFields.CONTENT, String::class.java)
+                .addField(EditionOfEventFields.EVENT_ID, String::class.java)
+                .setRequired(EditionOfEventFields.EVENT_ID, true)
+                .addField(EditionOfEventFields.SENDER_ID, String::class.java)
+                .setRequired(EditionOfEventFields.SENDER_ID, true)
+                .addField(EditionOfEventFields.TIMESTAMP, Long::class.java)
+                .addField(EditionOfEventFields.IS_LOCAL_ECHO, Boolean::class.java)
+
+
+        realm.schema.get("EditAggregatedSummaryEntity")
+                ?.removeField("aggregatedContent")
+                ?.removeField("sourceEvents")
+                ?.removeField("lastEditTs")
+                ?.removeField("sourceLocalEchoEvents")
+                ?.addRealmListField(EditAggregatedSummaryEntityFields.EDITIONS.`$`, editionOfEventSchema)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
index c2b729e593..e262b40419 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
@@ -98,6 +98,7 @@ internal fun ChunkEntity.addTimelineEvent(roomId: String,
         this.eventId = eventId
         this.roomId = roomId
         this.annotations = EventAnnotationsSummaryEntity.where(realm, roomId, eventId).findFirst()
+                ?.also { it.cleanUp(eventEntity.sender) }
         this.readReceipts = readReceiptsSummaryEntity
         this.displayIndex = displayIndex
         val roomMemberContent = roomMemberContentsByUser[senderId]
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index 9ed2664068..f4d3d74150 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -20,11 +20,7 @@ import org.matrix.android.sdk.api.session.room.model.EditAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
 import org.matrix.android.sdk.api.session.room.model.ReactionAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedSummary
-import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntity
 import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
-import org.matrix.android.sdk.internal.database.model.ReactionAggregatedSummaryEntity
-import org.matrix.android.sdk.internal.database.model.ReferencesAggregatedSummaryEntity
-import io.realm.RealmList
 
 internal object EventAnnotationsSummaryMapper {
     fun map(annotationsSummary: EventAnnotationsSummaryEntity): EventAnnotationsSummary {
@@ -41,11 +37,14 @@ internal object EventAnnotationsSummaryMapper {
                     )
                 },
                 editSummary = annotationsSummary.editSummary?.let {
+                    val latestEdition = it.editions.maxByOrNull { editionOfEvent -> editionOfEvent.timestamp }
                     EditAggregatedSummary(
-                            ContentMapper.map(it.aggregatedContent),
-                            it.sourceEvents.toList(),
-                            it.sourceLocalEchoEvents.toList(),
-                            it.lastEditTs
+                            ContentMapper.map(latestEdition?.content),
+                            it.editions.filter { editionOfEvent -> !editionOfEvent.isLocalEcho }
+                                    .map { editionOfEvent -> editionOfEvent.eventId },
+                            it.editions.filter { editionOfEvent -> editionOfEvent.isLocalEcho }
+                                    .map { editionOfEvent -> editionOfEvent.eventId },
+                            latestEdition?.timestamp ?: 0L
                     )
                 },
                 referencesAggregatedSummary = annotationsSummary.referencesSummaryEntity?.let {
@@ -62,46 +61,6 @@ internal object EventAnnotationsSummaryMapper {
 
         )
     }
-
-    fun map(annotationsSummary: EventAnnotationsSummary, roomId: String): EventAnnotationsSummaryEntity {
-        val eventAnnotationsSummaryEntity = EventAnnotationsSummaryEntity()
-        eventAnnotationsSummaryEntity.eventId = annotationsSummary.eventId
-        eventAnnotationsSummaryEntity.roomId = roomId
-        eventAnnotationsSummaryEntity.editSummary = annotationsSummary.editSummary?.let {
-            EditAggregatedSummaryEntity(
-                    ContentMapper.map(it.aggregatedContent),
-                    RealmList<String>().apply { addAll(it.sourceEvents) },
-                    RealmList<String>().apply { addAll(it.localEchos) },
-                    it.lastEditTs
-            )
-        }
-        eventAnnotationsSummaryEntity.reactionsSummary = annotationsSummary.reactionsSummary.let {
-            RealmList<ReactionAggregatedSummaryEntity>().apply {
-                addAll(it.map {
-                    ReactionAggregatedSummaryEntity(
-                            it.key,
-                            it.count,
-                            it.addedByMe,
-                            it.firstTimestamp,
-                            RealmList<String>().apply { addAll(it.sourceEvents) },
-                            RealmList<String>().apply { addAll(it.localEchoEvents) }
-                    )
-                })
-            }
-        }
-        eventAnnotationsSummaryEntity.referencesSummaryEntity = annotationsSummary.referencesAggregatedSummary?.let {
-            ReferencesAggregatedSummaryEntity(
-                    it.eventId,
-                    ContentMapper.map(it.content),
-                    RealmList<String>().apply { addAll(it.sourceEvents) },
-                    RealmList<String>().apply { addAll(it.localEchos) }
-            )
-        }
-        eventAnnotationsSummaryEntity.pollResponseSummary = annotationsSummary.pollResponseSummary?.let {
-            PollResponseAggregatedSummaryEntityMapper.map(it)
-        }
-        return eventAnnotationsSummaryEntity
-    }
 }
 
 internal fun EventAnnotationsSummaryEntity.asDomain(): EventAnnotationsSummary {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
index 604afc1ab1..0ed927a6b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
@@ -17,17 +17,24 @@ package org.matrix.android.sdk.internal.database.model
 
 import io.realm.RealmList
 import io.realm.RealmObject
+import io.realm.annotations.RealmClass
 
 /**
- * Keep the latest state of edition of a message
+ * Keep all the editions of a message
  */
 internal open class EditAggregatedSummaryEntity(
-        var aggregatedContent: String? = null,
-        // The list of the eventIDs used to build the summary (might be out of sync if chunked received from message chunk)
-        var sourceEvents: RealmList<String> = RealmList(),
-        var sourceLocalEchoEvents: RealmList<String> = RealmList(),
-        var lastEditTs: Long = 0
+        // The list of the editions used to build the summary (might be out of sync if chunked received from message chunk)
+        var editions: RealmList<EditionOfEvent> = RealmList()
 ) : RealmObject() {
 
     companion object
 }
+
+@RealmClass(embedded = true)
+internal open class EditionOfEvent(
+        var senderId: String = "",
+        var eventId: String = "",
+        var content: String? = null,
+        var timestamp: Long = 0,
+        var isLocalEcho: Boolean = false
+) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
index 33f26d439f..3e88130420 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.database.model
 import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
+import timber.log.Timber
 
 internal open class EventAnnotationsSummaryEntity(
         @PrimaryKey
@@ -29,6 +30,21 @@ internal open class EventAnnotationsSummaryEntity(
         var pollResponseSummary: PollResponseAggregatedSummaryEntity? = null
 ) : RealmObject() {
 
+    /**
+     * Cleanup undesired editions, done by users different from the originalEventSender
+     */
+    fun cleanUp(originalEventSenderId: String?) {
+        originalEventSenderId ?: return
+
+        editSummary?.editions?.filter {
+            it.senderId != originalEventSenderId
+        }
+                ?.forEach {
+                    Timber.w("Deleting an edition from ${it.senderId} of event sent by $originalEventSenderId")
+                    it.deleteFromRealm()
+                }
+    }
+
     companion object
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index bca2c42c9e..6e6096cf8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -43,6 +43,7 @@ import io.realm.annotations.RealmModule
             EventAnnotationsSummaryEntity::class,
             ReactionAggregatedSummaryEntity::class,
             EditAggregatedSummaryEntity::class,
+            EditionOfEvent::class,
             PollResponseAggregatedSummaryEntity::class,
             ReferencesAggregatedSummaryEntity::class,
             PushRulesEntity::class,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index c274ccb244..8269643d39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -36,6 +36,7 @@ import org.matrix.android.sdk.internal.crypto.verification.toState
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.mapper.EventMapper
 import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntity
+import org.matrix.android.sdk.internal.database.model.EditionOfEvent
 import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity
 import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventInsertType
@@ -219,49 +220,48 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
             // create the edit summary
             eventAnnotationsSummaryEntity.editSummary = realm.createObject(EditAggregatedSummaryEntity::class.java)
                     .also { editSummary ->
-                        editSummary.aggregatedContent = ContentMapper.map(newContent)
-                        if (isLocalEcho) {
-                            editSummary.lastEditTs = 0
-                            editSummary.sourceLocalEchoEvents.add(eventId)
-                        } else {
-                            editSummary.lastEditTs = event.originServerTs ?: 0
-                            editSummary.sourceEvents.add(eventId)
-                        }
+                        editSummary.editions.add(
+                                EditionOfEvent(
+                                        senderId = event.senderId ?: "",
+                                        eventId = event.eventId,
+                                        content = ContentMapper.map(newContent),
+                                        timestamp = if (isLocalEcho) 0 else event.originServerTs ?: 0,
+                                        isLocalEcho = isLocalEcho
+                                )
+                        )
                     }
         } else {
-            if (existingSummary.sourceEvents.contains(eventId)) {
+            if (existingSummary.editions.any { it.eventId == eventId }) {
                 // ignore this event, we already know it (??)
                 Timber.v("###REPLACE ignoring event for summary, it's known $eventId")
                 return
             }
             val txId = event.unsignedData?.transactionId
             // is it a remote echo?
-            if (!isLocalEcho && existingSummary.sourceLocalEchoEvents.contains(txId)) {
+            if (!isLocalEcho && existingSummary.editions.any { it.eventId == txId }) {
                 // ok it has already been managed
                 Timber.v("###REPLACE Receiving remote echo of edit (edit already done)")
-                existingSummary.sourceLocalEchoEvents.remove(txId)
-                existingSummary.sourceEvents.add(event.eventId)
-            } else if (
-                    isLocalEcho // do not rely on ts for local echo, take it
-                    || event.originServerTs ?: 0 >= existingSummary.lastEditTs
-            ) {
-                Timber.v("###REPLACE Computing aggregated edit summary (isLocalEcho:$isLocalEcho)")
-                if (!isLocalEcho) {
-                    // Do not take local echo originServerTs here, could mess up ordering (keep old ts)
-                    existingSummary.lastEditTs = event.originServerTs ?: System.currentTimeMillis()
-                }
-                existingSummary.aggregatedContent = ContentMapper.map(newContent)
-                if (isLocalEcho) {
-                    existingSummary.sourceLocalEchoEvents.add(eventId)
-                } else {
-                    existingSummary.sourceEvents.add(eventId)
+                existingSummary.editions.firstOrNull { it.eventId == txId }?.let {
+                    it.eventId = event.eventId
+                    it.timestamp = event.originServerTs ?: System.currentTimeMillis()
+                    it.isLocalEcho = false
                 }
             } else {
-                // ignore this event for the summary (back paginate)
-                if (!isLocalEcho) {
-                    existingSummary.sourceEvents.add(eventId)
-                }
-                Timber.v("###REPLACE ignoring event for summary, it's to old $eventId")
+                Timber.v("###REPLACE Computing aggregated edit summary (isLocalEcho:$isLocalEcho)")
+                existingSummary.editions.add(
+                        EditionOfEvent(
+                                senderId = event.senderId ?: "",
+                                eventId = event.eventId,
+                                content = ContentMapper.map(newContent),
+                                timestamp = if (isLocalEcho) {
+                                    System.currentTimeMillis()
+                                } else {
+                                    // Do not take local echo originServerTs here, could mess up ordering (keep old ts)
+                                    event.originServerTs ?: System.currentTimeMillis()
+                                },
+                                isLocalEcho = isLocalEcho
+                        )
+                )
             }
         }
     }
@@ -448,29 +448,13 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
             Timber.w("Redaction of a replace targeting an unknown event $relatedEventId")
             return
         }
-        val sourceEvents = eventSummary.editSummary?.sourceEvents
-        val sourceToDiscard = sourceEvents?.indexOf(redacted.eventId)
+        val sourceToDiscard = eventSummary.editSummary?.editions?.firstOrNull {it.eventId == redacted.eventId }
         if (sourceToDiscard == null) {
             Timber.w("Redaction of a replace that was not known in aggregation $sourceToDiscard")
             return
         }
-        // Need to remove this event from the redaction list and compute new aggregation state
-        sourceEvents.removeAt(sourceToDiscard)
-        val previousEdit = sourceEvents.mapNotNull { EventEntity.where(realm, it).findFirst() }.sortedBy { it.originServerTs }.lastOrNull()
-        if (previousEdit == null) {
-            // revert to original
-            eventSummary.editSummary?.deleteFromRealm()
-        } else {
-            // I have the last event
-            ContentMapper.map(previousEdit.content)?.toModel<MessageContent>()?.newContent?.let { newContent ->
-                eventSummary.editSummary?.lastEditTs = previousEdit.originServerTs
-                        ?: System.currentTimeMillis()
-                eventSummary.editSummary?.aggregatedContent = ContentMapper.map(newContent)
-            } ?: run {
-                Timber.e("Failed to udate edited summary")
-                // TODO how to reccover that
-            }
-        }
+        // Need to remove this event from the edition list
+        sourceToDiscard.deleteFromRealm()
     }
 
     private fun handleReactionRedact(eventToPrune: EventEntity, realm: Realm, userId: String) {

From bda776e2010c8d64c16db9c12f44f2a0d785016e Mon Sep 17 00:00:00 2001
From: sx0d <sxxx0d@gmail.com>
Date: Tue, 2 Mar 2021 06:07:54 +0000
Subject: [PATCH 124/578] Added translation using Weblate (Uzbek)

---
 vector/src/main/res/values-uz/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 vector/src/main/res/values-uz/strings.xml

diff --git a/vector/src/main/res/values-uz/strings.xml b/vector/src/main/res/values-uz/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/vector/src/main/res/values-uz/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 5f29668c272679517970e0c1004004f4c3a25c44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 06:57:55 +0000
Subject: [PATCH 125/578] Bump epoxy_version from 4.4.1 to 4.4.2

Bumps `epoxy_version` from 4.4.1 to 4.4.2.

Updates `epoxy` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-glide-preloading` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-processor` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-paging` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 51b848137b..391676058e 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -287,7 +287,7 @@ android {
 
 dependencies {
 
-    def epoxy_version = '4.4.1'
+    def epoxy_version = '4.4.2'
     def fragment_version = '1.3.0'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'

From 8c8771601346a73ffe8ced8b84a28968c4385060 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 06:59:54 +0000
Subject: [PATCH 126/578] Bump libphonenumber from 8.12.18 to 8.12.19

Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.18 to 8.12.19.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.18...v8.12.19)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 12aca0b6d1..c9918cceaf 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -166,7 +166,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.18'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.19'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.5.1'
diff --git a/vector/build.gradle b/vector/build.gradle
index 51b848137b..22183336a1 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -339,7 +339,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.5.1'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.18'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.19'
 
     // rx
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'

From fc468564dcb22115b6b1bb5d879ee77fbb164292 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 10:46:11 +0100
Subject: [PATCH 127/578] Extract state from view model

---
 .../edithistory/ViewEditHistoryViewModel.kt   | 16 +--------
 .../edithistory/ViewEditHistoryViewState.kt   | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
index fff1c8a0ff..02fb8c66f2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
@@ -15,23 +15,19 @@
  */
 package im.vector.app.features.home.room.detail.timeline.edithistory
 
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
@@ -41,16 +37,6 @@ import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import timber.log.Timber
 import java.util.UUID
 
-data class ViewEditHistoryViewState(
-        val eventId: String,
-        val roomId: String,
-        val isOriginalAReply: Boolean = false,
-        val editList: Async<List<Event>> = Uninitialized)
-    : MvRxState {
-
-    constructor(args: TimelineEventFragmentArgs) : this(roomId = args.roomId, eventId = args.eventId)
-}
-
 class ViewEditHistoryViewModel @AssistedInject constructor(@Assisted
                                                            initialState: ViewEditHistoryViewState,
                                                            val session: Session,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt
new file mode 100644
index 0000000000..62f08eef7f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewState.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.edithistory
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs
+import org.matrix.android.sdk.api.session.events.model.Event
+
+data class ViewEditHistoryViewState(
+        val eventId: String,
+        val roomId: String,
+        val isOriginalAReply: Boolean = false,
+        val editList: Async<List<Event>> = Uninitialized)
+    : MvRxState {
+
+    constructor(args: TimelineEventFragmentArgs) : this(roomId = args.roomId, eventId = args.eventId)
+}

From d2b39e5cb86ac29bb87c559273d9e73cdebd2b69 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 10:52:03 +0100
Subject: [PATCH 128/578] Convert RelationService to suspend (#2449)

---
 .../room/model/relation/RelationService.kt    |  2 +-
 .../room/relation/DefaultRelationService.kt   |  9 +--
 .../edithistory/ViewEditHistoryViewModel.kt   | 70 ++++++++++---------
 3 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
index 49aa95924c..4638dd204a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
@@ -93,7 +93,7 @@ interface RelationService {
     /**
      * Get the edit history of the given event
      */
-    fun fetchEditHistory(eventId: String, callback: MatrixCallback<List<Event>>)
+    suspend fun fetchEditHistory(eventId: String): List<Event>
 
     /**
      * Reply to an event in the timeline (must be in same room)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index bbcad3a4fe..da0cf45946 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -140,13 +140,8 @@ internal class DefaultRelationService @AssistedInject constructor(
         return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
     }
 
-    override fun fetchEditHistory(eventId: String, callback: MatrixCallback<List<Event>>) {
-        val params = FetchEditHistoryTask.Params(roomId, eventId)
-        fetchEditHistoryTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun fetchEditHistory(eventId: String): List<Event> {
+        return fetchEditHistoryTask.execute(FetchEditHistoryTask.Params(roomId, eventId))
     }
 
     override fun replyToMessage(eventReplied: TimelineEvent, replyText: CharSequence, autoMarkdown: Boolean): Cancelable? {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
index 02fb8c66f2..061743e163 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
@@ -15,6 +15,7 @@
  */
 package im.vector.app.features.home.room.detail.timeline.edithistory
 
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
@@ -28,10 +29,9 @@ import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import org.matrix.android.sdk.api.MatrixCallback
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
-import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.isReply
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import timber.log.Timber
@@ -68,48 +68,50 @@ class ViewEditHistoryViewModel @AssistedInject constructor(@Assisted
 
     private fun loadHistory() {
         setState { copy(editList = Loading()) }
-        room.fetchEditHistory(eventId, object : MatrixCallback<List<Event>> {
-            override fun onFailure(failure: Throwable) {
+
+        viewModelScope.launch {
+            val data = try {
+                room.fetchEditHistory(eventId)
+            } catch (failure: Throwable) {
                 setState {
                     copy(editList = Fail(failure))
                 }
+                return@launch
             }
 
-            override fun onSuccess(data: List<Event>) {
-                var originalIsReply = false
+            var originalIsReply = false
 
-                val events = data.map { event ->
-                    val timelineID = event.roomId + UUID.randomUUID().toString()
-                    event.also {
-                        // We need to check encryption
-                        if (it.isEncrypted() && it.mxDecryptionResult == null) {
-                            // for now decrypt sync
-                            try {
-                                val result = session.cryptoService().decryptEvent(it, timelineID)
-                                it.mxDecryptionResult = OlmDecryptionResult(
-                                        payload = result.clearEvent,
-                                        senderKey = result.senderCurve25519Key,
-                                        keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
-                                        forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
-                                )
-                            } catch (e: MXCryptoError) {
-                                Timber.w("Failed to decrypt event in history")
-                            }
-                        }
-
-                        if (event.eventId == it.eventId) {
-                            originalIsReply = it.isReply()
+            val events = data.map { event ->
+                val timelineID = event.roomId + UUID.randomUUID().toString()
+                event.also {
+                    // We need to check encryption
+                    if (it.isEncrypted() && it.mxDecryptionResult == null) {
+                        // for now decrypt sync
+                        try {
+                            val result = session.cryptoService().decryptEvent(it, timelineID)
+                            it.mxDecryptionResult = OlmDecryptionResult(
+                                    payload = result.clearEvent,
+                                    senderKey = result.senderCurve25519Key,
+                                    keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
+                                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                            )
+                        } catch (e: MXCryptoError) {
+                            Timber.w("Failed to decrypt event in history")
                         }
                     }
-                }
-                setState {
-                    copy(
-                            editList = Success(events),
-                            isOriginalAReply = originalIsReply
-                    )
+
+                    if (event.eventId == it.eventId) {
+                        originalIsReply = it.isReply()
+                    }
                 }
             }
-        })
+            setState {
+                copy(
+                        editList = Success(events),
+                        isOriginalAReply = originalIsReply
+                )
+            }
+        }
     }
 
     override fun handle(action: EmptyAction) {

From 7c0acc8ccf3e63ad43cff6477de69a28505c53d1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 10:54:37 +0100
Subject: [PATCH 129/578] Simplify code

---
 .../edithistory/ViewEditHistoryViewModel.kt   | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
index 061743e163..1307341446 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
@@ -83,26 +83,24 @@ class ViewEditHistoryViewModel @AssistedInject constructor(@Assisted
 
             val events = data.map { event ->
                 val timelineID = event.roomId + UUID.randomUUID().toString()
-                event.also {
-                    // We need to check encryption
-                    if (it.isEncrypted() && it.mxDecryptionResult == null) {
-                        // for now decrypt sync
-                        try {
-                            val result = session.cryptoService().decryptEvent(it, timelineID)
-                            it.mxDecryptionResult = OlmDecryptionResult(
-                                    payload = result.clearEvent,
-                                    senderKey = result.senderCurve25519Key,
-                                    keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
-                                    forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
-                            )
-                        } catch (e: MXCryptoError) {
-                            Timber.w("Failed to decrypt event in history")
-                        }
+                // We need to check encryption
+                if (event.isEncrypted() && event.mxDecryptionResult == null) {
+                    // for now decrypt sync
+                    try {
+                        val result = session.cryptoService().decryptEvent(event, timelineID)
+                        event.mxDecryptionResult = OlmDecryptionResult(
+                                payload = result.clearEvent,
+                                senderKey = result.senderCurve25519Key,
+                                keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
+                                forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                        )
+                    } catch (e: MXCryptoError) {
+                        Timber.w("Failed to decrypt event in history")
                     }
+                }
 
-                    if (event.eventId == it.eventId) {
-                        originalIsReply = it.isReply()
-                    }
+                if (event.eventId == event.eventId) {
+                    originalIsReply = event.isReply()
                 }
             }
             setState {

From 237545622fe1952b1aaeedd979cca649e103f43d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 10:55:22 +0100
Subject: [PATCH 130/578] Fix a bug I can see thanks to rework

---
 .../detail/timeline/edithistory/ViewEditHistoryViewModel.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
index 1307341446..3ce4a44812 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
@@ -99,7 +99,7 @@ class ViewEditHistoryViewModel @AssistedInject constructor(@Assisted
                     }
                 }
 
-                if (event.eventId == event.eventId) {
+                if (event.eventId == eventId) {
                     originalIsReply = event.isReply()
                 }
             }

From f5fad8a0828e4491ce479e228b14622435d4aa55 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 11:00:29 +0100
Subject: [PATCH 131/578] Make it compiles

---
 .../detail/timeline/edithistory/ViewEditHistoryViewModel.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
index 3ce4a44812..af814f5856 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt
@@ -81,7 +81,7 @@ class ViewEditHistoryViewModel @AssistedInject constructor(@Assisted
 
             var originalIsReply = false
 
-            val events = data.map { event ->
+            data.forEach { event ->
                 val timelineID = event.roomId + UUID.randomUUID().toString()
                 // We need to check encryption
                 if (event.isEncrypted() && event.mxDecryptionResult == null) {
@@ -105,7 +105,7 @@ class ViewEditHistoryViewModel @AssistedInject constructor(@Assisted
             }
             setState {
                 copy(
-                        editList = Success(events),
+                        editList = Success(data),
                         isOriginalAReply = originalIsReply
                 )
             }

From c33af6de6a9f1adda23cfbf33cadc177a96d0265 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 11:11:28 +0100
Subject: [PATCH 132/578] Do not show edition from other users

---
 .../api/session/room/model/relation/RelationService.kt   | 3 +++
 .../session/room/relation/FetchEditHistoryTask.kt        | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
index 4638dd204a..b83391fa06 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
@@ -92,6 +92,9 @@ interface RelationService {
 
     /**
      * Get the edit history of the given event
+     * The return list will contain the original event and all the editions of this event, done by the
+     * same sender, sorted in the reverse order (so the original event is the latest element, and the
+     * latest edition is the first element of the list)
      */
     suspend fun fetchEditHistory(eventId: String): List<Event>
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
index 854585ca29..f1c8fd49a4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
@@ -49,8 +49,11 @@ internal class DefaultFetchEditHistoryTask @Inject constructor(
             )
         }
 
-        val events = response.chunks.toMutableList()
-        response.originalEvent?.let { events.add(it) }
-        return events
+        // Filter out edition form other users
+        val originalSenderId = response.originalEvent?.senderId
+        val events = response.chunks.filter {
+            it.senderId == originalSenderId
+        }
+        return events + listOfNotNull(response.originalEvent)
     }
 }

From 95395945f21397bef9bba407a1b2a3f79eb0e3b2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 11:18:06 +0100
Subject: [PATCH 133/578] Also filter redacted events

---
 .../session/room/relation/FetchEditHistoryTask.kt         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
index f1c8fd49a4..f9fd5f9348 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
@@ -49,11 +49,11 @@ internal class DefaultFetchEditHistoryTask @Inject constructor(
             )
         }
 
-        // Filter out edition form other users
+        // Filter out edition form other users, and redacted editions
         val originalSenderId = response.originalEvent?.senderId
-        val events = response.chunks.filter {
-            it.senderId == originalSenderId
-        }
+        val events = response.chunks
+                .filter { it.senderId == originalSenderId }
+                .filter { !it.isRedacted() }
         return events + listOfNotNull(response.originalEvent)
     }
 }

From 5d69a1ab919457fe0e4e8358720de2d38807cb2f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 11:30:30 +0100
Subject: [PATCH 134/578] Fix a last bug when all editions has been deleted

---
 .../mapper/EventAnnotationsSummaryMapper.kt   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index f4d3d74150..08d98ce3b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -36,17 +36,18 @@ internal object EventAnnotationsSummaryMapper {
                             it.sourceLocalEcho.toList()
                     )
                 },
-                editSummary = annotationsSummary.editSummary?.let {
-                    val latestEdition = it.editions.maxByOrNull { editionOfEvent -> editionOfEvent.timestamp }
-                    EditAggregatedSummary(
-                            ContentMapper.map(latestEdition?.content),
-                            it.editions.filter { editionOfEvent -> !editionOfEvent.isLocalEcho }
-                                    .map { editionOfEvent -> editionOfEvent.eventId },
-                            it.editions.filter { editionOfEvent -> editionOfEvent.isLocalEcho }
-                                    .map { editionOfEvent -> editionOfEvent.eventId },
-                            latestEdition?.timestamp ?: 0L
-                    )
-                },
+                editSummary = annotationsSummary.editSummary
+                        ?.let {
+                            val latestEdition = it.editions.maxByOrNull { editionOfEvent -> editionOfEvent.timestamp } ?: return@let null
+                            EditAggregatedSummary(
+                                    aggregatedContent = ContentMapper.map(latestEdition.content),
+                                    sourceEvents = it.editions.filter { editionOfEvent -> !editionOfEvent.isLocalEcho }
+                                            .map { editionOfEvent -> editionOfEvent.eventId },
+                                    localEchos = it.editions.filter { editionOfEvent -> editionOfEvent.isLocalEcho }
+                                            .map { editionOfEvent -> editionOfEvent.eventId },
+                                    lastEditTs = latestEdition.timestamp
+                            )
+                        },
                 referencesAggregatedSummary = annotationsSummary.referencesSummaryEntity?.let {
                     ReferencesAggregatedSummary(
                             it.eventId,

From a8ba125bd2ad7f78483df16107ec063dc8d18db1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 11:37:13 +0100
Subject: [PATCH 135/578] Rename val for code clarity, and use facility

---
 .../sdk/api/session/room/model/EditAggregatedSummary.kt  | 2 +-
 .../sdk/api/session/room/timeline/TimelineEvent.kt       | 3 +--
 .../database/mapper/EventAnnotationsSummaryMapper.kt     | 2 +-
 .../app/features/home/room/detail/RoomDetailViewModel.kt | 9 +++------
 .../detail/timeline/action/MessageActionsViewModel.kt    | 3 +--
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
index 10fb81dc7f..67bab626cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
@@ -18,7 +18,7 @@ package org.matrix.android.sdk.api.session.room.model
 import org.matrix.android.sdk.api.session.events.model.Content
 
 data class EditAggregatedSummary(
-        val aggregatedContent: Content? = null,
+        val latestContent: Content? = null,
         // The list of the eventIDs used to build the summary (might be out of sync if chunked received from message chunk)
         val sourceEvents: List<String>,
         val localEchos: List<String>,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
index 53f0e5a8d3..7010a80233 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
@@ -123,8 +123,7 @@ fun TimelineEvent.getLastMessageContent(): MessageContent? {
     return if (root.getClearType() == EventType.STICKER) {
         root.getClearContent().toModel<MessageStickerContent>()
     } else {
-        annotations?.editSummary?.aggregatedContent?.toModel()
-                ?: root.getClearContent().toModel()
+        (annotations?.editSummary?.latestContent ?: root.getClearContent()).toModel()
     }
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index 08d98ce3b8..4a26b4c4bf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -40,7 +40,7 @@ internal object EventAnnotationsSummaryMapper {
                         ?.let {
                             val latestEdition = it.editions.maxByOrNull { editionOfEvent -> editionOfEvent.timestamp } ?: return@let null
                             EditAggregatedSummary(
-                                    aggregatedContent = ContentMapper.map(latestEdition.content),
+                                    latestContent = ContentMapper.map(latestEdition.content),
                                     sourceEvents = it.editions.filter { editionOfEvent -> !editionOfEvent.isLocalEcho }
                                             .map { editionOfEvent -> editionOfEvent.eventId },
                                     localEchos = it.editions.filter { editionOfEvent -> editionOfEvent.isLocalEcho }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 601891b15a..bb700bcb0d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -89,6 +89,7 @@ import org.matrix.android.sdk.api.session.room.read.ReadService
 import org.matrix.android.sdk.api.session.room.send.UserDraft
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.getRelationContent
 import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
 import org.matrix.android.sdk.api.session.widgets.model.Widget
@@ -785,9 +786,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                             room.editReply(state.sendMode.timelineEvent, it, action.text.toString())
                         }
                     } else {
-                        val messageContent: MessageContent? =
-                                state.sendMode.timelineEvent.annotations?.editSummary?.aggregatedContent.toModel()
-                                        ?: state.sendMode.timelineEvent.root.getClearContent().toModel()
+                        val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
                         val existingBody = messageContent?.body ?: ""
                         if (existingBody != action.text) {
                             room.editTextMessage(state.sendMode.timelineEvent.root.eventId ?: "",
@@ -802,9 +801,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     popDraft()
                 }
                 is SendMode.QUOTE -> {
-                    val messageContent: MessageContent? =
-                            state.sendMode.timelineEvent.annotations?.editSummary?.aggregatedContent.toModel()
-                                    ?: state.sendMode.timelineEvent.root.getClearContent().toModel()
+                    val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
                     val textMsg = messageContent?.body
 
                     val finalText = legacyRiotQuoteText(textMsg, action.text.toString())
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 1697d9250e..363899c4f9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -229,8 +229,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun actionsForEvent(timelineEvent: TimelineEvent, actionPermissions: ActionPermissions): List<EventSharedAction> {
-        val messageContent: MessageContent? = timelineEvent.annotations?.editSummary?.aggregatedContent.toModel()
-                ?: timelineEvent.root.getClearContent().toModel()
+        val messageContent = timelineEvent.getLastMessageContent()
         val msgType = messageContent?.msgType
 
         return arrayListOf<EventSharedAction>().apply {

From 161804be0d33010566a8294cd454536b6d7e90ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 10:39:41 +0000
Subject: [PATCH 136/578] Bump big_image_viewer_version from 1.7.0 to 1.7.1

Bumps `big_image_viewer_version` from 1.7.0 to 1.7.1.

Updates `BigImageViewer` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `GlideImageLoader` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `ProgressPieIndicator` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Updates `GlideImageViewFactory` from 1.7.0 to 1.7.1
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/compare/1.7.0...v1.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 391676058e..305c286e4d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -291,7 +291,7 @@ dependencies {
     def fragment_version = '1.3.0'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'
-    def big_image_viewer_version = '1.7.0'
+    def big_image_viewer_version = '1.7.1'
     def glide_version = '4.12.0'
     def moshi_version = '1.11.0'
     def daggerVersion = '2.33'

From b027e43615d4bbbd46333e844256156e98532a14 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 2 Mar 2021 11:41:20 +0100
Subject: [PATCH 137/578] Cleanup

---
 .../sdk/api/session/room/model/relation/RelationService.kt      | 1 -
 .../sdk/internal/crypto/verification/VerificationStateExt.kt    | 1 -
 .../android/sdk/internal/database/RealmSessionStoreMigration.kt | 1 -
 .../internal/session/room/EventRelationsAggregationProcessor.kt | 2 +-
 .../vector/app/features/home/room/detail/RoomDetailViewModel.kt | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
index b83391fa06..2c0e378efb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
@@ -16,7 +16,6 @@
 package org.matrix.android.sdk.api.session.room.model.relation
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationStateExt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationStateExt.kt
index b5fba0d54c..0617f32c24 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationStateExt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationStateExt.kt
@@ -33,4 +33,3 @@ internal fun VerificationState?.toState(newState: VerificationState): Verificati
     }
     return newState
 }
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 820588b1ab..c7fe7ab447 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -142,7 +142,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 .addField(EditionOfEventFields.TIMESTAMP, Long::class.java)
                 .addField(EditionOfEventFields.IS_LOCAL_ECHO, Boolean::class.java)
 
-
         realm.schema.get("EditAggregatedSummaryEntity")
                 ?.removeField("aggregatedContent")
                 ?.removeField("sourceEvents")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 8269643d39..60440c6359 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -448,7 +448,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
             Timber.w("Redaction of a replace targeting an unknown event $relatedEventId")
             return
         }
-        val sourceToDiscard = eventSummary.editSummary?.editions?.firstOrNull {it.eventId == redacted.eventId }
+        val sourceToDiscard = eventSummary.editSummary?.editions?.firstOrNull { it.eventId == redacted.eventId }
         if (sourceToDiscard == null) {
             Timber.w("Redaction of a replace that was not known in aggregation $sourceToDiscard")
             return
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index bb700bcb0d..4247ffdd54 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -79,7 +79,6 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.OptionItem
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl

From 33b3f0650caf6ebf5b8858d63ece83b59e491ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20H=C3=A4ger?= <martin.haeger@gmail.com>
Date: Tue, 2 Mar 2021 01:50:25 +0100
Subject: [PATCH 138/578] Permit cleartext for .onion addresses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Tor and Onion service protocols provide encryption and authentication
respectively. Since Domain Validation certificates aren't currently being
issued for .onion addresses, the HTTPS requirement makes Element practically
incompatible with homeservers operated by individuals on Tor.

Signed-off-by: Martin Häger <martin.haeger@gmail.com>
---
 CHANGES.md                                          | 1 +
 vector/src/main/res/xml/network_security_config.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 5125d158ec..8ec0b79bfe 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
+ - Allow non-HTTPS connections to homeservers on Tor (#2941)
  - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831)
  - Improve initial sync performance (#983)
  - PIP support for Jitsi call (#2418)
diff --git a/vector/src/main/res/xml/network_security_config.xml b/vector/src/main/res/xml/network_security_config.xml
index 1f323dffd1..4bf79f16ba 100644
--- a/vector/src/main/res/xml/network_security_config.xml
+++ b/vector/src/main/res/xml/network_security_config.xml
@@ -11,6 +11,8 @@
         <domain includeSubdomains="true">127.0.0.1</domain>
         <!-- Localhost for Android emulator -->
         <domain includeSubdomains="true">10.0.2.2</domain>
+        <!-- Onion services -->
+        <domain includeSubdomains="true">onion</domain>
     </domain-config>
 
     <debug-overrides>

From 3357c78375dbda42dc20ebec03a3b92a88fb9826 Mon Sep 17 00:00:00 2001
From: Kafji <k@kafji.net>
Date: Tue, 2 Mar 2021 18:54:00 +0700
Subject: [PATCH 139/578] Add tooltip for room quick actions

Add tooltip for low priority, favorite, and room settings quick actions.

Signed-off-by: Kafji <k@kafji.net>
---
 CHANGES.md                                    |  1 +
 .../bottomsheet/BottomSheetRoomPreviewItem.kt | 28 ++++++++++++++-----
 vector/src/main/res/values/strings.xml        |  2 ++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5125d158ec..79bd629fcb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ Improvements 🙌:
  - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831)
  - Improve initial sync performance (#983)
  - PIP support for Jitsi call (#2418)
+ - Add tooltip for room quick actions
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
index 1c80e6a85c..819669c8f4 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
@@ -20,6 +20,7 @@ import android.content.res.ColorStateList
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.widget.TooltipCompat
 import androidx.core.content.ContextCompat
 import androidx.core.widget.ImageViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
@@ -78,33 +79,46 @@ abstract class BottomSheetRoomPreviewItem : VectorEpoxyModel<BottomSheetRoomPrev
             // And do the action
             favoriteClickListener?.invoke()
         }
-        holder.roomSettings.onClick(settingsClickListener)
+        holder.roomSettings.apply {
+            onClick(settingsClickListener)
+            TooltipCompat.setTooltipText(this, stringProvider.getString(R.string.room_list_quick_actions_room_settings))
+        }
     }
 
     private fun setLowPriorityState(holder: Holder, isLowPriority: Boolean) {
+        val description: String
         val tintColor: Int
         if (isLowPriority) {
-            holder.roomLowPriority.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_low_priority_remove)
+            description = stringProvider.getString(R.string.room_list_quick_actions_low_priority_remove)
             tintColor = ContextCompat.getColor(holder.view.context, R.color.riotx_accent)
         } else {
-            holder.roomLowPriority.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_low_priority_add)
+            description = stringProvider.getString(R.string.room_list_quick_actions_low_priority_add)
             tintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
         }
-        ImageViewCompat.setImageTintList(holder.roomLowPriority, ColorStateList.valueOf(tintColor))
+        holder.roomLowPriority.apply {
+            contentDescription = description
+            ImageViewCompat.setImageTintList(this, ColorStateList.valueOf(tintColor))
+            TooltipCompat.setTooltipText(this, description)
+        }
     }
 
     private fun setFavoriteState(holder: Holder, isFavorite: Boolean) {
+        val description: String
         val tintColor: Int
         if (isFavorite) {
-            holder.roomFavorite.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_favorite_remove)
+            description = stringProvider.getString(R.string.room_list_quick_actions_favorite_remove)
             holder.roomFavorite.setImageResource(R.drawable.ic_star_green_24dp)
             tintColor = ContextCompat.getColor(holder.view.context, R.color.riotx_accent)
         } else {
-            holder.roomFavorite.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_favorite_add)
+            description = stringProvider.getString(R.string.room_list_quick_actions_favorite_add)
             holder.roomFavorite.setImageResource(R.drawable.ic_star_24dp)
             tintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
         }
-        ImageViewCompat.setImageTintList(holder.roomFavorite, ColorStateList.valueOf(tintColor))
+        holder.roomFavorite.apply {
+            contentDescription = description
+            ImageViewCompat.setImageTintList(this, ColorStateList.valueOf(tintColor))
+            TooltipCompat.setTooltipText(this, description)
+        }
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 320f14eccd..65c5abaa2d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1990,6 +1990,8 @@
     <string name="room_list_quick_actions_low_priority_add">"Add to low priority"</string>
     <string name="room_list_quick_actions_low_priority_remove">"Remove from low priority"</string>
     <string name="room_list_quick_actions_leave">"Leave the room"</string>
+    <string name="room_list_quick_actions_room_settings">"Room settings"</string>
+
     <string name="notice_member_no_changes">"%1$s made no changes"</string>
     <string name="notice_member_no_changes_by_you">"You made no changes"</string>
     <string name="command_description_spoiler">Sends the given message as a spoiler</string>

From 4e2e73637a45a0be0f0921a8bfb48a763cb5f61b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 16:14:57 +0100
Subject: [PATCH 140/578] Be robust if Event.type is missing (#2946)

---
 CHANGES.md                                            |  1 +
 .../android/sdk/api/session/events/model/Event.kt     |  4 ++--
 .../android/sdk/api/session/events/model/EventType.kt |  2 ++
 .../sdk/internal/crypto/tasks/EncryptEventTask.kt     |  2 +-
 .../sdk/internal/crypto/tasks/SendEventTask.kt        |  2 +-
 .../crypto/tasks/SendVerificationMessageTask.kt       |  2 +-
 .../sdk/internal/database/mapper/EventMapper.kt       | 11 ++++++-----
 .../session/room/membership/LoadRoomMembersTask.kt    |  9 +++++++--
 .../session/room/relation/SendRelationWorker.kt       |  2 +-
 .../internal/session/room/send/LocalEchoRepository.kt |  8 ++++----
 .../sdk/internal/session/sync/RoomSyncHandler.kt      | 10 +++++-----
 .../app/features/devtools/RoomStateListController.kt  |  2 +-
 .../features/notifications/NotifiableEventResolver.kt |  2 +-
 13 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5125d158ec..146db2c5d8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)
+ - Be robust if Event.type is missing (#2946)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 8f9f409b74..a208b15364 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -66,7 +66,7 @@ inline fun <reified T> T.toContent(): Content {
  */
 @JsonClass(generateAdapter = true)
 data class Event(
-        @Json(name = "type") val type: String,
+        @Json(name = "type") val type: String? = null,
         @Json(name = "event_id") val eventId: String? = null,
         @Json(name = "content") val content: Content? = null,
         @Json(name = "prev_content") val prevContent: Content? = null,
@@ -135,7 +135,7 @@ data class Event(
      * @return the event type
      */
     fun getClearType(): String {
-        return mxDecryptionResult?.payload?.get("type")?.toString() ?: type
+        return mxDecryptionResult?.payload?.get("type")?.toString() ?: type ?: EventType.MISSING_TYPE
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index d79117ad87..905e18b8e8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -20,6 +20,8 @@ package org.matrix.android.sdk.api.session.events.model
  * Constants defining known event types from Matrix specifications.
  */
 object EventType {
+    // Used when the type is missing, which should not happen
+    const val MISSING_TYPE = "org.matrix.android.sdk.missing_type"
 
     const val PRESENCE = "m.presence"
     const val MESSAGE = "m.room.message"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
index 56b267decd..627352f568 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
@@ -45,7 +45,7 @@ internal class DefaultEncryptEventTask @Inject constructor(
         // don't want to wait for any query
         // if (!params.crypto.isRoomEncrypted(params.roomId)) return params.event
         val localEvent = params.event
-        if (localEvent.eventId == null) {
+        if (localEvent.eventId == null || localEvent.type == null) {
             throw IllegalArgumentException()
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index b772bfbce2..1fbc30d6f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -58,7 +58,7 @@ internal class DefaultSendEventTask @Inject constructor(
                         localId,
                         roomId = event.roomId ?: "",
                         content = event.content,
-                        eventType = event.type
+                        eventType = event.type ?: ""
                 )
             }
             localEchoRepository.updateSendState(localId, params.event.roomId, SendState.SENT)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
index c39dfb1016..ab125135bb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
@@ -50,7 +50,7 @@ internal class DefaultSendVerificationMessageTask @Inject constructor(
                         localId,
                         roomId = event.roomId ?: "",
                         content = event.content,
-                        eventType = event.type
+                        eventType = event.type ?: ""
                 )
             }
             localEchoRepository.updateSendState(localId, event.roomId, SendState.SENT)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
index 66eccdfba0..a4a2fadd21 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.database.mapper
 import com.squareup.moshi.JsonDataException
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.UnsignedData
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
@@ -29,8 +30,6 @@ import timber.log.Timber
 internal object EventMapper {
 
     fun map(event: Event, roomId: String): EventEntity {
-        val uds = if (event.unsignedData == null) null
-        else MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).toJson(event.unsignedData)
         val eventEntity = EventEntity()
         // TODO change this as we shouldn't use event everywhere
         eventEntity.eventId = event.eventId ?: "$$roomId-${System.currentTimeMillis()}-${event.hashCode()}"
@@ -39,14 +38,16 @@ internal object EventMapper {
         eventEntity.prevContent = ContentMapper.map(event.resolvedPrevContent())
         eventEntity.isUseless = IsUselessResolver.isUseless(event)
         eventEntity.stateKey = event.stateKey
-        eventEntity.type = event.type
+        eventEntity.type = event.type ?: EventType.MISSING_TYPE
         eventEntity.sender = event.senderId
         eventEntity.originServerTs = event.originServerTs
         eventEntity.redacts = event.redacts
         eventEntity.age = event.unsignedData?.age ?: event.originServerTs
-        eventEntity.unsignedData = uds
+        eventEntity.unsignedData = event.unsignedData?.let {
+            MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).toJson(it)
+        }
         eventEntity.decryptionResultJson = event.mxDecryptionResult?.let {
-            MoshiProvider.providesMoshi().adapter<OlmDecryptionResult>(OlmDecryptionResult::class.java).toJson(it)
+            MoshiProvider.providesMoshi().adapter(OlmDecryptionResult::class.java).toJson(it)
         }
         eventEntity.decryptionErrorReason = event.mCryptoErrorReason
         eventEntity.decryptionErrorCode = event.mCryptoError?.name
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
index 2be90bf8e3..97cfcdaa44 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
@@ -105,12 +105,17 @@ internal class DefaultLoadRoomMembersTask @Inject constructor(
                     ?: realm.createObject(roomId)
             val now = System.currentTimeMillis()
             for (roomMemberEvent in response.roomMemberEvents) {
-                if (roomMemberEvent.eventId == null || roomMemberEvent.stateKey == null) {
+                if (roomMemberEvent.eventId == null || roomMemberEvent.stateKey == null || roomMemberEvent.type == null) {
                     continue
                 }
                 val ageLocalTs = roomMemberEvent.unsignedData?.age?.let { now - it }
                 val eventEntity = roomMemberEvent.toEntity(roomId, SendState.SYNCED, ageLocalTs).copyToRealmOrIgnore(realm, EventInsertType.PAGINATION)
-                CurrentStateEventEntity.getOrCreate(realm, roomId, roomMemberEvent.stateKey, roomMemberEvent.type).apply {
+                CurrentStateEventEntity.getOrCreate(
+                        realm,
+                        roomId,
+                        roomMemberEvent.stateKey,
+                        roomMemberEvent.type
+                ).apply {
                     eventId = roomMemberEvent.eventId
                     root = eventEntity
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
index c12597bea0..403aa274fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
@@ -89,7 +89,7 @@ internal class SendRelationWorker(context: Context, params: WorkerParameters)
                     roomId = roomId,
                     parentId = relatedEventId,
                     relationType = relationType,
-                    eventType = localEvent.type,
+                    eventType = localEvent.type!!,
                     content = localEvent.content
             )
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
index f742271fa7..1277e81fe3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
@@ -56,10 +56,10 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
 
     fun createLocalEcho(event: Event) {
         val roomId = event.roomId ?: throw IllegalStateException("You should have set a roomId for your event")
-        val senderId = event.senderId ?: throw IllegalStateException("You should have set a senderIf for your event")
-        if (event.eventId == null) {
-            throw IllegalStateException("You should have set an eventId for your event")
-        }
+        val senderId = event.senderId ?: throw IllegalStateException("You should have set a senderId for your event")
+        event.eventId ?: throw IllegalStateException("You should have set an eventId for your event")
+        event.type ?: throw IllegalStateException("You should have set a type for your event")
+
         val timelineEventEntity = realmSessionProvider.withRealm { realm ->
             val eventEntity = event.toEntity(roomId, SendState.UNSENT, System.currentTimeMillis())
             val roomMemberHelper = RoomMemberHelper(realm, roomId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 648dd2d88f..9f54d0b86c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -198,7 +198,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         // State event
         if (roomSync.state?.events?.isNotEmpty() == true) {
             for (event in roomSync.state.events) {
-                if (event.eventId == null || event.stateKey == null) {
+                if (event.eventId == null || event.stateKey == null || event.type == null) {
                     continue
                 }
                 val ageLocalTs = event.unsignedData?.age?.let { syncLocalTimestampMillis - it }
@@ -254,7 +254,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         roomEntity.membership = Membership.INVITE
         if (roomSync.inviteState != null && roomSync.inviteState.events.isNotEmpty()) {
             roomSync.inviteState.events.forEach { event ->
-                if (event.stateKey == null) {
+                if (event.stateKey == null || event.type == null) {
                     return@forEach
                 }
                 val ageLocalTs = event.unsignedData?.age?.let { syncLocalTimestampMillis - it }
@@ -281,7 +281,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                syncLocalTimestampMillis: Long): RoomEntity {
         val roomEntity = RoomEntity.where(realm, roomId).findFirst() ?: realm.createObject(roomId)
         for (event in roomSync.state?.events.orEmpty()) {
-            if (event.eventId == null || event.stateKey == null) {
+            if (event.eventId == null || event.stateKey == null || event.type == null) {
                 continue
             }
             val ageLocalTs = event.unsignedData?.age?.let { syncLocalTimestampMillis - it }
@@ -293,7 +293,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
             roomMemberEventHandler.handle(realm, roomId, event)
         }
         for (event in roomSync.timeline?.events.orEmpty()) {
-            if (event.eventId == null || event.senderId == null) {
+            if (event.eventId == null || event.senderId == null || event.type == null) {
                 continue
             }
             val ageLocalTs = event.unsignedData?.age?.let { syncLocalTimestampMillis - it }
@@ -340,7 +340,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
 
         for (event in eventList) {
-            if (event.eventId == null || event.senderId == null) {
+            if (event.eventId == null || event.senderId == null || event.type == null) {
                 continue
             }
             eventIds.add(event.eventId)
diff --git a/vector/src/main/java/im/vector/app/features/devtools/RoomStateListController.kt b/vector/src/main/java/im/vector/app/features/devtools/RoomStateListController.kt
index 69070c509b..38138474d9 100644
--- a/vector/src/main/java/im/vector/app/features/devtools/RoomStateListController.kt
+++ b/vector/src/main/java/im/vector/app/features/devtools/RoomStateListController.kt
@@ -37,7 +37,7 @@ class RoomStateListController @Inject constructor(
     override fun buildModels(data: RoomDevToolViewState?) {
         when (data?.displayMode) {
             RoomDevToolViewState.Mode.StateEventList -> {
-                val stateEventsGroups = data.stateEvents.invoke().orEmpty().groupBy { it.type }
+                val stateEventsGroups = data.stateEvents.invoke().orEmpty().groupBy { it.getClearType() }
 
                 if (stateEventsGroups.isEmpty()) {
                     noResultItem {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index c1bb1dde36..a4f617bf5b 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -68,7 +68,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
                 // If the event can be displayed, display it as is
                 Timber.w("NotifiableEventResolver Received an unsupported event matching a bing rule")
                 // TODO Better event text display
-                val bodyPreview = event.type
+                val bodyPreview = event.type ?: EventType.MISSING_TYPE
 
                 return SimpleNotifiableEvent(
                         session.myUserId,

From 2d664c423d54e09f3b915ec4dda2ffd0f6cda13c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 16:21:40 +0100
Subject: [PATCH 141/578] Simplify code

---
 .../fcm/VectorFirebaseMessagingService.kt     | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index cfd241d4f9..4d2cbecfe4 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -253,25 +253,15 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
      * Try to create an event from the FCM data
      *
      * @param data the FCM data
-     * @return the event
+     * @return the event or null if required data are missing
      */
     private fun parseEvent(data: Map<String, String>?): Event? {
-        // accept only event with room id.
-        if (null == data || !data.containsKey("room_id") || !data.containsKey("event_id")) {
-            return null
-        }
-
-        try {
-            return Event(eventId = data["event_id"],
-                    senderId = data["sender"],
-                    roomId = data["room_id"],
-                    type = data.getValue("type"),
-                    // TODO content = data.getValue("content"),
-                    originServerTs = System.currentTimeMillis())
-        } catch (e: Exception) {
-            Timber.e(e, "buildEvent fails ")
-        }
-
-        return null
+        return Event(
+                eventId = data?.get("event_id") ?: return null,
+                senderId = data["sender"],
+                roomId = data["room_id"] ?: return null,
+                type = data["type"] ?: return null,
+                originServerTs = System.currentTimeMillis()
+        )
     }
 }

From a9f923591d470ec73f97a1cd701a4e85aee9ce3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 15:32:08 +0000
Subject: [PATCH 142/578] Bump barista from 3.7.0 to 3.8.0

Bumps barista from 3.7.0 to 3.8.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 1c3f4d09c8..5543d27d95 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -473,7 +473,7 @@ dependencies {
     // Plant Timber tree for test
     androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
     // "The one who serves a great Espresso"
-    androidTestImplementation('com.schibsted.spain:barista:3.7.0') {
+    androidTestImplementation('com.schibsted.spain:barista:3.8.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
 }

From 2bef459107365e389c0be1878923b191f03ec0fb Mon Sep 17 00:00:00 2001
From: HelaBasa <R45XvezA@protonmail.ch>
Date: Tue, 2 Mar 2021 17:29:26 +0000
Subject: [PATCH 143/578] Added translation using Weblate (Sinhala)

---
 vector/src/main/res/values-si/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 vector/src/main/res/values-si/strings.xml

diff --git a/vector/src/main/res/values-si/strings.xml b/vector/src/main/res/values-si/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/vector/src/main/res/values-si/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From e6265c277e45ba47585ffee6969ef466006f6f29 Mon Sep 17 00:00:00 2001
From: HelaBasa <R45XvezA@protonmail.ch>
Date: Tue, 2 Mar 2021 17:32:24 +0000
Subject: [PATCH 144/578] Added translation using Weblate (Sinhala)

---
 matrix-sdk-android/src/main/res/values-si/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 matrix-sdk-android/src/main/res/values-si/strings.xml

diff --git a/matrix-sdk-android/src/main/res/values-si/strings.xml b/matrix-sdk-android/src/main/res/values-si/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-si/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From ae648c3e116635c7590113312ec07e092c17131c Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 4 Feb 2021 11:47:24 +0300
Subject: [PATCH 145/578] Make outbound key sharing strategy configurable.

---
 CHANGES.md                                    |  1 +
 .../android/sdk/api/MatrixConfiguration.kt    |  2 ++
 .../OutboundSessionKeySharingStrategy.kt      | 34 +++++++++++++++++++
 .../sdk/api/session/crypto/CryptoService.kt   |  2 ++
 .../internal/crypto/DefaultCryptoService.kt   | 15 ++++++++
 .../crypto/algorithms/IMXEncrypting.kt        |  7 ++++
 .../algorithms/megolm/MXMegolmEncryption.kt   |  9 +++--
 .../crypto/algorithms/olm/MXOlmEncryption.kt  |  4 +++
 .../session/room/timeline/DefaultTimeline.kt  | 16 +++++++--
 .../session/room/typing/SendTypingTask.kt     | 16 ++++++++-
 vector/build.gradle                           |  2 ++
 .../java/im/vector/app/VectorApplication.kt   |  2 +-
 12 files changed, 101 insertions(+), 9 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/OutboundSessionKeySharingStrategy.kt

diff --git a/CHANGES.md b/CHANGES.md
index ba3ad08037..a3eb4bfdf9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -41,6 +41,7 @@ Improvements 🙌:
  - Improve room profile UX
  - Upgrade Jitsi library from 2.9.3 to 3.1.0
  - a11y improvements
+ - Pre-share session keys when opening a room or start typing (#2771)
 
 Bugfix 🐛:
  - VoIP : fix audio devices output
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
index 93a1b962ed..c01aeab6dd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.api
 
 import org.matrix.android.sdk.api.crypto.MXCryptoConfig
+import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
 import java.net.Proxy
 
 data class MatrixConfiguration(
@@ -40,6 +41,7 @@ data class MatrixConfiguration(
          * True to advertise support for call transfers to other parties on Matrix calls.
          */
         val supportsCallTransfer: Boolean = false
+        val outboundSessionKeySharingStrategy: OutboundSessionKeySharingStrategy = OutboundSessionKeySharingStrategy.WhenSendingEvent
 ) {
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/OutboundSessionKeySharingStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/OutboundSessionKeySharingStrategy.kt
new file mode 100644
index 0000000000..9ef1f538b8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/OutboundSessionKeySharingStrategy.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.crypto
+
+enum class OutboundSessionKeySharingStrategy {
+    /**
+     * Keys will be sent for the first time when the first message is sent
+     */
+    WhenSendingEvent,
+
+    /**
+     * Keys will be sent for the first time when the timeline displayed
+     */
+    WhenEnteringRoom,
+
+    /**
+     * Keys will be sent for the first time when a typing started
+     */
+    WhenTyping
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
index eead9b4ab7..1c5bfb1a7b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
@@ -156,4 +156,6 @@ interface CryptoService {
     fun getWithHeldMegolmSession(roomId: String, sessionId: String): RoomKeyWithHeldContent?
 
     fun logDbUsageInfo()
+
+    fun ensureOutboundSession(roomId: String)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 67229a5eae..821ac18e3a 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -1290,6 +1290,21 @@ internal class DefaultCryptoService @Inject constructor(
         cryptoStore.logDbUsageInfo()
     }
 
+    override fun ensureOutboundSession(roomId: String) {
+        cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
+            roomEncryptorsStore
+                    .get(roomId)
+                    ?.let {
+                        getEncryptionAlgorithm(roomId)?.let { safeAlgorithm ->
+                            val userIds = getRoomUserIds(roomId)
+                            if (setEncryptionInRoom(roomId, safeAlgorithm, false, userIds)) {
+                                roomEncryptorsStore.get(roomId)?.ensureOutboundSession(getRoomUserIds(roomId))
+                            }
+                        }
+                    }
+        }
+    }
+
     /* ==========================================================================================
      * For test only
      * ========================================================================================== */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
index fc3ea08a21..008ef1b084 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
@@ -62,4 +62,11 @@ internal interface IMXEncrypting {
                            userId: String,
                            deviceId: String,
                            senderKey: String): Boolean
+
+    /**
+     * Ensure the outbound session
+     *
+     * @param usersInRoom the users in the room
+     */
+    suspend fun ensureOutboundSession(usersInRoom: List<String>)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index fa8acafb83..3a07dbcfb6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -137,11 +137,10 @@ internal class MXMegolmEncryption(
         return MXOutboundSessionInfo(sessionId, SharedWithHelper(roomId, sessionId, cryptoStore))
     }
 
-    /**
-     * Ensure the outbound session
-     *
-     * @param devicesInRoom the devices list
-     */
+    override suspend fun ensureOutboundSession(usersInRoom: List<String>) {
+        getDevicesInRoom(usersInRoom).allowedDevices
+    }
+
     private suspend fun ensureOutboundSession(devicesInRoom: MXUsersDevicesMap<CryptoDeviceInfo>): MXOutboundSessionInfo {
         Timber.v("## CRYPTO | ensureOutboundSession start")
         var session = outboundSession
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
index 9acc9bc1b2..acea6ff3fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
@@ -85,4 +85,8 @@ internal class MXOlmEncryption(
         // No need for olm
         return false
     }
+
+    override suspend fun ensureOutboundSession(usersInRoom: List<String>) {
+        // NOOP
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index ca272a3520..e75beb4b21 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -24,9 +24,13 @@ import io.realm.RealmQuery
 import io.realm.RealmResults
 import io.realm.Sort
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -80,8 +84,11 @@ internal class DefaultTimeline(
         private val timelineInput: TimelineInput,
         private val eventDecryptor: TimelineEventDecryptor,
         private val realmSessionProvider: RealmSessionProvider,
-        private val loadRoomMembersTask: LoadRoomMembersTask
-) : Timeline,
+        private val loadRoomMembersTask: LoadRoomMembersTask,
+        private val session: Session,
+        private val matrixConfiguration: MatrixConfiguration,
+        private val cryptoService: CryptoService
+        ) : Timeline,
         TimelineHiddenReadReceipts.Delegate,
         TimelineInput.Listener {
 
@@ -188,6 +195,11 @@ internal class DefaultTimeline(
                         }
                         .executeBy(taskExecutor)
 
+                if (session.getRoom(roomId)?.isEncrypted().orFalse()
+                        && matrixConfiguration.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
+                    cryptoService.ensureOutboundSession(roomId)
+                }
+
                 isReady.set(true)
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
index 3b56d04872..aa8dcf6013 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
@@ -21,6 +21,11 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.task.Task
 import kotlinx.coroutines.delay
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import javax.inject.Inject
 
@@ -38,12 +43,21 @@ internal interface SendTypingTask : Task<SendTypingTask.Params, Unit> {
 internal class DefaultSendTypingTask @Inject constructor(
         private val roomAPI: RoomAPI,
         @UserId private val userId: String,
-        private val globalErrorReceiver: GlobalErrorReceiver
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val matrixConfiguration: MatrixConfiguration,
+        private val session: Session,
+        private val cryptoService: CryptoService
 ) : SendTypingTask {
 
     override suspend fun execute(params: SendTypingTask.Params) {
         delay(params.delay ?: -1)
 
+        if (params.isTyping
+                && session.getRoom(params.roomId)?.isEncrypted().orFalse()
+                && matrixConfiguration.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping) {
+            cryptoService.ensureOutboundSession(params.roomId)
+        }
+
         executeRequest<Unit>(globalErrorReceiver) {
             apiCall = roomAPI.sendTypingState(
                     params.roomId,
diff --git a/vector/build.gradle b/vector/build.gradle
index 5543d27d95..a257f6aaf6 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -136,6 +136,8 @@ android {
         buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
         resValue "string", "build_number", "\"${buildNumber}\""
 
+        buildConfigField "org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy", "OutboundSessionKeySharingStrategy", "org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy.WhenTyping"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // Keep abiFilter for the universalApk
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index f8cda2c417..1926a35c9c 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -205,7 +205,7 @@ class VectorApplication :
         }
     }
 
-    override fun providesMatrixConfiguration() = MatrixConfiguration(BuildConfig.FLAVOR_DESCRIPTION)
+    override fun providesMatrixConfiguration() = MatrixConfiguration(applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION, outboundSessionKeySharingStrategy = BuildConfig.OutboundSessionKeySharingStrategy)
 
     override fun getWorkManagerConfiguration(): WorkConfiguration {
         return WorkConfiguration.Builder()

From e92edc7cb1c90566cca19df868716a9c6ade1381 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 4 Feb 2021 12:18:32 +0300
Subject: [PATCH 146/578] Fix remember to call the function.

---
 .../sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 3a07dbcfb6..42c19925ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -138,7 +138,7 @@ internal class MXMegolmEncryption(
     }
 
     override suspend fun ensureOutboundSession(usersInRoom: List<String>) {
-        getDevicesInRoom(usersInRoom).allowedDevices
+        ensureOutboundSession(getDevicesInRoom(usersInRoom).allowedDevices)
     }
 
     private suspend fun ensureOutboundSession(devicesInRoom: MXUsersDevicesMap<CryptoDeviceInfo>): MXOutboundSessionInfo {

From a2de80091d3d588e029f362645b7166d2430768d Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Fri, 5 Feb 2021 11:56:42 +0300
Subject: [PATCH 147/578] Code review fixes.

---
 .../internal/crypto/DefaultCryptoService.kt   | 15 ++++-
 .../crypto/IncomingGossipingRequestManager.kt | 13 +++--
 .../crypto/algorithms/IMXEncrypting.kt        | 37 ------------
 .../crypto/algorithms/IMXGroupEncryption.kt   | 57 +++++++++++++++++++
 .../algorithms/megolm/MXMegolmEncryption.kt   |  3 +-
 .../crypto/algorithms/olm/MXOlmEncryption.kt  | 13 -----
 .../session/room/DefaultRoomService.kt        | 23 +++++++-
 .../session/room/timeline/DefaultTimeline.kt  | 23 +-------
 .../room/typing/DefaultTypingService.kt       | 15 ++++-
 .../session/room/typing/SendTypingTask.kt     | 16 +-----
 10 files changed, 119 insertions(+), 96 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 821ac18e3a..72cf8b261d 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -53,6 +53,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.internal.crypto.actions.MegolmSessionDataImporter
 import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
 import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXGroupEncryption
 import org.matrix.android.sdk.internal.crypto.algorithms.IMXWithHeldExtension
 import org.matrix.android.sdk.internal.crypto.algorithms.megolm.MXMegolmEncryptionFactory
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.MXOlmEncryptionFactory
@@ -667,7 +668,12 @@ internal class DefaultCryptoService @Inject constructor(
 
     override fun discardOutboundSession(roomId: String) {
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
-            roomEncryptorsStore.get(roomId)?.discardSessionKey()
+            val roomEncryptor = roomEncryptorsStore.get(roomId)
+            if (roomEncryptor is IMXGroupEncryption) {
+                roomEncryptor.discardSessionKey()
+            } else {
+                Timber.e("## CRYPTO | discardOutboundSession() for:$roomId: Unable to handle IMXGroupEncryption")
+            }
         }
     }
 
@@ -1298,7 +1304,12 @@ internal class DefaultCryptoService @Inject constructor(
                         getEncryptionAlgorithm(roomId)?.let { safeAlgorithm ->
                             val userIds = getRoomUserIds(roomId)
                             if (setEncryptionInRoom(roomId, safeAlgorithm, false, userIds)) {
-                                roomEncryptorsStore.get(roomId)?.ensureOutboundSession(getRoomUserIds(roomId))
+                                val roomEncryptor = roomEncryptorsStore.get(roomId)
+                                if (roomEncryptor is IMXGroupEncryption) {
+                                    roomEncryptor.ensureOutboundSession(getRoomUserIds(roomId))
+                                } else {
+                                    Timber.e("## CRYPTO | ensureOutboundSession() for:$roomId: Unable to handle IMXGroupEncryption for $safeAlgorithm")
+                                }
                             }
                         }
                     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
index c075c90eb9..4a0a274f4f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.api.session.crypto.keyshare.GossipingRequestListen
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXGroupEncryption
 import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
 import org.matrix.android.sdk.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
 import org.matrix.android.sdk.internal.crypto.model.rest.GossipingDefaultContent
@@ -290,12 +291,16 @@ internal class IncomingGossipingRequestManager @Inject constructor(
                 .also { cryptoStore.updateGossipingRequestState(request, GossipingRequestState.REJECTED) }
 
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
-            val isSuccess = roomEncryptor.reshareKey(sessionId, userId, deviceId, senderKey)
+            if (roomEncryptor is IMXGroupEncryption) {
+                val isSuccess = roomEncryptor.reshareKey(sessionId, userId, deviceId, senderKey)
 
-            if (isSuccess) {
-                cryptoStore.updateGossipingRequestState(request, GossipingRequestState.ACCEPTED)
+                if (isSuccess) {
+                    cryptoStore.updateGossipingRequestState(request, GossipingRequestState.ACCEPTED)
+                } else {
+                    cryptoStore.updateGossipingRequestState(request, GossipingRequestState.UNABLE_TO_PROCESS)
+                }
             } else {
-                cryptoStore.updateGossipingRequestState(request, GossipingRequestState.UNABLE_TO_PROCESS)
+                Timber.e("## CRYPTO | handleKeyRequestFromOtherUser() from:$userId: Unable to handle IMXGroupEncryption.reshareKey for $alg")
             }
         }
         cryptoStore.updateGossipingRequestState(request, GossipingRequestState.RE_REQUESTED)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
index 008ef1b084..5294429198 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
@@ -32,41 +32,4 @@ internal interface IMXEncrypting {
      * @return the encrypted content
      */
     suspend fun encryptEventContent(eventContent: Content, eventType: String, userIds: List<String>): Content
-
-    /**
-     * In Megolm, each recipient maintains a record of the ratchet value which allows
-     * them to decrypt any messages sent in the session after the corresponding point
-     * in the conversation. If this value is compromised, an attacker can similarly
-     * decrypt past messages which were encrypted by a key derived from the
-     * compromised or subsequent ratchet values. This gives 'partial' forward
-     * secrecy.
-     *
-     * To mitigate this issue, the application should offer the user the option to
-     * discard historical conversations, by winding forward any stored ratchet values,
-     * or discarding sessions altogether.
-     */
-    fun discardSessionKey()
-
-    /**
-     * Re-shares a session key with devices if the key has already been
-     * sent to them.
-     *
-     * @param sessionId The id of the outbound session to share.
-     * @param userId The id of the user who owns the target device.
-     * @param deviceId The id of the target device.
-     * @param senderKey The key of the originating device for the session.
-     *
-     * @return true in case of success
-     */
-    suspend fun reshareKey(sessionId: String,
-                           userId: String,
-                           deviceId: String,
-                           senderKey: String): Boolean
-
-    /**
-     * Ensure the outbound session
-     *
-     * @param usersInRoom the users in the room
-     */
-    suspend fun ensureOutboundSession(usersInRoom: List<String>)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
new file mode 100644
index 0000000000..97b005659d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.algorithms
+
+internal interface IMXGroupEncryption {
+
+    /**
+     * In Megolm, each recipient maintains a record of the ratchet value which allows
+     * them to decrypt any messages sent in the session after the corresponding point
+     * in the conversation. If this value is compromised, an attacker can similarly
+     * decrypt past messages which were encrypted by a key derived from the
+     * compromised or subsequent ratchet values. This gives 'partial' forward
+     * secrecy.
+     *
+     * To mitigate this issue, the application should offer the user the option to
+     * discard historical conversations, by winding forward any stored ratchet values,
+     * or discarding sessions altogether.
+     */
+    fun discardSessionKey()
+
+    /**
+     * Re-shares a session key with devices if the key has already been
+     * sent to them.
+     *
+     * @param sessionId The id of the outbound session to share.
+     * @param userId The id of the user who owns the target device.
+     * @param deviceId The id of the target device.
+     * @param senderKey The key of the originating device for the session.
+     *
+     * @return true in case of success
+     */
+    suspend fun reshareKey(sessionId: String,
+                           userId: String,
+                           deviceId: String,
+                           senderKey: String): Boolean
+
+    /**
+     * Ensure the outbound session
+     *
+     * @param usersInRoom the users in the room
+     */
+    suspend fun ensureOutboundSession(usersInRoom: List<String>)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 42c19925ae..be85fcec8e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.internal.crypto.MXOlmDevice
 import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
 import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
 import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
+import org.matrix.android.sdk.internal.crypto.algorithms.IMXGroupEncryption
 import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupService
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
@@ -61,7 +62,7 @@ internal class MXMegolmEncryption(
         private val taskExecutor: TaskExecutor,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
         private val cryptoCoroutineScope: CoroutineScope
-) : IMXEncrypting {
+) : IMXEncrypting, IMXGroupEncryption {
 
     // OutboundSessionInfo. Null if we haven't yet started setting one up. Note
     // that even if this is non-null, it may not be ready for use (in which
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
index acea6ff3fe..65f78e11f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
@@ -76,17 +76,4 @@ internal class MXOlmEncryption(
         deviceListManager.downloadKeys(users, false)
         ensureOlmSessionsForUsersAction.handle(users)
     }
-
-    override fun discardSessionKey() {
-        // No need for olm
-    }
-
-    override suspend fun reshareKey(sessionId: String, userId: String, deviceId: String, senderKey: String): Boolean {
-        // No need for olm
-        return false
-    }
-
-    override suspend fun ensureOutboundSession(usersInRoom: List<String>) {
-        // NOOP
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 383dd876d3..c60150004f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -20,6 +20,11 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.RoomService
@@ -39,6 +44,7 @@ import org.matrix.android.sdk.internal.session.room.alias.DeleteRoomAliasTask
 import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
@@ -65,7 +71,10 @@ internal class DefaultRoomService @Inject constructor(
         private val roomGetter: RoomGetter,
         private val roomSummaryDataSource: RoomSummaryDataSource,
         private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-        private val taskExecutor: TaskExecutor
+        private val taskExecutor: TaskExecutor,
+        private val loadRoomMembersTask: LoadRoomMembersTask,
+        private val matrixConfiguration: MatrixConfiguration,
+        private val cryptoService: CryptoService
 ) : RoomService {
 
     override fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback<String>): Cancelable {
@@ -105,6 +114,18 @@ internal class DefaultRoomService @Inject constructor(
     }
 
     override fun onRoomDisplayed(roomId: String): Cancelable {
+        // Ensure to load all room members
+        loadRoomMembersTask
+                .configureWith(LoadRoomMembersTask.Params(roomId)) {
+                    this.callback = NoOpMatrixCallback()
+                }
+                .executeBy(taskExecutor)
+
+        // Ensure to share the outbound session keys with all members
+        if (roomGetter.getRoom(roomId)?.isEncrypted().orFalse()
+                && matrixConfiguration.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
+            cryptoService.ensureOutboundSession(roomId)
+        }
         return updateBreadcrumbsTask
                 .configureWith(UpdateBreadcrumbsTask.Params(roomId))
                 .executeBy(taskExecutor)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index e75beb4b21..1be5d55cad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -24,13 +24,8 @@ import io.realm.RealmQuery
 import io.realm.RealmResults
 import io.realm.Sort
 import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.MatrixConfiguration
-import org.matrix.android.sdk.api.NoOpMatrixCallback
-import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -54,7 +49,6 @@ import org.matrix.android.sdk.internal.database.query.filterEvents
 import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.database.query.whereRoomId
-import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.Debouncer
@@ -83,11 +77,7 @@ internal class DefaultTimeline(
         private val hiddenReadReceipts: TimelineHiddenReadReceipts,
         private val timelineInput: TimelineInput,
         private val eventDecryptor: TimelineEventDecryptor,
-        private val realmSessionProvider: RealmSessionProvider,
-        private val loadRoomMembersTask: LoadRoomMembersTask,
-        private val session: Session,
-        private val matrixConfiguration: MatrixConfiguration,
-        private val cryptoService: CryptoService
+        private val realmSessionProvider: RealmSessionProvider
         ) : Timeline,
         TimelineHiddenReadReceipts.Delegate,
         TimelineInput.Listener {
@@ -189,17 +179,6 @@ internal class DefaultTimeline(
                     hiddenReadReceipts.start(realm, filteredEvents, nonFilteredEvents, this)
                 }
 
-                loadRoomMembersTask
-                        .configureWith(LoadRoomMembersTask.Params(roomId)) {
-                            this.callback = NoOpMatrixCallback()
-                        }
-                        .executeBy(taskExecutor)
-
-                if (session.getRoom(roomId)?.isEncrypted().orFalse()
-                        && matrixConfiguration.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
-                    cryptoService.ensureOutboundSession(roomId)
-                }
-
                 isReady.set(true)
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
index 39b7967bc1..279ab3f334 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
@@ -21,8 +21,13 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.session.room.RoomGetter
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
@@ -36,7 +41,10 @@ import timber.log.Timber
 internal class DefaultTypingService @AssistedInject constructor(
         @Assisted private val roomId: String,
         private val taskExecutor: TaskExecutor,
-        private val sendTypingTask: SendTypingTask
+        private val sendTypingTask: SendTypingTask,
+        private val matrixConfiguration: MatrixConfiguration,
+        private val cryptoService: CryptoService,
+        private val roomGetter: RoomGetter
 ) : TypingService {
 
     @AssistedFactory
@@ -69,6 +77,11 @@ internal class DefaultTypingService @AssistedInject constructor(
 
         currentTask?.cancel()
 
+        if (roomGetter.getRoom(roomId)?.isEncrypted().orFalse()
+                && matrixConfiguration.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping) {
+            cryptoService.ensureOutboundSession(roomId)
+        }
+
         val params = SendTypingTask.Params(roomId, true)
         currentTask = sendTypingTask
                 .configureWith(params)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
index aa8dcf6013..3b56d04872 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
@@ -21,11 +21,6 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.task.Task
 import kotlinx.coroutines.delay
-import org.matrix.android.sdk.api.MatrixConfiguration
-import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
-import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import javax.inject.Inject
 
@@ -43,21 +38,12 @@ internal interface SendTypingTask : Task<SendTypingTask.Params, Unit> {
 internal class DefaultSendTypingTask @Inject constructor(
         private val roomAPI: RoomAPI,
         @UserId private val userId: String,
-        private val globalErrorReceiver: GlobalErrorReceiver,
-        private val matrixConfiguration: MatrixConfiguration,
-        private val session: Session,
-        private val cryptoService: CryptoService
+        private val globalErrorReceiver: GlobalErrorReceiver
 ) : SendTypingTask {
 
     override suspend fun execute(params: SendTypingTask.Params) {
         delay(params.delay ?: -1)
 
-        if (params.isTyping
-                && session.getRoom(params.roomId)?.isEncrypted().orFalse()
-                && matrixConfiguration.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping) {
-            cryptoService.ensureOutboundSession(params.roomId)
-        }
-
         executeRequest<Unit>(globalErrorReceiver) {
             apiCall = roomAPI.sendTypingState(
                     params.roomId,

From a623395585744c0826421ffe54f506741af1bda0 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 8 Feb 2021 17:04:50 +0300
Subject: [PATCH 148/578] Code review fixes.

---
 .../android/sdk/api/MatrixConfiguration.kt    |  1 -
 .../session/room/crypto/RoomCryptoService.kt  |  7 ++++
 .../internal/crypto/DefaultCryptoService.kt   | 42 ++++++++++++-------
 .../crypto/algorithms/IMXGroupEncryption.kt   |  7 ----
 .../algorithms/megolm/MXMegolmEncryption.kt   |  9 ++--
 .../sdk/internal/session/room/DefaultRoom.kt  |  4 ++
 .../session/room/DefaultRoomService.kt        | 23 +---------
 .../session/room/timeline/DefaultTimeline.kt  | 13 +++++-
 .../room/typing/DefaultTypingService.kt       | 15 +------
 vector/build.gradle                           |  2 +-
 .../java/im/vector/app/VectorApplication.kt   |  2 +-
 .../home/room/detail/RoomDetailViewModel.kt   | 11 +++++
 12 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
index c01aeab6dd..9f651a21fa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.api
 
 import org.matrix.android.sdk.api.crypto.MXCryptoConfig
-import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
 import java.net.Proxy
 
 data class MatrixConfiguration(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
index 1251fd9857..bb157ec7ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
@@ -30,4 +30,11 @@ interface RoomCryptoService {
      * Enable encryption of the room
      */
     suspend fun enableEncryption(algorithm: String = MXCRYPTO_ALGORITHM_MEGOLM)
+
+    /**
+     * Ensures all members of the room are loaded and outbound session keys are shared.
+     * Call this method according to [OutboundSessionKeySharingStrategy].
+     * If this method is not called, CryptoService will ensure it before sending events.
+     */
+    fun ensureOutboundSession()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 72cf8b261d..1a90377664 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -50,6 +50,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.util.emptyJsonDict
 import org.matrix.android.sdk.internal.crypto.actions.MegolmSessionDataImporter
 import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
 import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
@@ -709,7 +710,7 @@ internal class DefaultCryptoService @Inject constructor(
      */
     @Throws(MXCryptoError::class)
     private fun internalDecryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
-       return eventDecryptor.decryptEvent(event, timeline)
+        return eventDecryptor.decryptEvent(event, timeline)
     }
 
     /**
@@ -1297,22 +1298,31 @@ internal class DefaultCryptoService @Inject constructor(
     }
 
     override fun ensureOutboundSession(roomId: String) {
+        // Ensure to load all room members
+        loadRoomMembersTask
+                .configureWith(LoadRoomMembersTask.Params(roomId)) {
+                    this.callback = NoOpMatrixCallback()
+                }
+                .executeBy(taskExecutor)
+
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
-            roomEncryptorsStore
-                    .get(roomId)
-                    ?.let {
-                        getEncryptionAlgorithm(roomId)?.let { safeAlgorithm ->
-                            val userIds = getRoomUserIds(roomId)
-                            if (setEncryptionInRoom(roomId, safeAlgorithm, false, userIds)) {
-                                val roomEncryptor = roomEncryptorsStore.get(roomId)
-                                if (roomEncryptor is IMXGroupEncryption) {
-                                    roomEncryptor.ensureOutboundSession(getRoomUserIds(roomId))
-                                } else {
-                                    Timber.e("## CRYPTO | ensureOutboundSession() for:$roomId: Unable to handle IMXGroupEncryption for $safeAlgorithm")
-                                }
-                            }
-                        }
-                    }
+            val userIds = getRoomUserIds(roomId)
+            val alg = roomEncryptorsStore.get(roomId)
+                    ?: getEncryptionAlgorithm(roomId)
+                            ?.let { setEncryptionInRoom(roomId, it, false, userIds) }
+                            ?.let { roomEncryptorsStore.get(roomId) }
+
+            if (alg == null) {
+                val reason = String.format(MXCryptoError.UNABLE_TO_ENCRYPT_REASON, MXCryptoError.NO_MORE_ALGORITHM_REASON)
+                Timber.e("## CRYPTO | encryptEventContent() : $reason")
+                return@launch
+            }
+
+            runCatching {
+                alg.encryptEventContent(emptyJsonDict, EventType.DUMMY, userIds)
+            }.onFailure {
+                Timber.e("## CRYPTO | encryptEventContent() failed.")
+            }
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
index 97b005659d..2d0cf4bc01 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
@@ -47,11 +47,4 @@ internal interface IMXGroupEncryption {
                            userId: String,
                            deviceId: String,
                            senderKey: String): Boolean
-
-    /**
-     * Ensure the outbound session
-     *
-     * @param usersInRoom the users in the room
-     */
-    suspend fun ensureOutboundSession(usersInRoom: List<String>)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index be85fcec8e..db4f7279c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -138,10 +138,11 @@ internal class MXMegolmEncryption(
         return MXOutboundSessionInfo(sessionId, SharedWithHelper(roomId, sessionId, cryptoStore))
     }
 
-    override suspend fun ensureOutboundSession(usersInRoom: List<String>) {
-        ensureOutboundSession(getDevicesInRoom(usersInRoom).allowedDevices)
-    }
-
+    /**
+     * Ensure the outbound session
+     *
+     * @param devicesInRoom the devices list
+     */
     private suspend fun ensureOutboundSession(devicesInRoom: MXUsersDevicesMap<CryptoDeviceInfo>): MXOutboundSessionInfo {
         Timber.v("## CRYPTO | ensureOutboundSession start")
         var session = outboundSession
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 7a819250cf..a2b7a37b9b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -104,6 +104,10 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
         return cryptoService.shouldEncryptForInvitedMembers(roomId)
     }
 
+    override fun ensureOutboundSession() {
+        cryptoService.ensureOutboundSession(roomId)
+    }
+
     override suspend fun enableEncryption(algorithm: String) {
         when {
             isEncrypted()                          -> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index c60150004f..383dd876d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -20,11 +20,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.MatrixConfiguration
-import org.matrix.android.sdk.api.NoOpMatrixCallback
-import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
-import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.RoomService
@@ -44,7 +39,6 @@ import org.matrix.android.sdk.internal.session.room.alias.DeleteRoomAliasTask
 import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
-import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
@@ -71,10 +65,7 @@ internal class DefaultRoomService @Inject constructor(
         private val roomGetter: RoomGetter,
         private val roomSummaryDataSource: RoomSummaryDataSource,
         private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-        private val taskExecutor: TaskExecutor,
-        private val loadRoomMembersTask: LoadRoomMembersTask,
-        private val matrixConfiguration: MatrixConfiguration,
-        private val cryptoService: CryptoService
+        private val taskExecutor: TaskExecutor
 ) : RoomService {
 
     override fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback<String>): Cancelable {
@@ -114,18 +105,6 @@ internal class DefaultRoomService @Inject constructor(
     }
 
     override fun onRoomDisplayed(roomId: String): Cancelable {
-        // Ensure to load all room members
-        loadRoomMembersTask
-                .configureWith(LoadRoomMembersTask.Params(roomId)) {
-                    this.callback = NoOpMatrixCallback()
-                }
-                .executeBy(taskExecutor)
-
-        // Ensure to share the outbound session keys with all members
-        if (roomGetter.getRoom(roomId)?.isEncrypted().orFalse()
-                && matrixConfiguration.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
-            cryptoService.ensureOutboundSession(roomId)
-        }
         return updateBreadcrumbsTask
                 .configureWith(UpdateBreadcrumbsTask.Params(roomId))
                 .executeBy(taskExecutor)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 1be5d55cad..ca272a3520 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -24,6 +24,7 @@ import io.realm.RealmQuery
 import io.realm.RealmResults
 import io.realm.Sort
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -49,6 +50,7 @@ import org.matrix.android.sdk.internal.database.query.filterEvents
 import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.database.query.whereRoomId
+import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.Debouncer
@@ -77,8 +79,9 @@ internal class DefaultTimeline(
         private val hiddenReadReceipts: TimelineHiddenReadReceipts,
         private val timelineInput: TimelineInput,
         private val eventDecryptor: TimelineEventDecryptor,
-        private val realmSessionProvider: RealmSessionProvider
-        ) : Timeline,
+        private val realmSessionProvider: RealmSessionProvider,
+        private val loadRoomMembersTask: LoadRoomMembersTask
+) : Timeline,
         TimelineHiddenReadReceipts.Delegate,
         TimelineInput.Listener {
 
@@ -179,6 +182,12 @@ internal class DefaultTimeline(
                     hiddenReadReceipts.start(realm, filteredEvents, nonFilteredEvents, this)
                 }
 
+                loadRoomMembersTask
+                        .configureWith(LoadRoomMembersTask.Params(roomId)) {
+                            this.callback = NoOpMatrixCallback()
+                        }
+                        .executeBy(taskExecutor)
+
                 isReady.set(true)
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
index 279ab3f334..39b7967bc1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
@@ -21,13 +21,8 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.MatrixConfiguration
-import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
-import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.session.room.RoomGetter
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
@@ -41,10 +36,7 @@ import timber.log.Timber
 internal class DefaultTypingService @AssistedInject constructor(
         @Assisted private val roomId: String,
         private val taskExecutor: TaskExecutor,
-        private val sendTypingTask: SendTypingTask,
-        private val matrixConfiguration: MatrixConfiguration,
-        private val cryptoService: CryptoService,
-        private val roomGetter: RoomGetter
+        private val sendTypingTask: SendTypingTask
 ) : TypingService {
 
     @AssistedFactory
@@ -77,11 +69,6 @@ internal class DefaultTypingService @AssistedInject constructor(
 
         currentTask?.cancel()
 
-        if (roomGetter.getRoom(roomId)?.isEncrypted().orFalse()
-                && matrixConfiguration.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping) {
-            cryptoService.ensureOutboundSession(roomId)
-        }
-
         val params = SendTypingTask.Params(roomId, true)
         currentTask = sendTypingTask
                 .configureWith(params)
diff --git a/vector/build.gradle b/vector/build.gradle
index a257f6aaf6..c539ebb648 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -136,7 +136,7 @@ android {
         buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
         resValue "string", "build_number", "\"${buildNumber}\""
 
-        buildConfigField "org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy", "OutboundSessionKeySharingStrategy", "org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy.WhenTyping"
+        buildConfigField "org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy.WhenTyping"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index 1926a35c9c..dd94be77ba 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -205,7 +205,7 @@ class VectorApplication :
         }
     }
 
-    override fun providesMatrixConfiguration() = MatrixConfiguration(applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION, outboundSessionKeySharingStrategy = BuildConfig.OutboundSessionKeySharingStrategy)
+    override fun providesMatrixConfiguration() = MatrixConfiguration(applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION)
 
     override fun getWorkManagerConfiguration(): WorkConfiguration {
         return WorkConfiguration.Builder()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 601891b15a..099f2eefff 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -28,6 +28,7 @@ import com.jakewharton.rxrelay2.PublishRelay
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
@@ -60,6 +61,7 @@ import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.raw.RawService
@@ -179,6 +181,11 @@ class RoomDetailViewModel @AssistedInject constructor(
         callManager.addPstnSupportListener(this)
         callManager.checkForPSTNSupportIfNeeded()
         chatEffectManager.delegate = this
+
+        // Ensure to share the outbound session keys with all members
+        if (room.isEncrypted() && BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
+            room.ensureOutboundSession()
+        }
     }
 
     private fun observePowerLevel() {
@@ -591,6 +598,10 @@ class RoomDetailViewModel @AssistedInject constructor(
                 room.userStopsTyping()
             }
         }
+        // Ensure outbound session keys
+        if (room.isEncrypted() && BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping) {
+            room.ensureOutboundSession()
+        }
     }
 
     private fun handleTombstoneEvent(action: RoomDetailAction.HandleTombstoneEvent) {

From 8b39eabc0fae60f7f7fa16ea6bbd09d064068688 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 8 Feb 2021 17:26:09 +0300
Subject: [PATCH 149/578] Code review fixes.

---
 .../sdk/internal/crypto/DefaultCryptoService.kt    | 14 +++++++-------
 vector/build.gradle                                |  2 +-
 .../OutboundSessionKeySharingStrategy.kt           |  2 +-
 .../home/room/detail/RoomDetailViewModel.kt        |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename {matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto => vector/src/main/java/im/vector/app/features/crypto/keysrequest}/OutboundSessionKeySharingStrategy.kt (95%)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 1a90377664..14542a1ea8 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -1298,14 +1298,14 @@ internal class DefaultCryptoService @Inject constructor(
     }
 
     override fun ensureOutboundSession(roomId: String) {
-        // Ensure to load all room members
-        loadRoomMembersTask
-                .configureWith(LoadRoomMembersTask.Params(roomId)) {
-                    this.callback = NoOpMatrixCallback()
-                }
-                .executeBy(taskExecutor)
-
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
+            // Ensure to load all room members
+            loadRoomMembersTask
+                    .configureWith(LoadRoomMembersTask.Params(roomId)) {
+                        this.callback = NoOpMatrixCallback()
+                    }
+                    .executeBy(taskExecutor)
+
             val userIds = getRoomUserIds(roomId)
             val alg = roomEncryptorsStore.get(roomId)
                     ?: getEncryptionAlgorithm(roomId)
diff --git a/vector/build.gradle b/vector/build.gradle
index c539ebb648..dc2a16ccc5 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -136,7 +136,7 @@ android {
         buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
         resValue "string", "build_number", "\"${buildNumber}\""
 
-        buildConfigField "org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy.WhenTyping"
+        buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/OutboundSessionKeySharingStrategy.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/OutboundSessionKeySharingStrategy.kt
rename to vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
index 9ef1f538b8..e797f4622c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/OutboundSessionKeySharingStrategy.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.crypto
+package im.vector.app.features.crypto.keysrequest
 
 enum class OutboundSessionKeySharingStrategy {
     /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 099f2eefff..ea5787de46 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -61,7 +61,7 @@ import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.NoOpMatrixCallback
-import org.matrix.android.sdk.api.crypto.OutboundSessionKeySharingStrategy
+import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.raw.RawService
@@ -599,7 +599,7 @@ class RoomDetailViewModel @AssistedInject constructor(
             }
         }
         // Ensure outbound session keys
-        if (room.isEncrypted() && BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping) {
+        if (action.isTyping && room.isEncrypted() && BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping) {
             room.ensureOutboundSession()
         }
     }

From 11dffacc485e196baa9a3a71a7f4eab4e7a980ca Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 8 Feb 2021 17:39:25 +0300
Subject: [PATCH 150/578] Code review fixes.

---
 .../android/sdk/internal/crypto/DefaultCryptoService.kt     | 6 +-----
 .../crypto/keysrequest/OutboundSessionKeySharingStrategy.kt | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 14542a1ea8..08991b2d5f 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -1300,11 +1300,7 @@ internal class DefaultCryptoService @Inject constructor(
     override fun ensureOutboundSession(roomId: String) {
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
             // Ensure to load all room members
-            loadRoomMembersTask
-                    .configureWith(LoadRoomMembersTask.Params(roomId)) {
-                        this.callback = NoOpMatrixCallback()
-                    }
-                    .executeBy(taskExecutor)
+            loadRoomMembersTask.execute(LoadRoomMembersTask.Params(roomId))
 
             val userIds = getRoomUserIds(roomId)
             val alg = roomEncryptorsStore.get(roomId)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
index e797f4622c..19c62ed572 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/OutboundSessionKeySharingStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From fae484cb9593f385fc5c868246f4e526ec621de9 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 9 Feb 2021 22:37:48 +0300
Subject: [PATCH 151/578] Create test for ensureOutboundSession function.

---
 .../sdk/internal/crypto/CryptoServiceTest.kt  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoServiceTest.kt

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoServiceTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoServiceTest.kt
new file mode 100644
index 0000000000..6467705b01
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoServiceTest.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class CryptoServiceTest : InstrumentedTest {
+
+    private val mTestHelper = CommonTestHelper(context())
+    private val mCryptoTestHelper = CryptoTestHelper(mTestHelper)
+
+    @Test
+    fun ensure_outbound_session_happy_path() {
+        val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
+        val bobSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
+
+        // Initialize cross signing on both
+        mCryptoTestHelper.initializeCrossSigning(aliceSession)
+        mCryptoTestHelper.initializeCrossSigning(bobSession)
+
+        val roomId = mCryptoTestHelper.createDM(aliceSession, bobSession)
+        mCryptoTestHelper.verifySASCrossSign(aliceSession, bobSession, roomId)
+
+        aliceSession.cryptoService().ensureOutboundSession(roomId)
+
+        assertTrue(
+                aliceSession
+                        .cryptoService()
+                        .getGossipingEvents()
+                        .map { it.senderId }
+                        .containsAll(
+                                listOf(aliceSession.myUserId, bobSession.myUserId)
+                        )
+        )
+    }
+}

From 4450f51d7846f7bd8462592c4a27f812d8782a1b Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 10 Feb 2021 11:53:47 +0300
Subject: [PATCH 152/578] runCatching added to loadMembersTask execution.

---
 .../android/sdk/internal/crypto/DefaultCryptoService.kt       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 08991b2d5f..e254be74ed 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -1300,7 +1300,9 @@ internal class DefaultCryptoService @Inject constructor(
     override fun ensureOutboundSession(roomId: String) {
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
             // Ensure to load all room members
-            loadRoomMembersTask.execute(LoadRoomMembersTask.Params(roomId))
+            runCatching {
+                loadRoomMembersTask.execute(LoadRoomMembersTask.Params(roomId))
+            }
 
             val userIds = getRoomUserIds(roomId)
             val alg = roomEncryptorsStore.get(roomId)

From 533a7bb180669ee5347a17126bc23a56f1e66946 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 17 Feb 2021 16:47:40 +0100
Subject: [PATCH 153/578] Code Review

---
 .../sdk/internal/crypto/CryptoServiceTest.kt  |  62 -----------
 .../sdk/internal/crypto/PreShareKeysTest.kt   | 103 ++++++++++++++++++
 .../crypto/gossiping/WithHeldTests.kt         |   2 +-
 .../android/sdk/api/MatrixConfiguration.kt    |   1 -
 .../sdk/api/session/crypto/CryptoService.kt   |   6 +-
 .../session/room/crypto/RoomCryptoService.kt  |   2 +-
 .../internal/crypto/DefaultCryptoService.kt   |  26 +++--
 .../sdk/internal/crypto/EventDecryptor.kt     |   2 +-
 .../crypto/algorithms/IMXGroupEncryption.kt   |   2 +
 .../algorithms/megolm/MXMegolmEncryption.kt   |  21 +++-
 .../sdk/internal/session/room/DefaultRoom.kt  |   7 +-
 .../home/room/detail/RoomDetailAction.kt      |   2 +
 .../home/room/detail/RoomDetailFragment.kt    |   7 ++
 .../home/room/detail/RoomDetailViewModel.kt   |  39 ++++++-
 14 files changed, 197 insertions(+), 85 deletions(-)
 delete mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoServiceTest.kt
 create mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoServiceTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoServiceTest.kt
deleted file mode 100644
index 6467705b01..0000000000
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoServiceTest.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.crypto
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.FixMethodOrder
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.MethodSorters
-import org.matrix.android.sdk.InstrumentedTest
-import org.matrix.android.sdk.common.CommonTestHelper
-import org.matrix.android.sdk.common.CryptoTestHelper
-import org.matrix.android.sdk.common.SessionTestParams
-import org.matrix.android.sdk.common.TestConstants
-import kotlin.test.assertTrue
-
-@RunWith(AndroidJUnit4::class)
-@FixMethodOrder(MethodSorters.JVM)
-class CryptoServiceTest : InstrumentedTest {
-
-    private val mTestHelper = CommonTestHelper(context())
-    private val mCryptoTestHelper = CryptoTestHelper(mTestHelper)
-
-    @Test
-    fun ensure_outbound_session_happy_path() {
-        val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
-        val bobSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
-
-        // Initialize cross signing on both
-        mCryptoTestHelper.initializeCrossSigning(aliceSession)
-        mCryptoTestHelper.initializeCrossSigning(bobSession)
-
-        val roomId = mCryptoTestHelper.createDM(aliceSession, bobSession)
-        mCryptoTestHelper.verifySASCrossSign(aliceSession, bobSession, roomId)
-
-        aliceSession.cryptoService().ensureOutboundSession(roomId)
-
-        assertTrue(
-                aliceSession
-                        .cryptoService()
-                        .getGossipingEvents()
-                        .map { it.senderId }
-                        .containsAll(
-                                listOf(aliceSession.myUserId, bobSession.myUserId)
-                        )
-        )
-    }
-}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
new file mode 100644
index 0000000000..122584142e
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto
+
+import android.util.Log
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyContent
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(AndroidJUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class PreShareKeysTest : InstrumentedTest {
+
+    private val mTestHelper = CommonTestHelper(context())
+    private val mCryptoTestHelper = CryptoTestHelper(mTestHelper)
+
+    @Test
+    fun ensure_outbound_session_happy_path() {
+        val testData = mCryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
+        val e2eRoomID = testData.roomId
+        val aliceSession = testData.firstSession
+        val bobSession = testData.secondSession!!
+
+        // clear any outbound session
+        aliceSession.cryptoService().discardOutboundSession(e2eRoomID)
+
+        val preShareCount = bobSession.cryptoService().getGossipingEvents().count {
+            it.senderId == aliceSession.myUserId
+                    && it.getClearType() == EventType.ROOM_KEY
+        }
+
+        assertEquals(0, preShareCount, "Bob should not have receive any key from alice at this point")
+        Log.d("#Test", "Room Key Received from alice $preShareCount")
+
+        // Force presharing of new outbound key
+        mTestHelper.doSync<Unit> {
+            aliceSession.cryptoService().prepareToEncrypt(e2eRoomID, it)
+        }
+
+        mTestHelper.waitWithLatch { latch ->
+            mTestHelper.retryPeriodicallyWithLatch(latch) {
+                val newGossipCount = bobSession.cryptoService().getGossipingEvents().count {
+                    it.senderId == aliceSession.myUserId
+                            && it.getClearType() == EventType.ROOM_KEY
+                }
+                newGossipCount > preShareCount
+            }
+        }
+
+        val latest = bobSession.cryptoService().getGossipingEvents().lastOrNull {
+            it.senderId == aliceSession.myUserId
+                    && it.getClearType() == EventType.ROOM_KEY
+        }
+
+        val content = latest?.getClearContent().toModel<RoomKeyContent>()
+        assertNotNull(content, "Bob should have received and decrypted a room key event from alice")
+        assertEquals(e2eRoomID, content.roomId, "Wrong room")
+        val megolmSessionId = content.sessionId!!
+
+        val sharedIndex = aliceSession.cryptoService().getSharedWithInfo(e2eRoomID, megolmSessionId)
+                .getObject(bobSession.myUserId, bobSession.sessionParams.deviceId)
+
+        assertEquals(0, sharedIndex, "The session received by bob should match what alice sent")
+
+        // Just send a real message as test
+        val sentEvent = mTestHelper.sendTextMessage(aliceSession.getRoom(e2eRoomID)!!, "Allo", 1).first()
+
+        assertEquals(megolmSessionId, sentEvent.root.content.toModel<EncryptedEventContent>()?.sessionId, "Unexpected megolm session")
+        mTestHelper.waitWithLatch { latch ->
+            mTestHelper.retryPeriodicallyWithLatch(latch) {
+                bobSession.getRoom(e2eRoomID)?.getTimeLineEvent(sentEvent.eventId)?.root?.getClearType() == EventType.MESSAGE
+            }
+        }
+
+        mTestHelper.signOutAndClose(aliceSession)
+        mTestHelper.signOutAndClose(bobSession)
+    }
+}
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index 80cc14fcb6..b2516ea2be 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -51,7 +51,7 @@ class WithHeldTests : InstrumentedTest {
         // =============================
 
         val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
-        val bobSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
+        val bobSession = mTestHelper.createAccount(TestConstants.USER_BOB, SessionTestParams(true))
 
         // Initialize cross signing on both
         mCryptoTestHelper.initializeCrossSigning(aliceSession)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
index 9f651a21fa..93a1b962ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
@@ -40,7 +40,6 @@ data class MatrixConfiguration(
          * True to advertise support for call transfers to other parties on Matrix calls.
          */
         val supportsCallTransfer: Boolean = false
-        val outboundSessionKeySharingStrategy: OutboundSessionKeySharingStrategy = OutboundSessionKeySharingStrategy.WhenSendingEvent
 ) {
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
index 1c5bfb1a7b..1b7a5243e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
@@ -157,5 +157,9 @@ interface CryptoService {
 
     fun logDbUsageInfo()
 
-    fun ensureOutboundSession(roomId: String)
+    /**
+     * Perform any background tasks that can be done before a message is ready to
+     * send, in order to speed up sending of the message.
+     */
+    fun prepareToEncrypt(roomId: String, callback: MatrixCallback<Unit>)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
index bb157ec7ee..d8bec878a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
@@ -36,5 +36,5 @@ interface RoomCryptoService {
      * Call this method according to [OutboundSessionKeySharingStrategy].
      * If this method is not called, CryptoService will ensure it before sending events.
      */
-    fun ensureOutboundSession()
+    suspend fun prepareToEncrypt()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index e254be74ed..17d25736eb 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -50,7 +50,6 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
-import org.matrix.android.sdk.api.util.emptyJsonDict
 import org.matrix.android.sdk.internal.crypto.actions.MegolmSessionDataImporter
 import org.matrix.android.sdk.internal.crypto.actions.SetDeviceVerificationAction
 import org.matrix.android.sdk.internal.crypto.algorithms.IMXEncrypting
@@ -99,7 +98,6 @@ import org.matrix.olm.OlmManager
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
-import kotlin.jvm.Throws
 import kotlin.math.max
 
 /**
@@ -1297,11 +1295,16 @@ internal class DefaultCryptoService @Inject constructor(
         cryptoStore.logDbUsageInfo()
     }
 
-    override fun ensureOutboundSession(roomId: String) {
+    override fun prepareToEncrypt(roomId: String, callback: MatrixCallback<Unit>) {
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
+            Timber.d("## CRYPTO | prepareToEncrypt() : Check room members up to date")
             // Ensure to load all room members
-            runCatching {
+            try {
                 loadRoomMembersTask.execute(LoadRoomMembersTask.Params(roomId))
+            } catch (failure: Throwable) {
+                Timber.e("## CRYPTO | prepareToEncrypt() : Failed to load room members")
+                callback.onFailure(failure)
+                return@launch
             }
 
             val userIds = getRoomUserIds(roomId)
@@ -1312,15 +1315,20 @@ internal class DefaultCryptoService @Inject constructor(
 
             if (alg == null) {
                 val reason = String.format(MXCryptoError.UNABLE_TO_ENCRYPT_REASON, MXCryptoError.NO_MORE_ALGORITHM_REASON)
-                Timber.e("## CRYPTO | encryptEventContent() : $reason")
+                Timber.e("## CRYPTO | prepareToEncrypt() : $reason")
+                callback.onFailure(IllegalArgumentException("Missing algorithm"))
                 return@launch
             }
 
             runCatching {
-                alg.encryptEventContent(emptyJsonDict, EventType.DUMMY, userIds)
-            }.onFailure {
-                Timber.e("## CRYPTO | encryptEventContent() failed.")
-            }
+                (alg as? IMXGroupEncryption)?.preshareKey(userIds)
+            }.fold(
+                    { callback.onSuccess(Unit) },
+                    {
+                        Timber.e("## CRYPTO | prepareToEncrypt() failed.")
+                        callback.onFailure(it)
+                    }
+            )
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
index 92b7728890..32324896fa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/EventDecryptor.kt
@@ -105,7 +105,7 @@ internal class EventDecryptor @Inject constructor(
                 try {
                     return alg.decryptEvent(event, timeline)
                 } catch (mxCryptoError: MXCryptoError) {
-                    Timber.d("## CRYPTO | internalDecryptEvent : Failed to decrypt ${event.eventId} reason: $mxCryptoError")
+                    Timber.v("## CRYPTO | internalDecryptEvent : Failed to decrypt ${event.eventId} reason: $mxCryptoError")
                     if (algorithm == MXCRYPTO_ALGORITHM_OLM) {
                         if (mxCryptoError is MXCryptoError.Base
                                 && mxCryptoError.errorType == MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
index 2d0cf4bc01..1fd5061a65 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXGroupEncryption.kt
@@ -32,6 +32,8 @@ internal interface IMXGroupEncryption {
      */
     fun discardSessionKey()
 
+    suspend fun preshareKey(userIds: List<String>)
+
     /**
      * Re-shares a session key with devices if the key has already been
      * sent to them.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index db4f7279c6..bb75d014ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -94,6 +94,7 @@ internal class MXMegolmEncryption(
                     // annoyingly we have to serialize again the saved outbound session to store message index :/
                     // if not we would see duplicate message index errors
                     olmDevice.storeOutboundGroupSessionForRoom(roomId, outboundSession.sessionId)
+                    Timber.v("## CRYPTO | encryptEventContent: Finished in ${System.currentTimeMillis() - ts} millis")
                 }
     }
 
@@ -118,6 +119,16 @@ internal class MXMegolmEncryption(
         olmDevice.discardOutboundGroupSessionForRoom(roomId)
     }
 
+    override suspend fun preshareKey(userIds: List<String>) {
+        val ts = System.currentTimeMillis()
+        Timber.v("## CRYPTO | preshareKey : getDevicesInRoom")
+        val devices = getDevicesInRoom(userIds)
+        val outboundSession = ensureOutboundSession(devices.allowedDevices)
+
+        notifyWithheldForSession(devices.withHeldDevices, outboundSession)
+
+        Timber.v("## CRYPTO | preshareKey ${System.currentTimeMillis() - ts} millis")
+    }
     /**
      * Prepare a new session.
      *
@@ -253,7 +264,7 @@ internal class MXMegolmEncryption(
 
                     continue
                 }
-                Timber.i("## CRYPTO | shareUserDevicesKey() : Sharing keys with device $userId:$deviceID")
+                Timber.i("## CRYPTO | shareUserDevicesKey() : Add to share keys contentMap for $userId:$deviceID")
                 contentMap.setObject(userId, deviceID, messageEncrypter.encryptMessage(payload, listOf(sessionResult.deviceInfo)))
                 haveTargets = true
             }
@@ -264,10 +275,12 @@ internal class MXMegolmEncryption(
         // attempted to share with) rather than the contentMap (those we did
         // share with), because we don't want to try to claim a one-time-key
         // for dead devices on every message.
+        val gossipingEventBuffer = arrayListOf<Event>()
         for ((userId, devicesToShareWith) in devicesByUser) {
             for ((deviceId) in devicesToShareWith) {
                 session.sharedWithHelper.markedSessionAsShared(userId, deviceId, chainIndex)
-                cryptoStore.saveGossipingEvent(Event(
+                gossipingEventBuffer.add(
+                        Event(
                         type = EventType.ROOM_KEY,
                         senderId = credentials.userId,
                         content = submap.apply {
@@ -279,6 +292,8 @@ internal class MXMegolmEncryption(
             }
         }
 
+        cryptoStore.saveGossipingEvents(gossipingEventBuffer)
+
         if (haveTargets) {
             t0 = System.currentTimeMillis()
             Timber.i("## CRYPTO | shareUserDevicesKey() ${session.sessionId} : has target")
@@ -296,7 +311,7 @@ internal class MXMegolmEncryption(
     }
 
     private fun notifyKeyWithHeld(targets: List<UserDevice>, sessionId: String, senderKey: String?, code: WithHeldCode) {
-        Timber.i("## CRYPTO | notifyKeyWithHeld() :sending withheld key for $targets session:$sessionId ")
+        Timber.i("## CRYPTO | notifyKeyWithHeld() :sending withheld key for $targets session:$sessionId and code $code ")
         val withHeldContent = RoomKeyWithHeldContent(
                 roomId = roomId,
                 senderKey = senderKey,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index a2b7a37b9b..8e817ec31a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -45,6 +45,7 @@ import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSourc
 import org.matrix.android.sdk.internal.session.search.SearchTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.awaitCallback
 import java.security.InvalidParameterException
 import javax.inject.Inject
 
@@ -104,8 +105,10 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
         return cryptoService.shouldEncryptForInvitedMembers(roomId)
     }
 
-    override fun ensureOutboundSession() {
-        cryptoService.ensureOutboundSession(roomId)
+    override suspend fun prepareToEncrypt() {
+        awaitCallback<Unit> {
+            cryptoService.prepareToEncrypt(roomId, it)
+        }
     }
 
     override suspend fun enableEncryption(algorithm: String) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index 98ad6c454c..efc495a379 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -104,4 +104,6 @@ sealed class RoomDetailAction : VectorViewModelAction {
 
     // Preview URL
     data class DoNotShowPreviewUrlFor(val eventId: String, val url: String) : RoomDetailAction()
+
+    data class ComposerFocusChange(val focused: Boolean) : RoomDetailAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index c511c9e666..d51ed08083 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -70,6 +70,7 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.snackbar.Snackbar
+import com.jakewharton.rxbinding3.view.focusChanges
 import com.jakewharton.rxbinding3.widget.textChanges
 import com.vanniktech.emoji.EmojiPopup
 import im.vector.app.R
@@ -1144,6 +1145,12 @@ class RoomDetailFragment @Inject constructor(
                     roomDetailViewModel.handle(RoomDetailAction.UserIsTyping(it))
                 }
                 .disposeOnDestroyView()
+
+        views.composerLayout.views.composerEditText.focusChanges()
+                .subscribe {
+                    roomDetailViewModel.handle(RoomDetailAction.ComposerFocusChange(it))
+                }
+                .disposeOnDestroyView()
     }
 
     private fun sendUri(uri: Uri): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index ea5787de46..977efebb38 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -19,9 +19,13 @@ package im.vector.app.features.home.room.detail
 import android.net.Uri
 import androidx.annotation.IdRes
 import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.jakewharton.rxrelay2.PublishRelay
@@ -37,6 +41,7 @@ import im.vector.app.features.call.dialpad.DialPadLookup
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.command.CommandParser
 import im.vector.app.features.command.ParsedCommand
+import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
 import im.vector.app.features.createdirect.DirectRoomHelper
 import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider
 import im.vector.app.features.home.room.detail.composer.rainbow.RainbowGenerator
@@ -61,7 +66,6 @@ import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.NoOpMatrixCallback
-import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.raw.RawService
@@ -142,6 +146,8 @@ class RoomDetailViewModel @AssistedInject constructor(
     private var trackUnreadMessages = AtomicBoolean(false)
     private var mostRecentDisplayedEvent: TimelineEvent? = null
 
+    private var prepareToEncrypt: Async<Unit> = Uninitialized
+
     @AssistedFactory
     interface Factory {
         fun create(initialState: RoomDetailViewState): RoomDetailViewModel
@@ -184,7 +190,23 @@ class RoomDetailViewModel @AssistedInject constructor(
 
         // Ensure to share the outbound session keys with all members
         if (room.isEncrypted() && BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
-            room.ensureOutboundSession()
+            prepareForEncryption()
+        }
+    }
+
+    private fun prepareForEncryption() {
+        // check if there is not already a call made
+        if (prepareToEncrypt !is Loading) {
+            prepareToEncrypt = Loading()
+            viewModelScope.launch {
+                kotlin.runCatching {
+                    room.prepareToEncrypt()
+                }.fold({
+                    prepareToEncrypt = Success(Unit)
+                }, {
+                    prepareToEncrypt = Fail(it)
+                })
+            }
         }
     }
 
@@ -241,6 +263,7 @@ class RoomDetailViewModel @AssistedInject constructor(
     override fun handle(action: RoomDetailAction) {
         when (action) {
             is RoomDetailAction.UserIsTyping -> handleUserIsTyping(action)
+            is RoomDetailAction.ComposerFocusChange -> handleComposerFocusChange(action)
             is RoomDetailAction.SaveDraft -> handleSaveDraft(action)
             is RoomDetailAction.SendMessage -> handleSendMessage(action)
             is RoomDetailAction.SendMedia -> handleSendMedia(action)
@@ -598,9 +621,17 @@ class RoomDetailViewModel @AssistedInject constructor(
                 room.userStopsTyping()
             }
         }
+    }
+
+    private fun handleComposerFocusChange(action: RoomDetailAction.ComposerFocusChange) {
         // Ensure outbound session keys
-        if (action.isTyping && room.isEncrypted() && BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping) {
-            room.ensureOutboundSession()
+        if (BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping && room.isEncrypted()) {
+            if (action.focused) {
+                // Should we add some rate limit here, or do it only once per model lifecycle?
+                prepareForEncryption()
+            } else {
+                // we could eventually cancel here :/
+            }
         }
     }
 

From 91872fe6734c893c0b552967a77bfe0574a22958 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 17 Feb 2021 17:08:10 +0100
Subject: [PATCH 154/578] cleaning

---
 .../app/features/home/room/detail/RoomDetailViewModel.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 977efebb38..7365801589 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -189,7 +189,7 @@ class RoomDetailViewModel @AssistedInject constructor(
         chatEffectManager.delegate = this
 
         // Ensure to share the outbound session keys with all members
-        if (room.isEncrypted() && BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
+        if (OutboundSessionKeySharingStrategy.WhenEnteringRoom == BuildConfig.outboundSessionKeySharingStrategy && room.isEncrypted()) {
             prepareForEncryption()
         }
     }
@@ -625,7 +625,7 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     private fun handleComposerFocusChange(action: RoomDetailAction.ComposerFocusChange) {
         // Ensure outbound session keys
-        if (BuildConfig.outboundSessionKeySharingStrategy == OutboundSessionKeySharingStrategy.WhenTyping && room.isEncrypted()) {
+        if (OutboundSessionKeySharingStrategy.WhenTyping == BuildConfig.outboundSessionKeySharingStrategy && room.isEncrypted()) {
             if (action.focused) {
                 // Should we add some rate limit here, or do it only once per model lifecycle?
                 prepareForEncryption()

From 5c9750fb0741fb2db5cb818e4d3e379d85f18480 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 2 Mar 2021 19:18:19 +0100
Subject: [PATCH 155/578] Moar cleanup after rebase and before merge

---
 CHANGES.md                                    |  2 +-
 .../session/room/crypto/RoomCryptoService.kt  |  1 -
 .../algorithms/megolm/MXMegolmEncryption.kt   | 31 ++++++++---------
 .../megolm/MXMegolmEncryptionFactory.kt       | 34 +++++++++----------
 .../home/room/detail/RoomDetailViewModel.kt   |  8 ++---
 5 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a3eb4bfdf9..8692a2cff8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
  - Improve initial sync performance (#983)
  - PIP support for Jitsi call (#2418)
  - Add tooltip for room quick actions
+ - Pre-share session keys when opening a room or start typing (#2771)
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)
@@ -41,7 +42,6 @@ Improvements 🙌:
  - Improve room profile UX
  - Upgrade Jitsi library from 2.9.3 to 3.1.0
  - a11y improvements
- - Pre-share session keys when opening a room or start typing (#2771)
 
 Bugfix 🐛:
  - VoIP : fix audio devices output
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
index d8bec878a1..6581247b90 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
@@ -33,7 +33,6 @@ interface RoomCryptoService {
 
     /**
      * Ensures all members of the room are loaded and outbound session keys are shared.
-     * Call this method according to [OutboundSessionKeySharingStrategy].
      * If this method is not called, CryptoService will ensure it before sending events.
      */
     suspend fun prepareToEncrypt()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index bb75d014ff..6b91c0b859 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -18,8 +18,6 @@ package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -40,8 +38,6 @@ import org.matrix.android.sdk.internal.crypto.model.forEach
 import org.matrix.android.sdk.internal.crypto.repository.WarnOnUnknownDeviceRepository
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.internal.util.convertToUTF8
@@ -55,11 +51,11 @@ internal class MXMegolmEncryption(
         private val cryptoStore: IMXCryptoStore,
         private val deviceListManager: DeviceListManager,
         private val ensureOlmSessionsForDevicesAction: EnsureOlmSessionsForDevicesAction,
-        private val credentials: Credentials,
+        private val userId: String,
+        private val deviceId: String,
         private val sendToDeviceTask: SendToDeviceTask,
         private val messageEncrypter: MessageEncrypter,
         private val warnOnUnknownDevicesRepository: WarnOnUnknownDeviceRepository,
-        private val taskExecutor: TaskExecutor,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
         private val cryptoCoroutineScope: CoroutineScope
 ) : IMXEncrypting, IMXGroupEncryption {
@@ -282,7 +278,7 @@ internal class MXMegolmEncryption(
                 gossipingEventBuffer.add(
                         Event(
                         type = EventType.ROOM_KEY,
-                        senderId = credentials.userId,
+                        senderId = this.userId,
                         content = submap.apply {
                             this["session_key"] = ""
                             // we add a fake key for trail
@@ -310,8 +306,11 @@ internal class MXMegolmEncryption(
         }
     }
 
-    private fun notifyKeyWithHeld(targets: List<UserDevice>, sessionId: String, senderKey: String?, code: WithHeldCode) {
-        Timber.i("## CRYPTO | notifyKeyWithHeld() :sending withheld key for $targets session:$sessionId and code $code ")
+    private suspend fun notifyKeyWithHeld(targets: List<UserDevice>,
+                                          sessionId: String,
+                                          senderKey: String?,
+                                          code: WithHeldCode) {
+        Timber.i("## CRYPTO | notifyKeyWithHeld() :sending withheld key for $targets session:$sessionId and code $code")
         val withHeldContent = RoomKeyWithHeldContent(
                 roomId = roomId,
                 senderKey = senderKey,
@@ -327,13 +326,11 @@ internal class MXMegolmEncryption(
                     }
                 }
         )
-        sendToDeviceTask.configureWith(params) {
-            callback = object : MatrixCallback<Unit> {
-                override fun onFailure(failure: Throwable) {
-                    Timber.e("## CRYPTO | notifyKeyWithHeld() : Failed to notify withheld key for $targets session: $sessionId ")
-                }
-            }
-        }.executeBy(taskExecutor)
+        try {
+            sendToDeviceTask.execute(params)
+        } catch (failure: Throwable) {
+            Timber.e("## CRYPTO | notifyKeyWithHeld() : Failed to notify withheld key for $targets session: $sessionId ")
+        }
     }
 
     /**
@@ -359,7 +356,7 @@ internal class MXMegolmEncryption(
 
         // Include our device ID so that recipients can send us a
         // m.new_device message if they don't have our session key.
-        map["device_id"] = credentials.deviceId!!
+        map["device_id"] = deviceId
         session.useCount++
         return map
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
index f0cc15fb63..9f6312ea97 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.crypto.algorithms.megolm
 
 import kotlinx.coroutines.CoroutineScope
-import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.internal.crypto.DeviceListManager
 import org.matrix.android.sdk.internal.crypto.MXOlmDevice
 import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
@@ -26,7 +25,8 @@ import org.matrix.android.sdk.internal.crypto.keysbackup.DefaultKeysBackupServic
 import org.matrix.android.sdk.internal.crypto.repository.WarnOnUnknownDeviceRepository
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import javax.inject.Inject
 
@@ -36,29 +36,29 @@ internal class MXMegolmEncryptionFactory @Inject constructor(
         private val cryptoStore: IMXCryptoStore,
         private val deviceListManager: DeviceListManager,
         private val ensureOlmSessionsForDevicesAction: EnsureOlmSessionsForDevicesAction,
-        private val credentials: Credentials,
+        @UserId private val userId: String,
+        @DeviceId private val deviceId: String?,
         private val sendToDeviceTask: SendToDeviceTask,
         private val messageEncrypter: MessageEncrypter,
         private val warnOnUnknownDevicesRepository: WarnOnUnknownDeviceRepository,
-        private val taskExecutor: TaskExecutor,
         private val coroutineDispatchers: MatrixCoroutineDispatchers,
         private val cryptoCoroutineScope: CoroutineScope) {
 
     fun create(roomId: String): MXMegolmEncryption {
         return MXMegolmEncryption(
-                roomId,
-                olmDevice,
-                defaultKeysBackupService,
-                cryptoStore,
-                deviceListManager,
-                ensureOlmSessionsForDevicesAction,
-                credentials,
-                sendToDeviceTask,
-                messageEncrypter,
-                warnOnUnknownDevicesRepository,
-                taskExecutor,
-                coroutineDispatchers,
-                cryptoCoroutineScope
+                roomId = roomId,
+                olmDevice = olmDevice,
+                defaultKeysBackupService = defaultKeysBackupService,
+                cryptoStore = cryptoStore,
+                deviceListManager = deviceListManager,
+                ensureOlmSessionsForDevicesAction = ensureOlmSessionsForDevicesAction,
+                userId = userId,
+                deviceId = deviceId!!,
+                sendToDeviceTask = sendToDeviceTask,
+                messageEncrypter = messageEncrypter,
+                warnOnUnknownDevicesRepository = warnOnUnknownDevicesRepository,
+                coroutineDispatchers = coroutineDispatchers,
+                cryptoCoroutineScope = cryptoCoroutineScope
         )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 7365801589..935b4ca2f8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -195,11 +195,11 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun prepareForEncryption() {
-        // check if there is not already a call made
-        if (prepareToEncrypt !is Loading) {
+        // check if there is not already a call made, or if there has been an error
+        if (prepareToEncrypt.shouldLoad) {
             prepareToEncrypt = Loading()
             viewModelScope.launch {
-                kotlin.runCatching {
+                runCatching {
                     room.prepareToEncrypt()
                 }.fold({
                     prepareToEncrypt = Success(Unit)
@@ -629,8 +629,6 @@ class RoomDetailViewModel @AssistedInject constructor(
             if (action.focused) {
                 // Should we add some rate limit here, or do it only once per model lifecycle?
                 prepareForEncryption()
-            } else {
-                // we could eventually cancel here :/
             }
         }
     }

From 259ead106fe96559b9c6c00c28532f7558ead583 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 09:28:35 +0100
Subject: [PATCH 156/578] Fix code quality issue

---
 tools/check/forbidden_strings_in_code.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index a5127dc8aa..567e24a849 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===89
+enum class===90
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From 3cbee586bd769847890983a8785cc85c9ef770f9 Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Mon, 1 Mar 2021 19:08:19 +0000
Subject: [PATCH 157/578] Translated using Weblate (Persian)

Currently translated at 99.9% (2080 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
---
 vector/src/main/res/values-fa/strings.xml | 136 +++++++++++-----------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 5418d32c0c..5185b9a278 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -73,26 +73,26 @@
     <string name="auth_register">ساخت حساب</string>
     <string name="auth_submit">ارسال</string>
     <string name="auth_skip">رد شدن</string>
-    <string name="auth_send_reset_email">ارسال ایمیل بازنشانی</string>
-    <string name="auth_user_id_placeholder">ایمیل یا نام کاربری</string>
+    <string name="auth_send_reset_email">فرستادن رایانامهٔ بازنشانی</string>
+    <string name="auth_user_id_placeholder">رایانامه یا نام کاربری</string>
     <string name="auth_password_placeholder">گذرواژه</string>
     <string name="auth_new_password_placeholder">گذرواژه جدید</string>
     <string name="auth_user_name_placeholder">نام کاربری</string>
-    <string name="auth_email_placeholder">نشانی ایمیل</string>
-    <string name="auth_opt_email_placeholder">نشانی ایمیل (اختیاری)</string>
+    <string name="auth_email_placeholder">نشانی رایانامه</string>
+    <string name="auth_opt_email_placeholder">نشانی رایانامه (اختیاری)</string>
     <string name="auth_phone_number_placeholder">شماره تلفن</string>
     <string name="auth_opt_phone_number_placeholder">شماره تلفن (اختیاری)</string>
     <string name="auth_repeat_password_placeholder">گذرواژه را تکرار کنید</string>
     <string name="auth_repeat_new_password_placeholder">گذرواژه جدید خود را تأیید کنید</string>
     <string name="auth_invalid_login_param">نام کاربری یا گذرواژه نامعتبر است</string>
     <string name="auth_invalid_password">گذرواژه کوتاه است (حداقل ۶)</string>
-    <string name="auth_invalid_email">آدرس ایمیل نامعتبر به نظر می‌رسد</string>
+    <string name="auth_invalid_email">شبیه یک نشانی رایانامهٔ معتبر نیست</string>
     <string name="auth_invalid_phone">شماره تلفن نامعتبر به نظر می‌رسد</string>
     <string name="auth_password_dont_match">گذرواژه‌ها مطابقت ندارد</string>
     <string name="auth_forgot_password">گذرواژه را فراموش کردید؟</string>
-    <string name="auth_use_server_options">استفاده از گزینه‌های سفارشی سرور (پیش‌رفته)</string>
-    <string name="auth_email_validation_message">برای ادامه‌ی ثبت‌نام، لطفاً ایمیل خود را بررسی کنید</string>
-    <string name="auth_reset_password_next_step_button">من آدرس ایمیلم را تایید کرده‌ام</string>
+    <string name="auth_use_server_options">استفاده از گزینه‌های سفارشی کارساز (پیش‌رفته)</string>
+    <string name="auth_email_validation_message">برای ادامهٔ ثبت‌نام، لطفاً رایانامه‌تان را بررسی کنید</string>
+    <string name="auth_reset_password_next_step_button">نشانی رایانامه‌ام را تأیید کرده‌ام</string>
     <string name="login_error_network_error">نمی‌توان وارد شد: خطای شبکه</string>
     <string name="login_error_forbidden">نام کاربری/گذرواژه نامعتبر است</string>
     <string name="login_error_user_in_use">این نام کاربری قبلا استفاده شده است</string>
@@ -149,8 +149,8 @@
     <string name="send_bug_report_failed">امکان ارسال گزارش اشکال وجود نداشت، دوباره تلاش کنید (%s)</string>
     <string name="send_bug_report_progress">پیشرفت (%s%%)</string>
     <string name="send_files_in">ارسال در</string>
-    <string name="hs_url">نشانی سرور خانه</string>
-    <string name="identity_url">نشانی سرور هویتی</string>
+    <string name="hs_url">نشانی کارساز خانگی</string>
+    <string name="identity_url">نشانی کارساز هویت</string>
     <string name="option_send_voice">ارسال صدا</string>
     <string name="start_new_chat_prompt_msg">آیا مطمئنید می‌خواهید با %s یک گپ جدید را آغاز کنید؟</string>
     <string name="start_voice_call_prompt_msg">آیا مطمئنید می‌خواهید که یک تماس صوتی را آغاز کنید؟</string>
@@ -165,12 +165,12 @@
     <string name="auth_return_to_login">بازگشت به صفحه ورود</string>
     <string name="auth_missing_password">گذرواژه وارد نشده است</string>
     <string name="auth_missing_phone">شماره تلفن وارد نشده است</string>
-    <string name="auth_missing_email">نشانی ایمیل وارد نشده است</string>
+    <string name="auth_missing_email">نشانی رایانامه وارد نشده</string>
     <string name="auth_invalid_token">توکن نامعتبر است</string>
-    <string name="auth_missing_email_or_phone">آدرس ایمیل یا شماره تلفن وارد نشده است</string>
-    <string name="auth_email_already_defined">این نشانی ایمیل قبلاً ثبت شده است.</string>
-    <string name="auth_home_server">سرور خانه:</string>
-    <string name="auth_identity_server">سرور هویتی:</string>
+    <string name="auth_missing_email_or_phone">نشانی رایانامه یا شماره تلفن وارد نشده</string>
+    <string name="auth_email_already_defined">این نشانی رایانامه قبلاً ثبت شده.</string>
+    <string name="auth_home_server">کارساز خانگی:</string>
+    <string name="auth_identity_server">کارساز هویت:</string>
     <string name="login_error_unable_login">امکان ورود وجود ندارد</string>
     <string name="attachment_remaining_time_minutes">%1$dد %2$dث</string>
     <string name="room_info_room_topic">موضوع اتاق</string>
@@ -282,7 +282,7 @@
     <string name="auth_threepid_warning_message">ثبت‌نام با ورود همزمان ایمیل و شماره تلفن در حال حاضر پشتیبانی نمی‌شود. تنها شماره تلفن شما برای حساب‌تان ثبت خواهد شد.
 \n
 \nمی‌توانید در ادامه ایمیل خود را در تنظیمات برنامه به پروفایل خود اضافه کنید.</string>
-    <string name="auth_recaptcha_message">این سرور خانه می‌خواهد مطمئن شود که شما ربات نیستید</string>
+    <string name="auth_recaptcha_message">این کارساز خانگی می‌خواهد مطمئن شود که روبات نیستید</string>
     <string name="auth_username_in_use">نام کاربری قبلاً استفاده شده است</string>
     <string name="e2e_re_request_encryption_key"><u>بازدرخواست کلیدهای رمزنگاری</u> از دیگر نشست‌هایتان.</string>
     <string name="e2e_re_request_encryption_key_sent">درخواست کلید ارسال شد.</string>
@@ -550,27 +550,27 @@
     <string name="title_activity_verify_device">تأیید نشست</string>
     <string name="none">هیچ</string>
     <string name="revoke">ابطال</string>
-    <string name="people_no_identity_server">هیچ سرور هویتی پیکربندی نشده.</string>
-    <string name="call_failed_no_ice_title">تماس بدلیل سرور بد پیکربندی شده شکست خورد</string>
+    <string name="people_no_identity_server">هیچ کارساز هویتی پیکربندی نشده.</string>
+    <string name="call_failed_no_ice_title">تماس به دلیل پیکربندی بد کارساز، شکست خورد</string>
     <string name="call_failed_no_ice_use_alt">از %s استفاده کنید</string>
     <string name="auth_add_email_phone_message_2">رایانامه‌ای برای بازیابی تنظیم کنید. برای کشف شدن به دست افرادی که می‌شناسید، از رایانامه یا تلفن بعدی استفاده کنید.</string>
     <string name="auth_add_email_and_phone_message_2">رایانامه‌ای برای بازیابی تنظیم کنید. برای کشف شدن به دست افرادی که می‌شناسید، از رایانامه یا تلفن بعدی استفاده کنید.</string>
-    <string name="auth_reset_password_missing_email">نشانی ایمیل پیوست شده به حساب شما باید وارد شده باشد.</string>
+    <string name="auth_reset_password_missing_email">باید نشانی رایانامهٔ پیوسته به حسابتان وارد شود.</string>
     <string name="auth_reset_password_missing_password">گذرواژه جدیدی باید وارد شود.</string>
-    <string name="auth_reset_password_email_validation_message">یک ایمیل به %s فرستاده شد. هنگامی که پیوند همراه را دنبال کردید، در زیر کلیک کنید.</string>
-    <string name="auth_reset_password_error_unauthorized">تایید نشانی ایمیل ناموفق بود: مطمئن شوید که روی پیوند در ایمیل کلیک کرده‌اید</string>
+    <string name="auth_reset_password_email_validation_message">رایانامه‌ای به %s فرستاده شد. هنگامی که پیوند داخلش را دنبال کردید، پایین را کلیک کنید.</string>
+    <string name="auth_reset_password_error_unauthorized">شکست در تأیید نشانی رایانامه: مطمئن شوید که پیوند درون رایانامه را کلیک کرده‌اید</string>
     <string name="auth_reset_password_success_message">گذرواژه بازنشانی شد.
 \n
 \nشما از همه نشست‌ها خارج شدید و دیگر آگاهی ها را دریافت نخواهید کرد. برای فعال‌سازی دوباره آگاهی‌ها، در هر دستگاه دوباره وارد شوید.</string>
-    <string name="auth_accept_policies">لطفا سیاست‌های این سرور خانه را بررسی کنید و بپذیرید:</string>
+    <string name="auth_accept_policies">لطفاً سیاست‌های این کارساز خانگی را بررسی کرده و بپذیرید:</string>
     <string name="login_error_must_start_http">نشانی باید با http[s]:// آغاز شود</string>
     <string name="login_error_registration_network_error">نمی‌توان ثبت‌نام کرد: خطای شبکه</string>
     <string name="login_error_unable_register">نمی‎توان ثبت‌نام کرد</string>
-    <string name="login_error_unable_register_mail_ownership">نمی‌توان ثبت‌نام کرد : مالکیت ایمیل تایید نشد</string>
+    <string name="login_error_unable_register_mail_ownership">نمی‌توان ثبت‌نام کرد : شکست مالکیت رایانامه</string>
     <string name="login_error_invalid_home_server">لطفا یک نشانی معتبر وارد کنید</string>
     <string name="login_error_unknown_host">نشانی قابل دسترس نیست، لطفا آن را بررسی کنید</string>
     <string name="login_error_no_homeserver_found">این یک نشانی کارساز ماتریکس معتبر نیست</string>
-    <string name="login_error_homeserver_not_found">نمی‌توان به این نشانی سرور خانه دست یافت، لطفا آن را بررسی کنید</string>
+    <string name="login_error_homeserver_not_found">روی این نشانی نمی‌توان به کارساز خانگی‌ای رسید. لطفاً بررسیش کنید</string>
     <string name="login_error_ssl_handshake">افزاره‌تان از یک قرارداد امنیتی TLS تاریخ‌گذشته که به حمله آسیپ‌پذیر است استفاده می‌کند. برای امنیتتان، نخواهید توانست وصل شوید</string>
     <string name="login_error_unknown_token">توکن دسترسی مشخص شده، شناخته نشد</string>
     <string name="login_error_bad_json">JSON ناهنجار</string>
@@ -636,7 +636,7 @@
     <string name="pause_video">توقف</string>
     <string name="action_copy">رونوشت</string>
     <string name="dialog_title_success">موفقیت</string>
-    <string name="bottom_action_notification">اعلان‌ها</string>
+    <string name="bottom_action_notification">آگاهی‌ها</string>
     <string name="dismiss">خاتمه</string>
     <string name="no_permissions_to_start_conf_call">اجازهٔ شروع تماس کنفرانسی در این اتاق را ندارید</string>
     <string name="no_permissions_to_start_webrtc_call">اجازهٔ شروع تماس در این اتاق را ندارید</string>
@@ -1478,7 +1478,7 @@
     <string name="reset">بازنشانی</string>
     <string name="startup_notification_privacy_button_other">انتخاب گزینه‌ی دیگر</string>
     <string name="startup_notification_privacy_button_grant">مجوز دادن</string>
-    <string name="startup_notification_privacy_message">المنت می تواند در پس‌زمینه اجرا شود تا اعلان های شما را به صورت ایمن و اختصاصی مدیریت کند. این ممکن است بر میزان مصرف باتری شما تأثیر منفی بگذارد.</string>
+    <string name="startup_notification_privacy_message">المنت می تواند در پس‌زمینه اجرا شده تا آگاهی‌هایتان را به صورت ایمن و محرمانه مدیریت کند. ممکن است بر مصرف باتری تأثیر بگذارد.</string>
     <string name="reset_secure_backup_warning">این کار کلید امنیتی قبلی شما را حذف می‌کند.</string>
     <string name="reset_secure_backup_title">یک کلید امنیتی جدید به صورت تصادفی ایجاد کنید یا یک عبارت امنیتی جدید برای فایل‌های پشتیبان موجود خود تنظیم کنید.</string>
     <string name="settings_send_message_with_enter_summary">فشردن اینتر به جای رفتن به خط بعد، پیام را ارسال خواهد کرد</string>
@@ -1500,14 +1500,14 @@
     <string name="settings_notification_privacy_message_content_not_shown">• آگاهی‌ها <b>محتوای پیام را نشان نخواهند داد</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• آگاهی‌ها شاکل <b>فراداده و محتوای پیام</b> هستند</string>
     <string name="settings_notification_privacy_secure_message_content">• محتوای پیام آگاهی <b> به طور ایمن و مستقیم از کارساز خانگی ماتریکس</b> دریافت می‌شود</string>
-    <string name="settings_notification_privacy_metadata">• اعلان ها فقط حاوی فرا داده هستند</string>
-    <string name="settings_notification_privacy_fcm">• اعلان ها از طریق سرور Firebase ارسال می شوند</string>
+    <string name="settings_notification_privacy_metadata">• آگاهی‌ها فقط دارای فراداده هستند</string>
+    <string name="settings_notification_privacy_fcm">• آگاهی‌ها با پیام‌رسانی ابری Firebase فرستاده می‌شوند</string>
     <string name="settings_troubleshoot_test_battery_failed">اگر دستگاه برای مدتی از شارژر جدا باشد و از دستگاه نیز استفاده نشود، گوشی وارد حالت غیر هوشیار می‌شود. در این حالت از دسترسی برنامه‌ها به اینترنت جلوگیری می‌شود و همگام سازی و هشدارهای استاندارد آن‌ها به تعویق می‌افتد.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">این سرویس با ری‌استارت دستگاه شروع نمی‌شود. تا وقتی المنت را یک بار باز نکنید اعلانی دریافت نخواهید کرد.</string>
-    <string name="settings_troubleshoot_test_notification_notification_clicked">بر روی اعلان کلیک شد!</string>
-    <string name="settings_troubleshoot_test_notification_notice">لطفا بر روی اعلان کلیک کنید. اگر اعلان را نمی‌بینید، تنظیمات دستگاه را بررسی نمائید.</string>
-    <string name="settings_troubleshoot_test_notification_title">نمایش اعلان</string>
-    <string name="settings_troubleshoot_test_push_notification_content">شما اعلان را مشاهده می‌کنید! کلیک کنید!</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">خدمت، هنگام شروع دوبارهٔ افزاره اجرا نخواهد شد. تا وقتی یک بار المنت باز نشود، آگاهی‌ها را دریافت نخواهید کرد.</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">روی آگاهی کلیک شد!</string>
+    <string name="settings_troubleshoot_test_notification_notice">لطفاً روی آگاهی کلیک کنید. اگر آگاهی را نمی‌بینید، لطفاً تنظیمات سامانه را بررسی کنید.</string>
+    <string name="settings_troubleshoot_test_notification_title">نمایش آگاهی</string>
+    <string name="settings_troubleshoot_test_push_notification_content">دارید آگاهی را مشاهده می‌کنید! کلیک کنید!</string>
     <string name="settings_troubleshoot_test_push_loop_failed">دریافت Push با خطا مواجه شد. نصب مجدد برنامه می‌تواند یکی از راه‌حل‌های احتمالی باشد.</string>
     <string name="settings_troubleshoot_test_push_loop_success">برنامه Push دریافت کرد</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">برنامه منتظر دریافت Push است</string>
@@ -1529,11 +1529,11 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">توکن Firebase</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">مشکل Google Play Services را برطرف کنید</string>
-    <string name="settings_troubleshoot_test_play_services_failed">المنت از Google Play Services برای ارسال اعلان‌ها استفاده می‌کند اما به نظر می‌رسد به درستی پیکربندی نشده است:
+    <string name="settings_troubleshoot_test_play_services_failed">المنت برای ارسال آگاهی‌ها از خدمات پلی گوگل استفاده می‌کند اما به نظر می‌رسد به درستی پیکربندی نشده است:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services در دسترس و بروز است.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">تنظیمات سفارشی بارگذاری نشد، لطفاً دوباره امتحان کنید.</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">عیب‌یابی اولیه مشکلی را نشان نمی‌دهد. اگر همچنان در دریافت اعلان‌ها مشکل دارید لطفا خطا را گزارش کرده تا آن را بررسی کنیم.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">عیب‌یابی اولیه مشکلی را نشان نمی‌دهد. اگر همچنان در دریافت آگاهی‌ها مشکل دارید، لطفا خطا را گزارش کرده تا آن را بررسی کنیم.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">یک یا چند تست ناموفق بودند، لطفا خطا را گزارش کرده تا آن را بررسی کنیم.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">یک یا چند تست ناموفق بودند، راه حل(های) پیشنهادی را امتحان کنید.</string>
     <string name="settings_troubleshoot_diagnostic_running_status">در حال اجرا (%1$d از %2$d)</string>
@@ -1556,7 +1556,7 @@
     <string name="room_event_action_report_prompt_reason">دلیل گزارش این محتوا</string>
     <string name="room_details_people_present_group_name">عضو شد</string>
     <string name="room_details_people_invited_group_name">دعوت‌شدگان</string>
-    <string name="malformed_id">شناسه نامعتبر است. باید یک آدرس ایمیل یا شناسه‌ای در قالب \\\'@localpart:domain\\\' وارد نمایید</string>
+    <string name="malformed_id">شناسه بدریخت. باید یک نشانی رایانامه یا شناسهٔ ماتریکسی در قالب \'@localpart:domain\' باشد</string>
     <plurals name="room_details_selected">
         <item quantity="one">%d مورد</item>
         <item quantity="other">%d مورد</item>
@@ -1565,10 +1565,10 @@
     <string name="room_details_people">افراد</string>
     <string name="room_details_title">اطلاعات اتاق</string>
     <string name="ssl_only_accept">گواهی را تنها در صورتی تایید کنید که اثر انگشت آن با اثر انگشتی که ادمین سرور ارائه کرده‌است برابر باشد.</string>
-    <string name="ssl_expected_existing_expl">گواهی سرور تغییر کرده‌است. ممکن است این اتفاق به دلیل تمدید گواهی سرور رخ داده باشد. توصیه می‌شود از ادمین سرور سوال کنید.</string>
-    <string name="ssl_unexpected_existing_expl">گواهی سرور تغییر کرده است. این مورد بسیار نادر است. توصیه می شود گواهی جدید را قبول نکنید.</string>
-    <string name="ssl_cert_new_account_expl">اگر مدیر سرور گفته است که این مسئله اشکالی ندارد، اطمینان حاصل کنید که اثر انگشت زیر با اثر انگشت ارائه شده توسط آنها مطابقت دارد.</string>
-    <string name="ssl_cert_not_trust">این می‌تواند به این معنی باشد که حمله‌ی مرد میانی رخ داده است و یا اینکه گوشی شما، گواهی سرور را معتبر نمی‌داند.</string>
+    <string name="ssl_expected_existing_expl">گواهی از آنی که مورد اطمینان بوده، تغییر کرده. ممکن است کارساز، گواهیش را نوسازی کرده باشد. برای دریافت اثر انگشت مورد انتظار، با مدیر کارساز تماس بگیرید.</string>
+    <string name="ssl_unexpected_existing_expl">گواهی از آنی که مورد اطمینان تلفنتان است، تغییر کرده. این مورد بسیار نامعمول است. توصیه می شود این گواهی جدید را نپذیرید.</string>
+    <string name="ssl_cert_new_account_expl">اگر مدیر کارساز خبر از مورد انتظار بودنش داده، مطمئن شوید که اثر انگشت زیر با اثر انگشت ارائه شده به دستشان مطابق است.</string>
+    <string name="ssl_cert_not_trust">می‌تواند به این معنی باشد که کسی شدامدتان را بدخواهانه دستکاری کرده یا تلفنتان، به گواهی فراهم‌شده به دست کارساز دوردست، اطمینان ندارد.</string>
     <string name="room_unknown_devices_messages_notification">پیام به دلیل حضور یک دستگاه ناشناس ارسال نشد. %1$s یا %2$s؟</string>
     <string name="room_unsent_messages_notification">پیام ارسال نشد. %1$s یا %2$s؟</string>
     <string name="room_participants_unban_prompt_msg">با لغو مسدودیت، کاربر می‌تواند مجددا به اتاق اضافه شود.</string>
@@ -1602,14 +1602,14 @@
     <string name="permissions_rationale_msg_storage">المنت برای ارسال و ذخیره‌ی فایل‌ها نیاز به دسترسی به گالری شما را دارد.
 \n
 \nلطفا در پنجره‌ای که باز می‌شود این دسترسی را بدهید.</string>
-    <string name="settings_call_ringtone_use_default_stun_sum">هنگامی که سرور شما قابلیت تماس ندارد، از سرور %s استفاده کن</string>
-    <string name="settings_call_ringtone_use_default_stun">اجازه استفاده از سرور تماس پشتیبان</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">هنگامی که کارساز خانگیتان قابلیت تماس نداشته باشد، از %s استفاده خواهد شد (نشانی IPتان در طول تماس هم‌رسانی خواهد شد)</string>
+    <string name="settings_call_ringtone_use_default_stun">اجازه استفاده از کارساز تماس پشتیبان</string>
     <string name="login_error_ssl_peer_unverified">خطای SSL: هویت طرف مقابل تأیید نشد.</string>
-    <string name="call_failed_no_connection_description">اتصال برقرار نشد.
-\nلطفا از ادمین سرور بخواهید جهت برقراری مطمئن تماس‌ها، سرور turn را پیکربندی کند.</string>
-    <string name="call_failed_no_ice_description">لطفا از ادمین سرور (%1$s) بخواهید جهت برقراری مطمئن تماس‌ها، turn server را پیکربندی کند.
+    <string name="call_failed_no_connection_description">شکست در برقراری ارتباط همزمان.
+\nلطاً از مدیر کارساز بخواهید برای برقراری مطمئن تماس‌ها، کارساز turn را پیکربندی کند.</string>
+    <string name="call_failed_no_ice_description">لطفا از مدیر کارساز خانگیتان (%1$s) بخواهید برای برقراری مطمئن تماس‌ها، کارساز turn را پیکربندی کند.
 \n
-\nبه عنوان جایگزین می‌توانید از سرور عمومی %2$s استفاده کنید، اما این راه مطمئنی نیست چرا که آدرس IP شما در اختیار آن سرور قرار خواهد گرفت. برای مدیریت این بخش می‌توانید به تنظیمات مراجعه نمائید.</string>
+\nهمین‌طور می‌توانید از کارساز عمومی %2$s استفاده کنید، گرچه به همان اطمینان نبوده و نشانی IP شما را با آن کارساز هم‌رسانی خواهد کرد. همچنین می‌توانید این بخش را در تنظیمات مدیریت کنید.</string>
     <string name="secure_backup_reset_no_history">بعد از راه‌اندازی مجدد، هیچ تاریخچه، پیام، دستگاه تائید شده یا کاربر تائید شده‌ای در حساب شما وجود نخواهد داشت</string>
     <string name="secure_backup_reset_if_you_reset_all">اگر همه چیز را بازنشانی کنید</string>
     <string name="secure_backup_reset_all_no_other_devices">تنها در صورتی این کار را انجام دهید که از هیچ دستگاه دیگری نمی‌توانید این دستگاه را تائید نمائید.</string>
@@ -1654,7 +1654,7 @@
     <string name="bootstrap_crosssigning_progress_initializing">انتشار کلید‌های هویتی ایجاد شده</string>
     <string name="bootstrap_save_key_description">در صورتی که %2$s را فراموش کردید از %1$s به عنوان safety net استفاده کنید.</string>
     <string name="bootstrap_loading_text">این ممکن است چند ثانیه طول بکشد، لطفاً صبور باشید.</string>
-    <string name="bootstrap_info_text_2">یک کلید امنیتی وارد کنید. از این عبارت جهت ذخیره امن کلید‌ها در سمت سرور استفاده می‌شود.</string>
+    <string name="bootstrap_info_text_2">عبارت امنیتی‌ای را که فقط خودتان می‌دانید، وارد کنید. استفاده‌شده برای امن کردن رمزها روی کارسازتان.</string>
     <string name="bootstrap_dont_reuse_pwd">ترجیحا از گذرواژه حساب خود استفاده نکنید.</string>
     <string name="bootstrap_info_confirm_text">برای تایید، %s خود را دوباره وارد کنید.</string>
     <string name="bootstrap_info_text">افزایش امنیت و رمزگشایی پیام‌های رمزشده و اعتماد به %s.</string>
@@ -1694,7 +1694,7 @@
     <string name="verification_emoji_notice">شکلک‌ها را مقایسه کنید، از ترتیب نمایش آنان نیز مطمئن شوید.</string>
     <string name="verification_request_start_notice">بهتر است اینکار را به صورت حضوری و یا با استفاده از یک روش ارتباطی مطمئن انجام دهید.</string>
     <string name="verification_request_notice">برای امنیت بیشتر، %s را با بررسی یک کد یکبارمصرف تایید کنید.</string>
-    <string name="room_settings_enable_encryption_dialog_content">پس از فعال‌شدن ، نمی‌توان رمزگذاری برای یک اتاق را غیرفعال کرد. پیام های ارسالی در یک اتاق رمزگذاری شده توسط سرور قابل مشاهده نیست و فقط توسط اعضای اتاق قابل مشاهده است. فعال کردن رمزنگاری ممکن است از کارکرد بسیاری از ربات ها و پل ها جلوگیری کند.</string>
+    <string name="room_settings_enable_encryption_dialog_content">پس از به‌کار افتادن، نمی‌توان رمزگذاری اتاق را از کار انداخت. پیام‌های ارسالی در اتاقی رمزشده، به دست کارساز قابل مشاهده نبوده و فقط اعضای اتاق قادر به دیدنشان هستند. به‌کار انداختن رمزنگاری ممکن است از کارکرد درست بسیاری از روبات‌ها و پل‌ها جلوگیری کند.</string>
     <string name="room_settings_enable_encryption_dialog_title">رمزگذاری فعال شود؟</string>
     <string name="room_settings_enable_encryption">به کار انداختن رمزنگاری سرتاسری…</string>
     <string name="command_description_rainbow_emote">شکلک را با رنگ‌بندی رنگین گمان ارسال می کند</string>
@@ -1713,7 +1713,7 @@
     <string name="verification_green_shield">برای اطمینان از صحت هویت کاربران، به رنگ آیکون سپر آنان توجه کنید. رنگ سبز به معنای هویت تائید شده‌ی است. برای اطمینان از امنیت اتاق، همه کاربران آن اتاق را تائید کنید.</string>
     <string name="verify_user_sas_emoji_security_tip">برای امنیت بالا ، از یک روش ارتباطی امن دیگر استفاده کنید یا این کار را حضوری انجام دهید.</string>
     <string name="verify_user_sas_emoji_help_text">با تأیید شکلک‌های منحصر به فرد زیر در صفحه نمایش طرف مقابل به همان ترتیب، این کاربر را تأئید کنید.</string>
-    <string name="login_error_threepid_denied">دامنه ایمیل شما مجاز به ثبت نام در این سرور نیست</string>
+    <string name="login_error_threepid_denied">دامنهٔ رایانامه‌تان مجاز به ثبت‌نام روی این کارساز نیست</string>
     <string name="command_description_shrug">¯\\\\_(ツ)_/¯ را به یک پیام متنی ساده تغییر می دهد</string>
     <string name="permalink_malformed">لینک مشکل دارد</string>
     <string name="soft_logout_sso_not_same_user_error">نشست فعلی مربوط به کاربر %1$s است و شما اطلاعات حساب کاربر %2$s را ارائه داده‌اید. این مورد توسط المنت پشتیبانی نمی‌شود .
@@ -1733,10 +1733,10 @@
 \n• این نشست را در یکی از نشست دیگر خود حذف کرده‌اید.
 \n
 \n• ادمین سرور حساب شما را غیرفعال کرده‌است.</string>
-    <string name="autodiscover_well_known_error">سرور معتبر نیست. لطفا شناسه‌کاربری خود را بررسی کنید</string>
+    <string name="autodiscover_well_known_error">ناتوان در یافتن یک کارساز خانگی معتبر. لطفاً شناسه‌تان را بررسی کنید</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">این یک شناسه کاربری معتبر نیست. قالب صحیح: \\\'@user:homeserver.org\\\'</string>
     <string name="login_signin_matrix_id_password_notice">اگر گذرواژه خود را نمی‌دانید، برای تنظیم مجدد آن بازگردید.</string>
-    <string name="login_signin_matrix_id_notice">اگر یک حساب کاربری بر روی یک سرور دارید، از شناسه ماتریکس (به عنوان مثال @user:domain.com) و گذرواژه برای ورود استفاده کنید.</string>
+    <string name="login_signin_matrix_id_notice">اگر زوی یک کارساز خانگی خسابی برپا کرده‌اید، در پایین از شناسهٔ ماتریکس (مثلاً @user:domain.com) و گذرواژه‌تان استفاده کنید.</string>
     <string name="login_connect_using_matrix_id_notice">همچنین اگر قبلاً حساب کاربری داشته و از نام‌کاربری و گذرواژه خود اطلاع دارید، می توانید از این روش استفاده کنید:</string>
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">درخواست های زیادی ارسال شده است. می توانید در %1$d ثانیه دوباره امتحان کنید…</item>
@@ -1744,15 +1744,15 @@
     </plurals>
     <string name="login_error_outdated_homeserver_warning_content">این نسخه سرور بسیار قدیمی است. از ادمین خود بخواهید که آن را ارتقا دهد. البته شما می‌توانید ادامه دهید ، اما برخی از ویژگی ها ممکن است به درستی کار نکنند.</string>
     <string name="login_error_outdated_homeserver_content">این نسخه سرور بسیار قدیمی است. از ادمین خود بخواهید که آن را ارتقا دهد.</string>
-    <string name="login_error_outdated_homeserver_title">سرور به روز نشده</string>
+    <string name="login_error_outdated_homeserver_title">کارساز خانگی قدیمی</string>
     <string name="login_validation_code_is_not_correct">کد وارد شده صحیح نیست. لطفا بررسی فرمائید.</string>
     <string name="login_wait_for_email_notice">ما ایمیلی به %1$s ارسال کردیم.
 \nلطفاً برای ادامه فرآیند ایجاد حساب‌کاربری بر روی لینک موجود در آن کلیک کنید.</string>
     <string name="login_wait_for_email_title">لطفا ایمیل خود را بررسی کنید</string>
     <string name="login_terms_title">برای ادامه، شرایط را قبول کنید</string>
     <string name="login_a11y_captcha_container">لطفا کپچا را حل کنید</string>
-    <string name="login_a11y_choose_other">انتخاب سرور دلخواه</string>
-    <string name="login_a11y_choose_modular">انتخاب سرورهای المنت</string>
+    <string name="login_a11y_choose_other">گزینش یک کارساز خانگی سفارشی</string>
+    <string name="login_a11y_choose_modular">گزینش خدمات ماتریکس المنت</string>
     <string name="login_a11y_choose_matrix_org">انتخاب matrix.org</string>
     <string name="login_signup_cancel_confirmation_content">حساب شما هنوز ایجاد نشده‌است.
 \n
@@ -1766,7 +1766,7 @@
     <string name="login_reset_password_cancel_confirmation_content">گذرواژه شما هنوز تغییر نکرده‌است.
 \n
 \nفرآیند تغییر گذرواژه را متوقف می‌کنید؟</string>
-    <string name="login_reset_password_success_notice_2">شما از همه نشست‌ها خارج شده‌اید و دیگر اعلان‌ها را دریافت نخواهید کرد. برای فعال کردن مجدد اعلان‌ها، در دستگاه‌های خود وارد حسابتان شوید.</string>
+    <string name="login_reset_password_success_notice_2">از تمام نشست‌ها خارج شده و دیگر آگاهی‌ای دریافت نخواهید کرد. برای به کار انداختن دوبارهٔ آگاهی‌ها، روی هر دستگاهی، دوباره وارد شوید.</string>
     <string name="login_reset_password_mail_confirmation_submit">ایمیل را تایید کردم</string>
     <string name="login_reset_password_mail_confirmation_notice_2">برای تایید گذرواژه جدید لینک ارسالی را باز کرده، سپس روی متن زیر کلیک کنید.</string>
     <string name="login_reset_password_mail_confirmation_notice">یک ایمیل تائید به %1$s ارسال شد.</string>
@@ -1780,17 +1780,17 @@
     <string name="login_registration_not_supported">برنامه قادر به ایجاد حساب در این سرور نیست.
 \n
 \nآیا می خواهید با استفاده از مرورگر حساب کاربری بسازید؟</string>
-    <string name="login_registration_disabled">متأسفیم، این سرور حساب‌های جدید را نمی پذیرد.</string>
+    <string name="login_registration_disabled">متأسفانه این کارساز، حساب جدید نمی‌پذیرد.</string>
     <string name="login_mode_not_supported">برنامه نمی‌تواند به این سرور متصل شود. سرور از این مکانیزم‌(ها) برای ورود پشتیبانی می کند: %1$s.
 \n
 \nآیا می خواهید با استفاده از مرورگر وارد شوید؟</string>
     <string name="login_sso_error_message">هنگام بارگیری صفحه، خطایی روی داد: %1$s (%2$d)</string>
-    <string name="login_server_url_form_common_notice">آدرس سرور مورد نظر خود را وارد کنید</string>
-    <string name="login_server_url_form_other_notice">آدرس سروری را که می‌‌خواهید به آن متصل شوید، وارد کنید</string>
-    <string name="login_server_url_form_modular_notice">آدرس سروری را که می‌‌خواهید از آن استفاده کنید، وارد کنید</string>
-    <string name="login_server_matrix_org_text">به میلیون ها نفر در بزرگترین سرور عمومی بپیوندید</string>
+    <string name="login_server_url_form_common_notice">نشانی کارسازی که می‌خواهید استفاده کنید را وارد کنید</string>
+    <string name="login_server_url_form_other_notice">نشانی المنت یا کارسازی را که می‌‌خواهید به آن وصل شوید، وارد کنید</string>
+    <string name="login_server_url_form_modular_notice">نشانی کارساز یا المنت ماژولاری که می‌خواهید استفاده کنید را وارد کنید</string>
+    <string name="login_server_matrix_org_text">به میلیون‌ها نفر در بزرگ‌ترین کارساز عمومی بپیوندید</string>
     <string name="login_server_text">درست مانند ایمیل، حساب‌های کاربری یک خانه دارند؛ اگرچه می توانید با هر کسی که دوست دارید، صحبت کنید</string>
-    <string name="login_server_title">یک سرور انتخاب کنید</string>
+    <string name="login_server_title">کارسازی برگزینید</string>
     <string name="login_splash_submit">شروع کنید</string>
     <string name="login_splash_text3">تجارب خود را گسترش داده و شخصی‌سازی کنید</string>
     <string name="login_splash_text2">گفتگوهای خصوصی خود را با رمزگذاری محافظت کنید</string>
@@ -1851,10 +1851,10 @@
     <string name="settings_text_message_sent_hint">کد</string>
     <string name="settings_text_message_sent">پیامکی به %s ارسال شده است. لطفاً کد تأیید موجود در آن را وارد کنید.</string>
     <string name="settings_discovery_no_terms">سرور هویت‌سنجی‌ای که انتخاب کرده‌اید هیچگونه شرایط و ضوابطی ندارد. فقط اگر به صاحب سرویس اعتماد دارید ادامه دهید</string>
-    <string name="settings_discovery_no_terms_title">سرور هویت‌سنجی شرایط و ضوابط استفاده ندارد</string>
-    <string name="settings_discovery_please_enter_server">آدرس سرور هویت‌سنجی را وارد کنید</string>
-    <string name="settings_discovery_bad_identity_server">اتصال به سرور هویت‌سنجی امکان پذیر نیست</string>
-    <string name="settings_discovery_enter_identity_server">آدرس سرور هویت‌سنجی را وارد کنید</string>
+    <string name="settings_discovery_no_terms_title">کارساز هویت، شرایط و ضوابط استفاده ندارد</string>
+    <string name="settings_discovery_please_enter_server">لطفاً نشانی کارساز هویت را وارد کنید</string>
+    <string name="settings_discovery_bad_identity_server">نتوانست به کارساز هویت وصل شود</string>
+    <string name="settings_discovery_enter_identity_server">یک نشانی کارساز هویت وارد کنید</string>
     <string name="settings_discovery_confirm_mail_not_clicked">ما یک ایمیل تأیید به %s ارسال کردیم، ابتدا ایمیل خود را بررسی کرده و روی لینک تأیید کلیک کنید</string>
     <string name="settings_discovery_confirm_mail">ما یک ایمیل تأیید به %s ارسال کردیم، ایمیل خود را بررسی کرده و روی لینک تأیید کلیک کنید</string>
     <string name="settings_discovery_disconnect_identity_server_info">قطع ارتباط با سرور هویت‌سنجی به این معنی است که توسط کاربران دیگر قابل شناسایی نخواهید بود و نمی توانید دیگران را از طریق ایمیل یا تلفن دعوت کنید.</string>
@@ -2011,7 +2011,7 @@
     <string name="passphrase_enter_passphrase">ورود عبارت عبور</string>
     <string name="passphrase_confirm_passphrase">تأیید عبارت عبور</string>
     <string name="passphrase_create_passphrase">ایجاد عبارت عبور</string>
-    <string name="no_valid_google_play_services_apk">APK معتبر Google Play Services پیدا نشد. اعلان‌ها ممکن است به درستی کار نکنند.</string>
+    <string name="no_valid_google_play_services_apk">بستهٔ اندرویدی معتبر خدمات پلی گوگل پیدا نشد. ممکن است آگاهی‌ها درست کار نکنند.</string>
     <string name="x_plus">%d+</string>
     <string name="plus_x">+%d</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
@@ -2038,7 +2038,7 @@
 \nغیرفعال کردن حساب شما <b> به طور پیش فرض باعث نمی شود پیام های ارسالی شما را حذف کنیم </b>. اگر می خواهید پیام های شما را فراموش کنیم ، لطفاً کادر زیر را علامت بزنید.
 \n
 \nقابلیت مشاهده پیام در المنت مانند ایمیل است. حذف کردن پیام‌های شما به این معنی است که پیام‌هایی که ارسال کرده‌اید به هیچ کاربر جدید یا ثبت نشده‌ای نمایش داده نمی شود، اما کاربران ثبت‌نام شده که از قبل به این پیام ها دسترسی داشتند همچنان به نسخه خود دسترسی خواهند داشت.</string>
-    <string name="dialog_user_consent_content">برای ادامه استفاده از سرور %1$s باید شرایط و ضوابط را خوانده و موافقت کنید.</string>
+    <string name="dialog_user_consent_content">برای ادامهٔ استفاده از کارساز خانگی %1$s باید شرایط و ضوابط را خوانده و بپذیرید.</string>
     <string name="markdown_has_been_disabled">Markdown غیرفعال شده است.</string>
     <string name="markdown_has_been_enabled">Markdown فعال شده است.</string>
     <string name="command_description_clear_scalar_token">جهت رفع مشکلات مدیریت برنامه‌های ماتریکس</string>
@@ -2141,7 +2141,7 @@
     <string name="devices_details_device_name">به‌روزرسانی نام عمومی</string>
     <string name="devices_details_id_title">شناسه</string>
     <string name="devices_details_dialog_title">اطلاعات دستگاه</string>
-    <string name="settings_data_save_mode_summary">حالت صرفه‌جویی داده یک فیلتر خاص را اعمال می کند، که در نتیجه‌ی آن به‌روزرسانی‌های وضعیت آنلاین بودن و اعلان‌های تایپ فیلتر می شوند.</string>
+    <string name="settings_data_save_mode_summary">حالت صرفه‌جویی داده، پالایهٔ خاصی را اعمال می‌کند که در نتیجهٔ آن، به‌روزرسانی‌های حضور و آگاهی‌های نوشتن، پالوده می‌شوند.</string>
     <string name="settings_data_save_mode">حالت صرفه‌جویی در مصرف دیتا</string>
     <string name="settings_opt_in_of_analytics_ok">بله ، من می خواهم کمک کنم!</string>
     <string name="settings_opt_in_of_analytics_prompt">لطفاً برای کمک به ما در بهبود المنت، ارسال ناشناس تجزیه و تحلیل را فعال کنید.</string>

From d1e59abcf07a3ab0f79f294b6a93ca697ec539a1 Mon Sep 17 00:00:00 2001
From: Hivaa <hivaa@hivaa.im>
Date: Mon, 1 Mar 2021 14:43:17 +0000
Subject: [PATCH 158/578] Translated using Weblate (Persian)

Currently translated at 99.9% (2080 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
---
 vector/src/main/res/values-fa/strings.xml | 36 +++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 5185b9a278..e852025e89 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -944,7 +944,7 @@
     <string name="room_widget_permission_user_id">شناسهٔ کاربریتان</string>
     <string name="room_widget_permission_widget_id">شناسهٔ ابزارک</string>
     <string name="room_widget_permission_room_id">شناسهٔ اتاق</string>
-    <string name="error_jitsi_not_supported_on_old_device">متأسّفانه تماس‌های کنفرانسی با جیتسی روی افزاره‌های قدیمی (افزاره‌هایی با سیستم‌عامل اندروید زیر ۵) پشتیبانی نمی‌شود</string>
+    <string name="error_jitsi_not_supported_on_old_device">متأسّفانه تماس‌های کنفرانسی با جیتسی روی دستگاه‌های قدیمی (دستگاه‌هایی با سیستم‌عامل اندروید زیر ۶) پشتیبانی نمی‌شود</string>
     <string name="room_widget_resource_permission_title">این ابزارک می‌خواهد از منابع زیر استفاده کند:</string>
     <string name="room_widget_resource_grant_permission">اجازه</string>
     <string name="room_widget_resource_decline_permission">انسداد همه</string>
@@ -1215,7 +1215,7 @@
     <string name="settings_hs_admin_e2e_disabled">مدیر کارسازتان رمزنگاری سرتاسری پیش‌گزیده را در اتاق‌های خصوصی و پیام‌های مستقیم از کار انداخته است.</string>
     <string name="settings_active_sessions_signout_device">خروج از این نشست</string>
     <string name="crosssigning_verify_this_session">تأیید این ورود</string>
-    <string name="crosssigning_other_user_not_trust">ممکن است دیگر کاربران، به آن اعتماد نکنند</string>
+    <string name="crosssigning_other_user_not_trust">شما در حال حاضر در این تماس هستید</string>
     <string name="complete_security">تکمیل امنیت</string>
     <string name="verification_open_other_to_verify">استفاده از نشستی موجود برای تأییدش که به پیام‌های رمزشده دسترسی می‌دهد.</string>
     <string name="verification_profile_verify">تأیید</string>
@@ -2315,4 +2315,36 @@
     <string name="command_snow">فرستادن پیام داده با برف</string>
     <string name="default_message_emote_confetti">فرستادن کاغذ رنگی 🎉</string>
     <string name="default_message_emote_snow">فرستادن برف ❄️</string>
+    <string name="authentication_error">احراز هویت انجام نشد</string>
+    <string name="re_authentication_default_confirm_text">المنت برای انجام این عمل نیاز دارد که گذواژه‌ی خود را وارد کنید.</string>
+    <string name="re_authentication_activity_title">احراز هویت مجدد مورد نیاز است</string>
+    <string name="call_transfer_users_tab_title">کاربران</string>
+    <string name="call_transfer_failure">هنگام انتقال تماس خطایی روی داد</string>
+    <string name="call_transfer_title">انتقال</string>
+    <string name="call_transfer_connect_action">متصل شوید</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">۱ تماس فعال (%1$s) . ۱ تماس متوقف شده</item>
+        <item quantity="other">۱ تماس فعال (%1$s) . %2$d تماس متوقف شده</item>
+    </plurals>
+    <plurals name="call_only_paused">
+        <item quantity="one">تماس متوقف شده</item>
+        <item quantity="other">%1$d تماس متوقف شده</item>
+    </plurals>
+    <string name="call_only_active">تماس فعال (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">هنگام جستجوی شماره تلفن خطایی روی داد</string>
+    <string name="call_dial_pad_title">‬پد شماره گیری</string>
+    <string name="call_tile_call_back">تماس بگیرید</string>
+    <string name="call_tile_ended">این تماس پایان یافته است</string>
+    <string name="call_tile_other_declined">%1$s تماس را رد کرد</string>
+    <string name="call_tile_you_declined">شما این تماس را رد کردید %1$s</string>
+    <string name="call_tile_in_call">شما در حال حاضر در این تماس هستید</string>
+    <string name="failed_to_initialize_cross_signing">خطا در تنظیم امضای متقابل</string>
+    <string name="call_tile_other_started_call">%1$s یک تماس را شروع کرد</string>
+    <string name="call_tile_you_started_call">شما یک تماس را شروع کردید</string>
+    <string name="call_held_by_you">شما تماس را در حالت انتظار قرار داده‌اید</string>
+    <string name="call_held_by_user">%s تماس را در حالت انتظار قرار داده‌است</string>
+    <string name="call_hold_action">حالت انتظار</string>
+    <string name="call_resume_action">از سرگیری</string>
+    <string name="error_unauthorized">غیر مجاز، اطلاعات هویت‌سنجی موجود نمی‌باشد</string>
+    <string name="action_return">بازگشت</string>
 </resources>
\ No newline at end of file

From f5baa8ac914a4ebd8751a71066773254ad1ebcbd Mon Sep 17 00:00:00 2001
From: Niels Bouma <niels.bouma@outlook.com>
Date: Wed, 3 Mar 2021 09:00:23 +0000
Subject: [PATCH 159/578] Translated using Weblate (Dutch)

Currently translated at 54.0% (1124 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
---
 vector/src/main/res/values-nl/strings.xml | 49 +++++++++++------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index d15f7870a4..76bf7e6e80 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -79,7 +79,7 @@
     <string name="no_room_placeholder">Geen gesprekken</string>
     <string name="no_public_room_placeholder">Geen publieke gesprekken beschikbaar</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">1 gebruiker</item>
+        <item quantity="one">%d gebruiker</item>
         <item quantity="other">%d gebruikers</item>
     </plurals>
     <string name="send_bug_report_include_logs">Logboek versturen</string>
@@ -225,8 +225,7 @@
     <string name="permissions_rationale_msg_camera_and_audio">Element heeft toegang nodig tot uw camera en microfoon om video-oproepen te maken.
 \n
 \nVerleen toegang op de volgende pop-ups om de oproep te maken.</string>
-    <string name="permissions_rationale_msg_contacts">Element kan uw adresboek benaderen om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers.
-\nAls u het goed vindt om uw adresboek hiervoor te delen, verleen dan toegang op de volgende pop-up.</string>
+    <string name="permissions_rationale_msg_contacts">Element kan uw adresboek benaderen om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers. Als u het goed vindt om uw adresboek hiervoor te delen, verleen dan toegang op de volgende pop-up.</string>
     <string name="permissions_msg_contacts_warning_other_androids">Element kan uw adresboek gebruiken om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers.
 \n 
 \nWilt u uw adresboek hiervoor delen\?</string>
@@ -526,7 +525,7 @@
     <string name="encryption_information_sender_device_information">Informatie over sessie van afzender</string>
     <string name="encryption_information_device_name">Publieke naam</string>
     <string name="encryption_information_name">Publieke naam</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="encryption_information_device_id">Sessie ID</string>
     <string name="encryption_information_device_key">Sessiesleutel</string>
     <string name="encryption_information_verification">Verificatie</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519-vingerafdruk</string>
@@ -660,27 +659,27 @@
     <string name="start_video_call_prompt_msg">Weet u zeker dat u een video-oproep wilt beginnen\?</string>
     <string name="groups_list">Groepenlijst</string>
     <plurals name="membership_changes">
-        <item quantity="one">1 verandering in lidmaatschap</item>
+        <item quantity="one">%d verandering in lidmaatschap</item>
         <item quantity="other">%d veranderingen in lidmaatschap</item>
     </plurals>
     <string name="list_members">Ledenlijst</string>
     <string name="open_chat_header">Opschrift openen</string>
     <string name="room_sync_in_progress">Synchroniseren…</string>
     <plurals name="room_header_active_members_count">
-        <item quantity="one">1 actieve deelnemer</item>
+        <item quantity="one">%d actieve deelnemer</item>
         <item quantity="other">%d actieve deelnemers</item>
     </plurals>
     <plurals name="room_title_members">
-        <item quantity="one">1 deelnemer</item>
+        <item quantity="one">%d deelnemer</item>
         <item quantity="other">%d deelnemers</item>
     </plurals>
     <string name="room_participants_ban_prompt_msg">Weet u zeker dat u deze gebruiker uit dit gesprek wilt verbannen\?</string>
     <plurals name="room_new_messages_notification">
-        <item quantity="one">1 nieuw bericht</item>
+        <item quantity="one">%d nieuw bericht</item>
         <item quantity="other">%d nieuwe berichten</item>
     </plurals>
     <plurals name="directory_search_rooms">
-        <item quantity="one">1 gesprek</item>
+        <item quantity="one">%d gesprek</item>
         <item quantity="other">%d gesprekken</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
@@ -701,16 +700,16 @@
     <string name="room_settings_invalid_group_format_dialog_title">Ongeldige gemeenschaps-ID</string>
     <string name="room_settings_invalid_group_format_dialog_body">‘%s’ is geen geldige gemeenschaps-ID</string>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="one">1 ongelezen bericht waarin u vermeld staat</item>
+        <item quantity="one">%d ongelezen bericht waarin u vermeld staat</item>
         <item quantity="other">%d ongelezen berichten waarin u vermeld staat</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
-        <item quantity="one">1 gesprek</item>
+        <item quantity="one">%d gesprek</item>
         <item quantity="other">%d gesprekken</item>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s in %2$s</string>
     <plurals name="active_widgets">
-        <item quantity="one">1 actieve widget</item>
+        <item quantity="one">%d actieve widget</item>
         <item quantity="other">%d actieve widgets</item>
     </plurals>
     <!-- Widget Integration Manager -->
@@ -739,7 +738,7 @@
     <string name="receipt_avatar">Ontvangst-avatar</string>
     <string name="avatar">Avatar</string>
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">1 ongelezen bericht waarin u vermeld bent</item>
+        <item quantity="one">%d ongelezen bericht waarin u vermeld bent</item>
         <item quantity="other">%d ongelezen berichten waarin u vermeld bent</item>
     </plurals>
     <string name="notice_avatar">Vermeldingsavatar</string>
@@ -819,19 +818,19 @@
     <string name="missing_permissions_error">Deze actie is niet mogelijk wegens ontbrekende rechten.</string>
     <string name="system_alerts_header">Systeemmeldingen</string>
     <plurals name="format_time_s">
-        <item quantity="one">1s</item>
+        <item quantity="one">%ds</item>
         <item quantity="other">%ds</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">1m</item>
+        <item quantity="one">%dm</item>
         <item quantity="other">%dm</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">1u</item>
+        <item quantity="one">%du</item>
         <item quantity="other">%du</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="one">1d</item>
+        <item quantity="one">%dd</item>
         <item quantity="other">%dd</item>
     </plurals>
     <string name="room_participants_now">nu %1$s</string>
@@ -840,16 +839,16 @@
     <string name="room_participants_invite_join_names_and">%1$s en %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
     <plurals name="room_details_selected">
-        <item quantity="one">1 geselecteerd</item>
+        <item quantity="one">%d geselecteerd</item>
         <item quantity="other">%d geselecteerd</item>
     </plurals>
     <string name="command_description_clear_scalar_token">Om Matrix-appbeheer te herstellen</string>
     <plurals name="group_members">
-        <item quantity="one">1 deelnemer</item>
+        <item quantity="one">%d deelnemer</item>
         <item quantity="other">%d deelnemers</item>
     </plurals>
     <plurals name="group_rooms">
-        <item quantity="one">1 gesprek</item>
+        <item quantity="one">%d gesprek</item>
         <item quantity="other">%d gesprekken</item>
     </plurals>
     <string name="resource_limit_exceeded_title">Bronlimiet overschreden</string>
@@ -1011,7 +1010,7 @@
     <string name="encryption_message_recovery">Herstel van versleutelde berichten</string>
     <string name="encryption_settings_manage_message_recovery_summary">Sleutelback-up beheren</string>
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="one">%1$s: 1 bericht</item>
+        <item quantity="one">%1$s: %2$d bericht</item>
         <item quantity="other">%1$s: %2$d berichten</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
@@ -1137,7 +1136,7 @@
     <string name="new_recovery_method_popup_title">Nieuwe sleutelback-up</string>
     <string name="new_recovery_method_popup_description">Er is een nieuwe sleutelback-up voor versleutelde berichten gedetecteerd.
 \n
-\nAls u deze nieuwe herstelmethode niet heeft ingesteld, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel een nieuwe herstelmethode in in de instellingen.</string>
+\nAls u deze nieuwe herstelmethode niet heeft ingesteld, is het mogelijk dat er een aanvaller toegang tot uw account probeert te verkrijgen. Wijzig onmiddellijk uw accountwachtwoord en stel in de instellingen een nieuwe herstelmethode in.</string>
     <string name="new_recovery_method_popup_was_me">Ik was het</string>
     <string name="keys_backup_banner_setup_line1">Verlies nooit uw versleutelde berichten</string>
     <string name="keys_backup_banner_setup_line2">Begin sleutelback-up te gebruiken</string>
@@ -1233,7 +1232,7 @@
     <string name="invite_no_identity_server_error">Voeg een identiteitsserver toe in de instellingen om dit te doen.</string>
     <string name="settings_add_3pid_confirm_password_title">Bevestig uw wachtwoord</string>
     <string name="settings_add_3pid_flow_not_supported">U kunt dit niet doen vanaf de mobiele Element</string>
-    <string name="settings_background_fdroid_sync_mode">Synchroniseren op de achtergrond (experimenteel)</string>
+    <string name="settings_background_fdroid_sync_mode">Synchroniseren op de achtergrond</string>
     <string name="settings_background_fdroid_sync_mode_battery">Geoptimaliseerd voor batterij</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">Element zal op een batterijzuinige manier synchroniseren op de achtergrond.
 \nAfhankelijk van de staat van uw apparaat kan het besturingssysteem de synchronisatie uitstellen.</string>
@@ -1301,9 +1300,9 @@
     <string name="room_list_catchup_welcome_title">Welkom thuis!</string>
     <string name="room_list_catchup_welcome_body">Ongelezen berichten inhalen</string>
     <string name="room_list_people_empty_title">Gesprekken</string>
-    <string name="room_list_people_empty_body">Je directe gesprekken zullen hier worden weergegeven</string>
+    <string name="room_list_people_empty_body">Je directe gesprekken zullen hier worden weergegeven. Gebruik de + knop om een gesprek te starten.</string>
     <string name="room_list_rooms_empty_title">Kamers</string>
-    <string name="room_list_rooms_empty_body">Je kamers zullen hier worden weergegeven</string>
+    <string name="room_list_rooms_empty_body">Je kamers zullen hier worden weergegeven. Gebruik de + knop rechtsonder om een bestaande kamer te openen of een nieuwe aan te maken.</string>
     <string name="title_activity_emoji_reaction_picker">Reacties</string>
     <string name="reactions_agree">Bevestigen</string>
     <string name="reactions_like">Leuk vinden</string>

From 5e0ba452aa56cf494563c224ead87925e3063359 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 2 Mar 2021 01:01:48 +0000
Subject: [PATCH 160/578] Translated using Weblate (Ukrainian)

Currently translated at 61.7% (1285 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
---
 vector/src/main/res/values-uk/strings.xml | 59 +++++++++++++++++++++--
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index ac06e1ed0a..34dd2b1462 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -57,7 +57,7 @@
     <string name="action_quick_reply">Швидка відповідь</string>
     <string name="action_open">Відкрити</string>
     <string name="action_close">Закрити</string>
-    <string name="copied_to_clipboard">Скопійовано у сховок</string>
+    <string name="copied_to_clipboard">Скопійовано до буфера обміну</string>
     <string name="disable">Вимкнути</string>
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Підтвердження</string>
@@ -504,8 +504,8 @@
     <string name="room_settings_addresses_pref_title">Адреси</string>
     <string name="room_settings_labs_pref_title">Експериментальні</string>
     <string name="room_settings_labs_warning_message">Це експериментальні функції, що можуть несподівано ламатись. Використовуйте з обережністю.</string>
-    <string name="room_settings_labs_end_to_end">Наскрізне Шифрування</string>
-    <string name="room_settings_labs_end_to_end_is_active">Наскрізне Шифрування увімкнено</string>
+    <string name="room_settings_labs_end_to_end">Наскрізне шифрування</string>
+    <string name="room_settings_labs_end_to_end_is_active">Наскрізне шифрування увімкнено</string>
     <string name="room_settings_labs_end_to_end_warnings">Вийдіть з облікового запису, щоб отримати змогу увімкнути шифрування.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Шифрувати лише до перевірених пристроїв</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Ніколи не надсилати шифровані повідомлення з цього пристрою неперевіреним пристроям у цій кімнаті.</string>
@@ -1340,7 +1340,7 @@
     <string name="settings_secure_backup_section_title">Безпечне резервне копіювання</string>
     <string name="settings_show_room_member_state_events_summary">Включає події запрошення/приєднання/виходу/видалення/заборони та зміни зображень профілю/видимих імен.</string>
     <string name="settings_show_room_member_state_events">Показати стан подій учасників кімнати</string>
-    <string name="settings_cryptography_manage_keys">Управління ключами криптографії</string>
+    <string name="settings_cryptography_manage_keys">Керування криптографічними ключами</string>
     <string name="settings_integrations_summary">Використовуйте Менеджер інтеграції для керування ботами, мостами, віджетами та пакетами наклейок.
 \nМенеджери інтеграції отримують дані конфігурації та можуть змінювати віджети, надсилати запрошення до кімнати та надавати права від вашого імені.</string>
     <string name="settings_integrations">Інтеграції</string>
@@ -1480,4 +1480,55 @@
     <string name="login_server_url_form_other_hint">Адреса</string>
     <string name="keys_backup_setup_skip_msg">Ви можете втратити доступ до своїх повідомлень, якщо вийдете з облікового запису або загубите цей пристрій.</string>
     <string name="keys_backup_setup_skip_title">Ви впевнені\?</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Увімкніть біометричні дані для певного пристрою, такі як відбитки пальців та розпізнавання обличчя.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Увімкнути біометрію</string>
+    <string name="create_pin_title">Виберіть PIN-код для безпеки</string>
+    <string name="create_pin_confirm_title">Підтвердьте PIN-код</string>
+    <string name="create_pin_confirm_failure">Не вдалося підтвердити PIN-код, торкніться нового.</string>
+    <string name="auth_pin_title">Введіть свій PIN-код</string>
+    <string name="auth_pin_forgot">Забули PIN-код\?</string>
+    <string name="auth_pin_reset_title">Відновити PIN-код</string>
+    <string name="auth_pin_new_pin_action">Новий PIN-код</string>
+    <string name="auth_pin_reset_content">Щоб відновити PIN-код, потрібно буде повторно ввійти в систему та створити новий.</string>
+    <string name="settings_security_pin_code_title">Увімкнути PIN-код</string>
+    <string name="settings_security_pin_code_summary">Якщо хочете відновити PIN-код, торкніться «Забули PIN-код», щоб вийти та відновити.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-код — єдиний спосіб розблокувати Element.</string>
+    <string name="settings_security_pin_code_grace_period_title">Вимагати PIN-код через 2 хвилини</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">PIN-код вимагається після 2 хвилин не використання Element.</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">PIN-код потрібно вводити за кожного відкриття Element.</string>
+    <string name="settings_security_pin_code_change_pin_title">Змінити PIN-код</string>
+    <string name="settings_security_pin_code_change_pin_summary">Зміна поточного PIN-коду</string>
+    <string name="auth_pin_confirm_to_disable_title">Підтвердьте PIN-код, щоб вимкнути його</string>
+    <string name="settings_security_application_protection_screen_title">Налаштування захисту</string>
+    <string name="settings_security_application_protection_summary">Захистіть доступ PIN-кодом та біометричними даними.</string>
+    <string name="settings_security_application_protection_title">Захист доступу</string>
+    <string name="settings_active_sessions_verified_device_desc">Цей сеанс довірений для безпечного обміну повідомленнями, оскільки ви його підтвердили:</string>
+    <plurals name="settings_active_sessions_count">
+        <item quantity="one">%d активний сеанс</item>
+        <item quantity="few">%d активні сеанси</item>
+        <item quantity="many">%d активних сеансів</item>
+        <item quantity="other">%d активних сеансів</item>
+    </plurals>
+    <string name="settings_active_sessions_list">Активні сеанси</string>
+    <string name="settings_show_devices_list">Переглянути всі сеанси</string>
+    <string name="settings_active_sessions_show_all">Показати всі сеанси</string>
+    <string name="authentication_error">Помилка автентифікації</string>
+    <string name="re_authentication_activity_title">Потрібна повторна автентифікація</string>
+    <string name="re_authentication_default_confirm_text">Для виконання цієї дії Element вимагає ввести свої облікові дані.</string>
+    <string name="verify_cancel_self_verification_from_trusted">Якщо скасувати, ви не зможете читати зашифровані повідомлення на новому пристрої, а інші користувачі не довірятимуть йому</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Якщо скасувати, ви не зможете читати зашифровані повідомлення на цьому пристрої, а інші користувачі довірятимуть йому</string>
+    <string name="settings_active_sessions_manage">Керування сеансами</string>
+    <string name="please_wait">Просимо зачекати…</string>
+    <string name="crosssigning_verify_session">Перевірка входу</string>
+    <string name="settings_active_sessions_signout_device">Вийти з цього сеансу</string>
+    <string name="verify_new_session_was_not_me">Це був не я</string>
+    <string name="room_profile_not_encrypted_subtitle">Повідомлення в цій кімнаті не захищено наскрізним шифруванням.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Повідомлення тут не захищено наскрізним шифруванням.</string>
+    <string name="room_settings_enable_encryption">Увімкнути наскрізне шифрування…</string>
+    <string name="direct_room_encryption_enabled_tile_description">Повідомлення в цій кімнаті наскрізно зашифровані.</string>
+    <string name="verification_verify_device">Перевірити цей сеанс</string>
+    <string name="sas_decimal_description">Перевірте цей сеанс, підтвердивши, що на екрані партнера з’являються такі цифри</string>
+    <string name="sas_emoji_description">Перевірте цей сеанс, підтвердивши, що на екрані партнера з’являються ці емоджі</string>
+    <string name="sas_incoming_request_description">Перевірте цей сеанс, щоб позначити його надійним. Довірені сеанси партнерів дають вам додаткову впевненість під час використання наскрізно зашифрованих повідомлень.</string>
+    <string name="settings_active_sessions_unverified_device_desc">Перевірте цей сеанс, щоб позначити його надійним та надати йому доступ до зашифрованих повідомлень. Якщо ви не входили в цей сеанс, ваш обліковий запис може бути зламано:</string>
 </resources>
\ No newline at end of file

From c79e81347914efa9c5e2500c50c5fe9e88a8f83c Mon Sep 17 00:00:00 2001
From: vachan-maker <revsamtp@hotmail.com>
Date: Mon, 1 Mar 2021 06:51:23 +0000
Subject: [PATCH 161/578] Translated using Weblate (Malayalam)

Currently translated at 18.8% (393 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 867f91d586..7a85a8906f 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -363,4 +363,54 @@
     <string name="home_filter_placeholder_people">ആളുകളെ ഫിൽറ്റർ</string>
     <string name="keys_backup_activate">കീ ബാക്കപ്പ് ഉപയൊഗിക്കുക</string>
     <string name="keys_backup_is_not_finished_please_wait">കീ ബാക്കപ്പ് പൂർത്തിയായിട്ടില്ല, കാത്തിരിക്കൂ…</string>
+    <string name="settings_phone_numbers">ഫോൺ നമ്പറുകൾ</string>
+    <string name="settings_emails">ഈമെയിൽ വിലാസം</string>
+    <string name="settings_app_info_link_title">അപ്ലിക്കേഷൻ വിവരം</string>
+    <string name="settings_add_phone_number">ഫോൺ നമ്പർ ചേർക്കുക</string>
+    <string name="settings_phone_number">ഫോൺ</string>
+    <string name="settings_add_email_address">ഈ - മെയിൽ വിലാസം ചേർക്കുക</string>
+    <string name="settings_email_address">ഈ - മെയിൽ</string>
+    <string name="settings_display_name">പ്രദർശന നാമം</string>
+    <string name="settings_profile_picture">പ്രൊഫൈൽ ചിത്രം</string>
+    <string name="room_sliding_menu_privacy_policy">സ്വകാര്യതാ നയം</string>
+    <string name="room_sliding_menu_third_party_notices">മൂന്നാം കക്ഷി അറിയിപ്പുകൾ</string>
+    <string name="room_sliding_menu_term_and_conditions">നിബന്ധനകളും വ്യവസ്ഥകളും</string>
+    <string name="room_sliding_menu_version_x">പതിപ്പ് %s</string>
+    <string name="room_sliding_menu_version">പതിപ്പ്</string>
+    <string name="room_settings_mention_only">സൂചനകൾ മാത്രം</string>
+    <string name="room_settings_all_messages">എല്ലാ സന്ദേശങ്ങളും</string>
+    <plurals name="directory_search_rooms">
+        <item quantity="one">%d മുറി</item>
+        <item quantity="other">%d മുറികൾ</item>
+    </plurals>
+    <string name="room_recents_join_room_title">ഒരു മുറിയിൽ ചേരുക</string>
+    <string name="room_recents_join_room">മുറിയിൽ ചേരുക</string>
+    <string name="room_recents_create_room">മുറി സൃഷ്ടിക്കൂ</string>
+    <string name="room_recents_start_chat">ചാറ്റ് ആരംഭിക്കുക</string>
+    <string name="search_no_results">ഫലങ്ങളൊന്നുമില്ല</string>
+    <string name="room_details_title">മുറി വിശദാംശങ്ങൾ</string>
+    <string name="room_permissions_change_topic">വിഷയം മാറ്റുക</string>
+    <string name="room_permissions_change_room_name">മുറിയുടെ പേര് മാറ്റുക</string>
+    <string name="room_permissions_notify_everyone">എല്ലാവരേയും അറിയിക്കുക</string>
+    <string name="room_permissions_ban_users">ഉപയോക്താക്കളെ നിരോധിക്കുക</string>
+    <string name="room_permissions_kick_users">ഉപയോക്താക്കളെ പുറത്താക്കുക</string>
+    <string name="room_permissions_change_settings">ക്രമീകരണങ്ങൾ മാറ്റുക</string>
+    <string name="room_permissions_invite_users">ഉപയോക്താക്കളെ ക്ഷണിക്കുക</string>
+    <string name="room_permissions_send_messages">സന്ദേശങ്ങൾ അയയ്ക്കൂ</string>
+    <string name="room_settings_permissions_title">മുറിയുടെ അനുമതികൾ</string>
+    <string name="ssl_trust">വിശ്വസിക്കുക</string>
+    <string name="room_message_file_not_found">ഫയൽ കണ്ടെത്തിയില്ല</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">ഒരു മറുപടി അയയ്‌ക്കുക(എൻ‌ക്രിപ്റ്റ് ചെയ്യാത്ത)…</string>
+    <string name="room_participants_ban_reason">നിരോനിരോധിക്കാനുള്ള കാരണം</string>
+    <string name="room_participants_ban_title">ഉപയോക്താവിനെ നിരോധിക്കുക</string>
+    <string name="room_participants_kick_reason">പുറത്താക്കാനുള്ള കാരണം</string>
+    <string name="room_participants_kick_title">ഉപയോക്താവിനെ പുറത്താക്കുക</string>
+    <string name="room_participants_action_ignore">അവഗണിക്കൂ</string>
+    <string name="room_participants_action_ignore_title">ഉപയോക്താവിനെ അവഗണിക്കുക</string>
+    <string name="room_participants_power_level_demote">തരംതാഴ്ത്തുക</string>
+    <string name="room_participants_power_level_demote_warning_title">സ്വയം തരംതാഴ്ത്തണോ\?</string>
+    <string name="room_participants_action_devices_list">സെഷൻ പട്ടിക കാണിക്കുക</string>
+    <string name="ssl_logout_account">പുറത്തിറങ്ങുക</string>
+    <string name="logout">പുറത്തിറങ്ങുക</string>
+    <string name="title_activity_keys_backup_restore">കീ ബാക്കപ്പ് ഉപയൊഗിക്കൂ</string>
 </resources>
\ No newline at end of file

From b899753d0747f7371c59f894f199e54ab19064e6 Mon Sep 17 00:00:00 2001
From: sx0d <sxxx0d@gmail.com>
Date: Tue, 2 Mar 2021 15:31:27 +0000
Subject: [PATCH 162/578] Translated using Weblate (Uzbek)

Currently translated at 4.9% (104 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uz/
---
 vector/src/main/res/values-uz/strings.xml | 112 +++++++++++++++++++++-
 1 file changed, 111 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-uz/strings.xml b/vector/src/main/res/values-uz/strings.xml
index a6b3daec93..1205d099e5 100644
--- a/vector/src/main/res/values-uz/strings.xml
+++ b/vector/src/main/res/values-uz/strings.xml
@@ -1,2 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="call_notification_answer">Koʻtarish</string>
+    <string name="decline">Rad etish</string>
+    <string name="review">Koʻrib chiqish</string>
+    <string name="ignore">Eʼtiborsiz qoldirish</string>
+    <string name="abort">Tugatish</string>
+    <string name="done">Bajarildi</string>
+    <string name="skip">O\'tkazib yuborish</string>
+    <string name="accept">Qabul qilish</string>
+    <string name="invite">Taklif qilish</string>
+    <string name="or">yoki</string>
+    <string name="send_anyway">Baribir joʻnatish</string>
+    <string name="call_anyway">Baribir qo\'ng\'iroq qilish</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">Shifrlangan xonalarda konferents-qo\'ng\'iroqlar qo\'llab-quvvatlanmaydi</string>
+    <string name="cannot_call_yourself_with_invite">Siz o\'zingiz bilan qo\'ng\'iroq qila olmaysiz, ishtirokchilar taklifnomani qabul qilishini kuting</string>
+    <string name="cannot_call_yourself">Siz o\'zingiz bilan qo\'ng\'iroq qila olmaysiz</string>
+    <string name="audio_video_meeting_description">Uchrashuvlarda Jitsi xavfsizlik va ruxsat berish qoidalari qo\'llaniladi. Xonada hozir bo\'lgan barcha odamlar sizning uchrashuvingiz o\'tayotganda qo\'shilishga taklifni ko\'rishadi.</string>
+    <string name="conference_call_in_progress">Konferentsiya allaqachon davom etmoqda!</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Sizda qo\'ng\'iroqni boshlash uchun ruxsat yo\'q</string>
+    <string name="no_permissions_to_start_webrtc_call">Ushbu xonada qoʻngʻiroqni amalga oshirishga ruxsatingiz yo‘q</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Konferentsiya qo\'ng\'irog\'ini boshlash uchun sizning ruxsatingiz yo\'q</string>
+    <string name="no_permissions_to_start_conf_call">Ushbu xonada konferents-aloqani boshlashga ruxsatingiz yo‘q</string>
+    <string name="missing_permissions_to_start_conf_call">Ushbu xonada konferentsiya boshlash uchun taklif qilish uchun sizga ruxsat kerak</string>
+    <string name="missing_permissions_error">Ruxsat yoʻqligi sababli bu harakat amalga oshirilmaydi</string>
+    <string name="missing_permissions_warning">Ruxsat yoʻqligi sababli ayrim imkoniyatlar yo‘q bo‘lishi mumkin…</string>
+    <string name="ongoing_conference_call">Joriy konferts-aloaqa.
+\n%1$s yoki %2$s sifatida qoʻshilish</string>
+    <string name="start_chatting">Chatni boshlash</string>
+    <string name="reset">Qayta oʻrnatish</string>
+    <string name="dismiss">Bekor qilish</string>
+    <string name="play_video">Ijro etmoq</string>
+    <string name="active_call">Faol qo\'ng\'iroq</string>
+    <string name="report_content">Hisobot mazmuni</string>
+    <string name="disconnect">Ajratish</string>
+    <string name="revoke">Bekor qilish</string>
+    <string name="none">Yoʻq</string>
+    <string name="view_decrypted_source">Shifrlangan manbani ko‘rish</string>
+    <string name="view_source">Manbani ko‘rish</string>
+    <string name="permalink">Doimiy aloqa</string>
+    <string name="forward">Oldinga</string>
+    <string name="later">Keyinroq</string>
+    <string name="dialog_title_third_party_licences">Uchinchi tomonlarning litsenziyalari</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Chiqishdan oldin kalitlarning zaxira nusxasini yaratmasangiz, shifrlangan xabarlardan foydalanishni yo‘qotishingiz mumkin.</string>
+    <string name="backup">Zaxiraga nusxa olish</string>
+    <string name="are_you_sure">Ishonchingiz komilmi\?</string>
+    <string name="keys_backup_activate">Kalitlarni rezervlashdan foydalanish</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Kalitlar rezervga olinmoqda…</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Shifrlangan xabar kerak emas</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Kalitlarni xavfsiz nusxa olish faoliyati shifrlangan xabarlardan foydalanishni yo‘qotmaslik uchun barcha seanslarda faol bo‘lishi kerak.</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Kalitni saqlash amalga oshirilmoqda. Ayni paytda chiqsangiz, shifrlangan xabarlaringizni yoʻqotishingiz mumkin.</string>
+    <string name="keys_backup_is_not_finished_please_wait">Kalitlarni arxivlash yakunlanmadi, kuting…</string>
+    <string name="title_activity_keys_backup_restore">Kalitlarni rezervlashdan foydalanish</string>
+    <string name="title_activity_keys_backup_setup">Kalitlarni rezervga olish</string>
+    <string name="title_activity_group_details">Hamjamiyat haqida ma’lumot</string>
+    <string name="title_activity_member_details">Ishtirokchi haqida ma’lumot</string>
+    <string name="title_activity_settings">Sozlamalar</string>
+    <string name="notification_silent_notifications">Tovushsiz bildirishnomalar</string>
+    <string name="notification_noisy_notifications">Shovqinli bildirishnomalar</string>
+    <string name="notification_listening_for_events">Hodisalarni tinglash</string>
+    <string name="notification_sync_init">Xizmat ishga tushirilmoqda</string>
+    <string name="status_theme">Status.im temasi</string>
+    <string name="black_them">Qop-qora tema</string>
+    <string name="dark_theme">Qora tema</string>
+    <string name="light_theme">Oq tema</string>
+    <string name="system_theme">Tizim tanlovi boʻyicha</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Agar hozir chiqsangiz shifrlangan xabarlaringizni yoʻqotasiz</string>
+    <string name="notification_sync_in_progress">Sinxronizatsiya…</string>
+    <string name="title_activity_bug_report">Xatolik toʻgʻrisida xabar berish</string>
+    <string name="send_bug_report_include_logs">Loglarni joʻnatish</string>
+    <string name="no_room_placeholder">Xonalar yoʻq</string>
+    <string name="no_group_placeholder">Guruhlar yoʻq</string>
+    <string name="groups_invite_header">Chaqirish</string>
+    <string name="no_more_results">Boshqa natijalar yoʻq</string>
+    <string name="no_result_placeholder">Natija yoʻq</string>
+    <string name="matrix_only_filter">Faqat Matrix kontaktlari uchun</string>
+    <string name="rooms_header">Xonalar</string>
+    <string name="dialog_title_error">Xato</string>
+    <string name="dialog_title_warning">Ogohlantirish</string>
+    <string name="copied_to_clipboard">Buferga koʻchirildi</string>
+    <string name="action_add">Qoʻshish</string>
+    <string name="offline">Offlayn</string>
+    <string name="failed_to_remove_widget">Vidjetni oʻchirib boʻlmadi</string>
+    <string name="failed_to_add_widget">Vidjet qoʻshib boʻlmadi</string>
+    <string name="device_information">Sessiya haqida informatsiya</string>
+    <string name="missing_permissions_title_to_start_conf_call">Qoʻngʻiroqni amalga oshirish imkoniyati yoʻq</string>
+    <string name="audio_meeting">Audio suhbatni boshlash</string>
+    <string name="video_meeting">Video suhbatni boshlash</string>
+    <string name="cannot_start_call">Qoʻngʻiroqni amalga oshirish imkoniyati yoʻq, iltimos keyinroq urunib koʻring</string>
+    <string name="ongoing_conference_call_video">Video</string>
+    <string name="ongoing_conference_call_voice">Ovoz</string>
+    <string name="pause_video">Pauza</string>
+    <string name="rename">Qayta nomlash</string>
+    <string name="delete">Oʻchirib tashlash</string>
+    <string name="clear">Tozalash</string>
+    <string name="speak">Gapirish</string>
+    <string name="share">Tarqatish</string>
+    <string name="download">Yuklash</string>
+    <string name="redact">Oʻchirish</string>
+    <string name="resend">Qayta joʻnatish</string>
+    <string name="send">Joʻnatish</string>
+    <string name="stay">Qolish</string>
+    <string name="leave">Chiqish</string>
+    <string name="save">Saqlash</string>
+    <string name="cancel">Bekor qilish</string>
+    <string name="ok">OK</string>
+    <string name="loading">Yuklanmoqda…</string>
+    <string name="title_activity_verify_device">Sessiyani verifikatsiya qilish</string>
+    <string name="title_activity_choose_sticker">Stiker joʻnatish</string>
+    <string name="title_activity_home">Xabarlar</string>
+    <string name="title_activity_room">Xona</string>
+</resources>
\ No newline at end of file

From 755fad780849ec26f4d866783a2324d59524c8f8 Mon Sep 17 00:00:00 2001
From: HelaBasa <R45XvezA@protonmail.ch>
Date: Tue, 2 Mar 2021 17:27:20 +0000
Subject: [PATCH 163/578] Translated using Weblate (Sinhala)

Currently translated at 9.0% (1 of 11 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/si/
---
 fastlane/metadata/android/si/title.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/si/title.txt

diff --git a/fastlane/metadata/android/si/title.txt b/fastlane/metadata/android/si/title.txt
new file mode 100644
index 0000000000..83955cd75e
--- /dev/null
+++ b/fastlane/metadata/android/si/title.txt
@@ -0,0 +1 @@
+ඉලෙමන්ට් (මීට පෙර Riot.im)

From 36dae971617225d19a0e2612e1f6164aa0e923b9 Mon Sep 17 00:00:00 2001
From: HelaBasa <R45XvezA@protonmail.ch>
Date: Tue, 2 Mar 2021 17:32:11 +0000
Subject: [PATCH 164/578] Translated using Weblate (Sinhala)

Currently translated at 0.1% (4 of 2081 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/si/
---
 vector/src/main/res/values-si/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-si/strings.xml b/vector/src/main/res/values-si/strings.xml
index a6b3daec93..6ce16c8d85 100644
--- a/vector/src/main/res/values-si/strings.xml
+++ b/vector/src/main/res/values-si/strings.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="title_activity_home">පණිවිඩ</string>
+    <string name="title_activity_settings">සැකසුම්</string>
+    <string name="title_activity_room">කාමරය</string>
+    <string name="dark_theme">අඳුරු තේමාව</string>
+</resources>
\ No newline at end of file

From 7864707699df41a866e5ea0644427166830b0ee1 Mon Sep 17 00:00:00 2001
From: HelaBasa <R45XvezA@protonmail.ch>
Date: Tue, 2 Mar 2021 17:32:41 +0000
Subject: [PATCH 165/578] Translated using Weblate (Sinhala)

Currently translated at 0.4% (1 of 226 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/si/
---
 matrix-sdk-android/src/main/res/values-si/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/res/values-si/strings.xml b/matrix-sdk-android/src/main/res/values-si/strings.xml
index a6b3daec93..c0c6522ed4 100644
--- a/matrix-sdk-android/src/main/res/values-si/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-si/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
+</resources>
\ No newline at end of file

From 3f10be2ad355b2e18bf68a997e3737f4c8a1c0bc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 11:14:18 +0100
Subject: [PATCH 166/578] Fix lint issue

---
 vector/src/main/res/values-ml/strings.xml     | 2 +-
 vector/src/main/res/values-nb-rNO/strings.xml | 4 ++--
 vector/src/main/res/values-sq/strings.xml     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 7a85a8906f..6197c74568 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -285,7 +285,7 @@
     <string name="room_participants_action_ban">നിരോധിക്കൂ</string>
     <string name="reset">പുനഃസജ്ജമാക്കൂ</string>
     <string name="none">ഒന്നുമില്ല</string>
-    <string name="call_only_active">സജീവ കോൾ ()</string>
+    <string name="call_only_active">സജീവ കോൾ (%1$s)</string>
     <string name="call_tile_other_declined">%1$s ഈ കോൾ നിരസിച്ചു</string>
     <string name="new_recovery_method_popup_was_me">അത് ഞാൻ ആയിരുന്നു</string>
     <string name="finish">പൂർത്തിയാക്കൂ</string>
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 6865537fbb..830fb79dea 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1503,7 +1503,7 @@
     <string name="settings_show_emoji_keyboard_summary">Legg til en knapp på meldingskomponisten for å åpne emoji-tastaturet</string>
     <string name="settings_show_emoji_keyboard">Vis emoji-tastatur</string>
     <string name="settings_send_message_with_enter_summary">Enter-knappen på det myke tastaturet vil sende melding i stedet for å legge til en linjeskift</string>
-    <string name="settings_preview_media_before_sending">Forhåndsvis media før sending</string>
+    <string name="settings_preview_media_before_sending">Forhåndsvis medier før sending</string>
     <string name="settings_vibrate_on_mention">Vibrer når du nevner en bruker</string>
     <string name="settings_chat_effects_description">Bruk kommandoen /confetti eller send en melding som inneholder ❄️ eller 🎉</string>
     <string name="settings_show_read_receipts_summary">Klikk på lest kvitteringene for en detaljert liste.</string>
@@ -1512,7 +1512,7 @@
     <string name="settings_send_typing_notifs_summary">La andre brukere vite at du skriver.</string>
     <string name="settings_contacts_phonebook_country">Telefonbok land</string>
     <string name="settings_contacts_app_permission">Kontakter tillatelse</string>
-    <string name="settings_keep_media">Behold media</string>
+    <string name="settings_keep_media">Behold medier</string>
     <string name="settings_third_party_notices">Tredjeparts varsler</string>
     <plurals name="seconds">
         <item quantity="one">%d sekund</item>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index cc94d538e8..8e61371808 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2290,7 +2290,7 @@
     <string name="call_dial_pad_title">Pjesa e numrave</string>
     <string name="call_tile_call_back">Ktheji thirrjen</string>
     <string name="call_tile_ended">Kjo thirrje ka përfunduar</string>
-    <string name="call_tile_other_declined">%1$d hodhi poshtë këtë thirrje</string>
+    <string name="call_tile_other_declined">%1$s hodhi poshtë këtë thirrje</string>
     <string name="call_tile_you_declined">Hodhët poshtë këtë thirrje %1$s</string>
     <string name="call_tile_in_call">Gjendeni në këtë thirrje</string>
     <string name="call_tile_other_started_call">%1$s nisi një thirrje</string>

From 19288f29509cdee7f9eff5097fe88522345fd67a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 11:17:25 +0100
Subject: [PATCH 167/578] Remove unused string

---
 vector/src/main/res/values-ar/strings.xml        | 1 -
 vector/src/main/res/values-b+sr+Latn/strings.xml | 1 -
 vector/src/main/res/values-bg/strings.xml        | 1 -
 vector/src/main/res/values-bn-rIN/strings.xml    | 1 -
 vector/src/main/res/values-ca/strings.xml        | 1 -
 vector/src/main/res/values-cs/strings.xml        | 1 -
 vector/src/main/res/values-cy/strings.xml        | 1 -
 vector/src/main/res/values-de/strings.xml        | 1 -
 vector/src/main/res/values-el/strings.xml        | 1 -
 vector/src/main/res/values-eo/strings.xml        | 1 -
 vector/src/main/res/values-es-rMX/strings.xml    | 1 -
 vector/src/main/res/values-es/strings.xml        | 1 -
 vector/src/main/res/values-et/strings.xml        | 1 -
 vector/src/main/res/values-eu/strings.xml        | 2 --
 vector/src/main/res/values-fa/strings.xml        | 1 -
 vector/src/main/res/values-fi/strings.xml        | 1 -
 vector/src/main/res/values-fr/strings.xml        | 1 -
 vector/src/main/res/values-fy/strings.xml        | 1 -
 vector/src/main/res/values-gl/strings.xml        | 1 -
 vector/src/main/res/values-he/strings.xml        | 1 -
 vector/src/main/res/values-hr/strings.xml        | 1 -
 vector/src/main/res/values-hu/strings.xml        | 1 -
 vector/src/main/res/values-id/strings.xml        | 1 -
 vector/src/main/res/values-in/strings.xml        | 1 -
 vector/src/main/res/values-it/strings.xml        | 1 -
 vector/src/main/res/values-iw/strings.xml        | 1 -
 vector/src/main/res/values-ja/strings.xml        | 1 -
 vector/src/main/res/values-kab/strings.xml       | 1 -
 vector/src/main/res/values-ko/strings.xml        | 1 -
 vector/src/main/res/values-lv/strings.xml        | 1 -
 vector/src/main/res/values-ml/strings.xml        | 1 -
 vector/src/main/res/values-nb-rNO/strings.xml    | 1 -
 vector/src/main/res/values-nl/strings.xml        | 1 -
 vector/src/main/res/values-nn/strings.xml        | 1 -
 vector/src/main/res/values-pl/strings.xml        | 1 -
 vector/src/main/res/values-pt-rBR/strings.xml    | 1 -
 vector/src/main/res/values-pt/strings.xml        | 1 -
 vector/src/main/res/values-ro/strings.xml        | 1 -
 vector/src/main/res/values-ru/strings.xml        | 1 -
 vector/src/main/res/values-sk/strings.xml        | 2 --
 vector/src/main/res/values-sq/strings.xml        | 1 -
 vector/src/main/res/values-sr/strings.xml        | 1 -
 vector/src/main/res/values-sv/strings.xml        | 1 -
 vector/src/main/res/values-szl/strings.xml       | 1 -
 vector/src/main/res/values-tr/strings.xml        | 1 -
 vector/src/main/res/values-tzm/strings.xml       | 1 -
 vector/src/main/res/values-uk/strings.xml        | 1 -
 vector/src/main/res/values-uz/strings.xml        | 1 -
 vector/src/main/res/values-vls/strings.xml       | 1 -
 vector/src/main/res/values-zh-rCN/strings.xml    | 1 -
 vector/src/main/res/values-zh-rTW/strings.xml    | 1 -
 vector/src/main/res/values/strings.xml           | 1 -
 52 files changed, 54 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 390a68c24b..9503e002d7 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -914,6 +914,5 @@
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">لا أريد رسائلي المشفرة</string>
     <string name="title_activity_keys_backup_setup">نسخ إحتياطي للمفتاح</string>
     <string name="notification_sync_init">جاري إعداد الخدمة</string>
-    <string name="status_theme">سمة Status.im</string>
     <string name="system_theme">إفتراضي النظام</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index 29bd40b977..4f0e663297 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -4,7 +4,6 @@
     <string name="light_theme">Svetla Tema</string>
     <string name="dark_theme">Tamna Tema</string>
     <string name="black_them">Crna Tema</string>
-    <string name="status_theme">Status.im Tema</string>
 
     <string name="notification_sync_init">Inicijalizacija servisa</string>
     <string name="notification_sync_in_progress">Sinhronizacija u toku…</string>
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index c2235f3cd0..4f1848394e 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -811,7 +811,6 @@
     <string name="settings_lazy_loading_description">Подобрява производителността като зарежда членовете в стаите при първи преглед.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Сървърът Ви все още не поддържа постепенно зареждане на членовете в стаи. Опитайте по-късно.</string>
     <string name="unknown_error">Съжаляваме, възникна грешка</string>
-    <string name="status_theme">Status.im тема</string>
     <string name="room_sliding_menu_version_x">Версия %s</string>
     <string name="encryption_export_notice">Моля, въведете парола за шифроване на екпортираните ключове. Ще е нужно да въведете същата парола за да можете да ги импортирате.</string>
     <string name="passphrase_create_passphrase">Създай парола</string>
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index afb13b26f0..9cbe122897 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -4,7 +4,6 @@
     <string name="light_theme">হালকা থিম</string>
     <string name="dark_theme">গাঢ় থিম</string>
     <string name="black_them">কালো থিম</string>
-    <string name="status_theme">Status.im থিম</string>
 
     <string name="notification_sync_in_progress">সিংক্রোনাইজ হচ্ছে…</string>
     <string name="notification_listening_for_events">ইভেন্টের জন্য শোনা হচ্ছে</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 961a2b8731..46a7514f62 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -759,7 +759,6 @@
     <string name="e2e_re_request_encryption_key_dialog_title">Sol·licitud enviada</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Si us plau, obre Element a un altre dispositiu que pugui desxifrar el missatge de manera que pugui enviar les claus a aquesta sessió.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="status_theme">Tema Status.im</string>
     <string name="missing_permissions_error">No es pot dur a terme aquesta acció per falta de permisos.</string>
     <string name="dialog_title_error">Error</string>
     <string name="system_alerts_header">Alertes de sistema</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 2277157028..bac765be5a 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -177,7 +177,6 @@
     <string name="login_error_bad_json">Poškozený JSON</string>
     <string name="login_error_limit_exceeded">Bylo odesláno příliš mnoho požadavků</string>
     <string name="login_error_user_in_use">Toto uživatelské jméno je již použito</string>
-    <string name="status_theme">Motiv vzhledu Status.im</string>
     <string name="title_activity_choose_sticker">Odeslat nálepku</string>
     <string name="dialog_title_third_party_licences">Licenční smlouvy třetích stran</string>
     <string name="download">Stáhnout</string>
diff --git a/vector/src/main/res/values-cy/strings.xml b/vector/src/main/res/values-cy/strings.xml
index ccfefa7c0d..db0ff9b498 100644
--- a/vector/src/main/res/values-cy/strings.xml
+++ b/vector/src/main/res/values-cy/strings.xml
@@ -4,7 +4,6 @@
     <string name="light_theme">Thema Golau</string>
     <string name="dark_theme">Thema Tywyll</string>
     <string name="black_them">Thema Du</string>
-    <string name="status_theme">Thema Status.im</string>
 
     <string name="notification_sync_init">Yn paratoi gwasanaeth</string>
 </resources>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index a5015b2117..ffa4acac7f 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -863,7 +863,6 @@
     <string name="error_lazy_loading_not_supported_by_home_server">Dein Home-Server unterstützt noch nicht das Nachladen von Raummitgliedern. Versuche es später.</string>
     <string name="unknown_error">Entschuldige, ein Fehler trat auf</string>
     <string name="room_sliding_menu_version_x">Version %s</string>
-    <string name="status_theme">Status.im-Design</string>
     <string name="encryption_export_notice">Bitte eine Passphrase erstellen um exportierte Schlüssel zu verschlüsseln. Du musst dieselbe Passphrase eingeben um die Schlüssel importieren zu können.</string>
     <string name="passphrase_create_passphrase">Erzeuge Passphrase</string>
     <string name="passphrase_passphrase_does_not_match">Passphrasen stimmen nicht überein</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 98907a6a53..1b38a9553a 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -44,7 +44,6 @@
     <string name="light_theme">Ανοιχτόχρωμο θέμα</string>
     <string name="dark_theme">Σκουρόχρωμο θέμα</string>
     <string name="black_them">Μαύρο θέμα</string>
-    <string name="status_theme">Θέμα Status.im</string>
     <string name="title_activity_choose_sticker">Αποστολή αυτοκόλλητου</string>
     <string name="dialog_title_third_party_licences">Άδειες τρίτων</string>
     <string name="later">Αργότερα</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 51c0c4ee50..f6cca89791 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -84,7 +84,6 @@
     <string name="title_activity_keys_backup_restore">Uzi savkopiadon de ŝlosiloj</string>
     <string name="title_activity_verify_device">Kontroli salutaĵon</string>
     <string name="encryption_information_verify_device">Kontroli salutaĵon</string>
-    <string name="status_theme">Haŭto de Status.im</string>
     <string name="keys_backup_is_not_finished_please_wait">Savkopio de ŝlosiloj ne finiĝis; bonvolu atendi…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Vi perdos viajn ĉifritajn mesaĝojn se vi nun adiaŭos</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Progresas savkopio de ŝlosiloj. Se vi nun adiaŭos, vi perdos aliron al viaj ĉifritaj mesaĝoj.</string>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 6ddb1d53ac..fd7d9fe790 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -622,7 +622,6 @@ Dispositivos desconocidos:</string>
     <string name="clear">Borrar</string>
     <string name="missing_permissions_error">Debido a que faltan permisos, esta acción no es posible.</string>
     <string name="title_activity_bug_report">Informe de error</string>
-    <string name="status_theme">Tema de Status.im</string>
     <string name="title_activity_group_details">Detalles sobre la comunidad</string>
     <string name="title_activity_choose_sticker">Enviar una calcomanía</string>
     <string name="dialog_title_third_party_licences">Licencias de terceros</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 9dec86234d..0d24729a57 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -862,7 +862,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="resource_limit_hard_mau">Este servidor doméstico ha alcanzado su límite Mensual de Usuarios Activos.</string>
     <string name="resource_limit_soft_contact">Por favor, %s para aumentar este límite.</string>
     <string name="resource_limit_hard_contact">Por favor, %s para continuar utilizando este servicio.</string>
-    <string name="status_theme">Tema de Status.im</string>
     <string name="dialog_title_error">Error</string>
     <string name="room_sliding_menu_version_x">Versión %s</string>
     <string name="encryption_export_notice">Por favor, crea una frase de contraseña para cifrar las claves exportadas. Necesitarás ingresar la misma frase de contraseña para poder importar las claves.</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 928aa9a9b3..e04af0f5df 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -3,7 +3,6 @@
     <string name="light_theme">Hele teema</string>
     <string name="dark_theme">Tume teema</string>
     <string name="black_them">Must teema</string>
-    <string name="status_theme">Status.im teema</string>
     <string name="notification_sync_init">Käivitan teenuse</string>
     <string name="notification_sync_in_progress">Sünkroniseerin…</string>
     <string name="notification_listening_for_events">Kuulan, kas leidub sündmusi</string>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index cf14fee03f..5ac7769e07 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -974,8 +974,6 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
 
     <string name="unknown_error">Errore bat gertatu da</string>
 
-    <string name="status_theme">Status.im azala</string>
-
     <string name="room_sliding_menu_version_x">%s bertsioa</string>
     <string name="encryption_export_notice">Sortu esportatutako gakoak zifratzeko pasaesaldi bat. Pasaesaldi hori gakoak inportatzeko sartu beharko duzu.</string>
     <string name="passphrase_create_passphrase">Sortu pasaesaldia</string>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index e852025e89..906b5cfb07 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -252,7 +252,6 @@
     <string name="action_sign_out_confirmation_simple">آیا می‌خواهید از حساب کاربری خود خارج شوید؟</string>
     <string name="action_mark_room_read">علامت‌گذاری به عنوان خوانده شده</string>
     <string name="auth_login_sso">ورود با سامانه‌های احراز هویت مرکزی</string>
-    <string name="status_theme">زمینهٔ Status.im</string>
     <string name="notification_sync_init">در حال راه‌اندازی سرویس</string>
     <string name="notification_noisy_notifications">آگاهی‌های پرصدا</string>
     <string name="notification_silent_notifications">آگاهی‌های صامت</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 3b945069f7..e721291a4a 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -715,7 +715,6 @@
     <string name="settings_password">Salasana</string>
     <string name="deactivate_account_prompt_password">Kirjoita salasanasi jatkaaksesi:</string>
     <string name="error_empty_field_your_password">Kirjoita salasanasi.</string>
-    <string name="status_theme">Status.im-teema</string>
     <string name="settings_send_typing_notifs">Lähetä kirjoitusilmoitukset</string>
     <string name="settings_show_read_receipts">Näytä lukukuittaukset</string>
     <string name="settings_show_join_leave_messages">Näytä liittymiset ja poistumiset</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 2d11932681..0bebb626e9 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -810,7 +810,6 @@
     <string name="settings_lazy_loading_description">Améliore les performances en ne chargeant les membres des salons qu’au premier affichage.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Votre serveur d’accueil ne prend pas encore en charge le chargement en différé des membres des salons. Réessayez ultérieurement.</string>
     <string name="unknown_error">Désolé, une erreur est survenue</string>
-    <string name="status_theme">Thème Status.im</string>
     <string name="room_sliding_menu_version_x">Version %s</string>
     <string name="encryption_export_notice">Veuillez créer une phrase secrète pour chiffrer les clés exportées. Vous devrez saisir cette même phrase secrète afin de pouvoir importer les clés.</string>
     <string name="passphrase_create_passphrase">Créer la phrase secrète</string>
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index bd6631a0d9..af264e5723 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -3,7 +3,6 @@
     <string name="light_theme">Ljocht tema</string>
     <string name="dark_theme">Donker tema</string>
     <string name="black_them">Swart tema</string>
-    <string name="status_theme">Status.im-tema</string>
 
     <string name="notification_sync_init">Tsjinst inisjalisearje</string>
     <string name="notification_sync_in_progress">Syngronisearje…</string>
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index 2fec2ecf61..f0c7832dc6 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -567,6 +567,5 @@
     <string name="title_activity_keys_backup_restore">Usar copia da Chave</string>
     <string name="title_activity_keys_backup_setup">Copia de apoio da chave</string>
     <string name="notification_sync_init">Iniciando o servizo</string>
-    <string name="status_theme">Decorado Status.im</string>
     <string name="system_theme">Por defecto no sistema</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
index 81d89ff563..3a5e86445b 100644
--- a/vector/src/main/res/values-he/strings.xml
+++ b/vector/src/main/res/values-he/strings.xml
@@ -120,7 +120,6 @@
     <string name="notification_listening_for_events">האזנה לאירועים</string>
     <string name="notification_sync_in_progress">מסנכרן…</string>
     <string name="notification_sync_init">אתחול השירות</string>
-    <string name="status_theme">ערכת נושא Status.im</string>
     <string name="black_them">ערכת נושא שחורה</string>
     <string name="dark_theme">ערכת נושא כהה</string>
     <string name="light_theme">ערכת נושא בהירה</string>
diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml
index 3feac0f644..d672a48c50 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@@ -3,7 +3,6 @@
     <string name="light_theme">Svijetla tema</string>
     <string name="dark_theme">Tamna tema</string>
     <string name="black_them">Crna tema</string>
-    <string name="status_theme">Tema Status.im-a</string>
     <string name="notification_sync_init">Inicijalizacija servisa</string>
     <string name="notification_sync_in_progress">Sinkronizacija u tijeku…</string>
     <string name="notification_listening_for_events">Osluškivanje događaja</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index e25626c2e6..78b446c53a 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -810,7 +810,6 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="settings_lazy_loading_description">Teljesítmény növelése a szoba tagjainak késleltetett betöltésével.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">A Matrix szervered jelenleg nem támogatja a szoba tagság késleltetett betöltését. Próbáld meg később.</string>
     <string name="unknown_error">Ne haragudj, hiba történt</string>
-    <string name="status_theme">Status.im téma</string>
     <string name="room_sliding_menu_version_x">Verzió: %s</string>
     <string name="encryption_export_notice">Adj meg egy jelmondatot a kimentett kulcsok titkosításához. Ezt a jelmondatot kell majd megadnod a kulcsok betöltéséhez.</string>
     <string name="passphrase_create_passphrase">Jelmondat lekészítése</string>
diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml
index 24f9cea581..97ff704aa4 100644
--- a/vector/src/main/res/values-id/strings.xml
+++ b/vector/src/main/res/values-id/strings.xml
@@ -930,7 +930,6 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="notice_avatar">Avatar pemberitahu</string>
     <string name="receipt_avatar">Avatar penerima</string>
     <string name="command_description_deop_user">Demosi pengguna dengan id berikut</string>
-    <string name="status_theme">Tema Status.im</string>
 
     <string name="call_anyway">Tetap Panggil</string>
     <string name="accept">Terima</string>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index 24f9cea581..97ff704aa4 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -930,7 +930,6 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="notice_avatar">Avatar pemberitahu</string>
     <string name="receipt_avatar">Avatar penerima</string>
     <string name="command_description_deop_user">Demosi pengguna dengan id berikut</string>
-    <string name="status_theme">Tema Status.im</string>
 
     <string name="call_anyway">Tetap Panggil</string>
     <string name="accept">Terima</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index b3e6992439..060ea56a52 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -868,7 +868,6 @@
     <string name="error_lazy_loading_not_supported_by_home_server">Il tuo Home Server non supporta ancora il caricamento differito dei membri delle stanze. Prova più avanti.</string>
     <string name="unknown_error">Spiacente, si è verificato un errore</string>
     <string name="settings_lazy_loading_title">Caricamento differito dei membri della stanza</string>
-    <string name="status_theme">Tema Status.im</string>
     <string name="room_sliding_menu_version_x">Versione %s</string>
     <string name="encryption_export_notice">Crea una password per mettere al sicuro le chiavi esportate. La stessa password dovrà essere usata per poter importare le chiavi.</string>
     <string name="passphrase_create_passphrase">Crea una password</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index 81d89ff563..3a5e86445b 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -120,7 +120,6 @@
     <string name="notification_listening_for_events">האזנה לאירועים</string>
     <string name="notification_sync_in_progress">מסנכרן…</string>
     <string name="notification_sync_init">אתחול השירות</string>
-    <string name="status_theme">ערכת נושא Status.im</string>
     <string name="black_them">ערכת נושא שחורה</string>
     <string name="dark_theme">ערכת נושא כהה</string>
     <string name="light_theme">ערכת נושא בהירה</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 66a57da12a..259982025f 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -788,7 +788,6 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="error_lazy_loading_not_supported_by_home_server">あなたのホームサーバは部屋のメンバーの簡易読み込みをサポートしていません。後で試してください。</string>
     <string name="settings_lazy_loading_title">部屋のメンバーの簡易読み込み</string>
     <string name="unknown_error">申し訳ありません、エラーが発生しました</string>
-    <string name="status_theme">Status.im テーマ</string>
     <string name="room_sliding_menu_version_x">Version %s</string>
     <string name="encryption_export_notice">エクスポートされた鍵を暗号化するパスフレーズを作成してください。 キーをインポートするには、同じパスフレーズを入力する必要があります。</string>
     <string name="passphrase_create_passphrase">パスフレーズの作成</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 74075318d4..8988c4ade1 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -413,7 +413,6 @@
     <string name="room_settings_name_hint">Isem n texxamt</string>
     <string name="element_disclaimer_title">Tura, Riot d aferdis!</string>
     <string name="three_pid_revoke_invite_dialog_title">Sefesex tinnubga</string>
-    <string name="status_theme">Asentel Status.im</string>
     <string name="notification_sync_in_progress">Amtawi…</string>
     <string name="notification_listening_for_events">Timesliwt i yineḍruyen</string>
     <string name="notification_silent_notifications">Ilɣa s tsusmi</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index c14f0466fa..51ddb6850d 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -111,7 +111,6 @@
     <string name="auth_password_placeholder">비밀번호</string>
     <string name="auth_new_password_placeholder">새 비밀번호</string>
     <string name="auth_user_name_placeholder">사용자 이름</string>
-    <string name="status_theme">Status.im 테마</string>
 
     <string name="notification_sync_init">서비스 초기화 중</string>
     <string name="notification_noisy_notifications">소리로 알림</string>
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 88975c01f4..180d6d748d 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -1002,7 +1002,6 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="stay">Palikt</string>
     <string name="are_you_sure">Vai tiešām to vēlaties\?</string>
     <string name="title_activity_verify_device">Verificēt ierīci</string>
-    <string name="status_theme">Status.im tēma</string>
     <string name="system_theme">Sistēmas noklusējuma</string>
     <string name="room_member_power_level_custom_in">Pielāgots (%1$d) iekš %2$s</string>
     <string name="room_member_power_level_default_in">Noklusējums iekš %1$s</string>
diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 6197c74568..20ee803f30 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -250,7 +250,6 @@
     <string name="home_filter_placeholder_home">മുറി നാമങ്ങൾ ഫിൽറ്റർ ചെയ്യൂ</string>
     <string name="send_anyway">എന്തായാലും അയയ്ക്കൂ</string>
     <string name="title_activity_keys_backup_setup">കീ ബാക്കപ്പ്</string>
-    <string name="status_theme">Status.im തീം</string>
     <string name="black_them">കറുത്ത തീം</string>
     <string name="dark_theme">ഡാ൪ക്ക് തീം</string>
     <string name="light_theme">ലൈറ്റ് തീം</string>
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 830fb79dea..3f96911403 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -380,7 +380,6 @@
     <string name="qr_code_scanned_by_other_yes">Ja</string>
     <string name="enter_secret_storage_passphrase_warning">Advarsel:</string>
     <string name="delete_event_dialog_title">Bekreft fjerning</string>
-    <string name="status_theme">Status.im-tema</string>
     <string name="notification_listening_for_events">Lytter etter hendelser</string>
     <string name="title_activity_verify_device">Verifiser økten</string>
     <string name="active_call">Aktiv samtale</string>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 76bf7e6e80..5d2c847e27 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -861,7 +861,6 @@
     <string name="resource_limit_soft_contact">Gelieve %s om deze limiet te verhogen.</string>
     <string name="resource_limit_hard_contact">Gelieve %s om deze dienst te blijven gebruiken.</string>
     <string name="dialog_title_error">Foutmelding</string>
-    <string name="status_theme">Status.im-thema</string>
     <string name="call_anyway">Toch bellen</string>
     <string name="accept">Aanvaarden</string>
     <string name="auth_accept_policies">Gelieve het beleid van deze thuisserver te lezen en aanvaarden:</string>
diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml
index af2c42051f..203cd0834d 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@@ -789,7 +789,6 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="resource_limit_hard_mau">Heimtenaren har truffe den Månadlege Grensa si for Aktive Brukarar.</string>
     <string name="resource_limit_soft_contact">Ver venleg og %s for å heva grensa.</string>
     <string name="resource_limit_hard_contact">Ver venleg og %s for å halda fram med å bruka tenesten.</string>
-    <string name="status_theme">Status.im-tema</string>
     <string name="call_anyway">Ring likevel</string>
     <string name="accept">Aksepter</string>
     <string name="dialog_title_error">Feil</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index f69dc1d5d2..95b624df9a 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -774,7 +774,6 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     </plurals>
     <string name="room_tombstone_predecessor_link">Kliknij tutaj, aby zobaczyć starsze wiadomości</string>
     <string name="unknown_error">Przepraszamy, wystąpił błąd</string>
-    <string name="status_theme">Motyw Status.im</string>
     <string name="missing_permissions_error">Z powodu braku uprawnień to działanie nie jest możliwe.</string>
     <string name="system_alerts_header">Alerty systemowe</string>
     <string name="send_bug_report_description_in_english">Jeżeli to możliwe, proszę napisz opis w języku angielskim.</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index ff35ff868c..59b5ea9405 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -864,7 +864,6 @@
     <string name="resource_limit_soft_contact">Por favor, %s para que este limite seja aumentado.</string>
     <string name="resource_limit_hard_contact">Por favor, %s para seguir usando este serviço.</string>
     <string name="encryption_export_notice">Crie uma frase secreta para criptografar as chaves exportadas. Você precisará inserir essa frase secreta para importar chaves criptografadas.</string>
-    <string name="status_theme">Tema Status.im</string>
     <string name="accept">Aceitar</string>
     <string name="dialog_title_error">Erro</string>
     <string name="auth_accept_policies">Por favor, revise e aceite as políticas deste servidor local:</string>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
index d2e181dbe7..a19e3fe56f 100644
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -619,7 +619,6 @@ Dispositivos desconhecidos:</string>
     <string name="room_add_matrix_apps">Adicionar apps Matrix</string>
     <string name="notification_sync_in_progress">A sincronizar…</string>
     <string name="notification_listening_for_events">À escuta de eventos</string>
-    <string name="status_theme">Tema Status.im</string>
     <string name="notification_noisy_notifications">Notificações ruidosas</string>
     <string name="notification_silent_notifications">Notificações silenciosas</string>
     <string name="title_activity_bug_report">Relatório de bug</string>
diff --git a/vector/src/main/res/values-ro/strings.xml b/vector/src/main/res/values-ro/strings.xml
index dcb3f33dee..39cce6c5b1 100644
--- a/vector/src/main/res/values-ro/strings.xml
+++ b/vector/src/main/res/values-ro/strings.xml
@@ -3,7 +3,6 @@
     <string name="light_theme">Temă luminoasă</string>
     <string name="dark_theme">Temă întunecată</string>
     <string name="black_them">Temă Neagră</string>
-    <string name="status_theme">Tema Status.im</string>
 
     <string name="notification_sync_init">Inițializează serviciu</string>
     <string name="notification_sync_in_progress">Sincronizează…</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 5025da3bdd..319f9bb14b 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -887,7 +887,6 @@
     <string name="system_alerts_header">Системные оповещения</string>
     <string name="resource_limit_exceeded_title">Лимит ресурсов исчерпан</string>
     <string name="resource_limit_contact_action">Связаться с администратором</string>
-    <string name="status_theme">Тема status.im</string>
     <string name="dialog_title_error">Ошибка</string>
     <string name="room_sliding_menu_version_x">Версия %s</string>
     <string name="passphrase_create_passphrase">Создать парольную фразу</string>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 1a4418e3a3..4268d2ce33 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -997,8 +997,6 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
 
     <string name="unknown_error">Prepáčte, vyskytla sa chyba</string>
 
-    <string name="status_theme">Vzhľad Status.im</string>
-
     <string name="room_sliding_menu_version_x">Verzia %s</string>
     <string name="encryption_export_notice">Prosím vytvorte si heslo, ktorým zašifrujete exportované kľúče. Toto isté heslo budete musieť zadať aj pri importe kľúčov z uloženého súboru.</string>
     <string name="passphrase_create_passphrase">Vytvoriť heslo</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 8e61371808..66b3da80c3 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -3,7 +3,6 @@
     <string name="light_theme">Temë e Çelët</string>
     <string name="dark_theme">Temë e Errët</string>
     <string name="black_them">Temë e Zezë</string>
-    <string name="status_theme">Temë Status.im</string>
     <string name="notification_noisy_notifications">Njoftime të zhurmshme</string>
     <string name="notification_silent_notifications">Njoftime të heshtura</string>
     <string name="title_activity_home">Mesazhe</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 37a3213ce3..5cb61732b2 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -3,7 +3,6 @@
     <string name="light_theme">светла тема</string>
     <string name="dark_theme">тамна тема</string>
     <string name="black_them">црна тема</string>
-    <string name="status_theme">Status.im тема</string>
     <string name="notification_sync_init">Иницијализација сервиса</string>
     <string name="notification_sync_in_progress">Синхронизујем…</string>
     <string name="notification_noisy_notifications">Бучна обавештења</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index b2bf64234c..ee7589d22a 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -3,7 +3,6 @@
     <string name="light_theme">Ljust tema</string>
     <string name="dark_theme">Mörkt tema</string>
     <string name="black_them">Svart tema</string>
-    <string name="status_theme">Status.im-tema</string>
     <string name="notification_sync_init">Initialiserar tjänst</string>
     <string name="notification_sync_in_progress">Synkroniserar…</string>
     <string name="notification_listening_for_events">Lyssnar efter händelser</string>
diff --git a/vector/src/main/res/values-szl/strings.xml b/vector/src/main/res/values-szl/strings.xml
index d24e516fd3..2ad61d1f87 100644
--- a/vector/src/main/res/values-szl/strings.xml
+++ b/vector/src/main/res/values-szl/strings.xml
@@ -56,7 +56,6 @@
     <string name="notification_listening_for_events">Nasuchowanie zdarzyń</string>
     <string name="notification_sync_in_progress">Synchrōnizowanie…</string>
     <string name="notification_sync_init">Inicjalizacyjo usugi</string>
-    <string name="status_theme">Tymat Status.im</string>
     <string name="black_them">Czorny tymat</string>
     <string name="dark_theme">Ciymny tymat</string>
     <string name="light_theme">Jasny tymat</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 1d5b8ed277..0e1237ad33 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -147,7 +147,6 @@
     <string name="auth_password_placeholder">Şifre</string>
     <string name="auth_new_password_placeholder">Yeni şifre</string>
     <string name="auth_user_name_placeholder">Kullanıcı adı</string>
-    <string name="status_theme">Status.im Teması</string>
     <string name="title_activity_keys_backup_setup">Anahtar Yedekleme</string>
     <string name="title_activity_keys_backup_restore">Anahtar Yedekleme\'yi Kullan</string>
     <string name="keys_backup_is_not_finished_please_wait">Anahtar yedekleme tamamlanmadı, lütfen bekleyiniz…</string>
diff --git a/vector/src/main/res/values-tzm/strings.xml b/vector/src/main/res/values-tzm/strings.xml
index 9054e9e2b1..befe8dd878 100644
--- a/vector/src/main/res/values-tzm/strings.xml
+++ b/vector/src/main/res/values-tzm/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="title_activity_settings">Tisɣal</string>
     <string name="title_activity_home">Tuzinin</string>
-    <string name="status_theme">Asgum Status.im</string>
     <string name="direct_room_profile_section_more_settings">Tisɣal</string>
     <string name="settings">Tisɣal</string>
     <string name="room_list_quick_actions_settings">Tisɣal</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 34dd2b1462..6de37cec86 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -709,7 +709,6 @@
     <string name="e2e_re_request_encryption_key_dialog_content">Для відправлення ключа на цей пристрій, запустіть Element на іншому пристрої, що може дешифрувати повідомлення.</string>
     <string name="error_no_external_application_found">Вибачте, жодного стороннього застосунку не знайдено для завершення цієї дії.</string>
     <string name="option_send_voice">Відправити голосове повідомлення</string>
-    <string name="status_theme">Status.im Тема</string>
     <string name="missing_permissions_error">Ця дія неможлива через відсутність дозволів.</string>
     <string name="dialog_title_error">Помилка</string>
     <string name="system_alerts_header">Системні сповіщення</string>
diff --git a/vector/src/main/res/values-uz/strings.xml b/vector/src/main/res/values-uz/strings.xml
index 1205d099e5..4bc6eb2047 100644
--- a/vector/src/main/res/values-uz/strings.xml
+++ b/vector/src/main/res/values-uz/strings.xml
@@ -59,7 +59,6 @@
     <string name="notification_noisy_notifications">Shovqinli bildirishnomalar</string>
     <string name="notification_listening_for_events">Hodisalarni tinglash</string>
     <string name="notification_sync_init">Xizmat ishga tushirilmoqda</string>
-    <string name="status_theme">Status.im temasi</string>
     <string name="black_them">Qop-qora tema</string>
     <string name="dark_theme">Qora tema</string>
     <string name="light_theme">Oq tema</string>
diff --git a/vector/src/main/res/values-vls/strings.xml b/vector/src/main/res/values-vls/strings.xml
index 2fc4c40be7..896dbcaf23 100644
--- a/vector/src/main/res/values-vls/strings.xml
+++ b/vector/src/main/res/values-vls/strings.xml
@@ -5,7 +5,6 @@
     <string name="light_theme">Licht thema</string>
     <string name="dark_theme">Dounker thema</string>
     <string name="black_them">Zwart thema</string>
-    <string name="status_theme">Status.im-thema</string>
 
     <string name="notification_sync_init">Dienst wor geïnitialiseerd</string>
     <string name="notification_sync_in_progress">Bezig me synchroniseern…</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index a854fbaa7f..89c84a0998 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -792,7 +792,6 @@
     <string name="resource_limit_hard_mau">本服务器已达到每月活跃用户限制。</string>
     <string name="resource_limit_hard_contact">请 %s 以继续使用本服务。</string>
     <string name="resource_limit_soft_contact">请 %s 以增加此限制的额度。</string>
-    <string name="status_theme">Status.im 主题</string>
     <string name="call_anyway">仍然呼叫</string>
     <string name="accept">接受</string>
     <string name="dialog_title_error">错误</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index e246c0ae8a..4fae3868eb 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -789,7 +789,6 @@
     <string name="settings_lazy_loading_description">透過僅載入在第一次看到的地方的聊天室成員來增進效能。</string>
     <string name="error_lazy_loading_not_supported_by_home_server">您的家伺服器尚不支援延遲載入聊天室成員。請稍後再試。</string>
     <string name="unknown_error">抱歉，遇到錯誤</string>
-    <string name="status_theme">Status.im 主題</string>
     <string name="room_sliding_menu_version_x">版本 %s</string>
     <string name="encryption_export_notice">請建立密語以加密您匯出的金鑰。您將需要輸入這些密語以匯入金鑰。</string>
     <string name="passphrase_create_passphrase">建立密語</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 65c5abaa2d..b4ed3aca81 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -6,7 +6,6 @@
     <string name="light_theme">Light Theme</string>
     <string name="dark_theme">Dark Theme</string>
     <string name="black_them">Black Theme</string>
-    <string name="status_theme">Status.im Theme</string>
 
     <!-- permanent notification subtitle -->
     <string name="notification_sync_init">Initializing service</string>

From e96bdba752b6ecf15d3bc4401d6e1d8e6431e66e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 11:18:50 +0100
Subject: [PATCH 168/578] Fix typo in resource name

---
 vector/src/main/res/values-ar/strings.xml        | 2 +-
 vector/src/main/res/values-b+sr+Latn/strings.xml | 2 +-
 vector/src/main/res/values-bg/strings.xml        | 2 +-
 vector/src/main/res/values-bn-rIN/strings.xml    | 2 +-
 vector/src/main/res/values-bs/strings.xml        | 2 +-
 vector/src/main/res/values-ca/strings.xml        | 2 +-
 vector/src/main/res/values-cs/strings.xml        | 2 +-
 vector/src/main/res/values-cy/strings.xml        | 2 +-
 vector/src/main/res/values-da/strings.xml        | 2 +-
 vector/src/main/res/values-de/strings.xml        | 2 +-
 vector/src/main/res/values-el/strings.xml        | 2 +-
 vector/src/main/res/values-eo/strings.xml        | 2 +-
 vector/src/main/res/values-es-rMX/strings.xml    | 2 +-
 vector/src/main/res/values-es/strings.xml        | 2 +-
 vector/src/main/res/values-et/strings.xml        | 2 +-
 vector/src/main/res/values-eu/strings.xml        | 2 +-
 vector/src/main/res/values-fa/strings.xml        | 2 +-
 vector/src/main/res/values-fi/strings.xml        | 2 +-
 vector/src/main/res/values-fr/strings.xml        | 2 +-
 vector/src/main/res/values-fy/strings.xml        | 2 +-
 vector/src/main/res/values-gl/strings.xml        | 2 +-
 vector/src/main/res/values-he/strings.xml        | 2 +-
 vector/src/main/res/values-hr/strings.xml        | 2 +-
 vector/src/main/res/values-hu/strings.xml        | 2 +-
 vector/src/main/res/values-id/strings.xml        | 2 +-
 vector/src/main/res/values-in/strings.xml        | 2 +-
 vector/src/main/res/values-is/strings.xml        | 2 +-
 vector/src/main/res/values-it/strings.xml        | 2 +-
 vector/src/main/res/values-iw/strings.xml        | 2 +-
 vector/src/main/res/values-ja/strings.xml        | 2 +-
 vector/src/main/res/values-kab/strings.xml       | 2 +-
 vector/src/main/res/values-ko/strings.xml        | 2 +-
 vector/src/main/res/values-lv/strings.xml        | 2 +-
 vector/src/main/res/values-ml/strings.xml        | 2 +-
 vector/src/main/res/values-nb-rNO/strings.xml    | 2 +-
 vector/src/main/res/values-nl/strings.xml        | 2 +-
 vector/src/main/res/values-nn/strings.xml        | 2 +-
 vector/src/main/res/values-pl/strings.xml        | 2 +-
 vector/src/main/res/values-pt-rBR/strings.xml    | 2 +-
 vector/src/main/res/values-pt/strings.xml        | 2 +-
 vector/src/main/res/values-ro/strings.xml        | 2 +-
 vector/src/main/res/values-ru/strings.xml        | 2 +-
 vector/src/main/res/values-sk/strings.xml        | 2 +-
 vector/src/main/res/values-sq/strings.xml        | 2 +-
 vector/src/main/res/values-sr/strings.xml        | 2 +-
 vector/src/main/res/values-sv/strings.xml        | 2 +-
 vector/src/main/res/values-szl/strings.xml       | 2 +-
 vector/src/main/res/values-tlh/strings.xml       | 2 +-
 vector/src/main/res/values-tr/strings.xml        | 2 +-
 vector/src/main/res/values-uk/strings.xml        | 2 +-
 vector/src/main/res/values-uz/strings.xml        | 2 +-
 vector/src/main/res/values-vi/strings.xml        | 2 +-
 vector/src/main/res/values-vls/strings.xml       | 2 +-
 vector/src/main/res/values-zh-rCN/strings.xml    | 2 +-
 vector/src/main/res/values-zh-rTW/strings.xml    | 2 +-
 vector/src/main/res/values/array.xml             | 2 +-
 vector/src/main/res/values/strings.xml           | 2 +-
 57 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 9503e002d7..86e8c889e9 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">السمة الفاتحة</string>
     <string name="dark_theme">السمة الداكنة</string>
-    <string name="black_them">السمة السوداء</string>
+    <string name="black_theme">السمة السوداء</string>
     <string name="notification_sync_in_progress">يُزامن</string>
     <string name="notification_listening_for_events">يستمع للأحداث</string>
     <string name="title_activity_home">الرسائل</string>
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index 4f0e663297..ad749f1177 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="light_theme">Svetla Tema</string>
     <string name="dark_theme">Tamna Tema</string>
-    <string name="black_them">Crna Tema</string>
+    <string name="black_theme">Crna Tema</string>
 
     <string name="notification_sync_init">Inicijalizacija servisa</string>
     <string name="notification_sync_in_progress">Sinhronizacija u toku…</string>
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 4f1848394e..56caef9cca 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -4,7 +4,7 @@
     <!-- groups creation -->
     <string name="light_theme">Светла тема</string>
     <string name="dark_theme">Тъмна тема</string>
-    <string name="black_them">Черна тема</string>
+    <string name="black_theme">Черна тема</string>
     <string name="notification_sync_in_progress">Синхронизиране…</string>
     <string name="title_activity_home">Съобщения</string>
     <string name="title_activity_room">Стая</string>
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index 9cbe122897..0436e5f8cd 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="light_theme">হালকা থিম</string>
     <string name="dark_theme">গাঢ় থিম</string>
-    <string name="black_them">কালো থিম</string>
+    <string name="black_theme">কালো থিম</string>
 
     <string name="notification_sync_in_progress">সিংক্রোনাইজ হচ্ছে…</string>
     <string name="notification_listening_for_events">ইভেন্টের জন্য শোনা হচ্ছে</string>
diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml
index 21c429d69c..92363e9210 100644
--- a/vector/src/main/res/values-bs/strings.xml
+++ b/vector/src/main/res/values-bs/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Svijetla Tema</string>
     <string name="dark_theme">Tamna Tema</string>
-    <string name="black_them">Crna Tema</string>
+    <string name="black_theme">Crna Tema</string>
     <string name="notification_sync_in_progress">Sinkronizacija</string>
     <string name="notification_listening_for_events">Budući Događaji</string>
     <string name="notification_noisy_notifications">Glasne notifikacije</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 46a7514f62..296216b15b 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -3,7 +3,7 @@
     <!-- theme -->
     <string name="light_theme">Tema clar</string>
     <string name="dark_theme">Tema fosc</string>
-    <string name="black_them">Tema negre</string>
+    <string name="black_theme">Tema negre</string>
     <!-- permanent notification subtitle -->
     <string name="notification_sync_in_progress">Sincronitzant…</string>
     <string name="notification_listening_for_events">Escoltant esdeveniments</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index bac765be5a..04d338c7ca 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="light_theme">Světlý vzhled</string>
-    <string name="black_them">Černý vzhled</string>
+    <string name="black_theme">Černý vzhled</string>
     <string name="dark_theme">Tmavý vzhled</string>
     <string name="title_activity_home">Zprávy</string>
     <string name="title_activity_room">Místnost</string>
diff --git a/vector/src/main/res/values-cy/strings.xml b/vector/src/main/res/values-cy/strings.xml
index db0ff9b498..db4aa089e2 100644
--- a/vector/src/main/res/values-cy/strings.xml
+++ b/vector/src/main/res/values-cy/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="light_theme">Thema Golau</string>
     <string name="dark_theme">Thema Tywyll</string>
-    <string name="black_them">Thema Du</string>
+    <string name="black_theme">Thema Du</string>
 
     <string name="notification_sync_init">Yn paratoi gwasanaeth</string>
 </resources>
diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml
index 14b44a616b..198e4a60c1 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="light_theme">Lyst Tema</string>
     <string name="dark_theme">Mørkt Tema</string>
-    <string name="black_them">Sort Tema</string>
+    <string name="black_theme">Sort Tema</string>
 
     <string name="notification_sync_in_progress">Synkroniserer</string>
     <string name="notification_listening_for_events">Lyt efter begivenheder</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index ffa4acac7f..d543d179b4 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -613,7 +613,7 @@
     <string name="widget_integration_missing_user_id">Anfrage enthält keine user_id.</string>
     <string name="light_theme">Helles Design</string>
     <string name="dark_theme">Dunkles Design</string>
-    <string name="black_them">Schwarzes Design</string>
+    <string name="black_theme">Schwarzes Design</string>
     <string name="notification_sync_in_progress">Synchronisiere…</string>
     <string name="notification_listening_for_events">Auf Ereignisse lauschen</string>
     <string name="settings_containing_my_display_name">Nachrichten, die meinen Anzeigenamen enthalten</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 1b38a9553a..2737ce5c09 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -43,7 +43,7 @@
     <string name="encrypted_message">Κρυπτογραφημένο μήνυμα</string>
     <string name="light_theme">Ανοιχτόχρωμο θέμα</string>
     <string name="dark_theme">Σκουρόχρωμο θέμα</string>
-    <string name="black_them">Μαύρο θέμα</string>
+    <string name="black_theme">Μαύρο θέμα</string>
     <string name="title_activity_choose_sticker">Αποστολή αυτοκόλλητου</string>
     <string name="dialog_title_third_party_licences">Άδειες τρίτων</string>
     <string name="later">Αργότερα</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index f6cca89791..713e269254 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Hela haŭto</string>
     <string name="dark_theme">Malhela haŭto</string>
-    <string name="black_them">Nigra haŭto</string>
+    <string name="black_theme">Nigra haŭto</string>
     <string name="notification_sync_in_progress">Spegulante…</string>
     <string name="notification_listening_for_events">Atentante eventojn</string>
     <string name="notification_noisy_notifications">Laŭtaj sciigoj</string>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index fd7d9fe790..d9a0040181 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -615,7 +615,7 @@ Dispositivos desconocidos:</string>
     <string name="command_description_markdown">Activar/desactivar Markdown</string>
     <string name="light_theme">Tema Claro</string>
     <string name="dark_theme">Tema Oscuro</string>
-    <string name="black_them">Tema Negro</string>
+    <string name="black_theme">Tema Negro</string>
     <string name="notification_listening_for_events">Detectar eventos</string>
     <string name="notification_noisy_notifications">Notificaciones ruidosas</string>
     <string name="notification_silent_notifications">Notificaciones silenciosas</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 0d24729a57..dc6a5ced52 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -601,7 +601,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="people_search_user_directory">DIRECTORIO DE USUARIOS (%s)</string>
     <string name="light_theme">Tema Claro</string>
     <string name="dark_theme">Tema Oscuro</string>
-    <string name="black_them">Tema Negro</string>
+    <string name="black_theme">Tema Negro</string>
     <string name="notification_sync_in_progress">Sincronizando…</string>
     <string name="notification_listening_for_events">Captando eventos</string>
     <string name="notification_noisy_notifications">Notificaciones ruidosas</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index e04af0f5df..f570f3afa8 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Hele teema</string>
     <string name="dark_theme">Tume teema</string>
-    <string name="black_them">Must teema</string>
+    <string name="black_theme">Must teema</string>
     <string name="notification_sync_init">Käivitan teenuse</string>
     <string name="notification_sync_in_progress">Sünkroniseerin…</string>
     <string name="notification_listening_for_events">Kuulan, kas leidub sündmusi</string>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 5ac7769e07..15a5c317d6 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -637,7 +637,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="huge">Erraldoia</string>
     <string name="light_theme">Azal argia</string>
     <string name="dark_theme">Azal iluna</string>
-    <string name="black_them">Azal beltza</string>
+    <string name="black_theme">Azal beltza</string>
 
     <string name="notification_sync_in_progress">Sinkronizatzen…</string>
     <string name="notification_listening_for_events">Entzun gertaerak</string>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 906b5cfb07..1cfd61644c 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">زمینهٔ روشن</string>
     <string name="dark_theme">زمینهٔ تیره</string>
-    <string name="black_them">زمینهٔ سیاه</string>
+    <string name="black_theme">زمینهٔ سیاه</string>
     <string name="notification_listening_for_events">در حال گوش دادن به رویدادها</string>
     <string name="title_activity_home">پیام‌ها</string>
     <string name="title_activity_room">اتاق</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index e721291a4a..19013de106 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -613,7 +613,7 @@
     <string name="offline">Yhteydetön</string>
     <string name="light_theme">Vaalea teema</string>
     <string name="dark_theme">Tumma teema</string>
-    <string name="black_them">Musta teema</string>
+    <string name="black_theme">Musta teema</string>
     <string name="notification_sync_in_progress">Synkronoidaan…</string>
     <string name="notification_listening_for_events">Kuunnellaan tapahtumia</string>
     <string name="notification_noisy_notifications">Äänekkäät ilmoitukset</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 0bebb626e9..fa47d881c4 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -545,7 +545,7 @@
     <string name="huge">Énorme</string>
     <string name="light_theme">Thème clair</string>
     <string name="dark_theme">Thème sombre</string>
-    <string name="black_them">Thème noir</string>
+    <string name="black_theme">Thème noir</string>
     <string name="notification_sync_in_progress">Synchronisation…</string>
     <string name="notification_listening_for_events">Écoute d’évènements</string>
     <string name="settings_notification_ringtone">Son de notification</string>
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index af264e5723..bce5836731 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Ljocht tema</string>
     <string name="dark_theme">Donker tema</string>
-    <string name="black_them">Swart tema</string>
+    <string name="black_theme">Swart tema</string>
 
     <string name="notification_sync_init">Tsjinst inisjalisearje</string>
     <string name="notification_sync_in_progress">Syngronisearje…</string>
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index f0c7832dc6..fcbf0aa122 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Decorado claro</string>
     <string name="dark_theme">Decorado escuro</string>
-    <string name="black_them">Decorado negro</string>
+    <string name="black_theme">Decorado negro</string>
     <string name="notification_sync_in_progress">Sincronizando…</string>
     <string name="notification_noisy_notifications">Notificacións con son</string>
     <string name="notification_silent_notifications">Notificacións silenciosas</string>
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
index 3a5e86445b..dd91c10740 100644
--- a/vector/src/main/res/values-he/strings.xml
+++ b/vector/src/main/res/values-he/strings.xml
@@ -120,7 +120,7 @@
     <string name="notification_listening_for_events">האזנה לאירועים</string>
     <string name="notification_sync_in_progress">מסנכרן…</string>
     <string name="notification_sync_init">אתחול השירות</string>
-    <string name="black_them">ערכת נושא שחורה</string>
+    <string name="black_theme">ערכת נושא שחורה</string>
     <string name="dark_theme">ערכת נושא כהה</string>
     <string name="light_theme">ערכת נושא בהירה</string>
     <plurals name="public_room_nb_users">
diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml
index d672a48c50..444e3f722b 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Svijetla tema</string>
     <string name="dark_theme">Tamna tema</string>
-    <string name="black_them">Crna tema</string>
+    <string name="black_theme">Crna tema</string>
     <string name="notification_sync_init">Inicijalizacija servisa</string>
     <string name="notification_sync_in_progress">Sinkronizacija u tijeku…</string>
     <string name="notification_listening_for_events">Osluškivanje događaja</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 78b446c53a..12294a4094 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -545,7 +545,7 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="user_directory_header">Felhasználói címjegyzék</string>
     <string name="light_theme">Világos téma</string>
     <string name="dark_theme">Sötét téma</string>
-    <string name="black_them">Fekete téma</string>
+    <string name="black_theme">Fekete téma</string>
     <string name="settings_notification_ringtone">Értesítés hangja</string>
     <string name="settings_12_24_timestamps">Időbélyegek mutatása 12 órás formátumban</string>
     <string name="widget_no_power_to_manage">Engedélyre van szükséged a kisalkalmazások ebben a szobában való kezeléséhez</string>
diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml
index 97ff704aa4..b96d08030f 100644
--- a/vector/src/main/res/values-id/strings.xml
+++ b/vector/src/main/res/values-id/strings.xml
@@ -257,7 +257,7 @@ Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string
 Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="light_theme">Tema Terang</string>
     <string name="dark_theme">Tema Kelam</string>
-    <string name="black_them">Tema Gelap</string>
+    <string name="black_theme">Tema Gelap</string>
 
     <string name="notification_sync_in_progress">Sedang Sinkronisasi</string>
     <string name="notification_noisy_notifications">Pemberitahuan Berisik</string>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index 97ff704aa4..b96d08030f 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -257,7 +257,7 @@ Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string
 Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="light_theme">Tema Terang</string>
     <string name="dark_theme">Tema Kelam</string>
-    <string name="black_them">Tema Gelap</string>
+    <string name="black_theme">Tema Gelap</string>
 
     <string name="notification_sync_in_progress">Sedang Sinkronisasi</string>
     <string name="notification_noisy_notifications">Pemberitahuan Berisik</string>
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index c1c016fed0..1edc352a4b 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Ljóst þema</string>
     <string name="dark_theme">Dökkt þema</string>
-    <string name="black_them">Svart þema</string>
+    <string name="black_theme">Svart þema</string>
 
     <string name="notification_sync_in_progress">Samstilli</string>
     <string name="notification_listening_for_events">Hlusta eftir atburðum</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 060ea56a52..eb080ba7ad 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -602,7 +602,7 @@
     <string name="huge">Enorme</string>
     <string name="light_theme">Tema Chiaro</string>
     <string name="dark_theme">Tema Scuro</string>
-    <string name="black_them">Tema Nero</string>
+    <string name="black_theme">Tema Nero</string>
     <string name="notification_sync_in_progress">Sincronizzazione…</string>
     <string name="settings_notification_ringtone">Suono delle notifiche</string>
     <string name="settings_12_24_timestamps">Mostra gli orari in formato 12 ore</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index 3a5e86445b..dd91c10740 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -120,7 +120,7 @@
     <string name="notification_listening_for_events">האזנה לאירועים</string>
     <string name="notification_sync_in_progress">מסנכרן…</string>
     <string name="notification_sync_init">אתחול השירות</string>
-    <string name="black_them">ערכת נושא שחורה</string>
+    <string name="black_theme">ערכת נושא שחורה</string>
     <string name="dark_theme">ערכת נושא כהה</string>
     <string name="light_theme">ערכת נושא בהירה</string>
     <plurals name="public_room_nb_users">
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 259982025f..5919bb8df2 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -107,7 +107,7 @@
     <string name="room_message_placeholder_encrypted">暗号文を送信…</string>
     <string name="light_theme">明るいテーマ</string>
     <string name="dark_theme">暗いテーマ</string>
-    <string name="black_them">黒いテーマ</string>
+    <string name="black_theme">黒いテーマ</string>
     <string name="notification_sync_in_progress">同期中…</string>
     <string name="title_activity_home">メッセージ</string>
     <string name="title_activity_member_details">メンバー詳細</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 8988c4ade1..c374253000 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Asentel aceɛlal</string>
     <string name="dark_theme">Asentel n yiḍ</string>
-    <string name="black_them">Asentel aberkan</string>
+    <string name="black_theme">Asentel aberkan</string>
     <string name="notification_sync_init">Awennez n umeẓlu</string>
     <string name="title_activity_home">Iznan</string>
     <string name="title_activity_room">Taxxamt</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 51ddb6850d..0f3cbf4ff5 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">밝은 테마</string>
     <string name="dark_theme">어두운 테마</string>
-    <string name="black_them">검정 테마</string>
+    <string name="black_theme">검정 테마</string>
 
     <string name="notification_sync_in_progress">동기화 중…</string>
     <string name="title_activity_home">메시지</string>
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 180d6d748d..06b9ce4c02 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -115,7 +115,7 @@
     <string name="auth_user_name_placeholder">Lietotājvārds</string>
     <string name="light_theme">Gaiša tēma</string>
     <string name="dark_theme">Tumša tēma</string>
-    <string name="black_them">Melna tēma</string>
+    <string name="black_theme">Melna tēma</string>
     <string name="notification_sync_in_progress">Sinhronizācija…</string>
     <string name="notification_listening_for_events">Notikumu monitorings</string>
     <string name="notification_noisy_notifications">Skaņi paziņojumi</string>
diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 20ee803f30..64c469592c 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -250,7 +250,7 @@
     <string name="home_filter_placeholder_home">മുറി നാമങ്ങൾ ഫിൽറ്റർ ചെയ്യൂ</string>
     <string name="send_anyway">എന്തായാലും അയയ്ക്കൂ</string>
     <string name="title_activity_keys_backup_setup">കീ ബാക്കപ്പ്</string>
-    <string name="black_them">കറുത്ത തീം</string>
+    <string name="black_theme">കറുത്ത തീം</string>
     <string name="dark_theme">ഡാ൪ക്ക് തീം</string>
     <string name="light_theme">ലൈറ്റ് തീം</string>
     <string name="notification_sync_init">സേവനം സമാരംഭിക്കുന്നു</string>
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 3f96911403..7ca1368cfd 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Lyst tema</string>
     <string name="dark_theme">Mørkt tema</string>
-    <string name="black_them">Svart tema</string>
+    <string name="black_theme">Svart tema</string>
     <string name="notification_sync_init">Klargjør tjenesten</string>
     <string name="notification_sync_in_progress">Synkroniserer …</string>
     <string name="title_activity_home">Meldinger</string>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 5d2c847e27..40f604eb1d 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -599,7 +599,7 @@
     <string name="huge">Gigantisch</string>
     <string name="light_theme">Licht thema</string>
     <string name="dark_theme">Donker thema</string>
-    <string name="black_them">Zwart thema</string>
+    <string name="black_theme">Zwart thema</string>
     <string name="notification_sync_in_progress">Bezig met synchroniseren…</string>
     <string name="notification_listening_for_events">Luisteren voor evenementen</string>
     <string name="settings_notification_ringtone">Meldingsgeluid</string>
diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml
index 203cd0834d..c4c5d7d9a9 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Lyst tema</string>
     <string name="dark_theme">Mørkt tema</string>
-    <string name="black_them">Svart tema</string>
+    <string name="black_theme">Svart tema</string>
     <string name="notification_sync_in_progress">Synkroniserar…</string>
     <string name="notification_listening_for_events">Lyttar etter hendingar</string>
     <string name="notification_noisy_notifications">Bråkete varsel</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 95b624df9a..9748bcdf6b 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -444,7 +444,7 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="huge">P O T Ę Ż N Y</string>
     <string name="light_theme">Jasny motyw</string>
     <string name="dark_theme">Ciemny motyw</string>
-    <string name="black_them">Czarny motyw</string>
+    <string name="black_theme">Czarny motyw</string>
     <string name="call">Zadzwoń</string>
     <string name="avatar">Awatar</string>
     <string name="reason_colon">Powód: %1$s</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 59b5ea9405..48a4dae763 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -601,7 +601,7 @@
     <string name="huge">Gigantesco</string>
     <string name="light_theme">Tema claro</string>
     <string name="dark_theme">Tema escuro</string>
-    <string name="black_them">Tema preto</string>
+    <string name="black_theme">Tema preto</string>
     <string name="notification_sync_in_progress">Sincronizando…</string>
     <string name="notification_listening_for_events">Escutando eventos</string>
     <string name="notification_noisy_notifications">Notificações com som</string>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
index a19e3fe56f..3db77cf60f 100644
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -600,7 +600,7 @@ Dispositivos desconhecidos:</string>
     <string name="settings_clear_media_cache">Limpar cache de multimédia</string>
     <string name="light_theme">Tema Claro</string>
     <string name="dark_theme">Tema Escuro</string>
-    <string name="black_them">Tema Preto</string>
+    <string name="black_theme">Tema Preto</string>
     <string name="settings_notification_ringtone">Som de notificação</string>
     <string name="settings_12_24_timestamps">Utilizar formato de 12 horas (ex. 2:30pm)</string>
     <string name="widget_no_power_to_manage">Precisa de permissão para gerir os widgets nesta sala</string>
diff --git a/vector/src/main/res/values-ro/strings.xml b/vector/src/main/res/values-ro/strings.xml
index 39cce6c5b1..8ed9df6f47 100644
--- a/vector/src/main/res/values-ro/strings.xml
+++ b/vector/src/main/res/values-ro/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Temă luminoasă</string>
     <string name="dark_theme">Temă întunecată</string>
-    <string name="black_them">Temă Neagră</string>
+    <string name="black_theme">Temă Neagră</string>
 
     <string name="notification_sync_init">Inițializează serviciu</string>
     <string name="notification_sync_in_progress">Sincronizează…</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 319f9bb14b..878105c1fe 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -600,7 +600,7 @@
     <string name="settings_keep_media">Сохранить медиа</string>
     <string name="light_theme">Светлая тема</string>
     <string name="dark_theme">Тёмная тема</string>
-    <string name="black_them">Чёрная тема</string>
+    <string name="black_theme">Чёрная тема</string>
     <string name="settings_notification_ringtone">Звук уведомлений</string>
     <string name="settings_12_24_timestamps">Показывать метки времени в 12-часовом формате</string>
     <string name="widget_no_power_to_manage">Вам нужно разрешение на управление виджетами в этой комнате</string>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 4268d2ce33..3f9abae610 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Svetlý vzhľad</string>
     <string name="dark_theme">Tmavý vzhľad</string>
-    <string name="black_them">Čierny vzhľad</string>
+    <string name="black_theme">Čierny vzhľad</string>
 
     <string name="notification_sync_in_progress">Prebieha synchronizácia…</string>
     <string name="notification_listening_for_events">Spracovanie udalostí</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 66b3da80c3..a06bf6f141 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Temë e Çelët</string>
     <string name="dark_theme">Temë e Errët</string>
-    <string name="black_them">Temë e Zezë</string>
+    <string name="black_theme">Temë e Zezë</string>
     <string name="notification_noisy_notifications">Njoftime të zhurmshme</string>
     <string name="notification_silent_notifications">Njoftime të heshtura</string>
     <string name="title_activity_home">Mesazhe</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 5cb61732b2..2f5e124948 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">светла тема</string>
     <string name="dark_theme">тамна тема</string>
-    <string name="black_them">црна тема</string>
+    <string name="black_theme">црна тема</string>
     <string name="notification_sync_init">Иницијализација сервиса</string>
     <string name="notification_sync_in_progress">Синхронизујем…</string>
     <string name="notification_noisy_notifications">Бучна обавештења</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index ee7589d22a..fbe8aa9289 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Ljust tema</string>
     <string name="dark_theme">Mörkt tema</string>
-    <string name="black_them">Svart tema</string>
+    <string name="black_theme">Svart tema</string>
     <string name="notification_sync_init">Initialiserar tjänst</string>
     <string name="notification_sync_in_progress">Synkroniserar…</string>
     <string name="notification_listening_for_events">Lyssnar efter händelser</string>
diff --git a/vector/src/main/res/values-szl/strings.xml b/vector/src/main/res/values-szl/strings.xml
index 2ad61d1f87..e060344ae4 100644
--- a/vector/src/main/res/values-szl/strings.xml
+++ b/vector/src/main/res/values-szl/strings.xml
@@ -56,7 +56,7 @@
     <string name="notification_listening_for_events">Nasuchowanie zdarzyń</string>
     <string name="notification_sync_in_progress">Synchrōnizowanie…</string>
     <string name="notification_sync_init">Inicjalizacyjo usugi</string>
-    <string name="black_them">Czorny tymat</string>
+    <string name="black_theme">Czorny tymat</string>
     <string name="dark_theme">Ciymny tymat</string>
     <string name="light_theme">Jasny tymat</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-tlh/strings.xml b/vector/src/main/res/values-tlh/strings.xml
index 2d0c94a5f1..0f7f1ac8e9 100644
--- a/vector/src/main/res/values-tlh/strings.xml
+++ b/vector/src/main/res/values-tlh/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">tu\'qom wov</string>
     <string name="dark_theme">tu\'qom Hurgh</string>
-    <string name="black_them">tu\'qom qIj</string>
+    <string name="black_theme">tu\'qom qIj</string>
 
     <string name="notification_sync_in_progress">vIrapmoHltaH</string>
     <string name="notification_listening_for_events">wanI\' vInejtaH</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 0e1237ad33..2eb31a80d5 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">Açık Tema</string>
     <string name="dark_theme">Koyu Tema</string>
-    <string name="black_them">Siyah Tema</string>
+    <string name="black_theme">Siyah Tema</string>
     <string name="notification_sync_in_progress">Senkronize ediliyor…</string>
     <string name="notification_listening_for_events">Etkinlikler dinleniyor</string>
     <string name="notification_noisy_notifications">Sesli bildirimler</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 6de37cec86..c3dc489054 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -3,7 +3,7 @@
     <!-- theme -->
     <string name="light_theme">Світла Тема</string>
     <string name="dark_theme">Темна Тема</string>
-    <string name="black_them">OLED Тема</string>
+    <string name="black_theme">OLED Тема</string>
     <!-- permanent notification subtitle -->
     <string name="notification_sync_in_progress">Синхронізація…</string>
     <string name="notification_listening_for_events">Слухати події</string>
diff --git a/vector/src/main/res/values-uz/strings.xml b/vector/src/main/res/values-uz/strings.xml
index 4bc6eb2047..b705987cdf 100644
--- a/vector/src/main/res/values-uz/strings.xml
+++ b/vector/src/main/res/values-uz/strings.xml
@@ -59,7 +59,7 @@
     <string name="notification_noisy_notifications">Shovqinli bildirishnomalar</string>
     <string name="notification_listening_for_events">Hodisalarni tinglash</string>
     <string name="notification_sync_init">Xizmat ishga tushirilmoqda</string>
-    <string name="black_them">Qop-qora tema</string>
+    <string name="black_theme">Qop-qora tema</string>
     <string name="dark_theme">Qora tema</string>
     <string name="light_theme">Oq tema</string>
     <string name="system_theme">Tizim tanlovi boʻyicha</string>
diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index 1b0dddc4e6..b665fb925d 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -151,7 +151,7 @@
     <string name="notification_listening_for_events">Theo dõi sự kiện</string>
     <string name="notification_sync_in_progress">Đang đồng bộ hóa…</string>
     <string name="notification_sync_init">Đang khởi tạo dịch vụ</string>
-    <string name="black_them">Nền đen</string>
+    <string name="black_theme">Nền đen</string>
     <string name="dark_theme">Nền tối</string>
     <string name="light_theme">Nền sáng</string>
     <string name="auth_email_validation_message">Vui lòng kiểm tra email của bạn để tiếp tục quá trình đăng ký</string>
diff --git a/vector/src/main/res/values-vls/strings.xml b/vector/src/main/res/values-vls/strings.xml
index 896dbcaf23..4e30374a81 100644
--- a/vector/src/main/res/values-vls/strings.xml
+++ b/vector/src/main/res/values-vls/strings.xml
@@ -4,7 +4,7 @@
 
     <string name="light_theme">Licht thema</string>
     <string name="dark_theme">Dounker thema</string>
-    <string name="black_them">Zwart thema</string>
+    <string name="black_theme">Zwart thema</string>
 
     <string name="notification_sync_init">Dienst wor geïnitialiseerd</string>
     <string name="notification_sync_in_progress">Bezig me synchroniseern…</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 89c84a0998..3d9186d599 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -551,7 +551,7 @@
     <string name="huge">巨大</string>
     <string name="light_theme">浅色主题</string>
     <string name="dark_theme">深色主题</string>
-    <string name="black_them">黑色主题</string>
+    <string name="black_theme">黑色主题</string>
     <string name="settings_notification_ringtone">通知声音</string>
     <string name="settings_12_24_timestamps">使用12小时制显示时间戳</string>
     <string name="widget_no_power_to_manage">您需要权限来管理这个聊天室的小部件</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 4fae3868eb..b915f2d97d 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="light_theme">淺色主題</string>
     <string name="dark_theme">深色主題</string>
-    <string name="black_them">黑色主題</string>
+    <string name="black_theme">黑色主題</string>
     <string name="notification_sync_in_progress">正在同步……</string>
     <string name="notification_listening_for_events">聆聽事件</string>
     <string name="call_notification_answer">接受</string>
diff --git a/vector/src/main/res/values/array.xml b/vector/src/main/res/values/array.xml
index c2cd0b4cc5..26f7a39bf1 100644
--- a/vector/src/main/res/values/array.xml
+++ b/vector/src/main/res/values/array.xml
@@ -40,7 +40,7 @@
         <item>@string/system_theme</item>
         <item>@string/light_theme</item>
         <item>@string/dark_theme</item>
-        <item>@string/black_them</item>
+        <item>@string/black_theme</item>
     </string-array>
 
     <string-array name="theme_values">
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index b4ed3aca81..feaad8bf1f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="system_theme">System Default</string>
     <string name="light_theme">Light Theme</string>
     <string name="dark_theme">Dark Theme</string>
-    <string name="black_them">Black Theme</string>
+    <string name="black_theme">Black Theme</string>
 
     <!-- permanent notification subtitle -->
     <string name="notification_sync_init">Initializing service</string>

From 898c2d514cac8f683dc61a0770049743e3086b57 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 11:26:12 +0100
Subject: [PATCH 169/578] Add configuration for new languages

---
 vector/src/main/res/values-si/strings_no_weblate.xml | 8 ++++++++
 vector/src/main/res/values-uz/strings_no_weblate.xml | 8 ++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 vector/src/main/res/values-si/strings_no_weblate.xml
 create mode 100644 vector/src/main/res/values-uz/strings_no_weblate.xml

diff --git a/vector/src/main/res/values-si/strings_no_weblate.xml b/vector/src/main/res/values-si/strings_no_weblate.xml
new file mode 100644
index 0000000000..14f7be6a94
--- /dev/null
+++ b/vector/src/main/res/values-si/strings_no_weblate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="resources_language">si</string>
+    <string name="resources_country_code">LK</string>
+    <string name="resources_script">Latn</string>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-uz/strings_no_weblate.xml b/vector/src/main/res/values-uz/strings_no_weblate.xml
new file mode 100644
index 0000000000..080541f37a
--- /dev/null
+++ b/vector/src/main/res/values-uz/strings_no_weblate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="resources_language">uz</string>
+    <string name="resources_country_code">UZ</string>
+    <string name="resources_script">Latn</string>
+
+</resources>
\ No newline at end of file

From c42b42cb6107c9b78c36a17f1ef1be46acbaff1e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 12:13:08 +0100
Subject: [PATCH 170/578] Remove string usage from SDK - step 1 - Role Lint
 will also be able to detect more possible errors with this change

---
 .../sdk/api/session/room/powerlevels/Role.kt  | 13 +++----
 .../timeline/format/NoticeEventFormatter.kt   |  6 ++--
 .../roomprofile/permissions/RoleFormatter.kt  | 35 +++++++++++++++++++
 .../permissions/RoomPermissionsController.kt  | 12 ++-----
 4 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoleFormatter.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
index ecfddad0a4..5fe9bf6993 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
@@ -17,14 +17,11 @@
 
 package org.matrix.android.sdk.api.session.room.powerlevels
 
-import androidx.annotation.StringRes
-import org.matrix.android.sdk.R
-
-sealed class Role(open val value: Int, @StringRes val res: Int) : Comparable<Role> {
-    object Admin : Role(100, R.string.power_level_admin)
-    object Moderator : Role(50, R.string.power_level_moderator)
-    object Default : Role(0, R.string.power_level_default)
-    data class Custom(override val value: Int) : Role(value, R.string.power_level_custom)
+sealed class Role(open val value: Int) : Comparable<Role> {
+    object Admin : Role(100)
+    object Moderator : Role(50)
+    object Default : Role(0)
+    data class Custom(override val value: Int) : Role(value)
 
     override fun compareTo(other: Role): Int {
         return value.compareTo(other.value)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 1c86749abc..878cec0a07 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -20,6 +20,7 @@ import im.vector.app.ActiveSessionDataSource
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
+import im.vector.app.features.roomprofile.permissions.RoleFormatter
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.extensions.appendNl
 import org.matrix.android.sdk.api.extensions.orFalse
@@ -55,6 +56,7 @@ import javax.inject.Inject
 class NoticeEventFormatter @Inject constructor(
         private val activeSessionDataSource: ActiveSessionDataSource,
         private val roomHistoryVisibilityFormatter: RoomHistoryVisibilityFormatter,
+        private val roleFormatter: RoleFormatter,
         private val vectorPreferences: VectorPreferences,
         private val roomSummariesHolder: RoomSummariesHolder,
         private val sp: StringProvider
@@ -124,8 +126,8 @@ class NoticeEventFormatter @Inject constructor(
             val from = PowerLevelsHelper(previousPowerLevelsContent).getUserRole(userId)
             val to = PowerLevelsHelper(powerLevelsContent).getUserRole(userId)
             if (from != to) {
-                val fromStr = sp.getString(from.res, from.value)
-                val toStr = sp.getString(to.res, to.value)
+                val fromStr = roleFormatter.format(from)
+                val toStr = roleFormatter.format(to)
                 val diff = sp.getString(R.string.notice_power_level_diff, userId, fromStr, toStr)
                 diffs.add(diff)
             }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoleFormatter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoleFormatter.kt
new file mode 100644
index 0000000000..699cdd29e2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoleFormatter.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.roomprofile.permissions
+
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
+import javax.inject.Inject
+
+class RoleFormatter @Inject constructor(
+        private val stringProvider: StringProvider
+) {
+    fun format(role: Role): String {
+        return when (role) {
+            Role.Admin     -> stringProvider.getString(R.string.power_level_admin)
+            Role.Moderator -> stringProvider.getString(R.string.power_level_moderator)
+            Role.Default   -> stringProvider.getString(R.string.power_level_default)
+            is Role.Custom -> stringProvider.getString(R.string.power_level_custom, role.value)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
index 92bdac7ae0..8f99132bc9 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
@@ -32,6 +32,7 @@ import javax.inject.Inject
 
 class RoomPermissionsController @Inject constructor(
         private val stringProvider: StringProvider,
+        private val roleFormatter: RoleFormatter,
         colorProvider: ColorProvider
 ) : TypedEpoxyController<RoomPermissionsViewState>() {
 
@@ -124,7 +125,7 @@ class RoomPermissionsController @Inject constructor(
         buildProfileAction(
                 id = editablePermission.labelResId.toString(),
                 title = stringProvider.getString(editablePermission.labelResId),
-                subtitle = getSubtitle(currentRole),
+                subtitle = roleFormatter.format(currentRole),
                 dividerColor = dividerColor,
                 divider = true,
                 editable = editable,
@@ -136,15 +137,6 @@ class RoomPermissionsController @Inject constructor(
         )
     }
 
-    private fun getSubtitle(currentRole: Role): String {
-        return when (currentRole) {
-            Role.Admin,
-            Role.Moderator,
-            Role.Default   -> stringProvider.getString(currentRole.res)
-            is Role.Custom -> stringProvider.getString(currentRole.res, currentRole.value)
-        }
-    }
-
     private fun getCurrentRole(editablePermission: EditablePermission, content: PowerLevelsContent): Role {
         val value = when (editablePermission) {
             is EditablePermission.EventTypeEditablePermission -> content.events[editablePermission.eventType] ?: content.stateDefault

From e2e7516a99f63773550bfee67c176f5ad4e3e88b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 12:43:05 +0100
Subject: [PATCH 171/578] Remove string usage from SDK - step 2 - InitSyncStep

---
 .../sdk/api/session/initsync/InitSyncStep.kt  | 30 +++++++++++++
 .../initsync/InitialSyncProgressService.kt    |  3 +-
 .../DefaultInitialSyncProgressService.kt      | 12 +++---
 .../internal/session/initsync/Extensions.kt   | 10 ++---
 .../session/initsync/ProgressReporter.kt      |  4 +-
 .../sdk/internal/session/initsync/TaskInfo.kt |  4 +-
 .../internal/session/sync/GroupSyncHandler.kt |  8 ++--
 .../internal/session/sync/RoomSyncHandler.kt  | 12 +++---
 .../session/sync/SyncResponseHandler.kt       | 10 ++---
 .../sdk/internal/session/sync/SyncTask.kt     | 12 +++---
 .../vector/app/features/home/HomeActivity.kt  |  8 ++--
 .../features/home/InitSyncStepFormatter.kt    | 43 +++++++++++++++++++
 12 files changed, 115 insertions(+), 41 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt
new file mode 100644
index 0000000000..296f2bafaf
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.initsync
+
+enum class InitSyncStep {
+    ServerComputing,
+    Downloading,
+    ImportingAccount,
+    ImportingAccountCrypto,
+    ImportingAccountRoom,
+    ImportingAccountGroups,
+    ImportingAccountData,
+    ImportingAccountJoinedRooms,
+    ImportingAccountInvitedRooms,
+    ImportingAccountLeftRooms
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
index 0953696bc1..b5d4ef4dbb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitialSyncProgressService.kt
@@ -15,7 +15,6 @@
  */
 package org.matrix.android.sdk.api.session.initsync
 
-import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 
 interface InitialSyncProgressService {
@@ -25,7 +24,7 @@ interface InitialSyncProgressService {
     sealed class Status {
         object Idle : Status()
         data class Progressing(
-                @StringRes val statusText: Int,
+                val initSyncStep: InitSyncStep,
                 val percentProgress: Int = 0
         ) : Status()
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
index dc069d3e5e..eb3e3066b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/DefaultInitialSyncProgressService.kt
@@ -15,9 +15,9 @@
  */
 package org.matrix.android.sdk.internal.session.initsync
 
-import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
@@ -38,22 +38,22 @@ internal class DefaultInitialSyncProgressService @Inject constructor()
     /**
      * Create a rootTask
      */
-    fun startRoot(@StringRes nameRes: Int,
+    fun startRoot(initSyncStep: InitSyncStep,
                   totalProgress: Int) {
         endAll()
-        rootTask = TaskInfo(nameRes, totalProgress, null, 1F)
+        rootTask = TaskInfo(initSyncStep, totalProgress, null, 1F)
         reportProgress(0F)
     }
 
     /**
      * Add a child to the leaf
      */
-    override fun startTask(@StringRes nameRes: Int,
+    override fun startTask(initSyncStep: InitSyncStep,
                            totalProgress: Int,
                            parentWeight: Float) {
         val currentLeaf = rootTask?.leaf() ?: return
         currentLeaf.child = TaskInfo(
-                nameRes = nameRes,
+                initSyncStep = initSyncStep,
                 totalProgress = totalProgress,
                 parent = currentLeaf,
                 parentWeight = parentWeight
@@ -67,7 +67,7 @@ internal class DefaultInitialSyncProgressService @Inject constructor()
                 // Update the progress of the leaf and all its parents
                 leaf.setProgress(progress)
                 // Then update the live data using leaf wording and root progress
-                status.postValue(InitialSyncProgressService.Status.Progressing(leaf.nameRes, root.currentProgress.toInt()))
+                status.postValue(InitialSyncProgressService.Status.Progressing(leaf.initSyncStep, root.currentProgress.toInt()))
             }
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt
index f58559117c..b40b1a56bf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/Extensions.kt
@@ -16,25 +16,25 @@
 
 package org.matrix.android.sdk.internal.session.initsync
 
-import androidx.annotation.StringRes
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 
 internal inline fun <T> reportSubtask(reporter: ProgressReporter?,
-                                      @StringRes nameRes: Int,
+                                      initSyncStep: InitSyncStep,
                                       totalProgress: Int,
                                       parentWeight: Float,
                                       block: () -> T): T {
-    reporter?.startTask(nameRes, totalProgress, parentWeight)
+    reporter?.startTask(initSyncStep, totalProgress, parentWeight)
     return block().also {
         reporter?.endTask()
     }
 }
 
 internal inline fun <K, V, R> Map<out K, V>.mapWithProgress(reporter: ProgressReporter?,
-                                                            @StringRes nameRes: Int,
+                                                            initSyncStep: InitSyncStep,
                                                             parentWeight: Float,
                                                             transform: (Map.Entry<K, V>) -> R): List<R> {
     var current = 0F
-    reporter?.startTask(nameRes, count() + 1, parentWeight)
+    reporter?.startTask(initSyncStep, count() + 1, parentWeight)
     return map {
         reporter?.reportProgress(current)
         current++
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt
index 5361d107d2..8a7b26b4b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/ProgressReporter.kt
@@ -16,10 +16,10 @@
 
 package org.matrix.android.sdk.internal.session.initsync
 
-import androidx.annotation.StringRes
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 
 internal interface ProgressReporter {
-    fun startTask(@StringRes nameRes: Int,
+    fun startTask(initSyncStep: InitSyncStep,
                   totalProgress: Int,
                   parentWeight: Float)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt
index 37c2b152a9..3e4cce2e1f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/initsync/TaskInfo.kt
@@ -16,10 +16,10 @@
 
 package org.matrix.android.sdk.internal.session.initsync
 
-import androidx.annotation.StringRes
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import timber.log.Timber
 
-internal class TaskInfo(@StringRes val nameRes: Int,
+internal class TaskInfo(val initSyncStep: InitSyncStep,
                         val totalProgress: Int,
                         val parent: TaskInfo?,
                         val parentWeight: Float) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
index 112236b14f..02362bf050 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.sync
 
 import io.realm.Realm
-import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.internal.database.model.GroupEntity
 import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
@@ -50,17 +50,17 @@ internal class GroupSyncHandler @Inject constructor() {
     private fun handleGroupSync(realm: Realm, handlingStrategy: HandlingStrategy, reporter: ProgressReporter?) {
         val groups = when (handlingStrategy) {
             is HandlingStrategy.JOINED  ->
-                handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_groups, 0.6f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountGroups, 0.6f) {
                     handleJoinedGroup(realm, it.key)
                 }
 
             is HandlingStrategy.INVITED ->
-                handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_groups, 0.3f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountGroups, 0.3f) {
                     handleInvitedGroup(realm, it.key)
                 }
 
             is HandlingStrategy.LEFT    ->
-                handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_groups, 0.1f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountGroups, 0.1f) {
                     handleLeftGroup(realm, it.key)
                 }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 9f54d0b86c..eac5e7e6ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -18,11 +18,11 @@ package org.matrix.android.sdk.internal.session.sync
 
 import io.realm.Realm
 import io.realm.kotlin.createObject
-import org.matrix.android.sdk.R
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTagContent
@@ -112,18 +112,18 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                     // Rooms are already inserted, return an empty list
                     emptyList()
                 } else {
-                    handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_joined_rooms, 0.6f) {
+                    handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
                         handleJoinedRoom(realm, it.key, it.value.roomSync, insertType, syncLocalTimeStampMillis)
                     }
                 }
             }
             is HandlingStrategy.INVITED ->
-                handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_invited_rooms, 0.1f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountInvitedRooms, 0.1f) {
                     handleInvitedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
                 }
 
             is HandlingStrategy.LEFT    -> {
-                handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_left_rooms, 0.3f) {
+                handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountLeftRooms, 0.3f) {
                     handleLeftRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
                 }
             }
@@ -141,7 +141,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         val numberOfChunks = ceil(listSize / maxSize.toDouble()).toInt()
 
         if (numberOfChunks > 1) {
-            reportSubtask(reporter, R.string.initial_sync_start_importing_account_joined_rooms, numberOfChunks, 0.6f) {
+            reportSubtask(reporter, InitSyncStep.ImportingAccountJoinedRooms, numberOfChunks, 0.6f) {
                 val chunkSize = listSize / numberOfChunks
                 Timber.v("INIT_SYNC $listSize rooms to insert, split into $numberOfChunks sublists of $chunkSize items")
                 // I cannot find a better way to chunk a map, so chunk the keys and then create new maps
@@ -165,7 +165,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
             }
         } else {
             // No need to split
-            val rooms = handlingStrategy.data.mapWithProgress(reporter, R.string.initial_sync_start_importing_account_joined_rooms, 0.6f) {
+            val rooms = handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
                 handleJoinedRoom(realm, it.key, it.value.roomSync, insertType, syncLocalTimeStampMillis)
             }
             realm.insertOrUpdate(rooms)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index 3f501858b1..167e45031c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -18,9 +18,9 @@ package org.matrix.android.sdk.internal.session.sync
 
 import androidx.work.ExistingPeriodicWorkPolicy
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.R
 import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.pushrules.RuleScope
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.SessionId
@@ -73,7 +73,7 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
         // to ensure to decrypt them properly
         measureTimeMillis {
             Timber.v("Handle toDevice")
-            reportSubtask(reporter, R.string.initial_sync_start_importing_account_crypto, 100, 0.1f) {
+            reportSubtask(reporter, InitSyncStep.ImportingAccountCrypto, 100, 0.1f) {
                 if (syncResponse.toDevice != null) {
                     cryptoSyncHandler.handleToDevice(syncResponse.toDevice, reporter)
                 }
@@ -85,7 +85,7 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
         monarchy.awaitTransaction { realm ->
             measureTimeMillis {
                 Timber.v("Handle rooms")
-                reportSubtask(reporter, R.string.initial_sync_start_importing_account_rooms, 1, 0.7f) {
+                reportSubtask(reporter, InitSyncStep.ImportingAccountRoom, 1, 0.7f) {
                     if (syncResponse.rooms != null) {
                         roomSyncHandler.handle(realm, syncResponse.rooms, isInitialSync, reporter)
                     }
@@ -95,7 +95,7 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
             }
 
             measureTimeMillis {
-                reportSubtask(reporter, R.string.initial_sync_start_importing_account_groups, 1, 0.1f) {
+                reportSubtask(reporter, InitSyncStep.ImportingAccountGroups, 1, 0.1f) {
                     Timber.v("Handle groups")
                     if (syncResponse.groups != null) {
                         groupSyncHandler.handle(realm, syncResponse.groups, reporter)
@@ -106,7 +106,7 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
             }
 
             measureTimeMillis {
-                reportSubtask(reporter, R.string.initial_sync_start_importing_account_data, 1, 0.1f) {
+                reportSubtask(reporter, InitSyncStep.ImportingAccountData, 1, 0.1f) {
                     Timber.v("Handle accountData")
                     userAccountDataSyncHandler.handle(realm, syncResponse.accountData)
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index dea047f7d0..3d0368ef03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.sync
 
 import okhttp3.ResponseBody
-import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
 import org.matrix.android.sdk.internal.di.SessionFilesDirectory
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
@@ -90,7 +90,7 @@ internal class DefaultSyncTask @Inject constructor(
         if (isInitialSync) {
             // We might want to get the user information in parallel too
             userStore.createOrUpdate(userId)
-            initialSyncProgressService.startRoot(R.string.initial_sync_start_importing_account, 100)
+            initialSyncProgressService.startRoot(InitSyncStep.ImportingAccount, 100)
         }
         // Maybe refresh the home server capabilities data we know
         getHomeServerCapabilitiesTask.execute(GetHomeServerCapabilitiesTask.Params(forceRefresh = false))
@@ -137,20 +137,20 @@ internal class DefaultSyncTask @Inject constructor(
         if (workingFile.exists() && status >= InitialSyncStatus.STEP_DOWNLOADED) {
             // Go directly to the parse step
             Timber.v("INIT_SYNC file is already here")
-            reportSubtask(initialSyncProgressService, R.string.initial_sync_start_downloading, 1, 0.3f) {
+            reportSubtask(initialSyncProgressService, InitSyncStep.Downloading, 1, 0.3f) {
                 // Empty task
             }
         } else {
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADING)
             val syncResponse = logDuration("INIT_SYNC Perform server request") {
-                reportSubtask(initialSyncProgressService, R.string.initial_sync_start_server_computing, 1, 0.2f) {
+                reportSubtask(initialSyncProgressService, InitSyncStep.ServerComputing, 1, 0.2f) {
                     getSyncResponse(requestParams, MAX_NUMBER_OF_RETRY_AFTER_TIMEOUT)
                 }
             }
 
             if (syncResponse.isSuccessful) {
                 logDuration("INIT_SYNC Download and save to file") {
-                    reportSubtask(initialSyncProgressService, R.string.initial_sync_start_downloading, 1, 0.1f) {
+                    reportSubtask(initialSyncProgressService, InitSyncStep.Downloading, 1, 0.1f) {
                         syncResponse.body()?.byteStream()?.use { inputStream ->
                             workingFile.outputStream().use { outputStream ->
                                 inputStream.copyTo(outputStream)
@@ -164,7 +164,7 @@ internal class DefaultSyncTask @Inject constructor(
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADED)
         }
-        reportSubtask(initialSyncProgressService, R.string.initial_sync_start_importing_account, 1, 0.7F) {
+        reportSubtask(initialSyncProgressService, InitSyncStep.ImportingAccount, 1, 0.7F) {
             handleSyncFile(workingFile, initSyncStrategy)
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 74399d9215..60a8836be5 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -99,6 +99,7 @@ class HomeActivity :
     @Inject lateinit var unknownDeviceViewModelFactory: UnknownDeviceDetectorSharedViewModel.Factory
     @Inject lateinit var permalinkHandler: PermalinkHandler
     @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var initSyncStepFormatter: InitSyncStepFormatter
 
     private val drawerListener = object : DrawerLayout.SimpleDrawerListener() {
         override fun onDrawerStateChanged(newState: Int) {
@@ -208,11 +209,12 @@ class HomeActivity :
 
     private fun renderState(state: HomeActivityViewState) {
         when (val status = state.initialSyncProgressServiceStatus) {
-            is InitialSyncProgressService.Status.Idle -> {
+            is InitialSyncProgressService.Status.Idle        -> {
                 views.waitingView.root.isVisible = false
             }
             is InitialSyncProgressService.Status.Progressing -> {
-                Timber.v("${getString(status.statusText)} ${status.percentProgress}")
+                val initSyncStepStr = initSyncStepFormatter.format(status.initSyncStep)
+                Timber.v("$initSyncStepStr ${status.percentProgress}")
                 views.waitingView.root.setOnClickListener {
                     // block interactions
                 }
@@ -223,7 +225,7 @@ class HomeActivity :
                     isVisible = true
                 }
                 views.waitingView.waitingStatusText.apply {
-                    text = getString(status.statusText)
+                    text = initSyncStepStr
                     isVisible = true
                 }
                 views.waitingView.root.isVisible = true
diff --git a/vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt b/vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
new file mode 100644
index 0000000000..51ca96341e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/InitSyncStepFormatter.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home
+
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.initsync.InitSyncStep
+import javax.inject.Inject
+
+class InitSyncStepFormatter @Inject constructor(
+        private val stringProvider: StringProvider
+) {
+    fun format(initSyncStep: InitSyncStep): String {
+        return stringProvider.getString(
+                when (initSyncStep) {
+                    InitSyncStep.ServerComputing              -> R.string.initial_sync_start_server_computing
+                    InitSyncStep.Downloading                  -> R.string.initial_sync_start_downloading
+                    InitSyncStep.ImportingAccount             -> R.string.initial_sync_start_importing_account
+                    InitSyncStep.ImportingAccountCrypto       -> R.string.initial_sync_start_importing_account_crypto
+                    InitSyncStep.ImportingAccountRoom         -> R.string.initial_sync_start_importing_account_rooms
+                    InitSyncStep.ImportingAccountGroups       -> R.string.initial_sync_start_importing_account_groups
+                    InitSyncStep.ImportingAccountData         -> R.string.initial_sync_start_importing_account_data
+                    InitSyncStep.ImportingAccountJoinedRooms  -> R.string.initial_sync_start_importing_account_joined_rooms
+                    InitSyncStep.ImportingAccountInvitedRooms -> R.string.initial_sync_start_importing_account_invited_rooms
+                    InitSyncStep.ImportingAccountLeftRooms    -> R.string.initial_sync_start_importing_account_left_rooms
+                }
+        )
+    }
+}

From 8682c95c1993944980768c9351a631df958cb505 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 12:52:49 +0100
Subject: [PATCH 172/578] Do not leak user's local in fallback for verification
 request

---
 .../VerificationTransportRoomMessage.kt       |  6 ++---
 .../room/send/LocalEchoEventFactory.kt        | 23 -------------------
 .../src/main/res/values-bg/strings.xml        |  1 -
 .../src/main/res/values-bn-rIN/strings.xml    |  1 -
 .../src/main/res/values-ca/strings.xml        |  1 -
 .../src/main/res/values-cs/strings.xml        |  1 -
 .../src/main/res/values-de/strings.xml        |  1 -
 .../src/main/res/values-eo/strings.xml        |  1 -
 .../src/main/res/values-es/strings.xml        |  1 -
 .../src/main/res/values-et/strings.xml        |  1 -
 .../src/main/res/values-eu/strings.xml        |  2 --
 .../src/main/res/values-fa/strings.xml        |  1 -
 .../src/main/res/values-fi/strings.xml        |  1 -
 .../src/main/res/values-fr/strings.xml        |  1 -
 .../src/main/res/values-gl/strings.xml        |  1 -
 .../src/main/res/values-hu/strings.xml        |  1 -
 .../src/main/res/values-it/strings.xml        |  1 -
 .../src/main/res/values-kab/strings.xml       |  1 -
 .../src/main/res/values-lv/strings.xml        |  1 -
 .../src/main/res/values-nl/strings.xml        |  1 -
 .../src/main/res/values-pt-rBR/strings.xml    |  1 -
 .../src/main/res/values-ru/strings.xml        |  1 -
 .../src/main/res/values-sk/strings.xml        |  1 -
 .../src/main/res/values-sq/strings.xml        |  1 -
 .../src/main/res/values-sr/strings.xml        |  1 -
 .../src/main/res/values-sv/strings.xml        |  1 -
 .../src/main/res/values-zh-rCN/strings.xml    |  1 -
 .../src/main/res/values-zh-rTW/strings.xml    |  1 -
 .../src/main/res/values/strings.xml           |  2 --
 29 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index a447e659f5..54cc0e8161 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -24,7 +24,6 @@ import androidx.work.WorkInfo
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.R
 import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
 import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoRequest
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
@@ -52,7 +51,6 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
 import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.util.StringProvider
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import timber.log.Timber
@@ -62,7 +60,6 @@ import javax.inject.Inject
 
 internal class VerificationTransportRoomMessage(
         private val workManagerProvider: WorkManagerProvider,
-        private val stringProvider: StringProvider,
         private val sessionId: String,
         private val userId: String,
         private val userDeviceId: String?,
@@ -167,7 +164,8 @@ internal class VerificationTransportRoomMessage(
         )
 
         val info = MessageVerificationRequestContent(
-                body = stringProvider.getString(R.string.key_verification_request_fallback_message, userId),
+                body = "$userId is requesting to verify your key, but your client does not support in-chat key verification." +
+                        " You will need to use legacy key verification to verify keys.",
                 fromDevice = validInfo.fromDevice,
                 toUserId = otherUserId,
                 timestamp = validInfo.timestamp,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index c01923055b..432a4af062 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -20,7 +20,6 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.media.MediaMetadataRetriever
 import androidx.exifinterface.media.ExifInterface
-import org.matrix.android.sdk.R
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -42,7 +41,6 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageOptionsConte
 import org.matrix.android.sdk.api.session.room.model.message.MessagePollResponseContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
-import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_POLL
 import org.matrix.android.sdk.api.session.room.model.message.OptionItem
@@ -59,7 +57,6 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor
 import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
 import org.matrix.android.sdk.internal.session.room.send.pills.TextPillsUtils
-import org.matrix.android.sdk.internal.util.StringProvider
 import javax.inject.Inject
 
 /**
@@ -74,7 +71,6 @@ import javax.inject.Inject
 internal class LocalEchoEventFactory @Inject constructor(
         private val context: Context,
         @UserId private val userId: String,
-        private val stringProvider: StringProvider,
         private val markdownParser: MarkdownParser,
         private val textPillsUtils: TextPillsUtils,
         private val localEchoRepository: LocalEchoRepository,
@@ -334,25 +330,6 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    fun createVerificationRequest(roomId: String, fromDevice: String, toUserId: String, methods: List<String>): Event {
-        val localId = LocalEcho.createLocalEchoId()
-        return Event(
-                roomId = roomId,
-                originServerTs = dummyOriginServerTs(),
-                senderId = userId,
-                eventId = localId,
-                type = EventType.MESSAGE,
-                content = MessageVerificationRequestContent(
-                        body = stringProvider.getString(R.string.key_verification_request_fallback_message, userId),
-                        fromDevice = fromDevice,
-                        toUserId = toUserId,
-                        timestamp = System.currentTimeMillis(),
-                        methods = methods
-                ).toContent(),
-                unsignedData = UnsignedData(age = null, transactionId = localId)
-        )
-    }
-
     private fun dummyOriginServerTs(): Long {
         return System.currentTimeMillis()
     }
diff --git a/matrix-sdk-android/src/main/res/values-bg/strings.xml b/matrix-sdk-android/src/main/res/values-bg/strings.xml
index c3a5f3be82..12f1a85860 100644
--- a/matrix-sdk-android/src/main/res/values-bg/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bg/strings.xml
@@ -110,7 +110,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s предотврати присъединяването на гости в стаята.</string>
     <string name="notice_end_to_end_ok">%1$s включи шифроване от-край-до-край.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s включи шифроване от-край-до-край (неразпознат алгоритъм %2$s).</string>
-    <string name="key_verification_request_fallback_message">%s изпрати запитване за потвърждение на ключа ви, но клиентът ви не поддържа верифициране посредством чат. Ще трябва да използвате стария метод за верифициране на ключове.</string>
     <string name="notice_room_created">%1$s създаде стаята</string>
     <string name="summary_you_sent_image">Изпратихте снимка.</string>
     <string name="summary_you_sent_sticker">Изпратихте стикер.</string>
diff --git a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
index 35f8feaf0f..38be316df8 100644
--- a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
@@ -190,5 +190,4 @@
     <string name="notice_end_to_end_ok_by_you">আপনি শেষ থেকে শেষ এনক্রিপশন চালু করেছেন।</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (অজানা অ্যালগরিদম %2$s)।</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (অজানা অ্যালগরিদম %1$s )।</string>
-    <string name="key_verification_request_fallback_message">%s আপনার কীটি যাচাই করার জন্য অনুরোধ করছে, তবে আপনার ক্লায়েন্ট ইন-চ্যাট কী যাচাইকরণ সমর্থন করে না। কীগুলি যাচাই করতে আপনাকে লিগ্যাসি কী যাচাইকরণ ব্যবহার করতে হবে।</string>
 </resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-ca/strings.xml b/matrix-sdk-android/src/main/res/values-ca/strings.xml
index 98bda2c4ed..32f482724f 100644
--- a/matrix-sdk-android/src/main/res/values-ca/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ca/strings.xml
@@ -61,7 +61,6 @@
     <string name="summary_user_sent_sticker">%1$s ha enviat un adhesiu.</string>
     <string name="notice_direct_room_update">%s s\'ha actualitzat aquí.</string>
     <string name="notice_direct_room_update_by_you">Ho has actualitzat aquí.</string>
-    <string name="key_verification_request_fallback_message">%s està sol·licitant la verificació de la teva clau, però el teu client no admet la verificació de clau des del xat. Hauràs d\'utilitzar la verificació de claus heretada per fer la verificació.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Has activat el xifrat d\'extrem a extrem (algorisme %1$s no reconegut).</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s ha activat el xifrat d\'extrem a extrem (algorisme %2$s no reconegut).</string>
     <string name="notice_end_to_end_ok_by_you">Has activat el xifrat d\'extrem a extrem.</string>
diff --git a/matrix-sdk-android/src/main/res/values-cs/strings.xml b/matrix-sdk-android/src/main/res/values-cs/strings.xml
index b1ab4ea77f..018f0598fa 100644
--- a/matrix-sdk-android/src/main/res/values-cs/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-cs/strings.xml
@@ -195,7 +195,6 @@
     <string name="notice_end_to_end_ok_by_you">Zapnuli jste end-to-end šifrování.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s zapnuli end-to-end šifrování (neznámý algoritmus %2$s).</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Zapnuli jste end-to-end šifrování (neznámý algoritmus %1$s).</string>
-    <string name="key_verification_request_fallback_message">%s žádá ověření Vašeho klíče, ale Váš klient nepodporuje ověření klíče v chatu. Budete muset k ověření klíčů použít zastaralý způsob ověření.</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">Zamezili jste hostům vstoupit do této místnosti.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s zamezil hostům vstoupit do této místnosti.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">Povolili jste hostům vstoupit.</string>
diff --git a/matrix-sdk-android/src/main/res/values-de/strings.xml b/matrix-sdk-android/src/main/res/values-de/strings.xml
index fdfb264f49..406f4a7102 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -118,7 +118,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s hat Gästen untersagt den Raum zu betreten.</string>
     <string name="notice_end_to_end_ok">%1$s aktivierte Ende-zu-Ende-Verschlüsselung.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s aktivierte Ende-zu-Ende-Verschlüsselung (unbekannter Algorithmus %2$s).</string>
-    <string name="key_verification_request_fallback_message">%s fordert zur Überprüfung deines Schlüssels auf, jedoch unterstützt dein Client nicht die Schlüsselüberprüfung im Chat. Du musst die herkömmliche Schlüsselüberprüfung verwenden, um die Schlüssel zu überprüfen.</string>
     <string name="summary_you_sent_image">Du hast ein Bild gesendet.</string>
     <string name="summary_you_sent_sticker">Du hast einen Sticker gesendet.</string>
     <string name="notice_room_invite_no_invitee_by_you">Deine Einladung</string>
diff --git a/matrix-sdk-android/src/main/res/values-eo/strings.xml b/matrix-sdk-android/src/main/res/values-eo/strings.xml
index 10be2103cf..8dacd87157 100644
--- a/matrix-sdk-android/src/main/res/values-eo/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eo/strings.xml
@@ -110,7 +110,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s malpermesis al gastoj enveni.</string>
     <string name="notice_end_to_end_ok">%1$s ŝaltis tutvojan ĉifradon.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s ŝaltis tutvojan ĉifradon (kun nerekonita algoritmo %2$s).</string>
-    <string name="key_verification_request_fallback_message">%s petas kontrolon de via ŝlosilo, sed via kliento ne subtenas kontrolon de ŝlosiloj en la babilujo. Vi devos uzi malnovan kontrolmanieron de ŝlosiloj.</string>
     <string name="notice_power_level_changed_by_you">Vi ŝanĝis la povnivelon de %1$s.</string>
     <string name="notice_power_level_changed">%1$s sanĝis la povnivelon de %2$s.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Vi ŝaltis tutvojan ĉifradon (kun nerekonita algoritmo %1$s).</string>
diff --git a/matrix-sdk-android/src/main/res/values-es/strings.xml b/matrix-sdk-android/src/main/res/values-es/strings.xml
index 22b640e58b..10911dde68 100644
--- a/matrix-sdk-android/src/main/res/values-es/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-es/strings.xml
@@ -117,7 +117,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s ha impedido que los invitados se unan a la sala.</string>
     <string name="notice_end_to_end_ok">%1$s ha activado la encriptación extremo a extremo.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s ha activado la encriptación de extremo a extremo (algoritmo no reconocido %2$s).</string>
-    <string name="key_verification_request_fallback_message">%s solicita verificar su clave, pero su cliente no soporta la verificación de la clave en chat. Necesitará usar la verificación de claves clásica para poder verificar las claves.</string>
     <string name="summary_you_sent_image">Enviaste una imagen.</string>
     <string name="summary_you_sent_sticker">Enviaste un sticker.</string>
     <string name="notice_room_invite_no_invitee_by_you">Tu invitación</string>
diff --git a/matrix-sdk-android/src/main/res/values-et/strings.xml b/matrix-sdk-android/src/main/res/values-et/strings.xml
index 0cf5c3e438..2232e01ff4 100644
--- a/matrix-sdk-android/src/main/res/values-et/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-et/strings.xml
@@ -106,7 +106,6 @@
     <string name="notice_room_canonical_alias_unset">%1$s eemaldas selle jututoa põhiaadressi.</string>
     <string name="notice_room_guest_access_can_join">%1$s lubas külalistel selle jututoaga liituda.</string>
     <string name="notice_room_guest_access_forbidden">%1$s seadistas, et külalised ei või selle jututoaga liituda.</string>
-    <string name="key_verification_request_fallback_message">%s soovib verifitseerida sinu võtmeid, kuid sinu kasutatav klient ei oska vestluse-sisest verifitseerimist teha. Sa pead kasutama traditsioonilist verifitseerimislahendust.</string>
     <string name="notice_room_created">Kasutaja %1$s lõi jututoa</string>
     <string name="summary_you_sent_image">Sina saatsid pildi.</string>
     <string name="summary_you_sent_sticker">Sina saatsid kleepsu.</string>
diff --git a/matrix-sdk-android/src/main/res/values-eu/strings.xml b/matrix-sdk-android/src/main/res/values-eu/strings.xml
index bc61035c24..778761808e 100644
--- a/matrix-sdk-android/src/main/res/values-eu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-eu/strings.xml
@@ -137,7 +137,5 @@
     <string name="notice_end_to_end_ok">%1$s erabiltzaileak muturretik muturrerako zifratzea gaitu du.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s erabiltzaileak muturretik muturrerako zifratzea gaitu du. (%2$s algoritmo ezezaguna).</string>
 
-    <string name="key_verification_request_fallback_message">%s(e)k zure gakoa egiaztatzea eskatu du, baina zure bezeroak ez du txatean gakoa egiaztatzea onartzen. Gako egiaztaketa zaharra erabili beharko duzu.</string>
-
     <string name="notice_room_created">%1$s erabiltzaileak gela sortu du</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-fa/strings.xml b/matrix-sdk-android/src/main/res/values-fa/strings.xml
index 50446b9708..dbbb890b01 100644
--- a/matrix-sdk-android/src/main/res/values-fa/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fa/strings.xml
@@ -108,7 +108,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s جلوی پیوستن میمهانان به گروه را گرفت.</string>
     <string name="notice_end_to_end_ok">%1$s رمزنگاری سرتاسری را روشن کرد.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s رمزنگاری سرتاسری را روشن کرد (الگوریتم تشخیص‌داده‌نشده %2$s ).</string>
-    <string name="key_verification_request_fallback_message">%s درخواست تأیید کلیدتان را دارد، ولی کارخواهتان تأیید کلید درون گپ را پشتیبانی نمی‌کند. برای تأیید کلیدها لازم است از تأییدیهٔ کلید قدیمی استفاده کنید.</string>
     <string name="notice_room_created">%1$s اتاق را ایجاد کرد</string>
     <string name="notice_profile_change_redacted">%1$s نمایه‌اش را به‌روز کرد %2$s</string>
     <string name="could_not_redact">نمی‌توان ویرایش کرد</string>
diff --git a/matrix-sdk-android/src/main/res/values-fi/strings.xml b/matrix-sdk-android/src/main/res/values-fi/strings.xml
index 1e3788476f..044cbd3633 100644
--- a/matrix-sdk-android/src/main/res/values-fi/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fi/strings.xml
@@ -112,7 +112,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s esti vieraita liittymästä huoneeseen.</string>
     <string name="notice_end_to_end_ok">%1$s laittoi päälle osapuolten välisen salauksen.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s laittoi päälle osapuolisten välisen salauksen (tuntematon algoritmi %2$s).</string>
-    <string name="key_verification_request_fallback_message">%s haluaa varmentaa salausavaimesi, mutta asiakasohjelmasi ei tue keskustelun aikana tapahtuvaa avainten varmennusta. Joudut käyttämään perinteistä varmennustapaa.</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Hyväksyit käyttäjän %1$s kutsun. Syy: %2$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Peruutit kutsun liittyä huoneeseen käyttäjältä %1$s. Syy: %2$s</string>
     <string name="notice_room_third_party_invite_with_reason_by_you">Lähetit kutsun liittyä huoneeseen käyttäjälle %1$s. Syy: %2$s</string>
diff --git a/matrix-sdk-android/src/main/res/values-fr/strings.xml b/matrix-sdk-android/src/main/res/values-fr/strings.xml
index f49c54a8ba..4f0c1fa2b1 100644
--- a/matrix-sdk-android/src/main/res/values-fr/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fr/strings.xml
@@ -110,7 +110,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s a empêché les visiteurs de rejoindre le salon.</string>
     <string name="notice_end_to_end_ok">%1$s a activé le chiffrement de bout en bout.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s a activé le chiffrement de bout en bout (algorithme %2$s inconnu).</string>
-    <string name="key_verification_request_fallback_message">%s demande à vérifier votre clé, mais votre client ne supporte pas la vérification de clés dans les discussions. Vous devrez utiliser l’ancienne vérification de clés pour vérifier les clés.</string>
     <string name="notice_room_created">%1$s a créé le salon</string>
     <string name="notice_direct_room_update_by_you">Vous avez mis cet endroit à niveau.</string>
     <string name="notice_direct_room_update">%s a mis cet endroit à niveau.</string>
diff --git a/matrix-sdk-android/src/main/res/values-gl/strings.xml b/matrix-sdk-android/src/main/res/values-gl/strings.xml
index 208b1e9d13..61c42229cc 100644
--- a/matrix-sdk-android/src/main/res/values-gl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-gl/strings.xml
@@ -211,7 +211,6 @@
         <item quantity="one">%1$s engadiu %2$s como enderezo desta sala.</item>
         <item quantity="other">%1$s engadiu %2$s como enderezos desta sala.</item>
     </plurals>
-    <string name="key_verification_request_fallback_message">%s solicita verificar a túa chave, pero o teu cliente non soporta a verificación de chaves nos chats. Necesitarás usar o método antigo de verificación de chaves.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Activaches o cifrado extremo-a-extremo (algoritmo non recoñecido %1$s).</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s activou o cifrado extremo-a-extrem (algoritmo non recoñecible %2$s).</string>
     <string name="notice_end_to_end_ok_by_you">Activaches o cifrado extremo-a-extremo.</string>
diff --git a/matrix-sdk-android/src/main/res/values-hu/strings.xml b/matrix-sdk-android/src/main/res/values-hu/strings.xml
index 6c06c11813..62e0c5f90c 100644
--- a/matrix-sdk-android/src/main/res/values-hu/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-hu/strings.xml
@@ -110,7 +110,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s megtiltotta a vendégeknek, hogy belépjenek ebbe a szobába.</string>
     <string name="notice_end_to_end_ok">%1$s bekapcsolta a végpontok közötti titkosítást.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus %2$s).</string>
-    <string name="key_verification_request_fallback_message">%s kéri a kulcsok ellenőrzését de a kliens nem támogatja a szobán belüli kulcs ellenőrzést. A hagyományos módon kell ellenőrizned a kulcsokat.</string>
     <string name="notice_room_created">%1$s szobát készített</string>
     <string name="notice_answered_call_by_you">Fogadtad a hívást.</string>
     <string name="notice_ended_call_by_you">Befejezted a hívást.</string>
diff --git a/matrix-sdk-android/src/main/res/values-it/strings.xml b/matrix-sdk-android/src/main/res/values-it/strings.xml
index e1f57ddac0..fe846bdb2c 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -111,7 +111,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza per gli ospiti.</string>
     <string name="notice_end_to_end_ok">%1$s ha attivato la cifratura end-to-end.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s ha attivato la cifratura end-to-end (algoritmo %2$s non riconosciuto).</string>
-    <string name="key_verification_request_fallback_message">%s sta chiedendo di verificare la tua chiave, ma il tuo client non supporta la verifica in-chat. Dovrai usare il metodo di verifica obsoleto per verificare le chiavi.</string>
     <string name="notice_room_created">%1$s ha creato la stanza</string>
     <string name="summary_you_sent_image">Hai inviato un\'immagine.</string>
     <string name="summary_you_sent_sticker">Hai inviato un adesivo.</string>
diff --git a/matrix-sdk-android/src/main/res/values-kab/strings.xml b/matrix-sdk-android/src/main/res/values-kab/strings.xml
index 8b94fad9eb..ea0c78da5a 100644
--- a/matrix-sdk-android/src/main/res/values-kab/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-kab/strings.xml
@@ -116,7 +116,6 @@
         <item quantity="other">%1$s d %2$d wiyaḍ</item>
     </plurals>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef (alguritm %1$s ur yettwassen ara).</string>
-    <string name="key_verification_request_fallback_message">%s isuter-d ad isenqed tasarut-ik·im, maca amsaɣ-ik·im ur issefrak ara asenqed n tsura deg yidiwenniyen. Ilaq-ak·am useqdec asenqed iqdim n tsura i usenqed n tsura.</string>
     <string name="room_displayname_empty_room">Taxxamt tilemt</string>
     <string name="initial_sync_start_importing_account">Amtawi n tazwara:
 \nAktar n umiḍan…</string>
diff --git a/matrix-sdk-android/src/main/res/values-lv/strings.xml b/matrix-sdk-android/src/main/res/values-lv/strings.xml
index 815760f394..8aee2dcded 100644
--- a/matrix-sdk-android/src/main/res/values-lv/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-lv/strings.xml
@@ -81,7 +81,6 @@
     <string name="summary_you_sent_sticker">Jūs nosūtījāt uzlīmi.</string>
     <string name="summary_user_sent_sticker">%1$s nosūtīja uzlīmi.</string>
     <string name="summary_you_sent_image">Jūs nosūtījāt attēlu.</string>
-    <string name="key_verification_request_fallback_message">%s pieprasa verificēt jūsu atslēgu, taču jūsu klients neatbalsta tērzēšanas atslēgas verifikāciju. Lai verificētu atslēgas, jums būs jāizmanto atslēgu verifikācija novecojušā veidā.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Jūs ieslēdzāt pilnīgu šifrēšanu (neatpazīts algoritms %1$s).</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s ieslēdza pilnīgu šifrēšanu (neatpazīts algoritms %2$s).</string>
     <string name="notice_end_to_end_ok_by_you">Jūs ieslēdzāt pilnīgu šifrēšanu.</string>
diff --git a/matrix-sdk-android/src/main/res/values-nl/strings.xml b/matrix-sdk-android/src/main/res/values-nl/strings.xml
index 1b05052ba6..3216fdb720 100644
--- a/matrix-sdk-android/src/main/res/values-nl/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-nl/strings.xml
@@ -146,6 +146,5 @@
     <string name="notice_end_to_end_ok">%1$s heeft eind-tot-eind-versleuteling ingeschakeld.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s heeft eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %2$s).</string>
 
-    <string name="key_verification_request_fallback_message">%s vraagt om uw sleutel te verifiëren, maar uw cliënt biedt geen ondersteuning voor verificatie in het gesprek. U zult de verouderde sleutelverificatie moeten gebruiken om de sleutels te verifiëren.</string>
 
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
index af4004666c..95c1331690 100644
--- a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
@@ -198,7 +198,6 @@
     <string name="notice_end_to_end_ok_by_you">Você ativou a criptografia de ponta a ponta.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s ativou a criptografia de ponta a ponta (algoritmo não reconhecido %2$s).</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Você ativou a criptografia de ponta a ponta (algoritmo não reconhecido %1$s).</string>
-    <string name="key_verification_request_fallback_message">%s deseja confirmar a sua chave, mas o seu aplicativo não suporta a confirmação da chave da conversa. Você precisará usar a confirmação tradicional de chaves para confirmar chaves.</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">Você impediu que desconhecidos entrem na sala.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s impediu que desconhecidos entrem na sala.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">Você permitiu que desconhecidos entrem aqui.</string>
diff --git a/matrix-sdk-android/src/main/res/values-ru/strings.xml b/matrix-sdk-android/src/main/res/values-ru/strings.xml
index b317e04908..1236dd358a 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -123,7 +123,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s запретил(а) гостям входить в комнату.</string>
     <string name="notice_end_to_end_ok">%1$s включил(а) сквозное шифрование.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s включил(а) сквозное шифрование (неизвестный алгоритм %2$s).</string>
-    <string name="key_verification_request_fallback_message">%s запрашивает подтверждение вашего ключа, но ваш клиент не поддерживает подтверждение в чате. Используйте устаревшую проверку для сверки ключей.</string>
     <string name="summary_you_sent_image">Вы отправили изображение.</string>
     <string name="summary_you_sent_sticker">Вы отправили стикер.</string>
     <string name="notice_room_invite_no_invitee_by_you">Ваше приглашение</string>
diff --git a/matrix-sdk-android/src/main/res/values-sk/strings.xml b/matrix-sdk-android/src/main/res/values-sk/strings.xml
index a40654f7bf..390a3e9ba3 100644
--- a/matrix-sdk-android/src/main/res/values-sk/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sk/strings.xml
@@ -196,7 +196,6 @@
     <string name="notice_end_to_end_ok_by_you">Povolili ste E2E šifrovanie.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s povolil/a E2E šifrovanie (Nerozpoznaný algorytmus %2$s).</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Povolili ste E2E šifrovanie (Nerozpoznaný algorytmus %1$s).</string>
-    <string name="key_verification_request_fallback_message">%s požaduje overenie vašich šifrovacích kľúčov, ale váš klient nepodporuje overenie kľúčov v konverzácii. Budete musieť použiť zastaralú metódu overenia.</string>
     <string name="notice_room_server_acl_set_title_by_you">nastavili ste na servery pravidlá ACL tejto miestnosti.</string>
     <string name="notice_room_server_acl_set_title">%s nastavil(a) na servery pravidlá ACL tejto miestnosti.</string>
     <string name="notice_direct_room_update_by_you">Aktualizovali ste sem.</string>
diff --git a/matrix-sdk-android/src/main/res/values-sq/strings.xml b/matrix-sdk-android/src/main/res/values-sq/strings.xml
index 11734bf16a..33ed9f4e0a 100644
--- a/matrix-sdk-android/src/main/res/values-sq/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sq/strings.xml
@@ -110,7 +110,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s ka penguar vizitorë të marrin pjesë në dhomë.</string>
     <string name="notice_end_to_end_ok">%1$s aktivizoi fshehtëzim skaj-më-skaj.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s aktivizoi fshehtëzim skaj-më-skaj (algoritëm i papranuar %2$s).</string>
-    <string name="key_verification_request_fallback_message">%s po kërkon të verifikojë kyçin tuaj, por klienti juaj nuk mbulon verifikim kyçesh brenda fjalosjeje. Që të verifikoni kyça, do t’ju duhet të përdorni verifikim të dikurshëm kyçesh.</string>
     <string name="notice_room_created">%1$s krijo dhomën</string>
     <string name="summary_you_sent_image">Dërguat një figurë.</string>
     <string name="summary_you_sent_sticker">Dërguat një ngjitës.</string>
diff --git a/matrix-sdk-android/src/main/res/values-sr/strings.xml b/matrix-sdk-android/src/main/res/values-sr/strings.xml
index c55c92d58a..cf4aecaad1 100644
--- a/matrix-sdk-android/src/main/res/values-sr/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sr/strings.xml
@@ -43,7 +43,6 @@
     <string name="notice_direct_room_leave_by_you">Напустили сте собу</string>
     <string name="notice_direct_room_leave">%1$s напусти собу</string>
     <string name="notice_room_leave_by_you">Напустили сте собу</string>
-    <string name="key_verification_request_fallback_message">%s тражи да провери ваш кључ али ваш клијент не подржава верификацију унутар ћаскања. Мораћете да употребите старији начин за оверу кључева.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Укључили сте шифровање с краја на крај (непознат алгоритам %1$s).</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s укључи шифровање с краја на крај (непознат алгоритам %2$s).</string>
     <string name="notice_end_to_end_ok">%1$s искључи шифровање с краја на крај.</string>
diff --git a/matrix-sdk-android/src/main/res/values-sv/strings.xml b/matrix-sdk-android/src/main/res/values-sv/strings.xml
index df36a47533..d202670c49 100644
--- a/matrix-sdk-android/src/main/res/values-sv/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sv/strings.xml
@@ -190,7 +190,6 @@
     <string name="notice_end_to_end_ok_by_you">Du aktiverade totalsträckskryptering.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s aktiverade totalsträckskryptering (okänd algoritm %2$s).</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Du aktiverade totalsträckskryptering (okänd algoritm %1$s).</string>
-    <string name="key_verification_request_fallback_message">%s begär att verifiera din nyckel, men din klient stöder inte nyckelverifiering i chatten. Du behöver använda legacynyckelverifiering för att verifiera nycklar.</string>
     <string name="notice_direct_room_guest_access_forbidden_by_you">Du hindrade gäster från att gå med i rummet.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s hindrade gäster från att gå med i rummet.</string>
     <string name="notice_direct_room_guest_access_can_join_by_you">Du tillät gäster att gå med här.</string>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
index 478970a334..585ac625cb 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
@@ -107,7 +107,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s 已禁止访客加入聊天室。</string>
     <string name="notice_end_to_end_ok">%1$s 已开启端到端加密。</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端到端加密（无法识别的演算法 %2$s）。</string>
-    <string name="key_verification_request_fallback_message">%s 正在请求验证您的密钥，但您的客户端不支援聊天中密钥验证。 您将必须使用旧版的密钥验证来验证金钥。</string>
     <string name="notice_room_created">%1$s 创建了这个聊天室</string>
     <string name="summary_you_sent_image">您发送了一张图片。</string>
     <string name="summary_you_sent_sticker">您发送了一张贴纸。</string>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
index 6f73f88279..d525d4b4bd 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
@@ -107,7 +107,6 @@
     <string name="notice_room_guest_access_forbidden">%1$s 已禁止訪客加入聊天室。</string>
     <string name="notice_end_to_end_ok">%1$s 已開啟端到端加密。</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s 已開啟端到端加密（無法識別的演算法 %2$s）。</string>
-    <string name="key_verification_request_fallback_message">%s 正在請求驗證您的金鑰，但您的客戶端不支援聊天中金鑰驗證。您將必須使用舊版的金鑰驗證來驗證金鑰。</string>
     <string name="notice_room_created">%1$s 建立了聊天室</string>
     <string name="summary_you_sent_image">您傳送了圖片。</string>
     <string name="summary_you_sent_sticker">您傳送了貼圖。</string>
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index b93d9b680e..08275fba36 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -312,6 +312,4 @@
     <string name="notice_end_to_end_unknown_algorithm">%1$s turned on end-to-end encryption (unrecognised algorithm %2$s).</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">You turned on end-to-end encryption (unrecognised algorithm %1$s).</string>
 
-    <string name="key_verification_request_fallback_message">%s is requesting to verify your key, but your client does not support in-chat key verification. You will need to use legacy key verification to verify keys.</string>
-
 </resources>

From c13ff6a392e7be765c7760dc9aa9f1620f4c4b31 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 13:49:50 +0100
Subject: [PATCH 173/578] Extract Factories to dedicated files

---
 .../VerificationTransportRoomMessage.kt       | 30 ------------
 ...VerificationTransportRoomMessageFactory.kt | 49 +++++++++++++++++++
 .../VerificationTransportToDevice.kt          | 13 +----
 .../VerificationTransportToDeviceFactory.kt   | 32 ++++++++++++
 4 files changed, 82 insertions(+), 42 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessageFactory.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDeviceFactory.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index 54cc0e8161..957ff2d50c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -45,18 +45,13 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageVerification
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
 import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
 import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
-import org.matrix.android.sdk.internal.di.DeviceId
-import org.matrix.android.sdk.internal.di.SessionId
-import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
-import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import timber.log.Timber
 import java.util.UUID
 import java.util.concurrent.TimeUnit
-import javax.inject.Inject
 
 internal class VerificationTransportRoomMessage(
         private val workManagerProvider: WorkManagerProvider,
@@ -386,28 +381,3 @@ internal class VerificationTransportRoomMessage(
     }
 }
 
-internal class VerificationTransportRoomMessageFactory @Inject constructor(
-        private val workManagerProvider: WorkManagerProvider,
-        private val stringProvider: StringProvider,
-        @SessionId
-        private val sessionId: String,
-        @UserId
-        private val userId: String,
-        @DeviceId
-        private val deviceId: String?,
-        private val localEchoEventFactory: LocalEchoEventFactory,
-        private val taskExecutor: TaskExecutor
-) {
-
-    fun createTransport(roomId: String, tx: DefaultVerificationTransaction?): VerificationTransportRoomMessage {
-        return VerificationTransportRoomMessage(workManagerProvider,
-                stringProvider,
-                sessionId,
-                userId,
-                deviceId,
-                roomId,
-                localEchoEventFactory,
-                tx,
-                taskExecutor.executorScope)
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessageFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessageFactory.kt
new file mode 100644
index 0000000000..f89127273b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessageFactory.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.verification
+
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.di.SessionId
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import javax.inject.Inject
+
+internal class VerificationTransportRoomMessageFactory @Inject constructor(
+        private val workManagerProvider: WorkManagerProvider,
+        @SessionId
+        private val sessionId: String,
+        @UserId
+        private val userId: String,
+        @DeviceId
+        private val deviceId: String?,
+        private val localEchoEventFactory: LocalEchoEventFactory,
+        private val taskExecutor: TaskExecutor
+) {
+
+    fun createTransport(roomId: String, tx: DefaultVerificationTransaction?): VerificationTransportRoomMessage {
+        return VerificationTransportRoomMessage(workManagerProvider,
+                sessionId,
+                userId,
+                deviceId,
+                roomId,
+                localEchoEventFactory,
+                tx,
+                taskExecutor.executorScope)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
index 5fd1c5d650..8acd4faecf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
@@ -16,8 +16,8 @@
 package org.matrix.android.sdk.internal.crypto.verification
 
 import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoRequest
 import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
+import org.matrix.android.sdk.api.session.crypto.verification.ValidVerificationInfoRequest
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
@@ -33,11 +33,9 @@ import org.matrix.android.sdk.internal.crypto.model.rest.KeyVerificationStart
 import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_RECIPROCATE
 import org.matrix.android.sdk.internal.crypto.model.rest.VERIFICATION_METHOD_SAS
 import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
-import org.matrix.android.sdk.internal.di.DeviceId
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
-import javax.inject.Inject
 
 internal class VerificationTransportToDevice(
         private var tx: DefaultVerificationTransaction?,
@@ -249,12 +247,3 @@ internal class VerificationTransportToDevice(
     }
 }
 
-internal class VerificationTransportToDeviceFactory @Inject constructor(
-        private val sendToDeviceTask: SendToDeviceTask,
-        @DeviceId val myDeviceId: String?,
-        private val taskExecutor: TaskExecutor) {
-
-    fun createTransport(tx: DefaultVerificationTransaction?): VerificationTransportToDevice {
-        return VerificationTransportToDevice(tx, sendToDeviceTask, myDeviceId, taskExecutor)
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDeviceFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDeviceFactory.kt
new file mode 100644
index 0000000000..e9a2c65ef7
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDeviceFactory.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.verification
+
+import org.matrix.android.sdk.internal.crypto.tasks.SendToDeviceTask
+import org.matrix.android.sdk.internal.di.DeviceId
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import javax.inject.Inject
+
+internal class VerificationTransportToDeviceFactory @Inject constructor(
+        private val sendToDeviceTask: SendToDeviceTask,
+        @DeviceId val myDeviceId: String?,
+        private val taskExecutor: TaskExecutor) {
+
+    fun createTransport(tx: DefaultVerificationTransaction?): VerificationTransportToDevice {
+        return VerificationTransportToDevice(tx, sendToDeviceTask, myDeviceId, taskExecutor)
+    }
+}

From a3b1c348efa791dda52b8380a97b3bfa254ddb0b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 14:15:40 +0100
Subject: [PATCH 174/578] Create VectorRoomDisplayNameFallbackProvider to
 provide default room names

---
 .../android/sdk/api/MatrixConfiguration.kt    |  6 +-
 .../api/RoomDisplayNameFallbackProvider.kt    | 26 +++++++++
 .../membership/RoomDisplayNameResolver.kt     | 21 ++++---
 .../java/im/vector/app/VectorApplication.kt   |  8 ++-
 .../VectorRoomDisplayNameFallbackProvider.kt  | 57 +++++++++++++++++++
 5 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
index 93a1b962ed..ed809cdb04 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
@@ -39,7 +39,11 @@ data class MatrixConfiguration(
         /**
          * True to advertise support for call transfers to other parties on Matrix calls.
          */
-        val supportsCallTransfer: Boolean = false
+        val supportsCallTransfer: Boolean = false,
+        /**
+         * RoomDisplayNameFallbackProvider to provide default room display name.
+         */
+        val roomDisplayNameFallbackProvider: RoomDisplayNameFallbackProvider
 ) {
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
new file mode 100644
index 0000000000..4ac14d5f63
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api
+
+interface RoomDisplayNameFallbackProvider {
+    fun getNameForRoomInvite(): String
+    fun getNameForEmptyRoom(): String
+    fun getNameFor2members(name1: String?, name2: String?): String
+    fun getNameFor3members(name1: String?, name2: String?, name3: String?): String
+    fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?): String
+    fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int): String
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 784b610af7..6948dd956a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.session.room.membership
 
 import io.realm.Realm
-import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -32,17 +32,18 @@ import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.query.getOrNull
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.UserId
-import org.matrix.android.sdk.internal.util.StringProvider
 import javax.inject.Inject
 
 /**
  * This class computes room display name
  */
 internal class RoomDisplayNameResolver @Inject constructor(
-        private val stringProvider: StringProvider,
+        matrixConfiguration: MatrixConfiguration,
         @UserId private val userId: String
 ) {
 
+    private val roomDisplayNameFallbackProvider=  matrixConfiguration.roomDisplayNameFallbackProvider
+
     /**
      * Compute the room display name
      *
@@ -82,7 +83,7 @@ internal class RoomDisplayNameResolver @Inject constructor(
                         .findFirst()
                         ?.displayName
             } else {
-                stringProvider.getString(R.string.room_displayname_room_invite)
+                roomDisplayNameFallbackProvider.getNameForRoomInvite()
             }
         } else if (roomEntity?.membership == Membership.JOIN) {
             val roomSummary = RoomSummaryEntity.where(realm, roomId).findFirst()
@@ -104,25 +105,25 @@ internal class RoomDisplayNameResolver @Inject constructor(
             val otherMembersCount = otherMembersSubset.count()
             name = when (otherMembersCount) {
                 0    -> {
-                    stringProvider.getString(R.string.room_displayname_empty_room)
+                    roomDisplayNameFallbackProvider.getNameForEmptyRoom()
                     // TODO (was xx and yyy) ...
                 }
                 1    -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
                 2    -> {
-                    stringProvider.getString(R.string.room_displayname_two_members,
+                    roomDisplayNameFallbackProvider.getNameFor2members(
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[1], roomMembers)
                     )
                 }
                 3    -> {
-                    stringProvider.getString(R.string.room_displayname_3_members,
+                    roomDisplayNameFallbackProvider.getNameFor3members(
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[1], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[2], roomMembers)
                     )
                 }
                 4    -> {
-                    stringProvider.getString(R.string.room_displayname_4_members,
+                    roomDisplayNameFallbackProvider.getNameFor4members(
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[1], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[2], roomMembers),
@@ -131,9 +132,7 @@ internal class RoomDisplayNameResolver @Inject constructor(
                 }
                 else -> {
                     val remainingCount = invitedCount + joinedCount - otherMembersCount + 1
-                    stringProvider.getQuantityString(
-                            R.plurals.room_displayname_four_and_more_members,
-                            remainingCount,
+                    roomDisplayNameFallbackProvider.getNameFor4membersAndMore(
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[1], roomMembers),
                             resolveRoomMemberName(otherMembersSubset[2], roomMembers),
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index dd94be77ba..f3e2f8740e 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -53,6 +53,7 @@ import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.pin.PinLocker
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.app.features.room.VectorRoomDisplayNameFallbackProvider
 import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.themes.ThemeUtils
@@ -205,7 +206,12 @@ class VectorApplication :
         }
     }
 
-    override fun providesMatrixConfiguration() = MatrixConfiguration(applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION)
+    override fun providesMatrixConfiguration(): MatrixConfiguration {
+        return MatrixConfiguration(
+                applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION,
+                roomDisplayNameFallbackProvider = VectorRoomDisplayNameFallbackProvider(this)
+        )
+    }
 
     override fun getWorkManagerConfiguration(): WorkConfiguration {
         return WorkConfiguration.Builder()
diff --git a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
new file mode 100644
index 0000000000..ca18e1d4c8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.room
+
+import android.content.Context
+import org.matrix.android.sdk.R
+import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
+
+class VectorRoomDisplayNameFallbackProvider(
+        private val context: Context
+) : RoomDisplayNameFallbackProvider {
+
+    override fun getNameForRoomInvite(): String {
+        return context.getString(R.string.room_displayname_room_invite)
+    }
+
+    override fun getNameForEmptyRoom(): String {
+        return context.getString(R.string.room_displayname_empty_room)
+    }
+
+    override fun getNameFor2members(name1: String?, name2: String?): String {
+        return context.getString(R.string.room_displayname_two_members, name1, name2)
+    }
+
+    override fun getNameFor3members(name1: String?, name2: String?, name3: String?): String {
+        return context.getString(R.string.room_displayname_3_members, name1, name2, name3)
+    }
+
+    override fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?): String {
+        return context.getString(R.string.room_displayname_4_members, name1, name2, name3, name4)
+    }
+
+    override fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int): String {
+        return context.resources.getQuantityString(
+                R.plurals.room_displayname_four_and_more_members,
+                remainingCount,
+                name1,
+                name2,
+                name3,
+                remainingCount
+        )
+    }
+}

From dc63d6ae7396610fd7155dd73845ad396a1d5ec8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 14:16:11 +0100
Subject: [PATCH 175/578] Remove StringProvider from SDK

---
 .../sdk/internal/util/StringProvider.kt       | 62 -------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
deleted file mode 100644
index 69d50680a7..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.util
-
-import android.content.res.Resources
-import androidx.annotation.NonNull
-import androidx.annotation.PluralsRes
-import androidx.annotation.StringRes
-import dagger.Reusable
-import javax.inject.Inject
-
-@Reusable
-internal class StringProvider @Inject constructor(private val resources: Resources) {
-
-    /**
-     * Returns a localized string from the application's package's
-     * default string table.
-     *
-     * @param resId Resource id for the string
-     * @return The string data associated with the resource, stripped of styled
-     * text information.
-     */
-    @NonNull
-    fun getString(@StringRes resId: Int): String {
-        return resources.getString(resId)
-    }
-
-    /**
-     * Returns a localized formatted string from the application's package's
-     * default string table, substituting the format arguments as defined in
-     * [java.util.Formatter] and [java.lang.String.format].
-     *
-     * @param resId Resource id for the format string
-     * @param formatArgs The format arguments that will be used for
-     * substitution.
-     * @return The string data associated with the resource, formatted and
-     * stripped of styled text information.
-     */
-    @NonNull
-    fun getString(@StringRes resId: Int, vararg formatArgs: Any?): String {
-        return resources.getString(resId, *formatArgs)
-    }
-
-    @NonNull
-    fun getQuantityString(@PluralsRes resId: Int, quantity: Int, vararg formatArgs: Any?): String {
-        return resources.getQuantityString(resId, quantity, *formatArgs)
-    }
-}

From 9c76ee97eb1b806051b3fc8d7d23be22934ad988 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 14:34:43 +0100
Subject: [PATCH 176/578] Move SDK strings to the application

---
 .../src/main/res/values-ar/strings.xml        | 218 ------------
 .../src/main/res/values-az/strings.xml        | 116 -------
 .../src/main/res/values-bg/strings.xml        | 215 ------------
 .../src/main/res/values-bn-rIN/strings.xml    | 193 -----------
 .../src/main/res/values-bs/strings.xml        |   7 -
 .../src/main/res/values-ca/strings.xml        | 267 ---------------
 .../src/main/res/values-cs/strings.xml        | 276 ---------------
 .../src/main/res/values-da/strings.xml        |  75 -----
 .../src/main/res/values-de/strings.xml        | 274 ---------------
 .../src/main/res/values-el/strings.xml        |  76 -----
 .../src/main/res/values-eo/strings.xml        | 215 ------------
 .../src/main/res/values-es-rMX/strings.xml    |  92 -----
 .../src/main/res/values-es/strings.xml        | 274 ---------------
 .../src/main/res/values-et/strings.xml        | 266 ---------------
 .../src/main/res/values-eu/strings.xml        | 141 --------
 .../src/main/res/values-fa/strings.xml        | 221 ------------
 .../src/main/res/values-fi/strings.xml        | 212 ------------
 .../src/main/res/values-fr/strings.xml        | 238 -------------
 .../src/main/res/values-gl/strings.xml        | 266 ---------------
 .../src/main/res/values-he/strings.xml        |   2 -
 .../src/main/res/values-hu/strings.xml        | 196 -----------
 .../src/main/res/values-id/strings.xml        |  12 -
 .../src/main/res/values-in/strings.xml        |  12 -
 .../src/main/res/values-is/strings.xml        |  76 -----
 .../src/main/res/values-it/strings.xml        | 267 ---------------
 .../src/main/res/values-ja/strings.xml        |  86 -----
 .../src/main/res/values-kab/strings.xml       | 193 -----------
 .../src/main/res/values-ko/strings.xml        | 101 ------
 .../src/main/res/values-lt/strings.xml        |  35 --
 .../src/main/res/values-lv/strings.xml        | 244 --------------
 .../src/main/res/values-nl/strings.xml        | 150 ---------
 .../src/main/res/values-nn/strings.xml        |  68 ----
 .../src/main/res/values-pl/strings.xml        | 104 ------
 .../src/main/res/values-pt-rBR/strings.xml    | 274 ---------------
 .../src/main/res/values-pt/strings.xml        |  87 -----
 .../src/main/res/values-ru/strings.xml        | 290 ----------------
 .../src/main/res/values-si/strings.xml        |   4 -
 .../src/main/res/values-sk/strings.xml        | 211 ------------
 .../src/main/res/values-sq/strings.xml        | 262 ---------------
 .../src/main/res/values-sr/strings.xml        | 276 ---------------
 .../src/main/res/values-sv/strings.xml        | 266 ---------------
 .../src/main/res/values-szl/strings.xml       |   2 -
 .../src/main/res/values-te/strings.xml        |  71 ----
 .../src/main/res/values-th/strings.xml        |   4 -
 .../src/main/res/values-uk/strings.xml        | 176 ----------
 .../src/main/res/values-vls/strings.xml       | 103 ------
 .../src/main/res/values-zh-rCN/strings.xml    | 210 ------------
 .../src/main/res/values-zh-rTW/strings.xml    | 256 --------------
 .../src/main/res/values/strings.xml           | 315 ------------------
 vector/src/main/res/values-ar/strings.xml     | 215 ++++++++++++
 vector/src/main/res/values-az/strings.xml     | 115 ++++++-
 vector/src/main/res/values-bg/strings.xml     | 212 ++++++++++++
 vector/src/main/res/values-bn-rIN/strings.xml | 190 +++++++++++
 vector/src/main/res/values-bs/strings.xml     |   4 +
 vector/src/main/res/values-ca/strings.xml     | 264 +++++++++++++++
 vector/src/main/res/values-cs/strings.xml     | 273 +++++++++++++++
 vector/src/main/res/values-da/strings.xml     |  69 ++++
 vector/src/main/res/values-de/strings.xml     | 271 +++++++++++++++
 vector/src/main/res/values-el/strings.xml     |  72 ++++
 vector/src/main/res/values-eo/strings.xml     | 212 ++++++++++++
 vector/src/main/res/values-es-rMX/strings.xml |  88 +++++
 vector/src/main/res/values-es/strings.xml     | 271 +++++++++++++++
 vector/src/main/res/values-et/strings.xml     | 263 +++++++++++++++
 vector/src/main/res/values-eu/strings.xml     | 136 ++++++++
 vector/src/main/res/values-fa/strings.xml     | 218 ++++++++++++
 vector/src/main/res/values-fi/strings.xml     | 209 ++++++++++++
 vector/src/main/res/values-fr/strings.xml     | 235 +++++++++++++
 vector/src/main/res/values-gl/strings.xml     | 263 +++++++++++++++
 vector/src/main/res/values-hu/strings.xml     | 193 +++++++++++
 vector/src/main/res/values-id/strings.xml     |   9 +
 vector/src/main/res/values-in/strings.xml     |   9 +
 vector/src/main/res/values-is/strings.xml     |  72 ++++
 vector/src/main/res/values-it/strings.xml     | 264 +++++++++++++++
 vector/src/main/res/values-ja/strings.xml     |  83 +++++
 vector/src/main/res/values-kab/strings.xml    | 190 +++++++++++
 vector/src/main/res/values-ko/strings.xml     |  98 ++++++
 vector/src/main/res/values-lt/strings.xml     |  35 +-
 vector/src/main/res/values-lv/strings.xml     | 241 ++++++++++++++
 .../src/main/res/values-nb/strings.xml        |   0
 vector/src/main/res/values-nl/strings.xml     | 144 ++++++++
 vector/src/main/res/values-nn/strings.xml     |  65 ++++
 vector/src/main/res/values-pl/strings.xml     | 100 ++++++
 vector/src/main/res/values-pt-rBR/strings.xml | 271 +++++++++++++++
 vector/src/main/res/values-pt/strings.xml     |  83 +++++
 vector/src/main/res/values-ru/strings.xml     | 287 ++++++++++++++++
 vector/src/main/res/values-si/strings.xml     |   1 +
 vector/src/main/res/values-sk/strings.xml     | 208 ++++++++++++
 vector/src/main/res/values-sq/strings.xml     | 259 ++++++++++++++
 vector/src/main/res/values-sr/strings.xml     | 273 +++++++++++++++
 vector/src/main/res/values-sv/strings.xml     | 263 +++++++++++++++
 vector/src/main/res/values-te/strings.xml     |  66 ++++
 vector/src/main/res/values-th/strings.xml     |   1 +
 vector/src/main/res/values-uk/strings.xml     | 173 ++++++++++
 vector/src/main/res/values-vls/strings.xml    | 100 ++++++
 vector/src/main/res/values-zh-rCN/strings.xml | 207 ++++++++++++
 vector/src/main/res/values-zh-rTW/strings.xml | 253 ++++++++++++++
 vector/src/main/res/values/strings.xml        | 311 +++++++++++++++++
 97 files changed, 7837 insertions(+), 7997 deletions(-)
 delete mode 100644 matrix-sdk-android/src/main/res/values-ar/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-az/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-bg/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-bs/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-ca/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-cs/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-da/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-de/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-el/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-eo/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-es/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-et/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-eu/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-fa/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-fi/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-fr/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-gl/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-he/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-hu/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-id/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-in/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-is/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-it/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-ja/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-kab/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-ko/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-lt/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-lv/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-nl/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-nn/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-pl/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-pt/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-ru/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-si/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-sk/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-sq/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-sr/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-sv/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-szl/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-te/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-th/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-uk/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-vls/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
 delete mode 100644 matrix-sdk-android/src/main/res/values/strings.xml
 rename {matrix-sdk-android => vector}/src/main/res/values-nb/strings.xml (100%)

diff --git a/matrix-sdk-android/src/main/res/values-ar/strings.xml b/matrix-sdk-android/src/main/res/values-ar/strings.xml
deleted file mode 100644
index 6e017f9d23..0000000000
--- a/matrix-sdk-android/src/main/res/values-ar/strings.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_user_sent_image">إنَّ %1$s قد أرسلَ صُّورة.</string>
-    <string name="notice_room_invite_no_invitee">دعوة مِن %s</string>
-    <string name="notice_room_invite">إنَّ %1$s قد دَعى %2$s</string>
-    <string name="notice_room_invite_you">إنَّ %1$s قد دعاكَ أنت</string>
-    <string name="notice_room_join">إنَّ %1$s قد إنضّم إلى الغُرفة</string>
-    <string name="notice_room_leave">إنَّ %1$s قد غادر الغرفة</string>
-    <string name="notice_room_reject">إنَّ %1$s قد رفضَ الدعوة</string>
-    <string name="notice_room_kick">إنَّ %1$s قد طردَ %2$s</string>
-    <string name="notice_room_unban">إنَّ %1$s قد رفعَ الحظر عن %2$s</string>
-    <string name="notice_room_ban">إنَّ %1$s قد حظرَ %2$s</string>
-    <string name="notice_avatar_url_changed">إنَّ %1$s قد غيَّرَ صورته الشخصية</string>
-    <string name="notice_display_name_set">إنَّ %1$s قد عيَّنَ اسمه الظاهر إلى %2$s</string>
-    <string name="notice_display_name_changed_from">إنَّ %1$s قد غيَّرَ اسمه الظاهر من %2$s إلى %3$s</string>
-    <string name="notice_display_name_removed">إنَّ %1$s قد أزالَ اسمه الظاهر (لقد كان %2$s)</string>
-    <string name="notice_room_topic_changed">إنَّ %1$s قد غيَّرَ الموضوع إلى: %2$s</string>
-    <string name="notice_room_name_changed">إنَّ %1$s قد غيَّرَ اسم الغُرفة إلى: %2$s</string>
-    <string name="notice_answered_call">إنَّ %s قد أجابَ على المُكالمة.</string>
-    <string name="notice_ended_call">إنَّ %s قد أنهى المُكالمة.</string>
-    <string name="notice_made_future_room_visibility">إنَّ %1$s قد جعلَ التأريخ المُستقبلي للغُرفة مرئيًا لـ %2$s</string>
-    <string name="notice_room_visibility_invited">جميع أعضاء الغُرفة، مِنَ اللَّحظة التي تمَّت دعوتهم.</string>
-    <string name="notice_room_visibility_joined">جميع أعضاء الغُرفة، مِن لحظة انضمامهم.</string>
-    <string name="notice_room_visibility_shared">جميع أعضاء الغُرفة.</string>
-    <string name="notice_room_visibility_world_readable">أيُّ شخص.</string>
-    <string name="notice_room_visibility_unknown">غير معروف (%s).</string>
-    <string name="notice_end_to_end">إنَّ %1$s قد فعَّلَ تعمية النهاية-إلى-النهاية (%2$s)</string>
-    <string name="notice_requested_voip_conference">إنَّ %1$s قد طلبَ اجتماع VoIP</string>
-    <string name="notice_voip_started">إنَّ اجتماع VoIP قد بدأ</string>
-    <string name="notice_voip_finished">إنَّ اجتماع VoIP قد انتهى</string>
-    <string name="notice_room_name_removed">إنَّ %1$s قد أزالَ اسم الغُرفة</string>
-    <string name="notice_room_topic_removed">إنَّ %1$s قد أزالَ موضوع الغُرفة</string>
-    <string name="notice_profile_change_redacted">إنَّ %1$s قد حدَّثَ ملفه الشخصي %2$s</string>
-    <string name="notice_room_third_party_invite">إنَّ %1$s قد أرسلَ دعوة إلى %2$s للإنضمام إلى الغُرفة</string>
-    <string name="notice_crypto_unable_to_decrypt">** يتعذَّر فك تعمية: ⁨%s⁩ **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">إنَّ جِهاز المُرسل لم يُرسل لنا المفاتيح لهذه الرِّسالة.</string>
-    <string name="unable_to_send_message">يتعذَّ إرسال الرِّسالة</string>
-    <string name="message_failed_to_upload">فَشلَ رفع الصُّورة</string>
-    <string name="network_error">خطأ في الشَّبكة</string>
-    <string name="matrix_error">خطأ في Matrix</string>
-    <string name="room_error_join_failed_empty_room">حاليًا مِن غير المُمكِن إعادة الاِنضمام إلى غُرفة فارِغة.</string>
-    <string name="encrypted_message">رِسالة مُعمَّاة</string>
-    <string name="medium_email">عُنوان البريد الإلكتروني</string>
-    <string name="medium_phone_number">رقم الهاتف</string>
-    <string name="summary_message">‏‏⁨%1$s⁩: ‏⁨%2$s⁩</string>
-    <string name="notice_room_withdraw">إنَّ %1$s قد سحبَ دعوة %2$s</string>
-    <string name="notice_placed_video_call">إنَّ %s قد أجرى مُكالمة مرئية.</string>
-    <string name="notice_placed_voice_call">إنَّ %s قد أجرى مُكالمة صوتية.</string>
-    <string name="notice_room_third_party_registered_invite">إنَّ %1$s قد قَبَل دعوة %2$s</string>
-    <string name="could_not_redact">يتعذَّر التنقيح</string>
-    <string name="summary_user_sent_sticker">إنَّ %1$s قد أرسلَ مُلصقًا.</string>
-    <string name="notice_avatar_changed_too">(تمَّ تغيِّير الصُّورة أيضًا)</string>
-    <string name="room_displayname_invite_from">دَعوة مِن ⁨%s⁩</string>
-    <string name="room_displayname_empty_room">غُرفة فارِغة</string>
-    <string name="room_displayname_two_members">%1$s وَ %2$s</string>
-    <string name="room_displayname_room_invite">دَعوة غُرفة</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="zero"></item>
-        <item quantity="one">%1$s وواحد آخر</item>
-        <item quantity="two">%1$s و%2$d آخران</item>
-        <item quantity="few">%1$s و%2$d آخرين</item>
-        <item quantity="many">%1$s و%2$d آخرون</item>
-        <item quantity="other">%1$s و%2$d آخرون</item>
-    </plurals>
-    <string name="summary_you_sent_image">أنتَ قد أرسلتَ صُّورة.</string>
-    <string name="summary_you_sent_sticker">أنتَ قد أرسلتَ مُلصقًا.</string>
-    <string name="notice_room_invite_no_invitee_by_you">دعوة مِنكَ أنت</string>
-    <string name="notice_room_created">إنَّ %1$s قد أنشأ الغُرفة</string>
-    <string name="notice_room_created_by_you">أنتَ قد أنشأتَ الغُرفة</string>
-    <string name="notice_room_invite_by_you">أنتَ قد دعوتَ %1$s</string>
-    <string name="notice_room_join_by_you">أنتَ قد انضممت إلى الغُرفة</string>
-    <string name="notice_room_leave_by_you">أنتَ قد غادرتَ الغُرفة</string>
-    <string name="notice_room_reject_by_you">أنت قد رفضت الدعوة</string>
-    <string name="notice_room_kick_by_you">أنتَ قد طردتَ %1$s</string>
-    <string name="notice_room_unban_by_you">أنتَ قد رفعتَ الحظر عن %1$s</string>
-    <string name="notice_room_ban_by_you">أنتَ قد حظرتَ %1$s</string>
-    <string name="notice_room_withdraw_by_you">أنتَ قد سحبتَ دعوة %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">أنتَ قد غيّرتَ صورتك الشخصية</string>
-    <string name="notice_display_name_set_by_you">أنتَ قد عيَّنتَ اسمك الظاهر إلى %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">أنتَ قد غيّرتَ اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
-    <string name="notice_display_name_removed_by_you">أنتَ قد أزلتَ اسمك الظاهر (لقد كان ⁨%1$s⁩)</string>
-    <string name="notice_room_topic_changed_by_you">أنتَ قد غيَّرتَ الموضوع إلى: ⁨%1$s⁩</string>
-    <string name="notice_room_avatar_changed">إنَّ %1$s قد غيَّرَ صورة الغُرفة</string>
-    <string name="notice_room_avatar_changed_by_you">أنتَ قد غيَّرتَ صورة الغُرفة</string>
-    <string name="notice_room_name_changed_by_you">أنتَ قد غيَّرتَ اسم الغُرفة إلى: %1$s</string>
-    <string name="notice_placed_video_call_by_you">أنتَ قد أجريتَ مُكالمة مرئية.</string>
-    <string name="notice_placed_voice_call_by_you">أنتَ قد أجريتَ مُكالمة صوتية.</string>
-    <string name="notice_call_candidates">إنَّ %s قد أرسلَ بيانات لإعداد مُكالمة.</string>
-    <string name="notice_call_candidates_by_you">أنتَ قد أرسلتَ بيانات لإعداد مُكالمة.</string>
-    <string name="notice_answered_call_by_you">أنتَ قد أجبتَ على المُكالمة.</string>
-    <string name="notice_ended_call_by_you">أنتَ قد أنهيتَ المُكالمة.</string>
-    <string name="notice_made_future_room_visibility_by_you">أنتَ قد جعلتَ التأريخ المُستقبلي للغُرفة مرئيًا لـ %1$s</string>
-    <string name="notice_end_to_end_by_you">أنتَ قد فعَّلتَ تعيمية النهاية-إلى-النهاية (%1$s)</string>
-    <string name="notice_room_update">إنَّ %s قد قامَ بترقية هذه الغرفة.</string>
-    <string name="notice_room_update_by_you">أنتَ قد رقَّيتَ هذه الغرفة.</string>
-    <string name="notice_requested_voip_conference_by_you">أنتَ قد طلبتَ اجتماع VoIP</string>
-    <string name="notice_room_name_removed_by_you">أنتَ قد أزلتَ اسم الغُرفة</string>
-    <string name="notice_room_topic_removed_by_you">أنتَ قد أزلتَ موضوع الغُرفة</string>
-    <string name="notice_room_avatar_removed">إنَّ %1$s قد أزالَ صورة الغُرفة</string>
-    <string name="notice_room_avatar_removed_by_you">أنتَ قد أزلتَ صورة الغُرفة</string>
-    <string name="notice_event_redacted">تمَّت إزالة الرسالة</string>
-    <string name="notice_event_redacted_by">الرسالة قد أُزيلت بواسطة %1$s</string>
-    <string name="notice_event_redacted_with_reason">أُزيلت الرسالة [السبب: ⁨%1$s⁩]</string>
-    <string name="notice_event_redacted_by_with_reason">الرِّسالة أُزيلت بِواسطة %1$s [السبب: ⁨%2$s⁩]</string>
-    <string name="notice_room_third_party_invite_by_you">أنتَ قد أرسلتَ دعوة إلى %1$s للإنضمام إلى الغُرفة</string>
-    <string name="notice_room_third_party_revoked_invite">إنَّ %1$s قد سحب دعوة %2$s للإنضمام إلى الغُرفة</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">أنتَ قد سحبت دعوة %1$s للإنضمام إلى الغُرفة</string>
-    <string name="notice_room_third_party_registered_invite_by_you">أنتَ قد قبلتَ دعوة %1$s</string>
-    <string name="notice_widget_added">إنَّ %1$s قد أضافَ القطعة %2$s</string>
-    <string name="notice_widget_added_by_you">أنتَّ قد أضفتَ القطعة %1$s</string>
-    <string name="notice_widget_removed">إنَّ %1$s قد أزال القطعة %2$s</string>
-    <string name="notice_widget_removed_by_you">أنتَ قد أزلتَ القطعة %1$s</string>
-    <string name="notice_widget_modified">إنَّ %1$s قد عدَّلَ القطعة %2$s</string>
-    <string name="notice_widget_modified_by_you">أنتَ قد عدَّلتَ القطعة %1$s</string>
-    <string name="power_level_admin">مسؤول</string>
-    <string name="power_level_default">الاِفتراضي</string>
-    <string name="power_level_custom">مُخصَّص (⁨%1$d⁩)</string>
-    <string name="power_level_custom_no_value">مخصَّص</string>
-    <string name="notice_power_level_changed_by_you">أنتَ قد غيَّرتَ مُستوى قوة %1$s.</string>
-    <string name="notice_power_level_changed">إنَّ %1$s قد غيَّرَ مُستوى قوة %2$s.</string>
-    <string name="notice_power_level_diff">%1$s مِن %2$s إلى %3$s</string>
-    <string name="initial_sync_start_importing_account">المُزامنة الأولية:
-\nيجري إستيرد الحِساب…</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 جميع الخوادِم محظورة مِنَ المُشاركة! لم يعُد من المُمكِن استخدام هذه الغُرفة.</string>
-    <string name="notice_room_server_acl_updated_no_change">لا تغيير.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• خوادِم مُطابقة IP الحرفية محظورة الآن.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• الخادِم المُطابق لـ %s قد أُزيل مِن قائمة السماح.</string>
-    <string name="notice_room_server_acl_updated_allowed">• الخادِم المُطابق لـ %s مسموح الآن.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• الخادِم المُطابق لـ %s قد أُزيل مِن قائمة الحظر.</string>
-    <string name="notice_room_server_acl_updated_banned">• الخادِم المُطابق لـ %s محظور الآن.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• خوادِم مُطابقة IP الحرفية مسموحة الآن.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">أنتَ قد غيَّرتَ خادِم الـACLs لهذه الغُرفة.</string>
-    <string name="notice_room_server_acl_updated_title">إنَّ %s قد غيَّرَ خادِم الـACLs لهذه الغُرفة.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• الخادِم يحظُر مُطابقة القيم الحرفية للـIP.</string>
-    <string name="notice_room_server_acl_set_allowed">• الخادِم المُطابق لـ %s مسموح.</string>
-    <string name="notice_room_server_acl_set_banned">• الخادِم المُطابق لـ %s محظور.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• الخادِم يسمح بمُطابقة القيم الحرفية للـIP.</string>
-    <string name="notice_room_server_acl_set_title_by_you">أنتَ قد عيَّنتَ خادِم الـACLs لهذه الغُرفة.</string>
-    <string name="notice_room_server_acl_set_title">إنَّ %s قد عيَّنَ خادِم الـACLs لهذه الغُرفة.</string>
-    <string name="notice_direct_room_update_by_you">أنتَ قد قمتَ بالترقية هُنا.</string>
-    <string name="notice_direct_room_update">إنَّ %s قد قامَ بالترقية هُنا.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">أنتَ قد جعلتَ الرسائل المُستقبلية مرئية لـ %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">إنَّ %1$s قد جعلَ الرسائل المُستقبلية مرئية لـ %2$s</string>
-    <string name="notice_direct_room_leave_by_you">أنتَ قد غادرتَ الغُرفة</string>
-    <string name="notice_direct_room_leave">إنَّ %1$s قد غادر الغرفة</string>
-    <string name="notice_direct_room_join_by_you">أنت قد انضممت</string>
-    <string name="notice_direct_room_join">إنَّ %1$s قد انضم</string>
-    <string name="notice_direct_room_created_by_you">أنتَ قد أنشأتَ المُناقشة</string>
-    <string name="notice_direct_room_created">إنَّ %1$s قد أنشأ المُناقشة</string>
-    <string name="notice_room_withdraw_with_reason_by_you">أنتَ قد سحبتَ دعوة %1$s. السبب: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">إنَّ %1$s قد سحبَ دعوة %2$s. السبب: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">أنتَ قد ألغيتَ دعوة %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">إنَّ %1$s قد ألغيت دعوة %2$s للإنضمام إلى الغُرفة. السبب: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">أنتَ قد قبلتَ دعوة %1$s. السبب: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">إنَّ %1$s قد قبلَ دعوة %2$s. السبب: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">أنتَ قد أرسلتَ دعوة إلى %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">إنَّ %1$s قد أرسل دعوة إلى %2$s للإنضمام إلى الغُرغة. السبب: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">أنتَ قد حظرتَ %1$s. السبب: %2$s</string>
-    <string name="notice_room_ban_with_reason">إنَّ %1$s قد حَظر %2$s. السبب: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">أنتَ قد رفعتَ الحظر عن %1$s. السبب: %2$s</string>
-    <string name="notice_room_unban_with_reason">إنَّ %1$s قد رفع الحظر عن %2$s. السبب: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">أنتَ قد طردتَ %1$s. السبب: %2$s</string>
-    <string name="notice_room_kick_with_reason">إنَّ %1$s قد طرد %2$s. السبب: %3$s</string>
-    <string name="notice_room_reject_with_reason_by_you">أنتَ قد رفضتَ الدعوة. السبب: %1$s</string>
-    <string name="notice_room_reject_with_reason">إنَّ %1$s قد رفض الدعوة. السبب: %2$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">أنتَ قد غادرت. السبب: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">إنَّ %1$s قد غادر. السبب: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">أنتَ قد غادرتَ الغُرفة. السبب: %1$s</string>
-    <string name="notice_room_leave_with_reason">إنَّ %1$s قد غادر الغُرفة. السبب: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">أنتَ قد إنضممت. السبب: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">إنَّ %1$s قد إنضم. السبب: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">أنتَ قد إنضممتَ إلى الغُرفة. السبب: %1$s</string>
-    <string name="notice_room_join_with_reason">إنَّ %1$s قد إنضم إلى الغُرفة. السبب: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">إنَّ %1$s قد دعاكَ أنت. السبب: %2$s</string>
-    <string name="notice_room_invite_with_reason_by_you">أنتَ قد دعوتَ %1$s. السبب: %2$s</string>
-    <string name="notice_room_invite_with_reason">إنَّ %1$s قد دعا %2$s. السبب: %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">دعوتُكَ أنت. السبب: %1$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason">دعوة %1$s. السبب: %2$s</string>
-    <string name="clear_timeline_send_queue">محو قائمة انتظار الإرسال</string>
-    <string name="event_status_sending_message">يجري إرسال الرِّسالة…</string>
-    <string name="initial_sync_start_importing_account_data">المُزامنة الأولية:
-\nيجري إستيرد مَعلومات الحِساب</string>
-    <string name="initial_sync_start_importing_account_groups">المُزامنة الأولية:
-\nيجري إستيرد المُجتمعات</string>
-    <string name="initial_sync_start_importing_account_left_rooms">المُزامنة الأولية:
-\nيجري إستيرد الغُرف المُغادَر مِنها</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">المُزامنة الأولية:
-\nيجري إستيرد الغُرف المَدعو إليها</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">المُزامنة الأولية:
-\nيجري إستيرد الغُرف المُنضم فيها</string>
-    <string name="initial_sync_start_importing_account_rooms">المُزامنة الأولية:
-\nيجري إستيرد الغُرف</string>
-    <string name="initial_sync_start_importing_account_crypto">المُزامنة الأولية:
-\nيجري إستيرد التَعمية</string>
-    <string name="room_displayname_empty_room_was">غُرفة فارِغة (كانت %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="zero">%1$s، %2$s و%3$s</item>
-        <item quantity="one">%1$s، %2$s، %3$s و%4$d آخر</item>
-        <item quantity="two">%1$s، %2$s، %3$s و%4$d آخران</item>
-        <item quantity="few">%1$s، %2$s، %3$s و%4$d آخرين</item>
-        <item quantity="many">%1$s، %2$s، %3$s و%4$d آخرون</item>
-        <item quantity="other">%1$s،%2$s،%3$s و%4$d آخرون</item>
-    </plurals>
-    <string name="room_displayname_4_members">الأعضاء %1$s، %2$s، %3$s و %4$s</string>
-    <string name="room_displayname_3_members">الأعضاء %1$s، %2$s و %3$s</string>
-    <string name="power_level_moderator">مُشرِف</string>
-    <string name="notice_widget_jitsi_modified_by_you">أنتَ قد عدَّلتَ اجتماع الفيديو</string>
-    <string name="notice_widget_jitsi_modified">لقد عُدِّلَ اجتماع الفيديو بواسطة %1$s</string>
-    <string name="notice_widget_jitsi_removed_by_you">أنتَ قد أنهيتَ اجتماع الفيديو</string>
-    <string name="notice_widget_jitsi_removed">لقد أُنهيَ اجتماع الفيديو بواسطة %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">أنتَ قد بدأتَ اجتماع الفيديو</string>
-    <string name="notice_widget_jitsi_added">لقد بدأ اجتماع الفيديو بواسطة %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">أنتَ قد سحبتَ دعوة %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">إنَّ %1$s قد سحب دعوة %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">أنتَ قد دعوتَ %1$s</string>
-    <string name="notice_direct_room_third_party_invite">إنَّ %1$s قد دعى %2$s</string>
-    <string name="notice_profile_change_redacted_by_you">أنتَ قد حدَّثتَ ملفك الشخصي %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-az/strings.xml b/matrix-sdk-android/src/main/res/values-az/strings.xml
deleted file mode 100644
index 1f366c647f..0000000000
--- a/matrix-sdk-android/src/main/res/values-az/strings.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s şəkil göndərdi.</string>
-    <string name="summary_user_sent_sticker">%1$s stiker göndərdi.</string>
-
-    <string name="notice_room_invite_no_invitee">%s-nin dəvəti</string>
-    <string name="notice_room_invite">%1$s dəvət etdi %2$s</string>
-    <string name="notice_room_invite_you">%1$s sizi dəvət etdi</string>
-    <string name="notice_room_join">%1$s qoşuldu</string>
-    <string name="notice_room_leave">%1$s qalıb</string>
-    <string name="notice_room_reject">%1$s dəvəti rədd etdi</string>
-    <string name="notice_room_kick">%1$s %2$s-i xaric etdi</string>
-    <string name="notice_room_unban">%1$s %2$s-i blokdan açdı</string>
-    <string name="notice_room_ban">%1$s %2$s-i blokladı</string>
-    <string name="notice_room_withdraw">%1$s %2$s-in dəvətini geri götürdü</string>
-    <string name="notice_avatar_url_changed">%1$s avatarı dəyişdi</string>
-    <string name="notice_display_name_set">%1$s ekran adını %2$s olaraq təyin etdi</string>
-    <string name="notice_display_name_changed_from">%1$s ekran adını %2$s-dan %3$s-ya dəyişdi</string>
-    <string name="notice_display_name_removed">%1$s onların göstərilən adlarını sildi (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s mövzunu dəyişdi: %2$s</string>
-    <string name="notice_room_name_changed">%1$s otaq adını dəyişdirdi: %2$s</string>
-    <string name="notice_placed_video_call">%s video zəng etdi.</string>
-    <string name="notice_placed_voice_call">%s səsli zəng etdi.</string>
-    <string name="notice_answered_call">%s zəngə cavab verdi.</string>
-    <string name="notice_ended_call">%s zəng başa çatdı.</string>
-    <string name="notice_made_future_room_visibility">"%1$s gələcək otaq tarixçəsini %2$s-ə  görünən etdi"</string>
-    <string name="notice_room_visibility_invited">bütün otaq üzvləri, dəvət olunduğu andan.</string>
-    <string name="notice_room_visibility_joined">bütün otaq üzvləri, qoşulduğu andan.</string>
-    <string name="notice_room_visibility_shared">bütün otaq üzvləri.</string>
-    <string name="notice_room_visibility_world_readable">hər kəs.</string>
-    <string name="notice_room_visibility_unknown">naməlum (%s).</string>
-    <string name="notice_end_to_end">%1$s sondan-sona şifrələmə açdı (%2$s)</string>
-    <string name="notice_room_update">%s bu otağı təkmilləşdirdi.</string>
-
-    <string name="notice_requested_voip_conference">%1$s VoIP konfrans istədi</string>
-    <string name="notice_voip_started">VoIP konfransı başladı</string>
-    <string name="notice_voip_finished">VoIP konfransı başa çatdı</string>
-
-    <string name="notice_avatar_changed_too">(avatar da dəyişdirilib)</string>
-    <string name="notice_room_name_removed">%1$s otaq adını sildi</string>
-    <string name="notice_room_topic_removed">%1$s otaq mövzusunu sildi</string>
-    <string name="notice_event_redacted">Mesaj silindi</string>
-    <string name="notice_event_redacted_by">Mesaj %1$s tərəfindən silindi</string>
-    <string name="notice_event_redacted_with_reason">Mesaj silindi [səbəb: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Mesaj %1$s tərəfindən qaldırıldı [səbəb: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s profilini %2$s yenilədi</string>
-    <string name="notice_room_third_party_invite">%1$s otağa qoşulmaq üçün %2$s dəvətnamə göndərdi</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s otağa qoşulmaq üçün %2$s dəvətini ləğv etdi</string>
-    <string name="notice_room_third_party_registered_invite">%1$s %2$s üçün dəvəti qəbul etdi</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Şifrəni aça bilmir: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Göndərənin cihazı bu mesaj üçün açarları bizə göndərməyib.</string>
-
-    <string name="could_not_redact">Redaktə etmək olmur</string>
-    <string name="unable_to_send_message">Mesaj göndərmək olmur</string>
-
-    <string name="message_failed_to_upload">Şəkil yükləmək olmur</string>
-
-    <string name="network_error">Şəbəkə xətası</string>
-    <string name="matrix_error">Matris xətası</string>
-
-    <string name="room_error_join_failed_empty_room">Boş bir otağa yenidən qoşulmaq hazırda mümkün deyil.</string>
-
-    <string name="encrypted_message">Şifrəli mesaj</string>
-
-    <string name="medium_email">Elektron poçt ünvanı</string>
-    <string name="medium_phone_number">Telefon nömrəsi</string>
-
-    <string name="room_displayname_invite_from">%s-dən dəvət</string>
-    <string name="room_displayname_room_invite">Otağa dəvət</string>
-
-    <string name="room_displayname_two_members">%1$s və %2$s</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s və 1 digər</item>
-        <item quantity="other">%1$s və %2$d digərləri</item>
-    </plurals>
-
-    <string name="room_displayname_empty_room">Boş otaq</string>
-
-    <string name="initial_sync_start_importing_account">İlkin sinxronizasiya:
-\nHesab idxal olunur…</string>
-    <string name="initial_sync_start_importing_account_crypto">İlkin sinxronizasiya:
-\nKriptografiyanın idxalı</string>
-    <string name="initial_sync_start_importing_account_rooms">İlkin sinxronizasiya:
-\nOtaqlar idxalı</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">İlkin sinxronizasiya:
-\nOtaqlara daxil olmaq</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">İlkin sinxronizasiya:
-\nDəvət olunmuş otaqların idxalı</string>
-    <string name="initial_sync_start_importing_account_left_rooms">İlkin sinxronizasiya:
-\nTərk olunmuş otaqların idxalı</string>
-    <string name="initial_sync_start_importing_account_groups">İlkin sinxronizasiya:
-\nİcmaların idxalı</string>
-    <string name="initial_sync_start_importing_account_data">İlkin sinxronizasiya:
-\nHesab məlumatlarının idxalı</string>
-
-    <string name="event_status_sending_message">Mesaj göndərilir…</string>
-    <string name="clear_timeline_send_queue">Göndərmə növbəsini təmizləyin</string>
-
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s-nin dəvəti. Səbəb: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s dəvət olunmuş %2$s. Səbəb: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s sizi dəvət etdi. Səbəb: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s qoşuldu. Səbəb: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s qalıb. Səbəb: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s dəvəti rədd etdi. Səbəb: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s %2$s-i xaric etdi. Səbəb: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s blokdan açdı %2$s. Səbəb: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s blokladı %2$s. Səbəb: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s otağa qoşulmaq üçün %2$s dəvətnamə göndərdi. Səbəb: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s otağa qoşulmaq üçün %2$s dəvətini ləğv etdi. Səbəb: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s üçün dəvəti qəbul etdi. Səbəb: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s %2$s dəvətini geri götürdü. Səbəb: %3$s</string>
-
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-bg/strings.xml b/matrix-sdk-android/src/main/res/values-bg/strings.xml
deleted file mode 100644
index 12f1a85860..0000000000
--- a/matrix-sdk-android/src/main/res/values-bg/strings.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s изпрати снимка.</string>
-    <string name="notice_room_invite_no_invitee">Поканата на %s</string>
-    <string name="notice_room_invite">%1$s покани %2$s</string>
-    <string name="notice_room_invite_you">%1$s Ви покани</string>
-    <string name="notice_room_join">%1$s се присъедини в стаята</string>
-    <string name="notice_room_leave">%1$s напусна стаята</string>
-    <string name="notice_room_reject">%1$s отхвърли поканата</string>
-    <string name="notice_room_kick">%1$s изгони %2$s</string>
-    <string name="notice_room_unban">%1$s отблокира %2$s</string>
-    <string name="notice_room_ban">%1$s блокира %2$s</string>
-    <string name="notice_room_withdraw">%1$s оттегли поканата си за %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s смени своята профилна снимка</string>
-    <string name="notice_display_name_set">%1$s си сложи име %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s смени своето име от %2$s на %3$s</string>
-    <string name="notice_display_name_removed">%1$s премахна своето име (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s смени темата на: %2$s</string>
-    <string name="notice_room_name_changed">%1$s смени името на стаята на: %2$s</string>
-    <string name="notice_placed_video_call">%s започна видео разговор.</string>
-    <string name="notice_placed_voice_call">%s започна гласов разговор.</string>
-    <string name="notice_answered_call">%s отговори на обаждането.</string>
-    <string name="notice_ended_call">%s прекрати разговора.</string>
-    <string name="notice_made_future_room_visibility">%1$s направи бъдещата история на стаята видима за %2$s</string>
-    <string name="notice_room_visibility_invited">всички членове, от момента на поканването им в нея.</string>
-    <string name="notice_room_visibility_joined">всички членове, от момента на присъединяването им в нея.</string>
-    <string name="notice_room_visibility_shared">всички членове в нея.</string>
-    <string name="notice_room_visibility_world_readable">всеки.</string>
-    <string name="notice_room_visibility_unknown">непозната (%s).</string>
-    <string name="notice_end_to_end">%1$s включи шифроване от край до край (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s заяви VoIP групов разговор</string>
-    <string name="notice_voip_started">Започна VoIP групов разговор</string>
-    <string name="notice_voip_finished">Груповият разговор приключи</string>
-    <string name="notice_avatar_changed_too">(профилната снимка също беше сменена)</string>
-    <string name="notice_room_name_removed">%1$s премахна името на стаята</string>
-    <string name="notice_room_topic_removed">%1$s премахна темата на стаята</string>
-    <string name="notice_profile_change_redacted">%1$s обнови своя профил %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s изпрати покана на %2$s да се присъедини към стаята</string>
-    <string name="notice_room_third_party_registered_invite">%1$s прие поканата за %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Неуспешно разшифроване: %s **</string>
-    <string name="could_not_redact">Неуспешно премахване</string>
-    <string name="unable_to_send_message">Неуспешно изпращане на съобщението</string>
-    <string name="message_failed_to_upload">Неуспешно качване на снимката</string>
-    <string name="network_error">Грешка в мрежата</string>
-    <string name="matrix_error">Matrix грешка</string>
-    <string name="room_error_join_failed_empty_room">В момента не е възможно да се присъедините отново към празна стая.</string>
-    <string name="encrypted_message">Шифровано съобщение</string>
-    <string name="medium_email">Имейл адрес</string>
-    <string name="medium_phone_number">Телефонен номер</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Устройството на подателя не изпрати ключовете за това съобщение.</string>
-    <string name="summary_user_sent_sticker">%1$s изпрати стикер.</string>
-    <string name="room_displayname_invite_from">Покана от %s</string>
-    <string name="room_displayname_room_invite">Покана за стая</string>
-    <string name="room_displayname_two_members">%1$s и %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s и 1 друг</item>
-        <item quantity="other">%1$s и %2$d други</item>
-    </plurals>
-    <string name="room_displayname_empty_room">Празна стая</string>
-    <string name="notice_event_redacted">Премахнато съобщение</string>
-    <string name="notice_event_redacted_by">Съобщение премахнато от %1$s</string>
-    <string name="notice_event_redacted_with_reason">Премахнато съобщение [причина: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Съобщение премахнато от %1$s [причина: %2$s]</string>
-    <string name="initial_sync_start_importing_account">Начална синхронизация:
-\nИмпортиране на профил…</string>
-    <string name="initial_sync_start_importing_account_crypto">Начална синхронизация:
-\nИмпортиране на данни за шифроване</string>
-    <string name="initial_sync_start_importing_account_rooms">Начална синхронизация:
-\nИмпортиране на стаи</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Начална синхронизация:
-\nИмпортиране на стаи, от които съм част</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Начална синхронизация:
-\nИмпортиране на стаи, към които съм поканен</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Начална синхронизация:
-\nИмпортиране на стаи, които съм напуснал</string>
-    <string name="initial_sync_start_importing_account_groups">Начална синхронизация:
-\nИмпортиране на общности</string>
-    <string name="initial_sync_start_importing_account_data">Начална синхронизация:
-\nИмпортиране на данни за профила</string>
-    <string name="notice_room_update">%s обнови тази стая.</string>
-    <string name="event_status_sending_message">Изпращане на съобщение…</string>
-    <string name="clear_timeline_send_queue">Изчисти опашката за изпращане</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s оттегли поканата за присъединяване на %2$s към стаята</string>
-    <string name="notice_room_invite_no_invitee_with_reason">поканата на %1$s. Причина: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s покани %2$s. Причина: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s ви покани. Причина: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s се присъедини в стаята. Причина: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s напусна стаята. Причина: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s отхвърли поканата. Причина: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s изгони %2$s. Причина: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s блокира %2$s. Причина: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s блокира %2$s. Причина: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s изпрати покана до %2$s да се присъедини в стаята. Причина: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s премахна поканата за присъединяване на %2$s в стаята. Причина: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s прие поканата за %2$s. Причина: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s оттегли поканата на %2$s. Причина: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s добави %2$s като адрес за тази стая.</item>
-        <item quantity="other">%1$s добави %2$s като адреси за тази стая.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s премахна %2$s като адрес за тази стая.</item>
-        <item quantity="other">%1$s премахна %2$s като адреси за тази стая.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s добави %2$s и премахна %3$s като адреси за тази стая.</string>
-    <string name="notice_room_canonical_alias_set">%1$s настрой %2$s като основен адрес за тази стая.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s премахна основния адрес за тази стая.</string>
-    <string name="notice_room_guest_access_can_join">%1$s разреши на гости да се присъединяват в стаята.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s предотврати присъединяването на гости в стаята.</string>
-    <string name="notice_end_to_end_ok">%1$s включи шифроване от-край-до-край.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s включи шифроване от-край-до-край (неразпознат алгоритъм %2$s).</string>
-    <string name="notice_room_created">%1$s създаде стаята</string>
-    <string name="summary_you_sent_image">Изпратихте снимка.</string>
-    <string name="summary_you_sent_sticker">Изпратихте стикер.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Ваша покана</string>
-    <string name="notice_room_created_by_you">Създадохте стаята</string>
-    <string name="notice_room_invite_by_you">Поканихте %1$s</string>
-    <string name="notice_room_join_by_you">Присъединихте се в стаята</string>
-    <string name="notice_room_leave_by_you">Напуснахте стаята</string>
-    <string name="notice_room_reject_by_you">Отхвърлихте поканата</string>
-    <string name="notice_room_kick_by_you">Изгонихте %1$s</string>
-    <string name="notice_room_unban_by_you">Отблокирахте %1$s</string>
-    <string name="notice_room_ban_by_you">Блокирахте %1$s</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Включихте шифроване от-край-до-край (непознат алгоритъм: %1$s).</string>
-    <string name="notice_end_to_end_ok_by_you">Включихте шифроване от-край-до-край.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Спряхте възможността гости да се присъединяват в стаята.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s спря възможността гости да се присъединяват в стаята.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Спряхте възможността гости да се присъединяват в стаята.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Позволихте на гости да се присъединяват тук.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s позволи на гости да се присъединяват тук.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Позволихте на гости да се присъединяват към стаята.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Премахнахте основния адрес на стаята.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Зададохте %1$s като основен адрес на стаята.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Добавихте %1$s и премахнахте %2$s от адресите за стаята.</string>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Премахнахте %1$s от адресите на стаята.</item>
-        <item quantity="other">Премахнахте %1$s от адресите на стаята.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Добавихте %1$s като адрес за тази стая.</item>
-        <item quantity="other">Добавихте %1$s като адреси за тази стая.</item>
-    </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">Оттеглихте поканата на %1$s. Причина: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Приехте поканата за %1$s. Причина: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Оттеглихте поканата за присъединяване в стаята от %1$s. Причина: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Изпратихте покана към %1$s за присъединяване в стаята. Причина: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Блокирахте %1$s. Причина: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Отблокирахте %1$s. Причина: %2$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Изгонихте %1$s. Причина: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Отхвърлихте поканата. Причина: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Напуснахте. Причина: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s напусна. Причина: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Напуснахте стаята. Причина: %1$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Присъединихте се. Причина: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s се присъедини. Причина: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Присъединихте се в стаята. Причина: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Поканихте %1$s. Причина: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваша покана. Причина: %1$s</string>
-    <string name="notice_power_level_diff">%1$s от %2$s на %3$s</string>
-    <string name="notice_power_level_changed">%1$s промени нивото на достъп на %2$s.</string>
-    <string name="notice_power_level_changed_by_you">Променихте нивото на достъп на %1$s.</string>
-    <string name="power_level_custom_no_value">Собствено ниво</string>
-    <string name="power_level_custom">Собствено ниво (%1$d)</string>
-    <string name="power_level_default">По подразбиране</string>
-    <string name="power_level_moderator">Модератор</string>
-    <string name="power_level_admin">Администратор</string>
-    <string name="notice_widget_modified_by_you">Променихте %1$s приспособлението</string>
-    <string name="notice_widget_modified">%1$s промени %2$s приспособлението</string>
-    <string name="notice_widget_removed_by_you">Премахнахте %1$s приспособлението</string>
-    <string name="notice_widget_removed">%1$s премахна %2$s приспособлението</string>
-    <string name="notice_widget_added_by_you">Добавихте %1$s приспособление</string>
-    <string name="notice_widget_added">%1$s добави %2$s приспособление</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Приехте поканата за %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Оттеглихте поканата от %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s оттегли поканата от %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Оттеглихте поканата за присъединяване в стаята от %1$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Поканихте %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s покани %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Изпратихте покана към %1$s за присъединяване в стаята</string>
-    <string name="notice_profile_change_redacted_by_you">Обновихте профила си %1$s</string>
-    <string name="notice_room_avatar_removed_by_you">Премахнахте снимката на стаята</string>
-    <string name="notice_room_avatar_removed">%1$s премахна снимката на стаята</string>
-    <string name="notice_room_topic_removed_by_you">Премахнахте темата на стаята</string>
-    <string name="notice_room_name_removed_by_you">Премахнахте името на стаята</string>
-    <string name="notice_requested_voip_conference_by_you">Заявихте VoIP конференция</string>
-    <string name="notice_direct_room_update_by_you">Обновихте чата.</string>
-    <string name="notice_direct_room_update">%s обнови чата.</string>
-    <string name="notice_room_update_by_you">Обновихте стаята.</string>
-    <string name="notice_end_to_end_by_you">Включихте шифроване от-край-до-край (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Направихте бъдещите съобщения видими за %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s направи бъдещите съобщения видими за %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Направихте бъдещата история на стаята видима за %1$s</string>
-    <string name="notice_ended_call_by_you">Прекратихте разговора.</string>
-    <string name="notice_placed_video_call_by_you">Започнахте видео разговор.</string>
-    <string name="notice_answered_call_by_you">Отговорихте на обаждането.</string>
-    <string name="notice_call_candidates_by_you">Изпратихте данни за настройка на разговора.</string>
-    <string name="notice_call_candidates">%s изпрати данни за настройка на разговора.</string>
-    <string name="notice_placed_voice_call_by_you">Започнахте гласов разговор.</string>
-    <string name="notice_room_name_changed_by_you">Променихте името на стаята на: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Променихте снимката на стаята</string>
-    <string name="notice_room_avatar_changed">%1$s промени снимката на стаята</string>
-    <string name="notice_room_topic_changed_by_you">Променихте темата на: %1$s</string>
-    <string name="notice_display_name_removed_by_you">Премахнахте името си (%1$s)</string>
-    <string name="notice_display_name_changed_from_by_you">Променихте името си от %1$s на %2$s</string>
-    <string name="notice_display_name_set_by_you">Променихте името си на %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Променихте снимката си</string>
-    <string name="notice_room_withdraw_by_you">Оттеглихте поканата от %1$s</string>
-    <string name="notice_direct_room_leave_by_you">Напуснахте стаята</string>
-    <string name="notice_direct_room_leave">%1$s напусна стаята</string>
-    <string name="notice_direct_room_join_by_you">Присъединихте се</string>
-    <string name="notice_direct_room_join">%1$s се присъедини</string>
-    <string name="notice_direct_room_created_by_you">Създадохте дискусията</string>
-    <string name="notice_direct_room_created">%1$s създаде дискусията</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
deleted file mode 100644
index 38be316df8..0000000000
--- a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_user_sent_image">%1$s একটি ফটো পাঠিয়েছে।</string>
-    <string name="summary_user_sent_sticker">%1$s একটি স্তিকার পাঠিয়েছে।</string>
-    <string name="notice_room_invite_no_invitee">%s এর আমন্ত্রণ</string>
-    <string name="notice_room_invite">%1$s %2$s কে আমন্ত্রণ করেছে</string>
-    <string name="notice_room_invite_you">%1$s আপনাকে আমন্ত্রণ করেছে</string>
-    <string name="notice_room_join">%1$s রুম এ যোগ দিয়েছে</string>
-    <string name="notice_room_leave">%1$s রুম ছেড়ে দিয়েছে</string>
-    <string name="notice_room_reject">%1$s আমন্ত্রণ টি বাতিল করেছে</string>
-    <string name="notice_room_kick">%1$s %2$s কে কিক করেছে</string>
-    <string name="notice_room_unban">%1$s %2$s কে নিষিদ্ধ তালিকা থেকে মুক্ত করেছে</string>
-    <string name="notice_room_ban">%1$s %2$s কে নিষিদ্ধ করেছে</string>
-    <string name="notice_room_withdraw">%1$s %2$s এর আমন্ত্রণ ফেরত নিয়েছে</string>
-    <string name="notice_avatar_url_changed">%1$s নিজের অবতার পরিবর্তন করেছে</string>
-    <string name="notice_display_name_set">%1$s নিজের প্রদর্শন নাম %2$s রেখেছে</string>
-    <string name="notice_display_name_changed_from">%1$s নিজের প্রদর্শন নাম %2$s থেকে %3$s তে পরিবর্তন করেছে</string>
-    <string name="notice_display_name_removed">%1$s নিজের প্রদর্শন নাম মুছে দিয়েছে (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s বিষয় টি এতে পরিবর্তন করেছে: %2$s</string>
-    <string name="notice_room_name_changed">%1$s রুম এর নাম এতে পরিবর্তন করেছে: %2$s</string>
-    <string name="notice_placed_video_call">%s একটি ভিডিও কল স্থাপন করেছিল।</string>
-    <string name="notice_placed_voice_call">%s একটি ভয়েস কল দিয়েছে।</string>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_you_sent_image">আপনি একটি ছবি প্রেরণ করেছেন।</string>
-    <string name="summary_you_sent_sticker">আপনি একটি স্তিকার পাঠিয়েছেন।</string>
-    <string name="notice_room_invite_no_invitee_by_you">আপনার আমন্ত্রণ</string>
-    <string name="notice_room_created">%1$s কক্ষটি তৈরি করেছেন</string>
-    <string name="notice_room_created_by_you">আপনি কক্ষটি তৈরি করেছেন</string>
-    <string name="notice_room_invite_by_you">আপনি %1$s কে আমন্ত্রিত করেছেন</string>
-    <string name="notice_room_join_by_you">আপনি কক্ষে যোগ দিয়েছেন</string>
-    <string name="notice_room_leave_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন</string>
-    <string name="notice_room_reject_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন</string>
-    <string name="notice_room_kick_by_you">আপনি %1$s কে কীক করেছেন</string>
-    <string name="notice_room_unban_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন</string>
-    <string name="notice_room_ban_by_you">আপনি %1$s কে নিষিদ্ধ করেছেন</string>
-    <string name="notice_room_withdraw_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন</string>
-    <string name="notice_avatar_url_changed_by_you">আপনি আপনার অবতারটি পরিবর্তন করেছেন</string>
-    <string name="notice_display_name_set_by_you">আপনি আপনার প্রদর্শনের নামটি %1$s তে সেট করেছেন</string>
-    <string name="notice_display_name_changed_from_by_you">আপনি আপনার প্রদর্শনের নামটি %1$s থেকে %2$s এ পরিবর্তন করেছেন</string>
-    <string name="notice_display_name_removed_by_you">আপনি আপনার প্রদর্শনের নামটি সরিয়ে দিয়েছেন (যেটা ছিল %1$s)</string>
-    <string name="notice_room_topic_changed_by_you">আপনি বিষয়টিকে এতে পরিবর্তন করেছেন: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s কক্ষের অবতারটি পরিবর্তন করেছে</string>
-    <string name="notice_room_avatar_changed_by_you">আপনি কক্ষের অবতারটি পরিবর্তন করেছেন</string>
-    <string name="notice_room_name_changed_by_you">আপনি কক্ষের নাম এতে পরিবর্তন করেছেন:%1$s</string>
-    <string name="notice_placed_video_call_by_you">আপনি একটি ভিডিও কল করেছেন।</string>
-    <string name="notice_placed_voice_call_by_you">আপনি একটি ভয়েস কল দিয়েছেন।</string>
-    <string name="notice_call_candidates">কল সেটআপ করার জন্য %s ডেটা প্রেরণ করেছে।</string>
-    <string name="notice_call_candidates_by_you">আপনি কল সেটআপ করার জন্য ডেটা প্রেরণ করেছেন।</string>
-    <string name="notice_answered_call">%s কলটির উত্তর দিয়েছে।</string>
-    <string name="notice_answered_call_by_you">আপনি কলটি উত্তর দিয়েছেন।</string>
-    <string name="notice_ended_call">%s কলটি শেষ করেছেন।</string>
-    <string name="notice_ended_call_by_you">আপনি কলটি শেষ করেছেন।</string>
-    <string name="notice_made_future_room_visibility">%1$s ভবিষ্যতের ঘরের ইতিহাস %2$s এর কাছে দৃশ্যমান করে তুলেছে</string>
-    <string name="notice_made_future_room_visibility_by_you">আপনি ভবিষ্যতের কক্ষ ইতিহাস %1$s এর কাছে দৃশ্যমান করেছেন</string>
-    <string name="notice_room_visibility_invited">কক্ষের সমস্ত সদস্য, যখন থেকে তারা আমন্ত্রিত।</string>
-    <string name="notice_room_visibility_joined">কক্ষের সমস্ত সদস্য, যখন থেকে তারা যোগদান করেছিল।</string>
-    <string name="notice_room_visibility_shared">সমস্ত কক্ষের সদস্য।</string>
-    <string name="notice_room_visibility_world_readable">যে কেউ।</string>
-    <string name="notice_room_visibility_unknown">অজানা (%s)।</string>
-    <string name="notice_end_to_end">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (%2$s)</string>
-    <string name="notice_end_to_end_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (%1$s)</string>
-    <string name="notice_room_update">%s এই কক্ষটিকে আপগ্রেড করেছে।</string>
-    <string name="notice_room_update_by_you">আপনি এই কক্ষটি আপগ্রেড করেছেন।</string>
-    <string name="notice_requested_voip_conference">%1$s একটি ভিওআইপি সম্মেলনের জন্য অনুরোধ করেছে</string>
-    <string name="notice_requested_voip_conference_by_you">আপনি একটি ভিওআইপি সম্মেলনের অনুরোধ করেছেন</string>
-    <string name="notice_voip_started">ভিওআইপি সম্মেলন শুরু হয়েছে</string>
-    <string name="notice_voip_finished">ভিওআইপি সম্মেলন শেষ হয়েছে</string>
-    <string name="notice_avatar_changed_too">(আবতারটিও পরিবর্তন করা হয়েছিল)</string>
-    <string name="notice_room_name_removed">%1$s কক্ষের নাম সরিয়েছে</string>
-    <string name="notice_room_name_removed_by_you">আপনি কক্ষের নাম সরিয়েছেন</string>
-    <string name="notice_room_topic_removed">%1$s কক্ষের বিষয় মুছে ফেলেছে</string>
-    <string name="notice_room_topic_removed_by_you">আপনি কক্ষের বিষয়টিকে সরিয়ে দিয়েছেন</string>
-    <string name="notice_room_avatar_removed">%1$s কক্ষের অবতার সরিয়ে নিয়েছে</string>
-    <string name="notice_room_avatar_removed_by_you">আপনি কক্ষের অবতার সরিয়েছেন</string>
-    <string name="notice_event_redacted">বার্তা সরানো হয়েছে</string>
-    <string name="notice_event_redacted_by">%1$s দ্বারা বার্তা সরানো হয়েছে</string>
-    <string name="notice_event_redacted_with_reason">বার্তা সরানো হয়েছে [কারণ:%1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">%1$s দ্বারা বার্তা সরানো হয়েছে [কারণ: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s তাদের প্রোফাইল %2$s আপডেট করেছে</string>
-    <string name="notice_profile_change_redacted_by_you">আপনি আপনার প্রোফাইল %1$s আপডেট করেছেন</string>
-    <string name="notice_room_third_party_invite">%1$s %2$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ পাঠিয়েছে</string>
-    <string name="notice_room_third_party_invite_by_you">আপনি %1$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ প্রেরণ করেছেন</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s %2$s এর কক্ষে যোগদানের আমন্ত্রণ বাতিল করে দিয়েছিল</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন</string>
-    <string name="notice_room_third_party_registered_invite">%1$s %2$s এর জন্য আমন্ত্রণটি গ্রহণ করেছে</string>
-    <string name="notice_room_third_party_registered_invite_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন</string>
-    <string name="notice_widget_added">%1$s %2$s উইজেট যুক্ত করেছে</string>
-    <string name="notice_widget_added_by_you">আপনি %1$s উইজেট যুক্ত করেছেন</string>
-    <string name="notice_widget_removed">%1$s %2$s উইজেট সরিয়ে দিয়েছেন</string>
-    <string name="notice_widget_removed_by_you">আপনি %1$s উইজেট সরিয়েছেন</string>
-    <string name="notice_widget_modified">%1$s %2$s উইজেট পরিবর্তন করেছেন</string>
-    <string name="notice_widget_modified_by_you">আপনি %1$s উইজেট পরিবর্তন করেছেন</string>
-    <string name="power_level_admin">অ্যাডমিন</string>
-    <string name="power_level_moderator">নিয়ামক</string>
-    <string name="power_level_default">ডিফল্ট</string>
-    <string name="power_level_custom">কাস্টম (%1$d)</string>
-    <string name="power_level_custom_no_value">কাস্টম</string>
-    <string name="notice_power_level_changed_by_you">আপনি %1$s এর পাওয়ার স্তর পরিবর্তন করেছেন।</string>
-    <string name="notice_power_level_changed">%1$s %2$s এর পাওয়ার স্তর পরিবর্তন করেছে।</string>
-    <string name="notice_power_level_diff">%1$s %2$s থেকে %3$s পর্যন্ত</string>
-    <string name="notice_crypto_unable_to_decrypt">** ডিক্রিপ্ট করতে অক্ষম: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
-    <string name="could_not_redact">পুনরায় প্রতিক্রিয়া করতে পারেনি</string>
-    <string name="unable_to_send_message">বার্তা পাঠাতে অক্ষম</string>
-    <string name="message_failed_to_upload">চিত্র আপলোড করতে ব্যর্থ</string>
-    <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
-    <string name="matrix_error">ম্যাট্রিক্স ত্রুটি</string>
-    <string name="room_error_join_failed_empty_room">খালি কক্ষে পুনরায় যোগদান করা বর্তমানে সম্ভব নয়।</string>
-    <string name="encrypted_message">এনক্রিপ্ট করা বার্তা</string>
-    <string name="medium_email">ইমেল ঠিকানা</string>
-    <string name="medium_phone_number">ফোন নম্বর</string>
-    <string name="room_displayname_invite_from">%s থেকে আমন্ত্রণ করুন</string>
-    <string name="room_displayname_room_invite">কক্ষ আমন্ত্রণ</string>
-    <string name="room_displayname_two_members">%1$s এবং %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s এবং অন্য ১ জন</item>
-        <item quantity="other">%1$s এবং অন্যান্য %2$d জন</item>
-    </plurals>
-    <string name="room_displayname_empty_room">খালি কক্ষ</string>
-    <string name="initial_sync_start_importing_account">প্রাথমিক সিঙ্ক:
-\nঅ্যাকাউন্ট আমদানি করা হচ্ছে…</string>
-    <string name="initial_sync_start_importing_account_crypto">প্রাথমিক সিঙ্ক:
-\nক্রিপ্টো আমদানি হচ্ছে</string>
-    <string name="initial_sync_start_importing_account_rooms">প্রাথমিক সিঙ্ক:
-\nকক্ষগুলি আমদানি করা হচ্ছে</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">প্রাথমিক সিঙ্ক:
-\nযোগ করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">প্রাথমিক সিঙ্ক:
-\nআমন্ত্রিত করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
-    <string name="initial_sync_start_importing_account_left_rooms">প্রাথমিক সিঙ্ক:
-\nছেড়ে দেওয়া কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
-    <string name="initial_sync_start_importing_account_groups">প্রাথমিক সিঙ্ক:
-\nসম্প্রদায়গুলি আমদানি করা হচ্ছে</string>
-    <string name="initial_sync_start_importing_account_data">প্রাথমিক সিঙ্ক:
-\nঅ্যাকাউন্ট ডেটা আমদানি করা হচ্ছে</string>
-    <string name="event_status_sending_message">বার্তা প্রেরণ করা হচ্ছে …</string>
-    <string name="clear_timeline_send_queue">প্রেরণ সারি পরিষ্কার করুন</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s এর আমন্ত্রণ। কারণ: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">আপনার আমন্ত্রণ। কারণ: %1$s</string>
-    <string name="notice_room_invite_with_reason">%1$s আমন্ত্রিত করেছেন %2$s কে। কারণ: %3$s</string>
-    <string name="notice_room_invite_with_reason_by_you">আপনি %1$s কে আমন্ত্রিত করেছেন। কারণ: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s আপনাকে আমন্ত্রণ করেছে। কারণ: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s রুম এ যোগ দিয়েছে। কারণ: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">আপনি কক্ষে যোগ দিয়েছেন। কারণ: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s রুম ছেড়ে দিয়েছে। কারণ: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন। কারণ: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s আমন্ত্রণ বাতিল করেছেন। কারণ: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন। কারণ: %1$s</string>
-    <string name="notice_room_kick_with_reason">%1$s %2$s কে কিক করেছে। কারণ: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">আপনি %1$s কে কীক করেছেন। কারণ: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s %2$s কে নিষিদ্ধ তালিকা থেকে মুক্ত করেছে। কারণ: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন। কারণ: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s %2$s কে নিষিদ্ধ করেছে। কারণ: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ করেছেন। কারণ: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s রুমের সাথে যোগ দিতে %2$s কে একটি আমন্ত্রণ পাঠিয়েছেন। কারণ: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">আপনি %1$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ প্রেরণ করেছেন। কারণ: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s %2$s এর কক্ষে যোগদানের আমন্ত্রণ বাতিল করে দিয়েছিল। কারণ: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন। কারণ: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s এর জন্য আমন্ত্রণ গ্রহণ করেছেন। কারণ: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন। কারণ: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s %2$s এর আমন্ত্রণ ফেরত নিয়েছে। কারণ: %3$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন। কারণ: %2$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s যুক্ত করেছে।</item>
-        <item quantity="other">%1$s এই ঘরের ঠিকানাগুলি হিসাবে %2$s যুক্ত করেছে।</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">আপনি এই কক্ষের জন্য ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
-        <item quantity="other">আপনি এই কক্ষের ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s সরানো হয়েছে।</item>
-        <item quantity="other">%1$s %3$s কে এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">আপনি এই ঘরের ঠিকানা হিসাবে %1$s সরিয়েছেন।</item>
-        <item quantity="other">আপনি এই ঘরের ঠিকানা হিসাবে %1$s গুলি সরিয়েছেন।</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s %2$s যোগ করেছে এবং %3$s গুলি এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">আপনি %1$s যোগ করেছেন এবং %2$s কে এই ঘরের ঠিকানা হিসাবে সরিয়ে দিয়েছেন।</string>
-    <string name="notice_room_canonical_alias_set">%1$s এই ঘরের মূল ঠিকানাটি %2$s তে সেট করে।</string>
-    <string name="notice_room_canonical_alias_set_by_you">আপনি এই ঘরের মূল ঠিকানাটি %1$s তে সেট করেছেন।</string>
-    <string name="notice_room_canonical_alias_unset">%1$s এই ঘরের মূল ঠিকানা সরিয়ে নিয়েছে।</string>
-    <string name="notice_room_canonical_alias_unset_by_you">আপনি এই ঘরের মূল ঠিকানা সরিয়েছেন।</string>
-    <string name="notice_room_guest_access_can_join">%1$s অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছে।</string>
-    <string name="notice_room_guest_access_can_join_by_you">আপনি অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছেন।</string>
-    <string name="notice_room_guest_access_forbidden">%1$s অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছে।</string>
-    <string name="notice_room_guest_access_forbidden_by_you">আপনি অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছেন।</string>
-    <string name="notice_end_to_end_ok">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে।</string>
-    <string name="notice_end_to_end_ok_by_you">আপনি শেষ থেকে শেষ এনক্রিপশন চালু করেছেন।</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (অজানা অ্যালগরিদম %2$s)।</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (অজানা অ্যালগরিদম %1$s )।</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-bs/strings.xml b/matrix-sdk-android/src/main/res/values-bs/strings.xml
deleted file mode 100644
index 6a6ee46d32..0000000000
--- a/matrix-sdk-android/src/main/res/values-bs/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="room_displayname_invite_from">Pozovite iz %s</string>
-    <string name="room_displayname_room_invite">Poziv u Sobu</string>
-    <string name="room_displayname_two_members">%1$s i %2$s</string>
-    <string name="room_displayname_empty_room">Prazna soba</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-ca/strings.xml b/matrix-sdk-android/src/main/res/values-ca/strings.xml
deleted file mode 100644
index 32f482724f..0000000000
--- a/matrix-sdk-android/src/main/res/values-ca/strings.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s ha enviat una imatge.</string>
-    <string name="notice_room_leave">%1$s ha marxat de la sala</string>
-    <string name="notice_room_join">%1$s s\'ha unit a la sala</string>
-    <string name="medium_phone_number">Número de telèfon</string>
-    <string name="medium_email">Correu electrònic</string>
-    <string name="encrypted_message">Missatge xifrat</string>
-    <string name="notice_room_invite_no_invitee">invitació de %s</string>
-    <string name="notice_room_invite">%1$s ha convidat a %2$s</string>
-    <string name="notice_room_invite_you">%1$s t\'ha convidat</string>
-    <string name="notice_room_reject">%1$s ha rebutjat la invitació</string>
-    <string name="notice_room_kick">%1$s ha expulsat %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s ha canviat el seu àlies de %2$s a %3$s</string>
-    <string name="notice_display_name_removed">%1$s ha eliminat el àlies (era %2$s)</string>
-    <string name="notice_room_topic_changed">%1$s ha canviat el tema a: %2$s</string>
-    <string name="notice_room_name_changed">%1$s ha canviat el nom de la sala a: %2$s</string>
-    <string name="notice_answered_call">%s ha respost a la trucada.</string>
-    <string name="notice_ended_call">%s ha finalitzat la trucada.</string>
-    <string name="notice_room_visibility_invited">tots el participants de la sala, des de que són convidats.</string>
-    <string name="notice_room_visibility_shared">tots els participants de la sala.</string>
-    <string name="notice_room_visibility_unknown">desconegut (%s).</string>
-    <string name="notice_end_to_end">%1$s ha activat el xifrat d\'extrem a extrem (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s ha sol·licitat una conferència VoIP</string>
-    <string name="notice_room_unban">%1$s ha tret el vet a %2$s</string>
-    <string name="notice_room_ban">%1$s ha vetat %2$s</string>
-    <string name="notice_room_withdraw">%1$s ha retirat la invitació de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s ha canviat la seva icona</string>
-    <string name="notice_made_future_room_visibility">%1$s ha establert la visibilitat de l\'històric futur de la sala a %2$s</string>
-    <string name="notice_room_visibility_joined">tots els participants de la sala, des de que s\'hi uneixen.</string>
-    <string name="notice_room_visibility_world_readable">qualsevol.</string>
-    <string name="notice_voip_started">S\'ha iniciat la conferència VoIP</string>
-    <string name="notice_voip_finished">Ha finalitzat la conferència VoIP</string>
-    <string name="notice_avatar_changed_too">(també ha canviat la icona)</string>
-    <string name="notice_room_name_removed">%1$s ha eliminat el nom de la sala</string>
-    <string name="notice_room_topic_removed">%1$s ha eliminat el tema de la sala</string>
-    <string name="notice_profile_change_redacted">%1$s ha actualitzat el seu perfil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s ha enviat una invitació a %2$s perquè s\'uneixi a la sala</string>
-    <string name="notice_room_third_party_registered_invite">%1$s ha acceptat la invitació de %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** No s\'ha pogut desxifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositiu del remitent no ens ha enviat les claus per aquest missatge.</string>
-    <string name="could_not_redact">No s\'ha pogut redactar</string>
-    <string name="unable_to_send_message">No s\'ha pogut enviar el missatge</string>
-    <string name="message_failed_to_upload">No s\'ha pogut pujar la imatge</string>
-    <string name="network_error">Error de xarxa</string>
-    <string name="matrix_error">Error de Matrix</string>
-    <string name="room_error_join_failed_empty_room">Ara per ara no és possible tornar a unir-se a una sala buida.</string>
-    <string name="notice_display_name_set">%1$s a canviat el seu àlies a %2$s</string>
-    <string name="notice_placed_video_call">%s ha realitzat una videotrucada.</string>
-    <string name="notice_placed_voice_call">%s ha realitzat una trucada de veu.</string>
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Invitació de %s</string>
-    <string name="room_displayname_room_invite">Convida a la sala</string>
-    <string name="room_displayname_two_members">%1$s i %2$s</string>
-    <string name="room_displayname_empty_room">Sala buida</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s i 1 altre</item>
-        <item quantity="other">%1$s i %2$d altres</item>
-    </plurals>
-    <string name="summary_user_sent_sticker">%1$s ha enviat un adhesiu.</string>
-    <string name="notice_direct_room_update">%s s\'ha actualitzat aquí.</string>
-    <string name="notice_direct_room_update_by_you">Ho has actualitzat aquí.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Has activat el xifrat d\'extrem a extrem (algorisme %1$s no reconegut).</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s ha activat el xifrat d\'extrem a extrem (algorisme %2$s no reconegut).</string>
-    <string name="notice_end_to_end_ok_by_you">Has activat el xifrat d\'extrem a extrem.</string>
-    <string name="notice_end_to_end_ok">%1$s ha activat el xifrat d\'extrem a extrem.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Has impedit que els convidats es puguin unir a la sala.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedit que els convidats es puguin unir a la sala.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Has impedit que els convidats es puguin unir a la sala.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s ha impedit que els convidats es puguin unir a la sala.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Has permès que els convidats s\'uneixin aquí.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s ha permès que els convidats s\'uneixin aquí.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Has permès que els convidats s\'uneixin a la sala.</string>
-    <string name="notice_room_guest_access_can_join">%1$s ha permès que els convidats s\'uneixin a la sala.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Has eliminat l\'adreça principal d\'aquesta sala.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s ha eliminat l\'adreça principal d\'aquesta sala.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Has establert l\'adreça principal d\'aquesta sala a %1$s.</string>
-    <string name="notice_room_canonical_alias_set">%1$s ha establert l\'adreça principal d\'aquesta sala a %2$s.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Has afegit %1$s i has eliminat %2$s d\'aquesta sala (adreces).</string>
-    <string name="notice_room_aliases_added_and_removed">%1$s ha afegit %2$s i ha eliminat %3$s d\'aquesta sala (adreces).</string>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Has eliminat l\'adreça %1$s d\'aquesta sala.</item>
-        <item quantity="other">Has eliminat les adreces %1$s d\'aquesta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s ha eliminat %2$s com a adreça d\'aquesta sala.</item>
-        <item quantity="other">%1$s ha eliminat %2$s com a adreces d\'aquesta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Has afegit l\'adreça %1$s a aquesta sala.</item>
-        <item quantity="other">Has afegit les adreces %1$s a aquesta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s ha afegit l\'adreça %2$s a aquesta sala.</item>
-        <item quantity="other">%1$s ha afegit les adreces %2$s a aquesta sala.</item>
-    </plurals>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Has revocat la invitació de %1$s perquè s\'uneixi a la sala. Motiu: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s ha revocat la invitació de %2$s perquè s\'uneixi a la sala. Motiu: %3$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Has revocat la invitació de %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s ha revocat la invitació de %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Has revocat la invitació de %1$s perquè s\'uneixi a la sala</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s ha revocat la invitació de %2$s perquè s\'uneixi a la sala</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Has retirat la invitació de %1$s. Motiu: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s ha retirat la invitació de %2$s. Motiu: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Has acceptat la invitació de %1$s. Motiu: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s ha acceptat la invitació de %2$s. Motiu: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Has enviat una invitació a %1$s perquè s\'uneixi a la sala. Motiu: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s ha enviat una invitació a %2$s perquè s\'uneixi a la sala. Motiu: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Has vetat %1$s. Motiu: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s ha vetat %2$s. Motiu: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Has tret el vet a %1$s. Motiu: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s ha tret el vet a %2$s. Motiu: %3$s</string>
-    <string name="notice_room_ban_by_you">Has vetat %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Has marxat de la sala. Motiu: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s ha marxat de la sala. Motiu: %2$s</string>
-    <string name="notice_direct_room_leave_by_you">Has marxat de la sala</string>
-    <string name="notice_direct_room_leave">%1$s ha marxat de la sala</string>
-    <string name="notice_room_leave_by_you">Has marxat de la sala</string>
-    <string name="notice_room_kick_by_you">Has expulsat %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Has expulsat %1$s. Motiu: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s ha expulsat %2$s. Motiu: %3$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Has rebutjat la invitació. Motiu: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s ha rebutjat la invitació. Motiu: %2$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Has marxat. Motiu: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s ha marxat. Motiu: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">T\'has unit. Motiu: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s s\'ha unit. Motiu: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">T\'has unit a la sala. Motiu: %1$s</string>
-    <string name="notice_room_join_with_reason">%1$s s\'ha unit a la sala. Motiu: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s t\'ha convidat. Motiu: %2$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Has convidat %1$s. Motiu: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s ha convidat %2$s. Motiu: %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">La teva invitació. Motiu: %1$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason">la invitació de %1$s. Motiu: %2$s</string>
-    <string name="clear_timeline_send_queue">Esborra la cua d\'enviament</string>
-    <string name="event_status_sending_message">Enviant missatge…</string>
-    <string name="initial_sync_start_importing_account_data">Sincronització inicial:
-\nImportant dades del compte</string>
-    <string name="initial_sync_start_importing_account_groups">Sincronització inicial:
-\nImportant comunitats</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Sincronització inicial:
-\nImportant sales que deixat</string>
-    <string name="initial_sync_start_importing_account">Sincronització inicial:
-\nImportant compte…</string>
-    <string name="initial_sync_start_importing_account_crypto">Sincronització inicial:
-\nImportant xifrat</string>
-    <string name="initial_sync_start_importing_account_rooms">Sincronització inicial:
-\nImportant sales</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Sincronització inicial:
-\nImportant sales on hi estàs convidat</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Sincronització inicial:
-\nImportant sales on hi estàs unit</string>
-    <string name="notice_power_level_diff">%1$s de %2$s a %3$s</string>
-    <string name="notice_power_level_changed">%1$s ha canviat el nivell d\'autoritat de %2$s.</string>
-    <string name="notice_power_level_changed_by_you">Has canviat el nivell d\'autoritat de %1$s.</string>
-    <string name="power_level_custom_no_value">Personalitzat</string>
-    <string name="power_level_custom">Personalitzat (%1$d)</string>
-    <string name="power_level_default">Predeterminat</string>
-    <string name="power_level_moderator">Moderador</string>
-    <string name="power_level_admin">Administrador</string>
-    <string name="notice_widget_modified_by_you">Has modificat el giny %1$s</string>
-    <string name="notice_widget_modified">%1$s ha modificat el giny %2$s</string>
-    <string name="notice_widget_removed_by_you">Has eliminat el giny %1$s</string>
-    <string name="notice_widget_removed">%1$s ha eliminat el giny %2$s</string>
-    <string name="notice_widget_added_by_you">Has afegit el giny %1$s</string>
-    <string name="notice_widget_added">%1$s ha afegit el giny %2$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Has acceptat la invitació de %1$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Has convidat a %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s ha convidat a %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Has enviat una invitació a %1$s perquè s\'uneixi a la sala</string>
-    <string name="notice_profile_change_redacted_by_you">Has actualitzat el teu perfil %1$s</string>
-    <string name="notice_event_redacted_by_with_reason">Missatge eliminat per %1$s [motiu: %2$s]</string>
-    <string name="notice_event_redacted_with_reason">Missatge eliminat [motiu: %1$s]</string>
-    <string name="notice_event_redacted_by">Missatge eliminat per %1$s</string>
-    <string name="notice_event_redacted">Missatge eliminat</string>
-    <string name="notice_room_avatar_removed_by_you">Has eliminat la icona de la sala</string>
-    <string name="notice_room_avatar_removed">%1$s ha eliminat la icona de la sala</string>
-    <string name="notice_room_topic_removed_by_you">Has eliminat el tema de la sala</string>
-    <string name="notice_room_name_removed_by_you">Has eliminat el nom de la sala</string>
-    <string name="notice_requested_voip_conference_by_you">Has sol·licitat una conferència VoIP</string>
-    <string name="notice_room_update_by_you">Has actualitzat aquesta sala.</string>
-    <string name="notice_room_update">%s ha actualitzat aquesta sala.</string>
-    <string name="notice_end_to_end_by_you">Has activat el xifrat d\'extrem a extrem (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Has establert la visibilitat dels missatges futurs a %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s ha establert la visibilitat dels missatges futurs a %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Has establert la visibilitat de l\'històric futur de la sala a %1$s</string>
-    <string name="notice_ended_call_by_you">Has finalitzat la trucada.</string>
-    <string name="notice_answered_call_by_you">Has respost a la trucada.</string>
-    <string name="notice_call_candidates_by_you">Has enviat dades per configurar la trucada.</string>
-    <string name="notice_call_candidates">%s ha enviat dades per configurar la trucada.</string>
-    <string name="notice_placed_voice_call_by_you">Has realitzat una trucada de veu.</string>
-    <string name="notice_placed_video_call_by_you">Has realitzat una videotrucada.</string>
-    <string name="notice_room_name_changed_by_you">Has canviat el nom de la sala a: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Has canviat la icona de la sala</string>
-    <string name="notice_room_avatar_changed">%1$s ha canviat la icona de la sala</string>
-    <string name="notice_room_topic_changed_by_you">Has canviat el tema a: %1$s</string>
-    <string name="notice_display_name_removed_by_you">Has eliminat el teu àlies (era %1$s)</string>
-    <string name="notice_display_name_changed_from_by_you">Has canviat el teu àlies de %1$s a %2$s</string>
-    <string name="notice_display_name_set_by_you">Has canviat el teu àlies a %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Has canviat la teva icona</string>
-    <string name="notice_room_withdraw_by_you">Has retirat la invitació de %1$s</string>
-    <string name="notice_room_unban_by_you">Has tret el vet a %1$s</string>
-    <string name="notice_room_reject_by_you">Has rebutjat la invitació</string>
-    <string name="notice_direct_room_created_by_you">Has creat la discussió</string>
-    <string name="notice_direct_room_created">%1$s ha creat la discussió</string>
-    <string name="notice_direct_room_join_by_you">T\'has unit</string>
-    <string name="notice_direct_room_join">%1$s s\'ha unit</string>
-    <string name="notice_room_join_by_you">T\'has unit a la sala</string>
-    <string name="notice_room_invite_by_you">Has convidat a %1$s</string>
-    <string name="notice_room_created_by_you">Has creat la sala</string>
-    <string name="notice_room_created">%1$s ha creat la sala</string>
-    <string name="notice_room_invite_no_invitee_by_you">La teva invitació</string>
-    <string name="summary_you_sent_sticker">Has enviat un adhesiu.</string>
-    <string name="summary_you_sent_image">Has enviat una imatge.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servidors coincidents amb literals IP ara estan vetats.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servidors coincidents amb literals IP ara estan permesos.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Servidors coincidents amb %s han estat eliminats de la llista de permesos.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Servidors coincidents amb %s ara estan permesos.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Servidors coincidents amb %s han estat eliminats del llista de vetats.</string>
-    <string name="notice_room_server_acl_updated_banned">• Servidors coincidents amb %s ara estan vetats.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servidors coincidents amb literals IP estan vetats.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servidors coincidents amb literals IP estan permesos.</string>
-    <string name="notice_room_server_acl_set_allowed">• Servidors coincidents amb %s estan permesos.</string>
-    <string name="notice_room_server_acl_set_banned">• Servidors coincidents amb %s estan vetats.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Has canviat les adreces d\'aquesta sala.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s ha canviat les adreces d\'aquesta sala.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Has canviat l\'adreça principal i les adreces alternatives d\'aquesta sala.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ha canviat l\'adreça principal i les adreces alternatives d\'aquesta sala.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Has canviat les adreces alternatives d\'aquesta sala.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s ha canviat les adreces alternatives d\'aquesta sala.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Has eliminat l\'adreça alternativa %1$s d\'aquesta sala.</item>
-        <item quantity="other">Has eliminat les adreces alternatives %1$s d\'aquesta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s ha eliminat l\'adreça alternativa %2$s d\'aquesta sala.</item>
-        <item quantity="other">%1$s ha eliminat les adreces alternatives %2$s d\'aquesta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Has afegit l\'adreça alternativa %1$s per aquesta sala.</item>
-        <item quantity="other">Has afegit les adreces alternatives %1$s per aquesta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s ha afegit l\'adreça alternativa %2$s per aquesta sala.</item>
-        <item quantity="other">%1$s ha afegit les adreces alternatives %2$s per aquesta sala.</item>
-    </plurals>
-    <string name="room_displayname_empty_room_was">Sala buida (era %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s i %4$d altre</item>
-        <item quantity="other">%1$s, %2$s, %3$s i %4$d altres</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s i %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s i %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Tots els servidors tenen la participació vetada! Aquesta sala ja no pot ser utilitzada.</string>
-    <string name="notice_room_server_acl_updated_no_change">Sense canvis.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Has canviat les ACLs de servidor d\'aquesta sala.</string>
-    <string name="notice_room_server_acl_updated_title">%s ha canviat les ACLs de servidor d\'aquesta sala.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Has establert les ACLs de servidor per aquesta sala.</string>
-    <string name="notice_room_server_acl_set_title">%s ha establert les ACLs de servidor d\'aquesta sala.</string>
-    <string name="notice_widget_jitsi_modified_by_you">Has modificat la videoconferència</string>
-    <string name="notice_widget_jitsi_modified">%1$s ha modificat la videoconferència</string>
-    <string name="notice_widget_jitsi_removed_by_you">Has finalitzat la videoconferència</string>
-    <string name="notice_widget_jitsi_added">%1$s ha iniciat una videoconferència</string>
-    <string name="notice_widget_jitsi_added_by_you">Has iniciat una videoconferència</string>
-    <string name="notice_widget_jitsi_removed">%1$s ha finalitzat la videoconferència</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-cs/strings.xml b/matrix-sdk-android/src/main/res/values-cs/strings.xml
deleted file mode 100644
index 018f0598fa..0000000000
--- a/matrix-sdk-android/src/main/res/values-cs/strings.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">Uživatel %1$s poslal obrázek.</string>
-    <string name="summary_user_sent_sticker">Uživatel %1$s poslal nálepku.</string>
-    <string name="notice_room_invite_no_invitee">Pozvání od uživatele %s</string>
-    <string name="notice_room_invite">Uživatel %1$s pozval uživatele %2$s</string>
-    <string name="notice_room_invite_you">Uživatel %1$s vás pozval</string>
-    <string name="notice_room_join">%1$s vstoupil do místnosti</string>
-    <string name="notice_room_leave">Uživatel %1$s odešel</string>
-    <string name="notice_room_reject">%1$s odmítli pozvání</string>
-    <string name="notice_room_kick">%1$s vykopli %2$s</string>
-    <string name="notice_room_unban">%1$s zrušil vykázání %2$s</string>
-    <string name="notice_room_ban">%1$s vykázali %2$s</string>
-    <string name="notice_room_withdraw">%1$s zrušili pozvání pro %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s změnili svůj profilový obrázek</string>
-    <string name="notice_display_name_set">%1$s nastavili své veřejné jméno na %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s změnili své veřejné jméno z %2$s na %3$s</string>
-    <string name="notice_display_name_removed">%1$s odstranili své veřejné jméno (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s změnili téma na: %2$s</string>
-    <string name="notice_room_name_changed">%1$s změnili název místnosti na: %2$s</string>
-    <string name="notice_placed_video_call">%s uskutečnili videohovor.</string>
-    <string name="notice_placed_voice_call">%s uskutečnili hlasový hovor.</string>
-    <string name="notice_answered_call">%s přijali hovor.</string>
-    <string name="notice_ended_call">%s ukončili hovor.</string>
-    <string name="notice_made_future_room_visibility">%1$s nastavili viditelnost budoucí historie místnosti pro %2$s</string>
-    <string name="notice_room_visibility_invited">všechny členy místnosti od chvíle, kdy budou pozváni.</string>
-    <string name="notice_room_visibility_joined">všechny členy místnosti od chvíle, kdy se připojí.</string>
-    <string name="notice_room_visibility_shared">všechny členy místnosti.</string>
-    <string name="notice_room_visibility_world_readable">kohokoliv.</string>
-    <string name="notice_room_visibility_unknown">neznámým (%s).</string>
-    <string name="notice_end_to_end">%1$s zapnuli end-to-end šifrování (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s požádali o VoIP konferenci</string>
-    <string name="notice_voip_started">Začala VoIP konference</string>
-    <string name="notice_voip_finished">VoIP konference skončila</string>
-    <string name="notice_avatar_changed_too">(profilový obrázek byl také změněn)</string>
-    <string name="notice_room_name_removed">%1$s odstranili název místnosti</string>
-    <string name="notice_room_topic_removed">%1$s odstranili téma místnosti</string>
-    <string name="notice_profile_change_redacted">%1$s aktualizovali svůj profil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s do této místnosti pozvali %2$s</string>
-    <string name="notice_room_third_party_registered_invite">%1$s přijali pozvání pro %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Nelze dešifrovat: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Odesílatelovo zařízení nám neposlalo klíče pro tuto zprávu.</string>
-    <string name="could_not_redact">Nelze vymazat</string>
-    <string name="unable_to_send_message">Zprávu nelze odeslat</string>
-    <string name="message_failed_to_upload">Obrázek nelze nahrát</string>
-    <string name="network_error">Chyba sítě</string>
-    <string name="matrix_error">Chyba v Matrixu</string>
-    <string name="room_error_join_failed_empty_room">V současnosti není možné znovu vstoupit do prázdné místnosti.</string>
-    <string name="encrypted_message">Šifrovaná zpráva</string>
-    <string name="medium_email">E-mailová adresa</string>
-    <string name="medium_phone_number">Telefonní číslo</string>
-    <string name="room_displayname_invite_from">Pozvání od %s</string>
-    <string name="room_displayname_room_invite">Pozvání do místnosti</string>
-    <string name="room_displayname_two_members">%1$s a %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s a jeden další</item>
-        <item quantity="few">%1$s a %2$d další</item>
-        <item quantity="other">%1$s a %2$d dalších</item>
-    </plurals>
-    <string name="room_displayname_empty_room">Prázdná místnost</string>
-    <string name="notice_room_update">%s povýšili tuto místnost.</string>
-    <string name="notice_event_redacted_with_reason">Zpráva byla smazána [důvod: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Zpráva smazána uživatelem %1$s [důvod: %2$s]</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s zrušili pozvánku do místnosti pro %2$s</string>
-    <string name="initial_sync_start_importing_account">Úvodní synchronizace: 
-\nImportuji účet…</string>
-    <string name="initial_sync_start_importing_account_crypto">Úvodní synchronizace: 
-\nImportuji klíče</string>
-    <string name="initial_sync_start_importing_account_rooms">Úvodní synchronizace: 
-\nImportuji místnosti</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Úvodní synchronizace: 
-\nImportuji místností, jichž jste členy</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Úvodní synchronizace: 
-\nImportuji místnost, jež jste opustili</string>
-    <string name="initial_sync_start_importing_account_groups">Úvodní synchronizace:
-\nImportuji skupiny</string>
-    <string name="initial_sync_start_importing_account_data">Úvodní synchronizace: 
-\nImportuji data účtu</string>
-    <string name="event_status_sending_message">Odesílám zprávu…</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Úvodní synchronizace: 
-\nImportuji pozvání</string>
-    <string name="clear_timeline_send_queue">Vymazat frontu neodeslaných zpráv</string>
-    <string name="notice_room_invite_with_reason">%1$s pozvali %2$s. Důvod: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s vás pozvali. Důvod: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s opustil místnost. Důvod: %2$s</string>
-    <string name="notice_event_redacted">Zpráva odstraněna</string>
-    <string name="notice_event_redacted_by">Zprávu odstranil/a %1$s</string>
-    <string name="summary_you_sent_image">Poslali jste obrázek.</string>
-    <string name="summary_you_sent_sticker">Poslali jste nálepku.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Vaše pozvání</string>
-    <string name="notice_room_created">%1$s založil místnost</string>
-    <string name="notice_room_created_by_you">Založili jste místnost</string>
-    <string name="notice_room_invite_by_you">Pozvali jste %1$s</string>
-    <string name="notice_room_join_by_you">Vstoupili jste do místnosti</string>
-    <string name="notice_room_leave_by_you">Opustili jste místnost</string>
-    <string name="notice_room_reject_by_you">Odmítli jste pozvání</string>
-    <string name="notice_room_kick_by_you">Vykopli jste %1$s</string>
-    <string name="notice_room_unban_by_you">Zrušili jste vykázání pro %1$s</string>
-    <string name="notice_room_ban_by_you">Vykázali jste %1$s</string>
-    <string name="notice_room_withdraw_by_you">Stáhli jste pozvánku od %1$s zpět</string>
-    <string name="notice_avatar_url_changed_by_you">Změnili jste svůj profilový obrázek</string>
-    <string name="notice_display_name_set_by_you">Změnili jste své veřejné jméno na %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">Změnili jste své veřejné jméno z %1$s na %2$s</string>
-    <string name="notice_display_name_removed_by_you">Odstranili jste své veřejné jméno (%1$s)</string>
-    <string name="notice_room_topic_changed_by_you">Změnili jste téma na: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s změnili obrázek místnosti</string>
-    <string name="notice_room_avatar_changed_by_you">Změnili jste obrázek místnosti</string>
-    <string name="notice_room_name_changed_by_you">Změnili jste jméno místnosti na: %1$s</string>
-    <string name="notice_placed_video_call_by_you">Zahájili jste video hovor.</string>
-    <string name="notice_placed_voice_call_by_you">Zahájili jste hlasový hovor.</string>
-    <string name="notice_call_candidates">%s poslali data, aby mohli zahájit hovor.</string>
-    <string name="notice_call_candidates_by_you">Poslali jste data, abyste mohli zahájit hovor.</string>
-    <string name="notice_answered_call_by_you">Přijali jste hovor.</string>
-    <string name="notice_ended_call_by_you">Ukončili jste hovor.</string>
-    <string name="notice_made_future_room_visibility_by_you">Učinili jste budoucí historii místnosti viditelnou pro %1$s</string>
-    <string name="notice_end_to_end_by_you">Zapnuli jste end-to-end šifrování (%1$s)</string>
-    <string name="notice_room_update_by_you">Povýšili jste tuto místnost.</string>
-    <string name="notice_requested_voip_conference_by_you">Požádali jste o VoIP konferenci</string>
-    <string name="notice_room_name_removed_by_you">Odstranili jste jméno místnosti</string>
-    <string name="notice_room_topic_removed_by_you">Odstranili jste téma místnosti</string>
-    <string name="notice_room_avatar_removed">%1$s odstranili obrázek místnosti</string>
-    <string name="notice_room_avatar_removed_by_you">Odstranili jste obrázek místnosti</string>
-    <string name="notice_profile_change_redacted_by_you">Aktualizovali jste svů profil %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Poslali jste %1$s pozvání ke vstupu do místnosti</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Zrušili jste pozvánku ke vstupu do místnosti pro %1$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Přijali jste pozvání pro %1$s</string>
-    <string name="notice_widget_added">%1$s přidali widget %2$s</string>
-    <string name="notice_widget_added_by_you">Přidali jste widget %1$s</string>
-    <string name="notice_widget_removed">%1$s odstranili widget %2$s</string>
-    <string name="notice_widget_removed_by_you">Odstranili jste widget %1$s</string>
-    <string name="notice_widget_modified">%1$s změnil widget %2$s</string>
-    <string name="notice_widget_modified_by_you">Změnili jste widget %1$s</string>
-    <string name="power_level_admin">Správce</string>
-    <string name="power_level_moderator">Moderátor</string>
-    <string name="power_level_default">Výchozí</string>
-    <string name="power_level_custom">Vlastní (%1$d)</string>
-    <string name="power_level_custom_no_value">Vlastní</string>
-    <string name="notice_power_level_changed_by_you">Změnili jste %1$s stupeň oprávnění.</string>
-    <string name="notice_power_level_changed">%1$s změnili %2$s stupeň oprávnění.</string>
-    <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Pozvání od %1$s. Důvod: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Vaše pozvání. Důvod: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Pozvali jste %1$s. Důvod: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s vstoupili do místnosti. Důvod: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Vstoupili jste do místnosti. Důvod: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Opustili jste místnost. Důvod: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s pozvání odmítli. Důvod: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Odmítli jste pozvání. Důvod: %1$s</string>
-    <string name="notice_room_kick_with_reason">%1$s vykopnuli %2$s. Důvod: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Vykopnuli jste %1$s. Důvod: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s zrušili %2$s vykázání. Důvod: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Zrušili jste %1$s vykázání. Důvod: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s vykázali %2$s. Důvod: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Vykázali jste %1$s. Důvod: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s poslali %2$s pozvání, aby vstoupili do místnosti. Důvod: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Poslali jste %1$s pozvání, aby vstoupili do místnosti. Důvod: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s zrušili pozvání do místnosti pro %2$s. Důvod: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Zrušili jste pozvání do místnosti pro %1$s. Důvod: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s přijali pozvání pro %2$s. Důvod: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Přijali jste pozvání pro %1$s. Důvod: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s zrušili pozvání pro %2$s. Důvod: %3$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Zrušili jste pozvání od %1$s. Důvod: %2$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s přidali %2$s jako adresu pro tuto místnost.</item>
-        <item quantity="few">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
-        <item quantity="other">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Přidali jste %1$s jako adresu pro tuto místnost.</item>
-        <item quantity="few">Přidali jste %1$s jako adresy pro tuto místnost.</item>
-        <item quantity="other">Přidali jste %1$s jako adresy pro tuto místnost.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s odstranili %2$s jako adresu pro tuto místnost.</item>
-        <item quantity="few">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
-        <item quantity="other">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Odstranili jste %1$s jako adresu pro tuto místnost.</item>
-        <item quantity="few">Odstranili jste %1$s jako adresuy pro tuto místnost.</item>
-        <item quantity="other">Odstranili jste %1$s jako adresy pro tuto místnost.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s přidali %2$s a odstranili %3$s jako adresy pro tuto místnost.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Přidali jste %1$s a odstranili %2$s jako adresy pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_set">%1$s nastavili hlavní adresu této místnosti na %2$s.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Nastavili jste %1$s na hlavní adresu této místnosti.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s odstranili hlavní adresu této místnosti.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Odstranili jste hlavní adresu této místnosti.</string>
-    <string name="notice_room_guest_access_can_join">%1$s povolili hostům vstoupit do místnosti.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Povolili jste hostům vstoupit do místnosti.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s zamezili hostům vstoupit do místnosti.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Zamezili jste hostům vstoupit do místnosti.</string>
-    <string name="notice_end_to_end_ok">%1$s zapnuli end-to-end šifrování.</string>
-    <string name="notice_end_to_end_ok_by_you">Zapnuli jste end-to-end šifrování.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s zapnuli end-to-end šifrování (neznámý algoritmus %2$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Zapnuli jste end-to-end šifrování (neznámý algoritmus %1$s).</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Zamezili jste hostům vstoupit do této místnosti.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s zamezil hostům vstoupit do této místnosti.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Povolili jste hostům vstoupit.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s povolil hostům vstoupit.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Odešli jste. Důvod: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s odešli. Důvod: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Vstoupili jste. Důvod: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s vstoupili. Důvod: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Zrušili jste pozvání pro %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s zrušili pozvání pro %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Pozvali jste %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s pozvali %2$s</string>
-    <string name="notice_direct_room_update_by_you">Tady jste provedli upgrade.</string>
-    <string name="notice_direct_room_update">%s tady provedli upgrade.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Učinili jste budoucí zprávy viditelné pro %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s učinili budoucí zprávy viditelné pro %2$s</string>
-    <string name="notice_direct_room_leave_by_you">Odešli jste z místnosti</string>
-    <string name="notice_direct_room_leave">%1$s odešli z místnosti</string>
-    <string name="notice_direct_room_join_by_you">Vstoupili jste</string>
-    <string name="notice_direct_room_join">%1$s vstoupili</string>
-    <string name="notice_direct_room_created_by_you">Založili jste diskusi</string>
-    <string name="notice_direct_room_created">%1$s založil diskusi</string>
-    <string name="room_displayname_empty_room_was">Prázdná místnost (byla %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s a %4$d další</item>
-        <item quantity="few">%1$s, %2$s, %3$s a %4$d další</item>
-        <item quantity="other">%1$s, %2$s, %3$s a %4$d dalších</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s a %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s a %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Účast všech serverů je zakázána! Tuto místnost již nelze použít.</string>
-    <string name="notice_room_server_acl_updated_no_change">Beze změny.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servery shodující se doslovně s IP jsou nyní zakázány.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servery shodující se doslovně s IP jsou nyní povoleny.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Servery shodující se s %s byly odstraněny ze seznamu povolených.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Servery shodující se s %s jsou nyní povoleny.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Servery shodující se s %s byly odstraněny ze seznamu zakázaných.</string>
-    <string name="notice_room_server_acl_updated_banned">• Servery shodující se s %s jsou nyní zakázány.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Změnili jste ACL serveru pro tuto místnost.</string>
-    <string name="notice_room_server_acl_updated_title">%s změnili ACL serveru pro tuto místnost.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Server shodující se doslovně s IP je povolen.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Server shodující se doslovně s IP je zakázán.</string>
-    <string name="notice_room_server_acl_set_allowed">• Server shodující se s %s je povolen.</string>
-    <string name="notice_room_server_acl_set_banned">• Server shodující se s %s je zakázán.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Nastavili jste ACL serveru pro tuto místnost.</string>
-    <string name="notice_room_server_acl_set_title">%s nastavili ACL serveru pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Změnili jste adresy pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s změnili adresy pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Změnili jste hlavní a alternativní adresu pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s změnili hlavní a alternativní adresu pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Změnili jste alternativní adresu pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s změnili alternativní adresu pro tuto místnost.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Odstranili jste alternativní adresu %1$s pro tuto místnost.</item>
-        <item quantity="few">Odstranili jste alternativní adresy %1$s pro tuto místnost.</item>
-        <item quantity="other">Odstranili jste alternativní adresy %1$s pro tuto místnost.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s odstranili alternativní adresu %2$s pro tuto místnost.</item>
-        <item quantity="few">%1$s odstranili alternativní adresy %2$s pro tuto místnost.</item>
-        <item quantity="other">%1$s odstranili alternativní adresy %2$s pro tuto místnost.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Přidali jste alternativní adresu %1$s pro tuto místnost.</item>
-        <item quantity="few">Přidali jste alternativní adresy %1$s pro tuto místnost.</item>
-        <item quantity="other">Přidali jste alternativní adresy %1$s pro tuto místnost.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s přidali alternativní adresu %2$s pro tuto místnost.</item>
-        <item quantity="few">%1$s přidali alternativní adresy %2$s pro tuto místnost.</item>
-        <item quantity="other">%1$s přidali alternativní adresy %2$s pro tuto místnost.</item>
-    </plurals>
-    <string name="notice_widget_jitsi_modified_by_you">Upravili jste videokonferenci</string>
-    <string name="notice_widget_jitsi_modified">Videokonference byla upravena uživatelem %1$s</string>
-    <string name="notice_widget_jitsi_removed_by_you">Ukončili jste videokonferenci</string>
-    <string name="notice_widget_jitsi_removed">Videokonference byla ukončena uživatelem %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">Zahájili jste videokonferenci</string>
-    <string name="notice_widget_jitsi_added">Videokonference byla zahájena uživatelem %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-da/strings.xml b/matrix-sdk-android/src/main/res/values-da/strings.xml
deleted file mode 100644
index 510fa231af..0000000000
--- a/matrix-sdk-android/src/main/res/values-da/strings.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s sendte et billede.</string>
-
-    <string name="notice_room_invite_no_invitee">%ss invitation</string>
-    <string name="notice_room_invite">%1$s inviterede %2$s</string>
-    <string name="notice_room_invite_you">%1$s inviterede dig</string>
-    <string name="notice_room_join">%1$s forbandt</string>
-    <string name="notice_room_leave">%1$s forlod rummet</string>
-    <string name="notice_room_reject">%1$s afviste invitationen</string>
-    <string name="notice_room_kick">%1$s kickede %2$s</string>
-    <string name="notice_room_unban">%1$s unbannede %2$s</string>
-    <string name="notice_room_ban">%1$s bannede %2$s</string>
-    <string name="notice_room_withdraw">%1$s trak %2$ss invitation tilbage</string>
-    <string name="notice_avatar_url_changed">%1$s skiftede sin avatar</string>
-    <string name="notice_display_name_set">%1$s satte sit viste navn til %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s ændrede sit viste navn fra %2$s til %3$s</string>
-    <string name="notice_display_name_removed">%1$s fjernede sit viste navn (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s ændrede emnet til: %2$s</string>
-    <string name="notice_room_name_changed">%1$s ændrede rumnavnet til: %2$s</string>
-    <string name="notice_placed_video_call">%s startede et videoopkald.</string>
-    <string name="notice_placed_voice_call">%s startede et stemmeopkald.</string>
-    <string name="notice_answered_call">%s svarede opkaldet.</string>
-    <string name="notice_ended_call">%s stoppede opkaldet.</string>
-    <string name="notice_made_future_room_visibility">%1$s gjorde den fremtidige rum historik synlig for %2$s</string>
-    <string name="notice_room_visibility_invited">alle medlemmer af rummet, fra det tidspunkt de er inviteret.</string>
-    <string name="notice_room_visibility_joined">alle medlemmer af rummet, fra det tidspunkt de er forbundede.</string>
-    <string name="notice_room_visibility_shared">Alle medlemmer af rummet.</string>
-    <string name="notice_room_visibility_world_readable">alle.</string>
-    <string name="notice_room_visibility_unknown">ukendt (%s).</string>
-    <string name="notice_end_to_end">%1$s slog ende-til-ende kryptering til (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s forespurgte en VoIP konference</string>
-    <string name="notice_voip_started">VoIP konference startet</string>
-    <string name="notice_voip_finished">VoIP konference afsluttet</string>
-
-    <string name="notice_avatar_changed_too">(avatar blev også ændret)</string>
-    <string name="notice_room_name_removed">%1$s fjernede navnet på rummet</string>
-    <string name="notice_room_topic_removed">%1$s fjernede emnet for rummet</string>
-    <string name="notice_profile_change_redacted">%1$s opdaterede sin profil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s inviterede %2$s til rummet</string>
-    <string name="notice_room_third_party_registered_invite">%1$s accepterede invitationen til %2$s</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Kunne ikke dekryptere: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Afsenderens enhed har ikke sendt os nøglerne til denne besked.</string>
-
-    <string name="could_not_redact">Kunne ikke hemmeligholde</string>
-    <string name="unable_to_send_message">Kunne ikke sende besked</string>
-
-    <string name="message_failed_to_upload">Kunne ikke uploade billede</string>
-
-    <string name="network_error">Netværks fejl</string>
-    <string name="matrix_error">Matrix fejl</string>
-
-    <string name="room_error_join_failed_empty_room">Det er i øjeblikket ikke muligt at genforbinde til et tomt rum.</string>
-
-    <string name="encrypted_message">Krypteret besked</string>
-
-    <string name="medium_email">mailadresse</string>
-    <string name="medium_phone_number">Telefonnummer</string>
-
-    <string name="room_displayname_invite_from">Invitation fra %s</string>
-    <string name="room_displayname_room_invite">Invitation til rum</string>
-    <string name="room_displayname_two_members">%1$s og %2$s</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s og 1 anden</item>
-        <item quantity="other">%1$s og %2$d andre</item>
-    </plurals>
-
-    <string name="room_displayname_empty_room">Tomt rum</string>
-
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-de/strings.xml b/matrix-sdk-android/src/main/res/values-de/strings.xml
deleted file mode 100644
index 406f4a7102..0000000000
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s hat ein Bild gesendet.</string>
-    <string name="notice_room_invite_no_invitee">Einladung von %s</string>
-    <string name="notice_room_invite">%1$s hat %2$s eingeladen</string>
-    <string name="notice_room_invite_you">%1$s hat dich eingeladen</string>
-    <string name="notice_room_join">%1$s hat den Raum betreten</string>
-    <string name="notice_room_leave">%1$s hat den Raum verlassen</string>
-    <string name="notice_room_reject">%1$s hat die Einladung abgelehnt</string>
-    <string name="notice_room_kick">%1$s hat %2$s gekickt</string>
-    <string name="notice_room_unban">%1$s hat die Sperre von %2$s aufgehoben</string>
-    <string name="notice_room_ban">%1$s hat %2$s verbannt</string>
-    <string name="notice_room_withdraw">%1$s hat die Einladung für %2$s zurückgezogen</string>
-    <string name="notice_avatar_url_changed">%1$s hat das Profilbild geändert</string>
-    <string name="notice_display_name_set">%1$s hat den Anzeigenamen geändert in %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s hat den Anzeigenamen von %2$s auf %3$s geändert</string>
-    <string name="notice_display_name_removed">%1$s hat den Anzeigenamen gelöscht (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s hat das Raumthema geändert auf: %2$s</string>
-    <string name="notice_room_name_changed">%1$s hat den Raumnamen geändert in: %2$s</string>
-    <string name="notice_placed_video_call">%s hat einen Videoanruf durchgeführt.</string>
-    <string name="notice_placed_voice_call">%s hat einen Sprachanruf getätigt.</string>
-    <string name="notice_answered_call">%s hat den Anruf angenommen.</string>
-    <string name="notice_ended_call">%s hat den Anruf beendet.</string>
-    <string name="notice_made_future_room_visibility">%1$s hat den zukünftigen Chatverlauf sichtbar gemacht für %2$s</string>
-    <string name="notice_room_visibility_invited">Alle Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).</string>
-    <string name="notice_room_visibility_joined">Alle Mitglieder (ab dem Zeitpunkt, an dem sie den Raum betreten haben).</string>
-    <string name="notice_room_visibility_shared">alle Raum-Mitglieder.</string>
-    <string name="notice_room_visibility_world_readable">Jeder.</string>
-    <string name="notice_room_visibility_unknown">Unbekannt (%s).</string>
-    <string name="notice_end_to_end">%1$s hat die Ende-zu-Ende-Verschlüsselung aktiviert (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s möchte eine VoIP-Konferenz beginnen</string>
-    <string name="notice_voip_started">VoIP-Konferenz gestartet</string>
-    <string name="notice_voip_finished">VoIP-Konferenz beendet</string>
-    <string name="notice_avatar_changed_too">(Profilbild wurde ebenfalls geändert)</string>
-    <string name="notice_room_name_removed">%1$s hat den Raumnamen entfernt</string>
-    <string name="notice_room_topic_removed">%1$s hat das Raum-Thema entfernt</string>
-    <string name="notice_profile_change_redacted">%1$s hat das Benutzerprofil aktualisiert %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s hat eine Einladung an %2$s gesendet</string>
-    <string name="notice_room_third_party_registered_invite">%1$s hat die Einladung in %2$s akzeptiert</string>
-    <string name="notice_crypto_unable_to_decrypt">** Nicht entschlüsselbar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Das absendende Gerät hat uns keine Schlüssel für diese Nachricht übermittelt.</string>
-    <!-- Room Screen -->
-    <string name="could_not_redact">Entfernen nicht möglich</string>
-    <string name="unable_to_send_message">Nachricht kann nicht gesendet werden</string>
-    <string name="message_failed_to_upload">Bild konnte nicht hochgeladen werden</string>
-    <!-- general errors -->
-    <string name="network_error">Netzwerk-Fehler</string>
-    <string name="matrix_error">Matrix-Fehler</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">Es ist aktuell nicht möglich, einen leeren Raum erneut zu betreten.</string>
-    <string name="encrypted_message">Verschlüsselte Nachricht</string>
-    <!-- medium friendly name -->
-    <string name="medium_email">E-Mail-Adresse</string>
-    <string name="medium_phone_number">Telefonnummer</string>
-    <string name="summary_user_sent_sticker">%1$s hat einen Sticker gesendet.</string>
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Einladung von %s</string>
-    <string name="room_displayname_room_invite">Raumeinladung</string>
-    <string name="room_displayname_two_members">%1$s und %2$s</string>
-    <string name="room_displayname_empty_room">Leerer Raum</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s und 1 andere(r)</item>
-        <item quantity="other">%1$s und %2$d andere</item>
-    </plurals>
-    <string name="notice_event_redacted">Nachricht entfernt</string>
-    <string name="notice_event_redacted_by">Nachricht entfernt von %1$s</string>
-    <string name="notice_event_redacted_with_reason">Nachricht entfernt [Grund: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Nachricht entfernt von %1$s [Grund: %2$s]</string>
-    <string name="notice_room_update">%s hat diesen Raum aufgewertet.</string>
-    <string name="event_status_sending_message">Sende eine Nachricht…</string>
-    <string name="clear_timeline_send_queue">Sendewarteschlange leeren</string>
-    <string name="initial_sync_start_importing_account">Erste Synchronisation: 
-\nImportiere Benutzerkonto…</string>
-    <string name="initial_sync_start_importing_account_crypto">Erste Synchronisation: 
-\nImportiere Cryptoschlüssel</string>
-    <string name="initial_sync_start_importing_account_rooms">Erste Synchronisation: 
-\nImportiere Räume</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Erste Synchronisation: 
-\nImportiere betretene Räume</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Erste Synchronisation: 
-\nImportiere eingeladene Räume</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Erste Synchronisation: 
-\nImportiere verlassene Räume</string>
-    <string name="initial_sync_start_importing_account_groups">Erste Synchronisation: 
-\nImportiere Communities</string>
-    <string name="initial_sync_start_importing_account_data">Erste Synchronisation: 
-\nImportiere Benutzerdaten</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s hat die Einladung an %2$s, den Raum zu betreten, zurückgezogen</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s Einladung. Grund: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s hat %2$s eingeladen. Grund: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s hat dich eingeladen. Grund: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s ist dem Raum beigetreten. Grund: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s hat den Raum verlassen. Grund: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s hat die Einladung abgelehnt. Grund: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s hat %2$s gekickt. Grund: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s hat Sperre von %2$s aufgehoben. Grund: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s hat %2$s verbannt. Grund: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s hat eine Einladung an %2$s gesandt um diesem Raum beizutreten. Grund: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s hat Einladung an %2$s zu Betreten dieses Raumes zurückgezogen. Grund: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s hat die Einladung für %2$s angenommen. Grund: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s hat Einladung für %2$s verworfen. Grund: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s fügt %2$s als eine Adresse für diesen Raum hinzu.</item>
-        <item quantity="other">%1$s fügt %2$s als Adressen für diesen Raum hinzu.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s entfernt %2$s als eine Adresse für diesen Raum.</item>
-        <item quantity="other">%1$s entfernt %2$s als Adressen für diesen Raum.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s fügt %2$s als Adresse für diesen Raum hinzu und entfernt %3$s.</string>
-    <string name="notice_room_canonical_alias_set">%1$s legt die Hauptadresse fest für diesen Raum als %2$s fest.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s entfernte die Hauptadresse für diesen Raum.</string>
-    <string name="notice_room_guest_access_can_join">%1$s hat Gästen erlaubt den Raum zu betreten.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s hat Gästen untersagt den Raum zu betreten.</string>
-    <string name="notice_end_to_end_ok">%1$s aktivierte Ende-zu-Ende-Verschlüsselung.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s aktivierte Ende-zu-Ende-Verschlüsselung (unbekannter Algorithmus %2$s).</string>
-    <string name="summary_you_sent_image">Du hast ein Bild gesendet.</string>
-    <string name="summary_you_sent_sticker">Du hast einen Sticker gesendet.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Deine Einladung</string>
-    <string name="notice_room_created">%1$s hat den Raum erstellt</string>
-    <string name="notice_room_created_by_you">Du hast den Raum erstellt</string>
-    <string name="notice_room_invite_by_you">Du hast %1$s eingeladen</string>
-    <string name="notice_room_join_by_you">Du bist dem Raum beigetreten</string>
-    <string name="notice_room_leave_by_you">Du hast den Raum verlassen</string>
-    <string name="notice_room_reject_by_you">Du hast die Einladung abgelehnt</string>
-    <string name="notice_room_kick_by_you">Du hast %1$s aus dem Raum entfernt</string>
-    <string name="notice_room_unban_by_you">Du hast den Bann von %1$s aufgehoben</string>
-    <string name="notice_room_ban_by_you">Du hast %1$s gebannt</string>
-    <string name="notice_room_withdraw_by_you">Du hast die Einladung von %1$s zurückgenommen</string>
-    <string name="notice_avatar_url_changed_by_you">Du hast dein Profilbild geändert</string>
-    <string name="notice_display_name_set_by_you">Du hast deinen Anzeigenamen zu %1$s geändert</string>
-    <string name="notice_display_name_changed_from_by_you">Du hast deinen Anzeigenamen von %1$s zu %2$s geändert</string>
-    <string name="notice_display_name_removed_by_you">Du hast deinen Anzeigenamen entfernt (er war %1$s)</string>
-    <string name="notice_room_topic_changed_by_you">Du hast das Thema geändert auf: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s hat das Bild des Raumes geändert</string>
-    <string name="notice_room_avatar_changed_by_you">Du hast das Bild des Raumes geändert</string>
-    <string name="notice_room_name_changed_by_you">Du hast den Raumnamen zu %1$s geändert</string>
-    <string name="notice_placed_video_call_by_you">Du hast einen Videoanruf gestartet.</string>
-    <string name="notice_placed_voice_call_by_you">Du hast einen Audioanruf gestartet.</string>
-    <string name="notice_answered_call_by_you">Du hast den Anruf angenommen.</string>
-    <string name="notice_ended_call_by_you">Du hast den Anruf beendet.</string>
-    <string name="notice_made_future_room_visibility_by_you">Du hast den zukünftigen Nachrichtenverlauf für %1$s sichtbar gemacht</string>
-    <string name="notice_end_to_end_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (%1$s)</string>
-    <string name="notice_room_update_by_you">Du hast den Raum aufgwertet.</string>
-    <string name="notice_requested_voip_conference_by_you">Du hast eine VoIP-Konferenz angefordert</string>
-    <string name="notice_room_name_removed_by_you">Du hast den Raumnamen entfernt</string>
-    <string name="notice_room_topic_removed_by_you">Du hast das Raumthema entfernt</string>
-    <string name="notice_room_avatar_removed">%1$s hat das Bild des Raumes entfernt</string>
-    <string name="notice_room_avatar_removed_by_you">Du hast das Bild des Raumes entfernt</string>
-    <string name="notice_profile_change_redacted_by_you">Du hast dein Profil %1$s aktualisiert</string>
-    <string name="notice_room_third_party_invite_by_you">Du hast %1$s in den Raum eingeladen</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Du hast die Einladung für %1$s zurückgenommen</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Du hast die Einladung für %1$s akzeptiert</string>
-    <string name="notice_widget_added">%1$s hat das %2$s Widget hinzugefügt</string>
-    <string name="notice_widget_added_by_you">Du hast das %1$s Widget hinzugefügt</string>
-    <string name="notice_widget_removed">%1$s hat das %2$s Widget entfernt</string>
-    <string name="notice_widget_removed_by_you">Du hast das %1$s Widget entfernt</string>
-    <string name="notice_widget_modified">%1$s hat das %2$s Widget modifiziert</string>
-    <string name="notice_widget_modified_by_you">Du hast das %1$s Widget modifiziert</string>
-    <string name="power_level_admin">Administrator</string>
-    <string name="power_level_moderator">Moderator</string>
-    <string name="power_level_default">Standard</string>
-    <string name="power_level_custom">Benutzerdefiniert (%1$d)</string>
-    <string name="power_level_custom_no_value">Benutzerdefiniert</string>
-    <string name="notice_power_level_changed_by_you">Du hast die Berechtigungsstufe von %1$s geändert.</string>
-    <string name="notice_power_level_changed">%1$s hat die Berechtigungsstufe von %2$s geändert.</string>
-    <string name="notice_power_level_diff">%1$s von %2$s zu %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Deine Einladung. Grund: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Du hast %1$s eingeladen. Grund: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Du bist dem Raum beigetreten. Grund: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Du hast den Raum verlassen. Grund: %1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Du hast die Einladung abgelehnt. Grund: %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Du hast %1$s aus dem Raum entfernt. Grund %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Du hast den Bann von %1$s aufgehoben. Grund: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Du hast %1$s gebannt. Grund: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Du hast %1$s in den Raum eingeladen. Grund: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Du hast die Einladung für %1$s zurückgenommen. Grund: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Du hast die Einladung von %1$s angenommen. Grund: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Du hast die Einladung von %1$s abgelehnt. Grund: %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Du hast die Raumaddresse %1$s hinzugefügt.</item>
-        <item quantity="other">Du hast die Raumaddressen %1$s hinzugefügt.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Du hast die Raum-Adresse %1$s vom Raum entfernt.</item>
-        <item quantity="other">Du hast die Raum-Adressen %1$s vom Raum entfernt.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">Du hast den Raumaddressen %1$s hinzugefügt und %2$s entfernt.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Du hast die Hauptaddresse für diesen Raum auf %1$s gesetzt.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Du hast die Hauptaddresse des Raums entfernt.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Du hast Gästen erlaubt dem Raum beizutreten.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Du hast Gästen untersagt dem Raum beizutreten.</string>
-    <string name="notice_end_to_end_ok_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (unbekannter Algorithmus %1$s).</string>
-    <string name="notice_call_candidates">%s hat Daten gesendet, um einen Anruf zu starten.</string>
-    <string name="notice_call_candidates_by_you">Du hast Daten geschickt, um eine Anruf zu starten.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Du hast Gästen erlaubt hier beizutreten.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s hat Gästen erlaubt hier beizutreten.</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Du bist beigetreten. Grund: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s ist beigetreten. Grund: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Du hast die Einladung für %1$s zurückgezogen</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s hat die Einladung für %2$s zurückgezogen</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Du hast %1$s eingeladen</string>
-    <string name="notice_direct_room_third_party_invite">%1$s hat %2$s eingeladen</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Du hast zukünftige Nachrichten für %1$s sichtbar gemacht</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s hat zukünftige Nachrichten für %2$s sichtbar gemacht</string>
-    <string name="notice_direct_room_leave_by_you">Du hast den Raum verlassen</string>
-    <string name="notice_direct_room_leave">%1$s hat den Raum verlassen</string>
-    <string name="notice_direct_room_join_by_you">Du bist beigetreten</string>
-    <string name="notice_direct_room_join">%1$s ist beigetreten</string>
-    <string name="notice_direct_room_created_by_you">Du hast eine Diskussion erstellt</string>
-    <string name="notice_direct_room_created">%1$s hat eine Diskussion erstellt</string>
-    <string name="notice_direct_room_update">%s hat hier ein Upgrade durchgeführt.</string>
-    <string name="notice_direct_room_update_by_you">Du hast hier ein Upgrade durchgeführt.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Du hast Gästen untersagt den Raum zu betreten.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s hat Gästen untersagt den Raum zu betreten.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Du bist gegangen. Grund: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s ist gegangen. Grund: %2$s</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Du hast die Adressen für diesen Raum geändert.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s hat die Adressen für diesen Raum geändert.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Du hast die Haupt- und die alternativen Adressen für diesen Raum geändert.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s hat die Haupt- und die alternativen Adressen für diesen Raum geändert.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Du hast die alternativen Adressen für diesen Raum geändert.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s hat die alternativen Adressen für diesen Raum geändert.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Du entferntest die alternative Adresse %1$s für diesen Raum.</item>
-        <item quantity="other">Du entferntest die alternativen Adressen %1$s für diesen Raum.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s entfernte die alternative Adresse %2$s für diesen Raum.</item>
-        <item quantity="other">%1$s entfernte die alternativen Adressen %2$s für diesen Raum.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Du hast die alternative Adresse %1$s für diesen Raum hinzugefügt.</item>
-        <item quantity="other">Du hast die alternativen Adressen %1$s für diesen Raum hinzufügt.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s fügte die alternative Adresse %2$s für diesen Raum hinzu.</item>
-        <item quantity="other">%1$s fügte die alternativen Adressen %2$s für diesen Raum hinzu.</item>
-    </plurals>
-    <string name="room_displayname_empty_room_was">Leerer Raum (war %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s und %4$d andere/r</item>
-        <item quantity="other">%1$s, %2$s, %3$s und %4$d andere</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s und %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s und %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Alle Server sind von der Teilnahme ausgeschlossen! Dieser Raum kann nicht mehr genutzt werden.</string>
-    <string name="notice_room_server_acl_updated_no_change">Keine Änderung.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Server, die mit IPs übereinstimmen, sind jetzt gesperrt.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Server, die mit IPs übereinstimmen, sind nicht erlaubt.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Server, die mit %s übereinstimmen, wurden von der Elaubten-Liste entfernt.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Server, die mit %s übereinstimmen, sind jetzt erlaubt.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Server, die mit %s übereinstimmen, werden von der Sperrliste entfernt.</string>
-    <string name="notice_room_server_acl_updated_banned">• Server, die mit %s übereinstimmen, sind jetzt gesperrt.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Du hast die Server-ACL für diesen Raum geändert.</string>
-    <string name="notice_room_server_acl_updated_title">%s hat die Server-Zugriffssteuerungsliste (ACL) für diesen Raum geändert.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Server, die mit IPs übereinstimmen, sind gesperrt.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Server, die mit IPs übereinstimmen, sind erlaubt.</string>
-    <string name="notice_room_server_acl_set_allowed">• Server, die mit %s übereinstimmen, sind erlaubt.</string>
-    <string name="notice_room_server_acl_set_banned">• Server, die mit %s übereinstimmen, sind gesperrt.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Du hast die Server-ACL für diesen Raum gesetzt.</string>
-    <string name="notice_room_server_acl_set_title">%s hat die Server-Zugriffssteuerungsliste (ACL) für diesen Raum gesetzt.</string>
-    <string name="notice_widget_jitsi_modified_by_you">Du hast eine Videokonferenz geändert</string>
-    <string name="notice_widget_jitsi_modified">Videokonferenz von %1$s geändert</string>
-    <string name="notice_widget_jitsi_removed">Videokonferenz von %1$s beendet</string>
-    <string name="notice_widget_jitsi_removed_by_you">Du hast eine Videokonferenz beendet</string>
-    <string name="notice_widget_jitsi_added_by_you">Du hast eine Videokonferenz gestartet</string>
-    <string name="notice_widget_jitsi_added">Videokonferenz von %1$s gestartet</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-el/strings.xml b/matrix-sdk-android/src/main/res/values-el/strings.xml
deleted file mode 100644
index 9db4e91849..0000000000
--- a/matrix-sdk-android/src/main/res/values-el/strings.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="medium_email">Ηλεκτρονική διεύθυνση</string>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">Ο/Η %1$s έστειλε μια εικόνα.</string>
-    <string name="summary_user_sent_sticker">Ο/Η %1$s έστειλε ένα αυτοκόλλητο.</string>
-
-    <string name="notice_room_invite_you">Ο/Η %1$s σας προσκάλεσε</string>
-    <string name="notice_room_leave">Ο/Η %1$s αποχώρησε</string>
-    <string name="notice_room_reject">Ο/Η %1$s απέρριψε την πρόσκληση</string>
-    <string name="notice_room_kick">Ο/Η %1$s έδιωξε τον/την %2$s</string>
-    <string name="notice_room_invite">Ο/Η %1$s προσκάλεσε τον/την %2$s</string>
-    <string name="notice_room_invite_no_invitee">Η πρόσκληση του/της %s</string>
-    <string name="medium_phone_number">Αριθμός τηλεφώνου</string>
-
-    <string name="notice_room_ban">Ο/Η %1$s απέκλεισε τον/την %2$s</string>
-    <string name="notice_room_withdraw">Ο/Η %1$s απέσυρε την πρόσκληση του/της %2$s</string>
-    <string name="notice_avatar_url_changed">Ο/Η %1$s άλλαξε εικονίδιο χρήστη</string>
-    <string name="notice_display_name_set">Ο/Η %1$s άλλαξε το εμφανιζόμενό του/της όνομα σε %2$s</string>
-    <string name="notice_display_name_changed_from">Ο/Η %1$s άλλαξε το εμφανιζόμενό του/της όνομα από %2$s σε %3$s</string>
-    <string name="notice_display_name_removed">Ο/Η %1$s αφαίρεσε το εμφανιζόμενό του/της όνομα (%2$s)</string>
-    <string name="notice_room_topic_changed">Ο/Η %1$s άλλαξε το θέμα σε: %2$s</string>
-    <string name="notice_room_name_changed">Ο/Η %1$s άλλαξε το όνομα του δωματίου σε: %2$s</string>
-    <string name="notice_answered_call">Ο/Η %s απάντησε στην κλήση.</string>
-    <string name="notice_ended_call">Ο/Η %s τερμάτισε την κλήση.</string>
-
-    <string name="notice_placed_video_call">Ο/Η %s πραγματοποίησε μια κλήση βίντεο.</string>
-    <string name="notice_placed_voice_call">Ο/Η %s πραγματοποίησε μια κλήση ήχου.</string>
-    <string name="notice_made_future_room_visibility">Ο/Η %1$s κατέστησε το μελλοντικό ιστορικό του δωματίου ορατό στον/στην %2$s</string>
-    <string name="notice_room_visibility_invited">όλα τα μέλη του δωματίου, από την στιγμή που προσκλήθηκαν.</string>
-    <string name="notice_room_visibility_shared">όλα τα μέλη του δωματίου.</string>
-    <string name="notice_room_visibility_world_readable">οποιοσδήποτε.</string>
-    <string name="notice_room_visibility_unknown">άγνωστος/η (%s).</string>
-    <string name="notice_avatar_changed_too">(έγινε αλλαγή και του εικονιδίου χρήστη)</string>
-    <string name="notice_room_name_removed">Ο/Η %1$s αφαίρεσε το όνομα του δωματίου</string>
-    <string name="notice_room_topic_removed">Ο/Η %1$s αφαίρεσε το θέμα του δωματίου</string>
-    <string name="notice_profile_change_redacted">Ο/Η %1$s ανανέωσε το προφίλ του/της %2$s</string>
-    <string name="notice_room_third_party_registered_invite">Ο/Η %1$s δέχτηκε την πρόσκληση για το %2$s</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Αδυναμία αποκρυπτογράφησης: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Η συσκευή του/της αποστολέα δεν μας έχει στείλει τα κλειδιά για αυτό το μήνυμα.</string>
-
-    <string name="unable_to_send_message">Αποτυχία αποστολής μηνύματος</string>
-
-    <string name="message_failed_to_upload">Αποτυχία αναφόρτωσης εικόνας</string>
-
-    <string name="network_error">Σφάλμα δικτύου</string>
-    <string name="matrix_error">Σφάλμα του Matrix</string>
-
-    <string name="encrypted_message">Κρυπτογραφημένο μήνυμα</string>
-
-    <string name="notice_requested_voip_conference">Ο/Η %1$s ζήτησε μια VoIP διάσκεψη</string>
-    <string name="notice_voip_started">Η VoIP διάσκεψη ξεκίνησε</string>
-    <string name="notice_voip_finished">Η VoIP διάσκεψη έληξε</string>
-
-    <string name="notice_room_join">Ο/Η %1$s εισήλθε στο δωμάτιο</string>
-
-    <string name="room_displayname_invite_from">Πρόσκληση από %s</string>
-    <string name="room_displayname_room_invite">Πρόσκληση στο δωμάτιο</string>
-
-    <string name="room_displayname_two_members">%1$s και %2$s</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s και 1 ακόμα</item>
-        <item quantity="other">%1$s και %2$d ακόμα</item>
-    </plurals>
-
-    <string name="room_displayname_empty_room">Άδειο δωμάτιο</string>
-
-    <string name="notice_room_visibility_joined">όλα τα μέλη του δωματίου από την στιγμή που εισήλθαν.</string>
-    <string name="notice_end_to_end">Ο/Η %1$s ενεργοποίησε την κρυπτογράφηση απ\'άκρη σ\'άκρη (%2$s)</string>
-
-    <string name="notice_room_third_party_invite">Ο/Η %1$s έστειλε μία πρόσκληση στον/στην %2$s για να εισέλθει στο δωμάτιο</string>
-    <string name="room_error_join_failed_empty_room">Δεν είναι δυνατή ακόμα η επανείσοδος σε ένα άδειο δωμάτιο.</string>
-
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-eo/strings.xml b/matrix-sdk-android/src/main/res/values-eo/strings.xml
deleted file mode 100644
index 8dacd87157..0000000000
--- a/matrix-sdk-android/src/main/res/values-eo/strings.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_user_sent_image">%1$s sendis bildon.</string>
-    <string name="summary_user_sent_sticker">%1$s sendis glumarkon.</string>
-    <string name="notice_room_invite_no_invitee">Invito de %s</string>
-    <string name="notice_room_invite">%1$s invitis uzanton %2$s</string>
-    <string name="notice_room_invite_you">%1$s invitis vin</string>
-    <string name="notice_room_join">%1$s envenis</string>
-    <string name="notice_room_leave">%1$s foriris de la ĉambro</string>
-    <string name="notice_room_reject">%1$s rifuzis la inviton</string>
-    <string name="notice_room_kick">%1$s forpelis uzanton %2$s</string>
-    <string name="notice_room_unban">%1$s malforbaris uzanton %2$s</string>
-    <string name="notice_room_ban">%1$s forbaris uzanton %2$s</string>
-    <string name="notice_room_withdraw">%1$s nuligis inviton por %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s ŝanĝis sian profilbildon</string>
-    <string name="notice_crypto_unable_to_decrypt">** Ne eblas malĉifri: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">La aparato de la sendinto ne sendis al ni la ŝlosilojn por tiu mesaĝo.</string>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="notice_display_name_set">%1$s ŝanĝis sian prezentan nomon al %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s ŝanĝis sian prezentan nomon de %2$s al %3$s</string>
-    <string name="notice_display_name_removed">%1$s forigis sian prezentan nomon (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s ŝanĝis la temon al: %2$s</string>
-    <string name="notice_room_name_changed">%1$s ŝanĝis nomon de la ĉambro al: %2$s</string>
-    <string name="notice_placed_video_call">%s vidvokis.</string>
-    <string name="notice_placed_voice_call">%s voĉvokis.</string>
-    <string name="notice_answered_call">%s respondis la vokon.</string>
-    <string name="notice_ended_call">%s finis la vokon.</string>
-    <string name="notice_made_future_room_visibility">%1$s videbligis estontan historion de ĉambro al %2$s</string>
-    <string name="notice_room_visibility_invited">ĉiuj ĉambranoj, ekde siaj invitoj.</string>
-    <string name="notice_room_visibility_joined">ĉiuj ĉambranoj, ekde siaj aliĝoj.</string>
-    <string name="notice_room_visibility_shared">ĉiuj ĉambranoj.</string>
-    <string name="notice_room_visibility_world_readable">ĉiu ajn.</string>
-    <string name="notice_room_visibility_unknown">nekonata (%s).</string>
-    <string name="notice_end_to_end">%1$s ŝaltis tutvojan ĉifradon (%2$s)</string>
-    <string name="notice_room_update">%s gradaltigis la ĉambron.</string>
-    <string name="notice_event_redacted">Mesaĝo foriĝis</string>
-    <string name="notice_event_redacted_by">Mesaĝon forigis %1$s</string>
-    <string name="notice_event_redacted_with_reason">Mesaĝo foriĝis [kialo: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Mesaĝon forigis %1$s [kialo: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s ĝisdatigis sian profilon %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s sendis aliĝan inviton al %2$s</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s nuligis la aliĝan inviton por %2$s</string>
-    <string name="notice_room_third_party_registered_invite">%1$s akceptis la inviton por %2$s</string>
-    <string name="could_not_redact">Ne povis redakti</string>
-    <string name="unable_to_send_message">Ne povas sendi mesaĝon</string>
-    <string name="message_failed_to_upload">Malsukcesis alŝuti bildon</string>
-    <string name="network_error">Reta eraro</string>
-    <string name="matrix_error">Matrix-eraro</string>
-    <string name="room_error_join_failed_empty_room">Nun ne eblas re-aliĝi al malplena ĉambro.</string>
-    <string name="encrypted_message">Ĉifrita mesaĝo</string>
-    <string name="medium_email">Retpoŝtadreso</string>
-    <string name="medium_phone_number">Telefonnumero</string>
-    <string name="room_displayname_invite_from">Invito de %s</string>
-    <string name="room_displayname_room_invite">Invito al ĉambro</string>
-    <string name="room_displayname_two_members">%1$s kaj %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s kaj 1 alia</item>
-        <item quantity="other">%1$s kaj %2$d aliaj</item>
-    </plurals>
-    <string name="room_displayname_empty_room">Malplena ĉambro</string>
-    <string name="initial_sync_start_importing_account">Komenca spegulado:
-\nEnportante konton…</string>
-    <string name="initial_sync_start_importing_account_crypto">Komenca spegulado:
-\nEnportante ĉifrilojn</string>
-    <string name="initial_sync_start_importing_account_rooms">Komenca spegulado:
-\nEnportante ĉambrojn</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Komenca spegulado:
-\nEnportante aliĝitajn ĉambrojn</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Komenca spegulado:
-\nEnportante ĉambrojn de invitoj</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Komenca spegulado:
-\nEnportante forlasitajn ĉambrojn</string>
-    <string name="initial_sync_start_importing_account_groups">Komenca spegulado:
-\nEnportante komunumojn</string>
-    <string name="initial_sync_start_importing_account_data">Komenca spegulado:
-\nEnportante datumojn de konto</string>
-    <string name="event_status_sending_message">Sendante mesaĝon…</string>
-    <string name="clear_timeline_send_queue">Vakigi sendan atendovicon</string>
-    <string name="notice_requested_voip_conference">%1$s petis grupan vokon</string>
-    <string name="notice_voip_started">Grupa voko komenciĝis</string>
-    <string name="notice_voip_finished">Grupa voko finiĝis</string>
-    <string name="notice_avatar_changed_too">(ankaŭ profilbildo ŝanĝiĝis)</string>
-    <string name="notice_room_name_removed">%1$s forigis nomon de la ĉambro</string>
-    <string name="notice_room_topic_removed">%1$s forigis temon de la ĉambro</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Invito de %1$s. Kialo: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s invitis uzanton %2$s. Kialo: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s invitis vin. Kialo: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s envenis. Kialo: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s foriris de la ĉambro. Kialo: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s rifuzis la inviton. Kialo: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s forpelis uzanton %2$s. Kialo: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s malforbaris uzanton %2$s. Kialo: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s forbaris uzanton %2$s. Kialo: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s sendis al %2$s inviton al la ĉambro. Kialo: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s nuligis la inviton al la ĉambro por %2$s. Kialo: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s akceptis la inviton por %2$s. Kialo: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s nuligis la inviton por %2$s. Kialo: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s aldonis %2$s kiel adreson por ĉi tiu ĉambro.</item>
-        <item quantity="other">%1$s aldonis %2$s kiel adresojn por ĉi tiu ĉambro.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s forigis %2$s kiel adreson por ĉi tiu ĉambro.</item>
-        <item quantity="other">%1$s forigis %2$s kiel adresojn por ĉi tiu ĉambro.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s aldonis %2$s kaj forigis %3$s kiel adresojn por ĉi tiu ĉambro.</string>
-    <string name="notice_room_canonical_alias_set">%1$s agordis la ĉefadreson de ĉi tiu ĉambro al %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s forigis la ĉefadreson de ĉi tiu ĉambro.</string>
-    <string name="notice_room_guest_access_can_join">%1$s permesis al gastoj enveni.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s malpermesis al gastoj enveni.</string>
-    <string name="notice_end_to_end_ok">%1$s ŝaltis tutvojan ĉifradon.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s ŝaltis tutvojan ĉifradon (kun nerekonita algoritmo %2$s).</string>
-    <string name="notice_power_level_changed_by_you">Vi ŝanĝis la povnivelon de %1$s.</string>
-    <string name="notice_power_level_changed">%1$s sanĝis la povnivelon de %2$s.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Vi ŝaltis tutvojan ĉifradon (kun nerekonita algoritmo %1$s).</string>
-    <string name="notice_end_to_end_ok_by_you">Vi ŝaltis tutvojan ĉifradon.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Vi malpermesis al gastoj aliĝi.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s malpermesis al gastoj aliĝi.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Vi malpermesis al gastoj enveni.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Vi permesis al gastoj aliĝi.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s permesis al gastoj aliĝi.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Vi permesis al gastoj enveni.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Vi forigis la ĉefadreson de ĉi tiu ĉambro.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Vi agordis al ĉefadreson de ĉi tiu ĉambro al %1$s.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Vi aldonis %1$s kaj forigis %2$s kiel adresojn por ĉi tiu ĉambro.</string>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Vi forigis %1$s kiel adreson por ĉi tiu ĉambro.</item>
-        <item quantity="other">Vi forigis %1$s kiel adresojn por ĉi tiu ĉambro.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Vi aldonis %1$s kiel adreson por ĉi tiu ĉambro.</item>
-        <item quantity="other">Vi aldonis %1$s kiel adresojn por ĉi tiu ĉambro.</item>
-    </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">Vi nuligis la inviton por %1$s. Kialo: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Vi akceptis la inviton por %1$s. Kialo: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vi nuligis inviton al la ĉambro por %1$s. Kialo: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Vi sendis al %1$s inviton al la ĉambro. Kialo: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Vi forbaris uzanton %1$s. Kialo: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Vi malforbaris uzanton %1$s. Kialo: %2$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Vi forpelis uzanton %1$s. Kialo: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Vi rifuzis la inviton. Kialo: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Vi foriris. Kialo: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s foriris. Kialo: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Vi foriris de la ĉambro. Kialo: %1$s</string>
-    <string name="notice_room_join_with_reason_by_you">Vi envenis. Kialo: %1$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Vi aliĝis. Kialo: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s aliĝis. Kialo: %2$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Vi invitis uzanton %1$s. Kialo: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Via invito. Kialo: %1$s</string>
-    <string name="notice_power_level_diff">%1$s de %2$s al %3$s</string>
-    <string name="power_level_custom_no_value">Propra</string>
-    <string name="power_level_default">Ordinara</string>
-    <string name="power_level_custom">Propra (%1$d)</string>
-    <string name="power_level_moderator">Reguligisto</string>
-    <string name="power_level_admin">Administranto</string>
-    <string name="notice_widget_modified_by_you">Vi ŝanĝis la fenestraĵon %1$s</string>
-    <string name="notice_widget_modified">%1$s ŝanĝis la fenestraĵon %2$s</string>
-    <string name="notice_widget_removed_by_you">Vi forigis la fenestraĵon %1$s</string>
-    <string name="notice_widget_removed">%1$s forigis la fenestraĵon %2$s</string>
-    <string name="notice_widget_added_by_you">Vi aldonis la fenestraĵon %1$s</string>
-    <string name="notice_widget_added">%1$s aldonis la fenestraĵon %2$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Vi akceptis la inviton por %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Vi nuligis la inviton por %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s nuligis la inviton por %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Vi nuligis la aliĝan inviton por %1$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Vi invitis uzanton %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s invitis uzanton %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Vi sendis aliĝan inviton al %1$s</string>
-    <string name="notice_profile_change_redacted_by_you">Vi ĝisdatigis vian profilon %1$s</string>
-    <string name="notice_room_avatar_removed_by_you">Vi forigis bildon de la ĉambro</string>
-    <string name="notice_room_avatar_removed">%1$s forigis bildon de la ĉambro</string>
-    <string name="notice_room_topic_removed_by_you">Vi forigis temon de la ĉambro</string>
-    <string name="notice_room_name_removed_by_you">Vi forigis nomon de la ĉambro</string>
-    <string name="notice_requested_voip_conference_by_you">Vi petis grupan vokon</string>
-    <string name="notice_direct_room_update_by_you">Vi gradaltigis la interparolon.</string>
-    <string name="notice_direct_room_update">%s gradaltigis la interparolon.</string>
-    <string name="notice_room_update_by_you">Vi gradaltigis la ĉambron.</string>
-    <string name="notice_end_to_end_by_you">Vi ŝaltis tutvojan ĉifradon (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s videbligis al %2$s estontajn mesaĝojn</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Vi videbligis al %1$s estontajn mesaĝojn</string>
-    <string name="notice_made_future_room_visibility_by_you">Vi videbligis estontan historion de ĉambro al %1$s</string>
-    <string name="notice_ended_call_by_you">Vi finis la vokon.</string>
-    <string name="notice_answered_call_by_you">Vi respondis la vokon.</string>
-    <string name="notice_call_candidates_by_you">Vi sendis datumojn por prepari la vokon.</string>
-    <string name="notice_call_candidates">%s sendis datumojn por prepari la vokon.</string>
-    <string name="notice_placed_voice_call_by_you">Vi voĉvokis.</string>
-    <string name="notice_placed_video_call_by_you">Vi vidvokis.</string>
-    <string name="notice_room_name_changed_by_you">Vi ŝanĝis la nomon de la ĉambro al: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Vi ŝanĝis la bildon de la ĉambro</string>
-    <string name="notice_room_avatar_changed">%1$s ŝanĝis la bildon de la ĉambro</string>
-    <string name="notice_room_topic_changed_by_you">Vi ŝanĝis la temon al: %1$s</string>
-    <string name="notice_display_name_removed_by_you">Vi forigis vian prezentan nomon (%1$s)</string>
-    <string name="notice_display_name_changed_from_by_you">Vi ŝanĝis vian prezentan nomon de %1$s al %2$s</string>
-    <string name="notice_display_name_set_by_you">Vi ŝanĝis vian prezentan nomon al %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Vi ŝanĝis vian profilbildon</string>
-    <string name="notice_room_withdraw_by_you">Vi nuligis inviton por %1$s</string>
-    <string name="notice_room_ban_by_you">Vi forbaris uzanton %1$s</string>
-    <string name="notice_room_unban_by_you">Vi malforbaris uzanton %1$s</string>
-    <string name="notice_room_kick_by_you">Vi forpelis uzanton %1$s</string>
-    <string name="notice_room_reject_by_you">Vi rifuzis la inviton</string>
-    <string name="notice_direct_room_leave_by_you">Vi foriris de la ĉambro</string>
-    <string name="notice_direct_room_leave">%1$s foriris de la ĉambro</string>
-    <string name="notice_room_leave_by_you">Vi foriris de la ĉambro</string>
-    <string name="notice_direct_room_join_by_you">Vi envenis</string>
-    <string name="notice_direct_room_join">%1$s envenis</string>
-    <string name="notice_room_join_by_you">Vi envenis</string>
-    <string name="notice_room_invite_by_you">Vi invitis uzanton %1$s</string>
-    <string name="notice_direct_room_created_by_you">Vi kreis la diskuton</string>
-    <string name="notice_direct_room_created">%1$s kreis la diskuton</string>
-    <string name="notice_room_created_by_you">Vi kreis la ĉambron</string>
-    <string name="notice_room_created">%1$s kreis la ĉambron</string>
-    <string name="notice_room_invite_no_invitee_by_you">Via invito</string>
-    <string name="summary_you_sent_sticker">Vi sendis glumarkon.</string>
-    <string name="summary_you_sent_image">Vi sendis bildon.</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml b/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
deleted file mode 100644
index a8e8477005..0000000000
--- a/matrix-sdk-android/src/main/res/values-es-rMX/strings.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s envió una imagen.</string>
-
-    <string name="notice_room_invite_no_invitee">la invitación de %s</string>
-    <string name="notice_room_invite">%1$s invitó a %2$s</string>
-    <string name="notice_room_invite_you">%1$s te invitó</string>
-    <string name="notice_room_join">%1$s se unió</string>
-    <string name="notice_room_leave">%1$s salió</string>
-    <string name="notice_room_reject">%1$s rechazó la invitación</string>
-    <string name="notice_room_kick">%1$s quitó a %2$s</string>
-    <string name="notice_room_unban">%1$s desprohibió a %2$s</string>
-    <string name="notice_room_ban">%1$s prohibió %2$s</string>
-    <string name="notice_room_withdraw">%1$s retiró la invitación de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s cambió su foto de perfil</string>
-    <string name="notice_display_name_set">%1$s estableció %2$s como su nombre visible</string>
-    <string name="notice_display_name_changed_from">%1$s cambió su nombre visible de %2$s a %3$s</string>
-    <string name="notice_display_name_removed">%1$s eliminó su nombre visible (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s cambió el tema a: %2$s</string>
-    <string name="notice_room_name_changed">%1$s cambió el nombre de la sala a: %2$s</string>
-    <string name="notice_placed_video_call">%s comenzó una llamada de video.</string>
-    <string name="notice_placed_voice_call">%s comenzó una llamada de voz.</string>
-    <string name="notice_answered_call">%s recibió la llamada.</string>
-    <string name="notice_ended_call">%s terminó la llamada.</string>
-    <string name="notice_made_future_room_visibility">%1$s dejó que %2$s vea el historial del futuro</string>
-    <string name="notice_room_visibility_invited">todos los miembros de la sala, desde su invitación.</string>
-    <string name="notice_room_visibility_joined">todos los miembros de la sala, desde cuando entraron.</string>
-    <string name="notice_room_visibility_shared">todos los miembros de la sala.</string>
-    <string name="notice_room_visibility_world_readable">todos.</string>
-    <string name="notice_room_visibility_unknown">desconocido (%s).</string>
-    <string name="notice_end_to_end">%1$s encendió el cifrado de extremo a extremo (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s solicitó una conferencia VoIP</string>
-    <string name="notice_voip_started">conferencia VoIP comenzó</string>
-    <string name="notice_voip_finished">conferencia VoIP finalizó</string>
-
-    <string name="notice_avatar_changed_too">(foto de perfil también se cambió)</string>
-    <string name="notice_room_name_removed">%1$s eliminó el nombre de la sala</string>
-    <string name="notice_room_topic_removed">%1$s retiró el tema de la sala</string>
-    <string name="notice_profile_change_redacted">%1$s actualizó su perfil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s envió una invitación a %2$s para entrar a la sala</string>
-    <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitación de %2$s</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** No se puede descifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositivo del remitente no nos ha enviado las claves de este mensaje.</string>
-
-    <!-- Room Screen -->
-    <string name="could_not_redact">No se pudo redactar</string>
-    <string name="unable_to_send_message">No se puede enviar el mensaje</string>
-
-    <string name="message_failed_to_upload">La subida de la imagen falló</string>
-
-    <!-- general errors -->
-    <string name="network_error">Error de la red</string>
-    <string name="matrix_error">Error de Matrix</string>
-
-    <!-- Home Screen -->
-
-    <!-- Last seen time -->
-
-    <!-- call events -->
-
-    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">No es posible volver a unirse a una sala vacía.</string>
-
-    <string name="encrypted_message">Mensaje cifrado</string>
-
-    <!-- medium friendly name -->
-    <string name="medium_email">Correo electrónico</string>
-    <string name="medium_phone_number">Número telefónico</string>
-
-    <string name="summary_user_sent_sticker">%1$s envió una calcomanía.</string>
-
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Invitación de %s</string>
-    <string name="room_displayname_room_invite">Invitación de Sala</string>
-    <string name="room_displayname_two_members">%1$s y %2$s</string>
-    <string name="room_displayname_empty_room">Sala vacía</string>
-
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s y otro</item>
-        <item quantity="other">%1$s y %2$d otros</item>
-    </plurals>
-
-    <string name="notice_event_redacted">Mensaje eliminado</string>
-    <string name="notice_event_redacted_by">Mensaje eliminado por %1$s</string>
-    <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-es/strings.xml b/matrix-sdk-android/src/main/res/values-es/strings.xml
deleted file mode 100644
index 10911dde68..0000000000
--- a/matrix-sdk-android/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s envió una imagen.</string>
-    <string name="notice_room_invite_no_invitee">la invitación de %s</string>
-    <string name="notice_room_invite">%1$s invitó a %2$s</string>
-    <string name="notice_room_invite_you">%1$s te ha invitado</string>
-    <string name="notice_room_join">%1$s se ha unido</string>
-    <string name="notice_room_leave">%1$s salió</string>
-    <string name="notice_room_reject">%1$s rechazó la invitación</string>
-    <string name="notice_room_kick">%1$s expulsó a %2$s</string>
-    <string name="notice_room_unban">%1$s le quitó el veto a %2$s</string>
-    <string name="notice_room_ban">%1$s vetó a %2$s</string>
-    <string name="notice_room_withdraw">%1$s retiró la invitación de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s cambió su avatar</string>
-    <string name="notice_display_name_set">%1$s estableció %2$s como su nombre público</string>
-    <string name="notice_display_name_changed_from">%1$s cambió su nombre público de %2$s a %3$s</string>
-    <string name="notice_display_name_removed">%1$s eliminó su nombre público (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s cambió el tema a: %2$s</string>
-    <string name="notice_room_name_changed">%1$s cambió el nombre de la sala a: %2$s</string>
-    <string name="notice_placed_video_call">%s realizó una llamada de vídeo.</string>
-    <string name="notice_placed_voice_call">%s realizó una llamada de voz.</string>
-    <string name="notice_answered_call">%s contestó la llamada.</string>
-    <string name="notice_ended_call">%s finalizó la llamada.</string>
-    <string name="notice_made_future_room_visibility">%1$s hizo visible el historial futuro de la sala para %2$s</string>
-    <string name="notice_room_visibility_invited">todos los miembros de la sala, desde su invitación.</string>
-    <string name="notice_room_visibility_joined">todos los miembros de la sala, desde el momento en que se unieron.</string>
-    <string name="notice_room_visibility_shared">todos los miembros de la sala.</string>
-    <string name="notice_room_visibility_world_readable">todos.</string>
-    <string name="notice_room_visibility_unknown">desconocido (%s).</string>
-    <string name="notice_end_to_end">%1$s ha activado la encriptación de Extremo-a-Extremo (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s solicitó una conferencia de VozIP</string>
-    <string name="notice_voip_started">Conferencia de VozIP iniciada</string>
-    <string name="notice_voip_finished">Conferencia de VozIP finalizada</string>
-    <string name="notice_avatar_changed_too">(el avatar también se cambió)</string>
-    <string name="notice_room_name_removed">%1$s eliminó el nombre de la sala</string>
-    <string name="notice_room_topic_removed">%1$s eliminó el tema de la sala</string>
-    <string name="notice_profile_change_redacted">%1$s actualizó su perfil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s invitó a %2$s a unirse a la sala</string>
-    <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitación para %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** No es posible descifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositivo emisor no nos ha enviado las claves para este mensaje.</string>
-    <!-- Room Screen -->
-    <string name="could_not_redact">No se pudo redactar</string>
-    <string name="unable_to_send_message">No es posible enviar el mensaje</string>
-    <string name="message_failed_to_upload">No se pudo cargar la imagen</string>
-    <!-- general errors -->
-    <string name="network_error">Error de red</string>
-    <string name="matrix_error">Error de Matrix</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">Actualmente no es posible volver a unirse a una sala vacía.</string>
-    <string name="encrypted_message">Mensaje encriptado</string>
-    <!-- medium friendly name -->
-    <string name="medium_email">Dirección de correo electrónico</string>
-    <string name="medium_phone_number">Número telefónico</string>
-    <string name="summary_user_sent_sticker">%1$s envió una pegatina.</string>
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Invitación de %s</string>
-    <string name="room_displayname_room_invite">Invitación a Sala</string>
-    <string name="room_displayname_two_members">%1$s y %2$s</string>
-    <string name="room_displayname_empty_room">Sala vacía</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s y 1 otro</item>
-        <item quantity="other">%1$s y %2$d otros</item>
-    </plurals>
-    <string name="notice_event_redacted">Mensaje eliminado</string>
-    <string name="notice_event_redacted_by">Mensaje eliminado por %1$s</string>
-    <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s ha revocado la invitación a unirse a la sala para %2$s</string>
-    <string name="initial_sync_start_importing_account">Sincronización Inicial
-\nImportando cuenta…</string>
-    <string name="initial_sync_start_importing_account_rooms">Sincronización Inicial:
-\nImportando Salas</string>
-    <string name="initial_sync_start_importing_account_groups">Sincronización Inicial:
-\nImportando Comunidades</string>
-    <string name="initial_sync_start_importing_account_data">Sincronización Inicial:
-\nImportando Datos de la Cuenta</string>
-    <string name="event_status_sending_message">Enviando mensaje…</string>
-    <string name="clear_timeline_send_queue">Borrar cola de envío</string>
-    <string name="notice_room_invite_with_reason">%1$s ha invitado a %2$s. Razón: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s te ha invitado. Razón: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s se ha unido. Razón: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s se ha ido. Razón: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s ha rechadazo la invitación. Razón: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s expulsó a %2$s. Razón: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s ha baneado a %2$s. Razón: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s ha aceptado la invitación para %2$s. Razón: %3$s</string>
-    <string name="notice_room_canonical_alias_unset">%1$s ha eliminado la dirección principal para esta sala.</string>
-    <string name="notice_room_update">%s ha actualizado la sala.</string>
-    <string name="initial_sync_start_importing_account_crypto">Sincronización Inicial:
-\nImportando criptografía</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Sincronización Inicial:
-\nImportando Salas a las que te has unido</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Sincronización Inicial:
-\nImportando Salas a las que has sido invitada</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Sincronización Inicial:
-\nImportando Salas Abandonadas</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Invitación de %1$s. Razón: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s ha desbaneado a %2$s. Razón: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s envió una invitación a %2$s para que se una a la sala. Razón: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revocó la invitación de %2$s para unirse a la sala. Razón: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s ha retirado la invitación de %2$s. Razón: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s ha añadido %2$s como alias de esta sala.</item>
-        <item quantity="other">%1$s ha añadido %2$s como alias de esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s ha quitado %2$s como alias de esta sala.</item>
-        <item quantity="other">%1$s ha quitado %2$s como alias de esta sala.</item>
-    </plurals>
-    <string name="notice_room_canonical_alias_set">%1$s ha establecido la dirección principal de esta sala a %2$s.</string>
-    <string name="notice_room_guest_access_can_join">%1$s ha permitido que los invitados se unan a la sala.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s ha impedido que los invitados se unan a la sala.</string>
-    <string name="notice_end_to_end_ok">%1$s ha activado la encriptación extremo a extremo.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s ha activado la encriptación de extremo a extremo (algoritmo no reconocido %2$s).</string>
-    <string name="summary_you_sent_image">Enviaste una imagen.</string>
-    <string name="summary_you_sent_sticker">Enviaste un sticker.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Tu invitación</string>
-    <string name="notice_room_created">%1$s creó la sala</string>
-    <string name="notice_room_created_by_you">Creaste la sala</string>
-    <string name="notice_room_invite_by_you">Invitaste a %1$s</string>
-    <string name="notice_room_join_by_you">Te uniste a la Sala</string>
-    <string name="notice_room_leave_by_you">Dejaste la Sala</string>
-    <string name="notice_room_reject_by_you">Rechazaste la invitación</string>
-    <string name="notice_room_kick_by_you">Tu pateaste a %1$s</string>
-    <string name="notice_room_unban_by_you">Tu desbanaste a %1$s</string>
-    <string name="notice_room_ban_by_you">Usted prohibió a %1$s</string>
-    <string name="notice_room_withdraw_by_you">Retiró la invitación de %1$s\'s</string>
-    <string name="notice_avatar_url_changed_by_you">Cambiaste tu avatar</string>
-    <string name="notice_display_name_set_by_you">Establece su nombre de visualización en %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">Cambiaste tu nombre para mostrar de %1$s a %2$s</string>
-    <string name="notice_display_name_removed_by_you">Quitaste tu nombre para mostrar (era %1$s)</string>
-    <string name="notice_room_topic_changed_by_you">Cambiaste el tema a: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s cambió el avatar de la sala</string>
-    <string name="notice_room_avatar_changed_by_you">Cambiaste el avatar de la sala</string>
-    <string name="notice_room_name_changed_by_you">Cambiaste el nombre de la sala a: %1$s</string>
-    <string name="notice_placed_video_call_by_you">Hiciste una videollamada.</string>
-    <string name="notice_placed_voice_call_by_you">Hiciste una llamada de voz.</string>
-    <string name="notice_call_candidates">%s envió datos para configurar la llamada.</string>
-    <string name="notice_call_candidates_by_you">Enviaste datos para configurar la llamada.</string>
-    <string name="notice_answered_call_by_you">Respondiste la llamada.</string>
-    <string name="notice_ended_call_by_you">Terminaste la llamada.</string>
-    <string name="notice_made_future_room_visibility_by_you">Hiciste visible el futuro historial de la %1$s</string>
-    <string name="notice_end_to_end_by_you">Has activado la encriptación de Extremo-a-Extremo (%1$s)</string>
-    <string name="notice_room_update_by_you">Has actualizado esta sala.</string>
-    <string name="notice_requested_voip_conference_by_you">Solicitaste una conferencia de VozIP</string>
-    <string name="notice_room_name_removed_by_you">Quitaste el nombre de la sala</string>
-    <string name="notice_room_topic_removed_by_you">Quitaste el tema de la sala</string>
-    <string name="notice_room_avatar_removed">%1$s eliminó el avatar de la sala</string>
-    <string name="notice_room_avatar_removed_by_you">Quitaste el avatar de la sala</string>
-    <string name="notice_profile_change_redacted_by_you">Actualizaste tu perfil %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Enviaste una invitación a %1$s para unirse a la sala</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Revocaste la invitación para que %1$s se una a la sala</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Aceptaste la invitación para %1$s</string>
-    <string name="notice_widget_added">%1$s agrego el widget %2$s</string>
-    <string name="notice_widget_added_by_you">Agregaste el widget %1$s</string>
-    <string name="notice_widget_removed">%1$s eliminó el widget %2$s</string>
-    <string name="notice_widget_removed_by_you">Quitaste el widget %1$s</string>
-    <string name="notice_widget_modified">%1$s modifico el widget %2$s</string>
-    <string name="notice_widget_modified_by_you">Modificaste el widget %1$s</string>
-    <string name="power_level_admin">Administrador</string>
-    <string name="power_level_moderator">Moderador</string>
-    <string name="power_level_default">Por defecto</string>
-    <string name="power_level_custom">Personalizado (%1$d)</string>
-    <string name="power_level_custom_no_value">Personalizado</string>
-    <string name="notice_power_level_changed_by_you">Cambiaste el nivel de permisos de %1$s.</string>
-    <string name="notice_power_level_changed">%1$s cambió el nivel de permisos de %2$s.</string>
-    <string name="notice_power_level_diff">%1$s de %2$s a %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Tu invitación. Razón: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Invitaste a %1$s. Razón: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Te uniste a la sala. Razón: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Dejaste la sala. Razón: %1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Rechazaste la invitación. Razón: %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Pateaste a %1$s. Motivo: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Has desactivado a %1$s. Motivo: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Prohibiste a %1$s. Motivo: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Enviaste una invitación a %1$s para unirse a la sala. Motivo: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Revocaste la invitación para que %1$s se una a la sala. Motivo: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Aceptaste la invitación para %1$s. Motivo: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Retiró la invitación de %1$s\'s. Motivo: %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Agregaste %1$s como dirección para esta sala.</item>
-        <item quantity="other">Agregaste %1$s como direcciones para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Quitaste %1$s como dirección para esta sala.</item>
-        <item quantity="other">Quitaste %1$s como direcciones para esta sala.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s añadió %2$s y eliminó %3$s como alias para esta sala.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Agregaste %1$s y quitaste %2$s como direcciones para esta sala.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Estableciste la dirección principal de esta sala en %1$s.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Quitaste la dirección principal de esta sala.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Ha permitido que los invitados se unan a la sala.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Ha impedido que los invitados se unan a la sala.</string>
-    <string name="notice_end_to_end_ok_by_you">Tu has activado la encriptación de Extremo-a-Extremo.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Has activado la encriptación de Extremo-a-Extremo (algoritmo %1$s no reconocido).</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Has impedido que invitados se unan a la sala.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Has permitido a invitados unirse aquí.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Te has ido. Razón: %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Has revocado la invitación de %1$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Has invitado a %1$s</string>
-    <string name="notice_direct_room_update_by_you">Has actualizado aquí.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Has hecho futuros mensajes visibles a %1$s</string>
-    <string name="notice_direct_room_leave_by_you">Te saliste de la sala</string>
-    <string name="notice_direct_room_join_by_you">Te uniste</string>
-    <string name="notice_direct_room_created_by_you">Creaste la conversación</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedido que invitados se unan a la sala.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s ha permitido a invitados a unirse aquí.</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s se ha ido. Razón: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Tu te has unido. Razón: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s se ha unido. Razón: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s ha revocado la invitación de %2$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s ha invitado %2$s</string>
-    <string name="notice_direct_room_update">%s ha actualizado aquí.</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s ha hecho futuros mensajes visibles a %2$s</string>
-    <string name="notice_direct_room_leave">%1$s ha salido de la sala</string>
-    <string name="notice_direct_room_join">%1$s se ha unido</string>
-    <string name="notice_direct_room_created">%1$s ha creado la conversación</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Cambiaste el alias de esta sala.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s cambió el alias de esta sala.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Cambiaste los alias principal y alternativos de esta sala.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s cambió los alias principal y alternativos de esta sala.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Cambiaste los alias alternativos de esta sala.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s cambió los alias alternativos de esta sala.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Eliminaste el alias alternativo %1$s para esta sala.</item>
-        <item quantity="other">Eliminaste los alias alternativos %1$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s eliminó el alias alternativo %2$s para esta sala.</item>
-        <item quantity="other">%1$s eliminó los alias alternativos %2$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Añadiste el alias alternativo %1$s para esta sala.</item>
-        <item quantity="other">Añadiste los alias alternativos %1$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s añadió el alias alternativo %2$s para esta sala.</item>
-        <item quantity="other">%1$s añadió los alias alternativos %2$s para esta sala.</item>
-    </plurals>
-    <string name="room_displayname_empty_room_was">Sala vacía (%s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s y %4$d otro</item>
-        <item quantity="other">%1$s, %2$s, %3$s y %4$d otros</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s y %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s y %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Todos los servidores tienen prohibido participar! Esta sala ya no puede ser usada.</string>
-    <string name="notice_room_server_acl_updated_no_change">Sin cambios.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Los servidores con literales IP coincidentes ahora están prohibidos.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Los servidores con literales IP coincidentes ahora están permitidos.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Los servidores con %s coincidentes se han eliminado de la lista de permitidos.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Los servidores con %s coincidentes ahora están permitidos.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Los servidores con %s coincidentes se han eliminado de la lista de baneos.</string>
-    <string name="notice_room_server_acl_updated_banned">• Los servidores con %s coincidentes ahora están prohibidos.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Has cambiado la lista de control de acceso para esta sala.</string>
-    <string name="notice_room_server_acl_updated_title">%s ha cambiado la lista de control de acceso para esta sala.</string>
-    <string name="notice_room_server_acl_set_allowed">• Los servidores con %s coincidentes están permitidos.</string>
-    <string name="notice_room_server_acl_set_banned">• Los servidores con %s coincidentes están prohibidos.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Los servidores con literales IP coincidentes están prohibidos.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Los servidores con literales IP coincidentes están permitidos.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Has fijado la lista de control de acceso para esta sala.</string>
-    <string name="notice_room_server_acl_set_title">%s ha fijado la lista de control de acceso para esta sala.</string>
-    <string name="notice_widget_jitsi_modified_by_you">Has modificado la videoconferencia</string>
-    <string name="notice_widget_jitsi_modified">Videoconferencia modificada por %1$s</string>
-    <string name="notice_widget_jitsi_removed_by_you">Has terminado la videoconferencia</string>
-    <string name="notice_widget_jitsi_removed">Videoconferencia terminada por %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">Has empezado una videoconferencia</string>
-    <string name="notice_widget_jitsi_added">Videoconferencia empezada por %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-et/strings.xml b/matrix-sdk-android/src/main/res/values-et/strings.xml
deleted file mode 100644
index 2232e01ff4..0000000000
--- a/matrix-sdk-android/src/main/res/values-et/strings.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s saatis pildi.</string>
-    <string name="summary_user_sent_sticker">%1$s saatis kleepsu.</string>
-    <string name="notice_room_invite_no_invitee">Kasutaja %s kutse</string>
-    <string name="notice_room_invite">%1$s kutsus kasutajat %2$s</string>
-    <string name="notice_room_invite_you">%1$s kutsus sind</string>
-    <string name="notice_room_join">%1$s liitus jututoaga</string>
-    <string name="notice_room_leave">%1$s lahkus jututoast</string>
-    <string name="notice_room_reject">%1$s lükkas tagasi kutse</string>
-    <string name="notice_room_kick">%1$s müksas kasutajat %2$s</string>
-    <string name="notice_room_withdraw">%1$s võttis tagasi kutse kasutajale %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s muutis oma avatari</string>
-    <string name="notice_display_name_set">%1$s määras oma kuvatavaks nimeks %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s muutis senise kuvatava nime %2$s uueks nimeks %3$s</string>
-    <string name="notice_display_name_removed">%1$s eemaldas oma kuvatava nime (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s muutis uueks teemaks %2$s</string>
-    <string name="notice_room_name_changed">%1$s muutis jututoa uueks nimeks %2$s</string>
-    <string name="notice_placed_video_call">%s alustas videokõnet.</string>
-    <string name="notice_placed_voice_call">%s alustas häälkõnet.</string>
-    <string name="notice_answered_call">%s vastas kõnele.</string>
-    <string name="notice_ended_call">%s lõpetas kõne.</string>
-    <string name="notice_made_future_room_visibility">%1$s seadistas, et tulevane jututoa ajalugu on nähtav kasutajale %2$s</string>
-    <string name="notice_room_visibility_invited">kõikidele jututoa liikmetele alates kutsumise hetkest.</string>
-    <string name="notice_room_visibility_joined">kõikidele jututoa liikmetele alates liitumise hetkest.</string>
-    <string name="notice_room_visibility_shared">kõikidele jututoa liikmetele.</string>
-    <string name="notice_room_visibility_world_readable">kõikidele.</string>
-    <string name="notice_room_visibility_unknown">teadmata (%s).</string>
-    <string name="notice_end_to_end">%1$s lülitas sisse läbiva krüptimise (%2$s)</string>
-    <string name="notice_room_update">%s uuendas seda jututuba.</string>
-    <string name="notice_requested_voip_conference">%1$s saatis VoIP konverentsi kutse</string>
-    <string name="notice_voip_started">VoIP-konverents algas</string>
-    <string name="notice_voip_finished">VoIP-konverents lõppes</string>
-    <string name="notice_avatar_changed_too">(samuti sai avatar muudetud)</string>
-    <string name="notice_room_name_removed">%1$s eemaldas jututoa nime</string>
-    <string name="notice_room_topic_removed">%1$s eemaldas jututoa teema</string>
-    <string name="notice_event_redacted">Sõnum on eemaldatud</string>
-    <string name="notice_event_redacted_by">Sõnum on eemaldatud %1$s poolt</string>
-    <string name="notice_event_redacted_with_reason">Sõnum on eemaldatud [põhjus: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Sõnum on eemaldatud %1$s poolt [põhjus: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s uuendas oma profiili %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s saatis jututoaga liitumiseks kutse kasutajale %2$s</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s</string>
-    <string name="notice_room_third_party_registered_invite">%1$s võttis vastu kutse %2$s nimel</string>
-    <string name="notice_crypto_unable_to_decrypt">** Ei õnnestu dekrüptida: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Sõnumi saatja seade ei ole selle sõnumi jaoks saatnud dekrüptimisvõtmeid.</string>
-    <string name="could_not_redact">Ei saanud muuta sõnumit</string>
-    <string name="unable_to_send_message">Sõnumi saatmine ei õnnestunud</string>
-    <string name="message_failed_to_upload">Pildi üleslaadimine ei õnnestunud</string>
-    <string name="network_error">Võrguühenduse viga</string>
-    <string name="matrix_error">Matrix\'i viga</string>
-    <string name="room_error_join_failed_empty_room">Hetkel ei ole võimalik uuesti liituda tühja jututoaga.</string>
-    <string name="encrypted_message">Krüptitud sõnum</string>
-    <string name="medium_email">E-posti aadress</string>
-    <string name="medium_phone_number">Telefoninumber</string>
-    <string name="room_displayname_invite_from">Kutse kasutajalt %s</string>
-    <string name="room_displayname_room_invite">Kutse jututuppa</string>
-    <string name="room_displayname_two_members">%1$s ja %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s ja üks muu</item>
-        <item quantity="other">%1$s ja %2$d muud</item>
-    </plurals>
-    <string name="room_displayname_empty_room">Tühi jututuba</string>
-    <string name="initial_sync_start_importing_account">Alglaadimine:
-\nImpordin kontot…</string>
-    <string name="initial_sync_start_importing_account_crypto">Alglaadimine:
-\nImpordin krüptoseadistusi</string>
-    <string name="initial_sync_start_importing_account_rooms">Alglaadimine:
-\nImpordin jututubasid</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Alglaadimine:
-\nImpordin liitutud jututubasid</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Alglaadimine:
-\nImpordin kutsutud jututubasid</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Alglaadimine:
-\nImpordin lahkutud jututubasid</string>
-    <string name="initial_sync_start_importing_account_groups">Alglaadimine:
-\nImpordin kogukondi</string>
-    <string name="initial_sync_start_importing_account_data">Alglaadimine:
-\nImpordin kontoandmeid</string>
-    <string name="event_status_sending_message">Saadan sõnumit…</string>
-    <string name="clear_timeline_send_queue">Tühjenda saatmisjärjekord</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Kasutaja %1$s kutse. Põhjus: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s kutsus kasutajat %2$s. Põhjus: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s kutsus sind. Põhjus: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s liitus jututoaga. Põhjus: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s lahkus jututoast. Põhjus: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s lükkas kutse tagasi. Põhjus: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s müksas välja kasutaja %2$s. Põhjus: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s saatis kasutajale %2$s kutse jututoaga liitumiseks. Põhjus: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s tühistas kasutajale %2$s saadetud kutse jututoaga liitumiseks. Põhjus: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s võttis vastu kutse %2$s jututoaga liitumiseks. Põhjus: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s võttis tagasi kasutajale %2$s saadetud kutse. Põhjus: %3$s</string>
-    <string name="notice_end_to_end_ok">%1$s lülitas sisse läbiva krüptimise.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s lülitas sisse läbiva krüptimise (tundmatu algoritm %2$s).</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s lisas %2$s selle jututoa aadressiks.</item>
-        <item quantity="other">%1$s lisas %2$s selle jututoa aadressideks.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s eemaldas %2$s kui selle jututoa aadressi.</item>
-        <item quantity="other">%1$s eemaldas %2$s selle jututoa aadresside hulgast.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s lisas %2$s ja eemaldas %3$s selle jututoa aadresside loendist.</string>
-    <string name="notice_room_canonical_alias_set">%1$s seadistas selle jututoa põhiaadressiks %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s eemaldas selle jututoa põhiaadressi.</string>
-    <string name="notice_room_guest_access_can_join">%1$s lubas külalistel selle jututoaga liituda.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s seadistas, et külalised ei või selle jututoaga liituda.</string>
-    <string name="notice_room_created">Kasutaja %1$s lõi jututoa</string>
-    <string name="summary_you_sent_image">Sina saatsid pildi.</string>
-    <string name="summary_you_sent_sticker">Sina saatsid kleepsu.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Sinu kutse</string>
-    <string name="notice_room_created_by_you">Sa lõid jututoa</string>
-    <string name="notice_room_invite_by_you">Sina kutsusid kasutajat %1$s</string>
-    <string name="notice_room_join_by_you">Sina liitusid jututoaga</string>
-    <string name="notice_room_leave_by_you">Sina lahkusid jututoast</string>
-    <string name="notice_room_reject_by_you">Sina lükkasid kutse tagasi</string>
-    <string name="notice_room_kick_by_you">Sina müksasid %1$s välja</string>
-    <string name="notice_room_unban">%1$s taastas %2$s ligipääsu</string>
-    <string name="notice_room_unban_by_you">Sina taastasid %1$s ligipääsu</string>
-    <string name="notice_room_ban">%1$s keelas %2$s ligipääsu</string>
-    <string name="notice_room_ban_by_you">Sina keelasid %1$s ligipääsu</string>
-    <string name="notice_room_withdraw_by_you">Sina võtsid tagasi %1$s kutse</string>
-    <string name="notice_avatar_url_changed_by_you">Sina muutsid oma tunnuspilti</string>
-    <string name="notice_display_name_set_by_you">Sina määrasid oma kuvatavaks nimeks %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">Sina muutsid senise kuvatava nime %1$s uueks nimeks %2$s</string>
-    <string name="notice_display_name_removed_by_you">Sina eemaldasid oma kuvatava nime (oli %1$s)</string>
-    <string name="notice_room_topic_changed_by_you">Sina muutsid uueks teemaks %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s muutis jututoa tunnuspilti</string>
-    <string name="notice_room_avatar_changed_by_you">Sina muutsid jututoa tunnuspilti</string>
-    <string name="notice_room_name_changed_by_you">Sina muutsid jututoa uueks nimeks %1$s</string>
-    <string name="notice_placed_video_call_by_you">Sa alustasid videokõnet.</string>
-    <string name="notice_placed_voice_call_by_you">Sa alustasid häälkõnet.</string>
-    <string name="notice_call_candidates">%s saatis info kõne algatamiseks.</string>
-    <string name="notice_call_candidates_by_you">Sa saatsid info kõne algatamiseks.</string>
-    <string name="notice_answered_call_by_you">Sa vastasid kõnele.</string>
-    <string name="notice_ended_call_by_you">Sa lõpetasid kõne.</string>
-    <string name="notice_made_future_room_visibility_by_you">Sa seadistasid, et tulevane jututoa ajalugu on nähtav kasutajale %1$s</string>
-    <string name="notice_end_to_end_by_you">Sa lülitasid sisse läbiva krüptimise (%1$s)</string>
-    <string name="notice_room_update_by_you">Sa uuendasid seda jututuba.</string>
-    <string name="notice_requested_voip_conference_by_you">Sa algatasid VoIP rühmakõne</string>
-    <string name="notice_room_name_removed_by_you">Sa eemaldasid jututoa nime</string>
-    <string name="notice_room_topic_removed_by_you">Sa eemaldasid jututoa teema</string>
-    <string name="notice_room_avatar_removed">%1$s eemaldas jututoa tunnuspildi</string>
-    <string name="notice_room_avatar_removed_by_you">Sa eemaldasid jututoa tunnuspildi</string>
-    <string name="notice_profile_change_redacted_by_you">Sa uuendasid oma profiili %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Sina võtsid vastu kutse %1$s nimel</string>
-    <string name="notice_widget_added">%1$s lisas %2$s vidina</string>
-    <string name="notice_widget_added_by_you">Sina lisasid %1$s vidina</string>
-    <string name="notice_widget_removed">%1$s eemaldas %2$s vidina</string>
-    <string name="notice_widget_removed_by_you">Sina eemdaldasid %1$s vidina</string>
-    <string name="notice_widget_modified">%1$s muutis %2$s vidinat</string>
-    <string name="notice_widget_modified_by_you">Sa muutsid %1$s vidinat</string>
-    <string name="power_level_admin">Peakasutaja</string>
-    <string name="power_level_moderator">Moderaator</string>
-    <string name="power_level_default">Tavakasutaja</string>
-    <string name="power_level_custom">Kohandatud kasutajaõigused (%1$d)</string>
-    <string name="power_level_custom_no_value">Kohandatud õigused</string>
-    <string name="notice_power_level_changed_by_you">Sina muutsid kasutaja %1$s õigusi.</string>
-    <string name="notice_power_level_changed">%1$s muutis kasutaja %2$s õigusi.</string>
-    <string name="notice_power_level_diff">%1$s õiguste muutus %2$s -&gt; %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Sinu kutse. Põhjus %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Sina kutsusid kasutajat %1$s. Põhjus: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Sina liitusid jututoaga. Põhjus: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Sina lahkusid jututoast. Põhjus: %1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Sina lükkasid kutse tagasi. Põhjus: %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Sina müksasid kasutaja %1$s välja. Põhjus: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s taastas ligipääsu kasutajale %2$s. Põhjus: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Sina taastasid kasutaja %1$s ligipääsu. Põhjus: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s keelas kasutaja %2$s ligipääsu. Põhjus: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Sina keelasid kasutaja %1$s ligipääsu. Põhjus: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks. Põhjus: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s. Põhjus: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Sina võtsid vastu kutse %1$s nimel. Põhjus: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Sina võtsid tagasi kasutaja %1$s kutse. Põhjus: %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Sina lisasid %1$s selle jututoa aadressiks.</item>
-        <item quantity="other">Sina lisasid %1$s selle jututoa aadressideks.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Sina eemaldasid %1$s, kui selle jututoa aadressi.</item>
-        <item quantity="other">Sina eemaldasid %1$s selle jututoa aadresside hulgast.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">Sina lisasid %1$s selle jututoa aadressiks ning eemaldasid %2$s aadresside hulgast.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Sina seadistasid selle jututoa põhiaadressiks %1$s.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Sina eemaldasid selle jututoa põhiaadressi.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Sina lubasid külalistel selle jututoaga liituda.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Sina seadistasid, et külalised ei või selle jututoaga liituda.</string>
-    <string name="notice_end_to_end_ok_by_you">Sa lülitasid sisse läbiva krüptimise.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Sa lülitasid sisse läbiva krüptimise (kasutusel on tundmatu algoritm %1$s).</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Sina seadistasid, et külalised ei või selle jututoaga liituda.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s seadistas, et külalised ei või selle jututoaga liituda.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Sina lubasid külalistel selle jututoaga liituda.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s lubas külalistel selle jututoaga liituda.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Sina lahkusid jututoast. Põhjus: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s lahkus jututoast. Põhjus: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Sina liitusid jututoaga. Põhjus: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s liitus jututoaga. Põhjus: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Sina kutsusid kasutajat %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s kutsus kasutajat %2$s</string>
-    <string name="notice_direct_room_update_by_you">Sa uuendasid seda jututuba.</string>
-    <string name="notice_direct_room_update">%s uuendas seda jututuba.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Sina seadistasid, et tulevased jututoa sõnumid on nähtavad kasutajale %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s seadistas, et tulevased jututoa sõnumid on nähtavad kasutajale %2$s</string>
-    <string name="notice_direct_room_leave_by_you">Sina lahkusid jututoast</string>
-    <string name="notice_direct_room_leave">%1$s lahkus jututoast</string>
-    <string name="notice_direct_room_join_by_you">Sina liitusid</string>
-    <string name="notice_direct_room_join">%1$s liitus</string>
-    <string name="notice_direct_room_created_by_you">Sina alustasid vestlust</string>
-    <string name="notice_direct_room_created">%1$s alustas vestlust</string>
-    <string name="room_displayname_empty_room_was">Tühi jututuba (oli %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s ja %4$d muu</item>
-        <item quantity="other">%1$s, %2$s, %3$s ja %4$d muud</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s ja %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s ja %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Kõikide serverite osalemine on keelatud! Seda jututuba ei saa enam kasutada.</string>
-    <string name="notice_room_server_acl_updated_no_change">Muudatusi ei ole.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Nüüd on keelatud serverid, mille ip-aadress vastab mustrile.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Nüüd on lubatud serverid, mille ip-aadress vastab mustrile.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Server, mille nimes leidub %s, eemaldati lubatud serverite loendist.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Nüüd on lubatud serverid, mille nimes leidub %s.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Server, mille nimes leidub %s eemaldati keeluloendist.</string>
-    <string name="notice_room_server_acl_updated_banned">• Keelatud on server, mille nimes leidub %s.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Sina muutsid selle jututoa jaoks serverite pääsuloendit.</string>
-    <string name="notice_room_server_acl_updated_title">%s muutis selle jututoa jaoks serverite pääsuloendit.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Sina kirjeldasid selle jututoa jaoks serverite pääsuloendi.</string>
-    <string name="notice_room_server_acl_set_title">%s kirjeldas selle jututoa jaoks serverite pääsuloendi.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Keelatud on serverid, mille ip-aadress vastab mustrile.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Lubatud on serverid, mille ip-aadress vastab mustrile.</string>
-    <string name="notice_room_server_acl_set_allowed">• Lubatud on serverid, mille nimes leidub %s.</string>
-    <string name="notice_room_server_acl_set_banned">• Keelatud on serverid, mille nimes leidub %s.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s muutis selle jututoa aadresse.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Sa muutsid selle jututoa põhiaadressi ja täiendavaid aadresse.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s muutis selle jututoa täiendavaid aadresse.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Sa muutsid selle jututoa täiendavaid aadresse.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s muutis selle jututoa põhiaadressi ja täiendavaid aadresse.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Sa eemaldasid selle jututoa täiendava aadressi %1$s.</item>
-        <item quantity="other">Sa eemaldasid selle jututoa täiendavad aadressid %1$s.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s eemaldas selle jututoa täiendava aadressi %2$s.</item>
-        <item quantity="other">%1$s eemaldas selle jututoa täiendavad aadressid %2$s.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Sa lisasid sellele jututoale täiendava aadressi %1$s.</item>
-        <item quantity="other">Sa lisasid sellele jututoale täiendavad aadressid %1$s.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s lisas sellele jututoale täiendava aadressi %2$s.</item>
-        <item quantity="other">%1$s lisas sellele jututoale täiendavad aadressid %2$s.</item>
-    </plurals>
-    <string name="notice_room_canonical_alias_no_change_by_you">Sa muutsid selle jututoa aadresse.</string>
-    <string name="notice_widget_jitsi_modified_by_you">Sina muutsid videokoosolekut</string>
-    <string name="notice_widget_jitsi_removed_by_you">Sina lõpetasid videokoosoleku</string>
-    <string name="notice_widget_jitsi_removed">%1$s lõpetas videokoosoleku</string>
-    <string name="notice_widget_jitsi_added_by_you">Sina algatasid videokoosoleku</string>
-    <string name="notice_widget_jitsi_added">%1$s algatas videokoosoleku</string>
-    <string name="notice_widget_jitsi_modified">%1$s muutis videokoosolekut</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-eu/strings.xml b/matrix-sdk-android/src/main/res/values-eu/strings.xml
deleted file mode 100644
index 778761808e..0000000000
--- a/matrix-sdk-android/src/main/res/values-eu/strings.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s erabiltzaileak irudi bat bidali du.</string>
-
-    <string name="notice_room_invite_no_invitee">%s erabiltzailearen gonbidapena</string>
-    <string name="notice_room_invite">%1$s erabiltzaileak %2$s gonbidatu du</string>
-    <string name="notice_room_invite_you">%1$s erabiltzaileak gonbidatu zaitu</string>
-    <string name="notice_room_join">%1$s gelara elkartu da</string>
-    <string name="notice_room_leave">%1$s gelatik atera da</string>
-    <string name="notice_room_reject">%1$s erabiltzaileak gonbidapena baztertu du</string>
-    <string name="notice_room_kick">%1$s erabiltzaileak %2$s kanporatu du</string>
-    <string name="notice_room_unban">%1$s erabiltzaileak debekua kendu dio %2$s erabiltzaileari</string>
-    <string name="notice_room_ban">%1$s erabiltzaileak %2$s debekatu du</string>
-    <string name="notice_room_withdraw">%1$s erabiltzaileak %2$s erabiltzailearen gonbidapena atzera bota du</string>
-    <string name="notice_avatar_url_changed">%1$s erabiltzaileak abatarra aldatu du</string>
-    <string name="notice_display_name_set">%1$s erabiltzaileak bere pantaila-izena aldatu du beste honetara: %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s erabiltzaileak bere pantaila-izena aldatu du, honetatik: %2$s honetara: %3$s</string>
-    <string name="notice_display_name_removed">%1$s erabiltzaileak bere pantaila-izena kendu du (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s erabiltzaileak mintzagaia honetara aldatu du: %2$s</string>
-    <string name="notice_room_name_changed">%1$s erabiltzaileak gelaren izena honetara aldatu du: %2$s</string>
-    <string name="notice_placed_video_call">%s erabiltzaileak bideo deia hasi du.</string>
-    <string name="notice_placed_voice_call">%s erabiltzaileak ahots deia hasi du.</string>
-    <string name="notice_answered_call">%s erabiltzaileak deia erantzun du.</string>
-    <string name="notice_ended_call">%s erabiltzaileak deia amaitu du.</string>
-    <string name="notice_made_future_room_visibility">%1$s erabiltzaileak gelaren historiala ikusgai jarri du hauentzat: %2$s</string>
-    <string name="notice_room_visibility_invited">gelako kide guztiak, gonbidatu zitzaienetik.</string>
-    <string name="notice_room_visibility_joined">gelako kide guztiak, elkartu zirenetik.</string>
-    <string name="notice_room_visibility_shared">gelako kide guztiak.</string>
-    <string name="notice_room_visibility_world_readable">edonor.</string>
-    <string name="notice_room_visibility_unknown">ezezaguna (%s).</string>
-    <string name="notice_end_to_end">%1$s erabiltzaileak muturretik muturrera zifratzea aktibatu du (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s erabiltzaileak VoIP konferentzia bat eskatu du</string>
-    <string name="notice_voip_started">VoIP konferentzia hasita</string>
-    <string name="notice_voip_finished">VoIP konferentzia amaituta</string>
-
-    <string name="notice_avatar_changed_too">(abatarra ere aldatu da)</string>
-    <string name="notice_room_name_removed">%1$s erabiltzaileak gelaren izena kendu du</string>
-    <string name="notice_room_topic_removed">%1$s erabiltzaileak gelaren mintzagaia kendu du</string>
-    <string name="notice_profile_change_redacted">%1$s erabiltzaileak bere profila eguneratu du %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %2$s erabiltzaileari</string>
-    <string name="notice_room_third_party_registered_invite">%1$s erabiltzaileak %2$s gelarako gonbidapena onartu du</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Ezin izan da deszifratu: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Igorlearen gailuak ez dizkigu mezu honetarako gakoak bidali.</string>
-
-    <string name="could_not_redact">Ezin izan da kendu</string>
-    <string name="unable_to_send_message">Ezin izan da mezua bidali</string>
-
-    <string name="message_failed_to_upload">Huts egin du irudia igotzean</string>
-
-    <string name="network_error">Sare errorea</string>
-    <string name="matrix_error">Matrix errorea</string>
-
-    <string name="room_error_join_failed_empty_room">Ezin da oraingoz hutsik dagoen gela batetara berriro sartu.</string>
-
-    <string name="encrypted_message">Zifratutako mezua</string>
-
-    <string name="medium_email">E-mail helbidea</string>
-    <string name="medium_phone_number">Telefono zenbakia</string>
-
-    <string name="summary_user_sent_sticker">%1$s erabiltzaileak eranskailu bat bidali du.</string>
-
-    <string name="room_displayname_invite_from">%s gelarako gonbidapena</string>
-    <string name="room_displayname_room_invite">Gela gonbidapena</string>
-    <string name="room_displayname_two_members">%1$s eta %2$s</string>
-    <string name="room_displayname_empty_room">Gela hutsa</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s eta beste bat</item>
-        <item quantity="other">%1$s eta beste %2$d</item>
-    </plurals>
-
-
-    <string name="notice_event_redacted">Mezua kendu da</string>
-    <string name="notice_event_redacted_by">%1$s erabiltzaileak mezua kendu du</string>
-    <string name="notice_event_redacted_with_reason">Mezua kendu da [arrazoia: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">%1$s erabiltzaileak mezua kendu du [arrazoia: %2$s]</string>
-
-    <string name="initial_sync_start_importing_account">Hasierako sinkronizazioa:
-\nKontua inportatzen…</string>
-    <string name="initial_sync_start_importing_account_crypto">Hasierako sinkronizazioa:
-\nZifratzea inportatzen</string>
-    <string name="initial_sync_start_importing_account_rooms">Hasierako sinkronizazioa:
-\nGelak inportatzen</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Hasierako sinkronizazioa:
-\nElkartutako gelak inportatzen</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Hasierako sinkronizazioa:
-\nGonbidatutako gelak inportatzen</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Hasierako sinkronizazioa:
-\nUtzitako gelak inportatzen</string>
-    <string name="initial_sync_start_importing_account_groups">Hasierako sinkronizazioa:
-\nKomunitateak inportatzen</string>
-    <string name="initial_sync_start_importing_account_data">Hasierako sinkronizazioa:
-\nKontuaren datuak inportatzen</string>
-
-    <string name="notice_room_update">%s erabiltzaileak gela hau eguneratu du.</string>
-
-    <string name="event_status_sending_message">Mezua bidaltzen…</string>
-    <string name="clear_timeline_send_queue">Garbitu bidalketa-ilara</string>
-
-    <string name="notice_room_third_party_revoked_invite">%1$s erabiltzaileak %2$s gelara elkartzeko gonbidapena indargabetu du</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s erabiltzailearen gonbidapena. Arrazoia: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s erabiltzaileak %2$s gonbidatu du. Arrazoia: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s erabiltzaileak gonbidatu zaitu. Arrazoia: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s gelara elkartu da. Arrazoia: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s gelatik atera da. Arrazoia: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s erabiltzaileak gonbidapena baztertu du. Arrazoia: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s erabiltzaileak %2$s kanporatu du. Arrazoia: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s erabiltzaileak debekua kendu dio %2$s erabiltzaileari. Arrazoia: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s erabiltzaileak %2$s debekatu du. Arrazoia: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">"%1$s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %2$s erabiltzaileari. Arrazoia: %3$s"</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">"%1$s erabiltzaileak %2$s gelara elkartzeko gonbidapena indargabetu du. Arrazoia: %3$s"</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">"%1$s erabiltzaileak %2$s gelarako gonbidapena onartu du. Arrazoia: %3$s"</string>
-    <string name="notice_room_withdraw_with_reason">"%1$s erabiltzaileak %2$s erabiltzailearen gonbidapena indargabetu du. Arrazoia: %3$s"</string>
-
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s erabiltzaileak %2$s gehitu du gela honen helbide gisa.</item>
-        <item quantity="other">%1$s erabiltzaileak %2$s gehitu ditu gela honen helbide gisa.</item>
-    </plurals>
-
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s erabiltzaileak %2$s kendu du gela honen helbide gisa.</item>
-        <item quantity="other">%1$s erabiltzaileak %3$s kendu ditu gela honen helbide gisa.</item>
-    </plurals>
-
-    <string name="notice_room_aliases_added_and_removed">%1$s erabiltzaileak %2$s gehitu %3$s eta kendu ditu gela honen helbide gisa.</string>
-
-    <string name="notice_room_canonical_alias_set">%1$s erabiltzaileak %2$s ezarri du gela honen helbide nagusi gisa.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s erabiltzaileak gela honen helbide nagusia kendu du.</string>
-
-    <string name="notice_room_guest_access_can_join">%1$k gonbidatuak gelara sartzea onartu du.</string>
-    <string name="notice_room_guest_access_forbidden">%1%k gonbidatuak gelara sartzea galerazi du.</string>
-
-    <string name="notice_end_to_end_ok">%1$s erabiltzaileak muturretik muturrerako zifratzea gaitu du.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s erabiltzaileak muturretik muturrerako zifratzea gaitu du. (%2$s algoritmo ezezaguna).</string>
-
-    <string name="notice_room_created">%1$s erabiltzaileak gela sortu du</string>
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-fa/strings.xml b/matrix-sdk-android/src/main/res/values-fa/strings.xml
deleted file mode 100644
index dbbb890b01..0000000000
--- a/matrix-sdk-android/src/main/res/values-fa/strings.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s تصویری فرستاد.</string>
-    <string name="summary_user_sent_sticker">%1$s برچسبی فرستاد.</string>
-    <string name="notice_room_invite_no_invitee">دعوت %s</string>
-    <string name="notice_room_invite">‫%1$s، %2$s را دعوت کرد</string>
-    <string name="notice_room_invite_you">%1$s دعوتتان کرد</string>
-    <string name="notice_room_join">%1$s به اتاق پیوست</string>
-    <string name="notice_room_leave">%1$s اتاق را ترک کرد</string>
-    <string name="notice_room_reject">%1$s دعوت را رد کرد</string>
-    <string name="notice_room_kick">%1$s، %2$s را اخراج کرد</string>
-    <string name="notice_room_unban">%1$s، انسداد %2$s را رفع کرد</string>
-    <string name="notice_room_ban">%1$s، %2$s را مسدود کرد</string>
-    <string name="notice_room_withdraw">%1$s دعوت %2$s را نپذیرفت</string>
-    <string name="notice_avatar_url_changed">%1$s تصویرش را عوض کرد</string>
-    <string name="notice_display_name_set">%1$s نام نمایشی خود را به %2$s تنظیم کرد</string>
-    <string name="notice_display_name_changed_from">%1$s نام نمایشیش را از %2$s به %3$s تغییر داد</string>
-    <string name="notice_display_name_removed">%1$s نام نمایشیش (%2$s) را پاک کرد</string>
-    <string name="notice_room_topic_changed">%1$s موضوع را به %2$s تغییر داد</string>
-    <string name="notice_room_name_changed">%1$s نام اتاق را به %2$s تغییر داد</string>
-    <string name="notice_placed_video_call">%s یک تماس تصویری برقرار کرد.</string>
-    <string name="notice_placed_voice_call">%s یک تماس صوتی برقرار کرد.</string>
-    <string name="notice_answered_call">%s تماس را پاسخ داد.</string>
-    <string name="notice_ended_call">%s به تماس پایان داد.</string>
-    <string name="notice_made_future_room_visibility">%1$s تاریخچهٔ آیندهٔ اتاق را برای %2$s نمایان کرد</string>
-    <string name="notice_room_visibility_invited">همهٔ اعضای اتاق، از زمان دعوت شدنشان.</string>
-    <string name="notice_room_visibility_joined">همهٔ اعضای اتاق، از زمان پیوستنشان.</string>
-    <string name="notice_room_visibility_shared">همهٔ اعضای اتاق.</string>
-    <string name="notice_room_visibility_world_readable">هرکسی.</string>
-    <string name="notice_room_visibility_unknown">ناشناخته (%s).</string>
-    <string name="notice_end_to_end">%1$s رمزنگاری سرتاسری را روشن کرد (%2$s)</string>
-    <string name="notice_room_update">%s این اتاق را ارتقا داد.</string>
-    <string name="notice_requested_voip_conference">%1$s درخواست یک گردهمایی صوتی داد</string>
-    <string name="notice_voip_started">گردهمایی صوتی آغاز شد</string>
-    <string name="notice_voip_finished">گردهمایی صوتی پایان یافت</string>
-    <string name="notice_avatar_changed_too">(تصویر هم عوض شد)</string>
-    <string name="notice_room_name_removed">%1$s نام اتاق را پاک کرد</string>
-    <string name="notice_room_topic_removed">%1$s موضوع اتاق را پاک کرد</string>
-    <string name="notice_event_redacted">پیام برداشته شد</string>
-    <string name="notice_event_redacted_by">پیام به دست %1$s برداشته شد</string>
-    <string name="notice_event_redacted_with_reason">پیام برداشته شد [دلیل: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">پیام به دست %1$s برداشته شد [دلیل: %2$s]</string>
-    <string name="notice_room_third_party_invite">%1$s دعوتی برای پیوستن %2$s به اتاق فرستاد</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s دعوت پیوستن به اتاق %2$s را باطل کرد</string>
-    <string name="notice_room_third_party_registered_invite">%1$s دعوت برای %2$s را پذیرفت</string>
-    <string name="notice_crypto_unable_to_decrypt">** ناتوان در رمزگشایی: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">دستگاه فرستنده، کلیدهای این پیام را برایمان نفرستاده است.</string>
-    <string name="unable_to_send_message">ناتوان در فرستادن پیام</string>
-    <string name="message_failed_to_upload">شکست در بارگذاری تصویر</string>
-    <string name="network_error">خطای شبکه</string>
-    <string name="matrix_error">خطای ماتریکس</string>
-    <string name="room_error_join_failed_empty_room">در حال حاضر امکان بازپیوست به اتاقی خالی وجود ندارد‌‌.</string>
-    <string name="encrypted_message">پیام رمزنگاری شده</string>
-    <string name="medium_email">نشانی رایانامه</string>
-    <string name="medium_phone_number">شماره تلفن</string>
-    <string name="room_displayname_invite_from">دعوت از %s</string>
-    <string name="room_displayname_room_invite">دعوت اتاق</string>
-    <string name="room_displayname_two_members">%1$s و %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s و ۱ نفر دیگر</item>
-        <item quantity="other">%1$s و %2$d نفر دیگر</item>
-    </plurals>
-    <string name="room_displayname_empty_room">اتاق خالی</string>
-    <string name="initial_sync_start_importing_account">همگام‌سازی نخستین:
-\nدر حال درون‌ریزی حساب…</string>
-    <string name="initial_sync_start_importing_account_crypto">همگام‌سازی نخستین:
-\nدر حال درون‌ریزی رمزنگاری</string>
-    <string name="initial_sync_start_importing_account_rooms">همگام‌سازی نخستین:
-\nدر حال درون‌ریزی اتاق‌ها</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">همگام‌سازی نخستین:
-\nدر حال درون‌ریزی اتاق‌های پیوسته</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">همگام‌سازی نخستین:
-\nدر حال درون‌ریزی اتاق‌های دعوت‌شده</string>
-    <string name="initial_sync_start_importing_account_left_rooms">همگام‌سازی نخستین:
-\nدر حال درون‌ریزی اتاق‌های ترک‌شده</string>
-    <string name="initial_sync_start_importing_account_groups">همگام‌سازی نخستین: 
-\nدر حال درون‌ریزی انجمن‌ها</string>
-    <string name="initial_sync_start_importing_account_data">همگام‌سازی نخستین:
-\nدر حال درون‌ریزی داده‌های حساب</string>
-    <string name="event_status_sending_message">در حال فرستادن پیام…</string>
-    <string name="clear_timeline_send_queue">پاک‌سازی صفِ در حال ارسال</string>
-    <string name="notice_room_invite_no_invitee_with_reason">دعوت %1$s. دلیل: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s، %2$s را دعوت کرد. دلیل: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s دعوتتان کرد. دلیل: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s به اتاق پیوست. دلیل: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s اتاق را ترک کرد. دلیل: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s دعوت را رد کرد. دلیل: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s، %2$s را اخراج کرد. دلیل: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s انسداد %2$s را رفع کرد. دلیل: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s، %2$s را مسدود کرد. دلیل: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s دعوتی برای پیوستن %2$s به اتاق فرستاد. دلیل: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s دعوت %2$s برای پیوستن به اتاق را باطل کرد. دلیل: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s دعوت برای %2$s را پذیرفت. دلیل: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s دعوت %2$s را نپذیرفت. دلیل: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s، %2$s را به عنوان نشانی‌ای برای این اتاق افزود.</item>
-        <item quantity="other">%1$s، %2$s را به عنوان نشانی‌هایی برای این اتاق افزود.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s، %2$s را به عنوان نشانی‌ای برای این اتاق پاک کرد.</item>
-        <item quantity="other">%1$s، %3$s را به عنوان نشانی‌هایی برای این اتاق پاک کرد.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s برای نشانی این اتاق، %2$s را افزود و %3$s را پاک کرد.</string>
-    <string name="notice_room_canonical_alias_set">%1$s نشانی اصلی این اتاق را به %2$s تنظیم کرد.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s نشانی اصلی را برای این اتاق پاک کرد.</string>
-    <string name="notice_room_guest_access_can_join">%1$s اجازه داد میمهانان به گروه بپیوندند.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s جلوی پیوستن میمهانان به گروه را گرفت.</string>
-    <string name="notice_end_to_end_ok">%1$s رمزنگاری سرتاسری را روشن کرد.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s رمزنگاری سرتاسری را روشن کرد (الگوریتم تشخیص‌داده‌نشده %2$s ).</string>
-    <string name="notice_room_created">%1$s اتاق را ایجاد کرد</string>
-    <string name="notice_profile_change_redacted">%1$s نمایه‌اش را به‌روز کرد %2$s</string>
-    <string name="could_not_redact">نمی‌توان ویرایش کرد</string>
-    <string name="summary_you_sent_image">تصویری فرستادید.</string>
-    <string name="summary_you_sent_sticker">برچسبی فرستادید.</string>
-    <string name="notice_room_invite_no_invitee_by_you">دعوتتان</string>
-    <string name="notice_room_created_by_you">اتاق را ایجاد کردید</string>
-    <string name="notice_room_invite_by_you">از %1$s دعوت کردید</string>
-    <string name="notice_room_join_by_you">به اتاق پیوستید</string>
-    <string name="notice_room_leave_by_you">اتاق را ترک کردید</string>
-    <string name="notice_room_reject_by_you">دعوت را رد کردید</string>
-    <string name="notice_room_kick_by_you">%1$s را اخراج کردید</string>
-    <string name="notice_room_unban_by_you">تحریم %1$s را برداشتید</string>
-    <string name="notice_room_ban_by_you">%1$s را تحریم کردید</string>
-    <string name="notice_room_withdraw_by_you">دعوت %1$s را پس‌گرفتید</string>
-    <string name="notice_avatar_url_changed_by_you">آواتارتان را عوض کردید</string>
-    <string name="notice_display_name_set_by_you">نام نمایشیتان را به %1$s تغییر دادید</string>
-    <string name="notice_display_name_changed_from_by_you">نام نمایشیتان را از %1$s به %2$s تغییر دادید</string>
-    <string name="notice_display_name_removed_by_you">نام نمایشیتان را برداشتید (%1$s بود)</string>
-    <string name="notice_room_topic_changed_by_you">موضوع را به %1$s تغییر دادید</string>
-    <string name="notice_room_avatar_changed">%1$s آواتار اتاق را تغییر داد</string>
-    <string name="notice_room_avatar_changed_by_you">آواتار اتاق را تغییر دادید</string>
-    <string name="notice_room_name_changed_by_you">نام اتاق را به %1$s تغییر دادید</string>
-    <string name="notice_placed_video_call_by_you">تماس تصویری گرفتید.</string>
-    <string name="notice_placed_voice_call_by_you">تماس صوتی گرفتید.</string>
-    <string name="notice_call_candidates">%s برای برپایی تماس، داده فرستاد.</string>
-    <string name="notice_call_candidates_by_you">برای برپایی تماس، داده فرستادید.</string>
-    <string name="notice_answered_call_by_you">تماس را پاسخ دادید.</string>
-    <string name="notice_ended_call_by_you">به تماس پایان دادید.</string>
-    <string name="notice_made_future_room_visibility_by_you">تاریخچهٔ آتی اتاق را برای %1$s نمایان کردید</string>
-    <string name="notice_end_to_end_by_you">رمزنگاری سرتاسری را روشن کردید (%1$s)</string>
-    <string name="notice_room_update_by_you">این اتاق را ارتقا دادید.</string>
-    <string name="notice_requested_voip_conference_by_you">دارخواست کنفرانس ویپ دادید</string>
-    <string name="notice_room_name_removed_by_you">نام اتاق را برداشتید</string>
-    <string name="notice_room_topic_removed_by_you">موضوع اتاق را برداشتید</string>
-    <string name="notice_room_avatar_removed">%1$s آواتار اتاق را برداشت</string>
-    <string name="notice_room_avatar_removed_by_you">آواتار اتاق را برداشتید</string>
-    <string name="notice_profile_change_redacted_by_you">نمایه‌تان را به‌روز کردید %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">برای %1$s دعوت پیوستن به اتاق فرستادید</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">دعوت پیوستن %1$s به اتاق را پس گرفتید</string>
-    <string name="notice_room_third_party_registered_invite_by_you">دعوت برای %1$s را پذیرفتید</string>
-    <string name="notice_widget_added">%1$s ابزارک %2$s را افزود</string>
-    <string name="notice_widget_added_by_you">ابزارک %1$s را افزودید</string>
-    <string name="notice_widget_removed">%1$s ابزارک %2$s را برداشت</string>
-    <string name="notice_widget_removed_by_you">ابزارک %1$s را برداشتید</string>
-    <string name="notice_widget_modified">%1$s ابزارک %2$s را دستکاری کرد</string>
-    <string name="notice_widget_modified_by_you">ابزارک %1$s را دستکاری کردید</string>
-    <string name="power_level_admin">مدیر</string>
-    <string name="power_level_moderator">ناظم</string>
-    <string name="power_level_default">پیش‌گزیده</string>
-    <string name="power_level_custom">سفارشی (%1$d)</string>
-    <string name="power_level_custom_no_value">سفارشی</string>
-    <string name="notice_power_level_changed_by_you">سطح قدرت %1$s را تغییر دادید.</string>
-    <string name="notice_power_level_changed">%1$s سطح قدرت %2$s را تغییر داد.</string>
-    <string name="notice_power_level_diff">%1$s از %2$s به %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">دعوتتان. دلیل: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">%1$s را دعوت کردید. دلیل: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">به اتاق پیوستید. دلیل: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">اتاق را ترک کردید. دلیل: %1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">دعوت را رد کردید. دلیل: %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">%1$s را اخراج کردید. دلیل: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">تحریم %1$s را برداشتید. دلیل: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">%1$s را تحریم کردید. دلیل: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">دعوتی به %1$s برای پیوستن به اتاق فرستادید. دلیل: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">دعوت %1$s برای پیوستن به اتاق را پس گرفتید. دلیل: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">دعوت برای %1$s را پذیرفتید. دلیل: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">دعوت %1$s را رد کردید. دلیل: %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">نشانی %1$s را به این اتاق افزودید.</item>
-        <item quantity="other">نشانی‌های %1$s را به این اتاق افزودید.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">نشانی %1$s را از این اتاق برداشتید.</item>
-        <item quantity="other">نشانی‌های %1$s را از این اتاق برداشتید.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">نشانی %1$s ار افزوده و %2$s را از این اتاق برداشتید.</string>
-    <string name="notice_room_canonical_alias_set_by_you">نشانی اصلی این اتاق را به %1$s تنظیم کردید.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">نشانی اصلی این اتاق را برداشتید.</string>
-    <string name="notice_room_guest_access_can_join_by_you">به میهمانان اجازهٔ پیوستن به گروه دادید.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">میمهانان را از پیوستن به گروه بازداشتید.</string>
-    <string name="notice_end_to_end_ok_by_you">رمزنگاری سرتاسری را روشن کردید.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">رمزنگاری سرتاسری را روشن کردید (الگوریتم ناشناخته %1$s).</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">مهمان‌ها را از پیوستن به اتاق بازداشتید.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s مهمان‌ها را از پیوستن به اتاق بازداشت.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">به مهمان‌ها اجازه دادید به این‌جا بپیوندند.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s به مهمان‌ها اجازه داد به این‌جا بپیوندند.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">رفتید. دلیل: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s رفت. دلیل: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">پیوستید. دلیل: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$sپیوست. دلیل: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">دعوت %1$s را پس گرفتید</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s دعوت %2$s را پس گرفت</string>
-    <string name="notice_direct_room_third_party_invite_by_you">%1$s را دعوت کردید</string>
-    <string name="notice_direct_room_third_party_invite">%1$s، %2$s را دعوت کرد</string>
-    <string name="notice_direct_room_update_by_you">این‌جا را ارتقا دادید.</string>
-    <string name="notice_direct_room_update">%s این‌جا را ارتقا داد.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">پیام‌های آینده را برای %1$s نمایان کردید</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s پیام‌های آینده را برای %2$s نمایان کرد</string>
-    <string name="notice_direct_room_leave_by_you">اتاق را ترک کردید</string>
-    <string name="notice_direct_room_leave">%1$s اتاق را ترک کرد</string>
-    <string name="notice_direct_room_join_by_you">پیوستید</string>
-    <string name="notice_direct_room_join">%1$s پیوست</string>
-    <string name="notice_direct_room_created_by_you">گفت‌وگو را ایجاد کردید</string>
-    <string name="notice_direct_room_created">%1$s گفت‌وگو را ایجاد کرد</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s، %2$s، %3$s و %4$d نفر دیگر</item>
-        <item quantity="other">%1$s، %2$s، %3$s و %4$d نفر دیگر</item>
-    </plurals>
-    <string name="room_displayname_3_members">%1$s، %2$s و %3$s</string>
-    <string name="room_displayname_4_members">%1$s، %2$s، %3$s و %4$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-fi/strings.xml b/matrix-sdk-android/src/main/res/values-fi/strings.xml
deleted file mode 100644
index 044cbd3633..0000000000
--- a/matrix-sdk-android/src/main/res/values-fi/strings.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_user_sent_image">%1$s lähetti kuvan.</string>
-    <string name="notice_room_invite_no_invitee">Käyttäjän %s kutsu</string>
-    <string name="notice_room_invite">%1$s kutsui käyttäjän %2$s</string>
-    <string name="notice_room_invite_you">%1$s kutsui sinut</string>
-    <string name="notice_room_join">%1$s liittyi huoneeseen</string>
-    <string name="notice_room_leave">%1$s poistui huoneesta</string>
-    <string name="notice_room_reject">%1$s hylkäsi kutsun</string>
-    <string name="notice_room_kick">%1$s poisti käyttäjän %2$s</string>
-    <string name="notice_room_unban">%1$s poisti porttikiellon käyttäjältä %2$s</string>
-    <string name="notice_room_ban">%1$s antoi porttikiellon käyttäjälle %2$s</string>
-    <string name="notice_room_withdraw">%1$s veti takaisin kutsun käyttäjälle %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s vaihtoi profiilikuvaansa</string>
-    <string name="notice_display_name_set">%1$s asetti näyttönimekseen %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s muutti näyttönimensä nimestä %2$s nimeen %3$s</string>
-    <string name="notice_display_name_removed">%1$s poisti näyttönimensä (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s vaihtoi aiheeksi: %2$s</string>
-    <string name="notice_room_name_changed">%1$s vaihtoi huoneen nimeksi %2$s</string>
-    <string name="notice_placed_video_call">%s soitti videopuhelun.</string>
-    <string name="notice_placed_voice_call">%s soitti äänipuhelun.</string>
-    <string name="notice_answered_call">%s vastasi puheluun.</string>
-    <string name="notice_ended_call">%s lopetti puhelun.</string>
-    <string name="notice_made_future_room_visibility">%1$s muutti tulevan huonehistorian näkyväksi seuraaville: %2$s</string>
-    <string name="notice_room_visibility_invited">kaikki huoneen jäsenet, kutsumisestaan asti.</string>
-    <string name="notice_room_visibility_joined">kaikki huoneen jäsenet, liittymisestään asti.</string>
-    <string name="notice_room_visibility_shared">kaikki huoneen jäsenet.</string>
-    <string name="notice_room_visibility_world_readable">kaikki.</string>
-    <string name="notice_room_visibility_unknown">tuntematon (%s).</string>
-    <string name="notice_end_to_end">%1$s otti käyttöön osapuolten välisen salauksen (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s lähetti VoIP-konferenssipyynnön</string>
-    <string name="notice_voip_started">VoIP-konferenssi alkoi</string>
-    <string name="notice_voip_finished">VoIP-konferenssi päättyi</string>
-    <string name="notice_avatar_changed_too">(myös kuva vaihdettiin)</string>
-    <string name="notice_room_name_removed">%1$s poisti huoneen nimen</string>
-    <string name="notice_room_topic_removed">%1$s poisti huoneen aiheen</string>
-    <string name="notice_profile_change_redacted">%1$s päivitti profiilinsa %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s lähetti liittymiskutsun huoneeseen käyttäjälle %2$s</string>
-    <string name="notice_room_third_party_registered_invite">%1$s hyväksyi kutsun käyttäjän %2$s puolesta</string>
-    <string name="notice_crypto_unable_to_decrypt">** Salauksen purku epäonnistui: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Lähettäjän laite ei ole lähettänyt avaimia tähän viestiin.</string>
-    <string name="unable_to_send_message">Viestin lähetys epäonnistui</string>
-    <string name="message_failed_to_upload">Kuvan lataaminen epäonnistui</string>
-    <string name="network_error">Verkkovirhe</string>
-    <string name="matrix_error">Matrix-virhe</string>
-    <string name="room_error_join_failed_empty_room">Tällä hetkellä ei ole mahdollista liittyä uudelleen tyhjään huoneeseen.</string>
-    <string name="encrypted_message">Salattu viesti</string>
-    <string name="medium_email">Sähköpostiosoite</string>
-    <string name="medium_phone_number">Puhelinnumero</string>
-    <string name="could_not_redact">Takaisinveto epäonnistui</string>
-    <string name="summary_message">%1$s: %2$s</string>
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Kutsu käyttäjältä %s</string>
-    <!-- Grammar problem -->
-    <string name="room_displayname_room_invite">Huonekutsu</string>
-    <string name="room_displayname_two_members">%1$s ja %2$s</string>
-    <string name="room_displayname_empty_room">Tyhjä huone</string>
-    <string name="summary_user_sent_sticker">%1$s lähetti tarran.</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s ja yksi muu</item>
-        <item quantity="other">%1$s ja %2$d muuta</item>
-    </plurals>
-    <string name="notice_event_redacted">Viesti poistettu</string>
-    <string name="notice_event_redacted_by">%1$s poisti viestin</string>
-    <string name="notice_event_redacted_with_reason">Viesti poistettu [syy: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">%1$s poisti viestin [syy: %2$s]</string>
-    <string name="initial_sync_start_importing_account">Alkusynkronointi:
-\nTuodaan tiliä…</string>
-    <string name="initial_sync_start_importing_account_crypto">Alkusynkronointi:
-\nTuodaan kryptoa</string>
-    <string name="initial_sync_start_importing_account_rooms">Alkusynkronointi:
-\nTuodaan huoneita</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Alkusynkronointi:
-\nTuodaan liityttyjä huoneita</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Alkusynkronointi:
-\nTuodaan kutsuttuja huoneita</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Alkusynkronointi:
-\nTuodaan poistuttuja huoneita</string>
-    <string name="initial_sync_start_importing_account_groups">Alkusynkronointi:
-\nTuodaan yhteisöjä</string>
-    <string name="initial_sync_start_importing_account_data">Alkusynkronointi:
-\nTuodaan tilin tietoja</string>
-    <string name="notice_room_update">%s päivitti tämän huoneen.</string>
-    <string name="event_status_sending_message">Lähetetään viestiä…</string>
-    <string name="clear_timeline_send_queue">Tyhjennä lähetysjono</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s veti takaisin käyttäjän %2$s liittymiskutsun huoneeseen</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Henkilön %1$s kutsu. Syy: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s kutsui henkilön %2$s. Syy: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s kutsui sinut. Syy: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s liittyi huoneeseen. Syy: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s poistui huoneesta. Syy: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s hylkäsi kutsun. Syy: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s poisti käyttäjän %2$s huoneesta. Syy: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s poisti porttikiellon käyttäjältä %2$s. Syy: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s antoi porttikiellon käyttäjälle %2$s. Syy: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s lähetti kutsun liittyä huoneeseen käyttäjälle %2$s. Syy: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s kumosi kutsun liittyä huoneeseen käyttäjälle %2$s. Syy: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s hyväksyi kutsun liityäkseen huoneeseen %2$s. Syy: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s veti takaisin käyttäjän %2$s kutsun. Syy: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s lisäsi tälle huoneelle osoitteen %2$s.</item>
-        <item quantity="other">%1$s lisäsi tälle huoneelle osoitteet %2$s.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s poisti tältä huoneelta osoitteen %2$s.</item>
-        <item quantity="other">%1$s poisti tältä huoneelta osoitteet %3$s.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s lisäsi tälle huoneelle osoitteen %2$s ja poisti osoitteen %3$s.</string>
-    <string name="notice_room_canonical_alias_set">%1$s asetti tämän huoneen pääosoitteeksi %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s poisti tämän huoneen pääosoitteen.</string>
-    <string name="notice_room_guest_access_can_join">%1$s salli vieraiden liittyä huoneeseen.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s esti vieraita liittymästä huoneeseen.</string>
-    <string name="notice_end_to_end_ok">%1$s laittoi päälle osapuolten välisen salauksen.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s laittoi päälle osapuolisten välisen salauksen (tuntematon algoritmi %2$s).</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Hyväksyit käyttäjän %1$s kutsun. Syy: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Peruutit kutsun liittyä huoneeseen käyttäjältä %1$s. Syy: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Lähetit kutsun liittyä huoneeseen käyttäjälle %1$s. Syy: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Estit käyttäjän %1$s. Syy: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Peruutit eston %1$s. Syy: %2$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Poistit käyttäjän %1$s. Syy: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Hylkäsit kutsun. Syy: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Lähdit. Syy: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s lähti. Syy: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Poistuit huoneesta. Syy: %1$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Liityit. Syy: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s liittyi. Syy: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Liityit ryhmään. Syy: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Kutsuit %1$s. Syy: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Kutsusi. Syy: %1$s</string>
-    <string name="room_displayname_empty_room_was">Tyhjä huone (oli %s)</string>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s ja %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s ja %3$s</string>
-    <string name="power_level_custom_no_value">Mukautettu</string>
-    <string name="power_level_custom">Mukautettu (%1$d)</string>
-    <string name="power_level_default">Oletus</string>
-    <string name="power_level_moderator">Valvoja</string>
-    <string name="power_level_admin">Ylläpitäjä</string>
-    <string name="notice_widget_modified">%1$s muutti %2$s sovelmaa</string>
-    <string name="notice_widget_removed_by_you">Poistit %1$s sovelman</string>
-    <string name="notice_widget_removed">%1$s poisti %2$s sovelman</string>
-    <string name="notice_widget_added_by_you">Lisäsit %1$s sovelman</string>
-    <string name="notice_widget_added">%1$s lisäsi %2$s sovelman</string>
-    <string name="notice_widget_modified_by_you">Muutit %1$s sovelmaa</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Hyväksyit kutsun henkilölle %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Peruutit kutsun henkilöltä %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s peruutti kutsun henkilöltä %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Peruutit henkilön %1$s kutsun liittyä ryhmään</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Kutsuit %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s kutsui %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Lähetit henkilölle %1$s kutsun liittyä huoneeseen</string>
-    <string name="notice_profile_change_redacted_by_you">Päivitit profiilisi %1$s</string>
-    <string name="notice_room_avatar_removed_by_you">Poistit huoneen profiilikuvan</string>
-    <string name="notice_room_avatar_removed">%1$s poisti huoneen profiilikuvan</string>
-    <string name="notice_room_topic_removed_by_you">Poistit huoneen aiheen</string>
-    <string name="notice_room_name_removed_by_you">Poistit huoneen nimen</string>
-    <string name="notice_requested_voip_conference_by_you">Pyysit ryhmäpuhelua</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Kaikki palvelimet on estetty osallistumasta! Tätä huonetta ei voi enää käyttää.</string>
-    <string name="notice_room_server_acl_updated_no_change">Ei muutosta.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Palvelimet jotka %s poistettiin estolistalta.</string>
-    <string name="notice_room_server_acl_updated_banned">• Palvelimen haku %s on nyt kielletty.</string>
-    <string name="notice_room_server_acl_set_allowed">• Palvelimen haku %s on sallittu.</string>
-    <string name="notice_room_server_acl_set_banned">• Palvelimen haku %s on kielletty.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s on estänyt vieraita liittymästä huoneeseen.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Estit vieraita liittymästä huoneeseen.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Annoit vieraille luvan liittyä huoneeseen.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Annoit vieraille luvan liittyä tänne.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s on antanut vieraille luvan liittyä tänne.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Poistit tämän huoneen pääosoitteen.</string>
-    <string name="notice_end_to_end_ok_by_you">Otit käyttöön päästä päähän -salauksen.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Olet estänyt vieraiden liittymisen huoneeseen.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Otit päästä päähän -salauksen käyttöön (tuntematon algoritmi %1$s).</string>
-    <string name="notice_direct_room_update_by_you">Päivitit tässä.</string>
-    <string name="notice_direct_room_update">%s päivitti täällä.</string>
-    <string name="notice_room_update_by_you">Päivitit tämän huoneen.</string>
-    <string name="notice_end_to_end_by_you">Otit päästä päähän -salauksen käyttöön (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Teit tulevista viesteistä näkyviä käyttäjälle %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s teki tulevista viesteistä näkyviä käyttäjälle %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Teit tulevan huonehistorian näkyväksi %1$s</string>
-    <string name="notice_ended_call_by_you">Lopetit puhelun.</string>
-    <string name="notice_answered_call_by_you">Vastasit puheluun.</string>
-    <string name="notice_call_candidates_by_you">Lähetit tietoja puhelun valmistelemiseksi.</string>
-    <string name="notice_call_candidates">%s lähetti tietoja puhelun valmistelemiseksi.</string>
-    <string name="notice_placed_voice_call_by_you">Aloitit äänipuhelun.</string>
-    <string name="notice_placed_video_call_by_you">Aloitit videopuhelun.</string>
-    <string name="notice_room_name_changed_by_you">Vaihdoit huoneen nimeksi: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Vaihdoit huoneen profiilikuvaa</string>
-    <string name="notice_room_avatar_changed">%1$s muutti huoneen profiilikuvaa</string>
-    <string name="notice_room_topic_changed_by_you">Vaihdoit aiheen: %1$s</string>
-    <string name="notice_display_name_removed_by_you">Poistit nimimerkkisi (se oli %1$s)</string>
-    <string name="notice_display_name_changed_from_by_you">Vaihdoit nimimerkkisi %1$s nimeen %2$s</string>
-    <string name="notice_display_name_set_by_you">Asetit nimimerkiksesi %1$s</string>
-    <string name="notice_room_invite_no_invitee_by_you">Kutsusi</string>
-    <string name="notice_avatar_url_changed_by_you">Vaihdoit profiilikuvaasi</string>
-    <string name="notice_room_withdraw_by_you">Peruutit %1$sn kutsun</string>
-    <string name="notice_room_ban_by_you">Estit %1$s</string>
-    <string name="notice_room_unban_by_you">Poistit eston %1$s</string>
-    <string name="notice_room_kick_by_you">Poistit %1$s</string>
-    <string name="notice_room_reject_by_you">Hylkäsit kutsun</string>
-    <string name="notice_direct_room_leave_by_you">Poistuit huoneesta</string>
-    <string name="notice_direct_room_leave">%1$s poistui huoneesta</string>
-    <string name="notice_room_leave_by_you">Poistuit huoneesta</string>
-    <string name="notice_direct_room_join_by_you">Liityit</string>
-    <string name="notice_direct_room_join">%1$s liittyi</string>
-    <string name="notice_room_join_by_you">Liityit huoneeseen</string>
-    <string name="notice_room_invite_by_you">Kutsuit %1$s</string>
-    <string name="notice_direct_room_created_by_you">Loit keskustelun</string>
-    <string name="notice_direct_room_created">%1$s loi keskustelun</string>
-    <string name="notice_room_created_by_you">Loit huoneen</string>
-    <string name="notice_room_created">%1$s loi huoneen</string>
-    <string name="summary_you_sent_sticker">Lähetit tarran.</string>
-    <string name="summary_you_sent_image">Lähetit kuvan.</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-fr/strings.xml b/matrix-sdk-android/src/main/res/values-fr/strings.xml
deleted file mode 100644
index 4f0c1fa2b1..0000000000
--- a/matrix-sdk-android/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s : %2$s</string>
-    <string name="summary_user_sent_image">%1$s a envoyé une image.</string>
-    <string name="notice_room_invite_no_invitee">invitation de %s</string>
-    <string name="notice_room_invite">%1$s a invité %2$s</string>
-    <string name="notice_room_invite_you">%1$s vous a invité</string>
-    <string name="notice_room_join">%1$s a rejoint le salon</string>
-    <string name="notice_room_leave">%1$s est parti du salon</string>
-    <string name="notice_room_reject">%1$s a rejeté l’invitation</string>
-    <string name="notice_room_kick">%1$s a expulsé %2$s</string>
-    <string name="notice_room_unban">%1$s a révoqué l\'exclusion de %2$s</string>
-    <string name="notice_room_ban">%1$s a exclus %2$s</string>
-    <string name="notice_room_withdraw">%1$s a annulé l’invitation de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s a changé d’avatar</string>
-    <string name="notice_display_name_set">%1$s a modifié son nom affiché en %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s a modifié son nom affiché de %2$s en %3$s</string>
-    <string name="notice_display_name_removed">%1$s a supprimé son nom affiché (précédemment %2$s)</string>
-    <string name="notice_room_topic_changed">%1$s a changé le sujet en : %2$s</string>
-    <string name="notice_room_name_changed">%1$s a changé le nom du salon en : %2$s</string>
-    <string name="notice_placed_video_call">%s a passé un appel vidéo.</string>
-    <string name="notice_placed_voice_call">%s a passé un appel vocal.</string>
-    <string name="notice_answered_call">%s a répondu à l’appel.</string>
-    <string name="notice_ended_call">%s a raccroché.</string>
-    <string name="notice_made_future_room_visibility">%1$s a rendu l’historique futur du salon visible pour %2$s</string>
-    <string name="notice_room_visibility_invited">tous les membres du salon, depuis qu’ils ont été invités.</string>
-    <string name="notice_room_visibility_joined">tous les membres du salon, depuis qu’ils l’ont rejoint.</string>
-    <string name="notice_room_visibility_shared">tous les membres du salon.</string>
-    <string name="notice_room_visibility_world_readable">n’importe qui.</string>
-    <string name="notice_room_visibility_unknown">inconnu (%s).</string>
-    <string name="notice_end_to_end">%1$s a activé le chiffrement de bout en bout (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s a demandé une téléconférence VoIP</string>
-    <string name="notice_voip_started">Téléconférence VoIP démarrée</string>
-    <string name="notice_voip_finished">Téléconférence VoIP terminée</string>
-    <string name="notice_avatar_changed_too">(l’avatar a aussi changé)</string>
-    <string name="notice_room_name_removed">%1$s a supprimé le nom du salon</string>
-    <string name="notice_room_topic_removed">%1$s a supprimé le sujet du salon</string>
-    <string name="notice_profile_change_redacted">%1$s a mis à jour son profil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s a envoyé une invitation à %2$s pour rejoindre le salon</string>
-    <string name="notice_room_third_party_registered_invite">%1$s a accepté l’invitation pour %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Déchiffrement impossible : %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
-    <string name="could_not_redact">Effacement impossible</string>
-    <string name="unable_to_send_message">Envoi du message impossible</string>
-    <string name="message_failed_to_upload">L’envoi de l’image a échoué</string>
-    <string name="network_error">Erreur de réseau</string>
-    <string name="matrix_error">Erreur de Matrix</string>
-    <string name="room_error_join_failed_empty_room">Il est impossible pour le moment de revenir dans un salon vide.</string>
-    <string name="encrypted_message">Message chiffré</string>
-    <string name="medium_email">Adresse e-mail</string>
-    <string name="medium_phone_number">Numéro de téléphone</string>
-    <string name="summary_user_sent_sticker">%1$s a envoyé un sticker.</string>
-    <string name="room_displayname_invite_from">Invitation de %s</string>
-    <string name="room_displayname_room_invite">Invitation au salon</string>
-    <string name="room_displayname_empty_room">Salon vide</string>
-    <string name="room_displayname_two_members">%1$s et %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s et 1 autre</item>
-        <item quantity="other">%1$s et %2$d autres</item>
-    </plurals>
-    <string name="notice_event_redacted">Message supprimé</string>
-    <string name="notice_event_redacted_by">Message supprimé par %1$s</string>
-    <string name="notice_event_redacted_with_reason">Message supprimé [motif : %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Message supprimé par %1$s [motif : %2$s]</string>
-    <string name="initial_sync_start_importing_account">Synchronisation initiale :
-\nImportation du compte…</string>
-    <string name="initial_sync_start_importing_account_crypto">Synchronisation initiale :
-\nImportation de la cryptographie</string>
-    <string name="initial_sync_start_importing_account_rooms">Synchronisation initiale :
-\nImportation des salons</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Synchronisation initiale :
-\nImportation des salons que vous avez rejoints</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Synchronisation initiale :
-\nImportation des salons où vous avez été invités</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Synchronisation initiale :
-\nImportation des salons que vous avez quittés</string>
-    <string name="initial_sync_start_importing_account_groups">Synchronisation initiale :
-\nImportation des communautés</string>
-    <string name="initial_sync_start_importing_account_data">Synchronisation initiale :
-\nImportation des données du compte</string>
-    <string name="notice_room_update">%s a mis à niveau ce salon.</string>
-    <string name="event_status_sending_message">Envoi du message…</string>
-    <string name="clear_timeline_send_queue">Vider la file d’envoi</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s a révoqué l’invitation pour %2$s à rejoindre le salon</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Invitation de %1$s. Raison : %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s a invité %2$s. Raison : %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s vous a invité. Raison : %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s a rejoint le salon. Raison : %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s est parti du salon. Raison : %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s a refusé l’invitation. Raison : %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s a expulsé %2$s. Raison : %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s a révoqué l\'exclusion de %2$s. Raison : %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s a exclus %2$s. Raison : %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s a envoyé une invitation à %2$s pour rejoindre le salon. Raison : %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s a révoqué l’invitation de %2$s à rejoindre le salon. Raison : %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s a accepté l’invitation pour %2$s. Raison : %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s a annulé l’invitation de %2$s. Raison : %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s a ajouté %2$s comme adresse pour ce salon.</item>
-        <item quantity="other">%1$s a ajouté %2$s comme adresses pour ce salon.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s a supprimé %2$s comme adresse pour ce salon.</item>
-        <item quantity="other">%1$s a supprimé %3$s comme adresses pour ce salon.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s a ajouté %2$s et supprimé %3$s comme adresses pour ce salon.</string>
-    <string name="notice_room_canonical_alias_set">%1$s a défini %2$s comme adresse principale pour ce salon.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s a supprimé l’adresse principale de ce salon.</string>
-    <string name="notice_room_guest_access_can_join">%1$s a autorisé les visiteurs à rejoindre le salon.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s a empêché les visiteurs de rejoindre le salon.</string>
-    <string name="notice_end_to_end_ok">%1$s a activé le chiffrement de bout en bout.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s a activé le chiffrement de bout en bout (algorithme %2$s inconnu).</string>
-    <string name="notice_room_created">%1$s a créé le salon</string>
-    <string name="notice_direct_room_update_by_you">Vous avez mis cet endroit à niveau.</string>
-    <string name="notice_direct_room_update">%s a mis cet endroit à niveau.</string>
-    <string name="notice_room_update_by_you">Vous avez mis à niveau ce salon.</string>
-    <string name="notice_room_kick_by_you">Vous avez expulsé %1$s</string>
-    <string name="notice_room_reject_by_you">Vous avez rejeté l\'invitation</string>
-    <string name="notice_direct_room_leave_by_you">Vous avez quitté le salon</string>
-    <string name="notice_direct_room_leave">%1$s a quitté le salon</string>
-    <string name="notice_room_leave_by_you">Vous avez quitté le salon</string>
-    <string name="notice_direct_room_join_by_you">Vous avez rejoint le salon</string>
-    <string name="notice_direct_room_join">%1$s a rejoint le salon</string>
-    <string name="notice_room_join_by_you">Vous avez rejoint le salon</string>
-    <string name="notice_room_invite_by_you">Vous avez invité %1$s</string>
-    <string name="notice_direct_room_created_by_you">Vous avez créé la discussion</string>
-    <string name="notice_direct_room_created">%1$s a créé la discussion</string>
-    <string name="notice_room_created_by_you">Vous avez créé le salon</string>
-    <string name="notice_room_invite_no_invitee_by_you">Votre invitation</string>
-    <string name="summary_you_sent_sticker">Vous avez envoyé un autocollant.</string>
-    <string name="summary_you_sent_image">Vous avez envoyé une image.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Vous avez activé le chiffrement de bout en bout (algorithme %1$s inconnu).</string>
-    <string name="notice_end_to_end_ok_by_you">Vous avez activé le chiffrement de bout en bout.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Vous avez empêché les visiteurs de rejoindre le salon.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s a empêché les visiteurs de rejoindre le salon.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Vous avez empêché les visiteurs de rejoindre le salon.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Vous avez autorisé les visiteurs à venir ici.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s a autorisé les visiteurs à venir ici.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Vous avez autorisé les visiteurs à rejoindre le salon.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Vous avez supprimé l’adresse principale de ce salon.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Vous avez défini %1$s comme adresse principale pour ce salon.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Vous avez ajouté %1$s et supprimé %2$s comme adresses pour ce salon.</string>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Vous avez supprimé %1$s comme adresse pour ce salon.</item>
-        <item quantity="other">Vous avez supprimé %1$s comme adresses pour ce salon.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Vous avez ajouté %1$s comme adresse pour ce salon.</item>
-        <item quantity="other">Vous avez ajouté %1$s comme adresses pour ce salon.</item>
-    </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">Vous avez annulé l’invitation de %1$s. Raison : %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Vous avez accepté l’invitation pour %1$s. Raison : %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vous avez révoqué l’invitation de %1$s à rejoindre le salon. Raison : %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon. Raison : %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Vous avez refusé l’invitation. Raison : %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Vous êtes parti. Raison : %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s est parti. Raison : %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Vous êtes parti du salon. Raison : %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s rejoint. Raison : %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Vous avez rejoint. Raison : %1$s</string>
-    <string name="notice_room_join_with_reason_by_you">Vous avez rejoint le salon. Raison : %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Vous avez invité %1$s. Raison : %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Votre invitation. Raison %1$s</string>
-    <string name="notice_power_level_diff">%1$s de %2$s à %3$s</string>
-    <string name="notice_power_level_changed">%1$s a modifié le niveau de pouvoir de %2$s.</string>
-    <string name="notice_power_level_changed_by_you">Vous avez modifié le niveau de pouvoir de %1$s.</string>
-    <string name="power_level_custom_no_value">Personnalisé</string>
-    <string name="power_level_custom">Personnalisé (%1$d)</string>
-    <string name="power_level_default">Défaut</string>
-    <string name="power_level_moderator">Modérateur</string>
-    <string name="power_level_admin">Admin</string>
-    <string name="notice_widget_modified_by_you">Vous avez modifié le widget %1$s</string>
-    <string name="notice_widget_modified">%1$s a modifié le widget %2$s</string>
-    <string name="notice_widget_removed_by_you">Vous avez supprimé le widget %1$s</string>
-    <string name="notice_widget_removed">%1$s a supprimé le widget %2$s</string>
-    <string name="notice_widget_added_by_you">Vous avez ajouté le widget %1$s</string>
-    <string name="notice_widget_added">%1$s a ajouté le widget %2$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Vous avez accepté l’invitation pour %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Vous avez révoqué l\'invitation pour %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s a révoqué l\'invitation pour %2$s</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Vous avez rendu les futurs messages visible pour %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s a rendu les futurs messages visible pour %2$s</string>
-    <string name="notice_room_avatar_removed_by_you">Vous avez supprimé l\'avatar du salon</string>
-    <string name="notice_room_avatar_removed">%1$s a supprimé l\'avatar du salon</string>
-    <string name="notice_room_name_removed_by_you">Vous avez supprimé le nom du salon</string>
-    <string name="notice_requested_voip_conference_by_you">Vous avez demandé une téléconférence VoIP</string>
-    <string name="notice_end_to_end_by_you">Vous avez activé le chiffrement de bout en bout (%1$s)</string>
-    <string name="notice_made_future_room_visibility_by_you">Vous avez rendu l’historique futur du salon visible pour %1$s</string>
-    <string name="notice_ended_call_by_you">Vous avez raccroché.</string>
-    <string name="notice_answered_call_by_you">Vous avez répondu à l’appel.</string>
-    <string name="notice_call_candidates_by_you">Vous avez envoyé les données pour configurer l\'appel.</string>
-    <string name="notice_call_candidates">%s a envoyé les données pour configurer l\'appel.</string>
-    <string name="notice_placed_voice_call_by_you">Vous avez passé un appel vocal.</string>
-    <string name="notice_placed_video_call_by_you">Vous avez passé un appel vidéo.</string>
-    <string name="notice_room_name_changed_by_you">Vous avez changé le nom du salon en : %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Vous avez modifié l\'avatar du salon</string>
-    <string name="notice_room_avatar_changed">%1$s a modifié l\'avatar du salon</string>
-    <string name="notice_display_name_changed_from_by_you">Vous avez modifié votre nom affiché de %1$s en %2$s</string>
-    <string name="notice_display_name_set_by_you">Vous avez modifié votre nom affiché en %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Vous avez changé votre avatar</string>
-    <string name="notice_room_withdraw_by_you">Vous avez annulé l’invitation de %1$s</string>
-    <string name="notice_room_topic_changed_by_you">Vous avez changé le sujet en : %1$s</string>
-    <string name="notice_display_name_removed_by_you">Vous avez supprimé votre nom affiché (précédemment %1$s)</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Vous avez révoqué l’invitation pour %1$s à rejoindre le salon</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Vous avez invité %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s a invité %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon</string>
-    <string name="notice_profile_change_redacted_by_you">Vous avez mis à jour votre profile %1$s</string>
-    <string name="notice_room_topic_removed_by_you">Vous avez supprimé le sujet du salon</string>
-    <string name="notice_room_ban_with_reason_by_you">Vous avez exclus %1$s. Raison : %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Vous avez révoqué l\'exclusion de %1$s. Raison : %2$s</string>
-    <string name="notice_room_ban_by_you">Vous avez exclus %1$s</string>
-    <string name="notice_room_unban_by_you">Vous avez révoqué l\'exclusion de %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Vous avez expulsé %1$s. Raison : %2$s</string>
-    <string name="room_displayname_empty_room_was">Salon vide (était %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s et %4$d autre</item>
-        <item quantity="other">%1$s, %2$s, %3$s et %4$d autres</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s et %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s et %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Tous les serveurs sont interdits de participer ! Ce salon ne peut plus être utilisé.</string>
-    <string name="notice_room_server_acl_updated_no_change">Aucun changement.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Les serveurs correspondant à des IP littérales sont maintenant interdits.</string>
-    <string name="notice_room_server_acl_set_banned">• Les serveurs correspondant à %s sont interdits.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Les serveurs correspondants à des IP littérales sont interdites.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont autorisés.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont maintenant autorisées.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Les serveurs correspondant à %s sont supprimés de la liste autorisée.</string>
-    <string name="notice_room_server_acl_updated_allowed">• les serveur correspondant à %s sont maintenant autorisés.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Les serveurs correspondant à %s étaient supprimés de la liste des interdits.</string>
-    <string name="notice_room_server_acl_updated_banned">• Les serveurs correspondant à %s sont maintenant interdits.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Vous avez changé les droits ACL du serveur pour ce salon.</string>
-    <string name="notice_room_server_acl_updated_title">%s a changé les droits ACL du serveur pour ce salon.</string>
-    <string name="notice_room_server_acl_set_allowed">• Les serveurs correspondant à %s sont autorisés.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Vous avez paramétré les ACL pour ce salon.</string>
-    <string name="notice_room_server_acl_set_title">%s paramètre les autorisations étendues (ACL) du serveur pour ce salon.</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-gl/strings.xml b/matrix-sdk-android/src/main/res/values-gl/strings.xml
deleted file mode 100644
index 61c42229cc..0000000000
--- a/matrix-sdk-android/src/main/res/values-gl/strings.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="medium_email">Enderezo de correo</string>
-    <string name="message_failed_to_upload">Fallo ao subir a páxina</string>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s enviou unha imaxe.</string>
-    <string name="summary_user_sent_sticker">%1$s enviou unha icona.</string>
-    <string name="notice_room_invite_no_invitee">Convite de %s</string>
-    <string name="notice_room_invite">%1$s convidou a %2$s</string>
-    <string name="notice_room_invite_you">%1$s convidouno</string>
-    <string name="notice_room_join">%1$s entrou</string>
-    <string name="notice_room_leave">%1$s saíu</string>
-    <string name="notice_room_reject">%1$s rexeitou o convite</string>
-    <string name="notice_room_kick">%1$s expulsou a %2$s</string>
-    <string name="notice_room_unban">%1$s desbloqueou a %2$s</string>
-    <string name="notice_room_ban">%1$s bloqueou a %2$s</string>
-    <string name="notice_room_withdraw">%1$s cancelou o convite de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s cambiou o seu avatar</string>
-    <string name="notice_display_name_set">%1$s cambiou o seu nome a %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s cambiou o seu nome de %2$s a %3$s</string>
-    <string name="notice_display_name_removed">%1$s borrou o seu nome público (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s cambiou o tema desta sala para: %2$s</string>
-    <string name="notice_room_name_changed">%1$s cambiou o nome desta sala para: %2$s</string>
-    <string name="notice_placed_video_call">%s iniciou unha chamada de vídeo.</string>
-    <string name="notice_placed_voice_call">%s iniciou unha chamada de voz.</string>
-    <string name="notice_answered_call">%s respondeu á chamada.</string>
-    <string name="notice_ended_call">%s terminou a chamada.</string>
-    <string name="notice_made_future_room_visibility">%1$s fixo visible os próximos históricos para %2$s</string>
-    <string name="notice_room_visibility_invited">toda a xente que integran esta sala, desde o momento en que foron convidados.</string>
-    <string name="notice_room_visibility_joined">todas a xente da sala, desde o momento en que entraron.</string>
-    <string name="notice_room_visibility_shared">todas os membros da sala.</string>
-    <string name="notice_room_visibility_world_readable">todos.</string>
-    <string name="notice_room_visibility_unknown">descoñecido (%s).</string>
-    <string name="notice_end_to_end">%1$s activou a criptografía par-a-par (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s solicitou unha conferencia VoIP</string>
-    <string name="notice_voip_started">A conferencia VoIP comenzou</string>
-    <string name="notice_voip_finished">A conferencia VoIP terminou</string>
-    <string name="notice_avatar_changed_too">(o avatar tamén foi cambiado)</string>
-    <string name="notice_room_name_removed">%1$s borrou o nome da sala</string>
-    <string name="notice_room_topic_removed">%1$s removeu o tema da sala</string>
-    <string name="notice_profile_change_redacted">%1$s actualizou o seu perfil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s envioulle un convite a %2$s para que entre na sala</string>
-    <string name="notice_room_third_party_registered_invite">%1$s aceptou o convite para %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Imposíbel descifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">O dispositivo do que envía non enviou as chaves desta mensaxe.</string>
-    <string name="could_not_redact">Non se puido redactar</string>
-    <string name="unable_to_send_message">Non foi posíbel enviar a mensaxe</string>
-    <string name="network_error">Erro da conexión</string>
-    <string name="matrix_error">Erro de Matrix</string>
-    <string name="room_error_join_failed_empty_room">Aínda non é posíbel volver a entrar nunha sala baleira.</string>
-    <string name="encrypted_message">Mensaxe cifrada</string>
-    <string name="medium_phone_number">Número de teléfono</string>
-    <string name="room_displayname_two_members">%1$s e %2$s</string>
-    <string name="notice_placed_voice_call_by_you">Fixeches unha chamada de audio.</string>
-    <string name="notice_placed_video_call_by_you">Fixeches unha chamada de vídeo.</string>
-    <string name="notice_room_name_changed_by_you">Cambiaches o nome da sala a: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Cambiaches o avatar da sala</string>
-    <string name="notice_room_avatar_changed">%1$s cambiou o avatar da sala</string>
-    <string name="notice_room_topic_changed_by_you">Cambiaches o asunto a: %1$s</string>
-    <string name="notice_display_name_removed_by_you">Eliminaches o teu nome público (era %1$s)</string>
-    <string name="notice_display_name_changed_from_by_you">Cambiaches o teu nome público de %1$s a %2$s</string>
-    <string name="notice_display_name_set_by_you">Estableceches o nome público a %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Cambiaches o teu avatar</string>
-    <string name="notice_room_withdraw_by_you">Retirácheslle o convite a %1$s</string>
-    <string name="notice_room_ban_by_you">Vetaches a %1$s</string>
-    <string name="notice_room_unban_by_you">Readmitiches a %1$s</string>
-    <string name="notice_room_kick_by_you">Expulsaches a %1$s</string>
-    <string name="notice_room_reject_by_you">Rexeitaches o convite</string>
-    <string name="notice_direct_room_leave_by_you">Deixaches a sala</string>
-    <string name="notice_direct_room_leave">%1$s deixou a sala</string>
-    <string name="notice_room_leave_by_you">Saíches da sala</string>
-    <string name="notice_direct_room_join_by_you">Unícheste</string>
-    <string name="notice_direct_room_join">%1$s iniuse</string>
-    <string name="notice_room_join_by_you">Unícheste a sala</string>
-    <string name="notice_room_invite_by_you">Convidaches a %1$s</string>
-    <string name="notice_direct_room_created_by_you">Creaches a conversa</string>
-    <string name="notice_direct_room_created">%1$s creou a conversa</string>
-    <string name="notice_room_created_by_you">Creaches a sala</string>
-    <string name="notice_room_created">%1$s creou a sala</string>
-    <string name="notice_room_invite_no_invitee_by_you">O teu convite</string>
-    <string name="summary_you_sent_sticker">Enviaches un adhesivo.</string>
-    <string name="summary_you_sent_image">Enviaches unha imaxe.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servidores con literais IP están vetados.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servidores con IP literais están permitidos.</string>
-    <string name="notice_room_server_acl_set_banned">• Servidores con %s están vetados.</string>
-    <string name="notice_room_server_acl_set_allowed">• Servidores con %s están permitidos.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Estableceches os ACLs do servidor para esta sala.</string>
-    <string name="notice_room_server_acl_set_title">%s estableceu os ACLs do servidor para esta sala.</string>
-    <string name="notice_direct_room_update">%s actualizou aquí.</string>
-    <string name="notice_direct_room_update_by_you">Actualizaches aquí.</string>
-    <string name="notice_room_update_by_you">Actualizaches esta sala.</string>
-    <string name="notice_room_update">%s actualizou esta sala.</string>
-    <string name="notice_end_to_end_by_you">Activaches o cifrado extremo-a-extremo (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Fixeches visibles as mensaxes futuras para %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s fixo visibles as mensaxes futuras para %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Fixeches visible no futuro o historial da sala para %1$s</string>
-    <string name="notice_ended_call_by_you">Remataches a chamada.</string>
-    <string name="notice_answered_call_by_you">Respondeches á chamada.</string>
-    <string name="notice_call_candidates_by_you">Enviaches datos para configurar a chamada.</string>
-    <string name="notice_call_candidates">%s enviou datos para configurar a chamada.</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Retiraches o convite de %1$s. Razón: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s retirou o convite de %2$s. Razón: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Aceptaches o convite para %1$s. Razón: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s aceptou o convite para %2$s. Razón: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Revogaches o convite para que %1$s se una á sala. Razón: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revogou o convite para que %2$s se una á sala. Razón: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Convidaches a %1$s para que se una á sala. Razón: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s convidou a %2$s para que se una á sala. Razón: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Vetaches a %1$s. Razón: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s vetou a %2$s. Razón: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Retirácheslle o veto a %1$s. Razón: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s retirou o veto a %2$s. Razón: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Expulsaches a %1$s. Razón: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s expulsou a %2$s. Razón: %3$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Rexeitaches o convite. Razón: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s rexeitou o convite. Razón: %2$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Saíches. Razón: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s saíu. Razón: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Saíches da sala. Razón: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s deixou a sala. Razón: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Unícheste. Razón: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s uníuse. Razón: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Unícheste á sala. Razón: %1$s</string>
-    <string name="notice_room_join_with_reason">%1$s uniuse á sala. Razón: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s convidoute. Razón: %2$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Convidaches a %1$s. Razón: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s convidou a %2$s. Razón: %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">O teu convite. Razón: %1$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Razón: %2$s</string>
-    <string name="clear_timeline_send_queue">Baleirar cola de envíos</string>
-    <string name="event_status_sending_message">Enviando mensaxe…</string>
-    <string name="initial_sync_start_importing_account_data">Sincr. inicial:
-\nImportando datos da conta</string>
-    <string name="initial_sync_start_importing_account_groups">Sincr. inicial:
-\nImportando comunidades</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Sincr. inicial:
-\nImportando salas das que saíches</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Sincr. inicial:
-\nImportando convites a salas</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Sincr. inicial:
-\nImportando Salas</string>
-    <string name="initial_sync_start_importing_account_rooms">Sincr. inicial:
-\nImportando salas</string>
-    <string name="initial_sync_start_importing_account_crypto">Sincr. inicial:
-\nImportando cifrado</string>
-    <string name="initial_sync_start_importing_account">Sincr. inicial:
-\nImportando conta…</string>
-    <string name="room_displayname_empty_room_was">Sala baleira (estaba %s)</string>
-    <string name="room_displayname_empty_room">Sala baleira</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s e 1 máis</item>
-        <item quantity="other">%1$s e %2$d outras</item>
-    </plurals>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s e %4$d máis</item>
-        <item quantity="other">%1$s, %2$s, %3$s e %4$d outras</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s e %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s e %3$s</string>
-    <string name="room_displayname_room_invite">Convite de sala</string>
-    <string name="room_displayname_invite_from">Convite desde %s</string>
-    <string name="notice_power_level_diff">%1$s de %2$s a %3$s</string>
-    <string name="notice_power_level_changed">%1$s cambiou de categoría a %2$s.</string>
-    <string name="notice_power_level_changed_by_you">Cambiaches a categoría de %1$s.</string>
-    <string name="power_level_custom_no_value">Personalizado</string>
-    <string name="power_level_custom">Personalizado (%1$d)</string>
-    <string name="power_level_default">Por defecto</string>
-    <string name="power_level_moderator">Moderadora</string>
-    <string name="power_level_admin">Admin</string>
-    <string name="notice_widget_jitsi_modified_by_you">Modificaches a conferencia de vídeo</string>
-    <string name="notice_widget_jitsi_modified">Conferencia de vídeo modificada por %1$s</string>
-    <string name="notice_widget_jitsi_removed_by_you">Finalizaches a conferencia de vídeo</string>
-    <string name="notice_widget_jitsi_removed">Conferencia de vídeo finalizada por %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">Iniciaches unha conferencia de vídeo</string>
-    <string name="notice_widget_jitsi_added">Conferencia de vídeo iniciada por %1$s</string>
-    <string name="notice_widget_modified_by_you">Modificaches o widget %1$s</string>
-    <string name="notice_widget_modified">%1$s modificou o widget %2$s</string>
-    <string name="notice_widget_removed_by_you">Eliminaches o widget %1$s</string>
-    <string name="notice_widget_removed">%1$s eliminou o widget %2$s</string>
-    <string name="notice_widget_added_by_you">Engadiches o widget %1$s</string>
-    <string name="notice_widget_added">%1$s engadiu o widget %2$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Aceptaches o convite para %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Revogaches o convite para %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s revogou o convite para %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Revogaches o convite para que %1$s se una á sala</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s revogou o convite para que %2$s se una á sala</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Convidaches a %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s convidou a %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Enviácheslle un convite a %1$s para unirse á sala</string>
-    <string name="notice_profile_change_redacted_by_you">Actualizaches o teu perfil %1$s</string>
-    <string name="notice_event_redacted_by_with_reason">Mensaxe eliminada por %1$s [razón: %2$s]</string>
-    <string name="notice_event_redacted_with_reason">Mensaxe eliminada [razón: %1$s]</string>
-    <string name="notice_event_redacted_by">Mensaxe eliminada por %1$s</string>
-    <string name="notice_event_redacted">Mensaxe eliminada</string>
-    <string name="notice_room_avatar_removed_by_you">Eliminaches o avatar da sala</string>
-    <string name="notice_room_avatar_removed">%1$s eliminou o avatar da sala</string>
-    <string name="notice_room_topic_removed_by_you">Eliminaches o asunto da sala</string>
-    <string name="notice_room_name_removed_by_you">Eliminaches o nome da sala</string>
-    <string name="notice_requested_voip_conference_by_you">Solicitaches unha conferencia VoIP</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Vetouse a participación de tódolos servidores! Xa non se pode utilizar esta sala.</string>
-    <string name="notice_room_server_acl_updated_no_change">Sen cambio.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Os servidores con literais IP concordantes están vetados.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Os servidores cos literais IP concordantes están permitidos.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Servidores con %s foron eliminados da lista de permitidos.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Os servidores con %s agora están permitidos.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Os servidores con %s xa non están la lista de vetados.</string>
-    <string name="notice_room_server_acl_updated_banned">• Os servidores con %s están agora vetados.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Cambiaches os ACLs do servidor para esta sala.</string>
-    <string name="notice_room_server_acl_updated_title">%s cambiou os ACLs do servidor para esta sala.</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s engadiu %2$s como enderezo desta sala.</item>
-        <item quantity="other">%1$s engadiu %2$s como enderezos desta sala.</item>
-    </plurals>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Activaches o cifrado extremo-a-extremo (algoritmo non recoñecido %1$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s activou o cifrado extremo-a-extrem (algoritmo non recoñecible %2$s).</string>
-    <string name="notice_end_to_end_ok_by_you">Activaches o cifrado extremo-a-extremo.</string>
-    <string name="notice_end_to_end_ok">%1$s activou o cifrado extremo-a-extremo.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Non permites que as convidadas se unan á sala.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s non permite que as usuarias se unan á sala.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Non permites que as convidadas se unan á sala.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s non permite que as convidadas se unan á sala.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Permitiches que as convidadas se unan aquí.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s permitiu que as convidadas se unan aquí.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Permitiches que as convidadas se unan á sala.</string>
-    <string name="notice_room_guest_access_can_join">%1$s permite que as convidadas se unan á sala.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Cambiaches os enderezos desta sala.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s cambiou os enderezos desta sala.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Cambiaches os enderezos principal e alternativo para esta sala.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s cambiou os enderezos alternativo e principal para esta sala.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Cambiaches os enderezos alternativos para esta sala.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s cambiou os enderezos alternativos para esta sala.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Eliminaches o enderezo alternativo %1$s para esta sala.</item>
-        <item quantity="other">Eliminaches os enderezos alternativos %1$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s eliminou o enderezo alternativo %2$s para esta sala.</item>
-        <item quantity="other">%1$s eliminou os enderezos alternativos %2$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Engadiches o enderezo alternativo %1$s para esta sala.</item>
-        <item quantity="other">Engadiches os enderezos alternativos %1$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s engadiu o enderezo alternativo %2$s para esta sala.</item>
-        <item quantity="other">%1$s engadiu os enderezos alternativos %2$s para esta sala.</item>
-    </plurals>
-    <string name="notice_room_canonical_alias_unset_by_you">Eliminaches o enderezo principal desta sala.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s eliminou o enderezo principal desta sala.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Estableceches %1$s como enderezo principal desta sala.</string>
-    <string name="notice_room_canonical_alias_set">%1$s estableceu %2$s como enderezo principal desta sala.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Engadiches %1$s e eliminaches %2$s como enderezos desta sala.</string>
-    <string name="notice_room_aliases_added_and_removed">%1$s engadiu %2$s e eliminou %3$s como enderezos desta sala.</string>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Eliminaches %1$s como enderezo desta sala.</item>
-        <item quantity="other">Eliminaches %1$s como enderezos desta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s eliminou %2$s como enderezo desta sala.</item>
-        <item quantity="other">%1$s eliminou %2$s como enderezos desta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Engadiches %1$s como enderezo para esta sala.</item>
-        <item quantity="other">Engadiches %1$s como enderezos para esta sala.</item>
-    </plurals>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-he/strings.xml b/matrix-sdk-android/src/main/res/values-he/strings.xml
deleted file mode 100644
index a6b3daec93..0000000000
--- a/matrix-sdk-android/src/main/res/values-he/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-hu/strings.xml b/matrix-sdk-android/src/main/res/values-hu/strings.xml
deleted file mode 100644
index 62e0c5f90c..0000000000
--- a/matrix-sdk-android/src/main/res/values-hu/strings.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s küldött egy képet.</string>
-    <string name="notice_room_invite_no_invitee">%s meghívója</string>
-    <string name="notice_room_invite">%1$s meghívta: %2$s</string>
-    <string name="notice_room_invite_you">%1$s meghívott</string>
-    <string name="notice_room_join">%1$s belépett a szobába</string>
-    <string name="notice_room_leave">%1$s kilépett a szobából</string>
-    <string name="notice_room_reject">%1$s elutasította a meghívást</string>
-    <string name="notice_room_kick">%1$s kidobta: %2$s</string>
-    <string name="notice_room_unban">%1$s feloldotta %2$s tiltását</string>
-    <string name="notice_room_ban">%1$s kitiltotta: %2$s</string>
-    <string name="notice_room_withdraw">%1$s visszavonta %2$s meghívását</string>
-    <string name="notice_avatar_url_changed">%1$s megváltoztatta a profilképét</string>
-    <string name="notice_display_name_set">%1$s megváltoztatta a megjelenő nevét erre: %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s megváltoztatta a megjelenítendő nevét erről: %2$s, erre: %3$s</string>
-    <string name="notice_display_name_removed">%1$s eltávolította a megjelenítendő nevét (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s megváltoztatta a témát erre: %2$s</string>
-    <string name="notice_room_name_changed">%1$s megváltoztatta a szoba nevét erre: %2$s</string>
-    <string name="notice_placed_video_call">%s videóhívást kezdeményezett.</string>
-    <string name="notice_placed_voice_call">%s hanghívást indított.</string>
-    <string name="notice_answered_call">%s fogadta a hívást.</string>
-    <string name="notice_ended_call">%s befejezte a hívást.</string>
-    <string name="notice_made_future_room_visibility">%1$s láthatóvá tette a jövőbeli előzményeket %2$s</string>
-    <string name="notice_room_visibility_invited">a szoba összes tagja számára, a meghívásuk időpontjától kezdve.</string>
-    <string name="notice_room_visibility_joined">a szoba összes tagja számára, a csatlakozásuk időpontjától kezdve.</string>
-    <string name="notice_room_visibility_shared">az összes szobatag számára.</string>
-    <string name="notice_room_visibility_world_readable">bárki.</string>
-    <string name="notice_room_visibility_unknown">ismeretlen (%s).</string>
-    <string name="notice_end_to_end">%1$s bekapcsolta a végpontok közötti titkosítást (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s hanghívás konferenciát kérelmezett</string>
-    <string name="notice_voip_started">Hanghívás konferencia elindult</string>
-    <string name="notice_voip_finished">Hanghívás konferencia befejeződött</string>
-    <string name="notice_avatar_changed_too">(a profilkép is megváltozott)</string>
-    <string name="notice_room_name_removed">%1$s eltávolította a szoba nevét</string>
-    <string name="notice_room_topic_removed">%1$s eltávolította a szoba témáját</string>
-    <string name="notice_profile_change_redacted">%1$s megváltoztatta a(z) %2$s profilját</string>
-    <string name="notice_room_third_party_invite">%1$s meghívót küldött %2$s számára, hogy csatlakozzon a szobához</string>
-    <string name="notice_room_third_party_registered_invite">%1$s elfogadta a meghívót ebbe: %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Visszafejtés sikertelen: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">A küldő eszköze nem küldte el a kulcsokat ehhez az üzenethez.</string>
-    <string name="could_not_redact">Kitakarás sikertelen</string>
-    <string name="unable_to_send_message">Üzenet küldése sikertelen</string>
-    <string name="message_failed_to_upload">Kép feltöltése sikertelen</string>
-    <string name="network_error">Hálózati hiba</string>
-    <string name="matrix_error">Matrix hiba</string>
-    <string name="room_error_join_failed_empty_room">Jelenleg nem lehetséges újracsatlakozni egy üres szobához.</string>
-    <string name="encrypted_message">Titkosított üzenet</string>
-    <string name="medium_email">E-mail cím</string>
-    <string name="medium_phone_number">Telefonszám</string>
-    <string name="summary_user_sent_sticker">%1$s küldött egy matricát.</string>
-    <string name="room_displayname_invite_from">Meghívó tőle: %s</string>
-    <string name="room_displayname_room_invite">Meghívó egy szobába</string>
-    <string name="room_displayname_two_members">%1$s és %2$s</string>
-    <string name="room_displayname_empty_room">Üres szoba</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s és 1 másik</item>
-        <item quantity="other">%1$s és %2$d másik</item>
-    </plurals>
-    <string name="notice_event_redacted">Üzenet eltávolítva</string>
-    <string name="notice_event_redacted_by">Üzenetet eltávolította: %1$s</string>
-    <string name="notice_event_redacted_with_reason">Üzenet eltávolítva [ok: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Üzenetet eltávolította: %1$s [ok: %2$s]</string>
-    <string name="initial_sync_start_importing_account">Induló szinkronizáció:
-\nFiók betöltése…</string>
-    <string name="initial_sync_start_importing_account_crypto">Induló szinkronizáció:
-\nTitkosítás betöltése</string>
-    <string name="initial_sync_start_importing_account_rooms">Induló szinkronizáció:
-\nSzobák betöltése</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Induló szinkronizáció:
-\nCsatlakozott szobák betöltése</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Induló szinkronizáció:
-\nMeghívott szobák betöltése</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Induló szinkronizáció:
-\nElhagyott szobák betöltése</string>
-    <string name="initial_sync_start_importing_account_groups">Induló szinkronizáció:
-\nKözösségek betöltése</string>
-    <string name="initial_sync_start_importing_account_data">Induló szinkronizáció:
-\nFiók adatok betöltése</string>
-    <string name="notice_room_update">%s frissítette ezt a szobát.</string>
-    <string name="event_status_sending_message">Üzenet küldése…</string>
-    <string name="clear_timeline_send_queue">Küldő sor ürítése</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s visszavonta %2$s meghívását, hogy csatlakozzon a szobához</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s meghívója. Ok: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s meghívta őt: %2$s. Ok: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s meghívott. Ok: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s belépett a szobába. Mert: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s kilépett a szobából. Ok: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s visszautasította a meghívót. Ok: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s kirúgta őt: %2$s. Ok: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s visszaengedte őt: %2$s. Ok: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s kitiltotta őt: %2$s. Ok: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s meghívót küldött neki: %2$s, hogy lépjen be a szobába. Ok: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s visszavonta %2$s meghívóját a szobába való belépéshez. Ok: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s elfogadta a meghívót ide: %2$s. Ok: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s visszavonta %2$s meghívóját. Ok: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s ezt a címet adta a szobához: %2$s.</item>
-        <item quantity="other">%1$s ezeket a címeket adta a szobához: %2$s.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s ezt a címet törölte a szobából: %3$s.</item>
-        <item quantity="other">%1$s ezeket a címeket törölte a szobából: %3$s.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s a szobához adta ezeket:%2$s és törölte ezeket: %3$s.</string>
-    <string name="notice_room_canonical_alias_set">%1$s a szoba elsődleges címét erre állította be: %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s eltávolította a szoba elsődleges címét.</string>
-    <string name="notice_room_guest_access_can_join">%1$s megengedte a vendégeknek, hogy belépjenek ebbe a szobába.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s megtiltotta a vendégeknek, hogy belépjenek ebbe a szobába.</string>
-    <string name="notice_end_to_end_ok">%1$s bekapcsolta a végpontok közötti titkosítást.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus %2$s).</string>
-    <string name="notice_room_created">%1$s szobát készített</string>
-    <string name="notice_answered_call_by_you">Fogadtad a hívást.</string>
-    <string name="notice_ended_call_by_you">Befejezted a hívást.</string>
-    <string name="notice_call_candidates_by_you">Hívási adatokat küldtél.</string>
-    <string name="notice_call_candidates">%s hívási adatokat küldött.</string>
-    <string name="notice_placed_voice_call_by_you">Hanghívást indítottál.</string>
-    <string name="notice_placed_video_call_by_you">Videóhívást indítottál.</string>
-    <string name="notice_room_avatar_changed_by_you">Megváltoztattad a szoba képét</string>
-    <string name="notice_room_avatar_changed">%1$s megváltoztatta a szoba képét</string>
-    <string name="notice_room_topic_changed_by_you">Megváltoztattad a témát erre: %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Megváltoztattad a profilképed</string>
-    <string name="notice_room_withdraw_by_you">Visszavontad %1$s meghívóját</string>
-    <string name="notice_room_ban_by_you">Kitiltottad %1$s felhasználót</string>
-    <string name="notice_room_unban_by_you">Visszaengedted %1$s felhasználót</string>
-    <string name="notice_room_kick_by_you">Kirúgtad %1$s felhasználót</string>
-    <string name="notice_room_reject_by_you">Visszautasítottad a meghívót</string>
-    <string name="notice_direct_room_leave_by_you">Elhagytad a szobát</string>
-    <string name="notice_direct_room_leave">%1$s elhagyta a szobát</string>
-    <string name="notice_room_leave_by_you">Elhagytad a szobát</string>
-    <string name="notice_direct_room_join_by_you">Csatlakoztál</string>
-    <string name="notice_direct_room_join">%1$s csatlakozott</string>
-    <string name="notice_room_join_by_you">Beléptél a szobába</string>
-    <string name="notice_room_invite_by_you">Meghívtad: %1$s</string>
-    <string name="notice_direct_room_created_by_you">Létrehoztad a beszélgetést</string>
-    <string name="notice_direct_room_created">%1$s létrehozta a beszélgetést</string>
-    <string name="notice_room_created_by_you">Létrehoztad a szobát</string>
-    <string name="summary_you_sent_sticker">Matricát küldtél.</string>
-    <string name="summary_you_sent_image">Képet küldtél.</string>
-    <string name="power_level_custom_no_value">Saját</string>
-    <string name="power_level_custom">Saját (%1$d)</string>
-    <string name="power_level_default">Alapértelmezett</string>
-    <string name="power_level_moderator">Moderátor</string>
-    <string name="power_level_admin">Admin</string>
-    <string name="notice_widget_modified_by_you">Ön megváltoztatta a %1$s kisalkalmazást</string>
-    <string name="notice_widget_modified">%1$s megváltoztatta a %2$s kisalkalmazást</string>
-    <string name="notice_widget_removed_by_you">Ön eltávolította a %1$s kisalkalmazást</string>
-    <string name="notice_widget_removed">%1$s eltávolította a %2$s kisalkalmazást</string>
-    <string name="notice_widget_added_by_you">Ön hozzáadott egy %1$s kisalkalmazást</string>
-    <string name="notice_widget_added">%1$s hozzáadott egy %2$s kisalkalmazást</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Ön elfogadta a meghívót ehhez: %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Ön visszavonta %1$s felhasználó meghívóját</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s visszavonta %2$s felhasználó meghívóját</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Ön visszavonta %1$s felhasználó meghívóját</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Ön meghívta %1$s felhasználót</string>
-    <string name="notice_direct_room_third_party_invite">%1$s meghívta %2$s felhasználót</string>
-    <string name="notice_room_third_party_invite_by_you">Ön meghívót küldött %1$s felhasználónak, hogy csatlakozzon a szobához</string>
-    <string name="notice_profile_change_redacted_by_you">Ön frissítette a saját profilját %1$s</string>
-    <string name="notice_room_avatar_removed_by_you">Ön eltávolította a szoba képét</string>
-    <string name="notice_room_avatar_removed">%1$s eltávolította a szoba képét</string>
-    <string name="notice_room_topic_removed_by_you">Ön eltávolította a szoba témáját</string>
-    <string name="notice_room_name_removed_by_you">Ön eltávolította a szoba nevét</string>
-    <string name="notice_requested_voip_conference_by_you">Ön videókonferencia kezdeményezését kérte</string>
-    <string name="notice_direct_room_update_by_you">Ön frissítette ezt a szobát.</string>
-    <string name="notice_direct_room_update">%s frissítette a szobát.</string>
-    <string name="notice_room_update_by_you">Ön frissítette ezt a szobát.</string>
-    <string name="notice_end_to_end_by_you">Ön bekapcsolta a végpontok közötti titkosítást (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Ön elérhetővé tette a jövőbeni üzeneteket %1$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Ön elérhetővé tette a jövőbeni üzeneteket %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s elérhetővé tette a jövőbeni üzeneteket %2$s</string>
-    <string name="notice_room_name_changed_by_you">Ön megváltoztatta a szoba nevét erre: %1$s</string>
-    <string name="notice_display_name_removed_by_you">Ön eltávolította a saját megjelenített nevét (%1$s volt)</string>
-    <string name="notice_display_name_changed_from_by_you">Ön megváltoztatta a saját megjelenítési nevét erről: %1$s, erre: %2$s</string>
-    <string name="notice_display_name_set_by_you">Ön beállította a saját megjelenítési nevét erre: %1$s</string>
-    <string name="notice_room_invite_no_invitee_by_you">Az ön meghívása</string>
-    <string name="notice_power_level_diff">%1$s felhasználó hozzáférési szintjét erről: %2$s, erre: %3$s</string>
-    <string name="notice_power_level_changed">%1$s megváltoztatta %2$s.</string>
-    <string name="notice_power_level_changed_by_you">Megváltoztattad %1$s hozzáférési szintjét.</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Minden szerver ki lett tiltva a szobából! Ez a szoba többé nem használható.</string>
-    <string name="notice_room_server_acl_updated_no_change">Nincs változás.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Most már tiltva vannak az IP címet hosztnévként használó szerverek.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Az IP címet hosztnévként használó szerverek most már engedélyezve vannak.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• El lettek távolítva a tiltólistából az erre illeszkedő szerverek: %s</string>
-    <string name="notice_room_server_acl_updated_allowed">• Most már engedélyezve vannak az erre illeszkedő szerverek: %s</string>
-    <string name="notice_room_server_acl_updated_was_banned">• El lettek távolítva a tiltólistából az erre illeszkedő szerverek: %s</string>
-    <string name="notice_room_server_acl_updated_banned">• Most már tiltva vannak az erre a kifejezésre illeszkedő szerverek: %s</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Megváltoztattad a szerver ACL-eket ehhez a szobához.</string>
-    <string name="notice_room_server_acl_updated_title">%s megváltoztatta a szerver ACL-eket ehhez a szobához.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• IP címet hosztnévként használó szerverek tiltva vannak.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• IP címet hosztnévként használó szerverek engedélyezve vannak.</string>
-    <string name="notice_room_server_acl_set_allowed">• Engedélyezve vannak azok a szerverek, amik illeszkednek erre: %s</string>
-    <string name="notice_room_server_acl_set_banned">• Tiltva vannak azok a szerverek, amik illeszkednek erre: %s</string>
-    <string name="notice_room_server_acl_set_title_by_you">Beállítottad a szerver ACL-eket ehhez a szobához.</string>
-    <string name="notice_room_server_acl_set_title">%s beállította a szerver ACL-eket ehhez a szobához.</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-id/strings.xml b/matrix-sdk-android/src/main/res/values-id/strings.xml
deleted file mode 100644
index 157b23d401..0000000000
--- a/matrix-sdk-android/src/main/res/values-id/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="room_displayname_invite_from">Undang dari %s</string>
-    <string name="room_displayname_room_invite">Undangan Ruang</string>
-    <string name="room_displayname_two_members">%1$s dan %2$s</string>
-
-    <string name="room_displayname_empty_room">Ruang kosong</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="other">%1$s dan %2$d yang lain</item>
-    </plurals>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-in/strings.xml b/matrix-sdk-android/src/main/res/values-in/strings.xml
deleted file mode 100644
index 157b23d401..0000000000
--- a/matrix-sdk-android/src/main/res/values-in/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="room_displayname_invite_from">Undang dari %s</string>
-    <string name="room_displayname_room_invite">Undangan Ruang</string>
-    <string name="room_displayname_two_members">%1$s dan %2$s</string>
-
-    <string name="room_displayname_empty_room">Ruang kosong</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="other">%1$s dan %2$d yang lain</item>
-    </plurals>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-is/strings.xml b/matrix-sdk-android/src/main/res/values-is/strings.xml
deleted file mode 100644
index ecf19edb8a..0000000000
--- a/matrix-sdk-android/src/main/res/values-is/strings.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s sendi mynd.</string>
-    <string name="summary_user_sent_sticker">%1$s sendi límmerki.</string>
-
-    <string name="notice_room_invite_no_invitee">%s sendi boð um þátttöku</string>
-    <string name="notice_room_invite">%1$s bauð %2$s</string>
-    <string name="notice_room_invite_you">%1$s bauð þér</string>
-    <string name="notice_room_join">%1$s gekk í hópinn</string>
-    <string name="notice_room_leave">%1$s hætti</string>
-    <string name="notice_room_reject">%1$s hafnaði boðinu</string>
-    <string name="notice_room_kick">%1$s sparkaði %2$s</string>
-    <string name="notice_room_unban">%1$s afbannaði %2$s</string>
-    <string name="notice_room_ban">%1$s bannaði %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s breyttu auðkennismynd sinni</string>
-    <string name="notice_room_visibility_invited">allir meðlimir spjallrásar, síðan þeim var boðið.</string>
-    <string name="notice_room_visibility_joined">allir meðlimir spjallrásar, síðan þeir skráðu sig.</string>
-    <string name="notice_room_visibility_shared">allir meðlimir spjallrásar.</string>
-    <string name="notice_room_visibility_world_readable">hver sem er.</string>
-    <string name="notice_room_visibility_unknown">óþekktur (%s).</string>
-    <string name="notice_voip_started">VoIP-símafundur hafinn</string>
-    <string name="notice_voip_finished">VoIP-símafundi lokið</string>
-
-    <string name="notice_avatar_changed_too">(einnig var skipt um auðkennismynd)</string>
-    <string name="notice_crypto_unable_to_decrypt">** Mistókst að afkóða: %s **</string>
-
-    <string name="unable_to_send_message">Gat ekki sent skilaboð</string>
-
-    <string name="message_failed_to_upload">Gat ekki sent inn mynd</string>
-
-    <string name="network_error">Villa í netkerfi</string>
-    <string name="matrix_error">Villa í Matrix</string>
-
-    <string name="encrypted_message">Dulrituð skilaboð</string>
-
-    <string name="medium_email">Tölvupóstfang</string>
-    <string name="medium_phone_number">Símanúmer</string>
-
-    <string name="notice_room_withdraw">%1$s tók til baka boð frá %2$s</string>
-    <string name="notice_display_name_set">%1$s setti birtingarnafn sitt sem %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s breytti birtingarnafni sínu úr %2$s í %3$s</string>
-    <string name="notice_display_name_removed">%1$s fjarlægði birtingarnafn sitt (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s breytti umræðuefninu í: %2$s</string>
-    <string name="notice_room_name_changed">%1$s breytti heiti spjallrásarinnar í: %2$s</string>
-    <string name="notice_placed_video_call">%s hringdi myndsamtal.</string>
-    <string name="notice_placed_voice_call">%s hringdi raddsamtal.</string>
-    <string name="notice_answered_call">%s svaraði símtalinu.</string>
-    <string name="notice_ended_call">%s lauk símtalinu.</string>
-    <string name="notice_end_to_end">%1$s kveikti á enda-í-enda dulritun (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s bað um VoIP-símafund</string>
-    <string name="notice_room_name_removed">%1$s fjarlægði heiti spjallrásar</string>
-    <string name="notice_room_topic_removed">%1$s fjarlægði umfjöllunarefni spjallrásar</string>
-    <string name="notice_made_future_room_visibility">%1$s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir %2$s</string>
-    <string name="notice_profile_change_redacted">%1$s uppfærði notandasniðið sitt %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s sendi boð til %2$s um þátttöku í spjallrásinni</string>
-    <string name="notice_room_third_party_registered_invite">%1$s samþykkti boð um að taka þátt í %2$s</string>
-
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Tæki sendandans hefur ekki sent okkur dulritunarlyklana fyrir þessi skilaboð.</string>
-
-    <string name="could_not_redact">Gat ekki ritstýrt</string>
-    <string name="room_error_join_failed_empty_room">Ekki er í augnablikinu hægt að taka aftur þátt í spjallrás sem er tóm.</string>
-
-    <string name="room_displayname_room_invite">Boð á spjallrás</string>
-    <string name="room_displayname_two_members">%1$s og %2$s</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s og 1 annar</item>
-        <item quantity="other">%1$s og %2$d aðrir</item>
-    </plurals>
-
-    <string name="room_displayname_empty_room">Tóm spjallrás</string>
-    <string name="room_displayname_invite_from">Boð frá %s</string>
-
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-it/strings.xml b/matrix-sdk-android/src/main/res/values-it/strings.xml
deleted file mode 100644
index fe846bdb2c..0000000000
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s ha inviato un\'immagine.</string>
-    <string name="notice_room_invite_no_invitee">Invito di %s</string>
-    <string name="notice_room_invite">%1$s ha invitato %2$s</string>
-    <string name="notice_room_invite_you">%1$s ti ha invitato</string>
-    <string name="notice_room_join">%1$s è entrato nella stanza</string>
-    <string name="notice_room_leave">%1$s è uscito dalla stanza</string>
-    <string name="notice_room_reject">%1$s ha rifiutato l\'invito</string>
-    <string name="notice_room_kick">%1$s ha buttato fuori %2$s</string>
-    <string name="notice_room_unban">%1$s ha tolto il bando a %2$s</string>
-    <string name="notice_room_ban">%1$s ha bandito %2$s</string>
-    <string name="notice_room_withdraw">%1$s ha revocato l\'invito per %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s ha modificato il suo avatar</string>
-    <string name="notice_display_name_set">%1$s hanno cambiato il nome visualizzato con %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s ha cambiato il nome visualizzato da %2$s a %3$s</string>
-    <string name="notice_display_name_removed">%1$s ha rimosso il nome visibile (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s ha cambiato l\'argomento con: %2$s</string>
-    <string name="notice_room_name_changed">%1$s ha cambiato il nome della stanza con: %2$s</string>
-    <string name="notice_placed_video_call">%s ha iniziato una chiamata video.</string>
-    <string name="notice_placed_voice_call">%s ha iniziato una chiamata vocale.</string>
-    <string name="notice_answered_call">%s ha risposto alla chiamata.</string>
-    <string name="notice_ended_call">%s ha terminato la chiamata.</string>
-    <string name="notice_made_future_room_visibility">%1$s ha reso la futura cronologia della stanza visibile a %2$s</string>
-    <string name="notice_room_visibility_invited">tutti i membri della stanza, dal momento del loro invito.</string>
-    <string name="notice_room_visibility_joined">tutti i membri della stanza, dal momento in cui sono entrati.</string>
-    <string name="notice_room_visibility_shared">tutti i membri della stanza.</string>
-    <string name="notice_room_visibility_world_readable">chiunque.</string>
-    <string name="notice_room_visibility_unknown">sconosciuto (%s).</string>
-    <string name="notice_end_to_end">%1$s ha attivato la crittografia end-to-end (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s ha richiesto una conferenza VoIP</string>
-    <string name="notice_voip_started">Conferenza VoIP iniziata</string>
-    <string name="notice_voip_finished">Conferenza VoIP terminata</string>
-    <string name="notice_avatar_changed_too">(anche l\'avatar è cambiato)</string>
-    <string name="notice_room_name_removed">%1$s ha rimosso il nome della stanza</string>
-    <string name="notice_room_topic_removed">%1$s ha rimosso l\'argomento della stanza</string>
-    <string name="notice_profile_change_redacted">%1$s ha aggiornato il profilo %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s ha mandato un invito a %2$s per unirsi alla stanza</string>
-    <string name="notice_room_third_party_registered_invite">%1$s ha accettato l\'invito per %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Impossibile decriptare: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Il dispositivo del mittente non ci ha inviato le chiavi per questo messaggio.</string>
-    <string name="could_not_redact">Impossibile revisionare</string>
-    <string name="unable_to_send_message">Impossibile inviare il messaggio</string>
-    <string name="message_failed_to_upload">Invio dell\'immagine fallito</string>
-    <string name="network_error">Errore di rete</string>
-    <string name="matrix_error">Errore di Matrix</string>
-    <string name="room_error_join_failed_empty_room">Al momento non è possibile rientrare in una stanza vuota.</string>
-    <string name="encrypted_message">Messaggio criptato</string>
-    <string name="medium_email">Indirizzo email</string>
-    <string name="medium_phone_number">Numero di telefono</string>
-    <string name="summary_user_sent_sticker">%1$s ha inviato un adesivo.</string>
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Invito da %s</string>
-    <string name="room_displayname_room_invite">Invito nella stanza</string>
-    <string name="room_displayname_two_members">%1$s e %2$s</string>
-    <string name="room_displayname_empty_room">Stanza vuota</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s e 1 altro</item>
-        <item quantity="other">%1$s e %2$d altri</item>
-    </plurals>
-    <string name="notice_event_redacted">Messaggio rimosso</string>
-    <string name="notice_event_redacted_by">Messaggio rimosso da %1$s</string>
-    <string name="notice_event_redacted_with_reason">Messaggio rimosso [motivo: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Messaggio rimosso da %1$s [motivo: %2$s]</string>
-    <string name="initial_sync_start_importing_account">Sync iniziale:
-\nImportazione account…</string>
-    <string name="initial_sync_start_importing_account_crypto">Sync iniziale:
-\nImportazione cifratura</string>
-    <string name="initial_sync_start_importing_account_rooms">Sync iniziale:
-\nImportazione stanze</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Sync iniziale:
-\nImportazione stanze partecipate</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Sync iniziale:
-\nImportazione stanze invitate</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Sync iniziale:
-\nImportazione stanze lasciate</string>
-    <string name="initial_sync_start_importing_account_groups">Sync iniziale:
-\nImportazione comunità</string>
-    <string name="initial_sync_start_importing_account_data">Sync iniziale:
-\nImportazione dati account</string>
-    <string name="notice_room_update">%s ha aggiornato questa stanza.</string>
-    <string name="event_status_sending_message">Invio messaggio in corso …</string>
-    <string name="clear_timeline_send_queue">Cancella la coda di invio</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s ha revocato l\'invito a %2$s di unirsi alla stanza</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Invito di %1$s. Motivo: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s ha invitato %2$s. Motivo: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s ti ha invitato. Motivo: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s è entrato nella stanza. Motivo: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s è uscito dalla stanza. Motivo: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s ha rifiutato l\'invito. Motivo: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s ha buttato fuori %2$s. Motivo: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s ha riammesso %2$s. Motivo: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s ha bandito %2$s. Motivo: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s ha inviato un invito a %2$s di unirsi alla stanza. Motivo: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s ha revocato l\'invito a %2$s di unirsi alla stanza. Motivo: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s ha accettato l\'invito per %2$s. Motivo: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s ha rifiutato l\'invito di %2$s. Motivo: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s ha aggiunto %2$s come indirizzo per questa stanza.</item>
-        <item quantity="other">%1$s ha aggiunto %2$s come indirizzi per questa stanza.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s ha rimosso %2$s come indirizzo per questa stanza.</item>
-        <item quantity="other">%1$s ha rimosso %2$s come indirizzi per questa stanza.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s ha aggiunto %2$s e rimosso %3$s come indirizzi per questa stanza.</string>
-    <string name="notice_room_canonical_alias_set">%1$s ha impostato l\'indirizzo principale per questa stanza a %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s ha rimosso l\'indirizzo principale per questa stanza.</string>
-    <string name="notice_room_guest_access_can_join">%1$s ha permesso l\'accesso alla stanza per gli ospiti.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza per gli ospiti.</string>
-    <string name="notice_end_to_end_ok">%1$s ha attivato la cifratura end-to-end.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s ha attivato la cifratura end-to-end (algoritmo %2$s non riconosciuto).</string>
-    <string name="notice_room_created">%1$s ha creato la stanza</string>
-    <string name="summary_you_sent_image">Hai inviato un\'immagine.</string>
-    <string name="summary_you_sent_sticker">Hai inviato un adesivo.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Il tuo invito</string>
-    <string name="notice_room_created_by_you">Hai creato la stanza</string>
-    <string name="notice_room_invite_by_you">Hai invitato %1$s</string>
-    <string name="notice_room_join_by_you">Sei entrato nella stanza</string>
-    <string name="notice_room_leave_by_you">Sei uscito dalla stanza</string>
-    <string name="notice_room_reject_by_you">Hai rifiutato l\'invito</string>
-    <string name="notice_room_kick_by_you">Hai buttato fuori %1$s</string>
-    <string name="notice_room_unban_by_you">Hai riammesso %1$s</string>
-    <string name="notice_room_ban_by_you">Hai bandito %1$s</string>
-    <string name="notice_room_withdraw_by_you">Hai ritirato l\'invito di %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Hai cambiato il tuo avatar</string>
-    <string name="notice_display_name_set_by_you">Hai impostato il tuo nome visualizzato a %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">Hai cambiato il tuo nome visualizzato da %1$s a %2$s</string>
-    <string name="notice_display_name_removed_by_you">Hai rimosso il tuo nome visibile (era %1$s)</string>
-    <string name="notice_room_topic_changed_by_you">Hai cambiato l\'argomento a: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s ha modificato l\'avatar della stanza</string>
-    <string name="notice_room_avatar_changed_by_you">Hai modificato l\'avatar della stanza</string>
-    <string name="notice_room_name_changed_by_you">Hai cambiato il nome della stanza a: %1$s</string>
-    <string name="notice_placed_video_call_by_you">Hai iniziato una videochiamata.</string>
-    <string name="notice_placed_voice_call_by_you">Hai iniziato una telefonata.</string>
-    <string name="notice_call_candidates">%s ha inviato dati per impostare la chiamata.</string>
-    <string name="notice_call_candidates_by_you">Hai inviato dati per impostare la chiamata.</string>
-    <string name="notice_answered_call_by_you">Hai risposto alla chiamata.</string>
-    <string name="notice_ended_call_by_you">Hai terminato la chiamata.</string>
-    <string name="notice_made_future_room_visibility_by_you">Hai reso visibile la futura cronologia della stanza a %1$s</string>
-    <string name="notice_end_to_end_by_you">Hai attivato la crittografia end-to-end (%1$s)</string>
-    <string name="notice_room_update_by_you">Hai aggiornato questa stanza.</string>
-    <string name="notice_requested_voip_conference_by_you">Hai richiesto una conferenza VoIP</string>
-    <string name="notice_room_name_removed_by_you">Hai rimosso il nome della stanza</string>
-    <string name="notice_room_topic_removed_by_you">Hai rimosso l\'argomento della stanza</string>
-    <string name="notice_room_avatar_removed">%1$s ha rimosso l\'avatar della stanza</string>
-    <string name="notice_room_avatar_removed_by_you">Hai rimosso l\'avatar della stanza</string>
-    <string name="notice_profile_change_redacted_by_you">Hai aggiornato il tuo profilo %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Hai mandato un invito a %1$s a unirsi alla stanza</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Hai revocato l\'invito per %1$s a unirsi alla stanza</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Hai accettato l\'invito per %1$s</string>
-    <string name="notice_widget_added">%1$s ha aggiunto il widget %2$s</string>
-    <string name="notice_widget_added_by_you">Hai aggiunto il widget %1$s</string>
-    <string name="notice_widget_removed">%1$s ha rimosso il widget %2$s</string>
-    <string name="notice_widget_removed_by_you">Hai rimosso il widget %1$s</string>
-    <string name="notice_widget_modified">%1$s ha modificato il widget %2$s</string>
-    <string name="notice_widget_modified_by_you">Hai modificato il widget %1$s</string>
-    <string name="power_level_admin">Amministratore</string>
-    <string name="power_level_moderator">Moderatore</string>
-    <string name="power_level_default">Predefinito</string>
-    <string name="power_level_custom">Personalizzato (%1$d)</string>
-    <string name="power_level_custom_no_value">Personalizzato</string>
-    <string name="notice_power_level_changed_by_you">Hai cambiato il livello di potere di %1$s.</string>
-    <string name="notice_power_level_changed">%1$s ha cambiato il livello di potere di %2$s.</string>
-    <string name="notice_power_level_diff">%1$s da %2$s a %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Il tuo invito. Motivo: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Hai invitato %1$s. Motivo: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Sei entrato nella stanza. Motivo: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Sei uscito dalla stanza. Motivo: %1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Hai rifiutato l\'invito. Motivo: %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Hai buttato fuori %1$s. Motivo: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Hai riammesso %1$s. Motivo: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Hai bandito %1$s. Motivo: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Hai mandato un invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Hai revocato l\'invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Hai accettato l\'invito per %1$s. Motivo: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Hai ritirato l\'invito di %1$s. Motivo: %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Hai aggiunto %1$s come indirizzo per questa stanza.</item>
-        <item quantity="other">Hai aggiunto %1$s come indirizzi per questa stanza.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Hai rimosso %1$s come indirizzo per questa stanza.</item>
-        <item quantity="other">Hai rimosso %1$s come indirizzi per questa stanza.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">Hai aggiunto %1$s e rimosso %2$s come indirizzi per questa stanza.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Hai impostato l\'indirizzo principale per questa stanza a %1$s.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Hai rimosso l\'indirizzo principale per questa stanza.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Hai permesso l\'accesso alla stanza per gli ospiti.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza per gli ospiti.</string>
-    <string name="notice_end_to_end_ok_by_you">Hai attivato la crittografia end-to-end.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia end-to-end (algoritmo %1$s sconosciuto).</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza agli ospiti.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza agli ospiti.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Hai permesso l\'accesso agli ospiti.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s ha permesso l\'accesso agli ospiti.</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Sei entrato. Motivo: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Sei uscito. Motivo: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s è uscito. Motivo: %2$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s è entrato. Motivo: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Hai revocato l\'invito per %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s ha revocato l\'invito per %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Hai invitato %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s ha invitato %2$s</string>
-    <string name="notice_direct_room_update_by_you">Hai aggiornato la stanza.</string>
-    <string name="notice_direct_room_update">%s ha aggiornato la stanza.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Hai reso visibili i messaggi futuri a %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s ha reso visibili i messaggi futuri a %2$s</string>
-    <string name="notice_direct_room_leave_by_you">Sei uscito dalla stanza</string>
-    <string name="notice_direct_room_leave">%1$s è uscito dalla stanza</string>
-    <string name="notice_direct_room_join_by_you">Sei entrato</string>
-    <string name="notice_direct_room_join">%1$s è entrato</string>
-    <string name="notice_direct_room_created_by_you">Hai creato la discussione</string>
-    <string name="notice_direct_room_created">%1$s ha creato la discussione</string>
-    <string name="room_displayname_empty_room_was">Stanza vuota (era %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s e %4$d altro</item>
-        <item quantity="other">%1$s, %2$s, %3$s e altri %4$d</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s e %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s e %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Tutti i server sono banditi dalla partecipazione! Questa stanza non può più essere usata.</string>
-    <string name="notice_room_server_acl_updated_no_change">Nessuna modifica.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• I server che corrispondono a IP letterali ora sono banditi.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• I server che corrispondono a IP letterali ora sono permessi.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• I server che corrispondono a %s sono stati rimossi dalla lista dei consentiti.</string>
-    <string name="notice_room_server_acl_updated_allowed">• I server che corrispondono a %s ora sono permessi.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• I server che corrispondono a %s sono stati rimossi dalla lista di ban.</string>
-    <string name="notice_room_server_acl_updated_banned">• I server che corrispondono a %s ora sono banditi.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Hai cambiato le ACL del server per questa stanza.</string>
-    <string name="notice_room_server_acl_updated_title">%s ha cambiato le ACL del server per questa stanza.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• I server che corrispondono a IP letterali sono banditi.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• I server che corrispondono a IP letterali sono permessi.</string>
-    <string name="notice_room_server_acl_set_allowed">• I server che corrispondono a %s sono permessi.</string>
-    <string name="notice_room_server_acl_set_banned">• I server che corrispondono a %s sono banditi.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Hai impostato le ACL del server per questa stanza.</string>
-    <string name="notice_room_server_acl_set_title">%s ha impostato le ACL del server per questa stanza.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Hai cambiato gli indirizzi per questa stanza.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s ha cambiato gli indirizzi per questa stanza.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Hai cambiato gli indirizzi principali ed alternativi per questa stanza.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ha cambiato gli indirizzi principali ed alternativi per questa stanza.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Hai cambiato gli indirizzi alternativi per questa stanza.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s ha cambiato gli indirizzi alternativi per questa stanza.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Hai rimosso l\'indirizzo alternativo %1$s per questa stanza.</item>
-        <item quantity="other">Hai rimosso gli indirizzi alternativi %1$s per questa stanza.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s ha rimosso l\'indirizzo alternativo %2$s per questa stanza.</item>
-        <item quantity="other">%1$s ha rimosso gli indirizzi alternativi %2$s per questa stanza.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Hai aggiunto l\'indirizzo alternativo %1$s per questa stanza.</item>
-        <item quantity="other">Hai aggiunto gli indirizzi alternativi %1$s per questa stanza.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s ha aggiunto l\'indirizzo alternativo %2$s per questa stanza.</item>
-        <item quantity="other">%1$s ha aggiunto gli indirizzi alternativi %2$s per questa stanza.</item>
-    </plurals>
-    <string name="notice_widget_jitsi_modified_by_you">Hai modificato la video conferenza</string>
-    <string name="notice_widget_jitsi_modified">Video conferenza modificata da %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">Hai iniziato la video conferenza</string>
-    <string name="notice_widget_jitsi_removed_by_you">Hai terminato la video conferenza</string>
-    <string name="notice_widget_jitsi_removed">Video conferenza terminata da %1$s</string>
-    <string name="notice_widget_jitsi_added">Video conferenza iniziata da %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-ja/strings.xml b/matrix-sdk-android/src/main/res/values-ja/strings.xml
deleted file mode 100644
index add19edfaf..0000000000
--- a/matrix-sdk-android/src/main/res/values-ja/strings.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$sが画像を送信しました。</string>
-    <string name="summary_user_sent_sticker">%1$sがスタンプを送信しました。</string>
-    <string name="notice_room_invite_no_invitee">%sの招待</string>
-    <string name="notice_room_invite">%1$sが%2$sを招待しました</string>
-    <string name="notice_room_invite_you">%1$sがあなたを招待しました</string>
-    <string name="notice_room_join">%1$sが参加しました</string>
-    <string name="notice_room_leave">%1$sが退出しました</string>
-    <string name="notice_room_reject">%1$sが招待を断りました</string>
-    <string name="notice_room_kick">%1$sが%2$sを追放しました</string>
-    <string name="notice_room_unban">%1$sが%2$sをブロック解除しました</string>
-    <string name="notice_room_ban">%1$sが%2$sをブロックしました</string>
-    <string name="notice_room_withdraw">%1$sが%2$sの招待を撤回しました</string>
-    <string name="notice_avatar_url_changed">%1$sがアバターを変更しました</string>
-    <string name="notice_display_name_set">%1$sが表示名を%2$sに設定しました</string>
-    <string name="notice_display_name_changed_from">%1$sが表示名を%2$sから%3$sに変更しました</string>
-    <string name="notice_display_name_removed">%1$sが表示名 (%2$s) を削除しました</string>
-    <string name="notice_room_topic_changed">%1$sがテーマを%2$sに変更しました</string>
-    <string name="notice_room_name_changed">%1$sが部屋名を%2$sに変更しました</string>
-    <string name="notice_placed_video_call">%sがビデオ通話を開始しました。</string>
-    <string name="notice_placed_voice_call">%sが音声通話を開始しました。</string>
-    <string name="notice_answered_call">%sが電話に出ました。</string>
-    <string name="notice_ended_call">%sが通話を終了しました。</string>
-    <string name="room_displayname_invite_from">%sさんからの招待</string>
-    <string name="room_displayname_room_invite">部屋への招待</string>
-    <string name="room_displayname_two_members">%1$sと%2$s</string>
-    <string name="room_displayname_empty_room">空の部屋</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="other">%1$sと他%2$d名</item>
-    </plurals>
-    <string name="notice_made_future_room_visibility">%1$sは、今後の部屋履歴を%2$sに表示させました</string>
-    <string name="notice_room_visibility_invited">部屋のメンバー全員、招待された時点から。</string>
-    <string name="notice_room_visibility_joined">部屋のメンバー全員、参加した時点から。</string>
-    <string name="notice_room_visibility_shared">部屋のメンバー全員。</string>
-    <string name="notice_room_visibility_world_readable">誰でも。</string>
-    <string name="notice_room_visibility_unknown">不明 (%s)。</string>
-    <string name="notice_end_to_end">%1$s がエンドツーエンド暗号化を有効にしました (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s がVoIP会議をリクエストしました</string>
-    <string name="notice_voip_started">VoIP会議が開始されました</string>
-    <string name="notice_voip_finished">VoIP会議が終了しました</string>
-    <string name="notice_avatar_changed_too">(アバターも変更された)</string>
-    <string name="notice_room_name_removed">%1$s が部屋名を削除しました</string>
-    <string name="notice_room_topic_removed">%1$s がルームトピックを削除しました</string>
-    <string name="notice_profile_change_redacted">%1$s がプロフィール %2$s を更新しました</string>
-    <string name="notice_room_third_party_invite">%1$s は %2$s に部屋に参加するよう招待状を送りました</string>
-    <string name="notice_room_third_party_registered_invite">%1$sは%2$sの招待を受け入れました</string>
-    <string name="notice_crypto_unable_to_decrypt">** 解読できません: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">送信者の端末からこのメッセージのキーが送信されていません。</string>
-    <string name="could_not_redact">修正できませんでした</string>
-    <string name="unable_to_send_message">メッセージを送信できません</string>
-    <string name="message_failed_to_upload">画像のアップロードに失敗しました</string>
-    <string name="network_error">ネットワークエラー</string>
-    <string name="matrix_error">Matrixエラー</string>
-    <string name="room_error_join_failed_empty_room">現在空の部屋に再参加することはできません。</string>
-    <string name="encrypted_message">暗号化されたメッセージ</string>
-    <string name="medium_email">メールアドレス</string>
-    <string name="medium_phone_number">電話番号</string>
-    <string name="notice_room_avatar_changed_by_you">ルームのアバターを変更しました</string>
-    <string name="notice_room_avatar_changed">%1$sがルームのアバターを変更しました</string>
-    <string name="notice_room_topic_changed_by_you">トピックを%1$sに変更しました</string>
-    <string name="notice_display_name_removed_by_you">表示名を削除しました(%1$sでした)</string>
-    <string name="notice_display_name_changed_from_by_you">表示名を%1$sから%2$sに変更しました</string>
-    <string name="notice_display_name_set_by_you">表示名を%1$sに設定しました</string>
-    <string name="notice_avatar_url_changed_by_you">アバターを変更しました</string>
-    <string name="notice_room_withdraw_by_you">%1$sの招待を取り下げました</string>
-    <string name="notice_room_ban_by_you">%1$sをBANしました</string>
-    <string name="notice_room_unban_by_you">%1$sのBANを解除しました</string>
-    <string name="notice_room_kick_by_you">%1$sを退出させました</string>
-    <string name="notice_room_reject_by_you">招待を拒否しました</string>
-    <string name="notice_direct_room_leave_by_you">ルームから退出しました</string>
-    <string name="notice_direct_room_leave">%1$sがルームから退出しました</string>
-    <string name="notice_room_leave_by_you">ルームから退出しました</string>
-    <string name="notice_direct_room_join_by_you">参加しました</string>
-    <string name="notice_direct_room_join">%1$sが参加しました</string>
-    <string name="notice_room_join_by_you">ルームに参加しました</string>
-    <string name="notice_room_invite_by_you">%1$sを招待しました</string>
-    <string name="notice_direct_room_created_by_you">ディスカッションを作成しました</string>
-    <string name="notice_direct_room_created">%1$sがディスカッションを作成しました</string>
-    <string name="notice_room_created_by_you">ルームを作成しました</string>
-    <string name="notice_room_created">%1$sがルームを作成しました</string>
-    <string name="notice_room_invite_no_invitee_by_you">招待</string>
-    <string name="summary_you_sent_sticker">ステッカーを送信しました。</string>
-    <string name="summary_you_sent_image">画像を送信しました。</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-kab/strings.xml b/matrix-sdk-android/src/main/res/values-kab/strings.xml
deleted file mode 100644
index ea0c78da5a..0000000000
--- a/matrix-sdk-android/src/main/res/values-kab/strings.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s t.yuzen tugna.</string>
-    <string name="summary_you_sent_image">Tuzneḍ tugna.</string>
-    <string name="notice_room_invite_no_invitee">Tinubga n %s</string>
-    <string name="notice_room_invite_no_invitee_by_you">Tinubga-k•m</string>
-    <string name="notice_room_created">%1$s yesnulfa-d taxxamt</string>
-    <string name="notice_room_created_by_you">Tesnulfaḍ-d taxxamt-a</string>
-    <string name="notice_room_invite">%1$s inced-d %2$s</string>
-    <string name="notice_room_invite_by_you">Tnecdeḍ-d %1$s</string>
-    <string name="notice_room_invite_you">%1$s inced-ik-id</string>
-    <string name="notice_room_join">%1$s yedda ɣer texxamt</string>
-    <string name="notice_room_join_by_you">Teddiḍ ɣer texxamt</string>
-    <string name="notice_room_leave">%1$s yeǧǧa taxxamt</string>
-    <string name="notice_room_leave_by_you">Teǧǧiḍ taxxamt</string>
-    <string name="notice_room_reject">%1$s yugi/tugi tinubga</string>
-    <string name="notice_room_reject_by_you">Tufiḍ tinubga</string>
-    <string name="notice_room_kick">%1$s yessufeɣ %2$s</string>
-    <string name="notice_room_kick_by_you">Tessufɣeḍ %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Tbeddleḍ avatar-inek·inem</string>
-    <string name="power_level_admin">Anedbal</string>
-    <string name="power_level_moderator">Aseɣyad</string>
-    <string name="power_level_default">Amezwer</string>
-    <string name="power_level_custom_no_value">Sagen</string>
-    <string name="notice_power_level_diff">%1$s seg %2$s ɣer %3$s</string>
-    <string name="message_failed_to_upload">Tegguma ad d-tali tugna</string>
-    <string name="medium_email">Tansa n yimayl</string>
-    <string name="summary_user_sent_sticker">%1$s azen astiker.</string>
-    <string name="summary_you_sent_sticker">Tuzneḍ amenṭaḍ.</string>
-    <string name="notice_room_unban">%1$s yekkes agdal i %2$s</string>
-    <string name="notice_room_unban_by_you">Tekkseḍ agdal i %1$s</string>
-    <string name="notice_room_ban">%1$s igdel %2$s</string>
-    <string name="notice_room_ban_by_you">Tgedleḍ %1$s</string>
-    <string name="notice_room_withdraw">%1$s issefsex tinubga n %2$s</string>
-    <string name="notice_room_withdraw_by_you">Tesfesxeḍ tinubga n %1$s</string>
-    <string name="notice_avatar_url_changed">%1$s ibeddel avatar-is</string>
-    <string name="notice_display_name_set">%1$s isbadu isem-is i d-ittuseknen ɣer %2$s</string>
-    <string name="notice_display_name_set_by_you">Tesbaduḍ isem-ik•im i d-ittuseknen ɣer %1$s</string>
-    <string name="notice_display_name_changed_from">%1$s ibeddel isem-is i d-ittuseknen seg %2$s ɣer %3$s</string>
-    <string name="notice_display_name_changed_from_by_you">Tbeddleḍ isem-ik•im i d-ittuseknen seg %1$s ɣer %2$s</string>
-    <string name="notice_display_name_removed">%1$s yekkes isem-is i d-ittuseknen (yella %2$s)</string>
-    <string name="notice_display_name_removed_by_you">Tekkseḍ isem-ik·im yettwaskanen (d %1$s)</string>
-    <string name="notice_room_topic_changed">%1$s isnifel asentel s: %2$s</string>
-    <string name="notice_room_topic_changed_by_you">Tesnifleḍ asentel s: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s ibeddel avaṭar n texxamt</string>
-    <string name="notice_room_avatar_changed_by_you">Tbeddleḍ avaṭar n texxamt</string>
-    <string name="notice_room_name_changed">%1$s ibeddel isem n texxamt s: %2$s</string>
-    <string name="notice_room_name_changed_by_you">Tbeddleḍ isem n texxamt s: %1$s</string>
-    <string name="notice_placed_video_call">%s isɛedda siwel s tvidyut.</string>
-    <string name="notice_placed_video_call_by_you">Tesɛeddaḍ siwel s tvidyut.</string>
-    <string name="notice_placed_voice_call">%s isɛedda asiwel s taɣect.</string>
-    <string name="notice_placed_voice_call_by_you">Tesɛeddaḍ siwel s taɣect.</string>
-    <string name="notice_call_candidates">%s yuzen isefka i usbadu n usiwel.</string>
-    <string name="notice_call_candidates_by_you">Tuzneḍ isefka i usbadu n usiwel.</string>
-    <string name="notice_answered_call">%s yerra ɣef usiwel.</string>
-    <string name="notice_answered_call_by_you">Terriḍ ɣef usiwel.</string>
-    <string name="notice_ended_call">%s iḥbes asiwel.</string>
-    <string name="notice_ended_call_by_you">Tḥebseḍ asiwel.</string>
-    <string name="notice_room_visibility_invited">meṛṛa iɛeggalen n texxamt, segmi ara d-ttwanecden.</string>
-    <string name="notice_room_visibility_joined">meṛṛa iɛeggalen n texamt, segmi ara d-rnun.</string>
-    <string name="notice_room_visibility_shared">meṛṛa iɛeggalen n texxamt.</string>
-    <string name="notice_room_visibility_world_readable">yal yiwen.</string>
-    <string name="notice_room_visibility_unknown">arussin (%s).</string>
-    <string name="notice_end_to_end">%1$s isermed awgelhen seg yixef ɣer yixef (%2$s)</string>
-    <string name="notice_end_to_end_by_you">Tesremdeḍ awgelhen seg yixef ɣer yixef (%1$s)</string>
-    <string name="notice_room_update">%s ileqqem taxxamt-a.</string>
-    <string name="notice_room_update_by_you">Tleqqmeḍ taxxamt-a.</string>
-    <string name="notice_requested_voip_conference">%1$s isuter-d asarag VoIP</string>
-    <string name="notice_requested_voip_conference_by_you">Tsutreḍ-d asarag VoIP</string>
-    <string name="notice_voip_started">Asarag VoIP yebda</string>
-    <string name="notice_voip_finished">Asarag VoIP yekfa</string>
-    <string name="notice_avatar_changed_too">(avatar daɣen ibeddel)</string>
-    <string name="notice_room_name_removed">%1$s yekkes isem n texxamt</string>
-    <string name="notice_room_name_removed_by_you">Tekkseḍ isem n texxamt</string>
-    <string name="notice_room_topic_removed">%1$s yekkes asentel n texxamt</string>
-    <string name="notice_room_topic_removed_by_you">Tekkseḍ asentel n texxamt</string>
-    <string name="notice_room_avatar_removed">%1$s yekkes avatar n texxamt</string>
-    <string name="notice_room_avatar_removed_by_you">Tekkseḍ avatar n texxamt</string>
-    <string name="notice_event_redacted">Izen ittwakkes</string>
-    <string name="notice_event_redacted_by">Izen ittwakkes sɣur %1$s</string>
-    <string name="notice_event_redacted_with_reason">Izen ittwakkes [tamentilt: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Izen ittwakkes sɣur %1$s [tamentilt: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s ileqqem amaɣnu-ines %2$s</string>
-    <string name="notice_profile_change_redacted_by_you">Tleqqmeḍ amaɣnu-inek•inem %1$s</string>
-    <string name="notice_room_third_party_invite">%1$s yuzen tinubga i %2$s akken ad yeddu ɣer texxamt</string>
-    <string name="notice_room_third_party_invite_by_you">Tuzneḍ tinubga i %1$s akken ad yeddu ɣer texxamt</string>
-    <string name="notice_room_third_party_registered_invite">%1$s iqbel tinubga i %2$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Tqebleḍ tinubga i %1$s</string>
-    <string name="notice_widget_added">%1$s yerna awiǧit %2$s</string>
-    <string name="notice_widget_added_by_you">Terniḍ awiǧit %1$s</string>
-    <string name="notice_widget_removed">%1$s yekkes awiǧit %2$s</string>
-    <string name="notice_widget_removed_by_you">Tekkseḍ awiǧit %1$s</string>
-    <string name="notice_widget_modified">%1$s ibeddel awiǧit %2$s</string>
-    <string name="notice_widget_modified_by_you">Tbeddleḍ awiǧit %1$s</string>
-    <string name="power_level_custom">Sagen (%1$d)</string>
-    <string name="notice_power_level_changed_by_you">Tbeddleḍ aswir n tezmert n %1$s.</string>
-    <string name="notice_power_level_changed">%1$s ibeddel aswir n tezmert n %2$s.</string>
-    <string name="notice_crypto_unable_to_decrypt">** Awgelhen d awezɣi: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Ibenk n umazan ur aɣ-d-yuzin ara tisura i yizen-a.</string>
-    <string name="unable_to_send_message">Tuzna n yizen d tawezɣit</string>
-    <string name="network_error">Tuccḍa deg uẓeṭṭa</string>
-    <string name="matrix_error">Tuccḍa deg Matrix</string>
-    <string name="notice_made_future_room_visibility">%1$s iga amazray n texxamyt i d-iteddun yettban i %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Tgiḍ amazray n texxamyt i d-iteddun yettban i %1$s</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s issefsax tinubga i %2$s i wakken ad d-yekcem ɣer texxamt</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Tesfesxeḍ tinubga i %1$s i wakken ad d-yernu ɣer texxamt</string>
-    <string name="room_error_join_failed_empty_room">D awezɣi tura ad nales ad nuɣal ɣer texxamt tilemt.</string>
-    <string name="encrypted_message">Izen yettwawgelhen</string>
-    <string name="medium_phone_number">Uṭṭun n tiliɣri</string>
-    <string name="room_displayname_invite_from">Tinubga sɣur %s</string>
-    <string name="room_displayname_room_invite">Tinubga ɣer texxamt</string>
-    <string name="room_displayname_two_members">%1$s d %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s d 1 wayeḍ</item>
-        <item quantity="other">%1$s d %2$d wiyaḍ</item>
-    </plurals>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef (alguritm %1$s ur yettwassen ara).</string>
-    <string name="room_displayname_empty_room">Taxxamt tilemt</string>
-    <string name="initial_sync_start_importing_account">Amtawi n tazwara:
-\nAktar n umiḍan…</string>
-    <string name="initial_sync_start_importing_account_crypto">Amtawi n tazwara:
-\nAktar n uwgelhen</string>
-    <string name="initial_sync_start_importing_account_rooms">Amtawi n tazwara:
-\nAktar n texxamin</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Amtawi n tazwara:
-\nAktar n texxamin iɣer terniḍ</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Amtawi n tazwara:
-\nAktar n texxamin iɣer tettwanecdeḍ</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Amtawi n tazwara:
-\nAktar n texxamin i teǧǧiḍ</string>
-    <string name="initial_sync_start_importing_account_groups">Amtawi n tazwara:
-\nAktar n tmezdagnutin</string>
-    <string name="initial_sync_start_importing_account_data">Amtawi n tazwara:
-\nAktar n yisefka n umiḍan</string>
-    <string name="event_status_sending_message">Tuzzna n yizen…</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Tinubga n %1$s. Tamentilt: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Tinubga-k•m. Tamentilt: %1$s</string>
-    <string name="notice_room_invite_with_reason">%1$s inced %2$s. Tamentilt: %3$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Tnecdeḍ %1$s. Tamentilt: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s inced-ik•ikem. Tamentilt: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s yedda ɣer texxamt. Tamentilt: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Teddiḍ ɣer texxamt. Tamentilt: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s yeǧǧa taxxamt. Tamentilt: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Teǧǧiḍ taxxamt. Tamentilt: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s yugi tinubga. Tamentilt: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Tugiḍ tinubga. Tamentilt: %1$s</string>
-    <string name="notice_room_kick_with_reason">%1$s yessufeɣ %2$s. Tamentilt: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Tessufɣeḍ %1$s. Tamentilt: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s yekkes agdal i %2$s. Tamentilt: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Tekkseḍ agdal i %1$s. Tamentilt: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s igdel %2$s. Tamentilt: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Tgedleḍ %1$s. Tamentilt: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s yuzen tinubga i %2$s akken ad yeddu ɣer texxamt. Tamentilt: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Tuzneḍ tinubga i %1$s iwakken ad yeddu ɣer texxamt. Tamentilt: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s iqbel tinubga i %2$s. Tamentilt: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Tqebleḍ tinubga i %1$s. Tamentilt: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s issefsex tinubga n %2$s. Tamentilt: %3$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Tesfesxeḍ tinubga n %1$s. Tamentilt: %2$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s yerna %2$s d tansa i texxamt-a.</item>
-        <item quantity="other">%1$s yerna %2$s d tansiwin i texxamt-a.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Terniḍ %1$s d tansa i texxamt-a.</item>
-        <item quantity="other">Terniḍ %1$s d tansiwin i texxamt-a.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s yekkes %2$s am tansa i texxamt-a.</item>
-        <item quantity="other">%1$s yekkes %3$s am tansiwin i texxamt-a.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Tekkseḍ %1$s am tansa i texxamt-a.</item>
-        <item quantity="other">Tekkseḍ %1$s am tansiwin i texxamt-a.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s yerna %2$s terniḍ tekkseḍ %3$s am tansiwin i texxamt-a.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Terniḍ %1$s terniḍ tekkseḍ %2$s am tansiwin i texxamt-a.</string>
-    <string name="notice_room_canonical_alias_set">%1$s isbadu %2$s am tansa tagejdant i texxamt-a.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Tesbaduḍ %1$s am tansa tagejdant i texxamt-a.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s yekkes tansa tagejdant i texxamt-a.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Tekkseḍ tansa tagejdant i texxamt-a.</string>
-    <string name="notice_room_guest_access_can_join">%1$s isireg inebgawen ad ddun ɣer texxamt.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Tsirgeḍ inebgawen ad ddun ɣer texxamt.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s issewḥel inebgawen iwakken ur tteddun ara ɣer texxamt.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Tesweḥleḍ inebgawen iwakken ur tteddun ara ɣer texxamt.</string>
-    <string name="notice_end_to_end_ok">%1$s yermed awgelhen seg yixef ɣer yixef.</string>
-    <string name="notice_end_to_end_ok_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s yermed awgelhen seg yixef ɣer yixef (alguritm %2$s ur yettwassen ara).</string>
-    <string name="clear_timeline_send_queue">Sfeḍ tabdart n uraǧu n tuzzna</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s issefsex tinubga n %2$s i tmerniwt ɣer texxamt. Tamentilt: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Tesfesxeḍ tinubga n %1$s i tmerna ɣer texxamt. Tamentilt: %2$s</string>
-    <string name="could_not_redact">Yegguma ad yaru</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-ko/strings.xml b/matrix-sdk-android/src/main/res/values-ko/strings.xml
deleted file mode 100644
index eee67628eb..0000000000
--- a/matrix-sdk-android/src/main/res/values-ko/strings.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="notice_room_invite_no_invitee">%s님의 초대</string>
-    <string name="summary_user_sent_image">%1$s님이 사진을 보냈습니다.</string>
-    <string name="summary_user_sent_sticker">%1$s님이 스티커를 보냈습니다.</string>
-
-    <string name="notice_room_invite">%1$s님이 %2$s님을 초대했습니다</string>
-    <string name="notice_room_invite_you">%1$s님이 당신을 초대했습니다</string>
-    <string name="notice_room_join">%1$s님이 참가했습니다</string>
-    <string name="notice_room_leave">%1$s님이 떠났습니다</string>
-    <string name="notice_room_reject">%1$s님이 초대를 거부했습니다</string>
-    <string name="notice_room_kick">%1$s님이 %2$s님을 추방했습니다</string>
-    <string name="notice_room_unban">%1$s님이 %2$s님의 출입 금지를 풀었습니다</string>
-    <string name="notice_room_ban">%1$s님이 %2$s님을 출입 금지했습니다</string>
-    <string name="notice_room_withdraw">%1$s님이 %2$s님의 초대를 취소했습니다</string>
-    <string name="notice_avatar_url_changed">%1$s님이 아바타를 변경했습니다</string>
-    <string name="notice_display_name_set">%1$s님이 표시 이름을 %2$s(으)로 설정했습니다</string>
-    <string name="notice_display_name_changed_from">%1$s님이 표시 이름을 %2$s에서 %3$s(으)로 변경했습니다</string>
-    <string name="notice_display_name_removed">%1$s님이 표시 이름을 삭제했습니다 (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s님이 주제를 다음으로 변경했습니다: %2$s</string>
-    <string name="notice_room_name_changed">%1$s님이 방 이름을 다음으로 변경했습니다: %2$s</string>
-    <string name="notice_placed_video_call">%s님이 영상 통화를 걸었습니다.</string>
-    <string name="notice_placed_voice_call">%s님이 음성 통화를 걸었습니다.</string>
-    <string name="notice_answered_call">%s님이 전화를 받았습니다.</string>
-    <string name="notice_ended_call">%s님이 전화를 끊었습니다.</string>
-    <string name="notice_made_future_room_visibility">%1$s님이 이후 %2$s에게 방 기록을 공개했습니다</string>
-    <string name="notice_room_visibility_invited">초대된 시점부터 모든 방 구성원</string>
-    <string name="notice_room_visibility_joined">들어온 시점부터 모든 방 구성원</string>
-    <string name="notice_room_visibility_shared">모든 방 구성원</string>
-    <string name="notice_room_visibility_world_readable">누구나.</string>
-    <string name="notice_room_visibility_unknown">알 수 없음 (%s).</string>
-    <string name="notice_end_to_end">%1$s님이 종단간 암호화를 켰습니다 (%2$s)</string>
-    <string name="notice_room_update">%s님이 방을 업그레이드했습니다.</string>
-
-    <string name="notice_requested_voip_conference">%1$s님이 VoIP 회의를 요청했습니다</string>
-    <string name="notice_voip_started">VoIP 회의가 시작했습니다</string>
-    <string name="notice_voip_finished">VoIP 회의가 끝났습니다</string>
-
-    <string name="notice_avatar_changed_too">(아바타도 변경됨)</string>
-    <string name="notice_room_name_removed">%1$s님이 방 이름을 삭제했습니다</string>
-    <string name="notice_room_topic_removed">%1$s님이 방 주제를 삭제했습니다</string>
-    <string name="notice_event_redacted">메시지가 삭제되었습니다</string>
-    <string name="notice_event_redacted_by">메시지가 %1$s님에 의해 삭제되었습니다</string>
-    <string name="notice_event_redacted_with_reason">메시지가 삭제되었습니다 [이유: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">메시지가 %1$s님에 의해 삭제되었습니다 [이유: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s님이 프로필 %2$s을(를) 업데이트했습니다</string>
-    <string name="notice_room_third_party_invite">%1$s님이 %2$s님에게 방 초대를 보냈습니다</string>
-    <string name="notice_room_third_party_registered_invite">%1$s님이 %2$s의 초대를 수락했습니다</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** 암호를 복호화할 수 없음: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">발신인의 기기에서 이 메시지의 키를 보내지 않았습니다.</string>
-
-    <string name="could_not_redact">검열할 수 없습니다</string>
-    <string name="unable_to_send_message">메시지를 보낼 수 없습니다</string>
-
-    <string name="message_failed_to_upload">사진 업로드에 실패했습니다</string>
-
-    <string name="network_error">네트워크 오류</string>
-    <string name="matrix_error">Matrix 오류</string>
-
-    <string name="room_error_join_failed_empty_room">현재 빈 방에 다시 들어갈 수 없습니다.</string>
-
-    <string name="encrypted_message">암호화된 메시지</string>
-
-    <string name="medium_email">이메일 주소</string>
-    <string name="medium_phone_number">전화번호</string>
-
-    <string name="room_displayname_invite_from">%s에서 초대함</string>
-    <string name="room_displayname_room_invite">방 초대</string>
-
-    <string name="room_displayname_two_members">%1$s님과 %2$s님</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="other">%1$s님 외 %2$d명</item>
-    </plurals>
-
-    <string name="room_displayname_empty_room">빈 방</string>
-
-    <string name="initial_sync_start_importing_account">초기 동기화:
-\n계정 가져오는 중…</string>
-    <string name="initial_sync_start_importing_account_crypto">초기 동기화:
-\n암호 가져오는 중</string>
-    <string name="initial_sync_start_importing_account_rooms">초기 동기화:
-\n방 가져오는 중</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">초기 동기화:
-\n들어간 방 가져오는 중</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">초기 동기화:
-\n초대받은 방 가져오는 중</string>
-    <string name="initial_sync_start_importing_account_left_rooms">초기 동기화:
-\n떠난 방 가져오는 중</string>
-    <string name="initial_sync_start_importing_account_groups">초기 동기화:
-\n커뮤니티 가져오는 중</string>
-    <string name="initial_sync_start_importing_account_data">초기 동기화:
-\n계정 데이터 가져오는 중</string>
-
-    <string name="event_status_sending_message">메시지 보내는 중…</string>
-    <string name="clear_timeline_send_queue">전송 대기 열 지우기</string>
-
-    <string name="notice_room_third_party_revoked_invite">%1$s님이 %2$s님에게 방에 참가하라고 보낸 초대를 취소했습니다</string>
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-lt/strings.xml b/matrix-sdk-android/src/main/res/values-lt/strings.xml
deleted file mode 100644
index db63c9385a..0000000000
--- a/matrix-sdk-android/src/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s išsiuntė vaizdą.</string>
-    <string name="summary_user_sent_sticker">%1$s išsiuntė lipduką.</string>
-    <string name="notice_room_invite_no_invitee">%s pakvietimas</string>
-    <string name="notice_room_join_by_you">Jūs prisijungėte prie kambario</string>
-    <string name="notice_room_join">%1$s prisijungė prie kambario</string>
-    <string name="notice_room_invite_you">%1$s pakvietė jus</string>
-    <string name="notice_room_invite_by_you">Jūs pakvietėte %1$s</string>
-    <string name="notice_room_invite">%1$s pakvietė %2$s</string>
-    <string name="notice_direct_room_created_by_you">Jūs sukūrėte diskusiją</string>
-    <string name="notice_direct_room_created">%1$s sukūrė diskusiją</string>
-    <string name="notice_room_created_by_you">Jūs sukūrėte kambarį</string>
-    <string name="notice_room_created">%1$s sukūrė kambarį</string>
-    <string name="notice_room_invite_no_invitee_by_you">Jūsų pakvietimas</string>
-    <string name="summary_you_sent_sticker">Jūs išsiuntėte lipduką.</string>
-    <string name="summary_you_sent_image">Jūs išsiuntėte vaizdą.</string>
-    <string name="notice_room_withdraw_by_you">Jūs atšaukėte %1$s pakvietimą</string>
-    <string name="notice_room_withdraw">%1$s atšaukė %2$s pakvietimą</string>
-    <string name="notice_room_ban_by_you">Jūs užblokavote %1$s</string>
-    <string name="notice_room_ban">%1$s užblokavo %2$s</string>
-    <string name="notice_room_unban_by_you">Jūs atblokavote %1$s</string>
-    <string name="notice_room_unban">%1$s atblokavo %2$s</string>
-    <string name="notice_room_kick_by_you">Jūs išmetėte %1$s</string>
-    <string name="notice_room_kick">%1$s išmetė %2$s</string>
-    <string name="notice_room_reject_by_you">Jūs atmetėte pakvietimą</string>
-    <string name="notice_room_reject">%1$s atmetė pakvietimą</string>
-    <string name="notice_direct_room_leave_by_you">Jūs išėjote iš kambario</string>
-    <string name="notice_direct_room_leave">%1$s išėjo iš kambario</string>
-    <string name="notice_room_leave_by_you">Jūs išėjote iš kambario</string>
-    <string name="notice_room_leave">%1$s išėjo iš kambario</string>
-    <string name="notice_direct_room_join_by_you">Jūs prisijungėte</string>
-    <string name="notice_direct_room_join">%1$s prisijungė</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-lv/strings.xml b/matrix-sdk-android/src/main/res/values-lv/strings.xml
deleted file mode 100644
index 8aee2dcded..0000000000
--- a/matrix-sdk-android/src/main/res/values-lv/strings.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s nosūtīja attēlu.</string>
-    <string name="notice_room_invite_no_invitee">Uzaicinājums no %s</string>
-    <string name="notice_room_invite">%1$s uzaicināja %2$s</string>
-    <string name="notice_room_invite_you">%1$s uzaicināja jūs</string>
-    <string name="notice_room_join">%1$s pievienojās</string>
-    <string name="notice_room_leave">%1$s pameta istabu</string>
-    <string name="notice_room_reject">%1$s noraidīja uzaicinājumu</string>
-    <string name="notice_room_kick">%1$s padzina %2$s</string>
-    <string name="notice_room_unban">%1$s atcēla pieejas liegumu %2$s</string>
-    <string name="notice_room_ban">%1$s liedza pieeju %2$s</string>
-    <string name="notice_room_withdraw">%1$s atsauca %2$s uzaicinājumu</string>
-    <string name="notice_avatar_url_changed">%1$s nomainīja avataru</string>
-    <string name="notice_display_name_set">%1$s uzstādīja parādāmo vārdu uz %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s nomainīja parādāmo vārdu no %2$s uz %3$s</string>
-    <string name="notice_display_name_removed">%1$s dzēsa savu parādāmo vārdu (iepriekš %2$s)</string>
-    <string name="notice_room_topic_changed">%1$s nomainīja tematu uz %2$s</string>
-    <string name="notice_room_name_changed">%1$s nomainīja istabas nosaukumu uz %2$s</string>
-    <string name="notice_placed_video_call">%s veica video zvanu.</string>
-    <string name="notice_placed_voice_call">%s veica audio zvanu.</string>
-    <string name="notice_answered_call">%s atbildēja uz zvanu.</string>
-    <string name="notice_ended_call">%s beidza zvanu.</string>
-    <string name="notice_made_future_room_visibility">%1$s padarīja istabas turpmāko ziņu vēsturi redzamu %2$s</string>
-    <string name="notice_room_visibility_invited">visi istabas biedri no brīža, kad tika uzaicināti.</string>
-    <string name="notice_room_visibility_joined">visi istabas biedri no brīža, kad tika pievienojušies.</string>
-    <string name="notice_room_visibility_shared">visi istabas biedri.</string>
-    <string name="notice_room_visibility_world_readable">ikviens.</string>
-    <string name="notice_room_visibility_unknown">nezināms (%s).</string>
-    <string name="notice_end_to_end">%1$s ieslēdza pilnīgu šifrēšanu (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s pieprasīja VoIP konferenci</string>
-    <string name="notice_voip_started">VoIP konference sākās</string>
-    <string name="notice_voip_finished">VoIP konference beidzās</string>
-    <string name="notice_avatar_changed_too">(arī avatars tika nomainīts)</string>
-    <string name="notice_room_name_removed">%1$s dzēsa istabas nosaukumu</string>
-    <string name="notice_room_topic_removed">%1$s izdzēsa istabas tematu</string>
-    <string name="notice_profile_change_redacted">%1$s atjaunoja savu profilu %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s nosūtīja %2$s uzaicinājumu pievienoties istabai</string>
-    <string name="notice_room_third_party_registered_invite">%1$s pieņēma uzaicinājumu %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Neizdodas atšifrēt: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Sūtītāja ierīce mums nav nenosūtījusi atslēgas priekš šīs ziņas.</string>
-    <string name="could_not_redact">Nevarēja rediģēt</string>
-    <string name="unable_to_send_message">Neizdodas nosūtīt ziņu</string>
-    <string name="message_failed_to_upload">Neizdevās augšuplādēt attēlu</string>
-    <string name="network_error">Tīkla kļūda</string>
-    <string name="matrix_error">Matrix kļūda</string>
-    <string name="room_error_join_failed_empty_room">Šobrīd nav iespējams atkārtoti pievienoties tukšai istabai.</string>
-    <string name="encrypted_message">Šifrēta ziņa</string>
-    <string name="medium_email">Epasta adrese</string>
-    <string name="medium_phone_number">Telefona numurs</string>
-    <string name="room_displayname_invite_from">Uzaicinājums no %s</string>
-    <string name="room_displayname_room_invite">Uzaicinājums uz istabu</string>
-    <string name="room_displayname_two_members">%1$s un %2$s</string>
-    <string name="room_displayname_empty_room">Tukša istaba</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="zero">%1$s un 1 cits</item>
-        <item quantity="one">%1$s un %2$d citi</item>
-        <item quantity="other">%1$s un %2$d citu</item>
-    </plurals>
-    <string name="notice_display_name_changed_from_by_you">Jūs nomainījāt savu parādāmo vārdu no %1$s uz %2$s</string>
-    <string name="notice_display_name_set_by_you">Jūs nomainījāt savu parādāmo vārdu uz %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Jūs nomainījāt savu avataru</string>
-    <string name="notice_room_withdraw_by_you">Jūs atsaucāt %1$s uzaicinājumu</string>
-    <string name="notice_room_ban_by_you">Jūs liedzāt pieeju %1$s</string>
-    <string name="notice_room_unban_by_you">Jūs atcēlāt pieejas liegumu %1$s</string>
-    <string name="notice_room_kick_by_you">Jūs padzināt %1$s</string>
-    <string name="notice_room_reject_by_you">Jūs noraidījāt uzaicinājumu</string>
-    <string name="notice_direct_room_leave_by_you">Jūs pametāt istabu</string>
-    <string name="notice_direct_room_leave">%1$s pameta istabu</string>
-    <string name="notice_room_leave_by_you">Jūs pametāt istabu</string>
-    <string name="notice_direct_room_join_by_you">Jūs pievienojāties</string>
-    <string name="notice_direct_room_join">%1$s pievienojās istabai</string>
-    <string name="notice_room_join_by_you">Jūs pievienojāties istabai</string>
-    <string name="notice_room_invite_by_you">Jūs uzaicinājāt %1$s</string>
-    <string name="notice_direct_room_created_by_you">Jūs izveidojāt diskusiju</string>
-    <string name="notice_direct_room_created">%1$s izveidoja diskusiju</string>
-    <string name="notice_room_created_by_you">Jūs izveidojāt istabu</string>
-    <string name="notice_room_created">%1$s izveidoja istabu</string>
-    <string name="notice_room_invite_no_invitee_by_you">Jūsu uzaicinājums</string>
-    <string name="summary_you_sent_sticker">Jūs nosūtījāt uzlīmi.</string>
-    <string name="summary_user_sent_sticker">%1$s nosūtīja uzlīmi.</string>
-    <string name="summary_you_sent_image">Jūs nosūtījāt attēlu.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Jūs ieslēdzāt pilnīgu šifrēšanu (neatpazīts algoritms %1$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s ieslēdza pilnīgu šifrēšanu (neatpazīts algoritms %2$s).</string>
-    <string name="notice_end_to_end_ok_by_you">Jūs ieslēdzāt pilnīgu šifrēšanu.</string>
-    <string name="notice_end_to_end_ok">%1$s ieslēdza pilnīgu šifrēšanu.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Jūs esat novērsis iespēju viesiem pievienoties istabai.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s ir novērsis iespēju viesiem pievienoties istabai.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Jūs esat novērsis iespēju viesiem pievienoties istabai.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s ir novērsis iespēju viesiem pievienoties istabai.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Jūs esat atļāvis viesiem pievienoties istabai.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s ir atļāvis viesiem pievienoties istabai.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Jūs esat atļāvis viesiem pievienoties istabai.</string>
-    <string name="notice_room_guest_access_can_join">%1$s ir atļāvis viesiem pievienoties istabai.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Jūs nomainījāt adreses šai istabai.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s nomainīja adreses šai istabai.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Jūs nomainījāt galveno un alternatīvās adreses šai istabai.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s nomainīja galveno un alternatīvās adreses šai istabai.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Jūs nomainījāt alternatīvās adreses šai istabai.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s nomainīja alternatīvās adreses šai istabai.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="zero">Jūs izdzēsāt šīs istabas alternatīvo adresi %1$s.</item>
-        <item quantity="one">Jūs izdzēsāt šīs istabas alternatīvās adreses %1$s.</item>
-        <item quantity="other">Jūs izdzēsāt šīs istabas alternatīvās adreses %1$s.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="zero">%1$s izdzēsa šīs istabas alternatīvo adresi %2$s.</item>
-        <item quantity="one">%1$s izdzēsa šīs istabas alternatīvās adreses %2$s.</item>
-        <item quantity="other">%1$s izdzēsa šīs istabas alternatīvās adreses %2$s.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="zero">Jūs pievienojāt šīs istabas alternatīvo adresi %1$s.</item>
-        <item quantity="one">Jūs pievienojāt šīs istabas alternatīvās adreses %1$s.</item>
-        <item quantity="other">Jūs pievienojāt šīs istabas alternatīvās adreses %1$s.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="zero">%1$s pievienoja šīs istabas alternatīvo adresi %2$s.</item>
-        <item quantity="one">%1$s pievienoja šīs istabas alternatīvās adreses %2$s.</item>
-        <item quantity="other">%1$s pievienoja šīs istabas alternatīvās adreses %2$s.</item>
-    </plurals>
-    <string name="notice_room_canonical_alias_unset_by_you">Jūs izdzēsāt šis istabas galveno adresi.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s izdzēsa šis istabas galveno adresi.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Jūs iestatījāt %1$s kā šis istabas galveno adresi.</string>
-    <string name="notice_room_canonical_alias_set">%1$s iestatīja %2$s kā šis istabas galveno adresi.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Jūs pievienojāt %1$s un izdzēsāt %2$s kā šīs istabas adreses.</string>
-    <string name="notice_room_aliases_added_and_removed">%1$s pievienoja %2$s un izdzēsa %3$s kā šīs istabas adreses.</string>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="zero">Jūs izdzēsāt %1$s kā šīs istabas adresi.</item>
-        <item quantity="one">Jūs izdzēsāt %1$s kā šīs istabas adreses.</item>
-        <item quantity="other">Jūs izdzēsāt %1$s kā šīs istabas adreses.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="zero">%1$s izdzēsa %2$s kā šīs istabas adresi.</item>
-        <item quantity="one">%1$s izdzēsa %2$s kā šīs istabas adreses.</item>
-        <item quantity="other">%1$s izdzēsa %2$s kā šīs istabas adreses.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="zero">Jūs pievienojāt %1$s kā šīs istabas adresi.</item>
-        <item quantity="one">Jūs pievienojāt %1$s kā šīs istabas adreses.</item>
-        <item quantity="other">Jūs pievienojāt %1$s kā šīs istabas adreses.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="zero">%1$s pievienoja %2$s kā šīs istabas adresi.</item>
-        <item quantity="one">%1$s pievienoja %2$s kā šis istabas adreses.</item>
-        <item quantity="other">%1$s pievienoja %2$s kā šīs istabas adreses.</item>
-    </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">Jūs atsaucāt %1$s uzaicinājumu. Iemesls: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s atsauca uzaicinājumu %2$s. Iemesls: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Jūs pieņēmāt uzaicinājumu %1$s. Iemesls: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s pieņēma uzaicinājumu %2$s. Iemesls: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Jūs atsaucāt uzaicinājumu %1$s pievienoties istabai. Iemesls: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s atsauca uzaicinājumu %2$s pievienoties istabai. Iemesls: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Jūs nosūtījāt uzaicinājumu %1$s pievienoties istabai. Iemesls: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s nosūtīja uzaicinājumu %2$s pievienoties istabai. Iemesls: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Jūs liedzāt pieeju %1$s. Iemesls: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s liedza pieeju %2$s. Iemesls: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Jūs atcēlāt pieejas liegumu %1$s. Iemesls: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s atcēla %2$s pieejas liegumu. Iemesls: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Jūs padzināt %1$s. Iemesls: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s padzina %2$s. Iemesls: %3$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Jūs noraidījāt uzaicinājumu. Iemesls: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s noraidīja uzaicinājumu. Iemesls: %2$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Jūs izgājāt. Iemesls: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s izgāja. Iemels: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Jūs pametāt istabu. Iemesls: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s pameta istabu. Iemesls: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Jūs pievienojāties. Iemesls: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s pievienojās. Iemesls: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Jūs pievienojāties istabai. Iemesls: %1$s</string>
-    <string name="notice_room_join_with_reason">%1$s pievienojās istabai. Iemesls: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s uzaicināja jūs. Iemesls: %2$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Jūs uzaicinājāt %1$s. Iemesls: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s uzaicināja %2$s. Iemesls: %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Jūsu uzaicinājums. Iemesls: %1$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s uzaicinājums. Iemesls: %2$s</string>
-    <string name="clear_timeline_send_queue">Notīrīt sūtīšanas rindu</string>
-    <string name="event_status_sending_message">Sūta ziņu…</string>
-    <string name="initial_sync_start_importing_account_data">Sākotnējā sinhronizācija:
-\nImportē konta datus</string>
-    <string name="initial_sync_start_importing_account_groups">Sākotnējā sinhronizācija:
-\nImportē kopienas</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Sākotnējā sinhronizācija:
-\nImportē pamestās istabas</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Sākotnējā sinhronizācija:
-\nImportē istabas, uz kurām uzaicināts</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Sākotnējā sinhronizācija:
-\nImportē istabas, kurās ieiets</string>
-    <string name="initial_sync_start_importing_account_rooms">Sākotnējā sinhronizācija:
-\nImportē istabas</string>
-    <string name="initial_sync_start_importing_account_crypto">Sākotnējā sinhronizācija:
-\nImportē kriptogrāfiju</string>
-    <string name="initial_sync_start_importing_account">Sākotnējā sinhronizācija:
-\nImportē kontu…</string>
-    <string name="room_displayname_empty_room_was">Tukša istaba (bija %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="zero">%1$s, %2$s, %3$s un %4$d citi</item>
-        <item quantity="one">%1$s, %2$s, %3$s un %4$d cits</item>
-        <item quantity="other">%1$s, %2$s, %3$s un %4$d citi</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s un %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s un %3$s</string>
-    <string name="notice_power_level_diff">%1$s no %2$s uz %3$s</string>
-    <string name="notice_power_level_changed">%1$s nomainīja %2$s pieejas līmeni.</string>
-    <string name="notice_power_level_changed_by_you">Jūs nomainījāt %1$s pieejas līmeni.</string>
-    <string name="power_level_custom_no_value">Pielāgots</string>
-    <string name="power_level_custom">Pielāgots (%1$d)</string>
-    <string name="power_level_default">Noklusējuma</string>
-    <string name="power_level_moderator">Moderators</string>
-    <string name="power_level_admin">Administrators</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Jūs pieņēmāt uzaicinājumu %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Jūs atsaucāt uzaicinājumu %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s atsauca uzaicinājumu %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Jūs atsaucāt uzaicinājumu %1$s pievienoties istabai</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s atsauca uzaicinājumu %2$s pievienoties istabai</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Jūs uzaicinājāt %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s uzaicināja %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Jūs nosūtījāt %1$s uzaicinājumu pievienoties istabai</string>
-    <string name="notice_profile_change_redacted_by_you">Jūs atjaunojāt savu profilu %1$s</string>
-    <string name="notice_event_redacted_by_with_reason">%1$s izdzēsa ziņu [iemesls: %2$s]</string>
-    <string name="notice_event_redacted_with_reason">Ziņa izdzēsta [iemesls: %1$s]</string>
-    <string name="notice_event_redacted_by">%1$s izdzēsa ziņu</string>
-    <string name="notice_event_redacted">Ziņa izdzēsta</string>
-    <string name="notice_room_avatar_removed_by_you">Jūs izdzēsāt istabas avataru</string>
-    <string name="notice_room_avatar_removed">%1$s izdzēsa istabas avataru</string>
-    <string name="notice_room_topic_removed_by_you">Jūs izdzēsāt istabas tematu</string>
-    <string name="notice_room_name_removed_by_you">Jūs dzēsāt istabas nosaukumu</string>
-    <string name="notice_requested_voip_conference_by_you">Jūs pieprasījāt VoIP konferenci</string>
-    <string name="notice_end_to_end_by_you">Jūs ieslēdzāt pilnīgu šifrēšanu (%1$s)</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Jūs padarījāt turpmākās ziņas redzamas %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s padarīja turpmākās ziņas redzamas %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Jūs padarījāt istabas turpmāko ziņu vēsturi redzamu %1$s</string>
-    <string name="notice_ended_call_by_you">Jūs beidzāt zvanu.</string>
-    <string name="notice_answered_call_by_you">Jūs atbildējāt uz zvanu.</string>
-    <string name="notice_call_candidates_by_you">Jūs nosūtījāt datus zvana uzsākšanai.</string>
-    <string name="notice_call_candidates">%s nosūtīja datus zvana uzsākšanai.</string>
-    <string name="notice_placed_voice_call_by_you">Jūs veicāt balss zvanu.</string>
-    <string name="notice_placed_video_call_by_you">Jūs veicāt video zvanu.</string>
-    <string name="notice_room_name_changed_by_you">Jūs nomainījāt istabas nosaukumu uz %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Jūs nomainījāt istabas avataru</string>
-    <string name="notice_room_avatar_changed">%1$s nomainīja istabas avataru</string>
-    <string name="notice_room_topic_changed_by_you">Jūs nomainījāt tematu uz %1$s</string>
-    <string name="notice_display_name_removed_by_you">Jūs dzēsāt savu parādāmo vārdu (iepriekš %1$s)</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-nl/strings.xml b/matrix-sdk-android/src/main/res/values-nl/strings.xml
deleted file mode 100644
index 3216fdb720..0000000000
--- a/matrix-sdk-android/src/main/res/values-nl/strings.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s heeft een afbeelding gestuurd.</string>
-
-    <string name="notice_room_invite_no_invitee">Uitnodiging van %s</string>
-    <string name="notice_room_invite">%1$s heeft %2$s uitgenodigd</string>
-    <string name="notice_room_invite_you">%1$s heeft u uitgenodigd</string>
-    <string name="notice_room_join">%1$s neemt nu deel aan het gesprek</string>
-    <string name="notice_room_leave">%1$s heeft het gesprek verlaten</string>
-    <string name="notice_room_reject">%1$s heeft de uitnodiging geweigerd</string>
-    <string name="notice_room_kick">%1$s heeft %2$s uit het gesprek verwijderd</string>
-    <string name="notice_room_unban">%1$s heeft %2$s ontbannen</string>
-    <string name="notice_room_ban">%1$s heeft %2$s verbannen</string>
-    <string name="notice_room_withdraw">%1$s heeft de uitnodiging van %2$s ingetrokken</string>
-    <string name="notice_avatar_url_changed">%1$s heeft zijn/haar avatar aangepast</string>
-    <string name="notice_display_name_set">%1$s heeft zijn/haar naam aangepast naar %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s heeft zijn/haar naam aangepast van %2$s naar %3$s</string>
-    <string name="notice_display_name_removed">%1$s heeft zijn/haar naam verwijderd (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s heeft het onderwerp veranderd naar: %2$s</string>
-    <string name="notice_room_name_changed">%1$s heeft de gespreksnaam veranderd naar: %2$s</string>
-    <string name="notice_placed_video_call">%s heeft een video-oproep gemaakt.</string>
-    <string name="notice_placed_voice_call">%s heeft een spraakoproep gemaakt.</string>
-    <string name="notice_answered_call">%s heeft de oproep beantwoord.</string>
-    <string name="notice_ended_call">%s heeft opgehangen.</string>
-    <string name="notice_made_future_room_visibility">%1$s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor %2$s</string>
-    <string name="notice_room_visibility_invited">alle deelnemers aan het gesprek, vanaf het punt dat ze zijn uitgenodigd.</string>
-    <string name="notice_room_visibility_joined">alle deelnemers aan het gesprek, vanaf het punt dat ze zijn toegetreden.</string>
-    <string name="notice_room_visibility_shared">alle deelnemers aan het gesprek.</string>
-    <string name="notice_room_visibility_world_readable">iedereen.</string>
-    <string name="notice_room_visibility_unknown">onbekend (%s).</string>
-    <string name="notice_end_to_end">%1$s heeft eind-tot-eind-versleuteling aangezet (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s heeft een VoIP-vergadering aangevraagd</string>
-    <string name="notice_voip_started">VoIP-vergadering gestart</string>
-    <string name="notice_voip_finished">VoIP-vergadering gestopt</string>
-
-    <string name="notice_avatar_changed_too">(avatar is ook veranderd)</string>
-    <string name="notice_room_name_removed">%1$s heeft de gespreksnaam verwijderd</string>
-    <string name="notice_room_topic_removed">%1$s heeft het gespreksonderwerp verwijderd</string>
-    <string name="notice_profile_change_redacted">%1$s heeft zijn/haar profiel %2$s bijgewerkt</string>
-    <string name="notice_room_third_party_invite">%1$s heeft een uitnodiging naar %2$s gestuurd om het gesprek toe te treden</string>
-    <string name="notice_room_third_party_registered_invite">%1$s heeft de uitnodiging voor %2$s aanvaard</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Kan niet ontsleutelen: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Het apparaat van de afzender heeft geen sleutels voor dit bericht gestuurd.</string>
-
-    <!-- Room Screen -->
-    <string name="could_not_redact">Kon niet verwijderd worden</string>
-    <string name="unable_to_send_message">Kan bericht niet verzenden</string>
-
-    <string name="message_failed_to_upload">Uploaden van de afbeelding mislukt</string>
-
-    <!-- general errors -->
-    <string name="network_error">Netwerkfout</string>
-    <string name="matrix_error">Matrix-fout</string>
-
-    <!-- Home Screen -->
-
-    <!-- Last seen time -->
-
-    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">Het is momenteel niet mogelijk om een leeg gesprek opnieuw toe te treden.</string>
-
-    <string name="encrypted_message">Versleuteld bericht</string>
-
-    <!-- medium friendly name -->
-    <string name="medium_email">E-mailadres</string>
-    <string name="medium_phone_number">Telefoonnummer</string>
-
-    <string name="summary_user_sent_sticker">%1$s heeft een sticker gestuurd.</string>
-
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Uitnodiging van %s</string>
-    <string name="room_displayname_room_invite">Gespreksuitnodiging</string>
-    <string name="room_displayname_two_members">%1$s en %2$s</string>
-    <string name="room_displayname_empty_room">Leeg gesprek</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s en 1 andere</item>
-        <item quantity="other">%1$s en %2$d anderen</item>
-    </plurals>
-
-
-    <string name="notice_event_redacted">Bericht verwijderd</string>
-    <string name="notice_event_redacted_by">Bericht verwijderd door %1$s</string>
-    <string name="notice_event_redacted_with_reason">Bericht verwijderd [reden: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Bericht verwijderd door %1$s [reden: %2$s]</string>
-
-    <string name="initial_sync_start_importing_account">Initiële synchronisatie:
-\nAccount wordt geïmporteerd…</string>
-    <string name="initial_sync_start_importing_account_crypto">Initiële synchronisatie:
-\nCrypto wordt geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_rooms">Initiële synchronisatie:
-\nGesprekken worden geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Initiële synchronisatie:
-\nDeelgenomen gesprekken worden geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Initiële synchronisatie:
-\nUitgenodigde gesprekken worden geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisatie:
-\nVerlaten gesprekken worden geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_groups">Initiële synchronisatie:
-\nGemeenschappen worden geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_data">Initiële synchronisatie:
-\nAccountgegevens worden geïmporteerd</string>
-
-    <string name="notice_room_update">%s heeft dit gesprek opgewaardeerd.</string>
-
-    <string name="event_status_sending_message">Bericht wordt verstuurd…</string>
-    <string name="clear_timeline_send_queue">Uitgaande wachtrij legen</string>
-
-    <string name="notice_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s om het gesprek toe te treden ingetrokken</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Uitnodiging van %1$s. Reden: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s heeft %2$s uitgenodigd. Reden: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s heeft u uitgenodigd. Reden: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s neemt nu deel. Reden: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s is weggegaan. Reden: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s heeft de uitnodiging geweigerd. Reden: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s heeft %2$s verwijderd. Reden: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s heeft %2$s ontbannen. Reden: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s heeft %2$s verbannen. Reden: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s heeft %2$s een uitnodiging voor het gesprek gestuurd. Reden: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s heeft de uitnodiging voor %2$s ingetrokken. Reden: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s heeft de uitnodiging voor %2$s aanvaard. Reden: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s heeft de uitnodiging van %2$s ingetrokken. Reden: %3$s</string>
-
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s heeft %2$s als gespreksadres toegevoegd.</item>
-        <item quantity="other">%1$s heeft %2$s als gespreksadressen toegevoegd.</item>
-    </plurals>
-
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s heeft %2$s als gespreksadres verwijderd.</item>
-        <item quantity="other">%1$s heeft %3$s als gespreksadressen verwijderd.</item>
-    </plurals>
-
-    <string name="notice_room_aliases_added_and_removed">%1$s heeft %2$s als gespreksadres toegevoegd en %3$s verwijderd.</string>
-
-    <string name="notice_room_canonical_alias_set">%1$s heeft het hoofdadres voor dit gesprek ingesteld op %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s heeft het hoofdadres voor dit gesprek verwijderd.</string>
-
-    <string name="notice_room_guest_access_can_join">%1$s heeft gasten de toegang tot het gesprek verleend.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s heeft gasten de toegang tot het gesprek verhinderd.</string>
-
-    <string name="notice_end_to_end_ok">%1$s heeft eind-tot-eind-versleuteling ingeschakeld.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s heeft eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %2$s).</string>
-
-
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-nn/strings.xml b/matrix-sdk-android/src/main/res/values-nn/strings.xml
deleted file mode 100644
index 441d568fc3..0000000000
--- a/matrix-sdk-android/src/main/res/values-nn/strings.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="encrypted_message">Kryptert melding</string>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s sende eit bilæte.</string>
-    <string name="summary_user_sent_sticker">%1$s sende eit klistremerke.</string>
-    <string name="notice_room_invite_no_invitee">%s si innbjoding</string>
-    <string name="notice_room_invite">%1$s inviterte %2$s</string>
-    <string name="notice_room_invite_you">%1$s inviterte deg</string>
-    <string name="notice_room_join">%1$s kom inn</string>
-    <string name="notice_room_leave">%1$s forlot rommet</string>
-    <string name="notice_room_reject">%1$s sa nei til innbjodingi</string>
-    <string name="notice_room_kick">%1$s sparka %2$s</string>
-    <string name="notice_room_unban">%1$s slapp %2$s inn att</string>
-    <string name="notice_room_ban">%1$s stengde %2$s ute</string>
-    <string name="notice_room_withdraw">%1$s tok attende %2$s si innbjoding</string>
-    <string name="notice_avatar_url_changed">%1$s byta avataren sin</string>
-    <string name="notice_display_name_set">%1$s sette visingsnamnet sitt som %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s byta visingsnamnet sitt frå %2$s til %3$s</string>
-    <string name="notice_display_name_removed">%1$s tok burt visingsnamnet sitt (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s gjorde emnet til: %2$s</string>
-    <string name="notice_room_name_changed">%1$s gjorde romnamnet til: %2$s</string>
-    <string name="notice_placed_video_call">%s starta ei videosamtala.</string>
-    <string name="notice_placed_voice_call">%s starta ein talesamtale.</string>
-    <string name="notice_answered_call">%s tok røyret.</string>
-    <string name="notice_ended_call">%s la på røyret.</string>
-    <string name="notice_made_future_room_visibility">%1$s gjorde den framtidige romsoga synleg for %2$s</string>
-    <string name="notice_room_visibility_invited">alle rommedlemmar, frå då dei vart invitert inn.</string>
-    <string name="notice_room_visibility_joined">alle rommedlemmar, frå då dei kom inn.</string>
-    <string name="notice_room_visibility_shared">alle rommedlemmar.</string>
-    <string name="notice_room_visibility_world_readable">kven som heldst.</string>
-    <string name="notice_room_visibility_unknown">uvisst (%s).</string>
-    <string name="notice_end_to_end">%1$s skrudde ende-til-ende-kryptering på (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s bad um ei VoIP-gruppasamtala</string>
-    <string name="notice_voip_started">VoIP-gruppasamtala er starta</string>
-    <string name="notice_voip_finished">VoIP-gruppasamtala er ferdug</string>
-    <string name="notice_avatar_changed_too">(avataren vart au byta)</string>
-    <string name="notice_room_name_removed">%1$s tok burt romnamnet</string>
-    <string name="notice_room_topic_removed">%1$s tok burt romemnet</string>
-    <string name="notice_profile_change_redacted">%1$s gjorde um på skildringi si %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s inviterte %2$s til rommet</string>
-    <string name="notice_room_third_party_registered_invite">%1$s sa ja til innbjodingi til %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Fekk ikkje til å dekryptera: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsendareiningi hev ikkje sendt oss nyklane fyr denna meldingi.</string>
-    <string name="could_not_redact">Kunde ikkje gjera um</string>
-    <string name="unable_to_send_message">Fekk ikkje til å senda meldingi</string>
-    <string name="message_failed_to_upload">Fekk ikkje til å lasta biletet upp</string>
-    <string name="network_error">Noko gjekk gale med netverket</string>
-    <string name="matrix_error">Noko gjekk gale med Matrix</string>
-    <string name="room_error_join_failed_empty_room">Det lèt seg fyrebils ikkje gjera å fara inn att i eit tomt rom.</string>
-    <string name="medium_email">Epostadresse</string>
-    <string name="medium_phone_number">Telefonnummer</string>
-    <string name="room_displayname_invite_from">Innbjoding frå %s</string>
-    <string name="room_displayname_room_invite">Rominnbjoding</string>
-    <string name="room_displayname_two_members">%1$s og %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s og 1 til</item>
-        <item quantity="other">%1$s og %2$d til</item>
-    </plurals>
-    <string name="room_displayname_empty_room">Tomt rom</string>
-    <string name="notice_event_redacted">Ei melding vart stroki</string>
-    <string name="notice_event_redacted_by">%1$s strauk meldingi</string>
-    <string name="notice_event_redacted_with_reason">Meldingi vart stroki [av di: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">%1$s strauk meldingi [av di: %2$s]</string>
-    <string name="notice_room_update">%s oppgraderte rommet.</string>
-    <string name="clear_timeline_send_queue">Nullstill sendingskø</string>
-    <string name="notice_room_leave_with_reason">%1$s forlot rommet. Grunn: %2$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-pl/strings.xml b/matrix-sdk-android/src/main/res/values-pl/strings.xml
deleted file mode 100644
index 0d79edc658..0000000000
--- a/matrix-sdk-android/src/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s wysłał(a) zdjęcie.</string>
-
-    <string name="notice_room_invite_no_invitee">Zaproszenie od %s</string>
-    <string name="notice_room_invite">%1$s zaprosił(a) %2$s</string>
-    <string name="notice_room_invite_you">%1$s zaprosił(a) Cię</string>
-    <string name="notice_room_join">%1$s dołączył(a)</string>
-    <string name="notice_room_leave">%1$s opuścił(a)</string>
-    <string name="notice_room_reject">%1$s odrzucił(a) zaproszenie</string>
-    <string name="notice_room_kick">%1$s wyrzucił(a) %2$s</string>
-    <string name="notice_room_unban">%1$s odblokował(a) %2$s</string>
-    <string name="notice_room_ban">%1$s zablokował(a) %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s zmienił(a) awatar</string>
-    <string name="notice_display_name_set">%1$s zmienił(a) wyświetlaną nazwę na %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s zmienił(a) wyświetlaną nazwę z %2$s na %3$s</string>
-    <string name="notice_display_name_removed">%1$s usunął(-ęła) swoją wyświetlaną nazwę (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s zmienił(a) temat na: %2$s</string>
-    <string name="unable_to_send_message">Nie można wysłać wiadomości</string>
-
-    <string name="message_failed_to_upload">Przesyłanie zdjęcia nie powiodło się</string>
-
-    <string name="network_error">Błąd sieci</string>
-    <string name="matrix_error">Błąd Matrixa</string>
-
-    <string name="encrypted_message">Wiadomość zaszyfrowana</string>
-
-    <string name="medium_email">Adres e-mail</string>
-    <string name="medium_phone_number">Numer telefonu</string>
-
-    <string name="notice_room_visibility_shared">wszyscy członkowie pokoju.</string>
-    <string name="notice_room_visibility_world_readable">wszyscy.</string>
-    <string name="notice_room_name_changed">%1$s zmienił(a) nazwę pokoju na: %2$s</string>
-    <string name="notice_ended_call">%s zakończył(a) rozmowę.</string>
-    <string name="notice_room_name_removed">%1$s usunął(-ęła) nazwę pokoju</string>
-    <string name="notice_room_topic_removed">%1$s usunął(-ęła) temat pokoju</string>
-    <string name="summary_user_sent_sticker">%1$s wysłał(a) naklejkę.</string>
-
-    <string name="notice_end_to_end">%1$s włączył(a) szyfrowanie end-to-end (%2$s)</string>
-
-    <string name="notice_room_withdraw">%1$s wycofał(a) zaproszenie %2$s</string>
-    <string name="notice_answered_call">%s odebrał(a) połączenie.</string>
-    <string name="notice_avatar_changed_too">(awatar też został zmieniony)</string>
-
-    <string name="room_displayname_invite_from">Zaproszenie od %s</string>
-    <string name="room_displayname_room_invite">Zaproszenie do pokoju</string>
-    <string name="room_displayname_two_members">%1$s i %2$s</string>
-    <string name="room_displayname_empty_room">Pusty pokój</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s i jeden inny</item>
-        <item quantity="few">%1$s i kilku innych</item>
-        <item quantity="many">%1$s i %2$d innych</item>
-        <item quantity="other" />
-    </plurals>
-
-    <string name="notice_crypto_unable_to_decrypt">** Nie można odszyfrować: %s **</string>
-    <string name="notice_placed_video_call">%s wykonał(a) rozmowę wideo.</string>
-    <string name="notice_placed_voice_call">%s wykonał(a) połączenie głosowe.</string>
-    <string name="notice_made_future_room_visibility">%1$s uczynił(a) przyszłą historię pokoju widoczną dla %2$s</string>
-    <string name="notice_room_visibility_invited">wszyscy członkowie pokoju, od momentu w którym zostali zaproszeni.</string>
-    <string name="notice_room_visibility_joined">wszyscy członkowie pokoju, od momentu w którym dołączyli.</string>
-    <string name="notice_room_visibility_unknown">nieznane (%s).</string>
-    <string name="notice_requested_voip_conference">%1$s zażądał(a) grupowego połączenia VoIP</string>
-    <string name="notice_voip_started">Rozpoczęto grupowe połączenie głosowe VoIP</string>
-    <string name="notice_voip_finished">Zakończono grupowe połączenie głosowe VoIP</string>
-
-    <string name="notice_profile_change_redacted">%1$s zaktualizował swój profil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s wysłał(a) zaproszenie do %2$s aby dołączył(a) do tego pokoju</string>
-    <string name="notice_room_third_party_registered_invite">%1$s zaakceptował(a) zaproszenie dla %2$s</string>
-
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Urządzenie nadawcy nie wysłało nam kluczy do tej wiadomości.</string>
-
-    <string name="could_not_redact">Nie można zredagować</string>
-    <string name="room_error_join_failed_empty_room">Obecnie nie jest możliwe ponowne dołączenie do pustego pokoju.</string>
-
-    <string name="notice_event_redacted">Wiadomość usunięta</string>
-    <string name="notice_event_redacted_by">Wiadomość usunięta przez %1$s</string>
-    <string name="notice_event_redacted_with_reason">Wiadomość usunięta [powód: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Wiadomość usunięta przez %1$s [powód: %2$s]</string>
-    <string name="notice_room_update">%s zakutalizował(a) ten pokój.</string>
-
-    <string name="initial_sync_start_importing_account">Synchronizacja początkowa:
-\nImportowanie konta…</string>
-    <string name="initial_sync_start_importing_account_crypto">Synchronizacja początkowa:
-\nImportowanie kryptografii</string>
-    <string name="initial_sync_start_importing_account_rooms">Synchronizacja początkowa:
-\nImportowanie Pokoi</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Synchronizacja początkowa:
-\nImportowanie dołączonych Pokoi</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Synchronizacja początkowa:
-\nImportowanie zaproszonych Pokoi</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Synchronizacja początkowa:
-\nImportowanie opuszczonych Pokoi</string>
-    <string name="initial_sync_start_importing_account_groups">Synchronizacja początkowa:
-\nImportowanie Społeczności</string>
-    <string name="initial_sync_start_importing_account_data">Synchronizacja początkowa:
-\nImportowanie danych Konta</string>
-
-    <string name="event_status_sending_message">Wysyłanie wiadomości…</string>
-    <string name="clear_timeline_send_queue">Wyczyść kolejkę wysyłania</string>
-
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 95c1331690..0000000000
--- a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s enviou uma foto.</string>
-    <string name="notice_room_invite_no_invitee">convite de %s</string>
-    <string name="notice_room_invite">%1$s convidou %2$s</string>
-    <string name="notice_room_invite_you">%1$s convidou você</string>
-    <string name="notice_room_join">%1$s entrou na sala</string>
-    <string name="notice_room_leave">%1$s saiu da sala</string>
-    <string name="notice_room_reject">%1$s recusou o convite</string>
-    <string name="notice_room_kick">%1$s removeu %2$s</string>
-    <string name="notice_room_unban">%1$s removeu o banimento de %2$s</string>
-    <string name="notice_room_ban">%1$s baniu %2$s</string>
-    <string name="notice_room_withdraw">%1$s desfez o convite a %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s alterou a foto de perfil</string>
-    <string name="notice_display_name_set">%1$s definiu o nome e sobrenome como %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s alterou o nome e sobrenome de %2$s para %3$s</string>
-    <string name="notice_display_name_removed">%1$s removeu o nome e sobrenome (era %2$s)</string>
-    <string name="notice_room_topic_changed">%1$s alterou a descrição para: %2$s</string>
-    <string name="notice_room_name_changed">%1$s alterou o nome da sala para: %2$s</string>
-    <string name="notice_placed_video_call">%s iniciou uma chamada de vídeo.</string>
-    <string name="notice_placed_voice_call">%s iniciou uma chamada de voz.</string>
-    <string name="notice_answered_call">%s aceitou a chamada.</string>
-    <string name="notice_ended_call">%s encerrou a chamada.</string>
-    <string name="notice_made_future_room_visibility">%1$s deixou o histórico futuro da sala visível para %2$s</string>
-    <string name="notice_room_visibility_invited">todos os participantes da sala, a partir do momento em que foram convidados.</string>
-    <string name="notice_room_visibility_joined">todos os participantes da sala, a partir do momento em que entraram nela.</string>
-    <string name="notice_room_visibility_shared">todos os participantes da sala.</string>
-    <string name="notice_room_visibility_world_readable">qualquer pessoa.</string>
-    <string name="notice_room_visibility_unknown">desconhecido (%s).</string>
-    <string name="notice_end_to_end">%1$s ativou a criptografia de ponta a ponta (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s deseja iniciar uma chamada em grupo</string>
-    <string name="notice_voip_started">Chamada em grupo iniciada</string>
-    <string name="notice_voip_finished">Chamada em grupo encerrada</string>
-    <string name="notice_avatar_changed_too">(a foto de perfil também foi alterada)</string>
-    <string name="notice_room_name_removed">%1$s removeu o nome da sala</string>
-    <string name="notice_room_topic_removed">%1$s removeu a descrição da sala</string>
-    <string name="notice_profile_change_redacted">%1$s atualizou o perfil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s enviou um convite para %2$s entrar na sala</string>
-    <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Não foi possível descriptografar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">O aparelho do remetente não nos enviou as chaves para esta mensagem.</string>
-    <!-- Room Screen -->
-    <string name="could_not_redact">Não foi possível redigir</string>
-    <string name="unable_to_send_message">Não foi possível enviar a mensagem</string>
-    <string name="message_failed_to_upload">O envio da imagem falhou</string>
-    <!-- general errors -->
-    <string name="network_error">Erro de conexão à internet</string>
-    <string name="matrix_error">Erro no servidor Matrix</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">Atualmente, não é possível entrar novamente em uma sala vazia.</string>
-    <string name="encrypted_message">Mensagem criptografada</string>
-    <!-- medium friendly name -->
-    <string name="medium_email">Endereço de e-mail</string>
-    <string name="medium_phone_number">Número de telefone</string>
-    <string name="summary_user_sent_sticker">%1$s enviou uma figurinha.</string>
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Convite de %s</string>
-    <string name="room_displayname_room_invite">Convite para sala</string>
-    <string name="room_displayname_two_members">%1$s e %2$s</string>
-    <string name="room_displayname_empty_room">Sala vazia</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s e 1 outro</item>
-        <item quantity="other">%1$s e %2$d outros</item>
-    </plurals>
-    <string name="summary_you_sent_image">Você enviou uma foto.</string>
-    <string name="summary_you_sent_sticker">Você enviou uma figurinha.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Seu convite</string>
-    <string name="notice_room_created">%1$s criou a sala</string>
-    <string name="notice_room_created_by_you">Você criou a sala</string>
-    <string name="notice_room_invite_by_you">Você convidou %1$s</string>
-    <string name="notice_room_join_by_you">Você entrou na sala</string>
-    <string name="notice_room_leave_by_you">Você saiu da sala</string>
-    <string name="notice_room_reject_by_you">Você recusou o convite</string>
-    <string name="notice_room_kick_by_you">Você removeu %1$s</string>
-    <string name="notice_room_unban_by_you">Você removeu o banimento de %1$s</string>
-    <string name="notice_room_ban_by_you">Você baniu %1$s</string>
-    <string name="notice_room_withdraw_by_you">Você desfez o convite a %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Você alterou a sua foto de perfil</string>
-    <string name="notice_display_name_set_by_you">Você definiu o seu nome e sobrenome como %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">Você alterou o seu nome e sobrenome de %1$s para %2$s</string>
-    <string name="notice_display_name_removed_by_you">Você removeu o seu nome e sobrenome (era %1$s)</string>
-    <string name="notice_room_topic_changed_by_you">Você alterou a descrição para: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s alterou a foto da sala</string>
-    <string name="notice_room_avatar_changed_by_you">Você alterou a foto da sala</string>
-    <string name="notice_room_name_changed_by_you">Você alterou o nome da sala para: %1$s</string>
-    <string name="notice_placed_video_call_by_you">Você iniciou uma chamada de vídeo.</string>
-    <string name="notice_placed_voice_call_by_you">Você iniciou uma chamada de voz.</string>
-    <string name="notice_call_candidates">%s enviou dados para configurar a chamada.</string>
-    <string name="notice_call_candidates_by_you">Você enviou dados para configurar a chamada.</string>
-    <string name="notice_answered_call_by_you">Você aceitou a chamada.</string>
-    <string name="notice_ended_call_by_you">Você encerrou a chamada.</string>
-    <string name="notice_made_future_room_visibility_by_you">Você deixou o histórico futuro da sala visível para %1$s</string>
-    <string name="notice_end_to_end_by_you">Você ativou a criptografia de ponta a ponta (%1$s)</string>
-    <string name="notice_room_update">%s atualizou esta sala.</string>
-    <string name="notice_room_update_by_you">Você atualizou esta sala.</string>
-    <string name="notice_requested_voip_conference_by_you">Você solicitou uma chamada em grupo</string>
-    <string name="notice_room_name_removed_by_you">Você removeu o nome da sala</string>
-    <string name="notice_room_topic_removed_by_you">Você removeu a descrição da sala</string>
-    <string name="notice_room_avatar_removed">%1$s removeu a foto da sala</string>
-    <string name="notice_room_avatar_removed_by_you">Você removeu a foto da sala</string>
-    <string name="notice_event_redacted">Mensagem apagada</string>
-    <string name="notice_event_redacted_by">Mensagem apagada por %1$s</string>
-    <string name="notice_event_redacted_with_reason">Mensagem apagada [motivo: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Mensagem apagada por %1$s [motivo: %2$s]</string>
-    <string name="notice_profile_change_redacted_by_you">Você atualizou o seu perfil %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Você enviou um convite para %1$s entrar na sala</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s cancelou o convite a %2$s para entrar na sala</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Você cancelou o convite a %1$s para entrar na sala</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Você aceitou o convite para %1$s</string>
-    <string name="notice_widget_added">%1$s adicionou o widget %2$s</string>
-    <string name="notice_widget_added_by_you">Você adicionou o widget %1$s</string>
-    <string name="notice_widget_removed">%1$s removeu o widget %2$s</string>
-    <string name="notice_widget_removed_by_you">Você removeu o widget %1$s</string>
-    <string name="notice_widget_modified">%1$s editou o widget %2$s</string>
-    <string name="notice_widget_modified_by_you">Você editou o widget %1$s</string>
-    <string name="power_level_admin">Administrador</string>
-    <string name="power_level_moderator">Moderador</string>
-    <string name="power_level_default">Padrão</string>
-    <string name="power_level_custom">Personalizado (%1$d)</string>
-    <string name="power_level_custom_no_value">Personalizado</string>
-    <string name="notice_power_level_changed_by_you">Você alterou o nível de permissão de %1$s.</string>
-    <string name="notice_power_level_changed">%1$s alterou o nível de permissão de %2$s.</string>
-    <string name="notice_power_level_diff">%1$s de %2$s para %3$s</string>
-    <string name="initial_sync_start_importing_account">Primeira sincronização:
-\nImportando a conta…</string>
-    <string name="initial_sync_start_importing_account_crypto">Primeira sincronização:
-\nImportando as chaves de criptografia</string>
-    <string name="initial_sync_start_importing_account_rooms">Primeira sincronização:
-\nImportando as salas</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Primeira sincronização:
-\nImportando as salas em que você entrou</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Primeira sincronização:
-\nImportando as salas em que você foi convidado</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Primeira sincronização:
-\nImportando as salas em que você saiu</string>
-    <string name="initial_sync_start_importing_account_groups">Primeira sincronização:
-\nImportando as comunidades</string>
-    <string name="initial_sync_start_importing_account_data">Primeira sincronização:
-\nImportando os dados da conta</string>
-    <string name="event_status_sending_message">Enviando mensagem…</string>
-    <string name="clear_timeline_send_queue">Limpar a fila de envio</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Motivo: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">O seu convite. Motivo: %1$s</string>
-    <string name="notice_room_invite_with_reason">%1$s convidou %2$s. Motivo: %3$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Você convidou %1$s. Motivo: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s convidou você. Motivo: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s entrou na sala. Motivo: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Você entrou na sala. Motivo: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s saiu da sala. Motivo: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Você saiu da sala. Motivo: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s recusou o convite. Motivo: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Você recusou o convite. Motivo: %1$s</string>
-    <string name="notice_room_kick_with_reason">%1$s removeu %2$s. Motivo: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Você removeu %1$s. Motivo: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s removeu o banimento de %2$s. Motivo: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Você removeu o banimento de %1$s. Motivo: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s baniu %2$s. Motivo: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Você baniu %1$s. Motivo: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s enviou um convite para %2$s entrar na sala. Motivo: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Você enviou um convite para %1$s entrar na sala. Motivo: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revogou o convite para %2$s entrar na sala. Motivo: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Você revogou o convite para %1$s entrar na sala. Motivo: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s aceitou o convite para %2$s. Motivo: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Você aceitou o convite para %1$s. Motivo: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s desfez o convite de %2$s. Motivo: %3$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Você desfez o convite de %1$s. Motivo: %2$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s adicionou %2$s como um endereço desta sala.</item>
-        <item quantity="other">%1$s adicionou %2$s como endereços desta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Você adicionou %1$s como um endereço desta sala.</item>
-        <item quantity="other">Você adicionou %1$s como endereços desta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s removeu %2$s como um endereço desta sala.</item>
-        <item quantity="other">%1$s removeu %2$s como endereços desta sala.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Você removeu %1$s como um endereço desta sala.</item>
-        <item quantity="other">Você removeu %1$s como endereços desta sala.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s adicionou %2$s e removeu %3$s como endereços desta sala.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Você adicionou %1$s e removeu %2$s como endereços desta sala.</string>
-    <string name="notice_room_canonical_alias_set">%1$s definiu o endereço principal desta sala como %2$s.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Você definiu o endereço principal desta sala como %1$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s removeu o endereço principal desta sala.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Você removeu o endereço principal desta sala.</string>
-    <string name="notice_room_guest_access_can_join">%1$s permitiu que convidados entrem na sala.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Você permitiu que convidados entrem na sala.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s impediu que convidados entrassem na sala.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Você impediu que convidados entrassem na sala.</string>
-    <string name="notice_end_to_end_ok">%1$s ativou a criptografia de ponta a ponta.</string>
-    <string name="notice_end_to_end_ok_by_you">Você ativou a criptografia de ponta a ponta.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s ativou a criptografia de ponta a ponta (algoritmo não reconhecido %2$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Você ativou a criptografia de ponta a ponta (algoritmo não reconhecido %1$s).</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Você impediu que desconhecidos entrem na sala.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s impediu que desconhecidos entrem na sala.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Você permitiu que desconhecidos entrem aqui.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s permitiu que desconhecidos entrem aqui.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Você saiu. Motivo: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s saiu. Motivo: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Você entrou. Motivo: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s entrou. Motivo: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Você cancelou o convite para %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s cancelou o convite para %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Você convidou %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s convidou %2$s</string>
-    <string name="notice_direct_room_update_by_you">Você atualizou esta sala.</string>
-    <string name="notice_direct_room_update">%s atualizou esta sala.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Você definiu que as mensagens enviadas a partir do presente momento estarão disponíveis para %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s definiu que as mensagens enviadas a partir do presente momento estarão disponíveis para %2$s</string>
-    <string name="notice_direct_room_leave_by_you">Você saiu da sala</string>
-    <string name="notice_direct_room_leave">%1$s saiu da sala</string>
-    <string name="notice_direct_room_join_by_you">Você entrou</string>
-    <string name="notice_direct_room_join">%1$s entrou</string>
-    <string name="notice_direct_room_created_by_you">Você criou a sala</string>
-    <string name="notice_direct_room_created">%1$s criou a sala</string>
-    <string name="room_displayname_empty_room_was">Sala vazia (era %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s e %4$d outro</item>
-        <item quantity="other">%1$s, %2$s, %3$s e %4$d outros</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s e %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s e %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Todos os servidores estão proibidos de participar! Esta sala não pode mais ser usada.</string>
-    <string name="notice_room_server_acl_updated_no_change">Nenhuma alteração.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servidores correspondentes aos IP literais agora estão banidos.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servidores correspondentes aos IP literais agora estão permitidos.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Servidores correspondentes à %s foram removidos da lista de permitidos.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Servidores correspondentes à %s agora são permitidos.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Servidores correspondente à %s foram removidos da lista de banidos.</string>
-    <string name="notice_room_server_acl_updated_banned">• Servidores correspondentes à %s foram banidos.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Você alterou a lista de controle de acesso (ACL) do servidor para esta sala.</string>
-    <string name="notice_room_server_acl_updated_title">%s alterou a lista de controle de acesso (ACL) do servidor para esta sala.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servidores correspondentes aos IP literais estão banidos.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servidores correspondentes aos IP literais estão permitidos.</string>
-    <string name="notice_room_server_acl_set_allowed">• Servidores correspondentes à %s estão permitidos.</string>
-    <string name="notice_room_server_acl_set_banned">• Servidores correspondentes à %s estão banidos.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Você definiu a lista de controle de acesso (ACL) do servidor para esta sala.</string>
-    <string name="notice_room_server_acl_set_title">%s definiu a lista de controle de acesso (ACL) do servidor para esta sala.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Você alterou os endereços alternativos desta sala.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s alterou os endereços alternativos desta sala.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Você removeu o endereço alternativo %1$s para esta sala.</item>
-        <item quantity="other">Você removeu os endereços alternativos %1$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s removeu o endereço alternativo %2$s para esta sala.</item>
-        <item quantity="other">%1$s removeu os endereços alternativos %2$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Você adicionou o endereço alternativo %1$s para esta sala.</item>
-        <item quantity="other">Você adicionou os endereços alternativos %1$s para esta sala.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s adicionou o endereço alternativo %2$s para esta sala.</item>
-        <item quantity="other">%1$s adicionou os endereços alternativos %2$s para esta sala.</item>
-    </plurals>
-    <string name="notice_room_canonical_alias_no_change_by_you">Você alterou os endereços desta sala.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s alterou os endereços desta sala.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Você alterou os endereços principal e alternativos desta sala.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s alterou os endereços principal e alternativos desta sala.</string>
-    <string name="notice_widget_jitsi_modified_by_you">Você modificou a chamada de vídeo</string>
-    <string name="notice_widget_jitsi_modified">Chamada de vídeo modificada por %1$s</string>
-    <string name="notice_widget_jitsi_removed_by_you">Você encerrou a chamada de vídeo</string>
-    <string name="notice_widget_jitsi_removed">Chamada de vídeo encerrada por %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">Você começou uma chamada de vídeo</string>
-    <string name="notice_widget_jitsi_added">Chamada de vídeo iniciada por %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-pt/strings.xml b/matrix-sdk-android/src/main/res/values-pt/strings.xml
deleted file mode 100644
index 4bc90cf0cb..0000000000
--- a/matrix-sdk-android/src/main/res/values-pt/strings.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s enviou uma imagem.</string>
-
-    <string name="notice_room_invite_no_invitee">convite de %s</string>
-    <string name="notice_room_invite">%1$s convidou %2$s</string>
-    <string name="notice_room_invite_you">%1$s convidou-o</string>
-    <string name="notice_room_join">%1$s entrou</string>
-    <string name="notice_room_leave">%1$s saiu</string>
-    <string name="notice_room_reject">%1$s recusou o convite</string>
-    <string name="notice_room_kick">%1$s expulsou %2$s</string>
-    <string name="notice_room_unban">%1$s des-baniu %2$s</string>
-    <string name="notice_room_ban">%1$s baniu %2$s</string>
-    <string name="notice_room_withdraw">%1$s cancelou o convite de %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s mudou o seu avatar</string>
-    <string name="notice_display_name_set">%1$s definiu seu nome público como %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s alterou seu nome público de %2$s para %3$s</string>
-    <string name="notice_display_name_removed">%1$s apagou o seu nome público (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s alterou o tópico desta sala para: %2$s</string>
-    <string name="notice_room_name_changed">%1$s alterou o nome desta sala para: %2$s</string>
-    <string name="notice_placed_video_call">%s iniciou uma chamada de vídeo.</string>
-    <string name="notice_placed_voice_call">%s iniciou uma chamada de voz.</string>
-    <string name="notice_answered_call">%s respondeu à chamada.</string>
-    <string name="notice_ended_call">%s terminou a chamada.</string>
-    <string name="notice_made_future_room_visibility">%1$s tornou o histórico futuro desta sala visível para %2$s</string>
-    <string name="notice_room_visibility_invited">todas os membros que integram esta sala, a partir do momento em que foram convidados.</string>
-    <string name="notice_room_visibility_joined">todas os membros da sala, a partir do momento em que entraram.</string>
-    <string name="notice_room_visibility_shared">todas os membros da sala.</string>
-    <string name="notice_room_visibility_world_readable">todos.</string>
-    <string name="notice_room_visibility_unknown">desconhecida (%s).</string>
-    <string name="notice_end_to_end">%1$s ativou a criptografia ponta-a-ponta (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s solicitou uma conferência VoIP</string>
-    <string name="notice_voip_started">A conferência VoIP começou</string>
-    <string name="notice_voip_finished">A conferência VoIP terminou</string>
-
-    <string name="notice_avatar_changed_too">(o avatar também foi alterado)</string>
-    <string name="notice_room_name_removed">%1$s removeu o nome da sala</string>
-    <string name="notice_room_topic_removed">%1$s removeu o tópico da sala</string>
-    <string name="notice_profile_change_redacted">%1$s atualizou o seu perfil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s enviou um convite para que %2$s se junte à sala</string>
-    <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Impossível decifrar: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">O dispositivo de quem enviou a mensagem não nos enviou as chaves para esta mensagem.</string>
-
-    <!-- Room Screen -->
-    <string name="could_not_redact">Não foi possível apagar</string>
-    <string name="unable_to_send_message">Não foi possível enviar a mensagem</string>
-
-    <string name="message_failed_to_upload">O envio da imagem falhou</string>
-
-    <!-- general errors -->
-    <string name="network_error">Erro de conexão à Internet</string>
-    <string name="matrix_error">Erro do Matrix</string>
-
-    <!-- Home Screen -->
-
-    <!-- Last seen time -->
-
-    <!-- call events -->
-
-    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">Ainda não é possível voltar a entrar numa sala vazia.</string>
-
-    <string name="encrypted_message">Mensagem cifrada</string>
-
-    <!-- medium friendly name -->
-    <string name="medium_email">Endereço de e-mail</string>
-    <string name="medium_phone_number">Número de telefone</string>
-
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Convite de %s</string>
-    <string name="room_displayname_room_invite">Convite para sala</string>
-    <string name="room_displayname_two_members">%1$s e %2$s</string>
-    <string name="room_displayname_empty_room">Sala vazia</string>
-
-
-    <string name="summary_user_sent_sticker">%1$s enviou um sticker.</string>
-
-    <string name="notice_room_update">%s fez o upgrade da sala.</string>
-
-    <string name="notice_event_redacted">Mensagem removida</string>
-    <string name="notice_event_redacted_by">Mensagem removida por %1$s</string>
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-ru/strings.xml b/matrix-sdk-android/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 1236dd358a..0000000000
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s отправил(а) изображение.</string>
-    <string name="notice_room_invite_no_invitee">%s приглашение</string>
-    <string name="notice_room_invite">%1$s пригласил(а) %2$s</string>
-    <string name="notice_room_invite_you">%1$s пригласил(а) вас</string>
-    <string name="notice_room_join">%1$s вошёл(ла) в комнату</string>
-    <string name="notice_room_leave">%1$s покинул(а) комнату</string>
-    <string name="notice_room_reject">%1$s отклонил(а) приглашение</string>
-    <string name="notice_room_kick">%1$s выгнан %2$s</string>
-    <string name="notice_room_unban">%1$s разблокировал(а) %2$s</string>
-    <string name="notice_room_ban">%1$s заблокировал(а) %2$s</string>
-    <string name="notice_room_withdraw">%1$s отозвал(а) приглашение %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s изменил(а) свой аватар</string>
-    <string name="notice_display_name_set">%1$s установил(а) имя %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s изменил(а) имя с %2$s на %3$s</string>
-    <string name="notice_display_name_removed">%1$s удалил(а) свое имя (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s изменил(а) тему на: %2$s</string>
-    <string name="notice_room_name_changed">%1$s изменил(а) название комнаты: %2$s</string>
-    <string name="notice_placed_video_call">%s начал(а) видеовызов.</string>
-    <string name="notice_placed_voice_call">%s начал(а) голосовой вызов.</string>
-    <string name="notice_answered_call">%s ответил(а) на звонок.</string>
-    <string name="notice_ended_call">%s завершил(а) вызов.</string>
-    <string name="notice_made_future_room_visibility">%1$s сделал(а) будущую историю комнаты видимой %2$s</string>
-    <string name="notice_room_visibility_invited">всем членам, с момента их приглашения.</string>
-    <string name="notice_room_visibility_joined">всем членам, с момента присоединения.</string>
-    <string name="notice_room_visibility_shared">всем членам.</string>
-    <string name="notice_room_visibility_world_readable">всем.</string>
-    <string name="notice_room_visibility_unknown">неизвестно (%s).</string>
-    <string name="notice_end_to_end">%1$s включил(а) сквозное шифрование (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s запросил(а) VoIP конференцию</string>
-    <string name="notice_voip_started">VoIP-конференция начата</string>
-    <string name="notice_voip_finished">VoIP-конференция завершена</string>
-    <string name="notice_avatar_changed_too">(аватар также был изменен)</string>
-    <string name="notice_room_name_removed">%1$s удалил(а) название комнаты</string>
-    <string name="notice_room_topic_removed">%1$s удалил(а) тему комнаты</string>
-    <string name="notice_profile_change_redacted">%1$s обновил(а) свой профиль %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s отправил(а) приглашение %2$s присоединиться к комнате</string>
-    <string name="notice_room_third_party_registered_invite">%1$s принял(а) приглашение от %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Невозможно расшифровать: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Устройство отправителя не предоставило нам ключ для расшифровки этого сообщения.</string>
-    <!-- Room Screen -->
-    <string name="could_not_redact">Не удалось изменить</string>
-    <string name="unable_to_send_message">Не удалось отправить сообщение</string>
-    <string name="message_failed_to_upload">Не удалось загрузить изображение</string>
-    <!-- general errors -->
-    <string name="network_error">Сетевая ошибка</string>
-    <string name="matrix_error">Ошибка Matrix</string>
-    <!-- Home Screen -->
-    <!-- Last seen time -->
-    <!-- call events -->
-    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">В настоящее время невозможно вновь присоединиться к пустой комнате.</string>
-    <string name="encrypted_message">Зашифрованное сообщение</string>
-    <!-- medium friendly name -->
-    <string name="medium_email">Адрес электронной почты</string>
-    <string name="medium_phone_number">Номер телефона</string>
-    <string name="summary_user_sent_sticker">%1$s отправил стикер.</string>
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Приглашение от %s</string>
-    <string name="room_displayname_room_invite">Приглашение в комнату</string>
-    <string name="room_displayname_two_members">%1$s и %2$s</string>
-    <string name="room_displayname_empty_room">Пустая комната</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s и 1 другой</item>
-        <item quantity="few">%1$s и %2$d другие</item>
-        <item quantity="many">%1$s и %2$d других</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="notice_event_redacted">Сообщение удалено</string>
-    <string name="notice_event_redacted_by">%1$s удалил(а) сообщение</string>
-    <string name="notice_event_redacted_with_reason">Сообщение удалено [причина: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">%1$s удалил(а) сообщение [причина: %2$s]</string>
-    <string name="initial_sync_start_importing_account">Начальная синхронизация:
-\nИмпорт учетной записи…</string>
-    <string name="initial_sync_start_importing_account_crypto">Начальная синхронизация:
-\nИмпорт криптографии</string>
-    <string name="initial_sync_start_importing_account_rooms">Начальная синхронизация:
-\nИмпорт комнат</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Синхронизация начата: 
-\nИмпорт присоединенных комнат</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Синхронизация начата: 
-\nИмпорт приглашенных комнат</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Начальная синхронизация:
-\nИмпорт покинутых комнат</string>
-    <string name="initial_sync_start_importing_account_groups">Начальная синхронизация:
-\nИмпорт сообществ</string>
-    <string name="initial_sync_start_importing_account_data">Начальная синхронизация:
-\nИмпорт данных учетной записи</string>
-    <string name="notice_room_update">%s обновил эту комнату.</string>
-    <string name="event_status_sending_message">Отправка сообщения…</string>
-    <string name="clear_timeline_send_queue">Очистить очередь отправки</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s отозвал приглашение %2$s присоединиться к комнате</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Приглашение %1$s. Причина: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s приглашен %2$s. Причина: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s пригласил вас. Причина: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s вошёл(ла) в комнату. Причина: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s покинул(а) комнату. Причина: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s отклонил приглашение. Причина: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s выгнали %2$s. Причина: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s разблокировано %2$s. Причина: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s забанен %2$s. Причина: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s отправил приглашение %2$s в комнату. Причина: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s отозвал приглашение %2$s присоединиться к комнате. Причина: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s принял приглашение для %2$s. Причина: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s отозвал приглашение %2$s. Причина: %3$s</string>
-    <string name="notice_room_created">%1$s создал(а) комнату</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s добавил(а) %2$s в качестве адреса для этой комнаты.</item>
-        <item quantity="few">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
-        <item quantity="many">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s удалил(а) адрес %2$s для комнаты.</item>
-        <item quantity="few">%1$s удалил(а) адреса %2$s для комнаты.</item>
-        <item quantity="many">%1$s удалил(а) адреса %2$s для комнаты.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s добавил(а) адреса %2$s и удалил(а) %3$s для комнаты.</string>
-    <string name="notice_room_canonical_alias_set">%1$s сделал(а) %2$s главным адресом комнаты.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s удалил(а) главный адрес комнаты.</string>
-    <string name="notice_room_guest_access_can_join">%1$s разрешил(а) гостям входить в комнату.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s запретил(а) гостям входить в комнату.</string>
-    <string name="notice_end_to_end_ok">%1$s включил(а) сквозное шифрование.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s включил(а) сквозное шифрование (неизвестный алгоритм %2$s).</string>
-    <string name="summary_you_sent_image">Вы отправили изображение.</string>
-    <string name="summary_you_sent_sticker">Вы отправили стикер.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Ваше приглашение</string>
-    <string name="notice_room_created_by_you">Вы создали комнату</string>
-    <string name="notice_room_invite_by_you">Вы пригласили %1$s</string>
-    <string name="notice_room_join_by_you">Вы вошли в комнату</string>
-    <string name="notice_room_leave_by_you">Вы покинули комнату</string>
-    <string name="notice_room_reject_by_you">Вы отклонили приглашение</string>
-    <string name="notice_room_kick_by_you">Вы выгнали %1$s</string>
-    <string name="notice_room_unban_by_you">Вы разбанили %1$s</string>
-    <string name="notice_room_ban_by_you">Вы забанили %1$s</string>
-    <string name="notice_room_withdraw_by_you">Вы отозвали приглашение %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Вы сменили свой аватар</string>
-    <string name="notice_display_name_set_by_you">Вы сменили своё отображаемое имя на %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">Вы сменили своё отображаемое имя с %1$s на %2$s</string>
-    <string name="notice_display_name_removed_by_you">Вы удалили своё отображаемое имя (%1$s)</string>
-    <string name="notice_room_topic_changed_by_you">Вы сменили тему на: %1$s</string>
-    <string name="notice_room_name_changed_by_you">Вы сменили название комнаты на: %1$s</string>
-    <string name="notice_placed_video_call_by_you">Вы начали видеозвонок.</string>
-    <string name="notice_placed_voice_call_by_you">Вы начали звонок.</string>
-    <string name="notice_answered_call_by_you">Вы ответили на звонок.</string>
-    <string name="notice_ended_call_by_you">Вы закончили звонок.</string>
-    <string name="notice_made_future_room_visibility_by_you">Вы сделали будущую историю комнаты видимой для %1$s</string>
-    <string name="notice_end_to_end_by_you">Вы включили сквозное шифрование (%1$s)</string>
-    <string name="notice_room_update_by_you">Вы обновили эту комнату.</string>
-    <string name="notice_requested_voip_conference_by_you">Вы начали групповой звонок</string>
-    <string name="notice_room_name_removed_by_you">Вы удалили название комнаты</string>
-    <string name="notice_room_topic_removed_by_you">Вы удалили тему комнаты</string>
-    <string name="notice_profile_change_redacted_by_you">Вы обновили свой профиль %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Вы отправили %1$s приглашение в эту комнату</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Вы отозвали у %1$s приглашение в эту комнату</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Вы приняли приглашение для %1$s</string>
-    <string name="notice_widget_added">%1$s добавил(а) виджет %2$s</string>
-    <string name="notice_widget_added_by_you">Вы добавили виджет %1$s</string>
-    <string name="notice_widget_removed">%1$s удалил(а) виджет %2$s</string>
-    <string name="notice_widget_removed_by_you">Вы удалили виджет %1$s</string>
-    <string name="notice_widget_modified">%1$s изменил(а) виджет %2$s</string>
-    <string name="notice_widget_modified_by_you">Вы изменили виджет %1$s</string>
-    <string name="power_level_admin">Администратор</string>
-    <string name="power_level_moderator">Модератор</string>
-    <string name="power_level_default">По умолчанию</string>
-    <string name="power_level_custom">Пользовательский (%1$d)</string>
-    <string name="power_level_custom_no_value">Пользовательский</string>
-    <string name="notice_power_level_changed_by_you">Вы изменили уровни доступа %1$s.</string>
-    <string name="notice_power_level_changed">%1$s изменил(а) уровни доступа %2$s.</string>
-    <string name="notice_power_level_diff">%1$s с %2$s на %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваше приглашение. Причина: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Вы пригласили %1$s. Причина: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Вы вошли в комнату. Причина: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Вы покинули комнату. Причина: %1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Вы отклонили приглашение. Причина: %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Вы выгнали %1$s. Причина: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Вы разбанили %1$s. Причина: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Вы забанили %1$s. Причина: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Вы отправили %1$s приглашение в эту комнату. Причина: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Вы отозвали у %1$s приглашение в эту комнату. Причина: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Вы приняли приглашение для %1$s. Причина: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Вы отозвали приглашение %1$s. Причина: %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Вы добавили адрес %1$s для этой комнаты.</item>
-        <item quantity="few">Вы добавили %1$s в качестве адресов для этой комнаты.</item>
-        <item quantity="many">Вы добавили %1$s в качестве адресов для этой комнаты.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Вы удалили адрес этой комнаты: %1$s.</item>
-        <item quantity="few">Вы удалили адреса этой комнаты: %1$s.</item>
-        <item quantity="many">Вы удалили адреса этой комнаты: %1$s.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">Вы добавили адреса %1$s и удалили %2$s для этой комнаты.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Вы задали главный адрес этой комнаты %1$s.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Вы удалили главный адрес этой комнаты.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Вы разрешили гостям входить в комнату.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Вы запретили гостям входить в комнату.</string>
-    <string name="notice_end_to_end_ok_by_you">Вы включили сквозное шифрование.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Вы включили сквозное шифрование (неизвестный алгоритм %1$s).</string>
-    <string name="notice_room_avatar_changed">%1$s изменил(а) аватар комнаты</string>
-    <string name="notice_room_avatar_changed_by_you">Вы изменили аватар комнаты</string>
-    <string name="notice_call_candidates">%s отправил(а) данные для начала звонка.</string>
-    <string name="notice_call_candidates_by_you">Вы отправили данные для начала звонка.</string>
-    <string name="notice_room_avatar_removed">%1$s удалил(а) аватар комнаты</string>
-    <string name="notice_room_avatar_removed_by_you">Вы удалили аватар комнаты</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Вы запретили гостям входить в комнату.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s запретил(а) гостям входить в комнату.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Вы разрешили гостям присоединяться сюда.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s разрешил(а) гостям присоединиться сюда.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Вы вышли. Причина: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s вышел(-ла). Причина: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Вы вошли. Причина: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s вошел(-ла). Причина: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Вы отозвали приглашение %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s отозвал(а) приглашение %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Вы пригласили %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s пригласил(а) %2$s</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Вы сделали будущие сообщения видимыми для %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s сделал(а) будущие сообщения видимыми для %2$s</string>
-    <string name="notice_direct_room_leave_by_you">Вы покинули комнату</string>
-    <string name="notice_direct_room_leave">%1$s покинул(а) комнату</string>
-    <string name="notice_direct_room_join_by_you">Вы вошли</string>
-    <string name="notice_direct_room_join">%1$s вошел(ла)</string>
-    <string name="notice_direct_room_created_by_you">Вы создали обсуждение</string>
-    <string name="notice_direct_room_created">%1$s создал(а) обсуждение</string>
-    <string name="notice_direct_room_update_by_you">Вы обновили эту комнату.</string>
-    <string name="notice_direct_room_update">%s обновил(а) эту комнату.</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s и %4$d другой</item>
-        <item quantity="few">%1$s, %2$s, %3$s и %4$d других</item>
-        <item quantity="many">%1$s, %2$s, %3$s и %4$d другие</item>
-        <item quantity="other">%1$s, %2$s, %3$s и %4$d другие</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s и %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s и %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Всем серверам запрещено участвовать! Эта комната больше не может быть использована.</string>
-    <string name="notice_room_server_acl_updated_no_change">Без изменений.</string>
-    <string name="room_displayname_empty_room_was">Пустая комната (была %s)</string>
-    <string name="notice_room_server_acl_set_banned">• Соответствующий сервер %s заблокирован.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Сервер, соответствующий буквальным IP-адресам, теперь запрещён.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Сервер, соответствующий буквальным IP-адресам, теперь разрешён.</string>
-    <string name="notice_room_server_acl_updated_banned">• Сервер, соответствующий %s, теперь запрещён.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Сервер, соответствующий %s, теперь разрешён.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Сервер, соответствующий %s, был удалён из списка блокировки.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Сервер, соответствующий буквальным IP-адресам, запрещён.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Сервер, соответствующий буквальным IP-адресам, разрешён.</string>
-    <string name="notice_room_server_acl_set_allowed">• Сервер, соответствующий %s, разрешён.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Сервер, соответствующий %s, был удалён из разрешённого списка.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Вы изменили права доступа сервера (ACL) для этой комнаты.</string>
-    <string name="notice_room_server_acl_updated_title">%s изменил права доступа сервера (ACL) для этой комнаты.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Вы настроили права доступа сервера (ACL) для этой комнаты.</string>
-    <string name="notice_room_server_acl_set_title">%s устанавливает права доступа сервера (ACL) для этой комнаты.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Вы изменили адреса этой комнаты.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s изменил(а) адреса этой комнаты.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Вы изменили основной и альтернативный адреса этой комнаты.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s изменил(а) основной и альтернативный адреса этой комнаты.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Вы изменили альтернативные адреса для этой комнаты.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s изменил(а) альтернативные адреса для этой комнаты.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Вы удалили альтернативный адрес %1$s для этой комнаты.</item>
-        <item quantity="few">Вы удалили альтернативные адреса %1$s для этой комнаты.</item>
-        <item quantity="many">Вы удалили альтернативные адреса %1$s для этой комнаты.</item>
-        <item quantity="other">Вы удалили альтернативные адреса %1$s для этой комнаты.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s удалил(а) альтернативный адрес %2$s для этой комнаты.</item>
-        <item quantity="few">%1$s удалил(а) альтернативные адреса %2$s для этой комнаты.</item>
-        <item quantity="many">%1$s удалил(а) альтернативные адреса %2$s для этой комнаты.</item>
-        <item quantity="other">%1$s удалил(а) альтернативные адреса %2$s для этой комнаты.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Вы добавили альтернативный адрес %1$s для этой комнаты.</item>
-        <item quantity="few">Вы добавили альтернативные адреса %1$s для этой комнаты.</item>
-        <item quantity="many">Вы добавили альтернативные адреса %1$s для этой комнаты.</item>
-        <item quantity="other">Вы добавили альтернативные адреса %1$s для этой комнаты.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s добавил(а) альтернативный адрес %2$s для этой комнаты.</item>
-        <item quantity="few">%1$s добавил(а) альтернативные адреса %2$s для этой комнаты.</item>
-        <item quantity="many">%1$s добавил(а) альтернативные адреса %2$s для этой комнаты.</item>
-        <item quantity="other">%1$s добавил(а) альтернативные адреса %2$s для этой комнаты.</item>
-    </plurals>
-    <string name="notice_widget_jitsi_modified_by_you">Вы изменили видеоконференцию</string>
-    <string name="notice_widget_jitsi_modified">%1$s изменил(а) видеоконференцию</string>
-    <string name="notice_widget_jitsi_removed_by_you">Вы завершили видеоконференцию</string>
-    <string name="notice_widget_jitsi_removed">%1$s завершил(а) видеоконференцию</string>
-    <string name="notice_widget_jitsi_added_by_you">Вы начали видеоконференцию</string>
-    <string name="notice_widget_jitsi_added">%1$s начал(а) видеоконференцию</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-si/strings.xml b/matrix-sdk-android/src/main/res/values-si/strings.xml
deleted file mode 100644
index c0c6522ed4..0000000000
--- a/matrix-sdk-android/src/main/res/values-si/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-sk/strings.xml b/matrix-sdk-android/src/main/res/values-sk/strings.xml
deleted file mode 100644
index 390a3e9ba3..0000000000
--- a/matrix-sdk-android/src/main/res/values-sk/strings.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s poslal/a obrázok.</string>
-    <string name="notice_room_invite_no_invitee">Pozvanie od %s</string>
-    <string name="notice_room_invite">%1$s pozval/a %2$s</string>
-    <string name="notice_room_invite_you">%1$s vás pozval/a</string>
-    <string name="notice_room_join">%1$s vstúpil/a do miestnosti</string>
-    <string name="notice_room_leave">%1$s opustil/a miestnosť</string>
-    <string name="notice_room_reject">%1$s odmietol/a pozvanie</string>
-    <string name="notice_room_kick">%1$s vykázal/a %2$s</string>
-    <string name="notice_room_unban">%1$s povolil/a vstupovať %2$s</string>
-    <string name="notice_room_ban">%1$s zakázal/a vstupovať %2$s</string>
-    <string name="notice_room_withdraw">%1$s vzal/a späť pozvanie %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s si zmenil/a obrázok v profile</string>
-    <string name="notice_display_name_set">%1$s si nastavil/a zobrazované meno %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s si zmenil/a zobrazované meno %2$s na %3$s</string>
-    <string name="notice_display_name_removed">%1$s odstránil/a svoje zobrazované meno (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s zmenil/a tému na: %2$s</string>
-    <string name="notice_room_name_changed">%1$s zmenil/a názov miestnosti na: %2$s</string>
-    <string name="notice_placed_video_call">%s uskutočnil/a video hovor.</string>
-    <string name="notice_placed_voice_call">%s zatelefonoval/a.</string>
-    <string name="notice_answered_call">%s prijal/a hovor.</string>
-    <string name="notice_ended_call">%s ukončil/a hovor.</string>
-    <string name="notice_made_future_room_visibility">%1$s sprístupnil/a budúcu históriu miestnosti %2$s</string>
-    <string name="notice_room_visibility_invited">pre všetkých členov, od kedy boli pozvaní.</string>
-    <string name="notice_room_visibility_joined">pre všetkých členov, od kedy vstúpili.</string>
-    <string name="notice_room_visibility_shared">pre všetkých členov.</string>
-    <string name="notice_room_visibility_world_readable">pre každého.</string>
-    <string name="notice_room_visibility_unknown">neznámym (%s).</string>
-    <string name="notice_end_to_end">%1$s povolil/a E2E šifrovanie (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s požiadal/a o VoIP konferenciu</string>
-    <string name="notice_voip_started">Začala sa VoIP konferencia</string>
-    <string name="notice_voip_finished">Skončila sa VoIP konferencia</string>
-    <string name="notice_avatar_changed_too">(aj obrázok v profile)</string>
-    <string name="notice_room_name_removed">%1$s odstránil/a názov miestnosti</string>
-    <string name="notice_room_topic_removed">%1$s odstránil/a tému miestnosti</string>
-    <string name="notice_profile_change_redacted">%1$s aktualizoval/a svoj profil %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s pozval/a %2$s vstúpiť do miestnosti</string>
-    <string name="notice_room_third_party_registered_invite">%1$s prijal/a pozvanie pre %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Nie je možné dešifrovať: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Zo zariadenia odosieľateľa nebolo možné získať kľúče potrebné na dešifrovanie tejto správy.</string>
-    <string name="could_not_redact">Nie je možné vymazať</string>
-    <string name="unable_to_send_message">Nie je možné odoslať správu</string>
-    <string name="message_failed_to_upload">Nepodarilo sa nahrať obrázok</string>
-    <string name="network_error">Chyba siete</string>
-    <string name="matrix_error">Chyba Matrix</string>
-    <string name="room_error_join_failed_empty_room">V súčasnosti nie je možné znovu vstúpiť do prázdnej miestnosti.</string>
-    <string name="encrypted_message">Šifrovaná správa</string>
-    <string name="medium_email">Emailová adresa</string>
-    <string name="medium_phone_number">Telefónne číslo</string>
-    <string name="summary_user_sent_sticker">%1$s poslal/a nálepku.</string>
-    <string name="room_displayname_invite_from">Pozvanie od %s</string>
-    <string name="room_displayname_room_invite">Pozvanie do miestnosti</string>
-    <string name="room_displayname_two_members">%1$s a %2$s</string>
-    <string name="room_displayname_empty_room">Prázdna miestnosť</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s a 1 ďalší</item>
-        <item quantity="few">%1$s a %2$d ďalší</item>
-        <item quantity="many">%1$s a %2$d ďalších</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="notice_room_update">%s aktualizoval/a túto miestnosť.</string>
-    <string name="notice_event_redacted">Odstránená správa</string>
-    <string name="notice_event_redacted_by">Odstránená správa používateľom %1$s</string>
-    <string name="notice_event_redacted_with_reason">Odstránená správa [dôvod: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Odstránená správa používateľom %1$s [dôvod: %2$s]</string>
-    <string name="initial_sync_start_importing_account">Úvodná synchronizácia:
-\nPrebieha import účtu…</string>
-    <string name="initial_sync_start_importing_account_crypto">Úvodná synchronizácia:
-\nPrebieha import šifrovacích kľúčov</string>
-    <string name="initial_sync_start_importing_account_rooms">Úvodná synchronizácia:
-\nPrebieha import miestností</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Úvodná synchronizácia:
-\nPrebieha import miestností, do ktorých ste vstúpili</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Úvodná synchronizácia: 
-\nPrebieha import pozvaní</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Úvodná synchronizácia:
-\nPrebieha import opustených miestností</string>
-    <string name="initial_sync_start_importing_account_groups">Úvodná synchronizácia:
-\nPrebieha import komunít</string>
-    <string name="initial_sync_start_importing_account_data">Úvodná synchronizácia:
-\nPrebieha import údajov účtu</string>
-    <string name="event_status_sending_message">Odosielanie správy…</string>
-    <string name="clear_timeline_send_queue">Vymazať správy na odoslanie</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s zamietol/a pozvanie používateľa %2$s vstúpiť do miestnosti</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Pozvanie od %1$s. Dôvod: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s pozval/a %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s vás pozval/a. Dôvod: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s vstúpil/a do miestnosti. Dôvod: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s opustil/a miestnosť. Dôvod: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s odmietol/a pozvanie. Dôvod: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s vykázal/a %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s povolil/a vstupovať %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s zakázal/a vstupovať %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s pozval/a %2$s vstúpiť do miestnosti. Dôvod: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s zamietol/a pozvanie používateľa %2$s vstúpiť do miestnosti. Dôvod: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s prijal/a pozvanie pre %2$s. Dôvod: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s vzal/a späť pozvanie %2$s. Dôvod: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s pridal/a adresu %2$s pre túto miestnosť.</item>
-        <item quantity="few">%1$s pridal/a adresy %2$s pre túto miestnosť.</item>
-        <item quantity="other">%1$s pridal/a adresy %2$s pre túto miestnosť.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s odstránil/a adresu %2$s pre túto miestnosť.</item>
-        <item quantity="few">%1$s odstránil/a adresy %3$s pre túto miestnosť.</item>
-        <item quantity="other">%1$s odstránil/a adresy %3$s pre túto miestnosť.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s pridal/a adresy %2$s a odstránil/a adresy %3$s pre túto miestnosť.</string>
-    <string name="notice_room_canonical_alias_set">%1$s nastavil/a hlavnú adresu tejto miestnosti %2$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s odstránil/a hlavnú adresu tejto miestnosti.</string>
-    <string name="notice_room_guest_access_can_join">%1$s povolil/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
-    <string name="summary_you_sent_image">Poslali ste obrázok.</string>
-    <string name="summary_you_sent_sticker">Poslali ste nálepku.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Pozvanie od vás</string>
-    <string name="notice_room_created">%1$s vytvoril/a miestnosť</string>
-    <string name="notice_room_created_by_you">Vytvorili ste miestnosť</string>
-    <string name="notice_room_invite_by_you">Pozvali ste %1$s</string>
-    <string name="notice_room_join_by_you">Vstúpili ste do miestnosti</string>
-    <string name="notice_room_leave_by_you">Opustili ste miestnosť</string>
-    <string name="notice_room_reject_by_you">Odmietli ste pozvanie</string>
-    <string name="notice_room_kick_by_you">Vykázali ste %1$s</string>
-    <string name="notice_room_unban_by_you">Povolili ste vstupovať %1$s</string>
-    <string name="notice_room_ban_by_you">Zakázali ste vstupovať %1$s</string>
-    <string name="notice_room_withdraw_by_you">Vzali ste späť pozvanie %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Zmenili ste si obrázok v profile</string>
-    <string name="notice_display_name_set_by_you">Nastavili ste si zobrazované meno %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">Zmenili ste si zobrazované meno %1$s na %2$s</string>
-    <string name="notice_display_name_removed_by_you">Odstránili ste svoje zobrazované meno %1$s</string>
-    <string name="notice_room_topic_changed_by_you">Zmenili ste tému na: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s zmenil/a obrázok miestnosti</string>
-    <string name="notice_room_avatar_changed_by_you">Zmenili ste obrázok miestnosti</string>
-    <string name="notice_room_name_changed_by_you">Zmenili ste názov miestnosti na: %1$s</string>
-    <string name="notice_placed_video_call_by_you">Uskutočnili ste video hovor.</string>
-    <string name="notice_placed_voice_call_by_you">Zatelefonovali ste.</string>
-    <string name="notice_call_candidates">%s poslal údaje pre nastavenie hovoru.</string>
-    <string name="notice_call_candidates_by_you">Poslali ste údaje na nastavenie hovoru.</string>
-    <string name="notice_answered_call_by_you">Prijali ste hovor.</string>
-    <string name="notice_ended_call_by_you">Ukončili ste hovor.</string>
-    <string name="notice_made_future_room_visibility_by_you">Sprístupnili ste budúcu históriu miestnosti %1$s</string>
-    <string name="notice_end_to_end_by_you">Povolili ste E2E šifrovanie (%1$s)</string>
-    <string name="notice_room_update_by_you">Aktualizovali ste túto miestnosť.</string>
-    <string name="notice_requested_voip_conference_by_you">Požiadali ste o VoIP konferenciu</string>
-    <string name="notice_room_name_removed_by_you">Odstránili ste názov miestnosti</string>
-    <string name="notice_room_topic_removed_by_you">Odstránili ste tému miestnosti</string>
-    <string name="notice_room_avatar_removed">%1$s odstránil obrázok miestnosti</string>
-    <string name="notice_room_avatar_removed_by_you">Odstránili ste obrázok miestnosti</string>
-    <string name="notice_profile_change_redacted_by_you">Aktualizovali ste svoj profil %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Pozvali ste %1$s vstúpiť do miestnosti</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Zamietli ste pozvanie používateľa %1$s vstúpiť do miestnosti</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Prijali ste pozvanie pre %1$s</string>
-    <string name="notice_widget_added">%1$s pridal/a widget %2$s</string>
-    <string name="notice_widget_added_by_you">Pridali ste widget %1$s</string>
-    <string name="notice_widget_removed">%1$s odstránil/a widget %2$s</string>
-    <string name="notice_widget_removed_by_you">Odstránili ste widget %1$s</string>
-    <string name="notice_widget_modified">%1$s upravil/a widget %2$s</string>
-    <string name="notice_widget_modified_by_you">Upravili ste widget %1$s</string>
-    <string name="power_level_admin">Správca</string>
-    <string name="power_level_moderator">Moderátor</string>
-    <string name="power_level_default">Predvolený</string>
-    <string name="power_level_custom">Vlastná úroveň (%1$d)</string>
-    <string name="power_level_custom_no_value">Vlastná úroveň</string>
-    <string name="notice_power_level_changed_by_you">Zmenili ste úroveň moci používateľa %1$s.</string>
-    <string name="notice_power_level_changed">%1$s zmenil úroveň moci používateľa %2$s.</string>
-    <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Pozvanie od vás. Dôvod: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Pozvali ste %1$s. Dôvod: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Vstúpili ste do miestnosti. Dôvod: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Opustili ste miestnosť. Dôvod: %1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Odmietli ste pozvanie. Dôvod: %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Vykázali ste %1$s. Dôvod: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Povolili ste vstupovať %1$s. Dôvod: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Zakázali ste vstupovať %1$s. Dôvod: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Pozvali ste %1$s vstúpiť do miestnosti. Dôvod: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Zamietli ste pozvanie používateľa %1$s vstúpiť do miestnosti. Dôvod: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Prijali ste pozvanie pre %1$s. Dôvod: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Vzali ste späť pozvanie %1$s. Dôvod: %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Pridali ste adresu %1$s pre túto miestnosť.</item>
-        <item quantity="few">Pridali ste adresy %1$s pre túto miestnosť.</item>
-        <item quantity="other">Pridali ste adresy %1$s pre túto miestnosť.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Odstránili ste adresu %1$s pre túto miestnosť.</item>
-        <item quantity="few">Odstránili ste adresy %1$s pre túto miestnosť.</item>
-        <item quantity="other">Odstránili ste adresy %1$s pre túto miestnosť.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">Pridali ste %1$s a odstránili adresy %2$s pre túto miestnosť.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Nastavili ste hlavnú adresu tejto miestnosti %1$s.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Odstránili ste hlavnú adresu tejto miestnosti.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Povolili ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s zakázal/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Zakázali ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
-    <string name="notice_end_to_end_ok">%1$s povolil/a E2E šifrovanie.</string>
-    <string name="notice_end_to_end_ok_by_you">Povolili ste E2E šifrovanie.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s povolil/a E2E šifrovanie (Nerozpoznaný algorytmus %2$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Povolili ste E2E šifrovanie (Nerozpoznaný algorytmus %1$s).</string>
-    <string name="notice_room_server_acl_set_title_by_you">nastavili ste na servery pravidlá ACL tejto miestnosti.</string>
-    <string name="notice_room_server_acl_set_title">%s nastavil(a) na servery pravidlá ACL tejto miestnosti.</string>
-    <string name="notice_direct_room_update_by_you">Aktualizovali ste sem.</string>
-    <string name="notice_direct_room_update">%s aktualizoval(a) sem.</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s sprístupnil(a) budúce správy %2$s</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Sprístupnili ste budúce správy %1$s</string>
-    <string name="notice_direct_room_leave_by_you">Opustili ste miestnosť</string>
-    <string name="notice_direct_room_leave">%1$s opustil(a) miestnosť</string>
-    <string name="notice_direct_room_join_by_you">Vstúpili ste</string>
-    <string name="notice_direct_room_join">%1$s vstúpil(a)</string>
-    <string name="notice_direct_room_created_by_you">Vytvorili ste konverzáciu</string>
-    <string name="notice_direct_room_created">%1$s vytvoril(a) konverzáciu</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-sq/strings.xml b/matrix-sdk-android/src/main/res/values-sq/strings.xml
deleted file mode 100644
index 33ed9f4e0a..0000000000
--- a/matrix-sdk-android/src/main/res/values-sq/strings.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s dërgoi një figurë.</string>
-    <string name="notice_room_invite">%1$s ftoi %2$s</string>
-    <string name="notice_room_invite_you">%1$s ju ftoi</string>
-    <string name="notice_room_join">%1$s hyri në dhomë</string>
-    <string name="notice_room_leave">%1$s doli nga dhoma</string>
-    <string name="notice_room_reject">%1$s hodhi tej ftesën</string>
-    <string name="notice_room_kick">%1$s përzuri %2$s</string>
-    <string name="notice_room_ban">%1$s dëboi %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s ndryshoi avatarin e vet</string>
-    <string name="notice_room_topic_changed">%1$s ndryshoi temën në: %2$s</string>
-    <string name="notice_room_name_changed">%1$s ndryshoi emrin e dhomës në: %2$s</string>
-    <string name="notice_placed_video_call">%s bëri një thirrje video.</string>
-    <string name="notice_placed_voice_call">%s bëri një thirrje zanore.</string>
-    <string name="notice_answered_call">%s iu përgjigj thirrjes.</string>
-    <string name="notice_ended_call">%s e përfundoi thirrjen.</string>
-    <string name="notice_made_future_room_visibility">%1$s e bëri historikun e ardhshëm të dhomës të dukshëm për %2$s</string>
-    <string name="notice_room_visibility_invited">për krejt anëtarët e dhomës, prej çastit kur janë ftuar.</string>
-    <string name="notice_room_visibility_joined">për krejt anëtarët e dhomës, prej çastit kur morën pjesë.</string>
-    <string name="notice_room_visibility_shared">krejt anëtarët e dhomës.</string>
-    <string name="notice_room_visibility_world_readable">cilido.</string>
-    <string name="notice_room_visibility_unknown">e panjohur (%s).</string>
-    <string name="notice_requested_voip_conference">%1$s kërkoi një konferencë VoIP</string>
-    <string name="notice_voip_started">Konferenca VoIP filloi</string>
-    <string name="notice_voip_finished">Konferenca VoIP përfundoi</string>
-    <string name="notice_avatar_changed_too">(u ndryshua edhe avatari)</string>
-    <string name="notice_room_name_removed">%1$s hoqi emrin e dhomës</string>
-    <string name="notice_profile_change_redacted">%1$s përditësoi profilin e tij %2$s</string>
-    <string name="notice_room_third_party_registered_invite">%1$s pranoi ftesën tuaj për %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** S’arrihet të shfshehtëzohet: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Pajisja e dërguesit nuk na ka dërguar kyçet për këtë mesazh.</string>
-    <string name="could_not_redact">S’u redaktua dot</string>
-    <string name="unable_to_send_message">S’arrihet të dërgohet mesazh</string>
-    <string name="message_failed_to_upload">Ngarkimi i figurës dështoi</string>
-    <string name="network_error">Gabim rrjeti</string>
-    <string name="matrix_error">Gabim Matrix</string>
-    <string name="room_error_join_failed_empty_room">Hëpërhë s’është e mundur të rihyhet në një dhomë të zbrazët.</string>
-    <string name="encrypted_message">Mesazh i fshehtëzuar</string>
-    <string name="medium_email">Adresë email</string>
-    <string name="medium_phone_number">Numër telefoni</string>
-    <string name="room_displayname_invite_from">Ftesë nga %s</string>
-    <string name="room_displayname_room_invite">Ftesë Dhome</string>
-    <string name="room_displayname_two_members">%1$s dhe %2$s</string>
-    <string name="room_displayname_empty_room">Dhomë e zbrazët</string>
-    <string name="summary_user_sent_sticker">%1$s dërgoi një ngjitës.</string>
-    <string name="notice_room_invite_no_invitee">Ftesë e %s</string>
-    <string name="notice_room_unban">%1$s hoqi dëbimin për %2$s</string>
-    <string name="notice_room_withdraw">%1$s tërhoqi mbrapsht ftesën për %2$s</string>
-    <string name="notice_display_name_set">%1$s caktoi për veten emër ekrani %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s ndryshoi emrin e tyre në ekran nga %2$s në %3$s</string>
-    <string name="notice_display_name_removed">%1$s hoqi emrin e tij në ekran (%2$s)</string>
-    <string name="notice_end_to_end">%1$s aktivizoi fshehtëzim skaj-më-skaj (%2$s)</string>
-    <string name="notice_room_topic_removed">%1$s hoqi temën e dhomës</string>
-    <string name="notice_room_third_party_invite">%1$s dërgoi një ftesë për %2$s që të marrë pjesë në dhomë</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s dhe 1 tjetër</item>
-        <item quantity="other">%1$s dhe %2$d të tjerë</item>
-    </plurals>
-    <string name="notice_event_redacted">Mesazhi u hoq</string>
-    <string name="notice_event_redacted_by">Mesazhi u hoq nga %1$s</string>
-    <string name="notice_event_redacted_with_reason">Mesazh i hequr [arsye: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Mesazh i hequr nga %1$s [arsye: %2$s]</string>
-    <string name="notice_room_update">%s e përmirësoi këtë dhomë.</string>
-    <string name="initial_sync_start_importing_account">Njëkohësimi Fillestar:
-\nPo importohet llogaria…</string>
-    <string name="initial_sync_start_importing_account_crypto">Njëkohësimi Fillestar:
-\nPo importohet kriptografi</string>
-    <string name="initial_sync_start_importing_account_rooms">Njëkohësimi Fillestar:
-\nPo importohen Dhoma</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Njëkohësimi Fillestar:
-\nPo importohen Dhoma Ku Është Bërë Hyrje</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Njëkohësimi Fillestar:
-\nPo importohen Dhoma Me Ftesë</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Njëkohësimi Fillestar:
-\nPo importohen Dhoma të Braktisura</string>
-    <string name="initial_sync_start_importing_account_groups">Njëkohësimi Fillestar:
-\nPo importohen Bashkësi</string>
-    <string name="initial_sync_start_importing_account_data">Njëkohësimi Fillestar:
-\nPo importohet të Dhëna Llogarie</string>
-    <string name="event_status_sending_message">Po dërgohet mesazh…</string>
-    <string name="clear_timeline_send_queue">Spastro radhë pritjeje</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s shfuqizoi ftesën për %2$s për pjesëmarrje te dhoma</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Ftesë e %1$s. Arsye: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s ftoi %2$s. Arsye: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s ju ftoi. Arsye: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s erdhi në dhomë. Arsye: %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s doli nga dhoma. Arsye: %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s hodhi poshtë ftesën. Arsye: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s përzuri %2$s. Arsye: %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s hoqi dëbimin për %2$s. Arsye: %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s dëboi %2$s. Arsye: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s dërgoi një ftesë për %2$s për të ardhur në dhomë. Arsye: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s shfuqizoi ftesën për %2$s për të ardhur në dhomë. Arsye: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s pranoi ftesën për %2$s. Arsye: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s tërhoqi mbrapsht ftesën për %2$s. Arsye: %3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s shtoi %2$s si një adresë për këtë dhomë.</item>
-        <item quantity="other">%1$s shtoi %2$s si adresa për këtë dhomë.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s hoqi %2$s si adresë për këtë dhomë.</item>
-        <item quantity="other">%1$s hoqi %2$s si adresa për këtë dhomë.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s shtoi %2$s dhe hoqi %3$s si adresa për këtë dhomë.</string>
-    <string name="notice_room_canonical_alias_set">%1$s caktoi %2$s si adresë kryesore për këtë dhomë.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s hoqi adresën kryesore për këtë dhomë.</string>
-    <string name="notice_room_guest_access_can_join">%1$s ka lejuar vizitorë të marrin pjesë në dhomë.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s ka penguar vizitorë të marrin pjesë në dhomë.</string>
-    <string name="notice_end_to_end_ok">%1$s aktivizoi fshehtëzim skaj-më-skaj.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s aktivizoi fshehtëzim skaj-më-skaj (algoritëm i papranuar %2$s).</string>
-    <string name="notice_room_created">%1$s krijo dhomën</string>
-    <string name="summary_you_sent_image">Dërguat një figurë.</string>
-    <string name="summary_you_sent_sticker">Dërguat një ngjitës.</string>
-    <string name="notice_room_invite_no_invitee_by_you">Ftesa juaj</string>
-    <string name="notice_room_created_by_you">Krijuat dhomën</string>
-    <string name="notice_room_invite_by_you">Ftuat %1$s</string>
-    <string name="notice_room_join_by_you">Hytë në dhomë</string>
-    <string name="notice_room_leave_by_you">Dolët nga dhoma</string>
-    <string name="notice_room_reject_by_you">Hodhët poshtë ftesën</string>
-    <string name="notice_room_kick_by_you">Përzutë %1$s</string>
-    <string name="notice_room_unban_by_you">Hoqët dëbimin për %1$s</string>
-    <string name="notice_room_ban_by_you">Dëbuat %1$s</string>
-    <string name="notice_room_withdraw_by_you">Tërhoqët mbrapsht ftesën për %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">Ndryshuat avatarin tuaj</string>
-    <string name="notice_display_name_set_by_you">Caktuat si emrin tuaj në ekran %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">E ndryshuat emrin tuaj në ekran nga %1$s në %2$s</string>
-    <string name="notice_display_name_removed_by_you">Hoqët emrin tuaj në ekran (qe %1$s)</string>
-    <string name="notice_room_topic_changed_by_you">E ndryshuat temën në: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s ndryshoi avatarin e dhomës</string>
-    <string name="notice_room_avatar_changed_by_you">Ndryshuat avatarin e dhomës</string>
-    <string name="notice_room_name_changed_by_you">Ndryshuat emrin e dhomës në: %1$s</string>
-    <string name="notice_placed_video_call_by_you">Filluat një thirrje video.</string>
-    <string name="notice_placed_voice_call_by_you">Filluat një thirrje zanore.</string>
-    <string name="notice_call_candidates">%s dërgoi të dhëna për ujdisjen e thirrjes.</string>
-    <string name="notice_call_candidates_by_you">Dërguat të dhëna për ujdisjen e thirrjes.</string>
-    <string name="notice_answered_call_by_you">Iu përgjigjët thirrjes.</string>
-    <string name="notice_ended_call_by_you">E përfunduat thirrjen.</string>
-    <string name="notice_made_future_room_visibility_by_you">E bëtë historikun e ardhshëm të dhomë të dukshëm për %1$s</string>
-    <string name="notice_end_to_end_by_you">Aktivizuat fshehtëzim skaj-më-skaj (%1$s)</string>
-    <string name="notice_room_update_by_you">Përmirësuat këtë dhomë.</string>
-    <string name="notice_requested_voip_conference_by_you">Kërkuat një konferencë VoIP</string>
-    <string name="notice_room_name_removed_by_you">Hoqët emrin e dhomës</string>
-    <string name="notice_room_topic_removed_by_you">Hoqët temën e dhomës</string>
-    <string name="notice_room_avatar_removed">%1$s hoqi avatarin e dhomës</string>
-    <string name="notice_room_avatar_removed_by_you">Hoqët avatarin e dhomës</string>
-    <string name="notice_profile_change_redacted_by_you">Përditësuat profilin tuaj %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Dërguat një ftesë te %1$s për të ardhur te dhoma</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Shfuqizuat ftesën për ardhjen në dhomë të %1$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Pranuat ftesën për %1$s</string>
-    <string name="notice_widget_added">%1$s shtoi widget-in %2$s</string>
-    <string name="notice_widget_added_by_you">Shtuat widget-in %1$s</string>
-    <string name="notice_widget_removed">%1$s hoqi widget-in %2$s</string>
-    <string name="notice_widget_removed_by_you">Hoqët widget-in %1$s</string>
-    <string name="notice_widget_modified">%1$s ndryshoi widget-in %2$s</string>
-    <string name="notice_widget_modified_by_you">Ndryshuat widget-in %1$s</string>
-    <string name="power_level_admin">Përgjegjës</string>
-    <string name="power_level_moderator">Moderator</string>
-    <string name="power_level_default">Parazgjedhje</string>
-    <string name="power_level_custom">Vetjake (%1$d)</string>
-    <string name="power_level_custom_no_value">Vetjake</string>
-    <string name="notice_power_level_changed_by_you">Ndryshuat shkallën e pushtetit për %1$s.</string>
-    <string name="notice_power_level_changed">%1$s ndryshoi shkallën e pushtetit për %2$s.</string>
-    <string name="notice_power_level_diff">%1$s nga %2$s në %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ftesa juaj. Arsye: %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Ftuat %1$s. Arsye: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Erdhët në dhomë, Arsye: %1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Ikët nga dhoma. Arsye: %1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Hodhët poshtë ftesën. Arsye: %1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Përzutë %1$s. Arsye: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Hoqët dëbimin për %1$s. Arsye: %2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Dëbuat %1$s. Arsye: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Dërguat një ftesë për %1$s të vijë në dhomë. Arsye: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Shfuqizuat ftesën për ardhjen në dhomë të %1$s. Arsye: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Pranuat ftesën për %1$s. Arsye: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Tërhoqët mbrapsht ftesën për %1$s. Arsye: %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Shtuat %1$s si një adresë për këtë dhomë.</item>
-        <item quantity="other">Shtuat %1$s si adresa për këtë dhomë.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Hoqët %1$s si një adresë për këtë dhomë.</item>
-        <item quantity="other">Hoqët %1$s si adresa për këtë dhomë.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">Shtuat %1$s dhe hoqët %2$s si adresa për këtë dhomë.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Caktuat si adresë kryesore për këtë dhomë %1$s.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Hoqët adresën kryesore për këtë dhomë.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Keni lejuar të vijnë mysafirë në dhomë.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">U keni penguar mysafirëve të vijnë në dhomë.</string>
-    <string name="notice_end_to_end_ok_by_you">Aktivizuat fshehtëzimin skaj-më-skaj.</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Aktivizuat fshehtëzimin skaj-më-skaj (algoritëm %1$s i panjohur).</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Keni penguar të vijnë në dhomë mysafirë.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s ka penguar të vijnë në dhomë mysafirë.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Keni lejuar të vijnë mysafirë këtu.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s ka lejuar të vijnë këtu mysafirë.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Dolët. Arsye: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s doli. Arsye: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Erdhët. Arsye: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s erdhi. Arsye: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Shfuqizuat ftesën për %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s shfuqizoi ftesën për %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Ftuat %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s ftoi %2$s</string>
-    <string name="notice_direct_room_update_by_you">U përmirësuat këtu.</string>
-    <string name="notice_direct_room_update">%s këtu u përmirësua.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">I bëtë mesazhet e ardhshëm të dukshëm për %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s i bëri mesazhet e ardhshëm të dukshëm për %2$s</string>
-    <string name="notice_direct_room_leave_by_you">Dolët nga dhoma</string>
-    <string name="notice_direct_room_leave">%1$s doli nga dhoma</string>
-    <string name="notice_direct_room_join_by_you">Erdhët</string>
-    <string name="notice_direct_room_join">%1$s erdhi</string>
-    <string name="notice_direct_room_created_by_you">Krijuat diskutimin</string>
-    <string name="notice_direct_room_created">%1$s krijoi diskutimin</string>
-    <string name="room_displayname_empty_room_was">Dhomë e zbrazët (was %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s dhe %4$d tjetër</item>
-        <item quantity="other">%1$s, %2$s, %3$s dhe %4$d të tjerë</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s dhe %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s dhe %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 U është penguar pjesëmarrja krejt shërbyesve! Kjo dhomë s’mund të përdoret më.</string>
-    <string name="notice_room_server_acl_updated_no_change">Pa ndryshim.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Ndryshuat ACL-ra shërbyesi për këtë dhomë.</string>
-    <string name="notice_room_server_acl_updated_title">%s ndryshoi ACL-ra shërbyesi për këtë dhomë.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Ujdisët ACL-ra shërbyesi për këtë dhomë.</string>
-    <string name="notice_room_server_acl_set_title">%s ujdisi ACL-ra shërbyesi për këtë dhomë.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Shërbyes që kanë përputhje me %s u hoqën nga lista e të lejuarve.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Shërbyesit që kanë përputhje me %s tani janë të lejuar.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Shërbyesit që kanë përputhje me %s u hoqën nga lista e ndalimeve.</string>
-    <string name="notice_room_server_acl_updated_banned">• Shërbyesit që kanë përputhje me %s tani janë të ndaluar.</string>
-    <string name="notice_room_server_acl_set_allowed">• Shërbyesit që kanë përputhje me %s janë të ndaluar.</string>
-    <string name="notice_room_server_acl_set_banned">• Shërbyesit që kanë përputhje me %s janë të ndaluar.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Ndryshuat adresat për këtë dhomë.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s ndryshoi adresat për këtë dhomë.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Ndryshuat adresat kryesore dhe alternative për këtë dhomë.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ndryshoi adresat kryesore dhe alternative për këtë dhomë.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Ndryshuat adresat alternative për këtë dhomë.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s ndryshoi adresat alternative për këtë dhomë.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Hoqët adresën alternative %1$s për këtë dhomë.</item>
-        <item quantity="other">Hoqët adresat alternative %1$s për këtë dhomë.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s hoqët adresën alternative %2$s për këtë dhomë.</item>
-        <item quantity="other">%1$s hoqët adresat alternative %2$s për këtë dhomë.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Shtuat adresën alternative %1$s për këtë dhomë.</item>
-        <item quantity="other">Shtuat adresat alternative %1$s për këtë dhomë.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s shtoi adresën alternative %2$s për këtë dhomë.</item>
-        <item quantity="other">%1$s shtoi adresat alternative %2$s për këtë dhomë.</item>
-    </plurals>
-    <string name="notice_widget_jitsi_modified_by_you">Ndryshuat konferencën video</string>
-    <string name="notice_widget_jitsi_modified">Konferenca video u ndryshua nga %1$s</string>
-    <string name="notice_widget_jitsi_removed_by_you">Përfunduat konferencën video</string>
-    <string name="notice_widget_jitsi_removed">Konferenca video u përfundua nga %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">Nisët një konferencë video</string>
-    <string name="notice_widget_jitsi_added">Konferencë video nisur nga %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-sr/strings.xml b/matrix-sdk-android/src/main/res/values-sr/strings.xml
deleted file mode 100644
index cf4aecaad1..0000000000
--- a/matrix-sdk-android/src/main/res/values-sr/strings.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="notice_room_leave">%1$s напусти собу</string>
-    <string name="notice_direct_room_join_by_you">Ви се придружисте</string>
-    <string name="notice_direct_room_join">%1$s се придружи</string>
-    <string name="notice_room_join_by_you">Ви се придружисте</string>
-    <string name="notice_room_join">%1$s се придружи</string>
-    <string name="notice_room_invite_you">%1$s позва вас</string>
-    <string name="notice_room_invite_by_you">Ви позвасте корисника %1$s</string>
-    <string name="notice_room_invite">%1$s позва корисника %2$s</string>
-    <string name="notice_direct_room_created_by_you">Направили сте дискусију</string>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="initial_sync_start_importing_account">Почетна синхронизација:
-\nувозим налог…</string>
-    <string name="room_displayname_empty_room_was">Празна соба (била је %s)</string>
-    <string name="room_displayname_empty_room">Празна соба</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s и још %2$d</item>
-        <item quantity="few">%1$s и још %2$d</item>
-        <item quantity="other">%1$s и још %2$d</item>
-    </plurals>
-    <string name="notice_direct_room_created">%1$s направи дискусију</string>
-    <string name="notice_room_created_by_you">Направили сте собу</string>
-    <string name="notice_room_created">%1$s направи собу</string>
-    <string name="notice_room_invite_no_invitee_by_you">Ваша позивница</string>
-    <string name="notice_room_invite_no_invitee">%s шаље позивницу</string>
-    <string name="summary_you_sent_sticker">Послали сте налепницу.</string>
-    <string name="summary_user_sent_sticker">%1$s посла налепницу.</string>
-    <string name="summary_you_sent_image">Послали сте слику.</string>
-    <string name="summary_user_sent_image">%1$s посла слику.</string>
-    <string name="notice_avatar_url_changed_by_you">Изменили сте свој аватар</string>
-    <string name="notice_avatar_url_changed">%1$s измени свој аватар</string>
-    <string name="notice_room_withdraw_by_you">Повукли сте позивницу за корисника %1$s</string>
-    <string name="notice_room_withdraw">%1$s повуче позивницу за корисника %2$s</string>
-    <string name="notice_room_ban_by_you">Забранили сте корисника %1$s</string>
-    <string name="notice_room_ban">%1$s забрани корисника %2$s</string>
-    <string name="notice_room_unban_by_you">Укинули сте забрану кориснику %1$s</string>
-    <string name="notice_room_unban">%1$s укину забрану кориснику %2$s</string>
-    <string name="notice_room_kick_by_you">Избацили сте корисника %1$s</string>
-    <string name="notice_room_kick">%1$s избаци %2$s</string>
-    <string name="notice_room_reject_by_you">Одбили сте позивницу</string>
-    <string name="notice_room_reject">%1$s одби позивницу</string>
-    <string name="notice_direct_room_leave_by_you">Напустили сте собу</string>
-    <string name="notice_direct_room_leave">%1$s напусти собу</string>
-    <string name="notice_room_leave_by_you">Напустили сте собу</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Укључили сте шифровање с краја на крај (непознат алгоритам %1$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s укључи шифровање с краја на крај (непознат алгоритам %2$s).</string>
-    <string name="notice_end_to_end_ok">%1$s искључи шифровање с краја на крај.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Спречили сте да се гости придруже у собу.</string>
-    <string name="notice_end_to_end_ok_by_you">Укључили сте шифровање с краја на крај.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Дозволили сте гостима да се придруже соби.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Изменили сте алтернативну адресу за ову собу.</string>
-    <string name="clear_timeline_send_queue">Очисти ред за слање</string>
-    <string name="event_status_sending_message">Шаљем поруку…</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s и још %4$d</item>
-        <item quantity="few">%1$s, %2$s, %3$s и још %4$d</item>
-        <item quantity="other">%1$s, %2$s, %3$s и још %4$d</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s и %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s и %3$s</string>
-    <string name="room_displayname_two_members">%1$s и %2$s</string>
-    <string name="medium_phone_number">Број телефона</string>
-    <string name="medium_email">Адреса е-поште</string>
-    <string name="encrypted_message">Шифрована порука</string>
-    <string name="room_error_join_failed_empty_room">Тренутно није могуће да се вратите у празну собу.</string>
-    <string name="matrix_error">Грешка Матрикса</string>
-    <string name="network_error">Мрежна грешка</string>
-    <string name="message_failed_to_upload">Неуспело слање слике</string>
-    <string name="unable_to_send_message">Не могу да пошаљем поруку</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Уређај пошиљаоца није нам послао кључеве за ову поруку.</string>
-    <string name="notice_power_level_changed_by_you">Изменили сте ниво снаге корисника %1$s.</string>
-    <string name="power_level_custom_no_value">посебно</string>
-    <string name="power_level_custom">посебно (%1$d)</string>
-    <string name="power_level_default">подразумевано</string>
-    <string name="power_level_moderator">модератор</string>
-    <string name="power_level_admin">админ</string>
-    <string name="notice_event_redacted_with_reason">Порука уклоњена [разлог: %1$s]</string>
-    <string name="notice_event_redacted_by">Поруку уклони %1$s</string>
-    <string name="notice_event_redacted">Порука уклоњена</string>
-    <string name="notice_room_avatar_removed_by_you">Уклонили сте аватар собе</string>
-    <string name="notice_room_avatar_removed">%1$s уклони аватар собе</string>
-    <string name="notice_room_topic_removed_by_you">Уклонили сте тему собе</string>
-    <string name="notice_room_topic_removed">%1$s уклони тему собе</string>
-    <string name="notice_room_name_removed_by_you">Уклонили сте назив собе</string>
-    <string name="notice_room_name_removed">%1$s уклони назив собе</string>
-    <string name="notice_avatar_changed_too">(аватар је такође промењен)</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Свим серверима је забрањено учествовање! Ова соба се више не може користити.</string>
-    <string name="notice_room_server_acl_updated_no_change">Без измене.</string>
-    <string name="notice_room_update_by_you">Надоградили сте ову собу.</string>
-    <string name="notice_room_visibility_unknown">непознато (%s).</string>
-    <string name="notice_made_future_room_visibility_by_you">Учинили сте да од сада, историјат буде видљив за %1$s</string>
-    <string name="notice_made_future_room_visibility">%1$s учини да од сада, историјат буде видљив за %2$s</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Учинили сте да будуће поруке буду видљиве за %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s учини да будуће поруке буду видљиве за %2$s</string>
-    <string name="notice_room_visibility_world_readable">свакога.</string>
-    <string name="notice_room_visibility_shared">све чланове.</string>
-    <string name="notice_room_visibility_joined">све чланове, од кад се придруже.</string>
-    <string name="notice_room_visibility_invited">све чланове, од када су позвани.</string>
-    <string name="notice_ended_call_by_you">Завршили сте позив.</string>
-    <string name="notice_ended_call">%s заврши позив.</string>
-    <string name="notice_answered_call_by_you">Одговорили сте на позив.</string>
-    <string name="notice_answered_call">%s одговори на позив.</string>
-    <string name="notice_call_candidates_by_you">Послали сте податке за поставку позива.</string>
-    <string name="notice_call_candidates">%s посла податке за поставку позива.</string>
-    <string name="notice_placed_voice_call_by_you">Позвали сте гласовним позивом.</string>
-    <string name="notice_placed_voice_call">%s позва видео позивом.</string>
-    <string name="notice_placed_video_call_by_you">Позвали сте видео позивом.</string>
-    <string name="notice_room_avatar_changed_by_you">Изменили сте аватар собе</string>
-    <string name="notice_display_name_set_by_you">Поставили сте своје приказно име на %1$s</string>
-    <string name="notice_display_name_set">%1$s постави своје приказно име на %2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Додали сте %1$s као адресу ове собе.</item>
-        <item quantity="few">Додали сте %1$s као адресе ове собе.</item>
-        <item quantity="other">Додали сте %1$s као адресе ове собе.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s додаде %2$s као адресу ове собе.</item>
-        <item quantity="few">%1$s додаде %2$s као адресе ове собе.</item>
-        <item quantity="other">%1$s додаде %2$s као адресе ове собе.</item>
-    </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">Повукли сте позивницу корисника %1$s. Разлог: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s повлачи позивницу корисника %2$s. Разлог: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Прихватили сте позивницу за %1$s. Разлог: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s прихвата позивницу за %2$s. Разлог:%3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Повукли сте позивницу да се %1$s придружи соби. Разлог: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s повуче позивницу да се %2$s придружи соби. Разлог: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Послали сте позивницу да се %1$s придружи соби. Разлог: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s посла позивницу да се %2$s придружи соби. Разлог: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Забранили сте корисника %1$s. Разлог: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s забрани корисника %2$s. Разлог: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Одблокирали сте корисника %1$s. Разлог: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s одблокира корисника %2$s. Разлог: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Избацили сте корисника %1$s. Разлог: %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s избаци корисника %2$s. Разлог: %3$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Одбили сте позивницу. Разлог: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s одби позивницу. Разлог: %2$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Изашли сте. Разлог: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s изађе. Разлог: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Напустили сте собу. Разлог: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s напусти собу. Разлог: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Придружили сте се. Разлог: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s се придружи. Разлог: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Придружили сте се соби. Разлог: %1$s</string>
-    <string name="notice_room_join_with_reason">%1$s се придружи соби. Разлог: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s вас позива. Разлог: %2$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Позвали сте корисника %1$s. Разлог: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s позва корисника %2$s. Разлог: %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваша позивница. Разлог: %1$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s - позивница. Разлог: %2$s</string>
-    <string name="initial_sync_start_importing_account_data">Почетна синхронизација:
-\nувозим податке о налогу</string>
-    <string name="initial_sync_start_importing_account_groups">Почетна синхронизација:
-\nувозим заједнице</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Почетна синхронизација:
-\nувозим напуштене собе</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Почетна синхронизација:
-\nувозим собе са позивницом</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Почетна синхронизација:
-\nувозим собе у којима сте</string>
-    <string name="initial_sync_start_importing_account_crypto">Почетна синхронизација:
-\nувоз шифровања</string>
-    <string name="initial_sync_start_importing_account_rooms">Почетна синхронизација:
-\nувозим собе</string>
-    <string name="room_displayname_room_invite">Позивница за собу</string>
-    <string name="room_displayname_invite_from">%s вас позива</string>
-    <string name="could_not_redact">Не могу да редигујем</string>
-    <string name="notice_crypto_unable_to_decrypt">** Не могу да дешифрујем: %s **</string>
-    <string name="notice_power_level_diff">%1$s са %2$s на %3$s</string>
-    <string name="notice_power_level_changed">%1$s измени ниво снаге кориснику %2$s.</string>
-    <string name="notice_widget_modified_by_you">Изменили сте %1$s виџет</string>
-    <string name="notice_widget_modified">%1$s измени %2$s виџет</string>
-    <string name="notice_widget_removed_by_you">Уклонили сте %1$s виџет</string>
-    <string name="notice_widget_removed">%1$s уклони %2$s виџет</string>
-    <string name="notice_widget_added_by_you">Додали сте %1$s виџет</string>
-    <string name="notice_widget_added">%1$s додаде %2$s виџет</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Прихватили сте позивницу за %1$s</string>
-    <string name="notice_room_third_party_registered_invite">%1$s прихвати позивницу за %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Повукли сте позивницу за корисника %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s повуче позивницу за корисника %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Повукли сте позивницу да се %1$s придружи у собу</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s повуче позивницу да се %2$s придружи у собу</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Позвали сте корисника %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s позва корисника %2$s</string>
-    <string name="notice_room_third_party_invite_by_you">Послали сте позивницу да се %1$s придружи у собу</string>
-    <string name="notice_room_third_party_invite">%1$s посла позивницу да се %2$s придружи у собу</string>
-    <string name="notice_profile_change_redacted_by_you">Освежили сте свој профил %1$s</string>
-    <string name="notice_profile_change_redacted">%1$s освежи свој профил %2$s</string>
-    <string name="notice_event_redacted_by_with_reason">Поруку уклони %1$s [разлог: %2$s]</string>
-    <string name="notice_voip_finished">ВоИП конференција завршена</string>
-    <string name="notice_voip_started">ВоИП конференција започела</string>
-    <string name="notice_requested_voip_conference_by_you">Затражили сте ВоИП конференцију</string>
-    <string name="notice_requested_voip_conference">%1$s затражи ВоИП конференцију</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Сервери који садрже ИП бројеве су сада забрањени.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Сервери који садрже ИП бројеве су сада дозвољени.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Сервери који садрже %s су уклоњени са листе дозвољених.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Сервери који садрже %s су сада дозвољени.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Сервери који садрже %s су уклоњени са листе забрањених.</string>
-    <string name="notice_room_server_acl_updated_banned">• Сервери који садрже %s су сада забрањени.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Изменили сте АЦЛ сервера за ову собу.</string>
-    <string name="notice_room_server_acl_updated_title">%s измени АЦЛ сервера за ову собу.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Сервери са ИП бројевима су забрањени.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Сервери са ИП бројевима су дозвољени.</string>
-    <string name="notice_room_server_acl_set_allowed">• Сервери који садрже %s су дозвољени.</string>
-    <string name="notice_room_server_acl_set_banned">• Сервери који садрже %s су забрањени.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Поставили сте АЦЛ сервера за ову собу.</string>
-    <string name="notice_room_server_acl_set_title">%s постави АЦЛ сервера за ову собу.</string>
-    <string name="notice_direct_room_update_by_you">Надоградили сте овде.</string>
-    <string name="notice_direct_room_update">%s надогради овде.</string>
-    <string name="notice_room_update">%s надогради ову собу.</string>
-    <string name="notice_end_to_end_by_you">Укључили сте шифровање с краја на крај (%1$s)</string>
-    <string name="notice_end_to_end">%1$s укључи шифровање с краја на крај (%2$s)</string>
-    <string name="notice_placed_video_call">%s упути видео позив.</string>
-    <string name="notice_room_name_changed_by_you">Изменили сте назив собе у: %1$s</string>
-    <string name="notice_room_name_changed">%1$s измени назив собе у: %2$s</string>
-    <string name="notice_room_avatar_changed">%1$s измени аватар собе</string>
-    <string name="notice_room_topic_changed_by_you">Изменили сте тему на: %1$s</string>
-    <string name="notice_room_topic_changed">%1$s измени тему на: %2$s</string>
-    <string name="notice_display_name_removed_by_you">Уклонили сте своје приказно име (било је %1$s)</string>
-    <string name="notice_display_name_removed">%1$s уклони своје приказно име (било је %2$s)</string>
-    <string name="notice_display_name_changed_from_by_you">Изменили сте приказно име са %1$s на %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s измени приказно име са %2$s на %3$s</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s забрани гостима да се придруже у собу.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Забранили сте гостима да се придруже у собу.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s забрани гостима да се придруже у собу.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Дозволили сте гостима да се придруже овде.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s дозволи гостима да се придруже овде.</string>
-    <string name="notice_room_guest_access_can_join">%1$s дозволи гостима да се придруже у собу.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Изменили сте адресе за ову собу.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s измени адресе за ову собу.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Изменили сте главну и алтернативне адресе за ову собу.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s измени главну и алтернативне адресе за ову собу.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s измени алтернативне адресе за ову собу.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Уклонили сте алтернативну адресу %1$s за ову собу.</item>
-        <item quantity="few">Уклонили сте алтернативне адресе %1$s за ову собу.</item>
-        <item quantity="other">Уклонили сте алтернативне адресе %1$s за ову собу.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s уклони алтернативну адресу %2$s за ову собу.</item>
-        <item quantity="few">%1$s уклони алтернативне адресе %2$s за ову собу.</item>
-        <item quantity="other">%1$s уклони алтернативне адресе %2$s за ову собу.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Додали сте алтернативну адресу %1$s за ову собу.</item>
-        <item quantity="few">Додали сте алтернативне адресе %1$s за ову собу.</item>
-        <item quantity="other">Додали сте алтернативне адресе %1$s за ову собу.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s додаде алтернативну адресу %2$s за ову собу.</item>
-        <item quantity="few">%1$s додаде алтернативне адресе %2$s за ову собу.</item>
-        <item quantity="other">%1$s додаде алтернативне адресе %2$s за ову собу.</item>
-    </plurals>
-    <string name="notice_room_canonical_alias_unset_by_you">Уклонили сте главну адресу за ову собу.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s уклони главну адресу за ову собу.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Поставили сте главну адресу ове собе на %1$s.</string>
-    <string name="notice_room_canonical_alias_set">%1$s постави главну адресу ове собе на %2$s.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Додали сте %1$s и уклонили %2$s као адресе ове собе.</string>
-    <string name="notice_room_aliases_added_and_removed">%1$s додаде %2$s и уклони %3$s као адресе ове собе.</string>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Уклонили сте %1$s као адресу ове собе.</item>
-        <item quantity="few">Уклонили сте %1$s као адресе ове собе.</item>
-        <item quantity="other">Уклонили сте %1$s као адресе ове собе.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s уклони %2$s као адресу ове собе.</item>
-        <item quantity="few">%1$s уклони %2$s као адресе ове собе.</item>
-        <item quantity="other">%1$s уклони %2$s као адресе ове собе.</item>
-    </plurals>
-    <string name="notice_widget_jitsi_modified_by_you">Изменили сте видео конференцију</string>
-    <string name="notice_widget_jitsi_modified">%1$s измени видео конференцију</string>
-    <string name="notice_widget_jitsi_removed_by_you">Завршили сте видео конференцију</string>
-    <string name="notice_widget_jitsi_removed">%1$s заврши видео конференцију</string>
-    <string name="notice_widget_jitsi_added_by_you">Покренули сте видео конференцију</string>
-    <string name="notice_widget_jitsi_added">%1$s покрену видео конференцију</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-sv/strings.xml b/matrix-sdk-android/src/main/res/values-sv/strings.xml
deleted file mode 100644
index d202670c49..0000000000
--- a/matrix-sdk-android/src/main/res/values-sv/strings.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s skickade en bild.</string>
-    <string name="summary_you_sent_image">Du skickade en bild.</string>
-    <string name="summary_user_sent_sticker">%1$s skickade en dekal.</string>
-    <string name="summary_you_sent_sticker">Du skickade en dekal.</string>
-    <string name="notice_room_invite_no_invitee">Inbjudan från %s</string>
-    <string name="notice_room_invite_no_invitee_by_you">Inbjudan från dig</string>
-    <string name="notice_room_created">%1$s skapade rummet</string>
-    <string name="notice_room_created_by_you">Du skapade rummet</string>
-    <string name="notice_room_invite">%1$s bjöd in %2$s</string>
-    <string name="notice_room_invite_by_you">Du bjöd in %1$s</string>
-    <string name="notice_room_invite_you">%1$s bjöd in dig</string>
-    <string name="notice_room_join">%1$s gick med i rummet</string>
-    <string name="notice_room_join_by_you">Du gick med i rummet</string>
-    <string name="notice_room_leave">%1$s lämnade rummet</string>
-    <string name="notice_room_leave_by_you">Du lämnade rummet</string>
-    <string name="notice_room_reject">%1$s avböjde inbjudan</string>
-    <string name="notice_room_reject_by_you">Du avböjde inbjudan</string>
-    <string name="notice_room_kick">%1$s kickade %2$s</string>
-    <string name="notice_room_kick_by_you">Du kickade %1$s</string>
-    <string name="notice_room_unban">%1$s avbannade %2$s</string>
-    <string name="notice_room_unban_by_you">Du avbannade %1$s</string>
-    <string name="notice_room_ban">%1$s avbannade %2$s</string>
-    <string name="notice_room_ban_by_you">Du bannade %1$s</string>
-    <string name="notice_room_withdraw">%1$s drog tillbaka inbjudan för %2$s</string>
-    <string name="notice_room_withdraw_by_you">Du drog tillbaka inbjudan för %1$s</string>
-    <string name="notice_avatar_url_changed">%1$s bytte sin avatar</string>
-    <string name="notice_avatar_url_changed_by_you">Du bytte din avatar</string>
-    <string name="notice_display_name_set">%1$s satte sitt visningsnamn till %2$s</string>
-    <string name="notice_display_name_set_by_you">Du satte ditt visningsnamn till %1$s</string>
-    <string name="notice_display_name_changed_from">%1$s bytte sitt visningsnamn från %2$s till %3$s</string>
-    <string name="notice_display_name_changed_from_by_you">Du bytte ditt visningsnamn från %1$s till %2$s</string>
-    <string name="notice_display_name_removed">%1$s tog bort sitt visningsnamn (det var %2$s)</string>
-    <string name="notice_display_name_removed_by_you">Du tog bort ditt visningsnamn (det var %1$s)</string>
-    <string name="notice_room_topic_changed">%1$s bytte ämnet till: %2$s</string>
-    <string name="notice_room_topic_changed_by_you">Du bytte ämnet till: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s bytte rummets avatar</string>
-    <string name="notice_room_avatar_changed_by_you">Du bytte rummets avatar</string>
-    <string name="notice_room_name_changed">%1$s bytte rummets namn till: %2$s</string>
-    <string name="notice_room_name_changed_by_you">Du bytte rummets namnet till: %1$s</string>
-    <string name="notice_placed_video_call">%s startade ett videosamtal.</string>
-    <string name="notice_placed_video_call_by_you">Du startade ett videosamtal.</string>
-    <string name="notice_placed_voice_call">%s startade ett röstsamtal.</string>
-    <string name="notice_placed_voice_call_by_you">Du startade ett röstsamtal.</string>
-    <string name="notice_call_candidates">%s skickade data för att sätta upp samtalet.</string>
-    <string name="notice_call_candidates_by_you">Du skickade data för att sätta upp samtalet.</string>
-    <string name="notice_answered_call">%s svarade på samtalet.</string>
-    <string name="notice_answered_call_by_you">Du svarade på samtalet.</string>
-    <string name="notice_ended_call">%s avslutade samtalet.</string>
-    <string name="notice_ended_call_by_you">Du avslutade samtalet.</string>
-    <string name="notice_made_future_room_visibility">%1$s gjorde framtida rumshistorik synlig för %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Du gjorde framtida rumshistorik synlig för %1$s</string>
-    <string name="notice_room_visibility_invited">alla rumsmedlemmar, från tiden de bjöds in.</string>
-    <string name="notice_room_visibility_joined">alla rumsmedlemmar, från tiden de gick med.</string>
-    <string name="notice_room_visibility_shared">alla rumsmedlemmar.</string>
-    <string name="notice_room_visibility_world_readable">vem som helst.</string>
-    <string name="notice_room_visibility_unknown">okänt (%s).</string>
-    <string name="notice_end_to_end">%1$s aktiverade totalsträckskryptering (%2$s)</string>
-    <string name="notice_end_to_end_by_you">Du aktiverade totalsträckskryptering (%1$s)</string>
-    <string name="notice_room_update">%s uppgraderade det här rummet.</string>
-    <string name="notice_room_update_by_you">Du uppgraderade det här rummet.</string>
-    <string name="notice_requested_voip_conference">%1$s begärde ett VoIP-gruppsamtal</string>
-    <string name="notice_requested_voip_conference_by_you">Du begärde ett VoIP-gruppsamtal</string>
-    <string name="notice_voip_started">VoIP-gruppsamtal startat</string>
-    <string name="notice_voip_finished">VoIP-gruppsamtal avslutat</string>
-    <string name="notice_avatar_changed_too">(avataren blev även bytt)</string>
-    <string name="notice_room_name_removed">%1$s tog bort rummets namn</string>
-    <string name="notice_room_name_removed_by_you">Du tog bort rummets namn</string>
-    <string name="notice_room_topic_removed">%1$s tog bort rummets ämne</string>
-    <string name="notice_room_topic_removed_by_you">Du tog bort rummets ämne</string>
-    <string name="notice_room_avatar_removed">%1$s tog bort rummets avatar</string>
-    <string name="notice_room_avatar_removed_by_you">Du tog bort rummets avatar</string>
-    <string name="notice_event_redacted">Meddelande borttaget</string>
-    <string name="notice_event_redacted_by">Meddelande borttaget av %1$s</string>
-    <string name="notice_event_redacted_with_reason">Meddelande borttaget [anledning: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Meddelande borttaget av %1$s [anledning: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s uppdaterade sim profil %2$s</string>
-    <string name="notice_profile_change_redacted_by_you">Du uppdaterade din profil %1$s</string>
-    <string name="notice_room_third_party_invite">%1$s bjöd in %2$s att gå med i rummet</string>
-    <string name="notice_room_third_party_invite_by_you">Du bjöd in %1$s att gå med i rummet</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s drog tillbaka inbjudan för %2$s att gå med i rummet</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Du drog tillbaka inbjudan för %1$s att gå med i rummet</string>
-    <string name="notice_room_third_party_registered_invite">%1$s accepterade inbjudan för %2$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Du accepterade inbjudan för %1$s</string>
-    <string name="notice_widget_added">%1$s lade till %2$s-widget</string>
-    <string name="notice_widget_added_by_you">Du lade till %1$s-widget</string>
-    <string name="notice_widget_removed">%1$s tog bort %2$s-widget</string>
-    <string name="notice_widget_removed_by_you">Du tog bort %1$s-widget</string>
-    <string name="notice_widget_modified">%1$s modifierade %2$s-widget</string>
-    <string name="notice_widget_modified_by_you">Du modifierade %1$s-widget</string>
-    <string name="power_level_admin">Admin</string>
-    <string name="power_level_moderator">Moderator</string>
-    <string name="power_level_default">Standard</string>
-    <string name="power_level_custom">Anpassad (%1$d)</string>
-    <string name="power_level_custom_no_value">Anpassad</string>
-    <string name="notice_power_level_changed_by_you">Du ändrade behörighetsnivå för %1$s.</string>
-    <string name="notice_power_level_changed">%1$s ändrade behörighetsnivå för %2$s.</string>
-    <string name="notice_power_level_diff">%1$s från %2$s till %3$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Kan inte avkryptera: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsändarens enhet har inte gett oss nycklarna för det här meddelandet.</string>
-    <string name="could_not_redact">Kunde inte dölja</string>
-    <string name="unable_to_send_message">Kunde inte skicka meddelandet</string>
-    <string name="message_failed_to_upload">Misslyckades att ladda upp bilden</string>
-    <string name="network_error">Nätverksfel</string>
-    <string name="matrix_error">Matrixfel</string>
-    <string name="room_error_join_failed_empty_room">Det går för närvarande inte att gå med i ett tomt rum igen.</string>
-    <string name="encrypted_message">Krypterat meddelande</string>
-    <string name="medium_email">E-postadress</string>
-    <string name="medium_phone_number">Telefonnummer</string>
-    <string name="room_displayname_invite_from">Inbjudan från %s</string>
-    <string name="room_displayname_room_invite">Rumsinbjudan</string>
-    <string name="room_displayname_two_members">%1$s och %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s och en till</item>
-        <item quantity="other">%1$s och %2$d till</item>
-    </plurals>
-    <string name="room_displayname_empty_room">Tomt rum</string>
-    <string name="initial_sync_start_importing_account">Inledande synk:
-\nImporterar konto…</string>
-    <string name="initial_sync_start_importing_account_crypto">Inledande synk:
-\nImporterar krypto</string>
-    <string name="initial_sync_start_importing_account_rooms">Inledande synk:
-\nImporterar rum</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Inledande synk:
-\nImporterar anslutna rum</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Inledande synk:
-\nImporterar inbjudna rum</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Inledande synk:
-\nImporterar lämnade rum</string>
-    <string name="initial_sync_start_importing_account_groups">Inledande synk:
-\nImporterar gemenskaper</string>
-    <string name="initial_sync_start_importing_account_data">Inledande synk:
-\nImporterar kontodata</string>
-    <string name="event_status_sending_message">Skickar meddelande…</string>
-    <string name="clear_timeline_send_queue">Rensa sändningskö</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Inbjudan från %1$s. Anledning: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Inbjudan från dig. Anledning: %1$s</string>
-    <string name="notice_room_invite_with_reason">%1$s bjöd in %2$s. Anledning: %3$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Du bjöd in %1$s. Anledning: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s bjöd in dig. Anledning: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s gick med i rummet. Anledning: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Du gick med i rummet. Anledning: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s lämnade rummet. Anledning: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Du lämnade rummet. Anledning: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s avböjde inbjudan. Anledning: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Du avböjde inbjudan. Anledning: %1$s</string>
-    <string name="notice_room_kick_with_reason">%1$s kickade %2$s. Anledning: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">Du kickade %1$s. Anledning: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s avbannade %2$s. Anledning: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Du avbannade %1$s. Anledning: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s bannade %2$s. Anledning: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">Du bannade %1$s. Anledning: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s bjöd in %2$s att gå med i rummet. Anledning: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Du bjöd in %1$s att gå med i rummet. Anledning: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s drog tillbaka inbjudan för %2$s att gå med i rummet. Anledning: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Du drog tillbaka inbjudan för %1$s att gå med i rummet. Anledning: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s accepterade inbjudan för %2$s. Anledning: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Du accepterade inbjudan för %1$s. Anledning: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s drog tillbaka inbjudan för %2$s. Anledning: %3$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Du drog tillbaka inbjudan för %1$s. Anledning: %2$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s lade till %2$s som en adress för det här rummet.</item>
-        <item quantity="other">%1$s lade till %2$s som adresser för det här rummet.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">Du lade till %1$s som en adress för det här rummet.</item>
-        <item quantity="other">Du lade till %1$s som adresser för det här rummet.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s tog bort %2$s som en adress för det här rummet.</item>
-        <item quantity="other">%1$s tog bort %2$s som adresser för det här rummet.</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Du tog bort %1$s som en adress för det här rummet.</item>
-        <item quantity="other">Du tog bort %1$s som adresser för det här rummet.</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s lade till %2$s och tog bort %3$s som adresser för det här rummet.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">Du lade till %1$s och tog bort %2$s som adresser för det här rummet.</string>
-    <string name="notice_room_canonical_alias_set">%1$s satta huvudadressen för det här rummet till %2$s.</string>
-    <string name="notice_room_canonical_alias_set_by_you">Du satta huvudadressen för det här rummet till %1$s.</string>
-    <string name="notice_room_canonical_alias_unset">%1$s tog bort huvudadressen för det här rummet.</string>
-    <string name="notice_room_canonical_alias_unset_by_you">Du tog bort huvudadressen för det här rummet.</string>
-    <string name="notice_room_guest_access_can_join">%1$s tillät gäster att gå med i rummet.</string>
-    <string name="notice_room_guest_access_can_join_by_you">Du tillät gäster att gå med i rummet.</string>
-    <string name="notice_room_guest_access_forbidden">%1$s hindrade gäster från att gå med i rummet.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">Du hindrade gäster från att gå med i rummet.</string>
-    <string name="notice_end_to_end_ok">%1$s aktiverade totalsträckskryptering.</string>
-    <string name="notice_end_to_end_ok_by_you">Du aktiverade totalsträckskryptering.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s aktiverade totalsträckskryptering (okänd algoritm %2$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">Du aktiverade totalsträckskryptering (okänd algoritm %1$s).</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">Du hindrade gäster från att gå med i rummet.</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s hindrade gäster från att gå med i rummet.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">Du tillät gäster att gå med här.</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s tillät gäster att gå med här.</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Du lämnade. Anledning: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s Lämnade. Anledning: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Du gick med. Anledning: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s gick med. Anledning: %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Du drog tillbaka inbjudan för %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s drog tillbaka inbjudan för %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Du bjöd in %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s bjöd in %2$s</string>
-    <string name="notice_direct_room_update_by_you">Du uppgraderade här.</string>
-    <string name="notice_direct_room_update">%s uppgraderade här.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Du gjorde framtida meddelanden synliga för %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s gjorde framtida meddelanden synliga för %2$s</string>
-    <string name="notice_direct_room_leave_by_you">Du lämnade rummet</string>
-    <string name="notice_direct_room_leave">%1$s lämnade rummet</string>
-    <string name="notice_direct_room_join_by_you">Du gick med</string>
-    <string name="notice_direct_room_join">%1$s gick med</string>
-    <string name="notice_direct_room_created_by_you">Du skapade diskussionen</string>
-    <string name="notice_direct_room_created">%1$s skapade diskussionen</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Du ändrade adresserna för det här rummet.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s ändrade adresserna för det här rummet.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Du ändrade huvudadressen och de alternativa adresserna för det här rummet.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ändrade huvudadressen och de alternativa adresserna för det här rummet.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Du ändrade de alternativa adresserna för det här rummet.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s ändrade de alternativa adresserna för det här rummet.</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Du tog bort den alternativa adressen %1$s för det här rummet.</item>
-        <item quantity="other">Du tog bort de alternativa adresserna %1$s för det här rummet.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s tog bort den alternativa adressen %2$s för det här rummet.</item>
-        <item quantity="other">%1$s tog bort de alternativa adresserna %2$s för det här rummet.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Du lade till den alternativa adressen %1$s för det här rummet.</item>
-        <item quantity="other">Du lade till de alternativa adresserna %1$s för det här rummet.</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s lade till den alternativa adressen %2$s för det här rummet.</item>
-        <item quantity="other">%1$s lade till de alternativa adresserna %2$s för det här rummet.</item>
-    </plurals>
-    <string name="room_displayname_empty_room_was">Tomt rum (var %s)</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s och %4$d till</item>
-        <item quantity="other">%1$s, %2$s, %3$s och %4$d till</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s och %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s och %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Alla servrar har bannats från att delta! Det här rummet kan inte användas längre.</string>
-    <string name="notice_room_server_acl_updated_no_change">Ingen ändring.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servrar som matchar IP-adresser är nu bannade.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servrar som matchar IP-adresser är nu tillåtna.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Servrar som matchar %s togs bort från tillåtelselistan.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Servrar som matchar %s är nu tillåtna.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Servrar som matchar %s togs bort från bannlistan.</string>
-    <string name="notice_room_server_acl_updated_banned">• Servrar som matchar %s är nu bannade.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Du ändrade server-ACLer för det här rummet.</string>
-    <string name="notice_room_server_acl_updated_title">%s ändrade server-ACLer för det här rummet.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servrar som matchar IP-adresser är tillåtna.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servrar som matchar IP-adresser är bannade.</string>
-    <string name="notice_room_server_acl_set_allowed">• Servrar som matchar %s är tillåtna.</string>
-    <string name="notice_room_server_acl_set_banned">• Servrar som matchar %s är bannade.</string>
-    <string name="notice_room_server_acl_set_title_by_you">Du satte server-ACLer för det här rummet.</string>
-    <string name="notice_room_server_acl_set_title">%s satte server-ACLer för det här rummet.</string>
-    <string name="notice_widget_jitsi_modified_by_you">Du ändrade videogruppsamtal</string>
-    <string name="notice_widget_jitsi_modified">Videogruppsamtal ändrades av %1$s</string>
-    <string name="notice_widget_jitsi_removed_by_you">Du avslutade videogruppsamtal</string>
-    <string name="notice_widget_jitsi_removed">Videogruppsamtal avslutades av %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">Du startade videogruppsamtal</string>
-    <string name="notice_widget_jitsi_added">Videogruppsamtal startades av %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-szl/strings.xml b/matrix-sdk-android/src/main/res/values-szl/strings.xml
deleted file mode 100644
index a6b3daec93..0000000000
--- a/matrix-sdk-android/src/main/res/values-szl/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-te/strings.xml b/matrix-sdk-android/src/main/res/values-te/strings.xml
deleted file mode 100644
index 62f58c9e26..0000000000
--- a/matrix-sdk-android/src/main/res/values-te/strings.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="notice_room_invite_no_invitee">%s\'s ఆహ్వానం</string>
-    <string name="notice_room_invite">%1$s ఆహ్వానించారు %2$s</string>
-    <string name="notice_room_leave">%1$s వదిలి వెళారు</string>
-    <string name="notice_room_reject">%1$s ఆహ్వానాన్ని తిరస్కరించారు</string>
-    <string name="notice_room_kick">%1$s తన్నాడు %2$s</string>
-    <string name="notice_room_unban">%1$s నిషేధాన్ని %2$s</string>
-    <string name="notice_room_ban">%1$s నిషేధించారు %2$s</string>
-    <string name="notice_room_withdraw">%1$s ఉపసంహరించుకుంది %2$s\'s ఆహ్వానం</string>
-    <string name="notice_avatar_url_changed">%1$s వారి అవతార్ను మార్చారు</string>
-    <string name="notice_display_name_set">%1$s వారి డిస్ప్లే పేరును ని సెట్ చేసారు %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s వారి ప్రదర్శన పేరును %2$s నుండి %3$s మార్చారు</string>
-    <string name="notice_display_name_removed">%1$s వారి ప్రదర్శన పేరుని తీసివేసారు (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s అంశం మార్చబడింది:%2$s</string>
-    <string name="notice_room_name_changed">%1$s గది పెరు మార్చబడింది %2$s</string>
-    <string name="notice_placed_video_call">%s ఒక వీడియో కాల్ని ఉంచింది.</string>
-    <string name="notice_placed_voice_call">%s వాయిస్ కాల్ని ఉంచారు.</string>
-    <string name="notice_answered_call">%s కాల్కి సమాధానం ఇచ్చారు.</string>
-    <string name="notice_ended_call">%s కాల్ ముగిసింది.</string>
-    <string name="notice_made_future_room_visibility">%1$s భవిష్యత్ గది చరిత్రను %2$s కి కనిపించేలా చేసింది</string>
-    <string name="notice_room_visibility_invited">పాయింట్నుండి, అన్ని గది సభ్యుల వారు ఆహ్వానించబడ్డారు.</string>
-    <string name="notice_room_visibility_joined">పాయింట్ నుండి, అన్ని గదుల సభ్యుల వారు చేరారు.</string>
-    <string name="notice_room_visibility_shared">అన్ని గదుల సభ్యులు.</string>
-    <string name="notice_room_visibility_world_readable">ఎవరైనా.</string>
-    <string name="notice_room_visibility_unknown">తెలియని (%s).</string>
-    <string name="notice_end_to_end">%1$s ఎండ్-టు-ఎండ్ ఎన్క్రిప్షన్ ఆన్ చెయ్యబడింది (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s వి ఓ ఇ పి సమావేశాన్ని అభ్యర్థించారు</string>
-    <string name="notice_voip_started">వి ఓ ఇ పి సమావేశం ప్రారంభమైంది</string>
-    <string name="notice_voip_finished">వి ఓ ఇ పి సమావేశం ముగిసింది</string>
-
-    <string name="notice_avatar_changed_too">(అవతార్ మార్చబడింది)</string>
-    <string name="notice_room_name_removed">%1$s గది పేరు తొలగించబడింది</string>
-    <string name="notice_room_topic_removed">%1$s గది అంశాన్ని తీసివేసారు</string>
-    <string name="notice_profile_change_redacted">%1$s వారి ప్రొఫైల్ నవీకరించబడింది %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s గదిలో చేరడానికి %2$s కు ఆహ్వానాన్ని పంపారు</string>
-    <string name="notice_room_third_party_registered_invite">%2$sకోసం %1$s ఆహ్వానాన్ని అంగీకరించారు</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** వ్యక్తీకరించడానికి సాధ్యం కాలేదు: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">ఈ సందేశానికి పంపేవారి పరికరం మాకు కీలను పంపలేదు.</string>
-
-    <string name="could_not_redact">గది స్క్రీన్</string>
-    <string name="unable_to_send_message">సందేశం పంపడం సాధ్యం కాలేదు</string>
-
-    <string name="message_failed_to_upload">చిత్రాన్ని అప్లోడ్ చేయడంలో విఫలమైంది</string>
-
-    <string name="network_error">సాధారణ లోపాలు</string>
-    <string name="matrix_error">మాట్రిక్స్ లోపం</string>
-
-    <string name="room_error_join_failed_empty_room">మళ్లీ ఖాళీ గది ని చేరడానికి ప్రస్తుతం ఇది సాధ్యం కాదు.</string>
-
-    <string name="encrypted_message">ఎన్క్రిప్టెడ్ సందేశం</string>
-
-    <string name="medium_email">ఇమెయిల్ చిరునామా</string>
-    <string name="medium_phone_number">ఫోను నంబరు</string>
-
-
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s ఒక చిత్రం పంపారు.</string>
-
-    <string name="notice_room_invite_you">%1$s మిమ్మల్ని ఆహ్వానించారు</string>
-    <string name="notice_room_join">%1$s చేరారు</string>
-
-    <string name="room_displayname_invite_from">%s నుండి ఆహ్వానించు</string>
-    <string name="room_displayname_two_members">%1$s మరియు %2$s</string>
-    <string name="room_displayname_room_invite">గదికి ఆహ్వానం</string>
-    <string name="room_displayname_empty_room">ఖాళీ గది</string>
-
-
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-th/strings.xml b/matrix-sdk-android/src/main/res/values-th/strings.xml
deleted file mode 100644
index 3abd948f77..0000000000
--- a/matrix-sdk-android/src/main/res/values-th/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-uk/strings.xml b/matrix-sdk-android/src/main/res/values-uk/strings.xml
deleted file mode 100644
index 0624ae3cd7..0000000000
--- a/matrix-sdk-android/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s надсилає зображення.</string>
-    <string name="notice_room_invite_no_invitee">%s запрошення</string>
-    <string name="notice_room_invite">%1$s запрошує %2$s</string>
-    <string name="encrypted_message">Зашифроване повідомлення</string>
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Запрошення від %s</string>
-    <string name="room_displayname_room_invite">Запрошення до кімнати</string>
-    <string name="room_displayname_two_members">%1$s і %2$s</string>
-    <string name="room_displayname_empty_room">Порожня кімната</string>
-    <string name="summary_user_sent_sticker">%1$s надсилає наліпку.</string>
-    <string name="notice_room_invite_you">%1$s запрошує вас</string>
-    <string name="notice_room_join">%1$s приєднується</string>
-    <string name="notice_room_leave">%1$s залишає кімнату</string>
-    <string name="notice_room_reject">%1$s відхиляє запрошення</string>
-    <string name="notice_room_kick">%1$s викидає %2$s</string>
-    <string name="notice_room_unban">%1$s розблоковує %2$s</string>
-    <string name="notice_room_ban">%1$s блокує %2$s</string>
-    <string name="notice_room_withdraw">%1$s відкликає запрошення для %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s змінює свій аватар</string>
-    <string name="notice_display_name_set">%1$s встановлюють собі назву %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s змінює своє ім’я з %2$s на %3$s</string>
-    <string name="notice_display_name_removed">%1$s прибирає своє ім’я (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s змінює тему на: %2$s</string>
-    <string name="notice_room_name_changed">%1$s змінює назву кімнати на: %2$s</string>
-    <string name="notice_placed_video_call">%s починає відеовиклик.</string>
-    <string name="notice_placed_voice_call">%s розпочинає голосовий виклик.</string>
-    <string name="notice_answered_call">%s відповідає на виклик.</string>
-    <string name="notice_ended_call">%s завершує дзвінок.</string>
-    <string name="notice_made_future_room_visibility">%1$s робить майбутню історію кімнати видимою для %2$s</string>
-    <string name="notice_room_visibility_invited">всіх учасників кімнати, з моменту їх запрошення.</string>
-    <string name="notice_room_visibility_joined">всіх учасників кімнати, з моменту їх приєднання.</string>
-    <string name="notice_room_visibility_shared">всіх учасників кімнати.</string>
-    <string name="notice_room_visibility_world_readable">будь-кого.</string>
-    <string name="notice_room_visibility_unknown">невідомо (%s).</string>
-    <string name="notice_end_to_end">%1$s вмикає наскрізне шифрування (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s запросив(ла) VoIP конференцію</string>
-    <string name="notice_voip_started">VoIP конференція розпочалась</string>
-    <string name="notice_voip_finished">VoIP конференція завершилась</string>
-    <string name="notice_avatar_changed_too">(аватар також змінено)</string>
-    <string name="notice_room_name_removed">%1$s прибирає назву кімнати</string>
-    <string name="notice_room_topic_removed">%1$s прибирає тему кімнати</string>
-    <string name="notice_profile_change_redacted">%1$s оновлює свій профіль %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s надсилає запрошення %2$s приєднатися до кімнати</string>
-    <string name="notice_room_third_party_registered_invite">%1$s приймає запрошення до %2$s</string>
-    <string name="notice_crypto_unable_to_decrypt">** Неможливо розшифрувати: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Пристрій відправника не надіслав нам ключ для цього повідомлення.</string>
-    <string name="could_not_redact">Неможливо відредагувати</string>
-    <string name="unable_to_send_message">Не вдалося надіслати повідомлення</string>
-    <string name="message_failed_to_upload">Не вдалося завантажити зображення</string>
-    <string name="network_error">Помилка мережі</string>
-    <string name="matrix_error">Помилка Matrix</string>
-    <string name="room_error_join_failed_empty_room">Наразі неможливо переприєднатися до порожньої кімнати.</string>
-    <string name="medium_email">Адреса електронної пошти</string>
-    <string name="medium_phone_number">Номер телефону</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s та 1 інший</item>
-        <item quantity="few">%1$s та %2$d інші</item>
-        <item quantity="many">%1$s та %2$d інших</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="notice_room_update">%s оновлює цю кімнату.</string>
-    <string name="notice_event_redacted">Повідомлення вилучено</string>
-    <string name="notice_event_redacted_by">%1$s вилучає повідомлення</string>
-    <string name="notice_event_redacted_with_reason">Повідомлення вилучено [причина: %1$s]</string>
-    <string name="initial_sync_start_importing_account_data">Початкове налаштування:
-\nІмпортування даних облікового запису</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Ви вийшли. Причина: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s виходить. Причина: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Ви залишили кімнату. Причина: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s залишає кімнату. Причина: %2$s</string>
-    <string name="notice_direct_room_leave">%1$s залишає кімнату</string>
-    <string name="notice_direct_room_leave_by_you">Ви залишили кімнату</string>
-    <string name="notice_room_leave_by_you">Ви залишили кімнату</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">Ви змінили адреси цієї кімнати.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Ви змінили основну та альтернативну адреси цієї кімнати.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">Ви змінили альтернативні адреси для цієї кімнати.</string>
-    <string name="notice_power_level_changed_by_you">Ви змінили рівень доступу на %1$s.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">Ви змінили серверні списки контролю доступу для цієї кімнати.</string>
-    <string name="notice_room_name_changed_by_you">Ви змінили назву кімнати на: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Ви змінили світлину кімнати</string>
-    <string name="notice_room_topic_changed_by_you">Ви змінили тему на: %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">Ви змінили показуване ім\'я з %1$s на %2$s</string>
-    <string name="notice_avatar_url_changed_by_you">Ви змінили світлину профілю</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s та %4$d інший</item>
-        <item quantity="few">%1$s, %2$s, %3$s та %4$d інші</item>
-        <item quantity="many">%1$s, %2$s, %3$s та %4$d інших</item>
-        <item quantity="other">%1$s, %2$s, %3$s та %4$d інших</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s та %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s та %3$s</string>
-    <string name="power_level_default">Типово</string>
-    <string name="power_level_moderator">Модератор</string>
-    <string name="power_level_admin">Адміністратор</string>
-    <string name="notice_widget_removed_by_you">Ви вилучили %1$s віджет</string>
-    <string name="notice_widget_removed">%1$s вилучає %2$s віджет</string>
-    <string name="notice_widget_added_by_you">Ви додали %1$s віджет</string>
-    <string name="notice_widget_added">%1$s додає %2$s віджет</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Ви прийняли запрошення до %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">Ви надіслали запрошення для %1$s приєднатися до кімнати</string>
-    <string name="notice_profile_change_redacted_by_you">Ви оновили свій профіль %1$s</string>
-    <string name="notice_event_redacted_by_with_reason">%1$s вилучає повідомлення [причина: %2$s]</string>
-    <string name="notice_room_avatar_removed_by_you">Ви прибрали аватар кімнати</string>
-    <string name="notice_room_avatar_removed">%1$s прибирає аватар кімнати</string>
-    <string name="notice_room_topic_removed_by_you">Ви прибрали тему кімнати</string>
-    <string name="notice_room_name_removed_by_you">Ви прибрали назву кімнати</string>
-    <string name="notice_direct_room_update">%s оновлює кімнату.</string>
-    <string name="notice_room_update_by_you">Ви оновили цю кімнату.</string>
-    <string name="notice_end_to_end_by_you">Ви увімкнули наскрізне шифрування (%1$s)</string>
-    <string name="notice_placed_voice_call_by_you">Ви починаєте голосовий виклик.</string>
-    <string name="notice_placed_video_call_by_you">Ви починаєте відеовиклик.</string>
-    <string name="notice_room_avatar_changed">%1$s змінює аватар кімнати</string>
-    <string name="notice_display_name_removed_by_you">Ви прибрали показуване ім\'я (%1$s)</string>
-    <string name="notice_room_kick_by_you">Ви викинули %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s запрошує %2$s</string>
-    <string name="notice_room_reject_by_you">Ви відхилили запрошення</string>
-    <string name="notice_direct_room_join_by_you">Ви приєдналися</string>
-    <string name="notice_direct_room_join">%1$s приєднується</string>
-    <string name="notice_room_join_by_you">Ви приєдналися до кімнати</string>
-    <string name="notice_direct_room_third_party_invite_by_you">Ви запросили %1$s</string>
-    <string name="notice_room_invite_by_you">Ви запросили %1$s</string>
-    <string name="notice_direct_room_created_by_you">Ви створили обговорення</string>
-    <string name="notice_direct_room_created">%1$s створює обговорення</string>
-    <string name="notice_room_created_by_you">Ви створили кімнату</string>
-    <string name="notice_room_created">%1$s створює кімнату</string>
-    <string name="notice_room_invite_no_invitee_by_you">Ваше запрошення</string>
-    <string name="summary_you_sent_sticker">Ви надіслали наліпку.</string>
-    <string name="summary_you_sent_image">Ви надіслали зображення.</string>
-    <string name="notice_room_reject_with_reason_by_you">Ви відхилили запрошення. Причина: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s відхиляє запрошення. Причина: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Ви приєдналися. Причина: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s приєднується. Причина: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">Ви приєднуєтеся до кімнати. Причина: %1$s</string>
-    <string name="notice_room_join_with_reason">%1$s приєднується до кімнати. Причина: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s запрошує вас. Причина: %2$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Ви запросили %1$s. Причина: %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s запрошує %2$s. Причина: %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваше запрошення. Причина: %1$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Запрошення від %1$s. Причина: %2$s</string>
-    <string name="clear_timeline_send_queue">Очистити чергу надсилання</string>
-    <string name="event_status_sending_message">Надсилання повідомлень…</string>
-    <string name="initial_sync_start_importing_account_groups">Початкова синхронізація:
-\nІмпортування спільнот</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Початкова синхронізація:
-\nІмпортування кімнат, які ви залишили</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Початкова синхронізація:
-\nІмпортування запрошень до кімнат</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Початкова синхронізація:
-\nІмпортування кімнат, до яких ви приєдналися</string>
-    <string name="initial_sync_start_importing_account_rooms">Початкова синхронізація:
-\nІмпортування кімнат</string>
-    <string name="initial_sync_start_importing_account_crypto">Початкова синхронізація:
-\nІмпортування криптографічних даних</string>
-    <string name="initial_sync_start_importing_account">Початкова синхронізація:
-\nІмпортування даних облікового запису…</string>
-    <string name="room_displayname_empty_room_was">Порожня кімната (була %s)</string>
-    <string name="power_level_custom_no_value">Власний</string>
-    <string name="power_level_custom">Власний (%1$d)</string>
-    <string name="notice_widget_modified_by_you">Ви змінили віджет %1$s</string>
-    <string name="notice_widget_modified">%1$s змінює віджет %2$s</string>
-    <string name="notice_direct_room_update_by_you">Ви оновили кімнату.</string>
-    <string name="notice_made_future_room_visibility_by_you">Ви зробили майбутню історію кімнати видимою для %1$s</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">Ви зробили майбутні повідомлення видимими для %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s робить майбутні повідомлення видимими для %2$s</string>
-    <string name="notice_ended_call_by_you">Ви завершили дзвінок.</string>
-    <string name="notice_answered_call_by_you">Ви відповіли на виклик.</string>
-    <string name="notice_call_candidates_by_you">Ви надіслали дані для налаштування виклику.</string>
-    <string name="notice_call_candidates">%s надсилає дані для налаштування виклику.</string>
-    <string name="notice_display_name_set_by_you">Ви встановили собі показуване ім\'я %1$s</string>
-    <string name="notice_room_withdraw_by_you">Ви відкликали запрошення для %1$s</string>
-    <string name="notice_room_ban_by_you">Ви заблокували %1$s</string>
-    <string name="notice_room_unban_by_you">Ви заблокували %1$s</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-vls/strings.xml b/matrix-sdk-android/src/main/res/values-vls/strings.xml
deleted file mode 100644
index f0f2287a8d..0000000000
--- a/matrix-sdk-android/src/main/res/values-vls/strings.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s èt e fotootje gesteurd.</string>
-    <string name="summary_user_sent_sticker">%1$s èt e sticker gesteurd.</string>
-
-    <string name="notice_room_invite_no_invitee">Uutnodigienge van %s</string>
-    <string name="notice_room_invite">%1$s èt %2$s uutgenodigd</string>
-    <string name="notice_room_invite_you">%1$s èt joun uitgenodigd</string>
-    <string name="notice_room_join">%1$s neemt nu deel an ’t gesprek</string>
-    <string name="notice_room_leave">%1$s èt ’t gesprek verloatn</string>
-    <string name="notice_room_reject">%1$s èt d’uitnodigienge geweigerd</string>
-    <string name="notice_room_kick">%1$s èt %2$s uut ’t gesprek verwyderd</string>
-    <string name="notice_room_unban">%1$s èt %2$s ountbann</string>
-    <string name="notice_room_ban">%1$s èt %2$s verbann</string>
-    <string name="notice_room_withdraw">%1$s èt d’uutnodigienge van %2$s ingetrokkn</string>
-    <string name="notice_avatar_url_changed">%1$s èt zyn/heur avatar angepast</string>
-    <string name="notice_display_name_set">%1$s èt zyn/heur noame angepast noa %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s èt zyn/heur noame angepast van %2$s noa %3$s</string>
-    <string name="notice_display_name_removed">%1$s èt zyn/heur noame verwyderd (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s èt ’t ounderwerp veranderd noa: %2$s</string>
-    <string name="notice_room_name_changed">%1$s èt de gespreksnoame veranderd noa: %2$s</string>
-    <string name="notice_placed_video_call">%s èt e video-iproep gemakt.</string>
-    <string name="notice_placed_voice_call">%s èt e sproakiproep gemakt.</string>
-    <string name="notice_answered_call">%s èt den iproep beantwoord.</string>
-    <string name="notice_ended_call">%s èt ipgehangn.</string>
-    <string name="notice_made_future_room_visibility">%1$s èt de toekomstige gespreksgeschiedenisse zichtboar gemakt vo %2$s</string>
-    <string name="notice_room_visibility_invited">alle deelnemers an ’t gesprek, vanaf ’t punt dan ze zyn uutgenodigd.</string>
-    <string name="notice_room_visibility_joined">alle deelnemers an ’t gesprek, vanaf ’t punt dan ze zyn toegetreedn.</string>
-    <string name="notice_room_visibility_shared">alle deelnemers an ’t gesprek.</string>
-    <string name="notice_room_visibility_world_readable">iedereen.</string>
-    <string name="notice_room_visibility_unknown">ounbekend (%s).</string>
-    <string name="notice_end_to_end">%1$s èt eind-tout-eind-versleutelienge angezet (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s èt e VoIP-vergoaderienge angevroagd</string>
-    <string name="notice_voip_started">VoIP-vergoaderienge begunn</string>
-    <string name="notice_voip_finished">VoIP-vergoaderienge gestopt</string>
-
-    <string name="notice_avatar_changed_too">(avatar es ook veranderd)</string>
-    <string name="notice_room_name_removed">%1$s èt de gespreksnoame verwyderd</string>
-    <string name="notice_room_topic_removed">%1$s èt ’t gespreksounderwerp verwyderd</string>
-    <string name="notice_event_redacted">Bericht verwyderd</string>
-    <string name="notice_event_redacted_by">Bericht verwyderd deur %1$s</string>
-    <string name="notice_event_redacted_with_reason">Bericht verwyderd [reden: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Bericht verwyderd deur %1$s [reden: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s èt zyn/heur profiel %2$s bygewerkt</string>
-    <string name="notice_room_third_party_invite">%1$s èt een uutnodigienge noa %2$s gesteurd vo ’t gesprek toe te treedn</string>
-    <string name="notice_room_third_party_registered_invite">%1$s èt d’uutnodigienge vo %2$s anveird</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Kun nie ountsleuteln: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">’t Toestel van den afzender èt geen sleutels vo da bericht hier gesteurd.</string>
-
-    <string name="could_not_redact">Kosteg nie verwyderd wordn</string>
-    <string name="unable_to_send_message">Kosteg ’t bericht nie verzendn</string>
-
-    <string name="message_failed_to_upload">Iploadn van ’t fotootje es mislukt</string>
-
-    <string name="network_error">Netwerkfout</string>
-    <string name="matrix_error">Matrix-fout</string>
-
-    <string name="room_error_join_failed_empty_room">’t Es vo de moment nie meuglik van e leeg gesprek were toe te treedn.</string>
-
-    <string name="encrypted_message">Versleuteld bericht</string>
-
-    <string name="medium_email">E-mailadresse</string>
-    <string name="medium_phone_number">Telefongnumero</string>
-
-    <string name="room_displayname_invite_from">Uutnodigienge van %s</string>
-    <string name="room_displayname_room_invite">Gespreksuutnodigienge</string>
-
-    <string name="room_displayname_two_members">%1$s en %2$s</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s en 1 andere</item>
-        <item quantity="other">%1$s en %2$d anderen</item>
-    </plurals>
-
-    <string name="room_displayname_empty_room">Leeg gesprek</string>
-
-    <string name="initial_sync_start_importing_account">Initiële synchronisoasje:
-\nAccount wor geïmporteerd…</string>
-    <string name="initial_sync_start_importing_account_crypto">Initiële synchronisoasje: 
-\nCrypto wor geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_rooms">Initiële synchronisoasje: 
-\nGesprekkn wordn geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Initiële synchronisoasje: 
-\nDeelgenoomn gesprekken wordn geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Initiële synchronisoasje: 
-\nUutgenodigde gesprekkn wordn geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisoasje: 
-\nVerloatn gesprekkn wordn geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_groups">Initiële synchronisoasje: 
-\nGemeenschappn wordn geïmporteerd</string>
-    <string name="initial_sync_start_importing_account_data">Initiële synchronisoasje: 
-\nAccountgegeevns wordn geïmporteerd</string>
-
-    <string name="notice_room_update">%s èt da gesprek hier ipgewoardeerd.</string>
-
-    <string name="event_status_sending_message">Bericht wor verstuurd…</string>
-    <string name="clear_timeline_send_queue">Uutgoande wachtreeke leegn</string>
-
-    <string name="notice_room_third_party_revoked_invite">%1$s èt d’uutnodigienge vo %2$s vo ’t gesprek toe te treedn ingetrokkn</string>
-</resources>
diff --git a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 585ac625cb..0000000000
--- a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_user_sent_image">%1$s 发送了一张图片。</string>
-    <string name="notice_room_invite_no_invitee">%s 的邀请</string>
-    <string name="notice_room_invite">%1$s 邀请了 %2$s</string>
-    <string name="notice_room_invite_you">%1$s 邀请了您</string>
-    <string name="notice_room_join">%1$s 加入了聊天室</string>
-    <string name="notice_room_leave">%1$s 离开了聊天室</string>
-    <string name="notice_room_reject">%1$s 拒绝了邀请</string>
-    <string name="notice_room_kick">%1$s 移除了 %2$s</string>
-    <string name="notice_room_unban">%1$s 解封了 %2$s</string>
-    <string name="notice_room_ban">%1$s 封禁了 %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s 更换了他们的头像</string>
-    <string name="notice_display_name_set">%1$s 将他们的昵称设置为 %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s 把他们的昵称从 %2$s 改为 %3$s</string>
-    <string name="notice_display_name_removed">%1$s 移除了他们的昵称 (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s 把主题改为： %2$s</string>
-    <string name="notice_room_name_changed">%1$s 把聊天室名称改为： %2$s</string>
-    <string name="notice_placed_video_call">%s 发起了一次视频通话。</string>
-    <string name="notice_placed_voice_call">%s 发起了一次语音通话。</string>
-    <string name="notice_answered_call">%s 已接听通话。</string>
-    <string name="notice_ended_call">%s 已结束通话。</string>
-    <string name="notice_room_visibility_invited">所有聊天室成员，从他们被邀请开始。</string>
-    <string name="notice_room_visibility_joined">所有聊天室成员，从他们加入开始。</string>
-    <string name="notice_room_visibility_shared">所有聊天室成员。</string>
-    <string name="notice_room_visibility_world_readable">任何人。</string>
-    <string name="notice_room_visibility_unknown">未知（%s）。</string>
-    <string name="notice_end_to_end">%1$s 开启了端到端加密（%2$s）</string>
-    <string name="notice_requested_voip_conference">%1$s 请求了一次 VoIP 会议</string>
-    <string name="notice_voip_started">VoIP 会议已开始</string>
-    <string name="notice_voip_finished">VoIP 会议已结束</string>
-    <string name="notice_avatar_changed_too">（头像也被更改）</string>
-    <string name="notice_room_name_removed">%1$s 移除了聊天室名称</string>
-    <string name="notice_room_topic_removed">%1$s 移除了聊天室主题</string>
-    <string name="notice_crypto_unable_to_decrypt">** 无法解密：%s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
-    <string name="unable_to_send_message">无法发送消息</string>
-    <string name="message_failed_to_upload">上传图像失败</string>
-    <string name="network_error">网络错误</string>
-    <string name="matrix_error">Matrix 错误</string>
-    <string name="room_error_join_failed_empty_room">目前无法重新加入一个空的聊天室。</string>
-    <string name="encrypted_message">已加密消息</string>
-    <string name="medium_email">电子邮箱地址</string>
-    <string name="medium_phone_number">手机号码</string>
-    <string name="notice_room_withdraw">%1$s 撤回了对 %2$s 的邀请</string>
-    <string name="notice_made_future_room_visibility">%1$s 让未来的聊天室历史记录对 %2$s 可见</string>
-    <string name="notice_profile_change_redacted">%1$s 更新了他的个人档案 %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s 向 %2$s 发送了加入聊天室的邀请</string>
-    <string name="notice_room_third_party_registered_invite">%1$s 接受了 %2$s 的邀请</string>
-    <string name="could_not_redact">无法撤回</string>
-    <string name="summary_message">%1$s：%2$s</string>
-    <string name="summary_user_sent_sticker">%1$s 发送了一张贴纸。</string>
-    <string name="room_displayname_empty_room">空聊天室</string>
-    <string name="room_displayname_invite_from">来自 %s 的邀请</string>
-    <string name="room_displayname_room_invite">聊天室邀请</string>
-    <string name="room_displayname_two_members">%1$s 和 %2$s</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="other">%1$s 与其他 %2$d 位</item>
-    </plurals>
-    <string name="notice_event_redacted">消息已被移除</string>
-    <string name="notice_event_redacted_by">消息已被 %1$s 移除</string>
-    <string name="notice_event_redacted_with_reason">消息已被移除 [原因: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">消息已被 %1$s 移除 [原因: %2$s]</string>
-    <string name="initial_sync_start_importing_account">初始化同步：
-\n正在导入账号…</string>
-    <string name="initial_sync_start_importing_account_crypto">初始化同步：
-\n正在导入加密数据</string>
-    <string name="initial_sync_start_importing_account_rooms">初始化同步：
-\n正在导入聊天室</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">初始化同步：
-\n正在导入已加入的聊天室</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">初始化同步：
-\n正在导入已邀请的聊天室</string>
-    <string name="initial_sync_start_importing_account_left_rooms">初始化同步：
-\n正在导入已离开的聊天室</string>
-    <string name="initial_sync_start_importing_account_groups">初始化同步：
-\n正在导入社区</string>
-    <string name="initial_sync_start_importing_account_data">初始化同步：
-\n正在导入账号数据</string>
-    <string name="notice_room_update">%s 升级了此聊天室。</string>
-    <string name="event_status_sending_message">正在发送消息…</string>
-    <string name="clear_timeline_send_queue">清除正在发送队列</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 加入聊天室的邀请</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀请。理由：%2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s 邀请了 %2$s。理由：%3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s 邀请了您。理由：%2$s</string>
-    <string name="notice_room_join_with_reason">%1$s 加入了聊天室。理由：%2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s 离开了聊天室。理由：%2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s 已拒绝邀请。理由：%2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s 踢走了 %2$s。理由：%3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s 解封了 %2$s。理由：%3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s 封禁了 %2$s。理由：%3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s 已发送邀请给 %2$s 来加入聊天室。理由：%3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s 撤销了 %2$s 加入聊天室的邀請。理由：%3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s 接受 %2$s 的邀請。理由：%3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s 撤回了对 %2$s 的邀请。理由：%3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="other">%1$s 新增了 %2$s 为此聊天室的地址。</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="other">%1$s 移除了 %2$s 作为此聊天室额地址。</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s 为此聊天室新增了 %2$s 并移除 %3$s 地址。</string>
-    <string name="notice_room_canonical_alias_set">%1$s 将此聊天室的主地址设为了 %2$s。</string>
-    <string name="notice_room_canonical_alias_unset">%1$s 为此聊天室移除了主地址。</string>
-    <string name="notice_room_guest_access_can_join">%1$s 已允许访客加入聊天室。</string>
-    <string name="notice_room_guest_access_forbidden">%1$s 已禁止访客加入聊天室。</string>
-    <string name="notice_end_to_end_ok">%1$s 已开启端到端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端到端加密（无法识别的演算法 %2$s）。</string>
-    <string name="notice_room_created">%1$s 创建了这个聊天室</string>
-    <string name="summary_you_sent_image">您发送了一张图片。</string>
-    <string name="summary_you_sent_sticker">您发送了一张贴纸。</string>
-    <string name="notice_room_invite_no_invitee_by_you">您的邀请</string>
-    <string name="notice_room_created_by_you">您创建了这个聊天室</string>
-    <string name="notice_room_invite_by_you">您邀请了 %1$s</string>
-    <string name="notice_room_join_by_you">您加入了聊天室</string>
-    <string name="notice_room_leave_by_you">您离开了聊天室</string>
-    <string name="notice_room_reject_by_you">您拒绝了邀请</string>
-    <string name="notice_room_kick_by_you">您移除了 %1$s</string>
-    <string name="notice_room_unban_by_you">您解封了 %1$s</string>
-    <string name="notice_room_ban_by_you">您封禁了 %1$s</string>
-    <string name="notice_room_withdraw_by_you">您撤回了对 %1$s 的邀请</string>
-    <string name="notice_avatar_url_changed_by_you">您更换了您的头像</string>
-    <string name="notice_display_name_set_by_you">您将您的昵称设置为 %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">您将您的昵称从 %1$s 改为 %2$s</string>
-    <string name="notice_display_name_removed_by_you">您移除了您的昵称 (%1$s)</string>
-    <string name="notice_room_topic_changed_by_you">您把主题改为：%1$s</string>
-    <string name="notice_room_avatar_changed">%1$s 变更了聊天室头像</string>
-    <string name="notice_room_avatar_changed_by_you">您变更了聊天室头像</string>
-    <string name="notice_room_name_changed_by_you">您把聊天室名称改为：%1$s</string>
-    <string name="notice_placed_video_call_by_you">您发起了一次视频通话。</string>
-    <string name="notice_placed_voice_call_by_you">您发起了一次语音通话。</string>
-    <string name="notice_call_candidates">%s 发送了数据以建立通话。</string>
-    <string name="notice_call_candidates_by_you">您发送了数据以建立通话。</string>
-    <string name="notice_answered_call_by_you">您接听了通话。</string>
-    <string name="notice_ended_call_by_you">您结束了通话。</string>
-    <string name="notice_made_future_room_visibility_by_you">您已让未来的聊天室记录对 %1$s 可见</string>
-    <string name="notice_end_to_end_by_you">您开启了端到端加密（%1$s）</string>
-    <string name="notice_room_update_by_you">您升级了此聊天室。</string>
-    <string name="notice_requested_voip_conference_by_you">您请求了 VoIP 会议</string>
-    <string name="notice_room_name_removed_by_you">您移除了聊天室名称</string>
-    <string name="notice_room_topic_removed_by_you">您移除了聊天室主题</string>
-    <string name="notice_room_avatar_removed">%1$s 移除了聊天室头像</string>
-    <string name="notice_room_avatar_removed_by_you">您移除了聊天室头像</string>
-    <string name="notice_profile_change_redacted_by_you">您更新了您的个人档案 %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">您向 %1$s 发送了加入聊天室的邀请</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">您已撤回了对 %1$s 加入聊天室的邀请</string>
-    <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀请</string>
-    <string name="notice_widget_added">%1$s 添加了 %2$s 小部件</string>
-    <string name="notice_widget_added_by_you">您添加了 %1$s 小部件</string>
-    <string name="notice_widget_removed">%1$s 移除了 %2$s 小部件</string>
-    <string name="notice_widget_removed_by_you">您移除了 %1$s 小部件</string>
-    <string name="notice_widget_modified">%1$s 修改了 %2$s 小部件</string>
-    <string name="notice_widget_modified_by_you">您修改了 %1$s 小部件</string>
-    <string name="power_level_admin">管理员</string>
-    <string name="power_level_moderator">审核员</string>
-    <string name="power_level_default">默认</string>
-    <string name="power_level_custom">自定义（%1$d）</string>
-    <string name="power_level_custom_no_value">自定义</string>
-    <string name="notice_power_level_changed_by_you">您更改了%1$s 的权力等级。</string>
-    <string name="notice_power_level_changed">%1$s 更改了 %2$s 的权力等级。</string>
-    <string name="notice_power_level_diff">%1$s 从 %2$s 到 %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">您的邀请。理由：%1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">您邀请了 %1$s。理由：%2$s</string>
-    <string name="notice_room_join_with_reason_by_you">您加入了聊天室。理由：%1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">您离开了聊天室。理由：%1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">您拒绝了邀请。理由：%1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">您踢走了 %1$s。理由：%2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">您解封了 %1$s。理由：%2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">您封禁了 %1$s。理由：%2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">您已发送邀请给 %1$s 来加入聊天室。理由：%2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">您撤销了 %1$s 加入聊天室的邀请。理由：%2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">您接受了 %1$s 的邀请。理由：%2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀请。理由：%2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="other">您新增了 %1$s 为此聊天室的地址。</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="other">您移除了此聊天室的 %1$s 地址。</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">您为此聊天室新增了 %1$s 并移除了 %2$s 地址。</string>
-    <string name="notice_room_canonical_alias_set_by_you">您将此聊天室的主地址设为了 %1$s。</string>
-    <string name="notice_room_canonical_alias_unset_by_you">您移除了此聊天室的主地址。</string>
-    <string name="notice_room_guest_access_can_join_by_you">您已允许访客加入聊天室。</string>
-    <string name="notice_room_guest_access_forbidden_by_you">您已禁止访客加入聊天室。</string>
-    <string name="notice_end_to_end_ok_by_you">您已开启端到端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">您已开启端到端加密（无法识别的算法 %1$s）。</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">您已离开。理由：%1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s 已离开。理由：%2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">您已加入。理由：%1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s 已加入。理由：%2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">您撤回了对 %1$s 的邀请</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 的邀请</string>
-    <string name="notice_direct_room_third_party_invite_by_you">您邀请了 %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s 邀请了 %2$s</string>
-    <string name="notice_direct_room_update_by_you">您在此处升级。</string>
-    <string name="notice_direct_room_update">%s 在此处升级。</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">您使未来的消息对 %1$s 可见</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s 使未来的消息对 %2$s 可见</string>
-    <string name="notice_direct_room_leave_by_you">您离开了聊天室</string>
-    <string name="notice_direct_room_leave">%1$s 离开了聊天室</string>
-    <string name="notice_direct_room_join_by_you">您已加入</string>
-    <string name="notice_direct_room_join">%1$s 已加入</string>
-    <string name="notice_direct_room_created_by_you">您创建了讨论</string>
-    <string name="notice_direct_room_created">%1$s 创建了讨论</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">你已阻止客人加入房间。</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s已阻止客人加入房间。</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">你已允许客人加入这里。</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s 已允许客人加入这里。</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index d525d4b4bd..0000000000
--- a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s：%2$s</string>
-    <string name="summary_user_sent_image">%1$s 傳送了一張圖片。</string>
-    <string name="notice_room_invite_no_invitee">%s 的邀請</string>
-    <string name="notice_room_invite">%1$s 邀請了 %2$s</string>
-    <string name="notice_room_invite_you">%1$s 邀請您</string>
-    <string name="notice_room_join">%1$s 已加入聊天室</string>
-    <string name="notice_room_leave">%1$s 已離開聊天室</string>
-    <string name="notice_room_reject">%1$s 拒絕邀請</string>
-    <string name="notice_room_kick">%1$s 踢出 %2$s</string>
-    <string name="notice_room_unban">%1$s 解除禁止 %2$s</string>
-    <string name="notice_room_ban">%1$s 禁止 %2$s</string>
-    <string name="notice_room_withdraw">%1$s 收回了對 %2$s 的邀請</string>
-    <string name="notice_avatar_url_changed">%1$s 變更了他們的大頭貼</string>
-    <string name="notice_display_name_set">%1$s 設定了他們的顯示名稱為 %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s 變更了他們的顯示名稱從 %2$s 到 %3$s</string>
-    <string name="notice_display_name_removed">%1$s 移除了他們的顯示名稱 (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s 變更主題為：%2$s</string>
-    <string name="notice_room_name_changed">%1$s 變更房間名稱為：%2$s</string>
-    <string name="notice_placed_video_call">%s 撥出了視訊通話。</string>
-    <string name="notice_placed_voice_call">%s 撥出了語音通話。</string>
-    <string name="notice_answered_call">%s 回覆了通話。</string>
-    <string name="notice_ended_call">%s 結束通話。</string>
-    <string name="notice_made_future_room_visibility">%1$s 讓房間未來可讓 %2$s 看到歷史紀錄</string>
-    <string name="notice_room_visibility_invited">所有的房間成員，從他們被邀請的時間開始。</string>
-    <string name="notice_room_visibility_joined">所有的房間成員，從他們加入的時間開始。</string>
-    <string name="notice_room_visibility_shared">所有的房間成員。</string>
-    <string name="notice_room_visibility_world_readable">任何人。</string>
-    <string name="notice_room_visibility_unknown">未知 (%s)。</string>
-    <string name="notice_end_to_end">%1$s 開啟了端對端加密 (%2$s)</string>
-    <string name="notice_requested_voip_conference">%1$s 請求了 VoIP 會議通話</string>
-    <string name="notice_voip_started">VoIP 會議通話已開始</string>
-    <string name="notice_voip_finished">VoIP 會議通話已結束</string>
-    <string name="notice_avatar_changed_too">（大頭貼也變更了）</string>
-    <string name="notice_room_name_removed">%1$s 移除了房間名稱</string>
-    <string name="notice_room_topic_removed">%1$s 移除了房間主題</string>
-    <string name="notice_profile_change_redacted">%1$s 更新了他們的基本資料 %2$s</string>
-    <string name="notice_room_third_party_invite">%1$s 傳送加入房間的邀請給 %2$s</string>
-    <string name="notice_room_third_party_registered_invite">%1$s 接受 %2$s 的邀請</string>
-    <string name="notice_crypto_unable_to_decrypt">** 無法解密：%s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">傳送者的裝置並未在此訊息傳送他們的金鑰。</string>
-    <string name="could_not_redact">無法編輯</string>
-    <string name="unable_to_send_message">無法傳送訊息</string>
-    <string name="message_failed_to_upload">上傳圖片失敗</string>
-    <string name="network_error">網路錯誤</string>
-    <string name="matrix_error">Matrix 錯誤</string>
-    <string name="room_error_join_failed_empty_room">目前無法重新加入空房間。</string>
-    <string name="encrypted_message">已加密的訊息</string>
-    <string name="medium_email">電子郵件</string>
-    <string name="medium_phone_number">電話號碼</string>
-    <string name="summary_user_sent_sticker">%1$s 傳送了一張貼圖。</string>
-    <string name="room_displayname_invite_from">來自%s 的邀請</string>
-    <string name="room_displayname_room_invite">聊天室邀請</string>
-    <string name="room_displayname_two_members">%1$s 和 %2$s</string>
-    <string name="room_displayname_empty_room">空聊天室</string>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="other">%1$s 和 和其他 %2$d 個人</item>
-    </plurals>
-    <string name="notice_event_redacted">訊息已移除</string>
-    <string name="notice_event_redacted_by">訊息已被 %1$s 移除</string>
-    <string name="notice_event_redacted_with_reason">訊息已移除 [理由：%1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">訊息已被 %1$s 移除 [理由：%2$s]</string>
-    <string name="initial_sync_start_importing_account">初始化同步：
-\n正在匯入帳號……</string>
-    <string name="initial_sync_start_importing_account_crypto">初始化同步：
-\n正在匯入 crypto</string>
-    <string name="initial_sync_start_importing_account_rooms">初始化同步：
-\n正在匯入聊天室</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">初始化同步：
-\n正在匯入已加入的聊天室</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">初始化同步：
-\n正在匯入已邀請的聊天室</string>
-    <string name="initial_sync_start_importing_account_left_rooms">初始化同步：
-\n正在匯入已離開的聊天室</string>
-    <string name="initial_sync_start_importing_account_groups">初始化同步：
-\n正在匯入社群</string>
-    <string name="initial_sync_start_importing_account_data">初始化同步：
-\n正在匯入帳號資料</string>
-    <string name="notice_room_update">%s 已升級此聊天室。</string>
-    <string name="event_status_sending_message">正在傳送訊息……</string>
-    <string name="clear_timeline_send_queue">清除傳送佇列</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s 撤銷了 %2$s 加入聊天室的邀請</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀請。理由：%2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s 邀請了 %2$s。理由：%3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s 邀請了您。理由：%2$s</string>
-    <string name="notice_room_join_with_reason">%1$s 已加入聊天室。理由：%2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s 已離開聊天室。理由：%2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s 已回絕邀請。理由：%2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s 踢走了 %2$s。理由：%3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s 取消封鎖了 %2$s。理由：%3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s 封鎖了 %2$s。理由：%3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s 已傳送邀請給 %2$s 來加入聊天室。理由：%3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s 撤銷了 %2$s 加入聊天室的邀請。理由：%3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s 接受 %2$s 的邀請。理由：%3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s 撤回了對 %2$s 的邀請。理由：%3$s</string>
-    <plurals name="notice_room_aliases_added">
-        <item quantity="other">%1$s 新增了 %2$s 為此聊天室的地址。</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="other">%1$s 移除了此聊天室的 %2$s 地址。</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed">%1$s 為此聊天室新增 %2$s 並移除 %3$s 地址。</string>
-    <string name="notice_room_canonical_alias_set">%1$s 為此聊天室設定了 %2$s 為主地址。</string>
-    <string name="notice_room_canonical_alias_unset">%1$s 為此聊天室移除了主要地址。</string>
-    <string name="notice_room_guest_access_can_join">%1$s 已允許訪客加入聊天室。</string>
-    <string name="notice_room_guest_access_forbidden">%1$s 已禁止訪客加入聊天室。</string>
-    <string name="notice_end_to_end_ok">%1$s 已開啟端到端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s 已開啟端到端加密（無法識別的演算法 %2$s）。</string>
-    <string name="notice_room_created">%1$s 建立了聊天室</string>
-    <string name="summary_you_sent_image">您傳送了圖片。</string>
-    <string name="summary_you_sent_sticker">您傳送了貼圖。</string>
-    <string name="notice_room_invite_no_invitee_by_you">您的邀請</string>
-    <string name="notice_room_created_by_you">您建立了聊天室</string>
-    <string name="notice_room_invite_by_you">您邀請了 %1$s</string>
-    <string name="notice_room_join_by_you">您加入了聊天室</string>
-    <string name="notice_room_leave_by_you">您離開的聊天室</string>
-    <string name="notice_room_reject_by_you">您回絕了邀請</string>
-    <string name="notice_room_kick_by_you">您踢除了 %1$s</string>
-    <string name="notice_room_unban_by_you">您取消封鎖了 %1$s</string>
-    <string name="notice_room_ban_by_you">您封鎖了 %1$s</string>
-    <string name="notice_room_withdraw_by_you">您撤銷了 %1$s 的邀請</string>
-    <string name="notice_avatar_url_changed_by_you">您變更了您的大頭貼</string>
-    <string name="notice_display_name_set_by_you">您將您的顯示名稱設定為 %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">您將您的顯示名稱從 %1$s 變更為 %2$s</string>
-    <string name="notice_display_name_removed_by_you">您移除了您的顯示名稱（其曾為 %1$s）</string>
-    <string name="notice_room_topic_changed_by_you">您將主題變更為：%1$s</string>
-    <string name="notice_room_avatar_changed">%1$s 變更了聊天室大頭貼</string>
-    <string name="notice_room_avatar_changed_by_you">您變更了聊天室大頭貼</string>
-    <string name="notice_room_name_changed_by_you">您將聊天室名稱變更為：%1$s</string>
-    <string name="notice_placed_video_call_by_you">您發起了視訊通話。</string>
-    <string name="notice_placed_voice_call_by_you">您發起了音訊通話。</string>
-    <string name="notice_call_candidates">%s 傳送了資料以建立通話。</string>
-    <string name="notice_call_candidates_by_you">您傳送了資料以建立通話。</string>
-    <string name="notice_answered_call_by_you">您接了通話。</string>
-    <string name="notice_ended_call_by_you">您結束了通話。</string>
-    <string name="notice_made_future_room_visibility_by_you">您已將未來的聊天室歷史設定為對 %1$s 可見</string>
-    <string name="notice_end_to_end_by_you">您開啟了端到端加密 (%1$s)</string>
-    <string name="notice_room_update_by_you">您升級了此聊天室。</string>
-    <string name="notice_requested_voip_conference_by_you">您請求了 VoIP 會議</string>
-    <string name="notice_room_name_removed_by_you">您移除了聊天室名稱</string>
-    <string name="notice_room_topic_removed_by_you">您移除了聊天室主題</string>
-    <string name="notice_room_avatar_removed">%1$s 移除了聊天室大頭貼</string>
-    <string name="notice_room_avatar_removed_by_you">您移除了聊天室大頭貼</string>
-    <string name="notice_profile_change_redacted_by_you">您更新了您的個人檔案 %1$s</string>
-    <string name="notice_room_third_party_invite_by_you">您傳送了邀請給 %1$s 以加入聊天室</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">您已撤銷對 %1$s 加入聊天室的邀請</string>
-    <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀請</string>
-    <string name="notice_widget_added">%1$s 新增了 %2$s 小工具</string>
-    <string name="notice_widget_added_by_you">您新增了 %1$s 小工具</string>
-    <string name="notice_widget_removed">%1$s 移除了 %2$s 小工具</string>
-    <string name="notice_widget_removed_by_you">您移除了 %1$s 小工具</string>
-    <string name="notice_widget_modified">%1$s 修改了 %2$s 小工具</string>
-    <string name="notice_widget_modified_by_you">您修改了 %1$s 小工具</string>
-    <string name="power_level_admin">管理員</string>
-    <string name="power_level_moderator">板主</string>
-    <string name="power_level_default">預設</string>
-    <string name="power_level_custom">自訂 (%1$d)</string>
-    <string name="power_level_custom_no_value">自訂</string>
-    <string name="notice_power_level_changed_by_you">您變更了 %1$s 的權力等級。</string>
-    <string name="notice_power_level_changed">%1$s 變更了 %2$s 的權力等級。</string>
-    <string name="notice_power_level_diff">%1$s 從 %2$s 到 %3$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">您的邀請。理由：%1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">您邀請了 %1$s。理由：%2$s</string>
-    <string name="notice_room_join_with_reason_by_you">您加入了聊天室。理由：%1$s</string>
-    <string name="notice_room_leave_with_reason_by_you">您離開了聊天室。理由：%1$s</string>
-    <string name="notice_room_reject_with_reason_by_you">您回絕了邀請。理由：%1$s</string>
-    <string name="notice_room_kick_with_reason_by_you">您踢除了 %1$s。理由：%2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">您取消封鎖了 %1$s。理由：%2$s</string>
-    <string name="notice_room_ban_with_reason_by_you">您封鎖了 %1$s。理由：%2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">您傳甕了邀請給 %1$s 以加入聊天室。理由：%2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">您撤銷了 %1$s 加入聊天室的邀請。理由：%2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">您接受了 %1$s 的邀請。理由：%2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀請。理由：%2$s</string>
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="other">您為此聊天室新增了 %1$s 作為地址。</item>
-    </plurals>
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="other">您為此聊天室移除了 %1$s 作為地址。</item>
-    </plurals>
-    <string name="notice_room_aliases_added_and_removed_by_you">您為此聊天室新增了 %1$s 並移除了 %2$s 作為地址。</string>
-    <string name="notice_room_canonical_alias_set_by_you">您將此聊天室的主要地址設定為 %1$s。</string>
-    <string name="notice_room_canonical_alias_unset_by_you">您將此聊天室的主要地址移除。</string>
-    <string name="notice_room_guest_access_can_join_by_you">您已允許訪客加入聊天室。</string>
-    <string name="notice_room_guest_access_forbidden_by_you">您已阻止訪客加入聊天室。</string>
-    <string name="notice_end_to_end_ok_by_you">您開啟了端到端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">您開啟了端到端加密（無法識別的演算法 %1$s）。</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">您已避免訪客加入此聊天室。</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s 已避免訪客加入此聊天室。</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">您已允許訪客加入這裡。</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s 已允許訪客加入這裡。</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">您已離開。理由：%1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s 已離開。理由：%2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">您已加入。理由：%1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s 已加入。理由：%2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">您已撤銷對 %1$s 的邀請</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s 已撤銷對 %2$s 的邀請</string>
-    <string name="notice_direct_room_third_party_invite_by_you">您已邀請了 %1$s</string>
-    <string name="notice_direct_room_third_party_invite">%1$s 邀請了 %2$s</string>
-    <string name="notice_direct_room_update_by_you">您已在此升級。</string>
-    <string name="notice_direct_room_update">%s 已在此升級。</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">您讓未來的訊息對 %1$s 可見</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s 已讓未來的訊息對 %2$s 可見</string>
-    <string name="notice_direct_room_leave_by_you">您已離開聊天室</string>
-    <string name="notice_direct_room_leave">%1$s 已離開聊天室</string>
-    <string name="notice_direct_room_join_by_you">您已加入</string>
-    <string name="notice_direct_room_join">%1$s 已加入</string>
-    <string name="notice_direct_room_created_by_you">您已建立此討論</string>
-    <string name="notice_direct_room_created">%1$s 已建立此討論</string>
-    <string name="room_displayname_empty_room_was">空的聊天室（曾為 %s）</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="other">%1$s, %2$s, %3$s 與 %4$d 個其他</item>
-    </plurals>
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s 與 %4$s</string>
-    <string name="room_displayname_3_members">%1$s, %2$s 與 %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 禁止所有伺服器參與！無法再使用此聊天室。</string>
-    <string name="notice_room_server_acl_updated_no_change">無變更。</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• 禁止伺服器符合 IP 文字。</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• 允許伺服器符合 IP 文字。</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• 伺服器符合 %s 已從允許清單中移除。</string>
-    <string name="notice_room_server_acl_updated_allowed">• 允許伺服器符合 %s。</string>
-    <string name="notice_room_server_acl_updated_was_banned">• 伺服器符合 %s 已從禁止清單中移除。</string>
-    <string name="notice_room_server_acl_updated_banned">• 現在禁止伺服器符合 %s。</string>
-    <string name="notice_room_server_acl_updated_title_by_you">您為此聊天室變更了伺服器 ACL。</string>
-    <string name="notice_room_server_acl_updated_title">%s 為此聊天是變更了伺服器 ACL。</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• 禁止伺服器符合 IP 文字。</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• 允許伺服器符合 IP 文字。</string>
-    <string name="notice_room_server_acl_set_allowed">• 已允許伺服器符合 %s。</string>
-    <string name="notice_room_server_acl_set_banned">• 已禁止伺服器符合 %s。</string>
-    <string name="notice_room_server_acl_set_title_by_you">您為此聊天是設定了伺服器 ACL。</string>
-    <string name="notice_room_server_acl_set_title">%s 為此聊天是設定了伺服器 ACL。</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">您變更了此聊天室的地址。</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s 變更了此聊天室的地址。</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">您為此聊天室變更了主要及備用地址。</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s 為此聊天室變更了主要及備用地址。</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">您為此聊天室變更了備用地址。</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s 變更了此聊天室的備用地址。</string>
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="other">您為此聊天室移除了備用地址 %1$s。</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="other">%1$s 已為此聊天室移除備用地址 %2$s。</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="other">您為此聊天室新增了備用地址 %1$s。</item>
-    </plurals>
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="other">%1$s 已為此聊天室新增了備用地址 %2$s。</item>
-    </plurals>
-    <string name="notice_widget_jitsi_modified_by_you">您修改了視訊會議</string>
-    <string name="notice_widget_jitsi_modified">%1$s 修改了視訊會議</string>
-    <string name="notice_widget_jitsi_removed_by_you">您結束了視訊會議</string>
-    <string name="notice_widget_jitsi_removed">%1$s 結束了視訊會議</string>
-    <string name="notice_widget_jitsi_added_by_you">您開始了視訊會議</string>
-    <string name="notice_widget_jitsi_added">由 %1$s 開始的視訊會議</string>
-</resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
deleted file mode 100644
index 08275fba36..0000000000
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">%1$s sent an image.</string>
-    <string name="summary_you_sent_image">You sent an image.</string>
-    <string name="summary_user_sent_sticker">%1$s sent a sticker.</string>
-    <string name="summary_you_sent_sticker">You sent a sticker.</string>
-
-    <string name="notice_room_invite_no_invitee">%s\'s invitation</string>
-    <string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
-    <string name="notice_room_created">%1$s created the room</string>
-    <string name="notice_room_created_by_you">You created the room</string>
-    <string name="notice_direct_room_created">%1$s created the discussion</string>
-    <string name="notice_direct_room_created_by_you">You created the discussion</string>
-    <string name="notice_room_invite">%1$s invited %2$s</string>
-    <string name="notice_room_invite_by_you">You invited %1$s</string>
-    <string name="notice_room_invite_you">%1$s invited you</string>
-    <string name="notice_room_join">%1$s joined the room</string>
-    <string name="notice_room_join_by_you">You joined the room</string>
-    <string name="notice_direct_room_join">%1$s joined</string>
-    <string name="notice_direct_room_join_by_you">You joined</string>
-    <string name="notice_room_leave">%1$s left the room</string>
-    <string name="notice_room_leave_by_you">You left the room</string>
-    <string name="notice_direct_room_leave">%1$s left the room</string>
-    <string name="notice_direct_room_leave_by_you">You left the room</string>
-    <string name="notice_room_reject">%1$s rejected the invitation</string>
-    <string name="notice_room_reject_by_you">You rejected the invitation</string>
-    <string name="notice_room_kick">%1$s kicked %2$s</string>
-    <string name="notice_room_kick_by_you">You kicked %1$s</string>
-    <string name="notice_room_unban">%1$s unbanned %2$s</string>
-    <string name="notice_room_unban_by_you">You unbanned %1$s</string>
-    <string name="notice_room_ban">%1$s banned %2$s</string>
-    <string name="notice_room_ban_by_you">You banned %1$s</string>
-    <string name="notice_room_withdraw">%1$s withdrew %2$s\'s invitation</string>
-    <string name="notice_room_withdraw_by_you">You withdrew %1$s\'s invitation</string>
-    <string name="notice_avatar_url_changed">%1$s changed their avatar</string>
-    <string name="notice_avatar_url_changed_by_you">You changed your avatar</string>
-    <string name="notice_display_name_set">%1$s set their display name to %2$s</string>
-    <string name="notice_display_name_set_by_you">You set your display name to %1$s</string>
-    <string name="notice_display_name_changed_from">%1$s changed their display name from %2$s to %3$s</string>
-    <string name="notice_display_name_changed_from_by_you">You changed your display name from %1$s to %2$s</string>
-    <string name="notice_display_name_removed">%1$s removed their display name (it was %2$s)</string>
-    <string name="notice_display_name_removed_by_you">You removed your display name (it was %1$s)</string>
-    <string name="notice_room_topic_changed">%1$s changed the topic to: %2$s</string>
-    <string name="notice_room_topic_changed_by_you">You changed the topic to: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s changed the room avatar</string>
-    <string name="notice_room_avatar_changed_by_you">You changed the room avatar</string>
-    <string name="notice_room_name_changed">%1$s changed the room name to: %2$s</string>
-    <string name="notice_room_name_changed_by_you">You changed the room name to: %1$s</string>
-    <string name="notice_placed_video_call">%s placed a video call.</string>
-    <string name="notice_placed_video_call_by_you">You placed a video call.</string>
-    <string name="notice_placed_voice_call">%s placed a voice call.</string>
-    <string name="notice_placed_voice_call_by_you">You placed a voice call.</string>
-    <string name="notice_call_candidates">%s sent data to setup the call.</string>
-    <string name="notice_call_candidates_by_you">You sent data to setup the call.</string>
-    <string name="notice_answered_call">%s answered the call.</string>
-    <string name="notice_answered_call_by_you">You answered the call.</string>
-    <string name="notice_ended_call">%s ended the call.</string>
-    <string name="notice_ended_call_by_you">You ended the call.</string>
-    <string name="notice_made_future_room_visibility">%1$s made future room history visible to %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">You made future room history visible to %1$s</string>
-    <string name="notice_made_future_direct_room_visibility">%1$s made future messages visible to %2$s</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">You made future messages visible to %1$s</string>
-    <string name="notice_room_visibility_invited">all room members, from the point they are invited.</string>
-    <string name="notice_room_visibility_joined">all room members, from the point they joined.</string>
-    <string name="notice_room_visibility_shared">all room members.</string>
-    <string name="notice_room_visibility_world_readable">anyone.</string>
-    <string name="notice_room_visibility_unknown">unknown (%s).</string>
-    <string name="notice_end_to_end">%1$s turned on end-to-end encryption (%2$s)</string>
-    <string name="notice_end_to_end_by_you">You turned on end-to-end encryption (%1$s)</string>
-    <string name="notice_room_update">%s upgraded this room.</string>
-    <string name="notice_room_update_by_you">You upgraded this room.</string>
-    <string name="notice_direct_room_update">%s upgraded here.</string>
-    <string name="notice_direct_room_update_by_you">You upgraded here.</string>
-    <string name="notice_room_server_acl_set_title">%s set the server ACLs for this room.</string>
-    <string name="notice_room_server_acl_set_title_by_you">You set the server ACLs for this room.</string>
-    <string name="notice_room_server_acl_set_banned">• Server matching %s are banned.</string>
-    <string name="notice_room_server_acl_set_allowed">• Server matching %s are allowed.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• Server matching IP literals are allowed.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Server matching IP literals are banned.</string>
-
-    <string name="notice_room_server_acl_updated_title">%s changed the server ACLs for this room.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">You changed the server ACLs for this room.</string>
-    <string name="notice_room_server_acl_updated_banned">• Server matching %s are now banned.</string>
-    <string name="notice_room_server_acl_updated_was_banned">• Server matching %s were removed from the ban list.</string>
-    <string name="notice_room_server_acl_updated_allowed">• Server matching %s are now allowed.</string>
-    <string name="notice_room_server_acl_updated_was_allowed">• Server matching %s were removed from the allowed list.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Server matching IP literals are now allowed.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Server matching IP literals are now banned.</string>
-    <string name="notice_room_server_acl_updated_no_change">No change.</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 All servers are banned from participating! This room can no longer be used.</string>
-
-    <string name="notice_requested_voip_conference">%1$s requested a VoIP conference</string>
-    <string name="notice_requested_voip_conference_by_you">You requested a VoIP conference</string>
-    <string name="notice_voip_started">VoIP conference started</string>
-    <string name="notice_voip_finished">VoIP conference finished</string>
-
-    <string name="notice_avatar_changed_too">(avatar was changed too)</string>
-    <string name="notice_room_name_removed">%1$s removed the room name</string>
-    <string name="notice_room_name_removed_by_you">You removed the room name</string>
-    <string name="notice_room_topic_removed">%1$s removed the room topic</string>
-    <string name="notice_room_topic_removed_by_you">You removed the room topic</string>
-    <string name="notice_room_avatar_removed">%1$s removed the room avatar</string>
-    <string name="notice_room_avatar_removed_by_you">You removed the room avatar</string>
-    <string name="notice_event_redacted">Message removed</string>
-    <string name="notice_event_redacted_by">Message removed by %1$s</string>
-    <string name="notice_event_redacted_with_reason">Message removed [reason: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">Message removed by %1$s [reason: %2$s]</string>
-    <string name="notice_profile_change_redacted">%1$s updated their profile %2$s</string>
-    <string name="notice_profile_change_redacted_by_you">You updated your profile %1$s</string>
-    <string name="notice_room_third_party_invite">%1$s sent an invitation to %2$s to join the room</string>
-    <string name="notice_room_third_party_invite_by_you">You sent an invitation to %1$s to join the room</string>
-    <string name="notice_direct_room_third_party_invite">%1$s invited %2$s</string>
-    <string name="notice_direct_room_third_party_invite_by_you">You invited %1$s</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s revoked the invitation for %2$s to join the room</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">You revoked the invitation for %1$s to join the room</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s revoked the invitation for %2$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">You revoked the invitation for %1$s</string>
-    <string name="notice_room_third_party_registered_invite">%1$s accepted the invitation for %2$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">You accepted the invitation for %1$s</string>
-
-    <string name="notice_widget_added">%1$s added %2$s widget</string>
-    <string name="notice_widget_added_by_you">You added %1$s widget</string>
-    <string name="notice_widget_removed">%1$s removed %2$s widget</string>
-    <string name="notice_widget_removed_by_you">You removed %1$s widget</string>
-    <string name="notice_widget_modified">%1$s modified %2$s widget</string>
-    <string name="notice_widget_modified_by_you">You modified %1$s widget</string>
-
-    <string name="notice_widget_jitsi_added">Video conference started by %1$s</string>
-    <string name="notice_widget_jitsi_added_by_you">You started video conference</string>
-    <string name="notice_widget_jitsi_removed">Video conference ended by %1$s</string>
-    <string name="notice_widget_jitsi_removed_by_you">You ended video conference</string>
-    <string name="notice_widget_jitsi_modified">Video conference modified by %1$s</string>
-    <string name="notice_widget_jitsi_modified_by_you">You modified video conference</string>
-
-    <string name="power_level_admin">Admin</string>
-    <string name="power_level_moderator">Moderator</string>
-    <string name="power_level_default">Default</string>
-    <string name="power_level_custom">Custom (%1$d)</string>
-    <string name="power_level_custom_no_value">Custom</string>
-
-    <!-- parameter will be a comma separated list of values of notice_power_level_diff -->
-    <string name="notice_power_level_changed_by_you">You changed the power level of %1$s.</string>
-    <!-- First parameter will be a userId or display name, second one will be a comma separated list of values of notice_power_level_diff -->
-    <string name="notice_power_level_changed">%1$s changed the power level of %2$s.</string>
-    <!-- First parameter will be a userId or display name, the two last ones will be value of power_level_* -->
-    <string name="notice_power_level_diff">%1$s from %2$s to %3$s</string>
-
-    <string name="notice_crypto_unable_to_decrypt">** Unable to decrypt: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">The sender\'s device has not sent us the keys for this message.</string>
-
-    <!-- Messages -->
-
-    <!-- Room Screen -->
-    <string name="could_not_redact">Could not redact</string>
-    <string name="unable_to_send_message">Unable to send message</string>
-
-    <string name="message_failed_to_upload">Failed to upload image</string>
-
-    <!-- general errors -->
-    <string name="network_error">Network error</string>
-    <string name="matrix_error">Matrix error</string>
-
-    <!-- Home Screen -->
-
-    <!-- Last seen time -->
-
-    <!-- call events -->
-
-    <!-- room error messages -->
-    <string name="room_error_join_failed_empty_room">It is not currently possible to re-join an empty room.</string>
-
-    <string name="encrypted_message">Encrypted message</string>
-
-    <!-- medium friendly name -->
-    <string name="medium_email">Email address</string>
-    <string name="medium_phone_number">Phone number</string>
-
-    <!-- Room display name -->
-    <string name="room_displayname_invite_from">Invite from %s</string>
-    <string name="room_displayname_room_invite">Room Invite</string>
-
-    <!-- The 2 parameters will be members' name -->
-    <string name="room_displayname_two_members">%1$s and %2$s</string>
-    <!-- The 3 parameters will be members' name -->
-    <string name="room_displayname_3_members">%1$s, %2$s and %3$s</string>
-    <!-- The 4 parameters will be members' name -->
-    <string name="room_displayname_4_members">%1$s, %2$s, %3$s and %4$s</string>
-    <!-- The 3 first parameters will be members' name -->
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one">%1$s, %2$s, %3$s and %4$d other</item>
-        <item quantity="other">%1$s, %2$s, %3$s and %4$d others</item>
-    </plurals>
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s and 1 other</item>
-        <item quantity="other">%1$s and %2$d others</item>
-    </plurals>
-
-    <string name="room_displayname_empty_room">Empty room</string>
-    <string name="room_displayname_empty_room_was">Empty room (was %s)</string>
-
-    <string name="initial_sync_start_server_computing">Initial Sync:\nWaiting for server response…</string>
-    <string name="initial_sync_start_downloading">Initial Sync:\nDownloading data…</string>
-    <string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
-    <string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
-    <string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Initial Sync:\nImporting Joined Rooms</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Initial Sync:\nImporting Invited Rooms</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Initial Sync:\nImporting Left Rooms</string>
-    <string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
-    <string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
-
-    <string name="event_status_sending_message">Sending message…</string>
-    <string name="clear_timeline_send_queue">Clear sending queue</string>
-
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s invitation. Reason: %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Your invitation. Reason: %1$s</string>
-    <string name="notice_room_invite_with_reason">%1$s invited %2$s. Reason: %3$s</string>
-    <string name="notice_room_invite_with_reason_by_you">You invited %1$s. Reason: %2$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s invited you. Reason: %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s joined the room. Reason: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">You joined the room. Reason: %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s joined. Reason: %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">You joined. Reason: %1$s</string>
-    <string name="notice_room_leave_with_reason">%1$s left the room. Reason: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">You left the room. Reason: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s left. Reason: %2$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">You left. Reason: %1$s</string>
-    <string name="notice_room_reject_with_reason">%1$s rejected the invitation. Reason: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">You rejected the invitation. Reason: %1$s</string>
-    <string name="notice_room_kick_with_reason">%1$s kicked %2$s. Reason: %3$s</string>
-    <string name="notice_room_kick_with_reason_by_you">You kicked %1$s. Reason: %2$s</string>
-    <string name="notice_room_unban_with_reason">%1$s unbanned %2$s. Reason: %3$s</string>
-    <string name="notice_room_unban_with_reason_by_you">You unbanned %1$s. Reason: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s banned %2$s. Reason: %3$s</string>
-    <string name="notice_room_ban_with_reason_by_you">You banned %1$s. Reason: %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s sent an invitation to %2$s to join the room. Reason: %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">You sent an invitation to %1$s to join the room. Reason: %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revoked the invitation for %2$s to join the room. Reason: %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">You revoked the invitation for %1$s to join the room. Reason: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s accepted the invitation for %2$s. Reason: %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">You accepted the invitation for %1$s. Reason: %2$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s withdrew %2$s\'s invitation. Reason: %3$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">You withdrew %1$s\'s invitation. Reason: %2$s</string>
-
-    <plurals name="notice_room_aliases_added">
-        <item quantity="one">%1$s added %2$s as an address for this room.</item>
-        <item quantity="other">%1$s added %2$s as addresses for this room.</item>
-    </plurals>
-
-    <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">You added %1$s as an address for this room.</item>
-        <item quantity="other">You added %1$s as addresses for this room.</item>
-    </plurals>
-
-    <plurals name="notice_room_aliases_removed">
-        <item quantity="one">%1$s removed %2$s as an address for this room.</item>
-        <item quantity="other">%1$s removed %2$s as addresses for this room.</item>
-    </plurals>
-
-    <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">You removed %1$s as an address for this room.</item>
-        <item quantity="other">You removed %1$s as addresses for this room.</item>
-    </plurals>
-
-    <string name="notice_room_aliases_added_and_removed">%1$s added %2$s and removed %3$s as addresses for this room.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">You added %1$s and removed %2$s as addresses for this room.</string>
-
-    <string name="notice_room_canonical_alias_set">"%1$s set the main address for this room to %2$s."</string>
-    <string name="notice_room_canonical_alias_set_by_you">"You set the main address for this room to %1$s."</string>
-    <string name="notice_room_canonical_alias_unset">"%1$s removed the main address for this room."</string>
-    <string name="notice_room_canonical_alias_unset_by_you">"You removed the main address for this room."</string>
-
-    <plurals name="notice_room_canonical_alias_alternative_added">
-        <item quantity="one">%1$s added the alternative address %2$s for this room.</item>
-        <item quantity="other">%1$s added the alternative addresses %2$s for this room.</item>
-    </plurals>
-
-    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">You added the alternative address %1$s for this room.</item>
-        <item quantity="other">You added the alternative addresses %1$s for this room.</item>
-    </plurals>
-
-    <plurals name="notice_room_canonical_alias_alternative_removed">
-        <item quantity="one">%1$s removed the alternative address %2$s for this room.</item>
-        <item quantity="other">%1$s removed the alternative addresses %2$s for this room.</item>
-    </plurals>
-
-    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">You removed the alternative address %1$s for this room.</item>
-        <item quantity="other">You removed the alternative addresses %1$s for this room.</item>
-    </plurals>
-
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s changed the alternative addresses for this room.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">You changed the alternative addresses for this room.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s changed the main and alternative addresses for this room.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">You changed the main and alternative addresses for this room.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s changed the addresses for this room.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">You changed the addresses for this room.</string>
-
-    <string name="notice_room_guest_access_can_join">"%1$s has allowed guests to join the room."</string>
-    <string name="notice_room_guest_access_can_join_by_you">"You have allowed guests to join the room."</string>
-    <string name="notice_direct_room_guest_access_can_join">"%1$s has allowed guests to join here."</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">"You have allowed guests to join here."</string>
-    <string name="notice_room_guest_access_forbidden">"%1$s has prevented guests from joining the room."</string>
-    <string name="notice_room_guest_access_forbidden_by_you">"You have prevented guests from joining the room."</string>
-    <string name="notice_direct_room_guest_access_forbidden">"%1$s has prevented guests from joining the room."</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">"You have prevented guests from joining the room."</string>
-
-    <string name="notice_end_to_end_ok">%1$s turned on end-to-end encryption.</string>
-    <string name="notice_end_to_end_ok_by_you">You turned on end-to-end encryption.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s turned on end-to-end encryption (unrecognised algorithm %2$s).</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">You turned on end-to-end encryption (unrecognised algorithm %1$s).</string>
-
-</resources>
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 86e8c889e9..60c7506810 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -1,5 +1,220 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_user_sent_image">إنَّ %1$s قد أرسلَ صُّورة.</string>
+    <string name="notice_room_invite_no_invitee">دعوة مِن %s</string>
+    <string name="notice_room_invite">إنَّ %1$s قد دَعى %2$s</string>
+    <string name="notice_room_invite_you">إنَّ %1$s قد دعاكَ أنت</string>
+    <string name="notice_room_join">إنَّ %1$s قد إنضّم إلى الغُرفة</string>
+    <string name="notice_room_leave">إنَّ %1$s قد غادر الغرفة</string>
+    <string name="notice_room_reject">إنَّ %1$s قد رفضَ الدعوة</string>
+    <string name="notice_room_kick">إنَّ %1$s قد طردَ %2$s</string>
+    <string name="notice_room_unban">إنَّ %1$s قد رفعَ الحظر عن %2$s</string>
+    <string name="notice_room_ban">إنَّ %1$s قد حظرَ %2$s</string>
+    <string name="notice_avatar_url_changed">إنَّ %1$s قد غيَّرَ صورته الشخصية</string>
+    <string name="notice_display_name_set">إنَّ %1$s قد عيَّنَ اسمه الظاهر إلى %2$s</string>
+    <string name="notice_display_name_changed_from">إنَّ %1$s قد غيَّرَ اسمه الظاهر من %2$s إلى %3$s</string>
+    <string name="notice_display_name_removed">إنَّ %1$s قد أزالَ اسمه الظاهر (لقد كان %2$s)</string>
+    <string name="notice_room_topic_changed">إنَّ %1$s قد غيَّرَ الموضوع إلى: %2$s</string>
+    <string name="notice_room_name_changed">إنَّ %1$s قد غيَّرَ اسم الغُرفة إلى: %2$s</string>
+    <string name="notice_answered_call">إنَّ %s قد أجابَ على المُكالمة.</string>
+    <string name="notice_ended_call">إنَّ %s قد أنهى المُكالمة.</string>
+    <string name="notice_made_future_room_visibility">إنَّ %1$s قد جعلَ التأريخ المُستقبلي للغُرفة مرئيًا لـ %2$s</string>
+    <string name="notice_room_visibility_invited">جميع أعضاء الغُرفة، مِنَ اللَّحظة التي تمَّت دعوتهم.</string>
+    <string name="notice_room_visibility_joined">جميع أعضاء الغُرفة، مِن لحظة انضمامهم.</string>
+    <string name="notice_room_visibility_shared">جميع أعضاء الغُرفة.</string>
+    <string name="notice_room_visibility_world_readable">أيُّ شخص.</string>
+    <string name="notice_room_visibility_unknown">غير معروف (%s).</string>
+    <string name="notice_end_to_end">إنَّ %1$s قد فعَّلَ تعمية النهاية-إلى-النهاية (%2$s)</string>
+    <string name="notice_requested_voip_conference">إنَّ %1$s قد طلبَ اجتماع VoIP</string>
+    <string name="notice_voip_started">إنَّ اجتماع VoIP قد بدأ</string>
+    <string name="notice_voip_finished">إنَّ اجتماع VoIP قد انتهى</string>
+    <string name="notice_room_name_removed">إنَّ %1$s قد أزالَ اسم الغُرفة</string>
+    <string name="notice_room_topic_removed">إنَّ %1$s قد أزالَ موضوع الغُرفة</string>
+    <string name="notice_profile_change_redacted">إنَّ %1$s قد حدَّثَ ملفه الشخصي %2$s</string>
+    <string name="notice_room_third_party_invite">إنَّ %1$s قد أرسلَ دعوة إلى %2$s للإنضمام إلى الغُرفة</string>
+    <string name="notice_crypto_unable_to_decrypt">** يتعذَّر فك تعمية: ⁨%s⁩ **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">إنَّ جِهاز المُرسل لم يُرسل لنا المفاتيح لهذه الرِّسالة.</string>
+    <string name="unable_to_send_message">يتعذَّ إرسال الرِّسالة</string>
+    <string name="message_failed_to_upload">فَشلَ رفع الصُّورة</string>
+    <string name="network_error">خطأ في الشَّبكة</string>
+    <string name="matrix_error">خطأ في Matrix</string>
+    <string name="room_error_join_failed_empty_room">حاليًا مِن غير المُمكِن إعادة الاِنضمام إلى غُرفة فارِغة.</string>
+    <string name="encrypted_message">رِسالة مُعمَّاة</string>
+    <string name="medium_email">عُنوان البريد الإلكتروني</string>
+    <string name="medium_phone_number">رقم الهاتف</string>
+    <string name="summary_message">‏‏⁨%1$s⁩: ‏⁨%2$s⁩</string>
+    <string name="notice_room_withdraw">إنَّ %1$s قد سحبَ دعوة %2$s</string>
+    <string name="notice_placed_video_call">إنَّ %s قد أجرى مُكالمة مرئية.</string>
+    <string name="notice_placed_voice_call">إنَّ %s قد أجرى مُكالمة صوتية.</string>
+    <string name="notice_room_third_party_registered_invite">إنَّ %1$s قد قَبَل دعوة %2$s</string>
+    <string name="could_not_redact">يتعذَّر التنقيح</string>
+    <string name="summary_user_sent_sticker">إنَّ %1$s قد أرسلَ مُلصقًا.</string>
+    <string name="notice_avatar_changed_too">(تمَّ تغيِّير الصُّورة أيضًا)</string>
+    <string name="room_displayname_invite_from">دَعوة مِن ⁨%s⁩</string>
+    <string name="room_displayname_empty_room">غُرفة فارِغة</string>
+    <string name="room_displayname_two_members">%1$s وَ %2$s</string>
+    <string name="room_displayname_room_invite">دَعوة غُرفة</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="zero"></item>
+        <item quantity="one">%1$s وواحد آخر</item>
+        <item quantity="two">%1$s و%2$d آخران</item>
+        <item quantity="few">%1$s و%2$d آخرين</item>
+        <item quantity="many">%1$s و%2$d آخرون</item>
+        <item quantity="other">%1$s و%2$d آخرون</item>
+    </plurals>
+    <string name="summary_you_sent_image">أنتَ قد أرسلتَ صُّورة.</string>
+    <string name="summary_you_sent_sticker">أنتَ قد أرسلتَ مُلصقًا.</string>
+    <string name="notice_room_invite_no_invitee_by_you">دعوة مِنكَ أنت</string>
+    <string name="notice_room_created">إنَّ %1$s قد أنشأ الغُرفة</string>
+    <string name="notice_room_created_by_you">أنتَ قد أنشأتَ الغُرفة</string>
+    <string name="notice_room_invite_by_you">أنتَ قد دعوتَ %1$s</string>
+    <string name="notice_room_join_by_you">أنتَ قد انضممت إلى الغُرفة</string>
+    <string name="notice_room_leave_by_you">أنتَ قد غادرتَ الغُرفة</string>
+    <string name="notice_room_reject_by_you">أنت قد رفضت الدعوة</string>
+    <string name="notice_room_kick_by_you">أنتَ قد طردتَ %1$s</string>
+    <string name="notice_room_unban_by_you">أنتَ قد رفعتَ الحظر عن %1$s</string>
+    <string name="notice_room_ban_by_you">أنتَ قد حظرتَ %1$s</string>
+    <string name="notice_room_withdraw_by_you">أنتَ قد سحبتَ دعوة %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">أنتَ قد غيّرتَ صورتك الشخصية</string>
+    <string name="notice_display_name_set_by_you">أنتَ قد عيَّنتَ اسمك الظاهر إلى %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">أنتَ قد غيّرتَ اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
+    <string name="notice_display_name_removed_by_you">أنتَ قد أزلتَ اسمك الظاهر (لقد كان ⁨%1$s⁩)</string>
+    <string name="notice_room_topic_changed_by_you">أنتَ قد غيَّرتَ الموضوع إلى: ⁨%1$s⁩</string>
+    <string name="notice_room_avatar_changed">إنَّ %1$s قد غيَّرَ صورة الغُرفة</string>
+    <string name="notice_room_avatar_changed_by_you">أنتَ قد غيَّرتَ صورة الغُرفة</string>
+    <string name="notice_room_name_changed_by_you">أنتَ قد غيَّرتَ اسم الغُرفة إلى: %1$s</string>
+    <string name="notice_placed_video_call_by_you">أنتَ قد أجريتَ مُكالمة مرئية.</string>
+    <string name="notice_placed_voice_call_by_you">أنتَ قد أجريتَ مُكالمة صوتية.</string>
+    <string name="notice_call_candidates">إنَّ %s قد أرسلَ بيانات لإعداد مُكالمة.</string>
+    <string name="notice_call_candidates_by_you">أنتَ قد أرسلتَ بيانات لإعداد مُكالمة.</string>
+    <string name="notice_answered_call_by_you">أنتَ قد أجبتَ على المُكالمة.</string>
+    <string name="notice_ended_call_by_you">أنتَ قد أنهيتَ المُكالمة.</string>
+    <string name="notice_made_future_room_visibility_by_you">أنتَ قد جعلتَ التأريخ المُستقبلي للغُرفة مرئيًا لـ %1$s</string>
+    <string name="notice_end_to_end_by_you">أنتَ قد فعَّلتَ تعيمية النهاية-إلى-النهاية (%1$s)</string>
+    <string name="notice_room_update">إنَّ %s قد قامَ بترقية هذه الغرفة.</string>
+    <string name="notice_room_update_by_you">أنتَ قد رقَّيتَ هذه الغرفة.</string>
+    <string name="notice_requested_voip_conference_by_you">أنتَ قد طلبتَ اجتماع VoIP</string>
+    <string name="notice_room_name_removed_by_you">أنتَ قد أزلتَ اسم الغُرفة</string>
+    <string name="notice_room_topic_removed_by_you">أنتَ قد أزلتَ موضوع الغُرفة</string>
+    <string name="notice_room_avatar_removed">إنَّ %1$s قد أزالَ صورة الغُرفة</string>
+    <string name="notice_room_avatar_removed_by_you">أنتَ قد أزلتَ صورة الغُرفة</string>
+    <string name="notice_event_redacted">تمَّت إزالة الرسالة</string>
+    <string name="notice_event_redacted_by">الرسالة قد أُزيلت بواسطة %1$s</string>
+    <string name="notice_event_redacted_with_reason">أُزيلت الرسالة [السبب: ⁨%1$s⁩]</string>
+    <string name="notice_event_redacted_by_with_reason">الرِّسالة أُزيلت بِواسطة %1$s [السبب: ⁨%2$s⁩]</string>
+    <string name="notice_room_third_party_invite_by_you">أنتَ قد أرسلتَ دعوة إلى %1$s للإنضمام إلى الغُرفة</string>
+    <string name="notice_room_third_party_revoked_invite">إنَّ %1$s قد سحب دعوة %2$s للإنضمام إلى الغُرفة</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">أنتَ قد سحبت دعوة %1$s للإنضمام إلى الغُرفة</string>
+    <string name="notice_room_third_party_registered_invite_by_you">أنتَ قد قبلتَ دعوة %1$s</string>
+    <string name="notice_widget_added">إنَّ %1$s قد أضافَ القطعة %2$s</string>
+    <string name="notice_widget_added_by_you">أنتَّ قد أضفتَ القطعة %1$s</string>
+    <string name="notice_widget_removed">إنَّ %1$s قد أزال القطعة %2$s</string>
+    <string name="notice_widget_removed_by_you">أنتَ قد أزلتَ القطعة %1$s</string>
+    <string name="notice_widget_modified">إنَّ %1$s قد عدَّلَ القطعة %2$s</string>
+    <string name="notice_widget_modified_by_you">أنتَ قد عدَّلتَ القطعة %1$s</string>
+    <string name="power_level_admin">مسؤول</string>
+    <string name="power_level_default">الاِفتراضي</string>
+    <string name="power_level_custom">مُخصَّص (⁨%1$d⁩)</string>
+    <string name="power_level_custom_no_value">مخصَّص</string>
+    <string name="notice_power_level_changed_by_you">أنتَ قد غيَّرتَ مُستوى قوة %1$s.</string>
+    <string name="notice_power_level_changed">إنَّ %1$s قد غيَّرَ مُستوى قوة %2$s.</string>
+    <string name="notice_power_level_diff">%1$s مِن %2$s إلى %3$s</string>
+    <string name="initial_sync_start_importing_account">المُزامنة الأولية:
+\nيجري إستيرد الحِساب…</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 جميع الخوادِم محظورة مِنَ المُشاركة! لم يعُد من المُمكِن استخدام هذه الغُرفة.</string>
+    <string name="notice_room_server_acl_updated_no_change">لا تغيير.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• خوادِم مُطابقة IP الحرفية محظورة الآن.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• الخادِم المُطابق لـ %s قد أُزيل مِن قائمة السماح.</string>
+    <string name="notice_room_server_acl_updated_allowed">• الخادِم المُطابق لـ %s مسموح الآن.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• الخادِم المُطابق لـ %s قد أُزيل مِن قائمة الحظر.</string>
+    <string name="notice_room_server_acl_updated_banned">• الخادِم المُطابق لـ %s محظور الآن.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• خوادِم مُطابقة IP الحرفية مسموحة الآن.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">أنتَ قد غيَّرتَ خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_updated_title">إنَّ %s قد غيَّرَ خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• الخادِم يحظُر مُطابقة القيم الحرفية للـIP.</string>
+    <string name="notice_room_server_acl_set_allowed">• الخادِم المُطابق لـ %s مسموح.</string>
+    <string name="notice_room_server_acl_set_banned">• الخادِم المُطابق لـ %s محظور.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• الخادِم يسمح بمُطابقة القيم الحرفية للـIP.</string>
+    <string name="notice_room_server_acl_set_title_by_you">أنتَ قد عيَّنتَ خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_set_title">إنَّ %s قد عيَّنَ خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_direct_room_update_by_you">أنتَ قد قمتَ بالترقية هُنا.</string>
+    <string name="notice_direct_room_update">إنَّ %s قد قامَ بالترقية هُنا.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">أنتَ قد جعلتَ الرسائل المُستقبلية مرئية لـ %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">إنَّ %1$s قد جعلَ الرسائل المُستقبلية مرئية لـ %2$s</string>
+    <string name="notice_direct_room_leave_by_you">أنتَ قد غادرتَ الغُرفة</string>
+    <string name="notice_direct_room_leave">إنَّ %1$s قد غادر الغرفة</string>
+    <string name="notice_direct_room_join_by_you">أنت قد انضممت</string>
+    <string name="notice_direct_room_join">إنَّ %1$s قد انضم</string>
+    <string name="notice_direct_room_created_by_you">أنتَ قد أنشأتَ المُناقشة</string>
+    <string name="notice_direct_room_created">إنَّ %1$s قد أنشأ المُناقشة</string>
+    <string name="notice_room_withdraw_with_reason_by_you">أنتَ قد سحبتَ دعوة %1$s. السبب: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">إنَّ %1$s قد سحبَ دعوة %2$s. السبب: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">أنتَ قد ألغيتَ دعوة %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">إنَّ %1$s قد ألغيت دعوة %2$s للإنضمام إلى الغُرفة. السبب: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">أنتَ قد قبلتَ دعوة %1$s. السبب: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">إنَّ %1$s قد قبلَ دعوة %2$s. السبب: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">أنتَ قد أرسلتَ دعوة إلى %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">إنَّ %1$s قد أرسل دعوة إلى %2$s للإنضمام إلى الغُرغة. السبب: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">أنتَ قد حظرتَ %1$s. السبب: %2$s</string>
+    <string name="notice_room_ban_with_reason">إنَّ %1$s قد حَظر %2$s. السبب: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">أنتَ قد رفعتَ الحظر عن %1$s. السبب: %2$s</string>
+    <string name="notice_room_unban_with_reason">إنَّ %1$s قد رفع الحظر عن %2$s. السبب: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">أنتَ قد طردتَ %1$s. السبب: %2$s</string>
+    <string name="notice_room_kick_with_reason">إنَّ %1$s قد طرد %2$s. السبب: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">أنتَ قد رفضتَ الدعوة. السبب: %1$s</string>
+    <string name="notice_room_reject_with_reason">إنَّ %1$s قد رفض الدعوة. السبب: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">أنتَ قد غادرت. السبب: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">إنَّ %1$s قد غادر. السبب: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">أنتَ قد غادرتَ الغُرفة. السبب: %1$s</string>
+    <string name="notice_room_leave_with_reason">إنَّ %1$s قد غادر الغُرفة. السبب: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">أنتَ قد إنضممت. السبب: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">إنَّ %1$s قد إنضم. السبب: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">أنتَ قد إنضممتَ إلى الغُرفة. السبب: %1$s</string>
+    <string name="notice_room_join_with_reason">إنَّ %1$s قد إنضم إلى الغُرفة. السبب: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">إنَّ %1$s قد دعاكَ أنت. السبب: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">أنتَ قد دعوتَ %1$s. السبب: %2$s</string>
+    <string name="notice_room_invite_with_reason">إنَّ %1$s قد دعا %2$s. السبب: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">دعوتُكَ أنت. السبب: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">دعوة %1$s. السبب: %2$s</string>
+    <string name="clear_timeline_send_queue">محو قائمة انتظار الإرسال</string>
+    <string name="event_status_sending_message">يجري إرسال الرِّسالة…</string>
+    <string name="initial_sync_start_importing_account_data">المُزامنة الأولية:
+\nيجري إستيرد مَعلومات الحِساب</string>
+    <string name="initial_sync_start_importing_account_groups">المُزامنة الأولية:
+\nيجري إستيرد المُجتمعات</string>
+    <string name="initial_sync_start_importing_account_left_rooms">المُزامنة الأولية:
+\nيجري إستيرد الغُرف المُغادَر مِنها</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">المُزامنة الأولية:
+\nيجري إستيرد الغُرف المَدعو إليها</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">المُزامنة الأولية:
+\nيجري إستيرد الغُرف المُنضم فيها</string>
+    <string name="initial_sync_start_importing_account_rooms">المُزامنة الأولية:
+\nيجري إستيرد الغُرف</string>
+    <string name="initial_sync_start_importing_account_crypto">المُزامنة الأولية:
+\nيجري إستيرد التَعمية</string>
+    <string name="room_displayname_empty_room_was">غُرفة فارِغة (كانت %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="zero">%1$s، %2$s و%3$s</item>
+        <item quantity="one">%1$s، %2$s، %3$s و%4$d آخر</item>
+        <item quantity="two">%1$s، %2$s، %3$s و%4$d آخران</item>
+        <item quantity="few">%1$s، %2$s، %3$s و%4$d آخرين</item>
+        <item quantity="many">%1$s، %2$s، %3$s و%4$d آخرون</item>
+        <item quantity="other">%1$s،%2$s،%3$s و%4$d آخرون</item>
+    </plurals>
+    <string name="room_displayname_4_members">الأعضاء %1$s، %2$s، %3$s و %4$s</string>
+    <string name="room_displayname_3_members">الأعضاء %1$s، %2$s و %3$s</string>
+    <string name="power_level_moderator">مُشرِف</string>
+    <string name="notice_widget_jitsi_modified_by_you">أنتَ قد عدَّلتَ اجتماع الفيديو</string>
+    <string name="notice_widget_jitsi_modified">لقد عُدِّلَ اجتماع الفيديو بواسطة %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">أنتَ قد أنهيتَ اجتماع الفيديو</string>
+    <string name="notice_widget_jitsi_removed">لقد أُنهيَ اجتماع الفيديو بواسطة %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">أنتَ قد بدأتَ اجتماع الفيديو</string>
+    <string name="notice_widget_jitsi_added">لقد بدأ اجتماع الفيديو بواسطة %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">أنتَ قد سحبتَ دعوة %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">إنَّ %1$s قد سحب دعوة %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">أنتَ قد دعوتَ %1$s</string>
+    <string name="notice_direct_room_third_party_invite">إنَّ %1$s قد دعى %2$s</string>
+    <string name="notice_profile_change_redacted_by_you">أنتَ قد حدَّثتَ ملفك الشخصي %1$s</string>
     <string name="light_theme">السمة الفاتحة</string>
     <string name="dark_theme">السمة الداكنة</string>
     <string name="black_theme">السمة السوداء</string>
diff --git a/vector/src/main/res/values-az/strings.xml b/vector/src/main/res/values-az/strings.xml
index a6b3daec93..3821dcfb73 100644
--- a/vector/src/main/res/values-az/strings.xml
+++ b/vector/src/main/res/values-az/strings.xml
@@ -1,2 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s şəkil göndərdi.</string>
+    <string name="summary_user_sent_sticker">%1$s stiker göndərdi.</string>
+
+    <string name="notice_room_invite_no_invitee">%s-nin dəvəti</string>
+    <string name="notice_room_invite">%1$s dəvət etdi %2$s</string>
+    <string name="notice_room_invite_you">%1$s sizi dəvət etdi</string>
+    <string name="notice_room_join">%1$s qoşuldu</string>
+    <string name="notice_room_leave">%1$s qalıb</string>
+    <string name="notice_room_reject">%1$s dəvəti rədd etdi</string>
+    <string name="notice_room_kick">%1$s %2$s-i xaric etdi</string>
+    <string name="notice_room_unban">%1$s %2$s-i blokdan açdı</string>
+    <string name="notice_room_ban">%1$s %2$s-i blokladı</string>
+    <string name="notice_room_withdraw">%1$s %2$s-in dəvətini geri götürdü</string>
+    <string name="notice_avatar_url_changed">%1$s avatarı dəyişdi</string>
+    <string name="notice_display_name_set">%1$s ekran adını %2$s olaraq təyin etdi</string>
+    <string name="notice_display_name_changed_from">%1$s ekran adını %2$s-dan %3$s-ya dəyişdi</string>
+    <string name="notice_display_name_removed">%1$s onların göstərilən adlarını sildi (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s mövzunu dəyişdi: %2$s</string>
+    <string name="notice_room_name_changed">%1$s otaq adını dəyişdirdi: %2$s</string>
+    <string name="notice_placed_video_call">%s video zəng etdi.</string>
+    <string name="notice_placed_voice_call">%s səsli zəng etdi.</string>
+    <string name="notice_answered_call">%s zəngə cavab verdi.</string>
+    <string name="notice_ended_call">%s zəng başa çatdı.</string>
+    <string name="notice_made_future_room_visibility">"%1$s gələcək otaq tarixçəsini %2$s-ə  görünən etdi"</string>
+    <string name="notice_room_visibility_invited">bütün otaq üzvləri, dəvət olunduğu andan.</string>
+    <string name="notice_room_visibility_joined">bütün otaq üzvləri, qoşulduğu andan.</string>
+    <string name="notice_room_visibility_shared">bütün otaq üzvləri.</string>
+    <string name="notice_room_visibility_world_readable">hər kəs.</string>
+    <string name="notice_room_visibility_unknown">naməlum (%s).</string>
+    <string name="notice_end_to_end">%1$s sondan-sona şifrələmə açdı (%2$s)</string>
+    <string name="notice_room_update">%s bu otağı təkmilləşdirdi.</string>
+
+    <string name="notice_requested_voip_conference">%1$s VoIP konfrans istədi</string>
+    <string name="notice_voip_started">VoIP konfransı başladı</string>
+    <string name="notice_voip_finished">VoIP konfransı başa çatdı</string>
+
+    <string name="notice_avatar_changed_too">(avatar da dəyişdirilib)</string>
+    <string name="notice_room_name_removed">%1$s otaq adını sildi</string>
+    <string name="notice_room_topic_removed">%1$s otaq mövzusunu sildi</string>
+    <string name="notice_event_redacted">Mesaj silindi</string>
+    <string name="notice_event_redacted_by">Mesaj %1$s tərəfindən silindi</string>
+    <string name="notice_event_redacted_with_reason">Mesaj silindi [səbəb: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mesaj %1$s tərəfindən qaldırıldı [səbəb: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s profilini %2$s yenilədi</string>
+    <string name="notice_room_third_party_invite">%1$s otağa qoşulmaq üçün %2$s dəvətnamə göndərdi</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s otağa qoşulmaq üçün %2$s dəvətini ləğv etdi</string>
+    <string name="notice_room_third_party_registered_invite">%1$s %2$s üçün dəvəti qəbul etdi</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Şifrəni aça bilmir: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Göndərənin cihazı bu mesaj üçün açarları bizə göndərməyib.</string>
+
+    <string name="could_not_redact">Redaktə etmək olmur</string>
+    <string name="unable_to_send_message">Mesaj göndərmək olmur</string>
+
+    <string name="message_failed_to_upload">Şəkil yükləmək olmur</string>
+
+    <string name="network_error">Şəbəkə xətası</string>
+    <string name="matrix_error">Matris xətası</string>
+
+    <string name="room_error_join_failed_empty_room">Boş bir otağa yenidən qoşulmaq hazırda mümkün deyil.</string>
+
+    <string name="encrypted_message">Şifrəli mesaj</string>
+
+    <string name="medium_email">Elektron poçt ünvanı</string>
+    <string name="medium_phone_number">Telefon nömrəsi</string>
+
+    <string name="room_displayname_invite_from">%s-dən dəvət</string>
+    <string name="room_displayname_room_invite">Otağa dəvət</string>
+
+    <string name="room_displayname_two_members">%1$s və %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s və 1 digər</item>
+        <item quantity="other">%1$s və %2$d digərləri</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Boş otaq</string>
+
+    <string name="initial_sync_start_importing_account">İlkin sinxronizasiya:
+\nHesab idxal olunur…</string>
+    <string name="initial_sync_start_importing_account_crypto">İlkin sinxronizasiya:
+\nKriptografiyanın idxalı</string>
+    <string name="initial_sync_start_importing_account_rooms">İlkin sinxronizasiya:
+\nOtaqlar idxalı</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">İlkin sinxronizasiya:
+\nOtaqlara daxil olmaq</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">İlkin sinxronizasiya:
+\nDəvət olunmuş otaqların idxalı</string>
+    <string name="initial_sync_start_importing_account_left_rooms">İlkin sinxronizasiya:
+\nTərk olunmuş otaqların idxalı</string>
+    <string name="initial_sync_start_importing_account_groups">İlkin sinxronizasiya:
+\nİcmaların idxalı</string>
+    <string name="initial_sync_start_importing_account_data">İlkin sinxronizasiya:
+\nHesab məlumatlarının idxalı</string>
+
+    <string name="event_status_sending_message">Mesaj göndərilir…</string>
+    <string name="clear_timeline_send_queue">Göndərmə növbəsini təmizləyin</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s-nin dəvəti. Səbəb: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s dəvət olunmuş %2$s. Səbəb: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s sizi dəvət etdi. Səbəb: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s qoşuldu. Səbəb: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s qalıb. Səbəb: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s dəvəti rədd etdi. Səbəb: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s %2$s-i xaric etdi. Səbəb: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s blokdan açdı %2$s. Səbəb: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s blokladı %2$s. Səbəb: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s otağa qoşulmaq üçün %2$s dəvətnamə göndərdi. Səbəb: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s otağa qoşulmaq üçün %2$s dəvətini ləğv etdi. Səbəb: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s üçün dəvəti qəbul etdi. Səbəb: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s %2$s dəvətini geri götürdü. Səbəb: %3$s</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 56caef9cca..569cb50a9c 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1,5 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s изпрати снимка.</string>
+    <string name="notice_room_invite_no_invitee">Поканата на %s</string>
+    <string name="notice_room_invite">%1$s покани %2$s</string>
+    <string name="notice_room_invite_you">%1$s Ви покани</string>
+    <string name="notice_room_join">%1$s се присъедини в стаята</string>
+    <string name="notice_room_leave">%1$s напусна стаята</string>
+    <string name="notice_room_reject">%1$s отхвърли поканата</string>
+    <string name="notice_room_kick">%1$s изгони %2$s</string>
+    <string name="notice_room_unban">%1$s отблокира %2$s</string>
+    <string name="notice_room_ban">%1$s блокира %2$s</string>
+    <string name="notice_room_withdraw">%1$s оттегли поканата си за %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s смени своята профилна снимка</string>
+    <string name="notice_display_name_set">%1$s си сложи име %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s смени своето име от %2$s на %3$s</string>
+    <string name="notice_display_name_removed">%1$s премахна своето име (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s смени темата на: %2$s</string>
+    <string name="notice_room_name_changed">%1$s смени името на стаята на: %2$s</string>
+    <string name="notice_placed_video_call">%s започна видео разговор.</string>
+    <string name="notice_placed_voice_call">%s започна гласов разговор.</string>
+    <string name="notice_answered_call">%s отговори на обаждането.</string>
+    <string name="notice_ended_call">%s прекрати разговора.</string>
+    <string name="notice_made_future_room_visibility">%1$s направи бъдещата история на стаята видима за %2$s</string>
+    <string name="notice_room_visibility_invited">всички членове, от момента на поканването им в нея.</string>
+    <string name="notice_room_visibility_joined">всички членове, от момента на присъединяването им в нея.</string>
+    <string name="notice_room_visibility_shared">всички членове в нея.</string>
+    <string name="notice_room_visibility_world_readable">всеки.</string>
+    <string name="notice_room_visibility_unknown">непозната (%s).</string>
+    <string name="notice_end_to_end">%1$s включи шифроване от край до край (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s заяви VoIP групов разговор</string>
+    <string name="notice_voip_started">Започна VoIP групов разговор</string>
+    <string name="notice_voip_finished">Груповият разговор приключи</string>
+    <string name="notice_avatar_changed_too">(профилната снимка също беше сменена)</string>
+    <string name="notice_room_name_removed">%1$s премахна името на стаята</string>
+    <string name="notice_room_topic_removed">%1$s премахна темата на стаята</string>
+    <string name="notice_profile_change_redacted">%1$s обнови своя профил %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s изпрати покана на %2$s да се присъедини към стаята</string>
+    <string name="notice_room_third_party_registered_invite">%1$s прие поканата за %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Неуспешно разшифроване: %s **</string>
+    <string name="could_not_redact">Неуспешно премахване</string>
+    <string name="unable_to_send_message">Неуспешно изпращане на съобщението</string>
+    <string name="message_failed_to_upload">Неуспешно качване на снимката</string>
+    <string name="network_error">Грешка в мрежата</string>
+    <string name="matrix_error">Matrix грешка</string>
+    <string name="room_error_join_failed_empty_room">В момента не е възможно да се присъедините отново към празна стая.</string>
+    <string name="encrypted_message">Шифровано съобщение</string>
+    <string name="medium_email">Имейл адрес</string>
+    <string name="medium_phone_number">Телефонен номер</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Устройството на подателя не изпрати ключовете за това съобщение.</string>
+    <string name="summary_user_sent_sticker">%1$s изпрати стикер.</string>
+    <string name="room_displayname_invite_from">Покана от %s</string>
+    <string name="room_displayname_room_invite">Покана за стая</string>
+    <string name="room_displayname_two_members">%1$s и %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s и 1 друг</item>
+        <item quantity="other">%1$s и %2$d други</item>
+    </plurals>
+    <string name="room_displayname_empty_room">Празна стая</string>
+    <string name="notice_event_redacted">Премахнато съобщение</string>
+    <string name="notice_event_redacted_by">Съобщение премахнато от %1$s</string>
+    <string name="notice_event_redacted_with_reason">Премахнато съобщение [причина: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Съобщение премахнато от %1$s [причина: %2$s]</string>
+    <string name="initial_sync_start_importing_account">Начална синхронизация:
+\nИмпортиране на профил…</string>
+    <string name="initial_sync_start_importing_account_crypto">Начална синхронизация:
+\nИмпортиране на данни за шифроване</string>
+    <string name="initial_sync_start_importing_account_rooms">Начална синхронизация:
+\nИмпортиране на стаи</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Начална синхронизация:
+\nИмпортиране на стаи, от които съм част</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Начална синхронизация:
+\nИмпортиране на стаи, към които съм поканен</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Начална синхронизация:
+\nИмпортиране на стаи, които съм напуснал</string>
+    <string name="initial_sync_start_importing_account_groups">Начална синхронизация:
+\nИмпортиране на общности</string>
+    <string name="initial_sync_start_importing_account_data">Начална синхронизация:
+\nИмпортиране на данни за профила</string>
+    <string name="notice_room_update">%s обнови тази стая.</string>
+    <string name="event_status_sending_message">Изпращане на съобщение…</string>
+    <string name="clear_timeline_send_queue">Изчисти опашката за изпращане</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s оттегли поканата за присъединяване на %2$s към стаята</string>
+    <string name="notice_room_invite_no_invitee_with_reason">поканата на %1$s. Причина: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s покани %2$s. Причина: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s ви покани. Причина: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s се присъедини в стаята. Причина: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s напусна стаята. Причина: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s отхвърли поканата. Причина: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s изгони %2$s. Причина: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s блокира %2$s. Причина: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s блокира %2$s. Причина: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s изпрати покана до %2$s да се присъедини в стаята. Причина: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s премахна поканата за присъединяване на %2$s в стаята. Причина: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s прие поканата за %2$s. Причина: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s оттегли поканата на %2$s. Причина: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s добави %2$s като адрес за тази стая.</item>
+        <item quantity="other">%1$s добави %2$s като адреси за тази стая.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s премахна %2$s като адрес за тази стая.</item>
+        <item quantity="other">%1$s премахна %2$s като адреси за тази стая.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s добави %2$s и премахна %3$s като адреси за тази стая.</string>
+    <string name="notice_room_canonical_alias_set">%1$s настрой %2$s като основен адрес за тази стая.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s премахна основния адрес за тази стая.</string>
+    <string name="notice_room_guest_access_can_join">%1$s разреши на гости да се присъединяват в стаята.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s предотврати присъединяването на гости в стаята.</string>
+    <string name="notice_end_to_end_ok">%1$s включи шифроване от-край-до-край.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s включи шифроване от-край-до-край (неразпознат алгоритъм %2$s).</string>
+    <string name="notice_room_created">%1$s създаде стаята</string>
+    <string name="summary_you_sent_image">Изпратихте снимка.</string>
+    <string name="summary_you_sent_sticker">Изпратихте стикер.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Ваша покана</string>
+    <string name="notice_room_created_by_you">Създадохте стаята</string>
+    <string name="notice_room_invite_by_you">Поканихте %1$s</string>
+    <string name="notice_room_join_by_you">Присъединихте се в стаята</string>
+    <string name="notice_room_leave_by_you">Напуснахте стаята</string>
+    <string name="notice_room_reject_by_you">Отхвърлихте поканата</string>
+    <string name="notice_room_kick_by_you">Изгонихте %1$s</string>
+    <string name="notice_room_unban_by_you">Отблокирахте %1$s</string>
+    <string name="notice_room_ban_by_you">Блокирахте %1$s</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Включихте шифроване от-край-до-край (непознат алгоритъм: %1$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Включихте шифроване от-край-до-край.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Спряхте възможността гости да се присъединяват в стаята.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s спря възможността гости да се присъединяват в стаята.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Спряхте възможността гости да се присъединяват в стаята.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Позволихте на гости да се присъединяват тук.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s позволи на гости да се присъединяват тук.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Позволихте на гости да се присъединяват към стаята.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Премахнахте основния адрес на стаята.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Зададохте %1$s като основен адрес на стаята.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Добавихте %1$s и премахнахте %2$s от адресите за стаята.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Премахнахте %1$s от адресите на стаята.</item>
+        <item quantity="other">Премахнахте %1$s от адресите на стаята.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Добавихте %1$s като адрес за тази стая.</item>
+        <item quantity="other">Добавихте %1$s като адреси за тази стая.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">Оттеглихте поканата на %1$s. Причина: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Приехте поканата за %1$s. Причина: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Оттеглихте поканата за присъединяване в стаята от %1$s. Причина: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Изпратихте покана към %1$s за присъединяване в стаята. Причина: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Блокирахте %1$s. Причина: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Отблокирахте %1$s. Причина: %2$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Изгонихте %1$s. Причина: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Отхвърлихте поканата. Причина: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Напуснахте. Причина: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s напусна. Причина: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Напуснахте стаята. Причина: %1$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Присъединихте се. Причина: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s се присъедини. Причина: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Присъединихте се в стаята. Причина: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Поканихте %1$s. Причина: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваша покана. Причина: %1$s</string>
+    <string name="notice_power_level_diff">%1$s от %2$s на %3$s</string>
+    <string name="notice_power_level_changed">%1$s промени нивото на достъп на %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Променихте нивото на достъп на %1$s.</string>
+    <string name="power_level_custom_no_value">Собствено ниво</string>
+    <string name="power_level_custom">Собствено ниво (%1$d)</string>
+    <string name="power_level_default">По подразбиране</string>
+    <string name="power_level_moderator">Модератор</string>
+    <string name="power_level_admin">Администратор</string>
+    <string name="notice_widget_modified_by_you">Променихте %1$s приспособлението</string>
+    <string name="notice_widget_modified">%1$s промени %2$s приспособлението</string>
+    <string name="notice_widget_removed_by_you">Премахнахте %1$s приспособлението</string>
+    <string name="notice_widget_removed">%1$s премахна %2$s приспособлението</string>
+    <string name="notice_widget_added_by_you">Добавихте %1$s приспособление</string>
+    <string name="notice_widget_added">%1$s добави %2$s приспособление</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Приехте поканата за %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Оттеглихте поканата от %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s оттегли поканата от %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Оттеглихте поканата за присъединяване в стаята от %1$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Поканихте %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s покани %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Изпратихте покана към %1$s за присъединяване в стаята</string>
+    <string name="notice_profile_change_redacted_by_you">Обновихте профила си %1$s</string>
+    <string name="notice_room_avatar_removed_by_you">Премахнахте снимката на стаята</string>
+    <string name="notice_room_avatar_removed">%1$s премахна снимката на стаята</string>
+    <string name="notice_room_topic_removed_by_you">Премахнахте темата на стаята</string>
+    <string name="notice_room_name_removed_by_you">Премахнахте името на стаята</string>
+    <string name="notice_requested_voip_conference_by_you">Заявихте VoIP конференция</string>
+    <string name="notice_direct_room_update_by_you">Обновихте чата.</string>
+    <string name="notice_direct_room_update">%s обнови чата.</string>
+    <string name="notice_room_update_by_you">Обновихте стаята.</string>
+    <string name="notice_end_to_end_by_you">Включихте шифроване от-край-до-край (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Направихте бъдещите съобщения видими за %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s направи бъдещите съобщения видими за %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Направихте бъдещата история на стаята видима за %1$s</string>
+    <string name="notice_ended_call_by_you">Прекратихте разговора.</string>
+    <string name="notice_placed_video_call_by_you">Започнахте видео разговор.</string>
+    <string name="notice_answered_call_by_you">Отговорихте на обаждането.</string>
+    <string name="notice_call_candidates_by_you">Изпратихте данни за настройка на разговора.</string>
+    <string name="notice_call_candidates">%s изпрати данни за настройка на разговора.</string>
+    <string name="notice_placed_voice_call_by_you">Започнахте гласов разговор.</string>
+    <string name="notice_room_name_changed_by_you">Променихте името на стаята на: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Променихте снимката на стаята</string>
+    <string name="notice_room_avatar_changed">%1$s промени снимката на стаята</string>
+    <string name="notice_room_topic_changed_by_you">Променихте темата на: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Премахнахте името си (%1$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Променихте името си от %1$s на %2$s</string>
+    <string name="notice_display_name_set_by_you">Променихте името си на %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Променихте снимката си</string>
+    <string name="notice_room_withdraw_by_you">Оттеглихте поканата от %1$s</string>
+    <string name="notice_direct_room_leave_by_you">Напуснахте стаята</string>
+    <string name="notice_direct_room_leave">%1$s напусна стаята</string>
+    <string name="notice_direct_room_join_by_you">Присъединихте се</string>
+    <string name="notice_direct_room_join">%1$s се присъедини</string>
+    <string name="notice_direct_room_created_by_you">Създадохте дискусията</string>
+    <string name="notice_direct_room_created">%1$s създаде дискусията</string>
     <string name="encrypted_message">Шифровано съобщение</string>
     <!-- groups creation -->
     <string name="light_theme">Светла тема</string>
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index 0436e5f8cd..3002e4c056 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -1,5 +1,195 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="summary_user_sent_image">%1$s একটি ফটো পাঠিয়েছে।</string>
+    <string name="summary_user_sent_sticker">%1$s একটি স্তিকার পাঠিয়েছে।</string>
+    <string name="notice_room_invite_no_invitee">%s এর আমন্ত্রণ</string>
+    <string name="notice_room_invite">%1$s %2$s কে আমন্ত্রণ করেছে</string>
+    <string name="notice_room_invite_you">%1$s আপনাকে আমন্ত্রণ করেছে</string>
+    <string name="notice_room_join">%1$s রুম এ যোগ দিয়েছে</string>
+    <string name="notice_room_leave">%1$s রুম ছেড়ে দিয়েছে</string>
+    <string name="notice_room_reject">%1$s আমন্ত্রণ টি বাতিল করেছে</string>
+    <string name="notice_room_kick">%1$s %2$s কে কিক করেছে</string>
+    <string name="notice_room_unban">%1$s %2$s কে নিষিদ্ধ তালিকা থেকে মুক্ত করেছে</string>
+    <string name="notice_room_ban">%1$s %2$s কে নিষিদ্ধ করেছে</string>
+    <string name="notice_room_withdraw">%1$s %2$s এর আমন্ত্রণ ফেরত নিয়েছে</string>
+    <string name="notice_avatar_url_changed">%1$s নিজের অবতার পরিবর্তন করেছে</string>
+    <string name="notice_display_name_set">%1$s নিজের প্রদর্শন নাম %2$s রেখেছে</string>
+    <string name="notice_display_name_changed_from">%1$s নিজের প্রদর্শন নাম %2$s থেকে %3$s তে পরিবর্তন করেছে</string>
+    <string name="notice_display_name_removed">%1$s নিজের প্রদর্শন নাম মুছে দিয়েছে (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s বিষয় টি এতে পরিবর্তন করেছে: %2$s</string>
+    <string name="notice_room_name_changed">%1$s রুম এর নাম এতে পরিবর্তন করেছে: %2$s</string>
+    <string name="notice_placed_video_call">%s একটি ভিডিও কল স্থাপন করেছিল।</string>
+    <string name="notice_placed_voice_call">%s একটি ভয়েস কল দিয়েছে।</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_you_sent_image">আপনি একটি ছবি প্রেরণ করেছেন।</string>
+    <string name="summary_you_sent_sticker">আপনি একটি স্তিকার পাঠিয়েছেন।</string>
+    <string name="notice_room_invite_no_invitee_by_you">আপনার আমন্ত্রণ</string>
+    <string name="notice_room_created">%1$s কক্ষটি তৈরি করেছেন</string>
+    <string name="notice_room_created_by_you">আপনি কক্ষটি তৈরি করেছেন</string>
+    <string name="notice_room_invite_by_you">আপনি %1$s কে আমন্ত্রিত করেছেন</string>
+    <string name="notice_room_join_by_you">আপনি কক্ষে যোগ দিয়েছেন</string>
+    <string name="notice_room_leave_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন</string>
+    <string name="notice_room_reject_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন</string>
+    <string name="notice_room_kick_by_you">আপনি %1$s কে কীক করেছেন</string>
+    <string name="notice_room_unban_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন</string>
+    <string name="notice_room_ban_by_you">আপনি %1$s কে নিষিদ্ধ করেছেন</string>
+    <string name="notice_room_withdraw_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন</string>
+    <string name="notice_avatar_url_changed_by_you">আপনি আপনার অবতারটি পরিবর্তন করেছেন</string>
+    <string name="notice_display_name_set_by_you">আপনি আপনার প্রদর্শনের নামটি %1$s তে সেট করেছেন</string>
+    <string name="notice_display_name_changed_from_by_you">আপনি আপনার প্রদর্শনের নামটি %1$s থেকে %2$s এ পরিবর্তন করেছেন</string>
+    <string name="notice_display_name_removed_by_you">আপনি আপনার প্রদর্শনের নামটি সরিয়ে দিয়েছেন (যেটা ছিল %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">আপনি বিষয়টিকে এতে পরিবর্তন করেছেন: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s কক্ষের অবতারটি পরিবর্তন করেছে</string>
+    <string name="notice_room_avatar_changed_by_you">আপনি কক্ষের অবতারটি পরিবর্তন করেছেন</string>
+    <string name="notice_room_name_changed_by_you">আপনি কক্ষের নাম এতে পরিবর্তন করেছেন:%1$s</string>
+    <string name="notice_placed_video_call_by_you">আপনি একটি ভিডিও কল করেছেন।</string>
+    <string name="notice_placed_voice_call_by_you">আপনি একটি ভয়েস কল দিয়েছেন।</string>
+    <string name="notice_call_candidates">কল সেটআপ করার জন্য %s ডেটা প্রেরণ করেছে।</string>
+    <string name="notice_call_candidates_by_you">আপনি কল সেটআপ করার জন্য ডেটা প্রেরণ করেছেন।</string>
+    <string name="notice_answered_call">%s কলটির উত্তর দিয়েছে।</string>
+    <string name="notice_answered_call_by_you">আপনি কলটি উত্তর দিয়েছেন।</string>
+    <string name="notice_ended_call">%s কলটি শেষ করেছেন।</string>
+    <string name="notice_ended_call_by_you">আপনি কলটি শেষ করেছেন।</string>
+    <string name="notice_made_future_room_visibility">%1$s ভবিষ্যতের ঘরের ইতিহাস %2$s এর কাছে দৃশ্যমান করে তুলেছে</string>
+    <string name="notice_made_future_room_visibility_by_you">আপনি ভবিষ্যতের কক্ষ ইতিহাস %1$s এর কাছে দৃশ্যমান করেছেন</string>
+    <string name="notice_room_visibility_invited">কক্ষের সমস্ত সদস্য, যখন থেকে তারা আমন্ত্রিত।</string>
+    <string name="notice_room_visibility_joined">কক্ষের সমস্ত সদস্য, যখন থেকে তারা যোগদান করেছিল।</string>
+    <string name="notice_room_visibility_shared">সমস্ত কক্ষের সদস্য।</string>
+    <string name="notice_room_visibility_world_readable">যে কেউ।</string>
+    <string name="notice_room_visibility_unknown">অজানা (%s)।</string>
+    <string name="notice_end_to_end">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (%2$s)</string>
+    <string name="notice_end_to_end_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (%1$s)</string>
+    <string name="notice_room_update">%s এই কক্ষটিকে আপগ্রেড করেছে।</string>
+    <string name="notice_room_update_by_you">আপনি এই কক্ষটি আপগ্রেড করেছেন।</string>
+    <string name="notice_requested_voip_conference">%1$s একটি ভিওআইপি সম্মেলনের জন্য অনুরোধ করেছে</string>
+    <string name="notice_requested_voip_conference_by_you">আপনি একটি ভিওআইপি সম্মেলনের অনুরোধ করেছেন</string>
+    <string name="notice_voip_started">ভিওআইপি সম্মেলন শুরু হয়েছে</string>
+    <string name="notice_voip_finished">ভিওআইপি সম্মেলন শেষ হয়েছে</string>
+    <string name="notice_avatar_changed_too">(আবতারটিও পরিবর্তন করা হয়েছিল)</string>
+    <string name="notice_room_name_removed">%1$s কক্ষের নাম সরিয়েছে</string>
+    <string name="notice_room_name_removed_by_you">আপনি কক্ষের নাম সরিয়েছেন</string>
+    <string name="notice_room_topic_removed">%1$s কক্ষের বিষয় মুছে ফেলেছে</string>
+    <string name="notice_room_topic_removed_by_you">আপনি কক্ষের বিষয়টিকে সরিয়ে দিয়েছেন</string>
+    <string name="notice_room_avatar_removed">%1$s কক্ষের অবতার সরিয়ে নিয়েছে</string>
+    <string name="notice_room_avatar_removed_by_you">আপনি কক্ষের অবতার সরিয়েছেন</string>
+    <string name="notice_event_redacted">বার্তা সরানো হয়েছে</string>
+    <string name="notice_event_redacted_by">%1$s দ্বারা বার্তা সরানো হয়েছে</string>
+    <string name="notice_event_redacted_with_reason">বার্তা সরানো হয়েছে [কারণ:%1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s দ্বারা বার্তা সরানো হয়েছে [কারণ: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s তাদের প্রোফাইল %2$s আপডেট করেছে</string>
+    <string name="notice_profile_change_redacted_by_you">আপনি আপনার প্রোফাইল %1$s আপডেট করেছেন</string>
+    <string name="notice_room_third_party_invite">%1$s %2$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ পাঠিয়েছে</string>
+    <string name="notice_room_third_party_invite_by_you">আপনি %1$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ প্রেরণ করেছেন</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s %2$s এর কক্ষে যোগদানের আমন্ত্রণ বাতিল করে দিয়েছিল</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন</string>
+    <string name="notice_room_third_party_registered_invite">%1$s %2$s এর জন্য আমন্ত্রণটি গ্রহণ করেছে</string>
+    <string name="notice_room_third_party_registered_invite_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন</string>
+    <string name="notice_widget_added">%1$s %2$s উইজেট যুক্ত করেছে</string>
+    <string name="notice_widget_added_by_you">আপনি %1$s উইজেট যুক্ত করেছেন</string>
+    <string name="notice_widget_removed">%1$s %2$s উইজেট সরিয়ে দিয়েছেন</string>
+    <string name="notice_widget_removed_by_you">আপনি %1$s উইজেট সরিয়েছেন</string>
+    <string name="notice_widget_modified">%1$s %2$s উইজেট পরিবর্তন করেছেন</string>
+    <string name="notice_widget_modified_by_you">আপনি %1$s উইজেট পরিবর্তন করেছেন</string>
+    <string name="power_level_admin">অ্যাডমিন</string>
+    <string name="power_level_moderator">নিয়ামক</string>
+    <string name="power_level_default">ডিফল্ট</string>
+    <string name="power_level_custom">কাস্টম (%1$d)</string>
+    <string name="power_level_custom_no_value">কাস্টম</string>
+    <string name="notice_power_level_changed_by_you">আপনি %1$s এর পাওয়ার স্তর পরিবর্তন করেছেন।</string>
+    <string name="notice_power_level_changed">%1$s %2$s এর পাওয়ার স্তর পরিবর্তন করেছে।</string>
+    <string name="notice_power_level_diff">%1$s %2$s থেকে %3$s পর্যন্ত</string>
+    <string name="notice_crypto_unable_to_decrypt">** ডিক্রিপ্ট করতে অক্ষম: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
+    <string name="could_not_redact">পুনরায় প্রতিক্রিয়া করতে পারেনি</string>
+    <string name="unable_to_send_message">বার্তা পাঠাতে অক্ষম</string>
+    <string name="message_failed_to_upload">চিত্র আপলোড করতে ব্যর্থ</string>
+    <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
+    <string name="matrix_error">ম্যাট্রিক্স ত্রুটি</string>
+    <string name="room_error_join_failed_empty_room">খালি কক্ষে পুনরায় যোগদান করা বর্তমানে সম্ভব নয়।</string>
+    <string name="encrypted_message">এনক্রিপ্ট করা বার্তা</string>
+    <string name="medium_email">ইমেল ঠিকানা</string>
+    <string name="medium_phone_number">ফোন নম্বর</string>
+    <string name="room_displayname_invite_from">%s থেকে আমন্ত্রণ করুন</string>
+    <string name="room_displayname_room_invite">কক্ষ আমন্ত্রণ</string>
+    <string name="room_displayname_two_members">%1$s এবং %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s এবং অন্য ১ জন</item>
+        <item quantity="other">%1$s এবং অন্যান্য %2$d জন</item>
+    </plurals>
+    <string name="room_displayname_empty_room">খালি কক্ষ</string>
+    <string name="initial_sync_start_importing_account">প্রাথমিক সিঙ্ক:
+\nঅ্যাকাউন্ট আমদানি করা হচ্ছে…</string>
+    <string name="initial_sync_start_importing_account_crypto">প্রাথমিক সিঙ্ক:
+\nক্রিপ্টো আমদানি হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_rooms">প্রাথমিক সিঙ্ক:
+\nকক্ষগুলি আমদানি করা হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">প্রাথমিক সিঙ্ক:
+\nযোগ করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">প্রাথমিক সিঙ্ক:
+\nআমন্ত্রিত করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_left_rooms">প্রাথমিক সিঙ্ক:
+\nছেড়ে দেওয়া কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_groups">প্রাথমিক সিঙ্ক:
+\nসম্প্রদায়গুলি আমদানি করা হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_data">প্রাথমিক সিঙ্ক:
+\nঅ্যাকাউন্ট ডেটা আমদানি করা হচ্ছে</string>
+    <string name="event_status_sending_message">বার্তা প্রেরণ করা হচ্ছে …</string>
+    <string name="clear_timeline_send_queue">প্রেরণ সারি পরিষ্কার করুন</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s এর আমন্ত্রণ। কারণ: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">আপনার আমন্ত্রণ। কারণ: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s আমন্ত্রিত করেছেন %2$s কে। কারণ: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">আপনি %1$s কে আমন্ত্রিত করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s আপনাকে আমন্ত্রণ করেছে। কারণ: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s রুম এ যোগ দিয়েছে। কারণ: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">আপনি কক্ষে যোগ দিয়েছেন। কারণ: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s রুম ছেড়ে দিয়েছে। কারণ: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন। কারণ: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s আমন্ত্রণ বাতিল করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন। কারণ: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s %2$s কে কিক করেছে। কারণ: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">আপনি %1$s কে কীক করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s %2$s কে নিষিদ্ধ তালিকা থেকে মুক্ত করেছে। কারণ: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s %2$s কে নিষিদ্ধ করেছে। কারণ: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s রুমের সাথে যোগ দিতে %2$s কে একটি আমন্ত্রণ পাঠিয়েছেন। কারণ: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">আপনি %1$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ প্রেরণ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s %2$s এর কক্ষে যোগদানের আমন্ত্রণ বাতিল করে দিয়েছিল। কারণ: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s এর জন্য আমন্ত্রণ গ্রহণ করেছেন। কারণ: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s %2$s এর আমন্ত্রণ ফেরত নিয়েছে। কারণ: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন। কারণ: %2$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s যুক্ত করেছে।</item>
+        <item quantity="other">%1$s এই ঘরের ঠিকানাগুলি হিসাবে %2$s যুক্ত করেছে।</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">আপনি এই কক্ষের জন্য ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
+        <item quantity="other">আপনি এই কক্ষের ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s সরানো হয়েছে।</item>
+        <item quantity="other">%1$s %3$s কে এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">আপনি এই ঘরের ঠিকানা হিসাবে %1$s সরিয়েছেন।</item>
+        <item quantity="other">আপনি এই ঘরের ঠিকানা হিসাবে %1$s গুলি সরিয়েছেন।</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s %2$s যোগ করেছে এবং %3$s গুলি এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">আপনি %1$s যোগ করেছেন এবং %2$s কে এই ঘরের ঠিকানা হিসাবে সরিয়ে দিয়েছেন।</string>
+    <string name="notice_room_canonical_alias_set">%1$s এই ঘরের মূল ঠিকানাটি %2$s তে সেট করে।</string>
+    <string name="notice_room_canonical_alias_set_by_you">আপনি এই ঘরের মূল ঠিকানাটি %1$s তে সেট করেছেন।</string>
+    <string name="notice_room_canonical_alias_unset">%1$s এই ঘরের মূল ঠিকানা সরিয়ে নিয়েছে।</string>
+    <string name="notice_room_canonical_alias_unset_by_you">আপনি এই ঘরের মূল ঠিকানা সরিয়েছেন।</string>
+    <string name="notice_room_guest_access_can_join">%1$s অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছে।</string>
+    <string name="notice_room_guest_access_can_join_by_you">আপনি অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছেন।</string>
+    <string name="notice_room_guest_access_forbidden">%1$s অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছে।</string>
+    <string name="notice_room_guest_access_forbidden_by_you">আপনি অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছেন।</string>
+    <string name="notice_end_to_end_ok">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে।</string>
+    <string name="notice_end_to_end_ok_by_you">আপনি শেষ থেকে শেষ এনক্রিপশন চালু করেছেন।</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (অজানা অ্যালগরিদম %2$s)।</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (অজানা অ্যালগরিদম %1$s )।</string>
 
     <string name="light_theme">হালকা থিম</string>
     <string name="dark_theme">গাঢ় থিম</string>
diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml
index 92363e9210..691d439f45 100644
--- a/vector/src/main/res/values-bs/strings.xml
+++ b/vector/src/main/res/values-bs/strings.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="room_displayname_invite_from">Pozovite iz %s</string>
+    <string name="room_displayname_room_invite">Poziv u Sobu</string>
+    <string name="room_displayname_two_members">%1$s i %2$s</string>
+    <string name="room_displayname_empty_room">Prazna soba</string>
     <string name="light_theme">Svijetla Tema</string>
     <string name="dark_theme">Tamna Tema</string>
     <string name="black_theme">Crna Tema</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 296216b15b..144d218e61 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1,5 +1,269 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s ha enviat una imatge.</string>
+    <string name="notice_room_leave">%1$s ha marxat de la sala</string>
+    <string name="notice_room_join">%1$s s\'ha unit a la sala</string>
+    <string name="medium_phone_number">Número de telèfon</string>
+    <string name="medium_email">Correu electrònic</string>
+    <string name="encrypted_message">Missatge xifrat</string>
+    <string name="notice_room_invite_no_invitee">invitació de %s</string>
+    <string name="notice_room_invite">%1$s ha convidat a %2$s</string>
+    <string name="notice_room_invite_you">%1$s t\'ha convidat</string>
+    <string name="notice_room_reject">%1$s ha rebutjat la invitació</string>
+    <string name="notice_room_kick">%1$s ha expulsat %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s ha canviat el seu àlies de %2$s a %3$s</string>
+    <string name="notice_display_name_removed">%1$s ha eliminat el àlies (era %2$s)</string>
+    <string name="notice_room_topic_changed">%1$s ha canviat el tema a: %2$s</string>
+    <string name="notice_room_name_changed">%1$s ha canviat el nom de la sala a: %2$s</string>
+    <string name="notice_answered_call">%s ha respost a la trucada.</string>
+    <string name="notice_ended_call">%s ha finalitzat la trucada.</string>
+    <string name="notice_room_visibility_invited">tots el participants de la sala, des de que són convidats.</string>
+    <string name="notice_room_visibility_shared">tots els participants de la sala.</string>
+    <string name="notice_room_visibility_unknown">desconegut (%s).</string>
+    <string name="notice_end_to_end">%1$s ha activat el xifrat d\'extrem a extrem (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s ha sol·licitat una conferència VoIP</string>
+    <string name="notice_room_unban">%1$s ha tret el vet a %2$s</string>
+    <string name="notice_room_ban">%1$s ha vetat %2$s</string>
+    <string name="notice_room_withdraw">%1$s ha retirat la invitació de %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s ha canviat la seva icona</string>
+    <string name="notice_made_future_room_visibility">%1$s ha establert la visibilitat de l\'històric futur de la sala a %2$s</string>
+    <string name="notice_room_visibility_joined">tots els participants de la sala, des de que s\'hi uneixen.</string>
+    <string name="notice_room_visibility_world_readable">qualsevol.</string>
+    <string name="notice_voip_started">S\'ha iniciat la conferència VoIP</string>
+    <string name="notice_voip_finished">Ha finalitzat la conferència VoIP</string>
+    <string name="notice_avatar_changed_too">(també ha canviat la icona)</string>
+    <string name="notice_room_name_removed">%1$s ha eliminat el nom de la sala</string>
+    <string name="notice_room_topic_removed">%1$s ha eliminat el tema de la sala</string>
+    <string name="notice_profile_change_redacted">%1$s ha actualitzat el seu perfil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s ha enviat una invitació a %2$s perquè s\'uneixi a la sala</string>
+    <string name="notice_room_third_party_registered_invite">%1$s ha acceptat la invitació de %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** No s\'ha pogut desxifrar: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositiu del remitent no ens ha enviat les claus per aquest missatge.</string>
+    <string name="could_not_redact">No s\'ha pogut redactar</string>
+    <string name="unable_to_send_message">No s\'ha pogut enviar el missatge</string>
+    <string name="message_failed_to_upload">No s\'ha pogut pujar la imatge</string>
+    <string name="network_error">Error de xarxa</string>
+    <string name="matrix_error">Error de Matrix</string>
+    <string name="room_error_join_failed_empty_room">Ara per ara no és possible tornar a unir-se a una sala buida.</string>
+    <string name="notice_display_name_set">%1$s a canviat el seu àlies a %2$s</string>
+    <string name="notice_placed_video_call">%s ha realitzat una videotrucada.</string>
+    <string name="notice_placed_voice_call">%s ha realitzat una trucada de veu.</string>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Invitació de %s</string>
+    <string name="room_displayname_room_invite">Convida a la sala</string>
+    <string name="room_displayname_two_members">%1$s i %2$s</string>
+    <string name="room_displayname_empty_room">Sala buida</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s i 1 altre</item>
+        <item quantity="other">%1$s i %2$d altres</item>
+    </plurals>
+    <string name="summary_user_sent_sticker">%1$s ha enviat un adhesiu.</string>
+    <string name="notice_direct_room_update">%s s\'ha actualitzat aquí.</string>
+    <string name="notice_direct_room_update_by_you">Ho has actualitzat aquí.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Has activat el xifrat d\'extrem a extrem (algorisme %1$s no reconegut).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s ha activat el xifrat d\'extrem a extrem (algorisme %2$s no reconegut).</string>
+    <string name="notice_end_to_end_ok_by_you">Has activat el xifrat d\'extrem a extrem.</string>
+    <string name="notice_end_to_end_ok">%1$s ha activat el xifrat d\'extrem a extrem.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Has impedit que els convidats es puguin unir a la sala.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedit que els convidats es puguin unir a la sala.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Has impedit que els convidats es puguin unir a la sala.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s ha impedit que els convidats es puguin unir a la sala.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Has permès que els convidats s\'uneixin aquí.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s ha permès que els convidats s\'uneixin aquí.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Has permès que els convidats s\'uneixin a la sala.</string>
+    <string name="notice_room_guest_access_can_join">%1$s ha permès que els convidats s\'uneixin a la sala.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Has eliminat l\'adreça principal d\'aquesta sala.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s ha eliminat l\'adreça principal d\'aquesta sala.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Has establert l\'adreça principal d\'aquesta sala a %1$s.</string>
+    <string name="notice_room_canonical_alias_set">%1$s ha establert l\'adreça principal d\'aquesta sala a %2$s.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Has afegit %1$s i has eliminat %2$s d\'aquesta sala (adreces).</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s ha afegit %2$s i ha eliminat %3$s d\'aquesta sala (adreces).</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Has eliminat l\'adreça %1$s d\'aquesta sala.</item>
+        <item quantity="other">Has eliminat les adreces %1$s d\'aquesta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s ha eliminat %2$s com a adreça d\'aquesta sala.</item>
+        <item quantity="other">%1$s ha eliminat %2$s com a adreces d\'aquesta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Has afegit l\'adreça %1$s a aquesta sala.</item>
+        <item quantity="other">Has afegit les adreces %1$s a aquesta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s ha afegit l\'adreça %2$s a aquesta sala.</item>
+        <item quantity="other">%1$s ha afegit les adreces %2$s a aquesta sala.</item>
+    </plurals>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Has revocat la invitació de %1$s perquè s\'uneixi a la sala. Motiu: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s ha revocat la invitació de %2$s perquè s\'uneixi a la sala. Motiu: %3$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Has revocat la invitació de %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s ha revocat la invitació de %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Has revocat la invitació de %1$s perquè s\'uneixi a la sala</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s ha revocat la invitació de %2$s perquè s\'uneixi a la sala</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Has retirat la invitació de %1$s. Motiu: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s ha retirat la invitació de %2$s. Motiu: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Has acceptat la invitació de %1$s. Motiu: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s ha acceptat la invitació de %2$s. Motiu: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Has enviat una invitació a %1$s perquè s\'uneixi a la sala. Motiu: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s ha enviat una invitació a %2$s perquè s\'uneixi a la sala. Motiu: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Has vetat %1$s. Motiu: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s ha vetat %2$s. Motiu: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Has tret el vet a %1$s. Motiu: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s ha tret el vet a %2$s. Motiu: %3$s</string>
+    <string name="notice_room_ban_by_you">Has vetat %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Has marxat de la sala. Motiu: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s ha marxat de la sala. Motiu: %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Has marxat de la sala</string>
+    <string name="notice_direct_room_leave">%1$s ha marxat de la sala</string>
+    <string name="notice_room_leave_by_you">Has marxat de la sala</string>
+    <string name="notice_room_kick_by_you">Has expulsat %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Has expulsat %1$s. Motiu: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s ha expulsat %2$s. Motiu: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Has rebutjat la invitació. Motiu: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s ha rebutjat la invitació. Motiu: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Has marxat. Motiu: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s ha marxat. Motiu: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">T\'has unit. Motiu: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s s\'ha unit. Motiu: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">T\'has unit a la sala. Motiu: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s s\'ha unit a la sala. Motiu: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s t\'ha convidat. Motiu: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Has convidat %1$s. Motiu: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s ha convidat %2$s. Motiu: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">La teva invitació. Motiu: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">la invitació de %1$s. Motiu: %2$s</string>
+    <string name="clear_timeline_send_queue">Esborra la cua d\'enviament</string>
+    <string name="event_status_sending_message">Enviant missatge…</string>
+    <string name="initial_sync_start_importing_account_data">Sincronització inicial:
+\nImportant dades del compte</string>
+    <string name="initial_sync_start_importing_account_groups">Sincronització inicial:
+\nImportant comunitats</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sincronització inicial:
+\nImportant sales que deixat</string>
+    <string name="initial_sync_start_importing_account">Sincronització inicial:
+\nImportant compte…</string>
+    <string name="initial_sync_start_importing_account_crypto">Sincronització inicial:
+\nImportant xifrat</string>
+    <string name="initial_sync_start_importing_account_rooms">Sincronització inicial:
+\nImportant sales</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Sincronització inicial:
+\nImportant sales on hi estàs convidat</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Sincronització inicial:
+\nImportant sales on hi estàs unit</string>
+    <string name="notice_power_level_diff">%1$s de %2$s a %3$s</string>
+    <string name="notice_power_level_changed">%1$s ha canviat el nivell d\'autoritat de %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Has canviat el nivell d\'autoritat de %1$s.</string>
+    <string name="power_level_custom_no_value">Personalitzat</string>
+    <string name="power_level_custom">Personalitzat (%1$d)</string>
+    <string name="power_level_default">Predeterminat</string>
+    <string name="power_level_moderator">Moderador</string>
+    <string name="power_level_admin">Administrador</string>
+    <string name="notice_widget_modified_by_you">Has modificat el giny %1$s</string>
+    <string name="notice_widget_modified">%1$s ha modificat el giny %2$s</string>
+    <string name="notice_widget_removed_by_you">Has eliminat el giny %1$s</string>
+    <string name="notice_widget_removed">%1$s ha eliminat el giny %2$s</string>
+    <string name="notice_widget_added_by_you">Has afegit el giny %1$s</string>
+    <string name="notice_widget_added">%1$s ha afegit el giny %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Has acceptat la invitació de %1$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Has convidat a %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s ha convidat a %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Has enviat una invitació a %1$s perquè s\'uneixi a la sala</string>
+    <string name="notice_profile_change_redacted_by_you">Has actualitzat el teu perfil %1$s</string>
+    <string name="notice_event_redacted_by_with_reason">Missatge eliminat per %1$s [motiu: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">Missatge eliminat [motiu: %1$s]</string>
+    <string name="notice_event_redacted_by">Missatge eliminat per %1$s</string>
+    <string name="notice_event_redacted">Missatge eliminat</string>
+    <string name="notice_room_avatar_removed_by_you">Has eliminat la icona de la sala</string>
+    <string name="notice_room_avatar_removed">%1$s ha eliminat la icona de la sala</string>
+    <string name="notice_room_topic_removed_by_you">Has eliminat el tema de la sala</string>
+    <string name="notice_room_name_removed_by_you">Has eliminat el nom de la sala</string>
+    <string name="notice_requested_voip_conference_by_you">Has sol·licitat una conferència VoIP</string>
+    <string name="notice_room_update_by_you">Has actualitzat aquesta sala.</string>
+    <string name="notice_room_update">%s ha actualitzat aquesta sala.</string>
+    <string name="notice_end_to_end_by_you">Has activat el xifrat d\'extrem a extrem (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Has establert la visibilitat dels missatges futurs a %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s ha establert la visibilitat dels missatges futurs a %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Has establert la visibilitat de l\'històric futur de la sala a %1$s</string>
+    <string name="notice_ended_call_by_you">Has finalitzat la trucada.</string>
+    <string name="notice_answered_call_by_you">Has respost a la trucada.</string>
+    <string name="notice_call_candidates_by_you">Has enviat dades per configurar la trucada.</string>
+    <string name="notice_call_candidates">%s ha enviat dades per configurar la trucada.</string>
+    <string name="notice_placed_voice_call_by_you">Has realitzat una trucada de veu.</string>
+    <string name="notice_placed_video_call_by_you">Has realitzat una videotrucada.</string>
+    <string name="notice_room_name_changed_by_you">Has canviat el nom de la sala a: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Has canviat la icona de la sala</string>
+    <string name="notice_room_avatar_changed">%1$s ha canviat la icona de la sala</string>
+    <string name="notice_room_topic_changed_by_you">Has canviat el tema a: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Has eliminat el teu àlies (era %1$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Has canviat el teu àlies de %1$s a %2$s</string>
+    <string name="notice_display_name_set_by_you">Has canviat el teu àlies a %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Has canviat la teva icona</string>
+    <string name="notice_room_withdraw_by_you">Has retirat la invitació de %1$s</string>
+    <string name="notice_room_unban_by_you">Has tret el vet a %1$s</string>
+    <string name="notice_room_reject_by_you">Has rebutjat la invitació</string>
+    <string name="notice_direct_room_created_by_you">Has creat la discussió</string>
+    <string name="notice_direct_room_created">%1$s ha creat la discussió</string>
+    <string name="notice_direct_room_join_by_you">T\'has unit</string>
+    <string name="notice_direct_room_join">%1$s s\'ha unit</string>
+    <string name="notice_room_join_by_you">T\'has unit a la sala</string>
+    <string name="notice_room_invite_by_you">Has convidat a %1$s</string>
+    <string name="notice_room_created_by_you">Has creat la sala</string>
+    <string name="notice_room_created">%1$s ha creat la sala</string>
+    <string name="notice_room_invite_no_invitee_by_you">La teva invitació</string>
+    <string name="summary_you_sent_sticker">Has enviat un adhesiu.</string>
+    <string name="summary_you_sent_image">Has enviat una imatge.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servidors coincidents amb literals IP ara estan vetats.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servidors coincidents amb literals IP ara estan permesos.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servidors coincidents amb %s han estat eliminats de la llista de permesos.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Servidors coincidents amb %s ara estan permesos.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Servidors coincidents amb %s han estat eliminats del llista de vetats.</string>
+    <string name="notice_room_server_acl_updated_banned">• Servidors coincidents amb %s ara estan vetats.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servidors coincidents amb literals IP estan vetats.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servidors coincidents amb literals IP estan permesos.</string>
+    <string name="notice_room_server_acl_set_allowed">• Servidors coincidents amb %s estan permesos.</string>
+    <string name="notice_room_server_acl_set_banned">• Servidors coincidents amb %s estan vetats.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Has canviat les adreces d\'aquesta sala.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s ha canviat les adreces d\'aquesta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Has canviat l\'adreça principal i les adreces alternatives d\'aquesta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ha canviat l\'adreça principal i les adreces alternatives d\'aquesta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Has canviat les adreces alternatives d\'aquesta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s ha canviat les adreces alternatives d\'aquesta sala.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Has eliminat l\'adreça alternativa %1$s d\'aquesta sala.</item>
+        <item quantity="other">Has eliminat les adreces alternatives %1$s d\'aquesta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s ha eliminat l\'adreça alternativa %2$s d\'aquesta sala.</item>
+        <item quantity="other">%1$s ha eliminat les adreces alternatives %2$s d\'aquesta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Has afegit l\'adreça alternativa %1$s per aquesta sala.</item>
+        <item quantity="other">Has afegit les adreces alternatives %1$s per aquesta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s ha afegit l\'adreça alternativa %2$s per aquesta sala.</item>
+        <item quantity="other">%1$s ha afegit les adreces alternatives %2$s per aquesta sala.</item>
+    </plurals>
+    <string name="room_displayname_empty_room_was">Sala buida (era %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s i %4$d altre</item>
+        <item quantity="other">%1$s, %2$s, %3$s i %4$d altres</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s i %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s i %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Tots els servidors tenen la participació vetada! Aquesta sala ja no pot ser utilitzada.</string>
+    <string name="notice_room_server_acl_updated_no_change">Sense canvis.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Has canviat les ACLs de servidor d\'aquesta sala.</string>
+    <string name="notice_room_server_acl_updated_title">%s ha canviat les ACLs de servidor d\'aquesta sala.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Has establert les ACLs de servidor per aquesta sala.</string>
+    <string name="notice_room_server_acl_set_title">%s ha establert les ACLs de servidor d\'aquesta sala.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Has modificat la videoconferència</string>
+    <string name="notice_widget_jitsi_modified">%1$s ha modificat la videoconferència</string>
+    <string name="notice_widget_jitsi_removed_by_you">Has finalitzat la videoconferència</string>
+    <string name="notice_widget_jitsi_added">%1$s ha iniciat una videoconferència</string>
+    <string name="notice_widget_jitsi_added_by_you">Has iniciat una videoconferència</string>
+    <string name="notice_widget_jitsi_removed">%1$s ha finalitzat la videoconferència</string>
     <!-- theme -->
     <string name="light_theme">Tema clar</string>
     <string name="dark_theme">Tema fosc</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 04d338c7ca..9ba5b268d7 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1,5 +1,278 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">Uživatel %1$s poslal obrázek.</string>
+    <string name="summary_user_sent_sticker">Uživatel %1$s poslal nálepku.</string>
+    <string name="notice_room_invite_no_invitee">Pozvání od uživatele %s</string>
+    <string name="notice_room_invite">Uživatel %1$s pozval uživatele %2$s</string>
+    <string name="notice_room_invite_you">Uživatel %1$s vás pozval</string>
+    <string name="notice_room_join">%1$s vstoupil do místnosti</string>
+    <string name="notice_room_leave">Uživatel %1$s odešel</string>
+    <string name="notice_room_reject">%1$s odmítli pozvání</string>
+    <string name="notice_room_kick">%1$s vykopli %2$s</string>
+    <string name="notice_room_unban">%1$s zrušil vykázání %2$s</string>
+    <string name="notice_room_ban">%1$s vykázali %2$s</string>
+    <string name="notice_room_withdraw">%1$s zrušili pozvání pro %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s změnili svůj profilový obrázek</string>
+    <string name="notice_display_name_set">%1$s nastavili své veřejné jméno na %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s změnili své veřejné jméno z %2$s na %3$s</string>
+    <string name="notice_display_name_removed">%1$s odstranili své veřejné jméno (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s změnili téma na: %2$s</string>
+    <string name="notice_room_name_changed">%1$s změnili název místnosti na: %2$s</string>
+    <string name="notice_placed_video_call">%s uskutečnili videohovor.</string>
+    <string name="notice_placed_voice_call">%s uskutečnili hlasový hovor.</string>
+    <string name="notice_answered_call">%s přijali hovor.</string>
+    <string name="notice_ended_call">%s ukončili hovor.</string>
+    <string name="notice_made_future_room_visibility">%1$s nastavili viditelnost budoucí historie místnosti pro %2$s</string>
+    <string name="notice_room_visibility_invited">všechny členy místnosti od chvíle, kdy budou pozváni.</string>
+    <string name="notice_room_visibility_joined">všechny členy místnosti od chvíle, kdy se připojí.</string>
+    <string name="notice_room_visibility_shared">všechny členy místnosti.</string>
+    <string name="notice_room_visibility_world_readable">kohokoliv.</string>
+    <string name="notice_room_visibility_unknown">neznámým (%s).</string>
+    <string name="notice_end_to_end">%1$s zapnuli end-to-end šifrování (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s požádali o VoIP konferenci</string>
+    <string name="notice_voip_started">Začala VoIP konference</string>
+    <string name="notice_voip_finished">VoIP konference skončila</string>
+    <string name="notice_avatar_changed_too">(profilový obrázek byl také změněn)</string>
+    <string name="notice_room_name_removed">%1$s odstranili název místnosti</string>
+    <string name="notice_room_topic_removed">%1$s odstranili téma místnosti</string>
+    <string name="notice_profile_change_redacted">%1$s aktualizovali svůj profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s do této místnosti pozvali %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s přijali pozvání pro %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Nelze dešifrovat: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Odesílatelovo zařízení nám neposlalo klíče pro tuto zprávu.</string>
+    <string name="could_not_redact">Nelze vymazat</string>
+    <string name="unable_to_send_message">Zprávu nelze odeslat</string>
+    <string name="message_failed_to_upload">Obrázek nelze nahrát</string>
+    <string name="network_error">Chyba sítě</string>
+    <string name="matrix_error">Chyba v Matrixu</string>
+    <string name="room_error_join_failed_empty_room">V současnosti není možné znovu vstoupit do prázdné místnosti.</string>
+    <string name="encrypted_message">Šifrovaná zpráva</string>
+    <string name="medium_email">E-mailová adresa</string>
+    <string name="medium_phone_number">Telefonní číslo</string>
+    <string name="room_displayname_invite_from">Pozvání od %s</string>
+    <string name="room_displayname_room_invite">Pozvání do místnosti</string>
+    <string name="room_displayname_two_members">%1$s a %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s a jeden další</item>
+        <item quantity="few">%1$s a %2$d další</item>
+        <item quantity="other">%1$s a %2$d dalších</item>
+    </plurals>
+    <string name="room_displayname_empty_room">Prázdná místnost</string>
+    <string name="notice_room_update">%s povýšili tuto místnost.</string>
+    <string name="notice_event_redacted_with_reason">Zpráva byla smazána [důvod: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Zpráva smazána uživatelem %1$s [důvod: %2$s]</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s zrušili pozvánku do místnosti pro %2$s</string>
+    <string name="initial_sync_start_importing_account">Úvodní synchronizace:
+\nImportuji účet…</string>
+    <string name="initial_sync_start_importing_account_crypto">Úvodní synchronizace:
+\nImportuji klíče</string>
+    <string name="initial_sync_start_importing_account_rooms">Úvodní synchronizace:
+\nImportuji místnosti</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Úvodní synchronizace:
+\nImportuji místností, jichž jste členy</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Úvodní synchronizace:
+\nImportuji místnost, jež jste opustili</string>
+    <string name="initial_sync_start_importing_account_groups">Úvodní synchronizace:
+\nImportuji skupiny</string>
+    <string name="initial_sync_start_importing_account_data">Úvodní synchronizace:
+\nImportuji data účtu</string>
+    <string name="event_status_sending_message">Odesílám zprávu…</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Úvodní synchronizace:
+\nImportuji pozvání</string>
+    <string name="clear_timeline_send_queue">Vymazat frontu neodeslaných zpráv</string>
+    <string name="notice_room_invite_with_reason">%1$s pozvali %2$s. Důvod: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s vás pozvali. Důvod: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s opustil místnost. Důvod: %2$s</string>
+    <string name="notice_event_redacted">Zpráva odstraněna</string>
+    <string name="notice_event_redacted_by">Zprávu odstranil/a %1$s</string>
+    <string name="summary_you_sent_image">Poslali jste obrázek.</string>
+    <string name="summary_you_sent_sticker">Poslali jste nálepku.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Vaše pozvání</string>
+    <string name="notice_room_created">%1$s založil místnost</string>
+    <string name="notice_room_created_by_you">Založili jste místnost</string>
+    <string name="notice_room_invite_by_you">Pozvali jste %1$s</string>
+    <string name="notice_room_join_by_you">Vstoupili jste do místnosti</string>
+    <string name="notice_room_leave_by_you">Opustili jste místnost</string>
+    <string name="notice_room_reject_by_you">Odmítli jste pozvání</string>
+    <string name="notice_room_kick_by_you">Vykopli jste %1$s</string>
+    <string name="notice_room_unban_by_you">Zrušili jste vykázání pro %1$s</string>
+    <string name="notice_room_ban_by_you">Vykázali jste %1$s</string>
+    <string name="notice_room_withdraw_by_you">Stáhli jste pozvánku od %1$s zpět</string>
+    <string name="notice_avatar_url_changed_by_you">Změnili jste svůj profilový obrázek</string>
+    <string name="notice_display_name_set_by_you">Změnili jste své veřejné jméno na %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Změnili jste své veřejné jméno z %1$s na %2$s</string>
+    <string name="notice_display_name_removed_by_you">Odstranili jste své veřejné jméno (%1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Změnili jste téma na: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s změnili obrázek místnosti</string>
+    <string name="notice_room_avatar_changed_by_you">Změnili jste obrázek místnosti</string>
+    <string name="notice_room_name_changed_by_you">Změnili jste jméno místnosti na: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Zahájili jste video hovor.</string>
+    <string name="notice_placed_voice_call_by_you">Zahájili jste hlasový hovor.</string>
+    <string name="notice_call_candidates">%s poslali data, aby mohli zahájit hovor.</string>
+    <string name="notice_call_candidates_by_you">Poslali jste data, abyste mohli zahájit hovor.</string>
+    <string name="notice_answered_call_by_you">Přijali jste hovor.</string>
+    <string name="notice_ended_call_by_you">Ukončili jste hovor.</string>
+    <string name="notice_made_future_room_visibility_by_you">Učinili jste budoucí historii místnosti viditelnou pro %1$s</string>
+    <string name="notice_end_to_end_by_you">Zapnuli jste end-to-end šifrování (%1$s)</string>
+    <string name="notice_room_update_by_you">Povýšili jste tuto místnost.</string>
+    <string name="notice_requested_voip_conference_by_you">Požádali jste o VoIP konferenci</string>
+    <string name="notice_room_name_removed_by_you">Odstranili jste jméno místnosti</string>
+    <string name="notice_room_topic_removed_by_you">Odstranili jste téma místnosti</string>
+    <string name="notice_room_avatar_removed">%1$s odstranili obrázek místnosti</string>
+    <string name="notice_room_avatar_removed_by_you">Odstranili jste obrázek místnosti</string>
+    <string name="notice_profile_change_redacted_by_you">Aktualizovali jste svů profil %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Poslali jste %1$s pozvání ke vstupu do místnosti</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Zrušili jste pozvánku ke vstupu do místnosti pro %1$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Přijali jste pozvání pro %1$s</string>
+    <string name="notice_widget_added">%1$s přidali widget %2$s</string>
+    <string name="notice_widget_added_by_you">Přidali jste widget %1$s</string>
+    <string name="notice_widget_removed">%1$s odstranili widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Odstranili jste widget %1$s</string>
+    <string name="notice_widget_modified">%1$s změnil widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Změnili jste widget %1$s</string>
+    <string name="power_level_admin">Správce</string>
+    <string name="power_level_moderator">Moderátor</string>
+    <string name="power_level_default">Výchozí</string>
+    <string name="power_level_custom">Vlastní (%1$d)</string>
+    <string name="power_level_custom_no_value">Vlastní</string>
+    <string name="notice_power_level_changed_by_you">Změnili jste %1$s stupeň oprávnění.</string>
+    <string name="notice_power_level_changed">%1$s změnili %2$s stupeň oprávnění.</string>
+    <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Pozvání od %1$s. Důvod: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Vaše pozvání. Důvod: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Pozvali jste %1$s. Důvod: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s vstoupili do místnosti. Důvod: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Vstoupili jste do místnosti. Důvod: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Opustili jste místnost. Důvod: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s pozvání odmítli. Důvod: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Odmítli jste pozvání. Důvod: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s vykopnuli %2$s. Důvod: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Vykopnuli jste %1$s. Důvod: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s zrušili %2$s vykázání. Důvod: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Zrušili jste %1$s vykázání. Důvod: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s vykázali %2$s. Důvod: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Vykázali jste %1$s. Důvod: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s poslali %2$s pozvání, aby vstoupili do místnosti. Důvod: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Poslali jste %1$s pozvání, aby vstoupili do místnosti. Důvod: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s zrušili pozvání do místnosti pro %2$s. Důvod: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Zrušili jste pozvání do místnosti pro %1$s. Důvod: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s přijali pozvání pro %2$s. Důvod: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Přijali jste pozvání pro %1$s. Důvod: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s zrušili pozvání pro %2$s. Důvod: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Zrušili jste pozvání od %1$s. Důvod: %2$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s přidali %2$s jako adresu pro tuto místnost.</item>
+        <item quantity="few">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
+        <item quantity="other">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Přidali jste %1$s jako adresu pro tuto místnost.</item>
+        <item quantity="few">Přidali jste %1$s jako adresy pro tuto místnost.</item>
+        <item quantity="other">Přidali jste %1$s jako adresy pro tuto místnost.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s odstranili %2$s jako adresu pro tuto místnost.</item>
+        <item quantity="few">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
+        <item quantity="other">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Odstranili jste %1$s jako adresu pro tuto místnost.</item>
+        <item quantity="few">Odstranili jste %1$s jako adresuy pro tuto místnost.</item>
+        <item quantity="other">Odstranili jste %1$s jako adresy pro tuto místnost.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s přidali %2$s a odstranili %3$s jako adresy pro tuto místnost.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Přidali jste %1$s a odstranili %2$s jako adresy pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_set">%1$s nastavili hlavní adresu této místnosti na %2$s.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Nastavili jste %1$s na hlavní adresu této místnosti.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s odstranili hlavní adresu této místnosti.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Odstranili jste hlavní adresu této místnosti.</string>
+    <string name="notice_room_guest_access_can_join">%1$s povolili hostům vstoupit do místnosti.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Povolili jste hostům vstoupit do místnosti.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s zamezili hostům vstoupit do místnosti.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Zamezili jste hostům vstoupit do místnosti.</string>
+    <string name="notice_end_to_end_ok">%1$s zapnuli end-to-end šifrování.</string>
+    <string name="notice_end_to_end_ok_by_you">Zapnuli jste end-to-end šifrování.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s zapnuli end-to-end šifrování (neznámý algoritmus %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Zapnuli jste end-to-end šifrování (neznámý algoritmus %1$s).</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Zamezili jste hostům vstoupit do této místnosti.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s zamezil hostům vstoupit do této místnosti.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Povolili jste hostům vstoupit.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s povolil hostům vstoupit.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Odešli jste. Důvod: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s odešli. Důvod: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Vstoupili jste. Důvod: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s vstoupili. Důvod: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Zrušili jste pozvání pro %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s zrušili pozvání pro %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Pozvali jste %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s pozvali %2$s</string>
+    <string name="notice_direct_room_update_by_you">Tady jste provedli upgrade.</string>
+    <string name="notice_direct_room_update">%s tady provedli upgrade.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Učinili jste budoucí zprávy viditelné pro %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s učinili budoucí zprávy viditelné pro %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Odešli jste z místnosti</string>
+    <string name="notice_direct_room_leave">%1$s odešli z místnosti</string>
+    <string name="notice_direct_room_join_by_you">Vstoupili jste</string>
+    <string name="notice_direct_room_join">%1$s vstoupili</string>
+    <string name="notice_direct_room_created_by_you">Založili jste diskusi</string>
+    <string name="notice_direct_room_created">%1$s založil diskusi</string>
+    <string name="room_displayname_empty_room_was">Prázdná místnost (byla %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s a %4$d další</item>
+        <item quantity="few">%1$s, %2$s, %3$s a %4$d další</item>
+        <item quantity="other">%1$s, %2$s, %3$s a %4$d dalších</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s a %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s a %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Účast všech serverů je zakázána! Tuto místnost již nelze použít.</string>
+    <string name="notice_room_server_acl_updated_no_change">Beze změny.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servery shodující se doslovně s IP jsou nyní zakázány.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servery shodující se doslovně s IP jsou nyní povoleny.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servery shodující se s %s byly odstraněny ze seznamu povolených.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Servery shodující se s %s jsou nyní povoleny.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Servery shodující se s %s byly odstraněny ze seznamu zakázaných.</string>
+    <string name="notice_room_server_acl_updated_banned">• Servery shodující se s %s jsou nyní zakázány.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Změnili jste ACL serveru pro tuto místnost.</string>
+    <string name="notice_room_server_acl_updated_title">%s změnili ACL serveru pro tuto místnost.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Server shodující se doslovně s IP je povolen.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Server shodující se doslovně s IP je zakázán.</string>
+    <string name="notice_room_server_acl_set_allowed">• Server shodující se s %s je povolen.</string>
+    <string name="notice_room_server_acl_set_banned">• Server shodující se s %s je zakázán.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Nastavili jste ACL serveru pro tuto místnost.</string>
+    <string name="notice_room_server_acl_set_title">%s nastavili ACL serveru pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Změnili jste adresy pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s změnili adresy pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Změnili jste hlavní a alternativní adresu pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s změnili hlavní a alternativní adresu pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Změnili jste alternativní adresu pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s změnili alternativní adresu pro tuto místnost.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Odstranili jste alternativní adresu %1$s pro tuto místnost.</item>
+        <item quantity="few">Odstranili jste alternativní adresy %1$s pro tuto místnost.</item>
+        <item quantity="other">Odstranili jste alternativní adresy %1$s pro tuto místnost.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s odstranili alternativní adresu %2$s pro tuto místnost.</item>
+        <item quantity="few">%1$s odstranili alternativní adresy %2$s pro tuto místnost.</item>
+        <item quantity="other">%1$s odstranili alternativní adresy %2$s pro tuto místnost.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Přidali jste alternativní adresu %1$s pro tuto místnost.</item>
+        <item quantity="few">Přidali jste alternativní adresy %1$s pro tuto místnost.</item>
+        <item quantity="other">Přidali jste alternativní adresy %1$s pro tuto místnost.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s přidali alternativní adresu %2$s pro tuto místnost.</item>
+        <item quantity="few">%1$s přidali alternativní adresy %2$s pro tuto místnost.</item>
+        <item quantity="other">%1$s přidali alternativní adresy %2$s pro tuto místnost.</item>
+    </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">Upravili jste videokonferenci</string>
+    <string name="notice_widget_jitsi_modified">Videokonference byla upravena uživatelem %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Ukončili jste videokonferenci</string>
+    <string name="notice_widget_jitsi_removed">Videokonference byla ukončena uživatelem %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Zahájili jste videokonferenci</string>
+    <string name="notice_widget_jitsi_added">Videokonference byla zahájena uživatelem %1$s</string>
     <string name="light_theme">Světlý vzhled</string>
     <string name="black_theme">Černý vzhled</string>
     <string name="dark_theme">Tmavý vzhled</string>
diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml
index 198e4a60c1..1210d4da90 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@@ -1,6 +1,75 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s sendte et billede.</string>
 
+    <string name="notice_room_invite_no_invitee">%ss invitation</string>
+    <string name="notice_room_invite">%1$s inviterede %2$s</string>
+    <string name="notice_room_invite_you">%1$s inviterede dig</string>
+    <string name="notice_room_join">%1$s forbandt</string>
+    <string name="notice_room_leave">%1$s forlod rummet</string>
+    <string name="notice_room_reject">%1$s afviste invitationen</string>
+    <string name="notice_room_kick">%1$s kickede %2$s</string>
+    <string name="notice_room_unban">%1$s unbannede %2$s</string>
+    <string name="notice_room_ban">%1$s bannede %2$s</string>
+    <string name="notice_room_withdraw">%1$s trak %2$ss invitation tilbage</string>
+    <string name="notice_avatar_url_changed">%1$s skiftede sin avatar</string>
+    <string name="notice_display_name_set">%1$s satte sit viste navn til %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s ændrede sit viste navn fra %2$s til %3$s</string>
+    <string name="notice_display_name_removed">%1$s fjernede sit viste navn (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s ændrede emnet til: %2$s</string>
+    <string name="notice_room_name_changed">%1$s ændrede rumnavnet til: %2$s</string>
+    <string name="notice_placed_video_call">%s startede et videoopkald.</string>
+    <string name="notice_placed_voice_call">%s startede et stemmeopkald.</string>
+    <string name="notice_answered_call">%s svarede opkaldet.</string>
+    <string name="notice_ended_call">%s stoppede opkaldet.</string>
+    <string name="notice_made_future_room_visibility">%1$s gjorde den fremtidige rum historik synlig for %2$s</string>
+    <string name="notice_room_visibility_invited">alle medlemmer af rummet, fra det tidspunkt de er inviteret.</string>
+    <string name="notice_room_visibility_joined">alle medlemmer af rummet, fra det tidspunkt de er forbundede.</string>
+    <string name="notice_room_visibility_shared">Alle medlemmer af rummet.</string>
+    <string name="notice_room_visibility_world_readable">alle.</string>
+    <string name="notice_room_visibility_unknown">ukendt (%s).</string>
+    <string name="notice_end_to_end">%1$s slog ende-til-ende kryptering til (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s forespurgte en VoIP konference</string>
+    <string name="notice_voip_started">VoIP konference startet</string>
+    <string name="notice_voip_finished">VoIP konference afsluttet</string>
+
+    <string name="notice_avatar_changed_too">(avatar blev også ændret)</string>
+    <string name="notice_room_name_removed">%1$s fjernede navnet på rummet</string>
+    <string name="notice_room_topic_removed">%1$s fjernede emnet for rummet</string>
+    <string name="notice_profile_change_redacted">%1$s opdaterede sin profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s inviterede %2$s til rummet</string>
+    <string name="notice_room_third_party_registered_invite">%1$s accepterede invitationen til %2$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Kunne ikke dekryptere: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Afsenderens enhed har ikke sendt os nøglerne til denne besked.</string>
+
+    <string name="could_not_redact">Kunne ikke hemmeligholde</string>
+    <string name="unable_to_send_message">Kunne ikke sende besked</string>
+
+    <string name="message_failed_to_upload">Kunne ikke uploade billede</string>
+
+    <string name="network_error">Netværks fejl</string>
+    <string name="matrix_error">Matrix fejl</string>
+
+    <string name="room_error_join_failed_empty_room">Det er i øjeblikket ikke muligt at genforbinde til et tomt rum.</string>
+
+    <string name="encrypted_message">Krypteret besked</string>
+
+    <string name="medium_email">mailadresse</string>
+    <string name="medium_phone_number">Telefonnummer</string>
+
+    <string name="room_displayname_invite_from">Invitation fra %s</string>
+    <string name="room_displayname_room_invite">Invitation til rum</string>
+    <string name="room_displayname_two_members">%1$s og %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s og 1 anden</item>
+        <item quantity="other">%1$s og %2$d andre</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Tomt rum</string>
     <string name="light_theme">Lyst Tema</string>
     <string name="dark_theme">Mørkt Tema</string>
     <string name="black_theme">Sort Tema</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index d543d179b4..1ca3ee3320 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1,5 +1,276 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s hat ein Bild gesendet.</string>
+    <string name="notice_room_invite_no_invitee">Einladung von %s</string>
+    <string name="notice_room_invite">%1$s hat %2$s eingeladen</string>
+    <string name="notice_room_invite_you">%1$s hat dich eingeladen</string>
+    <string name="notice_room_join">%1$s hat den Raum betreten</string>
+    <string name="notice_room_leave">%1$s hat den Raum verlassen</string>
+    <string name="notice_room_reject">%1$s hat die Einladung abgelehnt</string>
+    <string name="notice_room_kick">%1$s hat %2$s gekickt</string>
+    <string name="notice_room_unban">%1$s hat die Sperre von %2$s aufgehoben</string>
+    <string name="notice_room_ban">%1$s hat %2$s verbannt</string>
+    <string name="notice_room_withdraw">%1$s hat die Einladung für %2$s zurückgezogen</string>
+    <string name="notice_avatar_url_changed">%1$s hat das Profilbild geändert</string>
+    <string name="notice_display_name_set">%1$s hat den Anzeigenamen geändert in %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s hat den Anzeigenamen von %2$s auf %3$s geändert</string>
+    <string name="notice_display_name_removed">%1$s hat den Anzeigenamen gelöscht (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s hat das Raumthema geändert auf: %2$s</string>
+    <string name="notice_room_name_changed">%1$s hat den Raumnamen geändert in: %2$s</string>
+    <string name="notice_placed_video_call">%s hat einen Videoanruf durchgeführt.</string>
+    <string name="notice_placed_voice_call">%s hat einen Sprachanruf getätigt.</string>
+    <string name="notice_answered_call">%s hat den Anruf angenommen.</string>
+    <string name="notice_ended_call">%s hat den Anruf beendet.</string>
+    <string name="notice_made_future_room_visibility">%1$s hat den zukünftigen Chatverlauf sichtbar gemacht für %2$s</string>
+    <string name="notice_room_visibility_invited">Alle Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).</string>
+    <string name="notice_room_visibility_joined">Alle Mitglieder (ab dem Zeitpunkt, an dem sie den Raum betreten haben).</string>
+    <string name="notice_room_visibility_shared">alle Raum-Mitglieder.</string>
+    <string name="notice_room_visibility_world_readable">Jeder.</string>
+    <string name="notice_room_visibility_unknown">Unbekannt (%s).</string>
+    <string name="notice_end_to_end">%1$s hat die Ende-zu-Ende-Verschlüsselung aktiviert (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s möchte eine VoIP-Konferenz beginnen</string>
+    <string name="notice_voip_started">VoIP-Konferenz gestartet</string>
+    <string name="notice_voip_finished">VoIP-Konferenz beendet</string>
+    <string name="notice_avatar_changed_too">(Profilbild wurde ebenfalls geändert)</string>
+    <string name="notice_room_name_removed">%1$s hat den Raumnamen entfernt</string>
+    <string name="notice_room_topic_removed">%1$s hat das Raum-Thema entfernt</string>
+    <string name="notice_profile_change_redacted">%1$s hat das Benutzerprofil aktualisiert %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s hat eine Einladung an %2$s gesendet</string>
+    <string name="notice_room_third_party_registered_invite">%1$s hat die Einladung in %2$s akzeptiert</string>
+    <string name="notice_crypto_unable_to_decrypt">** Nicht entschlüsselbar: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Das absendende Gerät hat uns keine Schlüssel für diese Nachricht übermittelt.</string>
+    <!-- Room Screen -->
+    <string name="could_not_redact">Entfernen nicht möglich</string>
+    <string name="unable_to_send_message">Nachricht kann nicht gesendet werden</string>
+    <string name="message_failed_to_upload">Bild konnte nicht hochgeladen werden</string>
+    <!-- general errors -->
+    <string name="network_error">Netzwerk-Fehler</string>
+    <string name="matrix_error">Matrix-Fehler</string>
+    <!-- Home Screen -->
+    <!-- Last seen time -->
+    <!-- call events -->
+    <!-- room error messages -->
+    <string name="room_error_join_failed_empty_room">Es ist aktuell nicht möglich, einen leeren Raum erneut zu betreten.</string>
+    <string name="encrypted_message">Verschlüsselte Nachricht</string>
+    <!-- medium friendly name -->
+    <string name="medium_email">E-Mail-Adresse</string>
+    <string name="medium_phone_number">Telefonnummer</string>
+    <string name="summary_user_sent_sticker">%1$s hat einen Sticker gesendet.</string>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Einladung von %s</string>
+    <string name="room_displayname_room_invite">Raumeinladung</string>
+    <string name="room_displayname_two_members">%1$s und %2$s</string>
+    <string name="room_displayname_empty_room">Leerer Raum</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s und 1 andere(r)</item>
+        <item quantity="other">%1$s und %2$d andere</item>
+    </plurals>
+    <string name="notice_event_redacted">Nachricht entfernt</string>
+    <string name="notice_event_redacted_by">Nachricht entfernt von %1$s</string>
+    <string name="notice_event_redacted_with_reason">Nachricht entfernt [Grund: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Nachricht entfernt von %1$s [Grund: %2$s]</string>
+    <string name="notice_room_update">%s hat diesen Raum aufgewertet.</string>
+    <string name="event_status_sending_message">Sende eine Nachricht…</string>
+    <string name="clear_timeline_send_queue">Sendewarteschlange leeren</string>
+    <string name="initial_sync_start_importing_account">Erste Synchronisation:
+\nImportiere Benutzerkonto…</string>
+    <string name="initial_sync_start_importing_account_crypto">Erste Synchronisation:
+\nImportiere Cryptoschlüssel</string>
+    <string name="initial_sync_start_importing_account_rooms">Erste Synchronisation:
+\nImportiere Räume</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Erste Synchronisation:
+\nImportiere betretene Räume</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Erste Synchronisation:
+\nImportiere eingeladene Räume</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Erste Synchronisation:
+\nImportiere verlassene Räume</string>
+    <string name="initial_sync_start_importing_account_groups">Erste Synchronisation:
+\nImportiere Communities</string>
+    <string name="initial_sync_start_importing_account_data">Erste Synchronisation:
+\nImportiere Benutzerdaten</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s hat die Einladung an %2$s, den Raum zu betreten, zurückgezogen</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s Einladung. Grund: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s hat %2$s eingeladen. Grund: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s hat dich eingeladen. Grund: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s ist dem Raum beigetreten. Grund: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s hat den Raum verlassen. Grund: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s hat die Einladung abgelehnt. Grund: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s hat %2$s gekickt. Grund: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s hat Sperre von %2$s aufgehoben. Grund: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s hat %2$s verbannt. Grund: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s hat eine Einladung an %2$s gesandt um diesem Raum beizutreten. Grund: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s hat Einladung an %2$s zu Betreten dieses Raumes zurückgezogen. Grund: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s hat die Einladung für %2$s angenommen. Grund: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s hat Einladung für %2$s verworfen. Grund: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s fügt %2$s als eine Adresse für diesen Raum hinzu.</item>
+        <item quantity="other">%1$s fügt %2$s als Adressen für diesen Raum hinzu.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s entfernt %2$s als eine Adresse für diesen Raum.</item>
+        <item quantity="other">%1$s entfernt %2$s als Adressen für diesen Raum.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s fügt %2$s als Adresse für diesen Raum hinzu und entfernt %3$s.</string>
+    <string name="notice_room_canonical_alias_set">%1$s legt die Hauptadresse fest für diesen Raum als %2$s fest.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s entfernte die Hauptadresse für diesen Raum.</string>
+    <string name="notice_room_guest_access_can_join">%1$s hat Gästen erlaubt den Raum zu betreten.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s hat Gästen untersagt den Raum zu betreten.</string>
+    <string name="notice_end_to_end_ok">%1$s aktivierte Ende-zu-Ende-Verschlüsselung.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s aktivierte Ende-zu-Ende-Verschlüsselung (unbekannter Algorithmus %2$s).</string>
+    <string name="summary_you_sent_image">Du hast ein Bild gesendet.</string>
+    <string name="summary_you_sent_sticker">Du hast einen Sticker gesendet.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Deine Einladung</string>
+    <string name="notice_room_created">%1$s hat den Raum erstellt</string>
+    <string name="notice_room_created_by_you">Du hast den Raum erstellt</string>
+    <string name="notice_room_invite_by_you">Du hast %1$s eingeladen</string>
+    <string name="notice_room_join_by_you">Du bist dem Raum beigetreten</string>
+    <string name="notice_room_leave_by_you">Du hast den Raum verlassen</string>
+    <string name="notice_room_reject_by_you">Du hast die Einladung abgelehnt</string>
+    <string name="notice_room_kick_by_you">Du hast %1$s aus dem Raum entfernt</string>
+    <string name="notice_room_unban_by_you">Du hast den Bann von %1$s aufgehoben</string>
+    <string name="notice_room_ban_by_you">Du hast %1$s gebannt</string>
+    <string name="notice_room_withdraw_by_you">Du hast die Einladung von %1$s zurückgenommen</string>
+    <string name="notice_avatar_url_changed_by_you">Du hast dein Profilbild geändert</string>
+    <string name="notice_display_name_set_by_you">Du hast deinen Anzeigenamen zu %1$s geändert</string>
+    <string name="notice_display_name_changed_from_by_you">Du hast deinen Anzeigenamen von %1$s zu %2$s geändert</string>
+    <string name="notice_display_name_removed_by_you">Du hast deinen Anzeigenamen entfernt (er war %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Du hast das Thema geändert auf: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s hat das Bild des Raumes geändert</string>
+    <string name="notice_room_avatar_changed_by_you">Du hast das Bild des Raumes geändert</string>
+    <string name="notice_room_name_changed_by_you">Du hast den Raumnamen zu %1$s geändert</string>
+    <string name="notice_placed_video_call_by_you">Du hast einen Videoanruf gestartet.</string>
+    <string name="notice_placed_voice_call_by_you">Du hast einen Audioanruf gestartet.</string>
+    <string name="notice_answered_call_by_you">Du hast den Anruf angenommen.</string>
+    <string name="notice_ended_call_by_you">Du hast den Anruf beendet.</string>
+    <string name="notice_made_future_room_visibility_by_you">Du hast den zukünftigen Nachrichtenverlauf für %1$s sichtbar gemacht</string>
+    <string name="notice_end_to_end_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (%1$s)</string>
+    <string name="notice_room_update_by_you">Du hast den Raum aufgwertet.</string>
+    <string name="notice_requested_voip_conference_by_you">Du hast eine VoIP-Konferenz angefordert</string>
+    <string name="notice_room_name_removed_by_you">Du hast den Raumnamen entfernt</string>
+    <string name="notice_room_topic_removed_by_you">Du hast das Raumthema entfernt</string>
+    <string name="notice_room_avatar_removed">%1$s hat das Bild des Raumes entfernt</string>
+    <string name="notice_room_avatar_removed_by_you">Du hast das Bild des Raumes entfernt</string>
+    <string name="notice_profile_change_redacted_by_you">Du hast dein Profil %1$s aktualisiert</string>
+    <string name="notice_room_third_party_invite_by_you">Du hast %1$s in den Raum eingeladen</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Du hast die Einladung für %1$s zurückgenommen</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Du hast die Einladung für %1$s akzeptiert</string>
+    <string name="notice_widget_added">%1$s hat das %2$s Widget hinzugefügt</string>
+    <string name="notice_widget_added_by_you">Du hast das %1$s Widget hinzugefügt</string>
+    <string name="notice_widget_removed">%1$s hat das %2$s Widget entfernt</string>
+    <string name="notice_widget_removed_by_you">Du hast das %1$s Widget entfernt</string>
+    <string name="notice_widget_modified">%1$s hat das %2$s Widget modifiziert</string>
+    <string name="notice_widget_modified_by_you">Du hast das %1$s Widget modifiziert</string>
+    <string name="power_level_admin">Administrator</string>
+    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_default">Standard</string>
+    <string name="power_level_custom">Benutzerdefiniert (%1$d)</string>
+    <string name="power_level_custom_no_value">Benutzerdefiniert</string>
+    <string name="notice_power_level_changed_by_you">Du hast die Berechtigungsstufe von %1$s geändert.</string>
+    <string name="notice_power_level_changed">%1$s hat die Berechtigungsstufe von %2$s geändert.</string>
+    <string name="notice_power_level_diff">%1$s von %2$s zu %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Deine Einladung. Grund: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Du hast %1$s eingeladen. Grund: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Du bist dem Raum beigetreten. Grund: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Du hast den Raum verlassen. Grund: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Du hast die Einladung abgelehnt. Grund: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Du hast %1$s aus dem Raum entfernt. Grund %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Du hast den Bann von %1$s aufgehoben. Grund: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Du hast %1$s gebannt. Grund: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Du hast %1$s in den Raum eingeladen. Grund: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Du hast die Einladung für %1$s zurückgenommen. Grund: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Du hast die Einladung von %1$s angenommen. Grund: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Du hast die Einladung von %1$s abgelehnt. Grund: %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Du hast die Raumaddresse %1$s hinzugefügt.</item>
+        <item quantity="other">Du hast die Raumaddressen %1$s hinzugefügt.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Du hast die Raum-Adresse %1$s vom Raum entfernt.</item>
+        <item quantity="other">Du hast die Raum-Adressen %1$s vom Raum entfernt.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">Du hast den Raumaddressen %1$s hinzugefügt und %2$s entfernt.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Du hast die Hauptaddresse für diesen Raum auf %1$s gesetzt.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Du hast die Hauptaddresse des Raums entfernt.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Du hast Gästen erlaubt dem Raum beizutreten.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Du hast Gästen untersagt dem Raum beizutreten.</string>
+    <string name="notice_end_to_end_ok_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (unbekannter Algorithmus %1$s).</string>
+    <string name="notice_call_candidates">%s hat Daten gesendet, um einen Anruf zu starten.</string>
+    <string name="notice_call_candidates_by_you">Du hast Daten geschickt, um eine Anruf zu starten.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Du hast Gästen erlaubt hier beizutreten.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s hat Gästen erlaubt hier beizutreten.</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Du bist beigetreten. Grund: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s ist beigetreten. Grund: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Du hast die Einladung für %1$s zurückgezogen</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s hat die Einladung für %2$s zurückgezogen</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Du hast %1$s eingeladen</string>
+    <string name="notice_direct_room_third_party_invite">%1$s hat %2$s eingeladen</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Du hast zukünftige Nachrichten für %1$s sichtbar gemacht</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s hat zukünftige Nachrichten für %2$s sichtbar gemacht</string>
+    <string name="notice_direct_room_leave_by_you">Du hast den Raum verlassen</string>
+    <string name="notice_direct_room_leave">%1$s hat den Raum verlassen</string>
+    <string name="notice_direct_room_join_by_you">Du bist beigetreten</string>
+    <string name="notice_direct_room_join">%1$s ist beigetreten</string>
+    <string name="notice_direct_room_created_by_you">Du hast eine Diskussion erstellt</string>
+    <string name="notice_direct_room_created">%1$s hat eine Diskussion erstellt</string>
+    <string name="notice_direct_room_update">%s hat hier ein Upgrade durchgeführt.</string>
+    <string name="notice_direct_room_update_by_you">Du hast hier ein Upgrade durchgeführt.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Du hast Gästen untersagt den Raum zu betreten.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s hat Gästen untersagt den Raum zu betreten.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Du bist gegangen. Grund: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s ist gegangen. Grund: %2$s</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Du hast die Adressen für diesen Raum geändert.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s hat die Adressen für diesen Raum geändert.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Du hast die Haupt- und die alternativen Adressen für diesen Raum geändert.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s hat die Haupt- und die alternativen Adressen für diesen Raum geändert.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Du hast die alternativen Adressen für diesen Raum geändert.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s hat die alternativen Adressen für diesen Raum geändert.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Du entferntest die alternative Adresse %1$s für diesen Raum.</item>
+        <item quantity="other">Du entferntest die alternativen Adressen %1$s für diesen Raum.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s entfernte die alternative Adresse %2$s für diesen Raum.</item>
+        <item quantity="other">%1$s entfernte die alternativen Adressen %2$s für diesen Raum.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Du hast die alternative Adresse %1$s für diesen Raum hinzugefügt.</item>
+        <item quantity="other">Du hast die alternativen Adressen %1$s für diesen Raum hinzufügt.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s fügte die alternative Adresse %2$s für diesen Raum hinzu.</item>
+        <item quantity="other">%1$s fügte die alternativen Adressen %2$s für diesen Raum hinzu.</item>
+    </plurals>
+    <string name="room_displayname_empty_room_was">Leerer Raum (war %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s und %4$d andere/r</item>
+        <item quantity="other">%1$s, %2$s, %3$s und %4$d andere</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s und %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s und %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Alle Server sind von der Teilnahme ausgeschlossen! Dieser Raum kann nicht mehr genutzt werden.</string>
+    <string name="notice_room_server_acl_updated_no_change">Keine Änderung.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Server, die mit IPs übereinstimmen, sind jetzt gesperrt.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Server, die mit IPs übereinstimmen, sind nicht erlaubt.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Server, die mit %s übereinstimmen, wurden von der Elaubten-Liste entfernt.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Server, die mit %s übereinstimmen, sind jetzt erlaubt.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Server, die mit %s übereinstimmen, werden von der Sperrliste entfernt.</string>
+    <string name="notice_room_server_acl_updated_banned">• Server, die mit %s übereinstimmen, sind jetzt gesperrt.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Du hast die Server-ACL für diesen Raum geändert.</string>
+    <string name="notice_room_server_acl_updated_title">%s hat die Server-Zugriffssteuerungsliste (ACL) für diesen Raum geändert.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Server, die mit IPs übereinstimmen, sind gesperrt.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Server, die mit IPs übereinstimmen, sind erlaubt.</string>
+    <string name="notice_room_server_acl_set_allowed">• Server, die mit %s übereinstimmen, sind erlaubt.</string>
+    <string name="notice_room_server_acl_set_banned">• Server, die mit %s übereinstimmen, sind gesperrt.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Du hast die Server-ACL für diesen Raum gesetzt.</string>
+    <string name="notice_room_server_acl_set_title">%s hat die Server-Zugriffssteuerungsliste (ACL) für diesen Raum gesetzt.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Du hast eine Videokonferenz geändert</string>
+    <string name="notice_widget_jitsi_modified">Videokonferenz von %1$s geändert</string>
+    <string name="notice_widget_jitsi_removed">Videokonferenz von %1$s beendet</string>
+    <string name="notice_widget_jitsi_removed_by_you">Du hast eine Videokonferenz beendet</string>
+    <string name="notice_widget_jitsi_added_by_you">Du hast eine Videokonferenz gestartet</string>
+    <string name="notice_widget_jitsi_added">Videokonferenz von %1$s gestartet</string>
     <!-- titles -->
     <string name="title_activity_home">Nachrichten</string>
     <string name="title_activity_room">"Raum</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 2737ce5c09..401ee237be 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -1,5 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="medium_email">Ηλεκτρονική διεύθυνση</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">Ο/Η %1$s έστειλε μια εικόνα.</string>
+    <string name="summary_user_sent_sticker">Ο/Η %1$s έστειλε ένα αυτοκόλλητο.</string>
+
+    <string name="notice_room_invite_you">Ο/Η %1$s σας προσκάλεσε</string>
+    <string name="notice_room_leave">Ο/Η %1$s αποχώρησε</string>
+    <string name="notice_room_reject">Ο/Η %1$s απέρριψε την πρόσκληση</string>
+    <string name="notice_room_kick">Ο/Η %1$s έδιωξε τον/την %2$s</string>
+    <string name="notice_room_invite">Ο/Η %1$s προσκάλεσε τον/την %2$s</string>
+    <string name="notice_room_invite_no_invitee">Η πρόσκληση του/της %s</string>
+    <string name="medium_phone_number">Αριθμός τηλεφώνου</string>
+
+    <string name="notice_room_ban">Ο/Η %1$s απέκλεισε τον/την %2$s</string>
+    <string name="notice_room_withdraw">Ο/Η %1$s απέσυρε την πρόσκληση του/της %2$s</string>
+    <string name="notice_avatar_url_changed">Ο/Η %1$s άλλαξε εικονίδιο χρήστη</string>
+    <string name="notice_display_name_set">Ο/Η %1$s άλλαξε το εμφανιζόμενό του/της όνομα σε %2$s</string>
+    <string name="notice_display_name_changed_from">Ο/Η %1$s άλλαξε το εμφανιζόμενό του/της όνομα από %2$s σε %3$s</string>
+    <string name="notice_display_name_removed">Ο/Η %1$s αφαίρεσε το εμφανιζόμενό του/της όνομα (%2$s)</string>
+    <string name="notice_room_topic_changed">Ο/Η %1$s άλλαξε το θέμα σε: %2$s</string>
+    <string name="notice_room_name_changed">Ο/Η %1$s άλλαξε το όνομα του δωματίου σε: %2$s</string>
+    <string name="notice_answered_call">Ο/Η %s απάντησε στην κλήση.</string>
+    <string name="notice_ended_call">Ο/Η %s τερμάτισε την κλήση.</string>
+
+    <string name="notice_placed_video_call">Ο/Η %s πραγματοποίησε μια κλήση βίντεο.</string>
+    <string name="notice_placed_voice_call">Ο/Η %s πραγματοποίησε μια κλήση ήχου.</string>
+    <string name="notice_made_future_room_visibility">Ο/Η %1$s κατέστησε το μελλοντικό ιστορικό του δωματίου ορατό στον/στην %2$s</string>
+    <string name="notice_room_visibility_invited">όλα τα μέλη του δωματίου, από την στιγμή που προσκλήθηκαν.</string>
+    <string name="notice_room_visibility_shared">όλα τα μέλη του δωματίου.</string>
+    <string name="notice_room_visibility_world_readable">οποιοσδήποτε.</string>
+    <string name="notice_room_visibility_unknown">άγνωστος/η (%s).</string>
+    <string name="notice_avatar_changed_too">(έγινε αλλαγή και του εικονιδίου χρήστη)</string>
+    <string name="notice_room_name_removed">Ο/Η %1$s αφαίρεσε το όνομα του δωματίου</string>
+    <string name="notice_room_topic_removed">Ο/Η %1$s αφαίρεσε το θέμα του δωματίου</string>
+    <string name="notice_profile_change_redacted">Ο/Η %1$s ανανέωσε το προφίλ του/της %2$s</string>
+    <string name="notice_room_third_party_registered_invite">Ο/Η %1$s δέχτηκε την πρόσκληση για το %2$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Αδυναμία αποκρυπτογράφησης: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Η συσκευή του/της αποστολέα δεν μας έχει στείλει τα κλειδιά για αυτό το μήνυμα.</string>
+
+    <string name="unable_to_send_message">Αποτυχία αποστολής μηνύματος</string>
+
+    <string name="message_failed_to_upload">Αποτυχία αναφόρτωσης εικόνας</string>
+
+    <string name="network_error">Σφάλμα δικτύου</string>
+    <string name="matrix_error">Σφάλμα του Matrix</string>
+
+    <string name="encrypted_message">Κρυπτογραφημένο μήνυμα</string>
+
+    <string name="notice_requested_voip_conference">Ο/Η %1$s ζήτησε μια VoIP διάσκεψη</string>
+    <string name="notice_voip_started">Η VoIP διάσκεψη ξεκίνησε</string>
+    <string name="notice_voip_finished">Η VoIP διάσκεψη έληξε</string>
+
+    <string name="notice_room_join">Ο/Η %1$s εισήλθε στο δωμάτιο</string>
+
+    <string name="room_displayname_invite_from">Πρόσκληση από %s</string>
+    <string name="room_displayname_room_invite">Πρόσκληση στο δωμάτιο</string>
+
+    <string name="room_displayname_two_members">%1$s και %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s και 1 ακόμα</item>
+        <item quantity="other">%1$s και %2$d ακόμα</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Άδειο δωμάτιο</string>
+
+    <string name="notice_room_visibility_joined">όλα τα μέλη του δωματίου από την στιγμή που εισήλθαν.</string>
+    <string name="notice_end_to_end">Ο/Η %1$s ενεργοποίησε την κρυπτογράφηση απ\'άκρη σ\'άκρη (%2$s)</string>
+
+    <string name="notice_room_third_party_invite">Ο/Η %1$s έστειλε μία πρόσκληση στον/στην %2$s για να εισέλθει στο δωμάτιο</string>
+    <string name="room_error_join_failed_empty_room">Δεν είναι δυνατή ακόμα η επανείσοδος σε ένα άδειο δωμάτιο.</string>
     <string name="cancel">Ακύρωση</string>
     <string name="action_close">Κλείσιμο</string>
     <string name="room_settings_direct_chat">Απευθείας συνομιλία</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 713e269254..36e7c86694 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -1,5 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_user_sent_image">%1$s sendis bildon.</string>
+    <string name="summary_user_sent_sticker">%1$s sendis glumarkon.</string>
+    <string name="notice_room_invite_no_invitee">Invito de %s</string>
+    <string name="notice_room_invite">%1$s invitis uzanton %2$s</string>
+    <string name="notice_room_invite_you">%1$s invitis vin</string>
+    <string name="notice_room_join">%1$s envenis</string>
+    <string name="notice_room_leave">%1$s foriris de la ĉambro</string>
+    <string name="notice_room_reject">%1$s rifuzis la inviton</string>
+    <string name="notice_room_kick">%1$s forpelis uzanton %2$s</string>
+    <string name="notice_room_unban">%1$s malforbaris uzanton %2$s</string>
+    <string name="notice_room_ban">%1$s forbaris uzanton %2$s</string>
+    <string name="notice_room_withdraw">%1$s nuligis inviton por %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s ŝanĝis sian profilbildon</string>
+    <string name="notice_crypto_unable_to_decrypt">** Ne eblas malĉifri: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">La aparato de la sendinto ne sendis al ni la ŝlosilojn por tiu mesaĝo.</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="notice_display_name_set">%1$s ŝanĝis sian prezentan nomon al %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s ŝanĝis sian prezentan nomon de %2$s al %3$s</string>
+    <string name="notice_display_name_removed">%1$s forigis sian prezentan nomon (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s ŝanĝis la temon al: %2$s</string>
+    <string name="notice_room_name_changed">%1$s ŝanĝis nomon de la ĉambro al: %2$s</string>
+    <string name="notice_placed_video_call">%s vidvokis.</string>
+    <string name="notice_placed_voice_call">%s voĉvokis.</string>
+    <string name="notice_answered_call">%s respondis la vokon.</string>
+    <string name="notice_ended_call">%s finis la vokon.</string>
+    <string name="notice_made_future_room_visibility">%1$s videbligis estontan historion de ĉambro al %2$s</string>
+    <string name="notice_room_visibility_invited">ĉiuj ĉambranoj, ekde siaj invitoj.</string>
+    <string name="notice_room_visibility_joined">ĉiuj ĉambranoj, ekde siaj aliĝoj.</string>
+    <string name="notice_room_visibility_shared">ĉiuj ĉambranoj.</string>
+    <string name="notice_room_visibility_world_readable">ĉiu ajn.</string>
+    <string name="notice_room_visibility_unknown">nekonata (%s).</string>
+    <string name="notice_end_to_end">%1$s ŝaltis tutvojan ĉifradon (%2$s)</string>
+    <string name="notice_room_update">%s gradaltigis la ĉambron.</string>
+    <string name="notice_event_redacted">Mesaĝo foriĝis</string>
+    <string name="notice_event_redacted_by">Mesaĝon forigis %1$s</string>
+    <string name="notice_event_redacted_with_reason">Mesaĝo foriĝis [kialo: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mesaĝon forigis %1$s [kialo: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s ĝisdatigis sian profilon %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s sendis aliĝan inviton al %2$s</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s nuligis la aliĝan inviton por %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s akceptis la inviton por %2$s</string>
+    <string name="could_not_redact">Ne povis redakti</string>
+    <string name="unable_to_send_message">Ne povas sendi mesaĝon</string>
+    <string name="message_failed_to_upload">Malsukcesis alŝuti bildon</string>
+    <string name="network_error">Reta eraro</string>
+    <string name="matrix_error">Matrix-eraro</string>
+    <string name="room_error_join_failed_empty_room">Nun ne eblas re-aliĝi al malplena ĉambro.</string>
+    <string name="encrypted_message">Ĉifrita mesaĝo</string>
+    <string name="medium_email">Retpoŝtadreso</string>
+    <string name="medium_phone_number">Telefonnumero</string>
+    <string name="room_displayname_invite_from">Invito de %s</string>
+    <string name="room_displayname_room_invite">Invito al ĉambro</string>
+    <string name="room_displayname_two_members">%1$s kaj %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s kaj 1 alia</item>
+        <item quantity="other">%1$s kaj %2$d aliaj</item>
+    </plurals>
+    <string name="room_displayname_empty_room">Malplena ĉambro</string>
+    <string name="initial_sync_start_importing_account">Komenca spegulado:
+\nEnportante konton…</string>
+    <string name="initial_sync_start_importing_account_crypto">Komenca spegulado:
+\nEnportante ĉifrilojn</string>
+    <string name="initial_sync_start_importing_account_rooms">Komenca spegulado:
+\nEnportante ĉambrojn</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Komenca spegulado:
+\nEnportante aliĝitajn ĉambrojn</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Komenca spegulado:
+\nEnportante ĉambrojn de invitoj</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Komenca spegulado:
+\nEnportante forlasitajn ĉambrojn</string>
+    <string name="initial_sync_start_importing_account_groups">Komenca spegulado:
+\nEnportante komunumojn</string>
+    <string name="initial_sync_start_importing_account_data">Komenca spegulado:
+\nEnportante datumojn de konto</string>
+    <string name="event_status_sending_message">Sendante mesaĝon…</string>
+    <string name="clear_timeline_send_queue">Vakigi sendan atendovicon</string>
+    <string name="notice_requested_voip_conference">%1$s petis grupan vokon</string>
+    <string name="notice_voip_started">Grupa voko komenciĝis</string>
+    <string name="notice_voip_finished">Grupa voko finiĝis</string>
+    <string name="notice_avatar_changed_too">(ankaŭ profilbildo ŝanĝiĝis)</string>
+    <string name="notice_room_name_removed">%1$s forigis nomon de la ĉambro</string>
+    <string name="notice_room_topic_removed">%1$s forigis temon de la ĉambro</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Invito de %1$s. Kialo: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s invitis uzanton %2$s. Kialo: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s invitis vin. Kialo: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s envenis. Kialo: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s foriris de la ĉambro. Kialo: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s rifuzis la inviton. Kialo: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s forpelis uzanton %2$s. Kialo: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s malforbaris uzanton %2$s. Kialo: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s forbaris uzanton %2$s. Kialo: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s sendis al %2$s inviton al la ĉambro. Kialo: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s nuligis la inviton al la ĉambro por %2$s. Kialo: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s akceptis la inviton por %2$s. Kialo: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s nuligis la inviton por %2$s. Kialo: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s aldonis %2$s kiel adreson por ĉi tiu ĉambro.</item>
+        <item quantity="other">%1$s aldonis %2$s kiel adresojn por ĉi tiu ĉambro.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s forigis %2$s kiel adreson por ĉi tiu ĉambro.</item>
+        <item quantity="other">%1$s forigis %2$s kiel adresojn por ĉi tiu ĉambro.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s aldonis %2$s kaj forigis %3$s kiel adresojn por ĉi tiu ĉambro.</string>
+    <string name="notice_room_canonical_alias_set">%1$s agordis la ĉefadreson de ĉi tiu ĉambro al %2$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s forigis la ĉefadreson de ĉi tiu ĉambro.</string>
+    <string name="notice_room_guest_access_can_join">%1$s permesis al gastoj enveni.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s malpermesis al gastoj enveni.</string>
+    <string name="notice_end_to_end_ok">%1$s ŝaltis tutvojan ĉifradon.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s ŝaltis tutvojan ĉifradon (kun nerekonita algoritmo %2$s).</string>
+    <string name="notice_power_level_changed_by_you">Vi ŝanĝis la povnivelon de %1$s.</string>
+    <string name="notice_power_level_changed">%1$s sanĝis la povnivelon de %2$s.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Vi ŝaltis tutvojan ĉifradon (kun nerekonita algoritmo %1$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Vi ŝaltis tutvojan ĉifradon.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Vi malpermesis al gastoj aliĝi.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s malpermesis al gastoj aliĝi.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Vi malpermesis al gastoj enveni.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Vi permesis al gastoj aliĝi.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s permesis al gastoj aliĝi.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Vi permesis al gastoj enveni.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Vi forigis la ĉefadreson de ĉi tiu ĉambro.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Vi agordis al ĉefadreson de ĉi tiu ĉambro al %1$s.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Vi aldonis %1$s kaj forigis %2$s kiel adresojn por ĉi tiu ĉambro.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Vi forigis %1$s kiel adreson por ĉi tiu ĉambro.</item>
+        <item quantity="other">Vi forigis %1$s kiel adresojn por ĉi tiu ĉambro.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Vi aldonis %1$s kiel adreson por ĉi tiu ĉambro.</item>
+        <item quantity="other">Vi aldonis %1$s kiel adresojn por ĉi tiu ĉambro.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">Vi nuligis la inviton por %1$s. Kialo: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Vi akceptis la inviton por %1$s. Kialo: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vi nuligis inviton al la ĉambro por %1$s. Kialo: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Vi sendis al %1$s inviton al la ĉambro. Kialo: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Vi forbaris uzanton %1$s. Kialo: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Vi malforbaris uzanton %1$s. Kialo: %2$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Vi forpelis uzanton %1$s. Kialo: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Vi rifuzis la inviton. Kialo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Vi foriris. Kialo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s foriris. Kialo: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Vi foriris de la ĉambro. Kialo: %1$s</string>
+    <string name="notice_room_join_with_reason_by_you">Vi envenis. Kialo: %1$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Vi aliĝis. Kialo: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s aliĝis. Kialo: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Vi invitis uzanton %1$s. Kialo: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Via invito. Kialo: %1$s</string>
+    <string name="notice_power_level_diff">%1$s de %2$s al %3$s</string>
+    <string name="power_level_custom_no_value">Propra</string>
+    <string name="power_level_default">Ordinara</string>
+    <string name="power_level_custom">Propra (%1$d)</string>
+    <string name="power_level_moderator">Reguligisto</string>
+    <string name="power_level_admin">Administranto</string>
+    <string name="notice_widget_modified_by_you">Vi ŝanĝis la fenestraĵon %1$s</string>
+    <string name="notice_widget_modified">%1$s ŝanĝis la fenestraĵon %2$s</string>
+    <string name="notice_widget_removed_by_you">Vi forigis la fenestraĵon %1$s</string>
+    <string name="notice_widget_removed">%1$s forigis la fenestraĵon %2$s</string>
+    <string name="notice_widget_added_by_you">Vi aldonis la fenestraĵon %1$s</string>
+    <string name="notice_widget_added">%1$s aldonis la fenestraĵon %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Vi akceptis la inviton por %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Vi nuligis la inviton por %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s nuligis la inviton por %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Vi nuligis la aliĝan inviton por %1$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Vi invitis uzanton %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s invitis uzanton %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Vi sendis aliĝan inviton al %1$s</string>
+    <string name="notice_profile_change_redacted_by_you">Vi ĝisdatigis vian profilon %1$s</string>
+    <string name="notice_room_avatar_removed_by_you">Vi forigis bildon de la ĉambro</string>
+    <string name="notice_room_avatar_removed">%1$s forigis bildon de la ĉambro</string>
+    <string name="notice_room_topic_removed_by_you">Vi forigis temon de la ĉambro</string>
+    <string name="notice_room_name_removed_by_you">Vi forigis nomon de la ĉambro</string>
+    <string name="notice_requested_voip_conference_by_you">Vi petis grupan vokon</string>
+    <string name="notice_direct_room_update_by_you">Vi gradaltigis la interparolon.</string>
+    <string name="notice_direct_room_update">%s gradaltigis la interparolon.</string>
+    <string name="notice_room_update_by_you">Vi gradaltigis la ĉambron.</string>
+    <string name="notice_end_to_end_by_you">Vi ŝaltis tutvojan ĉifradon (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s videbligis al %2$s estontajn mesaĝojn</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Vi videbligis al %1$s estontajn mesaĝojn</string>
+    <string name="notice_made_future_room_visibility_by_you">Vi videbligis estontan historion de ĉambro al %1$s</string>
+    <string name="notice_ended_call_by_you">Vi finis la vokon.</string>
+    <string name="notice_answered_call_by_you">Vi respondis la vokon.</string>
+    <string name="notice_call_candidates_by_you">Vi sendis datumojn por prepari la vokon.</string>
+    <string name="notice_call_candidates">%s sendis datumojn por prepari la vokon.</string>
+    <string name="notice_placed_voice_call_by_you">Vi voĉvokis.</string>
+    <string name="notice_placed_video_call_by_you">Vi vidvokis.</string>
+    <string name="notice_room_name_changed_by_you">Vi ŝanĝis la nomon de la ĉambro al: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Vi ŝanĝis la bildon de la ĉambro</string>
+    <string name="notice_room_avatar_changed">%1$s ŝanĝis la bildon de la ĉambro</string>
+    <string name="notice_room_topic_changed_by_you">Vi ŝanĝis la temon al: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Vi forigis vian prezentan nomon (%1$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Vi ŝanĝis vian prezentan nomon de %1$s al %2$s</string>
+    <string name="notice_display_name_set_by_you">Vi ŝanĝis vian prezentan nomon al %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Vi ŝanĝis vian profilbildon</string>
+    <string name="notice_room_withdraw_by_you">Vi nuligis inviton por %1$s</string>
+    <string name="notice_room_ban_by_you">Vi forbaris uzanton %1$s</string>
+    <string name="notice_room_unban_by_you">Vi malforbaris uzanton %1$s</string>
+    <string name="notice_room_kick_by_you">Vi forpelis uzanton %1$s</string>
+    <string name="notice_room_reject_by_you">Vi rifuzis la inviton</string>
+    <string name="notice_direct_room_leave_by_you">Vi foriris de la ĉambro</string>
+    <string name="notice_direct_room_leave">%1$s foriris de la ĉambro</string>
+    <string name="notice_room_leave_by_you">Vi foriris de la ĉambro</string>
+    <string name="notice_direct_room_join_by_you">Vi envenis</string>
+    <string name="notice_direct_room_join">%1$s envenis</string>
+    <string name="notice_room_join_by_you">Vi envenis</string>
+    <string name="notice_room_invite_by_you">Vi invitis uzanton %1$s</string>
+    <string name="notice_direct_room_created_by_you">Vi kreis la diskuton</string>
+    <string name="notice_direct_room_created">%1$s kreis la diskuton</string>
+    <string name="notice_room_created_by_you">Vi kreis la ĉambron</string>
+    <string name="notice_room_created">%1$s kreis la ĉambron</string>
+    <string name="notice_room_invite_no_invitee_by_you">Via invito</string>
+    <string name="summary_you_sent_sticker">Vi sendis glumarkon.</string>
+    <string name="summary_you_sent_image">Vi sendis bildon.</string>
     <string name="light_theme">Hela haŭto</string>
     <string name="dark_theme">Malhela haŭto</string>
     <string name="black_theme">Nigra haŭto</string>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index d9a0040181..71b4fb1002 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -1,5 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s envió una imagen.</string>
+
+    <string name="notice_room_invite_no_invitee">la invitación de %s</string>
+    <string name="notice_room_invite">%1$s invitó a %2$s</string>
+    <string name="notice_room_invite_you">%1$s te invitó</string>
+    <string name="notice_room_join">%1$s se unió</string>
+    <string name="notice_room_leave">%1$s salió</string>
+    <string name="notice_room_reject">%1$s rechazó la invitación</string>
+    <string name="notice_room_kick">%1$s quitó a %2$s</string>
+    <string name="notice_room_unban">%1$s desprohibió a %2$s</string>
+    <string name="notice_room_ban">%1$s prohibió %2$s</string>
+    <string name="notice_room_withdraw">%1$s retiró la invitación de %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s cambió su foto de perfil</string>
+    <string name="notice_display_name_set">%1$s estableció %2$s como su nombre visible</string>
+    <string name="notice_display_name_changed_from">%1$s cambió su nombre visible de %2$s a %3$s</string>
+    <string name="notice_display_name_removed">%1$s eliminó su nombre visible (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s cambió el tema a: %2$s</string>
+    <string name="notice_room_name_changed">%1$s cambió el nombre de la sala a: %2$s</string>
+    <string name="notice_placed_video_call">%s comenzó una llamada de video.</string>
+    <string name="notice_placed_voice_call">%s comenzó una llamada de voz.</string>
+    <string name="notice_answered_call">%s recibió la llamada.</string>
+    <string name="notice_ended_call">%s terminó la llamada.</string>
+    <string name="notice_made_future_room_visibility">%1$s dejó que %2$s vea el historial del futuro</string>
+    <string name="notice_room_visibility_invited">todos los miembros de la sala, desde su invitación.</string>
+    <string name="notice_room_visibility_joined">todos los miembros de la sala, desde cuando entraron.</string>
+    <string name="notice_room_visibility_shared">todos los miembros de la sala.</string>
+    <string name="notice_room_visibility_world_readable">todos.</string>
+    <string name="notice_room_visibility_unknown">desconocido (%s).</string>
+    <string name="notice_end_to_end">%1$s encendió el cifrado de extremo a extremo (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s solicitó una conferencia VoIP</string>
+    <string name="notice_voip_started">conferencia VoIP comenzó</string>
+    <string name="notice_voip_finished">conferencia VoIP finalizó</string>
+
+    <string name="notice_avatar_changed_too">(foto de perfil también se cambió)</string>
+    <string name="notice_room_name_removed">%1$s eliminó el nombre de la sala</string>
+    <string name="notice_room_topic_removed">%1$s retiró el tema de la sala</string>
+    <string name="notice_profile_change_redacted">%1$s actualizó su perfil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s envió una invitación a %2$s para entrar a la sala</string>
+    <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitación de %2$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** No se puede descifrar: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositivo del remitente no nos ha enviado las claves de este mensaje.</string>
+
+    <!-- Room Screen -->
+    <string name="could_not_redact">No se pudo redactar</string>
+    <string name="unable_to_send_message">No se puede enviar el mensaje</string>
+
+    <string name="message_failed_to_upload">La subida de la imagen falló</string>
+
+    <!-- general errors -->
+    <string name="network_error">Error de la red</string>
+    <string name="matrix_error">Error de Matrix</string>
+
+    <!-- Home Screen -->
+
+    <!-- Last seen time -->
+
+    <!-- call events -->
+
+    <!-- room error messages -->
+    <string name="room_error_join_failed_empty_room">No es posible volver a unirse a una sala vacía.</string>
+
+    <string name="encrypted_message">Mensaje cifrado</string>
+
+    <!-- medium friendly name -->
+    <string name="medium_email">Correo electrónico</string>
+    <string name="medium_phone_number">Número telefónico</string>
+
+    <string name="summary_user_sent_sticker">%1$s envió una calcomanía.</string>
+
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Invitación de %s</string>
+    <string name="room_displayname_room_invite">Invitación de Sala</string>
+    <string name="room_displayname_two_members">%1$s y %2$s</string>
+    <string name="room_displayname_empty_room">Sala vacía</string>
+
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s y otro</item>
+        <item quantity="other">%1$s y %2$d otros</item>
+    </plurals>
+
+    <string name="notice_event_redacted">Mensaje eliminado</string>
+    <string name="notice_event_redacted_by">Mensaje eliminado por %1$s</string>
+    <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
     <!-- titles -->
     <string name="title_activity_home">Mensajes</string>
     <string name="title_activity_room">Sala</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index dc6a5ced52..139b840e2b 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1,5 +1,276 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s envió una imagen.</string>
+    <string name="notice_room_invite_no_invitee">la invitación de %s</string>
+    <string name="notice_room_invite">%1$s invitó a %2$s</string>
+    <string name="notice_room_invite_you">%1$s te ha invitado</string>
+    <string name="notice_room_join">%1$s se ha unido</string>
+    <string name="notice_room_leave">%1$s salió</string>
+    <string name="notice_room_reject">%1$s rechazó la invitación</string>
+    <string name="notice_room_kick">%1$s expulsó a %2$s</string>
+    <string name="notice_room_unban">%1$s le quitó el veto a %2$s</string>
+    <string name="notice_room_ban">%1$s vetó a %2$s</string>
+    <string name="notice_room_withdraw">%1$s retiró la invitación de %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s cambió su avatar</string>
+    <string name="notice_display_name_set">%1$s estableció %2$s como su nombre público</string>
+    <string name="notice_display_name_changed_from">%1$s cambió su nombre público de %2$s a %3$s</string>
+    <string name="notice_display_name_removed">%1$s eliminó su nombre público (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s cambió el tema a: %2$s</string>
+    <string name="notice_room_name_changed">%1$s cambió el nombre de la sala a: %2$s</string>
+    <string name="notice_placed_video_call">%s realizó una llamada de vídeo.</string>
+    <string name="notice_placed_voice_call">%s realizó una llamada de voz.</string>
+    <string name="notice_answered_call">%s contestó la llamada.</string>
+    <string name="notice_ended_call">%s finalizó la llamada.</string>
+    <string name="notice_made_future_room_visibility">%1$s hizo visible el historial futuro de la sala para %2$s</string>
+    <string name="notice_room_visibility_invited">todos los miembros de la sala, desde su invitación.</string>
+    <string name="notice_room_visibility_joined">todos los miembros de la sala, desde el momento en que se unieron.</string>
+    <string name="notice_room_visibility_shared">todos los miembros de la sala.</string>
+    <string name="notice_room_visibility_world_readable">todos.</string>
+    <string name="notice_room_visibility_unknown">desconocido (%s).</string>
+    <string name="notice_end_to_end">%1$s ha activado la encriptación de Extremo-a-Extremo (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s solicitó una conferencia de VozIP</string>
+    <string name="notice_voip_started">Conferencia de VozIP iniciada</string>
+    <string name="notice_voip_finished">Conferencia de VozIP finalizada</string>
+    <string name="notice_avatar_changed_too">(el avatar también se cambió)</string>
+    <string name="notice_room_name_removed">%1$s eliminó el nombre de la sala</string>
+    <string name="notice_room_topic_removed">%1$s eliminó el tema de la sala</string>
+    <string name="notice_profile_change_redacted">%1$s actualizó su perfil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s invitó a %2$s a unirse a la sala</string>
+    <string name="notice_room_third_party_registered_invite">%1$s aceptó la invitación para %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** No es posible descifrar: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">El dispositivo emisor no nos ha enviado las claves para este mensaje.</string>
+    <!-- Room Screen -->
+    <string name="could_not_redact">No se pudo redactar</string>
+    <string name="unable_to_send_message">No es posible enviar el mensaje</string>
+    <string name="message_failed_to_upload">No se pudo cargar la imagen</string>
+    <!-- general errors -->
+    <string name="network_error">Error de red</string>
+    <string name="matrix_error">Error de Matrix</string>
+    <!-- Home Screen -->
+    <!-- Last seen time -->
+    <!-- call events -->
+    <!-- room error messages -->
+    <string name="room_error_join_failed_empty_room">Actualmente no es posible volver a unirse a una sala vacía.</string>
+    <string name="encrypted_message">Mensaje encriptado</string>
+    <!-- medium friendly name -->
+    <string name="medium_email">Dirección de correo electrónico</string>
+    <string name="medium_phone_number">Número telefónico</string>
+    <string name="summary_user_sent_sticker">%1$s envió una pegatina.</string>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Invitación de %s</string>
+    <string name="room_displayname_room_invite">Invitación a Sala</string>
+    <string name="room_displayname_two_members">%1$s y %2$s</string>
+    <string name="room_displayname_empty_room">Sala vacía</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s y 1 otro</item>
+        <item quantity="other">%1$s y %2$d otros</item>
+    </plurals>
+    <string name="notice_event_redacted">Mensaje eliminado</string>
+    <string name="notice_event_redacted_by">Mensaje eliminado por %1$s</string>
+    <string name="notice_event_redacted_with_reason">Mensaje eliminado [motivo: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mensaje eliminado por %1$s [motivo: %2$s]</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s ha revocado la invitación a unirse a la sala para %2$s</string>
+    <string name="initial_sync_start_importing_account">Sincronización Inicial
+\nImportando cuenta…</string>
+    <string name="initial_sync_start_importing_account_rooms">Sincronización Inicial:
+\nImportando Salas</string>
+    <string name="initial_sync_start_importing_account_groups">Sincronización Inicial:
+\nImportando Comunidades</string>
+    <string name="initial_sync_start_importing_account_data">Sincronización Inicial:
+\nImportando Datos de la Cuenta</string>
+    <string name="event_status_sending_message">Enviando mensaje…</string>
+    <string name="clear_timeline_send_queue">Borrar cola de envío</string>
+    <string name="notice_room_invite_with_reason">%1$s ha invitado a %2$s. Razón: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s te ha invitado. Razón: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s se ha unido. Razón: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s se ha ido. Razón: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s ha rechadazo la invitación. Razón: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s expulsó a %2$s. Razón: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s ha baneado a %2$s. Razón: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s ha aceptado la invitación para %2$s. Razón: %3$s</string>
+    <string name="notice_room_canonical_alias_unset">%1$s ha eliminado la dirección principal para esta sala.</string>
+    <string name="notice_room_update">%s ha actualizado la sala.</string>
+    <string name="initial_sync_start_importing_account_crypto">Sincronización Inicial:
+\nImportando criptografía</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Sincronización Inicial:
+\nImportando Salas a las que te has unido</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Sincronización Inicial:
+\nImportando Salas a las que has sido invitada</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sincronización Inicial:
+\nImportando Salas Abandonadas</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Invitación de %1$s. Razón: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s ha desbaneado a %2$s. Razón: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s envió una invitación a %2$s para que se una a la sala. Razón: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revocó la invitación de %2$s para unirse a la sala. Razón: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s ha retirado la invitación de %2$s. Razón: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s ha añadido %2$s como alias de esta sala.</item>
+        <item quantity="other">%1$s ha añadido %2$s como alias de esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s ha quitado %2$s como alias de esta sala.</item>
+        <item quantity="other">%1$s ha quitado %2$s como alias de esta sala.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_set">%1$s ha establecido la dirección principal de esta sala a %2$s.</string>
+    <string name="notice_room_guest_access_can_join">%1$s ha permitido que los invitados se unan a la sala.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s ha impedido que los invitados se unan a la sala.</string>
+    <string name="notice_end_to_end_ok">%1$s ha activado la encriptación extremo a extremo.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s ha activado la encriptación de extremo a extremo (algoritmo no reconocido %2$s).</string>
+    <string name="summary_you_sent_image">Enviaste una imagen.</string>
+    <string name="summary_you_sent_sticker">Enviaste un sticker.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Tu invitación</string>
+    <string name="notice_room_created">%1$s creó la sala</string>
+    <string name="notice_room_created_by_you">Creaste la sala</string>
+    <string name="notice_room_invite_by_you">Invitaste a %1$s</string>
+    <string name="notice_room_join_by_you">Te uniste a la Sala</string>
+    <string name="notice_room_leave_by_you">Dejaste la Sala</string>
+    <string name="notice_room_reject_by_you">Rechazaste la invitación</string>
+    <string name="notice_room_kick_by_you">Tu pateaste a %1$s</string>
+    <string name="notice_room_unban_by_you">Tu desbanaste a %1$s</string>
+    <string name="notice_room_ban_by_you">Usted prohibió a %1$s</string>
+    <string name="notice_room_withdraw_by_you">Retiró la invitación de %1$s\'s</string>
+    <string name="notice_avatar_url_changed_by_you">Cambiaste tu avatar</string>
+    <string name="notice_display_name_set_by_you">Establece su nombre de visualización en %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Cambiaste tu nombre para mostrar de %1$s a %2$s</string>
+    <string name="notice_display_name_removed_by_you">Quitaste tu nombre para mostrar (era %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Cambiaste el tema a: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s cambió el avatar de la sala</string>
+    <string name="notice_room_avatar_changed_by_you">Cambiaste el avatar de la sala</string>
+    <string name="notice_room_name_changed_by_you">Cambiaste el nombre de la sala a: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Hiciste una videollamada.</string>
+    <string name="notice_placed_voice_call_by_you">Hiciste una llamada de voz.</string>
+    <string name="notice_call_candidates">%s envió datos para configurar la llamada.</string>
+    <string name="notice_call_candidates_by_you">Enviaste datos para configurar la llamada.</string>
+    <string name="notice_answered_call_by_you">Respondiste la llamada.</string>
+    <string name="notice_ended_call_by_you">Terminaste la llamada.</string>
+    <string name="notice_made_future_room_visibility_by_you">Hiciste visible el futuro historial de la %1$s</string>
+    <string name="notice_end_to_end_by_you">Has activado la encriptación de Extremo-a-Extremo (%1$s)</string>
+    <string name="notice_room_update_by_you">Has actualizado esta sala.</string>
+    <string name="notice_requested_voip_conference_by_you">Solicitaste una conferencia de VozIP</string>
+    <string name="notice_room_name_removed_by_you">Quitaste el nombre de la sala</string>
+    <string name="notice_room_topic_removed_by_you">Quitaste el tema de la sala</string>
+    <string name="notice_room_avatar_removed">%1$s eliminó el avatar de la sala</string>
+    <string name="notice_room_avatar_removed_by_you">Quitaste el avatar de la sala</string>
+    <string name="notice_profile_change_redacted_by_you">Actualizaste tu perfil %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Enviaste una invitación a %1$s para unirse a la sala</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Revocaste la invitación para que %1$s se una a la sala</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Aceptaste la invitación para %1$s</string>
+    <string name="notice_widget_added">%1$s agrego el widget %2$s</string>
+    <string name="notice_widget_added_by_you">Agregaste el widget %1$s</string>
+    <string name="notice_widget_removed">%1$s eliminó el widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Quitaste el widget %1$s</string>
+    <string name="notice_widget_modified">%1$s modifico el widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Modificaste el widget %1$s</string>
+    <string name="power_level_admin">Administrador</string>
+    <string name="power_level_moderator">Moderador</string>
+    <string name="power_level_default">Por defecto</string>
+    <string name="power_level_custom">Personalizado (%1$d)</string>
+    <string name="power_level_custom_no_value">Personalizado</string>
+    <string name="notice_power_level_changed_by_you">Cambiaste el nivel de permisos de %1$s.</string>
+    <string name="notice_power_level_changed">%1$s cambió el nivel de permisos de %2$s.</string>
+    <string name="notice_power_level_diff">%1$s de %2$s a %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Tu invitación. Razón: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Invitaste a %1$s. Razón: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Te uniste a la sala. Razón: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Dejaste la sala. Razón: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Rechazaste la invitación. Razón: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Pateaste a %1$s. Motivo: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Has desactivado a %1$s. Motivo: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Prohibiste a %1$s. Motivo: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Enviaste una invitación a %1$s para unirse a la sala. Motivo: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Revocaste la invitación para que %1$s se una a la sala. Motivo: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Aceptaste la invitación para %1$s. Motivo: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Retiró la invitación de %1$s\'s. Motivo: %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Agregaste %1$s como dirección para esta sala.</item>
+        <item quantity="other">Agregaste %1$s como direcciones para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Quitaste %1$s como dirección para esta sala.</item>
+        <item quantity="other">Quitaste %1$s como direcciones para esta sala.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s añadió %2$s y eliminó %3$s como alias para esta sala.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Agregaste %1$s y quitaste %2$s como direcciones para esta sala.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Estableciste la dirección principal de esta sala en %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Quitaste la dirección principal de esta sala.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Ha permitido que los invitados se unan a la sala.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Ha impedido que los invitados se unan a la sala.</string>
+    <string name="notice_end_to_end_ok_by_you">Tu has activado la encriptación de Extremo-a-Extremo.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Has activado la encriptación de Extremo-a-Extremo (algoritmo %1$s no reconocido).</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Has impedido que invitados se unan a la sala.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Has permitido a invitados unirse aquí.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Te has ido. Razón: %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Has revocado la invitación de %1$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Has invitado a %1$s</string>
+    <string name="notice_direct_room_update_by_you">Has actualizado aquí.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Has hecho futuros mensajes visibles a %1$s</string>
+    <string name="notice_direct_room_leave_by_you">Te saliste de la sala</string>
+    <string name="notice_direct_room_join_by_you">Te uniste</string>
+    <string name="notice_direct_room_created_by_you">Creaste la conversación</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedido que invitados se unan a la sala.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s ha permitido a invitados a unirse aquí.</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s se ha ido. Razón: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Tu te has unido. Razón: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s se ha unido. Razón: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s ha revocado la invitación de %2$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s ha invitado %2$s</string>
+    <string name="notice_direct_room_update">%s ha actualizado aquí.</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s ha hecho futuros mensajes visibles a %2$s</string>
+    <string name="notice_direct_room_leave">%1$s ha salido de la sala</string>
+    <string name="notice_direct_room_join">%1$s se ha unido</string>
+    <string name="notice_direct_room_created">%1$s ha creado la conversación</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Cambiaste el alias de esta sala.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s cambió el alias de esta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Cambiaste los alias principal y alternativos de esta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s cambió los alias principal y alternativos de esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Cambiaste los alias alternativos de esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s cambió los alias alternativos de esta sala.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Eliminaste el alias alternativo %1$s para esta sala.</item>
+        <item quantity="other">Eliminaste los alias alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s eliminó el alias alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s eliminó los alias alternativos %2$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Añadiste el alias alternativo %1$s para esta sala.</item>
+        <item quantity="other">Añadiste los alias alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s añadió el alias alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s añadió los alias alternativos %2$s para esta sala.</item>
+    </plurals>
+    <string name="room_displayname_empty_room_was">Sala vacía (%s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s y %4$d otro</item>
+        <item quantity="other">%1$s, %2$s, %3$s y %4$d otros</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s y %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s y %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Todos los servidores tienen prohibido participar! Esta sala ya no puede ser usada.</string>
+    <string name="notice_room_server_acl_updated_no_change">Sin cambios.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Los servidores con literales IP coincidentes ahora están prohibidos.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Los servidores con literales IP coincidentes ahora están permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Los servidores con %s coincidentes se han eliminado de la lista de permitidos.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Los servidores con %s coincidentes ahora están permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Los servidores con %s coincidentes se han eliminado de la lista de baneos.</string>
+    <string name="notice_room_server_acl_updated_banned">• Los servidores con %s coincidentes ahora están prohibidos.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Has cambiado la lista de control de acceso para esta sala.</string>
+    <string name="notice_room_server_acl_updated_title">%s ha cambiado la lista de control de acceso para esta sala.</string>
+    <string name="notice_room_server_acl_set_allowed">• Los servidores con %s coincidentes están permitidos.</string>
+    <string name="notice_room_server_acl_set_banned">• Los servidores con %s coincidentes están prohibidos.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Los servidores con literales IP coincidentes están prohibidos.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Los servidores con literales IP coincidentes están permitidos.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Has fijado la lista de control de acceso para esta sala.</string>
+    <string name="notice_room_server_acl_set_title">%s ha fijado la lista de control de acceso para esta sala.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Has modificado la videoconferencia</string>
+    <string name="notice_widget_jitsi_modified">Videoconferencia modificada por %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Has terminado la videoconferencia</string>
+    <string name="notice_widget_jitsi_removed">Videoconferencia terminada por %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Has empezado una videoconferencia</string>
+    <string name="notice_widget_jitsi_added">Videoconferencia empezada por %1$s</string>
     <!-- titles -->
     <string name="title_activity_home">Mensajes</string>
     <string name="title_activity_room">Sala</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index f570f3afa8..eabb935b25 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -1,5 +1,268 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s saatis pildi.</string>
+    <string name="summary_user_sent_sticker">%1$s saatis kleepsu.</string>
+    <string name="notice_room_invite_no_invitee">Kasutaja %s kutse</string>
+    <string name="notice_room_invite">%1$s kutsus kasutajat %2$s</string>
+    <string name="notice_room_invite_you">%1$s kutsus sind</string>
+    <string name="notice_room_join">%1$s liitus jututoaga</string>
+    <string name="notice_room_leave">%1$s lahkus jututoast</string>
+    <string name="notice_room_reject">%1$s lükkas tagasi kutse</string>
+    <string name="notice_room_kick">%1$s müksas kasutajat %2$s</string>
+    <string name="notice_room_withdraw">%1$s võttis tagasi kutse kasutajale %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s muutis oma avatari</string>
+    <string name="notice_display_name_set">%1$s määras oma kuvatavaks nimeks %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s muutis senise kuvatava nime %2$s uueks nimeks %3$s</string>
+    <string name="notice_display_name_removed">%1$s eemaldas oma kuvatava nime (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s muutis uueks teemaks %2$s</string>
+    <string name="notice_room_name_changed">%1$s muutis jututoa uueks nimeks %2$s</string>
+    <string name="notice_placed_video_call">%s alustas videokõnet.</string>
+    <string name="notice_placed_voice_call">%s alustas häälkõnet.</string>
+    <string name="notice_answered_call">%s vastas kõnele.</string>
+    <string name="notice_ended_call">%s lõpetas kõne.</string>
+    <string name="notice_made_future_room_visibility">%1$s seadistas, et tulevane jututoa ajalugu on nähtav kasutajale %2$s</string>
+    <string name="notice_room_visibility_invited">kõikidele jututoa liikmetele alates kutsumise hetkest.</string>
+    <string name="notice_room_visibility_joined">kõikidele jututoa liikmetele alates liitumise hetkest.</string>
+    <string name="notice_room_visibility_shared">kõikidele jututoa liikmetele.</string>
+    <string name="notice_room_visibility_world_readable">kõikidele.</string>
+    <string name="notice_room_visibility_unknown">teadmata (%s).</string>
+    <string name="notice_end_to_end">%1$s lülitas sisse läbiva krüptimise (%2$s)</string>
+    <string name="notice_room_update">%s uuendas seda jututuba.</string>
+    <string name="notice_requested_voip_conference">%1$s saatis VoIP konverentsi kutse</string>
+    <string name="notice_voip_started">VoIP-konverents algas</string>
+    <string name="notice_voip_finished">VoIP-konverents lõppes</string>
+    <string name="notice_avatar_changed_too">(samuti sai avatar muudetud)</string>
+    <string name="notice_room_name_removed">%1$s eemaldas jututoa nime</string>
+    <string name="notice_room_topic_removed">%1$s eemaldas jututoa teema</string>
+    <string name="notice_event_redacted">Sõnum on eemaldatud</string>
+    <string name="notice_event_redacted_by">Sõnum on eemaldatud %1$s poolt</string>
+    <string name="notice_event_redacted_with_reason">Sõnum on eemaldatud [põhjus: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Sõnum on eemaldatud %1$s poolt [põhjus: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s uuendas oma profiili %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s saatis jututoaga liitumiseks kutse kasutajale %2$s</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s võttis vastu kutse %2$s nimel</string>
+    <string name="notice_crypto_unable_to_decrypt">** Ei õnnestu dekrüptida: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Sõnumi saatja seade ei ole selle sõnumi jaoks saatnud dekrüptimisvõtmeid.</string>
+    <string name="could_not_redact">Ei saanud muuta sõnumit</string>
+    <string name="unable_to_send_message">Sõnumi saatmine ei õnnestunud</string>
+    <string name="message_failed_to_upload">Pildi üleslaadimine ei õnnestunud</string>
+    <string name="network_error">Võrguühenduse viga</string>
+    <string name="matrix_error">Matrix\'i viga</string>
+    <string name="room_error_join_failed_empty_room">Hetkel ei ole võimalik uuesti liituda tühja jututoaga.</string>
+    <string name="encrypted_message">Krüptitud sõnum</string>
+    <string name="medium_email">E-posti aadress</string>
+    <string name="medium_phone_number">Telefoninumber</string>
+    <string name="room_displayname_invite_from">Kutse kasutajalt %s</string>
+    <string name="room_displayname_room_invite">Kutse jututuppa</string>
+    <string name="room_displayname_two_members">%1$s ja %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s ja üks muu</item>
+        <item quantity="other">%1$s ja %2$d muud</item>
+    </plurals>
+    <string name="room_displayname_empty_room">Tühi jututuba</string>
+    <string name="initial_sync_start_importing_account">Alglaadimine:
+\nImpordin kontot…</string>
+    <string name="initial_sync_start_importing_account_crypto">Alglaadimine:
+\nImpordin krüptoseadistusi</string>
+    <string name="initial_sync_start_importing_account_rooms">Alglaadimine:
+\nImpordin jututubasid</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Alglaadimine:
+\nImpordin liitutud jututubasid</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Alglaadimine:
+\nImpordin kutsutud jututubasid</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Alglaadimine:
+\nImpordin lahkutud jututubasid</string>
+    <string name="initial_sync_start_importing_account_groups">Alglaadimine:
+\nImpordin kogukondi</string>
+    <string name="initial_sync_start_importing_account_data">Alglaadimine:
+\nImpordin kontoandmeid</string>
+    <string name="event_status_sending_message">Saadan sõnumit…</string>
+    <string name="clear_timeline_send_queue">Tühjenda saatmisjärjekord</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Kasutaja %1$s kutse. Põhjus: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s kutsus kasutajat %2$s. Põhjus: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s kutsus sind. Põhjus: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s liitus jututoaga. Põhjus: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s lahkus jututoast. Põhjus: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s lükkas kutse tagasi. Põhjus: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s müksas välja kasutaja %2$s. Põhjus: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s saatis kasutajale %2$s kutse jututoaga liitumiseks. Põhjus: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s tühistas kasutajale %2$s saadetud kutse jututoaga liitumiseks. Põhjus: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s võttis vastu kutse %2$s jututoaga liitumiseks. Põhjus: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s võttis tagasi kasutajale %2$s saadetud kutse. Põhjus: %3$s</string>
+    <string name="notice_end_to_end_ok">%1$s lülitas sisse läbiva krüptimise.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s lülitas sisse läbiva krüptimise (tundmatu algoritm %2$s).</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s lisas %2$s selle jututoa aadressiks.</item>
+        <item quantity="other">%1$s lisas %2$s selle jututoa aadressideks.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s eemaldas %2$s kui selle jututoa aadressi.</item>
+        <item quantity="other">%1$s eemaldas %2$s selle jututoa aadresside hulgast.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s lisas %2$s ja eemaldas %3$s selle jututoa aadresside loendist.</string>
+    <string name="notice_room_canonical_alias_set">%1$s seadistas selle jututoa põhiaadressiks %2$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s eemaldas selle jututoa põhiaadressi.</string>
+    <string name="notice_room_guest_access_can_join">%1$s lubas külalistel selle jututoaga liituda.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s seadistas, et külalised ei või selle jututoaga liituda.</string>
+    <string name="notice_room_created">Kasutaja %1$s lõi jututoa</string>
+    <string name="summary_you_sent_image">Sina saatsid pildi.</string>
+    <string name="summary_you_sent_sticker">Sina saatsid kleepsu.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Sinu kutse</string>
+    <string name="notice_room_created_by_you">Sa lõid jututoa</string>
+    <string name="notice_room_invite_by_you">Sina kutsusid kasutajat %1$s</string>
+    <string name="notice_room_join_by_you">Sina liitusid jututoaga</string>
+    <string name="notice_room_leave_by_you">Sina lahkusid jututoast</string>
+    <string name="notice_room_reject_by_you">Sina lükkasid kutse tagasi</string>
+    <string name="notice_room_kick_by_you">Sina müksasid %1$s välja</string>
+    <string name="notice_room_unban">%1$s taastas %2$s ligipääsu</string>
+    <string name="notice_room_unban_by_you">Sina taastasid %1$s ligipääsu</string>
+    <string name="notice_room_ban">%1$s keelas %2$s ligipääsu</string>
+    <string name="notice_room_ban_by_you">Sina keelasid %1$s ligipääsu</string>
+    <string name="notice_room_withdraw_by_you">Sina võtsid tagasi %1$s kutse</string>
+    <string name="notice_avatar_url_changed_by_you">Sina muutsid oma tunnuspilti</string>
+    <string name="notice_display_name_set_by_you">Sina määrasid oma kuvatavaks nimeks %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Sina muutsid senise kuvatava nime %1$s uueks nimeks %2$s</string>
+    <string name="notice_display_name_removed_by_you">Sina eemaldasid oma kuvatava nime (oli %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Sina muutsid uueks teemaks %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s muutis jututoa tunnuspilti</string>
+    <string name="notice_room_avatar_changed_by_you">Sina muutsid jututoa tunnuspilti</string>
+    <string name="notice_room_name_changed_by_you">Sina muutsid jututoa uueks nimeks %1$s</string>
+    <string name="notice_placed_video_call_by_you">Sa alustasid videokõnet.</string>
+    <string name="notice_placed_voice_call_by_you">Sa alustasid häälkõnet.</string>
+    <string name="notice_call_candidates">%s saatis info kõne algatamiseks.</string>
+    <string name="notice_call_candidates_by_you">Sa saatsid info kõne algatamiseks.</string>
+    <string name="notice_answered_call_by_you">Sa vastasid kõnele.</string>
+    <string name="notice_ended_call_by_you">Sa lõpetasid kõne.</string>
+    <string name="notice_made_future_room_visibility_by_you">Sa seadistasid, et tulevane jututoa ajalugu on nähtav kasutajale %1$s</string>
+    <string name="notice_end_to_end_by_you">Sa lülitasid sisse läbiva krüptimise (%1$s)</string>
+    <string name="notice_room_update_by_you">Sa uuendasid seda jututuba.</string>
+    <string name="notice_requested_voip_conference_by_you">Sa algatasid VoIP rühmakõne</string>
+    <string name="notice_room_name_removed_by_you">Sa eemaldasid jututoa nime</string>
+    <string name="notice_room_topic_removed_by_you">Sa eemaldasid jututoa teema</string>
+    <string name="notice_room_avatar_removed">%1$s eemaldas jututoa tunnuspildi</string>
+    <string name="notice_room_avatar_removed_by_you">Sa eemaldasid jututoa tunnuspildi</string>
+    <string name="notice_profile_change_redacted_by_you">Sa uuendasid oma profiili %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Sina võtsid vastu kutse %1$s nimel</string>
+    <string name="notice_widget_added">%1$s lisas %2$s vidina</string>
+    <string name="notice_widget_added_by_you">Sina lisasid %1$s vidina</string>
+    <string name="notice_widget_removed">%1$s eemaldas %2$s vidina</string>
+    <string name="notice_widget_removed_by_you">Sina eemdaldasid %1$s vidina</string>
+    <string name="notice_widget_modified">%1$s muutis %2$s vidinat</string>
+    <string name="notice_widget_modified_by_you">Sa muutsid %1$s vidinat</string>
+    <string name="power_level_admin">Peakasutaja</string>
+    <string name="power_level_moderator">Moderaator</string>
+    <string name="power_level_default">Tavakasutaja</string>
+    <string name="power_level_custom">Kohandatud kasutajaõigused (%1$d)</string>
+    <string name="power_level_custom_no_value">Kohandatud õigused</string>
+    <string name="notice_power_level_changed_by_you">Sina muutsid kasutaja %1$s õigusi.</string>
+    <string name="notice_power_level_changed">%1$s muutis kasutaja %2$s õigusi.</string>
+    <string name="notice_power_level_diff">%1$s õiguste muutus %2$s -&gt; %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Sinu kutse. Põhjus %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Sina kutsusid kasutajat %1$s. Põhjus: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Sina liitusid jututoaga. Põhjus: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Sina lahkusid jututoast. Põhjus: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Sina lükkasid kutse tagasi. Põhjus: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Sina müksasid kasutaja %1$s välja. Põhjus: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s taastas ligipääsu kasutajale %2$s. Põhjus: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Sina taastasid kasutaja %1$s ligipääsu. Põhjus: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s keelas kasutaja %2$s ligipääsu. Põhjus: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Sina keelasid kasutaja %1$s ligipääsu. Põhjus: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks. Põhjus: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s. Põhjus: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Sina võtsid vastu kutse %1$s nimel. Põhjus: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Sina võtsid tagasi kasutaja %1$s kutse. Põhjus: %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Sina lisasid %1$s selle jututoa aadressiks.</item>
+        <item quantity="other">Sina lisasid %1$s selle jututoa aadressideks.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Sina eemaldasid %1$s, kui selle jututoa aadressi.</item>
+        <item quantity="other">Sina eemaldasid %1$s selle jututoa aadresside hulgast.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">Sina lisasid %1$s selle jututoa aadressiks ning eemaldasid %2$s aadresside hulgast.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Sina seadistasid selle jututoa põhiaadressiks %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Sina eemaldasid selle jututoa põhiaadressi.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Sina lubasid külalistel selle jututoaga liituda.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Sina seadistasid, et külalised ei või selle jututoaga liituda.</string>
+    <string name="notice_end_to_end_ok_by_you">Sa lülitasid sisse läbiva krüptimise.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Sa lülitasid sisse läbiva krüptimise (kasutusel on tundmatu algoritm %1$s).</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Sina seadistasid, et külalised ei või selle jututoaga liituda.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s seadistas, et külalised ei või selle jututoaga liituda.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Sina lubasid külalistel selle jututoaga liituda.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s lubas külalistel selle jututoaga liituda.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Sina lahkusid jututoast. Põhjus: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s lahkus jututoast. Põhjus: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Sina liitusid jututoaga. Põhjus: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s liitus jututoaga. Põhjus: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Sina kutsusid kasutajat %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s kutsus kasutajat %2$s</string>
+    <string name="notice_direct_room_update_by_you">Sa uuendasid seda jututuba.</string>
+    <string name="notice_direct_room_update">%s uuendas seda jututuba.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Sina seadistasid, et tulevased jututoa sõnumid on nähtavad kasutajale %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s seadistas, et tulevased jututoa sõnumid on nähtavad kasutajale %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Sina lahkusid jututoast</string>
+    <string name="notice_direct_room_leave">%1$s lahkus jututoast</string>
+    <string name="notice_direct_room_join_by_you">Sina liitusid</string>
+    <string name="notice_direct_room_join">%1$s liitus</string>
+    <string name="notice_direct_room_created_by_you">Sina alustasid vestlust</string>
+    <string name="notice_direct_room_created">%1$s alustas vestlust</string>
+    <string name="room_displayname_empty_room_was">Tühi jututuba (oli %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s ja %4$d muu</item>
+        <item quantity="other">%1$s, %2$s, %3$s ja %4$d muud</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s ja %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s ja %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Kõikide serverite osalemine on keelatud! Seda jututuba ei saa enam kasutada.</string>
+    <string name="notice_room_server_acl_updated_no_change">Muudatusi ei ole.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Nüüd on keelatud serverid, mille ip-aadress vastab mustrile.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Nüüd on lubatud serverid, mille ip-aadress vastab mustrile.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Server, mille nimes leidub %s, eemaldati lubatud serverite loendist.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Nüüd on lubatud serverid, mille nimes leidub %s.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Server, mille nimes leidub %s eemaldati keeluloendist.</string>
+    <string name="notice_room_server_acl_updated_banned">• Keelatud on server, mille nimes leidub %s.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Sina muutsid selle jututoa jaoks serverite pääsuloendit.</string>
+    <string name="notice_room_server_acl_updated_title">%s muutis selle jututoa jaoks serverite pääsuloendit.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Sina kirjeldasid selle jututoa jaoks serverite pääsuloendi.</string>
+    <string name="notice_room_server_acl_set_title">%s kirjeldas selle jututoa jaoks serverite pääsuloendi.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Keelatud on serverid, mille ip-aadress vastab mustrile.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Lubatud on serverid, mille ip-aadress vastab mustrile.</string>
+    <string name="notice_room_server_acl_set_allowed">• Lubatud on serverid, mille nimes leidub %s.</string>
+    <string name="notice_room_server_acl_set_banned">• Keelatud on serverid, mille nimes leidub %s.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s muutis selle jututoa aadresse.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Sa muutsid selle jututoa põhiaadressi ja täiendavaid aadresse.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s muutis selle jututoa täiendavaid aadresse.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Sa muutsid selle jututoa täiendavaid aadresse.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s muutis selle jututoa põhiaadressi ja täiendavaid aadresse.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Sa eemaldasid selle jututoa täiendava aadressi %1$s.</item>
+        <item quantity="other">Sa eemaldasid selle jututoa täiendavad aadressid %1$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s eemaldas selle jututoa täiendava aadressi %2$s.</item>
+        <item quantity="other">%1$s eemaldas selle jututoa täiendavad aadressid %2$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Sa lisasid sellele jututoale täiendava aadressi %1$s.</item>
+        <item quantity="other">Sa lisasid sellele jututoale täiendavad aadressid %1$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s lisas sellele jututoale täiendava aadressi %2$s.</item>
+        <item quantity="other">%1$s lisas sellele jututoale täiendavad aadressid %2$s.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_no_change_by_you">Sa muutsid selle jututoa aadresse.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Sina muutsid videokoosolekut</string>
+    <string name="notice_widget_jitsi_removed_by_you">Sina lõpetasid videokoosoleku</string>
+    <string name="notice_widget_jitsi_removed">%1$s lõpetas videokoosoleku</string>
+    <string name="notice_widget_jitsi_added_by_you">Sina algatasid videokoosoleku</string>
+    <string name="notice_widget_jitsi_added">%1$s algatas videokoosoleku</string>
+    <string name="notice_widget_jitsi_modified">%1$s muutis videokoosolekut</string>
     <string name="light_theme">Hele teema</string>
     <string name="dark_theme">Tume teema</string>
     <string name="black_theme">Must teema</string>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 15a5c317d6..56540de8ce 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1,6 +1,142 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s erabiltzaileak irudi bat bidali du.</string>
 
+    <string name="notice_room_invite_no_invitee">%s erabiltzailearen gonbidapena</string>
+    <string name="notice_room_invite">%1$s erabiltzaileak %2$s gonbidatu du</string>
+    <string name="notice_room_invite_you">%1$s erabiltzaileak gonbidatu zaitu</string>
+    <string name="notice_room_join">%1$s gelara elkartu da</string>
+    <string name="notice_room_leave">%1$s gelatik atera da</string>
+    <string name="notice_room_reject">%1$s erabiltzaileak gonbidapena baztertu du</string>
+    <string name="notice_room_kick">%1$s erabiltzaileak %2$s kanporatu du</string>
+    <string name="notice_room_unban">%1$s erabiltzaileak debekua kendu dio %2$s erabiltzaileari</string>
+    <string name="notice_room_ban">%1$s erabiltzaileak %2$s debekatu du</string>
+    <string name="notice_room_withdraw">%1$s erabiltzaileak %2$s erabiltzailearen gonbidapena atzera bota du</string>
+    <string name="notice_avatar_url_changed">%1$s erabiltzaileak abatarra aldatu du</string>
+    <string name="notice_display_name_set">%1$s erabiltzaileak bere pantaila-izena aldatu du beste honetara: %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s erabiltzaileak bere pantaila-izena aldatu du, honetatik: %2$s honetara: %3$s</string>
+    <string name="notice_display_name_removed">%1$s erabiltzaileak bere pantaila-izena kendu du (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s erabiltzaileak mintzagaia honetara aldatu du: %2$s</string>
+    <string name="notice_room_name_changed">%1$s erabiltzaileak gelaren izena honetara aldatu du: %2$s</string>
+    <string name="notice_placed_video_call">%s erabiltzaileak bideo deia hasi du.</string>
+    <string name="notice_placed_voice_call">%s erabiltzaileak ahots deia hasi du.</string>
+    <string name="notice_answered_call">%s erabiltzaileak deia erantzun du.</string>
+    <string name="notice_ended_call">%s erabiltzaileak deia amaitu du.</string>
+    <string name="notice_made_future_room_visibility">%1$s erabiltzaileak gelaren historiala ikusgai jarri du hauentzat: %2$s</string>
+    <string name="notice_room_visibility_invited">gelako kide guztiak, gonbidatu zitzaienetik.</string>
+    <string name="notice_room_visibility_joined">gelako kide guztiak, elkartu zirenetik.</string>
+    <string name="notice_room_visibility_shared">gelako kide guztiak.</string>
+    <string name="notice_room_visibility_world_readable">edonor.</string>
+    <string name="notice_room_visibility_unknown">ezezaguna (%s).</string>
+    <string name="notice_end_to_end">%1$s erabiltzaileak muturretik muturrera zifratzea aktibatu du (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s erabiltzaileak VoIP konferentzia bat eskatu du</string>
+    <string name="notice_voip_started">VoIP konferentzia hasita</string>
+    <string name="notice_voip_finished">VoIP konferentzia amaituta</string>
+
+    <string name="notice_avatar_changed_too">(abatarra ere aldatu da)</string>
+    <string name="notice_room_name_removed">%1$s erabiltzaileak gelaren izena kendu du</string>
+    <string name="notice_room_topic_removed">%1$s erabiltzaileak gelaren mintzagaia kendu du</string>
+    <string name="notice_profile_change_redacted">%1$s erabiltzaileak bere profila eguneratu du %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %2$s erabiltzaileari</string>
+    <string name="notice_room_third_party_registered_invite">%1$s erabiltzaileak %2$s gelarako gonbidapena onartu du</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Ezin izan da deszifratu: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Igorlearen gailuak ez dizkigu mezu honetarako gakoak bidali.</string>
+
+    <string name="could_not_redact">Ezin izan da kendu</string>
+    <string name="unable_to_send_message">Ezin izan da mezua bidali</string>
+
+    <string name="message_failed_to_upload">Huts egin du irudia igotzean</string>
+
+    <string name="network_error">Sare errorea</string>
+    <string name="matrix_error">Matrix errorea</string>
+
+    <string name="room_error_join_failed_empty_room">Ezin da oraingoz hutsik dagoen gela batetara berriro sartu.</string>
+
+    <string name="encrypted_message">Zifratutako mezua</string>
+
+    <string name="medium_email">E-mail helbidea</string>
+    <string name="medium_phone_number">Telefono zenbakia</string>
+
+    <string name="summary_user_sent_sticker">%1$s erabiltzaileak eranskailu bat bidali du.</string>
+
+    <string name="room_displayname_invite_from">%s gelarako gonbidapena</string>
+    <string name="room_displayname_room_invite">Gela gonbidapena</string>
+    <string name="room_displayname_two_members">%1$s eta %2$s</string>
+    <string name="room_displayname_empty_room">Gela hutsa</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s eta beste bat</item>
+        <item quantity="other">%1$s eta beste %2$d</item>
+    </plurals>
+
+
+    <string name="notice_event_redacted">Mezua kendu da</string>
+    <string name="notice_event_redacted_by">%1$s erabiltzaileak mezua kendu du</string>
+    <string name="notice_event_redacted_with_reason">Mezua kendu da [arrazoia: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s erabiltzaileak mezua kendu du [arrazoia: %2$s]</string>
+
+    <string name="initial_sync_start_importing_account">Hasierako sinkronizazioa:
+\nKontua inportatzen…</string>
+    <string name="initial_sync_start_importing_account_crypto">Hasierako sinkronizazioa:
+\nZifratzea inportatzen</string>
+    <string name="initial_sync_start_importing_account_rooms">Hasierako sinkronizazioa:
+\nGelak inportatzen</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Hasierako sinkronizazioa:
+\nElkartutako gelak inportatzen</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Hasierako sinkronizazioa:
+\nGonbidatutako gelak inportatzen</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Hasierako sinkronizazioa:
+\nUtzitako gelak inportatzen</string>
+    <string name="initial_sync_start_importing_account_groups">Hasierako sinkronizazioa:
+\nKomunitateak inportatzen</string>
+    <string name="initial_sync_start_importing_account_data">Hasierako sinkronizazioa:
+\nKontuaren datuak inportatzen</string>
+
+    <string name="notice_room_update">%s erabiltzaileak gela hau eguneratu du.</string>
+
+    <string name="event_status_sending_message">Mezua bidaltzen…</string>
+    <string name="clear_timeline_send_queue">Garbitu bidalketa-ilara</string>
+
+    <string name="notice_room_third_party_revoked_invite">%1$s erabiltzaileak %2$s gelara elkartzeko gonbidapena indargabetu du</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s erabiltzailearen gonbidapena. Arrazoia: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s erabiltzaileak %2$s gonbidatu du. Arrazoia: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s erabiltzaileak gonbidatu zaitu. Arrazoia: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s gelara elkartu da. Arrazoia: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s gelatik atera da. Arrazoia: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s erabiltzaileak gonbidapena baztertu du. Arrazoia: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s erabiltzaileak %2$s kanporatu du. Arrazoia: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s erabiltzaileak debekua kendu dio %2$s erabiltzaileari. Arrazoia: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s erabiltzaileak %2$s debekatu du. Arrazoia: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">"%1$s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %2$s erabiltzaileari. Arrazoia: %3$s"</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">"%1$s erabiltzaileak %2$s gelara elkartzeko gonbidapena indargabetu du. Arrazoia: %3$s"</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">"%1$s erabiltzaileak %2$s gelarako gonbidapena onartu du. Arrazoia: %3$s"</string>
+    <string name="notice_room_withdraw_with_reason">"%1$s erabiltzaileak %2$s erabiltzailearen gonbidapena indargabetu du. Arrazoia: %3$s"</string>
+
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s erabiltzaileak %2$s gehitu du gela honen helbide gisa.</item>
+        <item quantity="other">%1$s erabiltzaileak %2$s gehitu ditu gela honen helbide gisa.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s erabiltzaileak %2$s kendu du gela honen helbide gisa.</item>
+        <item quantity="other">%1$s erabiltzaileak %3$s kendu ditu gela honen helbide gisa.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed">%1$s erabiltzaileak %2$s gehitu %3$s eta kendu ditu gela honen helbide gisa.</string>
+
+    <string name="notice_room_canonical_alias_set">%1$s erabiltzaileak %2$s ezarri du gela honen helbide nagusi gisa.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s erabiltzaileak gela honen helbide nagusia kendu du.</string>
+
+    <string name="notice_room_guest_access_can_join">%1$k gonbidatuak gelara sartzea onartu du.</string>
+    <string name="notice_room_guest_access_forbidden">%1%k gonbidatuak gelara sartzea galerazi du.</string>
+
+    <string name="notice_end_to_end_ok">%1$s erabiltzaileak muturretik muturrerako zifratzea gaitu du.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s erabiltzaileak muturretik muturrerako zifratzea gaitu du. (%2$s algoritmo ezezaguna).</string>
+
+    <string name="notice_room_created">%1$s erabiltzaileak gela sortu du</string>
     <string name="title_activity_home">Mezuak</string>
     <string name="title_activity_room">Gela</string>
     <string name="title_activity_settings">Ezarpenak</string>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 1cfd61644c..8a0f1bf77b 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1,5 +1,223 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s تصویری فرستاد.</string>
+    <string name="summary_user_sent_sticker">%1$s برچسبی فرستاد.</string>
+    <string name="notice_room_invite_no_invitee">دعوت %s</string>
+    <string name="notice_room_invite">‫%1$s، %2$s را دعوت کرد</string>
+    <string name="notice_room_invite_you">%1$s دعوتتان کرد</string>
+    <string name="notice_room_join">%1$s به اتاق پیوست</string>
+    <string name="notice_room_leave">%1$s اتاق را ترک کرد</string>
+    <string name="notice_room_reject">%1$s دعوت را رد کرد</string>
+    <string name="notice_room_kick">%1$s، %2$s را اخراج کرد</string>
+    <string name="notice_room_unban">%1$s، انسداد %2$s را رفع کرد</string>
+    <string name="notice_room_ban">%1$s، %2$s را مسدود کرد</string>
+    <string name="notice_room_withdraw">%1$s دعوت %2$s را نپذیرفت</string>
+    <string name="notice_avatar_url_changed">%1$s تصویرش را عوض کرد</string>
+    <string name="notice_display_name_set">%1$s نام نمایشی خود را به %2$s تنظیم کرد</string>
+    <string name="notice_display_name_changed_from">%1$s نام نمایشیش را از %2$s به %3$s تغییر داد</string>
+    <string name="notice_display_name_removed">%1$s نام نمایشیش (%2$s) را پاک کرد</string>
+    <string name="notice_room_topic_changed">%1$s موضوع را به %2$s تغییر داد</string>
+    <string name="notice_room_name_changed">%1$s نام اتاق را به %2$s تغییر داد</string>
+    <string name="notice_placed_video_call">%s یک تماس تصویری برقرار کرد.</string>
+    <string name="notice_placed_voice_call">%s یک تماس صوتی برقرار کرد.</string>
+    <string name="notice_answered_call">%s تماس را پاسخ داد.</string>
+    <string name="notice_ended_call">%s به تماس پایان داد.</string>
+    <string name="notice_made_future_room_visibility">%1$s تاریخچهٔ آیندهٔ اتاق را برای %2$s نمایان کرد</string>
+    <string name="notice_room_visibility_invited">همهٔ اعضای اتاق، از زمان دعوت شدنشان.</string>
+    <string name="notice_room_visibility_joined">همهٔ اعضای اتاق، از زمان پیوستنشان.</string>
+    <string name="notice_room_visibility_shared">همهٔ اعضای اتاق.</string>
+    <string name="notice_room_visibility_world_readable">هرکسی.</string>
+    <string name="notice_room_visibility_unknown">ناشناخته (%s).</string>
+    <string name="notice_end_to_end">%1$s رمزنگاری سرتاسری را روشن کرد (%2$s)</string>
+    <string name="notice_room_update">%s این اتاق را ارتقا داد.</string>
+    <string name="notice_requested_voip_conference">%1$s درخواست یک گردهمایی صوتی داد</string>
+    <string name="notice_voip_started">گردهمایی صوتی آغاز شد</string>
+    <string name="notice_voip_finished">گردهمایی صوتی پایان یافت</string>
+    <string name="notice_avatar_changed_too">(تصویر هم عوض شد)</string>
+    <string name="notice_room_name_removed">%1$s نام اتاق را پاک کرد</string>
+    <string name="notice_room_topic_removed">%1$s موضوع اتاق را پاک کرد</string>
+    <string name="notice_event_redacted">پیام برداشته شد</string>
+    <string name="notice_event_redacted_by">پیام به دست %1$s برداشته شد</string>
+    <string name="notice_event_redacted_with_reason">پیام برداشته شد [دلیل: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">پیام به دست %1$s برداشته شد [دلیل: %2$s]</string>
+    <string name="notice_room_third_party_invite">%1$s دعوتی برای پیوستن %2$s به اتاق فرستاد</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s دعوت پیوستن به اتاق %2$s را باطل کرد</string>
+    <string name="notice_room_third_party_registered_invite">%1$s دعوت برای %2$s را پذیرفت</string>
+    <string name="notice_crypto_unable_to_decrypt">** ناتوان در رمزگشایی: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">دستگاه فرستنده، کلیدهای این پیام را برایمان نفرستاده است.</string>
+    <string name="unable_to_send_message">ناتوان در فرستادن پیام</string>
+    <string name="message_failed_to_upload">شکست در بارگذاری تصویر</string>
+    <string name="network_error">خطای شبکه</string>
+    <string name="matrix_error">خطای ماتریکس</string>
+    <string name="room_error_join_failed_empty_room">در حال حاضر امکان بازپیوست به اتاقی خالی وجود ندارد‌‌.</string>
+    <string name="encrypted_message">پیام رمزنگاری شده</string>
+    <string name="medium_email">نشانی رایانامه</string>
+    <string name="medium_phone_number">شماره تلفن</string>
+    <string name="room_displayname_invite_from">دعوت از %s</string>
+    <string name="room_displayname_room_invite">دعوت اتاق</string>
+    <string name="room_displayname_two_members">%1$s و %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s و ۱ نفر دیگر</item>
+        <item quantity="other">%1$s و %2$d نفر دیگر</item>
+    </plurals>
+    <string name="room_displayname_empty_room">اتاق خالی</string>
+    <string name="initial_sync_start_importing_account">همگام‌سازی نخستین:
+\nدر حال درون‌ریزی حساب…</string>
+    <string name="initial_sync_start_importing_account_crypto">همگام‌سازی نخستین:
+\nدر حال درون‌ریزی رمزنگاری</string>
+    <string name="initial_sync_start_importing_account_rooms">همگام‌سازی نخستین:
+\nدر حال درون‌ریزی اتاق‌ها</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">همگام‌سازی نخستین:
+\nدر حال درون‌ریزی اتاق‌های پیوسته</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">همگام‌سازی نخستین:
+\nدر حال درون‌ریزی اتاق‌های دعوت‌شده</string>
+    <string name="initial_sync_start_importing_account_left_rooms">همگام‌سازی نخستین:
+\nدر حال درون‌ریزی اتاق‌های ترک‌شده</string>
+    <string name="initial_sync_start_importing_account_groups">همگام‌سازی نخستین:
+\nدر حال درون‌ریزی انجمن‌ها</string>
+    <string name="initial_sync_start_importing_account_data">همگام‌سازی نخستین:
+\nدر حال درون‌ریزی داده‌های حساب</string>
+    <string name="event_status_sending_message">در حال فرستادن پیام…</string>
+    <string name="clear_timeline_send_queue">پاک‌سازی صفِ در حال ارسال</string>
+    <string name="notice_room_invite_no_invitee_with_reason">دعوت %1$s. دلیل: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s، %2$s را دعوت کرد. دلیل: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s دعوتتان کرد. دلیل: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s به اتاق پیوست. دلیل: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s اتاق را ترک کرد. دلیل: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s دعوت را رد کرد. دلیل: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s، %2$s را اخراج کرد. دلیل: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s انسداد %2$s را رفع کرد. دلیل: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s، %2$s را مسدود کرد. دلیل: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s دعوتی برای پیوستن %2$s به اتاق فرستاد. دلیل: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s دعوت %2$s برای پیوستن به اتاق را باطل کرد. دلیل: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s دعوت برای %2$s را پذیرفت. دلیل: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s دعوت %2$s را نپذیرفت. دلیل: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s، %2$s را به عنوان نشانی‌ای برای این اتاق افزود.</item>
+        <item quantity="other">%1$s، %2$s را به عنوان نشانی‌هایی برای این اتاق افزود.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s، %2$s را به عنوان نشانی‌ای برای این اتاق پاک کرد.</item>
+        <item quantity="other">%1$s، %3$s را به عنوان نشانی‌هایی برای این اتاق پاک کرد.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s برای نشانی این اتاق، %2$s را افزود و %3$s را پاک کرد.</string>
+    <string name="notice_room_canonical_alias_set">%1$s نشانی اصلی این اتاق را به %2$s تنظیم کرد.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s نشانی اصلی را برای این اتاق پاک کرد.</string>
+    <string name="notice_room_guest_access_can_join">%1$s اجازه داد میمهانان به گروه بپیوندند.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s جلوی پیوستن میمهانان به گروه را گرفت.</string>
+    <string name="notice_end_to_end_ok">%1$s رمزنگاری سرتاسری را روشن کرد.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s رمزنگاری سرتاسری را روشن کرد (الگوریتم تشخیص‌داده‌نشده %2$s ).</string>
+    <string name="notice_room_created">%1$s اتاق را ایجاد کرد</string>
+    <string name="notice_profile_change_redacted">%1$s نمایه‌اش را به‌روز کرد %2$s</string>
+    <string name="could_not_redact">نمی‌توان ویرایش کرد</string>
+    <string name="summary_you_sent_image">تصویری فرستادید.</string>
+    <string name="summary_you_sent_sticker">برچسبی فرستادید.</string>
+    <string name="notice_room_invite_no_invitee_by_you">دعوتتان</string>
+    <string name="notice_room_created_by_you">اتاق را ایجاد کردید</string>
+    <string name="notice_room_invite_by_you">از %1$s دعوت کردید</string>
+    <string name="notice_room_join_by_you">به اتاق پیوستید</string>
+    <string name="notice_room_leave_by_you">اتاق را ترک کردید</string>
+    <string name="notice_room_reject_by_you">دعوت را رد کردید</string>
+    <string name="notice_room_kick_by_you">%1$s را اخراج کردید</string>
+    <string name="notice_room_unban_by_you">تحریم %1$s را برداشتید</string>
+    <string name="notice_room_ban_by_you">%1$s را تحریم کردید</string>
+    <string name="notice_room_withdraw_by_you">دعوت %1$s را پس‌گرفتید</string>
+    <string name="notice_avatar_url_changed_by_you">آواتارتان را عوض کردید</string>
+    <string name="notice_display_name_set_by_you">نام نمایشیتان را به %1$s تغییر دادید</string>
+    <string name="notice_display_name_changed_from_by_you">نام نمایشیتان را از %1$s به %2$s تغییر دادید</string>
+    <string name="notice_display_name_removed_by_you">نام نمایشیتان را برداشتید (%1$s بود)</string>
+    <string name="notice_room_topic_changed_by_you">موضوع را به %1$s تغییر دادید</string>
+    <string name="notice_room_avatar_changed">%1$s آواتار اتاق را تغییر داد</string>
+    <string name="notice_room_avatar_changed_by_you">آواتار اتاق را تغییر دادید</string>
+    <string name="notice_room_name_changed_by_you">نام اتاق را به %1$s تغییر دادید</string>
+    <string name="notice_placed_video_call_by_you">تماس تصویری گرفتید.</string>
+    <string name="notice_placed_voice_call_by_you">تماس صوتی گرفتید.</string>
+    <string name="notice_call_candidates">%s برای برپایی تماس، داده فرستاد.</string>
+    <string name="notice_call_candidates_by_you">برای برپایی تماس، داده فرستادید.</string>
+    <string name="notice_answered_call_by_you">تماس را پاسخ دادید.</string>
+    <string name="notice_ended_call_by_you">به تماس پایان دادید.</string>
+    <string name="notice_made_future_room_visibility_by_you">تاریخچهٔ آتی اتاق را برای %1$s نمایان کردید</string>
+    <string name="notice_end_to_end_by_you">رمزنگاری سرتاسری را روشن کردید (%1$s)</string>
+    <string name="notice_room_update_by_you">این اتاق را ارتقا دادید.</string>
+    <string name="notice_requested_voip_conference_by_you">دارخواست کنفرانس ویپ دادید</string>
+    <string name="notice_room_name_removed_by_you">نام اتاق را برداشتید</string>
+    <string name="notice_room_topic_removed_by_you">موضوع اتاق را برداشتید</string>
+    <string name="notice_room_avatar_removed">%1$s آواتار اتاق را برداشت</string>
+    <string name="notice_room_avatar_removed_by_you">آواتار اتاق را برداشتید</string>
+    <string name="notice_profile_change_redacted_by_you">نمایه‌تان را به‌روز کردید %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">برای %1$s دعوت پیوستن به اتاق فرستادید</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">دعوت پیوستن %1$s به اتاق را پس گرفتید</string>
+    <string name="notice_room_third_party_registered_invite_by_you">دعوت برای %1$s را پذیرفتید</string>
+    <string name="notice_widget_added">%1$s ابزارک %2$s را افزود</string>
+    <string name="notice_widget_added_by_you">ابزارک %1$s را افزودید</string>
+    <string name="notice_widget_removed">%1$s ابزارک %2$s را برداشت</string>
+    <string name="notice_widget_removed_by_you">ابزارک %1$s را برداشتید</string>
+    <string name="notice_widget_modified">%1$s ابزارک %2$s را دستکاری کرد</string>
+    <string name="notice_widget_modified_by_you">ابزارک %1$s را دستکاری کردید</string>
+    <string name="power_level_admin">مدیر</string>
+    <string name="power_level_moderator">ناظم</string>
+    <string name="power_level_default">پیش‌گزیده</string>
+    <string name="power_level_custom">سفارشی (%1$d)</string>
+    <string name="power_level_custom_no_value">سفارشی</string>
+    <string name="notice_power_level_changed_by_you">سطح قدرت %1$s را تغییر دادید.</string>
+    <string name="notice_power_level_changed">%1$s سطح قدرت %2$s را تغییر داد.</string>
+    <string name="notice_power_level_diff">%1$s از %2$s به %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">دعوتتان. دلیل: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">%1$s را دعوت کردید. دلیل: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">به اتاق پیوستید. دلیل: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">اتاق را ترک کردید. دلیل: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">دعوت را رد کردید. دلیل: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">%1$s را اخراج کردید. دلیل: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">تحریم %1$s را برداشتید. دلیل: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">%1$s را تحریم کردید. دلیل: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">دعوتی به %1$s برای پیوستن به اتاق فرستادید. دلیل: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">دعوت %1$s برای پیوستن به اتاق را پس گرفتید. دلیل: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">دعوت برای %1$s را پذیرفتید. دلیل: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">دعوت %1$s را رد کردید. دلیل: %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">نشانی %1$s را به این اتاق افزودید.</item>
+        <item quantity="other">نشانی‌های %1$s را به این اتاق افزودید.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">نشانی %1$s را از این اتاق برداشتید.</item>
+        <item quantity="other">نشانی‌های %1$s را از این اتاق برداشتید.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">نشانی %1$s ار افزوده و %2$s را از این اتاق برداشتید.</string>
+    <string name="notice_room_canonical_alias_set_by_you">نشانی اصلی این اتاق را به %1$s تنظیم کردید.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">نشانی اصلی این اتاق را برداشتید.</string>
+    <string name="notice_room_guest_access_can_join_by_you">به میهمانان اجازهٔ پیوستن به گروه دادید.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">میمهانان را از پیوستن به گروه بازداشتید.</string>
+    <string name="notice_end_to_end_ok_by_you">رمزنگاری سرتاسری را روشن کردید.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">رمزنگاری سرتاسری را روشن کردید (الگوریتم ناشناخته %1$s).</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">مهمان‌ها را از پیوستن به اتاق بازداشتید.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s مهمان‌ها را از پیوستن به اتاق بازداشت.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">به مهمان‌ها اجازه دادید به این‌جا بپیوندند.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s به مهمان‌ها اجازه داد به این‌جا بپیوندند.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">رفتید. دلیل: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s رفت. دلیل: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">پیوستید. دلیل: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$sپیوست. دلیل: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">دعوت %1$s را پس گرفتید</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s دعوت %2$s را پس گرفت</string>
+    <string name="notice_direct_room_third_party_invite_by_you">%1$s را دعوت کردید</string>
+    <string name="notice_direct_room_third_party_invite">%1$s، %2$s را دعوت کرد</string>
+    <string name="notice_direct_room_update_by_you">این‌جا را ارتقا دادید.</string>
+    <string name="notice_direct_room_update">%s این‌جا را ارتقا داد.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">پیام‌های آینده را برای %1$s نمایان کردید</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s پیام‌های آینده را برای %2$s نمایان کرد</string>
+    <string name="notice_direct_room_leave_by_you">اتاق را ترک کردید</string>
+    <string name="notice_direct_room_leave">%1$s اتاق را ترک کرد</string>
+    <string name="notice_direct_room_join_by_you">پیوستید</string>
+    <string name="notice_direct_room_join">%1$s پیوست</string>
+    <string name="notice_direct_room_created_by_you">گفت‌وگو را ایجاد کردید</string>
+    <string name="notice_direct_room_created">%1$s گفت‌وگو را ایجاد کرد</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s، %2$s، %3$s و %4$d نفر دیگر</item>
+        <item quantity="other">%1$s، %2$s، %3$s و %4$d نفر دیگر</item>
+    </plurals>
+    <string name="room_displayname_3_members">%1$s، %2$s و %3$s</string>
+    <string name="room_displayname_4_members">%1$s، %2$s، %3$s و %4$s</string>
     <string name="light_theme">زمینهٔ روشن</string>
     <string name="dark_theme">زمینهٔ تیره</string>
     <string name="black_theme">زمینهٔ سیاه</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 19013de106..dadba4a077 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1,5 +1,214 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_user_sent_image">%1$s lähetti kuvan.</string>
+    <string name="notice_room_invite_no_invitee">Käyttäjän %s kutsu</string>
+    <string name="notice_room_invite">%1$s kutsui käyttäjän %2$s</string>
+    <string name="notice_room_invite_you">%1$s kutsui sinut</string>
+    <string name="notice_room_join">%1$s liittyi huoneeseen</string>
+    <string name="notice_room_leave">%1$s poistui huoneesta</string>
+    <string name="notice_room_reject">%1$s hylkäsi kutsun</string>
+    <string name="notice_room_kick">%1$s poisti käyttäjän %2$s</string>
+    <string name="notice_room_unban">%1$s poisti porttikiellon käyttäjältä %2$s</string>
+    <string name="notice_room_ban">%1$s antoi porttikiellon käyttäjälle %2$s</string>
+    <string name="notice_room_withdraw">%1$s veti takaisin kutsun käyttäjälle %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s vaihtoi profiilikuvaansa</string>
+    <string name="notice_display_name_set">%1$s asetti näyttönimekseen %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s muutti näyttönimensä nimestä %2$s nimeen %3$s</string>
+    <string name="notice_display_name_removed">%1$s poisti näyttönimensä (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s vaihtoi aiheeksi: %2$s</string>
+    <string name="notice_room_name_changed">%1$s vaihtoi huoneen nimeksi %2$s</string>
+    <string name="notice_placed_video_call">%s soitti videopuhelun.</string>
+    <string name="notice_placed_voice_call">%s soitti äänipuhelun.</string>
+    <string name="notice_answered_call">%s vastasi puheluun.</string>
+    <string name="notice_ended_call">%s lopetti puhelun.</string>
+    <string name="notice_made_future_room_visibility">%1$s muutti tulevan huonehistorian näkyväksi seuraaville: %2$s</string>
+    <string name="notice_room_visibility_invited">kaikki huoneen jäsenet, kutsumisestaan asti.</string>
+    <string name="notice_room_visibility_joined">kaikki huoneen jäsenet, liittymisestään asti.</string>
+    <string name="notice_room_visibility_shared">kaikki huoneen jäsenet.</string>
+    <string name="notice_room_visibility_world_readable">kaikki.</string>
+    <string name="notice_room_visibility_unknown">tuntematon (%s).</string>
+    <string name="notice_end_to_end">%1$s otti käyttöön osapuolten välisen salauksen (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s lähetti VoIP-konferenssipyynnön</string>
+    <string name="notice_voip_started">VoIP-konferenssi alkoi</string>
+    <string name="notice_voip_finished">VoIP-konferenssi päättyi</string>
+    <string name="notice_avatar_changed_too">(myös kuva vaihdettiin)</string>
+    <string name="notice_room_name_removed">%1$s poisti huoneen nimen</string>
+    <string name="notice_room_topic_removed">%1$s poisti huoneen aiheen</string>
+    <string name="notice_profile_change_redacted">%1$s päivitti profiilinsa %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s lähetti liittymiskutsun huoneeseen käyttäjälle %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s hyväksyi kutsun käyttäjän %2$s puolesta</string>
+    <string name="notice_crypto_unable_to_decrypt">** Salauksen purku epäonnistui: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Lähettäjän laite ei ole lähettänyt avaimia tähän viestiin.</string>
+    <string name="unable_to_send_message">Viestin lähetys epäonnistui</string>
+    <string name="message_failed_to_upload">Kuvan lataaminen epäonnistui</string>
+    <string name="network_error">Verkkovirhe</string>
+    <string name="matrix_error">Matrix-virhe</string>
+    <string name="room_error_join_failed_empty_room">Tällä hetkellä ei ole mahdollista liittyä uudelleen tyhjään huoneeseen.</string>
+    <string name="encrypted_message">Salattu viesti</string>
+    <string name="medium_email">Sähköpostiosoite</string>
+    <string name="medium_phone_number">Puhelinnumero</string>
+    <string name="could_not_redact">Takaisinveto epäonnistui</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Kutsu käyttäjältä %s</string>
+    <!-- Grammar problem -->
+    <string name="room_displayname_room_invite">Huonekutsu</string>
+    <string name="room_displayname_two_members">%1$s ja %2$s</string>
+    <string name="room_displayname_empty_room">Tyhjä huone</string>
+    <string name="summary_user_sent_sticker">%1$s lähetti tarran.</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s ja yksi muu</item>
+        <item quantity="other">%1$s ja %2$d muuta</item>
+    </plurals>
+    <string name="notice_event_redacted">Viesti poistettu</string>
+    <string name="notice_event_redacted_by">%1$s poisti viestin</string>
+    <string name="notice_event_redacted_with_reason">Viesti poistettu [syy: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s poisti viestin [syy: %2$s]</string>
+    <string name="initial_sync_start_importing_account">Alkusynkronointi:
+\nTuodaan tiliä…</string>
+    <string name="initial_sync_start_importing_account_crypto">Alkusynkronointi:
+\nTuodaan kryptoa</string>
+    <string name="initial_sync_start_importing_account_rooms">Alkusynkronointi:
+\nTuodaan huoneita</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Alkusynkronointi:
+\nTuodaan liityttyjä huoneita</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Alkusynkronointi:
+\nTuodaan kutsuttuja huoneita</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Alkusynkronointi:
+\nTuodaan poistuttuja huoneita</string>
+    <string name="initial_sync_start_importing_account_groups">Alkusynkronointi:
+\nTuodaan yhteisöjä</string>
+    <string name="initial_sync_start_importing_account_data">Alkusynkronointi:
+\nTuodaan tilin tietoja</string>
+    <string name="notice_room_update">%s päivitti tämän huoneen.</string>
+    <string name="event_status_sending_message">Lähetetään viestiä…</string>
+    <string name="clear_timeline_send_queue">Tyhjennä lähetysjono</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s veti takaisin käyttäjän %2$s liittymiskutsun huoneeseen</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Henkilön %1$s kutsu. Syy: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s kutsui henkilön %2$s. Syy: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s kutsui sinut. Syy: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s liittyi huoneeseen. Syy: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s poistui huoneesta. Syy: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s hylkäsi kutsun. Syy: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s poisti käyttäjän %2$s huoneesta. Syy: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s poisti porttikiellon käyttäjältä %2$s. Syy: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s antoi porttikiellon käyttäjälle %2$s. Syy: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s lähetti kutsun liittyä huoneeseen käyttäjälle %2$s. Syy: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s kumosi kutsun liittyä huoneeseen käyttäjälle %2$s. Syy: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s hyväksyi kutsun liityäkseen huoneeseen %2$s. Syy: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s veti takaisin käyttäjän %2$s kutsun. Syy: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s lisäsi tälle huoneelle osoitteen %2$s.</item>
+        <item quantity="other">%1$s lisäsi tälle huoneelle osoitteet %2$s.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s poisti tältä huoneelta osoitteen %2$s.</item>
+        <item quantity="other">%1$s poisti tältä huoneelta osoitteet %3$s.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s lisäsi tälle huoneelle osoitteen %2$s ja poisti osoitteen %3$s.</string>
+    <string name="notice_room_canonical_alias_set">%1$s asetti tämän huoneen pääosoitteeksi %2$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s poisti tämän huoneen pääosoitteen.</string>
+    <string name="notice_room_guest_access_can_join">%1$s salli vieraiden liittyä huoneeseen.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s esti vieraita liittymästä huoneeseen.</string>
+    <string name="notice_end_to_end_ok">%1$s laittoi päälle osapuolten välisen salauksen.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s laittoi päälle osapuolisten välisen salauksen (tuntematon algoritmi %2$s).</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Hyväksyit käyttäjän %1$s kutsun. Syy: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Peruutit kutsun liittyä huoneeseen käyttäjältä %1$s. Syy: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Lähetit kutsun liittyä huoneeseen käyttäjälle %1$s. Syy: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Estit käyttäjän %1$s. Syy: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Peruutit eston %1$s. Syy: %2$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Poistit käyttäjän %1$s. Syy: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Hylkäsit kutsun. Syy: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Lähdit. Syy: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s lähti. Syy: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Poistuit huoneesta. Syy: %1$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Liityit. Syy: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s liittyi. Syy: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Liityit ryhmään. Syy: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Kutsuit %1$s. Syy: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Kutsusi. Syy: %1$s</string>
+    <string name="room_displayname_empty_room_was">Tyhjä huone (oli %s)</string>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s ja %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s ja %3$s</string>
+    <string name="power_level_custom_no_value">Mukautettu</string>
+    <string name="power_level_custom">Mukautettu (%1$d)</string>
+    <string name="power_level_default">Oletus</string>
+    <string name="power_level_moderator">Valvoja</string>
+    <string name="power_level_admin">Ylläpitäjä</string>
+    <string name="notice_widget_modified">%1$s muutti %2$s sovelmaa</string>
+    <string name="notice_widget_removed_by_you">Poistit %1$s sovelman</string>
+    <string name="notice_widget_removed">%1$s poisti %2$s sovelman</string>
+    <string name="notice_widget_added_by_you">Lisäsit %1$s sovelman</string>
+    <string name="notice_widget_added">%1$s lisäsi %2$s sovelman</string>
+    <string name="notice_widget_modified_by_you">Muutit %1$s sovelmaa</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Hyväksyit kutsun henkilölle %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Peruutit kutsun henkilöltä %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s peruutti kutsun henkilöltä %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Peruutit henkilön %1$s kutsun liittyä ryhmään</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Kutsuit %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s kutsui %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Lähetit henkilölle %1$s kutsun liittyä huoneeseen</string>
+    <string name="notice_profile_change_redacted_by_you">Päivitit profiilisi %1$s</string>
+    <string name="notice_room_avatar_removed_by_you">Poistit huoneen profiilikuvan</string>
+    <string name="notice_room_avatar_removed">%1$s poisti huoneen profiilikuvan</string>
+    <string name="notice_room_topic_removed_by_you">Poistit huoneen aiheen</string>
+    <string name="notice_room_name_removed_by_you">Poistit huoneen nimen</string>
+    <string name="notice_requested_voip_conference_by_you">Pyysit ryhmäpuhelua</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Kaikki palvelimet on estetty osallistumasta! Tätä huonetta ei voi enää käyttää.</string>
+    <string name="notice_room_server_acl_updated_no_change">Ei muutosta.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Palvelimet jotka %s poistettiin estolistalta.</string>
+    <string name="notice_room_server_acl_updated_banned">• Palvelimen haku %s on nyt kielletty.</string>
+    <string name="notice_room_server_acl_set_allowed">• Palvelimen haku %s on sallittu.</string>
+    <string name="notice_room_server_acl_set_banned">• Palvelimen haku %s on kielletty.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s on estänyt vieraita liittymästä huoneeseen.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Estit vieraita liittymästä huoneeseen.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Annoit vieraille luvan liittyä huoneeseen.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Annoit vieraille luvan liittyä tänne.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s on antanut vieraille luvan liittyä tänne.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Poistit tämän huoneen pääosoitteen.</string>
+    <string name="notice_end_to_end_ok_by_you">Otit käyttöön päästä päähän -salauksen.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Olet estänyt vieraiden liittymisen huoneeseen.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Otit päästä päähän -salauksen käyttöön (tuntematon algoritmi %1$s).</string>
+    <string name="notice_direct_room_update_by_you">Päivitit tässä.</string>
+    <string name="notice_direct_room_update">%s päivitti täällä.</string>
+    <string name="notice_room_update_by_you">Päivitit tämän huoneen.</string>
+    <string name="notice_end_to_end_by_you">Otit päästä päähän -salauksen käyttöön (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Teit tulevista viesteistä näkyviä käyttäjälle %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s teki tulevista viesteistä näkyviä käyttäjälle %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Teit tulevan huonehistorian näkyväksi %1$s</string>
+    <string name="notice_ended_call_by_you">Lopetit puhelun.</string>
+    <string name="notice_answered_call_by_you">Vastasit puheluun.</string>
+    <string name="notice_call_candidates_by_you">Lähetit tietoja puhelun valmistelemiseksi.</string>
+    <string name="notice_call_candidates">%s lähetti tietoja puhelun valmistelemiseksi.</string>
+    <string name="notice_placed_voice_call_by_you">Aloitit äänipuhelun.</string>
+    <string name="notice_placed_video_call_by_you">Aloitit videopuhelun.</string>
+    <string name="notice_room_name_changed_by_you">Vaihdoit huoneen nimeksi: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Vaihdoit huoneen profiilikuvaa</string>
+    <string name="notice_room_avatar_changed">%1$s muutti huoneen profiilikuvaa</string>
+    <string name="notice_room_topic_changed_by_you">Vaihdoit aiheen: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Poistit nimimerkkisi (se oli %1$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Vaihdoit nimimerkkisi %1$s nimeen %2$s</string>
+    <string name="notice_display_name_set_by_you">Asetit nimimerkiksesi %1$s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Kutsusi</string>
+    <string name="notice_avatar_url_changed_by_you">Vaihdoit profiilikuvaasi</string>
+    <string name="notice_room_withdraw_by_you">Peruutit %1$sn kutsun</string>
+    <string name="notice_room_ban_by_you">Estit %1$s</string>
+    <string name="notice_room_unban_by_you">Poistit eston %1$s</string>
+    <string name="notice_room_kick_by_you">Poistit %1$s</string>
+    <string name="notice_room_reject_by_you">Hylkäsit kutsun</string>
+    <string name="notice_direct_room_leave_by_you">Poistuit huoneesta</string>
+    <string name="notice_direct_room_leave">%1$s poistui huoneesta</string>
+    <string name="notice_room_leave_by_you">Poistuit huoneesta</string>
+    <string name="notice_direct_room_join_by_you">Liityit</string>
+    <string name="notice_direct_room_join">%1$s liittyi</string>
+    <string name="notice_room_join_by_you">Liityit huoneeseen</string>
+    <string name="notice_room_invite_by_you">Kutsuit %1$s</string>
+    <string name="notice_direct_room_created_by_you">Loit keskustelun</string>
+    <string name="notice_direct_room_created">%1$s loi keskustelun</string>
+    <string name="notice_room_created_by_you">Loit huoneen</string>
+    <string name="notice_room_created">%1$s loi huoneen</string>
+    <string name="summary_you_sent_sticker">Lähetit tarran.</string>
+    <string name="summary_you_sent_image">Lähetit kuvan.</string>
     <!-- titles -->
     <string name="title_activity_home">Viestit</string>
     <string name="title_activity_room">Huone</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index fa47d881c4..ddbaa410df 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1,5 +1,240 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s : %2$s</string>
+    <string name="summary_user_sent_image">%1$s a envoyé une image.</string>
+    <string name="notice_room_invite_no_invitee">invitation de %s</string>
+    <string name="notice_room_invite">%1$s a invité %2$s</string>
+    <string name="notice_room_invite_you">%1$s vous a invité</string>
+    <string name="notice_room_join">%1$s a rejoint le salon</string>
+    <string name="notice_room_leave">%1$s est parti du salon</string>
+    <string name="notice_room_reject">%1$s a rejeté l’invitation</string>
+    <string name="notice_room_kick">%1$s a expulsé %2$s</string>
+    <string name="notice_room_unban">%1$s a révoqué l\'exclusion de %2$s</string>
+    <string name="notice_room_ban">%1$s a exclus %2$s</string>
+    <string name="notice_room_withdraw">%1$s a annulé l’invitation de %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s a changé d’avatar</string>
+    <string name="notice_display_name_set">%1$s a modifié son nom affiché en %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s a modifié son nom affiché de %2$s en %3$s</string>
+    <string name="notice_display_name_removed">%1$s a supprimé son nom affiché (précédemment %2$s)</string>
+    <string name="notice_room_topic_changed">%1$s a changé le sujet en : %2$s</string>
+    <string name="notice_room_name_changed">%1$s a changé le nom du salon en : %2$s</string>
+    <string name="notice_placed_video_call">%s a passé un appel vidéo.</string>
+    <string name="notice_placed_voice_call">%s a passé un appel vocal.</string>
+    <string name="notice_answered_call">%s a répondu à l’appel.</string>
+    <string name="notice_ended_call">%s a raccroché.</string>
+    <string name="notice_made_future_room_visibility">%1$s a rendu l’historique futur du salon visible pour %2$s</string>
+    <string name="notice_room_visibility_invited">tous les membres du salon, depuis qu’ils ont été invités.</string>
+    <string name="notice_room_visibility_joined">tous les membres du salon, depuis qu’ils l’ont rejoint.</string>
+    <string name="notice_room_visibility_shared">tous les membres du salon.</string>
+    <string name="notice_room_visibility_world_readable">n’importe qui.</string>
+    <string name="notice_room_visibility_unknown">inconnu (%s).</string>
+    <string name="notice_end_to_end">%1$s a activé le chiffrement de bout en bout (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s a demandé une téléconférence VoIP</string>
+    <string name="notice_voip_started">Téléconférence VoIP démarrée</string>
+    <string name="notice_voip_finished">Téléconférence VoIP terminée</string>
+    <string name="notice_avatar_changed_too">(l’avatar a aussi changé)</string>
+    <string name="notice_room_name_removed">%1$s a supprimé le nom du salon</string>
+    <string name="notice_room_topic_removed">%1$s a supprimé le sujet du salon</string>
+    <string name="notice_profile_change_redacted">%1$s a mis à jour son profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s a envoyé une invitation à %2$s pour rejoindre le salon</string>
+    <string name="notice_room_third_party_registered_invite">%1$s a accepté l’invitation pour %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Déchiffrement impossible : %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
+    <string name="could_not_redact">Effacement impossible</string>
+    <string name="unable_to_send_message">Envoi du message impossible</string>
+    <string name="message_failed_to_upload">L’envoi de l’image a échoué</string>
+    <string name="network_error">Erreur de réseau</string>
+    <string name="matrix_error">Erreur de Matrix</string>
+    <string name="room_error_join_failed_empty_room">Il est impossible pour le moment de revenir dans un salon vide.</string>
+    <string name="encrypted_message">Message chiffré</string>
+    <string name="medium_email">Adresse e-mail</string>
+    <string name="medium_phone_number">Numéro de téléphone</string>
+    <string name="summary_user_sent_sticker">%1$s a envoyé un sticker.</string>
+    <string name="room_displayname_invite_from">Invitation de %s</string>
+    <string name="room_displayname_room_invite">Invitation au salon</string>
+    <string name="room_displayname_empty_room">Salon vide</string>
+    <string name="room_displayname_two_members">%1$s et %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s et 1 autre</item>
+        <item quantity="other">%1$s et %2$d autres</item>
+    </plurals>
+    <string name="notice_event_redacted">Message supprimé</string>
+    <string name="notice_event_redacted_by">Message supprimé par %1$s</string>
+    <string name="notice_event_redacted_with_reason">Message supprimé [motif : %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Message supprimé par %1$s [motif : %2$s]</string>
+    <string name="initial_sync_start_importing_account">Synchronisation initiale :
+\nImportation du compte…</string>
+    <string name="initial_sync_start_importing_account_crypto">Synchronisation initiale :
+\nImportation de la cryptographie</string>
+    <string name="initial_sync_start_importing_account_rooms">Synchronisation initiale :
+\nImportation des salons</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Synchronisation initiale :
+\nImportation des salons que vous avez rejoints</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Synchronisation initiale :
+\nImportation des salons où vous avez été invités</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Synchronisation initiale :
+\nImportation des salons que vous avez quittés</string>
+    <string name="initial_sync_start_importing_account_groups">Synchronisation initiale :
+\nImportation des communautés</string>
+    <string name="initial_sync_start_importing_account_data">Synchronisation initiale :
+\nImportation des données du compte</string>
+    <string name="notice_room_update">%s a mis à niveau ce salon.</string>
+    <string name="event_status_sending_message">Envoi du message…</string>
+    <string name="clear_timeline_send_queue">Vider la file d’envoi</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s a révoqué l’invitation pour %2$s à rejoindre le salon</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Invitation de %1$s. Raison : %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s a invité %2$s. Raison : %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s vous a invité. Raison : %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s a rejoint le salon. Raison : %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s est parti du salon. Raison : %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s a refusé l’invitation. Raison : %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s a expulsé %2$s. Raison : %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s a révoqué l\'exclusion de %2$s. Raison : %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s a exclus %2$s. Raison : %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s a envoyé une invitation à %2$s pour rejoindre le salon. Raison : %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s a révoqué l’invitation de %2$s à rejoindre le salon. Raison : %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s a accepté l’invitation pour %2$s. Raison : %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s a annulé l’invitation de %2$s. Raison : %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s a ajouté %2$s comme adresse pour ce salon.</item>
+        <item quantity="other">%1$s a ajouté %2$s comme adresses pour ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s a supprimé %2$s comme adresse pour ce salon.</item>
+        <item quantity="other">%1$s a supprimé %3$s comme adresses pour ce salon.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s a ajouté %2$s et supprimé %3$s comme adresses pour ce salon.</string>
+    <string name="notice_room_canonical_alias_set">%1$s a défini %2$s comme adresse principale pour ce salon.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s a supprimé l’adresse principale de ce salon.</string>
+    <string name="notice_room_guest_access_can_join">%1$s a autorisé les visiteurs à rejoindre le salon.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s a empêché les visiteurs de rejoindre le salon.</string>
+    <string name="notice_end_to_end_ok">%1$s a activé le chiffrement de bout en bout.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s a activé le chiffrement de bout en bout (algorithme %2$s inconnu).</string>
+    <string name="notice_room_created">%1$s a créé le salon</string>
+    <string name="notice_direct_room_update_by_you">Vous avez mis cet endroit à niveau.</string>
+    <string name="notice_direct_room_update">%s a mis cet endroit à niveau.</string>
+    <string name="notice_room_update_by_you">Vous avez mis à niveau ce salon.</string>
+    <string name="notice_room_kick_by_you">Vous avez expulsé %1$s</string>
+    <string name="notice_room_reject_by_you">Vous avez rejeté l\'invitation</string>
+    <string name="notice_direct_room_leave_by_you">Vous avez quitté le salon</string>
+    <string name="notice_direct_room_leave">%1$s a quitté le salon</string>
+    <string name="notice_room_leave_by_you">Vous avez quitté le salon</string>
+    <string name="notice_direct_room_join_by_you">Vous avez rejoint le salon</string>
+    <string name="notice_direct_room_join">%1$s a rejoint le salon</string>
+    <string name="notice_room_join_by_you">Vous avez rejoint le salon</string>
+    <string name="notice_room_invite_by_you">Vous avez invité %1$s</string>
+    <string name="notice_direct_room_created_by_you">Vous avez créé la discussion</string>
+    <string name="notice_direct_room_created">%1$s a créé la discussion</string>
+    <string name="notice_room_created_by_you">Vous avez créé le salon</string>
+    <string name="notice_room_invite_no_invitee_by_you">Votre invitation</string>
+    <string name="summary_you_sent_sticker">Vous avez envoyé un autocollant.</string>
+    <string name="summary_you_sent_image">Vous avez envoyé une image.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Vous avez activé le chiffrement de bout en bout (algorithme %1$s inconnu).</string>
+    <string name="notice_end_to_end_ok_by_you">Vous avez activé le chiffrement de bout en bout.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Vous avez empêché les visiteurs de rejoindre le salon.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s a empêché les visiteurs de rejoindre le salon.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Vous avez empêché les visiteurs de rejoindre le salon.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Vous avez autorisé les visiteurs à venir ici.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s a autorisé les visiteurs à venir ici.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Vous avez autorisé les visiteurs à rejoindre le salon.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Vous avez supprimé l’adresse principale de ce salon.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Vous avez défini %1$s comme adresse principale pour ce salon.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Vous avez ajouté %1$s et supprimé %2$s comme adresses pour ce salon.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Vous avez supprimé %1$s comme adresse pour ce salon.</item>
+        <item quantity="other">Vous avez supprimé %1$s comme adresses pour ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Vous avez ajouté %1$s comme adresse pour ce salon.</item>
+        <item quantity="other">Vous avez ajouté %1$s comme adresses pour ce salon.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">Vous avez annulé l’invitation de %1$s. Raison : %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Vous avez accepté l’invitation pour %1$s. Raison : %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vous avez révoqué l’invitation de %1$s à rejoindre le salon. Raison : %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon. Raison : %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Vous avez refusé l’invitation. Raison : %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Vous êtes parti. Raison : %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s est parti. Raison : %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Vous êtes parti du salon. Raison : %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s rejoint. Raison : %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Vous avez rejoint. Raison : %1$s</string>
+    <string name="notice_room_join_with_reason_by_you">Vous avez rejoint le salon. Raison : %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Vous avez invité %1$s. Raison : %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Votre invitation. Raison %1$s</string>
+    <string name="notice_power_level_diff">%1$s de %2$s à %3$s</string>
+    <string name="notice_power_level_changed">%1$s a modifié le niveau de pouvoir de %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Vous avez modifié le niveau de pouvoir de %1$s.</string>
+    <string name="power_level_custom_no_value">Personnalisé</string>
+    <string name="power_level_custom">Personnalisé (%1$d)</string>
+    <string name="power_level_default">Défaut</string>
+    <string name="power_level_moderator">Modérateur</string>
+    <string name="power_level_admin">Admin</string>
+    <string name="notice_widget_modified_by_you">Vous avez modifié le widget %1$s</string>
+    <string name="notice_widget_modified">%1$s a modifié le widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Vous avez supprimé le widget %1$s</string>
+    <string name="notice_widget_removed">%1$s a supprimé le widget %2$s</string>
+    <string name="notice_widget_added_by_you">Vous avez ajouté le widget %1$s</string>
+    <string name="notice_widget_added">%1$s a ajouté le widget %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Vous avez accepté l’invitation pour %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Vous avez révoqué l\'invitation pour %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s a révoqué l\'invitation pour %2$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Vous avez rendu les futurs messages visible pour %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s a rendu les futurs messages visible pour %2$s</string>
+    <string name="notice_room_avatar_removed_by_you">Vous avez supprimé l\'avatar du salon</string>
+    <string name="notice_room_avatar_removed">%1$s a supprimé l\'avatar du salon</string>
+    <string name="notice_room_name_removed_by_you">Vous avez supprimé le nom du salon</string>
+    <string name="notice_requested_voip_conference_by_you">Vous avez demandé une téléconférence VoIP</string>
+    <string name="notice_end_to_end_by_you">Vous avez activé le chiffrement de bout en bout (%1$s)</string>
+    <string name="notice_made_future_room_visibility_by_you">Vous avez rendu l’historique futur du salon visible pour %1$s</string>
+    <string name="notice_ended_call_by_you">Vous avez raccroché.</string>
+    <string name="notice_answered_call_by_you">Vous avez répondu à l’appel.</string>
+    <string name="notice_call_candidates_by_you">Vous avez envoyé les données pour configurer l\'appel.</string>
+    <string name="notice_call_candidates">%s a envoyé les données pour configurer l\'appel.</string>
+    <string name="notice_placed_voice_call_by_you">Vous avez passé un appel vocal.</string>
+    <string name="notice_placed_video_call_by_you">Vous avez passé un appel vidéo.</string>
+    <string name="notice_room_name_changed_by_you">Vous avez changé le nom du salon en : %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Vous avez modifié l\'avatar du salon</string>
+    <string name="notice_room_avatar_changed">%1$s a modifié l\'avatar du salon</string>
+    <string name="notice_display_name_changed_from_by_you">Vous avez modifié votre nom affiché de %1$s en %2$s</string>
+    <string name="notice_display_name_set_by_you">Vous avez modifié votre nom affiché en %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Vous avez changé votre avatar</string>
+    <string name="notice_room_withdraw_by_you">Vous avez annulé l’invitation de %1$s</string>
+    <string name="notice_room_topic_changed_by_you">Vous avez changé le sujet en : %1$s</string>
+    <string name="notice_display_name_removed_by_you">Vous avez supprimé votre nom affiché (précédemment %1$s)</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Vous avez révoqué l’invitation pour %1$s à rejoindre le salon</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Vous avez invité %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s a invité %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon</string>
+    <string name="notice_profile_change_redacted_by_you">Vous avez mis à jour votre profile %1$s</string>
+    <string name="notice_room_topic_removed_by_you">Vous avez supprimé le sujet du salon</string>
+    <string name="notice_room_ban_with_reason_by_you">Vous avez exclus %1$s. Raison : %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Vous avez révoqué l\'exclusion de %1$s. Raison : %2$s</string>
+    <string name="notice_room_ban_by_you">Vous avez exclus %1$s</string>
+    <string name="notice_room_unban_by_you">Vous avez révoqué l\'exclusion de %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Vous avez expulsé %1$s. Raison : %2$s</string>
+    <string name="room_displayname_empty_room_was">Salon vide (était %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s et %4$d autre</item>
+        <item quantity="other">%1$s, %2$s, %3$s et %4$d autres</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s et %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s et %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Tous les serveurs sont interdits de participer ! Ce salon ne peut plus être utilisé.</string>
+    <string name="notice_room_server_acl_updated_no_change">Aucun changement.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Les serveurs correspondant à des IP littérales sont maintenant interdits.</string>
+    <string name="notice_room_server_acl_set_banned">• Les serveurs correspondant à %s sont interdits.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Les serveurs correspondants à des IP littérales sont interdites.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont autorisés.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont maintenant autorisées.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Les serveurs correspondant à %s sont supprimés de la liste autorisée.</string>
+    <string name="notice_room_server_acl_updated_allowed">• les serveur correspondant à %s sont maintenant autorisés.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Les serveurs correspondant à %s étaient supprimés de la liste des interdits.</string>
+    <string name="notice_room_server_acl_updated_banned">• Les serveurs correspondant à %s sont maintenant interdits.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Vous avez changé les droits ACL du serveur pour ce salon.</string>
+    <string name="notice_room_server_acl_updated_title">%s a changé les droits ACL du serveur pour ce salon.</string>
+    <string name="notice_room_server_acl_set_allowed">• Les serveurs correspondant à %s sont autorisés.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Vous avez paramétré les ACL pour ce salon.</string>
+    <string name="notice_room_server_acl_set_title">%s paramètre les autorisations étendues (ACL) du serveur pour ce salon.</string>
     <string name="title_activity_home">Messages</string>
     <string name="title_activity_settings">Paramètres</string>
     <string name="title_activity_member_details">Informations sur ce participant</string>
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index fcbf0aa122..e701ce6fdb 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -1,5 +1,268 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="medium_email">Enderezo de correo</string>
+    <string name="message_failed_to_upload">Fallo ao subir a páxina</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s enviou unha imaxe.</string>
+    <string name="summary_user_sent_sticker">%1$s enviou unha icona.</string>
+    <string name="notice_room_invite_no_invitee">Convite de %s</string>
+    <string name="notice_room_invite">%1$s convidou a %2$s</string>
+    <string name="notice_room_invite_you">%1$s convidouno</string>
+    <string name="notice_room_join">%1$s entrou</string>
+    <string name="notice_room_leave">%1$s saíu</string>
+    <string name="notice_room_reject">%1$s rexeitou o convite</string>
+    <string name="notice_room_kick">%1$s expulsou a %2$s</string>
+    <string name="notice_room_unban">%1$s desbloqueou a %2$s</string>
+    <string name="notice_room_ban">%1$s bloqueou a %2$s</string>
+    <string name="notice_room_withdraw">%1$s cancelou o convite de %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s cambiou o seu avatar</string>
+    <string name="notice_display_name_set">%1$s cambiou o seu nome a %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s cambiou o seu nome de %2$s a %3$s</string>
+    <string name="notice_display_name_removed">%1$s borrou o seu nome público (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s cambiou o tema desta sala para: %2$s</string>
+    <string name="notice_room_name_changed">%1$s cambiou o nome desta sala para: %2$s</string>
+    <string name="notice_placed_video_call">%s iniciou unha chamada de vídeo.</string>
+    <string name="notice_placed_voice_call">%s iniciou unha chamada de voz.</string>
+    <string name="notice_answered_call">%s respondeu á chamada.</string>
+    <string name="notice_ended_call">%s terminou a chamada.</string>
+    <string name="notice_made_future_room_visibility">%1$s fixo visible os próximos históricos para %2$s</string>
+    <string name="notice_room_visibility_invited">toda a xente que integran esta sala, desde o momento en que foron convidados.</string>
+    <string name="notice_room_visibility_joined">todas a xente da sala, desde o momento en que entraron.</string>
+    <string name="notice_room_visibility_shared">todas os membros da sala.</string>
+    <string name="notice_room_visibility_world_readable">todos.</string>
+    <string name="notice_room_visibility_unknown">descoñecido (%s).</string>
+    <string name="notice_end_to_end">%1$s activou a criptografía par-a-par (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s solicitou unha conferencia VoIP</string>
+    <string name="notice_voip_started">A conferencia VoIP comenzou</string>
+    <string name="notice_voip_finished">A conferencia VoIP terminou</string>
+    <string name="notice_avatar_changed_too">(o avatar tamén foi cambiado)</string>
+    <string name="notice_room_name_removed">%1$s borrou o nome da sala</string>
+    <string name="notice_room_topic_removed">%1$s removeu o tema da sala</string>
+    <string name="notice_profile_change_redacted">%1$s actualizou o seu perfil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s envioulle un convite a %2$s para que entre na sala</string>
+    <string name="notice_room_third_party_registered_invite">%1$s aceptou o convite para %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Imposíbel descifrar: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">O dispositivo do que envía non enviou as chaves desta mensaxe.</string>
+    <string name="could_not_redact">Non se puido redactar</string>
+    <string name="unable_to_send_message">Non foi posíbel enviar a mensaxe</string>
+    <string name="network_error">Erro da conexión</string>
+    <string name="matrix_error">Erro de Matrix</string>
+    <string name="room_error_join_failed_empty_room">Aínda non é posíbel volver a entrar nunha sala baleira.</string>
+    <string name="encrypted_message">Mensaxe cifrada</string>
+    <string name="medium_phone_number">Número de teléfono</string>
+    <string name="room_displayname_two_members">%1$s e %2$s</string>
+    <string name="notice_placed_voice_call_by_you">Fixeches unha chamada de audio.</string>
+    <string name="notice_placed_video_call_by_you">Fixeches unha chamada de vídeo.</string>
+    <string name="notice_room_name_changed_by_you">Cambiaches o nome da sala a: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Cambiaches o avatar da sala</string>
+    <string name="notice_room_avatar_changed">%1$s cambiou o avatar da sala</string>
+    <string name="notice_room_topic_changed_by_you">Cambiaches o asunto a: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Eliminaches o teu nome público (era %1$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Cambiaches o teu nome público de %1$s a %2$s</string>
+    <string name="notice_display_name_set_by_you">Estableceches o nome público a %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Cambiaches o teu avatar</string>
+    <string name="notice_room_withdraw_by_you">Retirácheslle o convite a %1$s</string>
+    <string name="notice_room_ban_by_you">Vetaches a %1$s</string>
+    <string name="notice_room_unban_by_you">Readmitiches a %1$s</string>
+    <string name="notice_room_kick_by_you">Expulsaches a %1$s</string>
+    <string name="notice_room_reject_by_you">Rexeitaches o convite</string>
+    <string name="notice_direct_room_leave_by_you">Deixaches a sala</string>
+    <string name="notice_direct_room_leave">%1$s deixou a sala</string>
+    <string name="notice_room_leave_by_you">Saíches da sala</string>
+    <string name="notice_direct_room_join_by_you">Unícheste</string>
+    <string name="notice_direct_room_join">%1$s iniuse</string>
+    <string name="notice_room_join_by_you">Unícheste a sala</string>
+    <string name="notice_room_invite_by_you">Convidaches a %1$s</string>
+    <string name="notice_direct_room_created_by_you">Creaches a conversa</string>
+    <string name="notice_direct_room_created">%1$s creou a conversa</string>
+    <string name="notice_room_created_by_you">Creaches a sala</string>
+    <string name="notice_room_created">%1$s creou a sala</string>
+    <string name="notice_room_invite_no_invitee_by_you">O teu convite</string>
+    <string name="summary_you_sent_sticker">Enviaches un adhesivo.</string>
+    <string name="summary_you_sent_image">Enviaches unha imaxe.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servidores con literais IP están vetados.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servidores con IP literais están permitidos.</string>
+    <string name="notice_room_server_acl_set_banned">• Servidores con %s están vetados.</string>
+    <string name="notice_room_server_acl_set_allowed">• Servidores con %s están permitidos.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Estableceches os ACLs do servidor para esta sala.</string>
+    <string name="notice_room_server_acl_set_title">%s estableceu os ACLs do servidor para esta sala.</string>
+    <string name="notice_direct_room_update">%s actualizou aquí.</string>
+    <string name="notice_direct_room_update_by_you">Actualizaches aquí.</string>
+    <string name="notice_room_update_by_you">Actualizaches esta sala.</string>
+    <string name="notice_room_update">%s actualizou esta sala.</string>
+    <string name="notice_end_to_end_by_you">Activaches o cifrado extremo-a-extremo (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Fixeches visibles as mensaxes futuras para %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s fixo visibles as mensaxes futuras para %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Fixeches visible no futuro o historial da sala para %1$s</string>
+    <string name="notice_ended_call_by_you">Remataches a chamada.</string>
+    <string name="notice_answered_call_by_you">Respondeches á chamada.</string>
+    <string name="notice_call_candidates_by_you">Enviaches datos para configurar a chamada.</string>
+    <string name="notice_call_candidates">%s enviou datos para configurar a chamada.</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Retiraches o convite de %1$s. Razón: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s retirou o convite de %2$s. Razón: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Aceptaches o convite para %1$s. Razón: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s aceptou o convite para %2$s. Razón: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Revogaches o convite para que %1$s se una á sala. Razón: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revogou o convite para que %2$s se una á sala. Razón: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Convidaches a %1$s para que se una á sala. Razón: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s convidou a %2$s para que se una á sala. Razón: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Vetaches a %1$s. Razón: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s vetou a %2$s. Razón: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Retirácheslle o veto a %1$s. Razón: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s retirou o veto a %2$s. Razón: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Expulsaches a %1$s. Razón: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s expulsou a %2$s. Razón: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Rexeitaches o convite. Razón: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s rexeitou o convite. Razón: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Saíches. Razón: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s saíu. Razón: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Saíches da sala. Razón: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s deixou a sala. Razón: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Unícheste. Razón: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s uníuse. Razón: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Unícheste á sala. Razón: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s uniuse á sala. Razón: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s convidoute. Razón: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Convidaches a %1$s. Razón: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s convidou a %2$s. Razón: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">O teu convite. Razón: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Razón: %2$s</string>
+    <string name="clear_timeline_send_queue">Baleirar cola de envíos</string>
+    <string name="event_status_sending_message">Enviando mensaxe…</string>
+    <string name="initial_sync_start_importing_account_data">Sincr. inicial:
+\nImportando datos da conta</string>
+    <string name="initial_sync_start_importing_account_groups">Sincr. inicial:
+\nImportando comunidades</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sincr. inicial:
+\nImportando salas das que saíches</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Sincr. inicial:
+\nImportando convites a salas</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Sincr. inicial:
+\nImportando Salas</string>
+    <string name="initial_sync_start_importing_account_rooms">Sincr. inicial:
+\nImportando salas</string>
+    <string name="initial_sync_start_importing_account_crypto">Sincr. inicial:
+\nImportando cifrado</string>
+    <string name="initial_sync_start_importing_account">Sincr. inicial:
+\nImportando conta…</string>
+    <string name="room_displayname_empty_room_was">Sala baleira (estaba %s)</string>
+    <string name="room_displayname_empty_room">Sala baleira</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s e 1 máis</item>
+        <item quantity="other">%1$s e %2$d outras</item>
+    </plurals>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s e %4$d máis</item>
+        <item quantity="other">%1$s, %2$s, %3$s e %4$d outras</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s e %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s e %3$s</string>
+    <string name="room_displayname_room_invite">Convite de sala</string>
+    <string name="room_displayname_invite_from">Convite desde %s</string>
+    <string name="notice_power_level_diff">%1$s de %2$s a %3$s</string>
+    <string name="notice_power_level_changed">%1$s cambiou de categoría a %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Cambiaches a categoría de %1$s.</string>
+    <string name="power_level_custom_no_value">Personalizado</string>
+    <string name="power_level_custom">Personalizado (%1$d)</string>
+    <string name="power_level_default">Por defecto</string>
+    <string name="power_level_moderator">Moderadora</string>
+    <string name="power_level_admin">Admin</string>
+    <string name="notice_widget_jitsi_modified_by_you">Modificaches a conferencia de vídeo</string>
+    <string name="notice_widget_jitsi_modified">Conferencia de vídeo modificada por %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Finalizaches a conferencia de vídeo</string>
+    <string name="notice_widget_jitsi_removed">Conferencia de vídeo finalizada por %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Iniciaches unha conferencia de vídeo</string>
+    <string name="notice_widget_jitsi_added">Conferencia de vídeo iniciada por %1$s</string>
+    <string name="notice_widget_modified_by_you">Modificaches o widget %1$s</string>
+    <string name="notice_widget_modified">%1$s modificou o widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Eliminaches o widget %1$s</string>
+    <string name="notice_widget_removed">%1$s eliminou o widget %2$s</string>
+    <string name="notice_widget_added_by_you">Engadiches o widget %1$s</string>
+    <string name="notice_widget_added">%1$s engadiu o widget %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Aceptaches o convite para %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Revogaches o convite para %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s revogou o convite para %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Revogaches o convite para que %1$s se una á sala</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s revogou o convite para que %2$s se una á sala</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Convidaches a %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s convidou a %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Enviácheslle un convite a %1$s para unirse á sala</string>
+    <string name="notice_profile_change_redacted_by_you">Actualizaches o teu perfil %1$s</string>
+    <string name="notice_event_redacted_by_with_reason">Mensaxe eliminada por %1$s [razón: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">Mensaxe eliminada [razón: %1$s]</string>
+    <string name="notice_event_redacted_by">Mensaxe eliminada por %1$s</string>
+    <string name="notice_event_redacted">Mensaxe eliminada</string>
+    <string name="notice_room_avatar_removed_by_you">Eliminaches o avatar da sala</string>
+    <string name="notice_room_avatar_removed">%1$s eliminou o avatar da sala</string>
+    <string name="notice_room_topic_removed_by_you">Eliminaches o asunto da sala</string>
+    <string name="notice_room_name_removed_by_you">Eliminaches o nome da sala</string>
+    <string name="notice_requested_voip_conference_by_you">Solicitaches unha conferencia VoIP</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Vetouse a participación de tódolos servidores! Xa non se pode utilizar esta sala.</string>
+    <string name="notice_room_server_acl_updated_no_change">Sen cambio.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Os servidores con literais IP concordantes están vetados.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Os servidores cos literais IP concordantes están permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servidores con %s foron eliminados da lista de permitidos.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Os servidores con %s agora están permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Os servidores con %s xa non están la lista de vetados.</string>
+    <string name="notice_room_server_acl_updated_banned">• Os servidores con %s están agora vetados.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Cambiaches os ACLs do servidor para esta sala.</string>
+    <string name="notice_room_server_acl_updated_title">%s cambiou os ACLs do servidor para esta sala.</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s engadiu %2$s como enderezo desta sala.</item>
+        <item quantity="other">%1$s engadiu %2$s como enderezos desta sala.</item>
+    </plurals>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Activaches o cifrado extremo-a-extremo (algoritmo non recoñecido %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s activou o cifrado extremo-a-extrem (algoritmo non recoñecible %2$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Activaches o cifrado extremo-a-extremo.</string>
+    <string name="notice_end_to_end_ok">%1$s activou o cifrado extremo-a-extremo.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Non permites que as convidadas se unan á sala.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s non permite que as usuarias se unan á sala.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Non permites que as convidadas se unan á sala.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s non permite que as convidadas se unan á sala.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Permitiches que as convidadas se unan aquí.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s permitiu que as convidadas se unan aquí.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Permitiches que as convidadas se unan á sala.</string>
+    <string name="notice_room_guest_access_can_join">%1$s permite que as convidadas se unan á sala.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Cambiaches os enderezos desta sala.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s cambiou os enderezos desta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Cambiaches os enderezos principal e alternativo para esta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s cambiou os enderezos alternativo e principal para esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Cambiaches os enderezos alternativos para esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s cambiou os enderezos alternativos para esta sala.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Eliminaches o enderezo alternativo %1$s para esta sala.</item>
+        <item quantity="other">Eliminaches os enderezos alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s eliminou o enderezo alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s eliminou os enderezos alternativos %2$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Engadiches o enderezo alternativo %1$s para esta sala.</item>
+        <item quantity="other">Engadiches os enderezos alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s engadiu o enderezo alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s engadiu os enderezos alternativos %2$s para esta sala.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">Eliminaches o enderezo principal desta sala.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s eliminou o enderezo principal desta sala.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Estableceches %1$s como enderezo principal desta sala.</string>
+    <string name="notice_room_canonical_alias_set">%1$s estableceu %2$s como enderezo principal desta sala.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Engadiches %1$s e eliminaches %2$s como enderezos desta sala.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s engadiu %2$s e eliminou %3$s como enderezos desta sala.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Eliminaches %1$s como enderezo desta sala.</item>
+        <item quantity="other">Eliminaches %1$s como enderezos desta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s eliminou %2$s como enderezo desta sala.</item>
+        <item quantity="other">%1$s eliminou %2$s como enderezos desta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Engadiches %1$s como enderezo para esta sala.</item>
+        <item quantity="other">Engadiches %1$s como enderezos para esta sala.</item>
+    </plurals>
     <string name="light_theme">Decorado claro</string>
     <string name="dark_theme">Decorado escuro</string>
     <string name="black_theme">Decorado negro</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 12294a4094..f475e4426c 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1,5 +1,198 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s küldött egy képet.</string>
+    <string name="notice_room_invite_no_invitee">%s meghívója</string>
+    <string name="notice_room_invite">%1$s meghívta: %2$s</string>
+    <string name="notice_room_invite_you">%1$s meghívott</string>
+    <string name="notice_room_join">%1$s belépett a szobába</string>
+    <string name="notice_room_leave">%1$s kilépett a szobából</string>
+    <string name="notice_room_reject">%1$s elutasította a meghívást</string>
+    <string name="notice_room_kick">%1$s kidobta: %2$s</string>
+    <string name="notice_room_unban">%1$s feloldotta %2$s tiltását</string>
+    <string name="notice_room_ban">%1$s kitiltotta: %2$s</string>
+    <string name="notice_room_withdraw">%1$s visszavonta %2$s meghívását</string>
+    <string name="notice_avatar_url_changed">%1$s megváltoztatta a profilképét</string>
+    <string name="notice_display_name_set">%1$s megváltoztatta a megjelenő nevét erre: %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s megváltoztatta a megjelenítendő nevét erről: %2$s, erre: %3$s</string>
+    <string name="notice_display_name_removed">%1$s eltávolította a megjelenítendő nevét (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s megváltoztatta a témát erre: %2$s</string>
+    <string name="notice_room_name_changed">%1$s megváltoztatta a szoba nevét erre: %2$s</string>
+    <string name="notice_placed_video_call">%s videóhívást kezdeményezett.</string>
+    <string name="notice_placed_voice_call">%s hanghívást indított.</string>
+    <string name="notice_answered_call">%s fogadta a hívást.</string>
+    <string name="notice_ended_call">%s befejezte a hívást.</string>
+    <string name="notice_made_future_room_visibility">%1$s láthatóvá tette a jövőbeli előzményeket %2$s</string>
+    <string name="notice_room_visibility_invited">a szoba összes tagja számára, a meghívásuk időpontjától kezdve.</string>
+    <string name="notice_room_visibility_joined">a szoba összes tagja számára, a csatlakozásuk időpontjától kezdve.</string>
+    <string name="notice_room_visibility_shared">az összes szobatag számára.</string>
+    <string name="notice_room_visibility_world_readable">bárki.</string>
+    <string name="notice_room_visibility_unknown">ismeretlen (%s).</string>
+    <string name="notice_end_to_end">%1$s bekapcsolta a végpontok közötti titkosítást (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s hanghívás konferenciát kérelmezett</string>
+    <string name="notice_voip_started">Hanghívás konferencia elindult</string>
+    <string name="notice_voip_finished">Hanghívás konferencia befejeződött</string>
+    <string name="notice_avatar_changed_too">(a profilkép is megváltozott)</string>
+    <string name="notice_room_name_removed">%1$s eltávolította a szoba nevét</string>
+    <string name="notice_room_topic_removed">%1$s eltávolította a szoba témáját</string>
+    <string name="notice_profile_change_redacted">%1$s megváltoztatta a(z) %2$s profilját</string>
+    <string name="notice_room_third_party_invite">%1$s meghívót küldött %2$s számára, hogy csatlakozzon a szobához</string>
+    <string name="notice_room_third_party_registered_invite">%1$s elfogadta a meghívót ebbe: %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Visszafejtés sikertelen: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">A küldő eszköze nem küldte el a kulcsokat ehhez az üzenethez.</string>
+    <string name="could_not_redact">Kitakarás sikertelen</string>
+    <string name="unable_to_send_message">Üzenet küldése sikertelen</string>
+    <string name="message_failed_to_upload">Kép feltöltése sikertelen</string>
+    <string name="network_error">Hálózati hiba</string>
+    <string name="matrix_error">Matrix hiba</string>
+    <string name="room_error_join_failed_empty_room">Jelenleg nem lehetséges újracsatlakozni egy üres szobához.</string>
+    <string name="encrypted_message">Titkosított üzenet</string>
+    <string name="medium_email">E-mail cím</string>
+    <string name="medium_phone_number">Telefonszám</string>
+    <string name="summary_user_sent_sticker">%1$s küldött egy matricát.</string>
+    <string name="room_displayname_invite_from">Meghívó tőle: %s</string>
+    <string name="room_displayname_room_invite">Meghívó egy szobába</string>
+    <string name="room_displayname_two_members">%1$s és %2$s</string>
+    <string name="room_displayname_empty_room">Üres szoba</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s és 1 másik</item>
+        <item quantity="other">%1$s és %2$d másik</item>
+    </plurals>
+    <string name="notice_event_redacted">Üzenet eltávolítva</string>
+    <string name="notice_event_redacted_by">Üzenetet eltávolította: %1$s</string>
+    <string name="notice_event_redacted_with_reason">Üzenet eltávolítva [ok: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Üzenetet eltávolította: %1$s [ok: %2$s]</string>
+    <string name="initial_sync_start_importing_account">Induló szinkronizáció:
+\nFiók betöltése…</string>
+    <string name="initial_sync_start_importing_account_crypto">Induló szinkronizáció:
+\nTitkosítás betöltése</string>
+    <string name="initial_sync_start_importing_account_rooms">Induló szinkronizáció:
+\nSzobák betöltése</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Induló szinkronizáció:
+\nCsatlakozott szobák betöltése</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Induló szinkronizáció:
+\nMeghívott szobák betöltése</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Induló szinkronizáció:
+\nElhagyott szobák betöltése</string>
+    <string name="initial_sync_start_importing_account_groups">Induló szinkronizáció:
+\nKözösségek betöltése</string>
+    <string name="initial_sync_start_importing_account_data">Induló szinkronizáció:
+\nFiók adatok betöltése</string>
+    <string name="notice_room_update">%s frissítette ezt a szobát.</string>
+    <string name="event_status_sending_message">Üzenet küldése…</string>
+    <string name="clear_timeline_send_queue">Küldő sor ürítése</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s visszavonta %2$s meghívását, hogy csatlakozzon a szobához</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s meghívója. Ok: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s meghívta őt: %2$s. Ok: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s meghívott. Ok: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s belépett a szobába. Mert: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s kilépett a szobából. Ok: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s visszautasította a meghívót. Ok: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s kirúgta őt: %2$s. Ok: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s visszaengedte őt: %2$s. Ok: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s kitiltotta őt: %2$s. Ok: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s meghívót küldött neki: %2$s, hogy lépjen be a szobába. Ok: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s visszavonta %2$s meghívóját a szobába való belépéshez. Ok: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s elfogadta a meghívót ide: %2$s. Ok: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s visszavonta %2$s meghívóját. Ok: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s ezt a címet adta a szobához: %2$s.</item>
+        <item quantity="other">%1$s ezeket a címeket adta a szobához: %2$s.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s ezt a címet törölte a szobából: %3$s.</item>
+        <item quantity="other">%1$s ezeket a címeket törölte a szobából: %3$s.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s a szobához adta ezeket:%2$s és törölte ezeket: %3$s.</string>
+    <string name="notice_room_canonical_alias_set">%1$s a szoba elsődleges címét erre állította be: %2$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s eltávolította a szoba elsődleges címét.</string>
+    <string name="notice_room_guest_access_can_join">%1$s megengedte a vendégeknek, hogy belépjenek ebbe a szobába.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s megtiltotta a vendégeknek, hogy belépjenek ebbe a szobába.</string>
+    <string name="notice_end_to_end_ok">%1$s bekapcsolta a végpontok közötti titkosítást.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s bekapcsolta a végpontok közötti titkosítást (ismeretlen algoritmus %2$s).</string>
+    <string name="notice_room_created">%1$s szobát készített</string>
+    <string name="notice_answered_call_by_you">Fogadtad a hívást.</string>
+    <string name="notice_ended_call_by_you">Befejezted a hívást.</string>
+    <string name="notice_call_candidates_by_you">Hívási adatokat küldtél.</string>
+    <string name="notice_call_candidates">%s hívási adatokat küldött.</string>
+    <string name="notice_placed_voice_call_by_you">Hanghívást indítottál.</string>
+    <string name="notice_placed_video_call_by_you">Videóhívást indítottál.</string>
+    <string name="notice_room_avatar_changed_by_you">Megváltoztattad a szoba képét</string>
+    <string name="notice_room_avatar_changed">%1$s megváltoztatta a szoba képét</string>
+    <string name="notice_room_topic_changed_by_you">Megváltoztattad a témát erre: %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Megváltoztattad a profilképed</string>
+    <string name="notice_room_withdraw_by_you">Visszavontad %1$s meghívóját</string>
+    <string name="notice_room_ban_by_you">Kitiltottad %1$s felhasználót</string>
+    <string name="notice_room_unban_by_you">Visszaengedted %1$s felhasználót</string>
+    <string name="notice_room_kick_by_you">Kirúgtad %1$s felhasználót</string>
+    <string name="notice_room_reject_by_you">Visszautasítottad a meghívót</string>
+    <string name="notice_direct_room_leave_by_you">Elhagytad a szobát</string>
+    <string name="notice_direct_room_leave">%1$s elhagyta a szobát</string>
+    <string name="notice_room_leave_by_you">Elhagytad a szobát</string>
+    <string name="notice_direct_room_join_by_you">Csatlakoztál</string>
+    <string name="notice_direct_room_join">%1$s csatlakozott</string>
+    <string name="notice_room_join_by_you">Beléptél a szobába</string>
+    <string name="notice_room_invite_by_you">Meghívtad: %1$s</string>
+    <string name="notice_direct_room_created_by_you">Létrehoztad a beszélgetést</string>
+    <string name="notice_direct_room_created">%1$s létrehozta a beszélgetést</string>
+    <string name="notice_room_created_by_you">Létrehoztad a szobát</string>
+    <string name="summary_you_sent_sticker">Matricát küldtél.</string>
+    <string name="summary_you_sent_image">Képet küldtél.</string>
+    <string name="power_level_custom_no_value">Saját</string>
+    <string name="power_level_custom">Saját (%1$d)</string>
+    <string name="power_level_default">Alapértelmezett</string>
+    <string name="power_level_moderator">Moderátor</string>
+    <string name="power_level_admin">Admin</string>
+    <string name="notice_widget_modified_by_you">Ön megváltoztatta a %1$s kisalkalmazást</string>
+    <string name="notice_widget_modified">%1$s megváltoztatta a %2$s kisalkalmazást</string>
+    <string name="notice_widget_removed_by_you">Ön eltávolította a %1$s kisalkalmazást</string>
+    <string name="notice_widget_removed">%1$s eltávolította a %2$s kisalkalmazást</string>
+    <string name="notice_widget_added_by_you">Ön hozzáadott egy %1$s kisalkalmazást</string>
+    <string name="notice_widget_added">%1$s hozzáadott egy %2$s kisalkalmazást</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Ön elfogadta a meghívót ehhez: %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Ön visszavonta %1$s felhasználó meghívóját</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s visszavonta %2$s felhasználó meghívóját</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Ön visszavonta %1$s felhasználó meghívóját</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Ön meghívta %1$s felhasználót</string>
+    <string name="notice_direct_room_third_party_invite">%1$s meghívta %2$s felhasználót</string>
+    <string name="notice_room_third_party_invite_by_you">Ön meghívót küldött %1$s felhasználónak, hogy csatlakozzon a szobához</string>
+    <string name="notice_profile_change_redacted_by_you">Ön frissítette a saját profilját %1$s</string>
+    <string name="notice_room_avatar_removed_by_you">Ön eltávolította a szoba képét</string>
+    <string name="notice_room_avatar_removed">%1$s eltávolította a szoba képét</string>
+    <string name="notice_room_topic_removed_by_you">Ön eltávolította a szoba témáját</string>
+    <string name="notice_room_name_removed_by_you">Ön eltávolította a szoba nevét</string>
+    <string name="notice_requested_voip_conference_by_you">Ön videókonferencia kezdeményezését kérte</string>
+    <string name="notice_direct_room_update_by_you">Ön frissítette ezt a szobát.</string>
+    <string name="notice_direct_room_update">%s frissítette a szobát.</string>
+    <string name="notice_room_update_by_you">Ön frissítette ezt a szobát.</string>
+    <string name="notice_end_to_end_by_you">Ön bekapcsolta a végpontok közötti titkosítást (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Ön elérhetővé tette a jövőbeni üzeneteket %1$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Ön elérhetővé tette a jövőbeni üzeneteket %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s elérhetővé tette a jövőbeni üzeneteket %2$s</string>
+    <string name="notice_room_name_changed_by_you">Ön megváltoztatta a szoba nevét erre: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Ön eltávolította a saját megjelenített nevét (%1$s volt)</string>
+    <string name="notice_display_name_changed_from_by_you">Ön megváltoztatta a saját megjelenítési nevét erről: %1$s, erre: %2$s</string>
+    <string name="notice_display_name_set_by_you">Ön beállította a saját megjelenítési nevét erre: %1$s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Az ön meghívása</string>
+    <string name="notice_power_level_diff">%1$s felhasználó hozzáférési szintjét erről: %2$s, erre: %3$s</string>
+    <string name="notice_power_level_changed">%1$s megváltoztatta %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Megváltoztattad %1$s hozzáférési szintjét.</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Minden szerver ki lett tiltva a szobából! Ez a szoba többé nem használható.</string>
+    <string name="notice_room_server_acl_updated_no_change">Nincs változás.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Most már tiltva vannak az IP címet hosztnévként használó szerverek.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Az IP címet hosztnévként használó szerverek most már engedélyezve vannak.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• El lettek távolítva a tiltólistából az erre illeszkedő szerverek: %s</string>
+    <string name="notice_room_server_acl_updated_allowed">• Most már engedélyezve vannak az erre illeszkedő szerverek: %s</string>
+    <string name="notice_room_server_acl_updated_was_banned">• El lettek távolítva a tiltólistából az erre illeszkedő szerverek: %s</string>
+    <string name="notice_room_server_acl_updated_banned">• Most már tiltva vannak az erre a kifejezésre illeszkedő szerverek: %s</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Megváltoztattad a szerver ACL-eket ehhez a szobához.</string>
+    <string name="notice_room_server_acl_updated_title">%s megváltoztatta a szerver ACL-eket ehhez a szobához.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• IP címet hosztnévként használó szerverek tiltva vannak.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• IP címet hosztnévként használó szerverek engedélyezve vannak.</string>
+    <string name="notice_room_server_acl_set_allowed">• Engedélyezve vannak azok a szerverek, amik illeszkednek erre: %s</string>
+    <string name="notice_room_server_acl_set_banned">• Tiltva vannak azok a szerverek, amik illeszkednek erre: %s</string>
+    <string name="notice_room_server_acl_set_title_by_you">Beállítottad a szerver ACL-eket ehhez a szobához.</string>
+    <string name="notice_room_server_acl_set_title">%s beállította a szerver ACL-eket ehhez a szobához.</string>
     <string name="title_activity_home">Üzenetek</string>
     <string name="title_activity_room">Szoba</string>
     <string name="title_activity_settings">Beállítások</string>
diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml
index b96d08030f..91fdb38426 100644
--- a/vector/src/main/res/values-id/strings.xml
+++ b/vector/src/main/res/values-id/strings.xml
@@ -1,5 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="room_displayname_invite_from">Undang dari %s</string>
+    <string name="room_displayname_room_invite">Undangan Ruang</string>
+    <string name="room_displayname_two_members">%1$s dan %2$s</string>
+
+    <string name="room_displayname_empty_room">Ruang kosong</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s dan %2$d yang lain</item>
+    </plurals>
     <string name="title_activity_home">Pesan</string>
     <string name="title_activity_room">Ruang</string>
     <string name="title_activity_settings">Pengaturan</string>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index b96d08030f..91fdb38426 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -1,5 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="room_displayname_invite_from">Undang dari %s</string>
+    <string name="room_displayname_room_invite">Undangan Ruang</string>
+    <string name="room_displayname_two_members">%1$s dan %2$s</string>
+
+    <string name="room_displayname_empty_room">Ruang kosong</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s dan %2$d yang lain</item>
+    </plurals>
     <string name="title_activity_home">Pesan</string>
     <string name="title_activity_room">Ruang</string>
     <string name="title_activity_settings">Pengaturan</string>
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index 1edc352a4b..5969940e82 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -1,5 +1,77 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s sendi mynd.</string>
+    <string name="summary_user_sent_sticker">%1$s sendi límmerki.</string>
+
+    <string name="notice_room_invite_no_invitee">%s sendi boð um þátttöku</string>
+    <string name="notice_room_invite">%1$s bauð %2$s</string>
+    <string name="notice_room_invite_you">%1$s bauð þér</string>
+    <string name="notice_room_join">%1$s gekk í hópinn</string>
+    <string name="notice_room_leave">%1$s hætti</string>
+    <string name="notice_room_reject">%1$s hafnaði boðinu</string>
+    <string name="notice_room_kick">%1$s sparkaði %2$s</string>
+    <string name="notice_room_unban">%1$s afbannaði %2$s</string>
+    <string name="notice_room_ban">%1$s bannaði %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s breyttu auðkennismynd sinni</string>
+    <string name="notice_room_visibility_invited">allir meðlimir spjallrásar, síðan þeim var boðið.</string>
+    <string name="notice_room_visibility_joined">allir meðlimir spjallrásar, síðan þeir skráðu sig.</string>
+    <string name="notice_room_visibility_shared">allir meðlimir spjallrásar.</string>
+    <string name="notice_room_visibility_world_readable">hver sem er.</string>
+    <string name="notice_room_visibility_unknown">óþekktur (%s).</string>
+    <string name="notice_voip_started">VoIP-símafundur hafinn</string>
+    <string name="notice_voip_finished">VoIP-símafundi lokið</string>
+
+    <string name="notice_avatar_changed_too">(einnig var skipt um auðkennismynd)</string>
+    <string name="notice_crypto_unable_to_decrypt">** Mistókst að afkóða: %s **</string>
+
+    <string name="unable_to_send_message">Gat ekki sent skilaboð</string>
+
+    <string name="message_failed_to_upload">Gat ekki sent inn mynd</string>
+
+    <string name="network_error">Villa í netkerfi</string>
+    <string name="matrix_error">Villa í Matrix</string>
+
+    <string name="encrypted_message">Dulrituð skilaboð</string>
+
+    <string name="medium_email">Tölvupóstfang</string>
+    <string name="medium_phone_number">Símanúmer</string>
+
+    <string name="notice_room_withdraw">%1$s tók til baka boð frá %2$s</string>
+    <string name="notice_display_name_set">%1$s setti birtingarnafn sitt sem %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s breytti birtingarnafni sínu úr %2$s í %3$s</string>
+    <string name="notice_display_name_removed">%1$s fjarlægði birtingarnafn sitt (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s breytti umræðuefninu í: %2$s</string>
+    <string name="notice_room_name_changed">%1$s breytti heiti spjallrásarinnar í: %2$s</string>
+    <string name="notice_placed_video_call">%s hringdi myndsamtal.</string>
+    <string name="notice_placed_voice_call">%s hringdi raddsamtal.</string>
+    <string name="notice_answered_call">%s svaraði símtalinu.</string>
+    <string name="notice_ended_call">%s lauk símtalinu.</string>
+    <string name="notice_end_to_end">%1$s kveikti á enda-í-enda dulritun (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s bað um VoIP-símafund</string>
+    <string name="notice_room_name_removed">%1$s fjarlægði heiti spjallrásar</string>
+    <string name="notice_room_topic_removed">%1$s fjarlægði umfjöllunarefni spjallrásar</string>
+    <string name="notice_made_future_room_visibility">%1$s gerði ferilskrá spjallrásar héðan í frá sýnilega fyrir %2$s</string>
+    <string name="notice_profile_change_redacted">%1$s uppfærði notandasniðið sitt %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s sendi boð til %2$s um þátttöku í spjallrásinni</string>
+    <string name="notice_room_third_party_registered_invite">%1$s samþykkti boð um að taka þátt í %2$s</string>
+
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Tæki sendandans hefur ekki sent okkur dulritunarlyklana fyrir þessi skilaboð.</string>
+
+    <string name="could_not_redact">Gat ekki ritstýrt</string>
+    <string name="room_error_join_failed_empty_room">Ekki er í augnablikinu hægt að taka aftur þátt í spjallrás sem er tóm.</string>
+
+    <string name="room_displayname_room_invite">Boð á spjallrás</string>
+    <string name="room_displayname_two_members">%1$s og %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s og 1 annar</item>
+        <item quantity="other">%1$s og %2$d aðrir</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Tóm spjallrás</string>
+    <string name="room_displayname_invite_from">Boð frá %s</string>
     <string name="light_theme">Ljóst þema</string>
     <string name="dark_theme">Dökkt þema</string>
     <string name="black_theme">Svart þema</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index eb080ba7ad..3c5ff68b25 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1,5 +1,269 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s ha inviato un\'immagine.</string>
+    <string name="notice_room_invite_no_invitee">Invito di %s</string>
+    <string name="notice_room_invite">%1$s ha invitato %2$s</string>
+    <string name="notice_room_invite_you">%1$s ti ha invitato</string>
+    <string name="notice_room_join">%1$s è entrato nella stanza</string>
+    <string name="notice_room_leave">%1$s è uscito dalla stanza</string>
+    <string name="notice_room_reject">%1$s ha rifiutato l\'invito</string>
+    <string name="notice_room_kick">%1$s ha buttato fuori %2$s</string>
+    <string name="notice_room_unban">%1$s ha tolto il bando a %2$s</string>
+    <string name="notice_room_ban">%1$s ha bandito %2$s</string>
+    <string name="notice_room_withdraw">%1$s ha revocato l\'invito per %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s ha modificato il suo avatar</string>
+    <string name="notice_display_name_set">%1$s hanno cambiato il nome visualizzato con %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s ha cambiato il nome visualizzato da %2$s a %3$s</string>
+    <string name="notice_display_name_removed">%1$s ha rimosso il nome visibile (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s ha cambiato l\'argomento con: %2$s</string>
+    <string name="notice_room_name_changed">%1$s ha cambiato il nome della stanza con: %2$s</string>
+    <string name="notice_placed_video_call">%s ha iniziato una chiamata video.</string>
+    <string name="notice_placed_voice_call">%s ha iniziato una chiamata vocale.</string>
+    <string name="notice_answered_call">%s ha risposto alla chiamata.</string>
+    <string name="notice_ended_call">%s ha terminato la chiamata.</string>
+    <string name="notice_made_future_room_visibility">%1$s ha reso la futura cronologia della stanza visibile a %2$s</string>
+    <string name="notice_room_visibility_invited">tutti i membri della stanza, dal momento del loro invito.</string>
+    <string name="notice_room_visibility_joined">tutti i membri della stanza, dal momento in cui sono entrati.</string>
+    <string name="notice_room_visibility_shared">tutti i membri della stanza.</string>
+    <string name="notice_room_visibility_world_readable">chiunque.</string>
+    <string name="notice_room_visibility_unknown">sconosciuto (%s).</string>
+    <string name="notice_end_to_end">%1$s ha attivato la crittografia end-to-end (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s ha richiesto una conferenza VoIP</string>
+    <string name="notice_voip_started">Conferenza VoIP iniziata</string>
+    <string name="notice_voip_finished">Conferenza VoIP terminata</string>
+    <string name="notice_avatar_changed_too">(anche l\'avatar è cambiato)</string>
+    <string name="notice_room_name_removed">%1$s ha rimosso il nome della stanza</string>
+    <string name="notice_room_topic_removed">%1$s ha rimosso l\'argomento della stanza</string>
+    <string name="notice_profile_change_redacted">%1$s ha aggiornato il profilo %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s ha mandato un invito a %2$s per unirsi alla stanza</string>
+    <string name="notice_room_third_party_registered_invite">%1$s ha accettato l\'invito per %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Impossibile decriptare: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Il dispositivo del mittente non ci ha inviato le chiavi per questo messaggio.</string>
+    <string name="could_not_redact">Impossibile revisionare</string>
+    <string name="unable_to_send_message">Impossibile inviare il messaggio</string>
+    <string name="message_failed_to_upload">Invio dell\'immagine fallito</string>
+    <string name="network_error">Errore di rete</string>
+    <string name="matrix_error">Errore di Matrix</string>
+    <string name="room_error_join_failed_empty_room">Al momento non è possibile rientrare in una stanza vuota.</string>
+    <string name="encrypted_message">Messaggio criptato</string>
+    <string name="medium_email">Indirizzo email</string>
+    <string name="medium_phone_number">Numero di telefono</string>
+    <string name="summary_user_sent_sticker">%1$s ha inviato un adesivo.</string>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Invito da %s</string>
+    <string name="room_displayname_room_invite">Invito nella stanza</string>
+    <string name="room_displayname_two_members">%1$s e %2$s</string>
+    <string name="room_displayname_empty_room">Stanza vuota</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s e 1 altro</item>
+        <item quantity="other">%1$s e %2$d altri</item>
+    </plurals>
+    <string name="notice_event_redacted">Messaggio rimosso</string>
+    <string name="notice_event_redacted_by">Messaggio rimosso da %1$s</string>
+    <string name="notice_event_redacted_with_reason">Messaggio rimosso [motivo: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Messaggio rimosso da %1$s [motivo: %2$s]</string>
+    <string name="initial_sync_start_importing_account">Sync iniziale:
+\nImportazione account…</string>
+    <string name="initial_sync_start_importing_account_crypto">Sync iniziale:
+\nImportazione cifratura</string>
+    <string name="initial_sync_start_importing_account_rooms">Sync iniziale:
+\nImportazione stanze</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Sync iniziale:
+\nImportazione stanze partecipate</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Sync iniziale:
+\nImportazione stanze invitate</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sync iniziale:
+\nImportazione stanze lasciate</string>
+    <string name="initial_sync_start_importing_account_groups">Sync iniziale:
+\nImportazione comunità</string>
+    <string name="initial_sync_start_importing_account_data">Sync iniziale:
+\nImportazione dati account</string>
+    <string name="notice_room_update">%s ha aggiornato questa stanza.</string>
+    <string name="event_status_sending_message">Invio messaggio in corso …</string>
+    <string name="clear_timeline_send_queue">Cancella la coda di invio</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s ha revocato l\'invito a %2$s di unirsi alla stanza</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Invito di %1$s. Motivo: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s ha invitato %2$s. Motivo: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s ti ha invitato. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s è entrato nella stanza. Motivo: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s è uscito dalla stanza. Motivo: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s ha rifiutato l\'invito. Motivo: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s ha buttato fuori %2$s. Motivo: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s ha riammesso %2$s. Motivo: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s ha bandito %2$s. Motivo: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s ha inviato un invito a %2$s di unirsi alla stanza. Motivo: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s ha revocato l\'invito a %2$s di unirsi alla stanza. Motivo: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s ha accettato l\'invito per %2$s. Motivo: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s ha rifiutato l\'invito di %2$s. Motivo: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s ha aggiunto %2$s come indirizzo per questa stanza.</item>
+        <item quantity="other">%1$s ha aggiunto %2$s come indirizzi per questa stanza.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s ha rimosso %2$s come indirizzo per questa stanza.</item>
+        <item quantity="other">%1$s ha rimosso %2$s come indirizzi per questa stanza.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s ha aggiunto %2$s e rimosso %3$s come indirizzi per questa stanza.</string>
+    <string name="notice_room_canonical_alias_set">%1$s ha impostato l\'indirizzo principale per questa stanza a %2$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s ha rimosso l\'indirizzo principale per questa stanza.</string>
+    <string name="notice_room_guest_access_can_join">%1$s ha permesso l\'accesso alla stanza per gli ospiti.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza per gli ospiti.</string>
+    <string name="notice_end_to_end_ok">%1$s ha attivato la cifratura end-to-end.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s ha attivato la cifratura end-to-end (algoritmo %2$s non riconosciuto).</string>
+    <string name="notice_room_created">%1$s ha creato la stanza</string>
+    <string name="summary_you_sent_image">Hai inviato un\'immagine.</string>
+    <string name="summary_you_sent_sticker">Hai inviato un adesivo.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Il tuo invito</string>
+    <string name="notice_room_created_by_you">Hai creato la stanza</string>
+    <string name="notice_room_invite_by_you">Hai invitato %1$s</string>
+    <string name="notice_room_join_by_you">Sei entrato nella stanza</string>
+    <string name="notice_room_leave_by_you">Sei uscito dalla stanza</string>
+    <string name="notice_room_reject_by_you">Hai rifiutato l\'invito</string>
+    <string name="notice_room_kick_by_you">Hai buttato fuori %1$s</string>
+    <string name="notice_room_unban_by_you">Hai riammesso %1$s</string>
+    <string name="notice_room_ban_by_you">Hai bandito %1$s</string>
+    <string name="notice_room_withdraw_by_you">Hai ritirato l\'invito di %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Hai cambiato il tuo avatar</string>
+    <string name="notice_display_name_set_by_you">Hai impostato il tuo nome visualizzato a %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Hai cambiato il tuo nome visualizzato da %1$s a %2$s</string>
+    <string name="notice_display_name_removed_by_you">Hai rimosso il tuo nome visibile (era %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Hai cambiato l\'argomento a: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s ha modificato l\'avatar della stanza</string>
+    <string name="notice_room_avatar_changed_by_you">Hai modificato l\'avatar della stanza</string>
+    <string name="notice_room_name_changed_by_you">Hai cambiato il nome della stanza a: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Hai iniziato una videochiamata.</string>
+    <string name="notice_placed_voice_call_by_you">Hai iniziato una telefonata.</string>
+    <string name="notice_call_candidates">%s ha inviato dati per impostare la chiamata.</string>
+    <string name="notice_call_candidates_by_you">Hai inviato dati per impostare la chiamata.</string>
+    <string name="notice_answered_call_by_you">Hai risposto alla chiamata.</string>
+    <string name="notice_ended_call_by_you">Hai terminato la chiamata.</string>
+    <string name="notice_made_future_room_visibility_by_you">Hai reso visibile la futura cronologia della stanza a %1$s</string>
+    <string name="notice_end_to_end_by_you">Hai attivato la crittografia end-to-end (%1$s)</string>
+    <string name="notice_room_update_by_you">Hai aggiornato questa stanza.</string>
+    <string name="notice_requested_voip_conference_by_you">Hai richiesto una conferenza VoIP</string>
+    <string name="notice_room_name_removed_by_you">Hai rimosso il nome della stanza</string>
+    <string name="notice_room_topic_removed_by_you">Hai rimosso l\'argomento della stanza</string>
+    <string name="notice_room_avatar_removed">%1$s ha rimosso l\'avatar della stanza</string>
+    <string name="notice_room_avatar_removed_by_you">Hai rimosso l\'avatar della stanza</string>
+    <string name="notice_profile_change_redacted_by_you">Hai aggiornato il tuo profilo %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Hai mandato un invito a %1$s a unirsi alla stanza</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Hai revocato l\'invito per %1$s a unirsi alla stanza</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Hai accettato l\'invito per %1$s</string>
+    <string name="notice_widget_added">%1$s ha aggiunto il widget %2$s</string>
+    <string name="notice_widget_added_by_you">Hai aggiunto il widget %1$s</string>
+    <string name="notice_widget_removed">%1$s ha rimosso il widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Hai rimosso il widget %1$s</string>
+    <string name="notice_widget_modified">%1$s ha modificato il widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Hai modificato il widget %1$s</string>
+    <string name="power_level_admin">Amministratore</string>
+    <string name="power_level_moderator">Moderatore</string>
+    <string name="power_level_default">Predefinito</string>
+    <string name="power_level_custom">Personalizzato (%1$d)</string>
+    <string name="power_level_custom_no_value">Personalizzato</string>
+    <string name="notice_power_level_changed_by_you">Hai cambiato il livello di potere di %1$s.</string>
+    <string name="notice_power_level_changed">%1$s ha cambiato il livello di potere di %2$s.</string>
+    <string name="notice_power_level_diff">%1$s da %2$s a %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Il tuo invito. Motivo: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Hai invitato %1$s. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Sei entrato nella stanza. Motivo: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Sei uscito dalla stanza. Motivo: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Hai rifiutato l\'invito. Motivo: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Hai buttato fuori %1$s. Motivo: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Hai riammesso %1$s. Motivo: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Hai bandito %1$s. Motivo: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Hai mandato un invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Hai revocato l\'invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Hai accettato l\'invito per %1$s. Motivo: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Hai ritirato l\'invito di %1$s. Motivo: %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Hai aggiunto %1$s come indirizzo per questa stanza.</item>
+        <item quantity="other">Hai aggiunto %1$s come indirizzi per questa stanza.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Hai rimosso %1$s come indirizzo per questa stanza.</item>
+        <item quantity="other">Hai rimosso %1$s come indirizzi per questa stanza.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">Hai aggiunto %1$s e rimosso %2$s come indirizzi per questa stanza.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Hai impostato l\'indirizzo principale per questa stanza a %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Hai rimosso l\'indirizzo principale per questa stanza.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Hai permesso l\'accesso alla stanza per gli ospiti.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza per gli ospiti.</string>
+    <string name="notice_end_to_end_ok_by_you">Hai attivato la crittografia end-to-end.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia end-to-end (algoritmo %1$s sconosciuto).</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza agli ospiti.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza agli ospiti.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Hai permesso l\'accesso agli ospiti.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s ha permesso l\'accesso agli ospiti.</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Sei entrato. Motivo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Sei uscito. Motivo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s è uscito. Motivo: %2$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s è entrato. Motivo: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Hai revocato l\'invito per %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s ha revocato l\'invito per %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Hai invitato %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s ha invitato %2$s</string>
+    <string name="notice_direct_room_update_by_you">Hai aggiornato la stanza.</string>
+    <string name="notice_direct_room_update">%s ha aggiornato la stanza.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Hai reso visibili i messaggi futuri a %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s ha reso visibili i messaggi futuri a %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Sei uscito dalla stanza</string>
+    <string name="notice_direct_room_leave">%1$s è uscito dalla stanza</string>
+    <string name="notice_direct_room_join_by_you">Sei entrato</string>
+    <string name="notice_direct_room_join">%1$s è entrato</string>
+    <string name="notice_direct_room_created_by_you">Hai creato la discussione</string>
+    <string name="notice_direct_room_created">%1$s ha creato la discussione</string>
+    <string name="room_displayname_empty_room_was">Stanza vuota (era %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s e %4$d altro</item>
+        <item quantity="other">%1$s, %2$s, %3$s e altri %4$d</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s e %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s e %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Tutti i server sono banditi dalla partecipazione! Questa stanza non può più essere usata.</string>
+    <string name="notice_room_server_acl_updated_no_change">Nessuna modifica.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• I server che corrispondono a IP letterali ora sono banditi.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• I server che corrispondono a IP letterali ora sono permessi.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• I server che corrispondono a %s sono stati rimossi dalla lista dei consentiti.</string>
+    <string name="notice_room_server_acl_updated_allowed">• I server che corrispondono a %s ora sono permessi.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• I server che corrispondono a %s sono stati rimossi dalla lista di ban.</string>
+    <string name="notice_room_server_acl_updated_banned">• I server che corrispondono a %s ora sono banditi.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Hai cambiato le ACL del server per questa stanza.</string>
+    <string name="notice_room_server_acl_updated_title">%s ha cambiato le ACL del server per questa stanza.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• I server che corrispondono a IP letterali sono banditi.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• I server che corrispondono a IP letterali sono permessi.</string>
+    <string name="notice_room_server_acl_set_allowed">• I server che corrispondono a %s sono permessi.</string>
+    <string name="notice_room_server_acl_set_banned">• I server che corrispondono a %s sono banditi.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Hai impostato le ACL del server per questa stanza.</string>
+    <string name="notice_room_server_acl_set_title">%s ha impostato le ACL del server per questa stanza.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Hai cambiato gli indirizzi per questa stanza.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s ha cambiato gli indirizzi per questa stanza.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Hai cambiato gli indirizzi principali ed alternativi per questa stanza.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ha cambiato gli indirizzi principali ed alternativi per questa stanza.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Hai cambiato gli indirizzi alternativi per questa stanza.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s ha cambiato gli indirizzi alternativi per questa stanza.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Hai rimosso l\'indirizzo alternativo %1$s per questa stanza.</item>
+        <item quantity="other">Hai rimosso gli indirizzi alternativi %1$s per questa stanza.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s ha rimosso l\'indirizzo alternativo %2$s per questa stanza.</item>
+        <item quantity="other">%1$s ha rimosso gli indirizzi alternativi %2$s per questa stanza.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Hai aggiunto l\'indirizzo alternativo %1$s per questa stanza.</item>
+        <item quantity="other">Hai aggiunto gli indirizzi alternativi %1$s per questa stanza.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s ha aggiunto l\'indirizzo alternativo %2$s per questa stanza.</item>
+        <item quantity="other">%1$s ha aggiunto gli indirizzi alternativi %2$s per questa stanza.</item>
+    </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">Hai modificato la video conferenza</string>
+    <string name="notice_widget_jitsi_modified">Video conferenza modificata da %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Hai iniziato la video conferenza</string>
+    <string name="notice_widget_jitsi_removed_by_you">Hai terminato la video conferenza</string>
+    <string name="notice_widget_jitsi_removed">Video conferenza terminata da %1$s</string>
+    <string name="notice_widget_jitsi_added">Video conferenza iniziata da %1$s</string>
     <!-- titles -->
     <string name="title_activity_home">Messaggi</string>
     <string name="title_activity_room">Stanza</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 5919bb8df2..fbac648a40 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1,5 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$sが画像を送信しました。</string>
+    <string name="summary_user_sent_sticker">%1$sがスタンプを送信しました。</string>
+    <string name="notice_room_invite_no_invitee">%sの招待</string>
+    <string name="notice_room_invite">%1$sが%2$sを招待しました</string>
+    <string name="notice_room_invite_you">%1$sがあなたを招待しました</string>
+    <string name="notice_room_join">%1$sが参加しました</string>
+    <string name="notice_room_leave">%1$sが退出しました</string>
+    <string name="notice_room_reject">%1$sが招待を断りました</string>
+    <string name="notice_room_kick">%1$sが%2$sを追放しました</string>
+    <string name="notice_room_unban">%1$sが%2$sをブロック解除しました</string>
+    <string name="notice_room_ban">%1$sが%2$sをブロックしました</string>
+    <string name="notice_room_withdraw">%1$sが%2$sの招待を撤回しました</string>
+    <string name="notice_avatar_url_changed">%1$sがアバターを変更しました</string>
+    <string name="notice_display_name_set">%1$sが表示名を%2$sに設定しました</string>
+    <string name="notice_display_name_changed_from">%1$sが表示名を%2$sから%3$sに変更しました</string>
+    <string name="notice_display_name_removed">%1$sが表示名 (%2$s) を削除しました</string>
+    <string name="notice_room_topic_changed">%1$sがテーマを%2$sに変更しました</string>
+    <string name="notice_room_name_changed">%1$sが部屋名を%2$sに変更しました</string>
+    <string name="notice_placed_video_call">%sがビデオ通話を開始しました。</string>
+    <string name="notice_placed_voice_call">%sが音声通話を開始しました。</string>
+    <string name="notice_answered_call">%sが電話に出ました。</string>
+    <string name="notice_ended_call">%sが通話を終了しました。</string>
+    <string name="room_displayname_invite_from">%sさんからの招待</string>
+    <string name="room_displayname_room_invite">部屋への招待</string>
+    <string name="room_displayname_two_members">%1$sと%2$s</string>
+    <string name="room_displayname_empty_room">空の部屋</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$sと他%2$d名</item>
+    </plurals>
+    <string name="notice_made_future_room_visibility">%1$sは、今後の部屋履歴を%2$sに表示させました</string>
+    <string name="notice_room_visibility_invited">部屋のメンバー全員、招待された時点から。</string>
+    <string name="notice_room_visibility_joined">部屋のメンバー全員、参加した時点から。</string>
+    <string name="notice_room_visibility_shared">部屋のメンバー全員。</string>
+    <string name="notice_room_visibility_world_readable">誰でも。</string>
+    <string name="notice_room_visibility_unknown">不明 (%s)。</string>
+    <string name="notice_end_to_end">%1$s がエンドツーエンド暗号化を有効にしました (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s がVoIP会議をリクエストしました</string>
+    <string name="notice_voip_started">VoIP会議が開始されました</string>
+    <string name="notice_voip_finished">VoIP会議が終了しました</string>
+    <string name="notice_avatar_changed_too">(アバターも変更された)</string>
+    <string name="notice_room_name_removed">%1$s が部屋名を削除しました</string>
+    <string name="notice_room_topic_removed">%1$s がルームトピックを削除しました</string>
+    <string name="notice_profile_change_redacted">%1$s がプロフィール %2$s を更新しました</string>
+    <string name="notice_room_third_party_invite">%1$s は %2$s に部屋に参加するよう招待状を送りました</string>
+    <string name="notice_room_third_party_registered_invite">%1$sは%2$sの招待を受け入れました</string>
+    <string name="notice_crypto_unable_to_decrypt">** 解読できません: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">送信者の端末からこのメッセージのキーが送信されていません。</string>
+    <string name="could_not_redact">修正できませんでした</string>
+    <string name="unable_to_send_message">メッセージを送信できません</string>
+    <string name="message_failed_to_upload">画像のアップロードに失敗しました</string>
+    <string name="network_error">ネットワークエラー</string>
+    <string name="matrix_error">Matrixエラー</string>
+    <string name="room_error_join_failed_empty_room">現在空の部屋に再参加することはできません。</string>
+    <string name="encrypted_message">暗号化されたメッセージ</string>
+    <string name="medium_email">メールアドレス</string>
+    <string name="medium_phone_number">電話番号</string>
+    <string name="notice_room_avatar_changed_by_you">ルームのアバターを変更しました</string>
+    <string name="notice_room_avatar_changed">%1$sがルームのアバターを変更しました</string>
+    <string name="notice_room_topic_changed_by_you">トピックを%1$sに変更しました</string>
+    <string name="notice_display_name_removed_by_you">表示名を削除しました(%1$sでした)</string>
+    <string name="notice_display_name_changed_from_by_you">表示名を%1$sから%2$sに変更しました</string>
+    <string name="notice_display_name_set_by_you">表示名を%1$sに設定しました</string>
+    <string name="notice_avatar_url_changed_by_you">アバターを変更しました</string>
+    <string name="notice_room_withdraw_by_you">%1$sの招待を取り下げました</string>
+    <string name="notice_room_ban_by_you">%1$sをBANしました</string>
+    <string name="notice_room_unban_by_you">%1$sのBANを解除しました</string>
+    <string name="notice_room_kick_by_you">%1$sを退出させました</string>
+    <string name="notice_room_reject_by_you">招待を拒否しました</string>
+    <string name="notice_direct_room_leave_by_you">ルームから退出しました</string>
+    <string name="notice_direct_room_leave">%1$sがルームから退出しました</string>
+    <string name="notice_room_leave_by_you">ルームから退出しました</string>
+    <string name="notice_direct_room_join_by_you">参加しました</string>
+    <string name="notice_direct_room_join">%1$sが参加しました</string>
+    <string name="notice_room_join_by_you">ルームに参加しました</string>
+    <string name="notice_room_invite_by_you">%1$sを招待しました</string>
+    <string name="notice_direct_room_created_by_you">ディスカッションを作成しました</string>
+    <string name="notice_direct_room_created">%1$sがディスカッションを作成しました</string>
+    <string name="notice_room_created_by_you">ルームを作成しました</string>
+    <string name="notice_room_created">%1$sがルームを作成しました</string>
+    <string name="notice_room_invite_no_invitee_by_you">招待</string>
+    <string name="summary_you_sent_sticker">ステッカーを送信しました。</string>
+    <string name="summary_you_sent_image">画像を送信しました。</string>
     <string name="title_activity_room">部屋</string>
     <string name="title_activity_settings">設定</string>
     <string name="title_activity_historical">履歴</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index c374253000..3561ec153f 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -1,5 +1,195 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s t.yuzen tugna.</string>
+    <string name="summary_you_sent_image">Tuzneḍ tugna.</string>
+    <string name="notice_room_invite_no_invitee">Tinubga n %s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Tinubga-k•m</string>
+    <string name="notice_room_created">%1$s yesnulfa-d taxxamt</string>
+    <string name="notice_room_created_by_you">Tesnulfaḍ-d taxxamt-a</string>
+    <string name="notice_room_invite">%1$s inced-d %2$s</string>
+    <string name="notice_room_invite_by_you">Tnecdeḍ-d %1$s</string>
+    <string name="notice_room_invite_you">%1$s inced-ik-id</string>
+    <string name="notice_room_join">%1$s yedda ɣer texxamt</string>
+    <string name="notice_room_join_by_you">Teddiḍ ɣer texxamt</string>
+    <string name="notice_room_leave">%1$s yeǧǧa taxxamt</string>
+    <string name="notice_room_leave_by_you">Teǧǧiḍ taxxamt</string>
+    <string name="notice_room_reject">%1$s yugi/tugi tinubga</string>
+    <string name="notice_room_reject_by_you">Tufiḍ tinubga</string>
+    <string name="notice_room_kick">%1$s yessufeɣ %2$s</string>
+    <string name="notice_room_kick_by_you">Tessufɣeḍ %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Tbeddleḍ avatar-inek·inem</string>
+    <string name="power_level_admin">Anedbal</string>
+    <string name="power_level_moderator">Aseɣyad</string>
+    <string name="power_level_default">Amezwer</string>
+    <string name="power_level_custom_no_value">Sagen</string>
+    <string name="notice_power_level_diff">%1$s seg %2$s ɣer %3$s</string>
+    <string name="message_failed_to_upload">Tegguma ad d-tali tugna</string>
+    <string name="medium_email">Tansa n yimayl</string>
+    <string name="summary_user_sent_sticker">%1$s azen astiker.</string>
+    <string name="summary_you_sent_sticker">Tuzneḍ amenṭaḍ.</string>
+    <string name="notice_room_unban">%1$s yekkes agdal i %2$s</string>
+    <string name="notice_room_unban_by_you">Tekkseḍ agdal i %1$s</string>
+    <string name="notice_room_ban">%1$s igdel %2$s</string>
+    <string name="notice_room_ban_by_you">Tgedleḍ %1$s</string>
+    <string name="notice_room_withdraw">%1$s issefsex tinubga n %2$s</string>
+    <string name="notice_room_withdraw_by_you">Tesfesxeḍ tinubga n %1$s</string>
+    <string name="notice_avatar_url_changed">%1$s ibeddel avatar-is</string>
+    <string name="notice_display_name_set">%1$s isbadu isem-is i d-ittuseknen ɣer %2$s</string>
+    <string name="notice_display_name_set_by_you">Tesbaduḍ isem-ik•im i d-ittuseknen ɣer %1$s</string>
+    <string name="notice_display_name_changed_from">%1$s ibeddel isem-is i d-ittuseknen seg %2$s ɣer %3$s</string>
+    <string name="notice_display_name_changed_from_by_you">Tbeddleḍ isem-ik•im i d-ittuseknen seg %1$s ɣer %2$s</string>
+    <string name="notice_display_name_removed">%1$s yekkes isem-is i d-ittuseknen (yella %2$s)</string>
+    <string name="notice_display_name_removed_by_you">Tekkseḍ isem-ik·im yettwaskanen (d %1$s)</string>
+    <string name="notice_room_topic_changed">%1$s isnifel asentel s: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">Tesnifleḍ asentel s: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s ibeddel avaṭar n texxamt</string>
+    <string name="notice_room_avatar_changed_by_you">Tbeddleḍ avaṭar n texxamt</string>
+    <string name="notice_room_name_changed">%1$s ibeddel isem n texxamt s: %2$s</string>
+    <string name="notice_room_name_changed_by_you">Tbeddleḍ isem n texxamt s: %1$s</string>
+    <string name="notice_placed_video_call">%s isɛedda siwel s tvidyut.</string>
+    <string name="notice_placed_video_call_by_you">Tesɛeddaḍ siwel s tvidyut.</string>
+    <string name="notice_placed_voice_call">%s isɛedda asiwel s taɣect.</string>
+    <string name="notice_placed_voice_call_by_you">Tesɛeddaḍ siwel s taɣect.</string>
+    <string name="notice_call_candidates">%s yuzen isefka i usbadu n usiwel.</string>
+    <string name="notice_call_candidates_by_you">Tuzneḍ isefka i usbadu n usiwel.</string>
+    <string name="notice_answered_call">%s yerra ɣef usiwel.</string>
+    <string name="notice_answered_call_by_you">Terriḍ ɣef usiwel.</string>
+    <string name="notice_ended_call">%s iḥbes asiwel.</string>
+    <string name="notice_ended_call_by_you">Tḥebseḍ asiwel.</string>
+    <string name="notice_room_visibility_invited">meṛṛa iɛeggalen n texxamt, segmi ara d-ttwanecden.</string>
+    <string name="notice_room_visibility_joined">meṛṛa iɛeggalen n texamt, segmi ara d-rnun.</string>
+    <string name="notice_room_visibility_shared">meṛṛa iɛeggalen n texxamt.</string>
+    <string name="notice_room_visibility_world_readable">yal yiwen.</string>
+    <string name="notice_room_visibility_unknown">arussin (%s).</string>
+    <string name="notice_end_to_end">%1$s isermed awgelhen seg yixef ɣer yixef (%2$s)</string>
+    <string name="notice_end_to_end_by_you">Tesremdeḍ awgelhen seg yixef ɣer yixef (%1$s)</string>
+    <string name="notice_room_update">%s ileqqem taxxamt-a.</string>
+    <string name="notice_room_update_by_you">Tleqqmeḍ taxxamt-a.</string>
+    <string name="notice_requested_voip_conference">%1$s isuter-d asarag VoIP</string>
+    <string name="notice_requested_voip_conference_by_you">Tsutreḍ-d asarag VoIP</string>
+    <string name="notice_voip_started">Asarag VoIP yebda</string>
+    <string name="notice_voip_finished">Asarag VoIP yekfa</string>
+    <string name="notice_avatar_changed_too">(avatar daɣen ibeddel)</string>
+    <string name="notice_room_name_removed">%1$s yekkes isem n texxamt</string>
+    <string name="notice_room_name_removed_by_you">Tekkseḍ isem n texxamt</string>
+    <string name="notice_room_topic_removed">%1$s yekkes asentel n texxamt</string>
+    <string name="notice_room_topic_removed_by_you">Tekkseḍ asentel n texxamt</string>
+    <string name="notice_room_avatar_removed">%1$s yekkes avatar n texxamt</string>
+    <string name="notice_room_avatar_removed_by_you">Tekkseḍ avatar n texxamt</string>
+    <string name="notice_event_redacted">Izen ittwakkes</string>
+    <string name="notice_event_redacted_by">Izen ittwakkes sɣur %1$s</string>
+    <string name="notice_event_redacted_with_reason">Izen ittwakkes [tamentilt: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Izen ittwakkes sɣur %1$s [tamentilt: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s ileqqem amaɣnu-ines %2$s</string>
+    <string name="notice_profile_change_redacted_by_you">Tleqqmeḍ amaɣnu-inek•inem %1$s</string>
+    <string name="notice_room_third_party_invite">%1$s yuzen tinubga i %2$s akken ad yeddu ɣer texxamt</string>
+    <string name="notice_room_third_party_invite_by_you">Tuzneḍ tinubga i %1$s akken ad yeddu ɣer texxamt</string>
+    <string name="notice_room_third_party_registered_invite">%1$s iqbel tinubga i %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Tqebleḍ tinubga i %1$s</string>
+    <string name="notice_widget_added">%1$s yerna awiǧit %2$s</string>
+    <string name="notice_widget_added_by_you">Terniḍ awiǧit %1$s</string>
+    <string name="notice_widget_removed">%1$s yekkes awiǧit %2$s</string>
+    <string name="notice_widget_removed_by_you">Tekkseḍ awiǧit %1$s</string>
+    <string name="notice_widget_modified">%1$s ibeddel awiǧit %2$s</string>
+    <string name="notice_widget_modified_by_you">Tbeddleḍ awiǧit %1$s</string>
+    <string name="power_level_custom">Sagen (%1$d)</string>
+    <string name="notice_power_level_changed_by_you">Tbeddleḍ aswir n tezmert n %1$s.</string>
+    <string name="notice_power_level_changed">%1$s ibeddel aswir n tezmert n %2$s.</string>
+    <string name="notice_crypto_unable_to_decrypt">** Awgelhen d awezɣi: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Ibenk n umazan ur aɣ-d-yuzin ara tisura i yizen-a.</string>
+    <string name="unable_to_send_message">Tuzna n yizen d tawezɣit</string>
+    <string name="network_error">Tuccḍa deg uẓeṭṭa</string>
+    <string name="matrix_error">Tuccḍa deg Matrix</string>
+    <string name="notice_made_future_room_visibility">%1$s iga amazray n texxamyt i d-iteddun yettban i %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Tgiḍ amazray n texxamyt i d-iteddun yettban i %1$s</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s issefsax tinubga i %2$s i wakken ad d-yekcem ɣer texxamt</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Tesfesxeḍ tinubga i %1$s i wakken ad d-yernu ɣer texxamt</string>
+    <string name="room_error_join_failed_empty_room">D awezɣi tura ad nales ad nuɣal ɣer texxamt tilemt.</string>
+    <string name="encrypted_message">Izen yettwawgelhen</string>
+    <string name="medium_phone_number">Uṭṭun n tiliɣri</string>
+    <string name="room_displayname_invite_from">Tinubga sɣur %s</string>
+    <string name="room_displayname_room_invite">Tinubga ɣer texxamt</string>
+    <string name="room_displayname_two_members">%1$s d %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s d 1 wayeḍ</item>
+        <item quantity="other">%1$s d %2$d wiyaḍ</item>
+    </plurals>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef (alguritm %1$s ur yettwassen ara).</string>
+    <string name="room_displayname_empty_room">Taxxamt tilemt</string>
+    <string name="initial_sync_start_importing_account">Amtawi n tazwara:
+\nAktar n umiḍan…</string>
+    <string name="initial_sync_start_importing_account_crypto">Amtawi n tazwara:
+\nAktar n uwgelhen</string>
+    <string name="initial_sync_start_importing_account_rooms">Amtawi n tazwara:
+\nAktar n texxamin</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Amtawi n tazwara:
+\nAktar n texxamin iɣer terniḍ</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Amtawi n tazwara:
+\nAktar n texxamin iɣer tettwanecdeḍ</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Amtawi n tazwara:
+\nAktar n texxamin i teǧǧiḍ</string>
+    <string name="initial_sync_start_importing_account_groups">Amtawi n tazwara:
+\nAktar n tmezdagnutin</string>
+    <string name="initial_sync_start_importing_account_data">Amtawi n tazwara:
+\nAktar n yisefka n umiḍan</string>
+    <string name="event_status_sending_message">Tuzzna n yizen…</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Tinubga n %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Tinubga-k•m. Tamentilt: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s inced %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Tnecdeḍ %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s inced-ik•ikem. Tamentilt: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s yedda ɣer texxamt. Tamentilt: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Teddiḍ ɣer texxamt. Tamentilt: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s yeǧǧa taxxamt. Tamentilt: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Teǧǧiḍ taxxamt. Tamentilt: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s yugi tinubga. Tamentilt: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Tugiḍ tinubga. Tamentilt: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s yessufeɣ %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Tessufɣeḍ %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s yekkes agdal i %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Tekkseḍ agdal i %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s igdel %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Tgedleḍ %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s yuzen tinubga i %2$s akken ad yeddu ɣer texxamt. Tamentilt: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Tuzneḍ tinubga i %1$s iwakken ad yeddu ɣer texxamt. Tamentilt: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s iqbel tinubga i %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Tqebleḍ tinubga i %1$s. Tamentilt: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s issefsex tinubga n %2$s. Tamentilt: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Tesfesxeḍ tinubga n %1$s. Tamentilt: %2$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s yerna %2$s d tansa i texxamt-a.</item>
+        <item quantity="other">%1$s yerna %2$s d tansiwin i texxamt-a.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Terniḍ %1$s d tansa i texxamt-a.</item>
+        <item quantity="other">Terniḍ %1$s d tansiwin i texxamt-a.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s yekkes %2$s am tansa i texxamt-a.</item>
+        <item quantity="other">%1$s yekkes %3$s am tansiwin i texxamt-a.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Tekkseḍ %1$s am tansa i texxamt-a.</item>
+        <item quantity="other">Tekkseḍ %1$s am tansiwin i texxamt-a.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s yerna %2$s terniḍ tekkseḍ %3$s am tansiwin i texxamt-a.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Terniḍ %1$s terniḍ tekkseḍ %2$s am tansiwin i texxamt-a.</string>
+    <string name="notice_room_canonical_alias_set">%1$s isbadu %2$s am tansa tagejdant i texxamt-a.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Tesbaduḍ %1$s am tansa tagejdant i texxamt-a.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s yekkes tansa tagejdant i texxamt-a.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Tekkseḍ tansa tagejdant i texxamt-a.</string>
+    <string name="notice_room_guest_access_can_join">%1$s isireg inebgawen ad ddun ɣer texxamt.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Tsirgeḍ inebgawen ad ddun ɣer texxamt.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s issewḥel inebgawen iwakken ur tteddun ara ɣer texxamt.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Tesweḥleḍ inebgawen iwakken ur tteddun ara ɣer texxamt.</string>
+    <string name="notice_end_to_end_ok">%1$s yermed awgelhen seg yixef ɣer yixef.</string>
+    <string name="notice_end_to_end_ok_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s yermed awgelhen seg yixef ɣer yixef (alguritm %2$s ur yettwassen ara).</string>
+    <string name="clear_timeline_send_queue">Sfeḍ tabdart n uraǧu n tuzzna</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s issefsex tinubga n %2$s i tmerniwt ɣer texxamt. Tamentilt: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Tesfesxeḍ tinubga n %1$s i tmerna ɣer texxamt. Tamentilt: %2$s</string>
+    <string name="could_not_redact">Yegguma ad yaru</string>
     <string name="light_theme">Asentel aceɛlal</string>
     <string name="dark_theme">Asentel n yiḍ</string>
     <string name="black_theme">Asentel aberkan</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 0f3cbf4ff5..030786056c 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -1,5 +1,103 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="notice_room_invite_no_invitee">%s님의 초대</string>
+    <string name="summary_user_sent_image">%1$s님이 사진을 보냈습니다.</string>
+    <string name="summary_user_sent_sticker">%1$s님이 스티커를 보냈습니다.</string>
+
+    <string name="notice_room_invite">%1$s님이 %2$s님을 초대했습니다</string>
+    <string name="notice_room_invite_you">%1$s님이 당신을 초대했습니다</string>
+    <string name="notice_room_join">%1$s님이 참가했습니다</string>
+    <string name="notice_room_leave">%1$s님이 떠났습니다</string>
+    <string name="notice_room_reject">%1$s님이 초대를 거부했습니다</string>
+    <string name="notice_room_kick">%1$s님이 %2$s님을 추방했습니다</string>
+    <string name="notice_room_unban">%1$s님이 %2$s님의 출입 금지를 풀었습니다</string>
+    <string name="notice_room_ban">%1$s님이 %2$s님을 출입 금지했습니다</string>
+    <string name="notice_room_withdraw">%1$s님이 %2$s님의 초대를 취소했습니다</string>
+    <string name="notice_avatar_url_changed">%1$s님이 아바타를 변경했습니다</string>
+    <string name="notice_display_name_set">%1$s님이 표시 이름을 %2$s(으)로 설정했습니다</string>
+    <string name="notice_display_name_changed_from">%1$s님이 표시 이름을 %2$s에서 %3$s(으)로 변경했습니다</string>
+    <string name="notice_display_name_removed">%1$s님이 표시 이름을 삭제했습니다 (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s님이 주제를 다음으로 변경했습니다: %2$s</string>
+    <string name="notice_room_name_changed">%1$s님이 방 이름을 다음으로 변경했습니다: %2$s</string>
+    <string name="notice_placed_video_call">%s님이 영상 통화를 걸었습니다.</string>
+    <string name="notice_placed_voice_call">%s님이 음성 통화를 걸었습니다.</string>
+    <string name="notice_answered_call">%s님이 전화를 받았습니다.</string>
+    <string name="notice_ended_call">%s님이 전화를 끊었습니다.</string>
+    <string name="notice_made_future_room_visibility">%1$s님이 이후 %2$s에게 방 기록을 공개했습니다</string>
+    <string name="notice_room_visibility_invited">초대된 시점부터 모든 방 구성원</string>
+    <string name="notice_room_visibility_joined">들어온 시점부터 모든 방 구성원</string>
+    <string name="notice_room_visibility_shared">모든 방 구성원</string>
+    <string name="notice_room_visibility_world_readable">누구나.</string>
+    <string name="notice_room_visibility_unknown">알 수 없음 (%s).</string>
+    <string name="notice_end_to_end">%1$s님이 종단간 암호화를 켰습니다 (%2$s)</string>
+    <string name="notice_room_update">%s님이 방을 업그레이드했습니다.</string>
+
+    <string name="notice_requested_voip_conference">%1$s님이 VoIP 회의를 요청했습니다</string>
+    <string name="notice_voip_started">VoIP 회의가 시작했습니다</string>
+    <string name="notice_voip_finished">VoIP 회의가 끝났습니다</string>
+
+    <string name="notice_avatar_changed_too">(아바타도 변경됨)</string>
+    <string name="notice_room_name_removed">%1$s님이 방 이름을 삭제했습니다</string>
+    <string name="notice_room_topic_removed">%1$s님이 방 주제를 삭제했습니다</string>
+    <string name="notice_event_redacted">메시지가 삭제되었습니다</string>
+    <string name="notice_event_redacted_by">메시지가 %1$s님에 의해 삭제되었습니다</string>
+    <string name="notice_event_redacted_with_reason">메시지가 삭제되었습니다 [이유: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">메시지가 %1$s님에 의해 삭제되었습니다 [이유: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s님이 프로필 %2$s을(를) 업데이트했습니다</string>
+    <string name="notice_room_third_party_invite">%1$s님이 %2$s님에게 방 초대를 보냈습니다</string>
+    <string name="notice_room_third_party_registered_invite">%1$s님이 %2$s의 초대를 수락했습니다</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** 암호를 복호화할 수 없음: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">발신인의 기기에서 이 메시지의 키를 보내지 않았습니다.</string>
+
+    <string name="could_not_redact">검열할 수 없습니다</string>
+    <string name="unable_to_send_message">메시지를 보낼 수 없습니다</string>
+
+    <string name="message_failed_to_upload">사진 업로드에 실패했습니다</string>
+
+    <string name="network_error">네트워크 오류</string>
+    <string name="matrix_error">Matrix 오류</string>
+
+    <string name="room_error_join_failed_empty_room">현재 빈 방에 다시 들어갈 수 없습니다.</string>
+
+    <string name="encrypted_message">암호화된 메시지</string>
+
+    <string name="medium_email">이메일 주소</string>
+    <string name="medium_phone_number">전화번호</string>
+
+    <string name="room_displayname_invite_from">%s에서 초대함</string>
+    <string name="room_displayname_room_invite">방 초대</string>
+
+    <string name="room_displayname_two_members">%1$s님과 %2$s님</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s님 외 %2$d명</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">빈 방</string>
+
+    <string name="initial_sync_start_importing_account">초기 동기화:
+\n계정 가져오는 중…</string>
+    <string name="initial_sync_start_importing_account_crypto">초기 동기화:
+\n암호 가져오는 중</string>
+    <string name="initial_sync_start_importing_account_rooms">초기 동기화:
+\n방 가져오는 중</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">초기 동기화:
+\n들어간 방 가져오는 중</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">초기 동기화:
+\n초대받은 방 가져오는 중</string>
+    <string name="initial_sync_start_importing_account_left_rooms">초기 동기화:
+\n떠난 방 가져오는 중</string>
+    <string name="initial_sync_start_importing_account_groups">초기 동기화:
+\n커뮤니티 가져오는 중</string>
+    <string name="initial_sync_start_importing_account_data">초기 동기화:
+\n계정 데이터 가져오는 중</string>
+
+    <string name="event_status_sending_message">메시지 보내는 중…</string>
+    <string name="clear_timeline_send_queue">전송 대기 열 지우기</string>
+
+    <string name="notice_room_third_party_revoked_invite">%1$s님이 %2$s님에게 방에 참가하라고 보낸 초대를 취소했습니다</string>
     <string name="light_theme">밝은 테마</string>
     <string name="dark_theme">어두운 테마</string>
     <string name="black_theme">검정 테마</string>
diff --git a/vector/src/main/res/values-lt/strings.xml b/vector/src/main/res/values-lt/strings.xml
index a6b3daec93..db63c9385a 100644
--- a/vector/src/main/res/values-lt/strings.xml
+++ b/vector/src/main/res/values-lt/strings.xml
@@ -1,2 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s išsiuntė vaizdą.</string>
+    <string name="summary_user_sent_sticker">%1$s išsiuntė lipduką.</string>
+    <string name="notice_room_invite_no_invitee">%s pakvietimas</string>
+    <string name="notice_room_join_by_you">Jūs prisijungėte prie kambario</string>
+    <string name="notice_room_join">%1$s prisijungė prie kambario</string>
+    <string name="notice_room_invite_you">%1$s pakvietė jus</string>
+    <string name="notice_room_invite_by_you">Jūs pakvietėte %1$s</string>
+    <string name="notice_room_invite">%1$s pakvietė %2$s</string>
+    <string name="notice_direct_room_created_by_you">Jūs sukūrėte diskusiją</string>
+    <string name="notice_direct_room_created">%1$s sukūrė diskusiją</string>
+    <string name="notice_room_created_by_you">Jūs sukūrėte kambarį</string>
+    <string name="notice_room_created">%1$s sukūrė kambarį</string>
+    <string name="notice_room_invite_no_invitee_by_you">Jūsų pakvietimas</string>
+    <string name="summary_you_sent_sticker">Jūs išsiuntėte lipduką.</string>
+    <string name="summary_you_sent_image">Jūs išsiuntėte vaizdą.</string>
+    <string name="notice_room_withdraw_by_you">Jūs atšaukėte %1$s pakvietimą</string>
+    <string name="notice_room_withdraw">%1$s atšaukė %2$s pakvietimą</string>
+    <string name="notice_room_ban_by_you">Jūs užblokavote %1$s</string>
+    <string name="notice_room_ban">%1$s užblokavo %2$s</string>
+    <string name="notice_room_unban_by_you">Jūs atblokavote %1$s</string>
+    <string name="notice_room_unban">%1$s atblokavo %2$s</string>
+    <string name="notice_room_kick_by_you">Jūs išmetėte %1$s</string>
+    <string name="notice_room_kick">%1$s išmetė %2$s</string>
+    <string name="notice_room_reject_by_you">Jūs atmetėte pakvietimą</string>
+    <string name="notice_room_reject">%1$s atmetė pakvietimą</string>
+    <string name="notice_direct_room_leave_by_you">Jūs išėjote iš kambario</string>
+    <string name="notice_direct_room_leave">%1$s išėjo iš kambario</string>
+    <string name="notice_room_leave_by_you">Jūs išėjote iš kambario</string>
+    <string name="notice_room_leave">%1$s išėjo iš kambario</string>
+    <string name="notice_direct_room_join_by_you">Jūs prisijungėte</string>
+    <string name="notice_direct_room_join">%1$s prisijungė</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 06b9ce4c02..1ee9e4ee61 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -1,5 +1,246 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s nosūtīja attēlu.</string>
+    <string name="notice_room_invite_no_invitee">Uzaicinājums no %s</string>
+    <string name="notice_room_invite">%1$s uzaicināja %2$s</string>
+    <string name="notice_room_invite_you">%1$s uzaicināja jūs</string>
+    <string name="notice_room_join">%1$s pievienojās</string>
+    <string name="notice_room_leave">%1$s pameta istabu</string>
+    <string name="notice_room_reject">%1$s noraidīja uzaicinājumu</string>
+    <string name="notice_room_kick">%1$s padzina %2$s</string>
+    <string name="notice_room_unban">%1$s atcēla pieejas liegumu %2$s</string>
+    <string name="notice_room_ban">%1$s liedza pieeju %2$s</string>
+    <string name="notice_room_withdraw">%1$s atsauca %2$s uzaicinājumu</string>
+    <string name="notice_avatar_url_changed">%1$s nomainīja avataru</string>
+    <string name="notice_display_name_set">%1$s uzstādīja parādāmo vārdu uz %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s nomainīja parādāmo vārdu no %2$s uz %3$s</string>
+    <string name="notice_display_name_removed">%1$s dzēsa savu parādāmo vārdu (iepriekš %2$s)</string>
+    <string name="notice_room_topic_changed">%1$s nomainīja tematu uz %2$s</string>
+    <string name="notice_room_name_changed">%1$s nomainīja istabas nosaukumu uz %2$s</string>
+    <string name="notice_placed_video_call">%s veica video zvanu.</string>
+    <string name="notice_placed_voice_call">%s veica audio zvanu.</string>
+    <string name="notice_answered_call">%s atbildēja uz zvanu.</string>
+    <string name="notice_ended_call">%s beidza zvanu.</string>
+    <string name="notice_made_future_room_visibility">%1$s padarīja istabas turpmāko ziņu vēsturi redzamu %2$s</string>
+    <string name="notice_room_visibility_invited">visi istabas biedri no brīža, kad tika uzaicināti.</string>
+    <string name="notice_room_visibility_joined">visi istabas biedri no brīža, kad tika pievienojušies.</string>
+    <string name="notice_room_visibility_shared">visi istabas biedri.</string>
+    <string name="notice_room_visibility_world_readable">ikviens.</string>
+    <string name="notice_room_visibility_unknown">nezināms (%s).</string>
+    <string name="notice_end_to_end">%1$s ieslēdza pilnīgu šifrēšanu (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s pieprasīja VoIP konferenci</string>
+    <string name="notice_voip_started">VoIP konference sākās</string>
+    <string name="notice_voip_finished">VoIP konference beidzās</string>
+    <string name="notice_avatar_changed_too">(arī avatars tika nomainīts)</string>
+    <string name="notice_room_name_removed">%1$s dzēsa istabas nosaukumu</string>
+    <string name="notice_room_topic_removed">%1$s izdzēsa istabas tematu</string>
+    <string name="notice_profile_change_redacted">%1$s atjaunoja savu profilu %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s nosūtīja %2$s uzaicinājumu pievienoties istabai</string>
+    <string name="notice_room_third_party_registered_invite">%1$s pieņēma uzaicinājumu %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Neizdodas atšifrēt: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Sūtītāja ierīce mums nav nenosūtījusi atslēgas priekš šīs ziņas.</string>
+    <string name="could_not_redact">Nevarēja rediģēt</string>
+    <string name="unable_to_send_message">Neizdodas nosūtīt ziņu</string>
+    <string name="message_failed_to_upload">Neizdevās augšuplādēt attēlu</string>
+    <string name="network_error">Tīkla kļūda</string>
+    <string name="matrix_error">Matrix kļūda</string>
+    <string name="room_error_join_failed_empty_room">Šobrīd nav iespējams atkārtoti pievienoties tukšai istabai.</string>
+    <string name="encrypted_message">Šifrēta ziņa</string>
+    <string name="medium_email">Epasta adrese</string>
+    <string name="medium_phone_number">Telefona numurs</string>
+    <string name="room_displayname_invite_from">Uzaicinājums no %s</string>
+    <string name="room_displayname_room_invite">Uzaicinājums uz istabu</string>
+    <string name="room_displayname_two_members">%1$s un %2$s</string>
+    <string name="room_displayname_empty_room">Tukša istaba</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="zero">%1$s un 1 cits</item>
+        <item quantity="one">%1$s un %2$d citi</item>
+        <item quantity="other">%1$s un %2$d citu</item>
+    </plurals>
+    <string name="notice_display_name_changed_from_by_you">Jūs nomainījāt savu parādāmo vārdu no %1$s uz %2$s</string>
+    <string name="notice_display_name_set_by_you">Jūs nomainījāt savu parādāmo vārdu uz %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Jūs nomainījāt savu avataru</string>
+    <string name="notice_room_withdraw_by_you">Jūs atsaucāt %1$s uzaicinājumu</string>
+    <string name="notice_room_ban_by_you">Jūs liedzāt pieeju %1$s</string>
+    <string name="notice_room_unban_by_you">Jūs atcēlāt pieejas liegumu %1$s</string>
+    <string name="notice_room_kick_by_you">Jūs padzināt %1$s</string>
+    <string name="notice_room_reject_by_you">Jūs noraidījāt uzaicinājumu</string>
+    <string name="notice_direct_room_leave_by_you">Jūs pametāt istabu</string>
+    <string name="notice_direct_room_leave">%1$s pameta istabu</string>
+    <string name="notice_room_leave_by_you">Jūs pametāt istabu</string>
+    <string name="notice_direct_room_join_by_you">Jūs pievienojāties</string>
+    <string name="notice_direct_room_join">%1$s pievienojās istabai</string>
+    <string name="notice_room_join_by_you">Jūs pievienojāties istabai</string>
+    <string name="notice_room_invite_by_you">Jūs uzaicinājāt %1$s</string>
+    <string name="notice_direct_room_created_by_you">Jūs izveidojāt diskusiju</string>
+    <string name="notice_direct_room_created">%1$s izveidoja diskusiju</string>
+    <string name="notice_room_created_by_you">Jūs izveidojāt istabu</string>
+    <string name="notice_room_created">%1$s izveidoja istabu</string>
+    <string name="notice_room_invite_no_invitee_by_you">Jūsu uzaicinājums</string>
+    <string name="summary_you_sent_sticker">Jūs nosūtījāt uzlīmi.</string>
+    <string name="summary_user_sent_sticker">%1$s nosūtīja uzlīmi.</string>
+    <string name="summary_you_sent_image">Jūs nosūtījāt attēlu.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Jūs ieslēdzāt pilnīgu šifrēšanu (neatpazīts algoritms %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s ieslēdza pilnīgu šifrēšanu (neatpazīts algoritms %2$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Jūs ieslēdzāt pilnīgu šifrēšanu.</string>
+    <string name="notice_end_to_end_ok">%1$s ieslēdza pilnīgu šifrēšanu.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Jūs esat novērsis iespēju viesiem pievienoties istabai.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s ir novērsis iespēju viesiem pievienoties istabai.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Jūs esat novērsis iespēju viesiem pievienoties istabai.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s ir novērsis iespēju viesiem pievienoties istabai.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Jūs esat atļāvis viesiem pievienoties istabai.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s ir atļāvis viesiem pievienoties istabai.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Jūs esat atļāvis viesiem pievienoties istabai.</string>
+    <string name="notice_room_guest_access_can_join">%1$s ir atļāvis viesiem pievienoties istabai.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Jūs nomainījāt adreses šai istabai.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s nomainīja adreses šai istabai.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Jūs nomainījāt galveno un alternatīvās adreses šai istabai.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s nomainīja galveno un alternatīvās adreses šai istabai.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Jūs nomainījāt alternatīvās adreses šai istabai.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s nomainīja alternatīvās adreses šai istabai.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="zero">Jūs izdzēsāt šīs istabas alternatīvo adresi %1$s.</item>
+        <item quantity="one">Jūs izdzēsāt šīs istabas alternatīvās adreses %1$s.</item>
+        <item quantity="other">Jūs izdzēsāt šīs istabas alternatīvās adreses %1$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="zero">%1$s izdzēsa šīs istabas alternatīvo adresi %2$s.</item>
+        <item quantity="one">%1$s izdzēsa šīs istabas alternatīvās adreses %2$s.</item>
+        <item quantity="other">%1$s izdzēsa šīs istabas alternatīvās adreses %2$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="zero">Jūs pievienojāt šīs istabas alternatīvo adresi %1$s.</item>
+        <item quantity="one">Jūs pievienojāt šīs istabas alternatīvās adreses %1$s.</item>
+        <item quantity="other">Jūs pievienojāt šīs istabas alternatīvās adreses %1$s.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="zero">%1$s pievienoja šīs istabas alternatīvo adresi %2$s.</item>
+        <item quantity="one">%1$s pievienoja šīs istabas alternatīvās adreses %2$s.</item>
+        <item quantity="other">%1$s pievienoja šīs istabas alternatīvās adreses %2$s.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">Jūs izdzēsāt šis istabas galveno adresi.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s izdzēsa šis istabas galveno adresi.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Jūs iestatījāt %1$s kā šis istabas galveno adresi.</string>
+    <string name="notice_room_canonical_alias_set">%1$s iestatīja %2$s kā šis istabas galveno adresi.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Jūs pievienojāt %1$s un izdzēsāt %2$s kā šīs istabas adreses.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s pievienoja %2$s un izdzēsa %3$s kā šīs istabas adreses.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="zero">Jūs izdzēsāt %1$s kā šīs istabas adresi.</item>
+        <item quantity="one">Jūs izdzēsāt %1$s kā šīs istabas adreses.</item>
+        <item quantity="other">Jūs izdzēsāt %1$s kā šīs istabas adreses.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="zero">%1$s izdzēsa %2$s kā šīs istabas adresi.</item>
+        <item quantity="one">%1$s izdzēsa %2$s kā šīs istabas adreses.</item>
+        <item quantity="other">%1$s izdzēsa %2$s kā šīs istabas adreses.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="zero">Jūs pievienojāt %1$s kā šīs istabas adresi.</item>
+        <item quantity="one">Jūs pievienojāt %1$s kā šīs istabas adreses.</item>
+        <item quantity="other">Jūs pievienojāt %1$s kā šīs istabas adreses.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="zero">%1$s pievienoja %2$s kā šīs istabas adresi.</item>
+        <item quantity="one">%1$s pievienoja %2$s kā šis istabas adreses.</item>
+        <item quantity="other">%1$s pievienoja %2$s kā šīs istabas adreses.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">Jūs atsaucāt %1$s uzaicinājumu. Iemesls: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s atsauca uzaicinājumu %2$s. Iemesls: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Jūs pieņēmāt uzaicinājumu %1$s. Iemesls: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s pieņēma uzaicinājumu %2$s. Iemesls: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Jūs atsaucāt uzaicinājumu %1$s pievienoties istabai. Iemesls: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s atsauca uzaicinājumu %2$s pievienoties istabai. Iemesls: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Jūs nosūtījāt uzaicinājumu %1$s pievienoties istabai. Iemesls: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s nosūtīja uzaicinājumu %2$s pievienoties istabai. Iemesls: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Jūs liedzāt pieeju %1$s. Iemesls: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s liedza pieeju %2$s. Iemesls: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Jūs atcēlāt pieejas liegumu %1$s. Iemesls: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s atcēla %2$s pieejas liegumu. Iemesls: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Jūs padzināt %1$s. Iemesls: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s padzina %2$s. Iemesls: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Jūs noraidījāt uzaicinājumu. Iemesls: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s noraidīja uzaicinājumu. Iemesls: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Jūs izgājāt. Iemesls: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s izgāja. Iemels: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Jūs pametāt istabu. Iemesls: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s pameta istabu. Iemesls: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Jūs pievienojāties. Iemesls: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s pievienojās. Iemesls: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Jūs pievienojāties istabai. Iemesls: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s pievienojās istabai. Iemesls: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s uzaicināja jūs. Iemesls: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Jūs uzaicinājāt %1$s. Iemesls: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s uzaicināja %2$s. Iemesls: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Jūsu uzaicinājums. Iemesls: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s uzaicinājums. Iemesls: %2$s</string>
+    <string name="clear_timeline_send_queue">Notīrīt sūtīšanas rindu</string>
+    <string name="event_status_sending_message">Sūta ziņu…</string>
+    <string name="initial_sync_start_importing_account_data">Sākotnējā sinhronizācija:
+\nImportē konta datus</string>
+    <string name="initial_sync_start_importing_account_groups">Sākotnējā sinhronizācija:
+\nImportē kopienas</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Sākotnējā sinhronizācija:
+\nImportē pamestās istabas</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Sākotnējā sinhronizācija:
+\nImportē istabas, uz kurām uzaicināts</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Sākotnējā sinhronizācija:
+\nImportē istabas, kurās ieiets</string>
+    <string name="initial_sync_start_importing_account_rooms">Sākotnējā sinhronizācija:
+\nImportē istabas</string>
+    <string name="initial_sync_start_importing_account_crypto">Sākotnējā sinhronizācija:
+\nImportē kriptogrāfiju</string>
+    <string name="initial_sync_start_importing_account">Sākotnējā sinhronizācija:
+\nImportē kontu…</string>
+    <string name="room_displayname_empty_room_was">Tukša istaba (bija %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="zero">%1$s, %2$s, %3$s un %4$d citi</item>
+        <item quantity="one">%1$s, %2$s, %3$s un %4$d cits</item>
+        <item quantity="other">%1$s, %2$s, %3$s un %4$d citi</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s un %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s un %3$s</string>
+    <string name="notice_power_level_diff">%1$s no %2$s uz %3$s</string>
+    <string name="notice_power_level_changed">%1$s nomainīja %2$s pieejas līmeni.</string>
+    <string name="notice_power_level_changed_by_you">Jūs nomainījāt %1$s pieejas līmeni.</string>
+    <string name="power_level_custom_no_value">Pielāgots</string>
+    <string name="power_level_custom">Pielāgots (%1$d)</string>
+    <string name="power_level_default">Noklusējuma</string>
+    <string name="power_level_moderator">Moderators</string>
+    <string name="power_level_admin">Administrators</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Jūs pieņēmāt uzaicinājumu %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Jūs atsaucāt uzaicinājumu %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s atsauca uzaicinājumu %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Jūs atsaucāt uzaicinājumu %1$s pievienoties istabai</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s atsauca uzaicinājumu %2$s pievienoties istabai</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Jūs uzaicinājāt %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s uzaicināja %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Jūs nosūtījāt %1$s uzaicinājumu pievienoties istabai</string>
+    <string name="notice_profile_change_redacted_by_you">Jūs atjaunojāt savu profilu %1$s</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s izdzēsa ziņu [iemesls: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">Ziņa izdzēsta [iemesls: %1$s]</string>
+    <string name="notice_event_redacted_by">%1$s izdzēsa ziņu</string>
+    <string name="notice_event_redacted">Ziņa izdzēsta</string>
+    <string name="notice_room_avatar_removed_by_you">Jūs izdzēsāt istabas avataru</string>
+    <string name="notice_room_avatar_removed">%1$s izdzēsa istabas avataru</string>
+    <string name="notice_room_topic_removed_by_you">Jūs izdzēsāt istabas tematu</string>
+    <string name="notice_room_name_removed_by_you">Jūs dzēsāt istabas nosaukumu</string>
+    <string name="notice_requested_voip_conference_by_you">Jūs pieprasījāt VoIP konferenci</string>
+    <string name="notice_end_to_end_by_you">Jūs ieslēdzāt pilnīgu šifrēšanu (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Jūs padarījāt turpmākās ziņas redzamas %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s padarīja turpmākās ziņas redzamas %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Jūs padarījāt istabas turpmāko ziņu vēsturi redzamu %1$s</string>
+    <string name="notice_ended_call_by_you">Jūs beidzāt zvanu.</string>
+    <string name="notice_answered_call_by_you">Jūs atbildējāt uz zvanu.</string>
+    <string name="notice_call_candidates_by_you">Jūs nosūtījāt datus zvana uzsākšanai.</string>
+    <string name="notice_call_candidates">%s nosūtīja datus zvana uzsākšanai.</string>
+    <string name="notice_placed_voice_call_by_you">Jūs veicāt balss zvanu.</string>
+    <string name="notice_placed_video_call_by_you">Jūs veicāt video zvanu.</string>
+    <string name="notice_room_name_changed_by_you">Jūs nomainījāt istabas nosaukumu uz %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Jūs nomainījāt istabas avataru</string>
+    <string name="notice_room_avatar_changed">%1$s nomainīja istabas avataru</string>
+    <string name="notice_room_topic_changed_by_you">Jūs nomainījāt tematu uz %1$s</string>
+    <string name="notice_display_name_removed_by_you">Jūs dzēsāt savu parādāmo vārdu (iepriekš %1$s)</string>
     <string name="title_activity_home">Ziņas</string>
     <string name="title_activity_room">Istaba</string>
     <string name="title_activity_settings">Iestatījumi</string>
diff --git a/matrix-sdk-android/src/main/res/values-nb/strings.xml b/vector/src/main/res/values-nb/strings.xml
similarity index 100%
rename from matrix-sdk-android/src/main/res/values-nb/strings.xml
rename to vector/src/main/res/values-nb/strings.xml
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 40f604eb1d..66a09447a5 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -1,5 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s heeft een afbeelding gestuurd.</string>
+
+    <string name="notice_room_invite_no_invitee">Uitnodiging van %s</string>
+    <string name="notice_room_invite">%1$s heeft %2$s uitgenodigd</string>
+    <string name="notice_room_invite_you">%1$s heeft u uitgenodigd</string>
+    <string name="notice_room_join">%1$s neemt nu deel aan het gesprek</string>
+    <string name="notice_room_leave">%1$s heeft het gesprek verlaten</string>
+    <string name="notice_room_reject">%1$s heeft de uitnodiging geweigerd</string>
+    <string name="notice_room_kick">%1$s heeft %2$s uit het gesprek verwijderd</string>
+    <string name="notice_room_unban">%1$s heeft %2$s ontbannen</string>
+    <string name="notice_room_ban">%1$s heeft %2$s verbannen</string>
+    <string name="notice_room_withdraw">%1$s heeft de uitnodiging van %2$s ingetrokken</string>
+    <string name="notice_avatar_url_changed">%1$s heeft zijn/haar avatar aangepast</string>
+    <string name="notice_display_name_set">%1$s heeft zijn/haar naam aangepast naar %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s heeft zijn/haar naam aangepast van %2$s naar %3$s</string>
+    <string name="notice_display_name_removed">%1$s heeft zijn/haar naam verwijderd (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s heeft het onderwerp veranderd naar: %2$s</string>
+    <string name="notice_room_name_changed">%1$s heeft de gespreksnaam veranderd naar: %2$s</string>
+    <string name="notice_placed_video_call">%s heeft een video-oproep gemaakt.</string>
+    <string name="notice_placed_voice_call">%s heeft een spraakoproep gemaakt.</string>
+    <string name="notice_answered_call">%s heeft de oproep beantwoord.</string>
+    <string name="notice_ended_call">%s heeft opgehangen.</string>
+    <string name="notice_made_future_room_visibility">%1$s heeft de toekomstige gespreksgeschiedenis zichtbaar gemaakt voor %2$s</string>
+    <string name="notice_room_visibility_invited">alle deelnemers aan het gesprek, vanaf het punt dat ze zijn uitgenodigd.</string>
+    <string name="notice_room_visibility_joined">alle deelnemers aan het gesprek, vanaf het punt dat ze zijn toegetreden.</string>
+    <string name="notice_room_visibility_shared">alle deelnemers aan het gesprek.</string>
+    <string name="notice_room_visibility_world_readable">iedereen.</string>
+    <string name="notice_room_visibility_unknown">onbekend (%s).</string>
+    <string name="notice_end_to_end">%1$s heeft eind-tot-eind-versleuteling aangezet (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s heeft een VoIP-vergadering aangevraagd</string>
+    <string name="notice_voip_started">VoIP-vergadering gestart</string>
+    <string name="notice_voip_finished">VoIP-vergadering gestopt</string>
+
+    <string name="notice_avatar_changed_too">(avatar is ook veranderd)</string>
+    <string name="notice_room_name_removed">%1$s heeft de gespreksnaam verwijderd</string>
+    <string name="notice_room_topic_removed">%1$s heeft het gespreksonderwerp verwijderd</string>
+    <string name="notice_profile_change_redacted">%1$s heeft zijn/haar profiel %2$s bijgewerkt</string>
+    <string name="notice_room_third_party_invite">%1$s heeft een uitnodiging naar %2$s gestuurd om het gesprek toe te treden</string>
+    <string name="notice_room_third_party_registered_invite">%1$s heeft de uitnodiging voor %2$s aanvaard</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Kan niet ontsleutelen: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Het apparaat van de afzender heeft geen sleutels voor dit bericht gestuurd.</string>
+
+    <!-- Room Screen -->
+    <string name="could_not_redact">Kon niet verwijderd worden</string>
+    <string name="unable_to_send_message">Kan bericht niet verzenden</string>
+
+    <string name="message_failed_to_upload">Uploaden van de afbeelding mislukt</string>
+
+    <!-- general errors -->
+    <string name="network_error">Netwerkfout</string>
+    <string name="matrix_error">Matrix-fout</string>
+
+    <!-- Home Screen -->
+
+    <!-- Last seen time -->
+
+    <!-- room error messages -->
+    <string name="room_error_join_failed_empty_room">Het is momenteel niet mogelijk om een leeg gesprek opnieuw toe te treden.</string>
+
+    <string name="encrypted_message">Versleuteld bericht</string>
+
+    <!-- medium friendly name -->
+    <string name="medium_email">E-mailadres</string>
+    <string name="medium_phone_number">Telefoonnummer</string>
+
+    <string name="summary_user_sent_sticker">%1$s heeft een sticker gestuurd.</string>
+
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Uitnodiging van %s</string>
+    <string name="room_displayname_room_invite">Gespreksuitnodiging</string>
+    <string name="room_displayname_two_members">%1$s en %2$s</string>
+    <string name="room_displayname_empty_room">Leeg gesprek</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s en 1 andere</item>
+        <item quantity="other">%1$s en %2$d anderen</item>
+    </plurals>
+
+
+    <string name="notice_event_redacted">Bericht verwijderd</string>
+    <string name="notice_event_redacted_by">Bericht verwijderd door %1$s</string>
+    <string name="notice_event_redacted_with_reason">Bericht verwijderd [reden: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Bericht verwijderd door %1$s [reden: %2$s]</string>
+
+    <string name="initial_sync_start_importing_account">Initiële synchronisatie:
+\nAccount wordt geïmporteerd…</string>
+    <string name="initial_sync_start_importing_account_crypto">Initiële synchronisatie:
+\nCrypto wordt geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_rooms">Initiële synchronisatie:
+\nGesprekken worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Initiële synchronisatie:
+\nDeelgenomen gesprekken worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Initiële synchronisatie:
+\nUitgenodigde gesprekken worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisatie:
+\nVerlaten gesprekken worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_groups">Initiële synchronisatie:
+\nGemeenschappen worden geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_data">Initiële synchronisatie:
+\nAccountgegevens worden geïmporteerd</string>
+
+    <string name="notice_room_update">%s heeft dit gesprek opgewaardeerd.</string>
+
+    <string name="event_status_sending_message">Bericht wordt verstuurd…</string>
+    <string name="clear_timeline_send_queue">Uitgaande wachtrij legen</string>
+
+    <string name="notice_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s om het gesprek toe te treden ingetrokken</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Uitnodiging van %1$s. Reden: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s heeft %2$s uitgenodigd. Reden: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s heeft u uitgenodigd. Reden: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s neemt nu deel. Reden: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s is weggegaan. Reden: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s heeft de uitnodiging geweigerd. Reden: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s heeft %2$s verwijderd. Reden: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s heeft %2$s ontbannen. Reden: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s heeft %2$s verbannen. Reden: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s heeft %2$s een uitnodiging voor het gesprek gestuurd. Reden: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s heeft de uitnodiging voor %2$s ingetrokken. Reden: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s heeft de uitnodiging voor %2$s aanvaard. Reden: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s heeft de uitnodiging van %2$s ingetrokken. Reden: %3$s</string>
+
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s heeft %2$s als gespreksadres toegevoegd.</item>
+        <item quantity="other">%1$s heeft %2$s als gespreksadressen toegevoegd.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s heeft %2$s als gespreksadres verwijderd.</item>
+        <item quantity="other">%1$s heeft %3$s als gespreksadressen verwijderd.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed">%1$s heeft %2$s als gespreksadres toegevoegd en %3$s verwijderd.</string>
+
+    <string name="notice_room_canonical_alias_set">%1$s heeft het hoofdadres voor dit gesprek ingesteld op %2$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s heeft het hoofdadres voor dit gesprek verwijderd.</string>
+
+    <string name="notice_room_guest_access_can_join">%1$s heeft gasten de toegang tot het gesprek verleend.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s heeft gasten de toegang tot het gesprek verhinderd.</string>
+
+    <string name="notice_end_to_end_ok">%1$s heeft eind-tot-eind-versleuteling ingeschakeld.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s heeft eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %2$s).</string>
     <!-- titles -->
     <string name="title_activity_home">Berichten</string>
     <string name="title_activity_room">Gesprek</string>
diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml
index c4c5d7d9a9..6ff80132e7 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@@ -1,5 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="encrypted_message">Kryptert melding</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s sende eit bilæte.</string>
+    <string name="summary_user_sent_sticker">%1$s sende eit klistremerke.</string>
+    <string name="notice_room_invite_no_invitee">%s si innbjoding</string>
+    <string name="notice_room_invite">%1$s inviterte %2$s</string>
+    <string name="notice_room_invite_you">%1$s inviterte deg</string>
+    <string name="notice_room_join">%1$s kom inn</string>
+    <string name="notice_room_leave">%1$s forlot rommet</string>
+    <string name="notice_room_reject">%1$s sa nei til innbjodingi</string>
+    <string name="notice_room_kick">%1$s sparka %2$s</string>
+    <string name="notice_room_unban">%1$s slapp %2$s inn att</string>
+    <string name="notice_room_ban">%1$s stengde %2$s ute</string>
+    <string name="notice_room_withdraw">%1$s tok attende %2$s si innbjoding</string>
+    <string name="notice_avatar_url_changed">%1$s byta avataren sin</string>
+    <string name="notice_display_name_set">%1$s sette visingsnamnet sitt som %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s byta visingsnamnet sitt frå %2$s til %3$s</string>
+    <string name="notice_display_name_removed">%1$s tok burt visingsnamnet sitt (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s gjorde emnet til: %2$s</string>
+    <string name="notice_room_name_changed">%1$s gjorde romnamnet til: %2$s</string>
+    <string name="notice_placed_video_call">%s starta ei videosamtala.</string>
+    <string name="notice_placed_voice_call">%s starta ein talesamtale.</string>
+    <string name="notice_answered_call">%s tok røyret.</string>
+    <string name="notice_ended_call">%s la på røyret.</string>
+    <string name="notice_made_future_room_visibility">%1$s gjorde den framtidige romsoga synleg for %2$s</string>
+    <string name="notice_room_visibility_invited">alle rommedlemmar, frå då dei vart invitert inn.</string>
+    <string name="notice_room_visibility_joined">alle rommedlemmar, frå då dei kom inn.</string>
+    <string name="notice_room_visibility_shared">alle rommedlemmar.</string>
+    <string name="notice_room_visibility_world_readable">kven som heldst.</string>
+    <string name="notice_room_visibility_unknown">uvisst (%s).</string>
+    <string name="notice_end_to_end">%1$s skrudde ende-til-ende-kryptering på (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s bad um ei VoIP-gruppasamtala</string>
+    <string name="notice_voip_started">VoIP-gruppasamtala er starta</string>
+    <string name="notice_voip_finished">VoIP-gruppasamtala er ferdug</string>
+    <string name="notice_avatar_changed_too">(avataren vart au byta)</string>
+    <string name="notice_room_name_removed">%1$s tok burt romnamnet</string>
+    <string name="notice_room_topic_removed">%1$s tok burt romemnet</string>
+    <string name="notice_profile_change_redacted">%1$s gjorde um på skildringi si %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s inviterte %2$s til rommet</string>
+    <string name="notice_room_third_party_registered_invite">%1$s sa ja til innbjodingi til %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Fekk ikkje til å dekryptera: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsendareiningi hev ikkje sendt oss nyklane fyr denna meldingi.</string>
+    <string name="could_not_redact">Kunde ikkje gjera um</string>
+    <string name="unable_to_send_message">Fekk ikkje til å senda meldingi</string>
+    <string name="message_failed_to_upload">Fekk ikkje til å lasta biletet upp</string>
+    <string name="network_error">Noko gjekk gale med netverket</string>
+    <string name="matrix_error">Noko gjekk gale med Matrix</string>
+    <string name="room_error_join_failed_empty_room">Det lèt seg fyrebils ikkje gjera å fara inn att i eit tomt rom.</string>
+    <string name="medium_email">Epostadresse</string>
+    <string name="medium_phone_number">Telefonnummer</string>
+    <string name="room_displayname_invite_from">Innbjoding frå %s</string>
+    <string name="room_displayname_room_invite">Rominnbjoding</string>
+    <string name="room_displayname_two_members">%1$s og %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s og 1 til</item>
+        <item quantity="other">%1$s og %2$d til</item>
+    </plurals>
+    <string name="room_displayname_empty_room">Tomt rom</string>
+    <string name="notice_event_redacted">Ei melding vart stroki</string>
+    <string name="notice_event_redacted_by">%1$s strauk meldingi</string>
+    <string name="notice_event_redacted_with_reason">Meldingi vart stroki [av di: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s strauk meldingi [av di: %2$s]</string>
+    <string name="notice_room_update">%s oppgraderte rommet.</string>
+    <string name="clear_timeline_send_queue">Nullstill sendingskø</string>
+    <string name="notice_room_leave_with_reason">%1$s forlot rommet. Grunn: %2$s</string>
     <string name="light_theme">Lyst tema</string>
     <string name="dark_theme">Mørkt tema</string>
     <string name="black_theme">Svart tema</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 9748bcdf6b..dae44ade8a 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1,5 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s wysłał(a) zdjęcie.</string>
+
+    <string name="notice_room_invite_no_invitee">Zaproszenie od %s</string>
+    <string name="notice_room_invite">%1$s zaprosił(a) %2$s</string>
+    <string name="notice_room_invite_you">%1$s zaprosił(a) Cię</string>
+    <string name="notice_room_join">%1$s dołączył(a)</string>
+    <string name="notice_room_leave">%1$s opuścił(a)</string>
+    <string name="notice_room_reject">%1$s odrzucił(a) zaproszenie</string>
+    <string name="notice_room_kick">%1$s wyrzucił(a) %2$s</string>
+    <string name="notice_room_unban">%1$s odblokował(a) %2$s</string>
+    <string name="notice_room_ban">%1$s zablokował(a) %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s zmienił(a) awatar</string>
+    <string name="notice_display_name_set">%1$s zmienił(a) wyświetlaną nazwę na %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s zmienił(a) wyświetlaną nazwę z %2$s na %3$s</string>
+    <string name="notice_display_name_removed">%1$s usunął(-ęła) swoją wyświetlaną nazwę (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s zmienił(a) temat na: %2$s</string>
+    <string name="unable_to_send_message">Nie można wysłać wiadomości</string>
+
+    <string name="message_failed_to_upload">Przesyłanie zdjęcia nie powiodło się</string>
+
+    <string name="network_error">Błąd sieci</string>
+    <string name="matrix_error">Błąd Matrixa</string>
+
+    <string name="encrypted_message">Wiadomość zaszyfrowana</string>
+
+    <string name="medium_email">Adres e-mail</string>
+    <string name="medium_phone_number">Numer telefonu</string>
+
+    <string name="notice_room_visibility_shared">wszyscy członkowie pokoju.</string>
+    <string name="notice_room_visibility_world_readable">wszyscy.</string>
+    <string name="notice_room_name_changed">%1$s zmienił(a) nazwę pokoju na: %2$s</string>
+    <string name="notice_ended_call">%s zakończył(a) rozmowę.</string>
+    <string name="notice_room_name_removed">%1$s usunął(-ęła) nazwę pokoju</string>
+    <string name="notice_room_topic_removed">%1$s usunął(-ęła) temat pokoju</string>
+    <string name="summary_user_sent_sticker">%1$s wysłał(a) naklejkę.</string>
+
+    <string name="notice_end_to_end">%1$s włączył(a) szyfrowanie end-to-end (%2$s)</string>
+
+    <string name="notice_room_withdraw">%1$s wycofał(a) zaproszenie %2$s</string>
+    <string name="notice_answered_call">%s odebrał(a) połączenie.</string>
+    <string name="notice_avatar_changed_too">(awatar też został zmieniony)</string>
+
+    <string name="room_displayname_invite_from">Zaproszenie od %s</string>
+    <string name="room_displayname_room_invite">Zaproszenie do pokoju</string>
+    <string name="room_displayname_two_members">%1$s i %2$s</string>
+    <string name="room_displayname_empty_room">Pusty pokój</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s i jeden inny</item>
+        <item quantity="few">%1$s i kilku innych</item>
+        <item quantity="many">%1$s i %2$d innych</item>
+        <item quantity="other" />
+    </plurals>
+
+    <string name="notice_crypto_unable_to_decrypt">** Nie można odszyfrować: %s **</string>
+    <string name="notice_placed_video_call">%s wykonał(a) rozmowę wideo.</string>
+    <string name="notice_placed_voice_call">%s wykonał(a) połączenie głosowe.</string>
+    <string name="notice_made_future_room_visibility">%1$s uczynił(a) przyszłą historię pokoju widoczną dla %2$s</string>
+    <string name="notice_room_visibility_invited">wszyscy członkowie pokoju, od momentu w którym zostali zaproszeni.</string>
+    <string name="notice_room_visibility_joined">wszyscy członkowie pokoju, od momentu w którym dołączyli.</string>
+    <string name="notice_room_visibility_unknown">nieznane (%s).</string>
+    <string name="notice_requested_voip_conference">%1$s zażądał(a) grupowego połączenia VoIP</string>
+    <string name="notice_voip_started">Rozpoczęto grupowe połączenie głosowe VoIP</string>
+    <string name="notice_voip_finished">Zakończono grupowe połączenie głosowe VoIP</string>
+
+    <string name="notice_profile_change_redacted">%1$s zaktualizował swój profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s wysłał(a) zaproszenie do %2$s aby dołączył(a) do tego pokoju</string>
+    <string name="notice_room_third_party_registered_invite">%1$s zaakceptował(a) zaproszenie dla %2$s</string>
+
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Urządzenie nadawcy nie wysłało nam kluczy do tej wiadomości.</string>
+
+    <string name="could_not_redact">Nie można zredagować</string>
+    <string name="room_error_join_failed_empty_room">Obecnie nie jest możliwe ponowne dołączenie do pustego pokoju.</string>
+
+    <string name="notice_event_redacted">Wiadomość usunięta</string>
+    <string name="notice_event_redacted_by">Wiadomość usunięta przez %1$s</string>
+    <string name="notice_event_redacted_with_reason">Wiadomość usunięta [powód: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Wiadomość usunięta przez %1$s [powód: %2$s]</string>
+    <string name="notice_room_update">%s zakutalizował(a) ten pokój.</string>
+
+    <string name="initial_sync_start_importing_account">Synchronizacja początkowa:
+\nImportowanie konta…</string>
+    <string name="initial_sync_start_importing_account_crypto">Synchronizacja początkowa:
+\nImportowanie kryptografii</string>
+    <string name="initial_sync_start_importing_account_rooms">Synchronizacja początkowa:
+\nImportowanie Pokoi</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Synchronizacja początkowa:
+\nImportowanie dołączonych Pokoi</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Synchronizacja początkowa:
+\nImportowanie zaproszonych Pokoi</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Synchronizacja początkowa:
+\nImportowanie opuszczonych Pokoi</string>
+    <string name="initial_sync_start_importing_account_groups">Synchronizacja początkowa:
+\nImportowanie Społeczności</string>
+    <string name="initial_sync_start_importing_account_data">Synchronizacja początkowa:
+\nImportowanie danych Konta</string>
+
+    <string name="event_status_sending_message">Wysyłanie wiadomości…</string>
+    <string name="clear_timeline_send_queue">Wyczyść kolejkę wysyłania</string>
     <string name="title_activity_home">Wiadomości</string>
     <string name="title_activity_room">Pokój</string>
     <string name="title_activity_settings">Ustawienia</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 48a4dae763..7148636729 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,276 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s enviou uma foto.</string>
+    <string name="notice_room_invite_no_invitee">convite de %s</string>
+    <string name="notice_room_invite">%1$s convidou %2$s</string>
+    <string name="notice_room_invite_you">%1$s convidou você</string>
+    <string name="notice_room_join">%1$s entrou na sala</string>
+    <string name="notice_room_leave">%1$s saiu da sala</string>
+    <string name="notice_room_reject">%1$s recusou o convite</string>
+    <string name="notice_room_kick">%1$s removeu %2$s</string>
+    <string name="notice_room_unban">%1$s removeu o banimento de %2$s</string>
+    <string name="notice_room_ban">%1$s baniu %2$s</string>
+    <string name="notice_room_withdraw">%1$s desfez o convite a %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s alterou a foto de perfil</string>
+    <string name="notice_display_name_set">%1$s definiu o nome e sobrenome como %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s alterou o nome e sobrenome de %2$s para %3$s</string>
+    <string name="notice_display_name_removed">%1$s removeu o nome e sobrenome (era %2$s)</string>
+    <string name="notice_room_topic_changed">%1$s alterou a descrição para: %2$s</string>
+    <string name="notice_room_name_changed">%1$s alterou o nome da sala para: %2$s</string>
+    <string name="notice_placed_video_call">%s iniciou uma chamada de vídeo.</string>
+    <string name="notice_placed_voice_call">%s iniciou uma chamada de voz.</string>
+    <string name="notice_answered_call">%s aceitou a chamada.</string>
+    <string name="notice_ended_call">%s encerrou a chamada.</string>
+    <string name="notice_made_future_room_visibility">%1$s deixou o histórico futuro da sala visível para %2$s</string>
+    <string name="notice_room_visibility_invited">todos os participantes da sala, a partir do momento em que foram convidados.</string>
+    <string name="notice_room_visibility_joined">todos os participantes da sala, a partir do momento em que entraram nela.</string>
+    <string name="notice_room_visibility_shared">todos os participantes da sala.</string>
+    <string name="notice_room_visibility_world_readable">qualquer pessoa.</string>
+    <string name="notice_room_visibility_unknown">desconhecido (%s).</string>
+    <string name="notice_end_to_end">%1$s ativou a criptografia de ponta a ponta (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s deseja iniciar uma chamada em grupo</string>
+    <string name="notice_voip_started">Chamada em grupo iniciada</string>
+    <string name="notice_voip_finished">Chamada em grupo encerrada</string>
+    <string name="notice_avatar_changed_too">(a foto de perfil também foi alterada)</string>
+    <string name="notice_room_name_removed">%1$s removeu o nome da sala</string>
+    <string name="notice_room_topic_removed">%1$s removeu a descrição da sala</string>
+    <string name="notice_profile_change_redacted">%1$s atualizou o perfil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s enviou um convite para %2$s entrar na sala</string>
+    <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Não foi possível descriptografar: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">O aparelho do remetente não nos enviou as chaves para esta mensagem.</string>
+    <!-- Room Screen -->
+    <string name="could_not_redact">Não foi possível redigir</string>
+    <string name="unable_to_send_message">Não foi possível enviar a mensagem</string>
+    <string name="message_failed_to_upload">O envio da imagem falhou</string>
+    <!-- general errors -->
+    <string name="network_error">Erro de conexão à internet</string>
+    <string name="matrix_error">Erro no servidor Matrix</string>
+    <!-- Home Screen -->
+    <!-- Last seen time -->
+    <!-- call events -->
+    <!-- room error messages -->
+    <string name="room_error_join_failed_empty_room">Atualmente, não é possível entrar novamente em uma sala vazia.</string>
+    <string name="encrypted_message">Mensagem criptografada</string>
+    <!-- medium friendly name -->
+    <string name="medium_email">Endereço de e-mail</string>
+    <string name="medium_phone_number">Número de telefone</string>
+    <string name="summary_user_sent_sticker">%1$s enviou uma figurinha.</string>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Convite de %s</string>
+    <string name="room_displayname_room_invite">Convite para sala</string>
+    <string name="room_displayname_two_members">%1$s e %2$s</string>
+    <string name="room_displayname_empty_room">Sala vazia</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s e 1 outro</item>
+        <item quantity="other">%1$s e %2$d outros</item>
+    </plurals>
+    <string name="summary_you_sent_image">Você enviou uma foto.</string>
+    <string name="summary_you_sent_sticker">Você enviou uma figurinha.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Seu convite</string>
+    <string name="notice_room_created">%1$s criou a sala</string>
+    <string name="notice_room_created_by_you">Você criou a sala</string>
+    <string name="notice_room_invite_by_you">Você convidou %1$s</string>
+    <string name="notice_room_join_by_you">Você entrou na sala</string>
+    <string name="notice_room_leave_by_you">Você saiu da sala</string>
+    <string name="notice_room_reject_by_you">Você recusou o convite</string>
+    <string name="notice_room_kick_by_you">Você removeu %1$s</string>
+    <string name="notice_room_unban_by_you">Você removeu o banimento de %1$s</string>
+    <string name="notice_room_ban_by_you">Você baniu %1$s</string>
+    <string name="notice_room_withdraw_by_you">Você desfez o convite a %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Você alterou a sua foto de perfil</string>
+    <string name="notice_display_name_set_by_you">Você definiu o seu nome e sobrenome como %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Você alterou o seu nome e sobrenome de %1$s para %2$s</string>
+    <string name="notice_display_name_removed_by_you">Você removeu o seu nome e sobrenome (era %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Você alterou a descrição para: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s alterou a foto da sala</string>
+    <string name="notice_room_avatar_changed_by_you">Você alterou a foto da sala</string>
+    <string name="notice_room_name_changed_by_you">Você alterou o nome da sala para: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Você iniciou uma chamada de vídeo.</string>
+    <string name="notice_placed_voice_call_by_you">Você iniciou uma chamada de voz.</string>
+    <string name="notice_call_candidates">%s enviou dados para configurar a chamada.</string>
+    <string name="notice_call_candidates_by_you">Você enviou dados para configurar a chamada.</string>
+    <string name="notice_answered_call_by_you">Você aceitou a chamada.</string>
+    <string name="notice_ended_call_by_you">Você encerrou a chamada.</string>
+    <string name="notice_made_future_room_visibility_by_you">Você deixou o histórico futuro da sala visível para %1$s</string>
+    <string name="notice_end_to_end_by_you">Você ativou a criptografia de ponta a ponta (%1$s)</string>
+    <string name="notice_room_update">%s atualizou esta sala.</string>
+    <string name="notice_room_update_by_you">Você atualizou esta sala.</string>
+    <string name="notice_requested_voip_conference_by_you">Você solicitou uma chamada em grupo</string>
+    <string name="notice_room_name_removed_by_you">Você removeu o nome da sala</string>
+    <string name="notice_room_topic_removed_by_you">Você removeu a descrição da sala</string>
+    <string name="notice_room_avatar_removed">%1$s removeu a foto da sala</string>
+    <string name="notice_room_avatar_removed_by_you">Você removeu a foto da sala</string>
+    <string name="notice_event_redacted">Mensagem apagada</string>
+    <string name="notice_event_redacted_by">Mensagem apagada por %1$s</string>
+    <string name="notice_event_redacted_with_reason">Mensagem apagada [motivo: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mensagem apagada por %1$s [motivo: %2$s]</string>
+    <string name="notice_profile_change_redacted_by_you">Você atualizou o seu perfil %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Você enviou um convite para %1$s entrar na sala</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s cancelou o convite a %2$s para entrar na sala</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Você cancelou o convite a %1$s para entrar na sala</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Você aceitou o convite para %1$s</string>
+    <string name="notice_widget_added">%1$s adicionou o widget %2$s</string>
+    <string name="notice_widget_added_by_you">Você adicionou o widget %1$s</string>
+    <string name="notice_widget_removed">%1$s removeu o widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Você removeu o widget %1$s</string>
+    <string name="notice_widget_modified">%1$s editou o widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Você editou o widget %1$s</string>
+    <string name="power_level_admin">Administrador</string>
+    <string name="power_level_moderator">Moderador</string>
+    <string name="power_level_default">Padrão</string>
+    <string name="power_level_custom">Personalizado (%1$d)</string>
+    <string name="power_level_custom_no_value">Personalizado</string>
+    <string name="notice_power_level_changed_by_you">Você alterou o nível de permissão de %1$s.</string>
+    <string name="notice_power_level_changed">%1$s alterou o nível de permissão de %2$s.</string>
+    <string name="notice_power_level_diff">%1$s de %2$s para %3$s</string>
+    <string name="initial_sync_start_importing_account">Primeira sincronização:
+\nImportando a conta…</string>
+    <string name="initial_sync_start_importing_account_crypto">Primeira sincronização:
+\nImportando as chaves de criptografia</string>
+    <string name="initial_sync_start_importing_account_rooms">Primeira sincronização:
+\nImportando as salas</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Primeira sincronização:
+\nImportando as salas em que você entrou</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Primeira sincronização:
+\nImportando as salas em que você foi convidado</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Primeira sincronização:
+\nImportando as salas em que você saiu</string>
+    <string name="initial_sync_start_importing_account_groups">Primeira sincronização:
+\nImportando as comunidades</string>
+    <string name="initial_sync_start_importing_account_data">Primeira sincronização:
+\nImportando os dados da conta</string>
+    <string name="event_status_sending_message">Enviando mensagem…</string>
+    <string name="clear_timeline_send_queue">Limpar a fila de envio</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Motivo: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">O seu convite. Motivo: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s convidou %2$s. Motivo: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Você convidou %1$s. Motivo: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s convidou você. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s entrou na sala. Motivo: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Você entrou na sala. Motivo: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s saiu da sala. Motivo: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Você saiu da sala. Motivo: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s recusou o convite. Motivo: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Você recusou o convite. Motivo: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s removeu %2$s. Motivo: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Você removeu %1$s. Motivo: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s removeu o banimento de %2$s. Motivo: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Você removeu o banimento de %1$s. Motivo: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s baniu %2$s. Motivo: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Você baniu %1$s. Motivo: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s enviou um convite para %2$s entrar na sala. Motivo: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Você enviou um convite para %1$s entrar na sala. Motivo: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revogou o convite para %2$s entrar na sala. Motivo: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Você revogou o convite para %1$s entrar na sala. Motivo: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s aceitou o convite para %2$s. Motivo: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Você aceitou o convite para %1$s. Motivo: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s desfez o convite de %2$s. Motivo: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Você desfez o convite de %1$s. Motivo: %2$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s adicionou %2$s como um endereço desta sala.</item>
+        <item quantity="other">%1$s adicionou %2$s como endereços desta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Você adicionou %1$s como um endereço desta sala.</item>
+        <item quantity="other">Você adicionou %1$s como endereços desta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s removeu %2$s como um endereço desta sala.</item>
+        <item quantity="other">%1$s removeu %2$s como endereços desta sala.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Você removeu %1$s como um endereço desta sala.</item>
+        <item quantity="other">Você removeu %1$s como endereços desta sala.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s adicionou %2$s e removeu %3$s como endereços desta sala.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Você adicionou %1$s e removeu %2$s como endereços desta sala.</string>
+    <string name="notice_room_canonical_alias_set">%1$s definiu o endereço principal desta sala como %2$s.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Você definiu o endereço principal desta sala como %1$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s removeu o endereço principal desta sala.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Você removeu o endereço principal desta sala.</string>
+    <string name="notice_room_guest_access_can_join">%1$s permitiu que convidados entrem na sala.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Você permitiu que convidados entrem na sala.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s impediu que convidados entrassem na sala.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Você impediu que convidados entrassem na sala.</string>
+    <string name="notice_end_to_end_ok">%1$s ativou a criptografia de ponta a ponta.</string>
+    <string name="notice_end_to_end_ok_by_you">Você ativou a criptografia de ponta a ponta.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s ativou a criptografia de ponta a ponta (algoritmo não reconhecido %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Você ativou a criptografia de ponta a ponta (algoritmo não reconhecido %1$s).</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Você impediu que desconhecidos entrem na sala.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s impediu que desconhecidos entrem na sala.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Você permitiu que desconhecidos entrem aqui.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s permitiu que desconhecidos entrem aqui.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Você saiu. Motivo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s saiu. Motivo: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Você entrou. Motivo: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s entrou. Motivo: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Você cancelou o convite para %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s cancelou o convite para %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Você convidou %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s convidou %2$s</string>
+    <string name="notice_direct_room_update_by_you">Você atualizou esta sala.</string>
+    <string name="notice_direct_room_update">%s atualizou esta sala.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Você definiu que as mensagens enviadas a partir do presente momento estarão disponíveis para %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s definiu que as mensagens enviadas a partir do presente momento estarão disponíveis para %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Você saiu da sala</string>
+    <string name="notice_direct_room_leave">%1$s saiu da sala</string>
+    <string name="notice_direct_room_join_by_you">Você entrou</string>
+    <string name="notice_direct_room_join">%1$s entrou</string>
+    <string name="notice_direct_room_created_by_you">Você criou a sala</string>
+    <string name="notice_direct_room_created">%1$s criou a sala</string>
+    <string name="room_displayname_empty_room_was">Sala vazia (era %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s e %4$d outro</item>
+        <item quantity="other">%1$s, %2$s, %3$s e %4$d outros</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s e %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s e %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Todos os servidores estão proibidos de participar! Esta sala não pode mais ser usada.</string>
+    <string name="notice_room_server_acl_updated_no_change">Nenhuma alteração.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servidores correspondentes aos IP literais agora estão banidos.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servidores correspondentes aos IP literais agora estão permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servidores correspondentes à %s foram removidos da lista de permitidos.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Servidores correspondentes à %s agora são permitidos.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Servidores correspondente à %s foram removidos da lista de banidos.</string>
+    <string name="notice_room_server_acl_updated_banned">• Servidores correspondentes à %s foram banidos.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Você alterou a lista de controle de acesso (ACL) do servidor para esta sala.</string>
+    <string name="notice_room_server_acl_updated_title">%s alterou a lista de controle de acesso (ACL) do servidor para esta sala.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servidores correspondentes aos IP literais estão banidos.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servidores correspondentes aos IP literais estão permitidos.</string>
+    <string name="notice_room_server_acl_set_allowed">• Servidores correspondentes à %s estão permitidos.</string>
+    <string name="notice_room_server_acl_set_banned">• Servidores correspondentes à %s estão banidos.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Você definiu a lista de controle de acesso (ACL) do servidor para esta sala.</string>
+    <string name="notice_room_server_acl_set_title">%s definiu a lista de controle de acesso (ACL) do servidor para esta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Você alterou os endereços alternativos desta sala.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s alterou os endereços alternativos desta sala.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Você removeu o endereço alternativo %1$s para esta sala.</item>
+        <item quantity="other">Você removeu os endereços alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s removeu o endereço alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s removeu os endereços alternativos %2$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Você adicionou o endereço alternativo %1$s para esta sala.</item>
+        <item quantity="other">Você adicionou os endereços alternativos %1$s para esta sala.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s adicionou o endereço alternativo %2$s para esta sala.</item>
+        <item quantity="other">%1$s adicionou os endereços alternativos %2$s para esta sala.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_no_change_by_you">Você alterou os endereços desta sala.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s alterou os endereços desta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Você alterou os endereços principal e alternativos desta sala.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s alterou os endereços principal e alternativos desta sala.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Você modificou a chamada de vídeo</string>
+    <string name="notice_widget_jitsi_modified">Chamada de vídeo modificada por %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Você encerrou a chamada de vídeo</string>
+    <string name="notice_widget_jitsi_removed">Chamada de vídeo encerrada por %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Você começou uma chamada de vídeo</string>
+    <string name="notice_widget_jitsi_added">Chamada de vídeo iniciada por %1$s</string>
     <!-- titles -->
     <string name="title_activity_home">Mensagens</string>
     <string name="title_activity_room">Sala</string>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
index 3db77cf60f..7fe8a9730d 100644
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -1,5 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s enviou uma imagem.</string>
+
+    <string name="notice_room_invite_no_invitee">convite de %s</string>
+    <string name="notice_room_invite">%1$s convidou %2$s</string>
+    <string name="notice_room_invite_you">%1$s convidou-o</string>
+    <string name="notice_room_join">%1$s entrou</string>
+    <string name="notice_room_leave">%1$s saiu</string>
+    <string name="notice_room_reject">%1$s recusou o convite</string>
+    <string name="notice_room_kick">%1$s expulsou %2$s</string>
+    <string name="notice_room_unban">%1$s des-baniu %2$s</string>
+    <string name="notice_room_ban">%1$s baniu %2$s</string>
+    <string name="notice_room_withdraw">%1$s cancelou o convite de %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s mudou o seu avatar</string>
+    <string name="notice_display_name_set">%1$s definiu seu nome público como %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s alterou seu nome público de %2$s para %3$s</string>
+    <string name="notice_display_name_removed">%1$s apagou o seu nome público (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s alterou o tópico desta sala para: %2$s</string>
+    <string name="notice_room_name_changed">%1$s alterou o nome desta sala para: %2$s</string>
+    <string name="notice_placed_video_call">%s iniciou uma chamada de vídeo.</string>
+    <string name="notice_placed_voice_call">%s iniciou uma chamada de voz.</string>
+    <string name="notice_answered_call">%s respondeu à chamada.</string>
+    <string name="notice_ended_call">%s terminou a chamada.</string>
+    <string name="notice_made_future_room_visibility">%1$s tornou o histórico futuro desta sala visível para %2$s</string>
+    <string name="notice_room_visibility_invited">todas os membros que integram esta sala, a partir do momento em que foram convidados.</string>
+    <string name="notice_room_visibility_joined">todas os membros da sala, a partir do momento em que entraram.</string>
+    <string name="notice_room_visibility_shared">todas os membros da sala.</string>
+    <string name="notice_room_visibility_world_readable">todos.</string>
+    <string name="notice_room_visibility_unknown">desconhecida (%s).</string>
+    <string name="notice_end_to_end">%1$s ativou a criptografia ponta-a-ponta (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s solicitou uma conferência VoIP</string>
+    <string name="notice_voip_started">A conferência VoIP começou</string>
+    <string name="notice_voip_finished">A conferência VoIP terminou</string>
+
+    <string name="notice_avatar_changed_too">(o avatar também foi alterado)</string>
+    <string name="notice_room_name_removed">%1$s removeu o nome da sala</string>
+    <string name="notice_room_topic_removed">%1$s removeu o tópico da sala</string>
+    <string name="notice_profile_change_redacted">%1$s atualizou o seu perfil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s enviou um convite para que %2$s se junte à sala</string>
+    <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Impossível decifrar: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">O dispositivo de quem enviou a mensagem não nos enviou as chaves para esta mensagem.</string>
+
+    <!-- Room Screen -->
+    <string name="could_not_redact">Não foi possível apagar</string>
+    <string name="unable_to_send_message">Não foi possível enviar a mensagem</string>
+
+    <string name="message_failed_to_upload">O envio da imagem falhou</string>
+
+    <!-- general errors -->
+    <string name="network_error">Erro de conexão à Internet</string>
+    <string name="matrix_error">Erro do Matrix</string>
+
+    <!-- Home Screen -->
+
+    <!-- Last seen time -->
+
+    <!-- call events -->
+
+    <!-- room error messages -->
+    <string name="room_error_join_failed_empty_room">Ainda não é possível voltar a entrar numa sala vazia.</string>
+
+    <string name="encrypted_message">Mensagem cifrada</string>
+
+    <!-- medium friendly name -->
+    <string name="medium_email">Endereço de e-mail</string>
+    <string name="medium_phone_number">Número de telefone</string>
+
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Convite de %s</string>
+    <string name="room_displayname_room_invite">Convite para sala</string>
+    <string name="room_displayname_two_members">%1$s e %2$s</string>
+    <string name="room_displayname_empty_room">Sala vazia</string>
+
+
+    <string name="summary_user_sent_sticker">%1$s enviou um sticker.</string>
+
+    <string name="notice_room_update">%s fez o upgrade da sala.</string>
+
+    <string name="notice_event_redacted">Mensagem removida</string>
+    <string name="notice_event_redacted_by">Mensagem removida por %1$s</string>
     <!-- titles -->
     <string name="title_activity_home">Mensagens</string>
     <string name="title_activity_room">Sala</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 878105c1fe..7741c155d8 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1,5 +1,292 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s отправил(а) изображение.</string>
+    <string name="notice_room_invite_no_invitee">%s приглашение</string>
+    <string name="notice_room_invite">%1$s пригласил(а) %2$s</string>
+    <string name="notice_room_invite_you">%1$s пригласил(а) вас</string>
+    <string name="notice_room_join">%1$s вошёл(ла) в комнату</string>
+    <string name="notice_room_leave">%1$s покинул(а) комнату</string>
+    <string name="notice_room_reject">%1$s отклонил(а) приглашение</string>
+    <string name="notice_room_kick">%1$s выгнан %2$s</string>
+    <string name="notice_room_unban">%1$s разблокировал(а) %2$s</string>
+    <string name="notice_room_ban">%1$s заблокировал(а) %2$s</string>
+    <string name="notice_room_withdraw">%1$s отозвал(а) приглашение %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s изменил(а) свой аватар</string>
+    <string name="notice_display_name_set">%1$s установил(а) имя %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s изменил(а) имя с %2$s на %3$s</string>
+    <string name="notice_display_name_removed">%1$s удалил(а) свое имя (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s изменил(а) тему на: %2$s</string>
+    <string name="notice_room_name_changed">%1$s изменил(а) название комнаты: %2$s</string>
+    <string name="notice_placed_video_call">%s начал(а) видеовызов.</string>
+    <string name="notice_placed_voice_call">%s начал(а) голосовой вызов.</string>
+    <string name="notice_answered_call">%s ответил(а) на звонок.</string>
+    <string name="notice_ended_call">%s завершил(а) вызов.</string>
+    <string name="notice_made_future_room_visibility">%1$s сделал(а) будущую историю комнаты видимой %2$s</string>
+    <string name="notice_room_visibility_invited">всем членам, с момента их приглашения.</string>
+    <string name="notice_room_visibility_joined">всем членам, с момента присоединения.</string>
+    <string name="notice_room_visibility_shared">всем членам.</string>
+    <string name="notice_room_visibility_world_readable">всем.</string>
+    <string name="notice_room_visibility_unknown">неизвестно (%s).</string>
+    <string name="notice_end_to_end">%1$s включил(а) сквозное шифрование (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s запросил(а) VoIP конференцию</string>
+    <string name="notice_voip_started">VoIP-конференция начата</string>
+    <string name="notice_voip_finished">VoIP-конференция завершена</string>
+    <string name="notice_avatar_changed_too">(аватар также был изменен)</string>
+    <string name="notice_room_name_removed">%1$s удалил(а) название комнаты</string>
+    <string name="notice_room_topic_removed">%1$s удалил(а) тему комнаты</string>
+    <string name="notice_profile_change_redacted">%1$s обновил(а) свой профиль %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s отправил(а) приглашение %2$s присоединиться к комнате</string>
+    <string name="notice_room_third_party_registered_invite">%1$s принял(а) приглашение от %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Невозможно расшифровать: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Устройство отправителя не предоставило нам ключ для расшифровки этого сообщения.</string>
+    <!-- Room Screen -->
+    <string name="could_not_redact">Не удалось изменить</string>
+    <string name="unable_to_send_message">Не удалось отправить сообщение</string>
+    <string name="message_failed_to_upload">Не удалось загрузить изображение</string>
+    <!-- general errors -->
+    <string name="network_error">Сетевая ошибка</string>
+    <string name="matrix_error">Ошибка Matrix</string>
+    <!-- Home Screen -->
+    <!-- Last seen time -->
+    <!-- call events -->
+    <!-- room error messages -->
+    <string name="room_error_join_failed_empty_room">В настоящее время невозможно вновь присоединиться к пустой комнате.</string>
+    <string name="encrypted_message">Зашифрованное сообщение</string>
+    <!-- medium friendly name -->
+    <string name="medium_email">Адрес электронной почты</string>
+    <string name="medium_phone_number">Номер телефона</string>
+    <string name="summary_user_sent_sticker">%1$s отправил стикер.</string>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Приглашение от %s</string>
+    <string name="room_displayname_room_invite">Приглашение в комнату</string>
+    <string name="room_displayname_two_members">%1$s и %2$s</string>
+    <string name="room_displayname_empty_room">Пустая комната</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s и 1 другой</item>
+        <item quantity="few">%1$s и %2$d другие</item>
+        <item quantity="many">%1$s и %2$d других</item>
+        <item quantity="other"/>
+    </plurals>
+    <string name="notice_event_redacted">Сообщение удалено</string>
+    <string name="notice_event_redacted_by">%1$s удалил(а) сообщение</string>
+    <string name="notice_event_redacted_with_reason">Сообщение удалено [причина: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s удалил(а) сообщение [причина: %2$s]</string>
+    <string name="initial_sync_start_importing_account">Начальная синхронизация:
+\nИмпорт учетной записи…</string>
+    <string name="initial_sync_start_importing_account_crypto">Начальная синхронизация:
+\nИмпорт криптографии</string>
+    <string name="initial_sync_start_importing_account_rooms">Начальная синхронизация:
+\nИмпорт комнат</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Синхронизация начата:
+\nИмпорт присоединенных комнат</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Синхронизация начата:
+\nИмпорт приглашенных комнат</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Начальная синхронизация:
+\nИмпорт покинутых комнат</string>
+    <string name="initial_sync_start_importing_account_groups">Начальная синхронизация:
+\nИмпорт сообществ</string>
+    <string name="initial_sync_start_importing_account_data">Начальная синхронизация:
+\nИмпорт данных учетной записи</string>
+    <string name="notice_room_update">%s обновил эту комнату.</string>
+    <string name="event_status_sending_message">Отправка сообщения…</string>
+    <string name="clear_timeline_send_queue">Очистить очередь отправки</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s отозвал приглашение %2$s присоединиться к комнате</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Приглашение %1$s. Причина: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s приглашен %2$s. Причина: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s пригласил вас. Причина: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s вошёл(ла) в комнату. Причина: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s покинул(а) комнату. Причина: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s отклонил приглашение. Причина: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s выгнали %2$s. Причина: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s разблокировано %2$s. Причина: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s забанен %2$s. Причина: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s отправил приглашение %2$s в комнату. Причина: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s отозвал приглашение %2$s присоединиться к комнате. Причина: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s принял приглашение для %2$s. Причина: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s отозвал приглашение %2$s. Причина: %3$s</string>
+    <string name="notice_room_created">%1$s создал(а) комнату</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s добавил(а) %2$s в качестве адреса для этой комнаты.</item>
+        <item quantity="few">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
+        <item quantity="many">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s удалил(а) адрес %2$s для комнаты.</item>
+        <item quantity="few">%1$s удалил(а) адреса %2$s для комнаты.</item>
+        <item quantity="many">%1$s удалил(а) адреса %2$s для комнаты.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s добавил(а) адреса %2$s и удалил(а) %3$s для комнаты.</string>
+    <string name="notice_room_canonical_alias_set">%1$s сделал(а) %2$s главным адресом комнаты.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s удалил(а) главный адрес комнаты.</string>
+    <string name="notice_room_guest_access_can_join">%1$s разрешил(а) гостям входить в комнату.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s запретил(а) гостям входить в комнату.</string>
+    <string name="notice_end_to_end_ok">%1$s включил(а) сквозное шифрование.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s включил(а) сквозное шифрование (неизвестный алгоритм %2$s).</string>
+    <string name="summary_you_sent_image">Вы отправили изображение.</string>
+    <string name="summary_you_sent_sticker">Вы отправили стикер.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Ваше приглашение</string>
+    <string name="notice_room_created_by_you">Вы создали комнату</string>
+    <string name="notice_room_invite_by_you">Вы пригласили %1$s</string>
+    <string name="notice_room_join_by_you">Вы вошли в комнату</string>
+    <string name="notice_room_leave_by_you">Вы покинули комнату</string>
+    <string name="notice_room_reject_by_you">Вы отклонили приглашение</string>
+    <string name="notice_room_kick_by_you">Вы выгнали %1$s</string>
+    <string name="notice_room_unban_by_you">Вы разбанили %1$s</string>
+    <string name="notice_room_ban_by_you">Вы забанили %1$s</string>
+    <string name="notice_room_withdraw_by_you">Вы отозвали приглашение %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Вы сменили свой аватар</string>
+    <string name="notice_display_name_set_by_you">Вы сменили своё отображаемое имя на %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Вы сменили своё отображаемое имя с %1$s на %2$s</string>
+    <string name="notice_display_name_removed_by_you">Вы удалили своё отображаемое имя (%1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Вы сменили тему на: %1$s</string>
+    <string name="notice_room_name_changed_by_you">Вы сменили название комнаты на: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Вы начали видеозвонок.</string>
+    <string name="notice_placed_voice_call_by_you">Вы начали звонок.</string>
+    <string name="notice_answered_call_by_you">Вы ответили на звонок.</string>
+    <string name="notice_ended_call_by_you">Вы закончили звонок.</string>
+    <string name="notice_made_future_room_visibility_by_you">Вы сделали будущую историю комнаты видимой для %1$s</string>
+    <string name="notice_end_to_end_by_you">Вы включили сквозное шифрование (%1$s)</string>
+    <string name="notice_room_update_by_you">Вы обновили эту комнату.</string>
+    <string name="notice_requested_voip_conference_by_you">Вы начали групповой звонок</string>
+    <string name="notice_room_name_removed_by_you">Вы удалили название комнаты</string>
+    <string name="notice_room_topic_removed_by_you">Вы удалили тему комнаты</string>
+    <string name="notice_profile_change_redacted_by_you">Вы обновили свой профиль %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Вы отправили %1$s приглашение в эту комнату</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Вы отозвали у %1$s приглашение в эту комнату</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Вы приняли приглашение для %1$s</string>
+    <string name="notice_widget_added">%1$s добавил(а) виджет %2$s</string>
+    <string name="notice_widget_added_by_you">Вы добавили виджет %1$s</string>
+    <string name="notice_widget_removed">%1$s удалил(а) виджет %2$s</string>
+    <string name="notice_widget_removed_by_you">Вы удалили виджет %1$s</string>
+    <string name="notice_widget_modified">%1$s изменил(а) виджет %2$s</string>
+    <string name="notice_widget_modified_by_you">Вы изменили виджет %1$s</string>
+    <string name="power_level_admin">Администратор</string>
+    <string name="power_level_moderator">Модератор</string>
+    <string name="power_level_default">По умолчанию</string>
+    <string name="power_level_custom">Пользовательский (%1$d)</string>
+    <string name="power_level_custom_no_value">Пользовательский</string>
+    <string name="notice_power_level_changed_by_you">Вы изменили уровни доступа %1$s.</string>
+    <string name="notice_power_level_changed">%1$s изменил(а) уровни доступа %2$s.</string>
+    <string name="notice_power_level_diff">%1$s с %2$s на %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваше приглашение. Причина: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Вы пригласили %1$s. Причина: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Вы вошли в комнату. Причина: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Вы покинули комнату. Причина: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Вы отклонили приглашение. Причина: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Вы выгнали %1$s. Причина: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Вы разбанили %1$s. Причина: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Вы забанили %1$s. Причина: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Вы отправили %1$s приглашение в эту комнату. Причина: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Вы отозвали у %1$s приглашение в эту комнату. Причина: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Вы приняли приглашение для %1$s. Причина: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Вы отозвали приглашение %1$s. Причина: %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Вы добавили адрес %1$s для этой комнаты.</item>
+        <item quantity="few">Вы добавили %1$s в качестве адресов для этой комнаты.</item>
+        <item quantity="many">Вы добавили %1$s в качестве адресов для этой комнаты.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Вы удалили адрес этой комнаты: %1$s.</item>
+        <item quantity="few">Вы удалили адреса этой комнаты: %1$s.</item>
+        <item quantity="many">Вы удалили адреса этой комнаты: %1$s.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">Вы добавили адреса %1$s и удалили %2$s для этой комнаты.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Вы задали главный адрес этой комнаты %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Вы удалили главный адрес этой комнаты.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Вы разрешили гостям входить в комнату.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Вы запретили гостям входить в комнату.</string>
+    <string name="notice_end_to_end_ok_by_you">Вы включили сквозное шифрование.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Вы включили сквозное шифрование (неизвестный алгоритм %1$s).</string>
+    <string name="notice_room_avatar_changed">%1$s изменил(а) аватар комнаты</string>
+    <string name="notice_room_avatar_changed_by_you">Вы изменили аватар комнаты</string>
+    <string name="notice_call_candidates">%s отправил(а) данные для начала звонка.</string>
+    <string name="notice_call_candidates_by_you">Вы отправили данные для начала звонка.</string>
+    <string name="notice_room_avatar_removed">%1$s удалил(а) аватар комнаты</string>
+    <string name="notice_room_avatar_removed_by_you">Вы удалили аватар комнаты</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Вы запретили гостям входить в комнату.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s запретил(а) гостям входить в комнату.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Вы разрешили гостям присоединяться сюда.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s разрешил(а) гостям присоединиться сюда.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Вы вышли. Причина: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s вышел(-ла). Причина: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Вы вошли. Причина: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s вошел(-ла). Причина: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Вы отозвали приглашение %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s отозвал(а) приглашение %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Вы пригласили %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s пригласил(а) %2$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Вы сделали будущие сообщения видимыми для %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s сделал(а) будущие сообщения видимыми для %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Вы покинули комнату</string>
+    <string name="notice_direct_room_leave">%1$s покинул(а) комнату</string>
+    <string name="notice_direct_room_join_by_you">Вы вошли</string>
+    <string name="notice_direct_room_join">%1$s вошел(ла)</string>
+    <string name="notice_direct_room_created_by_you">Вы создали обсуждение</string>
+    <string name="notice_direct_room_created">%1$s создал(а) обсуждение</string>
+    <string name="notice_direct_room_update_by_you">Вы обновили эту комнату.</string>
+    <string name="notice_direct_room_update">%s обновил(а) эту комнату.</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s и %4$d другой</item>
+        <item quantity="few">%1$s, %2$s, %3$s и %4$d других</item>
+        <item quantity="many">%1$s, %2$s, %3$s и %4$d другие</item>
+        <item quantity="other">%1$s, %2$s, %3$s и %4$d другие</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s и %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s и %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Всем серверам запрещено участвовать! Эта комната больше не может быть использована.</string>
+    <string name="notice_room_server_acl_updated_no_change">Без изменений.</string>
+    <string name="room_displayname_empty_room_was">Пустая комната (была %s)</string>
+    <string name="notice_room_server_acl_set_banned">• Соответствующий сервер %s заблокирован.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Сервер, соответствующий буквальным IP-адресам, теперь запрещён.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Сервер, соответствующий буквальным IP-адресам, теперь разрешён.</string>
+    <string name="notice_room_server_acl_updated_banned">• Сервер, соответствующий %s, теперь запрещён.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Сервер, соответствующий %s, теперь разрешён.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Сервер, соответствующий %s, был удалён из списка блокировки.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Сервер, соответствующий буквальным IP-адресам, запрещён.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Сервер, соответствующий буквальным IP-адресам, разрешён.</string>
+    <string name="notice_room_server_acl_set_allowed">• Сервер, соответствующий %s, разрешён.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Сервер, соответствующий %s, был удалён из разрешённого списка.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Вы изменили права доступа сервера (ACL) для этой комнаты.</string>
+    <string name="notice_room_server_acl_updated_title">%s изменил права доступа сервера (ACL) для этой комнаты.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Вы настроили права доступа сервера (ACL) для этой комнаты.</string>
+    <string name="notice_room_server_acl_set_title">%s устанавливает права доступа сервера (ACL) для этой комнаты.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Вы изменили адреса этой комнаты.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s изменил(а) адреса этой комнаты.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Вы изменили основной и альтернативный адреса этой комнаты.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s изменил(а) основной и альтернативный адреса этой комнаты.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Вы изменили альтернативные адреса для этой комнаты.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s изменил(а) альтернативные адреса для этой комнаты.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Вы удалили альтернативный адрес %1$s для этой комнаты.</item>
+        <item quantity="few">Вы удалили альтернативные адреса %1$s для этой комнаты.</item>
+        <item quantity="many">Вы удалили альтернативные адреса %1$s для этой комнаты.</item>
+        <item quantity="other">Вы удалили альтернативные адреса %1$s для этой комнаты.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s удалил(а) альтернативный адрес %2$s для этой комнаты.</item>
+        <item quantity="few">%1$s удалил(а) альтернативные адреса %2$s для этой комнаты.</item>
+        <item quantity="many">%1$s удалил(а) альтернативные адреса %2$s для этой комнаты.</item>
+        <item quantity="other">%1$s удалил(а) альтернативные адреса %2$s для этой комнаты.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Вы добавили альтернативный адрес %1$s для этой комнаты.</item>
+        <item quantity="few">Вы добавили альтернативные адреса %1$s для этой комнаты.</item>
+        <item quantity="many">Вы добавили альтернативные адреса %1$s для этой комнаты.</item>
+        <item quantity="other">Вы добавили альтернативные адреса %1$s для этой комнаты.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s добавил(а) альтернативный адрес %2$s для этой комнаты.</item>
+        <item quantity="few">%1$s добавил(а) альтернативные адреса %2$s для этой комнаты.</item>
+        <item quantity="many">%1$s добавил(а) альтернативные адреса %2$s для этой комнаты.</item>
+        <item quantity="other">%1$s добавил(а) альтернативные адреса %2$s для этой комнаты.</item>
+    </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">Вы изменили видеоконференцию</string>
+    <string name="notice_widget_jitsi_modified">%1$s изменил(а) видеоконференцию</string>
+    <string name="notice_widget_jitsi_removed_by_you">Вы завершили видеоконференцию</string>
+    <string name="notice_widget_jitsi_removed">%1$s завершил(а) видеоконференцию</string>
+    <string name="notice_widget_jitsi_added_by_you">Вы начали видеоконференцию</string>
+    <string name="notice_widget_jitsi_added">%1$s начал(а) видеоконференцию</string>
     <!-- titles -->
     <string name="title_activity_home">Сообщения</string>
     <string name="title_activity_room">Комната</string>
diff --git a/vector/src/main/res/values-si/strings.xml b/vector/src/main/res/values-si/strings.xml
index 6ce16c8d85..e1939a1ed6 100644
--- a/vector/src/main/res/values-si/strings.xml
+++ b/vector/src/main/res/values-si/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
     <string name="title_activity_home">පණිවිඩ</string>
     <string name="title_activity_settings">සැකසුම්</string>
     <string name="title_activity_room">කාමරය</string>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 3f9abae610..8efda54cf4 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -1,5 +1,213 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s poslal/a obrázok.</string>
+    <string name="notice_room_invite_no_invitee">Pozvanie od %s</string>
+    <string name="notice_room_invite">%1$s pozval/a %2$s</string>
+    <string name="notice_room_invite_you">%1$s vás pozval/a</string>
+    <string name="notice_room_join">%1$s vstúpil/a do miestnosti</string>
+    <string name="notice_room_leave">%1$s opustil/a miestnosť</string>
+    <string name="notice_room_reject">%1$s odmietol/a pozvanie</string>
+    <string name="notice_room_kick">%1$s vykázal/a %2$s</string>
+    <string name="notice_room_unban">%1$s povolil/a vstupovať %2$s</string>
+    <string name="notice_room_ban">%1$s zakázal/a vstupovať %2$s</string>
+    <string name="notice_room_withdraw">%1$s vzal/a späť pozvanie %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s si zmenil/a obrázok v profile</string>
+    <string name="notice_display_name_set">%1$s si nastavil/a zobrazované meno %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s si zmenil/a zobrazované meno %2$s na %3$s</string>
+    <string name="notice_display_name_removed">%1$s odstránil/a svoje zobrazované meno (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s zmenil/a tému na: %2$s</string>
+    <string name="notice_room_name_changed">%1$s zmenil/a názov miestnosti na: %2$s</string>
+    <string name="notice_placed_video_call">%s uskutočnil/a video hovor.</string>
+    <string name="notice_placed_voice_call">%s zatelefonoval/a.</string>
+    <string name="notice_answered_call">%s prijal/a hovor.</string>
+    <string name="notice_ended_call">%s ukončil/a hovor.</string>
+    <string name="notice_made_future_room_visibility">%1$s sprístupnil/a budúcu históriu miestnosti %2$s</string>
+    <string name="notice_room_visibility_invited">pre všetkých členov, od kedy boli pozvaní.</string>
+    <string name="notice_room_visibility_joined">pre všetkých členov, od kedy vstúpili.</string>
+    <string name="notice_room_visibility_shared">pre všetkých členov.</string>
+    <string name="notice_room_visibility_world_readable">pre každého.</string>
+    <string name="notice_room_visibility_unknown">neznámym (%s).</string>
+    <string name="notice_end_to_end">%1$s povolil/a E2E šifrovanie (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s požiadal/a o VoIP konferenciu</string>
+    <string name="notice_voip_started">Začala sa VoIP konferencia</string>
+    <string name="notice_voip_finished">Skončila sa VoIP konferencia</string>
+    <string name="notice_avatar_changed_too">(aj obrázok v profile)</string>
+    <string name="notice_room_name_removed">%1$s odstránil/a názov miestnosti</string>
+    <string name="notice_room_topic_removed">%1$s odstránil/a tému miestnosti</string>
+    <string name="notice_profile_change_redacted">%1$s aktualizoval/a svoj profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s pozval/a %2$s vstúpiť do miestnosti</string>
+    <string name="notice_room_third_party_registered_invite">%1$s prijal/a pozvanie pre %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Nie je možné dešifrovať: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Zo zariadenia odosieľateľa nebolo možné získať kľúče potrebné na dešifrovanie tejto správy.</string>
+    <string name="could_not_redact">Nie je možné vymazať</string>
+    <string name="unable_to_send_message">Nie je možné odoslať správu</string>
+    <string name="message_failed_to_upload">Nepodarilo sa nahrať obrázok</string>
+    <string name="network_error">Chyba siete</string>
+    <string name="matrix_error">Chyba Matrix</string>
+    <string name="room_error_join_failed_empty_room">V súčasnosti nie je možné znovu vstúpiť do prázdnej miestnosti.</string>
+    <string name="encrypted_message">Šifrovaná správa</string>
+    <string name="medium_email">Emailová adresa</string>
+    <string name="medium_phone_number">Telefónne číslo</string>
+    <string name="summary_user_sent_sticker">%1$s poslal/a nálepku.</string>
+    <string name="room_displayname_invite_from">Pozvanie od %s</string>
+    <string name="room_displayname_room_invite">Pozvanie do miestnosti</string>
+    <string name="room_displayname_two_members">%1$s a %2$s</string>
+    <string name="room_displayname_empty_room">Prázdna miestnosť</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s a 1 ďalší</item>
+        <item quantity="few">%1$s a %2$d ďalší</item>
+        <item quantity="many">%1$s a %2$d ďalších</item>
+        <item quantity="other"/>
+    </plurals>
+    <string name="notice_room_update">%s aktualizoval/a túto miestnosť.</string>
+    <string name="notice_event_redacted">Odstránená správa</string>
+    <string name="notice_event_redacted_by">Odstránená správa používateľom %1$s</string>
+    <string name="notice_event_redacted_with_reason">Odstránená správa [dôvod: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Odstránená správa používateľom %1$s [dôvod: %2$s]</string>
+    <string name="initial_sync_start_importing_account">Úvodná synchronizácia:
+\nPrebieha import účtu…</string>
+    <string name="initial_sync_start_importing_account_crypto">Úvodná synchronizácia:
+\nPrebieha import šifrovacích kľúčov</string>
+    <string name="initial_sync_start_importing_account_rooms">Úvodná synchronizácia:
+\nPrebieha import miestností</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Úvodná synchronizácia:
+\nPrebieha import miestností, do ktorých ste vstúpili</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Úvodná synchronizácia:
+\nPrebieha import pozvaní</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Úvodná synchronizácia:
+\nPrebieha import opustených miestností</string>
+    <string name="initial_sync_start_importing_account_groups">Úvodná synchronizácia:
+\nPrebieha import komunít</string>
+    <string name="initial_sync_start_importing_account_data">Úvodná synchronizácia:
+\nPrebieha import údajov účtu</string>
+    <string name="event_status_sending_message">Odosielanie správy…</string>
+    <string name="clear_timeline_send_queue">Vymazať správy na odoslanie</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s zamietol/a pozvanie používateľa %2$s vstúpiť do miestnosti</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Pozvanie od %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s pozval/a %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s vás pozval/a. Dôvod: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s vstúpil/a do miestnosti. Dôvod: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s opustil/a miestnosť. Dôvod: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s odmietol/a pozvanie. Dôvod: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s vykázal/a %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s povolil/a vstupovať %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s zakázal/a vstupovať %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s pozval/a %2$s vstúpiť do miestnosti. Dôvod: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s zamietol/a pozvanie používateľa %2$s vstúpiť do miestnosti. Dôvod: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s prijal/a pozvanie pre %2$s. Dôvod: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s vzal/a späť pozvanie %2$s. Dôvod: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s pridal/a adresu %2$s pre túto miestnosť.</item>
+        <item quantity="few">%1$s pridal/a adresy %2$s pre túto miestnosť.</item>
+        <item quantity="other">%1$s pridal/a adresy %2$s pre túto miestnosť.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s odstránil/a adresu %2$s pre túto miestnosť.</item>
+        <item quantity="few">%1$s odstránil/a adresy %3$s pre túto miestnosť.</item>
+        <item quantity="other">%1$s odstránil/a adresy %3$s pre túto miestnosť.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s pridal/a adresy %2$s a odstránil/a adresy %3$s pre túto miestnosť.</string>
+    <string name="notice_room_canonical_alias_set">%1$s nastavil/a hlavnú adresu tejto miestnosti %2$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s odstránil/a hlavnú adresu tejto miestnosti.</string>
+    <string name="notice_room_guest_access_can_join">%1$s povolil/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
+    <string name="summary_you_sent_image">Poslali ste obrázok.</string>
+    <string name="summary_you_sent_sticker">Poslali ste nálepku.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Pozvanie od vás</string>
+    <string name="notice_room_created">%1$s vytvoril/a miestnosť</string>
+    <string name="notice_room_created_by_you">Vytvorili ste miestnosť</string>
+    <string name="notice_room_invite_by_you">Pozvali ste %1$s</string>
+    <string name="notice_room_join_by_you">Vstúpili ste do miestnosti</string>
+    <string name="notice_room_leave_by_you">Opustili ste miestnosť</string>
+    <string name="notice_room_reject_by_you">Odmietli ste pozvanie</string>
+    <string name="notice_room_kick_by_you">Vykázali ste %1$s</string>
+    <string name="notice_room_unban_by_you">Povolili ste vstupovať %1$s</string>
+    <string name="notice_room_ban_by_you">Zakázali ste vstupovať %1$s</string>
+    <string name="notice_room_withdraw_by_you">Vzali ste späť pozvanie %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Zmenili ste si obrázok v profile</string>
+    <string name="notice_display_name_set_by_you">Nastavili ste si zobrazované meno %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Zmenili ste si zobrazované meno %1$s na %2$s</string>
+    <string name="notice_display_name_removed_by_you">Odstránili ste svoje zobrazované meno %1$s</string>
+    <string name="notice_room_topic_changed_by_you">Zmenili ste tému na: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s zmenil/a obrázok miestnosti</string>
+    <string name="notice_room_avatar_changed_by_you">Zmenili ste obrázok miestnosti</string>
+    <string name="notice_room_name_changed_by_you">Zmenili ste názov miestnosti na: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Uskutočnili ste video hovor.</string>
+    <string name="notice_placed_voice_call_by_you">Zatelefonovali ste.</string>
+    <string name="notice_call_candidates">%s poslal údaje pre nastavenie hovoru.</string>
+    <string name="notice_call_candidates_by_you">Poslali ste údaje na nastavenie hovoru.</string>
+    <string name="notice_answered_call_by_you">Prijali ste hovor.</string>
+    <string name="notice_ended_call_by_you">Ukončili ste hovor.</string>
+    <string name="notice_made_future_room_visibility_by_you">Sprístupnili ste budúcu históriu miestnosti %1$s</string>
+    <string name="notice_end_to_end_by_you">Povolili ste E2E šifrovanie (%1$s)</string>
+    <string name="notice_room_update_by_you">Aktualizovali ste túto miestnosť.</string>
+    <string name="notice_requested_voip_conference_by_you">Požiadali ste o VoIP konferenciu</string>
+    <string name="notice_room_name_removed_by_you">Odstránili ste názov miestnosti</string>
+    <string name="notice_room_topic_removed_by_you">Odstránili ste tému miestnosti</string>
+    <string name="notice_room_avatar_removed">%1$s odstránil obrázok miestnosti</string>
+    <string name="notice_room_avatar_removed_by_you">Odstránili ste obrázok miestnosti</string>
+    <string name="notice_profile_change_redacted_by_you">Aktualizovali ste svoj profil %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Pozvali ste %1$s vstúpiť do miestnosti</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Zamietli ste pozvanie používateľa %1$s vstúpiť do miestnosti</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Prijali ste pozvanie pre %1$s</string>
+    <string name="notice_widget_added">%1$s pridal/a widget %2$s</string>
+    <string name="notice_widget_added_by_you">Pridali ste widget %1$s</string>
+    <string name="notice_widget_removed">%1$s odstránil/a widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Odstránili ste widget %1$s</string>
+    <string name="notice_widget_modified">%1$s upravil/a widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Upravili ste widget %1$s</string>
+    <string name="power_level_admin">Správca</string>
+    <string name="power_level_moderator">Moderátor</string>
+    <string name="power_level_default">Predvolený</string>
+    <string name="power_level_custom">Vlastná úroveň (%1$d)</string>
+    <string name="power_level_custom_no_value">Vlastná úroveň</string>
+    <string name="notice_power_level_changed_by_you">Zmenili ste úroveň moci používateľa %1$s.</string>
+    <string name="notice_power_level_changed">%1$s zmenil úroveň moci používateľa %2$s.</string>
+    <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Pozvanie od vás. Dôvod: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Pozvali ste %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Vstúpili ste do miestnosti. Dôvod: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Opustili ste miestnosť. Dôvod: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Odmietli ste pozvanie. Dôvod: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Vykázali ste %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Povolili ste vstupovať %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Zakázali ste vstupovať %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Pozvali ste %1$s vstúpiť do miestnosti. Dôvod: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Zamietli ste pozvanie používateľa %1$s vstúpiť do miestnosti. Dôvod: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Prijali ste pozvanie pre %1$s. Dôvod: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Vzali ste späť pozvanie %1$s. Dôvod: %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Pridali ste adresu %1$s pre túto miestnosť.</item>
+        <item quantity="few">Pridali ste adresy %1$s pre túto miestnosť.</item>
+        <item quantity="other">Pridali ste adresy %1$s pre túto miestnosť.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Odstránili ste adresu %1$s pre túto miestnosť.</item>
+        <item quantity="few">Odstránili ste adresy %1$s pre túto miestnosť.</item>
+        <item quantity="other">Odstránili ste adresy %1$s pre túto miestnosť.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">Pridali ste %1$s a odstránili adresy %2$s pre túto miestnosť.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Nastavili ste hlavnú adresu tejto miestnosti %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Odstránili ste hlavnú adresu tejto miestnosti.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Povolili ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s zakázal/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Zakázali ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
+    <string name="notice_end_to_end_ok">%1$s povolil/a E2E šifrovanie.</string>
+    <string name="notice_end_to_end_ok_by_you">Povolili ste E2E šifrovanie.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s povolil/a E2E šifrovanie (Nerozpoznaný algorytmus %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Povolili ste E2E šifrovanie (Nerozpoznaný algorytmus %1$s).</string>
+    <string name="notice_room_server_acl_set_title_by_you">nastavili ste na servery pravidlá ACL tejto miestnosti.</string>
+    <string name="notice_room_server_acl_set_title">%s nastavil(a) na servery pravidlá ACL tejto miestnosti.</string>
+    <string name="notice_direct_room_update_by_you">Aktualizovali ste sem.</string>
+    <string name="notice_direct_room_update">%s aktualizoval(a) sem.</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s sprístupnil(a) budúce správy %2$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Sprístupnili ste budúce správy %1$s</string>
+    <string name="notice_direct_room_leave_by_you">Opustili ste miestnosť</string>
+    <string name="notice_direct_room_leave">%1$s opustil(a) miestnosť</string>
+    <string name="notice_direct_room_join_by_you">Vstúpili ste</string>
+    <string name="notice_direct_room_join">%1$s vstúpil(a)</string>
+    <string name="notice_direct_room_created_by_you">Vytvorili ste konverzáciu</string>
+    <string name="notice_direct_room_created">%1$s vytvoril(a) konverzáciu</string>
     <string name="light_theme">Svetlý vzhľad</string>
     <string name="dark_theme">Tmavý vzhľad</string>
     <string name="black_theme">Čierny vzhľad</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index a06bf6f141..e8c6ce8822 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1,5 +1,264 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s dërgoi një figurë.</string>
+    <string name="notice_room_invite">%1$s ftoi %2$s</string>
+    <string name="notice_room_invite_you">%1$s ju ftoi</string>
+    <string name="notice_room_join">%1$s hyri në dhomë</string>
+    <string name="notice_room_leave">%1$s doli nga dhoma</string>
+    <string name="notice_room_reject">%1$s hodhi tej ftesën</string>
+    <string name="notice_room_kick">%1$s përzuri %2$s</string>
+    <string name="notice_room_ban">%1$s dëboi %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s ndryshoi avatarin e vet</string>
+    <string name="notice_room_topic_changed">%1$s ndryshoi temën në: %2$s</string>
+    <string name="notice_room_name_changed">%1$s ndryshoi emrin e dhomës në: %2$s</string>
+    <string name="notice_placed_video_call">%s bëri një thirrje video.</string>
+    <string name="notice_placed_voice_call">%s bëri një thirrje zanore.</string>
+    <string name="notice_answered_call">%s iu përgjigj thirrjes.</string>
+    <string name="notice_ended_call">%s e përfundoi thirrjen.</string>
+    <string name="notice_made_future_room_visibility">%1$s e bëri historikun e ardhshëm të dhomës të dukshëm për %2$s</string>
+    <string name="notice_room_visibility_invited">për krejt anëtarët e dhomës, prej çastit kur janë ftuar.</string>
+    <string name="notice_room_visibility_joined">për krejt anëtarët e dhomës, prej çastit kur morën pjesë.</string>
+    <string name="notice_room_visibility_shared">krejt anëtarët e dhomës.</string>
+    <string name="notice_room_visibility_world_readable">cilido.</string>
+    <string name="notice_room_visibility_unknown">e panjohur (%s).</string>
+    <string name="notice_requested_voip_conference">%1$s kërkoi një konferencë VoIP</string>
+    <string name="notice_voip_started">Konferenca VoIP filloi</string>
+    <string name="notice_voip_finished">Konferenca VoIP përfundoi</string>
+    <string name="notice_avatar_changed_too">(u ndryshua edhe avatari)</string>
+    <string name="notice_room_name_removed">%1$s hoqi emrin e dhomës</string>
+    <string name="notice_profile_change_redacted">%1$s përditësoi profilin e tij %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s pranoi ftesën tuaj për %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** S’arrihet të shfshehtëzohet: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Pajisja e dërguesit nuk na ka dërguar kyçet për këtë mesazh.</string>
+    <string name="could_not_redact">S’u redaktua dot</string>
+    <string name="unable_to_send_message">S’arrihet të dërgohet mesazh</string>
+    <string name="message_failed_to_upload">Ngarkimi i figurës dështoi</string>
+    <string name="network_error">Gabim rrjeti</string>
+    <string name="matrix_error">Gabim Matrix</string>
+    <string name="room_error_join_failed_empty_room">Hëpërhë s’është e mundur të rihyhet në një dhomë të zbrazët.</string>
+    <string name="encrypted_message">Mesazh i fshehtëzuar</string>
+    <string name="medium_email">Adresë email</string>
+    <string name="medium_phone_number">Numër telefoni</string>
+    <string name="room_displayname_invite_from">Ftesë nga %s</string>
+    <string name="room_displayname_room_invite">Ftesë Dhome</string>
+    <string name="room_displayname_two_members">%1$s dhe %2$s</string>
+    <string name="room_displayname_empty_room">Dhomë e zbrazët</string>
+    <string name="summary_user_sent_sticker">%1$s dërgoi një ngjitës.</string>
+    <string name="notice_room_invite_no_invitee">Ftesë e %s</string>
+    <string name="notice_room_unban">%1$s hoqi dëbimin për %2$s</string>
+    <string name="notice_room_withdraw">%1$s tërhoqi mbrapsht ftesën për %2$s</string>
+    <string name="notice_display_name_set">%1$s caktoi për veten emër ekrani %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s ndryshoi emrin e tyre në ekran nga %2$s në %3$s</string>
+    <string name="notice_display_name_removed">%1$s hoqi emrin e tij në ekran (%2$s)</string>
+    <string name="notice_end_to_end">%1$s aktivizoi fshehtëzim skaj-më-skaj (%2$s)</string>
+    <string name="notice_room_topic_removed">%1$s hoqi temën e dhomës</string>
+    <string name="notice_room_third_party_invite">%1$s dërgoi një ftesë për %2$s që të marrë pjesë në dhomë</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s dhe 1 tjetër</item>
+        <item quantity="other">%1$s dhe %2$d të tjerë</item>
+    </plurals>
+    <string name="notice_event_redacted">Mesazhi u hoq</string>
+    <string name="notice_event_redacted_by">Mesazhi u hoq nga %1$s</string>
+    <string name="notice_event_redacted_with_reason">Mesazh i hequr [arsye: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Mesazh i hequr nga %1$s [arsye: %2$s]</string>
+    <string name="notice_room_update">%s e përmirësoi këtë dhomë.</string>
+    <string name="initial_sync_start_importing_account">Njëkohësimi Fillestar:
+\nPo importohet llogaria…</string>
+    <string name="initial_sync_start_importing_account_crypto">Njëkohësimi Fillestar:
+\nPo importohet kriptografi</string>
+    <string name="initial_sync_start_importing_account_rooms">Njëkohësimi Fillestar:
+\nPo importohen Dhoma</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Njëkohësimi Fillestar:
+\nPo importohen Dhoma Ku Është Bërë Hyrje</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Njëkohësimi Fillestar:
+\nPo importohen Dhoma Me Ftesë</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Njëkohësimi Fillestar:
+\nPo importohen Dhoma të Braktisura</string>
+    <string name="initial_sync_start_importing_account_groups">Njëkohësimi Fillestar:
+\nPo importohen Bashkësi</string>
+    <string name="initial_sync_start_importing_account_data">Njëkohësimi Fillestar:
+\nPo importohet të Dhëna Llogarie</string>
+    <string name="event_status_sending_message">Po dërgohet mesazh…</string>
+    <string name="clear_timeline_send_queue">Spastro radhë pritjeje</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s shfuqizoi ftesën për %2$s për pjesëmarrje te dhoma</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Ftesë e %1$s. Arsye: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s ftoi %2$s. Arsye: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s ju ftoi. Arsye: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s erdhi në dhomë. Arsye: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s doli nga dhoma. Arsye: %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s hodhi poshtë ftesën. Arsye: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s përzuri %2$s. Arsye: %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s hoqi dëbimin për %2$s. Arsye: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s dëboi %2$s. Arsye: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s dërgoi një ftesë për %2$s për të ardhur në dhomë. Arsye: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s shfuqizoi ftesën për %2$s për të ardhur në dhomë. Arsye: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s pranoi ftesën për %2$s. Arsye: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s tërhoqi mbrapsht ftesën për %2$s. Arsye: %3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s shtoi %2$s si një adresë për këtë dhomë.</item>
+        <item quantity="other">%1$s shtoi %2$s si adresa për këtë dhomë.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s hoqi %2$s si adresë për këtë dhomë.</item>
+        <item quantity="other">%1$s hoqi %2$s si adresa për këtë dhomë.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s shtoi %2$s dhe hoqi %3$s si adresa për këtë dhomë.</string>
+    <string name="notice_room_canonical_alias_set">%1$s caktoi %2$s si adresë kryesore për këtë dhomë.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s hoqi adresën kryesore për këtë dhomë.</string>
+    <string name="notice_room_guest_access_can_join">%1$s ka lejuar vizitorë të marrin pjesë në dhomë.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s ka penguar vizitorë të marrin pjesë në dhomë.</string>
+    <string name="notice_end_to_end_ok">%1$s aktivizoi fshehtëzim skaj-më-skaj.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s aktivizoi fshehtëzim skaj-më-skaj (algoritëm i papranuar %2$s).</string>
+    <string name="notice_room_created">%1$s krijo dhomën</string>
+    <string name="summary_you_sent_image">Dërguat një figurë.</string>
+    <string name="summary_you_sent_sticker">Dërguat një ngjitës.</string>
+    <string name="notice_room_invite_no_invitee_by_you">Ftesa juaj</string>
+    <string name="notice_room_created_by_you">Krijuat dhomën</string>
+    <string name="notice_room_invite_by_you">Ftuat %1$s</string>
+    <string name="notice_room_join_by_you">Hytë në dhomë</string>
+    <string name="notice_room_leave_by_you">Dolët nga dhoma</string>
+    <string name="notice_room_reject_by_you">Hodhët poshtë ftesën</string>
+    <string name="notice_room_kick_by_you">Përzutë %1$s</string>
+    <string name="notice_room_unban_by_you">Hoqët dëbimin për %1$s</string>
+    <string name="notice_room_ban_by_you">Dëbuat %1$s</string>
+    <string name="notice_room_withdraw_by_you">Tërhoqët mbrapsht ftesën për %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Ndryshuat avatarin tuaj</string>
+    <string name="notice_display_name_set_by_you">Caktuat si emrin tuaj në ekran %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">E ndryshuat emrin tuaj në ekran nga %1$s në %2$s</string>
+    <string name="notice_display_name_removed_by_you">Hoqët emrin tuaj në ekran (qe %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">E ndryshuat temën në: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s ndryshoi avatarin e dhomës</string>
+    <string name="notice_room_avatar_changed_by_you">Ndryshuat avatarin e dhomës</string>
+    <string name="notice_room_name_changed_by_you">Ndryshuat emrin e dhomës në: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Filluat një thirrje video.</string>
+    <string name="notice_placed_voice_call_by_you">Filluat një thirrje zanore.</string>
+    <string name="notice_call_candidates">%s dërgoi të dhëna për ujdisjen e thirrjes.</string>
+    <string name="notice_call_candidates_by_you">Dërguat të dhëna për ujdisjen e thirrjes.</string>
+    <string name="notice_answered_call_by_you">Iu përgjigjët thirrjes.</string>
+    <string name="notice_ended_call_by_you">E përfunduat thirrjen.</string>
+    <string name="notice_made_future_room_visibility_by_you">E bëtë historikun e ardhshëm të dhomë të dukshëm për %1$s</string>
+    <string name="notice_end_to_end_by_you">Aktivizuat fshehtëzim skaj-më-skaj (%1$s)</string>
+    <string name="notice_room_update_by_you">Përmirësuat këtë dhomë.</string>
+    <string name="notice_requested_voip_conference_by_you">Kërkuat një konferencë VoIP</string>
+    <string name="notice_room_name_removed_by_you">Hoqët emrin e dhomës</string>
+    <string name="notice_room_topic_removed_by_you">Hoqët temën e dhomës</string>
+    <string name="notice_room_avatar_removed">%1$s hoqi avatarin e dhomës</string>
+    <string name="notice_room_avatar_removed_by_you">Hoqët avatarin e dhomës</string>
+    <string name="notice_profile_change_redacted_by_you">Përditësuat profilin tuaj %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Dërguat një ftesë te %1$s për të ardhur te dhoma</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Shfuqizuat ftesën për ardhjen në dhomë të %1$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Pranuat ftesën për %1$s</string>
+    <string name="notice_widget_added">%1$s shtoi widget-in %2$s</string>
+    <string name="notice_widget_added_by_you">Shtuat widget-in %1$s</string>
+    <string name="notice_widget_removed">%1$s hoqi widget-in %2$s</string>
+    <string name="notice_widget_removed_by_you">Hoqët widget-in %1$s</string>
+    <string name="notice_widget_modified">%1$s ndryshoi widget-in %2$s</string>
+    <string name="notice_widget_modified_by_you">Ndryshuat widget-in %1$s</string>
+    <string name="power_level_admin">Përgjegjës</string>
+    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_default">Parazgjedhje</string>
+    <string name="power_level_custom">Vetjake (%1$d)</string>
+    <string name="power_level_custom_no_value">Vetjake</string>
+    <string name="notice_power_level_changed_by_you">Ndryshuat shkallën e pushtetit për %1$s.</string>
+    <string name="notice_power_level_changed">%1$s ndryshoi shkallën e pushtetit për %2$s.</string>
+    <string name="notice_power_level_diff">%1$s nga %2$s në %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ftesa juaj. Arsye: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Ftuat %1$s. Arsye: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Erdhët në dhomë, Arsye: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Ikët nga dhoma. Arsye: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Hodhët poshtë ftesën. Arsye: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Përzutë %1$s. Arsye: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Hoqët dëbimin për %1$s. Arsye: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Dëbuat %1$s. Arsye: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Dërguat një ftesë për %1$s të vijë në dhomë. Arsye: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Shfuqizuat ftesën për ardhjen në dhomë të %1$s. Arsye: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Pranuat ftesën për %1$s. Arsye: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Tërhoqët mbrapsht ftesën për %1$s. Arsye: %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Shtuat %1$s si një adresë për këtë dhomë.</item>
+        <item quantity="other">Shtuat %1$s si adresa për këtë dhomë.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Hoqët %1$s si një adresë për këtë dhomë.</item>
+        <item quantity="other">Hoqët %1$s si adresa për këtë dhomë.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">Shtuat %1$s dhe hoqët %2$s si adresa për këtë dhomë.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Caktuat si adresë kryesore për këtë dhomë %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Hoqët adresën kryesore për këtë dhomë.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Keni lejuar të vijnë mysafirë në dhomë.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">U keni penguar mysafirëve të vijnë në dhomë.</string>
+    <string name="notice_end_to_end_ok_by_you">Aktivizuat fshehtëzimin skaj-më-skaj.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Aktivizuat fshehtëzimin skaj-më-skaj (algoritëm %1$s i panjohur).</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Keni penguar të vijnë në dhomë mysafirë.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s ka penguar të vijnë në dhomë mysafirë.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Keni lejuar të vijnë mysafirë këtu.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s ka lejuar të vijnë këtu mysafirë.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Dolët. Arsye: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s doli. Arsye: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Erdhët. Arsye: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s erdhi. Arsye: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Shfuqizuat ftesën për %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s shfuqizoi ftesën për %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Ftuat %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s ftoi %2$s</string>
+    <string name="notice_direct_room_update_by_you">U përmirësuat këtu.</string>
+    <string name="notice_direct_room_update">%s këtu u përmirësua.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">I bëtë mesazhet e ardhshëm të dukshëm për %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s i bëri mesazhet e ardhshëm të dukshëm për %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Dolët nga dhoma</string>
+    <string name="notice_direct_room_leave">%1$s doli nga dhoma</string>
+    <string name="notice_direct_room_join_by_you">Erdhët</string>
+    <string name="notice_direct_room_join">%1$s erdhi</string>
+    <string name="notice_direct_room_created_by_you">Krijuat diskutimin</string>
+    <string name="notice_direct_room_created">%1$s krijoi diskutimin</string>
+    <string name="room_displayname_empty_room_was">Dhomë e zbrazët (was %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s dhe %4$d tjetër</item>
+        <item quantity="other">%1$s, %2$s, %3$s dhe %4$d të tjerë</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s dhe %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s dhe %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 U është penguar pjesëmarrja krejt shërbyesve! Kjo dhomë s’mund të përdoret më.</string>
+    <string name="notice_room_server_acl_updated_no_change">Pa ndryshim.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Ndryshuat ACL-ra shërbyesi për këtë dhomë.</string>
+    <string name="notice_room_server_acl_updated_title">%s ndryshoi ACL-ra shërbyesi për këtë dhomë.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Ujdisët ACL-ra shërbyesi për këtë dhomë.</string>
+    <string name="notice_room_server_acl_set_title">%s ujdisi ACL-ra shërbyesi për këtë dhomë.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Shërbyes që kanë përputhje me %s u hoqën nga lista e të lejuarve.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Shërbyesit që kanë përputhje me %s tani janë të lejuar.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Shërbyesit që kanë përputhje me %s u hoqën nga lista e ndalimeve.</string>
+    <string name="notice_room_server_acl_updated_banned">• Shërbyesit që kanë përputhje me %s tani janë të ndaluar.</string>
+    <string name="notice_room_server_acl_set_allowed">• Shërbyesit që kanë përputhje me %s janë të ndaluar.</string>
+    <string name="notice_room_server_acl_set_banned">• Shërbyesit që kanë përputhje me %s janë të ndaluar.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Ndryshuat adresat për këtë dhomë.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s ndryshoi adresat për këtë dhomë.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Ndryshuat adresat kryesore dhe alternative për këtë dhomë.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ndryshoi adresat kryesore dhe alternative për këtë dhomë.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Ndryshuat adresat alternative për këtë dhomë.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s ndryshoi adresat alternative për këtë dhomë.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Hoqët adresën alternative %1$s për këtë dhomë.</item>
+        <item quantity="other">Hoqët adresat alternative %1$s për këtë dhomë.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s hoqët adresën alternative %2$s për këtë dhomë.</item>
+        <item quantity="other">%1$s hoqët adresat alternative %2$s për këtë dhomë.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Shtuat adresën alternative %1$s për këtë dhomë.</item>
+        <item quantity="other">Shtuat adresat alternative %1$s për këtë dhomë.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s shtoi adresën alternative %2$s për këtë dhomë.</item>
+        <item quantity="other">%1$s shtoi adresat alternative %2$s për këtë dhomë.</item>
+    </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">Ndryshuat konferencën video</string>
+    <string name="notice_widget_jitsi_modified">Konferenca video u ndryshua nga %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Përfunduat konferencën video</string>
+    <string name="notice_widget_jitsi_removed">Konferenca video u përfundua nga %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Nisët një konferencë video</string>
+    <string name="notice_widget_jitsi_added">Konferencë video nisur nga %1$s</string>
     <string name="light_theme">Temë e Çelët</string>
     <string name="dark_theme">Temë e Errët</string>
     <string name="black_theme">Temë e Zezë</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 2f5e124948..837eb629cc 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -1,5 +1,278 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="notice_room_leave">%1$s напусти собу</string>
+    <string name="notice_direct_room_join_by_you">Ви се придружисте</string>
+    <string name="notice_direct_room_join">%1$s се придружи</string>
+    <string name="notice_room_join_by_you">Ви се придружисте</string>
+    <string name="notice_room_join">%1$s се придружи</string>
+    <string name="notice_room_invite_you">%1$s позва вас</string>
+    <string name="notice_room_invite_by_you">Ви позвасте корисника %1$s</string>
+    <string name="notice_room_invite">%1$s позва корисника %2$s</string>
+    <string name="notice_direct_room_created_by_you">Направили сте дискусију</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="initial_sync_start_importing_account">Почетна синхронизација:
+\nувозим налог…</string>
+    <string name="room_displayname_empty_room_was">Празна соба (била је %s)</string>
+    <string name="room_displayname_empty_room">Празна соба</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s и још %2$d</item>
+        <item quantity="few">%1$s и још %2$d</item>
+        <item quantity="other">%1$s и још %2$d</item>
+    </plurals>
+    <string name="notice_direct_room_created">%1$s направи дискусију</string>
+    <string name="notice_room_created_by_you">Направили сте собу</string>
+    <string name="notice_room_created">%1$s направи собу</string>
+    <string name="notice_room_invite_no_invitee_by_you">Ваша позивница</string>
+    <string name="notice_room_invite_no_invitee">%s шаље позивницу</string>
+    <string name="summary_you_sent_sticker">Послали сте налепницу.</string>
+    <string name="summary_user_sent_sticker">%1$s посла налепницу.</string>
+    <string name="summary_you_sent_image">Послали сте слику.</string>
+    <string name="summary_user_sent_image">%1$s посла слику.</string>
+    <string name="notice_avatar_url_changed_by_you">Изменили сте свој аватар</string>
+    <string name="notice_avatar_url_changed">%1$s измени свој аватар</string>
+    <string name="notice_room_withdraw_by_you">Повукли сте позивницу за корисника %1$s</string>
+    <string name="notice_room_withdraw">%1$s повуче позивницу за корисника %2$s</string>
+    <string name="notice_room_ban_by_you">Забранили сте корисника %1$s</string>
+    <string name="notice_room_ban">%1$s забрани корисника %2$s</string>
+    <string name="notice_room_unban_by_you">Укинули сте забрану кориснику %1$s</string>
+    <string name="notice_room_unban">%1$s укину забрану кориснику %2$s</string>
+    <string name="notice_room_kick_by_you">Избацили сте корисника %1$s</string>
+    <string name="notice_room_kick">%1$s избаци %2$s</string>
+    <string name="notice_room_reject_by_you">Одбили сте позивницу</string>
+    <string name="notice_room_reject">%1$s одби позивницу</string>
+    <string name="notice_direct_room_leave_by_you">Напустили сте собу</string>
+    <string name="notice_direct_room_leave">%1$s напусти собу</string>
+    <string name="notice_room_leave_by_you">Напустили сте собу</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Укључили сте шифровање с краја на крај (непознат алгоритам %1$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s укључи шифровање с краја на крај (непознат алгоритам %2$s).</string>
+    <string name="notice_end_to_end_ok">%1$s искључи шифровање с краја на крај.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Спречили сте да се гости придруже у собу.</string>
+    <string name="notice_end_to_end_ok_by_you">Укључили сте шифровање с краја на крај.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Дозволили сте гостима да се придруже соби.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Изменили сте алтернативну адресу за ову собу.</string>
+    <string name="clear_timeline_send_queue">Очисти ред за слање</string>
+    <string name="event_status_sending_message">Шаљем поруку…</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s и још %4$d</item>
+        <item quantity="few">%1$s, %2$s, %3$s и још %4$d</item>
+        <item quantity="other">%1$s, %2$s, %3$s и још %4$d</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s и %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s и %3$s</string>
+    <string name="room_displayname_two_members">%1$s и %2$s</string>
+    <string name="medium_phone_number">Број телефона</string>
+    <string name="medium_email">Адреса е-поште</string>
+    <string name="encrypted_message">Шифрована порука</string>
+    <string name="room_error_join_failed_empty_room">Тренутно није могуће да се вратите у празну собу.</string>
+    <string name="matrix_error">Грешка Матрикса</string>
+    <string name="network_error">Мрежна грешка</string>
+    <string name="message_failed_to_upload">Неуспело слање слике</string>
+    <string name="unable_to_send_message">Не могу да пошаљем поруку</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Уређај пошиљаоца није нам послао кључеве за ову поруку.</string>
+    <string name="notice_power_level_changed_by_you">Изменили сте ниво снаге корисника %1$s.</string>
+    <string name="power_level_custom_no_value">посебно</string>
+    <string name="power_level_custom">посебно (%1$d)</string>
+    <string name="power_level_default">подразумевано</string>
+    <string name="power_level_moderator">модератор</string>
+    <string name="power_level_admin">админ</string>
+    <string name="notice_event_redacted_with_reason">Порука уклоњена [разлог: %1$s]</string>
+    <string name="notice_event_redacted_by">Поруку уклони %1$s</string>
+    <string name="notice_event_redacted">Порука уклоњена</string>
+    <string name="notice_room_avatar_removed_by_you">Уклонили сте аватар собе</string>
+    <string name="notice_room_avatar_removed">%1$s уклони аватар собе</string>
+    <string name="notice_room_topic_removed_by_you">Уклонили сте тему собе</string>
+    <string name="notice_room_topic_removed">%1$s уклони тему собе</string>
+    <string name="notice_room_name_removed_by_you">Уклонили сте назив собе</string>
+    <string name="notice_room_name_removed">%1$s уклони назив собе</string>
+    <string name="notice_avatar_changed_too">(аватар је такође промењен)</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Свим серверима је забрањено учествовање! Ова соба се више не може користити.</string>
+    <string name="notice_room_server_acl_updated_no_change">Без измене.</string>
+    <string name="notice_room_update_by_you">Надоградили сте ову собу.</string>
+    <string name="notice_room_visibility_unknown">непознато (%s).</string>
+    <string name="notice_made_future_room_visibility_by_you">Учинили сте да од сада, историјат буде видљив за %1$s</string>
+    <string name="notice_made_future_room_visibility">%1$s учини да од сада, историјат буде видљив за %2$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Учинили сте да будуће поруке буду видљиве за %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s учини да будуће поруке буду видљиве за %2$s</string>
+    <string name="notice_room_visibility_world_readable">свакога.</string>
+    <string name="notice_room_visibility_shared">све чланове.</string>
+    <string name="notice_room_visibility_joined">све чланове, од кад се придруже.</string>
+    <string name="notice_room_visibility_invited">све чланове, од када су позвани.</string>
+    <string name="notice_ended_call_by_you">Завршили сте позив.</string>
+    <string name="notice_ended_call">%s заврши позив.</string>
+    <string name="notice_answered_call_by_you">Одговорили сте на позив.</string>
+    <string name="notice_answered_call">%s одговори на позив.</string>
+    <string name="notice_call_candidates_by_you">Послали сте податке за поставку позива.</string>
+    <string name="notice_call_candidates">%s посла податке за поставку позива.</string>
+    <string name="notice_placed_voice_call_by_you">Позвали сте гласовним позивом.</string>
+    <string name="notice_placed_voice_call">%s позва видео позивом.</string>
+    <string name="notice_placed_video_call_by_you">Позвали сте видео позивом.</string>
+    <string name="notice_room_avatar_changed_by_you">Изменили сте аватар собе</string>
+    <string name="notice_display_name_set_by_you">Поставили сте своје приказно име на %1$s</string>
+    <string name="notice_display_name_set">%1$s постави своје приказно име на %2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Додали сте %1$s као адресу ове собе.</item>
+        <item quantity="few">Додали сте %1$s као адресе ове собе.</item>
+        <item quantity="other">Додали сте %1$s као адресе ове собе.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s додаде %2$s као адресу ове собе.</item>
+        <item quantity="few">%1$s додаде %2$s као адресе ове собе.</item>
+        <item quantity="other">%1$s додаде %2$s као адресе ове собе.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">Повукли сте позивницу корисника %1$s. Разлог: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s повлачи позивницу корисника %2$s. Разлог: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Прихватили сте позивницу за %1$s. Разлог: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s прихвата позивницу за %2$s. Разлог:%3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Повукли сте позивницу да се %1$s придружи соби. Разлог: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s повуче позивницу да се %2$s придружи соби. Разлог: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Послали сте позивницу да се %1$s придружи соби. Разлог: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s посла позивницу да се %2$s придружи соби. Разлог: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Забранили сте корисника %1$s. Разлог: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s забрани корисника %2$s. Разлог: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Одблокирали сте корисника %1$s. Разлог: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s одблокира корисника %2$s. Разлог: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Избацили сте корисника %1$s. Разлог: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s избаци корисника %2$s. Разлог: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Одбили сте позивницу. Разлог: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s одби позивницу. Разлог: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Изашли сте. Разлог: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s изађе. Разлог: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Напустили сте собу. Разлог: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s напусти собу. Разлог: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Придружили сте се. Разлог: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s се придружи. Разлог: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Придружили сте се соби. Разлог: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s се придружи соби. Разлог: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s вас позива. Разлог: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Позвали сте корисника %1$s. Разлог: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s позва корисника %2$s. Разлог: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваша позивница. Разлог: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s - позивница. Разлог: %2$s</string>
+    <string name="initial_sync_start_importing_account_data">Почетна синхронизација:
+\nувозим податке о налогу</string>
+    <string name="initial_sync_start_importing_account_groups">Почетна синхронизација:
+\nувозим заједнице</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Почетна синхронизација:
+\nувозим напуштене собе</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Почетна синхронизација:
+\nувозим собе са позивницом</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Почетна синхронизација:
+\nувозим собе у којима сте</string>
+    <string name="initial_sync_start_importing_account_crypto">Почетна синхронизација:
+\nувоз шифровања</string>
+    <string name="initial_sync_start_importing_account_rooms">Почетна синхронизација:
+\nувозим собе</string>
+    <string name="room_displayname_room_invite">Позивница за собу</string>
+    <string name="room_displayname_invite_from">%s вас позива</string>
+    <string name="could_not_redact">Не могу да редигујем</string>
+    <string name="notice_crypto_unable_to_decrypt">** Не могу да дешифрујем: %s **</string>
+    <string name="notice_power_level_diff">%1$s са %2$s на %3$s</string>
+    <string name="notice_power_level_changed">%1$s измени ниво снаге кориснику %2$s.</string>
+    <string name="notice_widget_modified_by_you">Изменили сте %1$s виџет</string>
+    <string name="notice_widget_modified">%1$s измени %2$s виџет</string>
+    <string name="notice_widget_removed_by_you">Уклонили сте %1$s виџет</string>
+    <string name="notice_widget_removed">%1$s уклони %2$s виџет</string>
+    <string name="notice_widget_added_by_you">Додали сте %1$s виџет</string>
+    <string name="notice_widget_added">%1$s додаде %2$s виџет</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Прихватили сте позивницу за %1$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s прихвати позивницу за %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Повукли сте позивницу за корисника %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s повуче позивницу за корисника %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Повукли сте позивницу да се %1$s придружи у собу</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s повуче позивницу да се %2$s придружи у собу</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Позвали сте корисника %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s позва корисника %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Послали сте позивницу да се %1$s придружи у собу</string>
+    <string name="notice_room_third_party_invite">%1$s посла позивницу да се %2$s придружи у собу</string>
+    <string name="notice_profile_change_redacted_by_you">Освежили сте свој профил %1$s</string>
+    <string name="notice_profile_change_redacted">%1$s освежи свој профил %2$s</string>
+    <string name="notice_event_redacted_by_with_reason">Поруку уклони %1$s [разлог: %2$s]</string>
+    <string name="notice_voip_finished">ВоИП конференција завршена</string>
+    <string name="notice_voip_started">ВоИП конференција започела</string>
+    <string name="notice_requested_voip_conference_by_you">Затражили сте ВоИП конференцију</string>
+    <string name="notice_requested_voip_conference">%1$s затражи ВоИП конференцију</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Сервери који садрже ИП бројеве су сада забрањени.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Сервери који садрже ИП бројеве су сада дозвољени.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Сервери који садрже %s су уклоњени са листе дозвољених.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Сервери који садрже %s су сада дозвољени.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Сервери који садрже %s су уклоњени са листе забрањених.</string>
+    <string name="notice_room_server_acl_updated_banned">• Сервери који садрже %s су сада забрањени.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Изменили сте АЦЛ сервера за ову собу.</string>
+    <string name="notice_room_server_acl_updated_title">%s измени АЦЛ сервера за ову собу.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Сервери са ИП бројевима су забрањени.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Сервери са ИП бројевима су дозвољени.</string>
+    <string name="notice_room_server_acl_set_allowed">• Сервери који садрже %s су дозвољени.</string>
+    <string name="notice_room_server_acl_set_banned">• Сервери који садрже %s су забрањени.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Поставили сте АЦЛ сервера за ову собу.</string>
+    <string name="notice_room_server_acl_set_title">%s постави АЦЛ сервера за ову собу.</string>
+    <string name="notice_direct_room_update_by_you">Надоградили сте овде.</string>
+    <string name="notice_direct_room_update">%s надогради овде.</string>
+    <string name="notice_room_update">%s надогради ову собу.</string>
+    <string name="notice_end_to_end_by_you">Укључили сте шифровање с краја на крај (%1$s)</string>
+    <string name="notice_end_to_end">%1$s укључи шифровање с краја на крај (%2$s)</string>
+    <string name="notice_placed_video_call">%s упути видео позив.</string>
+    <string name="notice_room_name_changed_by_you">Изменили сте назив собе у: %1$s</string>
+    <string name="notice_room_name_changed">%1$s измени назив собе у: %2$s</string>
+    <string name="notice_room_avatar_changed">%1$s измени аватар собе</string>
+    <string name="notice_room_topic_changed_by_you">Изменили сте тему на: %1$s</string>
+    <string name="notice_room_topic_changed">%1$s измени тему на: %2$s</string>
+    <string name="notice_display_name_removed_by_you">Уклонили сте своје приказно име (било је %1$s)</string>
+    <string name="notice_display_name_removed">%1$s уклони своје приказно име (било је %2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Изменили сте приказно име са %1$s на %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s измени приказно име са %2$s на %3$s</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s забрани гостима да се придруже у собу.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Забранили сте гостима да се придруже у собу.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s забрани гостима да се придруже у собу.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Дозволили сте гостима да се придруже овде.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s дозволи гостима да се придруже овде.</string>
+    <string name="notice_room_guest_access_can_join">%1$s дозволи гостима да се придруже у собу.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Изменили сте адресе за ову собу.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s измени адресе за ову собу.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Изменили сте главну и алтернативне адресе за ову собу.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s измени главну и алтернативне адресе за ову собу.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s измени алтернативне адресе за ову собу.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Уклонили сте алтернативну адресу %1$s за ову собу.</item>
+        <item quantity="few">Уклонили сте алтернативне адресе %1$s за ову собу.</item>
+        <item quantity="other">Уклонили сте алтернативне адресе %1$s за ову собу.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s уклони алтернативну адресу %2$s за ову собу.</item>
+        <item quantity="few">%1$s уклони алтернативне адресе %2$s за ову собу.</item>
+        <item quantity="other">%1$s уклони алтернативне адресе %2$s за ову собу.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Додали сте алтернативну адресу %1$s за ову собу.</item>
+        <item quantity="few">Додали сте алтернативне адресе %1$s за ову собу.</item>
+        <item quantity="other">Додали сте алтернативне адресе %1$s за ову собу.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s додаде алтернативну адресу %2$s за ову собу.</item>
+        <item quantity="few">%1$s додаде алтернативне адресе %2$s за ову собу.</item>
+        <item quantity="other">%1$s додаде алтернативне адресе %2$s за ову собу.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">Уклонили сте главну адресу за ову собу.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s уклони главну адресу за ову собу.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Поставили сте главну адресу ове собе на %1$s.</string>
+    <string name="notice_room_canonical_alias_set">%1$s постави главну адресу ове собе на %2$s.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Додали сте %1$s и уклонили %2$s као адресе ове собе.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s додаде %2$s и уклони %3$s као адресе ове собе.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Уклонили сте %1$s као адресу ове собе.</item>
+        <item quantity="few">Уклонили сте %1$s као адресе ове собе.</item>
+        <item quantity="other">Уклонили сте %1$s као адресе ове собе.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s уклони %2$s као адресу ове собе.</item>
+        <item quantity="few">%1$s уклони %2$s као адресе ове собе.</item>
+        <item quantity="other">%1$s уклони %2$s као адресе ове собе.</item>
+    </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">Изменили сте видео конференцију</string>
+    <string name="notice_widget_jitsi_modified">%1$s измени видео конференцију</string>
+    <string name="notice_widget_jitsi_removed_by_you">Завршили сте видео конференцију</string>
+    <string name="notice_widget_jitsi_removed">%1$s заврши видео конференцију</string>
+    <string name="notice_widget_jitsi_added_by_you">Покренули сте видео конференцију</string>
+    <string name="notice_widget_jitsi_added">%1$s покрену видео конференцију</string>
     <string name="light_theme">светла тема</string>
     <string name="dark_theme">тамна тема</string>
     <string name="black_theme">црна тема</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index fbe8aa9289..1f01c04e93 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -1,5 +1,268 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s skickade en bild.</string>
+    <string name="summary_you_sent_image">Du skickade en bild.</string>
+    <string name="summary_user_sent_sticker">%1$s skickade en dekal.</string>
+    <string name="summary_you_sent_sticker">Du skickade en dekal.</string>
+    <string name="notice_room_invite_no_invitee">Inbjudan från %s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Inbjudan från dig</string>
+    <string name="notice_room_created">%1$s skapade rummet</string>
+    <string name="notice_room_created_by_you">Du skapade rummet</string>
+    <string name="notice_room_invite">%1$s bjöd in %2$s</string>
+    <string name="notice_room_invite_by_you">Du bjöd in %1$s</string>
+    <string name="notice_room_invite_you">%1$s bjöd in dig</string>
+    <string name="notice_room_join">%1$s gick med i rummet</string>
+    <string name="notice_room_join_by_you">Du gick med i rummet</string>
+    <string name="notice_room_leave">%1$s lämnade rummet</string>
+    <string name="notice_room_leave_by_you">Du lämnade rummet</string>
+    <string name="notice_room_reject">%1$s avböjde inbjudan</string>
+    <string name="notice_room_reject_by_you">Du avböjde inbjudan</string>
+    <string name="notice_room_kick">%1$s kickade %2$s</string>
+    <string name="notice_room_kick_by_you">Du kickade %1$s</string>
+    <string name="notice_room_unban">%1$s avbannade %2$s</string>
+    <string name="notice_room_unban_by_you">Du avbannade %1$s</string>
+    <string name="notice_room_ban">%1$s avbannade %2$s</string>
+    <string name="notice_room_ban_by_you">Du bannade %1$s</string>
+    <string name="notice_room_withdraw">%1$s drog tillbaka inbjudan för %2$s</string>
+    <string name="notice_room_withdraw_by_you">Du drog tillbaka inbjudan för %1$s</string>
+    <string name="notice_avatar_url_changed">%1$s bytte sin avatar</string>
+    <string name="notice_avatar_url_changed_by_you">Du bytte din avatar</string>
+    <string name="notice_display_name_set">%1$s satte sitt visningsnamn till %2$s</string>
+    <string name="notice_display_name_set_by_you">Du satte ditt visningsnamn till %1$s</string>
+    <string name="notice_display_name_changed_from">%1$s bytte sitt visningsnamn från %2$s till %3$s</string>
+    <string name="notice_display_name_changed_from_by_you">Du bytte ditt visningsnamn från %1$s till %2$s</string>
+    <string name="notice_display_name_removed">%1$s tog bort sitt visningsnamn (det var %2$s)</string>
+    <string name="notice_display_name_removed_by_you">Du tog bort ditt visningsnamn (det var %1$s)</string>
+    <string name="notice_room_topic_changed">%1$s bytte ämnet till: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">Du bytte ämnet till: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s bytte rummets avatar</string>
+    <string name="notice_room_avatar_changed_by_you">Du bytte rummets avatar</string>
+    <string name="notice_room_name_changed">%1$s bytte rummets namn till: %2$s</string>
+    <string name="notice_room_name_changed_by_you">Du bytte rummets namnet till: %1$s</string>
+    <string name="notice_placed_video_call">%s startade ett videosamtal.</string>
+    <string name="notice_placed_video_call_by_you">Du startade ett videosamtal.</string>
+    <string name="notice_placed_voice_call">%s startade ett röstsamtal.</string>
+    <string name="notice_placed_voice_call_by_you">Du startade ett röstsamtal.</string>
+    <string name="notice_call_candidates">%s skickade data för att sätta upp samtalet.</string>
+    <string name="notice_call_candidates_by_you">Du skickade data för att sätta upp samtalet.</string>
+    <string name="notice_answered_call">%s svarade på samtalet.</string>
+    <string name="notice_answered_call_by_you">Du svarade på samtalet.</string>
+    <string name="notice_ended_call">%s avslutade samtalet.</string>
+    <string name="notice_ended_call_by_you">Du avslutade samtalet.</string>
+    <string name="notice_made_future_room_visibility">%1$s gjorde framtida rumshistorik synlig för %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Du gjorde framtida rumshistorik synlig för %1$s</string>
+    <string name="notice_room_visibility_invited">alla rumsmedlemmar, från tiden de bjöds in.</string>
+    <string name="notice_room_visibility_joined">alla rumsmedlemmar, från tiden de gick med.</string>
+    <string name="notice_room_visibility_shared">alla rumsmedlemmar.</string>
+    <string name="notice_room_visibility_world_readable">vem som helst.</string>
+    <string name="notice_room_visibility_unknown">okänt (%s).</string>
+    <string name="notice_end_to_end">%1$s aktiverade totalsträckskryptering (%2$s)</string>
+    <string name="notice_end_to_end_by_you">Du aktiverade totalsträckskryptering (%1$s)</string>
+    <string name="notice_room_update">%s uppgraderade det här rummet.</string>
+    <string name="notice_room_update_by_you">Du uppgraderade det här rummet.</string>
+    <string name="notice_requested_voip_conference">%1$s begärde ett VoIP-gruppsamtal</string>
+    <string name="notice_requested_voip_conference_by_you">Du begärde ett VoIP-gruppsamtal</string>
+    <string name="notice_voip_started">VoIP-gruppsamtal startat</string>
+    <string name="notice_voip_finished">VoIP-gruppsamtal avslutat</string>
+    <string name="notice_avatar_changed_too">(avataren blev även bytt)</string>
+    <string name="notice_room_name_removed">%1$s tog bort rummets namn</string>
+    <string name="notice_room_name_removed_by_you">Du tog bort rummets namn</string>
+    <string name="notice_room_topic_removed">%1$s tog bort rummets ämne</string>
+    <string name="notice_room_topic_removed_by_you">Du tog bort rummets ämne</string>
+    <string name="notice_room_avatar_removed">%1$s tog bort rummets avatar</string>
+    <string name="notice_room_avatar_removed_by_you">Du tog bort rummets avatar</string>
+    <string name="notice_event_redacted">Meddelande borttaget</string>
+    <string name="notice_event_redacted_by">Meddelande borttaget av %1$s</string>
+    <string name="notice_event_redacted_with_reason">Meddelande borttaget [anledning: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Meddelande borttaget av %1$s [anledning: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s uppdaterade sim profil %2$s</string>
+    <string name="notice_profile_change_redacted_by_you">Du uppdaterade din profil %1$s</string>
+    <string name="notice_room_third_party_invite">%1$s bjöd in %2$s att gå med i rummet</string>
+    <string name="notice_room_third_party_invite_by_you">Du bjöd in %1$s att gå med i rummet</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s drog tillbaka inbjudan för %2$s att gå med i rummet</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Du drog tillbaka inbjudan för %1$s att gå med i rummet</string>
+    <string name="notice_room_third_party_registered_invite">%1$s accepterade inbjudan för %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Du accepterade inbjudan för %1$s</string>
+    <string name="notice_widget_added">%1$s lade till %2$s-widget</string>
+    <string name="notice_widget_added_by_you">Du lade till %1$s-widget</string>
+    <string name="notice_widget_removed">%1$s tog bort %2$s-widget</string>
+    <string name="notice_widget_removed_by_you">Du tog bort %1$s-widget</string>
+    <string name="notice_widget_modified">%1$s modifierade %2$s-widget</string>
+    <string name="notice_widget_modified_by_you">Du modifierade %1$s-widget</string>
+    <string name="power_level_admin">Admin</string>
+    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_default">Standard</string>
+    <string name="power_level_custom">Anpassad (%1$d)</string>
+    <string name="power_level_custom_no_value">Anpassad</string>
+    <string name="notice_power_level_changed_by_you">Du ändrade behörighetsnivå för %1$s.</string>
+    <string name="notice_power_level_changed">%1$s ändrade behörighetsnivå för %2$s.</string>
+    <string name="notice_power_level_diff">%1$s från %2$s till %3$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Kan inte avkryptera: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsändarens enhet har inte gett oss nycklarna för det här meddelandet.</string>
+    <string name="could_not_redact">Kunde inte dölja</string>
+    <string name="unable_to_send_message">Kunde inte skicka meddelandet</string>
+    <string name="message_failed_to_upload">Misslyckades att ladda upp bilden</string>
+    <string name="network_error">Nätverksfel</string>
+    <string name="matrix_error">Matrixfel</string>
+    <string name="room_error_join_failed_empty_room">Det går för närvarande inte att gå med i ett tomt rum igen.</string>
+    <string name="encrypted_message">Krypterat meddelande</string>
+    <string name="medium_email">E-postadress</string>
+    <string name="medium_phone_number">Telefonnummer</string>
+    <string name="room_displayname_invite_from">Inbjudan från %s</string>
+    <string name="room_displayname_room_invite">Rumsinbjudan</string>
+    <string name="room_displayname_two_members">%1$s och %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s och en till</item>
+        <item quantity="other">%1$s och %2$d till</item>
+    </plurals>
+    <string name="room_displayname_empty_room">Tomt rum</string>
+    <string name="initial_sync_start_importing_account">Inledande synk:
+\nImporterar konto…</string>
+    <string name="initial_sync_start_importing_account_crypto">Inledande synk:
+\nImporterar krypto</string>
+    <string name="initial_sync_start_importing_account_rooms">Inledande synk:
+\nImporterar rum</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Inledande synk:
+\nImporterar anslutna rum</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Inledande synk:
+\nImporterar inbjudna rum</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Inledande synk:
+\nImporterar lämnade rum</string>
+    <string name="initial_sync_start_importing_account_groups">Inledande synk:
+\nImporterar gemenskaper</string>
+    <string name="initial_sync_start_importing_account_data">Inledande synk:
+\nImporterar kontodata</string>
+    <string name="event_status_sending_message">Skickar meddelande…</string>
+    <string name="clear_timeline_send_queue">Rensa sändningskö</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Inbjudan från %1$s. Anledning: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Inbjudan från dig. Anledning: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s bjöd in %2$s. Anledning: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Du bjöd in %1$s. Anledning: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s bjöd in dig. Anledning: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s gick med i rummet. Anledning: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Du gick med i rummet. Anledning: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s lämnade rummet. Anledning: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Du lämnade rummet. Anledning: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s avböjde inbjudan. Anledning: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Du avböjde inbjudan. Anledning: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s kickade %2$s. Anledning: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Du kickade %1$s. Anledning: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s avbannade %2$s. Anledning: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Du avbannade %1$s. Anledning: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s bannade %2$s. Anledning: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Du bannade %1$s. Anledning: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s bjöd in %2$s att gå med i rummet. Anledning: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Du bjöd in %1$s att gå med i rummet. Anledning: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s drog tillbaka inbjudan för %2$s att gå med i rummet. Anledning: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Du drog tillbaka inbjudan för %1$s att gå med i rummet. Anledning: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s accepterade inbjudan för %2$s. Anledning: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Du accepterade inbjudan för %1$s. Anledning: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s drog tillbaka inbjudan för %2$s. Anledning: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Du drog tillbaka inbjudan för %1$s. Anledning: %2$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s lade till %2$s som en adress för det här rummet.</item>
+        <item quantity="other">%1$s lade till %2$s som adresser för det här rummet.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Du lade till %1$s som en adress för det här rummet.</item>
+        <item quantity="other">Du lade till %1$s som adresser för det här rummet.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s tog bort %2$s som en adress för det här rummet.</item>
+        <item quantity="other">%1$s tog bort %2$s som adresser för det här rummet.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Du tog bort %1$s som en adress för det här rummet.</item>
+        <item quantity="other">Du tog bort %1$s som adresser för det här rummet.</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s lade till %2$s och tog bort %3$s som adresser för det här rummet.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Du lade till %1$s och tog bort %2$s som adresser för det här rummet.</string>
+    <string name="notice_room_canonical_alias_set">%1$s satta huvudadressen för det här rummet till %2$s.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Du satta huvudadressen för det här rummet till %1$s.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s tog bort huvudadressen för det här rummet.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Du tog bort huvudadressen för det här rummet.</string>
+    <string name="notice_room_guest_access_can_join">%1$s tillät gäster att gå med i rummet.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Du tillät gäster att gå med i rummet.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s hindrade gäster från att gå med i rummet.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Du hindrade gäster från att gå med i rummet.</string>
+    <string name="notice_end_to_end_ok">%1$s aktiverade totalsträckskryptering.</string>
+    <string name="notice_end_to_end_ok_by_you">Du aktiverade totalsträckskryptering.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s aktiverade totalsträckskryptering (okänd algoritm %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Du aktiverade totalsträckskryptering (okänd algoritm %1$s).</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Du hindrade gäster från att gå med i rummet.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s hindrade gäster från att gå med i rummet.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Du tillät gäster att gå med här.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s tillät gäster att gå med här.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Du lämnade. Anledning: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s Lämnade. Anledning: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Du gick med. Anledning: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s gick med. Anledning: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Du drog tillbaka inbjudan för %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s drog tillbaka inbjudan för %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Du bjöd in %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s bjöd in %2$s</string>
+    <string name="notice_direct_room_update_by_you">Du uppgraderade här.</string>
+    <string name="notice_direct_room_update">%s uppgraderade här.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Du gjorde framtida meddelanden synliga för %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s gjorde framtida meddelanden synliga för %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Du lämnade rummet</string>
+    <string name="notice_direct_room_leave">%1$s lämnade rummet</string>
+    <string name="notice_direct_room_join_by_you">Du gick med</string>
+    <string name="notice_direct_room_join">%1$s gick med</string>
+    <string name="notice_direct_room_created_by_you">Du skapade diskussionen</string>
+    <string name="notice_direct_room_created">%1$s skapade diskussionen</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Du ändrade adresserna för det här rummet.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s ändrade adresserna för det här rummet.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Du ändrade huvudadressen och de alternativa adresserna för det här rummet.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ändrade huvudadressen och de alternativa adresserna för det här rummet.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Du ändrade de alternativa adresserna för det här rummet.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s ändrade de alternativa adresserna för det här rummet.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Du tog bort den alternativa adressen %1$s för det här rummet.</item>
+        <item quantity="other">Du tog bort de alternativa adresserna %1$s för det här rummet.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s tog bort den alternativa adressen %2$s för det här rummet.</item>
+        <item quantity="other">%1$s tog bort de alternativa adresserna %2$s för det här rummet.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Du lade till den alternativa adressen %1$s för det här rummet.</item>
+        <item quantity="other">Du lade till de alternativa adresserna %1$s för det här rummet.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s lade till den alternativa adressen %2$s för det här rummet.</item>
+        <item quantity="other">%1$s lade till de alternativa adresserna %2$s för det här rummet.</item>
+    </plurals>
+    <string name="room_displayname_empty_room_was">Tomt rum (var %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s och %4$d till</item>
+        <item quantity="other">%1$s, %2$s, %3$s och %4$d till</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s och %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s och %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Alla servrar har bannats från att delta! Det här rummet kan inte användas längre.</string>
+    <string name="notice_room_server_acl_updated_no_change">Ingen ändring.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servrar som matchar IP-adresser är nu bannade.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servrar som matchar IP-adresser är nu tillåtna.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servrar som matchar %s togs bort från tillåtelselistan.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Servrar som matchar %s är nu tillåtna.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Servrar som matchar %s togs bort från bannlistan.</string>
+    <string name="notice_room_server_acl_updated_banned">• Servrar som matchar %s är nu bannade.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Du ändrade server-ACLer för det här rummet.</string>
+    <string name="notice_room_server_acl_updated_title">%s ändrade server-ACLer för det här rummet.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servrar som matchar IP-adresser är tillåtna.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servrar som matchar IP-adresser är bannade.</string>
+    <string name="notice_room_server_acl_set_allowed">• Servrar som matchar %s är tillåtna.</string>
+    <string name="notice_room_server_acl_set_banned">• Servrar som matchar %s är bannade.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Du satte server-ACLer för det här rummet.</string>
+    <string name="notice_room_server_acl_set_title">%s satte server-ACLer för det här rummet.</string>
+    <string name="notice_widget_jitsi_modified_by_you">Du ändrade videogruppsamtal</string>
+    <string name="notice_widget_jitsi_modified">Videogruppsamtal ändrades av %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Du avslutade videogruppsamtal</string>
+    <string name="notice_widget_jitsi_removed">Videogruppsamtal avslutades av %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Du startade videogruppsamtal</string>
+    <string name="notice_widget_jitsi_added">Videogruppsamtal startades av %1$s</string>
     <string name="light_theme">Ljust tema</string>
     <string name="dark_theme">Mörkt tema</string>
     <string name="black_theme">Svart tema</string>
diff --git a/vector/src/main/res/values-te/strings.xml b/vector/src/main/res/values-te/strings.xml
index 1e6e138835..56a76fa72c 100644
--- a/vector/src/main/res/values-te/strings.xml
+++ b/vector/src/main/res/values-te/strings.xml
@@ -1,5 +1,71 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="notice_room_invite_no_invitee">%s\'s ఆహ్వానం</string>
+    <string name="notice_room_invite">%1$s ఆహ్వానించారు %2$s</string>
+    <string name="notice_room_leave">%1$s వదిలి వెళారు</string>
+    <string name="notice_room_reject">%1$s ఆహ్వానాన్ని తిరస్కరించారు</string>
+    <string name="notice_room_kick">%1$s తన్నాడు %2$s</string>
+    <string name="notice_room_unban">%1$s నిషేధాన్ని %2$s</string>
+    <string name="notice_room_ban">%1$s నిషేధించారు %2$s</string>
+    <string name="notice_room_withdraw">%1$s ఉపసంహరించుకుంది %2$s\'s ఆహ్వానం</string>
+    <string name="notice_avatar_url_changed">%1$s వారి అవతార్ను మార్చారు</string>
+    <string name="notice_display_name_set">%1$s వారి డిస్ప్లే పేరును ని సెట్ చేసారు %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s వారి ప్రదర్శన పేరును %2$s నుండి %3$s మార్చారు</string>
+    <string name="notice_display_name_removed">%1$s వారి ప్రదర్శన పేరుని తీసివేసారు (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s అంశం మార్చబడింది:%2$s</string>
+    <string name="notice_room_name_changed">%1$s గది పెరు మార్చబడింది %2$s</string>
+    <string name="notice_placed_video_call">%s ఒక వీడియో కాల్ని ఉంచింది.</string>
+    <string name="notice_placed_voice_call">%s వాయిస్ కాల్ని ఉంచారు.</string>
+    <string name="notice_answered_call">%s కాల్కి సమాధానం ఇచ్చారు.</string>
+    <string name="notice_ended_call">%s కాల్ ముగిసింది.</string>
+    <string name="notice_made_future_room_visibility">%1$s భవిష్యత్ గది చరిత్రను %2$s కి కనిపించేలా చేసింది</string>
+    <string name="notice_room_visibility_invited">పాయింట్నుండి, అన్ని గది సభ్యుల వారు ఆహ్వానించబడ్డారు.</string>
+    <string name="notice_room_visibility_joined">పాయింట్ నుండి, అన్ని గదుల సభ్యుల వారు చేరారు.</string>
+    <string name="notice_room_visibility_shared">అన్ని గదుల సభ్యులు.</string>
+    <string name="notice_room_visibility_world_readable">ఎవరైనా.</string>
+    <string name="notice_room_visibility_unknown">తెలియని (%s).</string>
+    <string name="notice_end_to_end">%1$s ఎండ్-టు-ఎండ్ ఎన్క్రిప్షన్ ఆన్ చెయ్యబడింది (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s వి ఓ ఇ పి సమావేశాన్ని అభ్యర్థించారు</string>
+    <string name="notice_voip_started">వి ఓ ఇ పి సమావేశం ప్రారంభమైంది</string>
+    <string name="notice_voip_finished">వి ఓ ఇ పి సమావేశం ముగిసింది</string>
+
+    <string name="notice_avatar_changed_too">(అవతార్ మార్చబడింది)</string>
+    <string name="notice_room_name_removed">%1$s గది పేరు తొలగించబడింది</string>
+    <string name="notice_room_topic_removed">%1$s గది అంశాన్ని తీసివేసారు</string>
+    <string name="notice_profile_change_redacted">%1$s వారి ప్రొఫైల్ నవీకరించబడింది %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s గదిలో చేరడానికి %2$s కు ఆహ్వానాన్ని పంపారు</string>
+    <string name="notice_room_third_party_registered_invite">%2$sకోసం %1$s ఆహ్వానాన్ని అంగీకరించారు</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** వ్యక్తీకరించడానికి సాధ్యం కాలేదు: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">ఈ సందేశానికి పంపేవారి పరికరం మాకు కీలను పంపలేదు.</string>
+
+    <string name="could_not_redact">గది స్క్రీన్</string>
+    <string name="unable_to_send_message">సందేశం పంపడం సాధ్యం కాలేదు</string>
+
+    <string name="message_failed_to_upload">చిత్రాన్ని అప్లోడ్ చేయడంలో విఫలమైంది</string>
+
+    <string name="network_error">సాధారణ లోపాలు</string>
+    <string name="matrix_error">మాట్రిక్స్ లోపం</string>
+
+    <string name="room_error_join_failed_empty_room">మళ్లీ ఖాళీ గది ని చేరడానికి ప్రస్తుతం ఇది సాధ్యం కాదు.</string>
+
+    <string name="encrypted_message">ఎన్క్రిప్టెడ్ సందేశం</string>
+
+    <string name="medium_email">ఇమెయిల్ చిరునామా</string>
+    <string name="medium_phone_number">ఫోను నంబరు</string>
+
+
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s ఒక చిత్రం పంపారు.</string>
+
+    <string name="notice_room_invite_you">%1$s మిమ్మల్ని ఆహ్వానించారు</string>
+    <string name="notice_room_join">%1$s చేరారు</string>
+
+    <string name="room_displayname_invite_from">%s నుండి ఆహ్వానించు</string>
+    <string name="room_displayname_two_members">%1$s మరియు %2$s</string>
+    <string name="room_displayname_room_invite">గదికి ఆహ్వానం</string>
+    <string name="room_displayname_empty_room">ఖాళీ గది</string>
     <string name="title_activity_room">గది</string>
     <string name="ok">అలాగే</string>
     <string name="title_activity_member_details">సభ్యుని వివరాలు</string>
diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index ac0b01b91d..7eefd0fbd5 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
     <string name="or">หรือ</string>
     <string name="action_open">เปิด</string>
     <string name="action_close">ปิด</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index c3dc489054..f84b97bf5c 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -1,5 +1,178 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s надсилає зображення.</string>
+    <string name="notice_room_invite_no_invitee">%s запрошення</string>
+    <string name="notice_room_invite">%1$s запрошує %2$s</string>
+    <string name="encrypted_message">Зашифроване повідомлення</string>
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Запрошення від %s</string>
+    <string name="room_displayname_room_invite">Запрошення до кімнати</string>
+    <string name="room_displayname_two_members">%1$s і %2$s</string>
+    <string name="room_displayname_empty_room">Порожня кімната</string>
+    <string name="summary_user_sent_sticker">%1$s надсилає наліпку.</string>
+    <string name="notice_room_invite_you">%1$s запрошує вас</string>
+    <string name="notice_room_join">%1$s приєднується</string>
+    <string name="notice_room_leave">%1$s залишає кімнату</string>
+    <string name="notice_room_reject">%1$s відхиляє запрошення</string>
+    <string name="notice_room_kick">%1$s викидає %2$s</string>
+    <string name="notice_room_unban">%1$s розблоковує %2$s</string>
+    <string name="notice_room_ban">%1$s блокує %2$s</string>
+    <string name="notice_room_withdraw">%1$s відкликає запрошення для %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s змінює свій аватар</string>
+    <string name="notice_display_name_set">%1$s встановлюють собі назву %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s змінює своє ім’я з %2$s на %3$s</string>
+    <string name="notice_display_name_removed">%1$s прибирає своє ім’я (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s змінює тему на: %2$s</string>
+    <string name="notice_room_name_changed">%1$s змінює назву кімнати на: %2$s</string>
+    <string name="notice_placed_video_call">%s починає відеовиклик.</string>
+    <string name="notice_placed_voice_call">%s розпочинає голосовий виклик.</string>
+    <string name="notice_answered_call">%s відповідає на виклик.</string>
+    <string name="notice_ended_call">%s завершує дзвінок.</string>
+    <string name="notice_made_future_room_visibility">%1$s робить майбутню історію кімнати видимою для %2$s</string>
+    <string name="notice_room_visibility_invited">всіх учасників кімнати, з моменту їх запрошення.</string>
+    <string name="notice_room_visibility_joined">всіх учасників кімнати, з моменту їх приєднання.</string>
+    <string name="notice_room_visibility_shared">всіх учасників кімнати.</string>
+    <string name="notice_room_visibility_world_readable">будь-кого.</string>
+    <string name="notice_room_visibility_unknown">невідомо (%s).</string>
+    <string name="notice_end_to_end">%1$s вмикає наскрізне шифрування (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s запросив(ла) VoIP конференцію</string>
+    <string name="notice_voip_started">VoIP конференція розпочалась</string>
+    <string name="notice_voip_finished">VoIP конференція завершилась</string>
+    <string name="notice_avatar_changed_too">(аватар також змінено)</string>
+    <string name="notice_room_name_removed">%1$s прибирає назву кімнати</string>
+    <string name="notice_room_topic_removed">%1$s прибирає тему кімнати</string>
+    <string name="notice_profile_change_redacted">%1$s оновлює свій профіль %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s надсилає запрошення %2$s приєднатися до кімнати</string>
+    <string name="notice_room_third_party_registered_invite">%1$s приймає запрошення до %2$s</string>
+    <string name="notice_crypto_unable_to_decrypt">** Неможливо розшифрувати: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Пристрій відправника не надіслав нам ключ для цього повідомлення.</string>
+    <string name="could_not_redact">Неможливо відредагувати</string>
+    <string name="unable_to_send_message">Не вдалося надіслати повідомлення</string>
+    <string name="message_failed_to_upload">Не вдалося завантажити зображення</string>
+    <string name="network_error">Помилка мережі</string>
+    <string name="matrix_error">Помилка Matrix</string>
+    <string name="room_error_join_failed_empty_room">Наразі неможливо переприєднатися до порожньої кімнати.</string>
+    <string name="medium_email">Адреса електронної пошти</string>
+    <string name="medium_phone_number">Номер телефону</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s та 1 інший</item>
+        <item quantity="few">%1$s та %2$d інші</item>
+        <item quantity="many">%1$s та %2$d інших</item>
+        <item quantity="other"/>
+    </plurals>
+    <string name="notice_room_update">%s оновлює цю кімнату.</string>
+    <string name="notice_event_redacted">Повідомлення вилучено</string>
+    <string name="notice_event_redacted_by">%1$s вилучає повідомлення</string>
+    <string name="notice_event_redacted_with_reason">Повідомлення вилучено [причина: %1$s]</string>
+    <string name="initial_sync_start_importing_account_data">Початкове налаштування:
+\nІмпортування даних облікового запису</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Ви вийшли. Причина: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s виходить. Причина: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Ви залишили кімнату. Причина: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s залишає кімнату. Причина: %2$s</string>
+    <string name="notice_direct_room_leave">%1$s залишає кімнату</string>
+    <string name="notice_direct_room_leave_by_you">Ви залишили кімнату</string>
+    <string name="notice_room_leave_by_you">Ви залишили кімнату</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Ви змінили адреси цієї кімнати.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Ви змінили основну та альтернативну адреси цієї кімнати.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Ви змінили альтернативні адреси для цієї кімнати.</string>
+    <string name="notice_power_level_changed_by_you">Ви змінили рівень доступу на %1$s.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Ви змінили серверні списки контролю доступу для цієї кімнати.</string>
+    <string name="notice_room_name_changed_by_you">Ви змінили назву кімнати на: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Ви змінили світлину кімнати</string>
+    <string name="notice_room_topic_changed_by_you">Ви змінили тему на: %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Ви змінили показуване ім\'я з %1$s на %2$s</string>
+    <string name="notice_avatar_url_changed_by_you">Ви змінили світлину профілю</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s та %4$d інший</item>
+        <item quantity="few">%1$s, %2$s, %3$s та %4$d інші</item>
+        <item quantity="many">%1$s, %2$s, %3$s та %4$d інших</item>
+        <item quantity="other">%1$s, %2$s, %3$s та %4$d інших</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s та %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s та %3$s</string>
+    <string name="power_level_default">Типово</string>
+    <string name="power_level_moderator">Модератор</string>
+    <string name="power_level_admin">Адміністратор</string>
+    <string name="notice_widget_removed_by_you">Ви вилучили %1$s віджет</string>
+    <string name="notice_widget_removed">%1$s вилучає %2$s віджет</string>
+    <string name="notice_widget_added_by_you">Ви додали %1$s віджет</string>
+    <string name="notice_widget_added">%1$s додає %2$s віджет</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Ви прийняли запрошення до %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Ви надіслали запрошення для %1$s приєднатися до кімнати</string>
+    <string name="notice_profile_change_redacted_by_you">Ви оновили свій профіль %1$s</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s вилучає повідомлення [причина: %2$s]</string>
+    <string name="notice_room_avatar_removed_by_you">Ви прибрали аватар кімнати</string>
+    <string name="notice_room_avatar_removed">%1$s прибирає аватар кімнати</string>
+    <string name="notice_room_topic_removed_by_you">Ви прибрали тему кімнати</string>
+    <string name="notice_room_name_removed_by_you">Ви прибрали назву кімнати</string>
+    <string name="notice_direct_room_update">%s оновлює кімнату.</string>
+    <string name="notice_room_update_by_you">Ви оновили цю кімнату.</string>
+    <string name="notice_end_to_end_by_you">Ви увімкнули наскрізне шифрування (%1$s)</string>
+    <string name="notice_placed_voice_call_by_you">Ви починаєте голосовий виклик.</string>
+    <string name="notice_placed_video_call_by_you">Ви починаєте відеовиклик.</string>
+    <string name="notice_room_avatar_changed">%1$s змінює аватар кімнати</string>
+    <string name="notice_display_name_removed_by_you">Ви прибрали показуване ім\'я (%1$s)</string>
+    <string name="notice_room_kick_by_you">Ви викинули %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s запрошує %2$s</string>
+    <string name="notice_room_reject_by_you">Ви відхилили запрошення</string>
+    <string name="notice_direct_room_join_by_you">Ви приєдналися</string>
+    <string name="notice_direct_room_join">%1$s приєднується</string>
+    <string name="notice_room_join_by_you">Ви приєдналися до кімнати</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Ви запросили %1$s</string>
+    <string name="notice_room_invite_by_you">Ви запросили %1$s</string>
+    <string name="notice_direct_room_created_by_you">Ви створили обговорення</string>
+    <string name="notice_direct_room_created">%1$s створює обговорення</string>
+    <string name="notice_room_created_by_you">Ви створили кімнату</string>
+    <string name="notice_room_created">%1$s створює кімнату</string>
+    <string name="notice_room_invite_no_invitee_by_you">Ваше запрошення</string>
+    <string name="summary_you_sent_sticker">Ви надіслали наліпку.</string>
+    <string name="summary_you_sent_image">Ви надіслали зображення.</string>
+    <string name="notice_room_reject_with_reason_by_you">Ви відхилили запрошення. Причина: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s відхиляє запрошення. Причина: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Ви приєдналися. Причина: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s приєднується. Причина: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Ви приєднуєтеся до кімнати. Причина: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s приєднується до кімнати. Причина: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s запрошує вас. Причина: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Ви запросили %1$s. Причина: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s запрошує %2$s. Причина: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваше запрошення. Причина: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Запрошення від %1$s. Причина: %2$s</string>
+    <string name="clear_timeline_send_queue">Очистити чергу надсилання</string>
+    <string name="event_status_sending_message">Надсилання повідомлень…</string>
+    <string name="initial_sync_start_importing_account_groups">Початкова синхронізація:
+\nІмпортування спільнот</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Початкова синхронізація:
+\nІмпортування кімнат, які ви залишили</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Початкова синхронізація:
+\nІмпортування запрошень до кімнат</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Початкова синхронізація:
+\nІмпортування кімнат, до яких ви приєдналися</string>
+    <string name="initial_sync_start_importing_account_rooms">Початкова синхронізація:
+\nІмпортування кімнат</string>
+    <string name="initial_sync_start_importing_account_crypto">Початкова синхронізація:
+\nІмпортування криптографічних даних</string>
+    <string name="initial_sync_start_importing_account">Початкова синхронізація:
+\nІмпортування даних облікового запису…</string>
+    <string name="room_displayname_empty_room_was">Порожня кімната (була %s)</string>
+    <string name="power_level_custom_no_value">Власний</string>
+    <string name="power_level_custom">Власний (%1$d)</string>
+    <string name="notice_widget_modified_by_you">Ви змінили віджет %1$s</string>
+    <string name="notice_widget_modified">%1$s змінює віджет %2$s</string>
+    <string name="notice_direct_room_update_by_you">Ви оновили кімнату.</string>
+    <string name="notice_made_future_room_visibility_by_you">Ви зробили майбутню історію кімнати видимою для %1$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Ви зробили майбутні повідомлення видимими для %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s робить майбутні повідомлення видимими для %2$s</string>
+    <string name="notice_ended_call_by_you">Ви завершили дзвінок.</string>
+    <string name="notice_answered_call_by_you">Ви відповіли на виклик.</string>
+    <string name="notice_call_candidates_by_you">Ви надіслали дані для налаштування виклику.</string>
+    <string name="notice_call_candidates">%s надсилає дані для налаштування виклику.</string>
+    <string name="notice_display_name_set_by_you">Ви встановили собі показуване ім\'я %1$s</string>
+    <string name="notice_room_withdraw_by_you">Ви відкликали запрошення для %1$s</string>
+    <string name="notice_room_ban_by_you">Ви заблокували %1$s</string>
+    <string name="notice_room_unban_by_you">Ви заблокували %1$s</string>
     <!-- theme -->
     <string name="light_theme">Світла Тема</string>
     <string name="dark_theme">Темна Тема</string>
diff --git a/vector/src/main/res/values-vls/strings.xml b/vector/src/main/res/values-vls/strings.xml
index 4e30374a81..0e14a8aa15 100644
--- a/vector/src/main/res/values-vls/strings.xml
+++ b/vector/src/main/res/values-vls/strings.xml
@@ -1,5 +1,105 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s èt e fotootje gesteurd.</string>
+    <string name="summary_user_sent_sticker">%1$s èt e sticker gesteurd.</string>
+
+    <string name="notice_room_invite_no_invitee">Uutnodigienge van %s</string>
+    <string name="notice_room_invite">%1$s èt %2$s uutgenodigd</string>
+    <string name="notice_room_invite_you">%1$s èt joun uitgenodigd</string>
+    <string name="notice_room_join">%1$s neemt nu deel an ’t gesprek</string>
+    <string name="notice_room_leave">%1$s èt ’t gesprek verloatn</string>
+    <string name="notice_room_reject">%1$s èt d’uitnodigienge geweigerd</string>
+    <string name="notice_room_kick">%1$s èt %2$s uut ’t gesprek verwyderd</string>
+    <string name="notice_room_unban">%1$s èt %2$s ountbann</string>
+    <string name="notice_room_ban">%1$s èt %2$s verbann</string>
+    <string name="notice_room_withdraw">%1$s èt d’uutnodigienge van %2$s ingetrokkn</string>
+    <string name="notice_avatar_url_changed">%1$s èt zyn/heur avatar angepast</string>
+    <string name="notice_display_name_set">%1$s èt zyn/heur noame angepast noa %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s èt zyn/heur noame angepast van %2$s noa %3$s</string>
+    <string name="notice_display_name_removed">%1$s èt zyn/heur noame verwyderd (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s èt ’t ounderwerp veranderd noa: %2$s</string>
+    <string name="notice_room_name_changed">%1$s èt de gespreksnoame veranderd noa: %2$s</string>
+    <string name="notice_placed_video_call">%s èt e video-iproep gemakt.</string>
+    <string name="notice_placed_voice_call">%s èt e sproakiproep gemakt.</string>
+    <string name="notice_answered_call">%s èt den iproep beantwoord.</string>
+    <string name="notice_ended_call">%s èt ipgehangn.</string>
+    <string name="notice_made_future_room_visibility">%1$s èt de toekomstige gespreksgeschiedenisse zichtboar gemakt vo %2$s</string>
+    <string name="notice_room_visibility_invited">alle deelnemers an ’t gesprek, vanaf ’t punt dan ze zyn uutgenodigd.</string>
+    <string name="notice_room_visibility_joined">alle deelnemers an ’t gesprek, vanaf ’t punt dan ze zyn toegetreedn.</string>
+    <string name="notice_room_visibility_shared">alle deelnemers an ’t gesprek.</string>
+    <string name="notice_room_visibility_world_readable">iedereen.</string>
+    <string name="notice_room_visibility_unknown">ounbekend (%s).</string>
+    <string name="notice_end_to_end">%1$s èt eind-tout-eind-versleutelienge angezet (%2$s)</string>
+
+    <string name="notice_requested_voip_conference">%1$s èt e VoIP-vergoaderienge angevroagd</string>
+    <string name="notice_voip_started">VoIP-vergoaderienge begunn</string>
+    <string name="notice_voip_finished">VoIP-vergoaderienge gestopt</string>
+
+    <string name="notice_avatar_changed_too">(avatar es ook veranderd)</string>
+    <string name="notice_room_name_removed">%1$s èt de gespreksnoame verwyderd</string>
+    <string name="notice_room_topic_removed">%1$s èt ’t gespreksounderwerp verwyderd</string>
+    <string name="notice_event_redacted">Bericht verwyderd</string>
+    <string name="notice_event_redacted_by">Bericht verwyderd deur %1$s</string>
+    <string name="notice_event_redacted_with_reason">Bericht verwyderd [reden: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Bericht verwyderd deur %1$s [reden: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s èt zyn/heur profiel %2$s bygewerkt</string>
+    <string name="notice_room_third_party_invite">%1$s èt een uutnodigienge noa %2$s gesteurd vo ’t gesprek toe te treedn</string>
+    <string name="notice_room_third_party_registered_invite">%1$s èt d’uutnodigienge vo %2$s anveird</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Kun nie ountsleuteln: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">’t Toestel van den afzender èt geen sleutels vo da bericht hier gesteurd.</string>
+
+    <string name="could_not_redact">Kosteg nie verwyderd wordn</string>
+    <string name="unable_to_send_message">Kosteg ’t bericht nie verzendn</string>
+
+    <string name="message_failed_to_upload">Iploadn van ’t fotootje es mislukt</string>
+
+    <string name="network_error">Netwerkfout</string>
+    <string name="matrix_error">Matrix-fout</string>
+
+    <string name="room_error_join_failed_empty_room">’t Es vo de moment nie meuglik van e leeg gesprek were toe te treedn.</string>
+
+    <string name="encrypted_message">Versleuteld bericht</string>
+
+    <string name="medium_email">E-mailadresse</string>
+    <string name="medium_phone_number">Telefongnumero</string>
+
+    <string name="room_displayname_invite_from">Uutnodigienge van %s</string>
+    <string name="room_displayname_room_invite">Gespreksuutnodigienge</string>
+
+    <string name="room_displayname_two_members">%1$s en %2$s</string>
+
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s en 1 andere</item>
+        <item quantity="other">%1$s en %2$d anderen</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Leeg gesprek</string>
+
+    <string name="initial_sync_start_importing_account">Initiële synchronisoasje:
+\nAccount wor geïmporteerd…</string>
+    <string name="initial_sync_start_importing_account_crypto">Initiële synchronisoasje:
+\nCrypto wor geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_rooms">Initiële synchronisoasje:
+\nGesprekkn wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Initiële synchronisoasje:
+\nDeelgenoomn gesprekken wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Initiële synchronisoasje:
+\nUutgenodigde gesprekkn wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisoasje:
+\nVerloatn gesprekkn wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_groups">Initiële synchronisoasje:
+\nGemeenschappn wordn geïmporteerd</string>
+    <string name="initial_sync_start_importing_account_data">Initiële synchronisoasje:
+\nAccountgegeevns wordn geïmporteerd</string>
+
+    <string name="notice_room_update">%s èt da gesprek hier ipgewoardeerd.</string>
+
+    <string name="event_status_sending_message">Bericht wor verstuurd…</string>
+    <string name="clear_timeline_send_queue">Uutgoande wachtreeke leegn</string>
+
+    <string name="notice_room_third_party_revoked_invite">%1$s èt d’uutnodigienge vo %2$s vo ’t gesprek toe te treedn ingetrokkn</string>
     <string name="encrypted_message">Versleuteld bericht</string>
 
     <string name="light_theme">Licht thema</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 3d9186d599..206ec665af 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,212 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_user_sent_image">%1$s 发送了一张图片。</string>
+    <string name="notice_room_invite_no_invitee">%s 的邀请</string>
+    <string name="notice_room_invite">%1$s 邀请了 %2$s</string>
+    <string name="notice_room_invite_you">%1$s 邀请了您</string>
+    <string name="notice_room_join">%1$s 加入了聊天室</string>
+    <string name="notice_room_leave">%1$s 离开了聊天室</string>
+    <string name="notice_room_reject">%1$s 拒绝了邀请</string>
+    <string name="notice_room_kick">%1$s 移除了 %2$s</string>
+    <string name="notice_room_unban">%1$s 解封了 %2$s</string>
+    <string name="notice_room_ban">%1$s 封禁了 %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s 更换了他们的头像</string>
+    <string name="notice_display_name_set">%1$s 将他们的昵称设置为 %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s 把他们的昵称从 %2$s 改为 %3$s</string>
+    <string name="notice_display_name_removed">%1$s 移除了他们的昵称 (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s 把主题改为： %2$s</string>
+    <string name="notice_room_name_changed">%1$s 把聊天室名称改为： %2$s</string>
+    <string name="notice_placed_video_call">%s 发起了一次视频通话。</string>
+    <string name="notice_placed_voice_call">%s 发起了一次语音通话。</string>
+    <string name="notice_answered_call">%s 已接听通话。</string>
+    <string name="notice_ended_call">%s 已结束通话。</string>
+    <string name="notice_room_visibility_invited">所有聊天室成员，从他们被邀请开始。</string>
+    <string name="notice_room_visibility_joined">所有聊天室成员，从他们加入开始。</string>
+    <string name="notice_room_visibility_shared">所有聊天室成员。</string>
+    <string name="notice_room_visibility_world_readable">任何人。</string>
+    <string name="notice_room_visibility_unknown">未知（%s）。</string>
+    <string name="notice_end_to_end">%1$s 开启了端到端加密（%2$s）</string>
+    <string name="notice_requested_voip_conference">%1$s 请求了一次 VoIP 会议</string>
+    <string name="notice_voip_started">VoIP 会议已开始</string>
+    <string name="notice_voip_finished">VoIP 会议已结束</string>
+    <string name="notice_avatar_changed_too">（头像也被更改）</string>
+    <string name="notice_room_name_removed">%1$s 移除了聊天室名称</string>
+    <string name="notice_room_topic_removed">%1$s 移除了聊天室主题</string>
+    <string name="notice_crypto_unable_to_decrypt">** 无法解密：%s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
+    <string name="unable_to_send_message">无法发送消息</string>
+    <string name="message_failed_to_upload">上传图像失败</string>
+    <string name="network_error">网络错误</string>
+    <string name="matrix_error">Matrix 错误</string>
+    <string name="room_error_join_failed_empty_room">目前无法重新加入一个空的聊天室。</string>
+    <string name="encrypted_message">已加密消息</string>
+    <string name="medium_email">电子邮箱地址</string>
+    <string name="medium_phone_number">手机号码</string>
+    <string name="notice_room_withdraw">%1$s 撤回了对 %2$s 的邀请</string>
+    <string name="notice_made_future_room_visibility">%1$s 让未来的聊天室历史记录对 %2$s 可见</string>
+    <string name="notice_profile_change_redacted">%1$s 更新了他的个人档案 %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s 向 %2$s 发送了加入聊天室的邀请</string>
+    <string name="notice_room_third_party_registered_invite">%1$s 接受了 %2$s 的邀请</string>
+    <string name="could_not_redact">无法撤回</string>
+    <string name="summary_message">%1$s：%2$s</string>
+    <string name="summary_user_sent_sticker">%1$s 发送了一张贴纸。</string>
+    <string name="room_displayname_empty_room">空聊天室</string>
+    <string name="room_displayname_invite_from">来自 %s 的邀请</string>
+    <string name="room_displayname_room_invite">聊天室邀请</string>
+    <string name="room_displayname_two_members">%1$s 和 %2$s</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s 与其他 %2$d 位</item>
+    </plurals>
+    <string name="notice_event_redacted">消息已被移除</string>
+    <string name="notice_event_redacted_by">消息已被 %1$s 移除</string>
+    <string name="notice_event_redacted_with_reason">消息已被移除 [原因: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">消息已被 %1$s 移除 [原因: %2$s]</string>
+    <string name="initial_sync_start_importing_account">初始化同步：
+\n正在导入账号…</string>
+    <string name="initial_sync_start_importing_account_crypto">初始化同步：
+\n正在导入加密数据</string>
+    <string name="initial_sync_start_importing_account_rooms">初始化同步：
+\n正在导入聊天室</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">初始化同步：
+\n正在导入已加入的聊天室</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">初始化同步：
+\n正在导入已邀请的聊天室</string>
+    <string name="initial_sync_start_importing_account_left_rooms">初始化同步：
+\n正在导入已离开的聊天室</string>
+    <string name="initial_sync_start_importing_account_groups">初始化同步：
+\n正在导入社区</string>
+    <string name="initial_sync_start_importing_account_data">初始化同步：
+\n正在导入账号数据</string>
+    <string name="notice_room_update">%s 升级了此聊天室。</string>
+    <string name="event_status_sending_message">正在发送消息…</string>
+    <string name="clear_timeline_send_queue">清除正在发送队列</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 加入聊天室的邀请</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀请。理由：%2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s 邀请了 %2$s。理由：%3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s 邀请了您。理由：%2$s</string>
+    <string name="notice_room_join_with_reason">%1$s 加入了聊天室。理由：%2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s 离开了聊天室。理由：%2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s 已拒绝邀请。理由：%2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s 踢走了 %2$s。理由：%3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s 解封了 %2$s。理由：%3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s 封禁了 %2$s。理由：%3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s 已发送邀请给 %2$s 来加入聊天室。理由：%3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s 撤销了 %2$s 加入聊天室的邀請。理由：%3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s 接受 %2$s 的邀請。理由：%3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s 撤回了对 %2$s 的邀请。理由：%3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="other">%1$s 新增了 %2$s 为此聊天室的地址。</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="other">%1$s 移除了 %2$s 作为此聊天室额地址。</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s 为此聊天室新增了 %2$s 并移除 %3$s 地址。</string>
+    <string name="notice_room_canonical_alias_set">%1$s 将此聊天室的主地址设为了 %2$s。</string>
+    <string name="notice_room_canonical_alias_unset">%1$s 为此聊天室移除了主地址。</string>
+    <string name="notice_room_guest_access_can_join">%1$s 已允许访客加入聊天室。</string>
+    <string name="notice_room_guest_access_forbidden">%1$s 已禁止访客加入聊天室。</string>
+    <string name="notice_end_to_end_ok">%1$s 已开启端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端到端加密（无法识别的演算法 %2$s）。</string>
+    <string name="notice_room_created">%1$s 创建了这个聊天室</string>
+    <string name="summary_you_sent_image">您发送了一张图片。</string>
+    <string name="summary_you_sent_sticker">您发送了一张贴纸。</string>
+    <string name="notice_room_invite_no_invitee_by_you">您的邀请</string>
+    <string name="notice_room_created_by_you">您创建了这个聊天室</string>
+    <string name="notice_room_invite_by_you">您邀请了 %1$s</string>
+    <string name="notice_room_join_by_you">您加入了聊天室</string>
+    <string name="notice_room_leave_by_you">您离开了聊天室</string>
+    <string name="notice_room_reject_by_you">您拒绝了邀请</string>
+    <string name="notice_room_kick_by_you">您移除了 %1$s</string>
+    <string name="notice_room_unban_by_you">您解封了 %1$s</string>
+    <string name="notice_room_ban_by_you">您封禁了 %1$s</string>
+    <string name="notice_room_withdraw_by_you">您撤回了对 %1$s 的邀请</string>
+    <string name="notice_avatar_url_changed_by_you">您更换了您的头像</string>
+    <string name="notice_display_name_set_by_you">您将您的昵称设置为 %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">您将您的昵称从 %1$s 改为 %2$s</string>
+    <string name="notice_display_name_removed_by_you">您移除了您的昵称 (%1$s)</string>
+    <string name="notice_room_topic_changed_by_you">您把主题改为：%1$s</string>
+    <string name="notice_room_avatar_changed">%1$s 变更了聊天室头像</string>
+    <string name="notice_room_avatar_changed_by_you">您变更了聊天室头像</string>
+    <string name="notice_room_name_changed_by_you">您把聊天室名称改为：%1$s</string>
+    <string name="notice_placed_video_call_by_you">您发起了一次视频通话。</string>
+    <string name="notice_placed_voice_call_by_you">您发起了一次语音通话。</string>
+    <string name="notice_call_candidates">%s 发送了数据以建立通话。</string>
+    <string name="notice_call_candidates_by_you">您发送了数据以建立通话。</string>
+    <string name="notice_answered_call_by_you">您接听了通话。</string>
+    <string name="notice_ended_call_by_you">您结束了通话。</string>
+    <string name="notice_made_future_room_visibility_by_you">您已让未来的聊天室记录对 %1$s 可见</string>
+    <string name="notice_end_to_end_by_you">您开启了端到端加密（%1$s）</string>
+    <string name="notice_room_update_by_you">您升级了此聊天室。</string>
+    <string name="notice_requested_voip_conference_by_you">您请求了 VoIP 会议</string>
+    <string name="notice_room_name_removed_by_you">您移除了聊天室名称</string>
+    <string name="notice_room_topic_removed_by_you">您移除了聊天室主题</string>
+    <string name="notice_room_avatar_removed">%1$s 移除了聊天室头像</string>
+    <string name="notice_room_avatar_removed_by_you">您移除了聊天室头像</string>
+    <string name="notice_profile_change_redacted_by_you">您更新了您的个人档案 %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">您向 %1$s 发送了加入聊天室的邀请</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">您已撤回了对 %1$s 加入聊天室的邀请</string>
+    <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀请</string>
+    <string name="notice_widget_added">%1$s 添加了 %2$s 小部件</string>
+    <string name="notice_widget_added_by_you">您添加了 %1$s 小部件</string>
+    <string name="notice_widget_removed">%1$s 移除了 %2$s 小部件</string>
+    <string name="notice_widget_removed_by_you">您移除了 %1$s 小部件</string>
+    <string name="notice_widget_modified">%1$s 修改了 %2$s 小部件</string>
+    <string name="notice_widget_modified_by_you">您修改了 %1$s 小部件</string>
+    <string name="power_level_admin">管理员</string>
+    <string name="power_level_moderator">审核员</string>
+    <string name="power_level_default">默认</string>
+    <string name="power_level_custom">自定义（%1$d）</string>
+    <string name="power_level_custom_no_value">自定义</string>
+    <string name="notice_power_level_changed_by_you">您更改了%1$s 的权力等级。</string>
+    <string name="notice_power_level_changed">%1$s 更改了 %2$s 的权力等级。</string>
+    <string name="notice_power_level_diff">%1$s 从 %2$s 到 %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">您的邀请。理由：%1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">您邀请了 %1$s。理由：%2$s</string>
+    <string name="notice_room_join_with_reason_by_you">您加入了聊天室。理由：%1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">您离开了聊天室。理由：%1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">您拒绝了邀请。理由：%1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">您踢走了 %1$s。理由：%2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">您解封了 %1$s。理由：%2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">您封禁了 %1$s。理由：%2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">您已发送邀请给 %1$s 来加入聊天室。理由：%2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">您撤销了 %1$s 加入聊天室的邀请。理由：%2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">您接受了 %1$s 的邀请。理由：%2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀请。理由：%2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="other">您新增了 %1$s 为此聊天室的地址。</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="other">您移除了此聊天室的 %1$s 地址。</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">您为此聊天室新增了 %1$s 并移除了 %2$s 地址。</string>
+    <string name="notice_room_canonical_alias_set_by_you">您将此聊天室的主地址设为了 %1$s。</string>
+    <string name="notice_room_canonical_alias_unset_by_you">您移除了此聊天室的主地址。</string>
+    <string name="notice_room_guest_access_can_join_by_you">您已允许访客加入聊天室。</string>
+    <string name="notice_room_guest_access_forbidden_by_you">您已禁止访客加入聊天室。</string>
+    <string name="notice_end_to_end_ok_by_you">您已开启端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">您已开启端到端加密（无法识别的算法 %1$s）。</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">您已离开。理由：%1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s 已离开。理由：%2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">您已加入。理由：%1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s 已加入。理由：%2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">您撤回了对 %1$s 的邀请</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 的邀请</string>
+    <string name="notice_direct_room_third_party_invite_by_you">您邀请了 %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s 邀请了 %2$s</string>
+    <string name="notice_direct_room_update_by_you">您在此处升级。</string>
+    <string name="notice_direct_room_update">%s 在此处升级。</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">您使未来的消息对 %1$s 可见</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s 使未来的消息对 %2$s 可见</string>
+    <string name="notice_direct_room_leave_by_you">您离开了聊天室</string>
+    <string name="notice_direct_room_leave">%1$s 离开了聊天室</string>
+    <string name="notice_direct_room_join_by_you">您已加入</string>
+    <string name="notice_direct_room_join">%1$s 已加入</string>
+    <string name="notice_direct_room_created_by_you">您创建了讨论</string>
+    <string name="notice_direct_room_created">%1$s 创建了讨论</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">你已阻止客人加入房间。</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s已阻止客人加入房间。</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">你已允许客人加入这里。</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s 已允许客人加入这里。</string>
     <string name="call_notification_answer">接受</string>
     <string name="call_notification_reject">拒绝</string>
     <string name="call_notification_hangup">挂断</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index b915f2d97d..2a73f3a596 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,258 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s：%2$s</string>
+    <string name="summary_user_sent_image">%1$s 傳送了一張圖片。</string>
+    <string name="notice_room_invite_no_invitee">%s 的邀請</string>
+    <string name="notice_room_invite">%1$s 邀請了 %2$s</string>
+    <string name="notice_room_invite_you">%1$s 邀請您</string>
+    <string name="notice_room_join">%1$s 已加入聊天室</string>
+    <string name="notice_room_leave">%1$s 已離開聊天室</string>
+    <string name="notice_room_reject">%1$s 拒絕邀請</string>
+    <string name="notice_room_kick">%1$s 踢出 %2$s</string>
+    <string name="notice_room_unban">%1$s 解除禁止 %2$s</string>
+    <string name="notice_room_ban">%1$s 禁止 %2$s</string>
+    <string name="notice_room_withdraw">%1$s 收回了對 %2$s 的邀請</string>
+    <string name="notice_avatar_url_changed">%1$s 變更了他們的大頭貼</string>
+    <string name="notice_display_name_set">%1$s 設定了他們的顯示名稱為 %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s 變更了他們的顯示名稱從 %2$s 到 %3$s</string>
+    <string name="notice_display_name_removed">%1$s 移除了他們的顯示名稱 (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s 變更主題為：%2$s</string>
+    <string name="notice_room_name_changed">%1$s 變更房間名稱為：%2$s</string>
+    <string name="notice_placed_video_call">%s 撥出了視訊通話。</string>
+    <string name="notice_placed_voice_call">%s 撥出了語音通話。</string>
+    <string name="notice_answered_call">%s 回覆了通話。</string>
+    <string name="notice_ended_call">%s 結束通話。</string>
+    <string name="notice_made_future_room_visibility">%1$s 讓房間未來可讓 %2$s 看到歷史紀錄</string>
+    <string name="notice_room_visibility_invited">所有的房間成員，從他們被邀請的時間開始。</string>
+    <string name="notice_room_visibility_joined">所有的房間成員，從他們加入的時間開始。</string>
+    <string name="notice_room_visibility_shared">所有的房間成員。</string>
+    <string name="notice_room_visibility_world_readable">任何人。</string>
+    <string name="notice_room_visibility_unknown">未知 (%s)。</string>
+    <string name="notice_end_to_end">%1$s 開啟了端對端加密 (%2$s)</string>
+    <string name="notice_requested_voip_conference">%1$s 請求了 VoIP 會議通話</string>
+    <string name="notice_voip_started">VoIP 會議通話已開始</string>
+    <string name="notice_voip_finished">VoIP 會議通話已結束</string>
+    <string name="notice_avatar_changed_too">（大頭貼也變更了）</string>
+    <string name="notice_room_name_removed">%1$s 移除了房間名稱</string>
+    <string name="notice_room_topic_removed">%1$s 移除了房間主題</string>
+    <string name="notice_profile_change_redacted">%1$s 更新了他們的基本資料 %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s 傳送加入房間的邀請給 %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s 接受 %2$s 的邀請</string>
+    <string name="notice_crypto_unable_to_decrypt">** 無法解密：%s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">傳送者的裝置並未在此訊息傳送他們的金鑰。</string>
+    <string name="could_not_redact">無法編輯</string>
+    <string name="unable_to_send_message">無法傳送訊息</string>
+    <string name="message_failed_to_upload">上傳圖片失敗</string>
+    <string name="network_error">網路錯誤</string>
+    <string name="matrix_error">Matrix 錯誤</string>
+    <string name="room_error_join_failed_empty_room">目前無法重新加入空房間。</string>
+    <string name="encrypted_message">已加密的訊息</string>
+    <string name="medium_email">電子郵件</string>
+    <string name="medium_phone_number">電話號碼</string>
+    <string name="summary_user_sent_sticker">%1$s 傳送了一張貼圖。</string>
+    <string name="room_displayname_invite_from">來自%s 的邀請</string>
+    <string name="room_displayname_room_invite">聊天室邀請</string>
+    <string name="room_displayname_two_members">%1$s 和 %2$s</string>
+    <string name="room_displayname_empty_room">空聊天室</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="other">%1$s 和 和其他 %2$d 個人</item>
+    </plurals>
+    <string name="notice_event_redacted">訊息已移除</string>
+    <string name="notice_event_redacted_by">訊息已被 %1$s 移除</string>
+    <string name="notice_event_redacted_with_reason">訊息已移除 [理由：%1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">訊息已被 %1$s 移除 [理由：%2$s]</string>
+    <string name="initial_sync_start_importing_account">初始化同步：
+\n正在匯入帳號……</string>
+    <string name="initial_sync_start_importing_account_crypto">初始化同步：
+\n正在匯入 crypto</string>
+    <string name="initial_sync_start_importing_account_rooms">初始化同步：
+\n正在匯入聊天室</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">初始化同步：
+\n正在匯入已加入的聊天室</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">初始化同步：
+\n正在匯入已邀請的聊天室</string>
+    <string name="initial_sync_start_importing_account_left_rooms">初始化同步：
+\n正在匯入已離開的聊天室</string>
+    <string name="initial_sync_start_importing_account_groups">初始化同步：
+\n正在匯入社群</string>
+    <string name="initial_sync_start_importing_account_data">初始化同步：
+\n正在匯入帳號資料</string>
+    <string name="notice_room_update">%s 已升級此聊天室。</string>
+    <string name="event_status_sending_message">正在傳送訊息……</string>
+    <string name="clear_timeline_send_queue">清除傳送佇列</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s 撤銷了 %2$s 加入聊天室的邀請</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀請。理由：%2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s 邀請了 %2$s。理由：%3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s 邀請了您。理由：%2$s</string>
+    <string name="notice_room_join_with_reason">%1$s 已加入聊天室。理由：%2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s 已離開聊天室。理由：%2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s 已回絕邀請。理由：%2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s 踢走了 %2$s。理由：%3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s 取消封鎖了 %2$s。理由：%3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s 封鎖了 %2$s。理由：%3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s 已傳送邀請給 %2$s 來加入聊天室。理由：%3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s 撤銷了 %2$s 加入聊天室的邀請。理由：%3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s 接受 %2$s 的邀請。理由：%3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s 撤回了對 %2$s 的邀請。理由：%3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="other">%1$s 新增了 %2$s 為此聊天室的地址。</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="other">%1$s 移除了此聊天室的 %2$s 地址。</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed">%1$s 為此聊天室新增 %2$s 並移除 %3$s 地址。</string>
+    <string name="notice_room_canonical_alias_set">%1$s 為此聊天室設定了 %2$s 為主地址。</string>
+    <string name="notice_room_canonical_alias_unset">%1$s 為此聊天室移除了主要地址。</string>
+    <string name="notice_room_guest_access_can_join">%1$s 已允許訪客加入聊天室。</string>
+    <string name="notice_room_guest_access_forbidden">%1$s 已禁止訪客加入聊天室。</string>
+    <string name="notice_end_to_end_ok">%1$s 已開啟端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s 已開啟端到端加密（無法識別的演算法 %2$s）。</string>
+    <string name="notice_room_created">%1$s 建立了聊天室</string>
+    <string name="summary_you_sent_image">您傳送了圖片。</string>
+    <string name="summary_you_sent_sticker">您傳送了貼圖。</string>
+    <string name="notice_room_invite_no_invitee_by_you">您的邀請</string>
+    <string name="notice_room_created_by_you">您建立了聊天室</string>
+    <string name="notice_room_invite_by_you">您邀請了 %1$s</string>
+    <string name="notice_room_join_by_you">您加入了聊天室</string>
+    <string name="notice_room_leave_by_you">您離開的聊天室</string>
+    <string name="notice_room_reject_by_you">您回絕了邀請</string>
+    <string name="notice_room_kick_by_you">您踢除了 %1$s</string>
+    <string name="notice_room_unban_by_you">您取消封鎖了 %1$s</string>
+    <string name="notice_room_ban_by_you">您封鎖了 %1$s</string>
+    <string name="notice_room_withdraw_by_you">您撤銷了 %1$s 的邀請</string>
+    <string name="notice_avatar_url_changed_by_you">您變更了您的大頭貼</string>
+    <string name="notice_display_name_set_by_you">您將您的顯示名稱設定為 %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">您將您的顯示名稱從 %1$s 變更為 %2$s</string>
+    <string name="notice_display_name_removed_by_you">您移除了您的顯示名稱（其曾為 %1$s）</string>
+    <string name="notice_room_topic_changed_by_you">您將主題變更為：%1$s</string>
+    <string name="notice_room_avatar_changed">%1$s 變更了聊天室大頭貼</string>
+    <string name="notice_room_avatar_changed_by_you">您變更了聊天室大頭貼</string>
+    <string name="notice_room_name_changed_by_you">您將聊天室名稱變更為：%1$s</string>
+    <string name="notice_placed_video_call_by_you">您發起了視訊通話。</string>
+    <string name="notice_placed_voice_call_by_you">您發起了音訊通話。</string>
+    <string name="notice_call_candidates">%s 傳送了資料以建立通話。</string>
+    <string name="notice_call_candidates_by_you">您傳送了資料以建立通話。</string>
+    <string name="notice_answered_call_by_you">您接了通話。</string>
+    <string name="notice_ended_call_by_you">您結束了通話。</string>
+    <string name="notice_made_future_room_visibility_by_you">您已將未來的聊天室歷史設定為對 %1$s 可見</string>
+    <string name="notice_end_to_end_by_you">您開啟了端到端加密 (%1$s)</string>
+    <string name="notice_room_update_by_you">您升級了此聊天室。</string>
+    <string name="notice_requested_voip_conference_by_you">您請求了 VoIP 會議</string>
+    <string name="notice_room_name_removed_by_you">您移除了聊天室名稱</string>
+    <string name="notice_room_topic_removed_by_you">您移除了聊天室主題</string>
+    <string name="notice_room_avatar_removed">%1$s 移除了聊天室大頭貼</string>
+    <string name="notice_room_avatar_removed_by_you">您移除了聊天室大頭貼</string>
+    <string name="notice_profile_change_redacted_by_you">您更新了您的個人檔案 %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">您傳送了邀請給 %1$s 以加入聊天室</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">您已撤銷對 %1$s 加入聊天室的邀請</string>
+    <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀請</string>
+    <string name="notice_widget_added">%1$s 新增了 %2$s 小工具</string>
+    <string name="notice_widget_added_by_you">您新增了 %1$s 小工具</string>
+    <string name="notice_widget_removed">%1$s 移除了 %2$s 小工具</string>
+    <string name="notice_widget_removed_by_you">您移除了 %1$s 小工具</string>
+    <string name="notice_widget_modified">%1$s 修改了 %2$s 小工具</string>
+    <string name="notice_widget_modified_by_you">您修改了 %1$s 小工具</string>
+    <string name="power_level_admin">管理員</string>
+    <string name="power_level_moderator">板主</string>
+    <string name="power_level_default">預設</string>
+    <string name="power_level_custom">自訂 (%1$d)</string>
+    <string name="power_level_custom_no_value">自訂</string>
+    <string name="notice_power_level_changed_by_you">您變更了 %1$s 的權力等級。</string>
+    <string name="notice_power_level_changed">%1$s 變更了 %2$s 的權力等級。</string>
+    <string name="notice_power_level_diff">%1$s 從 %2$s 到 %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">您的邀請。理由：%1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">您邀請了 %1$s。理由：%2$s</string>
+    <string name="notice_room_join_with_reason_by_you">您加入了聊天室。理由：%1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">您離開了聊天室。理由：%1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">您回絕了邀請。理由：%1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">您踢除了 %1$s。理由：%2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">您取消封鎖了 %1$s。理由：%2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">您封鎖了 %1$s。理由：%2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">您傳甕了邀請給 %1$s 以加入聊天室。理由：%2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">您撤銷了 %1$s 加入聊天室的邀請。理由：%2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">您接受了 %1$s 的邀請。理由：%2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀請。理由：%2$s</string>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="other">您為此聊天室新增了 %1$s 作為地址。</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="other">您為此聊天室移除了 %1$s 作為地址。</item>
+    </plurals>
+    <string name="notice_room_aliases_added_and_removed_by_you">您為此聊天室新增了 %1$s 並移除了 %2$s 作為地址。</string>
+    <string name="notice_room_canonical_alias_set_by_you">您將此聊天室的主要地址設定為 %1$s。</string>
+    <string name="notice_room_canonical_alias_unset_by_you">您將此聊天室的主要地址移除。</string>
+    <string name="notice_room_guest_access_can_join_by_you">您已允許訪客加入聊天室。</string>
+    <string name="notice_room_guest_access_forbidden_by_you">您已阻止訪客加入聊天室。</string>
+    <string name="notice_end_to_end_ok_by_you">您開啟了端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">您開啟了端到端加密（無法識別的演算法 %1$s）。</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">您已避免訪客加入此聊天室。</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s 已避免訪客加入此聊天室。</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">您已允許訪客加入這裡。</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s 已允許訪客加入這裡。</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">您已離開。理由：%1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s 已離開。理由：%2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">您已加入。理由：%1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s 已加入。理由：%2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">您已撤銷對 %1$s 的邀請</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s 已撤銷對 %2$s 的邀請</string>
+    <string name="notice_direct_room_third_party_invite_by_you">您已邀請了 %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s 邀請了 %2$s</string>
+    <string name="notice_direct_room_update_by_you">您已在此升級。</string>
+    <string name="notice_direct_room_update">%s 已在此升級。</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">您讓未來的訊息對 %1$s 可見</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s 已讓未來的訊息對 %2$s 可見</string>
+    <string name="notice_direct_room_leave_by_you">您已離開聊天室</string>
+    <string name="notice_direct_room_leave">%1$s 已離開聊天室</string>
+    <string name="notice_direct_room_join_by_you">您已加入</string>
+    <string name="notice_direct_room_join">%1$s 已加入</string>
+    <string name="notice_direct_room_created_by_you">您已建立此討論</string>
+    <string name="notice_direct_room_created">%1$s 已建立此討論</string>
+    <string name="room_displayname_empty_room_was">空的聊天室（曾為 %s）</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="other">%1$s, %2$s, %3$s 與 %4$d 個其他</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s 與 %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s 與 %3$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 禁止所有伺服器參與！無法再使用此聊天室。</string>
+    <string name="notice_room_server_acl_updated_no_change">無變更。</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• 禁止伺服器符合 IP 文字。</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• 允許伺服器符合 IP 文字。</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• 伺服器符合 %s 已從允許清單中移除。</string>
+    <string name="notice_room_server_acl_updated_allowed">• 允許伺服器符合 %s。</string>
+    <string name="notice_room_server_acl_updated_was_banned">• 伺服器符合 %s 已從禁止清單中移除。</string>
+    <string name="notice_room_server_acl_updated_banned">• 現在禁止伺服器符合 %s。</string>
+    <string name="notice_room_server_acl_updated_title_by_you">您為此聊天室變更了伺服器 ACL。</string>
+    <string name="notice_room_server_acl_updated_title">%s 為此聊天是變更了伺服器 ACL。</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• 禁止伺服器符合 IP 文字。</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• 允許伺服器符合 IP 文字。</string>
+    <string name="notice_room_server_acl_set_allowed">• 已允許伺服器符合 %s。</string>
+    <string name="notice_room_server_acl_set_banned">• 已禁止伺服器符合 %s。</string>
+    <string name="notice_room_server_acl_set_title_by_you">您為此聊天是設定了伺服器 ACL。</string>
+    <string name="notice_room_server_acl_set_title">%s 為此聊天是設定了伺服器 ACL。</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">您變更了此聊天室的地址。</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s 變更了此聊天室的地址。</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">您為此聊天室變更了主要及備用地址。</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s 為此聊天室變更了主要及備用地址。</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">您為此聊天室變更了備用地址。</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s 變更了此聊天室的備用地址。</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="other">您為此聊天室移除了備用地址 %1$s。</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="other">%1$s 已為此聊天室移除備用地址 %2$s。</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="other">您為此聊天室新增了備用地址 %1$s。</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="other">%1$s 已為此聊天室新增了備用地址 %2$s。</item>
+    </plurals>
+    <string name="notice_widget_jitsi_modified_by_you">您修改了視訊會議</string>
+    <string name="notice_widget_jitsi_modified">%1$s 修改了視訊會議</string>
+    <string name="notice_widget_jitsi_removed_by_you">您結束了視訊會議</string>
+    <string name="notice_widget_jitsi_removed">%1$s 結束了視訊會議</string>
+    <string name="notice_widget_jitsi_added_by_you">您開始了視訊會議</string>
+    <string name="notice_widget_jitsi_added">由 %1$s 開始的視訊會議</string>
     <string name="light_theme">淺色主題</string>
     <string name="dark_theme">深色主題</string>
     <string name="black_theme">黑色主題</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index feaad8bf1f..99eef6a8e2 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1,5 +1,316 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="summary_user_sent_image">%1$s sent an image.</string>
+    <string name="summary_you_sent_image">You sent an image.</string>
+    <string name="summary_user_sent_sticker">%1$s sent a sticker.</string>
+    <string name="summary_you_sent_sticker">You sent a sticker.</string>
+
+    <string name="notice_room_invite_no_invitee">%s\'s invitation</string>
+    <string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
+    <string name="notice_room_created">%1$s created the room</string>
+    <string name="notice_room_created_by_you">You created the room</string>
+    <string name="notice_direct_room_created">%1$s created the discussion</string>
+    <string name="notice_direct_room_created_by_you">You created the discussion</string>
+    <string name="notice_room_invite">%1$s invited %2$s</string>
+    <string name="notice_room_invite_by_you">You invited %1$s</string>
+    <string name="notice_room_invite_you">%1$s invited you</string>
+    <string name="notice_room_join">%1$s joined the room</string>
+    <string name="notice_room_join_by_you">You joined the room</string>
+    <string name="notice_direct_room_join">%1$s joined</string>
+    <string name="notice_direct_room_join_by_you">You joined</string>
+    <string name="notice_room_leave">%1$s left the room</string>
+    <string name="notice_room_leave_by_you">You left the room</string>
+    <string name="notice_direct_room_leave">%1$s left the room</string>
+    <string name="notice_direct_room_leave_by_you">You left the room</string>
+    <string name="notice_room_reject">%1$s rejected the invitation</string>
+    <string name="notice_room_reject_by_you">You rejected the invitation</string>
+    <string name="notice_room_kick">%1$s kicked %2$s</string>
+    <string name="notice_room_kick_by_you">You kicked %1$s</string>
+    <string name="notice_room_unban">%1$s unbanned %2$s</string>
+    <string name="notice_room_unban_by_you">You unbanned %1$s</string>
+    <string name="notice_room_ban">%1$s banned %2$s</string>
+    <string name="notice_room_ban_by_you">You banned %1$s</string>
+    <string name="notice_room_withdraw">%1$s withdrew %2$s\'s invitation</string>
+    <string name="notice_room_withdraw_by_you">You withdrew %1$s\'s invitation</string>
+    <string name="notice_avatar_url_changed">%1$s changed their avatar</string>
+    <string name="notice_avatar_url_changed_by_you">You changed your avatar</string>
+    <string name="notice_display_name_set">%1$s set their display name to %2$s</string>
+    <string name="notice_display_name_set_by_you">You set your display name to %1$s</string>
+    <string name="notice_display_name_changed_from">%1$s changed their display name from %2$s to %3$s</string>
+    <string name="notice_display_name_changed_from_by_you">You changed your display name from %1$s to %2$s</string>
+    <string name="notice_display_name_removed">%1$s removed their display name (it was %2$s)</string>
+    <string name="notice_display_name_removed_by_you">You removed your display name (it was %1$s)</string>
+    <string name="notice_room_topic_changed">%1$s changed the topic to: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">You changed the topic to: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s changed the room avatar</string>
+    <string name="notice_room_avatar_changed_by_you">You changed the room avatar</string>
+    <string name="notice_room_name_changed">%1$s changed the room name to: %2$s</string>
+    <string name="notice_room_name_changed_by_you">You changed the room name to: %1$s</string>
+    <string name="notice_placed_video_call">%s placed a video call.</string>
+    <string name="notice_placed_video_call_by_you">You placed a video call.</string>
+    <string name="notice_placed_voice_call">%s placed a voice call.</string>
+    <string name="notice_placed_voice_call_by_you">You placed a voice call.</string>
+    <string name="notice_call_candidates">%s sent data to setup the call.</string>
+    <string name="notice_call_candidates_by_you">You sent data to setup the call.</string>
+    <string name="notice_answered_call">%s answered the call.</string>
+    <string name="notice_answered_call_by_you">You answered the call.</string>
+    <string name="notice_ended_call">%s ended the call.</string>
+    <string name="notice_ended_call_by_you">You ended the call.</string>
+    <string name="notice_made_future_room_visibility">%1$s made future room history visible to %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">You made future room history visible to %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s made future messages visible to %2$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">You made future messages visible to %1$s</string>
+    <string name="notice_room_visibility_invited">all room members, from the point they are invited.</string>
+    <string name="notice_room_visibility_joined">all room members, from the point they joined.</string>
+    <string name="notice_room_visibility_shared">all room members.</string>
+    <string name="notice_room_visibility_world_readable">anyone.</string>
+    <string name="notice_room_visibility_unknown">unknown (%s).</string>
+    <string name="notice_end_to_end">%1$s turned on end-to-end encryption (%2$s)</string>
+    <string name="notice_end_to_end_by_you">You turned on end-to-end encryption (%1$s)</string>
+    <string name="notice_room_update">%s upgraded this room.</string>
+    <string name="notice_room_update_by_you">You upgraded this room.</string>
+    <string name="notice_direct_room_update">%s upgraded here.</string>
+    <string name="notice_direct_room_update_by_you">You upgraded here.</string>
+    <string name="notice_room_server_acl_set_title">%s set the server ACLs for this room.</string>
+    <string name="notice_room_server_acl_set_title_by_you">You set the server ACLs for this room.</string>
+    <string name="notice_room_server_acl_set_banned">• Server matching %s are banned.</string>
+    <string name="notice_room_server_acl_set_allowed">• Server matching %s are allowed.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Server matching IP literals are allowed.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Server matching IP literals are banned.</string>
+
+    <string name="notice_room_server_acl_updated_title">%s changed the server ACLs for this room.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">You changed the server ACLs for this room.</string>
+    <string name="notice_room_server_acl_updated_banned">• Server matching %s are now banned.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Server matching %s were removed from the ban list.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Server matching %s are now allowed.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Server matching %s were removed from the allowed list.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Server matching IP literals are now allowed.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Server matching IP literals are now banned.</string>
+    <string name="notice_room_server_acl_updated_no_change">No change.</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 All servers are banned from participating! This room can no longer be used.</string>
+
+    <string name="notice_requested_voip_conference">%1$s requested a VoIP conference</string>
+    <string name="notice_requested_voip_conference_by_you">You requested a VoIP conference</string>
+    <string name="notice_voip_started">VoIP conference started</string>
+    <string name="notice_voip_finished">VoIP conference finished</string>
+
+    <string name="notice_avatar_changed_too">(avatar was changed too)</string>
+    <string name="notice_room_name_removed">%1$s removed the room name</string>
+    <string name="notice_room_name_removed_by_you">You removed the room name</string>
+    <string name="notice_room_topic_removed">%1$s removed the room topic</string>
+    <string name="notice_room_topic_removed_by_you">You removed the room topic</string>
+    <string name="notice_room_avatar_removed">%1$s removed the room avatar</string>
+    <string name="notice_room_avatar_removed_by_you">You removed the room avatar</string>
+    <string name="notice_event_redacted">Message removed</string>
+    <string name="notice_event_redacted_by">Message removed by %1$s</string>
+    <string name="notice_event_redacted_with_reason">Message removed [reason: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">Message removed by %1$s [reason: %2$s]</string>
+    <string name="notice_profile_change_redacted">%1$s updated their profile %2$s</string>
+    <string name="notice_profile_change_redacted_by_you">You updated your profile %1$s</string>
+    <string name="notice_room_third_party_invite">%1$s sent an invitation to %2$s to join the room</string>
+    <string name="notice_room_third_party_invite_by_you">You sent an invitation to %1$s to join the room</string>
+    <string name="notice_direct_room_third_party_invite">%1$s invited %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">You invited %1$s</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s revoked the invitation for %2$s to join the room</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">You revoked the invitation for %1$s to join the room</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s revoked the invitation for %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">You revoked the invitation for %1$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s accepted the invitation for %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">You accepted the invitation for %1$s</string>
+
+    <string name="notice_widget_added">%1$s added %2$s widget</string>
+    <string name="notice_widget_added_by_you">You added %1$s widget</string>
+    <string name="notice_widget_removed">%1$s removed %2$s widget</string>
+    <string name="notice_widget_removed_by_you">You removed %1$s widget</string>
+    <string name="notice_widget_modified">%1$s modified %2$s widget</string>
+    <string name="notice_widget_modified_by_you">You modified %1$s widget</string>
+
+    <string name="notice_widget_jitsi_added">Video conference started by %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">You started video conference</string>
+    <string name="notice_widget_jitsi_removed">Video conference ended by %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">You ended video conference</string>
+    <string name="notice_widget_jitsi_modified">Video conference modified by %1$s</string>
+    <string name="notice_widget_jitsi_modified_by_you">You modified video conference</string>
+
+    <string name="power_level_admin">Admin</string>
+    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_default">Default</string>
+    <string name="power_level_custom">Custom (%1$d)</string>
+    <string name="power_level_custom_no_value">Custom</string>
+
+    <!-- parameter will be a comma separated list of values of notice_power_level_diff -->
+    <string name="notice_power_level_changed_by_you">You changed the power level of %1$s.</string>
+    <!-- First parameter will be a userId or display name, second one will be a comma separated list of values of notice_power_level_diff -->
+    <string name="notice_power_level_changed">%1$s changed the power level of %2$s.</string>
+    <!-- First parameter will be a userId or display name, the two last ones will be value of power_level_* -->
+    <string name="notice_power_level_diff">%1$s from %2$s to %3$s</string>
+
+    <string name="notice_crypto_unable_to_decrypt">** Unable to decrypt: %s **</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">The sender\'s device has not sent us the keys for this message.</string>
+
+    <!-- Messages -->
+
+    <!-- Room Screen -->
+    <string name="could_not_redact">Could not redact</string>
+    <string name="unable_to_send_message">Unable to send message</string>
+
+    <string name="message_failed_to_upload">Failed to upload image</string>
+
+    <!-- general errors -->
+    <string name="network_error">Network error</string>
+    <string name="matrix_error">Matrix error</string>
+
+    <!-- Home Screen -->
+
+    <!-- Last seen time -->
+
+    <!-- call events -->
+
+    <!-- room error messages -->
+    <string name="room_error_join_failed_empty_room">It is not currently possible to re-join an empty room.</string>
+
+    <string name="encrypted_message">Encrypted message</string>
+
+    <!-- medium friendly name -->
+    <string name="medium_email">Email address</string>
+    <string name="medium_phone_number">Phone number</string>
+
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Invite from %s</string>
+    <string name="room_displayname_room_invite">Room Invite</string>
+
+    <!-- The 2 parameters will be members' name -->
+    <string name="room_displayname_two_members">%1$s and %2$s</string>
+    <!-- The 3 parameters will be members' name -->
+    <string name="room_displayname_3_members">%1$s, %2$s and %3$s</string>
+    <!-- The 4 parameters will be members' name -->
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s and %4$s</string>
+    <!-- The 3 first parameters will be members' name -->
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s and %4$d other</item>
+        <item quantity="other">%1$s, %2$s, %3$s and %4$d others</item>
+    </plurals>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s and 1 other</item>
+        <item quantity="other">%1$s and %2$d others</item>
+    </plurals>
+
+    <string name="room_displayname_empty_room">Empty room</string>
+    <string name="room_displayname_empty_room_was">Empty room (was %s)</string>
+
+    <string name="initial_sync_start_server_computing">Initial Sync:\nWaiting for server response…</string>
+    <string name="initial_sync_start_downloading">Initial Sync:\nDownloading data…</string>
+    <string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
+    <string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
+    <string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Initial Sync:\nImporting Joined Rooms</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Initial Sync:\nImporting Invited Rooms</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Initial Sync:\nImporting Left Rooms</string>
+    <string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
+    <string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
+
+    <string name="event_status_sending_message">Sending message…</string>
+    <string name="clear_timeline_send_queue">Clear sending queue</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s invitation. Reason: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Your invitation. Reason: %1$s</string>
+    <string name="notice_room_invite_with_reason">%1$s invited %2$s. Reason: %3$s</string>
+    <string name="notice_room_invite_with_reason_by_you">You invited %1$s. Reason: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s invited you. Reason: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s joined the room. Reason: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">You joined the room. Reason: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s joined. Reason: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">You joined. Reason: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s left the room. Reason: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">You left the room. Reason: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s left. Reason: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">You left. Reason: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s rejected the invitation. Reason: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">You rejected the invitation. Reason: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s kicked %2$s. Reason: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">You kicked %1$s. Reason: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s unbanned %2$s. Reason: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">You unbanned %1$s. Reason: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s banned %2$s. Reason: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">You banned %1$s. Reason: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s sent an invitation to %2$s to join the room. Reason: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">You sent an invitation to %1$s to join the room. Reason: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s revoked the invitation for %2$s to join the room. Reason: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">You revoked the invitation for %1$s to join the room. Reason: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s accepted the invitation for %2$s. Reason: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">You accepted the invitation for %1$s. Reason: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s withdrew %2$s\'s invitation. Reason: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">You withdrew %1$s\'s invitation. Reason: %2$s</string>
+
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s added %2$s as an address for this room.</item>
+        <item quantity="other">%1$s added %2$s as addresses for this room.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">You added %1$s as an address for this room.</item>
+        <item quantity="other">You added %1$s as addresses for this room.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s removed %2$s as an address for this room.</item>
+        <item quantity="other">%1$s removed %2$s as addresses for this room.</item>
+    </plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">You removed %1$s as an address for this room.</item>
+        <item quantity="other">You removed %1$s as addresses for this room.</item>
+    </plurals>
+
+    <string name="notice_room_aliases_added_and_removed">%1$s added %2$s and removed %3$s as addresses for this room.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">You added %1$s and removed %2$s as addresses for this room.</string>
+
+    <string name="notice_room_canonical_alias_set">"%1$s set the main address for this room to %2$s."</string>
+    <string name="notice_room_canonical_alias_set_by_you">"You set the main address for this room to %1$s."</string>
+    <string name="notice_room_canonical_alias_unset">"%1$s removed the main address for this room."</string>
+    <string name="notice_room_canonical_alias_unset_by_you">"You removed the main address for this room."</string>
+
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s added the alternative address %2$s for this room.</item>
+        <item quantity="other">%1$s added the alternative addresses %2$s for this room.</item>
+    </plurals>
+
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">You added the alternative address %1$s for this room.</item>
+        <item quantity="other">You added the alternative addresses %1$s for this room.</item>
+    </plurals>
+
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s removed the alternative address %2$s for this room.</item>
+        <item quantity="other">%1$s removed the alternative addresses %2$s for this room.</item>
+    </plurals>
+
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">You removed the alternative address %1$s for this room.</item>
+        <item quantity="other">You removed the alternative addresses %1$s for this room.</item>
+    </plurals>
+
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s changed the alternative addresses for this room.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">You changed the alternative addresses for this room.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s changed the main and alternative addresses for this room.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">You changed the main and alternative addresses for this room.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s changed the addresses for this room.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">You changed the addresses for this room.</string>
+
+    <string name="notice_room_guest_access_can_join">"%1$s has allowed guests to join the room."</string>
+    <string name="notice_room_guest_access_can_join_by_you">"You have allowed guests to join the room."</string>
+    <string name="notice_direct_room_guest_access_can_join">"%1$s has allowed guests to join here."</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">"You have allowed guests to join here."</string>
+    <string name="notice_room_guest_access_forbidden">"%1$s has prevented guests from joining the room."</string>
+    <string name="notice_room_guest_access_forbidden_by_you">"You have prevented guests from joining the room."</string>
+    <string name="notice_direct_room_guest_access_forbidden">"%1$s has prevented guests from joining the room."</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">"You have prevented guests from joining the room."</string>
+
+    <string name="notice_end_to_end_ok">%1$s turned on end-to-end encryption.</string>
+    <string name="notice_end_to_end_ok_by_you">You turned on end-to-end encryption.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s turned on end-to-end encryption (unrecognised algorithm %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">You turned on end-to-end encryption (unrecognised algorithm %1$s).</string>
 
     <!-- theme -->
     <string name="system_theme">System Default</string>

From 3c7750c471467c30c6000a5f36020b6c22435f47 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 14:54:20 +0100
Subject: [PATCH 177/578] Remove duplicated string resource and translation

---
 vector/src/main/res/values-ar/strings.xml     | 1 -
 vector/src/main/res/values-bg/strings.xml     | 1 -
 vector/src/main/res/values-bn-rIN/strings.xml | 1 -
 vector/src/main/res/values-ca/strings.xml     | 1 -
 vector/src/main/res/values-cs/strings.xml     | 1 -
 vector/src/main/res/values-de/strings.xml     | 1 -
 vector/src/main/res/values-el/strings.xml     | 2 --
 vector/src/main/res/values-eo/strings.xml     | 1 -
 vector/src/main/res/values-es-rMX/strings.xml | 2 --
 vector/src/main/res/values-es/strings.xml     | 1 -
 vector/src/main/res/values-et/strings.xml     | 1 -
 vector/src/main/res/values-eu/strings.xml     | 2 --
 vector/src/main/res/values-fa/strings.xml     | 1 -
 vector/src/main/res/values-fi/strings.xml     | 1 -
 vector/src/main/res/values-fr/strings.xml     | 1 -
 vector/src/main/res/values-gl/strings.xml     | 1 -
 vector/src/main/res/values-hu/strings.xml     | 1 -
 vector/src/main/res/values-is/strings.xml     | 2 --
 vector/src/main/res/values-it/strings.xml     | 1 -
 vector/src/main/res/values-ja/strings.xml     | 1 -
 vector/src/main/res/values-kab/strings.xml    | 1 -
 vector/src/main/res/values-ko/strings.xml     | 2 --
 vector/src/main/res/values-lv/strings.xml     | 1 -
 vector/src/main/res/values-nl/strings.xml     | 2 --
 vector/src/main/res/values-nn/strings.xml     | 1 -
 vector/src/main/res/values-pl/strings.xml     | 2 --
 vector/src/main/res/values-pt-rBR/strings.xml | 1 -
 vector/src/main/res/values-pt/strings.xml     | 2 --
 vector/src/main/res/values-ru/strings.xml     | 1 -
 vector/src/main/res/values-sk/strings.xml     | 1 -
 vector/src/main/res/values-sq/strings.xml     | 1 -
 vector/src/main/res/values-sr/strings.xml     | 1 -
 vector/src/main/res/values-sv/strings.xml     | 1 -
 vector/src/main/res/values-uk/strings.xml     | 1 -
 vector/src/main/res/values-vls/strings.xml    | 2 --
 vector/src/main/res/values-zh-rCN/strings.xml | 1 -
 vector/src/main/res/values-zh-rTW/strings.xml | 1 -
 vector/src/main/res/values/strings.xml        | 2 --
 38 files changed, 48 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 60c7506810..0909d85efe 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -39,7 +39,6 @@
     <string name="network_error">خطأ في الشَّبكة</string>
     <string name="matrix_error">خطأ في Matrix</string>
     <string name="room_error_join_failed_empty_room">حاليًا مِن غير المُمكِن إعادة الاِنضمام إلى غُرفة فارِغة.</string>
-    <string name="encrypted_message">رِسالة مُعمَّاة</string>
     <string name="medium_email">عُنوان البريد الإلكتروني</string>
     <string name="medium_phone_number">رقم الهاتف</string>
     <string name="summary_message">‏‏⁨%1$s⁩: ‏⁨%2$s⁩</string>
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 569cb50a9c..92c0cc6ef9 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -45,7 +45,6 @@
     <string name="network_error">Грешка в мрежата</string>
     <string name="matrix_error">Matrix грешка</string>
     <string name="room_error_join_failed_empty_room">В момента не е възможно да се присъедините отново към празна стая.</string>
-    <string name="encrypted_message">Шифровано съобщение</string>
     <string name="medium_email">Имейл адрес</string>
     <string name="medium_phone_number">Телефонен номер</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Устройството на подателя не изпрати ключовете за това съобщение.</string>
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index 3002e4c056..f8030253e9 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -106,7 +106,6 @@
     <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
     <string name="matrix_error">ম্যাট্রিক্স ত্রুটি</string>
     <string name="room_error_join_failed_empty_room">খালি কক্ষে পুনরায় যোগদান করা বর্তমানে সম্ভব নয়।</string>
-    <string name="encrypted_message">এনক্রিপ্ট করা বার্তা</string>
     <string name="medium_email">ইমেল ঠিকানা</string>
     <string name="medium_phone_number">ফোন নম্বর</string>
     <string name="room_displayname_invite_from">%s থেকে আমন্ত্রণ করুন</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 144d218e61..d65d3be695 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -6,7 +6,6 @@
     <string name="notice_room_join">%1$s s\'ha unit a la sala</string>
     <string name="medium_phone_number">Número de telèfon</string>
     <string name="medium_email">Correu electrònic</string>
-    <string name="encrypted_message">Missatge xifrat</string>
     <string name="notice_room_invite_no_invitee">invitació de %s</string>
     <string name="notice_room_invite">%1$s ha convidat a %2$s</string>
     <string name="notice_room_invite_you">%1$s t\'ha convidat</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 9ba5b268d7..19d144cfc2 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -47,7 +47,6 @@
     <string name="network_error">Chyba sítě</string>
     <string name="matrix_error">Chyba v Matrixu</string>
     <string name="room_error_join_failed_empty_room">V současnosti není možné znovu vstoupit do prázdné místnosti.</string>
-    <string name="encrypted_message">Šifrovaná zpráva</string>
     <string name="medium_email">E-mailová adresa</string>
     <string name="medium_phone_number">Telefonní číslo</string>
     <string name="room_displayname_invite_from">Pozvání od %s</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 1ca3ee3320..25174ff3fe 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -52,7 +52,6 @@
     <!-- call events -->
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Es ist aktuell nicht möglich, einen leeren Raum erneut zu betreten.</string>
-    <string name="encrypted_message">Verschlüsselte Nachricht</string>
     <!-- medium friendly name -->
     <string name="medium_email">E-Mail-Adresse</string>
     <string name="medium_phone_number">Telefonnummer</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 401ee237be..ad7c99fd44 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -47,8 +47,6 @@
     <string name="network_error">Σφάλμα δικτύου</string>
     <string name="matrix_error">Σφάλμα του Matrix</string>
 
-    <string name="encrypted_message">Κρυπτογραφημένο μήνυμα</string>
-
     <string name="notice_requested_voip_conference">Ο/Η %1$s ζήτησε μια VoIP διάσκεψη</string>
     <string name="notice_voip_started">Η VoIP διάσκεψη ξεκίνησε</string>
     <string name="notice_voip_finished">Η VoIP διάσκεψη έληξε</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 36e7c86694..9409148160 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -47,7 +47,6 @@
     <string name="network_error">Reta eraro</string>
     <string name="matrix_error">Matrix-eraro</string>
     <string name="room_error_join_failed_empty_room">Nun ne eblas re-aliĝi al malplena ĉambro.</string>
-    <string name="encrypted_message">Ĉifrita mesaĝo</string>
     <string name="medium_email">Retpoŝtadreso</string>
     <string name="medium_phone_number">Telefonnumero</string>
     <string name="room_displayname_invite_from">Invito de %s</string>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 71b4fb1002..8954f517a0 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -64,8 +64,6 @@
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">No es posible volver a unirse a una sala vacía.</string>
 
-    <string name="encrypted_message">Mensaje cifrado</string>
-
     <!-- medium friendly name -->
     <string name="medium_email">Correo electrónico</string>
     <string name="medium_phone_number">Número telefónico</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 139b840e2b..fe85666f52 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -52,7 +52,6 @@
     <!-- call events -->
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Actualmente no es posible volver a unirse a una sala vacía.</string>
-    <string name="encrypted_message">Mensaje encriptado</string>
     <!-- medium friendly name -->
     <string name="medium_email">Dirección de correo electrónico</string>
     <string name="medium_phone_number">Número telefónico</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index eabb935b25..9bd24ebd54 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -51,7 +51,6 @@
     <string name="network_error">Võrguühenduse viga</string>
     <string name="matrix_error">Matrix\'i viga</string>
     <string name="room_error_join_failed_empty_room">Hetkel ei ole võimalik uuesti liituda tühja jututoaga.</string>
-    <string name="encrypted_message">Krüptitud sõnum</string>
     <string name="medium_email">E-posti aadress</string>
     <string name="medium_phone_number">Telefoninumber</string>
     <string name="room_displayname_invite_from">Kutse kasutajalt %s</string>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 56540de8ce..e9cf1bcefa 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -55,8 +55,6 @@
 
     <string name="room_error_join_failed_empty_room">Ezin da oraingoz hutsik dagoen gela batetara berriro sartu.</string>
 
-    <string name="encrypted_message">Zifratutako mezua</string>
-
     <string name="medium_email">E-mail helbidea</string>
     <string name="medium_phone_number">Telefono zenbakia</string>
 
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 8a0f1bf77b..95f00f2405 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -51,7 +51,6 @@
     <string name="network_error">خطای شبکه</string>
     <string name="matrix_error">خطای ماتریکس</string>
     <string name="room_error_join_failed_empty_room">در حال حاضر امکان بازپیوست به اتاقی خالی وجود ندارد‌‌.</string>
-    <string name="encrypted_message">پیام رمزنگاری شده</string>
     <string name="medium_email">نشانی رایانامه</string>
     <string name="medium_phone_number">شماره تلفن</string>
     <string name="room_displayname_invite_from">دعوت از %s</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index dadba4a077..2b6483d507 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -44,7 +44,6 @@
     <string name="network_error">Verkkovirhe</string>
     <string name="matrix_error">Matrix-virhe</string>
     <string name="room_error_join_failed_empty_room">Tällä hetkellä ei ole mahdollista liittyä uudelleen tyhjään huoneeseen.</string>
-    <string name="encrypted_message">Salattu viesti</string>
     <string name="medium_email">Sähköpostiosoite</string>
     <string name="medium_phone_number">Puhelinnumero</string>
     <string name="could_not_redact">Takaisinveto epäonnistui</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index ddbaa410df..6bc9ac7c68 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -46,7 +46,6 @@
     <string name="network_error">Erreur de réseau</string>
     <string name="matrix_error">Erreur de Matrix</string>
     <string name="room_error_join_failed_empty_room">Il est impossible pour le moment de revenir dans un salon vide.</string>
-    <string name="encrypted_message">Message chiffré</string>
     <string name="medium_email">Adresse e-mail</string>
     <string name="medium_phone_number">Numéro de téléphone</string>
     <string name="summary_user_sent_sticker">%1$s a envoyé un sticker.</string>
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index e701ce6fdb..ad08235a57 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -48,7 +48,6 @@
     <string name="network_error">Erro da conexión</string>
     <string name="matrix_error">Erro de Matrix</string>
     <string name="room_error_join_failed_empty_room">Aínda non é posíbel volver a entrar nunha sala baleira.</string>
-    <string name="encrypted_message">Mensaxe cifrada</string>
     <string name="medium_phone_number">Número de teléfono</string>
     <string name="room_displayname_two_members">%1$s e %2$s</string>
     <string name="notice_placed_voice_call_by_you">Fixeches unha chamada de audio.</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index f475e4426c..d2e7eed5f0 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -46,7 +46,6 @@
     <string name="network_error">Hálózati hiba</string>
     <string name="matrix_error">Matrix hiba</string>
     <string name="room_error_join_failed_empty_room">Jelenleg nem lehetséges újracsatlakozni egy üres szobához.</string>
-    <string name="encrypted_message">Titkosított üzenet</string>
     <string name="medium_email">E-mail cím</string>
     <string name="medium_phone_number">Telefonszám</string>
     <string name="summary_user_sent_sticker">%1$s küldött egy matricát.</string>
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index 5969940e82..dd8cb20559 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -32,8 +32,6 @@
     <string name="network_error">Villa í netkerfi</string>
     <string name="matrix_error">Villa í Matrix</string>
 
-    <string name="encrypted_message">Dulrituð skilaboð</string>
-
     <string name="medium_email">Tölvupóstfang</string>
     <string name="medium_phone_number">Símanúmer</string>
 
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 3c5ff68b25..c8dbf97cc1 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -46,7 +46,6 @@
     <string name="network_error">Errore di rete</string>
     <string name="matrix_error">Errore di Matrix</string>
     <string name="room_error_join_failed_empty_room">Al momento non è possibile rientrare in una stanza vuota.</string>
-    <string name="encrypted_message">Messaggio criptato</string>
     <string name="medium_email">Indirizzo email</string>
     <string name="medium_phone_number">Numero di telefono</string>
     <string name="summary_user_sent_sticker">%1$s ha inviato un adesivo.</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index fbac648a40..3d5cc0c555 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -54,7 +54,6 @@
     <string name="network_error">ネットワークエラー</string>
     <string name="matrix_error">Matrixエラー</string>
     <string name="room_error_join_failed_empty_room">現在空の部屋に再参加することはできません。</string>
-    <string name="encrypted_message">暗号化されたメッセージ</string>
     <string name="medium_email">メールアドレス</string>
     <string name="medium_phone_number">電話番号</string>
     <string name="notice_room_avatar_changed_by_you">ルームのアバターを変更しました</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 3561ec153f..074f68db1e 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -106,7 +106,6 @@
     <string name="notice_room_third_party_revoked_invite">%1$s issefsax tinubga i %2$s i wakken ad d-yekcem ɣer texxamt</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Tesfesxeḍ tinubga i %1$s i wakken ad d-yernu ɣer texxamt</string>
     <string name="room_error_join_failed_empty_room">D awezɣi tura ad nales ad nuɣal ɣer texxamt tilemt.</string>
-    <string name="encrypted_message">Izen yettwawgelhen</string>
     <string name="medium_phone_number">Uṭṭun n tiliɣri</string>
     <string name="room_displayname_invite_from">Tinubga sɣur %s</string>
     <string name="room_displayname_room_invite">Tinubga ɣer texxamt</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 030786056c..e98b406305 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -61,8 +61,6 @@
 
     <string name="room_error_join_failed_empty_room">현재 빈 방에 다시 들어갈 수 없습니다.</string>
 
-    <string name="encrypted_message">암호화된 메시지</string>
-
     <string name="medium_email">이메일 주소</string>
     <string name="medium_phone_number">전화번호</string>
 
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 1ee9e4ee61..a679b455b8 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -46,7 +46,6 @@
     <string name="network_error">Tīkla kļūda</string>
     <string name="matrix_error">Matrix kļūda</string>
     <string name="room_error_join_failed_empty_room">Šobrīd nav iespējams atkārtoti pievienoties tukšai istabai.</string>
-    <string name="encrypted_message">Šifrēta ziņa</string>
     <string name="medium_email">Epasta adrese</string>
     <string name="medium_phone_number">Telefona numurs</string>
     <string name="room_displayname_invite_from">Uzaicinājums no %s</string>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 66a09447a5..843d605454 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -62,8 +62,6 @@
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Het is momenteel niet mogelijk om een leeg gesprek opnieuw toe te treden.</string>
 
-    <string name="encrypted_message">Versleuteld bericht</string>
-
     <!-- medium friendly name -->
     <string name="medium_email">E-mailadres</string>
     <string name="medium_phone_number">Telefoonnummer</string>
diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml
index 6ff80132e7..783778ec6a 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="encrypted_message">Kryptert melding</string>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s sende eit bilæte.</string>
     <string name="summary_user_sent_sticker">%1$s sende eit klistremerke.</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index dae44ade8a..297415edc9 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -24,8 +24,6 @@
     <string name="network_error">Błąd sieci</string>
     <string name="matrix_error">Błąd Matrixa</string>
 
-    <string name="encrypted_message">Wiadomość zaszyfrowana</string>
-
     <string name="medium_email">Adres e-mail</string>
     <string name="medium_phone_number">Numer telefonu</string>
 
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 7148636729..f3a0e5a926 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -52,7 +52,6 @@
     <!-- call events -->
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Atualmente, não é possível entrar novamente em uma sala vazia.</string>
-    <string name="encrypted_message">Mensagem criptografada</string>
     <!-- medium friendly name -->
     <string name="medium_email">Endereço de e-mail</string>
     <string name="medium_phone_number">Número de telefone</string>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
index 7fe8a9730d..8ec938f9e3 100644
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -64,8 +64,6 @@
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Ainda não é possível voltar a entrar numa sala vazia.</string>
 
-    <string name="encrypted_message">Mensagem cifrada</string>
-
     <!-- medium friendly name -->
     <string name="medium_email">Endereço de e-mail</string>
     <string name="medium_phone_number">Número de telefone</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 7741c155d8..086c9bec54 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -52,7 +52,6 @@
     <!-- call events -->
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">В настоящее время невозможно вновь присоединиться к пустой комнате.</string>
-    <string name="encrypted_message">Зашифрованное сообщение</string>
     <!-- medium friendly name -->
     <string name="medium_email">Адрес электронной почты</string>
     <string name="medium_phone_number">Номер телефона</string>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 8efda54cf4..3f62126d2d 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -46,7 +46,6 @@
     <string name="network_error">Chyba siete</string>
     <string name="matrix_error">Chyba Matrix</string>
     <string name="room_error_join_failed_empty_room">V súčasnosti nie je možné znovu vstúpiť do prázdnej miestnosti.</string>
-    <string name="encrypted_message">Šifrovaná správa</string>
     <string name="medium_email">Emailová adresa</string>
     <string name="medium_phone_number">Telefónne číslo</string>
     <string name="summary_user_sent_sticker">%1$s poslal/a nálepku.</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index e8c6ce8822..80685a5f88 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -37,7 +37,6 @@
     <string name="network_error">Gabim rrjeti</string>
     <string name="matrix_error">Gabim Matrix</string>
     <string name="room_error_join_failed_empty_room">Hëpërhë s’është e mundur të rihyhet në një dhomë të zbrazët.</string>
-    <string name="encrypted_message">Mesazh i fshehtëzuar</string>
     <string name="medium_email">Adresë email</string>
     <string name="medium_phone_number">Numër telefoni</string>
     <string name="room_displayname_invite_from">Ftesë nga %s</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 837eb629cc..8f4cae8487 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -62,7 +62,6 @@
     <string name="room_displayname_two_members">%1$s и %2$s</string>
     <string name="medium_phone_number">Број телефона</string>
     <string name="medium_email">Адреса е-поште</string>
-    <string name="encrypted_message">Шифрована порука</string>
     <string name="room_error_join_failed_empty_room">Тренутно није могуће да се вратите у празну собу.</string>
     <string name="matrix_error">Грешка Матрикса</string>
     <string name="network_error">Мрежна грешка</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 1f01c04e93..d76a9557b8 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -106,7 +106,6 @@
     <string name="network_error">Nätverksfel</string>
     <string name="matrix_error">Matrixfel</string>
     <string name="room_error_join_failed_empty_room">Det går för närvarande inte att gå med i ett tomt rum igen.</string>
-    <string name="encrypted_message">Krypterat meddelande</string>
     <string name="medium_email">E-postadress</string>
     <string name="medium_phone_number">Telefonnummer</string>
     <string name="room_displayname_invite_from">Inbjudan från %s</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index f84b97bf5c..54d6dfeae9 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -4,7 +4,6 @@
     <string name="summary_user_sent_image">%1$s надсилає зображення.</string>
     <string name="notice_room_invite_no_invitee">%s запрошення</string>
     <string name="notice_room_invite">%1$s запрошує %2$s</string>
-    <string name="encrypted_message">Зашифроване повідомлення</string>
     <!-- Room display name -->
     <string name="room_displayname_invite_from">Запрошення від %s</string>
     <string name="room_displayname_room_invite">Запрошення до кімнати</string>
diff --git a/vector/src/main/res/values-vls/strings.xml b/vector/src/main/res/values-vls/strings.xml
index 0e14a8aa15..c8190e7a68 100644
--- a/vector/src/main/res/values-vls/strings.xml
+++ b/vector/src/main/res/values-vls/strings.xml
@@ -60,8 +60,6 @@
 
     <string name="room_error_join_failed_empty_room">’t Es vo de moment nie meuglik van e leeg gesprek were toe te treedn.</string>
 
-    <string name="encrypted_message">Versleuteld bericht</string>
-
     <string name="medium_email">E-mailadresse</string>
     <string name="medium_phone_number">Telefongnumero</string>
 
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 206ec665af..c129a3cb50 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -39,7 +39,6 @@
     <string name="network_error">网络错误</string>
     <string name="matrix_error">Matrix 错误</string>
     <string name="room_error_join_failed_empty_room">目前无法重新加入一个空的聊天室。</string>
-    <string name="encrypted_message">已加密消息</string>
     <string name="medium_email">电子邮箱地址</string>
     <string name="medium_phone_number">手机号码</string>
     <string name="notice_room_withdraw">%1$s 撤回了对 %2$s 的邀请</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 2a73f3a596..e70457723f 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -46,7 +46,6 @@
     <string name="network_error">網路錯誤</string>
     <string name="matrix_error">Matrix 錯誤</string>
     <string name="room_error_join_failed_empty_room">目前無法重新加入空房間。</string>
-    <string name="encrypted_message">已加密的訊息</string>
     <string name="medium_email">電子郵件</string>
     <string name="medium_phone_number">電話號碼</string>
     <string name="summary_user_sent_sticker">%1$s 傳送了一張貼圖。</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 99eef6a8e2..6623567f27 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -170,8 +170,6 @@
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">It is not currently possible to re-join an empty room.</string>
 
-    <string name="encrypted_message">Encrypted message</string>
-
     <!-- medium friendly name -->
     <string name="medium_email">Email address</string>
     <string name="medium_phone_number">Phone number</string>

From 57df61dadf8613d70f6d27ddef45e0b137bf61df Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 14:55:45 +0100
Subject: [PATCH 178/578] Changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8692a2cff8..526ea14b5c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@ Bugfix 🐛:
  - Be robust if Event.type is missing (#2946)
 
 Translations 🗣:
- -
+ - All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed.
 
 SDK API changes ⚠️:
  -

From 8447bf4a2d15bf2898a71fa234d95766e365695a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 15:05:57 +0100
Subject: [PATCH 179/578] Fix compilation issue

---
 .../app/features/room/VectorRoomDisplayNameFallbackProvider.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
index ca18e1d4c8..92408d59f4 100644
--- a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.room
 
 import android.content.Context
-import org.matrix.android.sdk.R
+import im.vector.app.R
 import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
 
 class VectorRoomDisplayNameFallbackProvider(

From b8498aecd904d5f43b2a819a79b81110f8cc2138 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 15:16:48 +0100
Subject: [PATCH 180/578] Code quality

---
 .../org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt | 2 +-
 .../crypto/verification/VerificationTransportRoomMessage.kt     | 1 -
 .../crypto/verification/VerificationTransportToDevice.kt        | 1 -
 .../internal/session/room/membership/RoomDisplayNameResolver.kt | 2 +-
 tools/check/forbidden_strings_in_code.txt                       | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt
index 296f2bafaf..901c1b2ffb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/initsync/InitSyncStep.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index 957ff2d50c..ad490bcd27 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -380,4 +380,3 @@ internal class VerificationTransportRoomMessage(
         Timber.w("## SAS ignored verification ready with methods: ${keyReq.methods}")
     }
 }
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
index 8acd4faecf..0dbbe656c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
@@ -246,4 +246,3 @@ internal class VerificationTransportToDevice(
         )
     }
 }
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 6948dd956a..0e18e30b13 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -42,7 +42,7 @@ internal class RoomDisplayNameResolver @Inject constructor(
         @UserId private val userId: String
 ) {
 
-    private val roomDisplayNameFallbackProvider=  matrixConfiguration.roomDisplayNameFallbackProvider
+    private val roomDisplayNameFallbackProvider = matrixConfiguration.roomDisplayNameFallbackProvider
 
     /**
      * Compute the room display name
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 567e24a849..9d22f882c6 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===90
+enum class===91
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From 5f01494ed057cf1af8626d9cc9f1fd2a58e1051a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 3 Mar 2021 16:09:08 +0100
Subject: [PATCH 181/578] Remove unused resource

---
 vector/src/main/res/values-bg/strings.xml     | 1 -
 vector/src/main/res/values-ca/strings.xml     | 1 -
 vector/src/main/res/values-cs/strings.xml     | 1 -
 vector/src/main/res/values-de/strings.xml     | 1 -
 vector/src/main/res/values-eo/strings.xml     | 1 -
 vector/src/main/res/values-es/strings.xml     | 1 -
 vector/src/main/res/values-et/strings.xml     | 1 -
 vector/src/main/res/values-fa/strings.xml     | 1 -
 vector/src/main/res/values-fi/strings.xml     | 1 -
 vector/src/main/res/values-fr/strings.xml     | 1 -
 vector/src/main/res/values-he/strings.xml     | 1 -
 vector/src/main/res/values-hu/strings.xml     | 1 -
 vector/src/main/res/values-it/strings.xml     | 1 -
 vector/src/main/res/values-iw/strings.xml     | 1 -
 vector/src/main/res/values-kab/strings.xml    | 1 -
 vector/src/main/res/values-nb-rNO/strings.xml | 1 -
 vector/src/main/res/values-pl/strings.xml     | 1 -
 vector/src/main/res/values-pt-rBR/strings.xml | 1 -
 vector/src/main/res/values-ru/strings.xml     | 1 -
 vector/src/main/res/values-sq/strings.xml     | 1 -
 vector/src/main/res/values-sv/strings.xml     | 1 -
 vector/src/main/res/values-zh-rCN/strings.xml | 1 -
 vector/src/main/res/values-zh-rTW/strings.xml | 1 -
 vector/src/main/res/values/strings.xml        | 3 ---
 24 files changed, 26 deletions(-)

diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 92c0cc6ef9..32b9265f31 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -2341,7 +2341,6 @@
     <string name="empty_phone_book">Телефонния указател е празен</string>
     <string name="add_from_phone_book">Добави от телефонния указател</string>
     <string name="save_recovery_key_chooser_hint">Запази ключа за възстановяване в</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="element_disclaimer_positive_button">НАУЧИ ПОВЕЧЕ</string>
     <string name="element_disclaimer_negative_button">РАЗБРАХ</string>
     <string name="element_disclaimer_content">Развълнувани сме да съобщим, че променихме името! Приложението ви е обновено и сте вписани в профила си.</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index d65d3be695..eca0fb2614 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -2456,7 +2456,6 @@
     </plurals>
     <string name="phone_book_perform_lookup">Busca contactes a Matrix</string>
     <string name="search_in_my_contacts">Busca als meus contactes</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="element_disclaimer_positive_button">MÉS INFORMACIÓ</string>
     <string name="element_disclaimer_title">Riot ara és Element!</string>
     <string name="crypto_error_withheld_generic">No pots accedir al missatge perquè el remitent, intencionadament, no ha enviat les claus</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 19d144cfc2..af48a7d148 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2376,7 +2376,6 @@
     <string name="element_disclaimer_content">Jsme nadšení, že smíme oznámit změnu jména! Vaše app je aktuální a jste přihlášeni do svého účtu.</string>
     <string name="element_disclaimer_negative_button">ROZUMÍM</string>
     <string name="element_disclaimer_positive_button">DOZVĚDĚT SE VÍCE</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Uložit klíče pro obnovu v</string>
     <string name="add_from_phone_book">Přidat z mého adresáře</string>
     <string name="empty_phone_book">Váš adresář je prázdný</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 25174ff3fe..8a781860c7 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2357,7 +2357,6 @@
     <string name="element_disclaimer_content">Wir sind begeistert unsere Namensänderung mitteilen zu können! Deine App ist auf dem neusten Stand und du bist mit deinem Account angemeldet.</string>
     <string name="element_disclaimer_negative_button">VERSTANDEN</string>
     <string name="element_disclaimer_positive_button">MEHR ERFAHREN</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Speichere Wiederherstellungsschlüssel in</string>
     <string name="add_from_phone_book">Füge über Kontaktliste hinzu</string>
     <string name="empty_phone_book">Deine Kontaktliste ist leer</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 9409148160..32f36d429b 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -2055,7 +2055,6 @@
     <string name="phone_book_title">Adresaro</string>
     <string name="empty_phone_book">Via adresaro malplenas</string>
     <string name="add_from_phone_book">Aldoni per mia adresaro</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="element_disclaimer_positive_button">EKSCIU PLION</string>
     <string name="element_disclaimer_negative_button">KOMPRENITE</string>
     <string name="element_disclaimer_content">Ni ĝojas anonci, ke ni ŝanĝis nian nomon! Via aplikaĵo estas ĝisdata kaj vi estas salutinta vian konton.</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index fe85666f52..cd43ff9c68 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1833,7 +1833,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="element_disclaimer_title">Riot ahora es Element!</string>
     <string name="element_disclaimer_negative_button">Entendido</string>
     <string name="element_disclaimer_positive_button">Aprender Mas</string>
-    <string name="element_login_splash_brand">Element</string>
     <string name="search_in_my_contacts">Buscar en mis contactos</string>
     <string name="three_pid_revoke_invite_dialog_title">Rechazar invitación</string>
     <string name="auth_pin_confirm_to_disable_title">Confirma PIN para desabilitarlo</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 9bd24ebd54..f3c41ed726 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2022,7 +2022,6 @@
     <string name="element_disclaimer_content">Meil on hea meel teatada, et oleme muutnud nime! Sinu rakendus on uuendatud ning sa oled oma kontole sisse logitud.</string>
     <string name="element_disclaimer_negative_button">Selge lugu</string>
     <string name="element_disclaimer_positive_button">Vaata lisateavet</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Salvesta taastevõti järgnevalt</string>
     <string name="add_from_phone_book">Lisa telefoniraamatust</string>
     <string name="empty_phone_book">Sinu telefoniraamat on tühi</string>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 95f00f2405..b570a75cb0 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1538,7 +1538,6 @@
     <string name="room_settings_topic_hint">موضوع</string>
     <string name="element_disclaimer_negative_button">گرفتم</string>
     <string name="element_disclaimer_positive_button">اطّلاعات بیش‌تر</string>
-    <string name="element_login_splash_brand">المنت</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">هشدارهای نشانی اصلی</string>
     <string name="encryption_information_sender_device_information">اطّلاعات نشست فرستنده</string>
     <string name="encryption_information_decryption_error">خطای رمزگشایی</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 2b6483d507..cbca322a9e 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -2221,7 +2221,6 @@
     <string name="direct_room_profile_section_more_settings">Asetukset</string>
     <string name="sent_a_poll">Äänestys</string>
     <string name="settings_text_message_sent_hint">Koodi</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="room_settings_topic_hint">Aihe</string>
     <string name="power_level_title">Rooli</string>
     <string name="invite_users_to_room_action_invite">KUTSU</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 6bc9ac7c68..b89962f71e 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2212,7 +2212,6 @@
     <string name="empty_phone_book">Votre carnet d\'adresses est vide</string>
     <string name="add_from_phone_book">Ajouter depuis mon carnet d\'adresses</string>
     <string name="save_recovery_key_chooser_hint">Enregistrer la clé de récupération</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="element_disclaimer_positive_button">EN SAVOIR PLUS</string>
     <string name="element_disclaimer_negative_button">COMPRIS</string>
     <string name="element_disclaimer_content">Nous sommes heureux de vous annoncer que nous avons un nouveau nom ! Votre application est à jour et vous êtes connectés à votre compte.</string>
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
index dd91c10740..a8b9588f96 100644
--- a/vector/src/main/res/values-he/strings.xml
+++ b/vector/src/main/res/values-he/strings.xml
@@ -2282,7 +2282,6 @@
     <string name="empty_phone_book">ספר הטלפונים שלך ריק</string>
     <string name="add_from_phone_book">הוסף מפנקס הטלפונים שלי</string>
     <string name="save_recovery_key_chooser_hint">שמור מפתח שחזור פנימה</string>
-    <string name="element_login_splash_brand">רכיב</string>
     <string name="element_disclaimer_positive_button">למד עוד</string>
     <string name="element_disclaimer_negative_button">הבנת</string>
     <string name="element_disclaimer_content">אנו שמחים לבשר ששינינו שם! האפליקציה שלך מעודכנת ואתה מחובר לחשבונך.</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index d2e7eed5f0..3f708657d8 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2251,7 +2251,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="element_disclaimer_content">Örömmel jelentjük be, hogy nevet változtattunk! Az alkalmazás naprakész, és be vagy jelentkezve a fiókodba.</string>
     <string name="element_disclaimer_negative_button">ÉRTEM</string>
     <string name="element_disclaimer_positive_button">TOVÁBBI INFORMÁCIÓK</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Helyreállítási kulcs mentése ide:</string>
     <string name="add_from_phone_book">Hozzáadás a telefonkönyvemből</string>
     <string name="empty_phone_book">A telefonkönyved üres</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index c8dbf97cc1..25617abb6b 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2357,7 +2357,6 @@
     <string name="element_disclaimer_content">Siamo entusiasti di annunciare che abbiamo cambiato nome! La tua app è aggiornata e hai fatto l\'accesso al tuo account.</string>
     <string name="element_disclaimer_negative_button">CAPITO</string>
     <string name="element_disclaimer_positive_button">MAGGIORI INFO</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Salva chiave di ripristino in</string>
     <string name="add_from_phone_book">Aggiungi dalla mia rubrica</string>
     <string name="empty_phone_book">La tua rubrica è vuota</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index dd91c10740..a8b9588f96 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -2282,7 +2282,6 @@
     <string name="empty_phone_book">ספר הטלפונים שלך ריק</string>
     <string name="add_from_phone_book">הוסף מפנקס הטלפונים שלי</string>
     <string name="save_recovery_key_chooser_hint">שמור מפתח שחזור פנימה</string>
-    <string name="element_login_splash_brand">רכיב</string>
     <string name="element_disclaimer_positive_button">למד עוד</string>
     <string name="element_disclaimer_negative_button">הבנת</string>
     <string name="element_disclaimer_content">אנו שמחים לבשר ששינינו שם! האפליקציה שלך מעודכנת ואתה מחובר לחשבונך.</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 074f68db1e..9ed230fe23 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -951,7 +951,6 @@
     <string name="crypto_utd">Ur yezmir ara ad yekkes awgelhen</string>
     <string name="element_disclaimer_negative_button">AWI-T</string>
     <string name="element_disclaimer_positive_button">ISSIN UGAR</string>
-    <string name="element_login_splash_brand">aferdis</string>
     <string name="save_recovery_key_chooser_hint">Sekles tasarut n tririt deg</string>
     <string name="add_from_phone_book">Rnu seg yidles n tiliɣri</string>
     <string name="empty_phone_book">Idles-ik·im n tiliɣri d ilem</string>
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 7ca1368cfd..d51d954d02 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -923,7 +923,6 @@
     <string name="notice_crypto_unable_to_decrypt_merged">Venter på krypteringshistorikk</string>
     <string name="element_disclaimer_title">Riot er nå Element!</string>
     <string name="element_disclaimer_content">Vi er glade for å kunngjøre at vi har byttet navn! Appen din er oppdatert, og du er logget på kontoen din.</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Lagre gjenopprettingsnøkkel i</string>
     <string name="loading_contact_book">Henter kontaktene dine…</string>
     <string name="empty_contact_book">Kontaktboken din er tom</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 297415edc9..751e0ad349 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1906,7 +1906,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="empty_phone_book">Twoja książka telefoniczna jest pusta</string>
     <string name="add_from_phone_book">Dodaj z mojej książki telefonicznej</string>
     <string name="save_recovery_key_chooser_hint">Zapisz klucz odzyskiwania w</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="element_disclaimer_positive_button">DOWIEDZ SIĘ WIĘCEJ</string>
     <string name="element_disclaimer_content">Jesteśmy podekscytowani mogąc oznajmić, że zmieniliśmy nazwę! Twoja aplikacja jest aktualna i jesteś zalogowany(-a) do swojego konta.</string>
     <string name="element_disclaimer_title">Riot nazywa się teraz Element!</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index f3a0e5a926..8f9ac6af09 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2364,7 +2364,6 @@
     <string name="element_disclaimer_content">Estamos felizes em anunciar que mudamos de nome! Seu aplicativo está atualizado e você está conectado à sua conta.</string>
     <string name="element_disclaimer_negative_button">OK, ENTENDI</string>
     <string name="element_disclaimer_positive_button">APRENDA MAIS</string>
-    <string name="element_login_splash_brand">Element</string>
     <string name="save_recovery_key_chooser_hint">Salvar chave de recuperação em</string>
     <string name="add_from_phone_book">Adicionar da minha lista de contatos</string>
     <string name="empty_phone_book">Sua lista de contatos está vazia</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 086c9bec54..d62d6c65a7 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2429,7 +2429,6 @@
     <string name="element_disclaimer_content">Мы рады сообщить, что сменили имя! Ваше приложение обновлено, и вы вошли в свою учетную запись.</string>
     <string name="element_disclaimer_negative_button">ПОНЯТНО</string>
     <string name="element_disclaimer_positive_button">УЗНАТЬ БОЛЬШЕ</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Сохранить ключ восстановления в</string>
     <string name="add_from_phone_book">Добавить из моей телефонной книги</string>
     <string name="empty_phone_book">Ваша телефонная книга пуста</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 80685a5f88..d5bfcf0d96 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2334,7 +2334,6 @@
     <string name="element_disclaimer_content">Jemi të ngazëllyer t’ju njoftojmë se kemi ndërruar emër! Aplikacioni juaj është i përditësuar dhe jeni i futur në llogarinë tuaj.</string>
     <string name="element_disclaimer_negative_button">E MORA VESH</string>
     <string name="element_disclaimer_positive_button">MËSONI MË TEPËR</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Ruaje kyçin e rimarrjeve te</string>
     <string name="add_from_phone_book">Shto prej numëratorit tim telefonik</string>
     <string name="empty_phone_book">Numëratori juaj telefonik është i zbrazët</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index d76a9557b8..79cdd21751 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2321,7 +2321,6 @@
     <string name="element_disclaimer_content">Vi är glada att meddela att vi har bytt namn! Din app är uppdaterad och du är inloggad på ditt konto.</string>
     <string name="element_disclaimer_negative_button">UPPFATTAT</string>
     <string name="element_disclaimer_positive_button">LÄR DIG MER</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">Spara återställningsnyckel i</string>
     <string name="add_from_phone_book">Lägg till från min telefonbok</string>
     <string name="empty_phone_book">Din telefonbok är tom</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index c129a3cb50..8a197b914f 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2215,7 +2215,6 @@
     <string name="element_disclaimer_content">我们兴奋地宣布我们改名了！您的应用已经是最新的并且您已登入您的帐户。</string>
     <string name="element_disclaimer_negative_button">明白了</string>
     <string name="element_disclaimer_positive_button">了解更多</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">将恢复密钥保存到</string>
     <string name="add_from_phone_book">从我的电话簿添加</string>
     <string name="empty_phone_book">您的电话簿是空的</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index e70457723f..15b18f2f38 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2253,7 +2253,6 @@
     <string name="element_disclaimer_content">我們很高興地我們已變更名稱！您的應用程式是最新的，而您也登入了您的帳號。</string>
     <string name="element_disclaimer_negative_button">知道了</string>
     <string name="element_disclaimer_positive_button">取得更多資訊</string>
-    <string name="element_login_splash_brand">element</string>
     <string name="save_recovery_key_chooser_hint">儲存復原金鑰於</string>
     <string name="add_from_phone_book">從我的電話簿新增</string>
     <string name="empty_phone_book">您的電話簿是空的</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 6623567f27..1e079346f6 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3046,9 +3046,6 @@
     <string name="element_disclaimer_negative_button">GOT IT</string>
     <string name="element_disclaimer_positive_button">LEARN MORE</string>
 
-    <string name="element_login_splash_brand">element</string>
-
-
     <string name="save_recovery_key_chooser_hint">Save recovery key in</string>
 
     <string name="add_from_phone_book">Add from my phone book</string>

From 263ad899d83c922e512901210fc57e7cc30f5fd0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 17:26:20 +0100
Subject: [PATCH 182/578] Setup com.likethesalad.android:string-reference to
 have compilation time build of Strings resource with the app_name

---
 build.gradle                                  |   1 +
 vector/build.gradle                           |   1 +
 vector/src/main/res/values-ar/strings.xml     |  22 +--
 .../src/main/res/values-b+sr+Latn/strings.xml |   6 +-
 vector/src/main/res/values-bg/strings.xml     | 106 ++++++-------
 vector/src/main/res/values-bn-rIN/strings.xml |  60 +++----
 vector/src/main/res/values-bs/strings.xml     |  14 +-
 vector/src/main/res/values-ca/strings.xml     | 114 +++++++-------
 vector/src/main/res/values-cs/strings.xml     | 112 ++++++-------
 vector/src/main/res/values-da/strings.xml     |  18 +--
 vector/src/main/res/values-de/strings.xml     | 112 ++++++-------
 vector/src/main/res/values-el/strings.xml     |  10 +-
 vector/src/main/res/values-eo/strings.xml     | 106 ++++++-------
 vector/src/main/res/values-es-rMX/strings.xml |  18 +--
 vector/src/main/res/values-es/strings.xml     | 110 ++++++-------
 vector/src/main/res/values-et/strings.xml     | 112 ++++++-------
 vector/src/main/res/values-eu/strings.xml     |  96 ++++++------
 vector/src/main/res/values-fa/strings.xml     |  96 ++++++------
 vector/src/main/res/values-fi/strings.xml     |  88 +++++------
 vector/src/main/res/values-fr/strings.xml     | 108 ++++++-------
 vector/src/main/res/values-fy/strings.xml     |   2 +-
 vector/src/main/res/values-gl/strings.xml     |   8 +-
 vector/src/main/res/values-he/strings.xml     |  90 +++++------
 vector/src/main/res/values-hr/strings.xml     |  72 ++++-----
 vector/src/main/res/values-hu/strings.xml     | 106 ++++++-------
 vector/src/main/res/values-id/strings.xml     |  54 +++----
 vector/src/main/res/values-in/strings.xml     |  54 +++----
 vector/src/main/res/values-is/strings.xml     |  24 +--
 vector/src/main/res/values-it/strings.xml     | 114 +++++++-------
 vector/src/main/res/values-iw/strings.xml     |  90 +++++------
 vector/src/main/res/values-ja/strings.xml     |  34 ++--
 vector/src/main/res/values-kab/strings.xml    | 108 ++++++-------
 vector/src/main/res/values-ko/strings.xml     |  70 ++++-----
 vector/src/main/res/values-lv/strings.xml     |  18 +--
 vector/src/main/res/values-ml/strings.xml     |   4 +-
 vector/src/main/res/values-nb-rNO/strings.xml |  68 ++++----
 vector/src/main/res/values-nl/strings.xml     |  66 ++++----
 vector/src/main/res/values-nn/strings.xml     |  32 ++--
 vector/src/main/res/values-pl/strings.xml     | 106 ++++++-------
 vector/src/main/res/values-pt-rBR/strings.xml | 114 +++++++-------
 vector/src/main/res/values-pt/strings.xml     |  32 ++--
 vector/src/main/res/values-ru/strings.xml     | 110 ++++++-------
 vector/src/main/res/values-sk/strings.xml     |  74 ++++-----
 vector/src/main/res/values-sq/strings.xml     | 112 ++++++-------
 vector/src/main/res/values-sr/strings.xml     |   2 +-
 vector/src/main/res/values-sv/strings.xml     | 112 ++++++-------
 vector/src/main/res/values-te/strings.xml     |  10 +-
 vector/src/main/res/values-th/strings.xml     |   2 +-
 vector/src/main/res/values-tr/strings.xml     |  70 ++++-----
 vector/src/main/res/values-uk/strings.xml     |  84 +++++-----
 vector/src/main/res/values-vi/strings.xml     |   6 +-
 vector/src/main/res/values-zh-rCN/strings.xml | 110 ++++++-------
 vector/src/main/res/values-zh-rTW/strings.xml | 112 ++++++-------
 vector/src/main/res/values/strings.xml        | 148 ++++++++++++------
 54 files changed, 1789 insertions(+), 1739 deletions(-)

diff --git a/build.gradle b/build.gradle
index b918750a08..ec7ec8c1de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
+        classpath "com.likethesalad.android:string-reference:1.2.1"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/vector/build.gradle b/vector/build.gradle
index dc2a16ccc5..8bcc5bc02b 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -5,6 +5,7 @@ apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'placeholder-resolver'
 
 kapt {
     correctErrorTypes = true
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 0909d85efe..ac07bc890c 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -268,7 +268,7 @@
     <string name="local_address_book_header">دفتر العناوين المحلي</string>
     <string name="matrix_only_filter">متراسلو «ماترِكس» فقط</string>
     <string name="no_conversation_placeholder">لا محادثات</string>
-    <string name="no_contact_access_placeholder">لم تسمح لِ‍ Element بمطالعة متراسليك المحليين</string>
+    <string name="template_no_contact_access_placeholder">لم تسمح لِ‍ Element بمطالعة متراسليك المحليين</string>
     <string name="no_result_placeholder">لا نتائج</string>
     <string name="rooms_header">الغرف</string>
     <string name="rooms_directory_header">دليل الغرف</string>
@@ -683,18 +683,18 @@
     <string name="compression_options">"أرسِل كَ‍ "</string>
     <string name="call_error_ice_failed">فشل اتصال الوسائط</string>
     <string name="call_error_answered_elsewhere">رُدّ على المكالة في مكان آخر</string>
-    <string name="permissions_rationale_msg_storage">يحتاج Element تصريحا منك للوصول إلى مكتبتي الصور والفديو لإرسال المرفقات وحفظها.
+    <string name="template_permissions_rationale_msg_storage">يحتاج Element تصريحا منك للوصول إلى مكتبتي الصور والفديو لإرسال المرفقات وحفظها.
 
 رجاءً اسمح بالوصول في المنبثقة التالية لتقدر على إرسال الملفات من هاتفك.</string>
-    <string name="permissions_rationale_msg_camera">يحتاج Element تصريحا منك للوصول إلى الكمرة لأخذ الصور وللمكالمات الصورية.</string>
-    <string name="permissions_rationale_msg_record_audio">يحتاج Element تصريحا منك للوصول إلى المِكرفون لإجراء المكالمات الصوتية.</string>
+    <string name="template_permissions_rationale_msg_camera">يحتاج Element تصريحا منك للوصول إلى الكمرة لأخذ الصور وللمكالمات الصورية.</string>
+    <string name="template_permissions_rationale_msg_record_audio">يحتاج Element تصريحا منك للوصول إلى المِكرفون لإجراء المكالمات الصوتية.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 رجاءً اسمح بالنفاذ في المنبثقة الآتية لتتمكن من إجراء محادثة.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">يحتاج Element تصريحا منك للوصول إلى الكمرة والمِكرفون لإجراء المكالمات الصورية.
+    <string name="template_permissions_rationale_msg_camera_and_audio">يحتاج Element تصريحا منك للوصول إلى الكمرة والمِكرفون لإجراء المكالمات الصورية.
 
 رجاءً اسمح بالوصول في المنبثقة التالية لتقدر على إرسال إجراء المكالمات الصورية.</string>
-    <string name="permissions_rationale_msg_contacts">يحتاج Element تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
+    <string name="template_permissions_rationale_msg_contacts">يحتاج Element تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
 
 رجاءً اسمح بالوصول في المنبثقة التالية لتستكشف مستخدميك في دفتر العناوين من Element.</string>
     <string name="media_slider_saved">حُفظت</string>
@@ -711,7 +711,7 @@
     <string name="read_receipts_list">قائمة علامات القراءة</string>
     <string name="compression_opt_list_original">الأصلي</string>
     <string name="call_error_user_not_responding">لم يُجب الطرف البعيد.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">يحتاج Element تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
+    <string name="template_permissions_msg_contacts_warning_other_androids">يحتاج Element تصريحا منك للوصول إلى دفتر العناوين للعثور على مستخدمي ماترِكس الآخرين وذلك حسب البريد الإلكتروني ورقم الهاتف.
 
 أتسمح بأن يصل Element إلى متراسليك؟</string>
     <string name="room_participants_header_direct_chats">الدردشات المباشرة</string>
@@ -933,7 +933,7 @@
     <string name="e2e_re_request_encryption_key"><u>أعِد طلب مفاتيح التعمية</u>من أجهزتك الأخرى.</string>
     <string name="e2e_re_request_encryption_key_sent">أُرسل طلب المفتاح.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">أُرسل الطلب</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">رجاءً أطلِق Element في جهاز آخر يقدر على فك تعمية الرسالة ليُرسل المفاتيح إلى هذا الجهاز.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">رجاءً أطلِق Element في جهاز آخر يقدر على فك تعمية الرسالة ليُرسل المفاتيح إلى هذا الجهاز.</string>
     <string name="speak">انطِق</string>
     <string name="clear">امسح</string>
     <string name="room_participants_online">متّصل</string>
@@ -955,8 +955,8 @@
     <string name="startup_notification_privacy_button_grant">امنح التصريح</string>
     <string name="startup_notification_privacy_button_other">اختر خيارا آخر</string>
     <string name="settings_opt_in_of_analytics">أرسِل بيانات التحاليل</string>
-    <string name="settings_opt_in_of_analytics_summary">يجمع Element التحاليل بشكل مجهّل فيتيح لنا ذلك تحسين التطبيق.</string>
-    <string name="settings_opt_in_of_analytics_prompt">رجاءً فعّل التحاليل لمساعدتنا في تحسين Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">يجمع Element التحاليل بشكل مجهّل فيتيح لنا ذلك تحسين التطبيق.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">رجاءً فعّل التحاليل لمساعدتنا في تحسين Element.</string>
     <string name="settings_opt_in_of_analytics_ok">نعم أريد المساعدة!</string>
     <string name="lock_screen_hint">اكتب هنا…</string>
     <string name="widget_integration_missing_parameter">ثمة معامل مطلوب ناقص.</string>
@@ -1018,7 +1018,7 @@
         <item quantity="other">%d محدّدة</item>
     </plurals>
     <string name="settings_preview_media_before_sending">عايِن الوسيط قبل إرساله</string>
-    <string name="startup_notification_privacy_message">يمكن أن يعمل Element في الخلفية ليُدير الإخطارات بأمان وخصوصية (قد يؤثّر هذا على استهلاك البطارية).</string>
+    <string name="template_startup_notification_privacy_message">يمكن أن يعمل Element في الخلفية ليُدير الإخطارات بأمان وخصوصية (قد يؤثّر هذا على استهلاك البطارية).</string>
     <string name="settings_without_flair">لست عضوًا في أي مجتمع حاليًا.</string>
     <plurals name="notification_unread_notified_messages">
         <item quantity="zero">لا رسائل إخطار غير مقروءة</item>
diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml
index ad749f1177..c5f3d3b407 100644
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@@ -178,7 +178,7 @@
     <string name="room_info_room_topic">Tema sobe</string>
 
     <string name="settings_call_category">Pozivi</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Koristi podrazumevani Element zvuk zvona za dolazeće pozive</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Koristi podrazumevani ${app_name} zvuk zvona za dolazeće pozive</string>
     <string name="settings_call_ringtone_title">Zvuk zvona dolazećeg poziva</string>
     <string name="settings_call_ringtone_dialog_title">Izaberite zvuk zvona za pozive:</string>
 
@@ -208,7 +208,7 @@
 
     <string name="settings_troubleshoot_test_service_boot_success">Servis će se početi sa radom prilikom ponovnog pokretanja uređaja.</string>
     <string name="settings_troubleshoot_test_battery_title">Optimizacija potrošnje baterije</string>
-    <string name="settings_troubleshoot_test_battery_success">Optimizacija potrošnje baterije ne utiče na Element.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Optimizacija potrošnje baterije ne utiče na ${app_name}.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoriši optimizacije</string>
 
     <string name="settings_notification_privacy_normal">Normalno</string>
@@ -263,7 +263,7 @@
     <string name="settings_discovery_category">Pronalaženje</string>
     <string name="settings_discovery_manage">Upravljajte vašim podešavanjima za pronalaženje.</string>
     <string name="startup_notification_privacy_title">Privatnost obaveštenja</string>
-    <string name="startup_notification_privacy_message">Element može da radi u pozadini kako bi upravljao vašim obaveštenjima sigurno i privatno. Ovo može da utiče na potrošnju baterije.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} može da radi u pozadini kako bi upravljao vašim obaveštenjima sigurno i privatno. Ovo može da utiče na potrošnju baterije.</string>
     <string name="startup_notification_privacy_button_grant">Dozvoli</string>
     <string name="startup_notification_privacy_button_other">Izaberi drugu opciju</string>
 
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 32b9265f31..e8dc6aa0b4 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -338,7 +338,7 @@
     <string name="user_directory_header">Директория с потребители</string>
     <string name="matrix_only_filter">Само потребители на Matrix</string>
     <string name="no_conversation_placeholder">Няма разговори</string>
-    <string name="no_contact_access_placeholder">Не сте дали достъп на Element до локалните ви контакти</string>
+    <string name="template_no_contact_access_placeholder">Не сте дали достъп на ${app_name} до локалните ви контакти</string>
     <string name="no_result_placeholder">Няма резултати</string>
     <string name="rooms_header">Стаи</string>
     <string name="rooms_directory_header">Директория със стаи</string>
@@ -769,22 +769,22 @@
     <string name="widget_integration_missing_user_id">Липсва user_id в заявката.</string>
     <string name="widget_integration_room_not_visible">Стая %s не е видима.</string>
     <string name="room_add_matrix_apps">Добави Matrix приложения</string>
-    <string name="permissions_rationale_msg_storage">Element иска разрешение за достъп до Вашата галерия със снимки и видеа, за да изпраща и запазва прикачени файлове.
+    <string name="template_permissions_rationale_msg_storage">${app_name} иска разрешение за достъп до Вашата галерия със снимки и видеа, за да изпраща и запазва прикачени файлове.
 \n
 \nМоля, разрешете достъпа от следващия прозорец, който се покаже, за да можете да изпращате файлове от телефона си.</string>
-    <string name="permissions_rationale_msg_camera">Element иска разшерение за достъп до Вашата камера, за да прави снимки или да осъществи видео разговори.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} иска разшерение за достъп до Вашата камера, за да прави снимки или да осъществи видео разговори.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nМоля, разрешете достъпа от следващия прозорец, който ще се покаже, за да можете да се обадите."</string>
-    <string name="permissions_rationale_msg_record_audio">Element иска разшерение за достъп до Вашия микрофон, за да се извърши звуков разговор.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} иска разшерение за достъп до Вашия микрофон, за да се извърши звуков разговор.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nМоля, разрешете достъпа от следващия прозорец, който ще се покаже, за да можете да се обадите."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element иска разширение за достъп до микрофона и камерата Ви, за да извърши видео разговор.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} иска разширение за достъп до микрофона и камерата Ви, за да извърши видео разговор.
 \n
 \nМоля, разрешете достъпа от следващия прозорец, който ще се покаже, за да можете да се обадите.</string>
-    <string name="permissions_rationale_msg_contacts">Element може да провери контактите ви, за да намери други Matrix потребители по имейл или телефонен номер. Ако сте съгласни да споделите списъка с контактите си за тази цел, моля разрешете достъп при предстоящото запитване.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element може да провери контактите ви, за да намери други Matrix потребители по имейл и телефонен номер.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} може да провери контактите ви, за да намери други Matrix потребители по имейл или телефонен номер. Ако сте съгласни да споделите списъка с контактите си за тази цел, моля разрешете достъп при предстоящото запитване.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} може да провери контактите ви, за да намери други Matrix потребители по имейл и телефонен номер.
 \n
 \nРазрешавате ли да се сподели списъка с контакти за тази цел\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Извинете. Операцията не е извършена поради липсващи разрешения за достъп</string>
@@ -907,7 +907,7 @@
     <string name="settings_notification_privacy_nosecure_message_content">• Уведомленията съдържат <b>метаданни и съдържания на съобщения</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Уведомленията <b>няма да показват съдържания на съобщения</b></string>
     <string name="startup_notification_privacy_title">Конфиденциалност на известията</string>
-    <string name="startup_notification_privacy_message">Element може да работи във фонов режим за да получава известия по защитен начин. Може да повлияе на консумацията на енергия.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} може да работи във фонов режим за да получава известия по защитен начин. Може да повлияе на консумацията на енергия.</string>
     <string name="startup_notification_privacy_button_grant">Разреши достъп</string>
     <string name="startup_notification_privacy_button_other">Избери друг вариант</string>
     <string name="settings_notification_privacy">Конфиденциалност на известията</string>
@@ -920,8 +920,8 @@
     <string name="settings_deactivate_account_section">Деактивиране на акаунт</string>
     <string name="settings_deactivate_my_account">Деактивирай акаунта ми</string>
     <string name="settings_opt_in_of_analytics">Изпращане на статистически данни</string>
-    <string name="settings_opt_in_of_analytics_summary">Element събира анонимни статистики за да ни помогне да подобрим приложението.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Моля, включете изпращането на статистики за да ни помогнете да подобрим Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} събира анонимни статистики за да ни помогне да подобрим приложението.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Моля, включете изпращането на статистики за да ни помогнете да подобрим ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Да, искам да помогна!</string>
     <string name="widget_integration_missing_parameter">Липсва задължителен параметър.</string>
     <string name="widget_integration_invalid_parameter">Невалиден параметър.</string>
@@ -943,7 +943,7 @@
     <string name="e2e_re_request_encryption_key"><u>Изисквай повторно ключове за шифроване</u> от другите ми устройства.</string>
     <string name="e2e_re_request_encryption_key_sent">Заявката за ключове беше изпратена.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Изпратена заявка</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Моля стартирайте Element на друго устройство можещо да разшифрова съобщението, за да може то да изпрати ключовете до това устройство.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Моля стартирайте ${app_name} на друго устройство можещо да разшифрова съобщението, за да може то да изпрати ключовете до това устройство.</string>
     <string name="lock_screen_hint">Пишете тук…</string>
     <string name="option_send_voice">Изпрати гласово съобщение</string>
     <string name="go_on_with">продължете с…</string>
@@ -1040,7 +1040,7 @@
     <string name="accept">Приемам</string>
     <string name="auth_accept_policies">Моля прегледайте и приемете политиките на сървъра:</string>
     <string name="settings_call_category">Обаждания</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Използвай мелодията по подразбиране на Element за входящи повиквания</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Използвай мелодията по подразбиране на ${app_name} за входящи повиквания</string>
     <string name="settings_call_ringtone_title">Мелодия за входящо повикване</string>
     <string name="settings_call_ringtone_dialog_title">Избор на мелодия за обаждания:</string>
     <string name="room_participants_action_kick">Изгони</string>
@@ -1081,12 +1081,12 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Разреши</string>
     <string name="settings_troubleshoot_test_device_settings_title">Настройки на устройството.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Уведомленията са разрешени за това устройство.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Уведомленията са забранени за тази сесия.
-\nМоля, проверете настройките на Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Уведомленията са забранени за тази сесия.
+\nМоля, проверете настройките на ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Разреши</string>
     <string name="settings_troubleshoot_test_play_services_title">Проверка на Google Play услугите</string>
     <string name="settings_troubleshoot_test_play_services_success">APK пакет за Google Play услугите е наличен и с актуална версия.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element използва Google Play услугите за да доставя известия за съобщения, но изглежда те не са конфигурирани правилно:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} използва Google Play услугите за да доставя известия за съобщения, но изглежда те не са конфигурирани правилно:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Поправи Google Play услугите</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase токен</string>
@@ -1108,22 +1108,22 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Услугата не успя да се рестартира</string>
     <string name="settings_troubleshoot_test_service_boot_title">Стартирай при старт на системата</string>
     <string name="settings_troubleshoot_test_service_boot_success">Услугата ще стартира когато устройството се рестартира.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Услугата няма да стартира когато устройството се рестартира. Няма да получавате известия докато Element не бъде отворен поне веднъж.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Услугата няма да стартира когато устройството се рестартира. Няма да получавате известия докато ${app_name} не бъде отворен поне веднъж.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Стартирай при старт на системата</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Проверка на фоновите ограничения</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Ограниченията във фонов режим са изключени за Element. Тази проверка трябва да се изпълни използвайки мобилни данни (не на Wi-Fi).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Ограниченията във фонов режим са изключени за ${app_name}. Тази проверка трябва да се изпълни използвайки мобилни данни (не на Wi-Fi).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Активирани са ограничения във фонов режим за Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Активирани са ограничения във фонов режим за ${app_name}.
 \nРаботата, която приложението се опитва да извършва във фонов режим бива агресивно ограничена. Това може да повлияе на известяването.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Премахни ограниченията</string>
     <string name="settings_troubleshoot_test_battery_title">Оптимизация на батерията</string>
-    <string name="settings_troubleshoot_test_battery_success">Element не се влияе от Оптимизация на батерията.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} не се влияе от Оптимизация на батерията.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ако потребител остави устройството неподвижно с изключен екран за известно време, то влиза в режим на заспиване. Това предотвратява приложенията да достъпват мрежата и отлага техните задачи, синхронизации и стандартни аларми.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Игнорирай оптимизацията</string>
     <string name="startup_notification_fdroid_battery_optim_title">Връзка във фонов режим</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element трябва да поддържа ниско-натоварваща връзка във фонов режим, за да може известията да пристигат надеждно.
-\nНа следващия екран, ще бъдете попитани дали да позволите на Element винаги да работи във фонов режим. Моля, приемете.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} трябва да поддържа ниско-натоварваща връзка във фонов режим, за да може известията да пристигат надеждно.
+\nНа следващия екран, ще бъдете попитани дали да позволите на ${app_name} винаги да работи във фонов режим. Моля, приемете.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Разреши</string>
     <string name="account_email_error">Възникна грешка при проверката на имейл адреса Ви.</string>
     <string name="account_phone_number_error">Възникна грешка при проверката на телефонния Ви номер.</string>
@@ -1142,12 +1142,12 @@
     <string name="settings_troubleshoot_test_bing_settings_failed">Някои известия са изключени в собствените Ви настройки.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Неуспешно зареждане на собствените правила. Опитайте пак.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Провери настройките</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nТази грешка е извън контрола на Element. Според Google, грешката показва, че устройството има прекалено много приложения регистрирани към системата за известия FCM. Проблема се случва само в случай на огромен брой приложения, така че не би трябвало да повлияе средно-статистическия потребител.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nТази грешка е извън контрола на Element. Може да се случи поради няколко причини. Възможно е проблема да изчезне, ако опитате по-късно. Също така, може да проверите дали Google Play услугите не са ограничени откъм мобилни данни (вижте системните настройки), или че часовникът на устройството е правилен. Възможно е грешката да възникне и ако използвате модифицирана операционна система (custom ROM).</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nТази грешка е извън контрола на Element. Няма Google акаунт на телефонът. Отворете системата за управления на акаунти и добавете Google акаунт.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nТази грешка е извън контрола на ${app_name}. Според Google, грешката показва, че устройството има прекалено много приложения регистрирани към системата за известия FCM. Проблема се случва само в случай на огромен брой приложения, така че не би трябвало да повлияе средно-статистическия потребител.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nТази грешка е извън контрола на ${app_name}. Може да се случи поради няколко причини. Възможно е проблема да изчезне, ако опитате по-късно. Също така, може да проверите дали Google Play услугите не са ограничени откъм мобилни данни (вижте системните настройки), или че часовникът на устройството е правилен. Възможно е грешката да възникне и ако използвате модифицирана операционна система (custom ROM).</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nТази грешка е извън контрола на ${app_name}. Няма Google акаунт на телефонът. Отворете системата за управления на акаунти и добавете Google акаунт.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Добави акаунт</string>
     <string name="settings_noisy_notifications_preferences">Настройка на шумни известия</string>
     <string name="settings_call_notifications_preferences">Настройка на известия за разговори</string>
@@ -1158,7 +1158,7 @@
     <string name="notification_silent">Безшумно</string>
     <string name="passphrase_empty_error_message">Моля, въведете парола</string>
     <string name="passphrase_passphrase_too_weak">Паролата е прекалено слаба</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Моля, изтрийте паролата, ако искате Element да генерира ключ за възстановяване.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Моля, изтрийте паролата, ако искате ${app_name} да генерира ключ за възстановяване.</string>
     <string name="keys_backup_no_session_error">Не беше открита Matrix сесия</string>
     <string name="keys_backup_setup_step1_title">Никога не губете шифровани съобщения</string>
     <string name="keys_backup_setup_step1_description">Съобщения в шифровани стаи са защитени с шифроване от край до край. Само Вие и получателят (получателите) имате ключовете за прочитането им.
@@ -1287,7 +1287,7 @@
     <string name="passwords_do_not_match">Паролите не съвпадат</string>
     <string name="autodiscover_invalid_response">Невалиден отговор при опит за откриване на адреса на сървъра</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Опции за откриване на сървър</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element откри конфигурация за собствен сървър за домейна от потребителското Ви име \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} откри конфигурация за собствен сървър за домейна от потребителското Ви име \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Използвай конфигурацията</string>
     <string name="notification_sync_init">Инициализиране на услугата</string>
@@ -1403,7 +1403,7 @@
     <string name="please_wait">Изчакайте…</string>
     <string name="group_all_communities">Всички общности</string>
     <string name="room_preview_no_preview">Тази стая не може да бъде прегледана</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Прегледа на стаи четими от цял свят все още не се поддържа от ElementX</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Прегледа на стаи четими от цял свят все още не се поддържа от ${app_name}</string>
     <string name="fab_menu_create_room">Стаи</string>
     <string name="fab_menu_create_chat">Директни съобщения</string>
     <string name="create_room_title">Нова стая</string>
@@ -1498,11 +1498,11 @@
     <string name="invite_no_identity_server_error">Добавете сървър за самоличност в настройки за да извършите това действие.</string>
     <string name="settings_background_fdroid_sync_mode">Режим на фонова синхронизация</string>
     <string name="settings_background_fdroid_sync_mode_battery">Пестящ батерия</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element ще синхронизира във фонов режим по начин, който пести ограничените ресурси на устройството (батерия).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} ще синхронизира във фонов режим по начин, който пести ограничените ресурси на устройството (батерия).
 \nВ зависимост от състоянието на ресурсите, синхронизацията може да бъде отложена от операционната система.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Целящ висока интерактивност</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element ще синхронизира във фонов режим на определен интервал (конфигурируемо).
-\nТова ще повлияе на използването на антената и батерията. Ще се показва перманентна нотификация, че Element слуша за събития.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} ще синхронизира във фонов режим на определен интервал (конфигурируемо).
+\nТова ще повлияе на използването на антената и батерията. Ще се показва перманентна нотификация, че ${app_name} слуша за събития.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Без фонова синхронизация</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Няма да бъдете уведомени за входящи съобщения, когато приложението е във фонов режим.</string>
     <string name="settings_background_sync_update_error">Неуспешно обновяване на настройките.</string>
@@ -1586,13 +1586,13 @@
     <string name="content_reported_as_inappropriate_content">Съдържанието беше докладвано като неподходящо. 
 \n 
 \nАко не искате да виждате повече съдържание от този потребител, може да ги игнорирате за да скриете съобщенията им.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element се нуждае от привилегии за да запази E2E ключовете върху диска.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} се нуждае от привилегии за да запази E2E ключовете върху диска.
 \n
 \nПозволете достъп на следващия екран, за да може в бъдеще да експортирате ключовете си ръчно.</string>
     <string name="no_network_indicator">В момента няма връзка с мрежата</string>
     <string name="login_error_no_homeserver_found">Това не е валиден адрес на Matrix сървър</string>
     <string name="settings_add_3pid_confirm_password_title">Потвърдете паролата</string>
-    <string name="settings_add_3pid_flow_not_supported">Не може да направите това от мобилно приложение на Element</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Не може да направите това от мобилно приложение на ${app_name}</string>
     <string name="settings_add_3pid_authentication_needed">Нужна е автентикация</string>
     <string name="settings_integrations">Интеграции</string>
     <string name="settings_integrations_summary">Използвайте мениджър на интеграции за да управлявате ботове, връзки с други мрежи, приспособления и стикери.
@@ -1759,7 +1759,7 @@
 \nВлезте отново за да достъпите профила и съобщенията си.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Ще загубите достъпа до защитените съобщения, освен ако не влезете за да възстановите ключовете за шифроване.</string>
     <string name="soft_logout_clear_data_dialog_submit">Изчисти данните</string>
-    <string name="soft_logout_sso_not_same_user_error">Текущата сесия е за потребител %1$s, а вие сте въвели данни за вход за %2$s. Element не поддържа това.
+    <string name="template_soft_logout_sso_not_same_user_error">Текущата сесия е за потребител %1$s, а вие сте въвели данни за вход за %2$s. ${app_name} не поддържа това.
 \nПърво изчистете данните, след това влезте отново с друг профил.</string>
     <string name="permalink_malformed">matrix.to връзката ви беше невалидна</string>
     <string name="bug_report_error_too_short">Описанието е прекалено кратко</string>
@@ -1777,7 +1777,7 @@
     <string name="devices_other_devices">Други устройства</string>
     <string name="autocomplete_limited_results">Показване само на първите резултати. Въведете още букви…</string>
     <string name="settings_developer_mode_fail_fast_title">Бърз-провал</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element може да забива по-често когато възникне неочаквана грешка</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} може да забива по-често когато възникне неочаквана грешка</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="event_redacted">Съобщението беше изтрито</string>
@@ -1818,7 +1818,7 @@
     <string name="call_select_sound_device">Избор на звуково устройство</string>
     <string name="call_failed_no_connection_description">Неуспешно установяване на връзка в реално време.
 \nПомолете администратора на сървъра да конфигурира TURN сървър, за да може разговорите да работят надеждно.</string>
-    <string name="call_failed_no_connection">Свързването е неуспешно</string>
+    <string name="template_call_failed_no_connection">Свързването е неуспешно</string>
     <string name="bottom_action_notification">Уведомления</string>
     <string name="dialog_title_success">Успешно</string>
     <string name="action_copy">Копирай</string>
@@ -1860,9 +1860,9 @@
     <string name="verify_cannot_cross_sign">Тази сесия не може да сподели потвърждението с другите ви сесии.
 \nПотвърждението ще се съхрани локално и ще може да бъде споделено в бъдеща версия на приложението.</string>
     <string name="unignore">Махни игнорирането</string>
-    <string name="rendering_event_error_exception">Element срещна проблем опитвайки се да визуализира съдържанието на събитие с идентификатор \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element не може да обработи събитие от тип \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element не може да обработва събития от тип \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} срещна проблем опитвайки се да визуализира съдържанието на събитие с идентификатор \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} не може да обработи събитие от тип \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} не може да обработва събития от тип \'%1$s\'</string>
     <string name="room_member_jump_to_read_receipt">Отиди на последното прочетено съобщение</string>
     <string name="room_member_power_level_custom_in">Собствено ниво (%1$d) в %2$s</string>
     <string name="room_member_power_level_default_in">По подразбиране в %1$s</string>
@@ -2123,7 +2123,7 @@
     <string name="encryption_information_dg_xsigning_complete">Кръстосаното-подписване е включено.
 \nЧастните ключове са на устройството.</string>
     <string name="identity_server_error_outdated_home_server">Операцията е невъзможна. Сървърът е стар.</string>
-    <string name="identity_server_error_outdated_identity_server">Този сървър за идентичност е стар. Element поддържа само API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Този сървър за идентичност е стар. ${app_name} поддържа само API V2.</string>
     <string name="disconnect_identity_server_dialog_content">Прекъснете връзката със сървъра за идентичност %s\?</string>
     <string name="open_terms_of">Отворете условията за %s</string>
     <string name="choose_locale_loading_locales">Зареждане на наличните езици…</string>
@@ -2175,13 +2175,13 @@
     <string name="enter_secret_storage_passphrase_or_key">За да продължите, използвайте %1$s или %2$s.</string>
     <string name="command_description_discard_session_not_handled">Поддържа се само в шифровани стаи</string>
     <string name="command_description_discard_session">Принудително премахва текущата изходяща групова сесия от шифрованата стая</string>
-    <string name="use_latest_app">Използвайте последната версия на Element за устройствата си:</string>
+    <string name="template_use_latest_app">Използвайте последната версия на ${app_name} за устройствата си:</string>
     <string name="or_other_mx_capabale_client">или друг Matrix клиент поддържаш кръстосано-подписване</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="use_other_session_content_description">Използвайте последната версия на Element за устройствата си (Element Web, Element Desktop, Element iOS, Element за Android) или друг Matrix клиент поддържаш кръстосано-подписване</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_use_other_session_content_description">Използвайте последната версия на ${app_name} за устройствата си (${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} за Android) или друг Matrix клиент поддържаш кръстосано-подписване</string>
     <string name="change_password_summary">Промяна на паролата за профила…</string>
     <string name="error_saving_media_file">Неуспешно съхраняване на медиен файл</string>
     <string name="error_adding_media_file_to_gallery">Неуспешно добавяне на медиен файл в галерията</string>
@@ -2293,19 +2293,19 @@
     <string name="refresh">Обнови</string>
     <string name="e2e_use_keybackup">Разблокирай шифрованата история на съобщенията</string>
     <string name="settings_key_requests">Заявки за ключове</string>
-    <string name="login_default_session_public_name">Element за Android</string>
+    <string name="template_login_default_session_public_name">${app_name} за Android</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Ключовете вече са обновени!</string>
     <string name="universal_link_malformed">Връзката беше с грешен формат</string>
     <string name="room_error_not_found">Неуспешно откриване на стаята. Потвърдете, че съществува.</string>
     <string name="error_opening_banned_room">Не можете да отворите стаи, от които сте били блокирани.</string>
     <string name="auth_pin_confirm_to_disable_title">Потвърждение на PIN код, за да изключване на PIN кода</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN код се изисква всеки път когато отворите Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">Изисква се PIN код след 2 минути неизползване на Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">PIN код се изисква всеки път когато отворите ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Изисква се PIN код след 2 минути неизползване на ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Изисквай PIN код след 2 минути</string>
     <string name="settings_security_pin_code_notifications_summary_off">Показвай само броя непрочетени съобщения в опростено уведомление.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Показвай подробности, като имена на стаи и съдържание на съобщенията.</string>
     <string name="settings_security_pin_code_notifications_title">Показвай съдържанието в уведомленията</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN кодът е единственият начин да отключите Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN кодът е единственият начин да отключите ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Включване на биометрични данни поддържани от устройството, като пръстов отпечатък и разпознаване на лица.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Включване на биометрични данни</string>
     <string name="settings_security_pin_code_summary">Ако искате да нулирате PIN кода си, натиснете Забравен PIN код, за да излезете от профила и да го нулирате.</string>
@@ -2386,7 +2386,7 @@
     <string name="identity_server_set_default_notice">Сървърът ви (%1$s) предлага използването на %2$s за сървър за идентичност</string>
     <string name="identity_server_error_no_current_binding_error">Няма асоциация с текущия идентификатор.</string>
     <string name="identity_server_error_binding_error">Асоциацията беше неуспешна.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">За вашата поверителност, Element поддържа изпращането на адреси и телефонни номера на потребители само в хеширан вид.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">За вашата поверителност, ${app_name} поддържа изпращането на адреси и телефонни номера на потребители само в хеширан вид.</string>
     <string name="identity_server_error_terms_not_signed">Първо приемете условията за сървъра за идентичност от Настройки.</string>
     <string name="identity_server_error_no_identity_server_configured">Конфигурирайте сървъра си за идентичност.</string>
     <string name="warning_unsaved_change_discard">Отхвърляне на промените</string>
diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml
index f8030253e9..0fd00b03fe 100644
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@@ -309,7 +309,7 @@
     <string name="user_directory_header">ব্যবহারকারী ডিরেক্টরি</string>
     <string name="matrix_only_filter">শুধুমাত্র ম্যাট্রিক্সের যোগাযোগগুলি</string>
     <string name="no_conversation_placeholder">"কথাবার্তা নেই "</string>
-    <string name="no_contact_access_placeholder">আপনি রায়টকে আপনার স্থানীয় পরিচিতি অ্যাক্সেস করার অনুমতি দেয় নি</string>
+    <string name="template_no_contact_access_placeholder">আপনি রায়টকে আপনার স্থানীয় পরিচিতি অ্যাক্সেস করার অনুমতি দেয় নি</string>
     <string name="no_result_placeholder">কোন ফলাফল নেই</string>
 
     <string name="rooms_header">রুমগুলি</string>
@@ -449,7 +449,7 @@
     <string name="e2e_re_request_encryption_key_sent">চাবির অনুরোধ পাঠানো।</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">অনুরোধ পাঠানো</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">দয়া করে শুরু করুন Element অন্য সেশান যেটা পারে বর্ণনা করতে বার্তা কে সুতরাং এটা পারে পাঠাতে চাবিগুলো কে যন্ত্র তে.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">দয়া করে শুরু করুন ${app_name} অন্য সেশান যেটা পারে বর্ণনা করতে বার্তা কে সুতরাং এটা পারে পাঠাতে চাবিগুলো কে যন্ত্র তে.</string>
 
     <string name="read_receipts_list">পড়ো প্রাপ্তিগুলি সারি</string>
 
@@ -478,7 +478,7 @@
     <string name="room_info_room_topic">ঘরএর বিষয়</string>
 
     <string name="settings_call_category">ডাকা</string>
-    <string name="settings_call_ringtone_use_app_ringtone">ব্যবহার করছেন অনুপস্থিত Element রিংটোন আগামী ডাক এর জন্য</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">ব্যবহার করছেন অনুপস্থিত ${app_name} রিংটোন আগামী ডাক এর জন্য</string>
     <string name="settings_call_ringtone_title">আসা কল এর রিংটোন</string>
     <string name="settings_call_ringtone_dialog_title">নির্বাচন করুন রিংটোন কল আর জন্য:</string>
 
@@ -502,22 +502,22 @@
     <string name="media_picker_cannot_record_video">পারছেন না দৃশ্য নথি করতে</string>
 
     <string name="permissions_rationale_popup_title">তথা</string>
-    <string name="permissions_rationale_msg_storage">Element এর প্রয়াজন অনুমতি নিতে আপনার ছবি এবং দৃশ্য রেকর্ড কে গ্রন্থাগার থেকে পাঠিয়ে জমার জায়গায় সংযুক্ত করতে।
+    <string name="template_permissions_rationale_msg_storage">${app_name} এর প্রয়াজন অনুমতি নিতে আপনার ছবি এবং দৃশ্য রেকর্ড কে গ্রন্থাগার থেকে পাঠিয়ে জমার জায়গায় সংযুক্ত করতে।
 \nদেয়া করে অনুমতি দিন প্রবেশ করতে পরের pop-up কে যেটা সক্ষম আপনার নথি কে আপনার ফোন থেকে পাঠাতে।</string>
-    <string name="permissions_rationale_msg_camera">Element এর প্রয়োজন অনুমতি নিয়ে প্রবেশে করতে আপনার ছবি তোলার যন্ত্র থেকে ছবি নিতে এবং দৃষ্টি রেকর্ড ডাকতে।</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} এর প্রয়োজন অনুমতি নিয়ে প্রবেশে করতে আপনার ছবি তোলার যন্ত্র থেকে ছবি নিতে এবং দৃষ্টি রেকর্ড ডাকতে।</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nদয়াকরে অনুমতি দিন প্রবেশ করাতে পরের পপ -আপ কে যেটা ডাকতে সক্ষম।"</string>
-    <string name="permissions_rationale_msg_record_audio">Element এর প্রয়োজন অনুমতি নিয়ে প্রবেশ করতে আপনার মাইক্রোফোন আর মাধ্যমে শোনার কালএর সঞ্চালনা করতে।</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} এর প্রয়োজন অনুমতি নিয়ে প্রবেশ করতে আপনার মাইক্রোফোন আর মাধ্যমে শোনার কালএর সঞ্চালনা করতে।</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nদেয়া করে অনুমতিদিন প্রবেশ করতে পরের pop-up এ যেটা কল করতে সক্ষম।"</string>
     <string name="notification_sync_init">সেবা আরম্ভ করা হচ্ছে</string>
-    <string name="permissions_rationale_msg_camera_and_audio">ভিডিও কল সম্পাদনের জন্য Element আপনার ক্যামেরা এবং আপনার মাইক্রোফোন অ্যাক্সেস করার অনুমতির প্রয়োজন।
+    <string name="template_permissions_rationale_msg_camera_and_audio">ভিডিও কল সম্পাদনের জন্য ${app_name} আপনার ক্যামেরা এবং আপনার মাইক্রোফোন অ্যাক্সেস করার অনুমতির প্রয়োজন।
 \n
 \nকল করতে সক্ষম হতে পরবর্তী পপ আপ অ্যাক্সেস অনুমতি দিন।</string>
-    <string name="permissions_rationale_msg_contacts">রায়ট অন্যান্য ম্যাট্রিক্স ব্যবহারকারীদের তাদের ইমেল এবং ফোন নম্বরগুলির উপর ভিত্তি করে আপনার ঠিকানা বইটি চেক করতে পারে। আপনি যদি এই উদ্দেশ্যে আপনার ঠিকানা বইটি ভাগ করে নিতে সম্মত হন তবে দয়া করে পরবর্তী পপ-আপটিতে অ্যাক্সেসের অনুমতি দিন।</string>
-    <string name="permissions_msg_contacts_warning_other_androids">রায়ট অন্যান্য ম্যাট্রিক্স ব্যবহারকারীদের তাদের ইমেল এবং ফোন নম্বরগুলির উপর ভিত্তি করে আপনার ঠিকানা বইটি চেক করতে পারে। 
+    <string name="template_permissions_rationale_msg_contacts">রায়ট অন্যান্য ম্যাট্রিক্স ব্যবহারকারীদের তাদের ইমেল এবং ফোন নম্বরগুলির উপর ভিত্তি করে আপনার ঠিকানা বইটি চেক করতে পারে। আপনি যদি এই উদ্দেশ্যে আপনার ঠিকানা বইটি ভাগ করে নিতে সম্মত হন তবে দয়া করে পরবর্তী পপ-আপটিতে অ্যাক্সেসের অনুমতি দিন।</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">রায়ট অন্যান্য ম্যাট্রিক্স ব্যবহারকারীদের তাদের ইমেল এবং ফোন নম্বরগুলির উপর ভিত্তি করে আপনার ঠিকানা বইটি চেক করতে পারে।
 \n
 \nআপনি এই উদ্দেশ্যে আপনার ঠিকানা বই ভাগ করতে সম্মত হন\?</string>
 
@@ -751,8 +751,8 @@
 
     <string name="settings_troubleshoot_test_device_settings_title">সেশান সেটিংস।</string>
     <string name="settings_troubleshoot_test_device_settings_success">বিজ্ঞপ্তি এই সেশানের জন্য সক্রিয় করা হয়েছে।</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">বিজ্ঞপ্তি এই সেশানের জন্য অনুমতি দেওয়া হয় নি। 
-\nElement এর সেটিংস যাচাই করুন।</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">বিজ্ঞপ্তি এই সেশানের জন্য অনুমতি দেওয়া হয় নি।
+\n${app_name} এর সেটিংস যাচাই করুন।</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">সক্ষম</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">কাস্টম সেটিংস।</string>
@@ -763,7 +763,7 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Play Services পরীক্ষা</string>
     <string name="settings_troubleshoot_test_play_services_success">গুগল প্লে সার্ভিসেস APK পাওয়া গেছে এবং আপ টু ডেট রয়েছে।</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element পুশ বার্তার প্রদানের জন্য Google Play পরিষেবাদি ব্যবহার করে কিন্তু এটি সঠিকভাবে কনফিগার করা বলে মনে হচ্ছে না:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} পুশ বার্তার প্রদানের জন্য Google Play পরিষেবাদি ব্যবহার করে কিন্তু এটি সঠিকভাবে কনফিগার করা বলে মনে হচ্ছে না:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play Services ঠিক করুন</string>
 
@@ -772,12 +772,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM টোকেন উদ্ধার করতে ব্যর্থ হয়েছে:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nএই ত্রুটিটি Element এর নিয়ন্ত্রণের বাইরে এবং Google এর মতে, এই ত্রুটিটি ইঙ্গিত করে যে ডিভাইসটিতে FCM এর সাথে নিবন্ধিত অনেকগুলি অ্যাপ্লিকেশন রয়েছে। ত্রুটিগুলি কেবলমাত্র অ্যাপ্লিকেশনের চরম সংখ্যাগুলিতে ঘটে থাকে, তাই এটি গড় ব্যবহারকারীকে প্রভাবিত করবে না।</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s] 
-\nএই ত্রুটি Element এর নিয়ন্ত্রণের বাইরে। এটা বিভিন্ন কারণে ঘটতে পারে। আপনি পরে পুনরায় চেষ্টা করলে হয়তো এটি কাজ করবে, আপনি এটিও পরীক্ষা করতে পারেন যে Google Play পরিষেবাটি সিস্টেম সেটিংসে ডেটা ব্যবহারের ক্ষেত্রে সীমাবদ্ধ নয়, অথবা আপনার ডিভাইসের ঘড়ি সঠিক, বা এটি কাস্টম রমতে ঘটতে পারে।</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nএই ত্রুটি Element এর নিয়ন্ত্রণের বাইরে। ফোনে কোন গুগল একাউন্ট নেই। অ্যাকাউন্ট ম্যানেজার খুলুন এবং একটি গুগল একাউন্ট যোগ করুন।</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nএই ত্রুটিটি ${app_name} এর নিয়ন্ত্রণের বাইরে এবং Google এর মতে, এই ত্রুটিটি ইঙ্গিত করে যে ডিভাইসটিতে FCM এর সাথে নিবন্ধিত অনেকগুলি অ্যাপ্লিকেশন রয়েছে। ত্রুটিগুলি কেবলমাত্র অ্যাপ্লিকেশনের চরম সংখ্যাগুলিতে ঘটে থাকে, তাই এটি গড় ব্যবহারকারীকে প্রভাবিত করবে না।</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nএই ত্রুটি ${app_name} এর নিয়ন্ত্রণের বাইরে। এটা বিভিন্ন কারণে ঘটতে পারে। আপনি পরে পুনরায় চেষ্টা করলে হয়তো এটি কাজ করবে, আপনি এটিও পরীক্ষা করতে পারেন যে Google Play পরিষেবাটি সিস্টেম সেটিংসে ডেটা ব্যবহারের ক্ষেত্রে সীমাবদ্ধ নয়, অথবা আপনার ডিভাইসের ঘড়ি সঠিক, বা এটি কাস্টম রমতে ঘটতে পারে।</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nএই ত্রুটি ${app_name} এর নিয়ন্ত্রণের বাইরে। ফোনে কোন গুগল একাউন্ট নেই। অ্যাকাউন্ট ম্যানেজার খুলুন এবং একটি গুগল একাউন্ট যোগ করুন।</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">একাউন্ট যোগ করুন</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">টোকেন নিবন্ধন</string>
@@ -797,19 +797,19 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">বুট করার সময় শুরু</string>
     <string name="settings_troubleshoot_test_service_boot_success">ডিভাইসটি পুনরায় চালু হলে পরিষেবা শুরু হবে।</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">ডিভাইসটি পুনরায় চালু হওয়ার সময় পরিষেবাটি শুরু হবে না, আপনি একবার Element টি খোলা না হওয়া পর্যন্ত বিজ্ঞপ্তি পাবেন না।</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">ডিভাইসটি পুনরায় চালু হওয়ার সময় পরিষেবাটি শুরু হবে না, আপনি একবার ${app_name} টি খোলা না হওয়া পর্যন্ত বিজ্ঞপ্তি পাবেন না।</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">বুট থেকে শুরু করা সক্রিয় করুন</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">ব্যাকগ্রাউন্ড এর সীমাবদ্ধতা চেক করুন</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">ব্যাকগ্রউন্ডের সীমাবদ্ধতা Element এর জন্য নিষ্ক্রিয় করা হয়েছে। এই পরীক্ষা মোবাইল ডেটা ব্যবহার করে চালানো উচিত (ওয়াইফাই না)।
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">ব্যাকগ্রউন্ডের সীমাবদ্ধতা ${app_name} এর জন্য নিষ্ক্রিয় করা হয়েছে। এই পরীক্ষা মোবাইল ডেটা ব্যবহার করে চালানো উচিত (ওয়াইফাই না)।
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">ব্যাকগ্রউন্ডের সীমাবদ্ধতা রিমোট এর জন্য সক্রিয় করা হয়েছে।
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">ব্যাকগ্রউন্ডের সীমাবদ্ধতা রিমোট এর জন্য সক্রিয় করা হয়েছে।
 \nঅ্যাপ্লিকেশন যেটি করার চেষ্টা করে সেটি ব্যাকগ্রাউন্ডে থাকা অবস্থায় আক্রমনাত্মকভাবে সীমিত হবে এবং এটি বিজ্ঞপ্তিগুলিতে প্রভাবিত হতে পারে।
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">সীমাবদ্ধগুলি নিষ্ক্রিয়</string>
 
     <string name="settings_troubleshoot_test_battery_title">ব্যাটারি অপ্টিমাইজেশান</string>
-    <string name="settings_troubleshoot_test_battery_success">Element ব্যাটারি অপ্টিমাইজেশান দ্বারা প্রভাবিত হয় না।</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} ব্যাটারি অপ্টিমাইজেশান দ্বারা প্রভাবিত হয় না।</string>
     <string name="settings_troubleshoot_test_battery_failed">যদি কোনও ব্যবহারকারী কোনও ডিভাইসটিকে নির্দিষ্ট সময়ের জন্য আনপ্লাগ এবং স্থিতিশীল রাখে তবে স্ক্রীন বন্ধের সাথে ডিভাইসটি ডোজ মোডে প্রবেশ করে। এটি অ্যাপ্লিকেশানগুলিকে নেটওয়ার্ক অ্যাক্সেস করতে বাধা দেয় এবং তাদের কাজ, সিঙ্ক এবং মান অ্যালার্মগুলি স্থগিত করে।</string>
     <string name="settings_troubleshoot_test_battery_quickfix">"অপ্টিমাইজেশান অবহেলা "</string>
 
@@ -937,19 +937,19 @@
     <string name="settings_deactivate_my_account">আমার একাউন্ট নিষ্ক্রিয় করুন</string>
 
     <string name="startup_notification_privacy_title">বিজ্ঞপ্তি\'র গোপনীয়তা</string>
-    <string name="startup_notification_privacy_message">সুরক্ষিতভাবে এবং ব্যক্তিগতভাবে আপনার বিজ্ঞপ্তি পরিচালনা করতে Element পটভূমিতে চালাতে পারে। এই ব্যাটারি ব্যবহার প্রভাবিত হতে পারে।</string>
+    <string name="template_startup_notification_privacy_message">সুরক্ষিতভাবে এবং ব্যক্তিগতভাবে আপনার বিজ্ঞপ্তি পরিচালনা করতে ${app_name} পটভূমিতে চালাতে পারে। এই ব্যাটারি ব্যবহার প্রভাবিত হতে পারে।</string>
     <string name="startup_notification_privacy_button_grant">অনুমতি প্রদান করুন</string>
     <string name="startup_notification_privacy_button_other">অন্য বিকল্প চয়ন করুন</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">পটভূমি সংযোগ</string>
-    <string name="startup_notification_fdroid_battery_optim_message">নির্ভরযোগ্য বিজ্ঞপ্তি পেতে Element কম প্রভাব ব্যাকগ্রাউন্ড সংযোগ রাখা প্রয়োজন।
+    <string name="template_startup_notification_fdroid_battery_optim_message">নির্ভরযোগ্য বিজ্ঞপ্তি পেতে ${app_name} কম প্রভাব ব্যাকগ্রাউন্ড সংযোগ রাখা প্রয়োজন।
 \nপরবর্তী স্ক্রিনে আপনাকে দাঙ্গাটি সর্বদা ব্যাকগ্রাউন্ডে চালানোর অনুমতি দেওয়া হবে, দয়া করে স্বীকার করুন।</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">অনুমতি প্রদান করুন</string>
 
     <string name="settings_analytics">বৈশ্লেষিক ন্যায়</string>
     <string name="settings_opt_in_of_analytics">বিশ্লেষণ তথ্য পাঠান</string>
-    <string name="settings_opt_in_of_analytics_summary">Element আমাদের অ্যাপ্লিকেশন উন্নত করার অনুমতি দেওয়ার জন্য বেনামী বিশ্লেষণ সংগ্রহ করে।</string>
-    <string name="settings_opt_in_of_analytics_prompt">আমাদের Element উন্নত করতে সাহায্য করার জন্য বিশ্লেষণ সক্রিয় করুন।</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} আমাদের অ্যাপ্লিকেশন উন্নত করার অনুমতি দেওয়ার জন্য বেনামী বিশ্লেষণ সংগ্রহ করে।</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">আমাদের ${app_name} উন্নত করতে সাহায্য করার জন্য বিশ্লেষণ সক্রিয় করুন।</string>
     <string name="settings_opt_in_of_analytics_ok">হ্যাঁ, আমি সাহায্য করতে চাই!</string>
 
     <string name="settings_data_save_mode">ডেটা সংরক্ষণ মোড</string>
@@ -1289,10 +1289,10 @@
 
     <string name="settings_background_fdroid_sync_mode">পটভূমি সিঙ্ক মোড (পরীক্ষামূলক)</string>
     <string name="settings_background_fdroid_sync_mode_battery">ব্যাটারির জন্য অনুকূলিত</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">রায়ট এমনভাবে পটভূমিতে সিঙ্ক হবে যা ডিভাইসের সীমিত সংস্থান (ব্যাটারি) সংরক্ষণ করে।
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">রায়ট এমনভাবে পটভূমিতে সিঙ্ক হবে যা ডিভাইসের সীমিত সংস্থান (ব্যাটারি) সংরক্ষণ করে।
 \nআপনার ডিভাইস রিসোর্স স্থিতির উপর নির্ভর করে সিঙ্কটি অপারেটিং সিস্টেম দ্বারা পিছিয়ে যেতে পারে।</string>
     <string name="settings_background_fdroid_sync_mode_real_time">রিয়েল টাইম জন্য অনুকূলিত</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">রায়ট নির্দিষ্ট সময়ে সময়ে পটভূমিতে সিঙ্ক হবে (কনফিগারযোগ্য)।
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">রায়ট নির্দিষ্ট সময়ে সময়ে পটভূমিতে সিঙ্ক হবে (কনফিগারযোগ্য)।
 \nএটি রেডিও এবং ব্যাটারির ব্যবহারকে প্রভাবিত করবে, রায়ট ইভেন্টগুলি শুনছে বলে জানিয়ে একটি স্থায়ী বিজ্ঞপ্তি প্রদর্শিত হবে।</string>
     <string name="settings_background_fdroid_sync_mode_disabled">কোনও পটভূমি সিঙ্ক না</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">অ্যাপটি ব্যাকগ্রাউন্ডে থাকা অবস্থায় আপনাকে আগত বার্তাগুলি সম্পর্কে অবহিত করা হবে না।</string>
@@ -1436,7 +1436,7 @@
     <string name="dialog_title_success">সাফল্য</string>
 
     <string name="bottom_action_notification">বিজ্ঞপ্তিগুলি</string>
-    <string name="call_failed_no_connection">এলিমেন্ট কল ব্যর্থ</string>
+    <string name="template_call_failed_no_connection">এলিমেন্ট কল ব্যর্থ</string>
     <string name="call_failed_no_connection_description">রিয়েল টাইম সংযোগ স্থাপন করতে ব্যর্থ।
 \nকলগুলি নির্ভরযোগ্যতার সাথে কাজ করার জন্য দয়া করে আপনার হোমসার্ভারের প্রশাসককে একটি টার্ন সার্ভার কনফিগার করতে বলুন।</string>
 
@@ -1533,7 +1533,7 @@
     <string name="passphrase_empty_error_message">দয়া করে একটি পাসফ্রেজ লিখুন</string>
     <string name="passphrase_passphrase_too_weak">পাসফ্রেজটি খুব দুর্বল</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">আপনি যদি এলিমেন্টটি পুনরুদ্ধার কী তৈরি করতে চান তবে দয়া করে পাসফ্রেজটি মুছুন।</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">আপনি যদি এলিমেন্টটি পুনরুদ্ধার কী তৈরি করতে চান তবে দয়া করে পাসফ্রেজটি মুছুন।</string>
     <string name="keys_backup_no_session_error">কোনও ম্যাট্রিক্স সেশন উপলব্ধ নেই</string>
 
     <string name="keys_backup_setup_step1_title">এনক্রিপ্ট করা বার্তাগুলি কখনই হারাবেন না</string>
diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml
index 691d439f45..8628a56a26 100644
--- a/vector/src/main/res/values-bs/strings.xml
+++ b/vector/src/main/res/values-bs/strings.xml
@@ -76,7 +76,7 @@
     <string name="user_directory_header">Imenik korisnika</string>
     <string name="matrix_only_filter">Samo matriks kontakti</string>
     <string name="no_conversation_placeholder">Nema razgovora</string>
-    <string name="no_contact_access_placeholder">Niste omogućili Elementu pristup vašim lokalnim kontaktima</string>
+    <string name="template_no_contact_access_placeholder">Niste omogućili ${app_name}u pristup vašim lokalnim kontaktima</string>
     <string name="no_result_placeholder">Nema rezultata</string>
     <string name="rooms_header">Sobe</string>
     <string name="rooms_directory_header">Imenik soba</string>
@@ -200,24 +200,24 @@ Odjavljeni ste sa svih uređaja i više nećete primati obavijesti. Da biste pon
     <string name="media_picker_both_capture_title">Snimi fotografiju ili video</string>
     <string name="media_picker_cannot_record_video">Nije moguće snimiti video</string>
     <string name="permissions_rationale_popup_title">Informacije</string>
-    <string name="permissions_rationale_msg_storage">Hepek treba dopuštenje za pristup vašoj biblioteci fotografija i videozapisa za slanje i spremanje privitaka.
+    <string name="template_permissions_rationale_msg_storage">Hepek treba dopuštenje za pristup vašoj biblioteci fotografija i videozapisa za slanje i spremanje privitaka.
 
 Omogućite pristup sljedećem skočnom prozoru da biste mogli slati datoteke sa telefona.</string>
-    <string name="permissions_rationale_msg_camera">Hepek treba dopuštenje za pristup vašoj kameri za snimanje fotografija i videopoziva.</string>
+    <string name="template_permissions_rationale_msg_camera">Hepek treba dopuštenje za pristup vašoj kameri za snimanje fotografija i videopoziva.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Omogućite pristup sljedećem pop-upu kako biste mogli uputiti poziv.</string>
-    <string name="permissions_rationale_msg_record_audio">Hepek traži dopuštenje za pristup mikrofonu za obavljanje audio poziva.</string>
+    <string name="template_permissions_rationale_msg_record_audio">Hepek traži dopuštenje za pristup mikrofonu za obavljanje audio poziva.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Omogućite pristup sljedećem pop-upu kako biste mogli uputiti poziv.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Hepek treba dopuštenje za pristup vašoj kemeri i mikrofonu za obavljanje video poziva.
+    <string name="template_permissions_rationale_msg_camera_and_audio">Hepek treba dopuštenje za pristup vašoj kemeri i mikrofonu za obavljanje video poziva.
 
 Omogućite pristup sljedećim skočnim prozorima da biste mogli uspostaviti poziv.</string>
-    <string name="permissions_rationale_msg_contacts">Hepek treba dopuštenje za pristup kontaktima kako bi pronašao druge Matrix korisnike na temelju njihove email adrese i telefonskih brojeva.
+    <string name="template_permissions_rationale_msg_contacts">Hepek treba dopuštenje za pristup kontaktima kako bi pronašao druge Matrix korisnike na temelju njihove email adrese i telefonskih brojeva.
 
 Dopustite pristup sljedećem skočnom prozoru da biste otkrili kontakte koji koriste Hepek.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Hepek treba dopuštenje za pristup kontaktima kako bi pronašao druge Matrix korisnike na temelju njihove email adrese i telefonskih brojeva.
+    <string name="template_permissions_msg_contacts_warning_other_androids">Hepek treba dopuštenje za pristup kontaktima kako bi pronašao druge Matrix korisnike na temelju njihove email adrese i telefonskih brojeva.
 
 Želite li dopustiti da Hepek pristupi vašim kontaktima?</string>
     <string name="permissions_action_not_performed_missing_permissions">Nažalost, akcija nije izvršena zbog nedostatka dozvola</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index eca0fb2614..7c09c778c5 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -348,7 +348,7 @@
     <string name="user_directory_header">Directori d\'usuari</string>
     <string name="matrix_only_filter">Només contactes de Matrix</string>
     <string name="no_conversation_placeholder">No hi ha xats</string>
-    <string name="no_contact_access_placeholder">No has donat permís a Element perquè pugui accedir als teus contactes locals</string>
+    <string name="template_no_contact_access_placeholder">No has donat permís a ${app_name} perquè pugui accedir als teus contactes locals</string>
     <string name="no_result_placeholder">Sense resultats</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Sales</string>
@@ -498,24 +498,24 @@
     <string name="media_picker_cannot_record_video">No es poden gravar vídeos"</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informació</string>
-    <string name="permissions_rationale_msg_storage">Per poder enviar i desar fitxers adjunts, Element necessita permís per accedir a la galeria de fotos i vídeos.
+    <string name="template_permissions_rationale_msg_storage">Per poder enviar i desar fitxers adjunts, ${app_name} necessita permís per accedir a la galeria de fotos i vídeos.
 \n
 \nPermet-li l\'accés en la següent finestra emergent per poder enviar fitxers des del mòbil.</string>
-    <string name="permissions_rationale_msg_camera">Per poder fer fotos i videotrucades, Element necessita permís per accedir a la càmera.</string>
+    <string name="template_permissions_rationale_msg_camera">Per poder fer fotos i videotrucades, ${app_name} necessita permís per accedir a la càmera.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nPermet-li l\'accés en la següent finestra emergent per tal de poder fer la trucada."</string>
-    <string name="permissions_rationale_msg_record_audio">Per tal de fer trucades de veu, Element necessita permís per accedir al micròfon.</string>
+    <string name="template_permissions_rationale_msg_record_audio">Per tal de fer trucades de veu, ${app_name} necessita permís per accedir al micròfon.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nPermet-li l\'accés en la següent finestra emergent per tal de poder fer la trucada."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Per tal de fer videotrucades, Element necessita permís per accedir a la càmera i al micròfon.
+    <string name="template_permissions_rationale_msg_camera_and_audio">Per tal de fer videotrucades, ${app_name} necessita permís per accedir a la càmera i al micròfon.
 \n
 \nPermet-li l\'accés en la següent finestra emergent per tal de poder fer la trucada.</string>
-    <string name="permissions_rationale_msg_contacts">Element pot revisar la teva llista de contactes per tal de trobar altres usuaris de Matrix basant-se en les seves adreces de correu i números de telèfon. Si acceptes compartir la teva llista de contactes amb aquesta finalitat, permet l\'accés en la següent finestra emergent.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Per tal de trobar altres usuaris de Matrix a partir dels seus correus o dels seus números de telèfon, Element necessita permís d\'accés a la llista de contactes.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} pot revisar la teva llista de contactes per tal de trobar altres usuaris de Matrix basant-se en les seves adreces de correu i números de telèfon. Si acceptes compartir la teva llista de contactes amb aquesta finalitat, permet l\'accés en la següent finestra emergent.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">Per tal de trobar altres usuaris de Matrix a partir dels seus correus o dels seus números de telèfon, ${app_name} necessita permís d\'accés a la llista de contactes.
 \n
-\nPermets que Element accedeixi als teus contactes amb aquesta finalitat\?</string>
+\nPermets que ${app_name} accedeixi als teus contactes amb aquesta finalitat\?</string>
     <string name="permissions_action_not_performed_missing_permissions">No s\'ha realitzat l\'acció per falta de permisos</string>
     <!-- medias slider string -->
     <string name="media_slider_saved">Desat</string>
@@ -1020,7 +1020,7 @@
     <string name="e2e_re_request_encryption_key">Tornar a demanar les claus de xifrat de les teves altres sessions.</string>
     <string name="e2e_re_request_encryption_key_sent">Petició de clau enviada.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Sol·licitud enviada</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Si us plau, obre Element a un altre dispositiu que pugui desxifrar el missatge de manera que pugui enviar les claus a aquesta sessió.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Si us plau, obre ${app_name} a un altre dispositiu que pugui desxifrar el missatge de manera que pugui enviar les claus a aquesta sessió.</string>
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="missing_permissions_error">No es pot dur a terme aquesta acció per falta de permisos.</string>
     <string name="dialog_title_error">Error</string>
@@ -1069,12 +1069,12 @@
     <string name="settings_deactivate_account_section">Desactivar el compte</string>
     <string name="settings_deactivate_my_account">Desactivar el meu compte</string>
     <string name="startup_notification_privacy_title">Notificació de privacitat</string>
-    <string name="startup_notification_privacy_message">El Element pot funcionar en segon pla per gestionar les vostres notificacions de forma segura i privada. Això podria afectar el consum de bateria.</string>
+    <string name="template_startup_notification_privacy_message">El ${app_name} pot funcionar en segon pla per gestionar les vostres notificacions de forma segura i privada. Això podria afectar el consum de bateria.</string>
     <string name="startup_notification_privacy_button_grant">Concedir permís</string>
     <string name="startup_notification_privacy_button_other">Escolliu una altra opció</string>
     <string name="settings_opt_in_of_analytics">Envia dades d\'anàlisi</string>
-    <string name="settings_opt_in_of_analytics_summary">Element recopila dades d\'anàlisi anònimes per tal de permetre millorar l\'aplicació.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Si us plau, activa les dades d\'anàlisi per ajudar-nos a millorar Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} recopila dades d\'anàlisi anònimes per tal de permetre millorar l\'aplicació.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Si us plau, activa les dades d\'anàlisi per ajudar-nos a millorar ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Sí, vull ajudar!</string>
     <string name="settings_without_flair">Ara mateix no ets membre de cap comunitat.</string>
     <string name="encryption_export_notice">Crea una frase per xifrar les claus exportades. Hauràs d\'introduir la mateixa frase per poder importar les claus.</string>
@@ -1140,7 +1140,7 @@
     <string name="merged_events_collapse">plega</string>
     <string name="accept">Accepta</string>
     <string name="settings_call_category">Trucada</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Utilitza el to de trucada d\'Element predeterminat per trucades entrants</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Utilitza el to de trucada d\'${app_name} predeterminat per trucades entrants</string>
     <string name="settings_call_ringtone_title">To de trucada entrant</string>
     <string name="settings_call_ringtone_dialog_title">Tria el to per les trucades:</string>
     <string name="room_participants_action_kick">Expulsa</string>
@@ -1181,12 +1181,12 @@
     <string name="settings_troubleshoot_test_service_boot_title">Inicia\'l a l\'arrencada</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Inhabilita les restriccions</string>
     <string name="settings_troubleshoot_test_battery_title">Optimització de bateria</string>
-    <string name="settings_troubleshoot_test_battery_success">El Element no està afectat per l\'optimització de bateria.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">El ${app_name} no està afectat per l\'optimització de bateria.</string>
     <string name="settings_show_join_leave_messages">Mostra els esdeveniments d\'unió i sortida</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Inclou els canvis d\'icona i d\'àlies.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Connexió al rerefons</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Per poder obtenir notificacions fiables, Element necessita mantenir una connexió en segon pla de baixa incidència.
-\nA la pantalla següent se\'t demanarà que permetis a Element executar-se sempre en segon pla, si us plau, accepta-ho.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">Per poder obtenir notificacions fiables, ${app_name} necessita mantenir una connexió en segon pla de baixa incidència.
+\nA la pantalla següent se\'t demanarà que permetis a ${app_name} executar-se sempre en segon pla, si us plau, accepta-ho.</string>
     <string name="settings_password">Contrasenya</string>
     <string name="account_additional_info">Informació addicional: %s</string>
     <string name="markdown_has_been_enabled">S\'ha habilitat el Markdown.</string>
@@ -1211,8 +1211,8 @@
     <string name="settings_notification_troubleshoot">Diagnostica les notificacions</string>
     <string name="settings_troubleshoot_diagnostic">Diagnòstic de la resolució de problemes</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Ha fallat una o més proves, envia un informe d\'errors per ajudar-nos a investigar-ho.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Les notificacions per aquesta sessió no estan activades.
-\nComprova la configuració d\'Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Les notificacions per aquesta sessió no estan activades.
+\nComprova la configuració d\'${app_name}.</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Configuració personalitzada.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Tingues en compte que alguns tipus de missatge estan configurats per ser silenciosos (es produirà una notificació sense so).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Algunes notificacions estan desactivades a la configuració personalitzada.</string>
@@ -1220,15 +1220,15 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Comprova la configuració</string>
     <string name="settings_troubleshoot_test_play_services_title">Comprovació dels serveis de Play</string>
     <string name="settings_troubleshoot_test_play_services_success">L\'APK dels Serveis de Google Play està disponible i està actualitzada.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element utilitza els serveis de Google Play per lliurar missatges però sembla que no està configurat correctament:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} utilitza els serveis de Google Play per lliurar missatges però sembla que no està configurat correctament:
 \n %1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">Token de Firebase</string>
     <string name="settings_troubleshoot_test_fcm_success">Token FCM obtingut correctament:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">No s\'ha pogut obtenir el token FCM:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nAquest error està fora del control d\'Element i, segons Google, aquest error indica que aquest dispositiu té massa aplicacions registrades amb FCM. L\'error només ocorre en casos en què hi ha un nombre extrem d\'aplicacions i, per tant, no hauria d\'afectar els usuari normals.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nAquest error està fora del control d\'${app_name} i, segons Google, aquest error indica que aquest dispositiu té massa aplicacions registrades amb FCM. L\'error només ocorre en casos en què hi ha un nombre extrem d\'aplicacions i, per tant, no hauria d\'afectar els usuari normals.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Afegeix un compte</string>
     <string name="settings_troubleshoot_test_token_registration_title">Registre de token</string>
     <string name="settings_troubleshoot_test_token_registration_success">El token FCM s\'ha registrat correctament al servidor local.</string>
@@ -1238,7 +1238,7 @@
     <string name="settings_troubleshoot_test_service_restart_success">El servei s\'ha parat i tornat a iniciar automàticament.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">No s\'ha pogut iniciar el servei</string>
     <string name="settings_troubleshoot_test_service_boot_success">El servei s\'iniciarà quan es reiniciï el dispositiu.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">El servei no s\'iniciarà quan el dispositiu es reiniciï, per tant, no rebràs notificacions fins que Element no s\'hagi obert per primera vegada.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">El servei no s\'iniciarà quan el dispositiu es reiniciï, per tant, no rebràs notificacions fins que ${app_name} no s\'hagi obert per primera vegada.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Habilita l\'inici durant l\'arrencada</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Comprova les restriccions del rerefons</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignora l\'optimització</string>
@@ -1259,7 +1259,7 @@
     <string name="notification_silent">Silenciós</string>
     <string name="passphrase_empty_error_message">Introduïu una frase de pas</string>
     <string name="passphrase_passphrase_too_weak">La frase de pas és massa feble</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Suprimiu la frase si vols que Element generi una clau de recuperació.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Suprimiu la frase si vols que ${app_name} generi una clau de recuperació.</string>
     <string name="keys_backup_no_session_error">No hi ha cap sessió de Matrix disponible</string>
     <string name="keys_backup_setup_step1_title">No perdeu mai els missatges xifrats</string>
     <string name="keys_backup_setup_step1_description">Els missatges en sales xifrades estan protegits amb xifrat d\'extrem a extrem. Només tu i el/s destinatari/s teniu les claus per poder llegir aquests missatges.
@@ -1287,13 +1287,13 @@
     <string name="keys_backup_restore_key_enter_hint">Introdueix la clau de recuperació</string>
     <string name="keys_backup_restore_setup_recovery_key">Recuperació de missatges</string>
     <string name="keys_backup_restore_with_key_helper">Has perdut la clau de recuperació\? Pots configurar-ne una de nova a la configuració.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nAquest error està fora del control d\'Element. Pot ser causat per diferents motius. És possible que torni a funcionar més endavant. També pots comprovar, a la configuració del sistema, que els Serveis de Google Play no tinguin cap restricció de dades o que l\'hora del dispositiu sigui la correcta. També pot passar si tens una ROM personalitzada.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nAquest error està fora del control d\'Element. No hi ha cap compte de Google al telèfon. Vés a la configuració de comptes i afegeix un compte de Google.</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Les restriccions en segon pla per a Element estan desactivades. Aquesta prova s\'hauria de fer emprant dades mòbils (sense WiFi).
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nAquest error està fora del control d\'${app_name}. Pot ser causat per diferents motius. És possible que torni a funcionar més endavant. També pots comprovar, a la configuració del sistema, que els Serveis de Google Play no tinguin cap restricció de dades o que l\'hora del dispositiu sigui la correcta. També pot passar si tens una ROM personalitzada.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nAquest error està fora del control d\'${app_name}. No hi ha cap compte de Google al telèfon. Vés a la configuració de comptes i afegeix un compte de Google.</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Les restriccions en segon pla per a ${app_name} estan desactivades. Aquesta prova s\'hauria de fer emprant dades mòbils (sense WiFi).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Les restriccions en segon pla per a Element estan activades.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Les restriccions en segon pla per a ${app_name} estan activades.
 \nLes tasques que l\'aplicació intenta fer en segon pla estaran força restringides, això pot afectar a les notificacions.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_battery_failed">Si un usuari deixa un dispositiu amb la pantalla apagada, desendollat i quiet durant un període de temps, el dispositiu entra en el mode repòs. Això impedeix que les aplicacions accedeixin a la xarxa i n\'ajorna les seves tasques, sincronitzacions i alarmes estàndard.</string>
@@ -1446,7 +1446,7 @@
     <string name="keys_backup_setup_override_stop">Aturar</string>
     <string name="keys_backup_settings_checking_backup_state">Comprovant l\'estat de la còpia de seguretat</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Opcions de compleció automàtica del servidor</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element ha detectat una configuració de servidor personalitzada pel teu domini d\'ID d\'usuari \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} ha detectat una configuració de servidor personalitzada pel teu domini d\'ID d\'usuari \"%1$s\":
 \n%2$s</string>
     <string name="invalid_or_expired_credentials">Se t\'ha desconnectat a causa de credencials incorrectes o caducades.</string>
     <string name="sas_verify_title">Verificar comparant una cadena de text curta.</string>
@@ -1517,7 +1517,7 @@
     <string name="please_wait">Espereu, si us plau…</string>
     <string name="group_all_communities">Totes les comunitats</string>
     <string name="room_preview_no_preview">Aquesta sala no es pot pre-visualitzar</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Element encara no admet la pre-visualització de les sales llegibles per tothom</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name} encara no admet la pre-visualització de les sales llegibles per tothom</string>
     <string name="fab_menu_create_room">Sales</string>
     <string name="fab_menu_create_chat">Xats personals</string>
     <string name="create_room_title">Sala nova</string>
@@ -1541,7 +1541,7 @@
     <string name="room_participants_kick_title">Expulsa usuari</string>
     <string name="error_sso_flow_not_supported_yet">Aquesta operació encara no està disponible en comptes que utilitzen la inscripció única (SSO).</string>
     <string name="login_signin_sso">Continua amb SSO</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Per a la teva pròpia privadesa, Element només admet l\'enviament del \"hash\" de correus electrònics i números de telèfon.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Per a la teva pròpia privadesa, ${app_name} només admet l\'enviament del \"hash\" de correus electrònics i números de telèfon.</string>
     <string name="command_description_discard_session_not_handled">Només admès en sales xifrades</string>
     <string name="encryption_unknown_algorithm_tile_description">El xifrat que utilitza aquesta sala no és compatible</string>
     <string name="auth_flow_not_supported">No pots fer això des del mòbil</string>
@@ -1551,7 +1551,7 @@
     <string name="login_mode_not_supported">L\'aplicació no ha pogut iniciar sessió en aquest servidor. El servidor és compatible amb el/s següent/s tipus d\'inici de sessió: %1$s.
 \n
 \nVols iniciar sessió utilitzant un client web\?</string>
-    <string name="settings_add_3pid_flow_not_supported">No pots fer això des d\'Element per a mòbils</string>
+    <string name="template_settings_add_3pid_flow_not_supported">No pots fer això des d\'${app_name} per a mòbils</string>
     <string name="search_is_not_supported_in_e2e_room">La cerca en sales xifrades encara no està disponible.</string>
     <string name="warning_room_not_created_yet">La sala encara no s\'ha acabat de crear. Vols cancel·lar la seva creació\?</string>
     <string name="room_error_not_found">No s\'ha trobat aquesta sala. Assegura\'t que existeixi.</string>
@@ -1641,7 +1641,7 @@
     <string name="room_participants_action_cancel_invite">Cancel·la invitació</string>
     <string name="return_to_call">Torna a la trucada</string>
     <string name="login_error_ssl_other">Error SSL.</string>
-    <string name="call_failed_no_connection">La trucada d\'Element ha fallat</string>
+    <string name="template_call_failed_no_connection">La trucada d\'${app_name} ha fallat</string>
     <string name="login_reset_password_on">Restableix la contrasenya a %1$s</string>
     <string name="login_login_with_email_error">Aquest correu electrònic no està associat amb cap compte.</string>
     <string name="login_registration_disabled">Ho sentim, aquest servidor no accepta comptes nous.</string>
@@ -1823,10 +1823,10 @@
     <string name="settings_background_sync_update_error">No s\'ha pogut actualitzar la configuració.</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">No se\'t notificarà de missatges entrants quan l\'aplicació es trobi en segon pla.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Sense sincronització en segon pla</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element farà la sincronització en segon pla periòdicament en instants de temps precisos (configurable).
-\nAixò tindrà un impacte en l\'ús de la ràdio i la bateria, es mostrarà una notificació permanent informant de que Element està a l\'espera d\'esdeveniments.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} farà la sincronització en segon pla periòdicament en instants de temps precisos (configurable).
+\nAixò tindrà un impacte en l\'ús de la ràdio i la bateria, es mostrarà una notificació permanent informant de que ${app_name} està a l\'espera d\'esdeveniments.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimitzat per a temps real</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element farà la sincronització en segon pla de manera que es preservin els recursos limitats del dispositiu (bateria).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} farà la sincronització en segon pla de manera que es preservin els recursos limitats del dispositiu (bateria).
 \nEn funció de l\'estat dels recursos del dispositiu, pot ser que el sistema operatiu endarrereixi la sincronització.</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimitzat per a la bateria</string>
     <string name="settings_background_fdroid_sync_mode">Mode de sincronització en segon pla</string>
@@ -2013,10 +2013,10 @@
     <string name="auth_invalid_login_param_space_in_password">Usuari i/o contrasenya incorrectes. La contrasenya introduïda comença o acaba amb espais, comprova-la.</string>
     <string name="auth_invalid_login_deactivated_account">Aquest compte ha estat desactivat.</string>
     <string name="attachment_viewer_item_x_of_y">%1$d de %2$d</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
-    <string name="app_desktop_web">Element Web
-\nElement per a escriptori</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} per a escriptori</string>
     <string name="add_people">Afegeix gent</string>
     <string name="add_members_to_room">Afegeix membres</string>
     <string name="add_from_phone_book">Afegeix des de la meva agenda</string>
@@ -2027,7 +2027,7 @@
     <string name="a11y_qr_code_for_verification">Codi QR</string>
     <string name="a11y_open_chat">Obre el xat</string>
     <string name="a11y_mute_microphone">Silencia el micròfon</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">El codi PIN és l\'única manera de desbloquejar Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">El codi PIN és l\'única manera de desbloquejar ${app_name}.</string>
     <string name="or_other_mx_capabale_client">o un altre client Matrix compatible amb la signatura creuada</string>
     <string name="encryption_information_dg_xsigning_disabled">La signatura creuada no està activada</string>
     <string name="encryption_information_dg_xsigning_not_trusted">La signatura creuada està activada
@@ -2043,7 +2043,7 @@
     <string name="room_permissions_send_m_room_server_acl_events">Enviar esdeveniments m.room.server_acl</string>
     <string name="room_permissions_change_permissions">Canviar els permisos</string>
     <string name="room_permissions_change_room_name">Canviar el nom de la sala</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element necessita permís per poder desar les claus E2E al disc.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} necessita permís per poder desar les claus E2E al disc.
 \n
 \nPermet-li l\'accés en la següent finestra emergent per poder exportar les claus manualment.</string>
     <string name="no_network_indicator">Ara mateix no hi ha cap connexió</string>
@@ -2087,8 +2087,8 @@
     <string name="auth_pin_confirm_to_disable_title">Confirma el PIN per poder desactivar el PIN</string>
     <string name="settings_security_pin_code_change_pin_summary">Canvia el teu PIN actual</string>
     <string name="settings_security_pin_code_change_pin_title">Canvia el PIN</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Codi PIN necessari cada vegada que obres Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">Codi PIN necessari al cap de 2 minuts sense utilitzar Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Codi PIN necessari cada vegada que obres ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Codi PIN necessari al cap de 2 minuts sense utilitzar ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Demana el PIN al cap de 2 minuts</string>
     <string name="settings_security_pin_code_notifications_summary_off">Mostra, només, el nombre de missatges no llegits en les notificacions simples.</string>
     <string name="settings_security_pin_code_notifications_title">Mostra el contingut de les notificacions</string>
@@ -2169,7 +2169,7 @@
     <string name="start_chatting">Comença a xatejar</string>
     <string name="system_theme">Predeterminat pel sistema</string>
     <string name="enter_secret_storage_passphrase_or_key">Utilitza la %1$s o la %2$s per a continuar.</string>
-    <string name="use_latest_app">Utilitza l\'última versió d\'Element als teus altres dispositius:</string>
+    <string name="template_use_latest_app">Utilitza l\'última versió d\'${app_name} als teus altres dispositius:</string>
     <string name="soft_logout_signin_notice">L\'administrador del servidor local (%1$s) ha tancat la teva sessió del compte %2$s (%3$s).</string>
     <plurals name="fallback_users_read">
         <item quantity="one">%d usuari ho ha llegit</item>
@@ -2237,7 +2237,7 @@
     <string name="new_session_review">Clica per revisar i verificar</string>
     <string name="new_session">Nou inici de sessió. Has estat tu\?</string>
     <string name="refresh">Actualitza</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Les claus ja estan actualitzades!</string>
     <string name="event_redacted_by_user_reason_with_reason">Esdeveniment eliminat per un usuari, motiu: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Esdeveniment moderat per un administrador de sala, motiu: %1$s</string>
@@ -2280,7 +2280,7 @@
     <string name="create_room_alias_hint">Adreça de la sala</string>
     <string name="create_room_encryption_title">Activa el xifrat</string>
     <string name="command_description_shrug">Afegeix ¯\\_(ツ)_/¯ a l\'inici d\'un missatge de text pla</string>
-    <string name="settings_developer_mode_fail_fast_summary">Pot ser que Element falli més sovint quan es produeixi un error inesperat</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">Pot ser que ${app_name} falli més sovint quan es produeixi un error inesperat</string>
     <string name="devices_other_devices">Altres sessions</string>
     <string name="devices_current_device">Sessió actual</string>
     <string name="settings">Configuració</string>
@@ -2368,8 +2368,8 @@
     <string name="settings_troubleshoot_test_notification_title">Visualització de notificació</string>
     <string name="this_is_the_beginning_of_room">Inici de %s.</string>
     <string name="invite_friends">Convida amics</string>
-    <string name="invite_friends_text">Ei, parla amb mi des d\'Element: %s</string>
-    <string name="invite_friends_rich_title">🔐️ Uneix-te a Element</string>
+    <string name="template_invite_friends_text">Ei, parla amb mi des d\'${app_name}: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Uneix-te a ${app_name}</string>
     <string name="user_code_info_text">Comparteix aquest codi amb la gent perquè puguin escanejar-lo, afegir-te i començar a xatejar amb tu.</string>
     <string name="identity_server_user_consent_not_provided">L\'usuari no s\'ha acceptat el consentiment.</string>
     <string name="command_confetti">Envia el missatge proporcionat amb confetis</string>
@@ -2407,7 +2407,7 @@
     <string name="login_server_text">Com els correus electrònics, els comptes pertanyen a una entitat però els pots fer servir per parlar amb tothom</string>
     <string name="create_room_disable_federation_description">Potser ho hauries d\'activar si la sala només s\'utilitzarà per la interacció de grups interns dins el teu servidor local. Això no es podrà canviar més tard.</string>
     <string name="create_room_disable_federation_title">Bloqueja qualsevol persona que no formi part de %s perquè mai pugui unir-se a la sala</string>
-    <string name="soft_logout_sso_not_same_user_error">La sessió actual és de l\'usuari %1$s i has introduït les credencials de l\'usuari %2$s. Això no es pot fer amb Element.
+    <string name="template_soft_logout_sso_not_same_user_error">La sessió actual és de l\'usuari %1$s i has introduït les credencials de l\'usuari %2$s. Això no es pot fer amb ${app_name}.
 \nPrimer esborra les dades i després torna a iniciar sessió amb l\'altre compte.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Perdràs l\'accés als missatges protegits tret de que iniciïs sessió i obtinguis les teves claus de xifrat.</string>
     <string name="soft_logout_clear_data_notice">Atenció: les teves dades personals (incloses les claus de xifrat) encara estan desades en aquest dispositiu.
@@ -2492,9 +2492,9 @@
     <string name="complete_security">Completa la seguretat</string>
     <string name="crosssigning_other_user_not_trust">Pot ser que altres usuaris no hi confiïn</string>
     <string name="unignore">Deixa d\'ignorar</string>
-    <string name="rendering_event_error_exception">Element ha trobat un problema al renderitzar el contingut de l\'esdeveniment amb ID \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element no gestiona els missatges de tipus \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element no gestiona els esdeveniments de tipus \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} ha trobat un problema al renderitzar el contingut de l\'esdeveniment amb ID \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} no gestiona els missatges de tipus \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} no gestiona els esdeveniments de tipus \'%1$s\'</string>
     <string name="room_profile_leaving_room">Marxant de la sala…</string>
     <string name="direct_room_profile_section_more_leave">Marxa</string>
     <string name="room_profile_section_more_leave">Marxa de la sala</string>
@@ -2570,7 +2570,7 @@
 \nSegur que vols continuar\?</string>
     <string name="external_link_confirmation_title">Comprova aquest enllaç</string>
     <string name="mark_as_verified">Marca-ho com a segur</string>
-    <string name="use_other_session_content_description">Utilitza l\'última versió d\'Element als teus altres dispositius, Element Web, Element per escriptori, Element iOS, Element per Android, o algun altre client de Matrix que admeti signatura creuada</string>
+    <string name="template_use_other_session_content_description">Utilitza l\'última versió d\'${app_name} als teus altres dispositius, ${app_name} Web, ${app_name} per escriptori, ${app_name} iOS, ${app_name} per Android, o algun altre client de Matrix que admeti signatura creuada</string>
     <string name="bootstrap_progress_storing_in_sss">Desant secret de clau de còpia de seguretat a SSSS</string>
     <string name="security_prompt_text">Verifica\'t a tu i als altres per mantenir els teus xats segurs</string>
     <string name="command_description_plain">Envia un missatge com a text pla, sense tenir en compte la formatació markdown</string>
@@ -2598,7 +2598,7 @@
     </plurals>
     <string name="secure_backup_reset_if_you_reset_all">Si ho restableixes tot</string>
     <string name="secure_backup_reset_all_no_other_devices">Fes això només si no tens cap altre dispositiu per poder verificar-ne aquest.</string>
-    <string name="re_authentication_default_confirm_text">Element necessita que introdueixis les teves credencials per poder realitzar aquesta acció.</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} necessita que introdueixis les teves credencials per poder realitzar aquesta acció.</string>
     <string name="re_authentication_activity_title">Re-autenticació necessària</string>
     <string name="contacts_book_title">Llista de contactes</string>
     <string name="empty_phone_book">La teva agenda està buida</string>
@@ -2619,7 +2619,7 @@
     <string name="identity_server_error_binding_error">L\'associació ha fallat.</string>
     <string name="identity_server_error_no_identity_server_configured">Primer configura un servidor d\'identitat.</string>
     <string name="identity_server_error_outdated_home_server">No es pot realitzar aquesta operació. El servidor local no està actualitzat.</string>
-    <string name="identity_server_error_outdated_identity_server">Aquest servidor d\'identitat no està actualitzat. Element només és compatible amb l\'API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Aquest servidor d\'identitat no està actualitzat. ${app_name} només és compatible amb l\'API V2.</string>
     <string name="disconnect_identity_server_dialog_content">Vols desconnectar-te del servidor d\'identitat %s\?</string>
     <string name="choose_locale_loading_locales">Carregant idiomes disponibles…</string>
     <string name="choose_locale_other_locales_title">Altres idiomes disponibles</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index af48a7d148..deacdeb266 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -352,7 +352,7 @@
     <string name="user_directory_header">Uživatelský adresář</string>
     <string name="matrix_only_filter">Pouze kontakty Matrix</string>
     <string name="no_conversation_placeholder">Žádné konverzace</string>
-    <string name="no_contact_access_placeholder">Nepovolil jste aplikaci Element přístup k místním kontaktům</string>
+    <string name="template_no_contact_access_placeholder">Nepovolil jste aplikaci ${app_name} přístup k místním kontaktům</string>
     <string name="no_result_placeholder">Žádné výsledky</string>
     <string name="rooms_header">Místnosti</string>
     <string name="rooms_directory_header">Adresář místností</string>
@@ -501,7 +501,7 @@
     <string name="room_info_room_name">Název místnosti</string>
     <string name="room_info_room_topic">Téma místnosti</string>
     <string name="settings_call_category">Hovory</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Použít původní vyzvánění Elementu pro příchozí hovory</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Použít původní vyzvánění ${app_name}u pro příchozí hovory</string>
     <string name="settings_call_ringtone_title">Vyzvánění příchozího hovoru</string>
     <string name="settings_call_ringtone_dialog_title">Vybrat vyzvánění pro hovory:</string>
     <string name="call">Hovor</string>
@@ -520,14 +520,14 @@
     <string name="media_picker_both_capture_title">Pořídit fotografii nebo video</string>
     <string name="media_picker_cannot_record_video">Nemohu natáčet video</string>
     <string name="permissions_rationale_popup_title">Informace</string>
-    <string name="permissions_rationale_msg_storage">Element potřebuje oprávnění pro přístup do Vaší knihovny fotografií a videí, aby mohl odesílat a ukládat přílohy.
+    <string name="template_permissions_rationale_msg_storage">${app_name} potřebuje oprávnění pro přístup do Vaší knihovny fotografií a videí, aby mohl odesílat a ukládat přílohy.
 \n
 \nProsím, povolte přístup na následující hlášce pro možnost odesílání souborů z Vašeho telefonu.</string>
-    <string name="permissions_rationale_msg_camera">Element potřebuje oprávnění pro přístup k Vašemu fotoaparátu pro pořizování fotografií a uskutečňování video hovorů.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} potřebuje oprávnění pro přístup k Vašemu fotoaparátu pro pořizování fotografií a uskutečňování video hovorů.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nProsím, povolte přístup na následující hlášce, abyste mohli uskutečnit hovor."</string>
-    <string name="permissions_rationale_msg_record_audio">Element potřebuje oprávnění pro přístup k Vašemu mikrofonu pro uskutečnění hlasových hovorů.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} potřebuje oprávnění pro přístup k Vašemu mikrofonu pro uskutečnění hlasových hovorů.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nProsím, povolte přístup na následující hlášce, abyste mohli uskutečnit hovor."</string>
@@ -541,7 +541,7 @@
     <string name="preview">Náhled</string>
     <string name="room_preview_invitation_format">Byli jste pozváni od %s ke vstupu do místnosti</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Žádost odeslána</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Prosím, spusťte Element na jiném zařízení, které může dešifrovat zprávu, aby poslalo klíče této relaci.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Prosím, spusťte ${app_name} na jiném zařízení, které může dešifrovat zprávu, aby poslalo klíče této relaci.</string>
     <string name="read_receipts_list">Seznam doručenek</string>
     <string name="groups_list">Seznam skupin</string>
     <string name="permissions_action_not_performed_missing_permissions">Omlouváme se, ale akce nebyla provedena z důvodu chybějících oprávnění</string>
@@ -678,11 +678,11 @@
     <string name="abort">Zrušit</string>
     <string name="action_sign_out_confirmation_simple">Opravdu se chcete odhlásit\?</string>
     <string name="video_call_in_progress">Video hovor probíhá…</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element potřebuje oprávnění pro přístup k Vaší kameře a mikrofonu pro uskutečnění video hovoru.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} potřebuje oprávnění pro přístup k Vaší kameře a mikrofonu pro uskutečnění video hovoru.
 \n
 \nProsím, povolte přístup na následující hlášce abyste mohli uskutečnit hovor.</string>
-    <string name="permissions_rationale_msg_contacts">Element může nahlédnout do vašeho adresáře, aby nalezl ostatní uživatele Matrixu na základě jejich e-mailu a telefonního čísla. Pokud souhlasíte se sdílením svého adresáře za tímto účelem, prosím, povolte přístup v příští hlášce.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element může nahlédnout do vašeho adresáře, aby nalezl ostatní uživatele Matrixu na základě jejich e-mailu a telefonního čísla.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} může nahlédnout do vašeho adresáře, aby nalezl ostatní uživatele Matrixu na základě jejich e-mailu a telefonního čísla. Pokud souhlasíte se sdílením svého adresáře za tímto účelem, prosím, povolte přístup v příští hlášce.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} může nahlédnout do vašeho adresáře, aby nalezl ostatní uživatele Matrixu na základě jejich e-mailu a telefonního čísla.
 \n 
 \nSouhlasíte se sdílením svého adresáře za tímto účelem\?</string>
     <string name="room_preview_unlinked_email_warning">Pozvánka byla odeslána na %s, což není spárováno s tímto účtem. 
@@ -793,7 +793,7 @@
     <string name="settings_call_ringtone_use_default_stun_sum">Použiiji %s jako nápomoc, pokud Váš homeserver žádnou nenabízí (Vaše IP adresa bude sdělena během hovoru)</string>
     <string name="invite_no_identity_server_error">Pro provedení této akce přidat server identit v nastavení.</string>
     <string name="settings_add_3pid_confirm_password_title">Potvrďte své heslo</string>
-    <string name="settings_add_3pid_flow_not_supported">Nelze provést z Element mobile</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Nelze provést z ${app_name} mobile</string>
     <string name="settings_add_3pid_authentication_needed">Ověření je nutné</string>
     <string name="settings_notification_privacy">Soukromí oznámení</string>
     <string name="settings_notification_troubleshoot">Odstraňování problémů s oznámeními</string>
@@ -815,8 +815,8 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Zapnout</string>
     <string name="settings_troubleshoot_test_device_settings_title">Nastavení relací.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Pro tuto relaci jsou oznámení zapnuta.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Oznámení nejsou zapnuta pro tuto relaci. 
-\nProsím, prověřte nastavení Elementu.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Oznámení nejsou zapnuta pro tuto relaci.
+\nProsím, prověřte nastavení ${app_name}u.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Zapnout</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Vlastní nastavení.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Všimněte si, že některé typy zpráv jsou ztišeny (vyvolají oznámeni bez zvuku).</string>
@@ -825,7 +825,7 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Kontrola nastavení</string>
     <string name="settings_troubleshoot_test_play_services_title">Kontrola služeb Play</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK je k dispozici a aktuální.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element používá Google Play Services pro doručení zpráv push, ale patrně nejsou správně nastaveny:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} používá Google Play Services pro doručení zpráv push, ale patrně nejsou správně nastaveny:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Opravit Play Services</string>
     <string name="settings_troubleshoot_test_fcm_title">Token Firebase</string>
@@ -833,12 +833,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Načtení FCM tokenu selhalo:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nTato chyba je mimo kontrolu Elementu a podle Googlu indikuje, že zařízení má příliš mnoho aplikací registrovaných s FCM. Tato chyba se ukáže jen v případech extrémního množství aplikací, a proto by neměla mít vliv na normálního uživatele.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nTato chyba je mimo kontrolu Elementu. Múže k ní dojít z několika důvodů. Snad bude fungovat, když zkusíte znovu později, můžete též zkontrolovat, zda Google Play Service nejsou omezeny v množství dat v systémových nastavení nebo zda hodiny zařízení jdou správné nebo k chybě může dojít na zvláštní ROM.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nTato chyba je mimo kontrolu Elementu. V telefonu není žádný účet Google. Prosím, spusťte správce účtů a doplňte účet Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nTato chyba je mimo kontrolu ${app_name}u a podle Googlu indikuje, že zařízení má příliš mnoho aplikací registrovaných s FCM. Tato chyba se ukáže jen v případech extrémního množství aplikací, a proto by neměla mít vliv na normálního uživatele.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nTato chyba je mimo kontrolu ${app_name}u. Múže k ní dojít z několika důvodů. Snad bude fungovat, když zkusíte znovu později, můžete též zkontrolovat, zda Google Play Service nejsou omezeny v množství dat v systémových nastavení nebo zda hodiny zařízení jdou správné nebo k chybě může dojít na zvláštní ROM.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nTato chyba je mimo kontrolu ${app_name}u. V telefonu není žádný účet Google. Prosím, spusťte správce účtů a doplňte účet Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Přidat účet</string>
     <string name="settings_troubleshoot_test_token_registration_title">Registrace tokenu</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM token se podařilo úspěšné registrovat na homeserveru.</string>
@@ -854,17 +854,17 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Restart služby se nezdařil</string>
     <string name="settings_troubleshoot_test_service_boot_title">Spustit při zavádění</string>
     <string name="settings_troubleshoot_test_service_boot_success">Služba se spustí při restartu zařízení.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Služba se nespustí při startu zařízení, neobdržíte oznámení, dokud jednou neotevřete Element.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Služba se nespustí při startu zařízení, neobdržíte oznámení, dokud jednou neotevřete ${app_name}.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Zapnout Spustit při zavádění</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Zkontrolovat omezení na pozadí</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Omezení na pozadí jsou pro Element vypnuta. Tento test by měl běžet s mobilními daty (ne WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Omezení na pozadí jsou pro ${app_name} vypnuta. Tento test by měl běžet s mobilními daty (ne WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Omezení na pozadí jsou pro Element zapnuta.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Omezení na pozadí jsou pro ${app_name} zapnuta.
 \nČinnosti prováděné aplikací budou agresivně omezeny, bude-li v pozadí, a to může mít vliv na oznámení.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Vypnout omezení</string>
     <string name="settings_troubleshoot_test_battery_title">Optimalizace baterie</string>
-    <string name="settings_troubleshoot_test_battery_success">Optimalizace baterie nemá na Element vliv.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Optimalizace baterie nemá na ${app_name} vliv.</string>
     <string name="settings_troubleshoot_test_battery_failed">Nechá-li uživatel zařízení vytažený ze zásuvky a v klidu po nějakou dobu a s obrazovkou vypnutou, zařízení vstoupí do stavu spánku. Ten zamezí aplikacím přístup k síti a odloží jejich úlohy, synchronizaci a běžná upozornění.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorovat optimalizaci</string>
     <string name="settings_notification_privacy_normal">Normální</string>
@@ -894,11 +894,11 @@
     <string name="settings_background_sync">Synchronizace na pozadí</string>
     <string name="settings_background_fdroid_sync_mode">Režim synchronizace na pozadí</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimalizován pro baterii</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element bude synchronizovat na pozadí způsobem, který šetří omezené zdroje zařízení (baterii).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} bude synchronizovat na pozadí způsobem, který šetří omezené zdroje zařízení (baterii).
 \nV závislosti na stavu zdrojů zařízení může být sync operačním systémem odložen.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimalizováno pro reálný čas</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element bude synchronizovat na pozadí periodicky v přesný čas (nastavitelné).
-\nTo bude mít vliv na využití rádia a baterie, stálé oznámení o tom, že Element čeká na události, bude zobrazeno.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} bude synchronizovat na pozadí periodicky v přesný čas (nastavitelné).
+\nTo bude mít vliv na využití rádia a baterie, stálé oznámení o tom, že ${app_name} čeká na události, bude zobrazeno.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Žádný sync na pozadí</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Neobdržíte oznámení o příchozích zprávách, je-li aplikace na pozadí.</string>
     <string name="settings_background_sync_update_error">Aktualizace nastavení se nezdařila.</string>
@@ -959,17 +959,17 @@
     <string name="settings_discovery_category">Odhalení</string>
     <string name="settings_discovery_manage">Správa Vašich nastaveni pro odhalení.</string>
     <string name="startup_notification_privacy_title">Soukromí ohledně oznámení</string>
-    <string name="startup_notification_privacy_message">Element může běžet na pozadí, aby spravoval Vaše oznámení bezpečně a v soukromí. To může mít vliv na baterii.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} může běžet na pozadí, aby spravoval Vaše oznámení bezpečně a v soukromí. To může mít vliv na baterii.</string>
     <string name="startup_notification_privacy_button_grant">Udělit oprávnění</string>
     <string name="startup_notification_privacy_button_other">Vybrat jinou volbu</string>
     <string name="startup_notification_fdroid_battery_optim_title">Spojení na pozadí</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element potřebuje udržovat spojení na pozadí se slabým vlivem, abyste obdrželi spolehlivá oznámení.
-\nNa příští obrazovce budete dotázáni o svolení nechat Element vždy v chodu na pozadí, prosím, souhlaste.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} potřebuje udržovat spojení na pozadí se slabým vlivem, abyste obdrželi spolehlivá oznámení.
+\nNa příští obrazovce budete dotázáni o svolení nechat ${app_name} vždy v chodu na pozadí, prosím, souhlaste.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Udělit oprávění</string>
     <string name="settings_analytics">Analýza</string>
     <string name="settings_opt_in_of_analytics">Odeslat analytická data</string>
-    <string name="settings_opt_in_of_analytics_summary">Element sbírá anonymní analytická data pro vylepšení aplikace.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Prosím, zapněte analýzu pro vylepšení Elementu.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} sbírá anonymní analytická data pro vylepšení aplikace.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Prosím, zapněte analýzu pro vylepšení ${app_name}u.</string>
     <string name="settings_opt_in_of_analytics_ok">Ano, chci pomoci!</string>
     <string name="settings_data_save_mode">Režim úsporných dat</string>
     <string name="settings_data_save_mode_summary">Režim úsporných data zavádí specifický filtr, takže aktualizace přítomnosti a oznámení o psaní jsou fitrovány.</string>
@@ -1390,7 +1390,7 @@
     <string name="passphrase_passphrase_does_not_match">Přistupová fráze se neshoduje</string>
     <string name="passphrase_empty_error_message">Prosím, zadejte přístupovou frázi</string>
     <string name="passphrase_passphrase_too_weak">Přístupová fráze je příliš slabá</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Prosím, smažte přístupovou frázi, přejete-li si, aby Element generoval klíč pro obnovu.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Prosím, smažte přístupovou frázi, přejete-li si, aby ${app_name} generoval klíč pro obnovu.</string>
     <string name="keys_backup_no_session_error">Žádná relace Matrix není dostupná</string>
     <string name="keys_backup_setup_step1_title">Nikdy neztraťte šifrované zprávy</string>
     <string name="keys_backup_setup_step1_description">Zprávy v šifrovaných místnostech jsou zabezpečeny pomocí end-to-end šifrováním. Pouze Vy a adresát(i) máte klíče ke čtení těchto zpráv.
@@ -1482,7 +1482,7 @@
     <string name="keys_backup_info_title_signature">Podpis</string>
     <string name="autodiscover_invalid_response">Neplatná odpověď z hledání homeserverů</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Volby serveru automaticky</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element nalezl vlastní konfiguraci serveru pro doménu Vašeho uživatelského Id \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} nalezl vlastní konfiguraci serveru pro doménu Vašeho uživatelského Id \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Použít konfiguraci</string>
     <string name="invalid_or_expired_credentials">Byli jste odhlášení kvůli chybným či neplatným ověřovacím údajům.</string>
@@ -1557,7 +1557,7 @@
     <string name="please_wait">Prosím, čekejte…</string>
     <string name="group_all_communities">Všechny komunity</string>
     <string name="room_preview_no_preview">Nelze provést náhled této místnosti</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Náhled místnosti čitelné pro všechny zatím Element nepodporuje</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Náhled místnosti čitelné pro všechny zatím ${app_name} nepodporuje</string>
     <string name="fab_menu_create_room">Místnosti</string>
     <string name="fab_menu_create_chat">Přímé zprávy</string>
     <string name="create_room_title">Nová místnost</string>
@@ -1697,7 +1697,7 @@
     <string name="content_reported_as_inappropriate_content">Obsah byl nahlášen jako nepatřičný.
 \n
 \nPokud si dále nepřejete vidět obsah tohoto uživatele, můžete jej ignorovat a tím skrýt jejich zprávy.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element potřebuje práva k uložení Vašich E2E klíčů na disk.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} potřebuje práva k uložení Vašich E2E klíčů na disk.
 \n
 \nProsím, povolte přístup v příštím dialogu, abyste mohli exportovat své klíče manuálně.</string>
     <string name="no_network_indicator">Právě nyní není k dispozici žádné síťové spojení</string>
@@ -1839,7 +1839,7 @@
 \nPro přístup k účtu a zprávám se znovu se přihlaste.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Ztratíte přístup k šifrovaným zprávám, pokud se nepřihlásíte za účelem obnovy šifrovacích klíčů.</string>
     <string name="soft_logout_clear_data_dialog_submit">Vyčistit data</string>
-    <string name="soft_logout_sso_not_same_user_error">Tato relace je pro uživatele %1$s a Vy jste zadali údaje pro uživatele %2$s. Element toto nepodporuje.
+    <string name="template_soft_logout_sso_not_same_user_error">Tato relace je pro uživatele %1$s a Vy jste zadali údaje pro uživatele %2$s. ${app_name} toto nepodporuje.
 \nProsím, nejdříve vyčistěte data a pak se přihlaste k jinému účtu.</string>
     <string name="permalink_malformed">Váš odkaz matrix.to byl chybný</string>
     <string name="bug_report_error_too_short">Popis je příliš krátký</string>
@@ -1857,7 +1857,7 @@
     <string name="devices_other_devices">Jiné relace</string>
     <string name="autocomplete_limited_results">Ukazuji jen první výsledky, zadejte více znaků…</string>
     <string name="settings_developer_mode_fail_fast_title">Fail-fast</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element se může zbořit častěji, když se objeví neočekávané chyby</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} se může zbořit častěji, když se objeví neočekávané chyby</string>
     <string name="command_description_shrug">Předsune ¯\\_(ツ)_/¯ do textové zprávy</string>
     <string name="create_room_encryption_title">Zapnout šifrování</string>
     <string name="create_room_encryption_description">Jakmile zapnuto, šifrování nelze vypnout.</string>
@@ -1929,9 +1929,9 @@
     <string name="room_member_power_level_moderator_in">Moderátor v %1$s</string>
     <string name="room_member_power_level_custom_in">Vlastní (%1$d) in %2$s</string>
     <string name="room_member_jump_to_read_receipt">Přeskočit k potvrzení přečtení</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element neobstarává události typu \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element neobstarává zprávy typu \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element narazil na chybu při převádění obsahu události s id \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} neobstarává události typu \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} neobstarává zprávy typu \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} narazil na chybu při převádění obsahu události s id \'%1$s\'</string>
     <string name="unignore">Odignorovat</string>
     <string name="verify_cannot_cross_sign">Tato relace nemůže sdílet toto ověření s jinými z Vašich relací.
 \nToto ověření bude uloženo místně a sdíleno v budoucí verzi aplikace.</string>
@@ -2029,7 +2029,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Událost smazána uživatelem, důvod: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Událost moderována správcem místnosti, důvod: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Klíče jsou již aktuální!</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Požadavky na klíče</string>
     <string name="e2e_use_keybackup">Odemknout zašifrovanou historii zpráv</string>
     <string name="refresh">Obnovit</string>
@@ -2150,13 +2150,13 @@
     <string name="login_signin_matrix_id_error_invalid_matrix_id">To není platný identifikátor uživatele. Platný formát: \'@uživatel:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">Nemohu najít platný domovský server. Prosím, zkontrolujte svůj identifikátor</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Režim letadlo je zapnut</string>
-    <string name="use_other_session_content_description">Použijte na svých zařízeních nejnovější Element, Element Web, Element Desktop, Element iOS, Element pro Android nebo jiný Matrix klient schopný křížového přihlášení</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">Použijte na svých zařízeních nejnovější ${app_name}, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} pro Android nebo jiný Matrix klient schopný křížového přihlášení</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">nebo jiný Matrix klient schopný křížového přihlášení</string>
-    <string name="use_latest_app">Použijte na svých zařízeních nejnovější Element:</string>
+    <string name="template_use_latest_app">Použijte na svých zařízeních nejnovější ${app_name}:</string>
     <string name="command_description_discard_session">Vynutí zahození probíhající skupinové relace v šifrované místnosti</string>
     <string name="command_description_discard_session_not_handled">Podporováno jen v šifrovaných místnostech</string>
     <string name="enter_secret_storage_passphrase_or_key">Použijte své %1$s nebo použijte svůj %2$s a pokračujte.</string>
@@ -2198,11 +2198,11 @@
     <string name="choose_locale_loading_locales">Načítám dostupné jayzky…</string>
     <string name="open_terms_of">Otevřít všeobecné podmínky %s</string>
     <string name="disconnect_identity_server_dialog_content">Odpojit se od serveru identit %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Tento server identit je zastaralý. Element podporuje jen API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Tento server identit je zastaralý. ${app_name} podporuje jen API V2.</string>
     <string name="identity_server_error_outdated_home_server">Tato operace není možná. Domovský server je zastaralý.</string>
     <string name="identity_server_error_no_identity_server_configured">Prosím, nejdříve nastavit server identit.</string>
     <string name="identity_server_error_terms_not_signed">Prosím, přijměte nejdříve všeobecné podmínky serveru identit v nastavení.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Pro Vaše soukromí, Element podporuje jen odesílání hašovaných emailových adress a telefonních čísel.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Pro Vaše soukromí, ${app_name} podporuje jen odesílání hašovaných emailových adress a telefonních čísel.</string>
     <string name="identity_server_error_binding_error">Propojení selhalo.</string>
     <string name="identity_server_error_no_current_binding_error">S tímto identifikátorem neexistuje žádné propojení.</string>
     <string name="identity_server_set_default_notice">Váš domovský server (%1$s) navrhuje použít %2$s za Váš domovský server</string>
@@ -2228,7 +2228,7 @@
     <string name="action_copy">Kopírovat</string>
     <string name="dialog_title_success">Podařilo se</string>
     <string name="bottom_action_notification">Oznámení</string>
-    <string name="call_failed_no_connection">Volání Elementu se nezdařilo</string>
+    <string name="template_call_failed_no_connection">Volání ${app_name}u se nezdařilo</string>
     <string name="call_failed_no_connection_description">Založit spojení v reálném čase se nezdařilo.
 \nProsím, požádejte správce svého homeserveru o konfiguraci TURN serveru, aby volání fungovala spolehlivě.</string>
     <string name="call_select_sound_device">Vybrat zvukové zařízení</string>
@@ -2429,13 +2429,13 @@
     <string name="warning_unsaved_change_discard">Změny zavrhnout</string>
     <string name="warning_unsaved_change">Zůstávají neuložené změny. Zavrhnout změny\?</string>
     <string name="warning_room_not_created_yet">Místnost nebyla ještě založena. Zrušit založení místnosti\?</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Kód PIN se vyžaduje při každém otevření Elementu.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">Kód PIN se vyžaduje, pokud se Element nepoužil 2 minuty.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Kód PIN se vyžaduje při každém otevření ${app_name}u.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Kód PIN se vyžaduje, pokud se ${app_name} nepoužil 2 minuty.</string>
     <string name="settings_security_pin_code_grace_period_title">Žádat PIN po 2 minutách</string>
     <string name="settings_security_pin_code_notifications_summary_off">Zobrazit pouze počet nepřečtených zpráv v jednoduchém oznámení.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Zobrazit podrobnosti např. názvy místností a obsah zpráv.</string>
     <string name="settings_security_pin_code_notifications_title">Zobrazit obsah v oznámení</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">Kód PIN je jediný způsob, jak odemknout Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">Kód PIN je jediný způsob, jak odemknout ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Zapnout biometriku specifickou pro zařízení, např. otisk prstu nebo rozpoznání obličeje.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Zapnout biometriku</string>
     <string name="settings_security_application_protection_screen_title">Nastavit ochranu</string>
@@ -2505,8 +2505,8 @@
     <string name="user_code_share">Sdílet můj kód</string>
     <string name="user_code_scan">Skenovat QR kód</string>
     <string name="not_a_valid_qr_code">To není platný matrixový QR kód</string>
-    <string name="invite_friends_rich_title">🔐️ Přidej se ke mně v elementu</string>
-    <string name="invite_friends_text">Ahoj, pojď si povídat v Elementu: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Přidej se ke mně v ${app_name}u</string>
+    <string name="template_invite_friends_text">Ahoj, pojď si povídat v ${app_name}u: %s</string>
     <string name="invite_friends">Pozvat přátele</string>
     <string name="add_people">Přidat lidi</string>
     <string name="topic_prefix">"Téma: "</string>
@@ -2624,7 +2624,7 @@
     <string name="action_add">Přidat</string>
     <string name="system_theme">Výchozí téma</string>
     <string name="authentication_error">Ověření se nezdařilo</string>
-    <string name="re_authentication_default_confirm_text">Element vyžaduje zadání přihlašovacích údajů k provedení této akce.</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} vyžaduje zadání přihlašovacích údajů k provedení této akce.</string>
     <string name="re_authentication_activity_title">Je nutné opětovné ověření</string>
     <string name="failed_to_initialize_cross_signing">Nastavení křížového podepisování se nezdařilo</string>
     <string name="error_unauthorized">Neautorizováno, chybí platné ověřovací údaje</string>
diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml
index 1210d4da90..d74de284f4 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@@ -148,7 +148,7 @@
     <string name="user_directory_header">Bruger katalog</string>
     <string name="matrix_only_filter">Kun Matrix kontakter</string>
     <string name="no_conversation_placeholder">Ingen samtaler</string>
-    <string name="no_contact_access_placeholder">Du gav ikke Element tilladelse til at se dine lokale kontakter</string>
+    <string name="template_no_contact_access_placeholder">Du gav ikke ${app_name} tilladelse til at se dine lokale kontakter</string>
     <string name="no_result_placeholder">Ingen resultater</string>
 
     <string name="rooms_header">Rum</string>
@@ -299,25 +299,25 @@ Du er blevet logget ud af alle enheder og vil ikke længere modtage pushnotifika
     <string name="media_picker_cannot_record_video">Kan ikke optage video</string>
 
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Element skal bruge tilladelse til at tilgå dit billed- og videoarkiv for at sende og gemme vedhæftninger.
+    <string name="template_permissions_rationale_msg_storage">${app_name} skal bruge tilladelse til at tilgå dit billed- og videoarkiv for at sende og gemme vedhæftninger.
 Giv venligst tilladelse ved næste pop-up for at kunne sende filer fra din telefon.</string>
-    <string name="permissions_rationale_msg_camera">Element skal bruge tilladelse til at bruge dit kamera for at billeder og lave videoopkald.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} skal bruge tilladelse til at bruge dit kamera for at billeder og lave videoopkald.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Giv venligst tilladelse ved næste pop-up for at kunne lave opkald.</string>
-    <string name="permissions_rationale_msg_record_audio">Element skal bruge tilladelse til at bruge din mikrofon for at lave lydopkald.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} skal bruge tilladelse til at bruge din mikrofon for at lave lydopkald.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Giv venligst tilladelse ved næste pop-up for at kunne lave opkaldet.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element skal bruge tilladelse til at bruge dit kamera og din mikrofon for at lave videoopkald.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} skal bruge tilladelse til at bruge dit kamera og din mikrofon for at lave videoopkald.
 
 Giv venligst tilladelse ved næste pop-up for at lave opkaldet.</string>
-    <string name="permissions_rationale_msg_contacts">Element skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
 
-Giv venligst tilladelse ved næste pop-up for at finde kontakter der er på Element.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
+Giv venligst tilladelse ved næste pop-up for at finde kontakter der er på ${app_name}.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
 
-Vil du give Element adgang til dine kontakter?</string>
+Vil du give ${app_name} adgang til dine kontakter?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Beklager… Handlingen blev ikke udført fordi der mangler tilladelser</string>
 
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 8a781860c7..ee1a204172 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -344,7 +344,7 @@
     <string name="local_address_book_header">Lokales Adressbuch</string>
     <string name="matrix_only_filter">Nur Matrix-Kontakte</string>
     <string name="no_conversation_placeholder">Keine Konversationen</string>
-    <string name="no_contact_access_placeholder">Element wurde nicht erlaubt, auf lokale Kontakte zuzugreifen</string>
+    <string name="template_no_contact_access_placeholder">${app_name} wurde nicht erlaubt, auf lokale Kontakte zuzugreifen</string>
     <string name="no_result_placeholder">Keine Ergebnisse</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Räume</string>
@@ -482,20 +482,20 @@
     <string name="media_picker_cannot_record_video">Video kann nicht aufgenommen werden</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Element benötigt die Berechtigung, auf deine Fotos und Videos zugreifen zu können, um Anhänge zu senden und zu speichern.\n\nBitte erlaube den Zugriff im nächsten Dialog, um Dateien von deinem Gerät zu versenden.</string>
-    <string name="permissions_rationale_msg_camera">Element benötigt die Berechtigung, auf deine Kamera zugreifen zu können, um Bilder aufzunehmen und Video-Anrufe durchzuführen.</string>
+    <string name="template_permissions_rationale_msg_storage">${app_name} benötigt die Berechtigung, auf deine Fotos und Videos zugreifen zu können, um Anhänge zu senden und zu speichern.\n\nBitte erlaube den Zugriff im nächsten Dialog, um Dateien von deinem Gerät zu versenden.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} benötigt die Berechtigung, auf deine Kamera zugreifen zu können, um Bilder aufzunehmen und Video-Anrufe durchzuführen.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen."</string>
-    <string name="permissions_rationale_msg_record_audio">Element benötigt die Berechtigung, auf dein Mikrofon zugreifen zu können, um (Sprach-)Anrufe tätigen zu können.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} benötigt die Berechtigung, auf dein Mikrofon zugreifen zu können, um (Sprach-)Anrufe tätigen zu können.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element benötigt die Berechtigung, auf Kamera und Mikrofon zu zugreifen, um Video-Anrufe durchzuführen.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} benötigt die Berechtigung, auf Kamera und Mikrofon zu zugreifen, um Video-Anrufe durchzuführen.
 \n
 \nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.</string>
-    <string name="permissions_rationale_msg_contacts">Element kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer:innen anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer:innen anhand ihrer E-Mail-Adresse und Telefonnummer zu finden.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer:innen anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer:innen anhand ihrer E-Mail-Adresse und Telefonnummer zu finden.
 \n
 \nStimmst du der Nutzung deines Adressbuchs zu diesem Zweck zu\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Entschuldige. Die Aktion wurde aufgrund fehlender Berechtigungen nicht ausgeführt</string>
@@ -1019,7 +1019,7 @@
     <string name="settings_notification_privacy_nosecure_message_content">• Benachrichtigungen enthalten <b>Metadaten und Nachrichteninhalte</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Benachrichtigungen werden <b>den Nachrichteninhalt nicht anzeigen</b></string>
     <string name="startup_notification_privacy_title">Benachrichtungs-Datenschutz</string>
-    <string name="startup_notification_privacy_message">Element kann im Hintergrund laufen um deine Benachrichtigungen sicher und privat zu verwalten. Dies kann den Energieverbrauch beeinflussen.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} kann im Hintergrund laufen um deine Benachrichtigungen sicher und privat zu verwalten. Dies kann den Energieverbrauch beeinflussen.</string>
     <string name="startup_notification_privacy_button_grant">Berechtigung gewähren</string>
     <string name="startup_notification_privacy_button_other">Wähle eine andere Option</string>
     <string name="title_activity_choose_sticker">Sende einen Sticker</string>
@@ -1030,8 +1030,8 @@
     <string name="settings_deactivate_account_section">Account deaktivieren</string>
     <string name="settings_deactivate_my_account">Deaktiviere meinen Account</string>
     <string name="settings_opt_in_of_analytics">Sende Analysedaten</string>
-    <string name="settings_opt_in_of_analytics_summary">Element sammelt anonyme Analysedaten um uns zu helfen, die App zu verbessern.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Bitte aktive Analysedaten um uns zu helfen Element zu verbessern.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} sammelt anonyme Analysedaten um uns zu helfen, die App zu verbessern.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Bitte aktive Analysedaten um uns zu helfen ${app_name} zu verbessern.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, ich möchte helfen!</string>
     <string name="widget_integration_missing_parameter">Ein benötigter Parameter fehlt.</string>
     <string name="widget_integration_invalid_parameter">Ein Parameter ist nicht valide.</string>
@@ -1053,7 +1053,7 @@
     <string name="e2e_re_request_encryption_key">Verschlüsselungsschlüssel von deinen anderen Sitzungen erneut anfragen.</string>
     <string name="e2e_re_request_encryption_key_sent">Schlüsselanfrage gesendet.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Anfrage gesendet</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Bitte öffne Element auf einem anderen Gerät, das die Nachricht entschlüsseln kann, damit es die Schlüssel an diese Sitzung senden kann.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Bitte öffne ${app_name} auf einem anderen Gerät, das die Nachricht entschlüsseln kann, damit es die Schlüssel an diese Sitzung senden kann.</string>
     <string name="lock_screen_hint">Hier tippen…</string>
     <string name="option_send_voice">Sprachnachricht senden</string>
     <string name="go_on_with">fortfahren mit…</string>
@@ -1167,7 +1167,7 @@
     <string name="settings_show_avatar_display_name_changes_messages">Zeige Konto-Ereignisse</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Enthält Änderungen des Profilbilds und des Anzeigenamens.</string>
     <string name="settings_call_category">Anrufe</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Nutze den Standard-Klingelton von Element für eingehende Anrufe</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Nutze den Standard-Klingelton von ${app_name} für eingehende Anrufe</string>
     <string name="settings_call_ringtone_title">Klingelton für eingehende Anrufe</string>
     <string name="settings_call_ringtone_dialog_title">Wähle Klingelton für Anrufe:</string>
     <string name="accept">Akzeptieren</string>
@@ -1188,10 +1188,10 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Aktiviere</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sitzungseinstellungen.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Benachrichtigungen sind für diese Sitzung aktiviert.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Benachrichtigungen sind für diese Sitzung nicht aktiviert. 
-\nBitte überprüfe die Einstellungen für Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Benachrichtigungen sind für diese Sitzung nicht aktiviert.
+\nBitte überprüfe die Einstellungen für ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktiviere</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element benutzt Google Play Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} benutzt Google Play Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Repariere Play-Dienste</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase-Token</string>
@@ -1212,17 +1212,17 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Dienst konnte nicht neugestartet werden</string>
     <string name="settings_troubleshoot_test_service_boot_title">Starte beim Hochfahren</string>
     <string name="settings_troubleshoot_test_service_boot_success">Dienst wird starten, wenn das Gerät neu gestartet wird.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Dieser Dienst wird nicht starten, wenn das Gerät neu gestartet wird. Du wirst keine Benachrichtigungen bekommen bis Element einmal geöffnet wurde.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Dieser Dienst wird nicht starten, wenn das Gerät neu gestartet wird. Du wirst keine Benachrichtigungen bekommen bis ${app_name} einmal geöffnet wurde.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktiviere das Starten beim Hochfahren</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Überprüfe Hintergrund-Einschränkungen</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Hintergrund-Einschränkungen sind für Element deaktiviert. Dieser Test sollte über mobile Daten ausgeführt werden (kein WLAN).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Hintergrund-Einschränkungen sind für ${app_name} deaktiviert. Dieser Test sollte über mobile Daten ausgeführt werden (kein WLAN).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Hintergrund-Einschränkungen sind für Element aktiviert.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Hintergrund-Einschränkungen sind für ${app_name} aktiviert.
 \nDie App wird aggressiv eingeschränkt, während sie im Hintergrund arbeiten möchte. Dies könnte Benachrichtigungen beeinflussen.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Einschränkungen deaktivieren</string>
     <string name="settings_troubleshoot_test_battery_title">Batterieoptimierung</string>
-    <string name="settings_troubleshoot_test_battery_success">Element wird nicht von Batterieoptimierungen beeinflusst.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} wird nicht von Batterieoptimierungen beeinflusst.</string>
     <string name="settings_notification_troubleshoot">Fehler bei Benachrichtigungen finden</string>
     <string name="settings_troubleshoot_diagnostic">Diagnose von Fehlern</string>
     <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose ist OK. Wenn du immer noch keine Benachrichtigungen bekommst, sende bitte einen Fehlerbericht, um uns beim nachforschen zu helfen.</string>
@@ -1232,8 +1232,8 @@
     <string name="settings_troubleshoot_test_battery_failed">Wenn ein:e Benutzer:in ein abgestecktes Gerät mit ausgeschaltetem Bildschirm eine Weile nicht bewegt, wechselt es in den Bereitschaftsmodus. Dies hindert Apps daran, auf das Netzwerk zuzugreifen und verzögert die Ausführung von Aufgaben, Synchronisierungen und Standard-Alarmen.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoriere Optimierungen</string>
     <string name="startup_notification_fdroid_battery_optim_title">Hintergrundverbindung</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element muss eine Hintergrundverbindung (nur geringe Belastung) aufrechterhalten, um verlässliche Benachrichtigungen zu erhalten.
-\nAuf dem nächsten Bildschirm wirst du gefragt, ob du Element erlauben möchtest im Hintergrund zu laufen. Bitte akzeptieren.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} muss eine Hintergrundverbindung (nur geringe Belastung) aufrechterhalten, um verlässliche Benachrichtigungen zu erhalten.
+\nAuf dem nächsten Bildschirm wirst du gefragt, ob du ${app_name} erlauben möchtest im Hintergrund zu laufen. Bitte akzeptieren.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Berechtigung gewähren</string>
     <string name="account_email_error">Beim Verifizieren deiner E-Mail-Adresse trat ein Fehler auf.</string>
     <string name="account_phone_number_error">Beim Verifizieren deiner Telefonnummer trat ein Fehler auf.</string>
@@ -1259,7 +1259,7 @@
     <string name="notification_silent">Stumm</string>
     <string name="passphrase_empty_error_message">Bitte eine Passphrase eingeben</string>
     <string name="passphrase_passphrase_too_weak">Passphrase ist zu schwach</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Bitte lösche die Passphrase, wenn Element einen Wiederherstellungs-Schlüssel erzeugen soll.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Bitte lösche die Passphrase, wenn ${app_name} einen Wiederherstellungs-Schlüssel erzeugen soll.</string>
     <string name="keys_backup_no_session_error">Keine Matrix-Sitzung verfügbar</string>
     <string name="keys_backup_setup_step1_title">Verliere nie wieder verschlüsselte Nachrichten</string>
     <string name="keys_backup_setup_step2_button_title">Setze Passphrase</string>
@@ -1282,12 +1282,12 @@
     <string name="keys_backup_settings_delete_backup_error">Konnte Sicherung nicht löschen (%s)</string>
     <string name="keys_backup_settings_delete_confirm_title">Lösche Sicherung</string>
     <string name="settings_notification_by_event">Präferenz der Benachrichtigungen nach Ereignis</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nDieser Fehler ist außerhalb von Element passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den/die Durchschnittsnutzer:in nicht betreffen.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nDieser Fehler liegt nicht unter der Kontrolle von Element. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nDieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nDieser Fehler ist außerhalb von ${app_name} passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den/die Durchschnittsnutzer:in nicht betreffen.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nDieser Fehler liegt nicht unter der Kontrolle von ${app_name}. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nDieser Fehler ist außerhalb von ${app_name} passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
     <string name="settings_cryptography_manage_keys">Verwaltung der Krypto-Schlüssel</string>
     <string name="encryption_settings_manage_message_recovery_summary">Schlüssel-Sicherung verwalten</string>
     <string name="keys_backup_setup_step1_description">Nachrichten in verschlüsselten Räumen sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der/die Empfänger!nnen haben die Schlüssel um diese Nachrichten zu lesen. 
@@ -1398,7 +1398,7 @@
     <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
     <string name="autodiscover_invalid_response">Ungültige Antwort beim Entdecken des Home-Servers</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Serveroptionen vervollständigen</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element hat eine benutzerdefinierte Serverkonfiguration für die Domäne deines Benutzernamens gefunden \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} hat eine benutzerdefinierte Serverkonfiguration für die Domäne deines Benutzernamens gefunden \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Nutze Konfiguration</string>
     <string name="notification_sync_init">Initialisiere Dienst</string>
@@ -1493,7 +1493,7 @@
     <string name="please_wait">Bitte warten…</string>
     <string name="group_all_communities">Alle Communities</string>
     <string name="room_preview_no_preview">Für diesen Raum kann keine Vorschau angezeigt werden</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Die Vorschau von öffentlichen Räumen wird von Element noch nicht unterstützt</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Die Vorschau von öffentlichen Räumen wird von ${app_name} noch nicht unterstützt</string>
     <string name="fab_menu_create_room">Räume</string>
     <string name="fab_menu_create_chat">Direktnachrichten</string>
     <string name="create_room_title">Neuer Raum</string>
@@ -1626,13 +1626,13 @@
     <string name="settings_call_ringtone_use_default_stun_sum">Wir nutzen %s als Assistenten wenn dein Home-Server keinen anbietet (Deine IP-Adresse wird während des Anrufs geteilt)</string>
     <string name="invite_no_identity_server_error">Führe einen Identitätsserver in deinen Einstellungen hinzu um diese Aktion auszuführen.</string>
     <string name="settings_add_3pid_confirm_password_title">Passwort bestätigen</string>
-    <string name="settings_add_3pid_flow_not_supported">Du kannst dies nicht auf einem mobilen Element tun</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Du kannst dies nicht auf einem mobilen ${app_name} tun</string>
     <string name="settings_add_3pid_authentication_needed">Authentifizierung benötigt</string>
     <string name="settings_background_fdroid_sync_mode">Hintergrund-Synchronisierungsmodus</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element wird sich im Hintergrund auf eine Art synchronisieren die Ressourcen des Geräts (Akku) schont. 
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} wird sich im Hintergrund auf eine Art synchronisieren die Ressourcen des Geräts (Akku) schont.
 \nAbhängig vom Ressourcen-Status deines Geräts kann dein System die Synchronisierung verschieben.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element wird sich im Hintergrund periodisch zu einem bestimmten Zeitpunkt synchronisieren (konfigurierbar).
-\nDies wird Funk- und Akkunutzung beeinflussen. Es wird eine permanente Benachrichtigung geben, die sagt, dass Element auf Ereignisse lauscht.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} wird sich im Hintergrund periodisch zu einem bestimmten Zeitpunkt synchronisieren (konfigurierbar).
+\nDies wird Funk- und Akkunutzung beeinflussen. Es wird eine permanente Benachrichtigung geben, die sagt, dass ${app_name} auf Ereignisse lauscht.</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nDie Synchronisierung kann aufgrund deiner Ressourcen (Akku) oder Gerätezustands (schlafend) verschoben werden.</string>
     <string name="settings_integrations">Integrationen</string>
@@ -1722,7 +1722,7 @@
     <string name="content_reported_as_inappropriate_content">Dieser Inhalt wurde als unangebracht gemeldet.
 \n 
 \nWenn du keine weiteren Inhalte dieses/r Nutzers/in sehen möchtest, kannst sie/ihn ignorieren, um jene Nachrichten auszublenden.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element benötigt Berechtigungen, um deine E2E Schlüssel zu speichern.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} benötigt Berechtigungen, um deine E2E Schlüssel zu speichern.
 \n
 \nBitte erlaube den Zugriff im nächsten Pop-Up sodass du deine Schlüssel manuell exportieren kannst.</string>
     <string name="no_network_indicator">Aktuell besteht keine Netzwerkverbindung</string>
@@ -1869,7 +1869,7 @@
 \nMelde dich erneut an, um auf deine Kontodaten und Nachrichten zuzugreifen.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Du verlierst den Zugriff auf verschlüsselte Nachrichten, außer, du meldest dich an, um den Verschlüsselungsschlüssel wiederherzustellen.</string>
     <string name="soft_logout_clear_data_dialog_submit">Daten löschen</string>
-    <string name="soft_logout_sso_not_same_user_error">Die aktuelle Sitzung gehört dem/der Benutzer!n%1$s. Die angegebenen Anmeldeinformationen sind von Benutzer!n %2$s. Dies wird nicht von Element unterstützt.
+    <string name="template_soft_logout_sso_not_same_user_error">Die aktuelle Sitzung gehört dem/der Benutzer!n%1$s. Die angegebenen Anmeldeinformationen sind von Benutzer!n %2$s. Dies wird nicht von ${app_name} unterstützt.
 \nBitte zuerst die Daten löschen und dann erneut anmelden.</string>
     <string name="permalink_malformed">matrix.to-Link fehlerhaft</string>
     <string name="bug_report_error_too_short">Die Beschreibung ist zu kurz</string>
@@ -1887,7 +1887,7 @@
     <string name="devices_other_devices">Andere Sitzungen</string>
     <string name="autocomplete_limited_results">Zeigt nur die ersten Ergebnisse, gib mehr Buchstaben ein…</string>
     <string name="settings_developer_mode_fail_fast_title">Ausfallsicher</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element kann häufiger abstürzen, wenn ein unerwarteter Fehler auftritt</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} kann häufiger abstürzen, wenn ein unerwarteter Fehler auftritt</string>
     <string name="command_description_shrug">Stellt einer Klartextnachricht ¯\\_(ツ)_/¯ voran</string>
     <string name="create_room_encryption_title">Aktiviere Verschlüsselung</string>
     <string name="create_room_encryption_description">Nach der Aktivierung kann die Verschlüsselung nicht deaktiviert werden.</string>
@@ -1957,9 +1957,9 @@
     <string name="room_member_power_level_admin_in">Admin in %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderation in %1$s</string>
     <string name="room_member_jump_to_read_receipt">Springen &amp; als gelesen markieren</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element kann keine Ereignisse vom Typ \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element beherrscht keine Nachrichten vom Typ \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element ist beim verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} kann keine Ereignisse vom Typ \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} beherrscht keine Nachrichten vom Typ \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} ist beim verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen</string>
     <string name="unignore">Nicht ignorieren</string>
     <string name="verify_cannot_cross_sign">Diese Sitzung kann diese Verifizierung nicht mit deinen anderen Sitzungen teilen.
 \nDie Überprüfung wird lokal gespeichert und in einer zukünftigen Version der App freigegeben.</string>
@@ -2055,7 +2055,7 @@
     <string name="keys_backup_restore_success_title_already_up_to_date">Schlüssel sind bereits aktuell!</string>
     <string name="spoiler">Spoiler</string>
     <string name="room_member_power_level_custom_in">Benutzerdefiniert (%1$d) in %2$s</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Schlüsselanforderungen</string>
     <string name="e2e_use_keybackup">Schalte den verschlüsselten Nachrichtenverlauf frei</string>
     <string name="refresh">Neu laden</string>
@@ -2156,13 +2156,13 @@
     <string name="media_file_added_to_gallery">Datei wurde der Galerie hinzugefügt</string>
     <string name="error_adding_media_file_to_gallery">Datei konnte nicht zur Galerie hinzugefügt werden</string>
     <string name="change_password_summary">Neues Benutzerpasswort festlegen…</string>
-    <string name="use_other_session_content_description">Nutze die neueste Version von Element auf deinen anderen Geräten, Element Web, Element Desktop, Element iOS, Element für Android oder einen anderen cross-signing fähigen Matrix client</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} für Android oder einen anderen cross-signing fähigen Matrix client</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">oder einen anderen cross-signing fähigen Matrix Client</string>
-    <string name="use_latest_app">Nutze die neueste Version von Element auf deinen anderen Geräten:</string>
+    <string name="template_use_latest_app">Nutze die neueste Version von ${app_name} auf deinen anderen Geräten:</string>
     <string name="command_description_discard_session">Erzwingt das Verwerfen der aktuell ausgehende Gruppensitzung in einem verschlüsseltem Raum</string>
     <string name="command_description_discard_session_not_handled">Wird nur in verschlüsselten Räumen unterstützt</string>
     <string name="enter_secret_storage_passphrase_or_key">Benutze deine %1$s oder deinen %2$s um fortzufahren.</string>
@@ -2203,7 +2203,7 @@
     <string name="pause_video">Pause</string>
     <string name="action_copy">Kopieren</string>
     <string name="bottom_action_notification">Benachrichtigungen</string>
-    <string name="call_failed_no_connection">Element-Anruf fehlgeschlagen</string>
+    <string name="template_call_failed_no_connection">${app_name}-Anruf fehlgeschlagen</string>
     <string name="play_video">Abspielen</string>
     <string name="dismiss">Ablehnen</string>
     <string name="dialog_title_success">Erfolg</string>
@@ -2308,11 +2308,11 @@
     <string name="choose_locale_loading_locales">Lade verfügbare Sprachen…</string>
     <string name="open_terms_of">Öffne AGBs von %s</string>
     <string name="disconnect_identity_server_dialog_content">Trenne Verbingung zu Identitätsserver %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Dieser Identitätsserver ist veraltet. Element unterstützt nur API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Dieser Identitätsserver ist veraltet. ${app_name} unterstützt nur API V2.</string>
     <string name="identity_server_error_outdated_home_server">Diese Operation is nicht möglich. Der Homeserver ist veraltet.</string>
     <string name="identity_server_error_no_identity_server_configured">Bitte konfiguriere zuerst einen Identitätsserver.</string>
     <string name="identity_server_error_terms_not_signed">Bitte akzeptiere zuerst die AGB des Identitätsservers in den Einstellungen.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Deiner Privatssphäre wegen unterstützt Element nur das Senden gehashter Emailaddressen und Telefonnummern.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Deiner Privatssphäre wegen unterstützt ${app_name} nur das Senden gehashter Emailaddressen und Telefonnummern.</string>
     <string name="identity_server_error_binding_error">Die Assoziierung ist fehlgeschlagen.</string>
     <string name="identity_server_error_no_current_binding_error">Für diese Kennung gibt es aktuell keine Assoziierung.</string>
     <string name="identity_server_set_default_notice">Dein Homeserver (%1$s) schlägt %2$s als Identitätsserver vor</string>
@@ -2454,7 +2454,7 @@
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du hast keine Berechtigung ein Konferenzgespräch zu starten</string>
     <string name="settings_security_pin_code_notifications_summary_on">Zeige Details wie Raumnamen und Nachrichteninhalt.</string>
     <string name="settings_security_pin_code_notifications_title">Zeige Inhalt in Benachrichtigungen</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-Code ist die einzige Möglichkeit Element zu entsperren.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN-Code ist die einzige Möglichkeit ${app_name} zu entsperren.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Aktiviere Gerät-spezifische Biometrie wie Fingerabdrücke und Gesichtserkennung.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Biometrie aktivieren</string>
     <string name="settings_security_application_protection_screen_title">Schutz konfigurieren</string>
@@ -2492,8 +2492,8 @@
     <string name="settings_troubleshoot_test_notification_notice">Bitte klicke auf die Benachrichtigung. Wenn die Benachrichtigung nicht angezeigt wird, überprüfe die Systemeinstellungen.</string>
     <string name="settings_troubleshoot_test_push_notification_content">Du siehst die Benachrichtigung! Klick mich!</string>
     <string name="settings_troubleshoot_test_notification_title">Benachrichtigungsanzeige</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Bei jedem Öffnen von Element ist der PIN-Code erforderlich.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN-Code ist erforderlich, nachdem Element 2 Minuten lang nicht verwendet wurde.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Bei jedem Öffnen von ${app_name} ist der PIN-Code erforderlich.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">PIN-Code ist erforderlich, nachdem ${app_name} 2 Minuten lang nicht verwendet wurde.</string>
     <string name="settings_security_pin_code_grace_period_title">Fordere PIN nach 2 Minuten an</string>
     <string name="settings_security_pin_code_notifications_summary_off">Zeige nur die Anzahl von ungelesenen Nachrichten in einer einfachen Benachrichtigung.</string>
     <string name="attachment_type_dialog_title">Bild hinzufügen von</string>
@@ -2554,8 +2554,8 @@
     <string name="user_code_my_code">Mein Code</string>
     <string name="user_code_scan">Scanne einen QR code</string>
     <string name="not_a_valid_qr_code">Das ist kein korrekter QR-Code von Matrix</string>
-    <string name="invite_friends_rich_title">🔐️ Komm mit zu Element</string>
-    <string name="invite_friends_text">Hey, schreibe mit mir auf Element: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Komm mit zu ${app_name}</string>
+    <string name="template_invite_friends_text">Hey, schreibe mit mir auf ${app_name}: %s</string>
     <string name="invite_friends">Freunde einladen</string>
     <string name="add_people">Leute hinzufügen</string>
     <string name="topic_prefix">"Thema "</string>
@@ -2639,7 +2639,7 @@
     <string name="room_permissions_send_m_room_server_acl_events">m.room.server_acl-Ereignisse senden</string>
     <string name="room_permissions_change_permissions">Berechtigungen ändern</string>
     <string name="authentication_error">Authentifizierung fehlgeschlagen</string>
-    <string name="re_authentication_default_confirm_text">Deine Anmeldeinformationen müssen für Element eingegeben werden, um diese Aktion auszuführen.</string>
+    <string name="template_re_authentication_default_confirm_text">Deine Anmeldeinformationen müssen für ${app_name} eingegeben werden, um diese Aktion auszuführen.</string>
     <string name="re_authentication_activity_title">Erneute Authentifizierung erforderlich</string>
     <string name="failed_to_initialize_cross_signing">Cross Signing konnte nicht eingerichtet werden</string>
     <string name="error_unauthorized">Nicht autorisierte, fehlende gültige Authentifizierungsdaten</string>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index ad7c99fd44..1ae7629fef 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -207,7 +207,7 @@
     <string name="room_info_room_name">Όνομα δωματίου</string>
     <string name="room_info_room_topic">Θέμα δωματίου</string>
     <string name="settings_call_category">Κλήσεις</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Χρήση του προεπιλεγμένου ήχου κλήσης του Element για τις εισερχόμενες κλήσεις</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Χρήση του προεπιλεγμένου ήχου κλήσης του ${app_name} για τις εισερχόμενες κλήσεις</string>
     <string name="settings_call_ringtone_title">Ήχος εισερχομένων κλήσεων</string>
     <string name="settings_call_ringtone_dialog_title">Επιλέξτε ήχο κλήσης:</string>
     <string name="call">Κλήση</string>
@@ -233,8 +233,8 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Ενεργοποίηση</string>
     <string name="settings_troubleshoot_test_device_settings_title">Ρυθμίσεις συσκευής.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Οι ειδοποιήσεις είναι ενεργοποιημένες για αυτή την συσκευή.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Οι ειδοποιήσεις δεν επιτρέπονται για αυτή την συσκευή. 
-\nΠαρακαλώ ελέγξτε τις ρυθμίσεις του Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Οι ειδοποιήσεις δεν επιτρέπονται για αυτή την συσκευή.
+\nΠαρακαλώ ελέγξτε τις ρυθμίσεις του ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ενεργοποίηση</string>
     <string name="settings_devices_list">Συσκευές</string>
     <string name="settings_inline_url_preview">Προεπισκόπιση συνδέσμων</string>
@@ -514,7 +514,7 @@
     <string name="call_select_sound_device">Αλλαγή Συσκευής Ήχου</string>
     <string name="call_failed_no_connection_description">Αποτυχία σύνδεσης σε πραγματικό χρόνο.
 \nΖητήστε από τον διαχειριστή του οικιακού σας διακομιστή να διαμορφώσει έναν διακομιστή TURN ώστε οι κλήσεις να λειτουργούν αξιόπιστα.</string>
-    <string name="call_failed_no_connection">Η Κλήση Element Aπέτυχε</string>
+    <string name="template_call_failed_no_connection">Η Κλήση ${app_name} Aπέτυχε</string>
     <string name="call_failed_dont_ask_again">Να μην ερωτηθώ ξανά</string>
     <string name="call_failed_no_ice_use_alt">Προσπαθήστε να χρησιμοποιήσετε το %s</string>
     <string name="call_failed_no_ice_description">Παρακαλώ ζητήστε απο τον διαχειριστή του ιδιέταιρου διακομιστή (%1$s) να ρυθμίσει ένα διακομιστή TURN ώστε οι κλήσεις να δουλέυουν αξιόπιστα.
@@ -545,7 +545,7 @@
     <string name="call_notification_hangup">Τέλος κλήσης</string>
     <string name="ongoing_conference_call">Τρέχουσα κλήση συνδιάσκεψης.
 \nΣυνδεθείτε με %1$s ή %2$s</string>
-    <string name="no_contact_access_placeholder">Δεν επιτρέψατε στο Element την πρόσβαση στις επαφές σας</string>
+    <string name="template_no_contact_access_placeholder">Δεν επιτρέψατε στο ${app_name} την πρόσβαση στις επαφές σας</string>
     <string name="bottom_action_notification">Ειδοποιήσεις</string>
     <string name="copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
     <string name="action_add">Πρόσθεση</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 32f36d429b..54fa6c4007 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -338,7 +338,7 @@
     <string name="direct_chats_header">Interparoloj</string>
     <string name="local_address_book_header">Loka adresaro</string>
     <string name="no_conversation_placeholder">Neniuj interparoloj</string>
-    <string name="no_contact_access_placeholder">Vi ne permesis al Element aliron al viaj lokaj kontaktoj</string>
+    <string name="template_no_contact_access_placeholder">Vi ne permesis al ${app_name} aliron al viaj lokaj kontaktoj</string>
     <string name="no_result_placeholder">Neniuj rezultoj</string>
     <string name="people_no_identity_server">Neniu identiga servilo estas agordita.</string>
     <string name="rooms_header">Ĉambroj</string>
@@ -508,11 +508,11 @@
     <string name="settings_background_sync">Fona spegulado</string>
     <string name="settings_background_fdroid_sync_mode">Reĝimo de fona spegulado</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimumigita por baterio</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element spegulos fone, per maniero konservanta la limigitajn rimedojn de la aparato (ĉefe la baterion).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} spegulos fone, per maniero konservanta la limigitajn rimedojn de la aparato (ĉefe la baterion).
 \nDepende de la stato de la rimedoj de via aparato, la spegulado povus esti prokrastita de la operaciumo.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimumigita por tujeco</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element spegulos fone, ripete, je preciza tempo (agordebla).
-\nĈi tio influos uzadon de baterio kaj radiilo, kaj aperigos ĉiaman sciigon pri tio, ke Element aŭskultas okazojn.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} spegulos fone, ripete, je preciza tempo (agordebla).
+\nĈi tio influos uzadon de baterio kaj radiilo, kaj aperigos ĉiaman sciigon pri tio, ke ${app_name} aŭskultas okazojn.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Neniu fona spegulado</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Vi ne sciiĝos pri envenaj mesaĝoj dum la aplikaĵo estas fone.</string>
     <string name="settings_background_sync_update_error">Malsukcesis ĝisdatigi agordojn.</string>
@@ -604,7 +604,7 @@
     <string name="e2e_re_request_encryption_key">Repeti ĉifrajn ŝlosilojn de aliaj viaj salutaĵoj.</string>
     <string name="e2e_re_request_encryption_key_sent">Peto de ŝlosilo sendiĝis.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Peto sendiĝis</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Bonvolu ruli Elementon sur alia aparato kiu scipovas malĉifri la mesaĝon, por ke ĝi povu sendi la ŝlosilojn al ĉi tiu salutaĵo.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Bonvolu ruli ${app_name} sur alia aparato kiu scipovas malĉifri la mesaĝon, por ke ĝi povu sendi la ŝlosilojn al ĉi tiu salutaĵo.</string>
     <string name="incoming_call">Envena voko</string>
     <string name="incoming_video_call">Envena vidvoko</string>
     <string name="incoming_voice_call">Envena voĉvoko</string>
@@ -614,22 +614,22 @@
     <string name="media_picker_both_capture_title">Foti aŭ filmi</string>
     <string name="media_picker_cannot_record_video">Ne povas filmi</string>
     <string name="permissions_rationale_popup_title">Informoj</string>
-    <string name="permissions_rationale_msg_storage">Element bezonas permeson aliri viajn fotojn kaj filmojn, por sendi kaj konservi kunsendaĵojn.
+    <string name="template_permissions_rationale_msg_storage">${app_name} bezonas permeson aliri viajn fotojn kaj filmojn, por sendi kaj konservi kunsendaĵojn.
 \n
 \nBonvolu permesi aliron per la sekva ŝprucpeto, por povi sendi dosierojn el via telefono.</string>
-    <string name="permissions_rationale_msg_camera">Element bezonas permeson aliri vian filmilon por foti kaj vidvoki.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} bezonas permeson aliri vian filmilon por foti kaj vidvoki.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nBonvolu permesi aliron per la sekva ŝprucpeto, por ebligi la vokon."</string>
-    <string name="permissions_rationale_msg_record_audio">Element bezonas permeson aliri vian mikrofonon por fari voĉvokojn.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} bezonas permeson aliri vian mikrofonon por fari voĉvokojn.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nBonvolu permesi aliron per la sekva ŝprucpeto, por ebligi la vokon."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element bezonas premeson aliri viajn filmilon kaj mikrofonon por fari vidvokojn. 
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} bezonas premeson aliri viajn filmilon kaj mikrofonon por fari vidvokojn.
 \n 
 \nBonvolu permesi aliron per la sekva ŝprucpeto, por ebligi la vokon.</string>
-    <string name="permissions_rationale_msg_contacts">Element povas kontroli vian adresaron por trovi aliajn uzantojn de Matrix per iliaj retpoŝtadresoj kaj telefonnumeroj. Se vi konsentas kunhavi vian adresaron por tiu celo, bonvolu permesi aliron per la sekva ŝprucpeto.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element povas kontroli vian adresaron por trovi aliajn uzantojn de Matrix per iliaj retpoŝtadresoj kaj telefonnumeroj.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} povas kontroli vian adresaron por trovi aliajn uzantojn de Matrix per iliaj retpoŝtadresoj kaj telefonnumeroj. Se vi konsentas kunhavi vian adresaron por tiu celo, bonvolu permesi aliron per la sekva ŝprucpeto.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} povas kontroli vian adresaron por trovi aliajn uzantojn de Matrix per iliaj retpoŝtadresoj kaj telefonnumeroj.
 \n
 \nĈu vi konsentas kunhavi vian adresaron por tiu celo\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Pardonu. Ago ne efektiviĝis, pro mankantaj permesoj</string>
@@ -741,9 +741,9 @@
     <string name="verify_cannot_cross_sign">Tiu ĉi salutaĵo ne povas konigi ĉi tiun kontrolon al aliaj viaj salutaĵoj.
 \nLa kontrolo konserviĝos loke kaj estos konigota de venonta versio de la aplikaĵo.</string>
     <string name="unignore">Reatenti</string>
-    <string name="rendering_event_error_exception">Element renkontis problemon bildigante enhavon de evento kun la identigilo «%1$s»</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Elemento ne traktas mesaĝojn de speco «%1$s»</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element ne traktas eventojn de speco «%1$s»</string>
+    <string name="template_rendering_event_error_exception">${app_name} renkontis problemon bildigante enhavon de evento kun la identigilo «%1$s»</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} ne traktas mesaĝojn de speco «%1$s»</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} ne traktas eventojn de speco «%1$s»</string>
     <string name="room_member_jump_to_read_receipt">Salti al legokonfirmo</string>
     <string name="room_member_power_level_custom_in">Propra (%1$d) en %2$s</string>
     <string name="room_member_power_level_default_in">Ordinara en %1$s</string>
@@ -827,7 +827,7 @@
     <string name="create_room_encryption_description">Post ŝalto, ne eblas ĉifradon malŝalti.</string>
     <string name="create_room_encryption_title">Ŝalti ĉifradon</string>
     <string name="command_description_shrug">Antaŭmetas ¯\\_(ツ)_/¯ al platteksta mesaĝo</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element povas fiaski pli ofte kiam okazas neatendita eraro</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} povas fiaski pli ofte kiam okazas neatendita eraro</string>
     <string name="autocomplete_limited_results">Montras nur la unuajn rezultojn; tajpu pliajn literojn…</string>
     <string name="devices_other_devices">Aliaj salutaĵoj</string>
     <string name="devices_current_device">Nuna salutaĵo</string>
@@ -842,7 +842,7 @@
     <string name="notification_initial_sync">Komenca spegulado…</string>
     <string name="bug_report_error_too_short">La priskribo estas tro mallonga</string>
     <string name="permalink_malformed">Via ligilo al matrix.to estis misformita</string>
-    <string name="soft_logout_sso_not_same_user_error">Ĉi tiu salutaĵo estas por uzanto %1$s kaj vi donas salutilojn por uzanto %2$s. Element ne subtenas tion.
+    <string name="template_soft_logout_sso_not_same_user_error">Ĉi tiu salutaĵo estas por uzanto %1$s kaj vi donas salutilojn por uzanto %2$s. ${app_name} ne subtenas tion.
 \nBonvolu unue vakigi datumojn, kaj poste saluti alian konton.</string>
     <string name="soft_logout_clear_data_dialog_submit">Vakigi datumojn</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Vi perdos aliron al sekuraj mesaĝoj, se vi ne salutos por rehavi viajn ĉifrajn ŝlosilojn.</string>
@@ -980,7 +980,7 @@
     <string name="room_list_quick_actions_notifications_all_noisy">Ĉiuj mesaĝoj (laŭte)</string>
     <string name="message_ignore_user">Malatenti uzanton</string>
     <string name="no_network_indicator">Estas neniu retkonekto nun</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element bezonas rajton konservi viajn tutvoje ĉifrajn ŝlosilojn surdiske.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} bezonas rajton konservi viajn tutvoje ĉifrajn ŝlosilojn surdiske.
 \n
 \nBonvolu permesi aliron per la venonta ŝprucpeto, por povi elporti viajn ŝlosilojn permane.</string>
     <string name="content_reported_as_inappropriate_content">Ĉi tiu enhavo estis raportita kiel maltaŭga.
@@ -1122,7 +1122,7 @@
     <string name="create_room_title">Nova ĉambro</string>
     <string name="fab_menu_create_chat">Rektaj interparoloj</string>
     <string name="fab_menu_create_room">Ĉambroj</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Antaŭrigardo al ĉambro legebla de ĉiuj ankoraŭ ne estas subtenata de Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Antaŭrigardo al ĉambro legebla de ĉiuj ankoraŭ ne estas subtenata de ${app_name}</string>
     <string name="room_preview_no_preview">Ne eblas antaŭrigardi ĉi tiun ĉambron</string>
     <string name="group_all_communities">Ĉiuj komunumoj</string>
     <string name="please_wait">Bonvolu atendi…</string>
@@ -1318,7 +1318,7 @@
 \nSekure savkopiu viajn ŝlosilojn por eviti ilian perdon.</string>
     <string name="keys_backup_setup_step1_title">Neniam perdu ĉifritajn mesaĝojn</string>
     <string name="keys_backup_no_session_error">Neniu salutaĵo de Matrix estas disponebla</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Bonvolu forigi la pasfrazon se vi volas, ke Element estigu novan rehavan ŝlosilon.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Bonvolu forigi la pasfrazon se vi volas, ke ${app_name} estigu novan rehavan ŝlosilon.</string>
     <string name="passphrase_passphrase_too_weak">Pasfrazo estas tro malforta</string>
     <string name="passphrase_empty_error_message">Bonvolu enigi pasfrazon</string>
     <string name="passphrase_passphrase_does_not_match">Pasfrazo ne akordas</string>
@@ -1685,17 +1685,17 @@
     <string name="settings_data_save_mode_summary">Datumkonserva reĝimo aplikas sepecialan filtron al sciigoj pri ĉeesto kaj tajpado.</string>
     <string name="settings_data_save_mode">Datumkonserva reĝimo</string>
     <string name="settings_opt_in_of_analytics_ok">Jes, mi volas helpi!</string>
-    <string name="settings_opt_in_of_analytics_prompt">Bonvolu ŝalti analizon por helpi la ni plibonigi ELementon.</string>
-    <string name="settings_opt_in_of_analytics_summary">Element kolektas sennomajn analizojn por helpi al ni plibonigi la aplikaĵon.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Bonvolu ŝalti analizon por helpi la ni plibonigi ${app_name}.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} kolektas sennomajn analizojn por helpi al ni plibonigi la aplikaĵon.</string>
     <string name="settings_opt_in_of_analytics">Sendi datumojn de analizo</string>
     <string name="settings_analytics">Analizo</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Doni permeson</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element bezonas malpezan fonan konekton por havi dependeblajn sciigojn.
-\nLa sekva ekrano petos ĉiam ruli Elementon fone; bonvolu akcepti.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} bezonas malpezan fonan konekton por havi dependeblajn sciigojn.
+\nLa sekva ekrano petos ĉiam ruli ${app_name} fone; bonvolu akcepti.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Fona konekto</string>
     <string name="startup_notification_privacy_button_other">Elekti alian elekteblon</string>
     <string name="startup_notification_privacy_button_grant">Doni permeson</string>
-    <string name="startup_notification_privacy_message">Element povas ruliĝi fone por mastrumi viajn sciigojn sekure kaj private. Tio povas influi uzadon de la baterio.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} povas ruliĝi fone por mastrumi viajn sciigojn sekure kaj private. Tio povas influi uzadon de la baterio.</string>
     <string name="startup_notification_privacy_title">Privateco de sciigoj</string>
     <string name="settings_discovery_manage">Administri viajn agordojn de trovado.</string>
     <string name="settings_discovery_category">Trovado</string>
@@ -1758,17 +1758,17 @@
     <string name="settings_notification_privacy_reduced">Malplia privateco</string>
     <string name="settings_notification_privacy_normal">Normala</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Malatenti optimumigon</string>
-    <string name="settings_troubleshoot_test_battery_success">Optimumigo de baterio ne influas sur Element.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Optimumigo de baterio ne influas sur ${app_name}.</string>
     <string name="settings_troubleshoot_test_battery_title">Optimumigo de baterio</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Malŝalti limigojn</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Fonaj limigoj estas ŝaltitaj por Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Fonaj limigoj estas ŝaltitaj por ${app_name}.
 \nAgado de la aplikaĵo estos akre limigita dum ĝi estas fone, kaj tio povus influi sciigojn.
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Fonaj limigoj estas malŝaltitaj por Element. Ĉi tiu testo devus esti rulata kun telefonaj datumoj (ne kun Vifio).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Fonaj limigoj estas malŝaltitaj por ${app_name}. Ĉi tiu testo devus esti rulata kun telefonaj datumoj (ne kun Vifio).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Kontroli fonajn limigojn</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Ŝalti ekadon kune kun aparato</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">La servo ne ekos kiam la aparato reekos, kaj vi ne ricevos sciigojn ĝis vi mem Elementon malfermos.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">La servo ne ekos kiam la aparato reekos, kaj vi ne ricevos sciigojn ĝis vi mem ${app_name} malfermos.</string>
     <string name="settings_troubleshoot_test_service_boot_success">La servo ekos kiam la aparato reekos.</string>
     <string name="settings_troubleshoot_test_service_boot_title">Eki kune kun aparato</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Servo malsukcesis reeki</string>
@@ -1807,19 +1807,19 @@
     <string name="settings_troubleshoot_test_token_registration_success">Ĵetono de FCM sukcese registriĝis ĉe la hejmservilo.</string>
     <string name="settings_troubleshoot_test_token_registration_title">Registrado de ĵetono</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Aldoni konton</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nTiu ĉi eraro ne dependas de Element. La telefono ne havas konton de Google. Bonvolu malfermi la administrilon de kontoj kaj aldoni konton de Google.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nTiu ĉi eraro ne dependas de Element. Ĝi povas okazi pro kelkaj kialoj. Eble ĝi funkcios se vi reprovos poste. Vi ankaŭ povas kontroli, ĉu la servo de Google Play ne estas datume limigita en la sistemaj agordoj, aŭ ĉu la horloĝo de via aparato ĝuste funkcias, aŭ ĉu ĝi ne okazas sur propra ROM.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nTiu ĉi eraro ne dependas de Element, kaj laŭ Google ĝi indikas, ke la aparato havas tro multajn aplikaĵojn registritajn je FCM. La eraro nur okazas kiam multegaj aplikaĵoj estas samtempe instalitaj, kaj ne devus koncerni ordinaran uzanton.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nTiu ĉi eraro ne dependas de ${app_name}. La telefono ne havas konton de Google. Bonvolu malfermi la administrilon de kontoj kaj aldoni konton de Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nTiu ĉi eraro ne dependas de ${app_name}. Ĝi povas okazi pro kelkaj kialoj. Eble ĝi funkcios se vi reprovos poste. Vi ankaŭ povas kontroli, ĉu la servo de Google Play ne estas datume limigita en la sistemaj agordoj, aŭ ĉu la horloĝo de via aparato ĝuste funkcias, aŭ ĉu ĝi ne okazas sur propra ROM.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nTiu ĉi eraro ne dependas de ${app_name}, kaj laŭ Google ĝi indikas, ke la aparato havas tro multajn aplikaĵojn registritajn je FCM. La eraro nur okazas kiam multegaj aplikaĵoj estas samtempe instalitaj, kaj ne devus koncerni ordinaran uzanton.</string>
     <string name="settings_troubleshoot_test_fcm_failed">Malsukcesis akiri ĵetonon de FCM:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_success">Ĵetono de FCM sukcese akiriĝis:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">Ĵetono de Firebase</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Ripari servojn de Google Play</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element uzas la servojn de Google Play por liveri pasivajn mesaĝojn, sed ili ne ŝajnas ĝuste agorditaj:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} uzas la servojn de Google Play por liveri pasivajn mesaĝojn, sed ili ne ŝajnas ĝuste agorditaj:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_success">APK de servoj de Google Play estas ĝisdata kaj disponebla.</string>
     <string name="settings_troubleshoot_test_play_services_title">Kontrolo de servoj de Google Play</string>
@@ -1829,8 +1829,8 @@
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Rimarku, ke iuj specoj de mesaĝoj estas silentaj (sciigas sensone).</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Propraj agordoj.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ŝalti</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Sciigoj ne estas ŝaltitaj por ĉi tiu salutaĵo.
-\nBonvolu kontroli la agordojn de Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Sciigoj ne estas ŝaltitaj por ĉi tiu salutaĵo.
+\nBonvolu kontroli la agordojn de ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Sciigoj estas ŝaltitaj por ĉi tiu salutaĵo.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Agordoj de salutaĵo.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Ŝalti</string>
@@ -1856,7 +1856,7 @@
     <string name="settings_emails_empty">Neniu retpoŝtadreso aldoniĝis al via konto</string>
     <string name="settings_emails">Retpoŝtadresoj</string>
     <string name="settings_add_3pid_authentication_needed">Necesas aŭtentikigo</string>
-    <string name="settings_add_3pid_flow_not_supported">Vi ne povas fari tion per Element por poŝtelefonoj</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Vi ne povas fari tion per ${app_name} por poŝtelefonoj</string>
     <string name="settings_add_3pid_confirm_password_title">Konfirmu vian pasvorton</string>
     <string name="settings_app_info_link_summary">Montri informojn pri aplikaĵo en sistemaj agordoj.</string>
     <string name="settings_app_info_link_title">Informoj pri aplikaĵo</string>
@@ -1974,7 +1974,7 @@
     <string name="call_select_sound_device">Elekti sonaparaton</string>
     <string name="call_failed_no_connection_description">Malsukcesis fari realtempan konekton.
 \nBonvolu peti la administranton de via hejmservilo agordi TURN-servilon, por ke vokoj funkciu dependeble.</string>
-    <string name="call_failed_no_connection">Malsukcesis voko de Element</string>
+    <string name="template_call_failed_no_connection">Malsukcesis voko de ${app_name}</string>
     <string name="matrix_only_filter">Nur kontaktoj de Matrix</string>
     <string name="bottom_action_notification">Sciigoj</string>
     <string name="dialog_title_success">Sukceso</string>
@@ -2007,20 +2007,20 @@
     <string name="settings_home_display">Hejmekrano</string>
     <string name="settings_troubleshoot_test_battery_failed">Se uzanto lasas aparaton neŝargata kaj senmova por ioma tempo, kun ekrano malaktiva, la aparato eniras dorman reĝimon. Tio malhelpas aplikaĵojn aliri la reton kaj fortenas iliajn taskojn, speguladon, kaj normalajn avertojn.</string>
     <string name="room_settings_add_homescreen_shortcut">Aldoni al hejmekrano</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Uzi implicitan sonoron de Element por envenaj vokoj</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Uzi implicitan sonoron de ${app_name} por envenaj vokoj</string>
     <string name="call_switch_camera">Baskuli filmilon</string>
     <string name="auth_pin_forgot">Forgesita numero\?</string>
     <string name="universal_link_malformed">La ligilo estis misformita</string>
     <string name="room_error_not_found">Ne povas trovi ĉi tiun ĉambron. Certiĝu, ke ĝi ekzistas.</string>
     <string name="error_opening_banned_room">Ne povas malfermi ĉambron, de kiu vi forbariĝis.</string>
     <string name="auth_pin_confirm_to_disable_title">Konfirmu personan identigan numeron por malŝalti ĝin</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Persona identiga numero estas postulata je ĉiu malfermo de Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">Persona identiga numero estas postulata post 2 minutoj de neuzado de Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Persona identiga numero estas postulata je ĉiu malfermo de ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Persona identiga numero estas postulata post 2 minutoj de neuzado de ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Postuli personan identigan numeron post 2 minutoj</string>
     <string name="settings_security_pin_code_notifications_summary_off">Montri nur la nombron de nelegitaj mesaĝoj en simpla sciigo.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Montri detalojn kiel nomojn de ĉambroj kaj enhavon de mesaĝoj.</string>
     <string name="settings_security_pin_code_notifications_title">Montri enhavon en sciigoj</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">La persona identiga numero estas la sola maniero malŝlosi Elementon.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">La persona identiga numero estas la sola maniero malŝlosi ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Ŝalti vivaĵanalizojn de la aparato, kiel ekzemple rekonadon de fingrospuroj aŭ vizaĝo.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Ŝalti vivaĵanalizojn</string>
     <string name="settings_security_pin_code_summary">Se vi volas restarigi vian personan identigan numeron, tuŝetu je «Forgesita numero» por adiaŭi kaj restarigi.</string>
@@ -2100,11 +2100,11 @@
     <string name="identity_server_set_default_submit">Uzi %1$s</string>
     <string name="identity_server_error_no_current_binding_error">Nun efektivas neniu ligo kun ĉi tiu identigilo.</string>
     <string name="identity_server_error_binding_error">Malsukcesis la ligo.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Pro via privateco, Element nur subtenas sendadon de haketitaj retpoŝtadresoj kaj telefonnumeroj.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Pro via privateco, ${app_name} nur subtenas sendadon de haketitaj retpoŝtadresoj kaj telefonnumeroj.</string>
     <string name="identity_server_error_terms_not_signed">Bonvolu unue akcepti la uzokondiĉojn de la identiga servilo per la agordoj.</string>
     <string name="identity_server_error_no_identity_server_configured">Bonvolu unue agordi identigan servilon.</string>
     <string name="identity_server_error_outdated_home_server">Ĉi tiu ago ne eblas. La hejmservilo estas eksdata.</string>
-    <string name="identity_server_error_outdated_identity_server">Ĉi tiu identiga servilo estas eksdata. Elemento suportas nur version 2 de la API.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Ĉi tiu identiga servilo estas eksdata. ${app_name} suportas nur version 2 de la API.</string>
     <string name="disconnect_identity_server_dialog_content">Ĉu malkonektiĝi de la identiga servilo %s\?</string>
     <string name="open_terms_of">Malfermi uzokondiĉojn de %s</string>
     <string name="choose_locale_loading_locales">Enlegante disponeblajn lingvojn…</string>
@@ -2141,13 +2141,13 @@
     <string name="use_recovery_key">Uzi rehavan ŝlosilon</string>
     <string name="enter_secret_storage_passphrase_or_key">Por daŭrigi, necesas via %1$s aŭ via %2$s.</string>
     <string name="command_description_discard_session_not_handled">Subtenata nur en ĉifritaj ĉambroj</string>
-    <string name="use_latest_app">Uzu la plej freŝan version de Element per aliaj viaj aparatoj:</string>
+    <string name="template_use_latest_app">Uzu la plej freŝan version de ${app_name} per aliaj viaj aparatoj:</string>
     <string name="or_other_mx_capabale_client">aŭ alian klienton de Matrix kapablan je delegaj subskriboj</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
-    <string name="app_desktop_web">Element Web (por TTT)
-\nElement Desktop (por labortablo)</string>
-    <string name="use_other_session_content_description">Uzu la plej freŝan Elementon per aliaj viaj aparatoj: Element Web, Element Desktop, Element iOS, Element por Android, aŭ alian klienton de Matrix kapablan je delegaj subskriboj</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="template_app_desktop_web">${app_name} Web (por TTT)
+\n${app_name} Desktop (por labortablo)</string>
+    <string name="template_use_other_session_content_description">Uzu la plej freŝan ${app_name} per aliaj viaj aparatoj: ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} por Android, aŭ alian klienton de Matrix kapablan je delegaj subskriboj</string>
     <string name="change_password_summary">Agordi novan pasvorton de konto…</string>
     <string name="error_saving_media_file">Ne povis konservi dosieron de vidaŭdaĵo</string>
     <string name="error_adding_media_file_to_gallery">Ne povis aldoni dosieron de vidaŭdaĵo al bildaro</string>
@@ -2212,7 +2212,7 @@
     <string name="refresh">Aktualigi</string>
     <string name="e2e_use_keybackup">Malŝlosi historion de ĉifritaj mesĝoj</string>
     <string name="settings_key_requests">Ŝlosilpetoj</string>
-    <string name="login_default_session_public_name">Element por Android</string>
+    <string name="template_login_default_session_public_name">${app_name} por Android</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Ŝlosiloj jam estas ĝisdataj!</string>
     <string name="event_redacted_by_admin_reason_with_reason">Evento foriĝis de administranto de la ĉambro, kialo: %1$s</string>
     <string name="event_redacted_by_user_reason_with_reason">Evento foriĝis de uzanto, kialo: %1$s</string>
@@ -2375,7 +2375,7 @@
     <string name="create_room_topic_hint">Temo</string>
     <string name="create_room_topic_section">Temo de ĉambro (malnepra)</string>
     <string name="create_room_name_section">Nomo de ĉambro</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element trovis propran servilan agordaron per la retnomo «%1$s» el via identigilo de uzanto:
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} trovis propran servilan agordaron per la retnomo «%1$s» el via identigilo de uzanto:
 \n%2$s</string>
     <string name="autodiscover_invalid_response">Nevalidas hejmservil-serĉanta respondo</string>
     <string name="room_permissions_notice">Elektu la rolojn bezonatajn por ŝanĝi diversajn partojn de la ĉambro</string>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 8954f517a0..b96e90fbe2 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -156,7 +156,7 @@
     <string name="local_address_book_header">Libreta local de direcciones</string>
     <string name="matrix_only_filter">Solamente contactos Matrix</string>
     <string name="no_conversation_placeholder">Sin conversaciones</string>
-    <string name="no_contact_access_placeholder">No ha permitido a Element acceder a sus contactos locales</string>
+    <string name="template_no_contact_access_placeholder">No ha permitido a ${app_name} acceder a sus contactos locales</string>
     <string name="no_result_placeholder">Sin resultados</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
@@ -292,16 +292,16 @@
     <string name="media_picker_cannot_record_video">No pudo grabar video"</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Información</string>
-    <string name="permissions_rationale_msg_storage">Element necesita tu permiso para entrar en tu almacenaje de fotos y videos para enviar y guardar archivos.\n\nPor favor permite el acceso en el siguiente mensaje para poder enviar archivos desde su dispostivo.</string>
-    <string name="permissions_rationale_msg_camera">Element necesita tu permiso para usar tu cámara para tomar fotos y hacer llamadas de video.</string>
+    <string name="template_permissions_rationale_msg_storage">${app_name} necesita tu permiso para entrar en tu almacenaje de fotos y videos para enviar y guardar archivos.\n\nPor favor permite el acceso en el siguiente mensaje para poder enviar archivos desde su dispostivo.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} necesita tu permiso para usar tu cámara para tomar fotos y hacer llamadas de video.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
-    <string name="permissions_rationale_msg_record_audio">Element necesita tu permiso para usar tu micrófono para hacer llamadas de voz.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} necesita tu permiso para usar tu micrófono para hacer llamadas de voz.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element necesita tu permiso para usar su cámara y micrófono para hacer llamadas de video.\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
-    <string name="permissions_rationale_msg_contacts">Element necesita tu permiso para leer tus contactos y directorio para encontrar a otros usuarios por sus correos electrónicos y números telefónicos.\n\nPor favor permite el acceso en el siguiente mensaje para encontrar usuarios de Element en su directorio.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element necesita tu permiso para leer los contactos de tu directorio para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} necesita tu permiso para usar su cámara y micrófono para hacer llamadas de video.\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
+    <string name="template_permissions_rationale_msg_contacts">${app_name} necesita tu permiso para leer tus contactos y directorio para encontrar a otros usuarios por sus correos electrónicos y números telefónicos.\n\nPor favor permite el acceso en el siguiente mensaje para encontrar usuarios de ${app_name} en su directorio.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} necesita tu permiso para leer los contactos de tu directorio para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
 
-¿Permitir el acceso a Element para leer tus contactos ?</string>
+¿Permitir el acceso a ${app_name} para leer tus contactos ?</string>
     <string name="permissions_action_not_performed_missing_permissions">Perdón. Operación no realizada debido a permisos faltantes</string>
     <!-- medias slider string -->
     <string name="media_slider_saved">Guardado</string>
@@ -725,7 +725,7 @@ Dispositivos desconocidos:</string>
     <string name="call_anyway">Llamar de todos modos</string>
     <string name="title_activity_verify_device">Verificar dispositivo</string>
     <string name="settings_call_category">Llamadas</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Usar el tono de llamada normal de Element para llamadas entrantes</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Usar el tono de llamada normal de ${app_name} para llamadas entrantes</string>
     <string name="settings_call_ringtone_title">Tono para llamadas entrantes</string>
     <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
     <string name="reason_hint">Razón</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index cd43ff9c68..2658fd6b88 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -341,7 +341,7 @@
     <string name="local_address_book_header">Agenda de contactos local</string>
     <string name="matrix_only_filter">Solo contactos de Matrix</string>
     <string name="no_conversation_placeholder">No hay conversaciones</string>
-    <string name="no_contact_access_placeholder">No permitiste que Element acceda a tus contactos locales</string>
+    <string name="template_no_contact_access_placeholder">No permitiste que ${app_name} acceda a tus contactos locales</string>
     <string name="no_result_placeholder">No hay resultados</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
@@ -481,26 +481,26 @@
     <string name="media_picker_cannot_record_video">No se puede grabar vídeo</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Información</string>
-    <string name="permissions_rationale_msg_storage">Element necesita permiso para acceder a tu biblioteca de fotos y vídeos para enviar y guardar archivos adjuntos.
+    <string name="template_permissions_rationale_msg_storage">${app_name} necesita permiso para acceder a tu biblioteca de fotos y vídeos para enviar y guardar archivos adjuntos.
 \n
 \nPor favor permite el acceso en la próxima ventana emergente para poder enviar archivos desde tu teléfono.</string>
-    <string name="permissions_rationale_msg_camera">Element necesita permiso para acceder a tu cámara para tomar fotos y realizar llamadas de vídeo.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} necesita permiso para acceder a tu cámara para tomar fotos y realizar llamadas de vídeo.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nPor favor permite el acceso en la próxima ventana emergente para poder realizar la llamada."</string>
-    <string name="permissions_rationale_msg_record_audio">Element necesita permiso para acceder a tu micrófono para realizar llamadas de voz.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} necesita permiso para acceder a tu micrófono para realizar llamadas de voz.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nPor favor permite el acceso en la próxima ventana emergente para poder realizar la llamada."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element necesita permiso para acceder a tu cámara y micrófono para realizar llamadas de vídeo.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} necesita permiso para acceder a tu cámara y micrófono para realizar llamadas de vídeo.
 \n
 \nPor favor permite el acceso en las próximas ventanas emergentes para poder realizar la llamada.</string>
-    <string name="permissions_rationale_msg_contacts">Element necesita permiso para acceder a tu agenda de contactos para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} necesita permiso para acceder a tu agenda de contactos para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
 
-Por favor permite el acceso en la próxima ventana emergente para descubrir usuarios accesibles desde Element en tu agenda de contactos.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element necesita permiso para acceder a tu agenda de contactos para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos. 
+Por favor permite el acceso en la próxima ventana emergente para descubrir usuarios accesibles desde ${app_name} en tu agenda de contactos.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} necesita permiso para acceder a tu agenda de contactos para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.
 \n
-\n¿Permitir que Element acceda a tus contactos \?</string>
+\n¿Permitir que ${app_name} acceda a tus contactos \?</string>
     <string name="permissions_action_not_performed_missing_permissions">Lo sentimos. Acción no realizada, debido a que faltan permisos</string>
     <!-- medias slider string -->
     <string name="media_slider_saved">Guardado</string>
@@ -1052,7 +1052,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="widget_integration_missing_parameter">Falta un parámetro requerido.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Solicitud enviada</string>
     <string name="speak">Conversar</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Por favor, inicia Element en otro dispositivo que pueda descifrar el mensaje para que pueda enviar las claves a esta sesión.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Por favor, inicia ${app_name} en otro dispositivo que pueda descifrar el mensaje para que pueda enviar las claves a esta sesión.</string>
     <string name="dialog_title_third_party_licences">Licencias de terceros</string>
     <string name="clear">Borrar</string>
     <string name="go_on_with">continuar con…</string>
@@ -1060,10 +1060,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="e2e_re_request_encryption_key">Volver a solicitar las claves de encriptado de tus otras sesiones.</string>
     <string name="e2e_re_request_encryption_key_sent">Solicitud de clave enviada.</string>
     <string name="startup_notification_privacy_title">Privacidad de Notificaciones</string>
-    <string name="startup_notification_privacy_message">Element puede ejecutarse en segundo plano para gestionar tus notificaciones de forma segura y privada. Esto podría afectar la duración de la batería.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} puede ejecutarse en segundo plano para gestionar tus notificaciones de forma segura y privada. Esto podría afectar la duración de la batería.</string>
     <string name="settings_opt_in_of_analytics">Enviar datos de análisis de estadísticas</string>
-    <string name="settings_opt_in_of_analytics_summary">Element recopila análisis de estadísticas anónimas para permitirnos mejorar la aplicación.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Por favor, habilita los análisis de estadísticas para ayudarnos a mejorar Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} recopila análisis de estadísticas anónimas para permitirnos mejorar la aplicación.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Por favor, habilita los análisis de estadísticas para ayudarnos a mejorar ${app_name}.</string>
     <string name="lock_screen_hint">Escribe aquí…</string>
     <string name="send_bug_report_description_in_english">Si es posible, por favor escribe la descripción en inglés.</string>
     <string name="room_message_placeholder_reply_to_encrypted">Enviar una respuesta cifrada…</string>
@@ -1147,7 +1147,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="accept">Aceptar</string>
     <string name="auth_accept_policies">Por favor revisa y acepta las reglas de este servidor doméstico:</string>
     <string name="settings_call_category">Llamadas</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Usar el tono de llamada normal de Element para llamadas entrantes</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Usar el tono de llamada normal de ${app_name} para llamadas entrantes</string>
     <string name="settings_call_ringtone_title">Tono para llamadas entrantes</string>
     <string name="settings_call_ringtone_dialog_title">Elegir sonido de llamadas:</string>
     <string name="video_call_in_progress">Llamada de video en proceso…</string>
@@ -1189,8 +1189,8 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_troubleshoot_test_account_settings_quickfix">Activar</string>
     <string name="settings_troubleshoot_test_device_settings_title">Ajustes de sesión.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Las notificaciones están activadas para esta sesión.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Las notificaciones no están habilitadas para esta sesión. 
-\nPor favor comprueba los ajustes Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Las notificaciones no están habilitadas para esta sesión.
+\nPor favor comprueba los ajustes ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Activar</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Ajustes personalizados.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Ten en cuenta que algunos mensajes son silenciosos (producen una notificación sin sonido).</string>
@@ -1207,16 +1207,16 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Una o más pruebas han fallado, por favor mándanos un informe de error para que podamos investigar.</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Copia de seguridad en progreso. Si cierras sesión ahora perderás el acceso a tus mensajes encriptados.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">La copia de seguridad debería estar activa ahora en todas tus sesiones para evitar la pérdida de acceso a tus mensajes encriptados.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element usa los servicios de Google Play para entregar mensajes Push pero no parece estar configurado correctamente:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} usa los servicios de Google Play para entregar mensajes Push pero no parece estar configurado correctamente:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">solucionar error con los Servicios de Google Play</string>
     <string name="settings_troubleshoot_test_fcm_title">Token Base</string>
     <string name="settings_troubleshoot_test_fcm_success">Token FCM recuperada correctamente:\n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Error al recuperar token FCM:\n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nEste error esta fuera del control de Element y de acuerdo con Google, este error indica que el dispositivo tiene demasiadas apps registradas con FCM. Este error solo ocurre cuando existe un numero demasiado alto de apps por lo que no deberia afectar a un usuario promedio.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nEste error esta fuera del control de Element. Puede ocurrir por numerosas razones. Probablemente funcione si vuelve a intentarlo mas tarde. También puede comprobar si los Servicios de Google Play están limitados por los ajustes del sistema o si la hora del dispositivo es correcta o si puede pasar en ROM personalizada.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nEste error esta fuera del control de Element. No hay cuenta de googled registrada en este dispositivo. Por favor abre el gestor dde cuentas y añade una cuenta de Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nEste error esta fuera del control de ${app_name} y de acuerdo con Google, este error indica que el dispositivo tiene demasiadas apps registradas con FCM. Este error solo ocurre cuando existe un numero demasiado alto de apps por lo que no deberia afectar a un usuario promedio.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nEste error esta fuera del control de ${app_name}. Puede ocurrir por numerosas razones. Probablemente funcione si vuelve a intentarlo mas tarde. También puede comprobar si los Servicios de Google Play están limitados por los ajustes del sistema o si la hora del dispositivo es correcta o si puede pasar en ROM personalizada.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nEste error esta fuera del control de ${app_name}. No hay cuenta de googled registrada en este dispositivo. Por favor abre el gestor dde cuentas y añade una cuenta de Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Añadir cuenta</string>
     <string name="settings_troubleshoot_test_token_registration_title">Token de registro</string>
     <string name="settings_troubleshoot_test_token_registration_success">Token FCM registrado correctamente en el Servidor.</string>
@@ -1245,17 +1245,17 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_troubleshoot_test_service_restart_failed">Error al reiniciar el servicio</string>
     <string name="settings_troubleshoot_test_service_boot_title">Inicio automático</string>
     <string name="settings_troubleshoot_test_service_boot_success">El servicio funcionará cuando reinicie el dispositivo.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">El servicio no se iniciará al reiniciar el dispositivo, no recibirá notificaciones hasta que Element haya sido abierto al menos 1 vez.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">El servicio no se iniciará al reiniciar el dispositivo, no recibirá notificaciones hasta que ${app_name} haya sido abierto al menos 1 vez.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Activar Inicio automático</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Comprobar restricciones en segundo plano</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Las restricciones de segundo plano están desactivadas para Element. Este debería funcionar con datos móviles (sin WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Las restricciones de segundo plano están desactivadas para ${app_name}. Este debería funcionar con datos móviles (sin WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Las restricciones de segundo plano están activadas para Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Las restricciones de segundo plano están activadas para ${app_name}.
 \nLa app estará completamente restringida mientras esté en segundo plano y esto podría afectar a las notificaciones.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desactivar restricciones</string>
     <string name="settings_troubleshoot_test_battery_title">Optimización de la bateria</string>
-    <string name="settings_troubleshoot_test_battery_success">A Element no le afecta la Optimización de la bateria.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">A ${app_name} no le afecta la Optimización de la bateria.</string>
     <string name="settings_troubleshoot_test_battery_failed">Si un usuario deja el dispositivo desenchufado e inmóvil durante cierto periodo de tiempo con la pantalla apagada, el dispositivo entrará en modo hibernación. Esto evita que las apps accedan a la red y postpone sus tareas, sincronizaciones y alarmas.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">ignorar optimización</string>
     <string name="settings_notification_privacy_no_background_sync">Las apps <b>no</b> necesita conectarse al servidor doméstico en segundo plano, esto debería reducir el uso de la batería</string>
@@ -1278,8 +1278,8 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_send_message_with_enter">Enviar mensaje con intro</string>
     <string name="settings_send_message_with_enter_summary">La tecla Intro enviará el mensaje en vez de añadir un salto de línea</string>
     <string name="startup_notification_fdroid_battery_optim_title">Conexión en segundo plano</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element necesita mantener una leve conexión en segundo plano para poder ofrecer notificaciones de confianza.
-\nEn la siguiente pantalla se le pedirá permisos para que Element siempre funcione en segundo plano, por favor acepte.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} necesita mantener una leve conexión en segundo plano para poder ofrecer notificaciones de confianza.
+\nEn la siguiente pantalla se le pedirá permisos para que ${app_name} siempre funcione en segundo plano, por favor acepte.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Conceder permiso</string>
     <string name="settings_data_save_mode_summary">El modo de guardado de datos aplica un filtro específico para que las actualizaciones de presencia y las notificaciones de escritura sean eliminadas.</string>
     <string name="account_email_error">Ha ocurrido un error mientras se verificaba tu dirección de correo electrónico.</string>
@@ -1328,7 +1328,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="no_valid_google_play_services_apk">No se ha encontrado ningún APK válido de Servicios de Google Play. Las notificaciones podrían no funcionar correctamente.</string>
     <string name="passphrase_empty_error_message">Por favor introduzca una contraseña</string>
     <string name="passphrase_passphrase_too_weak">La contraseña que has introducido es muy débil</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Por favor borra la contraseña si quieres que Element genere una clave de recuperación.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Por favor borra la contraseña si quieres que ${app_name} genere una clave de recuperación.</string>
     <string name="keys_backup_no_session_error">No hay ninguna sesión de Matrix disponible</string>
     <string name="keys_backup_setup_step1_title">Nunca perder los mensajes encriptados</string>
     <string name="keys_backup_setup_step1_description">Los mensajes en salas encriptadas están asegurados con encriptación Extremo-a-Extremo. Solo los integrantes de la sala y tu podéis leer estos mensajes.
@@ -1409,7 +1409,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     </plurals>
     <string name="keys_backup_info_title_signature">Firma</string>
     <string name="autodiscover_well_known_autofill_dialog_title">autocompletar opciones del servidor</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element ha detectado una configuración personalizada del servidor para el dominio de su ID de usuario \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} ha detectado una configuración personalizada del servidor para el dominio de su ID de usuario \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Configuración de uso</string>
     <string name="settings_default_media_source">Origen predeterminado de medios</string>
@@ -1508,7 +1508,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="please_wait">Espere por favor…</string>
     <string name="group_all_communities">Todas la comunidades</string>
     <string name="room_preview_no_preview">Esta sala no se puede previsualizar</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">La previsualización de salas públicas no es posible todavía con Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">La previsualización de salas públicas no es posible todavía con ${app_name}</string>
     <string name="fab_menu_create_room">Salas</string>
     <string name="fab_menu_create_chat">Chats</string>
     <string name="create_room_title">Nueva sala</string>
@@ -1560,10 +1560,10 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="auth_add_phone_message_2">Pon un número de teléfono para que las personas que conoces te puedan encontrar.</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Se usará %s como asistencia cuando el servidor doméstico no la ofrezca (su dirección IP se compartirá durante una llamada)</string>
     <string name="settings_background_fdroid_sync_mode">Modo Sincronización en segundo plano</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element se sincronizará en segundo plano de manera que se preserven los recursos del dispositivo (batería).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} se sincronizará en segundo plano de manera que se preserven los recursos del dispositivo (batería).
 \nDependiendo del estado de los recursos del dispositivo, la sincronización puede ser aplazada por el sistema operativo.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element se sincronizará en segundo plano periódicamente en un momento preciso (configurable).
-\nEsto afectará al uso de la radio y la batería, se mostrará una notificación permanente que indica que Element está escuchando a nuevos acontecimientos.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} se sincronizará en segundo plano periódicamente en un momento preciso (configurable).
+\nEsto afectará al uso de la radio y la batería, se mostrará una notificación permanente que indica que ${app_name} está escuchando a nuevos acontecimientos.</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">No se le notificará de los mensajes entrantes cuando la aplicación esté en segundo plano.</string>
     <string name="settings_set_workmanager_delay">Intervalo de sincronización preferido</string>
     <string name="settings_set_workmanager_delay_summary">%s
@@ -1725,7 +1725,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="content_reported_as_inappropriate_content">Este contenido fue reportado como inapropiado.
 \n
 \nSi no quieres ver más contenido de este usuario, puedes bloquearlo para ocultar sus mensajes.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element necesita permiso para guardar tus claves E2E en la memória del dispositivo.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} necesita permiso para guardar tus claves E2E en la memória del dispositivo.
 \n
 \nPorfavor permite el acceso en el siguiente pop-up para poder exportar tus claves manualmente.</string>
     <string name="no_network_indicator">No hay conexión de red</string>
@@ -1784,7 +1784,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="action_copy">Copiar</string>
     <string name="dialog_title_success">Correcto</string>
     <string name="bottom_action_notification">Notificaciones</string>
-    <string name="call_failed_no_connection">Element Fallo la Llamada</string>
+    <string name="template_call_failed_no_connection">${app_name} Fallo la Llamada</string>
     <string name="call_failed_no_connection_description">Fallo al intentar establecer conexion.
 \nTURN Server fallo. Por favor, contacte con el administrador de su Servidor y notifique el fallo.</string>
     <string name="call_select_sound_device">Seleccionar Dispositivo de Sonido</string>
@@ -1827,7 +1827,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="choose_locale_loading_locales">Cargando lenguajes disponibles…</string>
     <string name="open_terms_of">Leer los terminos de %s</string>
     <string name="disconnect_identity_server_dialog_content">Desconectarse del servidor de Identidad %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Servidor de identidad desactualizado. Element solo soporta API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Servidor de identidad desactualizado. ${app_name} solo soporta API V2.</string>
     <string name="identity_server_error_outdated_home_server">Operación no posible. Servidor desactualizado.</string>
     <string name="identity_server_error_no_identity_server_configured">Por favor, configure primero un Servidor de Identidad.</string>
     <string name="element_disclaimer_title">Riot ahora es Element!</string>
@@ -1867,7 +1867,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="devices_other_devices">Otras Sesiones</string>
     <string name="autocomplete_limited_results">Mostrando solo el primer resultado, agregue mas letras…</string>
     <string name="settings_developer_mode_fail_fast_title">Fallar rápido (Test)</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element puede fallar con más frecuencia cuando ocurre un error inesperado</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} puede fallar con más frecuencia cuando ocurre un error inesperado</string>
     <string name="command_description_shrug">Antepone ¯\\_(ツ)_/¯ a un mensaje de texto sin formato</string>
     <string name="create_room_encryption_title">Habilitar crifrado</string>
     <string name="create_room_encryption_description">Una vez habilitada, la encriptación no se puede deshabilitar.</string>
@@ -1929,9 +1929,9 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="room_member_power_level_default_in">Nivel Personalizado en %1$s</string>
     <string name="room_member_power_level_custom_in">Nivel Personalizado (%1$d) en %2$s</string>
     <string name="room_member_jump_to_read_receipt">Saltar para leer el recibo</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element no maneja eventos de tipo \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element no maneja el mensaje de tipo \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element encontró un problema al representar el contenido del evento con el ID \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} no maneja eventos de tipo \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} no maneja el mensaje de tipo \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} encontró un problema al representar el contenido del evento con el ID \'%1$s\'</string>
     <string name="unignore">Dejar de ignorar</string>
     <string name="room_list_sharing_header_recent_rooms">Salas recientes</string>
     <string name="room_list_sharing_header_other_rooms">Otras salas</string>
@@ -1973,7 +1973,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="message_action_item_redact">Eliminar…</string>
     <string name="delete_event_dialog_reason_checkbox">Razón</string>
     <string name="delete_event_dialog_reason_hint">Razón para redactar</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="refresh">Refrescar</string>
     <string name="new_session">Nuevo inicio de sesión detectado . ¿Fue usted\?</string>
     <string name="new_session_review">Toca para revisar y verificar</string>
@@ -2181,7 +2181,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
 \nVuelva a iniciar sesión para acceder a los datos y mensajes de su cuenta.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Perderás el acceso a los mensajes seguros a menos que inicies sesión para recuperar tus claves de encriptación.</string>
     <string name="soft_logout_clear_data_dialog_submit">Borrar datos</string>
-    <string name="soft_logout_sso_not_same_user_error">La sesión actual es para el usuario %1$s y usted proporciona las credenciales para el usuario %2$s. Esto no está suportado por Element.
+    <string name="template_soft_logout_sso_not_same_user_error">La sesión actual es para el usuario %1$s y usted proporciona las credenciales para el usuario %2$s. Esto no está suportado por ${app_name}.
 \nPrimero borre los datos, luego inicie sesión nuevamente con otra cuenta.</string>
     <string name="permalink_malformed">Su enlace matrix.to estaba mal formado</string>
     <string name="settings_developer_mode_summary">El modo desarrollador activa funciones ocultas y también puede hacer que la aplicación sea menos estable. ¡Solo para desarrolladores!</string>
@@ -2338,13 +2338,13 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="settings_security_prevent_screenshots_summary">Al habilitar esta configuración, se agrega FLAG_SECURE a todas las actividades. Reinicie la aplicación para que el cambio surta efecto.</string>
     <string name="media_file_added_to_gallery">Archivo multimedia agregado a la Galería</string>
     <string name="error_adding_media_file_to_gallery">No se pudo agregar el archivo multimedia a la Galería</string>
-    <string name="use_other_session_content_description">Utilice la última versión de Element en sus otros dispositivos, Element Web, Element Desktop, Element iOS, Element para Android u otro cliente Matrix con capacidad de firma cruzada</string>
-    <string name="app_desktop_web">Elemento Web 
-\nElemento de escritorio</string>
-    <string name="app_ios_android">Elemento iOS 
-\nElemento Android</string>
+    <string name="template_use_other_session_content_description">Utilice la última versión de ${app_name} en sus otros dispositivos, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} para Android u otro cliente Matrix con capacidad de firma cruzada</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} de escritorio</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\${app_name} Android</string>
     <string name="or_other_mx_capabale_client">u otro cliente Matrix con capacidad de firma cruzada</string>
-    <string name="use_latest_app">Utilice la última versión de Element en sus otros dispositivos:</string>
+    <string name="template_use_latest_app">Utilice la última versión de ${app_name} en sus otros dispositivos:</string>
     <string name="command_description_discard_session">Obliga a descartar la sesión de grupo saliente actual en una sala cifrada</string>
     <string name="command_description_discard_session_not_handled">Solo se admite en salas cifradas</string>
     <string name="enter_secret_storage_passphrase_or_key">Use su %1$s o use su %2$s para continuar.</string>
@@ -2365,7 +2365,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="error_sso_flow_not_supported_yet">Lo sentimos, esta operación aún no es posible para las cuentas conectadas mediante el inicio de sesión único.</string>
     <string name="create_room_dm_failure">No pudimos crear tu DM. Marque los usuarios que desea invitar y vuelva a intentarlo.</string>
     <string name="identity_server_error_terms_not_signed">Primero acepta los términos del servidor de identidad en la configuración.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Para su privacidad, Element solo admite el envío de números de teléfono y correos electrónicos de usuario con hash.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Para su privacidad, ${app_name} solo admite el envío de números de teléfono y correos electrónicos de usuario con hash.</string>
     <string name="identity_server_error_binding_error">La asociación ha fallado.</string>
     <string name="identity_server_error_no_current_binding_error">No hay asociación actual con este identificador.</string>
     <string name="identity_server_set_default_notice">Su servidor doméstico (%1$s) propone utilizar %2$s para su servidor de identidad</string>
@@ -2468,13 +2468,13 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="warning_unsaved_change">Hay cambios sin salvar. ¿Descartar los cambios\?</string>
     <string name="warning_room_not_created_yet">La sala todavía no ha sido creada. ¿Cancelar la creación\?</string>
     <string name="universal_link_malformed">El link está malformado</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN es requerido cada vez que se abre Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN es necesario después de no usar Element por 2 minutos.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">PIN es requerido cada vez que se abre ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">PIN es necesario después de no usar ${app_name} por 2 minutos.</string>
     <string name="settings_security_pin_code_grace_period_title">Requerir PIN después de 2 minutos</string>
     <string name="settings_security_pin_code_notifications_summary_off">Sólo mostrar el número de mensajes no leídos en una notificación sencilla.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Mostrar detalles, como nombres de salas y contenido de mensajes.</string>
     <string name="settings_security_pin_code_notifications_title">Mostrar contenido de notificaciones</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">Element sólo puede ser desbloqueado vía Código PIN.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">${app_name} sólo puede ser desbloqueado vía Código PIN.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Activar biometría de este dispositivo en particular, como huellas dactilares o reconocimiento facial.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Activar biometría</string>
     <string name="settings_security_application_protection_screen_title">Configurar protecciones</string>
@@ -2519,7 +2519,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="permissions_denied_add_contact">Permitir acceder a sus contactos.</string>
     <string name="error_unauthorized">Desautorizado, credenciales de autenticación no autorizadas</string>
     <string name="login_clear_homeserver_history">Limpiar Historial</string>
-    <string name="re_authentication_default_confirm_text">Element requiere que ingrese sus credenciales para realizar esta acción.</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} requiere que ingrese sus credenciales para realizar esta acción.</string>
     <string name="re_authentication_activity_title">Se necesita una nueva autenticación</string>
     <string name="matrix_to_card_title">Enlace Matrix</string>
     <string name="qr_code_not_scanned">¡Código QR no escaneado!</string>
@@ -2543,8 +2543,8 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="user_code_my_code">Mi codigo</string>
     <string name="user_code_share">Compartir mi codigo</string>
     <string name="user_code_scan">Escanear QR</string>
-    <string name="invite_friends_rich_title">🔐️ Unirme a Element</string>
-    <string name="invite_friends_text">Hey, contactame por Element:%s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Unirme a ${app_name}</string>
+    <string name="template_invite_friends_text">Hey, contactame por ${app_name}:%s</string>
     <string name="add_people">Adicionar persona</string>
     <string name="user_code_info_text">Compartir ese codigo para que puedan contactarloa usted.</string>
     <string name="a11y_create_direct_message_by_mxid">Crear una converzacion por ID Matrix</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index f3c41ed726..0c3f184a3e 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -378,7 +378,7 @@
     <string name="user_directory_header">Kasutajate kataloog</string>
     <string name="matrix_only_filter">Vaid need, kellel on Matrixi konto</string>
     <string name="no_conversation_placeholder">Vestlusi ei leidu</string>
-    <string name="no_contact_access_placeholder">Sa pole Element\'ile andnud ligipääsu kohalikele kontaktidele</string>
+    <string name="template_no_contact_access_placeholder">Sa pole ${app_name}\'ile andnud ligipääsu kohalikele kontaktidele</string>
     <string name="no_result_placeholder">Tulemusi ei ole</string>
     <string name="people_no_identity_server">Isikutuvastusserver ei ole seadistatud.</string>
     <string name="rooms_header">Jututoad</string>
@@ -513,7 +513,7 @@
     <string name="action_copy">Kopeeri</string>
     <string name="dialog_title_success">Õnnestus</string>
     <string name="bottom_action_notification">Teavitused</string>
-    <string name="call_failed_no_connection">Kõne ebaõnnestus</string>
+    <string name="template_call_failed_no_connection">Kõne ebaõnnestus</string>
     <string name="call_failed_no_connection_description">Reaalajas ühenduse loomine ei õnnestunud.
 \nPalu oma koduserveri %@ haldajat, et ta seadistaks kõnede kindlamaks toimimiseks TURN serveri.</string>
     <string name="call_select_sound_device">Vali heliseade</string>
@@ -533,7 +533,7 @@
     <string name="e2e_re_request_encryption_key">Küsi oma muudest sessioonidest krüptimisvõtmed uuesti.</string>
     <string name="e2e_re_request_encryption_key_sent">Võtmete jagamise päring on saadetud.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Päring on saadetud</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Palun käivita Element mõnes muus seadmes, mis suudab neid sõnumeid dekrüptoda ja seega saata krüptovõtmeid siia sessiooni.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Palun käivita ${app_name} mõnes muus seadmes, mis suudab neid sõnumeid dekrüptoda ja seega saata krüptovõtmeid siia sessiooni.</string>
     <string name="read_receipts_list">Lugemisteatiste loend</string>
     <string name="groups_list">Gruppide loend</string>
     <plurals name="membership_changes">
@@ -554,7 +554,7 @@
     <string name="room_info_room_name">Jututoa nimi</string>
     <string name="room_info_room_topic">Jututoa teema</string>
     <string name="settings_call_category">Kõned</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Kasuta saabuvate kõnede jaoks Element\'i vaikimisi helinat</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Kasuta saabuvate kõnede jaoks ${app_name}\'i vaikimisi helinat</string>
     <string name="settings_call_ringtone_use_default_stun">Kasuta kõnehõlbustusserverit</string>
     <string name="settings_call_ringtone_title">Saabuva kõne helin</string>
     <string name="settings_call_ringtone_dialog_title">Vali helin kõnede jaoks:</string>
@@ -576,18 +576,18 @@
     <string name="media_picker_both_capture_title">Tee foto või video</string>
     <string name="media_picker_cannot_record_video">Video salvestamine ei õnnestu</string>
     <string name="permissions_rationale_popup_title">Lisateave õiguste kohta</string>
-    <string name="permissions_rationale_msg_storage">Element vajab õigusi sinu foto- ja videokataloogide lugemiseks ning manuste salvestamiseks.
+    <string name="template_permissions_rationale_msg_storage">${app_name} vajab õigusi sinu foto- ja videokataloogide lugemiseks ning manuste salvestamiseks.
 \n
 \nSelleks, et saaksid oma nutiseadmest faile saata palun anna järgmisel lehel vajalikud õigused.</string>
-    <string name="permissions_rationale_msg_camera">Fotode ja videote salvestamiseks ning videokõnede tegemiseks vajab Element õigusi kasutada sinu kaamerat.</string>
+    <string name="template_permissions_rationale_msg_camera">Fotode ja videote salvestamiseks ning videokõnede tegemiseks vajab ${app_name} õigusi kasutada sinu kaamerat.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nKõnede tegemiseks palun anna järgmisel lehel vajalikud õigused."</string>
-    <string name="permissions_rationale_msg_record_audio">Kõnede tegemiseks vajab Element õigusi kasutada sinu mikrofoni.</string>
+    <string name="template_permissions_rationale_msg_record_audio">Kõnede tegemiseks vajab ${app_name} õigusi kasutada sinu mikrofoni.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nKõnede tegemiseks palun anna järgmisel lehel vajalikud õigused."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element vajab videokõnedeks õigusi sinu kaamera ja mikrofoni kasutamiseks.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} vajab videokõnedeks õigusi sinu kaamera ja mikrofoni kasutamiseks.
 \n
 \nKõnede tegemiseks palun anna järgmisel lehel vajalikud õigused.</string>
     <string name="permissions_action_not_performed_missing_permissions">Vabandust. Kuna vastavaid õigusi ei olnud, siis toimingut ei saanud teha</string>
@@ -803,7 +803,7 @@
     <string name="please_wait">Palun oota…</string>
     <string name="group_all_communities">Kõik kogukonnad</string>
     <string name="room_preview_no_preview">Sellel jututoal puudub eelvaade</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Element ei toeta veel kõigile nähtavate jututubade eelvaadet</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name} ei toeta veel kõigile nähtavate jututubade eelvaadet</string>
     <string name="fab_menu_create_room">Jututoad</string>
     <string name="fab_menu_create_chat">Isiklikud sõnumid</string>
     <string name="create_room_title">Uus jututuba</string>
@@ -849,7 +849,7 @@
     <string name="settings_active_sessions_signout_device">Logi sellest sessioonist välja</string>
     <string name="settings_failed_to_get_crypto_device_info">Teave krüptograafia kohta puudub</string>
     <string name="settings_active_sessions_verified_device_desc">Kuna sina oled selle sessiooni verifitseerinud, siis see sessioon on krüptitud sõnumite saatmiseks usaldusväärne:</string>
-    <string name="identity_server_error_outdated_identity_server">See isikutuvastusserver kasutab vana API\'t. Element toetab aga vaid API versiooni 2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">See isikutuvastusserver kasutab vana API\'t. ${app_name} toetab aga vaid API versiooni 2.</string>
     <string name="identity_server_error_outdated_home_server">See tegevus ei ole võimalik. Koduserveri versioon on liiga vana.</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d jututuba</item>
@@ -886,7 +886,7 @@
     <string name="settings_app_info_link_title">Rakenduse teave</string>
     <string name="settings_app_info_link_summary">Näita rakenduse teavet süsteemi seadistustes.</string>
     <string name="settings_add_3pid_confirm_password_title">Kinnitage oma salasõna</string>
-    <string name="settings_add_3pid_flow_not_supported">Seda tegevust ei saa teha Element\'i nutirakendusest</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Seda tegevust ei saa teha ${app_name}\'i nutirakendusest</string>
     <string name="settings_add_3pid_authentication_needed">Autentimine on nõutav</string>
     <string name="settings_notification_advanced">Teavituste lisaseadistused</string>
     <string name="settings_notification_by_event">Teavituse olulisus sündmuse alusel</string>
@@ -899,8 +899,8 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Võta kasutusele</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sessiooni seadistused.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Selles sessioonis on teavitused kasutusel.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Selles sessioonis ei ole teavitusi kasutusel.
-\nSeda saad muuta Element\'i seadistuses.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Selles sessioonis ei ole teavitusi kasutusel.
+\nSeda saad muuta ${app_name}\'i seadistuses.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Võta kasutusele</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Kohandatud seadistused.</string>
     <string name="settings_12_24_timestamps">Näita ajatempleid 12-tunnises vormingus</string>
@@ -1227,7 +1227,7 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Palun kontrolli seadistusi</string>
     <string name="settings_troubleshoot_test_play_services_title">Goolge Play teenuste kontrollimine</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK on kättesaadav ja uuendatud.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element kasutab Google Play teenuseid tõuketeavituste edastamiseks, kui see ei tundu olema korrektselt seadistatud:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} kasutab Google Play teenuseid tõuketeavituste edastamiseks, kui see ei tundu olema korrektselt seadistatud:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Paranda Google Play teenused</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase tunnusluba</string>
@@ -1235,12 +1235,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM tunnusloa laadimine ei õnnestunud:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nSee viga on väljaspool Element\'i kontrolli ning vastavalt Google infole liiga palju rakendusi kasutavad FCM\'i. Selline olukord peaks tekkima vaid siis kui kasutusel on hiidpalju selliseid rakendusi ning ei peaks mõjutama tavakasutajaid.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nSee viga on väljaspool Element\'i kontrolli ning võib juhtuda eri põhjustel. Võib-olla hilisemal proovimisel seda viga enam ei teki, kuid igaks juhuks vaata, et Google Play teenustele ei oleks süsteemi seadetes määratud andmesidepiirangut ning seadme kell on õige. Samuti võib see viga tekkida, kui sa pruugid kohandatud Androidi varianti (custom ROM).</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nSee viga on väljaspool Element\'i kontrolli. Telefoni ei ole seadistatud Google\'i kontot. Palun ava seadistustes kontohaldur ning lisa üks Google\'i konto.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nSee viga on väljaspool ${app_name}\'i kontrolli ning vastavalt Google infole liiga palju rakendusi kasutavad FCM\'i. Selline olukord peaks tekkima vaid siis kui kasutusel on hiidpalju selliseid rakendusi ning ei peaks mõjutama tavakasutajaid.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nSee viga on väljaspool ${app_name}\'i kontrolli ning võib juhtuda eri põhjustel. Võib-olla hilisemal proovimisel seda viga enam ei teki, kuid igaks juhuks vaata, et Google Play teenustele ei oleks süsteemi seadetes määratud andmesidepiirangut ning seadme kell on õige. Samuti võib see viga tekkida, kui sa pruugid kohandatud Androidi varianti (custom ROM).</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nSee viga on väljaspool ${app_name}\'i kontrolli. Telefoni ei ole seadistatud Google\'i kontot. Palun ava seadistustes kontohaldur ning lisa üks Google\'i konto.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lisa Google\'i konto</string>
     <string name="settings_troubleshoot_test_token_registration_title">Tunnusloa registreerimine</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM tunnusloa registreerimine koduserveris õnnestus.</string>
@@ -1256,7 +1256,7 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Teenuse uuesti käivitamine ei õnnestunud</string>
     <string name="settings_troubleshoot_test_service_boot_title">Käivita teenus seadme käivitamisel</string>
     <string name="settings_troubleshoot_test_service_boot_success">Teenus käivitatakse nutiseadme käivitamisel.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Seda teenust ei käivitatata nutiseadme käivitamisel. Sa ei saa teavitusi enne, kui Element on vähemalt korra avatud.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Seda teenust ei käivitatata nutiseadme käivitamisel. Sa ei saa teavitusi enne, kui ${app_name} on vähemalt korra avatud.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Käivita teenus nutiseadme käivitamisel</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Kontrolli taustapiiranguid</string>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
@@ -1304,21 +1304,21 @@
     <string name="settings_labs_native_camera_summary">Käivita kohandatud vaate asemel süsteemne kaamera vaade.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Kasuta reavahetuse klahvi sõnumi saatmiseks</string>
     <string name="settings_labs_enable_send_voice">Saada häälsõnumeid</string>
-    <string name="permissions_rationale_msg_contacts">Element saab kontrollida teie aadressiraamatut, et leida teisi Matrixi kasutajaid nende e-posti aadressi ja telefoninumbrite põhjal. Kui sa nõustud oma aadressiraamatut sel eesmärgil jagama, luba juurdepääs järgmisel hüpikaknal.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element saab kontrollida teie aadressiraamatut, et leida teisi Matrixi kasutajaid nende e-posti aadresside ja telefoninumbrite põhjal.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} saab kontrollida teie aadressiraamatut, et leida teisi Matrixi kasutajaid nende e-posti aadressi ja telefoninumbrite põhjal. Kui sa nõustud oma aadressiraamatut sel eesmärgil jagama, luba juurdepääs järgmisel hüpikaknal.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} saab kontrollida teie aadressiraamatut, et leida teisi Matrixi kasutajaid nende e-posti aadresside ja telefoninumbrite põhjal.
 \n
 \nKas sa oled nõus oma aadressiraamatut sel eesmärgil jagama\?</string>
     <string name="room_event_action_report_prompt_ignore_user">Kas sa soovid peita selle kasutaja kõik sõnumid\?
 \n
 \nPane tähele, et antud toiming taaskäivitab rakenduse ja see võib võtta veidi aega.</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Taustapiirangud on Elemendi jaoks keelatud. Seda testi tuleks läbi viia mobiilse andmeside abil (WIFI puudub).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Taustapiirangud on Elemendi jaoks keelatud. Seda testi tuleks läbi viia mobiilse andmeside abil (WIFI puudub).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Elemendi jaoks on taustpiirangud lubatud.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Elemendi jaoks on taustpiirangud lubatud.
 \nTöö, mida rakendus proovib teha, on agressiivselt piiratud, kui see on taustal ja see võib mõjutada teavituste kättesaamist.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Keela piirangud</string>
     <string name="settings_troubleshoot_test_battery_title">Aku optimeerimine</string>
-    <string name="settings_troubleshoot_test_battery_success">Aku optimeerimine ei mõjuta Elementi.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Aku optimeerimine ei mõjuta ${app_name}.</string>
     <string name="settings_troubleshoot_test_battery_failed">Kui kasutaja jätab seadme mõneks ajaks vooluvõrgust välja ja ühele kohale paigale ning ekraan on välja lülitatud, lülitub seade Doze režiimi. See takistab rakendustel juurdepääsu võrgule ja lükkab edasi nende töö, sünkroonimise ja tavalised teated.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Eira optimeerimist</string>
     <string name="settings_notification_privacy_normal">Tavaline</string>
@@ -1348,11 +1348,11 @@
     <string name="settings_background_sync">Andmete sünkroniseerimine taustal</string>
     <string name="settings_background_fdroid_sync_mode">Andmete taustal sünkroniseerimise režiim</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimeeritud akukestust silmas pidades</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element sünkroniseerib taustal nii, et see arvestab seadme piiratud ressursse (aku).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} sünkroniseerib taustal nii, et see arvestab seadme piiratud ressursse (aku).
 \nSõltuvalt seadme olekust võib operatsioonisüsteem sünkroniseerimist edasi lükata.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimeeritud reaalajas</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element sünkroniseerib sõnumeid taustal etteantud aja järel (aeg on seadistatav).
-\nSee mõjutab seadme saatjat/vastuvõtjat ja akukasutust ning kuvatakse püsiteade, et Element kuulab sündmusi.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} sünkroniseerib sõnumeid taustal etteantud aja järel (aeg on seadistatav).
+\nSee mõjutab seadme saatjat/vastuvõtjat ja akukasutust ning kuvatakse püsiteade, et ${app_name} kuulab sündmusi.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Taustasünkroonimine puudub</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Kui rakendus töötab taustal, siis sa ei saa saabunud sõnumite kohta teavitusi.</string>
     <string name="settings_background_sync_update_error">Seadistuste uuendamine ei õnnestunud.</string>
@@ -1419,17 +1419,17 @@
     <string name="settings_discovery_category">Leia kasutajaid</string>
     <string name="settings_discovery_manage">Halda kasutajate otsingu seadistusi.</string>
     <string name="startup_notification_privacy_title">Teavituste privaatsus</string>
-    <string name="startup_notification_privacy_message">Element võib taustal töötamise ajal hallata sinu teavitusi turvaliselt ja privaatselt. Aga see võib mõjutada akukasutust.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} võib taustal töötamise ajal hallata sinu teavitusi turvaliselt ja privaatselt. Aga see võib mõjutada akukasutust.</string>
     <string name="startup_notification_privacy_button_grant">Anna õigused</string>
     <string name="startup_notification_privacy_button_other">Tee muu valik</string>
     <string name="startup_notification_fdroid_battery_optim_title">Taustaühendus</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Selleks et teavitused toimiksid korralikult peab Element kasutama vähese kõrvalmõjuga taustaühendust.
-\nKui järgmisel lehel sinult küsitakse kas lubada, et Element töötab kogu aeg taustal, siis palun nõustu.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">Selleks et teavitused toimiksid korralikult peab ${app_name} kasutama vähese kõrvalmõjuga taustaühendust.
+\nKui järgmisel lehel sinult küsitakse kas lubada, et ${app_name} töötab kogu aeg taustal, siis palun nõustu.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Anna õigused</string>
     <string name="settings_analytics">Analüütika</string>
     <string name="settings_opt_in_of_analytics">Saada arendajatele analüütikat</string>
-    <string name="settings_opt_in_of_analytics_summary">Võimaldamaks meil rakendust parandada kogub Element anonüümset teavet rakenduse kasutuse kohta.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Selleks, et saaksime Element\'i paremaks teha, palun luba analüütika.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">Võimaldamaks meil rakendust parandada kogub ${app_name} anonüümset teavet rakenduse kasutuse kohta.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Selleks, et saaksime ${app_name}\'i paremaks teha, palun luba analüütika.</string>
     <string name="settings_opt_in_of_analytics_ok">Jah, ma soovin aidata!</string>
     <string name="settings_data_save_mode">Võrguliikluse mahu säästmise režiim</string>
     <string name="settings_data_save_mode_summary">Võrguliikluse andmemahu säästmiseks kasutatakse filtrit, mille puhul kasutajate olekuid ei uuendata ja sõnumite kirjutamise teavitusi ei laeta.</string>
@@ -1643,7 +1643,7 @@
     <string name="passphrase_passphrase_does_not_match">Paroolifraasid ei klappi mitte</string>
     <string name="passphrase_empty_error_message">Palun sisesta paroolifraas</string>
     <string name="passphrase_passphrase_too_weak">Paroolifraas on liiga nõrk</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Kui sa soovid, et Element looks taastevõtme, siis palun kustuta paroolifraas.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Kui sa soovid, et ${app_name} looks taastevõtme, siis palun kustuta paroolifraas.</string>
     <string name="keys_backup_no_session_error">Matrix\'i sessioone ei leidu</string>
     <string name="keys_backup_setup_step1_title">Ära kunagi kaota krüptitud sõnumeid</string>
     <string name="keys_backup_setup_step1_description">Sõnumid krüptitud jututubades kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.
@@ -1728,7 +1728,7 @@
     <string name="keys_backup_info_title_signature">Allkiri</string>
     <string name="autodiscover_invalid_response">Vigane vastus koduserveri tuvastamise päringule</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Serveriseadistuste automaatne sõnalõpetus</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element tuvastas kohandatud serveriseadistused sinu kasutajanime domeenis „%1$s“:
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} tuvastas kohandatud serveriseadistused sinu kasutajanime domeenis „%1$s“:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Kasuta seadistusi</string>
     <string name="invalid_or_expired_credentials">Oled kehtetu või aegunud kasutajanime või salasõna tõttu välja logitud.</string>
@@ -1900,7 +1900,7 @@
     <string name="devices_other_devices">Muud sessioonid</string>
     <string name="autocomplete_limited_results">Kuvan vaid esimesi tulemusi, kirjuta natuke pikemalt…</string>
     <string name="settings_developer_mode_fail_fast_title">Kiire lõppmäng</string>
-    <string name="settings_developer_mode_fail_fast_summary">Teadmata vigade puhul võib Element sagedamini kokku joosta</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">Teadmata vigade puhul võib ${app_name} sagedamini kokku joosta</string>
     <string name="command_description_shrug">Lisa ¯\\_(ツ)_/¯ smaili vormindamata teksti algusesse</string>
     <string name="create_room_encryption_title">Võta jututoas krüptimine kasutusele</string>
     <string name="create_room_encryption_description">Kui krüptimine on juba kasutusele võetud, siis ei saa seda enam eemaldada.</string>
@@ -1976,7 +1976,7 @@
     <string name="disconnect_identity_server_dialog_content">Kas katkestame ühenduse isikutuvastusserveriga %s\?</string>
     <string name="identity_server_error_no_identity_server_configured">Palun esmalt seadista isikutuvastusserver.</string>
     <string name="identity_server_error_terms_not_signed">Palun esmalt nõustu seadistustes isikutuvastusserveri kasutustingimustega.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Sinu privaatsuse nimel saadab Element e-posti aadressid ja telefoninumbrid serverisse vaid räsituna.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Sinu privaatsuse nimel saadab ${app_name} e-posti aadressid ja telefoninumbrid serverisse vaid räsituna.</string>
     <string name="identity_server_error_binding_error">Seoste loomine ei õnnestunud.</string>
     <string name="identity_server_error_no_current_binding_error">Selle tunnusega ei ole hetkel ühtegi seost.</string>
     <string name="identity_server_set_default_notice">Sinu koduserver (%1$s) soovitab kasutada sinu isikutuvastusserverina %2$s teenust</string>
@@ -2146,7 +2146,7 @@
     <string name="content_reported_as_inappropriate_content">Haldaja sai nüüd teate, et see sisu ei ole sobilik. 
 \n 
 \nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutajat eirata.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Läbiva krüptograafia jaoks vajalike võtmete salvestamiseks kohalikule andmekandjale vaajab Element sinu luba.
+    <string name="template_permissions_rationale_msg_keys_backup_export">Läbiva krüptograafia jaoks vajalike võtmete salvestamiseks kohalikule andmekandjale vaajab ${app_name} sinu luba.
 \n
 \nSelleks et saaksid võtmed käsitsi eksportida, siis palun anna selleks järgmises vaates luba.</string>
     <string name="no_network_indicator">Hetkel puudub võrguühendus</string>
@@ -2183,7 +2183,7 @@
 \n• Sinu koduserveri haldaja on turvakaalutlustel keelanud sinu ligipääsu.</string>
     <string name="signed_out_submit">Logi uuesti sisse</string>
     <string name="soft_logout_title">Sa oled loginud välja</string>
-    <string name="soft_logout_sso_not_same_user_error">Praegune sessioon kuulub kasutajale %1$s, kuid sina üritad siseneda kasutaajaga %2$s. Sellist võimalust Element hetkel ei toeta.
+    <string name="template_soft_logout_sso_not_same_user_error">Praegune sessioon kuulub kasutajale %1$s, kuid sina üritad siseneda kasutaajaga %2$s. Sellist võimalust ${app_name} hetkel ei toeta.
 \nPalun eemalda kõik andmed ning siis logi sisse muu kontoga.</string>
     <string name="verification_conclusion_compromised">Mõni järgnevatest võib olla sattunud valedesse kätesse:
 \n 
@@ -2222,9 +2222,9 @@
     <string name="room_member_power_level_default_in">Vaikimisi õigused jututoas %1$s</string>
     <string name="room_member_power_level_custom_in">Kohandatud õigused (%1$d) jututoas %2$s</string>
     <string name="room_member_jump_to_read_receipt">Hüppa lugemisteatise juurde</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element ei oska käsitleda %1$s-tüüpi sündmusi</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element ei oska käsitleda %1$s-tüüpi sünumeid</string>
-    <string name="rendering_event_error_exception">Tekkis viga, kui Element üritas töödelda sõnumi %1$s sisu</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} ei oska käsitleda %1$s-tüüpi sündmusi</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} ei oska käsitleda %1$s-tüüpi sünumeid</string>
+    <string name="template_rendering_event_error_exception">Tekkis viga, kui ${app_name} üritas töödelda sõnumi %1$s sisu</string>
     <string name="call_notification_answer">Võta vastu</string>
     <string name="call_notification_reject">Keeldu</string>
     <string name="call_notification_hangup">Lõpeta kõne</string>
@@ -2273,7 +2273,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Kasutaja kustutas sündmuse, põhjusena %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Jututoa haldur on sündmust modereerinud, põhjusena %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Krüptovõtmed on juba uuendatud!</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Päringud võtmete laadimiseks</string>
     <string name="e2e_use_keybackup">Võta krüptitud sõnumite ajalugu lukust lahti</string>
     <string name="refresh">Värskenda</string>
@@ -2331,13 +2331,13 @@
     <string name="error_adding_media_file_to_gallery">Meediafaili galeriisse lisamine ei õnnestunud</string>
     <string name="error_saving_media_file">Meediafaili salvestamine ei õnnestunud</string>
     <string name="change_password_summary">Määra kontole uus salasõna…</string>
-    <string name="use_other_session_content_description">Kasuta kõige uuemat Element\'i versioon mõnes muus seadmes, nagu näiteks Element Web, Element Desktop, Element iOS, Element Android. Samuti sobib mõni muu Matrix\'i klient, mis oskab risttunnustamist</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">Kasuta kõige uuemat ${app_name}\'i versioon mõnes muus seadmes, nagu näiteks ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} Android. Samuti sobib mõni muu Matrix\'i klient, mis oskab risttunnustamist</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">või mõnda teist Matrix\'i klienti, mis oskab risttunnustamist</string>
-    <string name="use_latest_app">Kasuta oma muus seadmes kõige uuemat Element\'i versiooni:</string>
+    <string name="template_use_latest_app">Kasuta oma muus seadmes kõige uuemat ${app_name}\'i versiooni:</string>
     <string name="command_description_discard_session">Sunnib loobuma praeguse krüptitud jututoa rühmavestluse seansist</string>
     <string name="command_description_discard_session_not_handled">Funktsionaalsus on toetatud ainult krüptitud jututubades</string>
     <string name="enter_secret_storage_passphrase_or_key">Jätkamiseks kasuta kas oma %1$s või %2$s.</string>
@@ -2380,13 +2380,13 @@
     <string name="delete_account_data_warning">Kas kustutame %1$s tüüpi kasutajakonto andmed\?
 \n
 \nKuna nii mõndagi ootamatut võib juhtuda, siis kasuta seda võimalust mõningase ettevaatusega.</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN-kood on nõutav alati, kui sa Element\'i avad.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN-kood on nõutav, kui sa kahe minuti jooksul pole Element\'i kasutanud.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">PIN-kood on nõutav alati, kui sa ${app_name}\'i avad.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">PIN-kood on nõutav, kui sa kahe minuti jooksul pole ${app_name}\'i kasutanud.</string>
     <string name="settings_security_pin_code_grace_period_title">Kahe minuti möödumisel küsi uuesti PIN-koodi</string>
     <string name="settings_security_pin_code_notifications_summary_off">Näita vaid napi teavitusena lugemata sõnumite arvu.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Näita täpsemat teavet nagu jututoa nimi ja sõnumi sisu.</string>
     <string name="settings_security_pin_code_notifications_title">Näita teavitustes sisu</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-kood on ainus võimalus, kuidas sa saad Element\'i lukust lahti.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN-kood on ainus võimalus, kuidas sa saad ${app_name}\'i lukust lahti.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Kasuta selles seadmes leiduvaid biomeetrilise tuvastuse võimalusi nagu sõrmejälgede lugejat või näotuvastust.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Kasuta biomeetrilist tuvastust</string>
     <string name="settings_security_application_protection_screen_title">Seadista</string>
@@ -2451,8 +2451,8 @@
     <string name="identity_server_consent_dialog_content">Kas selleks, et leida tuttavaid, oled sa nõus saatma oma kontaktteavet (telefoninumbreid ja/või e-posti aadresse) siin rakenduses seadistatud isikutuvastusserverile (%1$s)\?
 \n
 \nParema turvalisuse nimel me ei saada teavet mitte loetava tekstina, vaid räsina.</string>
-    <string name="invite_friends_rich_title">🔐️ Liitu minuga vestlusrakenduses Element</string>
-    <string name="invite_friends_text">Hei, palun suhtle minuga vestlusrakenduses Element: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Liitu minuga vestlusrakenduses ${app_name}</string>
+    <string name="template_invite_friends_text">Hei, palun suhtle minuga vestlusrakenduses ${app_name}: %s</string>
     <string name="invite_friends">Kutsu sõpru</string>
     <string name="add_people">Lisa inimesi</string>
     <string name="topic_prefix">"Teema: "</string>
@@ -2576,7 +2576,7 @@
     <string name="room_participants_leave_private_warning">See ei ole avalik jututuba. Ilma kutseta sa ei saa uuesti liituda.</string>
     <string name="system_theme">Süsteemi vaikeseadistused</string>
     <string name="authentication_error">Autentimine ei õnnestunud</string>
-    <string name="re_authentication_default_confirm_text">Selle tegevuse jaoks palub Element sul sisestada oma kasutajanime ja salasõna.</string>
+    <string name="template_re_authentication_default_confirm_text">Selle tegevuse jaoks palub ${app_name} sul sisestada oma kasutajanime ja salasõna.</string>
     <string name="re_authentication_activity_title">Palun korda autentimist</string>
     <string name="failed_to_initialize_cross_signing">Risttunnustamise alustamine ei õnnestunud</string>
     <string name="error_unauthorized">Volitused puuduvad, kasutajakonto ja/või salasõna on valed</string>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index e9cf1bcefa..434556241b 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -205,7 +205,7 @@
     <string name="local_address_book_header">Gailuko helbide liburua</string>
     <string name="matrix_only_filter">Matrixeko kontaktuak besterik ez</string>
     <string name="no_conversation_placeholder">Elkarrizketarik ez</string>
-    <string name="no_contact_access_placeholder">Ez diozu baimena eman Element aplikazioari zure gailuko kontaktuak atzitzeko</string>
+    <string name="template_no_contact_access_placeholder">Ez diozu baimena eman Element aplikazioari zure gailuko kontaktuak atzitzeko</string>
     <string name="no_result_placeholder">Emaitzarik ez</string>
 
     <string name="rooms_header">Gelak</string>
@@ -349,15 +349,15 @@ E-mail helbide bat gehitu dezakezu zure profilaren ezarpenetan.</string>
     <string name="media_picker_cannot_record_video">Ezin izan da bideoa grabatu</string>
 
     <string name="permissions_rationale_popup_title">Informazioa</string>
-    <string name="permissions_rationale_msg_camera">Elementek zure kamera atzitzeko baimena behar du argazkiak eta bideoak atera ahal izateko.</string>
+    <string name="template_permissions_rationale_msg_camera">Elementek zure kamera atzitzeko baimena behar du argazkiak eta bideoak atera ahal izateko.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
-    <string name="permissions_rationale_msg_record_audio">Elementek zure mikrofonoa atzitzeko baimena behar du ahots deiak egin ahal izateko.</string>
+    <string name="template_permissions_rationale_msg_record_audio">Elementek zure mikrofonoa atzitzeko baimena behar du ahots deiak egin ahal izateko.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Elementek zure kamera eta mikrofonoa atzitzeko baimenak behar ditu bideo deiak egin ahal izateko.
+    <string name="template_permissions_rationale_msg_camera_and_audio">Elementek zure kamera eta mikrofonoa atzitzeko baimenak behar ditu bideo deiak egin ahal izateko.
 
 Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
     <string name="permissions_action_not_performed_missing_permissions">Ez da ekintza burutu baimenak falta direlako</string>
@@ -377,11 +377,11 @@ Baimendu sarbidea hurrengo laster-leihoan deia egin ahal izateko.</string>
 
     <string name="room_preview_invitation_format">%s erabiltzaileak gela honetara elkartzera gonbidatu zaitu</string>
 
-    <string name="permissions_rationale_msg_storage">Elementek zure argazki eta bideoen liburutegia atzitzeko baimena behar du eranskinak gorde ahal izateko.
+    <string name="template_permissions_rationale_msg_storage">${app_name}ek zure argazki eta bideoen liburutegia atzitzeko baimena behar du eranskinak gorde ahal izateko.
 
 Baimendu sarbidea hurrengo laster-leihoan zure telefonotik fitxategiak bidali ahal izateko.</string>
-    <string name="permissions_rationale_msg_contacts">Element-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko. Honetarako zure helbide-liburua partekatzea onartzen baduzu, sakatu onartu hurrengo laster-leihoan.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko.
+    <string name="template_permissions_rationale_msg_contacts">${app_name}-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko. Honetarako zure helbide-liburua partekatzea onartzen baduzu, sakatu onartu hurrengo laster-leihoan.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name}-ek zure helbide-liburua egiaztatu dezake Matrix erabiltzaileak bere e-mail helbide edo telefono zenbakiaren bidez aurkitzeko.
 \n
 \nHonetarako zure helbide-liburua partekatzea onartzen duzu\?</string>
 
@@ -962,7 +962,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="settings_notification_privacy_message_content_not_shown">• Jakinarazpenek <b>ez dute mezuaren edukia erakutsiko</b></string>
 
     <string name="startup_notification_privacy_title">Jakinarazpenen pribatutasuna</string>
-    <string name="startup_notification_privacy_message">Element bigarren planoan aritu daiteke zure jakinarazpenak modu seguru eta pribatuan kudeatzeko. Honek baterian eragina izan lezake.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} bigarren planoan aritu daiteke zure jakinarazpenak modu seguru eta pribatuan kudeatzeko. Honek baterian eragina izan lezake.</string>
     <string name="startup_notification_privacy_button_grant">Eman baimena</string>
     <string name="startup_notification_privacy_button_other">Aukeratu beste zerbait</string>
 
@@ -977,8 +977,8 @@ Baten bat gehitu orain?</string>
     <string name="settings_deactivate_my_account">Desaktibatu nire kontua</string>
 
     <string name="settings_opt_in_of_analytics">Bidali analitiketarako datuak</string>
-    <string name="settings_opt_in_of_analytics_summary">Elementek analitika anonimoak biltzen ditu aplikazioa hobetzeko.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Gaitu analitikak Element hobetzera laguntzeko.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name}ek analitika anonimoak biltzen ditu aplikazioa hobetzeko.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Gaitu analitikak ${app_name} hobetzera laguntzeko.</string>
     <string name="settings_opt_in_of_analytics_ok">Bai, lagundu nahi dut!</string>
 
     <string name="widget_integration_missing_parameter">Behar den parametro bat falta da.</string>
@@ -1006,7 +1006,7 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
     <string name="e2e_re_request_encryption_key_sent">Gako eskaria bidalita.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Eskaria bidalita</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Abiatu Element beste mezua deszifratu dezakeen gailu batean, saio honetara gakoak bidali ditzan.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Abiatu ${app_name} beste mezua deszifratu dezakeen gailu batean, saio honetara gakoak bidali ditzan.</string>
 
     <string name="lock_screen_hint">Idatzi hemen…</string>
 
@@ -1127,7 +1127,7 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah
 
     <string name="call_anyway">Deitu hala ere</string>
     <string name="settings_call_category">Deiak</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Erabili Elementen lehenetsitako dei-doinua jasotako deientzat</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Erabili ${app_name}en lehenetsitako dei-doinua jasotako deientzat</string>
     <string name="settings_call_ringtone_title">Jasotako deien doinua</string>
     <string name="settings_call_ringtone_dialog_title">Hautatu deientzako doinua:</string>
 
@@ -1179,12 +1179,12 @@ Egiaztatu zure kontuaren ezarpenak.</string>
 
     <string name="settings_troubleshoot_test_device_settings_title">SAioaren ezarpenak.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Jakinarazpenak aktibatuta daude saio honentzat.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Jakinarazpenak ez daude aktibatuta saio honentzat. Egiaztatu Element ezarpenak.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Jakinarazpenak ez daude aktibatuta saio honentzat. Egiaztatu ${app_name} ezarpenak.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktibatu</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Play Services egiaztaketa</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK eskuragarri eta egunean dago.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element-ek Google Play Services erabiltzen du baina antza ez dago ondo konfiguratuta:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name}-ek Google Play Services erabiltzen du baina antza ez dago ondo konfiguratuta:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Konpondu Play Services</string>
 
@@ -1211,19 +1211,19 @@ Berrabiarazi aplikazioa.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Hasi abioan</string>
     <string name="settings_troubleshoot_test_service_boot_success">Zerbitzua gailua berrabiaraztean hasiko da.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Zerbitzua ez da hasiko gailua berrabiaraztean, ez duzu jakinarazpenik jasoko Element behin ireki arte.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Zerbitzua ez da hasiko gailua berrabiaraztean, ez duzu jakinarazpenik jasoko ${app_name} behin ireki arte.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Gaitu abioan hastea</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Egiaztatu bigarren planoko murrizketak</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Bigarren planoko murrizketak desaktibatuta daude Element-entzat. Proba hau datu mugikorrekin egin behar da (Ez WiFi).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Bigarren planoko murrizketak desaktibatuta daude ${app_name}-entzat. Proba hau datu mugikorrekin egin behar da (Ez WiFi).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Bigarren planoko murrizketak aktibatuta daude Element-entzat.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Bigarren planoko murrizketak aktibatuta daude ${app_name}-entzat.
 Aplikazioa egiten saiatzen ari dena agresiboki murriztuko zaio bigarren planoan dagoenean, eta honek jakinarazpenetan eragina izan dezake.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desaktibatu murrizketak</string>
 
     <string name="settings_troubleshoot_test_battery_title">Bateria optimizazioa</string>
-    <string name="settings_troubleshoot_test_battery_success">Bateria optimizazioak ez du eraginik Element-engan.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Bateria optimizazioak ez du eraginik ${app_name}-engan.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ezikusi optimizazioa</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Bigaren planoko konexioa</string>
@@ -1237,8 +1237,8 @@ Aplikazioa egiten saiatzen ari dena agresiboki murriztuko zaio bigarren planoan
     <string name="no_valid_google_play_services_apk">Ez da baliozko Google Play Services APK-rik aurkitu. Jakinarazpenak agian ez dira ongi ibiliko.</string>
 
     <string name="settings_troubleshoot_test_battery_failed">Erabiltzaile batek gailu bat deskonektatuta eta erabili gabe uzten badu denbora batez, pantaila itzalita duela, gailua kuluxka moduan sartzen da. Honek aplikazioak sarera konektatzea eragozten du eta beraien lanak atzeratzen ditu, baita ohiko alarmak.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element-ek bigarren planoko konexio arin bat behar du jakinarazpen fidagarriak izateko.
-Hurrengo pantailan Element-i bigarren planoan aritzeko baimena eskatuko zaizu, onartu ezazu mesedez.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name}-ek bigarren planoko konexio arin bat behar du jakinarazpen fidagarriak izateko.
+Hurrengo pantailan ${app_name}-i bigarren planoan aritzeko baimena eskatuko zaizu, onartu ezazu mesedez.</string>
 
     <string name="video_call_in_progress">Bide-deia abioan…</string>
 
@@ -1270,7 +1270,7 @@ Hurrengo pantailan Element-i bigarren planoan aritzeko baimena eskatuko zaizu, o
     <string name="passphrase_empty_error_message">Idatzi pasaesaldia</string>
     <string name="passphrase_passphrase_too_weak">Pasaesaldia ahulegia da</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Ezabatu pasaesaldia Element aplikazioak berreskuratze gako bat sortu dezan nahi baduzu.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Ezabatu pasaesaldia ${app_name} aplikazioak berreskuratze gako bat sortu dezan nahi baduzu.</string>
     <string name="keys_backup_no_session_error">Ez dago Matrix saiorik eskuragarri</string>
 
     <string name="keys_backup_setup_step1_title">Ez galdu inoiz zifratutako mezuak</string>
@@ -1310,12 +1310,12 @@ Hurrengo pantailan Element-i bigarren planoan aritzeko baimena eskatuko zaizu, o
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Kontuan izan mezu mota batzuk isilak izateko ezarri direla (soinurik gabeko jakinarazpena sortuko dute).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Jakinarazpen batzuk desgaituta daude zure ezarpen pertsonaletan.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Hutsegitea arau pertsonalak kargatzean, saiatu berriro.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-Errore hau Element-en kontroletik kanpo dago eta Google-en arabera, errore honek esan nahi du gailuko aplikazio gehiegik erabiltzen dutela FCM. Errore hau ezohiko aplikazio kopuru bat dagoenean gertatzen da, ez lioke erabiltzaile arrunt bati eragingo.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">"[%1$s]
-Errore hau Element-en kontroletik kanpo dago. Hainbat arrazoiengatik gerta daiteke eta geroago berriro saiatzen bazara agian badabil,  egiaztatu ere Google Play Service-ek ez duela datuen erabilera mugatua sistemaren ezarpenetan, edo zure gailuaren ordua ondo ezarrita dagoela, ROM pertsonalizatuekin gertatu daiteke ere."</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-Errore hau Element-en kontroletik kanpo dago. Ez dago Google konturik gailuan. Ireki kontuen kudeatzailea eta gehitu Google kontu bat.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+Errore hau ${app_name}-en kontroletik kanpo dago eta Google-en arabera, errore honek esan nahi du gailuko aplikazio gehiegik erabiltzen dutela FCM. Errore hau ezohiko aplikazio kopuru bat dagoenean gertatzen da, ez lioke erabiltzaile arrunt bati eragingo.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">"[%1$s]
+Errore hau ${app_name}-en kontroletik kanpo dago. Hainbat arrazoiengatik gerta daiteke eta geroago berriro saiatzen bazara agian badabil,  egiaztatu ere Google Play Service-ek ez duela datuen erabilera mugatua sistemaren ezarpenetan, edo zure gailuaren ordua ondo ezarrita dagoela, ROM pertsonalizatuekin gertatu daiteke ere."</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+Errore hau ${app_name}-en kontroletik kanpo dago. Ez dago Google konturik gailuan. Ireki kontuen kudeatzailea eta gehitu Google kontu bat.</string>
     <string name="keys_backup_setup_step1_description">Zifratutako geletako mezuak muturretik muturrera zifratuta daude. Hartzaileak/ek eta zuk eta ez beste inork irakurri ditzakezue mezuok.
 \n
 \nEgin zure gakoen babes-kopia segurua mezuak ez galtzeko.</string>
@@ -1448,7 +1448,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="autodiscover_invalid_response">Baliogabeko hasiera-zerbitzari deskubritze erantzuna</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Automatikoki osatu zerbitzariaren aukerak</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">"Element-ek pertsonalizatutako zerbitzari konfigurazio bat antzeman du zure erabiltzaile id-arentzat \"%1$s\" domeinuan:
+    <string name="template_autodiscover_well_known_autofill_dialog_message">"${app_name}-ek pertsonalizatutako zerbitzari konfigurazio bat antzeman du zure erabiltzaile id-arentzat \"%1$s\" domeinuan:
 \n%2$s"</string>
     <string name="autodiscover_well_known_autofill_confirm">Erabili konfigurazioa</string>
 
@@ -1580,7 +1580,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="group_all_communities">Komunitate guztiak</string>
 
     <string name="room_preview_no_preview">Gela hau ezin da aurreikusi</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Munduak irakurtzeko moduko gelaren aurrebista ez da oraindik onartzen Element bezeroan</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Munduak irakurtzeko moduko gelaren aurrebista ez da oraindik onartzen ${app_name} bezeroan</string>
 
     <string name="fab_menu_create_room">Gelak</string>
     <string name="fab_menu_create_chat">Mezu zuzenak</string>
@@ -1700,11 +1700,11 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="invite_no_identity_server_error">Gehitu identitate-zerbitzari bat zure ezarpenetan ekintza hau burutzeko.</string>
     <string name="settings_background_fdroid_sync_mode">Bigarren planoko sinkronizazio modua (Esperimentala)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Bateria erabilerarako optimizatua</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element bigarren planoan sinkronizatuko da gailuaren baliabide mugatuen erabilera ahal beste murriztuz (bateria).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} bigarren planoan sinkronizatuko da gailuaren baliabide mugatuen erabilera ahal beste murriztuz (bateria).
 \nZure gailuaren baliabideen egoeraren arabera, sistema eragileak sinkronizazioa atzeratu dezake.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Denbora errealerako optimizatua</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element bigarren planoan sinkronizatuko da maiztasun finkoarekin (konfiguragarria).
-\nHonek irrati eta bateriaren erabileran eragina izango du, eta Element gertaerei adi dagoela dion jakinarazpen bat bistaratuko da etengabe.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} bigarren planoan sinkronizatuko da maiztasun finkoarekin (konfiguragarria).
+\nHonek irrati eta bateriaren erabileran eragina izango du, eta ${app_name} gertaerei adi dagoela dion jakinarazpen bat bistaratuko da etengabe.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Ez sinkronizatu bigarren planoan</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Ez zaizu jasotako mezuei buruz jakinaraziko aplikazioa bigarren planoan dagoenean.</string>
     <string name="settings_background_sync_update_error">Huts egin du ezarpenak eguneratzean.</string>
@@ -1816,14 +1816,14 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \n
 \nEz baduzu erabiltzaile honen eduki gehiago ikusi nahi, bere mezuak ezkutatzeko blokeatu dezakezu</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Element-ek zure E2E gakoak diskoan gordetzeko baimena behar du.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name}-ek zure E2E gakoak diskoan gordetzeko baimena behar du.
 \n
 \nBaimendu sarbidea hurrengo laster-leihoan zure gakoak eskuz esportatu ahal izateko.</string>
 
     <string name="no_network_indicator">Ez dago sare konexiorik orain</string>
 
     <string name="settings_add_3pid_confirm_password_title">Berretsi zure pasahitza</string>
-    <string name="settings_add_3pid_flow_not_supported">Ezin duzu hau egin mugikorrerako Element erabiliz</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Ezin duzu hau egin mugikorrerako ${app_name} erabiliz</string>
     <string name="settings_add_3pid_authentication_needed">Autentifikazioa behar da</string>
 
 
@@ -2027,7 +2027,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \nHasi saioa berriro zure kontuaren datuak eta mezuak atzitzeko.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Zure mezu zifratuetara sarbidea galduko duzu ez baduzu saioa hasten zifratze gakoak berreskuratzeko.</string>
     <string name="soft_logout_clear_data_dialog_submit">Garbitu datuak</string>
-    <string name="soft_logout_sso_not_same_user_error">Oraingo saioa %1$s erabiltzailearena da eta %2$s erabiltzailearen kredentzialak eman dituzu. Element-k ez du hau onartzen.
+    <string name="template_soft_logout_sso_not_same_user_error">Oraingo saioa %1$s erabiltzailearena da eta %2$s erabiltzailearen kredentzialak eman dituzu. ${app_name}-k ez du hau onartzen.
 \nAurretik garbitu datuak, gero hasi saioa berriro beste kontu batekin.</string>
 
     <string name="permalink_malformed">Zure matrix.to esteka gaizki osatua dago</string>
@@ -2050,7 +2050,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="autocomplete_limited_results">Soilik lehen emaitzak erakusten, idatzi letra gehiago…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Hutsegin-azkar</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element aplikazioa ustekabeko erroreen aurrean maizago kraskatu daiteke</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} aplikazioa ustekabeko erroreen aurrean maizago kraskatu daiteke</string>
     <string name="command_description_shrug">"Jarri ¯\\_(ツ)_/¯  testu-soileko mezuaren aurretik"</string>
 
     <string name="create_room_encryption_title">Gaitu zifratzea</string>
@@ -2139,9 +2139,9 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="room_member_jump_to_read_receipt">Saltatu irakurragirira</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">Element aplikazioak ez ditu \'%1$s\' motako gertaerak kudeatzen</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element aplikazioak ez ditu \'%1$s\' motako mezuak kudeatzen</string>
-    <string name="rendering_event_error_exception">Element aplikazioak arazo bat izan du \'%1$s\' id-a duen edukia erakusteko</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} aplikazioak ez ditu \'%1$s\' motako gertaerak kudeatzen</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} aplikazioak ez ditu \'%1$s\' motako mezuak kudeatzen</string>
+    <string name="template_rendering_event_error_exception">${app_name} aplikazioak arazo bat izan du \'%1$s\' id-a duen edukia erakusteko</string>
 
     <string name="unignore">Utzi ezikusteari</string>
 
@@ -2271,7 +2271,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Gakoak egunean daude jada!</string>
 
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
 
     <string name="settings_key_requests">Gako eskaerak</string>
 
@@ -2413,13 +2413,13 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
 
-    <string name="use_other_session_content_description">Erabili azken Element bertsioa zure beste gailuetan, Element Web, Element Desktop, Element iOS, Element Android plataformarako, edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">Erabili azken ${app_name} bertsioa zure beste gailuetan, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} Android plataformarako, edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">edo zeharka sinatzeko gaitasuna duen beste Matrix bezero bat</string>
-    <string name="use_latest_app">Erabili azken Element bertsioa zure beste gailuetan:</string>
+    <string name="template_use_latest_app">Erabili azken ${app_name} bertsioa zure beste gailuetan:</string>
     <string name="command_description_discard_session">Uneko irteerako talde saioa zifratutako gela batean baztertzera behartzen du</string>
     <string name="command_description_discard_session_not_handled">Zifratutako gelatan onartzen da soilik</string>
     <string name="enter_secret_storage_passphrase_or_key">Erabili zure %1$s edo %2$s jarraitzeko.</string>
@@ -2489,11 +2489,11 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="open_terms_of">Ireki %s zerbitzariko baldintzak</string>
     <string name="disconnect_identity_server_dialog_content">Deskonektatu %s identitate zerbitzaritik\?</string>
-    <string name="identity_server_error_outdated_identity_server">Identitate zerbitzaria zaharkituta dago. Element-k API V2 besterik ez du onartzen.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Identitate zerbitzaria zaharkituta dago. ${app_name}-k API V2 besterik ez du onartzen.</string>
     <string name="identity_server_error_outdated_home_server">Ezin da eragiketa hau burutu. Hasiera-zerbitzaria zaharkituta dago.</string>
     <string name="identity_server_error_no_identity_server_configured">Konfiguratu identitate-zerbitzari bat aurretik.</string>
     <string name="identity_server_error_terms_not_signed">Onartu identitate-zerbitzariaren baldintzak aurretik zerbitzariaren ezarpenetan.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Zure pribatutasuna babesteko, Element-k erabiltzaileeen e-mail eta telefonoak hasheatuta bidaltzen ditu.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Zure pribatutasuna babesteko, ${app_name}-k erabiltzaileeen e-mail eta telefonoak hasheatuta bidaltzen ditu.</string>
     <string name="identity_server_error_binding_error">Asoziazioak huts egin du.</string>
     <string name="identity_server_error_no_current_binding_error">Ez dago asoziaziorik identifikatzaile honekin.</string>
 
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index b570a75cb0..189dd5aca0 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -346,7 +346,7 @@
     <string name="local_address_book_header">مخاطبین من</string>
     <string name="user_directory_header">فهرست کاربران</string>
     <string name="matrix_only_filter">فقط مخاطبین ماتریکس</string>
-    <string name="no_contact_access_placeholder">شما اجازه‌ی دسترسی به مخاطبین را به برنامه نداده‌اید</string>
+    <string name="template_no_contact_access_placeholder">شما اجازه‌ی دسترسی به مخاطبین را به برنامه نداده‌اید</string>
     <string name="no_result_placeholder">نتیجه‌ای نیست</string>
     <string name="rooms_directory_header">فهرست اتاق‌ها</string>
     <string name="no_room_placeholder">اتاقی نیست</string>
@@ -503,7 +503,7 @@
     <string name="e2e_re_request_encryption_key"><u>بازدرخواست کلیدهای رمزنگاری</u> از دیگر نشست‌هایتان.</string>
     <string name="e2e_re_request_encryption_key_sent">درخواست کلید ارسال شد.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">درخواست ارسال شد</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">لطفاً المنت را روی افزاره‌ای دیگر که می‌تواند پیام را رمزگشایی کند، اجرا کنید تا بتواند کلیدها را به این نشست بفرستد.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">لطفاً المنت را روی افزاره‌ای دیگر که می‌تواند پیام را رمزگشایی کند، اجرا کنید تا بتواند کلیدها را به این نشست بفرستد.</string>
     <string name="read_receipts_list">فهرست رسیدهای خواندن</string>
     <string name="keys_backup_setup_skip_title">آیا مطمئن هستید؟</string>
     <string name="disconnect">قطع اتصال</string>
@@ -543,7 +543,7 @@
     <string name="settings_app_info_link_title">اطّلاعات برنامه</string>
     <string name="settings_app_info_link_summary">نمایش اطّلاعات برنامه در تنظیمات سامانه.</string>
     <string name="settings_add_3pid_confirm_password_title">تأیید گذرواژه‌تان</string>
-    <string name="settings_add_3pid_flow_not_supported">نمی‌توانید با المنت همراه، این کار را بکنید</string>
+    <string name="template_settings_add_3pid_flow_not_supported">نمی‌توانید با المنت همراه، این کار را بکنید</string>
     <string name="settings_add_3pid_authentication_needed">نیاز به تأیید هویت است</string>
     <string name="settings_notification_advanced">تنظمیات پیش‌رفتهٔ آگاهی</string>
     <string name="settings_notification_troubleshoot">آگاهی‌های رفع‌اشکال</string>
@@ -554,7 +554,7 @@
     <string name="settings_troubleshoot_test_account_settings_failed">آگاهی‌ها برای حسابتان از کار افتاده‌اند.
 \nلطفاً تتظیمات حساب را بررسی کنید.</string>
     <string name="settings_troubleshoot_test_device_settings_success">آگاهی‌ها برای این نشست به کار افتاده‌اند.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">آگاهی‌ها برای این نشست به کار نیفتاده‌اند. 
+    <string name="template_settings_troubleshoot_test_device_settings_failed">آگاهی‌ها برای این نشست به کار نیفتاده‌اند.
 \nلطفاً تنظیمات المنت را بررسی کنید.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">برخی آگاهی‌ها در تنظیمات سفارشیتان از کار افتاده‌اند.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_title">خدمت آگاهی</string>
@@ -689,7 +689,7 @@
     <string name="please_wait">لطفاً شکیبایی کنید…</string>
     <string name="group_all_communities">تمام اجتماع‌ها</string>
     <string name="room_preview_no_preview">این اتاق نمی‌تواند پیش‌نمایش یابد</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">پیش‌نمایش اتاق‌های قابل خواندن به صورت عمومی هنوز در ریوت‌اکس پشتیبانی نمی‌شود</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">پیش‌نمایش اتاق‌های قابل خواندن به صورت عمومی هنوز در ریوت‌اکس پشتیبانی نمی‌شود</string>
     <string name="fab_menu_create_room">اتاق‌ها</string>
     <string name="fab_menu_create_chat">پیام‌های مستقیم</string>
     <string name="create_room_title">اتاق جدید</string>
@@ -793,13 +793,13 @@
     <string name="login_error_not_json">شامل یک JSON معتبر نبود</string>
     <string name="login_error_limit_exceeded">درخواست‌های بیش از حد ارسال شده</string>
     <string name="login_error_login_email_not_yet">هنوز روی پیوند ایمیل کلیک نشده</string>
-    <string name="settings_call_ringtone_use_app_ringtone">استفاده از صدای زنگ پیش‌گزیدهٔ المنت برای تماس‌های ورودی</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">استفاده از صدای زنگ پیش‌گزیدهٔ المنت برای تماس‌های ورودی</string>
     <string name="settings_call_ringtone_title">صدای زنگ تماس ورودی</string>
     <string name="settings_call_ringtone_dialog_title">گزینش صدای زنگ برای تماس‌ها:</string>
     <string name="media_picker_both_capture_title">یک عکس یا ویدیو بگیر</string>
     <string name="media_picker_cannot_record_video">نمی‌توان ویدیو ظبط کرد</string>
     <string name="permissions_rationale_popup_title">اطلاعات</string>
-    <string name="permissions_rationale_msg_camera">المنت برای گرفتن عکس و تماس‌های ویدیویی نیاز به اجازه دارد.</string>
+    <string name="template_permissions_rationale_msg_camera">المنت برای گرفتن عکس و تماس‌های ویدیویی نیاز به اجازه دارد.</string>
     <string name="open_chat_header">بازکردن سرتیتر</string>
     <string name="room_sync_in_progress">در حال هم‌گام‌سازی…</string>
     <string name="room_jump_to_first_unread">پریدن به نخستین پیام خوانده نشده.</string>
@@ -866,7 +866,7 @@
     <string name="call_notification_answer">پذیرش</string>
     <string name="call_notification_reject">رد</string>
     <string name="call_notification_hangup">قطع</string>
-    <string name="call_failed_no_connection">تماس المنت شکست خورد</string>
+    <string name="template_call_failed_no_connection">تماس المنت شکست خورد</string>
     <string name="call_select_sound_device">گزینش افزارهٔ صوتی</string>
     <string name="sound_device_phone">تلفن</string>
     <string name="sound_device_speaker">بلندگو</string>
@@ -978,14 +978,14 @@
     <string name="settings_troubleshoot_test_service_boot_success">خدمت هنگام شروع دوبارهٔ افزاره، شروع خواهد شد.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">به کار اندازی شروع هنگام راه‌اندازی</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">بررسی محدودیت‌های پس‌زمینه</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">محدودیت‌های پس‌زمینه برای المنت از کار افتاده‌اند. این آزمون باید با استفاده از دادهٔ همراه (بدون وای‌فای) اجرا شود.
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">محدودیت‌های پس‌زمینه برای المنت از کار افتاده‌اند. این آزمون باید با استفاده از دادهٔ همراه (بدون وای‌فای) اجرا شود.
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">محدودیت‌های پس‌زمینه برای النت به کار افتاده‌اند.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">محدودیت‌های پس‌زمینه برای النت به کار افتاده‌اند.
 \nکارهایی که کاره می‌خواهد انجام دهد، هنگامی که در پس‌زمینه است به صورت تهاجمی محدود می‌شوند که می‌تواند روی آگاهی‌ها تأثیر بگذارد.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">از کار انداختن محدودیت‌ها</string>
     <string name="settings_troubleshoot_test_battery_title">بهینه‌سازی باتری</string>
-    <string name="settings_troubleshoot_test_battery_success">المنت تحت تأثیر بهینه‌سازی باتری نیست.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">المنت تحت تأثیر بهینه‌سازی باتری نیست.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">نادیده‌گرفتن بهینه‌سازی</string>
     <string name="settings_notification_privacy_normal">عادی</string>
     <string name="settings_notification_privacy_reduced">محرمانگی کاهش‌یافته</string>
@@ -1353,7 +1353,7 @@
     <string name="devices_current_device">نشست جاری</string>
     <string name="autocomplete_limited_results">فقط نمایش نخستین نتایج. حرف‌های بیش‌تری بنویسید…</string>
     <string name="settings_developer_mode_fail_fast_title">شکست سریع</string>
-    <string name="settings_developer_mode_fail_fast_summary">المنت ممکن است هنگام رخ دادن خطای نامنتظره،‌بیش‌تر فروبپاشد</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">المنت ممکن است هنگام رخ دادن خطای نامنتظره،‌بیش‌تر فروبپاشد</string>
     <string name="create_room_encryption_title">به کار انداختن رمزنگاری</string>
     <string name="create_room_encryption_description">پس از به کار افتادن، رمزنگاری قابل از کار انداختن نیست.</string>
     <string name="verification_conclusion_warning">ورود نامطمئن</string>
@@ -1469,7 +1469,7 @@
     </plurals>
     <string name="delete_event_dialog_title">تأیید برداشت</string>
     <string name="delete_event_dialog_reason_checkbox">آوردن دلیل</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">درخواست‌های کلید</string>
     <string name="e2e_use_keybackup">قفل‌گشایی از تاریخچهٔ پیام‌های رمزشده</string>
     <string name="refresh">نوسازی</string>
@@ -1503,9 +1503,9 @@
     <string name="settings_security_prevent_screenshots_title">جلوگیری از نماگرفت کاره</string>
     <string name="settings_security_prevent_screenshots_summary">به کار انداختن این انتخاب، FLAG_SECURE را به تمامی فعّالیت‌ها می‌افزاید. برای اثرگذاری تغییر، برنامه را دوباره شروع کنید.</string>
     <string name="media_file_added_to_gallery">پروندهٔ رسانه‌ای به جُنگ افزوده شد</string>
-    <string name="app_desktop_web">المنت وب
+    <string name="template_app_desktop_web">المنت وب
 \nالمنت میزکار</string>
-    <string name="app_ios_android">المنت آی‌اواس
+    <string name="template_app_ios_android">المنت آی‌اواس
 \nالمنت اندروید</string>
     <string name="use_recovery_key">استفاده از کلید بازیابی</string>
     <string name="encrypted_unverified">رمزشده به دست افزاره‌ای تأییدنشده</string>
@@ -1604,7 +1604,7 @@
     <string name="setup_cross_signing">به کار انداختن ورود چندگانه</string>
     <string name="enter_secret_storage_passphrase_or_key">برای ادامه از %1$s یا %2$sتان استفاده کنید.</string>
     <string name="command_description_discard_session_not_handled">پشتیبانی‌شده فقط در اتاق‌های رمزشده</string>
-    <string name="use_latest_app">از آخرین نگارش المنت روی دیگر افزاره‌تان استفاده کنید:</string>
+    <string name="template_use_latest_app">از آخرین نگارش المنت روی دیگر افزاره‌تان استفاده کنید:</string>
     <string name="or_other_mx_capabale_client">یا دیگر کاره‌های ماتریکس دادای قابلیت ورود چندگانه</string>
     <string name="cross_signing_verify_by_text">تأیید دستی با متن</string>
     <string name="verify_this_session">تأیید ورود جدیدی که به حسابتان دسترسی دارد: %1$s</string>
@@ -1653,13 +1653,13 @@
     <string name="room_error_not_found">نمی‌توان این اتاق را یافت. مطمئن شوید وجود دارد.</string>
     <string name="error_opening_banned_room">نمی‌توان اتاقی را که از آن تحریم شده‌اید، گشود.</string>
     <string name="auth_pin_confirm_to_disable_title">برای از کار انداختن پین، تأییدش کنید</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">نیاز به رمز پین، هر بار که المنت را می‌گشایید.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">نیاز به رمز پین، ۲ دقیقه پس از استفاده نشدن از المنت.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">نیاز به رمز پین، هر بار که المنت را می‌گشایید.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">نیاز به رمز پین، ۲ دقیقه پس از استفاده نشدن از المنت.</string>
     <string name="settings_security_pin_code_grace_period_title">نیاز به پین پس از ۲ دقیقه</string>
     <string name="settings_security_pin_code_notifications_summary_off">فقط نمایش تعداد پیام‌های نخوانده در یک آگاهی ساده.</string>
     <string name="settings_security_pin_code_notifications_summary_on">نمایش جزییاتی چون نام اتاق‌ها و محتوای پیام.</string>
     <string name="settings_security_pin_code_notifications_title">نمایش محتوا در آگاهی‌ها</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">کد پین، تنها راه قفل‌گشایی المنت است.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">کد پین، تنها راه قفل‌گشایی المنت است.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">به کار انداختن زیست‌سنجی‌های مختص افزاره، مانند اثرانگشت‌ها و تشخیص چهره.</string>
     <string name="settings_security_pin_code_use_biometrics_title">به کار انداختن زیست‌سنجی‌ها</string>
     <string name="settings_security_pin_code_summary">اگر می‌خواهید پینتان را بازنشانی کنید، فراموشی پین را برای خروج و بازنشانی بزنید.</string>
@@ -1693,7 +1693,7 @@
     <string name="reset">بازنشانی</string>
     <string name="startup_notification_privacy_button_other">انتخاب گزینه‌ی دیگر</string>
     <string name="startup_notification_privacy_button_grant">مجوز دادن</string>
-    <string name="startup_notification_privacy_message">المنت می تواند در پس‌زمینه اجرا شده تا آگاهی‌هایتان را به صورت ایمن و محرمانه مدیریت کند. ممکن است بر مصرف باتری تأثیر بگذارد.</string>
+    <string name="template_startup_notification_privacy_message">المنت می تواند در پس‌زمینه اجرا شده تا آگاهی‌هایتان را به صورت ایمن و محرمانه مدیریت کند. ممکن است بر مصرف باتری تأثیر بگذارد.</string>
     <string name="reset_secure_backup_warning">این کار کلید امنیتی قبلی شما را حذف می‌کند.</string>
     <string name="reset_secure_backup_title">یک کلید امنیتی جدید به صورت تصادفی ایجاد کنید یا یک عبارت امنیتی جدید برای فایل‌های پشتیبان موجود خود تنظیم کنید.</string>
     <string name="settings_send_message_with_enter_summary">فشردن اینتر به جای رفتن به خط بعد، پیام را ارسال خواهد کرد</string>
@@ -1707,9 +1707,9 @@
     <string name="settings_inline_url_preview_summary">پیش‌نمایشی از آدرس‌های URL در پیام‌ها نمایش داده شود.</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nبسته به شارژ دستگاه یا وضعیت دستگاه(خاموش بودن صفحه) ممکن است همگام‌سازی به تعویق بیوفتد.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">المنت بصورت دوره‌ای و در بازه‌های قابل تنظیم در پس زمینه همگام‌سازی می شود.
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">المنت بصورت دوره‌ای و در بازه‌های قابل تنظیم در پس زمینه همگام‌سازی می شود.
 \nاین بر مصرف باتری شما تأثیر می‌گذارد، یک اعلان دائمی نمایش داده می‌شود که المنت برای رویدادها گوش می‌دهد.</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">المنت در پس زمینه همگام‌سازی می‌کند به گونه ای که منابع محدود دستگاه (باتری) حفظ می‌شود.
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">المنت در پس زمینه همگام‌سازی می‌کند به گونه ای که منابع محدود دستگاه (باتری) حفظ می‌شود.
 \nبسته به شارژ گوشی شما، ممکن است همگام‌سازی توسط سیستم‌عامل به تعویق بیوفتد.</string>
     <string name="settings_turn_screen_on">روشن کردن صفحه برای ۳ ثانیه</string>
     <string name="settings_notification_privacy_message_content_not_shown">• آگاهی‌ها <b>محتوای پیام را نشان نخواهند داد</b></string>
@@ -1718,7 +1718,7 @@
     <string name="settings_notification_privacy_metadata">• آگاهی‌ها فقط دارای فراداده هستند</string>
     <string name="settings_notification_privacy_fcm">• آگاهی‌ها با پیام‌رسانی ابری Firebase فرستاده می‌شوند</string>
     <string name="settings_troubleshoot_test_battery_failed">اگر دستگاه برای مدتی از شارژر جدا باشد و از دستگاه نیز استفاده نشود، گوشی وارد حالت غیر هوشیار می‌شود. در این حالت از دسترسی برنامه‌ها به اینترنت جلوگیری می‌شود و همگام سازی و هشدارهای استاندارد آن‌ها به تعویق می‌افتد.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">خدمت، هنگام شروع دوبارهٔ افزاره اجرا نخواهد شد. تا وقتی یک بار المنت باز نشود، آگاهی‌ها را دریافت نخواهید کرد.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">خدمت، هنگام شروع دوبارهٔ افزاره اجرا نخواهد شد. تا وقتی یک بار المنت باز نشود، آگاهی‌ها را دریافت نخواهید کرد.</string>
     <string name="settings_troubleshoot_test_notification_notification_clicked">روی آگاهی کلیک شد!</string>
     <string name="settings_troubleshoot_test_notification_notice">لطفاً روی آگاهی کلیک کنید. اگر آگاهی را نمی‌بینید، لطفاً تنظیمات سامانه را بررسی کنید.</string>
     <string name="settings_troubleshoot_test_notification_title">نمایش آگاهی</string>
@@ -1732,11 +1732,11 @@
     <string name="settings_troubleshoot_test_token_registration_success">توکن FCM با موفقیت در سرور ثبت شد.</string>
     <string name="settings_troubleshoot_test_token_registration_title">ثبت توکن</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">افزودن حساب کاربری</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nاین خطا از کنترل المنت خارج است. هیچ حساب Google‌ای روی تلفن وجود ندارد. لطفاً مدیریت حساب را در تنظیمات گوشی باز کرده و یک حساب Google اضافه کنید.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
 \nاین خطا از کنترل المنت خارج است و به چند دلیل ممکن است رخ داده باشد. امکان دارد در صورت تلاش مجدد مشکل رفع شود، همچنین می‌توانید بررسی کنید که سرویس Google Play در استفاده از اینترنت در تنظیمات گوشی محدودیتی نداشته باشد یا ساعت دستگاه شما درست باشد. همچنین ممکن است به علت استفاده از ROM سفارشی‌شده این خطا رخ داده باشد.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nاین خطا از کنترل المنت خارج است و طبق گفته گوگل ، این خطا نشان می دهد که دستگاه بیش از حد مجاز، برنامه های ثبت شده در FCM دارد. این خطا فقط در مواردی رخ می دهد که تعداد زیادی برنامه وجود دارد، بنابراین نباید بر کاربر عادی رخ دهد.</string>
     <string name="settings_troubleshoot_test_fcm_failed">بازیابی توکن FCM با مشکل مواجه شد:
 \n%1$s</string>
@@ -1744,7 +1744,7 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">توکن Firebase</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">مشکل Google Play Services را برطرف کنید</string>
-    <string name="settings_troubleshoot_test_play_services_failed">المنت برای ارسال آگاهی‌ها از خدمات پلی گوگل استفاده می‌کند اما به نظر می‌رسد به درستی پیکربندی نشده است:
+    <string name="template_settings_troubleshoot_test_play_services_failed">المنت برای ارسال آگاهی‌ها از خدمات پلی گوگل استفاده می‌کند اما به نظر می‌رسد به درستی پیکربندی نشده است:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services در دسترس و بروز است.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">تنظیمات سفارشی بارگذاری نشد، لطفاً دوباره امتحان کنید.</string>
@@ -1800,21 +1800,21 @@
     <string name="room_preview_unlinked_email_warning">این دعوت به %s ارسال شده که ارتباطی با این حساب ندارد.
 \nممکن است بخواهید با حسابی دیگر وارد شده یا این رایانامه را به حسابتان بیفزایید.</string>
     <string name="permissions_action_not_performed_missing_permissions">متاسفانه به دلیل عدم دسترسی، درخواست شما امکان پذیر نمی باشد</string>
-    <string name="permissions_msg_contacts_warning_other_androids">المنت می‌تواند با دیدن دفترچه تلفن شما کاربرهای دیگر ماتریکس را بر اساس ایمبل و شماره تلفنشان پیدا کند.
+    <string name="template_permissions_msg_contacts_warning_other_androids">المنت می‌تواند با دیدن دفترچه تلفن شما کاربرهای دیگر ماتریکس را بر اساس ایمبل و شماره تلفنشان پیدا کند.
 \n
 \nآیا موافق با اشتراک‌گذاری دفترچه تلفنتان به این منظور هستید؟</string>
-    <string name="permissions_rationale_msg_contacts">المنت می‌تواند با دیدن دفترچه تلفن شما کاربرهای دیگر ماتریکس را بر اساس ایمبل و شماره تلفنشان پیدا کند. اگر مایل به اشتراک گذاری دفترچه تلفنتان به این منظور هستید لطفا در پنجره‌ی بعد اجازه‌ی این کار را بدهید.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">المنت برای برقراری تماس تصویری نیازمند دسترسی به میکروفون و دوربین است.
+    <string name="template_permissions_rationale_msg_contacts">المنت می‌تواند با دیدن دفترچه تلفن شما کاربرهای دیگر ماتریکس را بر اساس ایمبل و شماره تلفنشان پیدا کند. اگر مایل به اشتراک گذاری دفترچه تلفنتان به این منظور هستید لطفا در پنجره‌ی بعد اجازه‌ی این کار را بدهید.</string>
+    <string name="template_permissions_rationale_msg_camera_and_audio">المنت برای برقراری تماس تصویری نیازمند دسترسی به میکروفون و دوربین است.
 \n
 \nلطفا در پنجره های بعدی دسترسی های لازم را بدهید.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nلطفا برای برقراری تماس در پنجره بعدی دسترسی لازم را بدهید."</string>
-    <string name="permissions_rationale_msg_record_audio">المنت برای برقراری تماس صوتی نیازمند دسترسی به میکروفون است.</string>
+    <string name="template_permissions_rationale_msg_record_audio">المنت برای برقراری تماس صوتی نیازمند دسترسی به میکروفون است.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nلطفا برای برقراری تماس در پنجره بعدی دسترسی لازم را بدهید."</string>
-    <string name="permissions_rationale_msg_storage">المنت برای ارسال و ذخیره‌ی فایل‌ها نیاز به دسترسی به گالری شما را دارد.
+    <string name="template_permissions_rationale_msg_storage">المنت برای ارسال و ذخیره‌ی فایل‌ها نیاز به دسترسی به گالری شما را دارد.
 \n
 \nلطفا در پنجره‌ای که باز می‌شود این دسترسی را بدهید.</string>
     <string name="settings_call_ringtone_use_default_stun_sum">هنگامی که کارساز خانگیتان قابلیت تماس نداشته باشد، از %s استفاده خواهد شد (نشانی IPتان در طول تماس هم‌رسانی خواهد شد)</string>
@@ -1834,7 +1834,7 @@
     <string name="keys_backup_recovery_key_error_decrypt">نسخه پشتیبان با این کلید بازیابی رمزگشایی نمی‌شود: لطفاً تأیید کنید که کلید بازیابی درست را وارد کرده‌اید.</string>
     <string name="enter_secret_storage_input_key">کلید پشتیبان خود را انتخاب کنید، یا با تایپ کردن و یا کپی‌کردن، آن را وارد کنید</string>
     <string name="command_description_discard_session">نشست‌های خارجی را مجبور به ترک گروه می‌کند</string>
-    <string name="use_other_session_content_description">از آخرین نسخه‌ی المنت روی دستگاه‌های دیگرتان استفاده کنید: نسخه وب المنت، نسخه دسکتاپ المنت، نسخه IOS المنت و نسخه اندروید المنت</string>
+    <string name="template_use_other_session_content_description">از آخرین نسخه‌ی المنت روی دستگاه‌های دیگرتان استفاده کنید: نسخه وب المنت، نسخه دسکتاپ المنت، نسخه IOS المنت و نسخه اندروید المنت</string>
     <string name="change_password_summary">تنظیم گذرواژه جدید…</string>
     <string name="error_saving_media_file">فایل رسانه ذخیره نشد</string>
     <string name="error_adding_media_file_to_gallery">فایل به گالری افزوده نشد</string>
@@ -1916,9 +1916,9 @@
     <string name="command_description_rainbow">پیام را با رنگ‌بندی رنگین کمان ارسال می کند</string>
     <string name="verify_cannot_cross_sign">این نشست نمی‌تواند تائید را با نشست‌های دیگر شما به اشتراک بگذارد.
 \nتائید به صورت محلی ذخیره می‌شود و در نسخه‌ی بعدی برنامه به اشتراک گذاشته می‌شود.</string>
-    <string name="rendering_event_error_exception">المنت هنگام ارائه محتوای رویدادی با شناسه \'%1$s\' با مشکل روبرو شد</string>
-    <string name="rendering_event_error_type_of_message_not_handled">المنت پیام‌های \'%1$s\' را پشتیبانی نمی‌کند</string>
-    <string name="rendering_event_error_type_of_event_not_handled">المنت رویداد \'%1$s\' را پشتیبانی نمی‌کند</string>
+    <string name="template_rendering_event_error_exception">المنت هنگام ارائه محتوای رویدادی با شناسه \'%1$s\' با مشکل روبرو شد</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">المنت پیام‌های \'%1$s\' را پشتیبانی نمی‌کند</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">المنت رویداد \'%1$s\' را پشتیبانی نمی‌کند</string>
     <string name="verification_conclusion_compromised">ممکن است یکی از موارد زیر به خطر افتاده باشد:
 \n
 \n- سرور میزبان شما
@@ -1931,7 +1931,7 @@
     <string name="login_error_threepid_denied">دامنهٔ رایانامه‌تان مجاز به ثبت‌نام روی این کارساز نیست</string>
     <string name="command_description_shrug">¯\\\\_(ツ)_/¯ را به یک پیام متنی ساده تغییر می دهد</string>
     <string name="permalink_malformed">لینک مشکل دارد</string>
-    <string name="soft_logout_sso_not_same_user_error">نشست فعلی مربوط به کاربر %1$s است و شما اطلاعات حساب کاربر %2$s را ارائه داده‌اید. این مورد توسط المنت پشتیبانی نمی‌شود .
+    <string name="template_soft_logout_sso_not_same_user_error">نشست فعلی مربوط به کاربر %1$s است و شما اطلاعات حساب کاربر %2$s را ارائه داده‌اید. این مورد توسط المنت پشتیبانی نمی‌شود .
 \nلطفا ابتدا داده ها را پاک کنید، سپس با یک حساب دیگر وارد برنامه شوید.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">دسترسی به پیام‌های رمزشده را از دست خواهید داد مگر اینکه برای بازیابی کلیدهای رمزگذاری خود، به حساب خود وارد شوید.</string>
     <string name="soft_logout_clear_data_dialog_content">آیا تمامی اطلاعات ذخیره‌شده در این دستگاه پاک شود؟
@@ -2024,7 +2024,7 @@
     <string name="room_list_quick_actions_low_priority_remove">حذف‌کردن از اولویت پایین</string>
     <string name="room_list_quick_actions_low_priority_add">اضافه‌کردن به اولویت پایین</string>
     <string name="no_network_indicator">در حال حاضر اتصال شبکه‌ای وجود ندارد</string>
-    <string name="permissions_rationale_msg_keys_backup_export">المنت برای ذخیره کلیدهای رمزنگاری سرتاسر شما بر روی حافظه نیاز به مجوز دارد.
+    <string name="template_permissions_rationale_msg_keys_backup_export">المنت برای ذخیره کلیدهای رمزنگاری سرتاسر شما بر روی حافظه نیاز به مجوز دارد.
 \n
 \nلطفاً در پنجره بعدی اجازه دسترسی دهید تا بتوانید کلیدهای خود را به صورت دستی ذخیره کنید.</string>
     <string name="content_reported_as_inappropriate_content">این محتوا به عنوان محتوای نامناسب گزارش شده‌است.
@@ -2142,7 +2142,7 @@
     <string name="sas_verify_title">با مقایسه‌کردن یک رشته‌ی متنی کوتاه تایید کنید.</string>
     <string name="invalid_or_expired_credentials">شما به دلیل اطلاعات نادرست حساب کاربری یا انقضای نشست از حساب خارج شدید.</string>
     <string name="autodiscover_well_known_autofill_confirm">از پیکربندی استفاده کنید</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">المنت یک پیکربندی اختصاصی سرور برای دامنه‌ی شناسه‌ی کاربری شما \"%1$s\" تشخیص داده است:
+    <string name="template_autodiscover_well_known_autofill_dialog_message">المنت یک پیکربندی اختصاصی سرور برای دامنه‌ی شناسه‌ی کاربری شما \"%1$s\" تشخیص داده است:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_dialog_title">تکمیل خودکار گزینه‌های مربوط به سرور</string>
     <string name="keys_backup_info_title_signature">امضاء</string>
@@ -2219,7 +2219,7 @@
 \n
 \nبرای جلوگیری از گم کردن کلیدهایتان، از آن‌ها به صورت امن، پشتیبان بگیرید.</string>
     <string name="keys_backup_no_session_error">هیچ نشست ماتریکسی موجود نیست</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">اگر می خواهید المنت یک کلید بازیابی ایجاد کند، لطفاً عبارت عبور را حذف کنید.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">اگر می خواهید المنت یک کلید بازیابی ایجاد کند، لطفاً عبارت عبور را حذف کنید.</string>
     <string name="passphrase_passphrase_too_weak">عبارت عبور بیش از حد ضعیف است</string>
     <string name="passphrase_empty_error_message">لطفاً عبارت عبوری وارد کنید</string>
     <string name="passphrase_passphrase_does_not_match">عبارت عبور، مطابق نبود</string>
@@ -2359,10 +2359,10 @@
     <string name="settings_data_save_mode_summary">حالت صرفه‌جویی داده، پالایهٔ خاصی را اعمال می‌کند که در نتیجهٔ آن، به‌روزرسانی‌های حضور و آگاهی‌های نوشتن، پالوده می‌شوند.</string>
     <string name="settings_data_save_mode">حالت صرفه‌جویی در مصرف دیتا</string>
     <string name="settings_opt_in_of_analytics_ok">بله ، من می خواهم کمک کنم!</string>
-    <string name="settings_opt_in_of_analytics_prompt">لطفاً برای کمک به ما در بهبود المنت، ارسال ناشناس تجزیه و تحلیل را فعال کنید.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">المنت برای داشتن اعلان‌های قابل اعتماد نیاز به فعالیت در پس زمینه دارد.
+    <string name="template_settings_opt_in_of_analytics_prompt">لطفاً برای کمک به ما در بهبود المنت، ارسال ناشناس تجزیه و تحلیل را فعال کنید.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">المنت برای داشتن اعلان‌های قابل اعتماد نیاز به فعالیت در پس زمینه دارد.
 \nدر صفحه بعدی از شما خواسته می شود که المنت همیشه در پس زمینه اجرا شود ، لطفاً آن را بپذیرید.</string>
-    <string name="settings_opt_in_of_analytics_summary">المنت اطلاعاتی را جمع آوری می کند و با ارسال آنان به صورت ناشناس به ما امکان بهبود برنامه را می‌دهد.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">المنت اطلاعاتی را جمع آوری می کند و با ارسال آنان به صورت ناشناس به ما امکان بهبود برنامه را می‌دهد.</string>
     <string name="settings_opt_in_of_analytics">ارسال داده های تجزیه و تحلیل</string>
     <string name="settings_analytics">تجزیه و تحلیل</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">مجوز دادن</string>
@@ -2377,7 +2377,7 @@
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">عبارت رمزی که فقط خودتان می‌دانید را وارد کرده و کلیدی برای پشتیبان تولید کنید.</string>
     <string name="identity_server_set_alternative_notice">به هنوتم جایگزین، می‌توانید نشامی هر کارساز هویت دیگری را وارد کنید</string>
     <string name="identity_server_set_default_notice">کارساز خانگیتان (%1$s) پیشنهاد استفاده از %2$s برای کارساز هویتتان را می‌دهد</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">برای محرمانگیتان، المنت تنها از فرستادن شماره تلفن و رایانامه‌های کاربری در هم ریخته پشتیبانی می‌کند.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">برای محرمانگیتان، المنت تنها از فرستادن شماره تلفن و رایانامه‌های کاربری در هم ریخته پشتیبانی می‌کند.</string>
     <string name="identity_server_error_outdated_home_server">این عملیات ممکن نیست. کارساز خانگی منقضی شده است.</string>
     <string name="invite_users_to_room_failure">نتوانستیم کاربران را دعوت کنیم. لطفاً کاربرانی که می‌خواهید دعوت کنید را بررسی کرده و دوباره تلاش کنید.</string>
     <string name="create_room_dm_failure">نتوانستیم پیامتان را ایجاد کنیم. لطفاً کاربرانی که می‌خواهید دعوت کنید را بررسی کرده و دوباره تلاش کنید.</string>
@@ -2402,14 +2402,14 @@
     <string name="identity_server_user_consent_not_provided">رضایت کاربر فراهم نشده است.</string>
     <string name="identity_server_error_terms_not_signed">لطفاً نخست شرایط کارساز هویت را در تنظیمات بپذیرید.</string>
     <string name="identity_server_error_no_identity_server_configured">لطفاً نخست کارساز هویتی را پیکربندی کنید.</string>
-    <string name="identity_server_error_outdated_identity_server">کارساز هویت منقضی شده اسن. المنت تنها نگارش ۲ از API را پشتیبانی می‌کند.</string>
+    <string name="template_identity_server_error_outdated_identity_server">کارساز هویت منقضی شده اسن. المنت تنها نگارش ۲ از API را پشتیبانی می‌کند.</string>
     <string name="user_code_info_text">این رمز را افراد هم‌رسانی کرده تا بتوانند برای افزودنتان و شروع گپ، بپویندش.</string>
     <string name="user_code_my_code">رمزم</string>
     <string name="user_code_share">هم‌رسانی رمزم</string>
     <string name="user_code_scan">پویش یک رمز QR</string>
     <string name="not_a_valid_qr_code">این یک رمز QR ماتریکس معتبر نیست</string>
-    <string name="invite_friends_rich_title">🔐️ پیوستن به من روی المنت</string>
-    <string name="invite_friends_text">سلام. روی المنت باهام حرف بزن: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ پیوستن به من روی المنت</string>
+    <string name="template_invite_friends_text">سلام. روی المنت باهام حرف بزن: %s</string>
     <string name="invite_friends">دعوت دوستان</string>
     <string name="add_people">افزودن افراد</string>
     <string name="topic_prefix">"موضوع: "</string>
@@ -2531,7 +2531,7 @@
     <string name="default_message_emote_confetti">فرستادن کاغذ رنگی 🎉</string>
     <string name="default_message_emote_snow">فرستادن برف ❄️</string>
     <string name="authentication_error">احراز هویت انجام نشد</string>
-    <string name="re_authentication_default_confirm_text">المنت برای انجام این عمل نیاز دارد که گذواژه‌ی خود را وارد کنید.</string>
+    <string name="template_re_authentication_default_confirm_text">المنت برای انجام این عمل نیاز دارد که گذواژه‌ی خود را وارد کنید.</string>
     <string name="re_authentication_activity_title">احراز هویت مجدد مورد نیاز است</string>
     <string name="call_transfer_users_tab_title">کاربران</string>
     <string name="call_transfer_failure">هنگام انتقال تماس خطایی روی داد</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index cbca322a9e..5f4741f86a 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -282,7 +282,7 @@
     <string name="local_address_book_header">Paikalliset yhteystiedot</string>
     <string name="matrix_only_filter">Ainoastaan Matrix-yhteyshenkilöt</string>
     <string name="no_conversation_placeholder">Ei keskusteluita</string>
-    <string name="no_contact_access_placeholder">Et ole sallinut Elementille pääsyä paikallisiin yhteystietoihisi</string>
+    <string name="template_no_contact_access_placeholder">Et ole sallinut ${app_name}ille pääsyä paikallisiin yhteystietoihisi</string>
     <string name="no_result_placeholder">Ei tuloksia</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Huoneet</string>
@@ -430,22 +430,22 @@
     <!-- ??? -->
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Huomio</string>
-    <string name="permissions_rationale_msg_storage">Element tarvitsee käyttöluvan mediagalleriaasi lähettäkseen liitteitä.\n\nSalli tiedostojen käyttö seuraavalla näytöllä liittääksesi kuvia ja muita tiedostoja viesteihin.</string>
-    <string name="permissions_rationale_msg_camera">Element tarvitsee käyttöluvan kameraan ottaakseen kuvia ja suorittakseen videopuheluita.</string>
+    <string name="template_permissions_rationale_msg_storage">${app_name} tarvitsee käyttöluvan mediagalleriaasi lähettäkseen liitteitä.\n\nSalli tiedostojen käyttö seuraavalla näytöllä liittääksesi kuvia ja muita tiedostoja viesteihin.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} tarvitsee käyttöluvan kameraan ottaakseen kuvia ja suorittakseen videopuheluita.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nSoittaaksesi videopuhelun, salli seuraavassa ponnahdusikkunassa sovelluksen käyttää kameraa."</string>
-    <string name="permissions_rationale_msg_record_audio">Element tarvitsee käyttöluvan mikrofoniin suorittakseen puheluita.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} tarvitsee käyttöluvan mikrofoniin suorittakseen puheluita.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nSoittaaksesi äänipuhelun, salli seuraavassa ponnahdusikkunassa sovelluksen käyttää mikrofonia."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element tarvitsee käyttöluvan kameraan ja mikrofoniin suorittakseen videopuheluita.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} tarvitsee käyttöluvan kameraan ja mikrofoniin suorittakseen videopuheluita.
 \n
 \nSalli mikrofonin ja kameran käyttö seuraavilla näytöillä aloittaaksesi tämän puhelun.</string>
-    <string name="permissions_rationale_msg_contacts">Element voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden ja puhelinnumeroiden perusteella. Jos suostut jakamaan yhteystietosi tätä tarkoitusta varten, salli yhteystietojen käyttö seuraavassa ponnahdusikkunassa.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element pystyy käyttämään yhteystietojasi, etsiäkseen muita Matrix-käyttäjiä sähköpostiosoitteiden sekä puhelinnumeroiden perusteella. 
+    <string name="template_permissions_rationale_msg_contacts">${app_name} voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden ja puhelinnumeroiden perusteella. Jos suostut jakamaan yhteystietosi tätä tarkoitusta varten, salli yhteystietojen käyttö seuraavassa ponnahdusikkunassa.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} pystyy käyttämään yhteystietojasi, etsiäkseen muita Matrix-käyttäjiä sähköpostiosoitteiden sekä puhelinnumeroiden perusteella.
 \n
-\nSaako Element käyttää yhteystietojasi tätä varten\?</string>
+\nSaako ${app_name} käyttää yhteystietojasi tätä varten\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Toimenpide epäonnistui puuttuvien käyttölupien takia</string>
     <!-- medias slider string -->
     <string name="media_slider_saved">Tallennettu</string>
@@ -975,12 +975,12 @@
     <string name="e2e_re_request_encryption_key"><u>Pyydä salausavaimia uudelleen</u> muista istunnoistasi.</string>
     <string name="e2e_re_request_encryption_key_sent">Avainpyyntö lähetetty.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Pyyntö lähetetty</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Käynnistä Element toisella laitteella, joka voi purkaa viestin, jotta se voi lähettää avaimet tähän istuntoon.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Käynnistä ${app_name} toisella laitteella, joka voi purkaa viestin, jotta se voi lähettää avaimet tähän istuntoon.</string>
     <plurals name="membership_changes">
         <item quantity="one">yksi jäsenyysmuutos</item>
         <item quantity="other">%d jäsenyysmuutosta</item>
     </plurals>
-    <string name="settings_call_ringtone_use_app_ringtone">Käytä Elementin oletussoittoääntä saapuville puheluille</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Käytä ${app_name}in oletussoittoääntä saapuville puheluille</string>
     <string name="settings_call_ringtone_title">Saapuvien puheluiden soittoääni</string>
     <string name="video_call_in_progress">Videopuhelu menossa…</string>
     <string name="list_members">Käyttäjälista</string>
@@ -1057,8 +1057,8 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Ota käyttöön</string>
     <string name="settings_troubleshoot_test_device_settings_title">Istunnon asetukset.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Ilmoitukset ovat käytössä tässä istunnossa.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Ilmoitukset eivät ole käytössä tässä istunnossa.
-\nTarkista Elementin asetukset.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Ilmoitukset eivät ole käytössä tässä istunnossa.
+\nTarkista ${app_name}in asetukset.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ota käyttöön</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Mukautetut asetukset.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Huomaathan, että osa viestityypeistä on asetettu olemaan hiljaisia (tuottavat ilmoituksen ilman ääntä).</string>
@@ -1067,7 +1067,7 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Tarkista asetukset</string>
     <string name="settings_troubleshoot_test_play_services_title">Play Services -palvelun tarkistus</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK on saatavilla ja ajan tasalla.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element käyttää Google Play Services -palvelua ilmoitusten välittämiseen, mutta se ei näytä olevan määritetty oikein:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} käyttää Google Play Services -palvelua ilmoitusten välittämiseen, mutta se ei näytä olevan määritetty oikein:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Korjaa Play Services -palvelu</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase-tunniste</string>
@@ -1075,12 +1075,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM-tunnisteen haku epäonnistui: 
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] 
-\nElement ei voi vaikuttaa tähän virheeseen, ja Googlen mukaan tämä virhe tarkoittaa, että tällä laitteella on liikaa FCM:ään rekisteröityjä sovelluksia. Tämä virhe ilmenee vain tapauksissa, joissa on erittäin paljon FCM:ään rekisteröityjä sovelluksia asennettuna, joten tätä ei pitäisi tapahtua normaalisti.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nTämä virhe ei ole Elementin ratkaistavissa. Se voi johtua useasta eri syystä. Ehkä tämä toimii, jos yrität myöhemmin. Voit myös tarkistaa, että Google Play Services -palvelu ei ole rajoitettuna järjestelmäasetuksissa, ja että laitteesi kello on oikein. Tämä voi tapahtua myös mukautetun käyttöjärjestelmän kanssa.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
-\nTämä virhe ei ole Elementin ratkaistavissa. Tässä puhelimessa ei ole Google-tiliä. Lisää laitteeseesi Google-tili tätä toimintoa varten.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\n${app_name} ei voi vaikuttaa tähän virheeseen, ja Googlen mukaan tämä virhe tarkoittaa, että tällä laitteella on liikaa FCM:ään rekisteröityjä sovelluksia. Tämä virhe ilmenee vain tapauksissa, joissa on erittäin paljon FCM:ään rekisteröityjä sovelluksia asennettuna, joten tätä ei pitäisi tapahtua normaalisti.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nTämä virhe ei ole ${app_name}in ratkaistavissa. Se voi johtua useasta eri syystä. Ehkä tämä toimii, jos yrität myöhemmin. Voit myös tarkistaa, että Google Play Services -palvelu ei ole rajoitettuna järjestelmäasetuksissa, ja että laitteesi kello on oikein. Tämä voi tapahtua myös mukautetun käyttöjärjestelmän kanssa.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nTämä virhe ei ole ${app_name}in ratkaistavissa. Tässä puhelimessa ei ole Google-tiliä. Lisää laitteeseesi Google-tili tätä toimintoa varten.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lisää tili</string>
     <string name="settings_troubleshoot_test_token_registration_title">Tunnisteen rekisteröinti</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM-tunniste rekisteröity onnistuneesti kotipalvelimelle.</string>
@@ -1096,17 +1096,17 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Palvelun uudelleenkäynnistäminen epäonnistui</string>
     <string name="settings_troubleshoot_test_service_boot_title">Käynnistä laitteen käynnistyessä</string>
     <string name="settings_troubleshoot_test_service_boot_success">Palvelu käynnistetään, kun laite käynnistetään uudelleen.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Palvelua ei käynnistetä laitteen uudelleenkäynnistyksen yhteydessä. Et tule saamaan ilmoituksia ennen kuin Element on käynnistetty uudelleen.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Palvelua ei käynnistetä laitteen uudelleenkäynnistyksen yhteydessä. Et tule saamaan ilmoituksia ennen kuin ${app_name} on käynnistetty uudelleen.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Ota käyttöön automaattinen käynnistys</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Tarkista taustapalveluiden rajoitukset</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Taustapalveluiden rajoitukset ovat pois käytöstä. Tämä testi tulee ajaa mobiilidatayhteydellä (ilman wlania). 
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Taustapalveluiden rajoitukset ovat pois käytöstä. Tämä testi tulee ajaa mobiilidatayhteydellä (ilman wlania).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Taustapalveluiden rajoitukset ovat käytössä. 
-\nTyötä, jota Element yrittää tehdä, rajoitetaan aggressiivisesti, kun se on taustalla, mikä saattaa vaikuttaa ilmoituksiin.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Taustapalveluiden rajoitukset ovat käytössä.
+\nTyötä, jota ${app_name} yrittää tehdä, rajoitetaan aggressiivisesti, kun se on taustalla, mikä saattaa vaikuttaa ilmoituksiin.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Poista rajoitukset</string>
     <string name="settings_troubleshoot_test_battery_title">Akunkäytön optimointi</string>
-    <string name="settings_troubleshoot_test_battery_success">Akunkäytön optimointi ei vaikuta Elementin toimintaan.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Akunkäytön optimointi ei vaikuta ${app_name}in toimintaan.</string>
     <string name="settings_troubleshoot_test_battery_failed">Jos käyttäjä jättää laitteen paikalleen ilman latausjohtoa niin, että näyttö on pois päältä, laite siirtyy torkkutilaan. Tämä estää sovelluksia käyttämästä verkkoyhteyksiä ja lykkää niiden töitä, synkronointeja ja perushälytyksiä.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Jätä optimointi huomiotta</string>
     <string name="settings_notification_privacy_normal">Normaali</string>
@@ -1129,15 +1129,15 @@
     <string name="settings_show_join_leave_messages_summary">Ei vaikuta kutsuihin, poistamisiin ja porttikieltoihin.</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Sisältää hahmokuvat ja näyttönimien vaihdot.</string>
     <string name="startup_notification_privacy_title">Ilmoitusten yksityisyys</string>
-    <string name="startup_notification_privacy_message">Element voi ajaa itseään taustalla hallitakseen sinulle näytettäviä ilmoituksia turvallisesti ja yksityisesti. Tämä voi vaikuttaa akunkäyttöön.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} voi ajaa itseään taustalla hallitakseen sinulle näytettäviä ilmoituksia turvallisesti ja yksityisesti. Tämä voi vaikuttaa akunkäyttöön.</string>
     <string name="startup_notification_privacy_button_grant">Anna oikeus</string>
     <string name="startup_notification_privacy_button_other">Valitse toinen vaihtoehto</string>
     <string name="startup_notification_fdroid_battery_optim_title">Taustayhteys</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Elementin tarvitsee käyttää taustayhteyttä, jotta se voi näyttää luotettavia ilmoituksia.
-\nSeuraavalla ruudulla sinulta kysytään lupaa, jotta Element voi pitää itsensä käynnissä taustalla.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name}in tarvitsee käyttää taustayhteyttä, jotta se voi näyttää luotettavia ilmoituksia.
+\nSeuraavalla ruudulla sinulta kysytään lupaa, jotta ${app_name} voi pitää itsensä käynnissä taustalla.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Anna oikeus</string>
-    <string name="settings_opt_in_of_analytics_summary">Element kerää anonyymiä analytiikkaa sovelluksen parantamiseksi.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Otathan analytiikan käyttöön Elementin parantamiseksi.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} kerää anonyymiä analytiikkaa sovelluksen parantamiseksi.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Otathan analytiikan käyttöön ${app_name}in parantamiseksi.</string>
     <string name="settings_opt_in_of_analytics_ok">Kyllä, haluan auttaa!</string>
     <string name="settings_data_save_mode_summary">Datansäästötila ottaa käyttöön erityisen suodattimen, joka poistaa paikallaoloilmoitukset ja kirjoittamisen ilmoitukset.</string>
     <string name="account_email_error">Sähköpostiasi varmennettaessa tapahtui virhe.</string>
@@ -1236,7 +1236,7 @@
     <string name="passphrase_passphrase_does_not_match">Salalause ei täsmää</string>
     <string name="passphrase_empty_error_message">Syötä salalause</string>
     <string name="passphrase_passphrase_too_weak">Salalause on liian heikko</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Poista salalause, jos haluat Element generoivan palautusavaimen.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Poista salalause, jos haluat ${app_name} generoivan palautusavaimen.</string>
     <string name="keys_backup_no_session_error">Matrix-istuntoa ei ole saatavilla</string>
     <string name="keys_backup_setup_step1_title">Älä koskaan menetä salattuja viestejä</string>
     <string name="keys_backup_setup_step1_description">Salatuissa huoneissa viestit ovat suojattuna osapuolten välisellä salauksella. Vain sinä ja vastaanottaja(t) omistavat avaimet näiden viestien lukemiseen.
@@ -1352,7 +1352,7 @@
 \nJos et asettanut uutta palautustapaa, hyökkääjä saattaa yrittää päästä käsiksi tiliisi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.</string>
     <string name="autodiscover_invalid_response">Epäkelpo kotipalvelimen löytövastaus</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Automaattitäydennyksen palvelinasetukset</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element löysi mukautetun palvelinasetuksen userId:si domainille ”%1$s”:
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} löysi mukautetun palvelinasetuksen userId:si domainille ”%1$s”:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Käytä asetuksia</string>
     <string name="notification_sync_init">Alustetaan palvelua</string>
@@ -1429,7 +1429,7 @@
     <string name="please_wait">Odota…</string>
     <string name="group_all_communities">Kaikki yhteisöt</string>
     <string name="room_preview_no_preview">Tätä huonetta ei voi esikatsella</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Element ei vielä tue täysin julkisen huoneen esikatselua</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name} ei vielä tue täysin julkisen huoneen esikatselua</string>
     <string name="fab_menu_create_room">Huoneet</string>
     <string name="fab_menu_create_chat">Yksityisviestit</string>
     <string name="create_room_title">Uusi huone</string>
@@ -1574,11 +1574,11 @@
     <string name="call_failed_no_ice_use_alt">Kokeile käyttää palvelinta %s</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Käyttää palvelinta %s apupalvelimena, jos kotipalvelimesi ei tarjoa sellaista (IP-osoitteesi näkyy palvelimelle puhelun aikana)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimoitu akunkestoa varten</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element synkronoi taustalla laitteen rajallisia resursseja (akkua) säästäen.
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} synkronoi taustalla laitteen rajallisia resursseja (akkua) säästäen.
 \nLaitteesi resurssien tilasta riippuen käyttöjärjestelmä saattaa lykätä synkronointia.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimoitu reaaliaikaa varten</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element synkronoi taustalla täsmällisin aikavälein (säädettävä).
-\nTämä vaikuttaa radion ja akun käyttöön. Näet pysyvän ilmoituksen, joka kertoo, että Element kuuntelee tapahtumia.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} synkronoi taustalla täsmällisin aikavälein (säädettävä).
+\nTämä vaikuttaa radion ja akun käyttöön. Näet pysyvän ilmoituksen, joka kertoo, että ${app_name} kuuntelee tapahtumia.</string>
     <string name="message_edits">Viestimuokkaukset</string>
     <string name="terms_description_for_identity_server">Ole löydettävissä</string>
     <string name="settings_text_message_sent">Tekstiviesti on lähetetty numeroon %s. Syötä sen sisältämä varmistuskoodi.</string>
@@ -1680,7 +1680,7 @@
     <string name="content_reported_as_inappropriate_content">Tämä sisältö on ilmiannettu epäsopivana. 
 \n 
 \nJos et halua nähdä enempää sisältöä tältä käyttäjältä, voit estää hänet piilottaaksesi hänen viestit.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element tarvitsee oikeuden tallentaakseen osapuolten välisen salauksen avaimesi talteen.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} tarvitsee oikeuden tallentaakseen osapuolten välisen salauksen avaimesi talteen.
 \n
 \nSalli pääsy tiedostoihin seuraavassa ponnahdusikkunassa, jotta voit viedä avaimesi käsin.</string>
     <string name="login_error_no_homeserver_found">Tämä ei ole kelvollinen Matrix-palvelimen osoite</string>
@@ -1814,8 +1814,8 @@
 \nKirjaudu sisään päästäksesi käsiksi tunnuksesi tietoihin ja viesteihin.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Menetät pääsyn salattuihin viesteihisi ellet kirjaudu sisään palauttaaksesi salausavaimesi.</string>
     <string name="soft_logout_clear_data_dialog_submit">Poista tiedot</string>
-    <string name="soft_logout_sso_not_same_user_error">Nykyinen istunto on käyttäjälle %1$s, ja yritit kirjautuas isään käyttäjälle %2$s. Element ei tue tätä.
-\nPoista ensin tietosi ja kirjaudu sen jälkeen toisella tunnuksella. Voit vaihtoehtoisesti käyttää Elementin selainversiota.</string>
+    <string name="template_soft_logout_sso_not_same_user_error">Nykyinen istunto on käyttäjälle %1$s, ja yritit kirjautuas isään käyttäjälle %2$s. ${app_name} ei tue tätä.
+\nPoista ensin tietosi ja kirjaudu sen jälkeen toisella tunnuksella. Voit vaihtoehtoisesti käyttää ${app_name}in selainversiota.</string>
     <string name="permalink_malformed">matrix.to-linkkisi oli epämuodostunut</string>
     <string name="bug_report_error_too_short">Kuvaus on liian lyhyt</string>
     <string name="login_server_url_form_other_notice">Syötä palvelin tai sen Elementin osoite, mihin haluat yhdistää</string>
@@ -1857,7 +1857,7 @@
     <string name="settings_rageshake_detection_threshold_summary">Ravista puhelintasi testataksesi tunnistusrajan</string>
     <string name="rageshake_detected">Ravistus tunnistettu!</string>
     <string name="autocomplete_limited_results">Näytetään vain ensimmäiset tulokset, kirjoita lisää kirjaimia…</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element voi kaatuilla tavallista useammin odottamattomien virheiden vuoksi</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} voi kaatuilla tavallista useammin odottamattomien virheiden vuoksi</string>
     <string name="command_description_shrug">Lisää ¯\\_(ツ)_/¯ tavallisen viestin alkuun</string>
     <string name="login_error_threepid_denied">Käyttämäsi sähköpostipalvelun ei ole sallittu rekisteröityä tälle palvelimelle</string>
     <string name="verification_sas_match">Täsmäävät</string>
@@ -1907,9 +1907,9 @@
     <string name="room_member_power_level_admin_in">Ylläpitäjä %1$s:ssä</string>
     <string name="room_member_power_level_moderator_in">Valvoja %1$s:ssä</string>
     <string name="room_member_jump_to_read_receipt">Siirry lukukuittaukseen</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element ei osaa käsitellä tapahtumia joiden tyyppi on \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element ei osaa käsitellä viestejä joiden tyyppi on \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element ei osannut piirtää tapahtuman jonka tunniste on \'%1$s\' sisältöä</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} ei osaa käsitellä tapahtumia joiden tyyppi on \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} ei osaa käsitellä viestejä joiden tyyppi on \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} ei osannut piirtää tapahtuman jonka tunniste on \'%1$s\' sisältöä</string>
     <string name="room_list_sharing_header_recent_rooms">Viimeaikaiset huoneet</string>
     <string name="room_list_sharing_header_other_rooms">Muut huoneet</string>
     <string name="command_description_rainbow">Lähettää annetun viestin väritettynä sateenkaaren väreillä</string>
@@ -1979,7 +1979,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Käyttäjä poistanut tapahtuman, syynä: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Tapahtuma moderoitu huoneen ylläpitäjän toimesta, syynä: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Avaimet ovat jo ajan tasalla!</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Avainpyynnöt</string>
     <string name="refresh">Päivitä</string>
     <string name="new_session">Uusi kirjautuminen. Olitko se sinä\?</string>
@@ -2058,7 +2058,7 @@
     <string name="sound_device_speaker">Kaiutin</string>
     <string name="sound_device_phone">Puhelin</string>
     <string name="call_select_sound_device">Valitse äänilaite</string>
-    <string name="call_failed_no_connection">Element-puhelu epäonnistui</string>
+    <string name="template_call_failed_no_connection">${app_name}-puhelu epäonnistui</string>
     <string name="send_bug_report_include_key_share_history">Lähetä avaimen jakopyyntöjen historia</string>
     <string name="no_more_results">Ei enempää tuloksia</string>
     <string name="bottom_action_notification">Ilmoitukset</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index b89962f71e..397ff5a1e3 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -292,7 +292,7 @@
     <string name="local_address_book_header">Carnet d’adresses local</string>
     <string name="matrix_only_filter">Contacts Matrix uniquement</string>
     <string name="no_conversation_placeholder">Aucune discussion</string>
-    <string name="no_contact_access_placeholder">Vous n’avez pas autorisé Element à accéder à vos contacts locaux</string>
+    <string name="template_no_contact_access_placeholder">Vous n’avez pas autorisé ${app_name} à accéder à vos contacts locaux</string>
     <string name="no_result_placeholder">Aucun résultat</string>
     <string name="rooms_header">Salons</string>
     <string name="rooms_directory_header">Répertoire de salons</string>
@@ -639,22 +639,22 @@
     <string name="call_error_user_not_responding">Le correspondant n’a pas décroché.</string>
     <string name="media_picker_both_capture_title">Prendre une photo ou une vidéo</string>
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Element a besoin d’accéder à vos photos et vidéos pour envoyer et enregistrer des pièces jointes
+    <string name="template_permissions_rationale_msg_storage">${app_name} a besoin d’accéder à vos photos et vidéos pour envoyer et enregistrer des pièces jointes
 \n
 \nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir envoyer des fichiers depuis votre téléphone.</string>
-    <string name="permissions_rationale_msg_camera">Element a besoin d’accéder à votre appareil photo pour prendre des photos et passer des appels vidéo.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} a besoin d’accéder à votre appareil photo pour prendre des photos et passer des appels vidéo.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir effectuer l’appel."</string>
-    <string name="permissions_rationale_msg_record_audio">Element a besoin d’accéder à votre microphone pour passer des appels audio.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} a besoin d’accéder à votre microphone pour passer des appels audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir effectuer l’appel."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element a besoin d’accéder à votre appareil photo et à votre microphone pour passer des appels vidéo.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} a besoin d’accéder à votre appareil photo et à votre microphone pour passer des appels vidéo.
 \n
 \nVeuillez autoriser l’accès dans les prochaines fenêtres contextuelles pour pouvoir effectuer l’appel.</string>
-    <string name="permissions_rationale_msg_contacts">Element peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail. Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour découvrir les utilisateurs du carnet d’adresses joignables via Element.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur adresse e-mail et leur numéro de téléphone. 
+    <string name="template_permissions_rationale_msg_contacts">${app_name} peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail. Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour découvrir les utilisateurs du carnet d’adresses joignables via ${app_name}.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur adresse e-mail et leur numéro de téléphone.
 \n 
 \nAutorisez-vous l\'accès à vos contacts à cette fin \?</string>
     <string name="permissions_action_not_performed_missing_permissions">Désolé. L’action n’a pas été réalisée, faute d’autorisations</string>
@@ -930,7 +930,7 @@
     <string name="settings_notification_privacy_nosecure_message_content">• Les notifications contiennent <b>des métadonnées et des messages</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Les notifications <b>n’afficheront pas le contenu des messages</b></string>
     <string name="startup_notification_privacy_title">Confidentialité des notifications</string>
-    <string name="startup_notification_privacy_message">Element peut fonctionner en arrière-plan pour gérer vos notifications de façon sécurisée et confidentielle. Cela peut affecter l’utilisation de la batterie.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} peut fonctionner en arrière-plan pour gérer vos notifications de façon sécurisée et confidentielle. Cela peut affecter l’utilisation de la batterie.</string>
     <string name="startup_notification_privacy_button_grant">Donner la permission</string>
     <string name="startup_notification_privacy_button_other">Choisir une autre option</string>
     <string name="notice_avatar">Avatar d’avertissement</string>
@@ -942,8 +942,8 @@
     <string name="settings_deactivate_account_section">Désactiver le compte</string>
     <string name="settings_deactivate_my_account">Désactiver mon compte</string>
     <string name="settings_opt_in_of_analytics">Envoyer des données analytiques</string>
-    <string name="settings_opt_in_of_analytics_summary">Element collecte des données analytiques anonymes pour nous permettre d’améliorer l’application.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Veuillez autoriser la collecte des données pour nous aider à améliorer Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} collecte des données analytiques anonymes pour nous permettre d’améliorer l’application.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Veuillez autoriser la collecte des données pour nous aider à améliorer ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Oui, je veux aider !</string>
     <string name="widget_integration_missing_parameter">Un paramètre requis est manquant.</string>
     <string name="widget_integration_invalid_parameter">Un paramètre n’est pas valide.</string>
@@ -965,7 +965,7 @@
     <string name="e2e_re_request_encryption_key">Redemander les clés de chiffrement à vos autres sessions.</string>
     <string name="e2e_re_request_encryption_key_sent">Demande de clé envoyée.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Demande envoyée</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Veuillez lancer Element sur un autre appareil qui peut déchiffrer le message pour qu’il puisse envoyer les clés à cette session.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Veuillez lancer ${app_name} sur un autre appareil qui peut déchiffrer le message pour qu’il puisse envoyer les clés à cette session.</string>
     <string name="lock_screen_hint">Tapez ici…</string>
     <string name="option_send_voice">Envoyer votre voix</string>
     <string name="go_on_with">continuer avec…</string>
@@ -1079,7 +1079,7 @@
     <string name="markdown_has_been_enabled">Le Markdown a été activé.</string>
     <string name="markdown_has_been_disabled">Le Markdown a été désactivé.</string>
     <string name="settings_call_category">Appels</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Utiliser la sonnerie par défaut de Element pour les appels entrants</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Utiliser la sonnerie par défaut de ${app_name} pour les appels entrants</string>
     <string name="settings_call_ringtone_title">Sonnerie d’appel entrant</string>
     <string name="settings_call_ringtone_dialog_title">Sélectionner la sonnerie pour les appels :</string>
     <string name="accept">Accepter</string>
@@ -1103,12 +1103,12 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Activer</string>
     <string name="settings_troubleshoot_test_device_settings_title">Paramètres de la session.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Les notifications sont activées pour cette session.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Les notifications ne sont pas activées pour cette session.
-\nVeuillez vérifier les paramètres de Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Les notifications ne sont pas activées pour cette session.
+\nVeuillez vérifier les paramètres de ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Activer</string>
     <string name="settings_troubleshoot_test_play_services_title">Vérification des services Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">L’APK des services Google Play est disponible et à jour.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element utilise les services Google Play pour envoyer les notifications mais ils n’ont pas l’air d’être configurés correctement :
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} utilise les services Google Play pour envoyer les notifications mais ils n’ont pas l’air d’être configurés correctement :
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Réparer les services Google Play</string>
     <string name="settings_troubleshoot_test_fcm_title">Jeton Firebase</string>
@@ -1130,22 +1130,22 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Le redémarrage du service a échoué</string>
     <string name="settings_troubleshoot_test_service_boot_title">Lancer au démarrage</string>
     <string name="settings_troubleshoot_test_service_boot_success">Le service démarrera quand l’appareil sera redémarré.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Le service ne démarrera pas quand l’appareil sera redémarré, vous ne recevrez pas de notifications tant que Element n’aura pas été lancé au moins une fois.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Le service ne démarrera pas quand l’appareil sera redémarré, vous ne recevrez pas de notifications tant que ${app_name} n’aura pas été lancé au moins une fois.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Activer le démarrage au démarrage de l’appareil</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Vérifier les restrictions en arrière-plan</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Les restrictions en arrière-plan sont désactivées pour Element. Ce test devrait être lancé en utilisant les données mobiles (pas le Wi-Fi).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Les restrictions en arrière-plan sont désactivées pour ${app_name}. Ce test devrait être lancé en utilisant les données mobiles (pas le Wi-Fi).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Les restrictions en arrière-plan sont activées pour Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Les restrictions en arrière-plan sont activées pour ${app_name}.
 \nLe travail qu’essayera de faire l’application sera restreint agressivement tant qu’elle sera en arrière-plan et cela pourra affecter les notifications.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Désactiver les restrictions</string>
     <string name="settings_troubleshoot_test_battery_title">Optimisation de la batterie</string>
-    <string name="settings_troubleshoot_test_battery_success">Element n’est pas affecté par l’optimisation de la batterie.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} n’est pas affecté par l’optimisation de la batterie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Si un utilisateur laisse un appareil débranché et immobile pour une longue durée, avec l’écran éteint, l’appareil entre dans le mode Doze. Cela empêche les applications d’accéder au réseau et reporte leurs travaux, synchronisations et alarmes standard.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorer l’optimisation</string>
     <string name="startup_notification_fdroid_battery_optim_title">Connexion en arrière-plan</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element doit garder une connexion à faible impact en arrière-plan afin d’avoir des notifications fiables.
-\nSur l’écran suivant on vous demandera d’autoriser Element à toujours fonctionner en arrière-plan, veuillez accepter.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} doit garder une connexion à faible impact en arrière-plan afin d’avoir des notifications fiables.
+\nSur l’écran suivant on vous demandera d’autoriser ${app_name} à toujours fonctionner en arrière-plan, veuillez accepter.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Donner la permission</string>
     <string name="account_email_error">Une erreur est survenue lors de la vérification de votre adresse e-mail.</string>
     <string name="account_phone_number_error">Une erreur est survenue lors de la vérification de votre numéro de téléphone.</string>
@@ -1164,12 +1164,12 @@
     <string name="settings_troubleshoot_test_bing_settings_failed">Certaines notifications sont désactivées dans vos paramètres personnalisés.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Échec du chargement de vos règles personnalisées, veuillez réessayer.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Vérifier les paramètres</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nCette erreur est indépendante de Element et, selon Google, cette erreur indique que l’appareil a enregistré trop d’applications avec FCM. Cette erreur ne survient que s’il y a un nombre d’applications extrême, et ne devrait donc pas affecter un utilisateur normal.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nCette erreur est indépendante de Element. Elle peut survenir pour plusieurs raisons. Cela peut fonctionner si vous réessayez plus tard. Vous pouvez aussi vérifier que le Service Google Play n’a pas un usage limité de données dans les paramètres système. Cela peut aussi arriver sur une ROM personnalisée.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nCette erreur est indépendante de Element. Il n’y pas de compte Google sur l’appareil. Veuillez ouvrir le gestionnaire de comptes et ajouter un compte Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nCette erreur est indépendante de ${app_name} et, selon Google, cette erreur indique que l’appareil a enregistré trop d’applications avec FCM. Cette erreur ne survient que s’il y a un nombre d’applications extrême, et ne devrait donc pas affecter un utilisateur normal.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nCette erreur est indépendante de ${app_name}. Elle peut survenir pour plusieurs raisons. Cela peut fonctionner si vous réessayez plus tard. Vous pouvez aussi vérifier que le Service Google Play n’a pas un usage limité de données dans les paramètres système. Cela peut aussi arriver sur une ROM personnalisée.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nCette erreur est indépendante de ${app_name}. Il n’y pas de compte Google sur l’appareil. Veuillez ouvrir le gestionnaire de comptes et ajouter un compte Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Ajouter un compte</string>
     <string name="settings_noisy_notifications_preferences">Configurer les notifications sonores</string>
     <string name="settings_call_notifications_preferences">Configurer les notifications d’appel</string>
@@ -1180,7 +1180,7 @@
     <string name="notification_silent">Silencieuse</string>
     <string name="passphrase_empty_error_message">Veuillez saisir une phrase secrète</string>
     <string name="passphrase_passphrase_too_weak">La phrase secrète est trop faible</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Veuillez supprimer la phrase secrète si vous voulez que Element génère une clé de récupération.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Veuillez supprimer la phrase secrète si vous voulez que ${app_name} génère une clé de récupération.</string>
     <string name="keys_backup_no_session_error">Aucune session Matrix n’est disponible</string>
     <string name="keys_backup_setup_step1_title">Ne perdez jamais vos messages chiffrés</string>
     <string name="keys_backup_setup_step1_description">Les messages dans les salons chiffrés sont sécurisés avec un chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) avez les clés pour lire ces messages. 
@@ -1310,7 +1310,7 @@
     <string name="passwords_do_not_match">Les mots de passe ne correspondent pas</string>
     <string name="autodiscover_invalid_response">Réponse de découverte du serveur d’accueil non valide</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Auto-compléter les options du serveur</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element a détecté une configuration de serveur personnalisée pour le domaine de votre identifiant « %1$s » :
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} a détecté une configuration de serveur personnalisée pour le domaine de votre identifiant « %1$s » :
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Utiliser la configuration</string>
     <string name="notification_sync_init">Initialisation du service</string>
@@ -1425,7 +1425,7 @@
     <string name="action_change">Changer</string>
     <string name="group_all_communities">Toutes les communautés</string>
     <string name="room_preview_no_preview">Impossible d’avoir un aperçu de ce salon</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">L’aperçu des salons visibles par tout le monde n’est pas encore pris en charge par Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">L’aperçu des salons visibles par tout le monde n’est pas encore pris en charge par ${app_name}</string>
     <string name="fab_menu_create_room">Salons</string>
     <string name="fab_menu_create_chat">Messages directs</string>
     <string name="create_room_title">Nouveau salon</string>
@@ -1520,11 +1520,11 @@
     <string name="invite_no_identity_server_error">Ajoutez un serveur d’identité dans vos paramètres pour réaliser cette action.</string>
     <string name="settings_background_fdroid_sync_mode">Mode de synchronisation en arrière-plan</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimisé pour la batterie</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element se synchronisera en arrière-plan de façon à préserver les ressources limitées de l’appareil (batterie).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} se synchronisera en arrière-plan de façon à préserver les ressources limitées de l’appareil (batterie).
 \nSelon l’état des ressources de votre appareil, la synchronisation peut être retardée par le système d’exploitation.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimisé pour le temps réel</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element se synchronisera en arrière-plan de façon périodique à un moment précis (configurable).
-\nCela aura un impact sur l’utilisation de la radio et de la batterie, une notification permanente sera affichée indiquant que Element est à l’écoute des évènements.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} se synchronisera en arrière-plan de façon périodique à un moment précis (configurable).
+\nCela aura un impact sur l’utilisation de la radio et de la batterie, une notification permanente sera affichée indiquant que ${app_name} est à l’écoute des évènements.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Aucune synchronisation en arrière-plan</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Vous ne serez pas notifié(e) des messages entrants quand l’application est en arrière-plan.</string>
     <string name="settings_background_sync_update_error">Échec de la mise à jour des paramètres.</string>
@@ -1608,7 +1608,7 @@
     <string name="content_reported_as_inappropriate_content">Ce contenu a été signalé comme inapproprié. 
 \n 
 \nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l\'ignorer pour masquer ses messages.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element a besoin de votre permission pour sauvegarder vos clés de chiffrement sur le disque.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} a besoin de votre permission pour sauvegarder vos clés de chiffrement sur le disque.
 \n
 \nAutorisez l’accès dans le prochaine fenêtre pour pouvoir exporter vos clés manuellement.</string>
     <string name="no_network_indicator">Il n’y a aucune connexion au réseau pour le moment</string>
@@ -1781,7 +1781,7 @@
 \nReconnectez-vous pour accéder aux données et aux messages de votre compte.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Vous perdrez l’accès à vos messages sécurisés sauf si vous vous connectez pour récupérer vos clés de chiffrement.</string>
     <string name="soft_logout_clear_data_dialog_submit">Effacer les données</string>
-    <string name="soft_logout_sso_not_same_user_error">La session en cours est celle de l’utilisateur %1$s et vous fournissez des identifiants pour l’utilisateur %2$s. Ce n’est pas pris en charge par Element.
+    <string name="template_soft_logout_sso_not_same_user_error">La session en cours est celle de l’utilisateur %1$s et vous fournissez des identifiants pour l’utilisateur %2$s. Ce n’est pas pris en charge par ${app_name}.
 \nEffacez d’abord les données, puis reconnectez-vous avec un autre compte.</string>
     <string name="permalink_malformed">Votre lien matrix.to était malformé</string>
     <string name="bug_report_error_too_short">La description est trop courte</string>
@@ -1799,7 +1799,7 @@
     <string name="devices_other_devices">Autres sessions</string>
     <string name="autocomplete_limited_results">Seuls les premiers résultats sont affichés, saisissez plus de lettres…</string>
     <string name="settings_developer_mode_fail_fast_title">Défaillance rapide</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element peut planter plus souvent quand une erreur inattendue survient</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} peut planter plus souvent quand une erreur inattendue survient</string>
     <string name="command_description_shrug">Préfixe ¯\\_(ツ)_/¯ à un message en texte brut</string>
     <string name="create_room_encryption_title">Activer le chiffrement</string>
     <string name="create_room_encryption_description">Une fois qu’il est activé, le chiffrement ne peut pas être désactivé.</string>
@@ -1870,9 +1870,9 @@
     <string name="room_member_power_level_moderator_in">Modérateur dans %1$s</string>
     <string name="room_member_power_level_custom_in">Personnalisé (%1$d) dans %2$s</string>
     <string name="room_member_jump_to_read_receipt">Aller à l’accusé de lecture</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element ne gère pas les évènements de type « %1$s »</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element ne gère pas les messages de type « %1$s »</string>
-    <string name="rendering_event_error_exception">Element a rencontré un problème lors de l’affichage du contenu de l’évènement ayant pour identifiant « %1$s »</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} ne gère pas les évènements de type « %1$s »</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} ne gère pas les messages de type « %1$s »</string>
+    <string name="template_rendering_event_error_exception">${app_name} a rencontré un problème lors de l’affichage du contenu de l’évènement ayant pour identifiant « %1$s »</string>
     <string name="unignore">Ne plus ignorer</string>
     <string name="verify_cannot_cross_sign">Cette session est incapable de partager cette vérification avec vos autres sessions.
 \nLa vérification sera sauvegardée localement et partagée dans une version future de l’application.</string>
@@ -1967,7 +1967,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Évènement supprimé par l’utilisateur, motif : %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Évènement modéré par l’administrateur du salon, motif : %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Les clés sont déjà à jour !</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Demandes de clé</string>
     <string name="e2e_use_keybackup">Déverrouiller l’historique des messages chiffrés</string>
     <string name="refresh">Actualiser</string>
@@ -2068,13 +2068,13 @@
     <string name="media_file_added_to_gallery">Fichier multimédia ajouté à la galerie</string>
     <string name="error_adding_media_file_to_gallery">Impossible d’ajouter le fichier multimédia à la galerie</string>
     <string name="change_password_summary">Définir un nouveau mot de passe de compte…</string>
-    <string name="use_other_session_content_description">Utilisez la dernière version de Element sur vos autres appareils : Element Web, Element pour Bureau, Element iOS, Element pour Android, ou un autre client Matrix qui prend en charge la signature croisée</string>
-    <string name="app_desktop_web">Element Web
-\nElement pour Bureau</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">Utilisez la dernière version de ${app_name} sur vos autres appareils : ${app_name} Web, ${app_name} pour Bureau, ${app_name} iOS, ${app_name} pour Android, ou un autre client Matrix qui prend en charge la signature croisée</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} pour Bureau</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">ou un autre client Matrix qui prend en charge la signature croisée</string>
-    <string name="use_latest_app">Utilisez la dernière version de Element sur vos autres appareils :</string>
+    <string name="template_use_latest_app">Utilisez la dernière version de ${app_name} sur vos autres appareils :</string>
     <string name="command_description_discard_session">Force la session de groupe sortante actuelle dans un salon chiffré à être abandonnée</string>
     <string name="command_description_discard_session_not_handled">Seulement pris en charge dans les salons chiffrés</string>
     <string name="enter_secret_storage_passphrase_or_key">Utilisez votre %1$s ou votre %2$s pour continuer.</string>
@@ -2135,11 +2135,11 @@
     <string name="choose_locale_loading_locales">Chargement des langues disponibles…</string>
     <string name="open_terms_of">Ouvrir les termes de %s</string>
     <string name="disconnect_identity_server_dialog_content">Se déconnecter du serveur d’identité %s \?</string>
-    <string name="identity_server_error_outdated_identity_server">Ce serveur d’identité est obsolète. Element ne supporte que l’API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Ce serveur d’identité est obsolète. ${app_name} ne supporte que l’API V2.</string>
     <string name="identity_server_error_outdated_home_server">Cette opération n’est pas possible. Le serveur d’accueil est obsolète.</string>
     <string name="identity_server_error_no_identity_server_configured">Veuillez d’abord configurer un serveur d’identité.</string>
     <string name="identity_server_error_terms_not_signed">Veuillez d’abord accepter les termes du serveur d’identité dans les paramètres.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, Element prend uniquement en charge l’envoi des adresses e-mail et des numéros de téléphone hachés.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, ${app_name} prend uniquement en charge l’envoi des adresses e-mail et des numéros de téléphone hachés.</string>
     <string name="identity_server_error_binding_error">L’association a échoué.</string>
     <string name="identity_server_error_no_current_binding_error">Il n’y a actuellement aucune association avec cet identifiant.</string>
     <string name="identity_server_set_default_notice">Votre serveur d’accueil (%1$s) propose d’utiliser %2$s comme serveur d’identité</string>
@@ -2264,17 +2264,17 @@
     <string name="settings_troubleshoot_test_notification_title">Affichage de la notification</string>
     <string name="settings_troubleshoot_test_push_notification_content">Vous voyez la notification ! Cliquez-moi dessus !</string>
     <string name="settings_troubleshoot_test_notification_notification_clicked">La notification a été cliquée !</string>
-    <string name="call_failed_no_connection">Appel échoué</string>
+    <string name="template_call_failed_no_connection">Appel échoué</string>
     <string name="direct_room_encryption_enabled_tile_description">Les messages de ce salon sont chiffrés de bout en bout.</string>
     <string name="room_created_summary_item_by_you">Vous avez créé et configuré ce salon.</string>
     <string name="auth_pin_confirm_to_disable_title">Confirmer le code pour le désactiver</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Le code est requis à l\'ouverture d\'Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">Le code est demandé après 2 minutes d\'inutilisation d\'Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Le code est requis à l\'ouverture d\'${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Le code est demandé après 2 minutes d\'inutilisation d\'${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Demander le code après 2 minutes</string>
     <string name="settings_security_pin_code_notifications_summary_off">Afficher uniquement le numéro de messages non-lus dans une simple notification.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Afficher les détails comme les noms des salons et le contenu du message.</string>
     <string name="settings_security_pin_code_notifications_title">Afficher le contenu dans les notifications</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">Le code est la seule façon de déverrouiller Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">Le code est la seule façon de déverrouiller ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Activer les données biométriques comme les empreintes digitales ou la reconnaissance faciale.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Activer les données biométriques</string>
     <string name="settings_security_pin_code_summary">Si vous voulez réinitialiser votre code, appuyez sur Code oublié pour vous déconnecter et le réinitialiser.</string>
@@ -2471,8 +2471,8 @@
     <string name="user_code_share">Partager mon code</string>
     <string name="user_code_scan">Scanner un code QR</string>
     <string name="not_a_valid_qr_code">Ce n\'est pas un code QR matrix valide</string>
-    <string name="invite_friends_rich_title">🔐️ Rejoins-moi sur element</string>
-    <string name="invite_friends_text">Salut, parle-moi sur Element : %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Rejoins-moi sur ${app_name}</string>
+    <string name="template_invite_friends_text">Salut, parle-moi sur ${app_name} : %s</string>
     <string name="invite_friends">Ajouter des amis</string>
     <string name="add_people">Ajouter des gens</string>
     <string name="topic_prefix">"Sujet : "</string>
diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index bce5836731..0e2bad095a 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -127,7 +127,7 @@
     <string name="user_directory_header">Brûkerskatalogus</string>
     <string name="matrix_only_filter">Allinnich Matrix-kontakten</string>
     <string name="no_conversation_placeholder">Gjin petearen</string>
-    <string name="no_contact_access_placeholder">Jo hawwe Element gjin tagong ta jo lokale kontakten jûn</string>
+    <string name="template_no_contact_access_placeholder">Jo hawwe ${app_name} gjin tagong ta jo lokale kontakten jûn</string>
     <string name="no_result_placeholder">Gjin resultaten</string>
     <string name="people_no_identity_server">Gjin identiteitsserver konfigurearre.</string>
 
diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index ad08235a57..bbfe838ca7 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -341,7 +341,7 @@
     <string name="user_directory_header">Directorio de usuario</string>
     <string name="matrix_only_filter">Só contactos Matrix</string>
     <string name="no_conversation_placeholder">Sen conversas</string>
-    <string name="no_contact_access_placeholder">Non lle permitiches a Element acceder ós contactos locais</string>
+    <string name="template_no_contact_access_placeholder">Non lle permitiches a ${app_name} acceder ós contactos locais</string>
     <string name="no_result_placeholder">Sen resultados</string>
     <string name="rooms_header">Salas</string>
     <string name="rooms_directory_header">Directorio de salas</string>
@@ -525,7 +525,7 @@
     <string name="settings_deactivate_my_account">Desactivar a miña conta</string>
     <string name="settings_analytics">Analytics</string>
     <string name="settings_opt_in_of_analytics">Enviar datos de análises</string>
-    <string name="settings_opt_in_of_analytics_summary">Element recolle información analítica anónima para permitirnos mellorar o aplicativo.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} recolle información analítica anónima para permitirnos mellorar o aplicativo.</string>
     <string name="settings_opt_in_of_analytics_ok">Si, quero axudar!</string>
     <string name="devices_details_id_title">ID</string>
     <string name="devices_details_name_title">Nome</string>
@@ -720,7 +720,7 @@
     <string name="login_error_login_email_not_yet">Unha ligazón de correo na que aínda non se premeu</string>
     <string name="e2e_re_request_encryption_key"><u>Volver a pedir as chaves de cifrado</u> do outro dispositivo seu.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Petición enviada</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Inicie Element noutro dispositivo que poida descifrar esta mensaxe e que despois desde alí lle poida enviar as chaves a este dispositivo.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Inicie ${app_name} noutro dispositivo que poida descifrar esta mensaxe e que despois desde alí lle poida enviar as chaves a este dispositivo.</string>
     <plurals name="membership_changes">
         <item quantity="one">1 cambio de participantes</item>
         <item quantity="other">%d cambios de participantes</item>
@@ -809,7 +809,7 @@
     <string name="settings_notifications_targets">Obxectivos das notificacións</string>
     <string name="settings_deactivate_account_section">Desactivar conta</string>
     <string name="startup_notification_privacy_title">Segredo das notificacións</string>
-    <string name="startup_notification_privacy_message">Element pode estar agochado e seguir traballando na xestión das notificacións dun xeito seguro e privado (inda que iso podería afectar ao uso da batería).</string>
+    <string name="template_startup_notification_privacy_message">${app_name} pode estar agochado e seguir traballando na xestión das notificacións dun xeito seguro e privado (inda que iso podería afectar ao uso da batería).</string>
     <string name="startup_notification_privacy_button_grant">Outorgar permisos</string>
     <string name="startup_notification_privacy_button_other">Escolla outra opción</string>
     <string name="settings_logged_in">Accedeuse como</string>
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
index a8b9588f96..abeed9287d 100644
--- a/vector/src/main/res/values-he/strings.xml
+++ b/vector/src/main/res/values-he/strings.xml
@@ -151,7 +151,7 @@
     <string name="people_no_identity_server">לא הוגדר שרת זהות.</string>
     <string name="no_more_results">אין תוצאות נוספות</string>
     <string name="no_result_placeholder">אין תוצאות</string>
-    <string name="no_contact_access_placeholder">לא אפשרת לאלמנט לגשת לאנשי הקשר המקומיים שלך</string>
+    <string name="template_no_contact_access_placeholder">לא אפשרת לאלמנט לגשת לאנשי הקשר המקומיים שלך</string>
     <string name="start_new_chat_prompt_msg">האם אתה בטוח שברצונך להתחיל צ\'אט חדש עם %s\?</string>
     <string name="option_send_voice">שלח קול</string>
     <string name="start_video_call">התחל שיחת וידאו</string>
@@ -279,7 +279,7 @@
     <string name="call_select_sound_device">בחר מכשיר סאונד</string>
     <string name="call_failed_no_connection_description">נכשל החיבור בזמן אמת.
 \nאנא בקש ממנהל שרת הבית שלך להגדיר שרת TURN על מנת שהשיחות יעבדו בצורה אמינה.</string>
-    <string name="call_failed_no_connection">שיחת האלמנט נכשלה</string>
+    <string name="template_call_failed_no_connection">שיחת האלמנט נכשלה</string>
     <string name="call_failed_dont_ask_again">אל תשאל אותי שוב</string>
     <string name="call_failed_no_ice_use_alt">נסה להשתמש ב-%s</string>
     <string name="call_failed_no_ice_title">השיחה נכשלה עקב שרת שהוגדר כהלכה</string>
@@ -309,22 +309,22 @@
     <string name="permissions_denied_add_contact">אפשר הרשאה לגשת לאנשי הקשר שלך.</string>
     <string name="permissions_denied_qr_code">כדי לסרוק קוד QR, עליך לאפשר גישה למצלמה.</string>
     <string name="permissions_action_not_performed_missing_permissions">מצטער. הפעולה לא בוצעה בגלל הרשאות חסרות</string>
-    <string name="permissions_msg_contacts_warning_other_androids">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם.
+    <string name="template_permissions_msg_contacts_warning_other_androids">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם.
 \n
 \nהאם אתה מסכים לשתף את פנקס הכתובות שלך למטרה זו\?</string>
-    <string name="permissions_rationale_msg_contacts">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם. אם אתה מסכים לשתף את פנקס הכתובות שלך למטרה זו, אנא הגש גישה בחלון הקופץ הבא.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">אלמנט זקוק להרשאה כדי לגשת למצלמה ולמיקרופון שלך כדי לבצע שיחות וידאו.
+    <string name="template_permissions_rationale_msg_contacts">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם. אם אתה מסכים לשתף את פנקס הכתובות שלך למטרה זו, אנא הגש גישה בחלון הקופץ הבא.</string>
+    <string name="template_permissions_rationale_msg_camera_and_audio">אלמנט זקוק להרשאה כדי לגשת למצלמה ולמיקרופון שלך כדי לבצע שיחות וידאו.
 \n
 \nאנא אפשר גישה בחלונות הקופצים הבאים כדי להיות מסוגל לבצע את השיחה.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לבצע את השיחה."</string>
-    <string name="permissions_rationale_msg_record_audio">אלמנט זקוק להרשאה כדי לגשת למיקרופון שלך כדי לבצע שיחות שמע.</string>
+    <string name="template_permissions_rationale_msg_record_audio">אלמנט זקוק להרשאה כדי לגשת למיקרופון שלך כדי לבצע שיחות שמע.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לבצע את השיחה."</string>
-    <string name="permissions_rationale_msg_camera">אלמנט זקוק להרשאה כדי לגשת למצלמה שלך כדי לצלם תמונות ושיחות וידאו.</string>
-    <string name="permissions_rationale_msg_storage">אלמנט זקוק להרשאה כדי לגשת לספריית התמונות והווידיאו שלך כדי לשלוח ולשמור קבצים מצורפים.
+    <string name="template_permissions_rationale_msg_camera">אלמנט זקוק להרשאה כדי לגשת למצלמה שלך כדי לצלם תמונות ושיחות וידאו.</string>
+    <string name="template_permissions_rationale_msg_storage">אלמנט זקוק להרשאה כדי לגשת לספריית התמונות והווידיאו שלך כדי לשלוח ולשמור קבצים מצורפים.
 \n
 \nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לשלוח קבצים מהטלפון שלך.</string>
     <string name="permissions_rationale_popup_title">מידע</string>
@@ -350,7 +350,7 @@
     <string name="settings_call_ringtone_title">רינגטון שיחה נכנסת</string>
     <string name="settings_call_ringtone_use_default_stun_sum">ישתמש ב-%s כסיוע כאשר השרת הביתי שלך אינו מציע כזה (כתובת ה- IP שלך תשותף במהלך שיחה)</string>
     <string name="settings_call_ringtone_use_default_stun">אפשר שרת עזרה לשיחות</string>
-    <string name="settings_call_ringtone_use_app_ringtone">השתמש ברינגטון ברירת המחדל של אלמנט לשיחות נכנסות</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">השתמש ברינגטון ברירת המחדל של אלמנט לשיחות נכנסות</string>
     <string name="settings_call_show_confirmation_dialog_summary">בקש אישור לפני שמתחילים בשיחה</string>
     <string name="settings_call_show_confirmation_dialog_title">מנע שיחה מקרית</string>
     <string name="settings_call_category">שיחות</string>
@@ -375,7 +375,7 @@
     </plurals>
     <string name="groups_list">רשימת קבוצות</string>
     <string name="read_receipts_list">קרא את רשימת הקבלות</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">הפעל את Element במכשיר אחר שיכול לפענח את ההודעה כדי שיוכל לשלוח את המפתחות להפעלה זו.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">הפעל את Element במכשיר אחר שיכול לפענח את ההודעה כדי שיוכל לשלוח את המפתחות להפעלה זו.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">הבקשה נשלחה</string>
     <string name="e2e_re_request_encryption_key_sent">בקשת המפתח נשלחה.</string>
     <string name="e2e_re_request_encryption_key">בקש מחדש מפתחות הצפנה מהפעלות האחרות שלך.</string>
@@ -421,10 +421,10 @@
     <string name="settings_background_sync_update_error">עדכון ההגדרות נכשל.</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">לא תקבל הודעה על הודעות נכנסות כאשר האפליקציה ברקע.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">אין סנכרון רקע</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">אלמנט יסונכרן ברקע מעת לעת בזמן מדויק (ניתן להגדרה).
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">אלמנט יסונכרן ברקע מעת לעת בזמן מדויק (ניתן להגדרה).
 \nזה ישפיע על השימוש ברדיו ובסוללה, תוצג הודעה קבועה לפיה אלמנט מאזין לאירועים.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">מותאם לזמן אמת</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">אלמנט יסונכרן ברקע באופן שישמור על המשאבים המוגבלים של המכשיר (סוללה).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">אלמנט יסונכרן ברקע באופן שישמור על המשאבים המוגבלים של המכשיר (סוללה).
 \nבהתאם למצב משאבי המכשיר שלך, ייתכן שהסנכרון יידחה על ידי מערכת ההפעלה.</string>
     <string name="settings_background_fdroid_sync_mode_battery">מותאם לסוללה</string>
     <string name="settings_background_fdroid_sync_mode">מצב סנכרון רקע</string>
@@ -455,17 +455,17 @@
     <string name="settings_notification_privacy_normal">רגיל</string>
     <string name="settings_troubleshoot_test_battery_quickfix">התעלם מאופטימיזציה</string>
     <string name="settings_troubleshoot_test_battery_failed">אם משתמש משאיר מכשיר מחובר לחשמל ויציב לתקופה מסוימת, כשהמסך כבוי, המכשיר עובר למצב Doze. זה מונע מאפליקציות גישה לרשת ומגדיר את העבודות, הסנכרונים וההתראות הסטנדרטיות שלהם.</string>
-    <string name="settings_troubleshoot_test_battery_success">אלמנט אינו מושפע מתהליך מיטוב הסוללה.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">אלמנט אינו מושפע מתהליך מיטוב הסוללה.</string>
     <string name="settings_troubleshoot_test_battery_title">אופטימיזציה של הסוללה</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">השבת הגבלות</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">מגבלות רקע מופעלות עבור Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">מגבלות רקע מופעלות עבור Element.
 \nהעבודה שהאפליקציה מנסה לעשות תוגבל באגרסיביות בזמן שהיא ברקע, וזה עלול להשפיע על ההודעות.
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">מגבלות רקע מושבתות עבור Element. יש להריץ בדיקה זו באמצעות נתונים ניידים (ללא WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">מגבלות רקע מושבתות עבור Element. יש להריץ בדיקה זו באמצעות נתונים ניידים (ללא WIFI).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">בדוק מגבלות רקע</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">הפעל את התחלה לאחר אתחול</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">השירות לא יופעל עם הפעלת המכשיר מחדש, לא תקבל התראות עד שאלמנט ייפתח לפחות פעם אחת.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">השירות לא יופעל עם הפעלת המכשיר מחדש, לא תקבל התראות עד שאלמנט ייפתח לפחות פעם אחת.</string>
     <string name="settings_troubleshoot_test_service_boot_success">השירות יתחיל עם הפעלת המכשיר מחדש.</string>
     <string name="settings_troubleshoot_test_service_boot_title">הפעל לאחר אתחול</string>
     <string name="settings_troubleshoot_test_service_restart_failed">השירות נכשל מלעלות מחדש</string>
@@ -489,11 +489,11 @@
     <string name="settings_troubleshoot_test_token_registration_success">אסימון FCM נרשם בהצלחה ל- HomeServer.</string>
     <string name="settings_troubleshoot_test_token_registration_title">רישום אסימונים</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">הוסף חשבון</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nשגיאה זו אינה בשליטה על אלמנט. אין חשבון Google בטלפון. אנא פתח את מנהל החשבון והוסף חשבון Google.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
 \nשגיאה זו אינה בשליטה על אלמנט. זה יכול להתרחש מכמה סיבות. אולי זה יעבוד אם תנסה שוב מאוחר יותר, תוכל גם לבדוק ששירות Google Play אינו מוגבל בשימוש נתונים בהגדרות המערכת, או ששעון המכשיר שלך תקין, או שזה יכול לקרות ב- ROM מותאם אישית.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nשגיאה זו איננה בשליטה על Element ולפי גוגל, שגיאה זו מצביעה על כך שלמכשיר יש יותר מדי אפליקציות הרשומות ב- FCM. השגיאה מתרחשת רק במקרים שבהם ישנם מספרים קיצוניים של אפליקציות, כך שהיא לא אמורה להשפיע על המשתמש הממוצע.</string>
     <string name="settings_troubleshoot_test_fcm_failed">נכשל באחזור אסימון FCM:
 \n%1$s</string>
@@ -501,7 +501,7 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">אסימון Firebase</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">תקן שירותי Google Play</string>
-    <string name="settings_troubleshoot_test_play_services_failed">אלמנט משתמש בשירותי Google Play כדי להעביר הודעות פוש אך נראה שהוא אינו מוגדר כהלכה:
+    <string name="template_settings_troubleshoot_test_play_services_failed">אלמנט משתמש בשירותי Google Play כדי להעביר הודעות פוש אך נראה שהוא אינו מוגדר כהלכה:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_success">ה- APK של שירותי Google Play זמין ומעודכן.</string>
     <string name="settings_troubleshoot_test_play_services_title">בדיקת שירותי הפעלה</string>
@@ -619,7 +619,7 @@
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">שים לב שחלק מסוגי ההודעות מוגדרים כשתיקים (יפיקו התראה ללא צליל).</string>
     <string name="settings_troubleshoot_test_bing_settings_title">הגדרות מותאמות אישית.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">אפשר</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">התראות אינן מופעלות עבור הפעלה זו.
+    <string name="template_settings_troubleshoot_test_device_settings_failed">התראות אינן מופעלות עבור הפעלה זו.
 \nאנא בדוק את הגדרות האלמנט.</string>
     <string name="settings_troubleshoot_test_device_settings_success">התראות מופעלות להפעלה זו.</string>
     <string name="settings_troubleshoot_test_device_settings_title">הגדרות מושב.</string>
@@ -648,7 +648,7 @@
     <string name="settings_emails_empty">לא הוספה כתובת דוא\"ל לחשבונך</string>
     <string name="settings_emails">כתובות דוא\"ל</string>
     <string name="settings_add_3pid_authentication_needed">נדרש אימות</string>
-    <string name="settings_add_3pid_flow_not_supported">אינך יכול לעשות זאת ממכשיר נייד</string>
+    <string name="template_settings_add_3pid_flow_not_supported">אינך יכול לעשות זאת ממכשיר נייד</string>
     <string name="settings_add_3pid_confirm_password_title">אשר את סיסמתך</string>
     <string name="settings_app_info_link_summary">הצג את פרטי היישום בהגדרות המערכת.</string>
     <string name="settings_app_info_link_title">מידע על האפליקציה</string>
@@ -1071,7 +1071,7 @@
 \nגבה את המפתחות שלך בצורה מאובטחת כדי לא לאבד אותם.</string>
     <string name="keys_backup_setup_step1_title">לעולם אל תאבד הודעות מוצפנות</string>
     <string name="keys_backup_no_session_error">אין מושב מטריקס זמין</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">אנא מחק את משפט הסיסמה אם ברצונך ש- Element ייצור מפתח שחזור.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">אנא מחק את משפט הסיסמה אם ברצונך ש- Element ייצור מפתח שחזור.</string>
     <string name="passphrase_passphrase_too_weak">משפט הסיסמה חלש מדי</string>
     <string name="passphrase_empty_error_message">אנא הזן משפט סיסמה</string>
     <string name="passphrase_passphrase_does_not_match">משפט הסיסמה אינו תואם</string>
@@ -1316,7 +1316,7 @@
     <string name="create_room_encryption_description">לאחר הפעלתו, לא ניתן להשבית את ההצפנה.</string>
     <string name="create_room_encryption_title">אפשר הצפנה</string>
     <string name="command_description_shrug">הוסף לפני ¯ \\ _ (ツ) _ / ¯ להודעת טקסט רגיל</string>
-    <string name="settings_developer_mode_fail_fast_summary">אלמנט עלול לקרוס לעיתים קרובות יותר כאשר מתרחשת שגיאה בלתי צפויה</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">אלמנט עלול לקרוס לעיתים קרובות יותר כאשר מתרחשת שגיאה בלתי צפויה</string>
     <string name="settings_developer_mode_fail_fast_title">כישלון-מהיר</string>
     <string name="autocomplete_limited_results">מציג רק את התוצאות הראשונות, הקלד עוד אותיות …</string>
     <string name="devices_other_devices">פעולות אחרות</string>
@@ -1333,7 +1333,7 @@
     <string name="notification_initial_sync">סנכרון ראשוני …</string>
     <string name="bug_report_error_too_short">התיאור קצר מדי</string>
     <string name="permalink_malformed">הקישור שלך ל- matrix.to היה תקין</string>
-    <string name="soft_logout_sso_not_same_user_error">ההפעלה הנוכחית מיועדת למשתמש %1$s ואתה מספק אישורי משתמש %2$s. זה אינו נתמך על ידי אלמנט.
+    <string name="template_soft_logout_sso_not_same_user_error">ההפעלה הנוכחית מיועדת למשתמש %1$s ואתה מספק אישורי משתמש %2$s. זה אינו נתמך על ידי אלמנט.
 \nראשית נקה נתונים ואז היכנס שוב לחשבון אחר.</string>
     <string name="soft_logout_clear_data_dialog_submit">נקה נתונים</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">תאבד את הגישה להודעות מאובטחות אלא אם תיכנס בכדי לשחזר את מפתחות ההצפנה שלך.</string>
@@ -1491,7 +1491,7 @@
     <string name="room_list_quick_actions_notifications_all_noisy">כל ההודעות (רועשות)</string>
     <string name="message_ignore_user">התעלם ממשתמש זה</string>
     <string name="no_network_indicator">אין חיבור רשת כרגע</string>
-    <string name="permissions_rationale_msg_keys_backup_export">אלמנט זקוק להרשאה כדי לשמור את מפתחות ה- E2E שלך בדיסק.
+    <string name="template_permissions_rationale_msg_keys_backup_export">אלמנט זקוק להרשאה כדי לשמור את מפתחות ה- E2E שלך בדיסק.
 \n
 \nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לייצא את המפתחות שלך באופן ידני.</string>
     <string name="content_reported_as_inappropriate_content">תוכן זה דווח כבלתי הולם.
@@ -1714,7 +1714,7 @@
     <string name="room_preview_no_preview_join">לא ניתן להציג תצוגה מקדימה של חדר זה. האם אתה רוצה להצטרף אליו\?</string>
     <string name="room_preview_not_found">בשלב זה אין גישה לחדר זה.
 \nנסה שוב מאוחר יותר, או בקש ממנהל החדר לבדוק אם יש לך גישה.</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">התצוגה המקדימה של החדר הקריא בעולם עדיין אינה נתמכת ב- Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">התצוגה המקדימה של החדר הקריא בעולם עדיין אינה נתמכת ב- Element</string>
     <string name="room_preview_no_preview">לא ניתן להציג תצוגה מקדימה של חדר זה</string>
     <string name="group_all_communities">כל הקהילות</string>
     <string name="please_wait">אנא המתינו…</string>
@@ -1791,7 +1791,7 @@
     <string name="sas_verify_title">אמת את זה על ידי השוואה של מחרוזת טקסט קצרה.</string>
     <string name="invalid_or_expired_credentials">הוצאת מחשבון בגלל אישורים לא חוקיים או שפג תוקפם.</string>
     <string name="autodiscover_well_known_autofill_confirm">השתמש בקונפיגורציה</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">אלמנט זיהה תצורת שרת מותאמת אישית לדומיין userId שלך \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">אלמנט זיהה תצורת שרת מותאמת אישית לדומיין userId שלך \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_dialog_title">השלם אוטומטית אפשרויות שרת</string>
     <string name="autodiscover_invalid_response">תגובת גילוי שרת בית לא חוקית</string>
@@ -1817,13 +1817,13 @@
     <string name="auth_pin_confirm_to_disable_title">אשר PIN כדי להשבית PIN</string>
     <string name="settings_security_pin_code_change_pin_summary">שנה את קוד ה- PIN הנוכחי שלך</string>
     <string name="settings_security_pin_code_change_pin_title">שנה PIN</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">קוד PIN נדרש בכל פעם שאתה פותח את Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">קוד PIN נדרש לאחר שתי דקות של אי שימוש ב- Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">קוד PIN נדרש בכל פעם שאתה פותח את Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">קוד PIN נדרש לאחר שתי דקות של אי שימוש ב- Element.</string>
     <string name="settings_security_pin_code_grace_period_title">דרוש מספר PIN לאחר 2 דקות</string>
     <string name="settings_security_pin_code_notifications_summary_off">הצג רק מספר הודעות שלא נקראו בהודעה פשוטה.</string>
     <string name="settings_security_pin_code_notifications_summary_on">הצג פרטים כמו שמות החדרים ותוכן ההודעה.</string>
     <string name="settings_security_pin_code_notifications_title">הצג תוכן בהתראות</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">קוד PIN הוא הדרך היחידה לפתוח את Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">קוד PIN הוא הדרך היחידה לפתוח את Element.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">אפשר ביומטריה ספציפית למכשירים, כמו טביעות אצבע וזיהוי פנים.</string>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%2$s חדר נמצא עבור %1$s</item>
@@ -1972,17 +1972,17 @@
     <string name="settings_data_save_mode_summary">מצב שמירת נתונים מחיל מסנן ספציפי כך שמסוננים עדכוני נוכחות והודעות הקלדה.</string>
     <string name="settings_data_save_mode">מצב שמירת נתונים</string>
     <string name="settings_opt_in_of_analytics_ok">כן, אני רוצה לעזור!</string>
-    <string name="settings_opt_in_of_analytics_prompt">אנא אפשר ניתוח נתונים כדי לעזור לנו לשפר את Element.</string>
-    <string name="settings_opt_in_of_analytics_summary">אלמנט אוסף ניתוח אנונימי כדי לאפשר לנו לשפר את היישום.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">אנא אפשר ניתוח נתונים כדי לעזור לנו לשפר את Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">אלמנט אוסף ניתוח אנונימי כדי לאפשר לנו לשפר את היישום.</string>
     <string name="settings_opt_in_of_analytics">שלח נתוני ניתוח</string>
     <string name="settings_analytics">ניתוח נתונים</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">הענק הרשאה</string>
-    <string name="startup_notification_fdroid_battery_optim_message">אלמנט צריך לשמור על חיבור רקע בעל השפעה נמוכה על מנת לקבל הודעות אמינות.
+    <string name="template_startup_notification_fdroid_battery_optim_message">אלמנט צריך לשמור על חיבור רקע בעל השפעה נמוכה על מנת לקבל הודעות אמינות.
 \nבמסך הבא תתבקש לאפשר לאלמנט לרוץ תמיד ברקע, אנא קבל.</string>
     <string name="startup_notification_fdroid_battery_optim_title">חיבור ברקע</string>
     <string name="startup_notification_privacy_button_other">בחר באפשרות אחרת</string>
     <string name="startup_notification_privacy_button_grant">מתן הרשאה</string>
-    <string name="startup_notification_privacy_message">אלמנט יכול לרוץ ברקע כדי לנהל את ההתראות שלך בצורה מאובטחת ופרטית. זה עשוי להשפיע על השימוש בסוללה.</string>
+    <string name="template_startup_notification_privacy_message">אלמנט יכול לרוץ ברקע כדי לנהל את ההתראות שלך בצורה מאובטחת ופרטית. זה עשוי להשפיע על השימוש בסוללה.</string>
     <string name="startup_notification_privacy_title">פרטיות הודעות</string>
     <string name="settings_discovery_manage">נהל את הגדרות הגילוי שלך.</string>
     <string name="settings_discovery_category">תַגלִית</string>
@@ -2005,7 +2005,7 @@
     <string name="e2e_use_keybackup">בטל את נעילת היסטוריית ההודעות המוצפנות</string>
     <string name="settings_export_trail">ייצוא ביקורת</string>
     <string name="settings_key_requests">בקשות מפתח</string>
-    <string name="login_default_session_public_name">אלמנט אנדרואיד</string>
+    <string name="template_login_default_session_public_name">אלמנט אנדרואיד</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">המפתחות כבר מעודכנים!</string>
     <string name="event_redacted_by_admin_reason_with_reason">האירוע בהנחיית מנהל החדר, סיבה: %1$s</string>
     <string name="event_redacted_by_user_reason_with_reason">האירוע נמחק על ידי המשתמש, הסיבה: %1$s</string>
@@ -2117,7 +2117,7 @@
     <string name="verify_cannot_cross_sign">הפעלה זו אינה יכולה לשתף את האימות הזה עם הפעלות אחרות שלך.
 \nהאימות יישמר באופן מקומי וישותף בגרסה עתידית של האפליקציה.</string>
     <string name="unignore">בטל התעלמות</string>
-    <string name="rendering_event_error_exception">אלמנט נתקל בבעיה בעת הצגת תוכן האירוע עם המזהה \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">אלמנט נתקל בבעיה בעת הצגת תוכן האירוע עם המזהה \'%1$s\'</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="command_confetti">שולח את ההודעה הנתונה עם קונפטי</string>
     <string name="secure_backup_reset_no_history">תתחיל מחדש ללא היסטוריה, ללא הודעות, מכשירים מאומתים או משתמשים מאומתים</string>
@@ -2132,13 +2132,13 @@
     <string name="enter_secret_storage_passphrase_or_key">השתמש ב- %1$s שלך או השתמש ב- %2$s שלך כדי להמשיך.</string>
     <string name="command_description_discard_session_not_handled">נתמך רק בחדרים מוצפנים</string>
     <string name="command_description_discard_session">מכריח את ההפעלה הקבוצתית החוצה הנוכחית בחדר מוצפן להיזרק</string>
-    <string name="use_latest_app">השתמש באלמנט האחרון במכשירים האחרים שלך:</string>
+    <string name="template_use_latest_app">השתמש באלמנט האחרון במכשירים האחרים שלך:</string>
     <string name="or_other_mx_capabale_client">או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
-    <string name="app_ios_android">אלמנט iOS
+    <string name="template_app_ios_android">אלמנט iOS
 \nאלמנט אנדרואיד</string>
-    <string name="app_desktop_web">רשת האינטרנט
+    <string name="template_app_desktop_web">רשת האינטרנט
 \nשולחן העבודה של אלמנט</string>
-    <string name="use_other_session_content_description">השתמש באלמנט העדכני ביותר במכשירים האחרים שלך, Element Web, Element Desktop, Element iOS, Element for Android, או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
+    <string name="template_use_other_session_content_description">השתמש באלמנט העדכני ביותר במכשירים האחרים שלך, Element Web, Element Desktop, Element iOS, Element for Android, או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
     <string name="change_password_summary">הגדר סיסמת חשבון חדשה …</string>
     <string name="error_saving_media_file">לא ניתן היה לשמור את קובץ המדיה</string>
     <string name="error_adding_media_file_to_gallery">לא ניתן היה להוסיף קובץ מדיה לגלריה</string>
@@ -2326,11 +2326,11 @@
     <string name="identity_server_user_consent_not_provided">הסכמת המשתמש לא סופקה.</string>
     <string name="identity_server_error_no_current_binding_error">אין קשר נוכחי למזהה זה.</string>
     <string name="identity_server_error_binding_error">העמותה נכשלה.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">למען הפרטיות שלך, אלמנט תומך רק בשליחת הודעות דוא\"ל של משתמשים, בליל ומספר טלפון.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">למען הפרטיות שלך, אלמנט תומך רק בשליחת הודעות דוא\"ל של משתמשים, בליל ומספר טלפון.</string>
     <string name="identity_server_error_terms_not_signed">אנא קבל תחילה את התנאים של שרת הזהות בהגדרות.</string>
     <string name="identity_server_error_no_identity_server_configured">אנא הגדר תחילה שרת זהות.</string>
     <string name="identity_server_error_outdated_home_server">פעולה זו אינה אפשרית. שרת הבית מיושן.</string>
-    <string name="identity_server_error_outdated_identity_server">שרת זהות זה מיושן .Element תומך רק ב- API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">שרת זהות זה מיושן .Element תומך רק ב- API V2.</string>
     <string name="disconnect_identity_server_dialog_content">להתנתק משרת הזהות%s\?</string>
     <string name="open_terms_of">תנאים פתוחים של%s</string>
     <string name="choose_locale_loading_locales">טוען שפות זמינות …</string>
@@ -2349,8 +2349,8 @@
     <string name="not_a_valid_qr_code">זה לא קוד QR מטריציוני תקף</string>
     <string name="invitations_sent_to_two_users">הזמנות נשלחו אל%1$s ו-%2$s</string>
     <string name="invitation_sent_to_one_user">ההזמנה נשלחה אל%1$s</string>
-    <string name="invite_friends_rich_title">🔐️ הצטרפו אלי באלמנט</string>
-    <string name="invite_friends_text">היי, דבר איתי באלמנט:%s</string>
+    <string name="template_invite_friends_rich_title">🔐️ הצטרפו אלי באלמנט</string>
+    <string name="template_invite_friends_text">היי, דבר איתי באלמנט:%s</string>
     <string name="invite_friends">להזמין חברים</string>
     <string name="invite_users_to_room_title">הזמן משתמשים</string>
     <string name="inviting_users_to_room">מזמין משתמשים …</string>
diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml
index 444e3f722b..566025a7d0 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@@ -115,7 +115,7 @@
     <string name="user_directory_header">Popis korisnika</string>
     <string name="matrix_only_filter">Samo kontakti u Matrixu</string>
     <string name="no_conversation_placeholder">Nema razgovora</string>
-    <string name="no_contact_access_placeholder">Niste Elementu omogućili pristup Vašim lokalnim kontaktima</string>
+    <string name="template_no_contact_access_placeholder">Niste ${app_name}u omogućili pristup Vašim lokalnim kontaktima</string>
     <string name="no_result_placeholder">Nema rezultata</string>
     <string name="people_no_identity_server">Nije podešen poslužitelj identiteta.</string>
     <string name="rooms_header">Sobe</string>
@@ -247,7 +247,7 @@
     <string name="e2e_re_request_encryption_key">Ponovno zatražite ključeve za šifriranje od Vaših drugih sesija.</string>
     <string name="e2e_re_request_encryption_key_sent">Zahtjev za ključ je poslan.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Zahtjev poslan</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Pokrenite Element na nekom drugom uređaju koji može dešifrirati poruku kako bi poslao ključeve ovoj sesiji.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Pokrenite ${app_name} na nekom drugom uređaju koji može dešifrirati poruku kako bi poslao ključeve ovoj sesiji.</string>
     <string name="read_receipts_list">Popis potvrda o pročitanim porukama</string>
     <string name="groups_list">Popis grupa</string>
     <plurals name="membership_changes">
@@ -269,7 +269,7 @@
     <string name="room_info_room_name">Naziv sobe</string>
     <string name="room_info_room_topic">Tema sobe</string>
     <string name="settings_call_category">Pozivi</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Koristi zadan zvuk tona Elementa za dolazne pozive</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Koristi zadan zvuk tona ${app_name}a za dolazne pozive</string>
     <string name="settings_call_ringtone_use_default_stun">Dozvoli rezervnog poslužitelja za pozivnog pomoćnika</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Koristit će se %s kao pomoćnik u slučaju da ga Vaš poslužitelj nema (Vaša IP adresa će biti podijeljena tijekom poziva)</string>
     <string name="settings_call_ringtone_title">Zvuk tona dolaznog poziva</string>
@@ -291,22 +291,22 @@
     <string name="media_picker_both_capture_title">Napravi fotografiju ili video zapis</string>
     <string name="media_picker_cannot_record_video">Nije moguće snimiti video zapis</string>
     <string name="permissions_rationale_popup_title">Informacije</string>
-    <string name="permissions_rationale_msg_storage">Element treba dozvolu pristupa Vašoj kolekciji fotografija i video zapisa za slanje i spremanje privitaka.
+    <string name="template_permissions_rationale_msg_storage">${app_name} treba dozvolu pristupa Vašoj kolekciji fotografija i video zapisa za slanje i spremanje privitaka.
 \n
 \nOmogućite pristup putem sljedećeg skočnog prozora kako biste mogli slati datoteke s Vašeg uređaja.</string>
-    <string name="permissions_rationale_msg_camera">Element treba dozvolu pristupa Vašoj kameri za snimanje fotografija i za video pozive.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} treba dozvolu pristupa Vašoj kameri za snimanje fotografija i za video pozive.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nOmogućite pristup putem sljedećeg skočnog prozora kako biste mogli uspostaviti poziv."</string>
-    <string name="permissions_rationale_msg_record_audio">Element treba dozvolu pristupa Vašem mikrofonu za obavljanje zvučnih poziva.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} treba dozvolu pristupa Vašem mikrofonu za obavljanje zvučnih poziva.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nOmogućite pristup putem sljedećeg skočnog prozora kako biste mogli uspostaviti poziv."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element treba dozvolu pristupa Vašoj kameri i mikrofonu za obavljanje video poziva.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} treba dozvolu pristupa Vašoj kameri i mikrofonu za obavljanje video poziva.
 \n
 \nOmogućite pristup putem sljedećih skočnih prozora kako biste mogli uspostaviti poziv.</string>
-    <string name="permissions_rationale_msg_contacts">Element može provjeriti Vaš imenik kako bi našao druge korisnike Matrixa temeljem njihove e-pošte i telefonskih brojeva. Ako se slažete podijeliti imenik u ove svrhe, dozvolite pristup putem sljedećeg skočnog prozora.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element može provjeriti Vaš imenik kako bi našao druge korisnike Matrixa temeljem njihove e-pošte i telefonskih brojeva.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} može provjeriti Vaš imenik kako bi našao druge korisnike Matrixa temeljem njihove e-pošte i telefonskih brojeva. Ako se slažete podijeliti imenik u ove svrhe, dozvolite pristup putem sljedećeg skočnog prozora.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} može provjeriti Vaš imenik kako bi našao druge korisnike Matrixa temeljem njihove e-pošte i telefonskih brojeva.
 \n
 \nŽelite li podijeliti imenik u ove svrhe\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Nažalost, radnja nije izvršena zbog nedostatka dozvola</string>
@@ -513,7 +513,7 @@
     <string name="ssl_only_accept">Prihvatite certifikat samo ako je poslužiteljski administrator objavio otisak prsta koji odgovara gore navedenom otisku.</string>
     <string name="room_settings_de_prioritize">Smanji prioritet</string>
     <string name="settings_add_3pid_confirm_password_title">Potvrdite Vašu lozinku</string>
-    <string name="settings_add_3pid_flow_not_supported">Ovo nije moguće napraviti iz mobilne inačice Elementa</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Ovo nije moguće napraviti iz mobilne inačice ${app_name}a</string>
     <string name="settings_add_3pid_authentication_needed">Potrebna je ovjera</string>
     <string name="settings_notification_advanced">Napredne postavke obavijesti</string>
     <string name="settings_notification_by_event">Važnost obavijesti po događajima</string>
@@ -537,8 +537,8 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Uključi</string>
     <string name="settings_troubleshoot_test_device_settings_title">Postavke sesije.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Obavijesti su uključene za ovu sesiju.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Obavijesti su isključene za ovu sesiju.
-\nProvjerite postavke Elementa.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Obavijesti su isključene za ovu sesiju.
+\nProvjerite postavke ${app_name}a.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Uključi</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Prilagođene postavke.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Uočite da su neke poruke postavljene na tiho (doći će do obavijesti bez zvuka).</string>
@@ -547,7 +547,7 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Provjeri postavke</string>
     <string name="settings_troubleshoot_test_play_services_title">Provjera Usluga za Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Usluga za Google Play je dostupan i ažuriran.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element koristi Usluge za Google Play kako bi isporučio poruke, no čini se da nisu ispravno podešene.
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} koristi Usluge za Google Play kako bi isporučio poruke, no čini se da nisu ispravno podešene.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Popravi Usluge za Play</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebaseova oznaka</string>
@@ -555,12 +555,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Neuspješno dohvaćanje oznake FCM-a:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nElement nema kontrolu nad ovom greškom te prema Googleu ova greška ukazuje da uređaj ima previše prijavljenih aplikacija na FCM-u. Greška se pojavljuje samo u slučajevima u kojima postoji krajnje mnogo aplikacija te to ne bi trebao biti slučaj kod prosječnog korisnika.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nElement nema kontrolu nad ovom greškom. Nekoliko je mogućih razloga za grešku. Možda će raditi ako kasnije ponovno pokušate. Također u postavkama sustava možete provjeriti da Usluge za Google Play nisu ograničene u korištenju podatkovnog prometa i da je sat Vašeg uređaja točan. Greška je moguća i na prilagođenim ROM-ovima.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nElement nema kontrolu nad ovom greškom. Na uređaju ne postoji račun pri Googleu. Možete otvoriti upravitelja računima i dodati račun pri Googleu.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\n${app_name} nema kontrolu nad ovom greškom te prema Googleu ova greška ukazuje da uređaj ima previše prijavljenih aplikacija na FCM-u. Greška se pojavljuje samo u slučajevima u kojima postoji krajnje mnogo aplikacija te to ne bi trebao biti slučaj kod prosječnog korisnika.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\n${app_name} nema kontrolu nad ovom greškom. Nekoliko je mogućih razloga za grešku. Možda će raditi ako kasnije ponovno pokušate. Također u postavkama sustava možete provjeriti da Usluge za Google Play nisu ograničene u korištenju podatkovnog prometa i da je sat Vašeg uređaja točan. Greška je moguća i na prilagođenim ROM-ovima.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\n${app_name} nema kontrolu nad ovom greškom. Na uređaju ne postoji račun pri Googleu. Možete otvoriti upravitelja računima i dodati račun pri Googleu.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Dodaj račun</string>
     <string name="settings_troubleshoot_test_token_registration_title">Registracija oznake</string>
     <string name="settings_troubleshoot_test_token_registration_success">Oznaka FCM-a je uspješno registrirana pri Vašem poslužitelju.</string>
@@ -576,17 +576,17 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Neuspjelo ponovno pokretanje servisa</string>
     <string name="settings_troubleshoot_test_service_boot_title">Pokreni pri podizanju sustava</string>
     <string name="settings_troubleshoot_test_service_boot_success">Servis će se pokrenuti prilikom ponovnog pokretanja uređaja.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Servis se neće pokrenuti sa ponovnim pokretanjem uređaja pa nećete primati obavijesti sve dok ne otvorite Element.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Servis se neće pokrenuti sa ponovnim pokretanjem uređaja pa nećete primati obavijesti sve dok ne otvorite ${app_name}.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Omogući pokretanje pri podizanju sustava</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Provjeri pozadinska ograničenja</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Pozadinska su ograničenja onemogućena za Element. Ovaj test trebate izvršiti putem podatkovne veze (bez WIFI-ja).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Pozadinska su ograničenja onemogućena za ${app_name}. Ovaj test trebate izvršiti putem podatkovne veze (bez WIFI-ja).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Pozadinska su ograničenja omogućena za Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Pozadinska su ograničenja omogućena za ${app_name}.
 \nRadnje koje aplikacija pokušava napraviti su bitno ograničene dok je u pozadini i ovo možete utjecati na obavijesti.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Onemogući ograničenja</string>
     <string name="settings_troubleshoot_test_battery_title">Optimiranje baterije</string>
-    <string name="settings_troubleshoot_test_battery_success">Optimiranje baterije ne utječe na Element.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Optimiranje baterije ne utječe na ${app_name}.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ako korisnik uz ugašen zaslon ostavi uređaj nepriključenog i u mirovanju tijekom nekog vremena, uređaj će ući u način drijemanja. Ovo aplikacijama onemogućuje pristup mreži i odgađa njihove zadatke, sinkronizaciju i uobičajene alarme.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Zanemari optimiranje</string>
     <string name="settings_notification_privacy_normal">Obično</string>
@@ -616,11 +616,11 @@
     <string name="settings_background_sync">Pozadinska sinkronizacija</string>
     <string name="settings_background_fdroid_sync_mode">Način pozadinske sinkronizacije (eksperimentalno)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimirano za bateriju</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element će sinkronizirati u pozadini na način koji čuva ograničena sredstva uređaja (baterija).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} će sinkronizirati u pozadini na način koji čuva ograničena sredstva uređaja (baterija).
 \nOvisno o stanju sredstava uređaja, operacijski sustav može odgoditi sinkronizaciju.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimirano za stvarno vrijeme</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element će u pozadini i periodično u točno određeno vrijeme koje je podesivo vršiti sinkronizaciju.
-\nOvo će imati utjecaja na korištenje radijskog sustava i potrošnju baterije. Uočit ćete stalno prikazanu obavijest da Element osluškuje događaje.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} će u pozadini i periodično u točno određeno vrijeme koje je podesivo vršiti sinkronizaciju.
+\nOvo će imati utjecaja na korištenje radijskog sustava i potrošnju baterije. Uočit ćete stalno prikazanu obavijest da ${app_name} osluškuje događaje.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Bez pozadinske sinkronizacije</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nećete primati obavijesti o dolaznim porukama kada je aplikacija u pozadini.</string>
     <string name="settings_background_sync_update_error">Neuspjela promjena postavki.</string>
@@ -679,17 +679,17 @@
     <string name="settings_discovery_category">Pronalaženje</string>
     <string name="settings_discovery_manage">Upravljajte Vašim postavkama za pronalaženje.</string>
     <string name="startup_notification_privacy_title">Privatnost obavještavanja</string>
-    <string name="startup_notification_privacy_message">Element se može izvršavati u pozadini kako bi sigurno i privatno upravljao Vašim obavijestima. Ovo može utjecati na potrošnju baterije.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} se može izvršavati u pozadini kako bi sigurno i privatno upravljao Vašim obavijestima. Ovo može utjecati na potrošnju baterije.</string>
     <string name="startup_notification_privacy_button_grant">Dozvoli</string>
     <string name="startup_notification_privacy_button_other">Izaberi drugu opciju</string>
     <string name="startup_notification_fdroid_battery_optim_title">Pozadinska veza</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element treba održati pozadinsku vezu s malim utjecajem kako bi imao pouzdane obavijesti.
-\nNa sljedećem zaslonu potvrdite Elementov zahtjev za stalnim izvršavanjem u pozadini.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} treba održati pozadinsku vezu s malim utjecajem kako bi imao pouzdane obavijesti.
+\nNa sljedećem zaslonu potvrdite ${app_name}ov zahtjev za stalnim izvršavanjem u pozadini.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Dozvoli</string>
     <string name="settings_analytics">Analitika</string>
     <string name="settings_opt_in_of_analytics">Pošalji analitičke podatke</string>
-    <string name="settings_opt_in_of_analytics_summary">Element skuplja anonimnu analitiku kako bi se unaprijedila aplikacija.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Omogućite analitiku ako želite pomoći unaprijediti Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} skuplja anonimnu analitiku kako bi se unaprijedila aplikacija.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Omogućite analitiku ako želite pomoći unaprijediti ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Da, želim pomoći!</string>
     <string name="settings_data_save_mode">Način uštede podataka</string>
     <string name="settings_data_save_mode_summary">Način uštede podataka primjenjuje određeno izdvajanje u kojem se ne navode novosti o prisutnosti i obavijesti o tipkanju.</string>
@@ -902,7 +902,7 @@
     <string name="passphrase_passphrase_does_not_match">Fraza-lozinka se ne podudara</string>
     <string name="passphrase_empty_error_message">Unesite fraza-lozinku</string>
     <string name="passphrase_passphrase_too_weak">Fraza-lozinka je preslaba</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Izbrišite fraza-lozinku ako želite da Element generira ključ za obnovu.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Izbrišite fraza-lozinku ako želite da ${app_name} generira ključ za obnovu.</string>
     <string name="sas_incoming_request_notif_title">Zahtjev za potvrdom</string>
     <string name="sas_incoming_request_notif_content">%s želi potvrditi Vašu sesiju</string>
     <string name="sas_error_m_user">Korisnik je prekinuo potvrdu</string>
@@ -950,7 +950,7 @@
     <string name="please_wait">Pričekajte…</string>
     <string name="group_all_communities">Sve zajednice</string>
     <string name="room_preview_no_preview">Nije moguće pregledati sobu</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Pregled sobe u koju svatko ima uvid još nije podržan u Element-u</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Pregled sobe u koju svatko ima uvid još nije podržan u ${app_name}-u</string>
     <string name="fab_menu_create_room">Sobe</string>
     <string name="fab_menu_create_chat">Izravne poruke</string>
     <string name="create_room_title">Nova soba</string>
@@ -1297,9 +1297,9 @@
     <string name="room_member_power_level_moderator_in">Moderator u %1$s</string>
     <string name="room_member_power_level_custom_in">Prilagođeno (%1$d) u %2$s</string>
     <string name="room_member_jump_to_read_receipt">Skoči na potvrdu o pročitanoj poruci</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element ne podržava događaje tipa \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element ne podržava poruke tipa \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element je naišao na problem pri prikazu sadržaja događaja s identitetom \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} ne podržava događaje tipa \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} ne podržava poruke tipa \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} je naišao na problem pri prikazu sadržaja događaja s identitetom \'%1$s\'</string>
     <string name="unignore">Ukloni zanemarivanje</string>
     <string name="room_list_sharing_header_recent_rooms">Nedavne sobe</string>
     <string name="room_list_sharing_header_other_rooms">Druge sobe</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 3f708657d8..e491722d8d 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -253,7 +253,7 @@
     <string name="local_address_book_header">Helyi címjegyzék</string>
     <string name="matrix_only_filter">Csak Matrix névjegyek</string>
     <string name="no_conversation_placeholder">Nincsenek beszélgetések</string>
-    <string name="no_contact_access_placeholder">Nem adtál hozzáférést a Elementnek a helyi névjegyeidhez</string>
+    <string name="template_no_contact_access_placeholder">Nem adtál hozzáférést a ${app_name}nek a helyi névjegyeidhez</string>
     <string name="no_result_placeholder">Nincs találat</string>
     <string name="rooms_header">Szobák</string>
     <string name="rooms_directory_header">Szobalista</string>
@@ -380,22 +380,22 @@
     <string name="media_picker_both_capture_title">Kép vagy videó készítése</string>
     <string name="media_picker_cannot_record_video">Videorögzítés sikertelen</string>
     <string name="permissions_rationale_popup_title">Információ</string>
-    <string name="permissions_rationale_msg_storage">A Elementnek szüksége van a fénykép- és videótárad elérési engedélyéhez a mellékletek küldéséhez és mentéséhez.
+    <string name="template_permissions_rationale_msg_storage">A ${app_name}nek szüksége van a fénykép- és videótárad elérési engedélyéhez a mellékletek küldéséhez és mentéséhez.
 \n
 \nEngedélyezd a hozzáférést a következő felugró ablakon, hogy fájlokat tudj küldeni a telefonodról.</string>
-    <string name="permissions_rationale_msg_camera">Az Elementnek engedélyre van szüksége a kamera eléréséhez, hogy képeket tudj készítsen és videóhívást tudj indítani.</string>
+    <string name="template_permissions_rationale_msg_camera">Az ${app_name}nek engedélyre van szüksége a kamera eléréséhez, hogy képeket tudj készítsen és videóhívást tudj indítani.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nEngedélyezd a hozzáférést a következő felugró ablakon, hogy hívást tudj indítani."</string>
-    <string name="permissions_rationale_msg_record_audio">A Elementnek engedélyre van szüksége a mikrofon eléréséhez, hogy hanghívás tudjon indítani.</string>
+    <string name="template_permissions_rationale_msg_record_audio">A ${app_name}nek engedélyre van szüksége a mikrofon eléréséhez, hogy hanghívás tudjon indítani.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nEngedélyezd a hozzáférést a következő felugró ablakon, hogy hívást tudj indítani."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">A Elementnek engedélyre van szüksége a mikrofonod és kamerád eléréséhez, hogy videohívást tudj indítani.
+    <string name="template_permissions_rationale_msg_camera_and_audio">A ${app_name}nek engedélyre van szüksége a mikrofonod és kamerád eléréséhez, hogy videohívást tudj indítani.
 \n
 \nEngedélyezd a hozzáférést a következő felugró ablakon, hogy hívást tudj indítani.</string>
-    <string name="permissions_rationale_msg_contacts">A Element a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókat. Ha egyetértesz a névjegyek ilyen célú megosztásával, kérlek engedélyezd a hozzáférést a következő felugró üzenetben.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">A Element a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókat.
+    <string name="template_permissions_rationale_msg_contacts">A ${app_name} a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókat. Ha egyetértesz a névjegyek ilyen célú megosztásával, kérlek engedélyezd a hozzáférést a következő felugró üzenetben.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">A ${app_name} a névjegyekben lévő e-mail és telefonszám alapján képes felkutatni más Matrix felhasználókat.
 \n
 \nEgyetértesz a névjegyek ilyen célú megosztásával\?</string>
     <string name="permissions_action_not_performed_missing_permissions">"Elnézést.  A művelet nem lett végre hajtva hiányzó engedélyek miatt"</string>
@@ -884,7 +884,7 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="settings_notification_privacy_metadata">• Az értesítések csak metaadatokat tartalmaznak</string>
     <string name="settings_notification_privacy_secure_message_content">• Az értesítés tartalma <b>közvetlenül a Matrix szerverről kerül letöltésre</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">Az értesítések <b>meta- és üzenet adatot is</b> tartalmaznak</string>
-    <string name="startup_notification_privacy_message">Element futtatható a háttérben az értesítések biztonságos és titkos kezeléséhez, ami hatással lehet az akkumulátor használatra.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} futtatható a háttérben az értesítések biztonságos és titkos kezeléséhez, ami hatással lehet az akkumulátor használatra.</string>
     <string name="startup_notification_privacy_button_grant">Engedély megadása</string>
     <string name="startup_notification_privacy_button_other">Más lehetőség választása</string>
     <string name="settings_notification_privacy">Értesítés adatvédelme</string>
@@ -900,8 +900,8 @@ Figyelmeztetés: ez a fájl törlésre kerülhet, ha az alkalmazást törli.</st
     <string name="settings_deactivate_account_section">Fiók felfüggesztése</string>
     <string name="settings_deactivate_my_account">Saját fiók felfüggesztése</string>
     <string name="settings_opt_in_of_analytics">Analitikai adatok küldése</string>
-    <string name="settings_opt_in_of_analytics_summary">Element anonim analitikai adatokat gyűjt, hogy javítani tudjuk az alkalmazást.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Kérlek engedélyezd az analitikai adatok gyűjtését ezzel segítve a Element fejlesztését.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} anonim analitikai adatokat gyűjt, hogy javítani tudjuk az alkalmazást.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Kérlek engedélyezd az analitikai adatok gyűjtését ezzel segítve a ${app_name} fejlesztését.</string>
     <string name="settings_opt_in_of_analytics_ok">Igen, segíteni akarok!</string>
     <string name="widget_integration_missing_parameter">A szükséges paraméter hiányzik.</string>
     <string name="widget_integration_invalid_parameter">Nem érvényes paraméter.</string>
@@ -923,7 +923,7 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="e2e_re_request_encryption_key">Végpontok közötti titkosításhoz használt kulcsok újrakérése a többi munkamenetedtől.</string>
     <string name="e2e_re_request_encryption_key_sent">Kulcs újrakérve.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Kérés elküldve</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Índítsd el a Elementet egy olyan eszközön, amely vissza tudja fejteni az üzenetet, hogy elküldhesse a kulcsot ennek a munkamenetnek.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Índítsd el a ${app_name}et egy olyan eszközön, amely vissza tudja fejteni az üzenetet, hogy elküldhesse a kulcsot ennek a munkamenetnek.</string>
     <string name="lock_screen_hint">Ide írj…</string>
     <string name="option_send_voice">Hangüzenet küldése</string>
     <string name="go_on_with">tovább ezzel…</string>
@@ -1031,13 +1031,13 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés
     <string name="settings_show_avatar_display_name_changes_messages">Fiók események megjelenítése</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Avatar és név változásokat tartalmaz.</string>
     <string name="settings_password">Jelszó</string>
-    <string name="settings_labs_native_camera_summary">Rendszer kamera indítása a Element egyedi kamera alkalmazása helyett.</string>
+    <string name="settings_labs_native_camera_summary">Rendszer kamera indítása a ${app_name} egyedi kamera alkalmazása helyett.</string>
     <string name="settings_labs_enable_send_voice_summary">Ehhez az opcióhoz egy harmadik féltől származó alkalmazásra van szükség, hogy felvedd az üzenetet.</string>
     <string name="command_problem_with_parameters">\"%s\" parancsnak több paraméterre van szüksége vagy valamelyik paraméter hibás.</string>
     <string name="markdown_has_been_enabled">Markdown engedélyezve.</string>
     <string name="markdown_has_been_disabled">Markdown tiltva.</string>
     <string name="settings_call_category">Hívások</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Az alapértelmezett Element csengőhang használata bejövő hívásokhoz</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Az alapértelmezett ${app_name} csengőhang használata bejövő hívásokhoz</string>
     <string name="settings_call_ringtone_title">Bejövő hívás csengőhangja</string>
     <string name="settings_call_ringtone_dialog_title">Csengőhang kiválasztása a hívásokhoz:</string>
     <string name="accept">Elfogadás</string>
@@ -1061,11 +1061,11 @@ Kérlek ellenőrizd a fiókbeállításokat.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Engedélyez</string>
     <string name="settings_troubleshoot_test_device_settings_title">Munkamenet beállítások.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Az értesítések engedélyezve vannak ezen az munkameneten.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Az értesítések tiltva vannak ezen a munkameneten. Kérlek ellenőrizd a Element beállításokat.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Az értesítések tiltva vannak ezen a munkameneten. Kérlek ellenőrizd a ${app_name} beállításokat.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Engedélyez</string>
     <string name="settings_troubleshoot_test_play_services_title">Play Szolgáltatások ellenőrzése</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK elérhető és a legújabb verziójú.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">"Element a Google Play Services-t használja  a „push” értesítések fogadásához, de úgy tűnik az nincs megfelelően beállítva:
+    <string name="template_settings_troubleshoot_test_play_services_failed">"${app_name} a Google Play Services-t használja  a „push” értesítések fogadásához, de úgy tűnik az nincs megfelelően beállítva:
 \n%1$s"</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play Services javítása</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase token</string>
@@ -1087,21 +1087,21 @@ Próbáld újraindítani a szolgáltatást.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">A szolgáltatást nem sikerült újraindítani</string>
     <string name="settings_troubleshoot_test_service_boot_title">Indítás az eszköz indulásakor</string>
     <string name="settings_troubleshoot_test_service_boot_success">A szolgáltatás az eszköz újraindulásakor elindul.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">A szolgáltatás az eszköz újraindulásakor nem fog elindulni, addig nem kapsz értesítést amíg egyszer el nem indítod a Element-ot.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">A szolgáltatás az eszköz újraindulásakor nem fog elindulni, addig nem kapsz értesítést amíg egyszer el nem indítod a ${app_name}-ot.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Indulás engedélyezése amikor az eszköz elindul</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Háttér korlátozások ellenőrzése</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">A háttér korlátozások nincsenek érvényben a Element-hoz. Ezt a tesztet mobil hálózaton kell elvégezni (WiFi nélkül).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">A háttér korlátozások nincsenek érvényben a ${app_name}-hoz. Ezt a tesztet mobil hálózaton kell elvégezni (WiFi nélkül).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Háttér korlátozások vannak érvényben a Element-hoz.
-Bármi amit a Element el akar végezni amíg a háttérben fut, agresszívan korlátozva van. Ez érintheti az értesítéseket is.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Háttér korlátozások vannak érvényben a ${app_name}-hoz.
+Bármi amit a ${app_name} el akar végezni amíg a háttérben fut, agresszívan korlátozva van. Ez érintheti az értesítéseket is.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Korlátozások tiltása</string>
     <string name="settings_troubleshoot_test_battery_title">Akkumulátor optimalizáció</string>
-    <string name="settings_troubleshoot_test_battery_success">Elementot nem érinti az akkumulátor optimalizáció.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name}ot nem érinti az akkumulátor optimalizáció.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ha a felhasználó töltés nélkül kikapcsolt képernyővel egy ideig magára hagyja az eszközt, az eszköz „Doze” módba kerül. Ez megakadályozza az alkalmazás számára, hogy hozzáférjen a hálózathoz, nem engedi elvégezni a feladatait, szinkronizációt és az alapértelmezett riasztásait.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimalizáció figyelmen kívül hagyása</string>
     <string name="startup_notification_fdroid_battery_optim_title">Háttér kapcsolat</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Az Elementnek szüksége van egy minimális háttér kapcsolat fenntartására ahhoz, hogy az értesítések megbízhatóan megérkezhessenek. A következő képernyőn el kell fogadnod, hogy a Element folyamatosan fusson a háttérben.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">Az ${app_name}nek szüksége van egy minimális háttér kapcsolat fenntartására ahhoz, hogy az értesítések megbízhatóan megérkezhessenek. A következő képernyőn el kell fogadnod, hogy a ${app_name} folyamatosan fusson a háttérben.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Jogosultság megadása</string>
     <string name="account_email_error">Az e-mail címed ellenőrzésekor hiba történt.</string>
     <string name="account_phone_number_error">A telefonszámod ellenőrzésekor hiba történt.</string>
@@ -1120,12 +1120,12 @@ Bármi amit a Element el akar végezni amíg a háttérben fut, agresszívan kor
     <string name="settings_troubleshoot_test_bing_settings_failed">Az egyedi beállításaidban néhány értesítés ki van kapcsolva.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Az egyedi szabályokat nem sikerült betölteni, kérlek próbáld újra.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Beállítások ellenőrzése</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-Ez a hiba a Elementon kívül van és a Google szerint ez a hiba azt jelzi, hogy túl sok alkalmazás használja az FCM-et. Ez a hiba akkor szokott előfordulni, ha nagyon sok alkalmazás van ezért egy átlagos felhasználót nem nagyon érinthet.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-Ez a hiba a Elementon kívül van. Több okból is előjöhet. Lehet, ha később próbálod már működni fog, de megnézheted, hogy a Google Play szolgáltatásnak nincs beállítva adathasználati korlátozás a rendszer beállításokban vagy, hogy az eszközöd órája helyesen jár-e de ezt előfordulhat egyedi ROM esetén is.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-Ez a hiba a Elementon kívül van. Nincs Google fiók az eszközön. Kérlek nyisd meg a fiókkezelőt és adj hozzá egy Google fiókot.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+Ez a hiba a ${app_name}on kívül van és a Google szerint ez a hiba azt jelzi, hogy túl sok alkalmazás használja az FCM-et. Ez a hiba akkor szokott előfordulni, ha nagyon sok alkalmazás van ezért egy átlagos felhasználót nem nagyon érinthet.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+Ez a hiba a ${app_name}on kívül van. Több okból is előjöhet. Lehet, ha később próbálod már működni fog, de megnézheted, hogy a Google Play szolgáltatásnak nincs beállítva adathasználati korlátozás a rendszer beállításokban vagy, hogy az eszközöd órája helyesen jár-e de ezt előfordulhat egyedi ROM esetén is.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+Ez a hiba a ${app_name}on kívül van. Nincs Google fiók az eszközön. Kérlek nyisd meg a fiókkezelőt és adj hozzá egy Google fiókot.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Fiók hozzáadása</string>
     <string name="settings_noisy_notifications_preferences">Hangos értesítések beállítása</string>
     <string name="settings_call_notifications_preferences">Hívás értesítések beállítása</string>
@@ -1136,7 +1136,7 @@ Ez a hiba a Elementon kívül van. Nincs Google fiók az eszközön. Kérlek nyi
     <string name="notification_silent">Csendes</string>
     <string name="passphrase_empty_error_message">Kérlek adj meg egy jelmondatot</string>
     <string name="passphrase_passphrase_too_weak">A jelmondat túl gyenge</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Ha azt szeretnéd, hogy a Element Visszaállítási Kulcsot generáljon akkor kérlek töröld a jelmondatot.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Ha azt szeretnéd, hogy a ${app_name} Visszaállítási Kulcsot generáljon akkor kérlek töröld a jelmondatot.</string>
     <string name="keys_backup_no_session_error">Jelenleg nincs Matrix munkamenet</string>
     <string name="keys_backup_setup_step1_title">Soha ne veszíts el titkosított üzenetet</string>
     <string name="keys_backup_setup_step1_description">A titkosított szobákban az üzenetek végponttól-végpontig titkosítva vannak. Csak neked és a címzetteknek vannak meg az üzenet elolvasásához szükséges kulcsok.
@@ -1266,7 +1266,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="passwords_do_not_match">A jelszavak nem egyeznek meg</string>
     <string name="autodiscover_invalid_response">A Matrix szerver felderítésére érvénytelen válasz érkezett</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Szerver beállítások automatikus kiegészítése</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element egyedi szerver beállítást észlelt a felhasználói azonosítód domain-jéhez: \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} egyedi szerver beállítást észlelt a felhasználói azonosítód domain-jéhez: \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Beállítás használata</string>
     <string name="notification_sync_init">Szolgáltatás indítása</string>
@@ -1381,7 +1381,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="please_wait">Kérlek várj…</string>
     <string name="group_all_communities">Minden közösség</string>
     <string name="room_preview_no_preview">Ennek a szobának nincs előnézete</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">A Element-ben a nyilvános szoba előnézete egyelőre nem támogatott</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">A ${app_name}-ben a nyilvános szoba előnézete egyelőre nem támogatott</string>
     <string name="fab_menu_create_room">Szobák</string>
     <string name="fab_menu_create_chat">Közvetlen üzenetek</string>
     <string name="create_room_title">Új szoba</string>
@@ -1476,11 +1476,11 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="invite_no_identity_server_error">A beállításokban adj hozzá egy azonosítási szervert ehhez a művelethez.</string>
     <string name="settings_background_fdroid_sync_mode">Háttér Szinkronizálási Mód (Kísérleti)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimalizált akkumulátor használat</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element a háttérben úgy szinkronizál, hogy a leginkább kímélje az eszköz korlátozott erőforrásait (akkumulátor).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} a háttérben úgy szinkronizál, hogy a leginkább kímélje az eszköz korlátozott erőforrásait (akkumulátor).
 \nAz eszköz erőforrásainak állapotától függően a szinkronizációt az operációs rendszer elhalaszthatja.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimalizálás valós idejű használatra</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element a háttérben rendszeresen, pontosan a megadott időközönként, szinkronizálni fog (beállítható).
-\nEz befolyásolja a rádió és az akkumulátor használatot, és folyamatosan egy értesítés fog megjelenni arról, hogy a Element figyel a neki küldött eseményekre.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} a háttérben rendszeresen, pontosan a megadott időközönként, szinkronizálni fog (beállítható).
+\nEz befolyásolja a rádió és az akkumulátor használatot, és folyamatosan egy értesítés fog megjelenni arról, hogy a ${app_name} figyel a neki küldött eseményekre.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Nincs szinkroniziálás a háttérben</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nem leszel értesítve az érkező üzenetekről, ha az alkalmazás csak a háttérben fut.</string>
     <string name="settings_background_sync_update_error">A beállítások frissítése nem sikerült.</string>
@@ -1564,12 +1564,12 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="content_reported_as_inappropriate_content">Ez a tartalom nem idevalónak lett bejelentve.
 \n
 \n Ha nem akarsz ettől a felhasználótól több üzenetet látni akkor blokkolhatod, hogy az üzenetei ne jelenjenek meg számodra</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Elementnak engedélyre van szüksége ahhoz, hogy a végponttól végpontig titkosító kulcsokat a lemezre menthesse.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name}nak engedélyre van szüksége ahhoz, hogy a végponttól végpontig titkosító kulcsokat a lemezre menthesse.
 \n
 \nKérlek a következő felugró ablakban engedélyezd a hozzáférést, hogy a kulcsokat kézzel kimenthesd.</string>
     <string name="no_network_indicator">Jelenleg nincs hálózati kapcsolat</string>
     <string name="settings_add_3pid_confirm_password_title">Jelszó megerősítés</string>
-    <string name="settings_add_3pid_flow_not_supported">Element mobilról ezt nem teheted meg</string>
+    <string name="template_settings_add_3pid_flow_not_supported">${app_name} mobilról ezt nem teheted meg</string>
     <string name="settings_add_3pid_authentication_needed">Azonosítás szükséges</string>
     <string name="settings_integrations">Integrációk</string>
     <string name="settings_integrations_summary">Botok, hidak, kisalkalmazások és matrica csomagok kezeléséhez használj Integrációs Menedzsert.
@@ -1738,7 +1738,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \nA fiók és az üzeneteid eléréséhez jelentkezz be.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Elveszted a hozzáférésedet a titkosított üzeneteidhez ha nem jelentkezel be a titkosítási kulcsok visszaállításához.</string>
     <string name="soft_logout_clear_data_dialog_submit">Adat törlése</string>
-    <string name="soft_logout_sso_not_same_user_error">A jelenlegi munkamenet %1$s felhasználóhoz tartozik és %2$s azonosítási adatait adtad meg. Ez Element-ben nem támogatott.
+    <string name="template_soft_logout_sso_not_same_user_error">A jelenlegi munkamenet %1$s felhasználóhoz tartozik és %2$s azonosítási adatait adtad meg. Ez ${app_name}-ben nem támogatott.
 \nElőször töröld az adatokat, utána lépj be a másik fiókba!</string>
     <string name="permalink_malformed">A matrix.to linked hibás</string>
     <string name="bug_report_error_too_short">A leírás túl rövid</string>
@@ -1756,7 +1756,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="devices_other_devices">Más munkamenetek</string>
     <string name="autocomplete_limited_results">Csak az első találat megmutatása, gépelj több betűt…</string>
     <string name="settings_developer_mode_fail_fast_title">Összeomlás-hamar</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element a nem várt hibák esetén többször fog összeomlani</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} a nem várt hibák esetén többször fog összeomlani</string>
     <string name="command_description_shrug">Hozzáteszi a sima szöveges üzenethez ezt: ¯\\_(ツ)_/¯</string>
     <string name="create_room_encryption_title">Titkosítás engedélyezése</string>
     <string name="create_room_encryption_description">Ha egyszer bekapcsolod, már nem lehet kikapcsolni.</string>
@@ -1827,9 +1827,9 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="room_member_power_level_moderator_in">Moderátor itt: %1$s</string>
     <string name="room_member_power_level_custom_in">Egyedi (%1$d) itt: %2$s</string>
     <string name="room_member_jump_to_read_receipt">Olvasási visszaigazolásra ugrás</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element nem kezeli ezt az eseményt: \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element nem kezeli ezt az üzenet típust: \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element problémába ütközött az esemény (azon: %1$s) megjelenítésekor</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} nem kezeli ezt az eseményt: \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} nem kezeli ezt az üzenet típust: \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} problémába ütközött az esemény (azon: %1$s) megjelenítésekor</string>
     <string name="unignore">Figyelembe vesz</string>
     <string name="verify_cannot_cross_sign">Ez a munkamenet nem tudja megosztani ezt az ellenőrzést a másik munkameneteddel.
 \nAz ellenőrzés helyileg elmentésre kerül és az alkalmazás jövőbeli verziójával meg lesz osztva.</string>
@@ -1924,7 +1924,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="event_redacted_by_user_reason_with_reason">Az eseményt a felhasználó törölte, ezért: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Az eseményt a szoba adminisztrátora moderálta, ezért: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">A kulcsok már frissek!</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Kulcs kérések</string>
     <string name="e2e_use_keybackup">Régi titkosított üzenetek feloldása</string>
     <string name="refresh">Frissítés</string>
@@ -2025,12 +2025,12 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="media_file_added_to_gallery">A média fájl a Galériához hozzáadva</string>
     <string name="error_adding_media_file_to_gallery">A média fájlt nem sikerült hozzáadni a Galériához</string>
     <string name="change_password_summary">Új fiók jelszó beállítása…</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">"vagy más eszközök közötti hitelesítést támogató  Matrix-klienst"</string>
-    <string name="use_latest_app">Az Element legújabb kliensét használd a többi eszközödön:</string>
+    <string name="template_use_latest_app">Az ${app_name} legújabb kliensét használd a többi eszközödön:</string>
     <string name="command_description_discard_session">A jelenlegi csoport munkamenet törlését kikényszeríti a titkosított szobában</string>
     <string name="command_description_discard_session_not_handled">Csak a titkosított szobákban támogatott</string>
     <string name="enter_secret_storage_passphrase_or_key">Használd ezt: %1$s vagy ezt: %2$s a továbblépéshez.</string>
@@ -2051,7 +2051,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="error_empty_field_choose_password">Kérlek válassz jelszót.</string>
     <string name="external_link_confirmation_title">Ezt a hivatkozást ellenőrizd le még egyszer</string>
     <string name="create_room_dm_failure">A közvetlen beszélgetést nem sikerült létrehozni. Ellenőrizd azokat a felhasználókat akiket meg szeretnél hívni és próbáld újra.</string>
-    <string name="use_other_session_content_description">"Használd a legújabb Elementet a többi eszközödön, azaz az Element Webet, az Element Desktopot, az Element for Androidot vagy más eszközök közötti hitelesítést támogató  Matrix-klienst"</string>
+    <string name="template_use_other_session_content_description">"Használd a legújabb ${app_name}et a többi eszközödön, azaz az ${app_name} Webet, az ${app_name} Desktopot, az ${app_name} for Androidot vagy más eszközök közötti hitelesítést támogató  Matrix-klienst"</string>
     <string name="confirm_your_identity">Erősítsd meg ebben a bejelentkezésben a személyazonosságodat egy másik munkamenetből, hogy hozzáférhess a titkosított üzenetekhez.</string>
     <string name="external_link_confirmation_message">%1$s hivatkozás egy másik oldalra visz: %2$s.
 \n
@@ -2093,11 +2093,11 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="choose_locale_other_locales_title">További elérhető nyelvek</string>
     <string name="choose_locale_loading_locales">Elérhető nyelvek betöltése…</string>
     <string name="open_terms_of">Megnyitás: %s feltételek</string>
-    <string name="identity_server_error_outdated_identity_server">Ez az azonosítási szerver régi. Element csak az API V2-t támogatja.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Ez az azonosítási szerver régi. ${app_name} csak az API V2-t támogatja.</string>
     <string name="identity_server_error_outdated_home_server">Ez a művelet nem támogatott. A Matrix szerver elavult.</string>
     <string name="identity_server_error_no_identity_server_configured">Kérlek először állíts be egy azonosítási szervert.</string>
     <string name="identity_server_error_terms_not_signed">Kérlek először fogadd el az azonosítási szerver felhasználási feltételeit a beállításokban.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">A biztonságod érdekében Element csak hash-selt e-mail cím és telefonszám küldését támogatja.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">A biztonságod érdekében ${app_name} csak hash-selt e-mail cím és telefonszám küldését támogatja.</string>
     <string name="identity_server_error_binding_error">A megfeleltetés sikertelen.</string>
     <string name="identity_server_error_no_current_binding_error">Ezzel az azonosítóval jelenleg nincs megfeleltetve semmi.</string>
     <string name="identity_server_set_default_notice">A Matrix szervered (%1$s) ezt az azonosítási szervert javasolja: %2$s</string>
@@ -2148,7 +2148,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="cannot_call_yourself_with_invite">Nem hívhatod fel saját magad, várj amíg a résztvevők elfogadják a meghívást</string>
     <string name="failed_to_add_widget">Kisalkalmazás hozzáadása sikertelen</string>
     <string name="failed_to_remove_widget">Kisalkalmazás eltávolítása sikertelen</string>
-    <string name="call_failed_no_connection">Element hívás sikertelen</string>
+    <string name="template_call_failed_no_connection">${app_name} hívás sikertelen</string>
     <string name="call_failed_no_connection_description">Nem sikerült felépíteni a valós idejű kapcsolatot.
 \nKérd meg a Matrix-kiszolgálód rendszergazdáját, hogy állítson be egy TURN-kiszolgálót, hogy a hívások megbízhatóan működjenek.</string>
     <string name="login_error_ssl_peer_unverified">SSL hiba: a partner személyazonossága nem lett megerősítve.</string>
@@ -2284,7 +2284,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="auth_pin_confirm_to_disable_title">Erősítsd meg a PIN-kódot a PIN-kód kikapcsolásához</string>
     <string name="settings_security_pin_code_notifications_summary_on">Részletek mutatása, mint például a szoba neve, vagy az üzenet tartalma.</string>
     <string name="settings_security_pin_code_notifications_title">Üzenetek tartalmának mutatása az értesítésekben</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">Az Element feloldása csak PIN kóddal lehetséges.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">Az ${app_name} feloldása csak PIN kóddal lehetséges.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Biometrikus azonosítás engedélyezése</string>
     <string name="settings_security_application_protection_screen_title">Védelem beállítása</string>
     <string name="settings_security_application_protection_summary">Hozzáférés védése PIN kóddal és biometrikus azonosítással.</string>
@@ -2314,8 +2314,8 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Nincs jogosultságod hívást indítani</string>
     <string name="no_permissions_to_start_webrtc_call">Nincs jogosultságod hívást indítani ebben a szobában</string>
     <string name="user_code_info_text">Mutasd meg ezt a kódot az ismerőseidnek, hogy be tudják olvasni, és elkezdődhessen a csevegés!</string>
-    <string name="invite_friends_rich_title">🔐️ Csatlakozz hozzám Element-en</string>
-    <string name="invite_friends_text">Hey, beszélgessünk Element-en: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Csatlakozz hozzám ${app_name}-en</string>
+    <string name="template_invite_friends_text">Hey, beszélgessünk ${app_name}-en: %s</string>
     <string name="invite_friends">Ismerősök meghívása</string>
     <string name="user_code_my_code">Saját kódom</string>
     <string name="user_code_share">Saját kód megosztása</string>
diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml
index 91fdb38426..af8863355c 100644
--- a/vector/src/main/res/values-id/strings.xml
+++ b/vector/src/main/res/values-id/strings.xml
@@ -155,7 +155,7 @@
 
     <string name="later">Nanti</string>
     <string name="send_anyway">Kirim Saja</string>
-    <string name="no_contact_access_placeholder">Element belum diijinkan untuk mengakses kontak lokal</string>
+    <string name="template_no_contact_access_placeholder">${app_name} belum diijinkan untuk mengakses kontak lokal</string>
     <string name="send_bug_report_include_crash_logs">Kirim log gangguan</string>
     <string name="huge">Raksasa</string>
     <string name="small">Kecil</string>
@@ -250,18 +250,18 @@ Anda telah dikeluarkan dari semua perangkat dan tidak lagi menerima pemberitahua
     <string name="media_picker_both_capture_title">Ambil gambar atau video</string>
     <string name="media_picker_cannot_record_video">Tidak bisa merekam video</string>
 
-    <string name="permissions_rationale_msg_storage">Element membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
+    <string name="template_permissions_rationale_msg_storage">${app_name} membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
 
 Harap berikan akses pada halaman berikut agar berkas dapat dikirim dari ponsel Anda.</string>
-    <string name="permissions_rationale_msg_camera">Element membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="permissions_rationale_msg_record_audio">Element membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
 
 Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="light_theme">Tema Terang</string>
@@ -321,7 +321,7 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="e2e_re_request_encryption_key_sent">Permintaan kunci terkirim.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Permintaan terkirim</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Jalankan Element di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Jalankan ${app_name} di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
 
     <string name="groups_list">Daftar Grup</string>
 
@@ -330,12 +330,12 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     </plurals>
 
     <string name="call">Panggilan</string>
-    <string name="permissions_rationale_msg_contacts">Element memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
 
-Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna Element yang terdapat di daftar kontak Anda.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
+Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna ${app_name} yang terdapat di daftar kontak Anda.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
 
-Bolehkah Element mengakses daftar kontak Anda?</string>
+Bolehkah ${app_name} mengakses daftar kontak Anda?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">"Maaf.  Tidak dapat dilakukan karena belum menerima permisi"</string>
 
@@ -855,14 +855,14 @@ Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
     <string name="settings_deactivate_my_account">Deaktivasi akunku</string>
 
     <string name="startup_notification_privacy_title">Kerahasiaan Notifikasi</string>
-    <string name="startup_notification_privacy_message">Element dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
     <string name="startup_notification_privacy_button_grant">Kabulkan permisi</string>
     <string name="startup_notification_privacy_button_other">Pilih opsi lain</string>
 
     <string name="settings_analytics">Analitik</string>
     <string name="settings_opt_in_of_analytics">Kirim data analitik</string>
-    <string name="settings_opt_in_of_analytics_summary">Element mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Ya, saya ingin membantu!</string>
 
     <string name="settings_data_save_mode">Mode hemat data</string>
@@ -948,7 +948,7 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
 
     <string name="settings_call_category">Panggilan</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Gunakan nada dering semula Element untuk panggilan masuk</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Gunakan nada dering semula ${app_name} untuk panggilan masuk</string>
     <string name="settings_call_ringtone_title">Nada dering panggilan masuk</string>
     <string name="settings_call_ringtone_dialog_title">Pilih nada dering untuk panggilan:</string>
 
@@ -980,13 +980,13 @@ Mohon periksa pengaturan akun.</string>
 
     <string name="settings_troubleshoot_test_device_settings_title">Pengaturan Perangkat.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk perangkat ini.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Pemberitahuan tidak diperbolehkan untuk perangkat ini.
-Mohon periksa pengaturan Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Pemberitahuan tidak diperbolehkan untuk perangkat ini.
+Mohon periksa pengaturan ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Perbolehkan</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Pemeriksaan Layanan Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Layanan Google Play ditemukan dan telah diperbaharui.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Perbaiki Layanan Google Play</string>
 
@@ -1013,19 +1013,19 @@ Coba nyalakan kembali aplikasi.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Mulai ketika menyalakan perangkat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Layanan akan dimulai ketika perangkat dinyalakan kembali.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka Element.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka ${app_name}.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Perbolehkan memulai ketika perangkat dinyalakan</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Periksa halangan di balik layar</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk Element. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk ${app_name}. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk ${app_name}.
 Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik layar, dan ini dapat mempengaruhi pemberitahuan.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Matikan penghalang</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimisasi Baterai</string>
-    <string name="settings_troubleshoot_test_battery_success">Element tidak terpengaruh oleh Optimisasi Baterai.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} tidak terpengaruh oleh Optimisasi Baterai.</string>
     <string name="title_activity_keys_backup_setup">Cadangkan Kunci</string>
     <string name="title_activity_keys_backup_restore">Gunakan Cadangan Kunci</string>
 
@@ -1054,12 +1054,12 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Gagal memuat aturan, mohon coba lagi.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Periksa Aturan</string>
 
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nError ini di luar kendali Element dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nError ini di luar kendali Element, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nError ini di luar kendali Element. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nError ini di luar kendali ${app_name} dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nError ini di luar kendali ${app_name}, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nError ini di luar kendali ${app_name}. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Tambah Akun</string>
 
     <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode Doze. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index 91fdb38426..af8863355c 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -155,7 +155,7 @@
 
     <string name="later">Nanti</string>
     <string name="send_anyway">Kirim Saja</string>
-    <string name="no_contact_access_placeholder">Element belum diijinkan untuk mengakses kontak lokal</string>
+    <string name="template_no_contact_access_placeholder">${app_name} belum diijinkan untuk mengakses kontak lokal</string>
     <string name="send_bug_report_include_crash_logs">Kirim log gangguan</string>
     <string name="huge">Raksasa</string>
     <string name="small">Kecil</string>
@@ -250,18 +250,18 @@ Anda telah dikeluarkan dari semua perangkat dan tidak lagi menerima pemberitahua
     <string name="media_picker_both_capture_title">Ambil gambar atau video</string>
     <string name="media_picker_cannot_record_video">Tidak bisa merekam video</string>
 
-    <string name="permissions_rationale_msg_storage">Element membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
+    <string name="template_permissions_rationale_msg_storage">${app_name} membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
 
 Harap berikan akses pada halaman berikut agar berkas dapat dikirim dari ponsel Anda.</string>
-    <string name="permissions_rationale_msg_camera">Element membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="permissions_rationale_msg_record_audio">Element membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
 
 Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="light_theme">Tema Terang</string>
@@ -321,7 +321,7 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="e2e_re_request_encryption_key_sent">Permintaan kunci terkirim.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Permintaan terkirim</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Jalankan Element di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Jalankan ${app_name} di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
 
     <string name="groups_list">Daftar Grup</string>
 
@@ -330,12 +330,12 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     </plurals>
 
     <string name="call">Panggilan</string>
-    <string name="permissions_rationale_msg_contacts">Element memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
 
-Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna Element yang terdapat di daftar kontak Anda.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
+Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna ${app_name} yang terdapat di daftar kontak Anda.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
 
-Bolehkah Element mengakses daftar kontak Anda?</string>
+Bolehkah ${app_name} mengakses daftar kontak Anda?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">"Maaf.  Tidak dapat dilakukan karena belum menerima permisi"</string>
 
@@ -855,14 +855,14 @@ Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
     <string name="settings_deactivate_my_account">Deaktivasi akunku</string>
 
     <string name="startup_notification_privacy_title">Kerahasiaan Notifikasi</string>
-    <string name="startup_notification_privacy_message">Element dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
     <string name="startup_notification_privacy_button_grant">Kabulkan permisi</string>
     <string name="startup_notification_privacy_button_other">Pilih opsi lain</string>
 
     <string name="settings_analytics">Analitik</string>
     <string name="settings_opt_in_of_analytics">Kirim data analitik</string>
-    <string name="settings_opt_in_of_analytics_summary">Element mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Ya, saya ingin membantu!</string>
 
     <string name="settings_data_save_mode">Mode hemat data</string>
@@ -948,7 +948,7 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
 
     <string name="settings_call_category">Panggilan</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Gunakan nada dering semula Element untuk panggilan masuk</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Gunakan nada dering semula ${app_name} untuk panggilan masuk</string>
     <string name="settings_call_ringtone_title">Nada dering panggilan masuk</string>
     <string name="settings_call_ringtone_dialog_title">Pilih nada dering untuk panggilan:</string>
 
@@ -980,13 +980,13 @@ Mohon periksa pengaturan akun.</string>
 
     <string name="settings_troubleshoot_test_device_settings_title">Pengaturan Perangkat.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk perangkat ini.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Pemberitahuan tidak diperbolehkan untuk perangkat ini.
-Mohon periksa pengaturan Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Pemberitahuan tidak diperbolehkan untuk perangkat ini.
+Mohon periksa pengaturan ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Perbolehkan</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Pemeriksaan Layanan Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Layanan Google Play ditemukan dan telah diperbaharui.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Perbaiki Layanan Google Play</string>
 
@@ -1013,19 +1013,19 @@ Coba nyalakan kembali aplikasi.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Mulai ketika menyalakan perangkat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Layanan akan dimulai ketika perangkat dinyalakan kembali.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka Element.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka ${app_name}.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Perbolehkan memulai ketika perangkat dinyalakan</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Periksa halangan di balik layar</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk Element. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk ${app_name}. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk ${app_name}.
 Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik layar, dan ini dapat mempengaruhi pemberitahuan.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Matikan penghalang</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimisasi Baterai</string>
-    <string name="settings_troubleshoot_test_battery_success">Element tidak terpengaruh oleh Optimisasi Baterai.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} tidak terpengaruh oleh Optimisasi Baterai.</string>
     <string name="title_activity_keys_backup_setup">Cadangkan Kunci</string>
     <string name="title_activity_keys_backup_restore">Gunakan Cadangan Kunci</string>
 
@@ -1054,12 +1054,12 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Gagal memuat aturan, mohon coba lagi.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Periksa Aturan</string>
 
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nError ini di luar kendali Element dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nError ini di luar kendali Element, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nError ini di luar kendali Element. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nError ini di luar kendali ${app_name} dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nError ini di luar kendali ${app_name}, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nError ini di luar kendali ${app_name}. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Tambah Akun</string>
 
     <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode Doze. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index dd8cb20559..99c024c320 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -756,7 +756,7 @@ Til að halda áfram skaltu setja inn lykilorðið þitt.</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">Ógilt snið samnefnis</string>
     <string name="directory_server_fail_to_retrieve_server">Netþjónninn gæti verið undir miklu álagi eða ekki til taks</string>
     <string name="missing_permissions_warning">Þar sem ýmsar heimildir vantar, eru sumir eiginleikar ekki tiltækir…</string>
-    <string name="no_contact_access_placeholder">Þú heimilaðir Element ekki aðgang að tengiliðum á tækinu</string>
+    <string name="template_no_contact_access_placeholder">Þú heimilaðir ${app_name} ekki aðgang að tengiliðum á tækinu</string>
     <string name="send_bug_report_rage_shake">Hristu ákveðið til að senda villutilkynningu</string>
 
     <string name="send_bug_report_sent">Það tókst að senda villuskýrsluna</string>
@@ -778,7 +778,7 @@ Ertu alveg viss?</string>
     <string name="settings_set_sync_delay">Hlé milli tveggja samstillingarbeiðna</string>
     <string name="settings_keep_media">Halda gögnum</string>
 
-    <string name="startup_notification_privacy_message">Element getur keyrt í bakgrunni og stýrt tilkynningum á öruggan hátt (getur haft áhrif á rafhlöðunotkun).</string>
+    <string name="template_startup_notification_privacy_message">${app_name} getur keyrt í bakgrunni og stýrt tilkynningum á öruggan hátt (getur haft áhrif á rafhlöðunotkun).</string>
 
     <string name="account_email_validation_message">Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram.</string>
     <string name="account_email_validation_error">Tókst ekki að sannreyna tölvupóstfang. Skoðaðu tölvupóstinn þinn og smelltu á tengilinn sem hann inniheldur. Þegar því er lokið skaltu smella á að halda áfram</string>
@@ -810,26 +810,26 @@ Ertu alveg viss?</string>
 
     <string name="login_error_unknown_token">Tiltekið aðgangsteikn þekktist ekki</string>
     <string name="call_error_user_not_responding">Ekki var svarað á fjartengda endanum.</string>
-    <string name="permissions_rationale_msg_storage">Element þarf heimild til að nota mynda- og myndskeiðasafn svo hægt sé að senda og vista viðhengi.
+    <string name="template_permissions_rationale_msg_storage">${app_name} þarf heimild til að nota mynda- og myndskeiðasafn svo hægt sé að senda og vista viðhengi.
 
 Leyfðu aðgang í næsta sprettglugga til þess að geta sent skrár úr símanum.</string>
-    <string name="permissions_rationale_msg_camera">Element þarf heimild til að nota myndavélina svo hægt sé að taka myndir og hringja myndsímtöl.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} þarf heimild til að nota myndavélina svo hægt sé að taka myndir og hringja myndsímtöl.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Leyfðu aðgang í næsta sprettglugga til þess að geta hringt.</string>
-    <string name="permissions_rationale_msg_record_audio">Element þarf heimild til að nota hljóðnemann svo hægt sé að hringja hljóðsímtöl.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} þarf heimild til að nota hljóðnemann svo hægt sé að hringja hljóðsímtöl.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Leyfðu aðgang í næsta sprettglugga til þess að geta hringt.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element þarf heimild til að nota myndavélina og hljóðnemann svo hægt sé að hringja myndsímtöl.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} þarf heimild til að nota myndavélina og hljóðnemann svo hægt sé að hringja myndsímtöl.
 
 Leyfðu aðgang í næstu sprettgluggum til þess að geta hringt.</string>
-    <string name="permissions_rationale_msg_contacts">Element þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
 
-Leyfðu aðgang í næsta sprettglugga til þess að finna þá notendur í nafnaskránni sem hægt er að hafa samband við úr Element.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
+Leyfðu aðgang í næsta sprettglugga til þess að finna þá notendur í nafnaskránni sem hægt er að hafa samband við úr ${app_name}.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} þarf heimild til að nota tengiliði í nafnaskránni svo hægt sé að finna aðra Matrix-notendur eftir tölvupóstföngum og símanúmerum þeirra.
 
-Leyfa Element nota tengiliðina ?</string>
+Leyfa ${app_name} nota tengiliðina ?</string>
 
     <string name="settings_deactivate_account_section">Gera notandaaðgang óvirkann</string>
     <string name="settings_deactivate_my_account">Gera notandaaðganginn minn óvirkann</string>
@@ -856,8 +856,8 @@ Leyfa Element nota tengiliðina ?</string>
     <string name="login_error_login_email_not_yet">Tölvupósttengill sem ekki er enn búið að smella á</string>
 
     <string name="malformed_id">Rangt formað auðkenni. Ætti að vera tölvupóstfang eða Matrix-auðkenni á borð við\'@sérheiti:lén\'</string>
-    <string name="settings_opt_in_of_analytics_summary">Element safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Endilega virkjaðu greiningargögn til að hjálpa okkur að bæta Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} safnar nafnlausum greiningargögnum til að gera okkur kleift að bæta forritið.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Endilega virkjaðu greiningargögn til að hjálpa okkur að bæta ${app_name}.</string>
     <string name="room_settings_room_access_warning">Til að tengja við spjallrás verður hún að vera með vistfang.</string>
     <string name="room_preview_try_join_an_unknown_room">Þú ert að reyna að tengjast %s. Myndirðu vilja gerast meðlimur til að geta tekið þátt í samræðunni?</string>
     <string name="room_preview_room_interactions_disabled">Þetta er forskoðun á spjallrásinni. Samskipti spjallrásarinnar hafa verið gerð óvirk.</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 25617abb6b..2a13148bcd 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -336,7 +336,7 @@
     <string name="user_directory_header">Elenco utenti</string>
     <string name="matrix_only_filter">Mostra solo i contatti Matrix</string>
     <string name="no_conversation_placeholder">Nessuna conversazione</string>
-    <string name="no_contact_access_placeholder">Element non ha avuto l\'autorizzazione ad accedere alla tua Rubrica locale</string>
+    <string name="template_no_contact_access_placeholder">${app_name} non ha avuto l\'autorizzazione ad accedere alla tua Rubrica locale</string>
     <string name="no_result_placeholder">Nessun risultato</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Stanze</string>
@@ -353,7 +353,7 @@
     <string name="send_bug_report">Segnala errore</string>
     <string name="send_bug_report_description">Per favore descrivi l\'errore. Cosa stavi facendo\? Cosa ti aspettavi dovesse accadere\? Cosa è effettivamente successo\?</string>
     <string name="send_bug_report_placeholder">Descrivi qui il problema</string>
-    <string name="send_bug_report_logs_description">Per permettere una diagnosi del problema, oltre alla segnalazione errore verranno inviati anche i registri di Element. Rapporto, registri e schermata non saranno resi pubblici. Tuttavia, se preferisci inviare solamente la segnalazione, deseleziona:</string>
+    <string name="send_bug_report_logs_description">Per permettere una diagnosi del problema, oltre alla segnalazione errore verranno inviati anche i registri di ${app_name}. Rapporto, registri e schermata non saranno resi pubblici. Tuttavia, se preferisci inviare solamente la segnalazione, deseleziona:</string>
     <string name="send_bug_report_alert_message">Sembra tu stia scuotendo il dispositivo con rabbia. Vuoi segnalare un errore\?</string>
     <string name="send_bug_report_app_crashed">L\'ultima volta l\'applicazione è andata in crash. Vuoi inviare una segnalazione\?</string>
     <string name="send_bug_report_sent">La segnalazione errore è stata spedita</string>
@@ -479,22 +479,22 @@
     <string name="media_picker_cannot_record_video">Impossibile registrare video</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informazione</string>
-    <string name="permissions_rationale_msg_storage">Element deve essere autorizzato ad accedere alla tua Galleria di foto e video per poter inviare e salvare allegati.
+    <string name="template_permissions_rationale_msg_storage">${app_name} deve essere autorizzato ad accedere alla tua Galleria di foto e video per poter inviare e salvare allegati.
 \n
 \nNel prossimo pop-up concedi l\'autorizzazione per poteri inviare file dal tuo dispositivo.</string>
-    <string name="permissions_rationale_msg_camera">Element deve essere autorizzato ad accedere alla tua fotocamera per poter fare foto e video.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} deve essere autorizzato ad accedere alla tua fotocamera per poter fare foto e video.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nNel prossimo pop-up concedi l\'autorizzazione per poter fare la chiamata."</string>
-    <string name="permissions_rationale_msg_record_audio">Element deve essere autorizzato ad accedere al microfono e poter così fare chiamate audio.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} deve essere autorizzato ad accedere al microfono e poter così fare chiamate audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nNel prossimo pop-up concedi l\'autorizzazione per poter fare la chiamata."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element deve essere autorizzato ad accedere a fotocamera e microfono per poter fare chiamate video.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} deve essere autorizzato ad accedere a fotocamera e microfono per poter fare chiamate video.
 \n
 \nNel prossimo pop-up concedi le autorizzazioni per poter fare la chiamata.</string>
-    <string name="permissions_rationale_msg_contacts">Element può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono. Se ti sta bene comunicare i dati di tutti i tuoi contatti all\'Identity Server, puoi concedere l\'autorizzazione nel prossimo pop-up.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono. Se ti sta bene comunicare i dati di tutti i tuoi contatti all\'Identity Server, puoi concedere l\'autorizzazione nel prossimo pop-up.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono.
 \n
 \nTi sta bene comunicare i dati di tutti i tuoi contatti per questo scopo\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Purtroppo l\'azione non è stata eseguita poiché mancano i permessi</string>
@@ -1017,7 +1017,7 @@
     <string name="settings_notification_privacy_nosecure_message_content">• Le notifiche contengono <b>metadati e contenuto del messaggio</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Le notifiche <b>non mostreranno il contenuto del messaggio</b></string>
     <string name="startup_notification_privacy_title">Privacy delle notifiche</string>
-    <string name="startup_notification_privacy_message">Element può esser sempre attivo in background in modo da gestire le tue notifiche in modo costante e sicuro. Ciò può influire sulla durata della batteria.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} può esser sempre attivo in background in modo da gestire le tue notifiche in modo costante e sicuro. Ciò può influire sulla durata della batteria.</string>
     <string name="startup_notification_privacy_button_grant">Concedi l\'autorizzazione</string>
     <string name="startup_notification_privacy_button_other">Scegli un\'altra opzione</string>
     <string name="title_activity_choose_sticker">Invia uno sticker</string>
@@ -1028,8 +1028,8 @@
     <string name="settings_deactivate_account_section">Disattiva l\'account</string>
     <string name="settings_deactivate_my_account">Disattiva il mio account</string>
     <string name="settings_opt_in_of_analytics">Invia le statistiche di utilizzo</string>
-    <string name="settings_opt_in_of_analytics_summary">Element raccoglie statistiche anonime per permettere il miglioramento dell\'applicazione.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Attiva le statistiche per aiutare a migliorare Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} raccoglie statistiche anonime per permettere il miglioramento dell\'applicazione.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Attiva le statistiche per aiutare a migliorare ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Sì, voglio aiutare!</string>
     <string name="widget_integration_missing_parameter">Manca un parametro indispensabile.</string>
     <string name="widget_integration_invalid_parameter">Uno dei parametri non è valido.</string>
@@ -1051,7 +1051,7 @@
     <string name="e2e_re_request_encryption_key">Richiedi di nuovo le chiavi di crittografia dalle tue altre sessioni.</string>
     <string name="e2e_re_request_encryption_key_sent">La richiesta della chiave è stata inviata.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Richiesta inviata</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Avvia Element su un altro dispositivo che possa decifrare il messaggio, in modo che possa inviare le chiavi a questa sessione.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Avvia ${app_name} su un altro dispositivo che possa decifrare il messaggio, in modo che possa inviare le chiavi a questa sessione.</string>
     <string name="lock_screen_hint">Digita qui…</string>
     <string name="option_send_voice">Invia messaggio vocale</string>
     <string name="go_on_with">prosegui con…</string>
@@ -1166,7 +1166,7 @@
     <string name="markdown_has_been_enabled">Markdown è stato abilitato.</string>
     <string name="markdown_has_been_disabled">Markdown è stato disabilitato.</string>
     <string name="settings_call_category">Chiamate</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Usa la suoneria predefinita di Element per le chiamate in arrivo</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Usa la suoneria predefinita di ${app_name} per le chiamate in arrivo</string>
     <string name="settings_call_ringtone_title">Suoneria delle chiamate in arrivo</string>
     <string name="settings_call_ringtone_dialog_title">Scegli la suoneria per le chiamate:</string>
     <string name="accept">Accetta</string>
@@ -1190,12 +1190,12 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Abilita</string>
     <string name="settings_troubleshoot_test_device_settings_title">Impostazioni sessione.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Le notifiche sono attive per questa sessione.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Le notifiche non sono attive per questa sessione. 
-\nControlla le impostazioni di Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Le notifiche non sono attive per questa sessione.
+\nControlla le impostazioni di ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Abilita</string>
     <string name="settings_troubleshoot_test_play_services_title">Esegui un controllo dei servizi</string>
     <string name="settings_troubleshoot_test_play_services_success">L\'APK Google Play Services è disponibile e aggiornato.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element usa Google Play Services per consegnare i messaggi a comparsa, ma sembra non sia stato configurato correttamente:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} usa Google Play Services per consegnare i messaggi a comparsa, ma sembra non sia stato configurato correttamente:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Correggi i Play Services</string>
     <string name="settings_troubleshoot_test_fcm_title">Token di Firebase</string>
@@ -1217,22 +1217,22 @@
     <string name="settings_troubleshoot_test_service_restart_failed">L\'avvio del servizio è fallito</string>
     <string name="settings_troubleshoot_test_service_boot_title">Esegui all\'avvio</string>
     <string name="settings_troubleshoot_test_service_boot_success">Il servizio inizierà quando il dispositivo sarà riavviato.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Il servizio non partirà al riavvio del dispositivo. Non riceverai notifiche finché Element non verrà aperto almeno una volta.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Il servizio non partirà al riavvio del dispositivo. Non riceverai notifiche finché ${app_name} non verrà aperto almeno una volta.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Abilita l\'esecuzione all\'avvio</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Verifica se Element sia stato configurato per funzionare in modo limitato quando lavora in background</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Element non funziona senza alcuna restrizione anche quando è eseguito in background. Questo test andrebbe eseguito usando dati mobili (non WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">${app_name} non funziona senza alcuna restrizione anche quando è eseguito in background. Questo test andrebbe eseguito usando dati mobili (non WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Element è stato configurato per funzionare in modo limitato quando è eseguito in background.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">${app_name} è stato configurato per funzionare in modo limitato quando è eseguito in background.
 \nIl funzionamento dell\'App, quando è eseguita in background, è stato fortemente limitato e ciò potrebbe influenzare la ricezione delle notifiche.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Non limitare</string>
     <string name="settings_troubleshoot_test_battery_title">Ottimizzazione della batteria</string>
-    <string name="settings_troubleshoot_test_battery_success">Element non è influenzato dall\'ottimizzazione della batteria.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} non è influenzato dall\'ottimizzazione della batteria.</string>
     <string name="settings_troubleshoot_test_battery_failed">Se si lascia un dispositivo scollegato, fermo e con lo schermo spento, dopo un certo tempo questo entra in modalità Doze. Ciò impedisce alle App di accedere alla rete e ritarda le attività, le sincronizzazioni e la ricezione dei normali allarmi.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignora l\'ottimizzazione</string>
     <string name="startup_notification_fdroid_battery_optim_title">Connessione in background</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Per poter ricevere le notifiche in tempo reale, Element deve potersi sempre connettere. Anche quando funziona in background.
-\nNella schermata successiva ti verrà chiesto di consentire a Element di funzionare anche quando è in background, accetta per favore.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">Per poter ricevere le notifiche in tempo reale, ${app_name} deve potersi sempre connettere. Anche quando funziona in background.
+\nNella schermata successiva ti verrà chiesto di consentire a ${app_name} di funzionare anche quando è in background, accetta per favore.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Concedi il permesso</string>
     <string name="account_email_error">Si è verificato un errore durante la verifica dell\'indirizzo email.</string>
     <string name="account_phone_number_error">Si è verificato un errore durante la verifica del numero di telefono.</string>
@@ -1267,12 +1267,12 @@
     <string name="settings_troubleshoot_test_bing_settings_failed">Alcune notifiche sono disattivate nelle tue impostazioni personalizzate.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Il caricamento delle regole personalizzate è fallito, riprova.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Controlla le Impostazioni</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] 
-\nQuesto errore non dipende da Element. Secondo Google dipende dal fatto che questo dispositivo ha troppe App registrate con FCM. L\'errore si verifica solo in casi in cui ci sia un numero estremo di app, quindi non dovrebbe affliggere l\'utente medio.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s] 
-\nQuesto errore non dipende da Element e può avere diverse cause. Potresti riprovare più tardi o controllare che Google Play Service non abbia configurato nelle Impostazioni di sistema dei limiti di utilizzo di dati. Anche un orologio di sistema regolato male potrebbe esserne la causa. Oppure può verificarsi se hai una ROM customizzata.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
-\nQuesto errore non dipende da Element. Non c\'è alcun account Google nel telefono. Apri il gestore di account ed aggiungi un account Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nQuesto errore non dipende da ${app_name}. Secondo Google dipende dal fatto che questo dispositivo ha troppe App registrate con FCM. L\'errore si verifica solo in casi in cui ci sia un numero estremo di app, quindi non dovrebbe affliggere l\'utente medio.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nQuesto errore non dipende da ${app_name} e può avere diverse cause. Potresti riprovare più tardi o controllare che Google Play Service non abbia configurato nelle Impostazioni di sistema dei limiti di utilizzo di dati. Anche un orologio di sistema regolato male potrebbe esserne la causa. Oppure può verificarsi se hai una ROM customizzata.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nQuesto errore non dipende da ${app_name}. Non c\'è alcun account Google nel telefono. Apri il gestore di account ed aggiungi un account Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Aggiungi account</string>
     <string name="settings_noisy_notifications_preferences">Configura le notifiche rumorose</string>
     <string name="settings_call_notifications_preferences">Configura le notifiche di chiamata</string>
@@ -1291,7 +1291,7 @@
     <string name="error_empty_field_enter_user_name">Inserisci un nome utente.</string>
     <string name="passphrase_empty_error_message">Inserisci una password</string>
     <string name="passphrase_passphrase_too_weak">La password è troppo debole</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Cancella la password se vuoi che Element generi un codice di recupero.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Cancella la password se vuoi che ${app_name} generi un codice di recupero.</string>
     <string name="keys_backup_no_session_error">Non c\'è alcuna sessione Matrix disponibile</string>
     <string name="keys_backup_setup_step1_title">Non perdere mai i messaggi cifrati</string>
     <string name="keys_backup_setup_step1_description">I messaggi nelle stanze cifrate sono protetti con crittografia E2E. Solo tu e il/i destinatario/i avete le chiavi crittografiche per leggere questi messaggi. 
@@ -1397,7 +1397,7 @@
     <string name="keys_backup_info_title_signature">Firma</string>
     <string name="autodiscover_invalid_response">Risposta Home Server non valida</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Opzioni autocompletamento server</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element ha rilevato una configurazione server personalizzata per il tuo dominio userId \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} ha rilevato una configurazione server personalizzata per il tuo dominio userId \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Usa configurazione</string>
     <string name="notification_sync_init">Inizializzazione del servizio</string>
@@ -1511,7 +1511,7 @@
     <string name="please_wait">Attendere prego…</string>
     <string name="group_all_communities">Tutte le comunità</string>
     <string name="room_preview_no_preview">Anteprima non disponibile per questa stanza</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">L\'anteprima di stanze leggibili da tutti non è ancora supportata in Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">L\'anteprima di stanze leggibili da tutti non è ancora supportata in ${app_name}</string>
     <string name="fab_menu_create_room">Stanze</string>
     <string name="fab_menu_create_chat">Messaggi diretti</string>
     <string name="create_room_title">Nuova stanza</string>
@@ -1607,11 +1607,11 @@
     <string name="invite_no_identity_server_error">Per poterlo fare, aggiungi un Identity Server nelle Impostazioni.</string>
     <string name="settings_background_fdroid_sync_mode">Modalità sync in background</string>
     <string name="settings_background_fdroid_sync_mode_battery">Ottimizzato per la batteria</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element si sincronizzerà in background in modo da non consumare la poca batteria disponibile.
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} si sincronizzerà in background in modo da non consumare la poca batteria disponibile.
 \nA seconda del livello della batteria, il sistema operativo potrebbe ritardare la sincronizzazione.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Ottimizzato per la performance</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element si sincronizzerà in background ad intervalli regolari (configurabili).
-\nCiò avrà un certo impatto sulla quantità di dati e batteria utilizzati. Una notifica sempre accesa comunicherà che Element è attivo.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} si sincronizzerà in background ad intervalli regolari (configurabili).
+\nCiò avrà un certo impatto sulla quantità di dati e batteria utilizzati. Una notifica sempre accesa comunicherà che ${app_name} è attivo.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Nessuna sincronizzazione in background</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Quando l\'App è in background non ti verranno notificati i messaggi in arrivo.</string>
     <string name="settings_background_sync_update_error">L\'aggiornamento delle impostazioni è fallito.</string>
@@ -1695,12 +1695,12 @@
     <string name="content_reported_as_inappropriate_content">Questo contenuto è stato segnalato come inappropriato. 
 \n 
 \nSe non vuoi più vedere contenuti da questo utente, puoi ignorarlo per nascondere i suoi messaggi.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element richiede l\'autorizzazione per salvare le tue chiavi crittografiche sul disco.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} richiede l\'autorizzazione per salvare le tue chiavi crittografiche sul disco.
 \n 
 \nPermetti l\'accesso nel prossimo pop-up per poter esportare le chiavi manualmente.</string>
     <string name="no_network_indicator">In questo momento non c\'è nessuna connessione di rete</string>
     <string name="settings_add_3pid_confirm_password_title">Conferma la tua password</string>
-    <string name="settings_add_3pid_flow_not_supported">Non puoi farlo da Element mobile</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Non puoi farlo da ${app_name} mobile</string>
     <string name="settings_add_3pid_authentication_needed">E\'necessaria l\'autenticazione</string>
     <string name="settings_integrations">Integrazioni</string>
     <string name="settings_integrations_summary">Usa un Integration Manager per gestire bot, bridge, widget e pacchetti di sticker.
@@ -1868,7 +1868,7 @@
 \nRiaccedi per avere accesso ai dati dell\'account e ai messaggi.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Perderai l\'accesso ai messaggi sicuri a meno che non accedi per recuperare le tue chiavi di cifratura.</string>
     <string name="soft_logout_clear_data_dialog_submit">Elimina i dati</string>
-    <string name="soft_logout_sso_not_same_user_error">La sessione attuale è per l\'utente %1$s e hai fornito le credenziali per l\'utente %2$s. Ciò non è supportato da Element.
+    <string name="template_soft_logout_sso_not_same_user_error">La sessione attuale è per l\'utente %1$s e hai fornito le credenziali per l\'utente %2$s. Ciò non è supportato da ${app_name}.
 \nPrima elimina i dati, poi accedi di nuovo con un altro account.</string>
     <string name="permalink_malformed">Il tuo collegamento matrix.to non è corretto</string>
     <string name="bug_report_error_too_short">La descrizione è troppo breve</string>
@@ -1886,7 +1886,7 @@
     <string name="devices_other_devices">Altre sessioni</string>
     <string name="autocomplete_limited_results">Mostrati solo i primi risultati, digita più lettere…</string>
     <string name="settings_developer_mode_fail_fast_title">Crash facile</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element potrebbe crashare più spesso quando si verifica un errore imprevisto</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} potrebbe crashare più spesso quando si verifica un errore imprevisto</string>
     <string name="command_description_shrug">Antepone ¯\\_(ツ)_/¯ ad un messaggio testuale</string>
     <string name="create_room_encryption_title">Attiva la cifratura</string>
     <string name="create_room_encryption_description">Una volta attivata, la cifratura non può essere disattivata.</string>
@@ -1957,9 +1957,9 @@
     <string name="room_member_power_level_moderator_in">Moderatore in %1$s</string>
     <string name="room_member_power_level_custom_in">Personalizzato (%1$d) in %2$s</string>
     <string name="room_member_jump_to_read_receipt">Vai alla ricevuta di lettura</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element non gestisce eventi del tipo \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element non gestisce messaggi del tipo \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element ha riscontrato un errore con il rendering del contenuto dell\'evento con id \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} non gestisce eventi del tipo \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} non gestisce messaggi del tipo \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} ha riscontrato un errore con il rendering del contenuto dell\'evento con id \'%1$s\'</string>
     <string name="unignore">Non ignorare</string>
     <string name="verify_cannot_cross_sign">Questa sessione non riesce a condividere questa verifica con le tue altre sessioni.
 \nLa verifica sarà salvata in locale e condivisa in una versione futura dell\'app.</string>
@@ -2054,7 +2054,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Evento eliminato da un utente, motivo: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Evento moderato da un admin della stanza, motivo: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Le chiavi sono già aggiornate!</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Richieste di chiavi</string>
     <string name="e2e_use_keybackup">Sblocca la cronologia dei messaggi cifrati</string>
     <string name="refresh">Ricarica</string>
@@ -2155,13 +2155,13 @@
     <string name="media_file_added_to_gallery">File multimediale aggiunto alla galleria</string>
     <string name="error_adding_media_file_to_gallery">Impossibile aggiungere il file multimediale alla galleria</string>
     <string name="change_password_summary">Imposta una nuova password dell\'account…</string>
-    <string name="use_other_session_content_description">Usa l\'ultima versione di Element sui tuoi altri dispositivi, Element Web, Element Desktop, Element iOS, Element per Android o un altro client Matrix che supporti la firma incrociata</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">Usa l\'ultima versione di ${app_name} sui tuoi altri dispositivi, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} per Android o un altro client Matrix che supporti la firma incrociata</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">o un altro client Matrix che supporti la firma incrociata</string>
-    <string name="use_latest_app">Usa l\'ultimo Element sui tuoi altri dispositivi:</string>
+    <string name="template_use_latest_app">Usa l\'ultimo ${app_name} sui tuoi altri dispositivi:</string>
     <string name="command_description_discard_session">Forza l\'attuale sessione di gruppo in uscita in una stanza cifrata ad essere scartata</string>
     <string name="command_description_discard_session_not_handled">Supportato solo nelle stanze cifrate</string>
     <string name="enter_secret_storage_passphrase_or_key">Usa la tua %1$s o la %2$s per continuare.</string>
@@ -2222,11 +2222,11 @@
     <string name="choose_locale_loading_locales">Caricamento lingue disponibili…</string>
     <string name="open_terms_of">Apri condizioni di %s</string>
     <string name="disconnect_identity_server_dialog_content">Disconnettere dal server di identitià %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Questo server di identità è obsoleto. Element supporta solo API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Questo server di identità è obsoleto. ${app_name} supporta solo API V2.</string>
     <string name="identity_server_error_outdated_home_server">Questa operazione non è possibile. L\'homeserver è obsoleto.</string>
     <string name="identity_server_error_no_identity_server_configured">Prima configura un server di identità.</string>
     <string name="identity_server_error_terms_not_signed">Prima accetta le condizioni del server di identità nelle impostazioni.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Per la tua privacy, Element supporta solo l\'invio di email utente e numeri di telefono in formato hash.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Per la tua privacy, ${app_name} supporta solo l\'invio di email utente e numeri di telefono in formato hash.</string>
     <string name="identity_server_error_binding_error">L\'associamento è fallito.</string>
     <string name="identity_server_error_no_current_binding_error">Non c\'è alcun associamento attuale con questo identificativo.</string>
     <string name="identity_server_set_default_notice">Il tuo homeserver (%1$s) propone di usare %2$s come tuo server di identità</string>
@@ -2240,7 +2240,7 @@
     <string name="action_copy">Copia</string>
     <string name="dialog_title_success">Completato</string>
     <string name="bottom_action_notification">Notifiche</string>
-    <string name="call_failed_no_connection">Telefonata di Element fallita</string>
+    <string name="template_call_failed_no_connection">Telefonata di ${app_name} fallita</string>
     <string name="call_failed_no_connection_description">Connessione in tempo reale fallita.
 \nChiedi all\'amministratore del tuo homeserver di configurare un server TURN per fare funzionare le chiamate.</string>
     <string name="call_select_sound_device">Seleziona dispositivo audio</string>
@@ -2445,7 +2445,7 @@
     <string name="settings_security_pin_code_notifications_summary_off">Mostra solo il numero di messaggi non letti in una semplice notifica.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Mostra dettagli come il nome delle stanze e il contenuto dei messaggi.</string>
     <string name="settings_security_pin_code_notifications_title">Mostra il contenuto nelle notifiche</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">Il codice PIN è l\'unico modo per sbloccare Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">Il codice PIN è l\'unico modo per sbloccare ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Attiva la biometria specifica del dispositivo, come impronte e riconoscimento facciale.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Attiva la biometria</string>
     <string name="settings_security_application_protection_screen_title">Configura protezione</string>
@@ -2490,8 +2490,8 @@
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Non hai il permesso di avviare una chiamata</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Non hai il permesso di avviare una chiamata di gruppo</string>
     <string name="reset">Reimposta</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Il codice PIN è richiesto ogni volta che apri Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">È necessario il codice PIN dopo 2 minuti di inattività con Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Il codice PIN è richiesto ogni volta che apri ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">È necessario il codice PIN dopo 2 minuti di inattività con ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Richiedi il PIN dopo 2 minuti</string>
     <string name="direct_room_created_summary_item">%s è entrato.</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">L\'applicazione è in attesa del PUSH</string>
@@ -2523,8 +2523,8 @@
     <string name="user_code_share">Condividi il mio codice</string>
     <string name="user_code_scan">Scansiona un codice QR</string>
     <string name="not_a_valid_qr_code">Non è un codice QR Matrix valido</string>
-    <string name="invite_friends_rich_title">🔐️ Unisciti a me su Element</string>
-    <string name="invite_friends_text">Ehy, parliamo su Element: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Unisciti a me su ${app_name}</string>
+    <string name="template_invite_friends_text">Ehy, parliamo su ${app_name}: %s</string>
     <string name="invite_friends">Invita amici</string>
     <string name="add_people">Aggiungi persone</string>
     <string name="topic_prefix">"Argomento: "</string>
@@ -2638,7 +2638,7 @@
     <string name="room_participants_leave_private_warning">Questa stanza non è pubblica. Non potrai rientrare senza un invito.</string>
     <string name="system_theme">Predefinito di sistema</string>
     <string name="authentication_error">Autenticazione fallita</string>
-    <string name="re_authentication_default_confirm_text">Element richiede di reinserire le credenziali per eseguire questa azione.</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} richiede di reinserire le credenziali per eseguire questa azione.</string>
     <string name="re_authentication_activity_title">Necessario riautenticarsi</string>
     <string name="call_transfer_users_tab_title">Utenti</string>
     <string name="call_transfer_failure">Si è verificato un errore trasferendo la chiamata</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index a8b9588f96..abeed9287d 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -151,7 +151,7 @@
     <string name="people_no_identity_server">לא הוגדר שרת זהות.</string>
     <string name="no_more_results">אין תוצאות נוספות</string>
     <string name="no_result_placeholder">אין תוצאות</string>
-    <string name="no_contact_access_placeholder">לא אפשרת לאלמנט לגשת לאנשי הקשר המקומיים שלך</string>
+    <string name="template_no_contact_access_placeholder">לא אפשרת לאלמנט לגשת לאנשי הקשר המקומיים שלך</string>
     <string name="start_new_chat_prompt_msg">האם אתה בטוח שברצונך להתחיל צ\'אט חדש עם %s\?</string>
     <string name="option_send_voice">שלח קול</string>
     <string name="start_video_call">התחל שיחת וידאו</string>
@@ -279,7 +279,7 @@
     <string name="call_select_sound_device">בחר מכשיר סאונד</string>
     <string name="call_failed_no_connection_description">נכשל החיבור בזמן אמת.
 \nאנא בקש ממנהל שרת הבית שלך להגדיר שרת TURN על מנת שהשיחות יעבדו בצורה אמינה.</string>
-    <string name="call_failed_no_connection">שיחת האלמנט נכשלה</string>
+    <string name="template_call_failed_no_connection">שיחת האלמנט נכשלה</string>
     <string name="call_failed_dont_ask_again">אל תשאל אותי שוב</string>
     <string name="call_failed_no_ice_use_alt">נסה להשתמש ב-%s</string>
     <string name="call_failed_no_ice_title">השיחה נכשלה עקב שרת שהוגדר כהלכה</string>
@@ -309,22 +309,22 @@
     <string name="permissions_denied_add_contact">אפשר הרשאה לגשת לאנשי הקשר שלך.</string>
     <string name="permissions_denied_qr_code">כדי לסרוק קוד QR, עליך לאפשר גישה למצלמה.</string>
     <string name="permissions_action_not_performed_missing_permissions">מצטער. הפעולה לא בוצעה בגלל הרשאות חסרות</string>
-    <string name="permissions_msg_contacts_warning_other_androids">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם.
+    <string name="template_permissions_msg_contacts_warning_other_androids">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם.
 \n
 \nהאם אתה מסכים לשתף את פנקס הכתובות שלך למטרה זו\?</string>
-    <string name="permissions_rationale_msg_contacts">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם. אם אתה מסכים לשתף את פנקס הכתובות שלך למטרה זו, אנא הגש גישה בחלון הקופץ הבא.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">אלמנט זקוק להרשאה כדי לגשת למצלמה ולמיקרופון שלך כדי לבצע שיחות וידאו.
+    <string name="template_permissions_rationale_msg_contacts">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם. אם אתה מסכים לשתף את פנקס הכתובות שלך למטרה זו, אנא הגש גישה בחלון הקופץ הבא.</string>
+    <string name="template_permissions_rationale_msg_camera_and_audio">אלמנט זקוק להרשאה כדי לגשת למצלמה ולמיקרופון שלך כדי לבצע שיחות וידאו.
 \n
 \nאנא אפשר גישה בחלונות הקופצים הבאים כדי להיות מסוגל לבצע את השיחה.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לבצע את השיחה."</string>
-    <string name="permissions_rationale_msg_record_audio">אלמנט זקוק להרשאה כדי לגשת למיקרופון שלך כדי לבצע שיחות שמע.</string>
+    <string name="template_permissions_rationale_msg_record_audio">אלמנט זקוק להרשאה כדי לגשת למיקרופון שלך כדי לבצע שיחות שמע.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לבצע את השיחה."</string>
-    <string name="permissions_rationale_msg_camera">אלמנט זקוק להרשאה כדי לגשת למצלמה שלך כדי לצלם תמונות ושיחות וידאו.</string>
-    <string name="permissions_rationale_msg_storage">אלמנט זקוק להרשאה כדי לגשת לספריית התמונות והווידיאו שלך כדי לשלוח ולשמור קבצים מצורפים.
+    <string name="template_permissions_rationale_msg_camera">אלמנט זקוק להרשאה כדי לגשת למצלמה שלך כדי לצלם תמונות ושיחות וידאו.</string>
+    <string name="template_permissions_rationale_msg_storage">אלמנט זקוק להרשאה כדי לגשת לספריית התמונות והווידיאו שלך כדי לשלוח ולשמור קבצים מצורפים.
 \n
 \nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לשלוח קבצים מהטלפון שלך.</string>
     <string name="permissions_rationale_popup_title">מידע</string>
@@ -350,7 +350,7 @@
     <string name="settings_call_ringtone_title">רינגטון שיחה נכנסת</string>
     <string name="settings_call_ringtone_use_default_stun_sum">ישתמש ב-%s כסיוע כאשר השרת הביתי שלך אינו מציע כזה (כתובת ה- IP שלך תשותף במהלך שיחה)</string>
     <string name="settings_call_ringtone_use_default_stun">אפשר שרת עזרה לשיחות</string>
-    <string name="settings_call_ringtone_use_app_ringtone">השתמש ברינגטון ברירת המחדל של אלמנט לשיחות נכנסות</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">השתמש ברינגטון ברירת המחדל של אלמנט לשיחות נכנסות</string>
     <string name="settings_call_show_confirmation_dialog_summary">בקש אישור לפני שמתחילים בשיחה</string>
     <string name="settings_call_show_confirmation_dialog_title">מנע שיחה מקרית</string>
     <string name="settings_call_category">שיחות</string>
@@ -375,7 +375,7 @@
     </plurals>
     <string name="groups_list">רשימת קבוצות</string>
     <string name="read_receipts_list">קרא את רשימת הקבלות</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">הפעל את Element במכשיר אחר שיכול לפענח את ההודעה כדי שיוכל לשלוח את המפתחות להפעלה זו.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">הפעל את Element במכשיר אחר שיכול לפענח את ההודעה כדי שיוכל לשלוח את המפתחות להפעלה זו.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">הבקשה נשלחה</string>
     <string name="e2e_re_request_encryption_key_sent">בקשת המפתח נשלחה.</string>
     <string name="e2e_re_request_encryption_key">בקש מחדש מפתחות הצפנה מהפעלות האחרות שלך.</string>
@@ -421,10 +421,10 @@
     <string name="settings_background_sync_update_error">עדכון ההגדרות נכשל.</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">לא תקבל הודעה על הודעות נכנסות כאשר האפליקציה ברקע.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">אין סנכרון רקע</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">אלמנט יסונכרן ברקע מעת לעת בזמן מדויק (ניתן להגדרה).
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">אלמנט יסונכרן ברקע מעת לעת בזמן מדויק (ניתן להגדרה).
 \nזה ישפיע על השימוש ברדיו ובסוללה, תוצג הודעה קבועה לפיה אלמנט מאזין לאירועים.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">מותאם לזמן אמת</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">אלמנט יסונכרן ברקע באופן שישמור על המשאבים המוגבלים של המכשיר (סוללה).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">אלמנט יסונכרן ברקע באופן שישמור על המשאבים המוגבלים של המכשיר (סוללה).
 \nבהתאם למצב משאבי המכשיר שלך, ייתכן שהסנכרון יידחה על ידי מערכת ההפעלה.</string>
     <string name="settings_background_fdroid_sync_mode_battery">מותאם לסוללה</string>
     <string name="settings_background_fdroid_sync_mode">מצב סנכרון רקע</string>
@@ -455,17 +455,17 @@
     <string name="settings_notification_privacy_normal">רגיל</string>
     <string name="settings_troubleshoot_test_battery_quickfix">התעלם מאופטימיזציה</string>
     <string name="settings_troubleshoot_test_battery_failed">אם משתמש משאיר מכשיר מחובר לחשמל ויציב לתקופה מסוימת, כשהמסך כבוי, המכשיר עובר למצב Doze. זה מונע מאפליקציות גישה לרשת ומגדיר את העבודות, הסנכרונים וההתראות הסטנדרטיות שלהם.</string>
-    <string name="settings_troubleshoot_test_battery_success">אלמנט אינו מושפע מתהליך מיטוב הסוללה.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">אלמנט אינו מושפע מתהליך מיטוב הסוללה.</string>
     <string name="settings_troubleshoot_test_battery_title">אופטימיזציה של הסוללה</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">השבת הגבלות</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">מגבלות רקע מופעלות עבור Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">מגבלות רקע מופעלות עבור Element.
 \nהעבודה שהאפליקציה מנסה לעשות תוגבל באגרסיביות בזמן שהיא ברקע, וזה עלול להשפיע על ההודעות.
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">מגבלות רקע מושבתות עבור Element. יש להריץ בדיקה זו באמצעות נתונים ניידים (ללא WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">מגבלות רקע מושבתות עבור Element. יש להריץ בדיקה זו באמצעות נתונים ניידים (ללא WIFI).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">בדוק מגבלות רקע</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">הפעל את התחלה לאחר אתחול</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">השירות לא יופעל עם הפעלת המכשיר מחדש, לא תקבל התראות עד שאלמנט ייפתח לפחות פעם אחת.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">השירות לא יופעל עם הפעלת המכשיר מחדש, לא תקבל התראות עד שאלמנט ייפתח לפחות פעם אחת.</string>
     <string name="settings_troubleshoot_test_service_boot_success">השירות יתחיל עם הפעלת המכשיר מחדש.</string>
     <string name="settings_troubleshoot_test_service_boot_title">הפעל לאחר אתחול</string>
     <string name="settings_troubleshoot_test_service_restart_failed">השירות נכשל מלעלות מחדש</string>
@@ -489,11 +489,11 @@
     <string name="settings_troubleshoot_test_token_registration_success">אסימון FCM נרשם בהצלחה ל- HomeServer.</string>
     <string name="settings_troubleshoot_test_token_registration_title">רישום אסימונים</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">הוסף חשבון</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nשגיאה זו אינה בשליטה על אלמנט. אין חשבון Google בטלפון. אנא פתח את מנהל החשבון והוסף חשבון Google.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
 \nשגיאה זו אינה בשליטה על אלמנט. זה יכול להתרחש מכמה סיבות. אולי זה יעבוד אם תנסה שוב מאוחר יותר, תוכל גם לבדוק ששירות Google Play אינו מוגבל בשימוש נתונים בהגדרות המערכת, או ששעון המכשיר שלך תקין, או שזה יכול לקרות ב- ROM מותאם אישית.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nשגיאה זו איננה בשליטה על Element ולפי גוגל, שגיאה זו מצביעה על כך שלמכשיר יש יותר מדי אפליקציות הרשומות ב- FCM. השגיאה מתרחשת רק במקרים שבהם ישנם מספרים קיצוניים של אפליקציות, כך שהיא לא אמורה להשפיע על המשתמש הממוצע.</string>
     <string name="settings_troubleshoot_test_fcm_failed">נכשל באחזור אסימון FCM:
 \n%1$s</string>
@@ -501,7 +501,7 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">אסימון Firebase</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">תקן שירותי Google Play</string>
-    <string name="settings_troubleshoot_test_play_services_failed">אלמנט משתמש בשירותי Google Play כדי להעביר הודעות פוש אך נראה שהוא אינו מוגדר כהלכה:
+    <string name="template_settings_troubleshoot_test_play_services_failed">אלמנט משתמש בשירותי Google Play כדי להעביר הודעות פוש אך נראה שהוא אינו מוגדר כהלכה:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_success">ה- APK של שירותי Google Play זמין ומעודכן.</string>
     <string name="settings_troubleshoot_test_play_services_title">בדיקת שירותי הפעלה</string>
@@ -619,7 +619,7 @@
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">שים לב שחלק מסוגי ההודעות מוגדרים כשתיקים (יפיקו התראה ללא צליל).</string>
     <string name="settings_troubleshoot_test_bing_settings_title">הגדרות מותאמות אישית.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">אפשר</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">התראות אינן מופעלות עבור הפעלה זו.
+    <string name="template_settings_troubleshoot_test_device_settings_failed">התראות אינן מופעלות עבור הפעלה זו.
 \nאנא בדוק את הגדרות האלמנט.</string>
     <string name="settings_troubleshoot_test_device_settings_success">התראות מופעלות להפעלה זו.</string>
     <string name="settings_troubleshoot_test_device_settings_title">הגדרות מושב.</string>
@@ -648,7 +648,7 @@
     <string name="settings_emails_empty">לא הוספה כתובת דוא\"ל לחשבונך</string>
     <string name="settings_emails">כתובות דוא\"ל</string>
     <string name="settings_add_3pid_authentication_needed">נדרש אימות</string>
-    <string name="settings_add_3pid_flow_not_supported">אינך יכול לעשות זאת ממכשיר נייד</string>
+    <string name="template_settings_add_3pid_flow_not_supported">אינך יכול לעשות זאת ממכשיר נייד</string>
     <string name="settings_add_3pid_confirm_password_title">אשר את סיסמתך</string>
     <string name="settings_app_info_link_summary">הצג את פרטי היישום בהגדרות המערכת.</string>
     <string name="settings_app_info_link_title">מידע על האפליקציה</string>
@@ -1071,7 +1071,7 @@
 \nגבה את המפתחות שלך בצורה מאובטחת כדי לא לאבד אותם.</string>
     <string name="keys_backup_setup_step1_title">לעולם אל תאבד הודעות מוצפנות</string>
     <string name="keys_backup_no_session_error">אין מושב מטריקס זמין</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">אנא מחק את משפט הסיסמה אם ברצונך ש- Element ייצור מפתח שחזור.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">אנא מחק את משפט הסיסמה אם ברצונך ש- Element ייצור מפתח שחזור.</string>
     <string name="passphrase_passphrase_too_weak">משפט הסיסמה חלש מדי</string>
     <string name="passphrase_empty_error_message">אנא הזן משפט סיסמה</string>
     <string name="passphrase_passphrase_does_not_match">משפט הסיסמה אינו תואם</string>
@@ -1316,7 +1316,7 @@
     <string name="create_room_encryption_description">לאחר הפעלתו, לא ניתן להשבית את ההצפנה.</string>
     <string name="create_room_encryption_title">אפשר הצפנה</string>
     <string name="command_description_shrug">הוסף לפני ¯ \\ _ (ツ) _ / ¯ להודעת טקסט רגיל</string>
-    <string name="settings_developer_mode_fail_fast_summary">אלמנט עלול לקרוס לעיתים קרובות יותר כאשר מתרחשת שגיאה בלתי צפויה</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">אלמנט עלול לקרוס לעיתים קרובות יותר כאשר מתרחשת שגיאה בלתי צפויה</string>
     <string name="settings_developer_mode_fail_fast_title">כישלון-מהיר</string>
     <string name="autocomplete_limited_results">מציג רק את התוצאות הראשונות, הקלד עוד אותיות …</string>
     <string name="devices_other_devices">פעולות אחרות</string>
@@ -1333,7 +1333,7 @@
     <string name="notification_initial_sync">סנכרון ראשוני …</string>
     <string name="bug_report_error_too_short">התיאור קצר מדי</string>
     <string name="permalink_malformed">הקישור שלך ל- matrix.to היה תקין</string>
-    <string name="soft_logout_sso_not_same_user_error">ההפעלה הנוכחית מיועדת למשתמש %1$s ואתה מספק אישורי משתמש %2$s. זה אינו נתמך על ידי אלמנט.
+    <string name="template_soft_logout_sso_not_same_user_error">ההפעלה הנוכחית מיועדת למשתמש %1$s ואתה מספק אישורי משתמש %2$s. זה אינו נתמך על ידי אלמנט.
 \nראשית נקה נתונים ואז היכנס שוב לחשבון אחר.</string>
     <string name="soft_logout_clear_data_dialog_submit">נקה נתונים</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">תאבד את הגישה להודעות מאובטחות אלא אם תיכנס בכדי לשחזר את מפתחות ההצפנה שלך.</string>
@@ -1491,7 +1491,7 @@
     <string name="room_list_quick_actions_notifications_all_noisy">כל ההודעות (רועשות)</string>
     <string name="message_ignore_user">התעלם ממשתמש זה</string>
     <string name="no_network_indicator">אין חיבור רשת כרגע</string>
-    <string name="permissions_rationale_msg_keys_backup_export">אלמנט זקוק להרשאה כדי לשמור את מפתחות ה- E2E שלך בדיסק.
+    <string name="template_permissions_rationale_msg_keys_backup_export">אלמנט זקוק להרשאה כדי לשמור את מפתחות ה- E2E שלך בדיסק.
 \n
 \nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לייצא את המפתחות שלך באופן ידני.</string>
     <string name="content_reported_as_inappropriate_content">תוכן זה דווח כבלתי הולם.
@@ -1714,7 +1714,7 @@
     <string name="room_preview_no_preview_join">לא ניתן להציג תצוגה מקדימה של חדר זה. האם אתה רוצה להצטרף אליו\?</string>
     <string name="room_preview_not_found">בשלב זה אין גישה לחדר זה.
 \nנסה שוב מאוחר יותר, או בקש ממנהל החדר לבדוק אם יש לך גישה.</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">התצוגה המקדימה של החדר הקריא בעולם עדיין אינה נתמכת ב- Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">התצוגה המקדימה של החדר הקריא בעולם עדיין אינה נתמכת ב- Element</string>
     <string name="room_preview_no_preview">לא ניתן להציג תצוגה מקדימה של חדר זה</string>
     <string name="group_all_communities">כל הקהילות</string>
     <string name="please_wait">אנא המתינו…</string>
@@ -1791,7 +1791,7 @@
     <string name="sas_verify_title">אמת את זה על ידי השוואה של מחרוזת טקסט קצרה.</string>
     <string name="invalid_or_expired_credentials">הוצאת מחשבון בגלל אישורים לא חוקיים או שפג תוקפם.</string>
     <string name="autodiscover_well_known_autofill_confirm">השתמש בקונפיגורציה</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">אלמנט זיהה תצורת שרת מותאמת אישית לדומיין userId שלך \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">אלמנט זיהה תצורת שרת מותאמת אישית לדומיין userId שלך \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_dialog_title">השלם אוטומטית אפשרויות שרת</string>
     <string name="autodiscover_invalid_response">תגובת גילוי שרת בית לא חוקית</string>
@@ -1817,13 +1817,13 @@
     <string name="auth_pin_confirm_to_disable_title">אשר PIN כדי להשבית PIN</string>
     <string name="settings_security_pin_code_change_pin_summary">שנה את קוד ה- PIN הנוכחי שלך</string>
     <string name="settings_security_pin_code_change_pin_title">שנה PIN</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">קוד PIN נדרש בכל פעם שאתה פותח את Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">קוד PIN נדרש לאחר שתי דקות של אי שימוש ב- Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">קוד PIN נדרש בכל פעם שאתה פותח את Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">קוד PIN נדרש לאחר שתי דקות של אי שימוש ב- Element.</string>
     <string name="settings_security_pin_code_grace_period_title">דרוש מספר PIN לאחר 2 דקות</string>
     <string name="settings_security_pin_code_notifications_summary_off">הצג רק מספר הודעות שלא נקראו בהודעה פשוטה.</string>
     <string name="settings_security_pin_code_notifications_summary_on">הצג פרטים כמו שמות החדרים ותוכן ההודעה.</string>
     <string name="settings_security_pin_code_notifications_title">הצג תוכן בהתראות</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">קוד PIN הוא הדרך היחידה לפתוח את Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">קוד PIN הוא הדרך היחידה לפתוח את Element.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">אפשר ביומטריה ספציפית למכשירים, כמו טביעות אצבע וזיהוי פנים.</string>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%2$s חדר נמצא עבור %1$s</item>
@@ -1972,17 +1972,17 @@
     <string name="settings_data_save_mode_summary">מצב שמירת נתונים מחיל מסנן ספציפי כך שמסוננים עדכוני נוכחות והודעות הקלדה.</string>
     <string name="settings_data_save_mode">מצב שמירת נתונים</string>
     <string name="settings_opt_in_of_analytics_ok">כן, אני רוצה לעזור!</string>
-    <string name="settings_opt_in_of_analytics_prompt">אנא אפשר ניתוח נתונים כדי לעזור לנו לשפר את Element.</string>
-    <string name="settings_opt_in_of_analytics_summary">אלמנט אוסף ניתוח אנונימי כדי לאפשר לנו לשפר את היישום.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">אנא אפשר ניתוח נתונים כדי לעזור לנו לשפר את Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">אלמנט אוסף ניתוח אנונימי כדי לאפשר לנו לשפר את היישום.</string>
     <string name="settings_opt_in_of_analytics">שלח נתוני ניתוח</string>
     <string name="settings_analytics">ניתוח נתונים</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">הענק הרשאה</string>
-    <string name="startup_notification_fdroid_battery_optim_message">אלמנט צריך לשמור על חיבור רקע בעל השפעה נמוכה על מנת לקבל הודעות אמינות.
+    <string name="template_startup_notification_fdroid_battery_optim_message">אלמנט צריך לשמור על חיבור רקע בעל השפעה נמוכה על מנת לקבל הודעות אמינות.
 \nבמסך הבא תתבקש לאפשר לאלמנט לרוץ תמיד ברקע, אנא קבל.</string>
     <string name="startup_notification_fdroid_battery_optim_title">חיבור ברקע</string>
     <string name="startup_notification_privacy_button_other">בחר באפשרות אחרת</string>
     <string name="startup_notification_privacy_button_grant">מתן הרשאה</string>
-    <string name="startup_notification_privacy_message">אלמנט יכול לרוץ ברקע כדי לנהל את ההתראות שלך בצורה מאובטחת ופרטית. זה עשוי להשפיע על השימוש בסוללה.</string>
+    <string name="template_startup_notification_privacy_message">אלמנט יכול לרוץ ברקע כדי לנהל את ההתראות שלך בצורה מאובטחת ופרטית. זה עשוי להשפיע על השימוש בסוללה.</string>
     <string name="startup_notification_privacy_title">פרטיות הודעות</string>
     <string name="settings_discovery_manage">נהל את הגדרות הגילוי שלך.</string>
     <string name="settings_discovery_category">תַגלִית</string>
@@ -2005,7 +2005,7 @@
     <string name="e2e_use_keybackup">בטל את נעילת היסטוריית ההודעות המוצפנות</string>
     <string name="settings_export_trail">ייצוא ביקורת</string>
     <string name="settings_key_requests">בקשות מפתח</string>
-    <string name="login_default_session_public_name">אלמנט אנדרואיד</string>
+    <string name="template_login_default_session_public_name">אלמנט אנדרואיד</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">המפתחות כבר מעודכנים!</string>
     <string name="event_redacted_by_admin_reason_with_reason">האירוע בהנחיית מנהל החדר, סיבה: %1$s</string>
     <string name="event_redacted_by_user_reason_with_reason">האירוע נמחק על ידי המשתמש, הסיבה: %1$s</string>
@@ -2117,7 +2117,7 @@
     <string name="verify_cannot_cross_sign">הפעלה זו אינה יכולה לשתף את האימות הזה עם הפעלות אחרות שלך.
 \nהאימות יישמר באופן מקומי וישותף בגרסה עתידית של האפליקציה.</string>
     <string name="unignore">בטל התעלמות</string>
-    <string name="rendering_event_error_exception">אלמנט נתקל בבעיה בעת הצגת תוכן האירוע עם המזהה \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">אלמנט נתקל בבעיה בעת הצגת תוכן האירוע עם המזהה \'%1$s\'</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="command_confetti">שולח את ההודעה הנתונה עם קונפטי</string>
     <string name="secure_backup_reset_no_history">תתחיל מחדש ללא היסטוריה, ללא הודעות, מכשירים מאומתים או משתמשים מאומתים</string>
@@ -2132,13 +2132,13 @@
     <string name="enter_secret_storage_passphrase_or_key">השתמש ב- %1$s שלך או השתמש ב- %2$s שלך כדי להמשיך.</string>
     <string name="command_description_discard_session_not_handled">נתמך רק בחדרים מוצפנים</string>
     <string name="command_description_discard_session">מכריח את ההפעלה הקבוצתית החוצה הנוכחית בחדר מוצפן להיזרק</string>
-    <string name="use_latest_app">השתמש באלמנט האחרון במכשירים האחרים שלך:</string>
+    <string name="template_use_latest_app">השתמש באלמנט האחרון במכשירים האחרים שלך:</string>
     <string name="or_other_mx_capabale_client">או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
-    <string name="app_ios_android">אלמנט iOS
+    <string name="template_app_ios_android">אלמנט iOS
 \nאלמנט אנדרואיד</string>
-    <string name="app_desktop_web">רשת האינטרנט
+    <string name="template_app_desktop_web">רשת האינטרנט
 \nשולחן העבודה של אלמנט</string>
-    <string name="use_other_session_content_description">השתמש באלמנט העדכני ביותר במכשירים האחרים שלך, Element Web, Element Desktop, Element iOS, Element for Android, או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
+    <string name="template_use_other_session_content_description">השתמש באלמנט העדכני ביותר במכשירים האחרים שלך, Element Web, Element Desktop, Element iOS, Element for Android, או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
     <string name="change_password_summary">הגדר סיסמת חשבון חדשה …</string>
     <string name="error_saving_media_file">לא ניתן היה לשמור את קובץ המדיה</string>
     <string name="error_adding_media_file_to_gallery">לא ניתן היה להוסיף קובץ מדיה לגלריה</string>
@@ -2326,11 +2326,11 @@
     <string name="identity_server_user_consent_not_provided">הסכמת המשתמש לא סופקה.</string>
     <string name="identity_server_error_no_current_binding_error">אין קשר נוכחי למזהה זה.</string>
     <string name="identity_server_error_binding_error">העמותה נכשלה.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">למען הפרטיות שלך, אלמנט תומך רק בשליחת הודעות דוא\"ל של משתמשים, בליל ומספר טלפון.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">למען הפרטיות שלך, אלמנט תומך רק בשליחת הודעות דוא\"ל של משתמשים, בליל ומספר טלפון.</string>
     <string name="identity_server_error_terms_not_signed">אנא קבל תחילה את התנאים של שרת הזהות בהגדרות.</string>
     <string name="identity_server_error_no_identity_server_configured">אנא הגדר תחילה שרת זהות.</string>
     <string name="identity_server_error_outdated_home_server">פעולה זו אינה אפשרית. שרת הבית מיושן.</string>
-    <string name="identity_server_error_outdated_identity_server">שרת זהות זה מיושן .Element תומך רק ב- API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">שרת זהות זה מיושן .Element תומך רק ב- API V2.</string>
     <string name="disconnect_identity_server_dialog_content">להתנתק משרת הזהות%s\?</string>
     <string name="open_terms_of">תנאים פתוחים של%s</string>
     <string name="choose_locale_loading_locales">טוען שפות זמינות …</string>
@@ -2349,8 +2349,8 @@
     <string name="not_a_valid_qr_code">זה לא קוד QR מטריציוני תקף</string>
     <string name="invitations_sent_to_two_users">הזמנות נשלחו אל%1$s ו-%2$s</string>
     <string name="invitation_sent_to_one_user">ההזמנה נשלחה אל%1$s</string>
-    <string name="invite_friends_rich_title">🔐️ הצטרפו אלי באלמנט</string>
-    <string name="invite_friends_text">היי, דבר איתי באלמנט:%s</string>
+    <string name="template_invite_friends_rich_title">🔐️ הצטרפו אלי באלמנט</string>
+    <string name="template_invite_friends_text">היי, דבר איתי באלמנט:%s</string>
     <string name="invite_friends">להזמין חברים</string>
     <string name="invite_users_to_room_title">הזמן משתמשים</string>
     <string name="inviting_users_to_room">מזמין משתמשים …</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 3d5cc0c555..13ef9801af 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -354,7 +354,7 @@
     <string name="start_video_call">ビデオ通話を開始</string>
     <string name="option_take_photo_video">写真または動画を撮影</string>
     <string name="auth_send_reset_email">初期化メール送信</string>
-    <string name="permissions_rationale_msg_camera">写真撮影やビデオ通話には, Elementアプリに端末のカメラの使用を許可する必要があります.</string>
+    <string name="template_permissions_rationale_msg_camera">写真撮影やビデオ通話には, ${app_name}アプリに端末のカメラの使用を許可する必要があります.</string>
     <string name="cannot_start_call">通話を開始できませんでした。後ほど試してください。</string>
     <string name="missing_permissions_warning">権限が無いため、一部の機能を利用できない可能性があります…</string>
     <string name="missing_permissions_to_start_conf_call">この部屋で会議を開始するためには招待権限が必要です</string>
@@ -362,7 +362,7 @@
     <string name="action_sign_out">ログアウト</string>
     <string name="bottom_action_home">ホーム</string>
     <string name="no_conversation_placeholder">会話なし</string>
-    <string name="no_contact_access_placeholder">端末の電話帳をElementアプリが読み取ることは許可されていません</string>
+    <string name="template_no_contact_access_placeholder">端末の電話帳を${app_name}アプリが読み取ることは許可されていません</string>
     <string name="no_result_placeholder">結果なし</string>
     <string name="rooms_header">部屋</string>
     <string name="rooms_directory_header">部屋一覧</string>
@@ -509,25 +509,25 @@
     <string name="matrix_only_filter">Matrixの連絡先のみ</string>
     <string name="call_error_user_not_responding">通信先が通話の受取に失敗しました。</string>
     <string name="permissions_rationale_popup_title">情報</string>
-    <string name="permissions_rationale_msg_storage">Elementは添付ファイルを送信および保存するために写真とビデオライブラリにアクセスするための許可が必要です。
+    <string name="template_permissions_rationale_msg_storage">${app_name}は添付ファイルを送信および保存するために写真とビデオライブラリにアクセスするための許可が必要です。
 
 あなたの携帯端末からファイルを送信できるようにするには、次のポップアップでアクセスを許可してください。</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \n通話をするには、次のポップアップでアクセスできるように設定してください。"</string>
-    <string name="permissions_rationale_msg_record_audio">Elementアプリは、音声通話を実行するためにマイクへアクセスするための許可が必要です。</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name}アプリは、音声通話を実行するためにマイクへアクセスするための許可が必要です。</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 通話をするには、次のポップアップでアクセスできるようにしてください。</string>
-    <string name="permissions_rationale_msg_camera_and_audio">ビデオ通話を行うには、カメラとマイクにアクセスするための権限がElementアプリに必要です。
+    <string name="template_permissions_rationale_msg_camera_and_audio">ビデオ通話を行うには、カメラとマイクにアクセスするための権限が${app_name}アプリに必要です。
 
 通話をするには、次のポップアップでのアクセスを許可してください。</string>
-    <string name="permissions_rationale_msg_contacts">Matrixユーザが電子メールアドレスや電話番号を元に他のユーザを検索するためには、Elementアプリがあなたの端末内電話帳へアクセスする許可が必要です。
+    <string name="template_permissions_rationale_msg_contacts">Matrixユーザが電子メールアドレスや電話番号を元に他のユーザを検索するためには、${app_name}アプリがあなたの端末内電話帳へアクセスする許可が必要です。
 
-Elementからあなた個人の電話帳への検索要求を許可する場合は、次のポップアップでアクセスを許可してください。</string>
-    <string name="permissions_msg_contacts_warning_other_androids">あなた個人の端末内の電話帳に登録されている電子メールアドレス、電話番号を元に、Elementの利用者を検索する場合は、アプリが端末内電話帳へアクセスする許可が必要です。
+${app_name}からあなた個人の電話帳への検索要求を許可する場合は、次のポップアップでアクセスを許可してください。</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">あなた個人の端末内の電話帳に登録されている電子メールアドレス、電話番号を元に、${app_name}の利用者を検索する場合は、アプリが端末内電話帳へアクセスする許可が必要です。
 
-Elementアプリがあなたの電話帳へアクセスすることを許可しますか？</string>
+${app_name}アプリがあなたの電話帳へアクセスすることを許可しますか？</string>
     <string name="permissions_action_not_performed_missing_permissions">申し訳ありません。権限がないために操作が実行されませんでした</string>
     <string name="report_content">発言を通報する</string>
     <string name="read_receipt">既読</string>
@@ -761,7 +761,7 @@ Elementアプリがあなたの電話帳へアクセスすることを許可し
     <string name="e2e_re_request_encryption_key">他のデバイスから <u>暗号鍵を再度要求</u> します。</string>
     <string name="e2e_re_request_encryption_key_sent">鍵のリクエストが送信されました。</string>
     <string name="e2e_re_request_encryption_key_dialog_title">リクエスト送信済</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">鍵をこのデバイスに送信できるように、メッセージを復号化できる他のデバイスでElementを起動してください。</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">鍵をこのデバイスに送信できるように、メッセージを復号化できる他のデバイスで${app_name}を起動してください。</string>
     <plurals name="format_time_s">
         <item quantity="other">%d 秒</item>
     </plurals>
@@ -793,12 +793,12 @@ Elementアプリがあなたの電話帳へアクセスすることを許可し
     <string name="settings_deactivate_account_section">アカウントを停止</string>
     <string name="settings_deactivate_my_account">自分のアカウントを停止</string>
     <string name="startup_notification_privacy_title">通知のプライバシー</string>
-    <string name="startup_notification_privacy_message">Elementは通知を安全で内密に扱うため、バックグラウンドで動作できます。これによりバッテリー使用に影響が出ることがあります。</string>
+    <string name="template_startup_notification_privacy_message">${app_name}は通知を安全で内密に扱うため、バックグラウンドで動作できます。これによりバッテリー使用に影響が出ることがあります。</string>
     <string name="startup_notification_privacy_button_grant">許可を与える</string>
     <string name="startup_notification_privacy_button_other">他のオプションを選択</string>
     <string name="settings_opt_in_of_analytics">解析データを送信</string>
-    <string name="settings_opt_in_of_analytics_summary">Elementはアプリを改善するため、匿名の解析データを収集します。</string>
-    <string name="settings_opt_in_of_analytics_prompt">Elementを改善するのを助けるため、解析を許可してください。</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name}はアプリを改善するため、匿名の解析データを収集します。</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">${app_name}を改善するのを助けるため、解析を許可してください。</string>
     <string name="settings_opt_in_of_analytics_ok">はい、助けたいです！</string>
     <string name="settings_without_flair">あなたは現在どのコミュニティーのメンバーでもありません。</string>
     <string name="lock_screen_hint">ここに入力…</string>
@@ -888,7 +888,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="accept">了承</string>
     <string name="auth_accept_policies">このホームサーバーの方針を閲覧し承認してください:</string>
     <string name="settings_call_category">通話設定画面</string>
-    <string name="settings_call_ringtone_use_app_ringtone">着信にElementの既定の着信音を使う</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">着信に${app_name}の既定の着信音を使う</string>
     <string name="settings_call_ringtone_title">着信音</string>
     <string name="settings_call_ringtone_dialog_title">着信音を選んでください:</string>
     <string name="room_participants_action_kick">追い出す</string>
@@ -1103,8 +1103,8 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="settings_emails_and_phone_numbers_summary">あなたの Matrix アカウントに関連付けられたメールアドレスと電話番号を管理</string>
     <string name="settings_emails_and_phone_numbers_title">メールアドレスと電話番号</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">有効化</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">このセッションで通知が無効化されています。
-\nElement の設定をご確認ください。</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">このセッションで通知が無効化されています。
+\n${app_name} の設定をご確認ください。</string>
     <string name="settings_troubleshoot_test_device_settings_success">このセッションで通知は有効化されています。</string>
     <string name="settings_troubleshoot_test_device_settings_title">セッション設定</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">有効化</string>
@@ -1191,7 +1191,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="qr_code">QR コード</string>
     <string name="add_by_qr_code">QR コードによる追加</string>
     <string name="user_code_share">コードを共有</string>
-    <string name="invite_friends_text">Element で会話しましょう: %s</string>
+    <string name="template_invite_friends_text">${app_name} で会話しましょう: %s</string>
     <string name="invite_friends">フレンドを招待</string>
     <string name="user_directory_search_hint">名前または ID で検索</string>
     <string name="direct_room_user_list_known_title">既知のユーザー</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 9ed230fe23..4e6dc67792 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -668,7 +668,7 @@
     <string name="user_directory_header">Akaram n useqdac</string>
     <string name="matrix_only_filter">Inermisen kan n Matrix</string>
     <string name="no_conversation_placeholder">Ulac idiwenniyen</string>
-    <string name="no_contact_access_placeholder">Ur teǧǧiḍ ara Element ad yekcem ɣer yinermisen-ik·im idiganen</string>
+    <string name="template_no_contact_access_placeholder">Ur teǧǧiḍ ara ${app_name} ad yekcem ɣer yinermisen-ik·im idiganen</string>
     <string name="people_no_identity_server">Ulac aqeddac n timagit yettusiwlen.</string>
     <string name="no_room_placeholder">Ulac tixxamin</string>
     <string name="no_public_room_placeholder">Ulac tixxamin tizuyaz yellan</string>
@@ -703,7 +703,7 @@
 \nDeg wadeg n wayen, tzemreḍ ad tesqedceḍ aqeddac azayez ɣef %2$s, maca aya ur yettettkal ara fell-as, ad yebḍu tansa-ik·im IP d uqeddac-a. Tzemreḍ ad tesferkeḍ aya deg yiɣewwaren.</string>
     <string name="call_failed_no_ice_use_alt">Ɛreḍ aseqdec n %s</string>
     <string name="call_failed_dont_ask_again">Ur iyi-d-ssutur ara tikkelt-nniḍen</string>
-    <string name="call_failed_no_connection">Asiwel s Element ur yeddi ara</string>
+    <string name="template_call_failed_no_connection">Asiwel s ${app_name} ur yeddi ara</string>
     <string name="call_select_sound_device">Fren ibenk n yimesli</string>
     <string name="sound_device_speaker">Amennay</string>
     <string name="sound_device_headset">Kask</string>
@@ -1200,11 +1200,11 @@
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
     <string name="error_saving_media_file">Ur yezmir ara ad isekles afaylu n umidya</string>
     <string name="change_password_summary">Sbadu awal uffir amaynut n umiḍan…</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
-    <string name="use_latest_app">Seqdec aferdis aneggaru ɣef yibenkan-nniḍen:</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="template_use_latest_app">Seqdec aferdis aneggaru ɣef yibenkan-nniḍen:</string>
     <string name="command_description_discard_session_not_handled">Yettusefrak kan deg texxamin yettwawgelhen</string>
     <string name="enter_secret_storage_passphrase_or_key">Seqdec %1$s-inek·inem neɣ seqdec %2$s-inek.inem i wakken ad tkemmleḍ.</string>
     <string name="keys_backup_recovery_key_error_decrypt">Aḥraz ur yezmir ara ad yekkes awgelhen s tsarut-a n tririt: ttxil-k·m sefqed ma d tasarut n tririt tameɣtut i teskecmeḍ.</string>
@@ -1316,21 +1316,21 @@
     <string name="call_error_camera_init_failed">Awennez n tkamiṛat d awezɣi</string>
     <string name="call_error_answered_elsewhere">tiririt ɣef usiwel seg wadeg-nniḍen</string>
     <string name="media_picker_cannot_record_video">Ur yezmir ara ad isekles tavidyut</string>
-    <string name="permissions_rationale_msg_storage">Element yesra tasiregt n unekcum ɣer temkarḍit-inek·inem n tewlafin d tvidyut i tuzna d usekles n tceqqufin yeddan.
+    <string name="template_permissions_rationale_msg_storage">${app_name} yesra tasiregt n unekcum ɣer temkarḍit-inek·inem n tewlafin d tvidyut i tuzna d usekles n tceqqufin yeddan.
 \n
 \nMa ulac aɣilif sireg anekcum deg yisfuyla udhimen i d-iteddun i wakken ad tizmireḍ ad tazneḍ ifuyla seg tiliɣri-inek·inem.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nMa ulac aɣilif sireg anekcum ɣer isfuyla udhimen i d-iteddun i wakken tizmireḍ ad tessiwleḍ."</string>
-    <string name="permissions_rationale_msg_record_audio">Element yesra tasiregt n unekcum ɣer usawaḍ-inek·inem i wakken ad iseddu isawalen s umeslaw.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} yesra tasiregt n unekcum ɣer usawaḍ-inek·inem i wakken ad iseddu isawalen s umeslaw.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nMa ulac aɣilif sireg anekcum ɣer isfuyla udhimen i d-iteddun i wakken tizmireḍ ad tessiwleḍ."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element yesra tasiregt n unekcum ɣer temkarḍit-inek·inem n tewlafin d tvidyut i tuzna d usekles n tceqqufin yeddan.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} yesra tasiregt n unekcum ɣer temkarḍit-inek·inem n tewlafin d tvidyut i tuzna d usekles n tceqqufin yeddan.
 \n 
 \n
 \nMa ulac aɣilif sireg anekcum deg yisfuyla udhimen i d-iteddun i wakken ad tizmireḍ ad tazneḍ ifuyla seg tiliɣri-inek·inem.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element yezmer ad issenqed adlis-inek·inem n tansiwin i wakken ad d-yaf iseqdacen-nniḍen n Matrix s usenned ɣer yimaylen d wuṭṭunen n tiliɣri nsen.
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} yezmer ad issenqed adlis-inek·inem n tansiwin i wakken ad d-yaf iseqdacen-nniḍen n Matrix s usenned ɣer yimaylen d wuṭṭunen n tiliɣri nsen.
 \n
 \nTebɣiḍ ad tebduḍ adlis-inek·inem n tansiwin i yiswi-a\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Nesḥassef. Tiggawt-a ur tezmir ara ad d-tili imi llant tsirag i ixuṣṣen</string>
@@ -1429,7 +1429,7 @@
     <string name="passphrase_passphrase_does_not_match">Tafyirt tuffirt ur temṣada ara</string>
     <string name="passphrase_empty_error_message">Ma ulac aɣilif sekcem tafyirt tuffirt</string>
     <string name="passphrase_passphrase_too_weak">Tafyirt tuffirt ur teǧhid ara aṭas</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Ma ulac aɣilif kkes tafyirt tuffirt ma yella tebɣiḍ Element ad isirew tasarut n tririt.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Ma ulac aɣilif kkes tafyirt tuffirt ma yella tebɣiḍ ${app_name} ad isirew tasarut n tririt.</string>
     <string name="keys_backup_no_session_error">Ulac tiɣimit n Matrix i yellan</string>
     <string name="keys_backup_setup_step1_advanced">(Leqqayen)</string>
     <string name="keys_backup_setup_step2_button_title">Sbadu tafyirt tuffirt</string>
@@ -1458,7 +1458,7 @@
     <string name="enter_secret_storage_passphrase">Sekcem tasarut tuffirt n uḥraz uffir</string>
     <string name="enter_secret_storage_passphrase_warning">Ɣur-k·m:</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Tisur ttwaleqqment yakan!</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Isutar n tsura</string>
     <string name="qr_code_scanned_verif_waiting">Ittraju %s…</string>
     <string name="settings_troubleshoot_title">Tifrat n wugur</string>
@@ -1466,7 +1466,7 @@
     <string name="enter_backup_passphrase">Kcem %s</string>
     <string name="call_error_ice_failed">Tuqqna n umidyat ur teddi ara</string>
     <string name="media_picker_both_capture_title">Ṭṭef-d tawlaft neɣ tavidyut</string>
-    <string name="permissions_rationale_msg_camera">Element yesra tasiregt n unekcum er tkamiat-ik·im i wakken ad d-yeṭṭef tawlafin d yisawalen s tvidyut.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} yesra tasiregt n unekcum er tkamiat-ik·im i wakken ad d-yeṭṭef tawlafin d yisawalen s tvidyut.</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Yal win·tin yessnen aseɣwen n texxamt, slid inebgawen</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Yal win·tin yessnen aseɣwen n texxamt rnu-d ɣer-sen inebgawen</string>
     <plurals name="room_settings_banned_users_count">
@@ -1574,13 +1574,13 @@
 \n
 \nIlaq-ak·am ad ternuḍ imayl-ik·im ɣer umaɣun-inek·inem deg yiɣewwaren.</string>
     <string name="login_error_ssl_handshake">Ibenk-inek·inem yesseqdac aneggaf n tɣellist TLS aqbur, yemzer i uḍfar s waṭas, i tɣellist-inek·inem ur tettizmireḍ ara a teqqneḍ</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Ma ulac aɣilif err Element deg yibenk-nniḍen i izemren ad yekkes awgelhen i yiznan, akken ad yizmir ad yazen tisura ɣer tɣimit-a.</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Seqdec taṭenṭunt n Element tamezwert i yisawalin ara d-ikecmen</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Ma ulac aɣilif err ${app_name} deg yibenk-nniḍen i izemren ad yekkes awgelhen i yiznan, akken ad yizmir ad yazen tisura ɣer tɣimit-a.</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Seqdec taṭenṭunt n ${app_name} tamezwert i yisawalin ara d-ikecmen</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Ad isseqdec %s d tallalt mi ara yili uqeddac-ik·im agejdan ur d-imudd ara yiwen (tansa-inek·inem IP ad tettwabḍu ayen akk ara yeqqim usiwel)</string>
     <string name="settings_call_ringtone_title">Taṭenṭunt n usiwel i d-ikecmen</string>
     <string name="settings_call_ringtone_dialog_title">Fren asṭeṭen i yisawalen:</string>
     <string name="call_error_user_not_responding">Agalis anmeggag ur yessaweḍ ara ad yerfed.</string>
-    <string name="permissions_rationale_msg_contacts">Matrix yezmer ad isenqed adlis-ik·im n tansiwin i wakken ad yaf iseqdacen-nniḍen n Matrix s ttawil n yimaylen d wuṭṭunen n tiliɣri nsen. Ma yella tqebleḍ ad tebduḍ adlis-ik·im n tansiwin i waya, ma ulac aɣilif sireg anekcum deg yisfuyla udhimen i d-iteddun.</string>
+    <string name="template_permissions_rationale_msg_contacts">Matrix yezmer ad isenqed adlis-ik·im n tansiwin i wakken ad yaf iseqdacen-nniḍen n Matrix s ttawil n yimaylen d wuṭṭunen n tiliɣri nsen. Ma yella tqebleḍ ad tebduḍ adlis-ik·im n tansiwin i waya, ma ulac aɣilif sireg anekcum deg yisfuyla udhimen i d-iteddun.</string>
     <string name="invite_no_identity_server_error">Rnu aqeddac n timagit deg yiɣewwaren-ik·im i wakken ad tesnetmeḍ tigawt-a.</string>
     <string name="room_participants_leave_prompt_msg">S tidet tebɣiḍ ad teǧǧeḍ taxxamt\?</string>
     <string name="room_participants_remove_prompt_msg">Tebɣiḍ s tidet ad tekkseḍ %s seg udiwenni-a\?</string>
@@ -1607,7 +1607,7 @@
     <string name="room_sliding_menu_third_party_notices">Turagin n wis tlata</string>
     <string name="settings_phone_number_empty">Ulac uṭṭun n tiliɣri i yettwarnan ɣer umiḍan-inek·inem</string>
     <string name="settings_app_info_link_summary">Sken talɣut n usnas deg yiɣewwaren n unagraw.</string>
-    <string name="settings_add_3pid_flow_not_supported">Ur tezmireḍ ara ad tgeḍ aya seg Element n uziraz</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Ur tezmireḍ ara ad tgeḍ aya seg ${app_name} n uziraz</string>
     <string name="settings_emails_empty">Ulac imayl yettwarnan ɣer umiḍan-ik·im</string>
     <string name="error_threepid_auth_failed">Ttkel tettekkaḍ ɣef useɣwen yellan deg yimayl i ak·am-n-uznen.</string>
     <string name="settings_notification_advanced">Iɣewwaren n yilɣa leqqayen</string>
@@ -1617,13 +1617,13 @@
     <string name="settings_troubleshoot_test_account_settings_failed">Ilɣa ttwasensen i umiḍan-inek·inem.
 \nMa ulac aɣilif senqed iɣewwaren n umiḍan.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Ttwaremden yilɣa i tɣimit-a.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Ur ttwaremden ara yilɣa i tɣimit-a.
-\nMa ulac aɣilif senqed iɣewwaren n Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Ur ttwaremden ara yilɣa i tɣimit-a.
+\nMa ulac aɣilif senqed iɣewwaren n ${app_name}.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Ẓer belli kra n yiznan yettwarun, ttusbadun ad ilin s tsusmi (ad d-neg alɣu s war imesli).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Kra n yilɣa ttusensen deg yiɣewwaren-ik·im udmawanen.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Asali n yilugan udmawanen ur yeddi ara, ma ulac aɣilif ɛreḍ tikkelt-nniḍen.</string>
     <string name="settings_troubleshoot_test_play_services_success">Imeẓla APK n Google Play llan rnu d imaynuten.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element yesseqdac imeẓla n Google Play i wakken ad d-iserreḥ i yiznan push maca ur yettban ara ttusewlen akken iwata:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} yesseqdac imeẓla n Google Play i wakken ad d-iserreḥ i yiznan push maca ur yettban ara ttusewlen akken iwata:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_token_registration_success">Ajuṭu FCM yettwasekles akken iwata ɣef uqeddac agejdan.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Asekles n ujuṭu FCM ɣef uqeddac agejdan ur yeddi ara.
@@ -1636,12 +1636,12 @@
     <string name="settings_troubleshoot_test_service_restart_success">Ameẓlu yettwanɣa syen yules asenker s wudem awurman.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Allus n usenker n umeẓlu ur yeddi ara</string>
     <string name="settings_troubleshoot_test_service_boot_success">Ameẓlu ad yenker mi ara yales yibenk asenker.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">"Ameẓlu ur yettenker ara mi ara yales yibenk asenker, ur d-tremseḍ ara ilɣa alamma yettwaldi  Element xerṣum yiwet n tikkelt."</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">"Ameẓlu ur yettenker ara mi ara yales yibenk asenker, ur d-tremseḍ ara ilɣa alamma yettwaldi ${app_name} xerṣum yiwet n tikkelt."</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Rmed asenker seg tnekra</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Senqed ilugan n ugilal</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Iluggan n ugilal ttusensen i Element. Asekyed-a ilaq ad yeddu s useqdec n yisefka n uziraz (ulac WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Iluggan n ugilal ttusensen i ${app_name}. Asekyed-a ilaq ad yeddu s useqdec n yisefka n uziraz (ulac WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Ilugan n ugilal ttwaremden i Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Ilugan n ugilal ttwaremden i ${app_name}.
 \nAmahil i yettaɛraḍ usnas ad t-yeg yesɛa talast ma mazal-it yella ɣef ugilal, aya yezmer ad d-yawi ugur i yilɣa.
 \n
 \n%1$s</string>
@@ -1659,7 +1659,7 @@
     <string name="settings_containing_my_display_name">Iznan ideg yella yisem-iw yettwaskanen</string>
     <string name="settings_invited_to_room">Mi ara d-ttunecdeɣ ɣer texxamt</string>
     <string name="settings_background_fdroid_sync_mode_battery">Yettusesfer i uẓru</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element ad yemtawi deg ugilal akken ara yeḥrez tilisa n teɣbula n yibenk (aẓru).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} ad yemtawi deg ugilal akken ara yeḥrez tilisa n teɣbula n yibenk (aẓru).
 \nAlmend n waddad n teɣbalut n yibenk-inek·inem, amtawi yezmer ad iɛeṭṭel seg anagraw n wammud.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Yettusesfer i wakud ilaw</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Ur d-tetteṭṭfeḍ ara ulɣu n yiznan i d-ikecmen ma yili asnas ɣef ugilal i yella.</string>
@@ -1710,8 +1710,8 @@
     <string name="startup_notification_privacy_button_other">Fren taxtiṛit-nniḍen</string>
     <string name="startup_notification_fdroid_battery_optim_title">Tuqqna n ugilal</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Mudd tasiregt</string>
-    <string name="settings_opt_in_of_analytics_summary">Element ileqqeḍ tasleḍt tudrigt i wakken ad aɣ-iɛawen ad nesnerni asnas.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Ma ulac aɣilif rmed tasleḍt i wakken ad aɣ-ɛiwnent ad nesnerni Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} ileqqeḍ tasleḍt tudrigt i wakken ad aɣ-iɛawen ad nesnerni asnas.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Ma ulac aɣilif rmed tasleḍt i wakken ad aɣ-ɛiwnent ad nesnerni ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Ih, bɣiɣ ad d-muddeɣ tallalt!</string>
     <string name="settings_data_save_mode">Askar n usekles n yisefka</string>
     <string name="devices_details_device_name">Leqqem isem azayez</string>
@@ -1848,7 +1848,7 @@
         <item quantity="other">Aḥraz n tsura %d…</item>
     </plurals>
     <string name="autodiscover_well_known_autofill_dialog_title">Iɣewwaren n uqeddac ummid awurman</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element yufa-d tawila n uqeddac udmawan i taɣult usulay—inek·inem n uqeddac \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} yufa-d tawila n uqeddac udmawan i taɣult usulay—inek·inem n uqeddac \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Seqdec tawila</string>
     <string name="invalid_or_expired_credentials">Tettusuffɣeḍ ssebba n yinekcam arimeɣta neɣ yemmuten.</string>
@@ -1962,7 +1962,7 @@
     <string name="content_reported_as_inappropriate_content">Agbur-a yettwakter-d mačči d win i iwulmen.
 \n
 \nMa yella dayen ur tebɣiḍ ara ad twaliḍ agbur-nniḍen sɣur aseqdac-a, tzemreḍ ad t-tesweḥleḍ i wakken ad teffreḍ iznan-ines</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element yesra tasiregt i usekles n tsura-inek·inem E2E ɣef uḍebsi.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} yesra tasiregt i usekles n tsura-inek·inem E2E ɣef uḍebsi.
 \n
 \nMa ulac aɣilif sireg anekcum ɣef yisfuyla udhimen i d-iteddun i wakken ad tizmireḍ ad tsifḍeḍ tisura-ik·im s ufus.</string>
     <string name="no_network_indicator">Ulac akk tuqqna n uzeṭṭa i igerrzen akka tura</string>
@@ -2027,7 +2027,7 @@
 \nKcem tikkelt-nniḍen i wakken ad tkecmeḍ ɣer yisefka d yiznan n umiḍan-inek·inem.</string>
     <string name="permalink_malformed">Aseɣwen-inek·inem n Matrix.to ur yemsil ara akken iwata</string>
     <string name="autocomplete_limited_results">Ala igmaḍ imezwura i d-yettwaseknen, aru ugar n yisekkilen…</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element yezmer ad yewḥel ugar n tikkal mi ara d-tili tuccḍa ur nettwaṛǧa ara</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} yezmer ad yewḥel ugar n tikkal mi ara d-tili tuccḍa ur nettwaṛǧa ara</string>
     <string name="login_error_threepid_denied">Taɣult n yimayl—ik·im ur tesɛi ara azref i wakken ad tettwasekles ɣef uqeddac-a</string>
     <string name="verification_conclusion_warning">Tuqqna ur nettwattkal ara</string>
     <string name="verify_user_sas_emoji_help_text">Senqed aseqdac-a s usentem n yimujit-a asuf i d-yettbanen ɣef ugdil-ines, deg yiwem umsizwer.</string>
@@ -2066,9 +2066,9 @@
     <string name="room_member_power_level_moderator_in">D amaẓrag deg %1$s</string>
     <string name="room_member_power_level_default_in">Amezwer deg %1$s</string>
     <string name="room_member_power_level_custom_in">D udmawan (%1$d) deg %2$s</string>
-    <string name="rendering_event_error_type_of_event_not_handled">"Element ur isekker ara ineḍruyen n wanaw  \'%1$s\'"</string>
-    <string name="rendering_event_error_type_of_message_not_handled">"Element ur isekker ara izen n wanaw  \'%1$s\'"</string>
-    <string name="rendering_event_error_exception">Element yemlal-d ugur mi ara d-yettarra agbur n uneḍru s usulay \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">"${app_name} ur isekker ara ineḍruyen n wanaw  \'%1$s\'"</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">"${app_name} ur isekker ara izen n wanaw  \'%1$s\'"</string>
+    <string name="template_rendering_event_error_exception">${app_name} yemlal-d ugur mi ara d-yettarra agbur n uneḍru s usulay \'%1$s\'</string>
     <string name="verify_cannot_cross_sign">Tiɣimit-a ulamek ara tebḍu aselken-a akked tqimiyin-nniḍen.
 \nAselken ad yettwaseklas s wudem adigan syen yettwabḍu deg lqem i d-iteddun n usnas.</string>
     <string name="room_list_sharing_header_recent_rooms">Tixxamin n melmi kan</string>
@@ -2197,7 +2197,7 @@
     <string name="settings_security_prevent_screenshots_summary">Armad n uɣewwar-a ad yernu FLAG_SECURE ɣer meṛṛa irmad. Ales asenker n usnas i wakken ad yemmed usnifel.</string>
     <string name="media_file_added_to_gallery">Afaylu n umidyat yettwarna ɣer temsikent</string>
     <string name="error_adding_media_file_to_gallery">D awezɣi ad yernu ufaylu n umidyat ɣer temsikent</string>
-    <string name="use_other_session_content_description">Seqdec lqem akk aneggaru n Element ɣef yibenkan-inek·inem-nniḍen: Element Web, Element n tnarit, Element iOS, Element i Android neɣ amsaɣ-nniḍen n Matrix yessefraken azmul anmidag</string>
+    <string name="template_use_other_session_content_description">Seqdec lqem akk aneggaru n ${app_name} ɣef yibenkan-inek·inem-nniḍen: ${app_name} Web, ${app_name} n tnarit, ${app_name} iOS, ${app_name} i Android neɣ amsaɣ-nniḍen n Matrix yessefraken azmul anmidag</string>
     <string name="enter_secret_storage_input_key">Fren tasarut-ik·im n tririt, neɣ err-itt s ufus s tira-ines s uasiw neɣ s usenteḍ-ines seg ɣefafus-inek·inem</string>
     <string name="cross_signing_verify_by_emoji">Senqed amyigew s yimujit</string>
     <string name="confirm_your_identity_quad_s">Sentem timagit-inek·inem s usenqed n yinekcam-a, anef-as ad yekcem ɣer yiznan yettwawgelhen.</string>
@@ -2207,11 +2207,11 @@
 \n
 \nTebɣiḍ s tidet ad tkemmleḍ\?</string>
     <string name="disconnect_identity_server_dialog_content">Ffeɣ seg tuqqna n uqeddac n timagit %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Aqeddac-a n timagit iɛedda d aqbur. Element yessafrak kan API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Aqeddac-a n timagit iɛedda d aqbur. ${app_name} yessafrak kan API V2.</string>
     <string name="identity_server_error_outdated_home_server">Tamahekt-a ulamek tedda. Aqeddac agejdan d aqbur.</string>
     <string name="identity_server_error_no_identity_server_configured">Ma ulac aɣilif qbel deg tazwara swel aqeddac n timagit.</string>
     <string name="identity_server_error_terms_not_signed">Ma ulac aɣilif qbel deg tazwara tiwtilin n uqeddac n timagit deg yiɣewwaren.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">I tɣellist n tbaḍnit-ik·im, Element yessefrak kan tuzna n yimaylen d wuṭṭunen n tiliɣri yettudwin i useqdac.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">I tɣellist n tbaḍnit-ik·im, ${app_name} yessefrak kan tuzna n yimaylen d wuṭṭunen n tiliɣri yettudwin i useqdac.</string>
     <string name="identity_server_error_binding_error">Assaɣ ur yeddi ara.</string>
     <string name="identity_server_error_no_current_binding_error">Akka tura ulac akk assaɣ d unekcam-a.</string>
     <string name="identity_server_set_default_notice">Aqeddac-ik·im agejdan (%1$s) yefka-d takti n useqdec n %2$s d aqeddac-ik·im n timagit</string>
@@ -2224,7 +2224,7 @@
     <string name="error_opening_banned_room">Ur tezmireḍ ara ad teldiḍ taxxamt ansi i d-tettwagedleḍ.</string>
     <string name="room_error_not_found">Ur nessaweḍ ara ad d-naf taxamt-a. Muqel ma tella d tidet.</string>
     <string name="room_settings_de_prioritize">Senqes deg wazal</string>
-    <string name="settings_troubleshoot_test_battery_success">Element ur t-iḥuza ara usesfer n uẓru.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} ur t-iḥuza ara usesfer n uẓru.</string>
     <string name="devices_delete_dialog_text">Tamahelt-a tesra asentem-nniḍen.
 \nI ukemmel, ma ulac aɣilif sekcem awal-ik·im uffir.</string>
     <string name="failed_to_load_timeline_position">%s yettaɛraḍ ad d-isali tazmilt tufrint deg tesnakudt n texxamt-a, maca ur yessaweḍ ara ad tt-naf.</string>
@@ -2250,22 +2250,22 @@
     <string name="ssl_unexpected_existing_expl">Aselken yettubeddel deg ubdil n win yettwamanen deg tiliɣri-inek·inem. Aya MAČČI D AYEN IGERRZEN. Issefk UR TETTAQBALEḌ ARA aselkin-a amaynut.</string>
     <string name="ssl_expected_existing_expl">Aselkin yettwabeddel seg win yettwamanen ɣer win ur nettwaman ara. Ahat aqeddac iɛawed-d aselkin-ines. Nermes anedbal n uqeddac ɣef udsil umḍin yetturaǧun.</string>
     <string name="ssl_only_accept">Ur qebbel ara aselkin alamma isuffeɣ-d unedbal n uqeddac adsil umḍin yemṣadan d win yellan ddaw-a.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nTuccḍa yekka nnig tezmert n Element, akken i d-yenna Google, tuccḍa-a teskan-d belli ibenk ɣer-s aqettun n yisnasen yettwaskelsen s FCM. Tuccḍa ur d-tettili ara ala ma yilin umiḍan n yisnasen aṭas, ɣef waya ur ilaq ara ad tḥaz aseqdac n tlemmast.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nTuccḍa-a tekka nnig tezmert n Element. Aya yezmer ad d-yili seg waṭas n ssebbat. Ahat ad yeddu ma yella tɛerḍeḍ tikkelt-nniḍen ticki, daɣen tzemreḍ ad tesneqdeḍ ma yella ameẓlu Google Play ur yesɛi ara talast deg useqdec n yisefka deg yiɣewwaren n unagraw, neɣ tamrilt n yibenk-inek·inem tṣeḥḥa, neɣ yezmer ad d-yili waya ɣef Rom tudmawant.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nTuccḍ-a tekka nnig tezmert n Element. Ulac amiḍan Google ɣe tiliɣri. Ma ulac aɣilif, ldi amsefrak n umiḍan syen rnu amiḍan n Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nTuccḍa yekka nnig tezmert n ${app_name}, akken i d-yenna Google, tuccḍa-a teskan-d belli ibenk ɣer-s aqettun n yisnasen yettwaskelsen s FCM. Tuccḍa ur d-tettili ara ala ma yilin umiḍan n yisnasen aṭas, ɣef waya ur ilaq ara ad tḥaz aseqdac n tlemmast.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nTuccḍa-a tekka nnig tezmert n ${app_name}. Aya yezmer ad d-yili seg waṭas n ssebbat. Ahat ad yeddu ma yella tɛerḍeḍ tikkelt-nniḍen ticki, daɣen tzemreḍ ad tesneqdeḍ ma yella ameẓlu Google Play ur yesɛi ara talast deg useqdec n yisefka deg yiɣewwaren n unagraw, neɣ tamrilt n yibenk-inek·inem tṣeḥḥa, neɣ yezmer ad d-yili waya ɣef Rom tudmawant.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nTuccḍ-a tekka nnig tezmert n ${app_name}. Ulac amiḍan Google ɣe tiliɣri. Ma ulac aɣilif, ldi amsefrak n umiḍan syen rnu amiḍan n Google.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ma yella aseqdac yeǧǧa ibenk ur t-isfurek ara rnu i kra n wakud, s ugdil yensan, ibenk ad yekcem deg uskar Doze. Aya ur yettaǧǧa ara isnasen ad kecmen ɣer uzeṭṭa i wakken ad aznen imahilen, amtawi d tesluɣin tiluganin nsen.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element ad yemtawi ɣef ugilal sya ɣer da deg yiwen n wakud (yettuswal).
-\nAya ad iḥaz aseqdec n ṛṛadyu d uẓru, ad yili wulɣu ad d-yettwaskanen i lebda i d-yemmalen belli Element yettɛassa ineḍruyen.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} ad yemtawi ɣef ugilal sya ɣer da deg yiwen n wakud (yettuswal).
+\nAya ad iḥaz aseqdec n ṛṛadyu d uẓru, ad yili wulɣu ad d-yettwaskanen i lebda i d-yemmalen belli ${app_name} yettɛassa ineḍruyen.</string>
     <string name="settings_integrations_summary">Seqdec amsefrak n yimsidaf i usefrek n yibuḍen, n tleggiyin, n yiwiǧiten d yikemmusen n ustiker.
 \nImsefrak n yimsidaf temmsen-d isefka n twila, syen zemren ad snilen iwiǧiten, ad aznen tinubgiwin ɣer teamin yerna ad sbadun iswiren n tezmert s yisem-ik·im.</string>
     <string name="settings_send_markdown_summary">Msel iznan s useqdec n tseddast n markdown send ad ttwaznen. Aya ad isireg amsal leqqayen am useqdec n yizamulen n yitran i uskan n uḍris uknan.</string>
     <string name="settings_send_message_with_enter_summary">Taqeffalt Kcem n unasiw n useɣzan ad tazen izen ideg ara teg angaz gar yizirigen</string>
-    <string name="startup_notification_privacy_message">Element yezmer ad yeddu deg ugilal i usefrek n yilɣa-inek·inem s wudem aɣelsan, uslig. Aya yezmer ad iḥaz aseqdec n uẓru.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element yesra ad yeǧǧ tuqqna s usemdu meẓẓiyen ɣef ugilal i wakken ad d-yawi ilɣa yettwamanen.
-\nƔef ugdil i d-iteddun, ad tettusnubegteḍ i wakken ad tmuddeḍ tisirag i Element ad yeddu i lebda ɣef ugilal, ttxil-k·m qbel.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} yezmer ad yeddu deg ugilal i usefrek n yilɣa-inek·inem s wudem aɣelsan, uslig. Aya yezmer ad iḥaz aseqdec n uẓru.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} yesra ad yeǧǧ tuqqna s usemdu meẓẓiyen ɣef ugilal i wakken ad d-yawi ilɣa yettwamanen.
+\nƔef ugdil i d-iteddun, ad tettusnubegteḍ i wakken ad tmuddeḍ tisirag i ${app_name} ad yeddu i lebda ɣef ugilal, ttxil-k·m qbel.</string>
     <string name="settings_data_save_mode_summary">Askar n usekles n yisefka yessemras imsizdeg afrayan i wakken ileqman n tihawt d yilɣa n tira ad ttwasizedgen.</string>
     <string name="room_settings_labs_warning_message">Tigi d timahilin tarmitanin i izemren ad rẓent s wayen ur nettwaṛǧa ara. Seqdec-itent maca ɣur-k·m.</string>
     <string name="deactivate_account_content">Aya ad yerr amiḍan-ik·im ur yettusexdam ara i lebda. Ur tettizmireḍ ara ad tkecmeḍ, ula d amdan-nniḍen ur yettizmir ara ad yales ajerred s usulay-a n useqdac. Aya ad isuffeɣ amiḍan-ik·im seg meṛṛa tixxamin ideg ittekka, yerna ad yekkes akk talqayt n umiḍan-ik·im seg uqeddac n timagit. <b>Ulac tuɣalin ɣer deffir deg tigawt-a</b>.
@@ -2282,14 +2282,14 @@
     <string name="sas_incoming_request_description">Senqed tiɣimit-a i wakken ad tcerḍeḍ fell-as tettwaḍman. Attkal ɣef tɣimiyin n yimendiden yettakk-ak·am-d lehna n uqerru mi ara tesseqdaceḍ iznan yettwawgelhen seg yixef ɣer yixef.</string>
     <string name="sas_error_m_unknown_method">Tiɣimit ur tessaweḍ ara ad teqbel amtawi n tsarut, agbar, MAC neɣ tarrayt SAS</string>
     <string name="room_list_catchup_welcome_body">Af-d iznan ur nettwaɣra ara da</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Taskant n texxamt ara yettwaɣran deg umaḍal ur tettusefrak ara ar tura deg Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Taskant n texxamt ara yettwaɣran deg umaḍal ur tettusefrak ara ar tura deg ${app_name}</string>
     <string name="settings_push_gateway_no_pushers">Ulac tinezgarin push ikelsen</string>
     <string name="send_file_step_sending_thumbnail">Tuzna n tenfult (%1$s / %2$s)</string>
     <string name="labs_swipe_to_reply_in_timeline">Rmed afraḍ i tririt deg tesnakudt</string>
     <string name="settings_discovery_no_terms">Aqeddac n timagit i tferneḍ ulac ɣer-s akk tiwtilin n yimeẓla. Ur ttkemmil ara ala ma yella tettekleḍ ɣef umeẓlu</string>
     <string name="labs_allow_extended_logging_summary">Iɣmisen ɣezzifen ad ɛawnen ineflayen s umuddu n wugar n yiɣemisen mi ara tazneḍ aneqqis RageShake, ula ma yili yermed asnas ur yettazen ara agbur n yiznan neɣ isefka-nniḍen usligen.</string>
     <string name="error_network_timeout">Akka d-yettban aqeddac yettaṭṭaf aṭas n wakud ɣef tririt. Yezmer aya yekka-d seg yir tuqqna neɣ seg tuccḍa deg uqeddac. Ma ulac aɣilif ɛreḍ tikkelt-nniḍen ticki.</string>
-    <string name="soft_logout_sso_not_same_user_error">Tiɣimit-a tamirant n useqdac %1$s ma d kečč·kemm ad tesnetmeḍ inekcam i useqdac %2$s. Aya ur t-yessefrak ara Element.
+    <string name="template_soft_logout_sso_not_same_user_error">Tiɣimit-a tamirant n useqdac %1$s ma d kečč·kemm ad tesnetmeḍ inekcam i useqdac %2$s. Aya ur t-yessefrak ara ${app_name}.
 \nMa ulac aɣilif, deg tazwara sfeḍ isefka, syen kcem tikkelt-nniḍen s umiḍan-nniḍen.</string>
     <string name="settings_developer_mode_summary">Askar n uneflay yermed timahilin i yeffren yerna yezmer daɣen ad yerr asnas ur yerkid ara akken iwata. I yineflayen kan!</string>
     <string name="settings_developer_mode_fail_fast_title">Abrir arurad</string>
@@ -2322,7 +2322,7 @@
     <string name="warning_room_not_created_yet">Mazal ur tettwarna ara texxamt ar tura. Sefsex timerna n texxamt\?</string>
     <string name="invalid_qr_code_uri">Tangalt QR d tarameɣtut (URI d arameɣtu)!</string>
     <string name="settings_security_pin_code_change_pin_summary">Senfel PIN inek·inem amiran</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Tangalt PIN tettusra yal mi ara teldiḍ Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Tangalt PIN tettusra yal mi ara teldiḍ ${app_name}.</string>
     <string name="warning_unsaved_change">Llan yisenfal ur nettusekles ara. Sefsex isenfal\?</string>
     <string name="room_settings_set_avatar">Sbadu avaṭar</string>
     <string name="matrix_to_card_title">Aseɣwen n Matrix</string>
@@ -2359,8 +2359,8 @@
     <string name="user_code_scan">Smiḍen tangalt QR</string>
     <string name="room_alias_address_hint">Tansa tamynut i d-yettusuffɣen (am. #alias:server)</string>
     <string name="direct_room_user_list_suggestions_title">Isumar</string>
-    <string name="invite_friends_rich_title">🔐️ Rnu-d ɣur-i ɣer element</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">Tangalt PIN d nettat kan i d ttawil s wayes ara teldiḍ Element.</string>
+    <string name="template_invite_friends_rich_title">🔐️ Rnu-d ɣur-i ɣer ${app_name}</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">Tangalt PIN d nettat kan i d ttawil s wayes ara teldiḍ ${app_name}.</string>
     <string name="add_a_topic_link_text">Rnu asentel</string>
     <string name="invite_friends">Snubget-d imeddukkal</string>
     <string name="user_code_my_code">Tangalt-inu</string>
@@ -2394,7 +2394,7 @@
         <item quantity="one">%d tinubga</item>
         <item quantity="other">%d n tnubgiwin</item>
     </plurals>
-    <string name="settings_security_pin_code_grace_period_summary_on">Tangalt PIN tettusra seld 2 tesdatin n war aseqdec n Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Tangalt PIN tettusra seld 2 tesdatin n war aseqdec n ${app_name}.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Iznan dagi ur ttwawgelhen ara seg yixef ɣer yixef</string>
     <string name="qr_code_not_scanned">Tangalt QR ur tettusmiḍen ara!</string>
     <string name="user_code_share">Bḍu tangalt-inu</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index e98b406305..dbd48a6c67 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -228,7 +228,7 @@
     <string name="done">완료</string>
     <string name="action_sign_out_confirmation_simple">정말 로그아웃하시겠어요\?</string>
     <string name="action_mark_room_read">읽음으로 표시</string>
-    <string name="no_contact_access_placeholder">Element이 연락처에 접근할 수 없게 되어 있습니다</string>
+    <string name="template_no_contact_access_placeholder">${app_name}이 연락처에 접근할 수 없게 되어 있습니다</string>
     <plurals name="public_room_nb_users">
         <item quantity="other">%d명의 사용자</item>
     </plurals>
@@ -360,7 +360,7 @@
     <string name="e2e_re_request_encryption_key_sent">키 요청을 보냈습니다.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">요청 보냄</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">다른 기기에서 Element을 설치해서 메시지를 암호화하고 이 기기로 키를 보내도록 합니다.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">다른 기기에서 ${app_name}을 설치해서 메시지를 암호화하고 이 기기로 키를 보내도록 합니다.</string>
 
     <string name="read_receipts_list">읽은 기록 읽기</string>
 
@@ -388,7 +388,7 @@
     <string name="room_info_room_topic">방 주제</string>
 
     <string name="settings_call_category">전화</string>
-    <string name="settings_call_ringtone_use_app_ringtone">수신 전화에 Element 기본 벨소리를 사용합니다</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">수신 전화에 ${app_name} 기본 벨소리를 사용합니다</string>
     <string name="settings_call_ringtone_title">수신 전화 벨소리</string>
     <string name="settings_call_ringtone_dialog_title">전화에 사용할 벨소리를 선택하세요:</string>
 
@@ -412,22 +412,22 @@
     <string name="media_picker_cannot_record_video">영상을 촬영할 수 없음</string>
 
     <string name="permissions_rationale_popup_title">정보</string>
-    <string name="permissions_rationale_msg_storage">첨부 파일을 보내고 저장하려면 Element은 영상과 사진 보관함에 접근하는 권한이 필요합니다.
+    <string name="template_permissions_rationale_msg_storage">첨부 파일을 보내고 저장하려면 ${app_name}은 영상과 사진 보관함에 접근하는 권한이 필요합니다.
 \n
 \n당신의 휴대 전화에서 파일을 보내려면 다음 팝업에서 접근을 허용해주세요.</string>
-    <string name="permissions_rationale_msg_camera">사진을 찍고 영상 통화를 하려면 Element은 카메라에 접근하는 권한이 필요합니다.</string>
+    <string name="template_permissions_rationale_msg_camera">사진을 찍고 영상 통화를 하려면 ${app_name}은 카메라에 접근하는 권한이 필요합니다.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요."</string>
-    <string name="permissions_rationale_msg_record_audio">음성 통화를 하려면 Element은 마이크에 접근하는 권한이 필요합니다.</string>
+    <string name="template_permissions_rationale_msg_record_audio">음성 통화를 하려면 ${app_name}은 마이크에 접근하는 권한이 필요합니다.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">영상 통화를 하려면 Element은 카메라와 마이크에 접근하는 권한이 필요합니다.
+    <string name="template_permissions_rationale_msg_camera_and_audio">영상 통화를 하려면 ${app_name}은 카메라와 마이크에 접근하는 권한이 필요합니다.
 \n
 \n전화를 하려면 다음 팝업에서 접근을 허용해주세요.</string>
-    <string name="permissions_rationale_msg_contacts">Element은 당신의 연락처를 확인해서 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다. 이런 이유로 연락처를 공유하는 것을 허용한다면, 다음 팝업에서 접근을 허용해주세요.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">"Element은  당신의 연락처를 확인하여 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다.
+    <string name="template_permissions_rationale_msg_contacts">${app_name}은 당신의 연락처를 확인해서 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다. 이런 이유로 연락처를 공유하는 것을 허용한다면, 다음 팝업에서 접근을 허용해주세요.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">"${app_name}은  당신의 연락처를 확인하여 이메일과 전화번호를 기반으로 다른 Matrix 사용자를 찾을 수 있습니다.
 \n 
 \n이런 이유로 연락처를 공유하는 것을 허용하겠습니까\?"</string>
 
@@ -665,8 +665,8 @@
 
     <string name="settings_troubleshoot_test_device_settings_title">기기 설정.</string>
     <string name="settings_troubleshoot_test_device_settings_success">알림이 이 기기에서 켜집니다.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">알림이 이 기기에서 허용되지 않습니다.
-\nElement 설정을 확인해주세요.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">알림이 이 기기에서 허용되지 않습니다.
+\n${app_name} 설정을 확인해주세요.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">켜기</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">맞춤 설정.</string>
@@ -677,7 +677,7 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Play 서비스 확인</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play 서비스 APK는 최신 버전입니다.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element은 Google Play 서비스를 사용해 푸시 메시지를 보내지만 올바르게 설정되지 않은 모양입니다:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name}은 Google Play 서비스를 사용해 푸시 메시지를 보내지만 올바르게 설정되지 않은 모양입니다:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play 서비스 고치기</string>
 
@@ -686,12 +686,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM 토큰을 검색하는데 실패했습니다:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\n이 오류는 Element의 통제 밖에 있으며 Google과 관련이 있습니다, 이 오류는 기기가 FCM에 등록된 앱이 너무 많다는 것을 나타냅니다. 오류는 수 많은 앱이 있는 경우에만 발생하고, 일반 사용자에게 영향을 미치지 않아야 합니다.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\n이 오류는 Element의 통제 밖입니다. 여러 이유로 발생할 수 있습니다. 나중에 다시 시도하면 작동할 지도 모릅니다, 시스템 설정에서 Google Play 서비스의 데이터 사용이 제한되었는지, 기기의 시간은 맞는 지 확인해보세요, 혹은 커스텀 롬 환경에서 발생할 수 있습니다.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\n이 오류는 Element의 통제 밖에 있습니다. 휴대 전화에 Google 계정이 없습니다. 계정 관리자를 열어 Google 계정을 추가하세요.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\n이 오류는 ${app_name}의 통제 밖에 있으며 Google과 관련이 있습니다, 이 오류는 기기가 FCM에 등록된 앱이 너무 많다는 것을 나타냅니다. 오류는 수 많은 앱이 있는 경우에만 발생하고, 일반 사용자에게 영향을 미치지 않아야 합니다.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\n이 오류는 ${app_name}의 통제 밖입니다. 여러 이유로 발생할 수 있습니다. 나중에 다시 시도하면 작동할 지도 모릅니다, 시스템 설정에서 Google Play 서비스의 데이터 사용이 제한되었는지, 기기의 시간은 맞는 지 확인해보세요, 혹은 커스텀 롬 환경에서 발생할 수 있습니다.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\n이 오류는 ${app_name}의 통제 밖에 있습니다. 휴대 전화에 Google 계정이 없습니다. 계정 관리자를 열어 Google 계정을 추가하세요.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">계정 추가</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">토큰 등록</string>
@@ -711,19 +711,19 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">부팅 시 시작</string>
     <string name="settings_troubleshoot_test_service_boot_success">기기가 다시 시작되면 서비스가 시작됩니다.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">기기가 다시 시작될 때 서비스가 시작되지 않습니다, 다시 시작한 후 Element을 한 번이라도 열지 않으면 알림을 받을 수 없습니다.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">기기가 다시 시작될 때 서비스가 시작되지 않습니다, 다시 시작한 후 ${app_name}을 한 번이라도 열지 않으면 알림을 받을 수 없습니다.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">부팅 시 시작 활성화</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">백그라운드 제한 사항 확인</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Element에 대한 백그라운드 제한 사항을 비활성화합니다. 이 테스트는 모바일 데이터를 사용해야 합니다 (WIFI 없음).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">${app_name}에 대한 백그라운드 제한 사항을 비활성화합니다. 이 테스트는 모바일 데이터를 사용해야 합니다 (WIFI 없음).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Element에 대한 백그라운드 제한 사항이 활성화됩니다.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">${app_name}에 대한 백그라운드 제한 사항이 활성화됩니다.
 \n앱이 백그라운드에서 작업하는 동안 앱이 시도하는 작업은 적극적으로 제한되며, 이는 알림에 영향을 줄 수 있습니다.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">제한 사항 비활성화</string>
 
     <string name="settings_troubleshoot_test_battery_title">배터리 최적화</string>
-    <string name="settings_troubleshoot_test_battery_success">Element은 배터리 최적화의 영향을 받지 않습니다.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name}은 배터리 최적화의 영향을 받지 않습니다.</string>
     <string name="settings_troubleshoot_test_battery_failed">사용자가 기기 화면을 끈 상태로 일정 시간 동안 연결되지 않은 상태로 두면, 기기는 Doze 모드에 들어갑니다. 이렇게 하면 앱이 네트워크에 접근하지 못하고 작업, 동기화 및 표준 경보가 지연됩니다.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">최적화 무시하기</string>
 
@@ -809,19 +809,19 @@
     <string name="settings_deactivate_my_account">내 계정 비활성화</string>
 
     <string name="startup_notification_privacy_title">알림 개인 정보</string>
-    <string name="startup_notification_privacy_message">Element은 백그라운드에서 실행되어 알림을 안전하고 은밀하게 관리할 수 있습니다. 이것은 배터리 사용량에 영향을 줄 수 있습니다.</string>
+    <string name="template_startup_notification_privacy_message">${app_name}은 백그라운드에서 실행되어 알림을 안전하고 은밀하게 관리할 수 있습니다. 이것은 배터리 사용량에 영향을 줄 수 있습니다.</string>
     <string name="startup_notification_privacy_button_grant">권한 부여</string>
     <string name="startup_notification_privacy_button_other">다른 설정을 선택하세요</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">백그라운드 연결</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element은 신뢰가 있는 알림을 위해 낮은 영향의 백그라운드 연결을 유지해야 합니다.
-\n다른 화면에서 Element이 항상 백그라운드에서 실행하도록 허용하는 메시지가 표시됩니다, 수락해주세요.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name}은 신뢰가 있는 알림을 위해 낮은 영향의 백그라운드 연결을 유지해야 합니다.
+\n다른 화면에서 ${app_name}이 항상 백그라운드에서 실행하도록 허용하는 메시지가 표시됩니다, 수락해주세요.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">권한 부여</string>
 
     <string name="settings_analytics">정보 분석</string>
     <string name="settings_opt_in_of_analytics">정보 분석 데이터 보내기</string>
-    <string name="settings_opt_in_of_analytics_summary">Element은 애플리케이션을 개선할 수 있도록 익명의 분석을 수집합니다.</string>
-    <string name="settings_opt_in_of_analytics_prompt">분석을 활성화해서 Element이 개선할 수 있도록 도와주세요.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name}은 애플리케이션을 개선할 수 있도록 익명의 분석을 수집합니다.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">분석을 활성화해서 ${app_name}이 개선할 수 있도록 도와주세요.</string>
     <string name="settings_opt_in_of_analytics_ok">예, 저도 돕고 싶습니다!</string>
 
     <string name="settings_data_save_mode">데이터 절약 모드</string>
@@ -1254,7 +1254,7 @@
     <string name="passphrase_empty_error_message">암호를 입력하세요</string>
     <string name="passphrase_passphrase_too_weak">암호가 너무 약합니다</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Element으로 복구 키를 생성하려면 암호를 지워주세요.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">${app_name}으로 복구 키를 생성하려면 암호를 지워주세요.</string>
     <string name="keys_backup_no_session_error">이용할 수 있는 Matrix 세션이 없음</string>
 
     <string name="keys_backup_setup_step1_title">암호화된 메시지를 잃지 마세요</string>
@@ -1388,7 +1388,7 @@
 
     <string name="autodiscover_invalid_response">잘못된 홈서버 검색 응답</string>
     <string name="autodiscover_well_known_autofill_dialog_title">자동 완성 서버 설정</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element이 userId 도메인 \"%1$s\"에 대한 맞춤 서버 설정을 감지했습니다:
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name}이 userId 도메인 \"%1$s\"에 대한 맞춤 서버 설정을 감지했습니다:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">설정 사용</string>
 
@@ -1478,7 +1478,7 @@
     <string name="group_all_communities">모든 커뮤니티</string>
 
     <string name="room_preview_no_preview">이 방은 미리 볼 수 없습니다</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">세계가 읽을 수 있는 방의 미리보기는 아직 ElementX에서 지원하지 않습니다</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">세계가 읽을 수 있는 방의 미리보기는 아직 ${app_name}X에서 지원하지 않습니다</string>
 
     <string name="fab_menu_create_room">방</string>
     <string name="fab_menu_create_chat">다이렉트 메시지</string>
@@ -1604,11 +1604,11 @@
     <string name="invite_no_identity_server_error">이 작업을 하려면 설정에서 ID 서버를 추가하세요.</string>
     <string name="settings_background_fdroid_sync_mode">백그라운드 동기화 모드 (실험적)</string>
     <string name="settings_background_fdroid_sync_mode_battery">배터리에 최적화됨</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element은 기기의 제한된 자원 (배터리)을 유지하기 위해 백그라운드에서 동기화합니다.
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name}은 기기의 제한된 자원 (배터리)을 유지하기 위해 백그라운드에서 동기화합니다.
 \n기기 자원 상태에 따라 운영체제에 의해 동기화는 지연될 수 있습니다.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">실시간으로 최적화됨</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element은 (설정할 수 있는) 특정 시간에 주기적으로 백그라운드에거 동기화됩니다.
-\n이는 라디오와 배터리 사용에 영향을 주며 Element이 이벤트를 수신하고 있는 상태라는 알림이 영구적으로 표시됩니다.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name}은 (설정할 수 있는) 특정 시간에 주기적으로 백그라운드에거 동기화됩니다.
+\n이는 라디오와 배터리 사용에 영향을 주며 ${app_name}이 이벤트를 수신하고 있는 상태라는 알림이 영구적으로 표시됩니다.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">백그라운드 동기화 없음</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">앱이 백그라운드에 있을 때 수신 메시지의 알림을 받지 않습니다.</string>
     <string name="settings_background_sync_update_error">설정을 업데이트하는데 실패했습니다.</string>
@@ -1709,14 +1709,14 @@
 \n
 \n이 사용자의 내용을 더 이상 보고 싶지 않다면, 사용자를 차단하거나 메시지를 감출 수 있습니다</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Element은 종단간 키를 디스크에 저장하려면 권한이 필요합니다.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name}은 종단간 키를 디스크에 저장하려면 권한이 필요합니다.
 \n
 \n키를 수동으로 내보내려면 다음 팝업에서 접근을 허용해주세요.</string>
 
     <string name="no_network_indicator">현재 네트워크 연결이 없습니다</string>
 
     <string name="settings_add_3pid_confirm_password_title">비밀번호가 정확하지 않습니다</string>
-    <string name="settings_add_3pid_flow_not_supported">라이엇 모바일에서 불가능한 것입니다</string>
+    <string name="template_settings_add_3pid_flow_not_supported">라이엇 모바일에서 불가능한 것입니다</string>
     <string name="settings_add_3pid_authentication_needed">인증이 요구됩니다</string>
 
 
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index a679b455b8..b5226f43ce 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -303,7 +303,7 @@
     <string name="local_address_book_header">Vietējā adrešu grāmata</string>
     <string name="matrix_only_filter">Vienīgi Matrix kontakti</string>
     <string name="no_conversation_placeholder">Nav sarunu</string>
-    <string name="no_contact_access_placeholder">Tu neesi atļāvis/usi Element piekļūt taviem vietējiem kontaktiem</string>
+    <string name="template_no_contact_access_placeholder">Tu neesi atļāvis/usi ${app_name} piekļūt taviem vietējiem kontaktiem</string>
     <string name="no_result_placeholder">Nav rezultātu</string>
     <string name="rooms_header">Istabas</string>
     <string name="rooms_directory_header">Istabu katalogs</string>
@@ -456,24 +456,24 @@
     <string name="media_picker_both_capture_title">Uzņemt foto vai video</string>
     <string name="media_picker_cannot_record_video">Neizdodas ierakstīt video</string>
     <string name="permissions_rationale_popup_title">Element informācija</string>
-    <string name="permissions_rationale_msg_storage">Element nepieciešama atļauja piekļūt jūsu fotoattēlu un video bibliotēkai, lai nosūtītu un saglabātu pielikumus.
+    <string name="template_permissions_rationale_msg_storage">${app_name} nepieciešama atļauja piekļūt jūsu fotoattēlu un video bibliotēkai, lai nosūtītu un saglabātu pielikumus.
 \n
 \nLūdzu, atļaujiet piekļuvi nākamajā uznirstošajā logā, lai varētu nosūtīt failus no sava tālruņa.</string>
-    <string name="permissions_rationale_msg_camera">Element-am nepieciešama atļauja piekļūt kamerai, lai uzņemtu foto un nodrošinātu video zvanus.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name}-am nepieciešama atļauja piekļūt kamerai, lai uzņemtu foto un nodrošinātu video zvanus.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nLūdzu dot piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus."</string>
-    <string name="permissions_rationale_msg_record_audio">Element-am nepieciešama atļauja piekļūt mikrofonam, lai nodrošinātu audio zvanus.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name}-am nepieciešama atļauja piekļūt mikrofonam, lai nodrošinātu audio zvanus.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nLūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element nepieciešama atļauja piekļūt kamerai un mikrofonam, lai veiktu videozvanus. 
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} nepieciešama atļauja piekļūt kamerai un mikrofonam, lai veiktu videozvanus.
 \n
 \nLūdzu, dodiet piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus.</string>
-    <string name="permissions_rationale_msg_contacts">Element-am nepieciešama atļauja piekļūt kontaktiem, lai varētu atrast citus lietotājus tīklā pēc to epasta adreses vai tālruņa #.
+    <string name="template_permissions_rationale_msg_contacts">${app_name}-am nepieciešama atļauja piekļūt kontaktiem, lai varētu atrast citus lietotājus tīklā pēc to epasta adreses vai tālruņa #.
 
-Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja atrast Tavus kontaktus, kuri ir sasniedzami Elementā.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element var pārbaudīt jūsu adrešu grāmatu, lai atrastu citus Matrix lietotājus pāc viņu epasta adresēm un tālruņa numuriem.
+Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja atrast Tavus kontaktus, kuri ir sasniedzami ${app_name}ā.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} var pārbaudīt jūsu adrešu grāmatu, lai atrastu citus Matrix lietotājus pāc viņu epasta adresēm un tālruņa numuriem.
 \n
 \nVai piekrītat koplietot savu adrešu grāmatu šim nolūkam\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Atvaino… Darbība nav veikta dēļ nepietiekamām piekļuves atļaujām</string>
@@ -1160,7 +1160,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="settings_emails_empty">Jūsu kontam nav pievienota neviena epasta adrese</string>
     <string name="settings_emails">Epasta adreses</string>
     <string name="settings_add_3pid_authentication_needed">Nepieciešama autentifikācija</string>
-    <string name="settings_add_3pid_flow_not_supported">Jūs nevarat to izdarīt ar Element mobile</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Jūs nevarat to izdarīt ar ${app_name} mobile</string>
     <string name="settings_add_3pid_confirm_password_title">Apstipriniet paroli</string>
     <string name="settings_phone_number_empty">Jūsu kontam nav pievienots neviens tālruņa numurs</string>
     <string name="room_sliding_menu_version_x">Versija %s</string>
diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 64c469592c..867f5661c2 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -19,7 +19,7 @@
     <string name="invite_friends">സുഹൃത്തുക്കളെ ക്ഷണിക്കുക</string>
     <string name="user_code_share">എന്റെ കോഡ് പങ്കിടുക</string>
     <string name="user_code_my_code">എന്റെ കോഡ്</string>
-    <string name="invite_friends_rich_title">🔐️ element-ൽ എന്നോടൊപ്പം ചേരുക</string>
+    <string name="template_invite_friends_rich_title">🔐️ ${app_name}-ൽ എന്നോടൊപ്പം ചേരുക</string>
     <string name="identity_server_set_alternative_submit">സമർപ്പിക്കൂ</string>
     <string name="a11y_open_chat">ചാറ്റ് തുറക്കുക</string>
     <string name="a11y_stop_camera">ക്യാമറ നിർത്തുക</string>
@@ -232,7 +232,7 @@
     <string name="auth_password_placeholder">രഹസ്യവാക്ക്</string>
     <string name="auth_user_id_placeholder">ഇമെയിൽ അല്ലെങ്കിൽ ഉപയോക്തൃനാമം</string>
     <string name="go_on_with">തുടരുക…</string>
-    <string name="call_failed_no_connection">Element കോൾ പരാജയപ്പെട്ടു</string>
+    <string name="template_call_failed_no_connection">${app_name} കോൾ പരാജയപ്പെട്ടു</string>
     <string name="option_send_voice">ശബ്ദം അയയ്ക്കൂ</string>
     <string name="hs_url">ഹോം സെർവർ URL</string>
     <string name="no_public_room_placeholder">പൊതു മുറിക‍ൾ ഒന്നും ലഭ്യമല്ല</string>
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index d51d954d02..98d324b696 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -406,7 +406,7 @@
     <string name="room_settings_mention_only">Kun nevninger</string>
     <string name="settings_olm_version">olm-versjon</string>
     <string name="settings_deactivate_account_section">Deaktiver kontoen</string>
-    <string name="settings_opt_in_of_analytics_summary">Element samler inn anonyme statistikker for å hjelpe oss med å forbedre programmet.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} samler inn anonyme statistikker for å hjelpe oss med å forbedre programmet.</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="settings_integration_manager">Integreringsbehandler</string>
     <string name="room_settings_room_name">Rommets navn</string>
@@ -581,7 +581,7 @@
     <string name="user_directory_header">Brukerkatalog</string>
     <string name="matrix_only_filter">Bare matrix-kontakter</string>
     <string name="no_conversation_placeholder">Ingen samtaler</string>
-    <string name="no_contact_access_placeholder">Du ga ikke Element tilgang til dine lokale kontakter</string>
+    <string name="template_no_contact_access_placeholder">Du ga ikke ${app_name} tilgang til dine lokale kontakter</string>
     <string name="people_no_identity_server">Ingen identitetsserver konfigurert.</string>
     <string name="rooms_directory_header">Romkatalog</string>
     <string name="no_public_room_placeholder">Ingen offentlige rom tilgjengelig</string>
@@ -627,7 +627,7 @@
     <string name="call_failed_no_ice_title">Oppringing feilet som følge av feilkonfigurert tjener</string>
     <string name="call_failed_no_ice_use_alt">Prøv med %s</string>
     <string name="call_failed_dont_ask_again">Ikke spør meg igjen</string>
-    <string name="call_failed_no_connection">Element samtale feilet</string>
+    <string name="template_call_failed_no_connection">${app_name} samtale feilet</string>
     <string name="call_select_sound_device">Velg lydenhet</string>
     <string name="sound_device_phone">Telefon</string>
     <string name="sound_device_speaker">Høytaler</string>
@@ -947,13 +947,13 @@
     <string name="settings_security_pin_code_summary">Hvis du vil tilbakestille PIN-koden, trykker du på Glemt PIN-kode for å logge av og tilbakestille.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Aktiver biometri</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Aktiver enhetsspesifikk biometri, som fingeravtrykk og ansiktsgjenkjenning.</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-kode er den eneste måten å låse opp Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN-kode er den eneste måten å låse opp ${app_name}.</string>
     <string name="settings_security_pin_code_notifications_title">Vis innhold i varsler</string>
     <string name="settings_security_pin_code_notifications_summary_on">Vis detaljer som romnavn og meldingsinnhold.</string>
     <string name="settings_security_pin_code_notifications_summary_off">Vis bare antall uleste meldinger i et enkelt varsel.</string>
     <string name="settings_security_pin_code_grace_period_title">Krev PIN etter 2 minutter</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN-kode kreves etter 2 minutter uten bruk av Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN-kode kreves hver gang du åpner Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">PIN-kode kreves etter 2 minutter uten bruk av ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">PIN-kode kreves hver gang du åpner ${app_name}.</string>
     <string name="settings_security_pin_code_change_pin_title">Endre PIN-kode</string>
     <string name="settings_security_pin_code_change_pin_summary">Endre din nåværende PIN-kode</string>
     <string name="auth_pin_confirm_to_disable_title">Bekreft PIN for å deaktivere PIN</string>
@@ -971,10 +971,10 @@
     <string name="settings_troubleshoot_test_push_notification_content">Du ser på varselet! Klikk på meg!</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Kunne ikke motta push. Løsningen kan være å installere applikasjonen på nytt.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Legg til konto</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nDenne feilen er utenfor kontroll av Element. Det er ingen Google-konto på telefonen. Åpne kontoadministratoren og legg til en Google-konto.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nDenne feilen er utenfor kontroll av ${app_name}. Det er ingen Google-konto på telefonen. Åpne kontoadministratoren og legg til en Google-konto.</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Fiks Play Services</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element bruker Google Play Services for å levere push-meldinger, men det ser ikke ut til å være konfigurert riktig:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} bruker Google Play Services for å levere push-meldinger, men det ser ikke ut til å være konfigurert riktig:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK er tilgjengelig og oppdatert.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Sjekk innstillinger</string>
@@ -982,8 +982,8 @@
     <string name="settings_troubleshoot_test_bing_settings_failed">Noen varsler er deaktivert i dine tilpassede innstillinger.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Legg merke til at enkelte meldinger er satt til å være lydløse (gir et varsel uten lyd).</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Egendefinerte innstillinger.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Varsler er ikke aktivert for denne økten.
-\nKontroller Elementinnstillingene.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Varsler er ikke aktivert for denne økten.
+\nKontroller ${app_name}innstillingene.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Varsler er aktivert for denne økten.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sesjonsinnstillinger.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Varsler er deaktivert for kontoen din.
@@ -1007,7 +1007,7 @@
     <string name="settings_emails_empty">Ingen e-post er lagt til kontoen din</string>
     <string name="settings_emails">E-post adresser</string>
     <string name="settings_add_3pid_authentication_needed">Autentisering er påkrevd</string>
-    <string name="settings_add_3pid_flow_not_supported">Du kan ikke gjøre dette fra Element mobile</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Du kan ikke gjøre dette fra ${app_name} mobile</string>
     <string name="settings_add_3pid_confirm_password_title">Bekreft passordet ditt</string>
     <string name="settings_app_info_link_summary">Vis applikasjonsinformasjonen i systeminnstillingene.</string>
     <string name="settings_app_info_link_title">App info</string>
@@ -1104,22 +1104,22 @@
     <string name="permissions_denied_add_contact">Tillat tillatelse til å få tilgang til kontaktene dine.</string>
     <string name="permissions_denied_qr_code">For å skanne en QR-kode, må du gi tilgang til kameraet.</string>
     <string name="permissions_action_not_performed_missing_permissions">Beklager. Handlingen ble ikke utført på grunn av manglende tillatelser</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element kan sjekke adresseboken din for å finne andre Matrix-brukere basert på e-post og telefonnummer.
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} kan sjekke adresseboken din for å finne andre Matrix-brukere basert på e-post og telefonnummer.
 \n
 \nEr du enig i å dele adresseboken for dette formålet\?</string>
-    <string name="permissions_rationale_msg_contacts">Element kan sjekke adresseboken din for å finne andre Matrix-brukere basert på e-post og telefonnummer. Hvis du godtar å dele adresseboken din for dette formålet, vennligst gi tilgang til neste popup.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element trenger tillatelse for å få tilgang til kameraet og mikrofonen for å utføre videosamtaler.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} kan sjekke adresseboken din for å finne andre Matrix-brukere basert på e-post og telefonnummer. Hvis du godtar å dele adresseboken din for dette formålet, vennligst gi tilgang til neste popup.</string>
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} trenger tillatelse for å få tilgang til kameraet og mikrofonen for å utføre videosamtaler.
 \n
 \nTillat tilgang til de neste popup-vinduene for å kunne ringe.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nTillat tilgang i neste popup for å kunne ringe."</string>
-    <string name="permissions_rationale_msg_record_audio">Element trenger tillatelse for å få tilgang til mikrofonen din for å utføre lydanrop.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} trenger tillatelse for å få tilgang til mikrofonen din for å utføre lydanrop.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nTillat tilgang i neste popup for å kunne ringe."</string>
-    <string name="permissions_rationale_msg_camera">Element trenger tillatelse for å få tilgang til kameraet ditt for å ta bilder og videosamtaler.</string>
-    <string name="permissions_rationale_msg_storage">Element trenger tillatelse for å få tilgang til bilde- og videobiblioteket ditt for å sende og lagre vedlegg.
+    <string name="template_permissions_rationale_msg_camera">${app_name} trenger tillatelse for å få tilgang til kameraet ditt for å ta bilder og videosamtaler.</string>
+    <string name="template_permissions_rationale_msg_storage">${app_name} trenger tillatelse for å få tilgang til bilde- og videobiblioteket ditt for å sende og lagre vedlegg.
 \n
 \nTillat tilgang i neste popup for å kunne sende filer fra telefonen din.</string>
     <string name="media_picker_cannot_record_video">Kan ikke ta opp video</string>
@@ -1141,7 +1141,7 @@
     <string name="settings_call_ringtone_title">Ringetone for innkommende samtaler</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Vil bruke %s som assistanse når hjemmeserveren din ikke tilbyr en (IP-adressen din blir delt under en samtale)</string>
     <string name="settings_call_ringtone_use_default_stun">Tillat reservehjelpsserver</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Bruk standard Element-ringetone for innkommende anrop</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Bruk standard ${app_name}-ringetone for innkommende anrop</string>
     <string name="settings_call_show_confirmation_dialog_summary">Be om bekreftelse før du starter en samtale</string>
     <string name="settings_call_show_confirmation_dialog_title">Forhindre utilsiktet samtale</string>
     <string name="room_info_room_topic">Romemne</string>
@@ -1151,7 +1151,7 @@
         <item quantity="other">%d medlemskapsendringer</item>
     </plurals>
     <string name="groups_list">Gruppeliste</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Start Element på en annen enhet som kan dekryptere meldingen, slik at den kan sende nøklene til denne økten.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Start ${app_name} på en annen enhet som kan dekryptere meldingen, slik at den kan sende nøklene til denne økten.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Forespørsel sendt</string>
     <string name="e2e_re_request_encryption_key_sent">Nøkkelforespørsel sendt.</string>
     <string name="login_error_ssl_peer_unverified">SSL-feil: identiteten til jevnaldrende er ikke bekreftet.</string>
@@ -1162,8 +1162,8 @@
     <string name="action_unpublish">Fjern publiseringen</string>
     <string name="action_add">Legg til</string>
     <string name="start_chatting">Begynn å chatte</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nDenne feilen er utenfor kontroll av Element, og ifølge Google indikerer denne feilen at enheten har for mange apper registrert hos FCM. Feilen oppstår bare i tilfeller der det er ekstremt mange apper, så det bør ikke påvirke gjennomsnittsbrukeren.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nDenne feilen er utenfor kontroll av ${app_name}, og ifølge Google indikerer denne feilen at enheten har for mange apper registrert hos FCM. Feilen oppstår bare i tilfeller der det er ekstremt mange apper, så det bør ikke påvirke gjennomsnittsbrukeren.</string>
     <string name="room_event_action_report_prompt_ignore_user">Vil du skjule alle meldinger fra denne brukeren\?
 \n
 \nMerk at denne handlingen starter appen på nytt, og det kan ta litt tid.</string>
@@ -1352,7 +1352,7 @@
     <string name="soft_logout_clear_data_dialog_submit">Slett data</string>
     <string name="devices_other_devices">Andre økter</string>
     <string name="rageshake_detected">Riste oppdaget!</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element kan krasje oftere når en uventet feil oppstår</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} kan krasje oftere når en uventet feil oppstår</string>
     <string name="create_room_alias_hint">Romadresse</string>
     <string name="create_room_alias_already_in_use">Denne adressen er allerede i bruk</string>
     <string name="create_room_alias_empty">Oppgi romadresse</string>
@@ -1406,7 +1406,7 @@
     <string name="settings_account_data">Kontodata</string>
     <string name="share_confirm_room">Vil du sende dette vedlegget til %1$s\?</string>
     <string name="delete_event_dialog_reason_checkbox">Inkluder en grunn</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="new_session">Ny pålogging. Var dette deg\?</string>
     <string name="new_session_review">Trykk for å se gjennom og bekrefte</string>
     <string name="verify_new_session_notice">Bruk denne økten til å bekrefte den nye, og gi den tilgang til krypterte meldinger.</string>
@@ -1445,7 +1445,7 @@
     <string name="upgrade_security">Krypteringsoppgradering tilgjengelig</string>
     <string name="security_prompt_text">Bekreft deg selv og andre for å sikre chattene dine</string>
     <string name="settings_security_prevent_screenshots_title">Forhindre skjermbilder av applikasjonen</string>
-    <string name="use_latest_app">Bruk det nyeste Element på de andre enhetene dine:</string>
+    <string name="template_use_latest_app">Bruk det nyeste ${app_name} på de andre enhetene dine:</string>
     <string name="bad_passphrase_key_reset_all_action">Har du glemt eller mistet alle gjenopprettingsalternativene\? Tilbakestill alt</string>
     <string name="secure_backup_reset_all">Tilbakestill alt</string>
     <string name="secure_backup_reset_all_no_other_devices">Gjør dette bare hvis du ikke har noen annen enhet du kan bekrefte denne enheten med.</string>
@@ -1461,7 +1461,7 @@
     <string name="error_empty_field_choose_user_name">Velg et brukernavn.</string>
     <string name="error_empty_field_choose_password">Velg passord.</string>
     <string name="add_people">Legg til personer</string>
-    <string name="invite_friends_rich_title">🔐️ Bli med meg på element</string>
+    <string name="template_invite_friends_rich_title">🔐️ Bli med meg på ${app_name}</string>
     <string name="invitation_sent_to_one_user">Invitasjon sendt til %1$s</string>
     <string name="not_a_valid_qr_code">Det er ikke en gyldig QR-kode for matrix</string>
     <string name="invite_users_to_room_failure">Vi kunne ikke invitere brukere. Kontroller brukerne du vil invitere, og prøv på nytt.</string>
@@ -1471,7 +1471,7 @@
     <string name="user_code_info_text">Del denne koden med folk slik at de kan skanne den for å legge til deg og begynne å chatte.</string>
     <string name="choose_locale_loading_locales">Laster inn tilgjengelige språk…</string>
     <string name="identity_server_error_terms_not_signed">Godta først vilkårene for identitetsserveren i innstillingene.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">For ditt privatliv støtter Element bare sending av hash-bruker-e-post og telefonnummer.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">For ditt privatliv støtter ${app_name} bare sending av hash-bruker-e-post og telefonnummer.</string>
     <string name="power_level_edit_title">Sett rolle</string>
     <string name="a11y_open_chat">Åpne chat</string>
     <string name="add_from_phone_book">Legg til fra telefonboken min</string>
@@ -1488,10 +1488,10 @@
     <string name="call_transfer_title">Overfør</string>
     <string name="call_transfer_failure">Det oppstod en feil under overføring av samtalen</string>
     <string name="call_transfer_users_tab_title">Brukere</string>
-    <string name="re_authentication_default_confirm_text">Element krever at du oppgir legitimasjonen din for å utføre denne handlingen.</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} krever at du oppgir legitimasjonen din for å utføre denne handlingen.</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
     <string name="startup_notification_fdroid_battery_optim_title">Bakgrunnsforbindelse</string>
-    <string name="startup_notification_privacy_message">Element kan kjøre i bakgrunnen for å administrere varslene dine sikkert og privat. Dette kan påvirke batteriforbruket.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} kan kjøre i bakgrunnen for å administrere varslene dine sikkert og privat. Dette kan påvirke batteriforbruket.</string>
     <string name="reset_secure_backup_warning">Dette vil erstatte din nåværende nøkkel eller frase.</string>
     <string name="reset_secure_backup_title">Generer en ny sikkerhetsnøkkel eller sett en ny sikkerhetsfrase for din eksisterende sikkerhetskopi.</string>
     <string name="settings_secure_backup_section_info">Beskytt deg mot å miste tilgang til krypterte meldinger og data ved å sikkerhetskopiere krypteringsnøkler på serveren din.</string>
@@ -1529,7 +1529,7 @@
     <string name="settings_notification_privacy_fcm">• Meldinger sendes via Firebase Cloud Messaging</string>
     <string name="settings_notification_privacy_need_permission">Appen trenger tillatelse for å kjøre i bakgrunnen</string>
     <string name="settings_troubleshoot_test_battery_failed">Hvis en bruker lar en enhet være frakoblet og stasjonær i en periode, mens skjermen er slått av, går enheten i Døsemodus. Dette forhindrer apper i å få tilgang til nettverket og avviser jobber, synkroniseringer og standardalarmer.</string>
-    <string name="settings_troubleshoot_test_battery_success">Element påvirkes ikke av batterioptimalisering.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} påvirkes ikke av batterioptimalisering.</string>
     <string name="settings_troubleshoot_test_notification_notification_clicked">Meldingen er klikket!</string>
     <string name="settings_troubleshoot_test_notification_notice">Klikk på varselet. Hvis du ikke ser varselet, må du sjekke systeminnstillingene.</string>
     <string name="settings_troubleshoot_test_notification_title">Varslingsvisning</string>
@@ -1564,7 +1564,7 @@
     <string name="system_theme">System standard</string>
     <string name="search_banned_user_hint">Filtrer utestengte brukere</string>
     <string name="room_permissions_modify_widgets">Endre widgets</string>
-    <string name="settings_opt_in_of_analytics_prompt">Aktiver analyse for å hjelpe med å forbedre Element.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Aktiver analyse for å hjelpe med å forbedre ${app_name}.</string>
     <string name="startup_notification_privacy_title">Varsel Personvern</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Inkluderer avatar og visningsnavnendringer.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Vis kontohendelser</string>
@@ -1591,9 +1591,9 @@
     <string name="settings_set_sync_timeout">Tidsavbrudd for synkronisering forespørsel</string>
     <string name="settings_enable_background_sync">Aktiver synkronisering i bakgrunnen</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Du vil ikke bli varslet om innkommende meldinger når appen er i bakgrunnen.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element vil synkroniseres i bakgrunnen med jevne mellomrom på presis tid (konfigurerbar).
-\nDette vil påvirke radio og batteribruk, det vises en permanent melding om at Element lytter etter hendelser.</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element synkroniseres i bakgrunnen på en måte som bevarer enhetens begrensede ressurser (batteri).
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} vil synkroniseres i bakgrunnen med jevne mellomrom på presis tid (konfigurerbar).
+\nDette vil påvirke radio og batteribruk, det vises en permanent melding om at ${app_name} lytter etter hendelser.</string>
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} synkroniseres i bakgrunnen på en måte som bevarer enhetens begrensede ressurser (batteri).
 \nAvhengig av enhetens ressurstilstand, kan synkroniseringen bli utsatt av operativsystemet.</string>
     <string name="settings_messages_in_group_chat">Msgs i gruppechatter</string>
     <string name="settings_containing_my_user_name">Msgs som inneholder brukernavnet mitt</string>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 843d605454..a2e12e99e2 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -213,7 +213,7 @@
     <string name="local_address_book_header">Lokale contactenlijst</string>
     <string name="matrix_only_filter">Alleen Matrix-contacten</string>
     <string name="no_conversation_placeholder">Geen gesprekken</string>
-    <string name="no_contact_access_placeholder">U heeft Element geen toegang tot uw lokale contacten gegeven</string>
+    <string name="template_no_contact_access_placeholder">U heeft ${app_name} geen toegang tot uw lokale contacten gegeven</string>
     <string name="no_result_placeholder">Geen resultaten</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Gesprekken</string>
@@ -353,22 +353,22 @@
     <string name="media_picker_cannot_record_video">Kan geen video opnemen"</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informatie</string>
-    <string name="permissions_rationale_msg_storage">Element heeft toegang nodig tot uw mediabestanden om bijlagen te verzenden en op te slaan.
+    <string name="template_permissions_rationale_msg_storage">${app_name} heeft toegang nodig tot uw mediabestanden om bijlagen te verzenden en op te slaan.
 \n
 \nVerleen toegang op de volgende pop-up om bestanden vanaf uw telefoon te sturen.</string>
-    <string name="permissions_rationale_msg_camera">Element heeft toegang nodig tot uw camera om foto’s en video-oproepen te maken.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} heeft toegang nodig tot uw camera om foto’s en video-oproepen te maken.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nVerleen toegang op de volgende pop-up om de oproep te maken."</string>
-    <string name="permissions_rationale_msg_record_audio">Element heeft toegang nodig tot uw microfoon om spraakoproepen te maken.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} heeft toegang nodig tot uw microfoon om spraakoproepen te maken.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nVerleen toegang op de volgende pop-up om de oproep te maken."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element heeft toegang nodig tot uw camera en microfoon om video-oproepen te maken.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} heeft toegang nodig tot uw camera en microfoon om video-oproepen te maken.
 \n
 \nVerleen toegang op de volgende pop-ups om de oproep te maken.</string>
-    <string name="permissions_rationale_msg_contacts">Element kan uw adresboek benaderen om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers. Als u het goed vindt om uw adresboek hiervoor te delen, verleen dan toegang op de volgende pop-up.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element kan uw adresboek gebruiken om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} kan uw adresboek benaderen om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers. Als u het goed vindt om uw adresboek hiervoor te delen, verleen dan toegang op de volgende pop-up.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} kan uw adresboek gebruiken om andere Matrix-gebruikers te vinden aan de hand van hun e-mailadressen en telefoonnummers.
 \n 
 \nWilt u uw adresboek hiervoor delen\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Sorry. De actie is niet toegepast vanwege ontbrekende rechten</string>
@@ -901,12 +901,12 @@
     <string name="settings_deactivate_account_section">Account deactiveren</string>
     <string name="settings_deactivate_my_account">Mijn account deactiveren</string>
     <string name="startup_notification_privacy_title">Meldingsprivacy</string>
-    <string name="startup_notification_privacy_message">Element kan op de achtergrond werken om uw meldingen veilig en privé te beheren. Dit beïnvloedt mogelijk het accuverbruik.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} kan op de achtergrond werken om uw meldingen veilig en privé te beheren. Dit beïnvloedt mogelijk het accuverbruik.</string>
     <string name="startup_notification_privacy_button_grant">Toestemming verlenen</string>
     <string name="startup_notification_privacy_button_other">Kies een andere optie</string>
     <string name="settings_opt_in_of_analytics">Statistische gegevens (analytics) versturen</string>
-    <string name="settings_opt_in_of_analytics_summary">Element verzamelt anonieme statistische gegevens (analytics) om het voor ons mogelijk te maken om de app te verbeteren.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Schakel statistische gegevens in om ons te helpen bij het verbeteren van Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} verzamelt anonieme statistische gegevens (analytics) om het voor ons mogelijk te maken om de app te verbeteren.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Schakel statistische gegevens in om ons te helpen bij het verbeteren van ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, ik wil helpen!</string>
     <string name="widget_integration_missing_parameter">Er ontbreekt een vereiste parameter.</string>
     <string name="widget_integration_invalid_parameter">Er is een parameter ongeldig.</string>
@@ -927,7 +927,7 @@
     <string name="e2e_re_request_encryption_key">Beveiligingssleutels van uw sessies <u>opnieuw aanvragen</u>.</string>
     <string name="e2e_re_request_encryption_key_sent">Sleutelaanvraag verstuurd.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Aanvraag verstuurd</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Start Element op een ander apparaat dat het bericht kan ontsleutelen, zodat het de sleutels naar deze sessie kan sturen.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Start ${app_name} op een ander apparaat dat het bericht kan ontsleutelen, zodat het de sleutels naar deze sessie kan sturen.</string>
     <string name="lock_screen_hint">Typ hier…</string>
     <string name="clear">Wissen</string>
     <string name="option_send_voice">Spraakbericht versturen</string>
@@ -1007,7 +1007,7 @@
     <string name="accept">Aanvaarden</string>
     <string name="auth_accept_policies">Gelieve het beleid van deze thuisserver te lezen en aanvaarden:</string>
     <string name="settings_call_category">Oproepen</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Gebruik de standaardbeltoon van Element voor inkomende oproepen</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Gebruik de standaardbeltoon van ${app_name} voor inkomende oproepen</string>
     <string name="settings_call_ringtone_title">Beltoon voor inkomende oproepen</string>
     <string name="settings_call_ringtone_dialog_title">Selecteer beltoon voor oproepen:</string>
     <string name="room_participants_action_kick">Eruit sturen</string>
@@ -1069,8 +1069,8 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Inschakelen</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sessie-instellingen.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Meldingen zijn ingeschakeld voor deze sessie.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Meldingen zijn niet ingeschakeld voor deze sessie. 
-\nGelieve de Element-instellingen te controleren.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Meldingen zijn niet ingeschakeld voor deze sessie.
+\nGelieve de ${app_name}-instellingen te controleren.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Inschakelen</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Aangepaste instellingen.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Sommige soorten berichten zijn stil (ze geven een geluidsloze melding).</string>
@@ -1079,7 +1079,7 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Instellingen controleren</string>
     <string name="settings_troubleshoot_test_play_services_title">Play-diensten controleren</string>
     <string name="settings_troubleshoot_test_play_services_success">De APK van Google Play Services is beschikbaar en up-to-date.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element maakt gebruikt van Google Play Services om pushberichten af te leveren, maar dit lijkt niet juist geconfigureerd te zijn:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} maakt gebruikt van Google Play Services om pushberichten af te leveren, maar dit lijkt niet juist geconfigureerd te zijn:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Play-diensten herstellen</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase-bewijs</string>
@@ -1087,12 +1087,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Het FCM-bewijs is niet opgehaald:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nDeze fout is onafhankelijk van Element. Volgens Google betekent deze fout dat het apparaat te veel apps heeft geregistreerd met FCM. De fout treedt enkel op ingeval er een enorm aantal apps is, dus zou dit de gemiddelde gebruiker niet mogen hinderen.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nDeze fout is onafhankelijk van Element. Ze kan verschillende oorzaken hebben. Misschien werkt het als u het later opnieuw probeert. U kunt ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van uw apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nDeze fout is onafhankelijk van Element. Er is geen Google-account verbonden met de telefoon. Open het accountbeheer en voeg er een Google-account toe.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nDeze fout is onafhankelijk van ${app_name}. Volgens Google betekent deze fout dat het apparaat te veel apps heeft geregistreerd met FCM. De fout treedt enkel op ingeval er een enorm aantal apps is, dus zou dit de gemiddelde gebruiker niet mogen hinderen.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nDeze fout is onafhankelijk van ${app_name}. Ze kan verschillende oorzaken hebben. Misschien werkt het als u het later opnieuw probeert. U kunt ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van uw apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nDeze fout is onafhankelijk van ${app_name}. Er is geen Google-account verbonden met de telefoon. Open het accountbeheer en voeg er een Google-account toe.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Account toevoegen</string>
     <string name="settings_troubleshoot_test_token_registration_title">Bewijsregistratie</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM-bewijs geregistreerd bij thuisserver.</string>
@@ -1108,17 +1108,17 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Dienst is niet herstart</string>
     <string name="settings_troubleshoot_test_service_boot_title">Starten bij opstarten van apparaat</string>
     <string name="settings_troubleshoot_test_service_boot_success">De dienst zal starten wanneer het apparaat wordt herstart.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">De dienst zal niet starten wanneer het apparaat wordt herstart en u zult geen meldingen ontvangen tot u Element hebt geopend.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">De dienst zal niet starten wanneer het apparaat wordt herstart en u zult geen meldingen ontvangen tot u ${app_name} hebt geopend.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Starten bij opstarten inschakelen</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Achtergrondbeperkingen controleren</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Achtergrondbeperkingen zijn uitgeschakeld voor Element. Deze test dient uitgevoerd te worden met een mobiele verbinding (geen wifi).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Achtergrondbeperkingen zijn uitgeschakeld voor ${app_name}. Deze test dient uitgevoerd te worden met een mobiele verbinding (geen wifi).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Achtergrondbeperkingen zijn ingeschakeld voor Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Achtergrondbeperkingen zijn ingeschakeld voor ${app_name}.
 \nAl wat de app probeert te doen zal in de achtergrond hevig beperkt worden; dit kan het correct functioneren van meldingen beïnvloeden.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Beperkingen uitschakelen</string>
     <string name="settings_troubleshoot_test_battery_title">Accuoptimalisatie</string>
-    <string name="settings_troubleshoot_test_battery_success">Element wordt niet beperkt door accuoptimalisatie.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} wordt niet beperkt door accuoptimalisatie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Als een gebruiker een apparaat los van de oplader een tijd laat stilliggen, met het scherm uitgeschakeld, gaat het apparaat in slaapmodus. Dit verhindert apps de toegang tot het netwerk, en stelt hun taken, synchronisaties en standaardalarmen uit.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimalisatie negeren</string>
     <string name="settings_notification_privacy_no_background_sync">De app heeft <b>geen</b> verbinding met de homeserver nodig in de achtergrond, dit zou het gebruik van de batterij moeten verlagen</string>
@@ -1130,8 +1130,8 @@
     <string name="settings_send_message_with_enter">Berichten versturen met Enter</string>
     <string name="settings_send_message_with_enter_summary">De Enter-knop van het toetsenbord zal berichten versturen in plaats van een regeleinde in te voegen</string>
     <string name="startup_notification_fdroid_battery_optim_title">Achtergrondverbinding</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element heeft een achtergrondverbinding met lage impact nodig om betrouwbare meldingen te kunnen hebben.
-\nOp het volgende scherm zult u gevraagd worden om Element toestemming te verlenen om altijd in de achtergrond te kunnen draaien, gelieve deze toestemming te verlenen.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} heeft een achtergrondverbinding met lage impact nodig om betrouwbare meldingen te kunnen hebben.
+\nOp het volgende scherm zult u gevraagd worden om ${app_name} toestemming te verlenen om altijd in de achtergrond te kunnen draaien, gelieve deze toestemming te verlenen.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Toestemming verlenen</string>
     <string name="settings_data_save_mode_summary">Databesparingsmodus past een specifieke filter toe zodat aanwezigheidsupdates en typmeldingen weggefilterd worden.</string>
     <string name="account_email_error">Er is een fout opgetreden bij het verifiëren van uw e-mailadres.</string>
@@ -1190,7 +1190,7 @@
     <string name="passphrase_passphrase_does_not_match">Wachtwoorden komen niet overeen</string>
     <string name="passphrase_empty_error_message">Voer een wachtwoord in</string>
     <string name="passphrase_passphrase_too_weak">Wachtwoord is te zwak</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Verwijder het wachtwoord als u wilt dat Element een herstelsleutel genereert.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Verwijder het wachtwoord als u wilt dat ${app_name} een herstelsleutel genereert.</string>
     <string name="keys_backup_no_session_error">Geen Matrix-sessie beschikbaar</string>
     <string name="keys_backup_setup_step1_title">Verlies nooit uw versleutelde berichten</string>
     <string name="keys_backup_setup_step1_description">Berichten in versleutelde gesprekken worden beveiligd met eind-tot-eind-versleuteling. Enkel de ontvanger(s) en u hebben de sleutels om deze berichten te lezen. 
@@ -1296,7 +1296,7 @@
     <string name="keys_backup_info_title_signature">Ondertekening</string>
     <string name="autodiscover_invalid_response">Ongeldig thuisserverontdekkingsantwoord</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Serveropties automatisch aanvullen</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element heeft een aangepaste serverconfiguratie gedetecteerd voor uw gebruikers-ID-domein ‘%1$s’:
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} heeft een aangepaste serverconfiguratie gedetecteerd voor uw gebruikers-ID-domein ‘%1$s’:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Configuratie gebruiken</string>
     <string name="error_jitsi_not_supported_on_old_device">Sorry, vergadergesprekken met Jitsi worden nog niet ondersteund op oudere apparaten (met een Android-versie lager dan 6.0)</string>
@@ -1372,13 +1372,13 @@
     <string name="settings_call_ringtone_use_default_stun_sum">Zal %s gebruiken om te assisteren in het geval dat uw thuisserver er niet over beschikt (uw IP-adres zal tijdens een oproep gedeeld worden)</string>
     <string name="invite_no_identity_server_error">Voeg een identiteitsserver toe in de instellingen om dit te doen.</string>
     <string name="settings_add_3pid_confirm_password_title">Bevestig uw wachtwoord</string>
-    <string name="settings_add_3pid_flow_not_supported">U kunt dit niet doen vanaf de mobiele Element</string>
+    <string name="template_settings_add_3pid_flow_not_supported">U kunt dit niet doen vanaf de mobiele ${app_name}</string>
     <string name="settings_background_fdroid_sync_mode">Synchroniseren op de achtergrond</string>
     <string name="settings_background_fdroid_sync_mode_battery">Geoptimaliseerd voor batterij</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element zal op een batterijzuinige manier synchroniseren op de achtergrond.
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} zal op een batterijzuinige manier synchroniseren op de achtergrond.
 \nAfhankelijk van de staat van uw apparaat kan het besturingssysteem de synchronisatie uitstellen.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Geoptimaliseerd voor snelheid</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element zal periodiek op de achtergrond synchroniseren (configureerbaar).
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} zal periodiek op de achtergrond synchroniseren (configureerbaar).
 \nDit heeft een negatieve impact op uw batterij- en datagebruik. Er zal een melding getoond worden ter informatie.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Geen achtergrondssynchronisatie</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">U zal geen melding van berichten ontvangen als de app zich in de achtergrond bevindt.</string>
@@ -1461,7 +1461,7 @@
     <string name="please_wait">Even wachten…</string>
     <string name="group_all_communities">Alle Gemeenschappen</string>
     <string name="room_preview_no_preview">Dit gesprek kan niet worden voorvertoond</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">De voorvertoning van wereld-leesbare gesprekken zijn nog niet ondersteund in Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">De voorvertoning van wereld-leesbare gesprekken zijn nog niet ondersteund in ${app_name}</string>
     <string name="fab_menu_create_room">Gesprekken</string>
     <string name="fab_menu_create_chat">Directe Berichten</string>
     <string name="create_room_title">Nieuw Gesprek</string>
diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml
index 783778ec6a..ed8afce0c9 100644
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@@ -148,7 +148,7 @@
     <string name="user_directory_header">Brukarkatalog</string>
     <string name="matrix_only_filter">Berre Matrix-kontaktar</string>
     <string name="no_conversation_placeholder">Ingen samtalar</string>
-    <string name="no_contact_access_placeholder">Du gav ikkje Element tilgang til dei lokale kontaktane dine</string>
+    <string name="template_no_contact_access_placeholder">Du gav ikkje ${app_name} tilgang til dei lokale kontaktane dine</string>
     <string name="no_result_placeholder">Ingen treff</string>
     <string name="rooms_header">Rom</string>
     <string name="rooms_directory_header">Romkatalog</string>
@@ -262,7 +262,7 @@
     <string name="e2e_re_request_encryption_key"><u>Etterspør på nytt krypteringsnøkklar</u> frå dei andre einingane dine.</string>
     <string name="e2e_re_request_encryption_key_sent">Nøkkelførespurnaden er sendt.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Førespurnaden er send</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Start Element på ein annan eining som kan dekryptere meldingen, slik at den kan sende nøkklane til denne sesjonen</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Start ${app_name} på ein annan eining som kan dekryptere meldingen, slik at den kan sende nøkklane til denne sesjonen</string>
     <string name="read_receipts_list">Les kvitteringsliste</string>
     <string name="groups_list">Gruppeliste</string>
     <plurals name="membership_changes">
@@ -297,23 +297,23 @@
     <string name="media_picker_both_capture_title">Ta bilete eller video</string>
     <string name="media_picker_cannot_record_video">Kan ikkje spela inn video</string>
     <string name="permissions_rationale_popup_title">Info</string>
-    <string name="permissions_rationale_msg_storage">Element treng tilgang til bilete- og videobiblioteket for å senda og lagra vedlegg.
+    <string name="template_permissions_rationale_msg_storage">${app_name} treng tilgang til bilete- og videobiblioteket for å senda og lagra vedlegg.
 \n 
 \nGje tilgang i sprettvindauget som kjem for å senda filer frå mobilen.</string>
-    <string name="permissions_rationale_msg_camera">Element treng tilgang til kameraet ditt for å ta bilete og videosamtalar.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} treng tilgang til kameraet ditt for å ta bilete og videosamtalar.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nVer venleg og gje tilgang på sprettvindauget som kjem for å starta samtalen."</string>
-    <string name="permissions_rationale_msg_record_audio">Element treng tilgang til mikrofonen din for å utføra talesamtalar.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} treng tilgang til mikrofonen din for å utføra talesamtalar.</string>
     <string name="call_error_ice_failed">Mediaforbindelsen feila</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nGjer vel og gje tilgang på sprettvindauget som kjem for å utføra samtalen."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element treng tilgang til kameraet og mikrofonen din for å utføra videosamtalar.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} treng tilgang til kameraet og mikrofonen din for å utføra videosamtalar.
 \n
 \nGjer vel og gjev tilgang på sprettvindauget som kjem for å utføra samtalen.</string>
-    <string name="permissions_rationale_msg_contacts">Element treng tilgang til kontaktliste for å finna andre Matrix-brukarar basert på e-post og telefonnummer. Viss du samtykker til å dele kontaktlista, ver venleg å tillat tilgang på sprettvindauget som kjem på neste skjermbilete.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element treng tilgang til kontaktliste for å finna andre Matrix-brukarar basert på e-post og telefonnummer.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} treng tilgang til kontaktliste for å finna andre Matrix-brukarar basert på e-post og telefonnummer. Viss du samtykker til å dele kontaktlista, ver venleg å tillat tilgang på sprettvindauget som kjem på neste skjermbilete.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} treng tilgang til kontaktliste for å finna andre Matrix-brukarar basert på e-post og telefonnummer.
 \n
 \nSamtykker du til å dele adresseboka for dette føremålet \?</string>
     <string name="permissions_action_not_performed_missing_permissions">Beklagar. Grunna manglande tilgangar, vart ikkje handlinga utført</string>
@@ -538,13 +538,13 @@
     <string name="settings_deactivate_account_section">Deaktiver konto</string>
     <string name="settings_deactivate_my_account">Deaktiver kontoen min</string>
     <string name="startup_notification_privacy_title">Personvern ved varslingar</string>
-    <string name="startup_notification_privacy_message">Element kan køyra i bakgrunnen for å sikkert og privat halda styr på varsla dine (dette kan påverka batteribruk).</string>
+    <string name="template_startup_notification_privacy_message">${app_name} kan køyra i bakgrunnen for å sikkert og privat halda styr på varsla dine (dette kan påverka batteribruk).</string>
     <string name="startup_notification_privacy_button_grant">Gje tillating</string>
     <string name="startup_notification_privacy_button_other">vel noko anna</string>
     <string name="settings_analytics">Statistikk</string>
     <string name="settings_opt_in_of_analytics">Send statistikkdata</string>
-    <string name="settings_opt_in_of_analytics_summary">Element samlar anonym statistikk inn for å forbetra applikasjonen.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Ver venleg og skru statistikkinnsamling på for å hjelpa oss med å forbetra Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} samlar anonym statistikk inn for å forbetra applikasjonen.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Ver venleg og skru statistikkinnsamling på for å hjelpa oss med å forbetra ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, eg vil hjelpa til!</string>
     <string name="settings_data_save_mode">Datasparingsmodus</string>
     <string name="devices_details_dialog_title">Informasjon om sesjon</string>
@@ -865,7 +865,7 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="auth_accept_policies">Venligast sjå over og godta retningslinjene til heimtenaren:</string>
     <string name="login_error_unknown_host">Det gjeng ikkje å nå URL-en, gjer vel og sjå til honom</string>
     <string name="settings_call_category">Oppringingar</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Bruk standard Element-ringetone for innkommande samtalar</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Bruk standard ${app_name}-ringetone for innkommande samtalar</string>
     <string name="settings_call_ringtone_title">Ringetone for innkommande samtalar</string>
     <string name="settings_call_ringtone_dialog_title">Vel ringetone for samtalar:</string>
     <string name="video_call_in_progress">Ein videosamtale pågår…</string>
@@ -892,8 +892,8 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="settings_troubleshoot_test_account_settings_quickfix">Skru på</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sesjonsinnstillingar.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Varslingar er aktivert for denne sesjonen.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Varslingar er deaktivert for denne sesjonen.
-\nSjekk Element-innstillingane.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Varslingar er deaktivert for denne sesjonen.
+\nSjekk ${app_name}-innstillingane.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Skru på</string>
     <string name="notification_sync_init">setter opp tenesta</string>
     <string name="title_activity_keys_backup_setup">Sikkerheitskopi av nøkkel</string>
@@ -935,7 +935,7 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="invite_no_identity_server_error">Legg til ein identitetstenar i innstillingane for å utføre denne handlinga.</string>
     <string name="room_sliding_menu_version_x">Versjon %s</string>
     <string name="settings_add_3pid_confirm_password_title">Stadfest ditt passord</string>
-    <string name="settings_add_3pid_flow_not_supported">Denne handlinga kan ikkje utførast frå Element på mobil</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Denne handlinga kan ikkje utførast frå ${app_name} på mobil</string>
     <string name="settings_add_3pid_authentication_needed">Authentisering er påkrevd</string>
     <string name="settings_integrations">Integrasjonar</string>
     <string name="settings_integrations_summary">Bruk ein integrasjonshandterar (Integration Manager) for å handtere botar, bruer, tillegg og klistermerkepakker. 
@@ -1000,7 +1000,7 @@ Meldingssynlegheit på Matrix liknar på epost. At vi gløymer meldingane dine t
     <string name="sound_device_wireless_headset">Trådlaus hovudtelefon</string>
     <string name="sound_device_speaker">Høgtalar</string>
     <string name="call_select_sound_device">Vel eining for lyd</string>
-    <string name="call_failed_no_connection">Element-samtalen feila</string>
+    <string name="template_call_failed_no_connection">${app_name}-samtalen feila</string>
     <string name="no_more_results">Ingen fleire resultat</string>
     <string name="dialog_title_success">Suksess</string>
     <string name="action_add">Legg til</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 751e0ad349..982f41b0cc 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -163,7 +163,7 @@
     <string name="user_directory_header">Katalog użytkowników</string>
     <string name="matrix_only_filter">Tylko kontakty Matrixa</string>
     <string name="no_conversation_placeholder">Brak rozmów</string>
-    <string name="no_contact_access_placeholder">Nie udzieliłeś(-aś) uprawnienia na dostęp do listy kontaktów</string>
+    <string name="template_no_contact_access_placeholder">Nie udzieliłeś(-aś) uprawnienia na dostęp do listy kontaktów</string>
     <string name="no_result_placeholder">Brak wyników</string>
     <string name="rooms_header">Pokoje</string>
     <string name="rooms_directory_header">Katalog pokojów</string>
@@ -279,11 +279,11 @@
     <string name="media_picker_both_capture_title">Zrób zdjęcie lub nagraj film</string>
     <string name="media_picker_cannot_record_video">Nie można nagrać filmu</string>
     <string name="permissions_rationale_popup_title">Informacja</string>
-    <string name="permissions_rationale_msg_storage">Element wymaga uprawnienia, aby wysyłać i zapisywać pliki multimedialne.
+    <string name="template_permissions_rationale_msg_storage">${app_name} wymaga uprawnienia, aby wysyłać i zapisywać pliki multimedialne.
 
 Przyznaj dostęp w następnym oknie.</string>
-    <string name="permissions_rationale_msg_camera">Element wymaga uprawnienia, aby wykonywać zdjęcia i nawiązywać połączenia wideo.</string>
-    <string name="permissions_rationale_msg_record_audio">Element wymaga uprawnienia, aby przeprowadzić połączenie audio.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} wymaga uprawnienia, aby wykonywać zdjęcia i nawiązywać połączenia wideo.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} wymaga uprawnienia, aby przeprowadzić połączenie audio.</string>
     <string name="permissions_action_not_performed_missing_permissions">Nie można wykonać operacji, ze względu na brak wymaganych uprawnień</string>
     <string name="media_slider_saved">Zapisano</string>
     <string name="media_slider_saved_message">Zapisać do pobranych?</string>
@@ -601,13 +601,13 @@ Możesz dodać adres e-mail do swojego profilu w ustawieniach.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nZezwól na dostęp w następnym oknie aby móc wykonać połączenie."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element wymaga dostępu do kamery i mikrofonu, aby przeprowadzać rozmowy wideo.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} wymaga dostępu do kamery i mikrofonu, aby przeprowadzać rozmowy wideo.
 
 Przyznaj dostęp w następnym oknie.</string>
-    <string name="permissions_rationale_msg_contacts">Element może sprawdzić Twoją książkę adresową, aby znajdywać innych użytkowników Matrixa bazując na ich adresie e-mail i numerze telefonu. Jeśli zgadzasz się na udostępnienie Twojej książki adresowej w tym celu, zezwól na dostęp w następnym okienku.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element wymaga dostępu do kontaktów, aby znajdywać innych użytkowników Matrixa bazując na adresie e-mail i numerze telefonu.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} może sprawdzić Twoją książkę adresową, aby znajdywać innych użytkowników Matrixa bazując na ich adresie e-mail i numerze telefonu. Jeśli zgadzasz się na udostępnienie Twojej książki adresowej w tym celu, zezwól na dostęp w następnym okienku.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} wymaga dostępu do kontaktów, aby znajdywać innych użytkowników Matrixa bazując na adresie e-mail i numerze telefonu.
 \n
-\nZezwolić Element na dostęp do kontaktów\?</string>
+\nZezwolić ${app_name} na dostęp do kontaktów\?</string>
     <string name="list_members">Lista uczestników</string>
     <string name="open_chat_header">Otwarty nagłówek</string>
     <string name="room_sync_in_progress">Synchronizacja…</string>
@@ -716,7 +716,7 @@ Jesteś pewien?</string>
     <string name="e2e_re_request_encryption_key"><u>Poproś ponownie o klucze szyfrujące</u> z innych Twoich sesji.</string>
     <string name="e2e_re_request_encryption_key_sent">Prośba o klucz wysłana.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Prośba wysłana</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Uruchom proszę Element na innym urządzeniu, które może odszyfrować wiadomość, aby wysłać klucze do tej sesji.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Uruchom proszę ${app_name} na innym urządzeniu, które może odszyfrować wiadomość, aby wysłać klucze do tej sesji.</string>
     <string name="settings_notification_privacy">Prywatność powiadomień</string>
     <string name="settings_notification_privacy_normal">Standardowa</string>
     <string name="settings_notification_privacy_reduced">Zmniejszona prywatność</string>
@@ -730,12 +730,12 @@ Jesteś pewien?</string>
     <string name="settings_deactivate_account_section">Dezaktywuj konto</string>
     <string name="settings_deactivate_my_account">Dezaktywuj moje konto</string>
     <string name="startup_notification_privacy_title">Prywatność powiadomień</string>
-    <string name="startup_notification_privacy_message">Element może działać w tle aby bezpiecznie i prywatnie zarządzać Twoimi powiadomieniami. To może mieć wpływ na zużycie baterii.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} może działać w tle aby bezpiecznie i prywatnie zarządzać Twoimi powiadomieniami. To może mieć wpływ na zużycie baterii.</string>
     <string name="startup_notification_privacy_button_grant">Nadaj uprawnienie</string>
     <string name="startup_notification_privacy_button_other">Wybierz inną opcję</string>
     <string name="settings_opt_in_of_analytics">Wysyłaj dane analityczne</string>
-    <string name="settings_opt_in_of_analytics_summary">Element zbiera anonimowe informacje które pozwolą ulepszyć aplikację.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Włącz proszę dane analityczne, aby pomóc nam ulepszyć Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} zbiera anonimowe informacje które pozwolą ulepszyć aplikację.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Włącz proszę dane analityczne, aby pomóc nam ulepszyć ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Tak, chcę pomóc!</string>
     <string name="settings_delete_notification_targets_confirmation">Czy na pewno chcesz usunąć ten cel powiadomień?</string>
     <string name="room_settings_room_access_warning">Aby móc stworzyć link do pokoju musi on mieć swój adres.</string>
@@ -952,7 +952,7 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Użyj domyślnego dzwonka Element dla przychodzących połączeń</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Użyj domyślnego dzwonka ${app_name} dla przychodzących połączeń</string>
     <string name="call_anyway">Zadzwoń mimo to</string>
     <string name="settings_call_category">Połączenia</string>
     <string name="room_participants_action_kick">Wyrzuć</string>
@@ -989,7 +989,7 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
 Sprawdź ustawienia systemowe.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Powiadomienia są wyłączone dla twojego konta.
 Sprawdź ustawienia konta.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Powiadomienia nie są włączone dla tej sesji. Proszę sprawdź ustawienia Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Powiadomienia nie są włączone dla tej sesji. Proszę sprawdź ustawienia ${app_name}.</string>
     <string name="account_additional_info">Dodatkowe informacje: %s</string>
     <string name="account_phone_number_error">Wystąpił błąd podczas weryfikowania numeru telefonu.</string>
     <string name="account_email_error">Wystąpił błąd podczas weryfikowania adresu e-mail.</string>
@@ -1240,21 +1240,21 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Niektóre rodzaje wiadomości będą ciche (wygenerują powiadomienie bez dźwięku).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Nie udało się wczytać niestandardowych reguł, spróbuj ponowić.</string>
     <string name="settings_troubleshoot_test_play_services_title">Weryfikacja Usług Google</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element używa Usług Google Play do dostarczania wiadomości push. Konfiguracja usług nie wydaje się być prawidłowa:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} używa Usług Google Play do dostarczania wiadomości push. Konfiguracja usług nie wydaje się być prawidłowa:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_success">Otrzymano token FCM:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Niepowodzenie przy pobieraniu tokena FCM:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nElement nie ma wpływu na wystąpienie tego problemu. Na tym urządzeniu nie ma konta Google. Otwórz menadżer kont i dodaj konto Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\n${app_name} nie ma wpływu na wystąpienie tego problemu. Na tym urządzeniu nie ma konta Google. Otwórz menadżer kont i dodaj konto Google.</string>
     <string name="settings_troubleshoot_test_token_registration_success">Token FCM z powodzeniem zarejestrowany na serwerze domowym.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Niepowodzenie przy rejestracji tokena FCM na serwerze domowym:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_service_restart_success">Usługa została zatrzymana i automatycznie uruchomiona ponownie.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Usługa nie uruchomiła się ponownie</string>
     <string name="settings_troubleshoot_test_service_boot_success">Usługa zostanie uruchomiona przy starcie urządzenia.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Usługa nie zostanie uruchomiona przy starcie urządzenia, nie otrzymasz żadnych powiadomień, dopóki Element nie zostanie uruchomiony.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Usługa nie zostanie uruchomiona przy starcie urządzenia, nie otrzymasz żadnych powiadomień, dopóki ${app_name} nie zostanie uruchomiony.</string>
     <string name="sas_security_advise">Dla zwiększenia bezpieczeństwa, zalecamy aby wykonać ten krok osobiście lub przez inne zaufane środki komunikacji.</string>
     <string name="content_reported_content">Treść została zgłoszona.
 \n
@@ -1271,24 +1271,24 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="auth_add_email_and_phone_message_2">Wprowadź adres e-mail, aby możliwe było odzyskiwanie konta. Opcjonalnie użyj adresu e-mail lub numeru telefonu aby móc zostać odkrytym przez znajomych.</string>
     <string name="settings_call_ringtone_use_default_stun">Pozwól na awaryjny serwer wspomagania połączeń</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Użyje %s aby wspomagać gdy Twój serwer domowy takiego nie ofertuje (Twój adres IP będzie udostępniony podczas połączenia)</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nBłąd jest poza kontrolą Element i nawiązując do Google sygnalizuje on, iż urządzenie posiada zbyt wiele aplikacji zarejestrowanych z FCM. Błąd występuje jedynie w przypadku posiadania skrajnie wielu aplikacji, w związku z czym nie powinno dotknąć to normalnego użytkownika.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nBłąd jest poza kontrolą Element. Może on występować z wielu powodów. Przypuszczalnie aplikacja powróci do normalnego stanu po spróbowaniu ponownie, chociaż można sprawdzić także w ustawieniach systemu uprawnienia Usług Google Play dotyczące dostępu do sieci, sprawdzić prawidłowość zegaru urządzenia lub też, może być to błąd niestandardowego oprogramowania systemowego.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nBłąd jest poza kontrolą ${app_name} i nawiązując do Google sygnalizuje on, iż urządzenie posiada zbyt wiele aplikacji zarejestrowanych z FCM. Błąd występuje jedynie w przypadku posiadania skrajnie wielu aplikacji, w związku z czym nie powinno dotknąć to normalnego użytkownika.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nBłąd jest poza kontrolą ${app_name}. Może on występować z wielu powodów. Przypuszczalnie aplikacja powróci do normalnego stanu po spróbowaniu ponownie, chociaż można sprawdzić także w ustawieniach systemu uprawnienia Usług Google Play dotyczące dostępu do sieci, sprawdzić prawidłowość zegaru urządzenia lub też, może być to błąd niestandardowego oprogramowania systemowego.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktywuj uruchamianie przy starcie systemu</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Restrykcje dotyczące działania aplikacji w tle są wyłączone dla Element. Test powinen zostać uruchomiony używając danych komórkowych (bez WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Restrykcje dotyczące działania aplikacji w tle są wyłączone dla ${app_name}. Test powinen zostać uruchomiony używając danych komórkowych (bez WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Restrykcje dotyczące działania aplikacji w tle są włączone dla Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Restrykcje dotyczące działania aplikacji w tle są włączone dla ${app_name}.
 \nPraca którą aplikacja próbuje wykonać będzie agresywnie ograniczona podczas działania w tle i może wpłynąć na wyświetlanie powiadomień.
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_battery_success">Na Element nie ma wpływu Optymalizacja Baterii.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Na ${app_name} nie ma wpływu Optymalizacja Baterii.</string>
     <string name="settings_troubleshoot_test_battery_failed">Jeżeli użytkownik pozostawi urządzenie odłączone od zasilania oraz nieużywane przez określony okres, z wyłączonym ekranem, urządzenie przejdzie w tryb Doze. Uniemożliwia to aplikacjom dostęp do sieci i opóźnia ich zadania, synchonizację oraz standardowe alarmy.</string>
     <string name="settings_background_fdroid_sync_mode">Tryb synchronizacji w tle</string>
     <string name="settings_background_fdroid_sync_mode_battery">Zoptymalizowano dla baterii</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element będzie synchronizował się w tle w sposób który oszczędza limitowane zasoby urządzenia (baterię).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} będzie synchronizował się w tle w sposób który oszczędza limitowane zasoby urządzenia (baterię).
 \nW zależności od stanu zasobów urządzenia, synchronizacja może być opóźniania przez system operacyjny.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Zopytmalizowano dla działania w czasie rzeczywistym</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element będzie synchornizował się okresowo o ściśle określonym czasie (konfigurowalne).
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} będzie synchornizował się okresowo o ściśle określonym czasie (konfigurowalne).
 \nWpłynie to na użycie baterii i sieci, na panelu powiadomień pozostanie wyświetlone stałe powiadomiene o nasłuchiwaniu zdarzeń.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Brak synchronizacji w tle</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nie będziesz otrzymywać powiadomień o przychodzących wiadomościach gdy aplikacja będzie działać w tle.</string>
@@ -1305,8 +1305,8 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_send_message_with_enter_summary">Przycisk enter na klawiaturze programowej wyśle wiadomość zamiast wprowadzania łamanania linii</string>
     <string name="settings_discovery_category">Znajdź</string>
     <string name="settings_discovery_manage">Zarządzaj ustawieniami wyszukiwania.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element potrzebuje utrzymać mało wpływowe połączenie w tle, w celu otrzymywania wiarygodnych powiadomień.
-\nNa następnym ekranie zostanie się poproszonym o pozwolenie działania w tle dla Element, proszę zaakceptować.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} potrzebuje utrzymać mało wpływowe połączenie w tle, w celu otrzymywania wiarygodnych powiadomień.
+\nNa następnym ekranie zostanie się poproszonym o pozwolenie działania w tle dla ${app_name}, proszę zaakceptować.</string>
     <string name="settings_data_save_mode_summary">Tryb oszczędzania danych użyje filtra szczegółowego, w związku z czym aktualizacje o obecności i powiadomienia o pisaniu zostaną przefiltrowane.</string>
     <string name="settings_media">Media</string>
     <string name="settings_default_media_source">Domyślne źródło mediów</string>
@@ -1349,7 +1349,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="widget_integration_review_terms">Aby kontynuować, musisz zaakceptować Warunki użytkowania dla tej usługi.</string>
     <string name="no_valid_google_play_services_apk">Nie znaleziono prawidłowej aplikacji Usługi Google Play. Powiadomienia mogą nie działać prawidłowo.</string>
     <string name="passphrase_passphrase_too_weak">Hasło jest zbyt słabe</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Proszę usunąć hasło, jeżeli chcesz aby Element wygenerował klucz odzyskiwania.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Proszę usunąć hasło, jeżeli chcesz aby ${app_name} wygenerował klucz odzyskiwania.</string>
     <string name="keys_backup_no_session_error">Brak dostępnych sesji Matrix</string>
     <string name="keys_backup_setup_step1_title">Nie utrać zaszyfrowanych wiadomości</string>
     <string name="keys_backup_setup_step1_description">Wiadomości w pokojach zaszyfrowanych są bezpieczne dzięki szyfrowaniu end-to-end. Jedynie Ty i Twój odbiorca posiadają klucze dla tych wiadomości.
@@ -1412,7 +1412,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     </plurals>
     <string name="autodiscover_invalid_response">Nieprawidłowa odpowiedź funkcji autoodkrywania serwera domowego</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Opcje automatycznego uzupełniania serwerów</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element wykryło niestandardową konfigurację serwera dla Twojej domeny userID \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} wykryło niestandardową konfigurację serwera dla Twojej domeny userID \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Użyj Konfiguracji</string>
     <string name="invalid_or_expired_credentials">Zostałeś(-łaś) wylogowana ze względu na nieprawidłowe lub wygasłe dane logowania.</string>
@@ -1424,7 +1424,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="sas_view_request_action">Wyświetl żądanie</string>
     <string name="sas_verified_successful_description">Bezpieczne wiadomości od tego użytkownika są zabezpeiczone za pomocą szyfrowania end-to-end i są nie do odczytania przez osoby trzecie.</string>
     <string name="call_failed_no_ice_title">Połączenie nie powiodło się z powodu niewłaściwie skonfigurowanego serwera</string>
-    <string name="settings_add_3pid_flow_not_supported">Nie możesz tego zrobić z mobilnej aplikacji Element</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Nie możesz tego zrobić z mobilnej aplikacji ${app_name}</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Niektóre powiadomienia są wyłączone w osobistej konfiguracji.</string>
     <string name="settings_troubleshoot_test_play_services_success">Usługi Google Play są aktualne.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Automatycznie uruchom ponownie usługę powiadomień</string>
@@ -1449,7 +1449,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="room_list_people_empty_body">Twoje rozmowy bezpośrednie będą wyświetlane tutaj. Naciśnij przycisk + żeby rozpocząć nową.</string>
     <string name="room_list_rooms_empty_body">Twoje pokoje będą wyświetlane tutaj. Naciśnij przycisk +żeby znaleźć istniejące bądź utworzyć nowy.</string>
     <string name="malformed_message">Nieprawidłowe zdarzenie, nie można wyświetlić</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Podgląd globalnego, publicznego pokoju nie jest wciąż wspierany w Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Podgląd globalnego, publicznego pokoju nie jest wciąż wspierany w ${app_name}</string>
     <string name="keys_backup_unable_to_get_trust_info">Wystąpił błąd podczas otrzymywania zaufanych informacji</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Wystąpił błąd podczas uzyskiwania danych kluczy kopii zapasowej</string>
     <string name="import_e2e_keys_from_file">Importowanie kluczy E2E z pliku \"%1$s\".</string>
@@ -1519,7 +1519,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="content_reported_as_inappropriate_content">Zawartość została zgłoszona jako niewłaściwa.
 \n
 \nJeżeli nie chcesz widzieć treści od tego użytkownika, możesz go zablokować aby ukryć jego wiadomości.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element potrzebuje uprawnień aby zapisywać klucze E2E na dysku.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} potrzebuje uprawnień aby zapisywać klucze E2E na dysku.
 \n
 \nPozwól na dostęp w następnym oknie aby móc eksportować klucze ręcznie.</string>
     <string name="room_list_quick_actions_leave">Opuść pokój</string>
@@ -1655,7 +1655,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \nZaloguj się ponownie aby uzyskać dostęp do danych konta i wiadomości.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Utracisz dostęp do zaszyfrowanych wiadomości do czasu, aż zalogujesz się aby odzyskać Twoje klucze szyfrujące.</string>
     <string name="soft_logout_clear_data_dialog_submit">Wyczyść dane</string>
-    <string name="soft_logout_sso_not_same_user_error">Aktualna sesja jest dla użytkownika %1$s, podajesz natomiast dane dla użytkownika %2$s. Nie jest to wspierane przez Element.
+    <string name="template_soft_logout_sso_not_same_user_error">Aktualna sesja jest dla użytkownika %1$s, podajesz natomiast dane dla użytkownika %2$s. Nie jest to wspierane przez ${app_name}.
 \nNa początku usuń dane, następnie zaloguj ponownie na innym koncie.</string>
     <string name="permalink_malformed">Link matrix.to został zdeformowany</string>
     <string name="bug_report_error_too_short">Opis zbyt krótki</string>
@@ -1669,7 +1669,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="devices_other_devices">Inne sesje</string>
     <string name="autocomplete_limited_results">Wyświetlanie jedynie początkowych wyników, wprowadź więcej znaków…</string>
     <string name="settings_developer_mode_fail_fast_title">Bezproblemowy</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element może zawieszać się częściej gdy napotka na niespodziewany błąd</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} może zawieszać się częściej gdy napotka na niespodziewany błąd</string>
     <string name="command_description_shrug">Preparuje ¯\\_(ツ)_/¯ dla zwykłej wiadomości tekstowej</string>
     <string name="create_room_encryption_title">Aktywuj szyfrowanie</string>
     <string name="create_room_encryption_description">Odkąd zostanie włączone, szyfrowanie nie może zostać wyłączone.</string>
@@ -1734,9 +1734,9 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="room_member_power_level_moderator_in">Moderator w %1$s</string>
     <string name="room_member_power_level_custom_in">Niestandardowy (%1$d) w %2$s</string>
     <string name="room_member_jump_to_read_receipt">Przeskocz do znacznika odczytania</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element nie obsługuje wydarzeń typu \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element nie obsługuje wiadomości typu \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element napotkał problem przy wyświetlaniu zawartości wydarzenia z ID \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} nie obsługuje wydarzeń typu \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} nie obsługuje wiadomości typu \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} napotkał problem przy wyświetlaniu zawartości wydarzenia z ID \'%1$s\'</string>
     <string name="unignore">Nie ignoruj</string>
     <string name="verify_cannot_cross_sign">Sesja nie jest w stanie podzielić się weryfikacją z innymi sesjami.
 \nWeryfikacja zostanie zapisana lokalnie i udostępniona w przyszłych wersjach aplikacji.</string>
@@ -1872,7 +1872,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="room_profile_section_more_uploads">Przesłane pliki</string>
     <string name="settings_key_requests">Prośby o klucze</string>
     <string name="e2e_use_keybackup">Odblokuj historię zaszyfrowanych wiadomości</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="refresh">Odśwież</string>
     <string name="verify_new_session_notice">Użyj tej sesji do weryfikacji nowej, nadając jej dostęp do zaszyfrowanych wiadomości.</string>
     <string name="verify_new_session_was_not_me">To nie ja</string>
@@ -1941,11 +1941,11 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="identity_server_set_default_submit">Użyj %1$s</string>
     <string name="enter_secret_storage_passphrase_or_key">Użyj %1$s albo %2$s aby kontynuować.</string>
     <string name="command_description_discard_session_not_handled">Dostępne tylko w pokojach szyfrowanych</string>
-    <string name="use_latest_app">Skorzystaj z najnowszych aplikacji Element na innych urządzeniach:</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
+    <string name="template_use_latest_app">Skorzystaj z najnowszych aplikacji ${app_name} na innych urządzeniach:</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
     <string name="change_password_summary">Ustaw nowe hasło do konta…</string>
     <string name="error_saving_media_file">Nie można zapisać pliku multimediów</string>
     <string name="error_adding_media_file_to_gallery">Nie można dodać pliku multimediów do galerii</string>
@@ -2315,7 +2315,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="room_participants_power_level_demote_warning_title">Czy chcesz się zdegradować\?</string>
     <string name="permissions_denied_add_contact">Zezwól na dostęp do Twoich kontaktów.</string>
     <string name="call_select_sound_device">Wybierz urządzenie dźwiękowe</string>
-    <string name="call_failed_no_connection">Połączenie Element nieudane</string>
+    <string name="template_call_failed_no_connection">Połączenie ${app_name} nieudane</string>
     <string name="call_notification_reject">Zrezygnuj</string>
     <string name="start_chatting">Rozpocznij konwersację</string>
     <string name="matrix_to_card_title">Łącze Matrix</string>
@@ -2331,13 +2331,13 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="auth_pin_confirm_to_disable_title">Potwierdź PIN aby zablokować kod PIN</string>
     <string name="settings_security_pin_code_change_pin_summary">Zmień swój bieżący kod PIN</string>
     <string name="settings_security_pin_code_change_pin_title">Zmień kod PIN</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Kod PIN jest wymagany za każdym razem kiedy otwierasz Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">Kod PIN jest wymagany po dwóch minutach nieużywania Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Kod PIN jest wymagany za każdym razem kiedy otwierasz ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Kod PIN jest wymagany po dwóch minutach nieużywania ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Wymagaj kodu PIN po upływie dwóch minut</string>
     <string name="settings_security_pin_code_notifications_summary_off">Wyświetlaj tylko liczbę nieprzeczytanych wiadomości w prostym powiadomieniu.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Pokazuj szczegóły takie jak nazwa pokoju lub treść wiadomości.</string>
     <string name="settings_security_pin_code_notifications_title">Pokazuj treść w powiadomieniach</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">Kod PIN jest jedynym sposobem na odblokowanie Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">Kod PIN jest jedynym sposobem na odblokowanie ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Włącz specyficzne dla urządzenia funkcje biometryczne takie jak czytnik odcisków palców bądź rozpoznawanie twarzy.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Włącz biometrię</string>
     <string name="settings_security_pin_code_summary">Jeżeli chcesz zresetować kod PIN, naciśnij Zapomnij kod PIN aby wylogować i zresetować.</string>
@@ -2367,11 +2367,11 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="identity_server_user_consent_not_provided">Użytkownik nie udzielił zgody.</string>
     <string name="identity_server_error_no_current_binding_error">Obecnie brak powiązania z tym identyfikatorem.</string>
     <string name="identity_server_error_binding_error">Powiązanie nieudane.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">W trosce o Twoją prywatność, Element obsługuje jedynie wysłanie skrótów (hash) adresów e-mail oraz numerów telefonu.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">W trosce o Twoją prywatność, ${app_name} obsługuje jedynie wysłanie skrótów (hash) adresów e-mail oraz numerów telefonu.</string>
     <string name="identity_server_error_terms_not_signed">Zaakceptuj najpierw reguły serwera tożsamości w ustawieniach.</string>
     <string name="identity_server_error_no_identity_server_configured">Najpierw skonfiguruj serwer tożsamości.</string>
     <string name="identity_server_error_outdated_home_server">Ta operacja nie jest możliwa. Ten serwer domowy jest przestarzały.</string>
-    <string name="identity_server_error_outdated_identity_server">Ten serwer tożsamości jest przestarzały. Element obsługuje jedynie API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Ten serwer tożsamości jest przestarzały. ${app_name} obsługuje jedynie API V2.</string>
     <string name="disconnect_identity_server_dialog_content">Rozłączyć z serwerem tożsamości %s\?</string>
     <string name="open_terms_of">Otwórz warunki %s</string>
     <string name="choose_locale_loading_locales">Ładowanie dostępnych języków…</string>
@@ -2391,8 +2391,8 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="not_a_valid_qr_code">To nie jest prawidłowy kod QR Matrix</string>
     <string name="invitations_sent_to_two_users">Zaproszenia wysłane do %1$s i %2$s</string>
     <string name="invitation_sent_to_one_user">Zaproszenie wysłane do %1$s</string>
-    <string name="invite_friends_rich_title">🔐️ Dołącz do mnie na Element</string>
-    <string name="invite_friends_text">Cześć, pogadaj ze mną na Element: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Dołącz do mnie na ${app_name}</string>
+    <string name="template_invite_friends_text">Cześć, pogadaj ze mną na ${app_name}: %s</string>
     <string name="invite_friends">Zaproś przyjaciół</string>
     <string name="invite_users_to_room_title">Zaproś użytkowników</string>
     <string name="inviting_users_to_room">Zapraszanie użytkowników…</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 8f9ac6af09..ce104ed847 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -344,7 +344,7 @@
     <string name="local_address_book_header">Agenda de endereços local</string>
     <string name="matrix_only_filter">Apenas contatos na Matrix</string>
     <string name="no_conversation_placeholder">Nenhuma conversa</string>
-    <string name="no_contact_access_placeholder">Você não permitiu que o Element acesse seus contatos locais</string>
+    <string name="template_no_contact_access_placeholder">Você não permitiu que o ${app_name} acesse seus contatos locais</string>
     <string name="no_result_placeholder">Nenhum resultado</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
@@ -484,22 +484,22 @@
     <string name="media_picker_cannot_record_video">Não é possível gravar vídeo</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informação</string>
-    <string name="permissions_rationale_msg_storage">Element precisa de permissão para acessar sua galeria de fotos e vídeos para enviar e salvar anexos.
+    <string name="template_permissions_rationale_msg_storage">${app_name} precisa de permissão para acessar sua galeria de fotos e vídeos para enviar e salvar anexos.
 \n
 \nPor favor, permita o acesso na próxima tela para poder enviar arquivos do seu celular.</string>
-    <string name="permissions_rationale_msg_camera">Element necessita permissão para acessar sua câmera para poder tirar fotos e fazer chamadas de vídeo.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} necessita permissão para acessar sua câmera para poder tirar fotos e fazer chamadas de vídeo.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nPor favor, permita o acesso na próxima tela para fazer a chamada."</string>
-    <string name="permissions_rationale_msg_record_audio">Element necessita permissão para acessar seu microfone para realizar chamadas de áudio.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} necessita permissão para acessar seu microfone para realizar chamadas de áudio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nPor favor, permita o acesso na próxima tela para fazer a chamada."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element necessita permissão para acessar sua câmera e seu microfone para fazer chamadas de vídeo.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} necessita permissão para acessar sua câmera e seu microfone para fazer chamadas de vídeo.
 \n
 \nPor favor, permita o acesso na próxima tela para fazer a chamada.</string>
-    <string name="permissions_rationale_msg_contacts">Element precisa de permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus e-mails e números de telefone. Se você concordar em usar a sua lista de contatos para esse propósito, permita o acesso na próxima janela pop-up.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element precisa de permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus e-mails e números de telefone.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} precisa de permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus e-mails e números de telefone. Se você concordar em usar a sua lista de contatos para esse propósito, permita o acesso na próxima janela pop-up.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} precisa de permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus e-mails e números de telefone.
 \n
 \nVocê concorda em usar a sua lista de contatos para esse propósito\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Desculpe. A ação não foi realizada, por falta de permissão</string>
@@ -1036,7 +1036,7 @@
     <string name="e2e_re_request_encryption_key">Solicitar novamente as chaves de criptografia das suas outras sessões.<u>Pedir novamente as chaves de criptografia</u> de seus outros dispositivos.</string>
     <string name="e2e_re_request_encryption_key_sent">Requisição de chave enviada.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Requisição enviada</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Por favor, inicie o Element em outro aparelho que possa descriptografar a mensagem, de modo que ele possa enviar as chaves para esta sessão.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Por favor, inicie o ${app_name} em outro aparelho que possa descriptografar a mensagem, de modo que ele possa enviar as chaves para esta sessão.</string>
     <plurals name="format_time_s">
         <item quantity="one">%ds</item>
         <item quantity="other">%ds</item>
@@ -1074,12 +1074,12 @@
     <string name="settings_deactivate_account_section">Desativar minha conta</string>
     <string name="settings_deactivate_my_account">Desativar minha conta</string>
     <string name="startup_notification_privacy_title">Privacidade das notificações</string>
-    <string name="startup_notification_privacy_message">Element pode funcionar em segundo plano para gerenciar as suas notificações de forma segura e confidencial. Isso poderá impactar o uso da bateria.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} pode funcionar em segundo plano para gerenciar as suas notificações de forma segura e confidencial. Isso poderá impactar o uso da bateria.</string>
     <string name="startup_notification_privacy_button_grant">Conceder a permissão</string>
     <string name="startup_notification_privacy_button_other">Escolha outra opção</string>
     <string name="settings_opt_in_of_analytics">Enviar dados de uso</string>
-    <string name="settings_opt_in_of_analytics_summary">Element coleta dados de uso anônimos para nos ajudar a melhorar o aplicativo.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Por favor, ative o envio de dados de uso para nos ajudar a melhorar o Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} coleta dados de uso anônimos para nos ajudar a melhorar o aplicativo.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Por favor, ative o envio de dados de uso para nos ajudar a melhorar o ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Sim, eu quero ajudar!</string>
     <string name="settings_without_flair">Você não faz parte de alguma comunidade, no momento.</string>
     <string name="lock_screen_hint">Escreva aqui…</string>
@@ -1138,7 +1138,7 @@
     <string name="dialog_title_error">Erro</string>
     <string name="auth_accept_policies">Por favor, revise e aceite as políticas deste servidor local:</string>
     <string name="settings_call_category">Chamadas</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Use o toque padrão do Element para chamadas recebidas</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Use o toque padrão do ${app_name} para chamadas recebidas</string>
     <string name="settings_call_ringtone_title">Toque de chamadas recebidas</string>
     <string name="settings_call_ringtone_dialog_title">Selecione o toque de chamadas:</string>
     <string name="reason_hint">Motivo</string>
@@ -1163,12 +1163,12 @@
     <string name="settings_troubleshoot_test_device_settings_title">Configurações da sessão</string>
     <string name="settings_troubleshoot_test_device_settings_success">Notificações estão ativadas nesta sessão.</string>
     <string name="room_participants_action_kick">Remover da sala</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Notificações não estão ativadas nesta sessão.
-\nPor favor, revise as configurações do Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Notificações não estão ativadas nesta sessão.
+\nPor favor, revise as configurações do ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ativar</string>
     <string name="settings_troubleshoot_test_play_services_title">Versão do Google Play Services</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK está disponível e atualizado.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element usa Google Play Services para entregar mensagens push, mas isto não parece estar configurado corretamente:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} usa Google Play Services para entregar mensagens push, mas isto não parece estar configurado corretamente:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Consertar Play Services</string>
     <string name="settings_troubleshoot_test_fcm_title">Token do Firebase</string>
@@ -1190,11 +1190,11 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Falha ao reiniciar Serviço</string>
     <string name="settings_troubleshoot_test_service_boot_title">Começar na inicialização</string>
     <string name="settings_troubleshoot_test_service_boot_success">O serviço iniciará quando o aparelho for reiniciado.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">O serviço não iniciará enquanto o aparelho não for reiniciado. Você não receberá notificações até que o Element for aberto ao menos uma vez.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">O serviço não iniciará enquanto o aparelho não for reiniciado. Você não receberá notificações até que o ${app_name} for aberto ao menos uma vez.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Iniciar com o sistema</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Revisar restrições de segundo plano</string>
     <string name="settings_troubleshoot_test_battery_title">Otimização de bateria</string>
-    <string name="settings_troubleshoot_test_battery_success">Element não é afetado pela Otimização de Bateria.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} não é afetado pela Otimização de Bateria.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Reinicialização Automática do Serviço de Notificações</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desativar restrições</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorar a otimização</string>
@@ -1208,11 +1208,11 @@
     <string name="settings_show_avatar_display_name_changes_messages">Mostrar eventos da conta</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Mostrar alterações de foto de perfil e de nome e sobrenome.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Conexão em segundo plano</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element precisa manter um baixo impacto na conexão em segundo plano para ter notificações confiáveis.
-\nNa próxima tela, você será solicitado a permitir que o Element funcione sempre em segundo plano. Por favor, aceite.</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Restrições de segundo plano estão desativadas para o Element. Este teste deve ser realizado usando dados móveis (sem Wi-Fi).
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} precisa manter um baixo impacto na conexão em segundo plano para ter notificações confiáveis.
+\nNa próxima tela, você será solicitado a permitir que o ${app_name} funcione sempre em segundo plano. Por favor, aceite.</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Restrições de segundo plano estão desativadas para o ${app_name}. Este teste deve ser realizado usando dados móveis (sem Wi-Fi).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Restrições em segundo plano estão ativadas para o Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Restrições em segundo plano estão ativadas para o ${app_name}.
 \nO aplicativo funciona bastante restringido enquanto está em segundo plano, o que pode afetar as notificações.
 \n%1$s</string>
     <string name="settings_send_markdown">Formatação de texto</string>
@@ -1271,17 +1271,17 @@
     <string name="settings_troubleshoot_test_bing_settings_failed">Algumas notificações estão desativadas nas suas configurações personalizadas.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Falha ao carregar regras personalizadas, tente novamente.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Verifique as configurações</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nEste erro está fora do controle do Element e, de acordo com o Google, esse erro indica que o aparelho tem muitos aplicativos registrados com FCM. O erro só ocorre nos casos em que há números extremos de aplicativos, portanto, isso não deve afetar o usuário comum.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nEste erro está fora do controle do ${app_name} e, de acordo com o Google, esse erro indica que o aparelho tem muitos aplicativos registrados com FCM. O erro só ocorre nos casos em que há números extremos de aplicativos, portanto, isso não deve afetar o usuário comum.</string>
     <string name="ignore">Bloquear</string>
     <string name="auth_login_sso">Entre com o login único</string>
     <string name="login_error_unknown_host">Este endereço não está acessível. Por favor, verifique-o</string>
     <string name="login_error_ssl_handshake">Seu aparelho está usando um protocolo de segurança TLS desatualizado, vulnerável a ataques. Para sua segurança, você não poderá se conectar</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nEste erro está fora de controle da Element. Isso pode ocorrer por vários motivos. Talvez funcione se você tentar novamente mais tarde. Você também pode verificar se o uso de dados do Google Play Service está restrito nas configurações do sistema, ou se o relógio do seu aparelho está correto. O erro também pode ocorrer em ROMs personalizadas.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nEste erro está fora de controle da ${app_name}. Isso pode ocorrer por vários motivos. Talvez funcione se você tentar novamente mais tarde. Você também pode verificar se o uso de dados do Google Play Service está restrito nas configurações do sistema, ou se o relógio do seu aparelho está correto. O erro também pode ocorrer em ROMs personalizadas.</string>
     <string name="notification_sync_init">Iniciando o serviço</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nEste erro está fora de controle do Element. Não há conta do Google no celular. Por favor, abra o gerenciador de contas e adicione uma conta do Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nEste erro está fora de controle do ${app_name}. Não há conta do Google no celular. Por favor, abra o gerenciador de contas e adicione uma conta do Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Adicionar Conta</string>
     <string name="settings_noisy_notifications_preferences">Configurar notificações com som</string>
     <string name="settings_call_notifications_preferences">Configurar notificações de chamada</string>
@@ -1309,7 +1309,7 @@
 \nAlternativamente, você pode tentar usar o servidor público em %2$s. No entanto, ele não é tão confiável e compartilhará o seu IP com esse servidor. Você também pode configurar isso nas Configurações.</string>
     <string name="call_failed_no_ice_use_alt">Tente usar %s</string>
     <string name="call_failed_dont_ask_again">Não pergunte novamente</string>
-    <string name="call_failed_no_connection">A chamada falhou</string>
+    <string name="template_call_failed_no_connection">A chamada falhou</string>
     <string name="call_failed_no_connection_description">Falha ao estabelecer conexão em tempo real.
 \nPor favor, peça ao administrador do seu servidor para configurar um servidor TURN, de modo que as chamadas funcionem de maneira estável.</string>
     <string name="call_select_sound_device">Selecione a caixa de som</string>
@@ -1357,18 +1357,18 @@
     <string name="room_participants_unban_title">Remover banimento do usuário</string>
     <string name="room_participants_unban_prompt_msg">Remover o banimento do usuário permitirá que ele entre novamente na sala.</string>
     <string name="settings_add_3pid_confirm_password_title">Confirme sua senha</string>
-    <string name="settings_add_3pid_flow_not_supported">Não pode fazer isto pelo Element app</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Não pode fazer isto pelo ${app_name} app</string>
     <string name="settings_add_3pid_authentication_needed">Autenticação exigida</string>
     <string name="settings_notification_privacy_no_background_sync">O aplicativo <b>não</b> precisa de se conectar ao servidor em segundo plano, isto deve reduzir a utilização da bateria</string>
     <string name="settings_background_fdroid_sync_mode">Sincronização em segundo plano</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimizado para bateria</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element sincronizará em segundo plano para preservar os recursos limitados do aparelho (bateria).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} sincronizará em segundo plano para preservar os recursos limitados do aparelho (bateria).
 \nDependendo do estado dos recursos do seu aparelho, a sincronização pode ser adiada pelo sistema operacional.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimizado em tempo real</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">O Element sincronizará periodicamente em segundo plano, no momento estabelecido (configurável).
-\nIsso afetará o uso de dados e da bateria. Haverá uma notificação permanente informando que o Element está sincronizando.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">O ${app_name} sincronizará periodicamente em segundo plano, no momento estabelecido (configurável).
+\nIsso afetará o uso de dados e da bateria. Haverá uma notificação permanente informando que o ${app_name} está sincronizando.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Sem sincronização em segundo plano</string>
-    <string name="settings_background_fdroid_sync_mode_disabled_description">Você não será notificado sobre mensagens recebidas quando o Element estiver em segundo plano.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Você não será notificado sobre mensagens recebidas quando o ${app_name} estiver em segundo plano.</string>
     <string name="settings_background_sync_update_error">Não foi possível actualizar a configuração.</string>
     <string name="settings_set_workmanager_delay">Intervalo de sincronização preferido</string>
     <string name="settings_set_workmanager_delay_summary">%s
@@ -1470,7 +1470,7 @@
     <string name="error_empty_field_enter_user_name">Digite o nome de usuário.</string>
     <string name="passphrase_empty_error_message">Digite a sua frase secreta</string>
     <string name="passphrase_passphrase_too_weak">A frase secreta é muito fraca</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Por favor, apague a frase secreta se desejar que o Element gere uma chave de recuperação.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Por favor, apague a frase secreta se desejar que o ${app_name} gere uma chave de recuperação.</string>
     <string name="keys_backup_no_session_error">Nenhuma sessão Matrix disponível</string>
     <string name="keys_backup_setup_step1_title">Nunca perca mensagens criptografadas</string>
     <string name="keys_backup_setup_step1_description">As mensagens em salas criptografadas são protegidas com a criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens. 
@@ -1584,7 +1584,7 @@
     <string name="keys_backup_info_title_algorithm">Algoritmo</string>
     <string name="autodiscover_invalid_response">Resposta de descoberta inválida no servidor local</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Completar Automaticamente as Opções do Servidor</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element detectou uma configuração personalizada do servidor para a sua ID de usuário \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} detectou uma configuração personalizada do servidor para a sua ID de usuário \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Usar a Configuração</string>
     <string name="invalid_or_expired_credentials">Você foi desligado devido as credenciais inválidas ou caducadas.</string>
@@ -1662,7 +1662,7 @@
     <string name="please_wait">Por favor, aguarde…</string>
     <string name="group_all_communities">Todas as comunidades</string>
     <string name="room_preview_no_preview">Esta sala não pode ser visualizada</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">A visualização da sala global ainda não é suportada por Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">A visualização da sala global ainda não é suportada por ${app_name}</string>
     <string name="fab_menu_create_room">Salas</string>
     <string name="fab_menu_create_chat">Conversas</string>
     <string name="create_room_title">Nova Sala</string>
@@ -1810,7 +1810,7 @@
     <string name="content_reported_as_inappropriate_content">Este conteúdo foi relatado como inadequado.
 \n
 \nSe você não quiser ver mais mensagens deste usuário, você pode bloqueá-lo para esconder suas mensagens.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element precisa de permissão para salvar suas chaves E2E no aparelho.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} precisa de permissão para salvar suas chaves E2E no aparelho.
 \n
 \nPermita o acesso na próxima janela para poder exportar suas chaves manualmente.</string>
     <string name="no_network_indicator">Não há conexão de rede no momento</string>
@@ -1968,7 +1968,7 @@
 \nEntre novamente para acessar os dados e mensagens da sua conta.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Você perderá o acesso as mensagens seguras a menos que você faça login para recuperar suas chaves de criptografia.</string>
     <string name="soft_logout_clear_data_dialog_submit">Limpar dados</string>
-    <string name="soft_logout_sso_not_same_user_error">A sessão atual é para o usuário %1$s e você fornece credenciais para o usuário %2$s. Isto não é suportado no Element.
+    <string name="template_soft_logout_sso_not_same_user_error">A sessão atual é para o usuário %1$s e você fornece credenciais para o usuário %2$s. Isto não é suportado no ${app_name}.
 \nPor favor, limpe os dados do aplicativo, depois faça o login novamente em outra conta.</string>
     <string name="permalink_malformed">Seu link do matrix.to foi malformado</string>
     <string name="bug_report_error_too_short">A descrição é curta demais</string>
@@ -1986,7 +1986,7 @@
     <string name="devices_other_devices">Outras sessões</string>
     <string name="autocomplete_limited_results">Mostrando apenas os primeiros resultados, digite mais letras…</string>
     <string name="settings_developer_mode_fail_fast_title">Relatar imediatamente as falhas</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element poderá quebrar com mais frequência quando ocorrer um erro inesperado</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} poderá quebrar com mais frequência quando ocorrer um erro inesperado</string>
     <string name="command_description_shrug">Adiciona ¯\\_(ツ)_/¯ a uma mensagem de texto</string>
     <string name="create_room_encryption_title">Ativar criptografia</string>
     <string name="create_room_encryption_description">Uma vez ativada, a criptografia não poderá ser desativada.</string>
@@ -2060,9 +2060,9 @@
     <string name="room_member_power_level_default_in">Padrão em %1$s</string>
     <string name="room_member_power_level_custom_in">Personalizado (%1$d) em %2$s</string>
     <string name="room_member_jump_to_read_receipt">Ir para a confirmação de leitura</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element não lida com eventos do tipo \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element não lida com mensagens do tipo \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element encontrou um problema ao render o conteúdo de um evento com \'%1$s\' ID</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} não lida com eventos do tipo \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} não lida com mensagens do tipo \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} encontrou um problema ao render o conteúdo de um evento com \'%1$s\' ID</string>
     <string name="unignore">Desbloquear</string>
     <string name="verify_cannot_cross_sign">Esta sessão não pode compartilhar essa confirmação com suas outras sessões.
 \nA confirmação será salvada localmente e será compartilhada em uma versão futura do aplicativo.</string>
@@ -2158,7 +2158,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Evento apagado pelo usuário, motivo: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Evento moderado pelo administrador da sala, motivo: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">As chaves já estão atualizadas!</string>
-    <string name="login_default_session_public_name">Element para Android</string>
+    <string name="template_login_default_session_public_name">${app_name} para Android</string>
     <string name="settings_key_requests">A chave pede</string>
     <string name="e2e_use_keybackup">Desbloquear histórico de mensagens criptografadas</string>
     <string name="refresh">Recarregar</string>
@@ -2267,13 +2267,13 @@
     <string name="error_adding_media_file_to_gallery">Não foi possível adicionar o arquivo de mídia à Galeria</string>
     <string name="error_saving_media_file">Não foi possível salvar o arquivo de mídia</string>
     <string name="change_password_summary">Definir uma nova senha da conta…</string>
-    <string name="use_other_session_content_description">Use o Element mais recente em seus outros aparelhos: Element Web, Element para Computador, Element para iOS, Element para Android, ou outro cliente Matrix capaz de fazer autoverificação</string>
-    <string name="app_desktop_web">Element Web
-\nElement para Computador</string>
-    <string name="app_ios_android">Element para iOS
-\nElement para Android</string>
+    <string name="template_use_other_session_content_description">Use o ${app_name} mais recente em seus outros aparelhos: ${app_name} Web, ${app_name} para Computador, ${app_name} para iOS, ${app_name} para Android, ou outro cliente Matrix capaz de fazer autoverificação</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} para Computador</string>
+    <string name="template_app_ios_android">${app_name} para iOS
+\n${app_name} para Android</string>
     <string name="or_other_mx_capabale_client">ou outro cliente da Matrix capaz de fazer autoverificação</string>
-    <string name="use_latest_app">Use o Element mais recente em seus outros aparelhos:</string>
+    <string name="template_use_latest_app">Use o ${app_name} mais recente em seus outros aparelhos:</string>
     <string name="command_description_discard_session">Força a atual sessão da comunidade em uma sala criptografada a ser descartada</string>
     <string name="command_description_discard_session_not_handled">Só é suportado em salas criptografadas</string>
     <string name="enter_secret_storage_passphrase_or_key">Use seu %1$s ou %2$s para continuar.</string>
@@ -2314,11 +2314,11 @@
     <string name="choose_locale_loading_locales">Carregando os idiomas disponíveis…</string>
     <string name="open_terms_of">Abra termos de %s</string>
     <string name="disconnect_identity_server_dialog_content">Desconectar-se do servidor de identidade %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Este servidor de identidade está desatualizado. Element suporta apenas API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Este servidor de identidade está desatualizado. ${app_name} suporta apenas API V2.</string>
     <string name="identity_server_error_outdated_home_server">Esta operação não é possível. O servidor doméstico está desatualizado.</string>
     <string name="identity_server_error_no_identity_server_configured">Por favor, primeiro configure um servidor de identidade.</string>
     <string name="identity_server_error_terms_not_signed">Por favor, primeiro aceite os termos do servidor de identidade nas configurações.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Pela sua privacidade, Element apenas suporta o envio dos e-mails e números de telefone de usuários em hash.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Pela sua privacidade, ${app_name} apenas suporta o envio dos e-mails e números de telefone de usuários em hash.</string>
     <string name="identity_server_error_binding_error">A associação falhou.</string>
     <string name="identity_server_error_no_current_binding_error">Não há nenhuma associação atual com este identificador.</string>
     <string name="identity_server_set_default_notice">Seu servidor doméstico (%1$s) propõe o uso de %2$s para seu servidor de identidade</string>
@@ -2449,13 +2449,13 @@
 \n
 \nProssiga com cuidado, pois não há como reverter esta escolha.</string>
     <string name="error_sso_flow_not_supported_yet">Desculpe, esta funcionalidade ainda não está disponível para contas conectadas via acesso único.</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">O código PIN é solicitado todas as vezes que você abre o Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">O código PIN é solicitado após 2 minutos sem usar o Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">O código PIN é solicitado todas as vezes que você abre o ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">O código PIN é solicitado após 2 minutos sem usar o ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Solicitar o PIN depois de 2 minutos</string>
     <string name="settings_security_pin_code_notifications_summary_off">Exibir apenas o número de mensagens não lidas em uma notificação.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Exibir o nome das salas e o conteúdo das mensagens.</string>
     <string name="settings_security_pin_code_notifications_title">Exibir o conteúdo das mensagens nas notificações</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">O código PIN é a única maneira de desbloquear o Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">O código PIN é a única maneira de desbloquear o ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Ativa a biometria específica do dispositivo, como impressões digitais e reconhecimento de rosto.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Ativar a biometria</string>
     <string name="settings_security_application_protection_screen_title">Configurar a proteção</string>
@@ -2535,8 +2535,8 @@
     <string name="user_code_share">Compartilhar meu código</string>
     <string name="user_code_scan">Escanear um código QR</string>
     <string name="not_a_valid_qr_code">Não é um código QR da Matrix válido</string>
-    <string name="invite_friends_rich_title">🔐️ Junte-se a mim no Element</string>
-    <string name="invite_friends_text">Ei, fale comigo no Element: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Junte-se a mim no ${app_name}</string>
+    <string name="template_invite_friends_text">Ei, fale comigo no ${app_name}: %s</string>
     <string name="invite_friends">Convidar amigos</string>
     <string name="add_people">Adicionar pessoas</string>
     <string name="topic_prefix">"Descrição:· "</string>
@@ -2645,7 +2645,7 @@
     <string name="room_participants_leave_private_warning">Esta sala não é pública. Você não poderá entrar novamente sem um convite.</string>
     <string name="system_theme">Padrão do sistema</string>
     <string name="authentication_error">Falha ao se autenticar</string>
-    <string name="re_authentication_default_confirm_text">O Element precisa que você insira suas credenciais para executar esta ação.</string>
+    <string name="template_re_authentication_default_confirm_text">O ${app_name} precisa que você insira suas credenciais para executar esta ação.</string>
     <string name="re_authentication_activity_title">Necessário autenticar-se novamente</string>
     <string name="error_unauthorized">Não autorizado, sem credenciais de autenticação válidas</string>
     <string name="call_transfer_users_tab_title">Pessoas</string>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
index 8ec938f9e3..8220b08dd4 100644
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -151,7 +151,7 @@
     <string name="local_address_book_header">Lista de endereços local</string>
     <string name="matrix_only_filter">Apenas contactos do Matrix</string>
     <string name="no_conversation_placeholder">Não há conversas</string>
-    <string name="no_contact_access_placeholder">Não permitiu ao Element aceder aos seus contactos locais</string>
+    <string name="template_no_contact_access_placeholder">Não permitiu ao ${app_name} aceder aos seus contactos locais</string>
     <string name="no_result_placeholder">Sem resultados</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
@@ -291,26 +291,26 @@ A sessão foi terminada em todos os dispositivos e não receberá mais notifica
     <string name="media_picker_cannot_record_video">Não foi possível gravar vídeo</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informação</string>
-    <string name="permissions_rationale_msg_storage">O Element necessita de permissão para aceder ao seu armazenamento de fotos e vídeos para poder enviar e guardar anexos.
+    <string name="template_permissions_rationale_msg_storage">O ${app_name} necessita de permissão para aceder ao seu armazenamento de fotos e vídeos para poder enviar e guardar anexos.
 
 Permita o acesso na próxima janela para poder enviar ficheiros a partir do seu telefone.</string>
-    <string name="permissions_rationale_msg_camera">O Element necessita de permissão para aceder à sua câmara para poder tirar fotos e fazer chamadas de vídeo.</string>
+    <string name="template_permissions_rationale_msg_camera">O ${app_name} necessita de permissão para aceder à sua câmara para poder tirar fotos e fazer chamadas de vídeo.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
 Por favor, permita o acesso na próxima janela para poder realizar a chamada.</string>
-    <string name="permissions_rationale_msg_record_audio">Element necessita de permissão para aceder ao seu microfone para realizar chamadas de áudio.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} necessita de permissão para aceder ao seu microfone para realizar chamadas de áudio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">
 
 Por favor, permita acesso na próxima janela para poder efetuar a chamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element necessita de permissão para aceder à sua câmara e ao seu microfone para realizar chamadas de vídeo.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} necessita de permissão para aceder à sua câmara e ao seu microfone para realizar chamadas de vídeo.
 
 Por favor, permita o acesso na próxima janela para poder efetuar a chamada.</string>
-    <string name="permissions_rationale_msg_contacts">O Element necessita de permissão para aceder à sua lista de contactos para encontrar outros utilizadores Matrix a partir dos seus e-mails e números de telefone.
+    <string name="template_permissions_rationale_msg_contacts">O ${app_name} necessita de permissão para aceder à sua lista de contactos para encontrar outros utilizadores Matrix a partir dos seus e-mails e números de telefone.
 
-Por favor, permita o acesso na próxima janela para poder encontrar utilizadores na sua lista de contactos que podem ser contactados pelo Element.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">O Element necessita de permissão para aceder à sua lista de contactos para encontrar outros utilizadores Matrix a partir dos seus endereços de email e números de telefone.
+Por favor, permita o acesso na próxima janela para poder encontrar utilizadores na sua lista de contactos que podem ser contactados pelo ${app_name}.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">O ${app_name} necessita de permissão para aceder à sua lista de contactos para encontrar outros utilizadores Matrix a partir dos seus endereços de email e números de telefone.
 
-Permitir ao Element aceder aos seus contactos?</string>
+Permitir ao ${app_name} aceder aos seus contactos?</string>
     <string name="permissions_action_not_performed_missing_permissions">Desculpe… A ação não foi realizada, por falta de permissões</string>
     <!-- medias slider string -->
     <string name="media_slider_saved">Guardado</string>
@@ -737,7 +737,7 @@ Adicionar alguns agora?</string>
     <string name="e2e_re_request_encryption_key"><u>Pedir de novo as chaves criptográficas</u> aos seus outros dispositivos.</string>
     <string name="e2e_re_request_encryption_key_sent">Pedido de chaves enviado.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Pedido enviado</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Por favor abra o Element num dispositivo que consiga decifrar a mensagem, para que esse dispositivo possa enviar as chaves para este dispositivo.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Por favor abra o ${app_name} num dispositivo que consiga decifrar a mensagem, para que esse dispositivo possa enviar as chaves para este dispositivo.</string>
     <string name="groups_list">Lista de Grupos</string>
     <plurals name="membership_changes">
         <item quantity="one">%d mudança de adesão</item>
@@ -818,13 +818,13 @@ Adicionar alguns agora?</string>
     <string name="settings_deactivate_account_section">Desactivar a conta</string>
     <string name="settings_deactivate_my_account">Desactivar a minha conta</string>
     <string name="startup_notification_privacy_title">Privacidade das Notificações</string>
-    <string name="startup_notification_privacy_message">O Element pode executar em segundo plano para gerir as notificações de forma segura e confidencial (isso poderá afectar a utilização da bateria).</string>
+    <string name="template_startup_notification_privacy_message">O ${app_name} pode executar em segundo plano para gerir as notificações de forma segura e confidencial (isso poderá afectar a utilização da bateria).</string>
     <string name="startup_notification_privacy_button_grant">Conceder permissão</string>
     <string name="startup_notification_privacy_button_other">Escolha outra opção</string>
     <string name="settings_analytics">Estatísticas de uso</string>
     <string name="settings_opt_in_of_analytics">Enviar dados de análise de estatísticas</string>
-    <string name="settings_opt_in_of_analytics_summary">O Element recolhe dados anónimos de análise de estatísticas para ajudar a melhorar a aplicação.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Por favor, permita o envio de dados de análise para ajudar-nos a melhorar o Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">O ${app_name} recolhe dados anónimos de análise de estatísticas para ajudar a melhorar a aplicação.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Por favor, permita o envio de dados de análise para ajudar-nos a melhorar o ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Sim, quero ajudar!</string>
     <string name="settings_flair">Insígnias</string>
     <string name="settings_without_flair">Você não faz, actualmente, parte de qualquer comunidade.</string>
@@ -993,7 +993,7 @@ A visibilidade das mensagens no Matrix é parecida com a dos emails. O nosso esq
     <string name="keys_backup_settings_delete_confirm_title">Apagar Backup</string>
     <string name="auth_accept_policies">Por favor veja e aceite, apolice para este servidor</string>
     <string name="settings_call_category">Chamadas</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Usar toque padrão para chamadas recebidas</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Usar toque padrão para chamadas recebidas</string>
     <string name="settings_call_ringtone_title">Toque para chamadas recebidas</string>
     <string name="settings_call_ringtone_dialog_title">Selecione toque para chamadas:</string>
     <string name="video_call_in_progress">Chamada de Vídeo em Progresso…</string>
@@ -1016,7 +1016,7 @@ Se faz favor verifique configurações de conta</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Activar</string>
     <string name="settings_troubleshoot_test_device_settings_title">Configurações de aparelho</string>
     <string name="settings_troubleshoot_test_device_settings_success">Notificações estão activadas para este aparelho</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Notificações estão desactivadas para este aparelho
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Notificações estão desactivadas para este aparelho
 Por favor, verifique configurações de aplicação</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Activar</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Configurações personalizadas</string>
@@ -1036,7 +1036,7 @@ Por favor, verifique configurações de aplicação</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Verificar restriçoes de histórico</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desactivar restricções</string>
     <string name="settings_troubleshoot_test_battery_title">Optimização de bateria</string>
-    <string name="settings_troubleshoot_test_battery_success">Element não é afectado por Optimização de bateria</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} não é afectado por Optimização de bateria</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorar Optimização</string>
     <string name="settings_noisy_notifications_preferences">Configurar Notificações de ruido</string>
     <string name="settings_call_notifications_preferences">Configurar Notificações de chamadas</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index d62d6c65a7..4a4f4a31ba 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -360,7 +360,7 @@
     <string name="local_address_book_header">Локальные контакты</string>
     <string name="matrix_only_filter">Только Matrix контакты</string>
     <string name="no_conversation_placeholder">Нет диалогов</string>
-    <string name="no_contact_access_placeholder">Вы не дали доступ Element к внутренним контактам</string>
+    <string name="template_no_contact_access_placeholder">Вы не дали доступ ${app_name} к внутренним контактам</string>
     <string name="no_result_placeholder">Нет результатов</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Комнаты</string>
@@ -502,18 +502,18 @@
     <string name="media_picker_cannot_record_video">Не удалось записать видео"</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Element Информация</string>
-    <string name="permissions_rationale_msg_storage">Element нуждается в разрешении на доступ к вашей фото-и видеотеке для отправки и сохранения вложений.
+    <string name="template_permissions_rationale_msg_storage">${app_name} нуждается в разрешении на доступ к вашей фото-и видеотеке для отправки и сохранения вложений.
 \n
 \nПожалуйста, разрешите доступ в следующем всплывающем окне, чтобы иметь возможность отправлять файлы с вашего устройства.</string>
-    <string name="permissions_rationale_msg_camera">Element необходимы разрешения на доступ к вашей камере, чтобы делать фото и совершать видеозвонки.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} необходимы разрешения на доступ к вашей камере, чтобы делать фото и совершать видеозвонки.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность совершать звонки.</string>
-    <string name="permissions_rationale_msg_record_audio">Element необходимы разрешения на доступ к микрофону, чтобы выполнять звонки.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} необходимы разрешения на доступ к микрофону, чтобы выполнять звонки.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность совершать звонки.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element необходимы разрешения на доступ к камере и микрофону для видеовызовов.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} необходимы разрешения на доступ к камере и микрофону для видеовызовов.
 \n
 \nПожалуйста дайте разрешение в следующем окне для звонка.</string>
-    <string name="permissions_rationale_msg_contacts">Element может проверить вашу адресную книгу, чтобы найти других пользователей Matrix по их электронной почте и номерам телефонов. Если вы согласны поделиться своей адресной книгой для этой цели, пожалуйста, откройте доступ на следующем всплывающем окне.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element может проверить Вашу адресную книгу, чтобы найти других пользователей сети по email или телефонному номеру.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} может проверить вашу адресную книгу, чтобы найти других пользователей Matrix по их электронной почте и номерам телефонов. Если вы согласны поделиться своей адресной книгой для этой цели, пожалуйста, откройте доступ на следующем всплывающем окне.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} может проверить Вашу адресную книгу, чтобы найти других пользователей сети по email или телефонному номеру.
 \n
 \nСогласны ли вы поделиться своей адресной книгой для этой цели\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Извините. Действие не выполнено из-за недостаточных разрешений</string>
@@ -1056,7 +1056,7 @@
     <string name="settings_notification_privacy_nosecure_message_content">• Уведомления содержат <b>метаданные и данные сообщения</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Уведомления <b>не будут показывать содержимое сообщения</b></string>
     <string name="startup_notification_privacy_title">Конфиденциальность уведомлений</string>
-    <string name="startup_notification_privacy_message">Element может работать в фоновом режиме для управления конфиденциальностью и безопасностью ваших уведомлений. Это может повлиять на время работы от батареи.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} может работать в фоновом режиме для управления конфиденциальностью и безопасностью ваших уведомлений. Это может повлиять на время работы от батареи.</string>
     <string name="startup_notification_privacy_button_grant">Предоставить разрешение</string>
     <string name="startup_notification_privacy_button_other">Выбрать другой вариант</string>
     <string name="settings_notification_privacy_reduced">Ограниченная конфиденциальность</string>
@@ -1069,8 +1069,8 @@
     <string name="settings_deactivate_account_section">Деактивация аккаунта</string>
     <string name="settings_deactivate_my_account">Деактивировать мой аккаунт</string>
     <string name="settings_opt_in_of_analytics">Отправка аналитических данных</string>
-    <string name="settings_opt_in_of_analytics_summary">Element собирает анонимную аналитику для улучшения приложения.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Пожалуйста, включите аналитику, чтобы помочь нам улучшить Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} собирает анонимную аналитику для улучшения приложения.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Пожалуйста, включите аналитику, чтобы помочь нам улучшить ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Да, я хочу помочь!</string>
     <string name="widget_integration_missing_parameter">Обязательный параметр отсутствует.</string>
     <string name="widget_integration_invalid_parameter">Параметр недействителен.</string>
@@ -1092,7 +1092,7 @@
     <string name="e2e_re_request_encryption_key">Перезапросить ключи шифрования у других ваших сессий.</string>
     <string name="e2e_re_request_encryption_key_sent">Отправлен запрос ключа.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Запрос отправлен</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Запустите Element на другом устройстве, которое может расшифровать сообщение, для отправки ключа на эту сессию.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Запустите ${app_name} на другом устройстве, которое может расшифровать сообщение, для отправки ключа на эту сессию.</string>
     <string name="lock_screen_hint">Введите здесь…</string>
     <string name="option_send_voice">Отправить голосовое сообщение</string>
     <string name="go_on_with">продолжить с…</string>
@@ -1195,7 +1195,7 @@
     <string name="settings_password">Пароль</string>
     <string name="auth_accept_policies">Пожалуйста ознакомьтесь и подтвердите согласие с политикой этого сервера:</string>
     <string name="settings_call_category">Вызовы</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Использовать стандартную мелодию Element для входящих звонков</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Использовать стандартную мелодию ${app_name} для входящих звонков</string>
     <string name="settings_call_ringtone_title">Мелодия звонка</string>
     <string name="settings_call_ringtone_dialog_title">Выберите мелодию звонка:</string>
     <string name="video_call_in_progress">Идёт видеозвонок …</string>
@@ -1235,12 +1235,12 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Включить</string>
     <string name="settings_troubleshoot_test_device_settings_title">Настройки сессии.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Уведомления включены для этой сессии.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Уведомления не включено для этой сессии. 
-\nПожалуйста, проверьте настройки Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Уведомления не включено для этой сессии.
+\nПожалуйста, проверьте настройки ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Включить</string>
     <string name="settings_troubleshoot_test_play_services_title">Проверка сервисов Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Google Play сервисов доступен и обновлён.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element использует сервисы Google Play для доставки push-сообщений, но не похоже что он настроен правильно: 
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} использует сервисы Google Play для доставки push-сообщений, но не похоже что он настроен правильно:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Исправить сервисы Play</string>
     <string name="settings_troubleshoot_test_fcm_title">Токен Firebase</string>
@@ -1262,17 +1262,17 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Не удалось перезапустить службу</string>
     <string name="settings_troubleshoot_test_service_boot_title">Запуск при загрузке</string>
     <string name="settings_troubleshoot_test_service_boot_success">Служба будет запущена после перезапуска устройства.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">При перезагрузке устройства служба не будет запущена , вы не будете получать уведомления, пока Element не будет открыт один раз.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">При перезагрузке устройства служба не будет запущена , вы не будете получать уведомления, пока ${app_name} не будет открыт один раз.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Включить запуск при загрузке</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Проверьте фоновые ограничения</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Фоновые ограничения отключены для Element. Этот тест должен быть запущен с использованием мобильных данных (без WIFI). 
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Фоновые ограничения отключены для ${app_name}. Этот тест должен быть запущен с использованием мобильных данных (без WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Фоновые ограничения включены для Element. 
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Фоновые ограничения включены для ${app_name}.
 \nРабота приложения будет жестко ограничена, пока оно находится в фоновом режиме, и это может повлиять на уведомления. 
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Отключить ограничения</string>
     <string name="settings_troubleshoot_test_battery_title">Оптимизация батареи</string>
-    <string name="settings_troubleshoot_test_battery_success">Оптимизация батареи не влияет на Element.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Оптимизация батареи не влияет на ${app_name}.</string>
     <string name="settings_troubleshoot_test_battery_failed">Если пользователь оставляет устройство в отключенном от сети и в неподвижном состоянии в течение некоторого времени при выключенном экране, устройство переходит в режим Doze. Это предотвращает доступ приложений к сети и откладывает выполнение заданий, синхронизацию и передачу стандартных аварийных сигналов.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Игнорировать оптимизацию</string>
     <string name="settings_inline_url_preview_summary">Предпросмотр ссылок в чате, когда ваш домашний сервер поддерживает эту функцию.</string>
@@ -1283,7 +1283,7 @@
     <string name="settings_show_join_leave_messages">Показывать события о вступлении/выходе</string>
     <string name="settings_show_avatar_display_name_changes_messages">Показывать события аккаунта</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Включает изменения аватара и отображаемого имени.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений. 
+    <string name="template_startup_notification_fdroid_battery_optim_message">Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений.
 \nНа следующем экране вам будет предложено разрешить Райоту всегда работать в фоновом режиме, пожалуйста, примите.</string>
     <string name="settings_labs_native_camera_summary">Использовать системную камеру вместо камеры Element.</string>
     <string name="settings_info_area_show">Показать информацию</string>
@@ -1315,7 +1315,7 @@
     <string name="notification_silent">Беззвучный</string>
     <string name="passphrase_empty_error_message">Пожалуйста, введите парольную фразу</string>
     <string name="passphrase_passphrase_too_weak">Парольная фраза слишком простая</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите парольную фразу, если хотите, чтобы Element сгенерировал ключ восстановления.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите парольную фразу, если хотите, чтобы ${app_name} сгенерировал ключ восстановления.</string>
     <string name="keys_backup_no_session_error">Matrix сессия недоступна</string>
     <string name="keys_backup_setup_step1_title">Никогда не теряйте зашифрованных сообщений</string>
     <string name="keys_backup_setup_step1_description">Сообщения в зашифрованных комнатах защищены сквозным шифрованием. Ключи для прочтения этих сообщений есть только у вас и получателя(ей).
@@ -1382,12 +1382,12 @@
     <string name="recovery_key_export_saved_as_warning">Ключ восстановления был сохранен в \'%s\'. 
 \n
 \nПредупреждение: этот файл может быть удален при удалении приложения.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
-\nЭта ошибка вне контроля Element. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s] 
-\nЭта ошибка вне контроля Element. Причины могут быть разными. Возможно, это будет работать, если вы повторите попытку позже, вы также можете проверить, что службы Google Play не ограничены в использовании данных в настройках системы, или что часы вашего устройства установлены правильно, или это может произойти на модифицированных прошивках.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] 
-\nЭта ошибка вне контроля Element, и, по словам Google, эта ошибка означает, что на устройстве слишком много приложений, зарегистрированных в FCM. Ошибка возникает только в тех случаях, когда существует огромное количество приложений, поэтому она не должна влиять на обычного пользователя.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nЭта ошибка вне контроля ${app_name}. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nЭта ошибка вне контроля ${app_name}. Причины могут быть разными. Возможно, это будет работать, если вы повторите попытку позже, вы также можете проверить, что службы Google Play не ограничены в использовании данных в настройках системы, или что часы вашего устройства установлены правильно, или это может произойти на модифицированных прошивках.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nЭта ошибка вне контроля ${app_name}, и, по словам Google, эта ошибка означает, что на устройстве слишком много приложений, зарегистрированных в FCM. Ошибка возникает только в тех случаях, когда существует огромное количество приложений, поэтому она не должна влиять на обычного пользователя.</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Ваши зашифрованные сообщения будут потеряны, если выйдете сейчас</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Выполняется резервное копирование ключа. Если выйти сейчас, Вы потеряете доступ к Вашим зашифрованным сообщениям.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Мне не нужны мои зашифрованные сообщения</string>
@@ -1498,7 +1498,7 @@
     <string name="ignore_request_short_label">Игнорировать</string>
     <string name="autodiscover_invalid_response">Ошибка отклика сервера</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Дополнить параметры сервера</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element обнаружил пользовательскую конфигурацию сервера для вашего userID домена\"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} обнаружил пользовательскую конфигурацию сервера для вашего userID домена\"%1$s\":
 \n%2$s</string>
     <string name="sas_verify_title">Проверьте, сравнив короткую текстовую строку.</string>
     <string name="sas_security_advise">Для обеспечения максимальной безопасности мы рекомендуем делать это лично или использовать другие надежные средства связи.</string>
@@ -1612,7 +1612,7 @@
     <string name="send_suggestion_sent">Спасибо, предложение было успешно отправлено</string>
     <string name="send_suggestion_failed">Предложение не было отправлено (%s)</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Показать скрытые события в ленте сообщений</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в Element пока не поддерживается</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в ${app_name} пока не поддерживается</string>
     <string name="bottom_action_people_x">Диалоги</string>
     <string name="send_file_step_idle">Ждите…</string>
     <string name="send_file_step_encrypting_thumbnail">Шифрование миниатюры…</string>
@@ -1674,10 +1674,10 @@
     <string name="settings_call_ringtone_use_default_stun_sum">Будет использовать%s в качестве помощника, если ваш домашний сервер не предлагает его (ваш IP-адрес будет доступен во время разговора)</string>
     <string name="invite_no_identity_server_error">Добавьте идентификационный сервер в свои настройки, чтобы выполнить это действие.</string>
     <string name="settings_background_fdroid_sync_mode">Режим фоновой синхронизации</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element будет синхронизироваться в фоновом режиме таким образом, чтобы сохранить ограниченные ресурсы устройства (батарея).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} будет синхронизироваться в фоновом режиме таким образом, чтобы сохранить ограниченные ресурсы устройства (батарея).
 \nВ зависимости от состояния ресурса вашего устройства, синхронизация может быть отложена операционной системой.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element будет синхронизироваться в фоновом режиме периодически в точное время (настраивается).
-\nЭто повлияет на использование радио и батареи, появится постоянное уведомление о том, что Element прислушивается к событиям.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} будет синхронизироваться в фоновом режиме периодически в точное время (настраивается).
+\nЭто повлияет на использование радио и батареи, появится постоянное уведомление о том, что ${app_name} прислушивается к событиям.</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Вы не будете уведомлены о входящих сообщениях, когда приложение находится в фоновом режиме.</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nСинхронизация может быть отложена в зависимости от ресурсов (батареи) или состояния устройства (спящий режим).</string>
@@ -1723,7 +1723,7 @@
     <string name="room_widget_open_in_browser">Открыть в браузере</string>
     <string name="room_widget_permission_widget_id">ID виджета</string>
     <string name="room_widget_resource_grant_permission">Принять</string>
-    <string name="settings_add_3pid_flow_not_supported">Вы это не можете делать на мобильном Element</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Вы это не можете делать на мобильном ${app_name}</string>
     <string name="room_widget_permission_added_by">Этот виджет был добавлен:</string>
     <string name="room_widget_permission_theme">Ваши тема</string>
     <string name="room_widget_permission_room_id">ID комнаты</string>
@@ -1887,7 +1887,7 @@
 \nВойдите заново, чтобы получить доступ к данным своей учётной записи и сообщениям.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Вы потеряете доступ к защищённым сообщениям, если не войдёте в систему для восстановления ключей шифрования.</string>
     <string name="soft_logout_clear_data_dialog_submit">Очистить данные</string>
-    <string name="soft_logout_sso_not_same_user_error">Текущая сессия предназначена для пользователя %1$s, а вы предоставляете учётные данные для пользователя %2$s. Это не поддерживается в Element.
+    <string name="template_soft_logout_sso_not_same_user_error">Текущая сессия предназначена для пользователя %1$s, а вы предоставляете учётные данные для пользователя %2$s. Это не поддерживается в ${app_name}.
 \nПожалуйста, сначала очистите данные, а затем снова войдите под другим аккаунтом.</string>
     <string name="permalink_malformed">Ваша ссылка на matrix.to неверна</string>
     <string name="bug_report_error_too_short">Описание слишком короткое</string>
@@ -1992,7 +1992,7 @@
     <string name="a11y_close_keys_backup_banner">Закрыть окно бэкапа ключей</string>
     <string name="one_user_read">%s прочитано</string>
     <string name="error_handling_incoming_share">Не удалось обработать данные</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element требуются права для сохранения ваших ключей шифрования на диск.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} требуются права для сохранения ваших ключей шифрования на диск.
 \n
 \nПожалуйста, разрешите доступ в следующем всплывающем окне, чтобы экспортировать ключи вручную.</string>
     <string name="no_network_indicator">Нет подключения к сети</string>
@@ -2001,7 +2001,7 @@
     <string name="action_copy">Копировать</string>
     <string name="dialog_title_success">Выполнено</string>
     <string name="bottom_action_notification">Уведомления</string>
-    <string name="call_failed_no_connection">Звонок не состоялся</string>
+    <string name="template_call_failed_no_connection">Звонок не состоялся</string>
     <string name="call_failed_no_connection_description">Не удалось установить соединение реального времени.
 \nПопросите администратора вашего сервера настроить сервер TURN, чтобы звонки работали надёжно.</string>
     <string name="call_select_sound_device">Выберите звуковое устройство</string>
@@ -2101,7 +2101,7 @@
     <string name="rageshake_detected">Тряска зафиксирована!</string>
     <string name="autocomplete_limited_results">Показываем только первые результаты, наберите больше букв…</string>
     <string name="settings_developer_mode_fail_fast_title">Раннее падение</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element может падать чаще, когда происходит непредвиденная ошибка</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} может падать чаще, когда происходит непредвиденная ошибка</string>
     <string name="command_description_shrug">Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения</string>
     <string name="create_room_encryption_description">После включения шифрования оно не может быть отключено.</string>
     <string name="login_error_threepid_denied">Ваш почтовый домен не имеет права регистрироваться на этом сервере</string>
@@ -2157,9 +2157,9 @@
     <string name="room_member_power_level_default_in">По умолчанию в %1$s</string>
     <string name="room_member_power_level_custom_in">Пользовательский (%1$d) в %2$s</string>
     <string name="room_member_jump_to_read_receipt">Перейти к последнему прочтённому им сообщению</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element не обрабатывает события типа \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element не обрабатывает сообщения типа \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element столкнулся с проблемой при отображении содержимого события с идентификатором \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} не обрабатывает события типа \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} не обрабатывает сообщения типа \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} столкнулся с проблемой при отображении содержимого события с идентификатором \'%1$s\'</string>
     <string name="unignore">Перестать игнорировать</string>
     <string name="verify_cannot_cross_sign">Эта сессия не может поделиться подтверждением с другими сессиями.
 \nПодтверждение будет сохранено локально и отправится в будущей версии приложения.</string>
@@ -2215,8 +2215,8 @@
     <string name="settings_messages_at_room">Сообщения, содержащие @room</string>
     <string name="settings_troubleshoot_title">Отладка</string>
     <string name="settings_notification_advanced_summary">Настройки важности уведомлений для событий</string>
-    <string name="use_other_session_content_description">Используйте последнюю версию Element на других ваших устройствах, веб-клиент Element, Element для ПК, Element для iOS, Element для Android или другой клиент Matrix, поддерживающий кросс-подпись</string>
-    <string name="use_latest_app">Используйте последнюю версию Element на других ваших устройствах:</string>
+    <string name="template_use_other_session_content_description">Используйте последнюю версию ${app_name} на других ваших устройствах, веб-клиент ${app_name}, ${app_name} для ПК, ${app_name} для iOS, ${app_name} для Android или другой клиент Matrix, поддерживающий кросс-подпись</string>
+    <string name="template_use_latest_app">Используйте последнюю версию ${app_name} на других ваших устройствах:</string>
     <string name="verify_this_session">Подтвердите новую сессию вашей учетной записи: %1$s</string>
     <string name="settings_setup_secure_backup">Настроить безопасное резервное копирование</string>
     <string name="bottom_sheet_setup_secure_backup_title">Безопасное резервное копирование</string>
@@ -2270,7 +2270,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Событие удалено пользователем, Причина: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Событие модерируется администратором комнаты, Причина: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Ключи успешно обновлены!</string>
-    <string name="login_default_session_public_name">Element для Android</string>
+    <string name="template_login_default_session_public_name">${app_name} для Android</string>
     <string name="refresh">Обновить</string>
     <string name="new_session">Новый вход в вашу учётную запись. Это были Вы\?</string>
     <string name="new_session_review">Нажмите, чтобы просмотреть и проверить</string>
@@ -2343,10 +2343,10 @@
     <string name="media_file_added_to_gallery">Медиафайл добавлен в галерею</string>
     <string name="error_adding_media_file_to_gallery">Не удалось добавить медиафайл в галерею</string>
     <string name="error_saving_media_file">Не удалось сохранить медиафайл</string>
-    <string name="app_desktop_web">Веб-Element
-\nElement для ПК</string>
-    <string name="app_ios_android">Element для iOS
-\nElement для Android</string>
+    <string name="template_app_desktop_web">Веб-${app_name}
+\n${app_name} для ПК</string>
+    <string name="template_app_ios_android">${app_name} для iOS
+\n${app_name} для Android</string>
     <string name="or_other_mx_capabale_client">или другой, поддерживаемый кросс-подпись Matrix клиент</string>
     <string name="command_description_discard_session">Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату</string>
     <string name="enter_secret_storage_passphrase_or_key">Чтобы продолжить, используйте ваш %1$s или используйте ваш %2$s.</string>
@@ -2382,11 +2382,11 @@
     <string name="choose_locale_loading_locales">Загрузка доступных языков…</string>
     <string name="open_terms_of">Посмотреть условия %s</string>
     <string name="disconnect_identity_server_dialog_content">Отключиться от сервера идентификации %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Этот сервер идентификации устарел. Element поддерживает только API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Этот сервер идентификации устарел. ${app_name} поддерживает только API V2.</string>
     <string name="identity_server_error_outdated_home_server">Эта операция невозможна. Домашний сервер устарел.</string>
     <string name="identity_server_error_no_identity_server_configured">Пожалуйста, настройте сначала сервер идентификации.</string>
     <string name="identity_server_error_terms_not_signed">Пожалуйста, примите сначала условия сервера идентификации в настройках.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Для вашей приватности, Element поддерживает отправку адреса электронной почты и номера телефона только в хэшированном виде.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Для вашей приватности, ${app_name} поддерживает отправку адреса электронной почты и номера телефона только в хэшированном виде.</string>
     <string name="identity_server_error_binding_error">Привязка не удалась.</string>
     <string name="identity_server_error_no_current_binding_error">Текущая взаимосвязь с этим идентификатором отсутствует.</string>
     <string name="identity_server_set_default_notice">Ваш домашний сервер (%1$s) предлагает использовать %2$s для вашего сервера идентификации</string>
@@ -2518,13 +2518,13 @@
     <string name="delete_account_data_warning">Удалить данные учетной записи типа %1$s\?
 \n
 \nИспользуйте с осторожностью, это может привести к неожиданному поведению.</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">ПИН-код потребуется каждый раз, когда вы откроете Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">ПИН-код потребуется через 2 минуты неиспользования Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">ПИН-код потребуется каждый раз, когда вы откроете ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">ПИН-код потребуется через 2 минуты неиспользования ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Требовать PIN-код через 2 минуты</string>
     <string name="settings_security_pin_code_notifications_summary_off">Отображать только количество непрочитанных сообщений в простом уведомлении.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Показывать подробности, такие как названия комнат и содержание сообщений.</string>
     <string name="settings_security_pin_code_notifications_title">Показывать содержимое в уведомлениях</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-код - единственный способ разблокировать Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN-код - единственный способ разблокировать ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Включить биометрические данные устройства, такие как отпечатки пальцев и распознавание лиц.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Включить биометрию</string>
     <string name="settings_security_application_protection_screen_title">Настроить защиту</string>
@@ -2604,8 +2604,8 @@
     <string name="user_code_share">Поделиться моим кодом</string>
     <string name="user_code_scan">Сканировать QR-код</string>
     <string name="not_a_valid_qr_code">Это недействительный QR-код matrix</string>
-    <string name="invite_friends_rich_title">🔐️ Присоединяйтесь ко мне в Element</string>
-    <string name="invite_friends_text">Привет, поговори со мной в Element: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Присоединяйтесь ко мне в ${app_name}</string>
+    <string name="template_invite_friends_text">Привет, поговори со мной в ${app_name}: %s</string>
     <string name="invite_friends">Пригласить друзей</string>
     <string name="add_people">Добавить людей</string>
     <string name="topic_prefix">"Тема: "</string>
@@ -2718,7 +2718,7 @@
     <string name="room_participants_leave_private_warning">Эта комната не публичная. Вы не сможете повторно присоединиться без приглашения.</string>
     <string name="system_theme">Системная тема</string>
     <string name="authentication_error">Не удалось пройти аутентификацию</string>
-    <string name="re_authentication_default_confirm_text">Element требует от вас ввести свои учетные данные для выполнения этого действия.</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} требует от вас ввести свои учетные данные для выполнения этого действия.</string>
     <string name="re_authentication_activity_title">Требуется повторная аутентификация</string>
     <string name="failed_to_initialize_cross_signing">Не удалось настроить перекрестную подпись</string>
     <string name="call_only_active">Активный звонок (%1$s)</string>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 3f62126d2d..6b47a2a536 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -290,7 +290,7 @@
     <string name="user_directory_header">Adresár používateľov</string>
     <string name="matrix_only_filter">Len Matrix kontakty</string>
     <string name="no_conversation_placeholder">Žiadne konverzácie</string>
-    <string name="no_contact_access_placeholder">Aplikácii Element ste nepovolili prístup k lokálnym kontaktom</string>
+    <string name="template_no_contact_access_placeholder">Aplikácii ${app_name} ste nepovolili prístup k lokálnym kontaktom</string>
     <string name="no_result_placeholder">Žiadne výsledky</string>
 
     <string name="rooms_header">Miestnosti</string>
@@ -438,24 +438,24 @@ Emailovú adresu si môžete k účtu pridať neskôr cez nastavenia.</string>
     <string name="media_picker_cannot_record_video">Nie je možné nahrať video</string>
 
     <string name="permissions_rationale_popup_title">Informácia</string>
-    <string name="permissions_rationale_msg_storage">Aby ste mohli posielať a prijímať súbory, Element potrebuje prístup k fotkám, videám a súborom vo vašom zariadení.
+    <string name="template_permissions_rationale_msg_storage">Aby ste mohli posielať a prijímať súbory, ${app_name} potrebuje prístup k fotkám, videám a súborom vo vašom zariadení.
 
 Prosím, povoľte prístup na nasledujúcej obrazovke.</string>
-    <string name="permissions_rationale_msg_camera">Aby ste mohli fotiť obrázky a videá a tiež uskutočňovať video hovory, Element potrebuje prístup k fotoaparátu.</string>
+    <string name="template_permissions_rationale_msg_camera">Aby ste mohli fotiť obrázky a videá a tiež uskutočňovať video hovory, ${app_name} potrebuje prístup k fotoaparátu.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nProsím, povoľte prístup na nasledujúcej obrazovke, aby ste mohli uskutočniť hovor."</string>
-    <string name="permissions_rationale_msg_record_audio">Aby ste mohli uskutočňovať audio hovory, Element potrebuje prístup k mikrofónu vašeho zariadenia.</string>
+    <string name="template_permissions_rationale_msg_record_audio">Aby ste mohli uskutočňovať audio hovory, ${app_name} potrebuje prístup k mikrofónu vašeho zariadenia.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nProsím, povoľte prístup na nasledujúcej obrazovke, aby ste mohli uskutočniť hovor."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Aby ste mohli uskutočňovať video hovory, Element potrebuje prístup k fotoaparátu a mikrofónu vašeho zariadenia.
+    <string name="template_permissions_rationale_msg_camera_and_audio">Aby ste mohli uskutočňovať video hovory, ${app_name} potrebuje prístup k fotoaparátu a mikrofónu vašeho zariadenia.
 
 Prosím, povoľte prístup na nasledujúcich obrazovkách.</string>
-    <string name="permissions_rationale_msg_contacts">Aby ste mohli na Matrixe nájsť vašich známych podľa telefónneho čísla alebo emailovej adresy, Element potrebuje prístup k vašim kontaktom. Ak si prajete zdieľať váš zoznam kontaktov za týmto účelom, prosím, povoľte prístup na nasledujúcej obrazovke.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Aby ste mohli na Matrixe nájsť vašich známych podľa telefónneho čísla alebo emailovej adresy, Element potrebuje prístup k vašim kontaktom.
+    <string name="template_permissions_rationale_msg_contacts">Aby ste mohli na Matrixe nájsť vašich známych podľa telefónneho čísla alebo emailovej adresy, ${app_name} potrebuje prístup k vašim kontaktom. Ak si prajete zdieľať váš zoznam kontaktov za týmto účelom, prosím, povoľte prístup na nasledujúcej obrazovke.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">Aby ste mohli na Matrixe nájsť vašich známych podľa telefónneho čísla alebo emailovej adresy, ${app_name} potrebuje prístup k vašim kontaktom.
 
-Chcete aplikácii Element povoliť prístup k vašim kontaktom?</string>
+Chcete aplikácii ${app_name} povoliť prístup k vašim kontaktom?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Prepáčte, akcia nebola vykonaná kvôli chýbajúcim oprávneniam</string>
 
@@ -1051,7 +1051,7 @@ Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikác
     <string name="settings_notification_privacy_message_content_not_shown">• Súčasťou oznámení <b>nebude zobrazený obsah správ</b></string>
 
     <string name="startup_notification_privacy_title">Súkromie oznámení</string>
-    <string name="startup_notification_privacy_message">Element môže fungovať na pozadí aby spracovával vaše upozornenia bezpečne a v súkromí. Môže to ovplyvniť využitie batérie.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} môže fungovať na pozadí aby spracovával vaše upozornenia bezpečne a v súkromí. Môže to ovplyvniť využitie batérie.</string>
     <string name="startup_notification_privacy_button_grant">Udeliť oprávnenie</string>
     <string name="startup_notification_privacy_button_other">Vyberte inú voľbu</string>
 
@@ -1066,8 +1066,8 @@ Pozor: tento súbor môže byť automaticky zmazaný po odinštalovaní aplikác
     <string name="settings_deactivate_my_account">Deaktivovať môj účet</string>
 
     <string name="settings_opt_in_of_analytics">Odosielať analytické údaje</string>
-    <string name="settings_opt_in_of_analytics_summary">Element zbiera anonymné analytické údaje, čo nám umožňuje aplikáciu ďalej zlepšovať.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Prosím povoľte odosielanie analytických údajov a pomôžte nám tak vylepšovať Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} zbiera anonymné analytické údaje, čo nám umožňuje aplikáciu ďalej zlepšovať.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Prosím povoľte odosielanie analytických údajov a pomôžte nám tak vylepšovať ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Áno, chcem pomôcť!</string>
 
     <string name="widget_integration_missing_parameter">Chýba zadanie povinného argumentu.</string>
@@ -1097,7 +1097,7 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
 
     <string name="e2e_re_request_encryption_key">Znovu požiadať o šifrovacie kľúče z vašich ostatných relácií.<u>Znovu požiadať o šifrovacie kľúče</u> z vašich ostatných zariadení.</string>
 
-    <string name="e2e_re_request_encryption_key_dialog_content">Prosím spustite Element na inom zariadení, ktoré je schopné dešifrovať túto správu, čím sa automaticky spustí prenos chýbajúcich kľúčov na túto reláciu.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Prosím spustite ${app_name} na inom zariadení, ktoré je schopné dešifrovať túto správu, čím sa automaticky spustí prenos chýbajúcich kľúčov na túto reláciu.</string>
 
     <string name="option_send_voice">Odoslať hlasovú správu</string>
 
@@ -1227,7 +1227,7 @@ Viditeľnosť správ odoslaných cez matrix funguje podobne ako viditeľnosť sp
     <string name="auth_accept_policies">Prosím prečítajte si a odsúhlaste zmluvné podmienky tohoto domovského servera:</string>
 
     <string name="settings_call_category">Hovory</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Použiť predvolené zvonenie Element pre prichádzajúce hovory</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Použiť predvolené zvonenie ${app_name} pre prichádzajúce hovory</string>
     <string name="settings_call_ringtone_title">Zvonenie pre prichádzajúci hovor</string>
     <string name="settings_call_ringtone_dialog_title">Vyberte zvonenie pre prichádzajúce hovory:</string>
 
@@ -1258,13 +1258,13 @@ Prosím, skontrolujte nastavenia účtu.</string>
 
     <string name="settings_troubleshoot_test_device_settings_title">Nastavenia relácií.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Oznámenia sú povolené pre túto reláciu.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Oznámenia nie sú povolené pre túto reláciu.
-\nProsím, skontrolujte nastavenia Elementu.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Oznámenia nie sú povolené pre túto reláciu.
+\nProsím, skontrolujte nastavenia ${app_name}u.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Povoliť</string>
 
     <string name="settings_troubleshoot_test_play_services_title">Kontrola aplikácii Služby Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">Aplikácia Služby Google Playje k dispozícii a aktualizovaná.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element používa aplikáciu Služby Google Play na doručovanie oznámení. No zdá sa, že táto nie je správne nakonfigurovaná:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} používa aplikáciu Služby Google Play na doručovanie oznámení. No zdá sa, že táto nie je správne nakonfigurovaná:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Opraviť Služby Play</string>
 
@@ -1291,19 +1291,19 @@ Prosím skúste reštartovať aplikáciu.</string>
 
     <string name="settings_troubleshoot_test_service_boot_title">Spustenie po zapnutí</string>
     <string name="settings_troubleshoot_test_service_boot_success">Služba sa automaticky spustí po reštarte zariadenia.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Služba sa automaticky nespustí po reštarte zariadenia a nedostanete po reštarte žiadne oznámenia, kým nespustíte Element aspoň raz.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Služba sa automaticky nespustí po reštarte zariadenia a nedostanete po reštarte žiadne oznámenia, kým nespustíte ${app_name} aspoň raz.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Povoliť spustenie služby po reštarte</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Kontrola obmedzenia spustenia na pozadí</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Obmedzenie spustenia na pozadí nie je aktívne pre Element. Tento test je potrebné spustiť cez mobilné dáta (nie cez wifi).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Obmedzenie spustenia na pozadí nie je aktívne pre ${app_name}. Tento test je potrebné spustiť cez mobilné dáta (nie cez wifi).
 %1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Obmedzenie spustenia na pozadí je aktívne pre Element.
-Činnosť aplikácii bude agresívne obmedzovaná operačným systémom, keď je Element na pozadí. Môže to mať negatívny vplyv na doručovanie oznámení.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Obmedzenie spustenia na pozadí je aktívne pre ${app_name}.
+Činnosť aplikácii bude agresívne obmedzovaná operačným systémom, keď je ${app_name} na pozadí. Môže to mať negatívny vplyv na doručovanie oznámení.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Deaktivovať obmedzenia</string>
 
     <string name="settings_troubleshoot_test_battery_title">Optimalizácia batérie</string>
-    <string name="settings_troubleshoot_test_battery_success">Chod Element nie je ovplyvnený nastavením optimalizácie batérie.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Chod ${app_name} nie je ovplyvnený nastavením optimalizácie batérie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Ak používateľ na nejaký čas ponechá zariadenie s vypnutou obrazovkou odložené odpojené od napájania, na zariadení sa použije režim Doze. Toto aplikáciám zabráni pristupovať k sieti, pozastaví ich naplánované úlohy, synchronizáciu aj bežné signály.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorovať optimalizáciu</string>
 
@@ -1319,8 +1319,8 @@ Prosím skúste reštartovať aplikáciu.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Zobrazovať udalosti účtu</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Zahŕňa zmeny zobrazovaného mena a obrázka v profile.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Pripojenie na pozadí</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element potrebuje na pozadí udržovať aktívne nenáročné spojenie, aby spoľahlivo fungovali oznámenia.
-Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí pre Element. Prosím povoľte ho.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} potrebuje na pozadí udržovať aktívne nenáročné spojenie, aby spoľahlivo fungovali oznámenia.
+Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí pre ${app_name}. Prosím povoľte ho.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Udeliť oprávnenie</string>
 
     <string name="account_email_error">Pri pokuse overiť vašu emailovú adresu sa vyskytla chyba.</string>
@@ -1373,12 +1373,12 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Nepodarilo sa načítať pravidlá oznámení. Prosím, skúste znovu.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Skontrolovať nastavenia</string>
 
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nNa zariadení máte množstvo aplikácií zaregistrovaných na doručovanie okamžitých oznámení cez služby Google play. Konfigurácia Element nemá vplyv na výskyt tejto chyby. Podľa Google sa môže vyskytovať len pri veľmi vysokom počte nainštalovaných aplikácií. Bežní používatelia by týmto nemali byť postihnutí.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nKonfigurácia Element nemá vplyv na zobrazenie tejto chyby. Táto chyba sa môže zobraziť z niekoľkých dôvodov. Uistite sa že máte správne nastavený systémový čas a že ste v nastaveniach systému aplikácii služby Google play neobmedzili používanie prístupu na internet. Chyba sa tiež môže zobrazovať na vlastných zostaveniach (ROM), alebo sa chyba môže samovoľne prestať zobrazovať neskôr.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nV zariadení nemáte nastavený účet Google. Prosím, pridajte si účet cez správcu účtov. Konfigurácia Element nemá vplyv na zobrazenie tejto chyby.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nNa zariadení máte množstvo aplikácií zaregistrovaných na doručovanie okamžitých oznámení cez služby Google play. Konfigurácia ${app_name} nemá vplyv na výskyt tejto chyby. Podľa Google sa môže vyskytovať len pri veľmi vysokom počte nainštalovaných aplikácií. Bežní používatelia by týmto nemali byť postihnutí.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nKonfigurácia ${app_name} nemá vplyv na zobrazenie tejto chyby. Táto chyba sa môže zobraziť z niekoľkých dôvodov. Uistite sa že máte správne nastavený systémový čas a že ste v nastaveniach systému aplikácii služby Google play neobmedzili používanie prístupu na internet. Chyba sa tiež môže zobrazovať na vlastných zostaveniach (ROM), alebo sa chyba môže samovoľne prestať zobrazovať neskôr.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nV zariadení nemáte nastavený účet Google. Prosím, pridajte si účet cez správcu účtov. Konfigurácia ${app_name} nemá vplyv na zobrazenie tejto chyby.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Pridať účet</string>
 
     <string name="settings_notification_privacy_no_background_sync">Aplikácia sa <b>nepotrebuje</b> pripájať k domovskému serveru, keď beží na pozadí, čo môže predĺžiť výdrž batérie</string>
@@ -1470,7 +1470,7 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
     <string name="dialog_title_success">Úspešné</string>
 
     <string name="bottom_action_notification">Oznámenia</string>
-    <string name="call_failed_no_connection">Element hovor zlyhal</string>
+    <string name="template_call_failed_no_connection">${app_name} hovor zlyhal</string>
     <string name="call_failed_no_connection_description">Nepodarilo sa uskutočniť spojenie v reálnom čase.
 \nProsím, požiadajte správcu domovského servera, aby správne nastavil server turn na zaistenie čo najspoľahlivejšej prevádzky hovorov.</string>
 
@@ -1519,17 +1519,17 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
     <string name="room_participants_unban_prompt_msg">Povolením používateľovi vstupovať zaistíte, aby sa používateľ mohol vrátiť do miestnosti.</string>
 
     <string name="settings_add_3pid_confirm_password_title">Potvrdiť vaše heslo</string>
-    <string name="settings_add_3pid_flow_not_supported">Toto nie je možné urobiť cez mobilnú aplikáciu Element</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Toto nie je možné urobiť cez mobilnú aplikáciu ${app_name}</string>
     <string name="settings_add_3pid_authentication_needed">Je požadované overenie</string>
 
 
     <string name="settings_background_fdroid_sync_mode">Režim synchronizácie na pozadí (Experimentálne)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimalizovaný na využívanie batérie</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element sa bude synchronizovať na pozadí s cieľom ušetriť limitované zdroje (batériu).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} sa bude synchronizovať na pozadí s cieľom ušetriť limitované zdroje (batériu).
 \nV závislosti od kapacity prostriedkov zariadenia môže byť synchronizácia odložená operačným systémom na neskôr.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimalizovaný na používanie v reálnom čase</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element sa bude pravideľne synchronizovať na pozadí v presne stanovenom čase (nastaviteľné).
-\nToto ovplyvní využívanie batérie a prenos údajov, v oznamovacej oblasti sa bude neustále zobrazovať upozornenie, že Element spracúva udalosti.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} sa bude pravideľne synchronizovať na pozadí v presne stanovenom čase (nastaviteľné).
+\nToto ovplyvní využívanie batérie a prenos údajov, v oznamovacej oblasti sa bude neustále zobrazovať upozornenie, že ${app_name} spracúva udalosti.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Žiadna synchronizácia na pozadí</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nebudete dostávať oznámenia o prichádzajúcich správach, keď aplikácia pracuje na pozadí.</string>
     <string name="settings_background_sync_update_error">Nepodarilo sa aktualizovať nastavenia.</string>
@@ -1631,7 +1631,7 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
     <string name="passphrase_empty_error_message">Prosím, zadajte dlhé heslo</string>
     <string name="passphrase_passphrase_too_weak">Dlhé heslo je príliš slabé</string>
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Prosím, zmažte dlhé heslo, ak si želáte vygenerovať kľúč obnovenia.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Prosím, zmažte dlhé heslo, ak si želáte vygenerovať kľúč obnovenia.</string>
     <string name="keys_backup_no_session_error">Nie je dostupná žiadna relácia matrix</string>
 
     <string name="keys_backup_setup_step1_title">Nikdy nepríďte o šifrované správy</string>
@@ -1779,7 +1779,7 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
 
     <string name="autodiscover_invalid_response">Neplatná odpoveď pri zisťovaní domovského servera</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Automaticky doplniť možnosti servera</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element zistil vlastné nastavenie servera pre vaše ID používateľa a doménu \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} zistil vlastné nastavenie servera pre vaše ID používateľa a doménu \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Použiť nastavenia</string>
 
@@ -1876,7 +1876,7 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
     <string name="group_all_communities">Všetky komunity</string>
 
     <string name="room_preview_no_preview">Nie je možné zobraziť náhľad tejto miestnosti</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Nazeranie do verejných miestností nie je zatiaľ podporované</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Nazeranie do verejných miestností nie je zatiaľ podporované</string>
 
     <string name="fab_menu_create_room">Miestnosti</string>
     <string name="fab_menu_create_chat">Priame konverzácie</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index d5bfcf0d96..b170fb9269 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -874,7 +874,7 @@
     <string name="ongoing_conference_call_video">Video</string>
     <string name="missing_permissions_to_start_conf_call">Ju duhen leje për ftesa, që të nisni një konferencë në këtë dhomë</string>
     <string name="bottom_action_favourites">Të parapëlqyer</string>
-    <string name="no_contact_access_placeholder">S’e lejuat Element-in të hyjë në kontaktet tuaja vendore</string>
+    <string name="template_no_contact_access_placeholder">S’e lejuat ${app_name}-in të hyjë në kontaktet tuaja vendore</string>
     <string name="send_bug_report_description">Ju lutemi, përshkruajeni të metën. Ç’po bënit? Ç’prisnit të ndodhte? Ç’ndodhi në fakt?</string>
     <string name="send_bug_report_alert_message">Duket se po përplasni telefonin nga inati. Do të donit të hapej skena për njoftim të metash?</string>
     <string name="send_bug_report_app_crashed">Herën e fundit aplikacioni u vithis. Do të donit të hapej skena e raportimit të vithisjeve?</string>
@@ -889,7 +889,7 @@
     <string name="auth_reset_password_success_message">Fjalëkalimi juaj u ricaktua.
 \n
 \nËshtë bërë dalja juaj nga llogaria në krejt sesionet dhe s’do të merrni më njoftime push. Për riaktivizim të njoftimeve, ribëni hyrjen në çdo pajisje.</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Ju lutemi, niseni Element-in në një tjetër pajisje që mund të shfshehtëzojë mesazhin, që kështu të mund të dërgojë kyçet te ky sesion.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Ju lutemi, niseni ${app_name}-in në një tjetër pajisje që mund të shfshehtëzojë mesazhin, që kështu të mund të dërgojë kyçet te ky sesion.</string>
     <string name="call_error_ice_failed">Lidhja e Medias Dështoi</string>
     <string name="media_picker_cannot_record_video">S’regjistrohet dot video</string>
     <string name="room_preview_unlinked_email_warning">Kjo ftesë i qe dërguar %s, që s’është i përshoqëruar me këtë llogari.
@@ -957,22 +957,22 @@
     <string name="call_connected">U bë lidhja e thirrjes</string>
     <string name="call_connecting">Po bëhet lidhja e thirrjes…</string>
     <string name="call_error_user_not_responding">Ana e largët dështoi të përgjigjet.</string>
-    <string name="permissions_rationale_msg_storage">Për të dërguar dhe ruajtur bashkëngjitje, Element-i lyp leje të përdorë mediatekën tuaj.
+    <string name="template_permissions_rationale_msg_storage">Për të dërguar dhe ruajtur bashkëngjitje, ${app_name}-i lyp leje të përdorë mediatekën tuaj.
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluska pasuese, që të jetë në gjendje të dërgojë kartela që nga telefoni juaj.</string>
-    <string name="permissions_rationale_msg_camera">Për të bërë foto dhe thirrje video, Element-i lyp leje të përdorë kamerën tuaj.</string>
+    <string name="template_permissions_rationale_msg_camera">Për të bërë foto dhe thirrje video, ${app_name}-i lyp leje të përdorë kamerën tuaj.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluska pasuese, që të jetë në gjendje të bëjë thirrjen."</string>
-    <string name="permissions_rationale_msg_record_audio">Për të kryer thirrje audio, Element-i lyp leje të përdorë mikrofonin tuaj.</string>
+    <string name="template_permissions_rationale_msg_record_audio">Për të kryer thirrje audio, ${app_name}-i lyp leje të përdorë mikrofonin tuaj.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluska pasuese, që të jetë në gjendje të bëjë thirrjen."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Për të kryer thirrje video, Element-i lyp leje të përdorë kamerën dhe mikrofonin tuaj.
+    <string name="template_permissions_rationale_msg_camera_and_audio">Për të kryer thirrje video, ${app_name}-i lyp leje të përdorë kamerën dhe mikrofonin tuaj.
 \n
 \nJu lutemi, lejoni përdorimin, që nga flluskat pasuese, që të jetë në gjendje të bëjë thirrjen.</string>
-    <string name="permissions_rationale_msg_contacts">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Element-i mund të kërkojë në librin tuaj të adresave. Nëse jeni dakord të lejohet hyrja në librin tuaj të adresave për këtë qëllim, ju lutemi, lejojeni hyrjen gjatë flluskës pasuese.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, Element-i mund të kërkojë në librin tuaj të adresave.
+    <string name="template_permissions_rationale_msg_contacts">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, ${app_name}-i mund të kërkojë në librin tuaj të adresave. Nëse jeni dakord të lejohet hyrja në librin tuaj të adresave për këtë qëllim, ju lutemi, lejojeni hyrjen gjatë flluskës pasuese.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">Për të gjetur përdorues të tjerë Matrix, bazuar në email-et apo numrat e tyre të telefonit, ${app_name}-i mund të kërkojë në librin tuaj të adresave.
 \n 
 \nJeni dakord të lejohet hyrja në librin tuaj të adresave për këtë qëllim\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Na ndjeni. Veprimi nuk u krye, për shkak lejesh që mungojnë</string>
@@ -1061,9 +1061,9 @@
     <string name="settings_send_typing_notifs_summary">Lejojuni përdoruesve të tjerë të dinë se po shtypni.</string>
     <string name="settings_send_markdown_summary">Formatojini mesazhet duke përdorur sintaksën Markdown përpara se të dërgohen. Kjo lejon formatim të thelluar, f.v., përdorimi i yllthit për ta shfaqur tekstin me të pjerrëta.</string>
     <string name="settings_show_join_leave_messages_summary">Nuk prek ftesat, përzëniet dhe dëbimet.</string>
-    <string name="startup_notification_privacy_message">Element-i mund të xhirojë në prapaskenë që të administrojë njoftimet tuaja në rrugë të sigurt dhe privatisht. Kjo mund të ndikojë në harxhimin e baterisë.</string>
-    <string name="settings_opt_in_of_analytics_summary">Element-i grumbullon të dhëna analitike anonime që të na lejojë ta përmirësojmë aplikacionin.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Ju lutemi, aktivizoni analizat që të na ndihmoni të përmirësojmë Element-in.</string>
+    <string name="template_startup_notification_privacy_message">${app_name}-i mund të xhirojë në prapaskenë që të administrojë njoftimet tuaja në rrugë të sigurt dhe privatisht. Kjo mund të ndikojë në harxhimin e baterisë.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name}-i grumbullon të dhëna analitike anonime që të na lejojë ta përmirësojmë aplikacionin.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Ju lutemi, aktivizoni analizat që të na ndihmoni të përmirësojmë ${app_name}-in.</string>
     <string name="settings_unignore_user">Të shfaqen krejt mesazhet prej %s\?
 \n
 \nKini parasysh që ky veprim do të sjellë rinisjen e aplikacionit dhe mund të hajë ca kohë.</string>
@@ -1090,7 +1090,7 @@
     <string name="option_send_sticker">Dërgoni një ngjitës</string>
     <string name="go_on_with">vazhdoni me…</string>
     <string name="settings_call_category">Thirrje</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Për thirrje ardhëse përdor zilen parazgjedhje të Element-it</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Për thirrje ardhëse përdor zilen parazgjedhje të ${app_name}-it</string>
     <string name="settings_call_ringtone_title">Zile thirrjesh ardhëse</string>
     <string name="settings_call_ringtone_dialog_title">Përzgjidhni zile për thirrjet:</string>
     <string name="room_settings_no_flair">Kjo dhomë nuk shfaq simbole për ndonjë bashkësi</string>
@@ -1118,12 +1118,12 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Aktivizoje</string>
     <string name="settings_troubleshoot_test_device_settings_title">Rregullime Sesioni.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Njoftimet janë të aktivizuara për këtë sesion.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Nuk janë aktivizuar njoftimet për këtë sesion. 
-\nJu lutemi, kontrolloni rregullimet e Element-it.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Nuk janë aktivizuar njoftimet për këtë sesion.
+\nJu lutemi, kontrolloni rregullimet e ${app_name}-it.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktivizoje</string>
     <string name="settings_troubleshoot_test_play_services_title">Kontroll pë Play Services</string>
     <string name="settings_troubleshoot_test_play_services_success">APK-ja për Google Play Services është e pranishme dhe e përditësuar.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element-i përdor Google Play Services për të dorëzuar mesazhe push, por s’duket të jetë formësuar saktë:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name}-i përdor Google Play Services për të dorëzuar mesazhe push, por s’duket të jetë formësuar saktë:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Ndreqni Play Services</string>
     <string name="settings_troubleshoot_test_fcm_title">Token Firebase</string>
@@ -1145,22 +1145,22 @@
     <string name="settings_troubleshoot_test_service_restart_failed">S’u arrit të rinisej shërbimi</string>
     <string name="settings_troubleshoot_test_service_boot_title">Nise gjatë nisjes së sistemit</string>
     <string name="settings_troubleshoot_test_service_boot_success">Shërbimi do të niset kur të riniset pajisja.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Shërbimi s’do të niset kur të riniset pajisja, s’do të merrni njoftime derisa Element-i të jetë hapur një herë.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Shërbimi s’do të niset kur të riniset pajisja, s’do të merrni njoftime derisa ${app_name}-i të jetë hapur një herë.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktivizo Nisje gjatë nisjes së sistemit</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Kontrollo kufizime prapaskene</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Kufizimet për në prapaskenë janë të çaktivizuar për Element-in. Ky test duhet të xhirojë duke përdorur të dhëna rrjeti celular (jo WIFI).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Kufizimet për në prapaskenë janë të çaktivizuar për ${app_name}-in. Ky test duhet të xhirojë duke përdorur të dhëna rrjeti celular (jo WIFI).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Kufizimet për në prapaskenë janë të aktivizuara për Element-in.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Kufizimet për në prapaskenë janë të aktivizuara për ${app_name}-in.
 \nPuna që aplikacioni rreket të bëjë do të kufizohet në mënyrë agresive, teksa gjendet në prapaskenë, dhe kjo mund të prekë njoftimet.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Çaktivizoji kufizimet</string>
     <string name="settings_troubleshoot_test_battery_title">Optimizim Baterie</string>
-    <string name="settings_troubleshoot_test_battery_success">Element-i nuk preket nga Optimizime Baterie.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name}-i nuk preket nga Optimizime Baterie.</string>
     <string name="settings_troubleshoot_test_battery_failed">Nëse një përdorues e lë një pajisje jo në prizë dhe të palëvizshme për një periudhë, me ekranin të fikur, pajisja kalon nën mënyrën Dremitje. Kjo u parandalon aplikimeve të hyjnë në rrjet dhe shtyn për më vonë punët e tyre, njëkohësimet dhe alarmet standarde.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Shpërfille Optimizimin</string>
     <string name="startup_notification_fdroid_battery_optim_title">Lidhje Në Prapaskenë</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Për t’ju dhënë njoftime të qëndrueshme, Element-i lyp të mbajë në prapaskenë një lidhje me pak ndikim.
-\nNë skenën pasuese do t’ju kërkohet të lejoni Element-in të xhirojë në prapaskenë, ju lutemi, pranojeni.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">Për t’ju dhënë njoftime të qëndrueshme, ${app_name}-i lyp të mbajë në prapaskenë një lidhje me pak ndikim.
+\nNë skenën pasuese do t’ju kërkohet të lejoni ${app_name}-in të xhirojë në prapaskenë, ju lutemi, pranojeni.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Akordojini leje</string>
     <string name="account_email_error">Ndodhi një gabim teksa verifikohej adresa juaj email.</string>
     <string name="account_phone_number_error">Ndodhi një gabim teksa verifikohej numri juaj i telefonit.</string>
@@ -1179,12 +1179,12 @@
     <string name="settings_troubleshoot_test_bing_settings_failed">Disa njoftime janë të çaktivizuara te rregullimet tuaja vetjake.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">S’u arrit të ngarkohen rregulla vetjakë, ju lutemi, riprovoni.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Kontrolloni Rregullimet</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nKy gabim është jashtë kontrollit të Element-it dhe, sipas Google-it, ky gabim është shenjë se pajisja ka shumë aplikacione të regjistruar me FCM. Gabimi ndodh vetëm në raste kur ka një numër të skajshëm aplikacionesh, ndaj nuk duhet të prekë përdoruesin mesatar.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nKy gabim është jashtë kontrollit të Element-it. Mund të ndodhë për disa arsye. Ndoshta do të funksionojë, nëse riprovoni më vonë, mund të kontrolloni edhe nëse për Google Play Service s’ka kufizime lidhur me përdorimin e të dhënave, te rregullimet e sistemit, ose se ora e pajisjes suaj është e saktë, ose mund të ndodhë në ROM të përshtatur.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nKy gabim është jashtë kontrollit të Element-it. S’ka llogari Google te telefoni. Ju lutemi, hapni përgjegjësin e llogarive dhe shtoni një llogari Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nKy gabim është jashtë kontrollit të ${app_name}-it dhe, sipas Google-it, ky gabim është shenjë se pajisja ka shumë aplikacione të regjistruar me FCM. Gabimi ndodh vetëm në raste kur ka një numër të skajshëm aplikacionesh, ndaj nuk duhet të prekë përdoruesin mesatar.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nKy gabim është jashtë kontrollit të ${app_name}-it. Mund të ndodhë për disa arsye. Ndoshta do të funksionojë, nëse riprovoni më vonë, mund të kontrolloni edhe nëse për Google Play Service s’ka kufizime lidhur me përdorimin e të dhënave, te rregullimet e sistemit, ose se ora e pajisjes suaj është e saktë, ose mund të ndodhë në ROM të përshtatur.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nKy gabim është jashtë kontrollit të ${app_name}-it. S’ka llogari Google te telefoni. Ju lutemi, hapni përgjegjësin e llogarive dhe shtoni një llogari Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Shtoni Llogari</string>
     <string name="settings_noisy_notifications_preferences">Formësoni Njoftime të Zhurmshme</string>
     <string name="settings_call_notifications_preferences">Formësoni Njoftime Thirrjesh</string>
@@ -1195,7 +1195,7 @@
     <string name="notification_silent">Të heshtur</string>
     <string name="passphrase_empty_error_message">Ju lutemi, jepni një frazëkalim</string>
     <string name="passphrase_passphrase_too_weak">Frazëkalimi është shumë i dobët</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Ju lutemi, fshini frazëkalimin, nëse doni që Element-i të prodhojë një kyç rimarrjesh.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Ju lutemi, fshini frazëkalimin, nëse doni që ${app_name}-i të prodhojë një kyç rimarrjesh.</string>
     <string name="keys_backup_no_session_error">S’ka sesione Matrix të gatshëm</string>
     <string name="keys_backup_setup_step1_title">Mos humbni kurrë mesazhe të fshehtëzuar</string>
     <string name="keys_backup_setup_step1_description">Mesazhet në dhoma të fshehtëzuara sigurohen me fshehtëzim skaj-më-skaj. Vetëm ju dhe marrësi(t) keni kyçet për leximin e këtyre mesazheve.
@@ -1325,7 +1325,7 @@
     <string name="new_recovery_method_popup_was_me">Unë qeshë</string>
     <string name="autodiscover_invalid_response">Përgjigje e pavlefshme zbulimi shërbyesi Home</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Mundësi Vetëplotësimi Shërbyesi</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element-i pikasi një formësim shërbyesi të përshtatur për përkatësinë tuaj userId \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name}-i pikasi një formësim shërbyesi të përshtatur për përkatësinë tuaj userId \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Përdor Formësim</string>
     <string name="notification_sync_init">Po gatitet shërbimi</string>
@@ -1439,7 +1439,7 @@
     <string name="please_wait">Ju lutemi, pritni…</string>
     <string name="group_all_communities">Krejt Bashkësitë</string>
     <string name="room_preview_no_preview">Kjo dhomë s’mund të parashihet</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Paraparja e dhomave të lexueshme nga bota nuk mbulohet ende në Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Paraparja e dhomave të lexueshme nga bota nuk mbulohet ende në ${app_name}</string>
     <string name="fab_menu_create_room">Dhoma</string>
     <string name="fab_menu_create_chat">Mesazhe të Drejtpërdrejtë</string>
     <string name="create_room_title">Dhomë e Re</string>
@@ -1531,11 +1531,11 @@
     <string name="invite_no_identity_server_error">Që të kryhet ky veprim, shtoni një shërbyes identitetesh, që nga rregullimet tuaja.</string>
     <string name="settings_background_fdroid_sync_mode">Mënyrë Njëkohësimi Në Prapaskenë</string>
     <string name="settings_background_fdroid_sync_mode_battery">E optimizuar për baterinë</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element-i do të bëjë njëkohësim në prapaskenë, në një mënyrë që kursen burimet e kufizuara të pajisjes (baterinë).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name}-i do të bëjë njëkohësim në prapaskenë, në një mënyrë që kursen burimet e kufizuara të pajisjes (baterinë).
 \nNë varësi të gjendjes së burimeve tuaja, njëkohësimi mund të shtyhet për më vonë nga sistemi operativ.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">I optimizuar për kohë të njëmendtë</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element0-i do të bëjë njëkohësim në prapaskenë periodikisht në një kohë të caktuar (e formësueshme).
-\nKjo do të ketë ndikim mbi përdorimin e baterisë dhe të transmetimit, do të shfaqet një njoftim i pandërprerë që pohon se Element-i po përgjon për akte.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name}0-i do të bëjë njëkohësim në prapaskenë periodikisht në një kohë të caktuar (e formësueshme).
+\nKjo do të ketë ndikim mbi përdorimin e baterisë dhe të transmetimit, do të shfaqet një njoftim i pandërprerë që pohon se ${app_name}-i po përgjon për akte.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Pa njëkohësim në prapraskenë</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">S’do të njoftoheni për mesazhe ardhës, kur aplikacioni gjendet në prapaskenë.</string>
     <string name="settings_background_sync_update_error">S’u arrit të përditësohen rregullime.</string>
@@ -1618,12 +1618,12 @@
     <string name="content_reported_as_inappropriate_content">Kjo lëndë është raportuar si e papërshtatshme. 
 \n 
 \nNëse s’doni të shihni më lëndë nga ky përdorues, mund ta shpërfillni, që të fshihen mesazhet e tij.</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element-i lyp leje për të ruajtur kyçet tuaj E2E në disk.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name}-i lyp leje për të ruajtur kyçet tuaj E2E në disk.
 \n
 \nJu lutemi, lejoni, te flluska pasuese, hyrje për të qenë e mundur të eksportohen kyçet tuaj dorazi.</string>
     <string name="no_network_indicator">Tani për tani s’la lidhje rrjeti</string>
     <string name="settings_add_3pid_confirm_password_title">Ripohoni fjalëkalimin tuaj</string>
-    <string name="settings_add_3pid_flow_not_supported">Këtë s’e bëni dot që nga Element-i për celular</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Këtë s’e bëni dot që nga ${app_name}-i për celular</string>
     <string name="settings_add_3pid_authentication_needed">Lypset mirëfilltësim</string>
     <string name="settings_integrations">Integrime</string>
     <string name="settings_integrations_summary">Përdorni një Përgjegjës Integrimesh që të administroni robotë, ura, widget-e dhe paketa ngjitësish.
@@ -1792,7 +1792,7 @@
 \nQë të mund të hyni te të dhëna të llogarisë tuaj dhe te mesazhe, bëni sërish hyrjen.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Do të humbni hyrje te mesazhe të sigurt, veç në hyfshi për të rimarrë kyçet tuaj të fshehtëzimit.</string>
     <string name="soft_logout_clear_data_dialog_submit">Spastro të dhënat</string>
-    <string name="soft_logout_sso_not_same_user_error">Sesioni i tanishëm është për përdoruesin %1$s dhe ju jepni kredenciale për përdoruesin %2$s. Kjo nuk mbulohet nga Element.
+    <string name="template_soft_logout_sso_not_same_user_error">Sesioni i tanishëm është për përdoruesin %1$s dhe ju jepni kredenciale për përdoruesin %2$s. Kjo nuk mbulohet nga ${app_name}.
 \nJu lutemi, së pari spastroni të dhëna, mandej hyni sërish në një tjetër llogari.</string>
     <string name="permalink_malformed">Lidhja juaj matrix.to është e keqformuar</string>
     <string name="bug_report_error_too_short">Përshkrimi është shumë i shkurtër</string>
@@ -1811,7 +1811,7 @@
     <string name="devices_current_device">Sesioni i tanishëm</string>
     <string name="devices_other_devices">Shfaq sesione të tjera</string>
     <string name="autocomplete_limited_results">Po shfaqen vetëm përfundimet e para, shtypni më shumë shkronja…</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element mund të vithiset më shpesh, kur ndodh një gabim i papritur</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} mund të vithiset më shpesh, kur ndodh një gabim i papritur</string>
     <string name="settings_call_ringtone_use_default_stun">Lejoni shërbyes rrugëzgjidhje asistimi thirrjesh</string>
     <string name="command_description_shrug">Parashtoji ¯\\_(ツ)_/¯ një mesazhi tekst të thjeshtë</string>
     <string name="create_room_encryption_title">Aktivizoni fshehtëzim</string>
@@ -1925,9 +1925,9 @@
     <string name="verification_request_alert_description">Për siguri ekstra, verifikojeni %s duke parë kontrolluar në të dy pajisjet tuaja një kod njëpërdorimsh.
 \n
 \nPër sigurinë maksimale, bëjeni këtë ju vetë.</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element nuk trajton akte të llojit \'%1$s\'</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element nuk trajton mesazhe të llojit \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element ndeshi një problem kur vizatohej lëndë e aktit me ID \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} nuk trajton akte të llojit \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} nuk trajton mesazhe të llojit \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} ndeshi një problem kur vizatohej lëndë e aktit me ID \'%1$s\'</string>
     <string name="verify_cannot_cross_sign">Ky sesion s’është në gjendje të ndajë këtë verifikim me sesionet tuaj të tjerë.
 \nVerifikimi do të ruhet lokalisht dhe do të ndahet nën një version të ardhshëm të aplikacionit.</string>
     <string name="verification_request_notice">Për të qenë i sigurt, verifikoni %s duke kontrolluar një kod njëpërdorimsh.</string>
@@ -1980,7 +1980,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Veprimtari e fshirë nga përdorues, arsye: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Veprimtari e moderuar nga përgjegjësi i dhomës, arsye: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Kyçet janë tashmë të përditësuar!</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">Kërkesa Kyçi</string>
     <string name="e2e_use_keybackup">Shkyçni historik mesazhesh të fshehtëzuar</string>
     <string name="refresh">Rifreskoje</string>
@@ -2081,13 +2081,13 @@
     <string name="media_file_added_to_gallery">Te Galeria u shtua kartelë media</string>
     <string name="error_adding_media_file_to_gallery">S’u shtua dot kartelë media te Galeria</string>
     <string name="change_password_summary">Caktoni një fjalëkalim të ri llogarie…</string>
-    <string name="use_other_session_content_description">Përdorni Element-in më të ri në pajisjet tuaja të tjera, Element Web, Element Desktop, Element iOS, Element për Android, ose një tjetër klient Matrix të aftë për &lt;em&gt;cross-signing&lt;/em</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">Përdorni ${app_name}-in më të ri në pajisjet tuaja të tjera, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} për Android, ose një tjetër klient Matrix të aftë për &lt;em&gt;cross-signing&lt;/em</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">ose një tjetër klient Matrix i aftë për &lt;em&gt;cross-signing&lt;/em</string>
-    <string name="use_latest_app">Përdorni Element-in më të ri në pajisjet tuaja të tjera:</string>
+    <string name="template_use_latest_app">Përdorni ${app_name}-in më të ri në pajisjet tuaja të tjera:</string>
     <string name="command_description_discard_session_not_handled">Mbulohet vetëm për dhoma të fshehtëzuara</string>
     <string name="enter_secret_storage_passphrase_or_key">Përdorni %1$s tuaj ose përdorni %2$s tuaj që të vazhdohet.</string>
     <string name="use_recovery_key">Përdorni Kyçin Rimarrjesh</string>
@@ -2147,7 +2147,7 @@
     <string name="choose_locale_other_locales_title">Gjuhë të tjera të gatshme</string>
     <string name="choose_locale_loading_locales">Po ngarkohen gjuhë të gatshme…</string>
     <string name="disconnect_identity_server_dialog_content">Të bëhet shkëputja prej shërbyesit tuaj të identitetit %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Ky shërbyes identitetesh është i vjetruar. Element mbulon vetëm API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Ky shërbyes identitetesh është i vjetruar. ${app_name} mbulon vetëm API V2.</string>
     <string name="identity_server_error_outdated_home_server">Ky veprim s’është i mundshëm. Shërbyesi Home është i vjetruar.</string>
     <string name="identity_server_error_no_identity_server_configured">Ju lutemi, së pari formësoni një shërbyes identitetesh.</string>
     <string name="identity_server_error_terms_not_signed">Ju lutemi, së pari pranoni te rregullimet termat e shërbyesit të identiteteve.</string>
@@ -2178,7 +2178,7 @@
     <string name="action_copy">Kopjoje</string>
     <string name="dialog_title_success">Sukses</string>
     <string name="bottom_action_notification">Njoftime</string>
-    <string name="call_failed_no_connection">Thirrja Element Dështoi</string>
+    <string name="template_call_failed_no_connection">Thirrja ${app_name} Dështoi</string>
     <string name="call_failed_no_connection_description">S’u arrit të vendosej lidhje e atypëratyshme.
 \nQë thirrjet të punojnë mirë, ju lutemi, kërkojini përgjegjësit të shërbyesit tuaj Home të formësojë një shërbyes TURN.</string>
     <string name="call_select_sound_device">Përzgjidhni Pajisje Zëri</string>
@@ -2295,7 +2295,7 @@
     <string name="error_saving_media_file">S’u ruajt dot kartelë media</string>
     <string name="confirm_your_identity_quad_s">Ripohoni identitetin tuaj duke verifikuar këto kredenciale hyrjeje, duke i akorduar hyrje te mesazhe të fshehtëzuar.</string>
     <string name="error_sso_flow_not_supported_yet">Na ndjeni, ky veprim s’është ende i mundshëm për llogari të lidhura duke përdorur Hyrje Njëshe.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Për privatësinë tuaj, Element-i mbulon vetëm dërgim email-esh dhe numrash telefoni përdoruesi të koduar.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Për privatësinë tuaj, ${app_name}-i mbulon vetëm dërgim email-esh dhe numrash telefoni përdoruesi të koduar.</string>
     <string name="power_level_edit_title">Caktoni rol</string>
     <string name="power_level_title">Rol</string>
     <string name="a11y_open_chat">Hapni fjalosje</string>
@@ -2368,13 +2368,13 @@
     <string name="error_opening_banned_room">S’mund të hapet një dhomë prej të cilës jeni dëbuar.</string>
     <string name="room_error_not_found">S’gjendet dot kjo dhomë. Sigurohuni që ekziston.</string>
     <string name="universal_link_malformed">Lidhja qe e keqformësuar</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Kodi PIN kërkohet doemos sa herë që hapni Element-in.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">Kodi PIN kërkohet doemos pas 2 minutash mospërdorimi të Element-it.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Kodi PIN kërkohet doemos sa herë që hapni ${app_name}-in.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Kodi PIN kërkohet doemos pas 2 minutash mospërdorimi të ${app_name}-it.</string>
     <string name="settings_security_pin_code_grace_period_title">Kërkoje doemos PIN-in pas 2 minutash</string>
     <string name="settings_security_pin_code_notifications_summary_off">Shfaq vetëm numrin e mesazheve të palexuar, në një njoftim të thjeshtë.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Shfaq hollësi, të tilla si emra dhomash dhe lëndë mesazhesh.</string>
     <string name="settings_security_pin_code_notifications_title">Shfaq lëndë në njoftime</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">Kodi PIN është rruga e vetme për të shkyçur Element-in.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">Kodi PIN është rruga e vetme për të shkyçur ${app_name}-in.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Aktivizoni të dhëna biometrike specifike për pajisjen, bie fjala, shenja gishtash dhe njohje fytyre.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Aktivizo të dhëna biometrike</string>
     <string name="settings_security_application_protection_screen_title">Formësoni mbrojtjen</string>
@@ -2448,8 +2448,8 @@
     <string name="user_code_share">Ndaje kodin tim me të tjerët</string>
     <string name="user_code_scan">Skanoni një kod QR</string>
     <string name="not_a_valid_qr_code">S’është kod QR Matrix i vlefshëm</string>
-    <string name="invite_friends_rich_title">Takohuni me mua në Element</string>
-    <string name="invite_friends_text">Hej, bisedoni me mua në Element: %s</string>
+    <string name="template_invite_friends_rich_title">Takohuni me mua në ${app_name}</string>
+    <string name="template_invite_friends_text">Hej, bisedoni me mua në ${app_name}: %s</string>
     <string name="invite_friends">Ftoni shokë</string>
     <string name="add_people">Shtoni persona</string>
     <string name="topic_prefix">"Temë: "</string>
@@ -2526,7 +2526,7 @@
     <string name="action_unpublish">Hiqi botimin</string>
     <string name="action_add">Shto</string>
     <string name="authentication_error">S’u arrit të bëhej mirëfilltësimi</string>
-    <string name="re_authentication_default_confirm_text">Që të kryejë këtë veprim, Element-i lyp dhënien prej jush të kredencialeve tuaja.</string>
+    <string name="template_re_authentication_default_confirm_text">Që të kryejë këtë veprim, ${app_name}-i lyp dhënien prej jush të kredencialeve tuaja.</string>
     <string name="re_authentication_activity_title">Lypset Rimirëfilltësim</string>
     <string name="call_transfer_users_tab_title">Përdorues</string>
     <string name="call_transfer_failure">Ndodhi një gabim teksa shpërngulej thirrja</string>
diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 8f4cae8487..2ce03e4a54 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -418,7 +418,7 @@
     </plurals>
     <string name="no_public_room_placeholder">Нема доступних јавних соба</string>
     <string name="no_more_results">Нема више резултата</string>
-    <string name="no_contact_access_placeholder">Нисте доволили да Елемент приступи вашим контактима</string>
+    <string name="template_no_contact_access_placeholder">Нисте доволили да Елемент приступи вашим контактима</string>
     <string name="no_conversation_placeholder">Нема разговора</string>
     <string name="system_alerts_header">Системска упозорења</string>
     <string name="bottom_action_groups">Заједнице</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 79cdd21751..70de437eab 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -377,7 +377,7 @@
     <string name="user_directory_header">Användarkatalog</string>
     <string name="matrix_only_filter">Bara Matrix-kontakter</string>
     <string name="no_conversation_placeholder">Inga konversationer</string>
-    <string name="no_contact_access_placeholder">Du gav inte Element tillgång till dina lokala kontakter</string>
+    <string name="template_no_contact_access_placeholder">Du gav inte ${app_name} tillgång till dina lokala kontakter</string>
     <string name="no_result_placeholder">Inga resultat</string>
     <string name="people_no_identity_server">Ingen identitetsserver konfigurerad.</string>
     <string name="rooms_header">Rum</string>
@@ -512,7 +512,7 @@
     <string name="e2e_re_request_encryption_key">Efterfråga krypteringsnycklarna igen från dina andra sessioner.</string>
     <string name="e2e_re_request_encryption_key_sent">Nyckelförfrågan har skickats.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Förfrågan har skickats</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Vänligen öppna Element på en annan enhet som kan dekryptera meddelandet så att den kan skicka nycklarna till den här sessionen.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Vänligen öppna ${app_name} på en annan enhet som kan dekryptera meddelandet så att den kan skicka nycklarna till den här sessionen.</string>
     <string name="read_receipts_list">Läsindikationslista</string>
     <string name="groups_list">Grupplista</string>
     <plurals name="membership_changes">
@@ -533,7 +533,7 @@
     <string name="room_info_room_name">Rumsnamn</string>
     <string name="room_info_room_topic">Rumsämne</string>
     <string name="settings_call_category">Samtal</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Använd förvald Element-ringsignal för inkommande samtal</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Använd förvald ${app_name}-ringsignal för inkommande samtal</string>
     <string name="settings_call_ringtone_use_default_stun">Tillåt reservassistansserver för samtal</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Kommer att använda %s som reserv när din hemserver inte erbjuder en (din IP-adress kommer att delas under samtalet)</string>
     <string name="settings_call_ringtone_title">Ringsignal för inkommande samtal</string>
@@ -555,22 +555,22 @@
     <string name="media_picker_both_capture_title">Ta en bild eller en video</string>
     <string name="media_picker_cannot_record_video">Kan inte spela in video</string>
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Element behöver tillstånd att komma åt ditt foto- och videobibliotek för att skicka och spara bilagor. 
+    <string name="template_permissions_rationale_msg_storage">${app_name} behöver tillstånd att komma åt ditt foto- och videobibliotek för att skicka och spara bilagor.
 \n 
 \nVänligen ge tillstånd i nästa popup för att kunna skicka filer från din telefon.</string>
-    <string name="permissions_rationale_msg_camera">Element behöver tillstånd att komma åt din kamera för att kunna ta bilder och hålla videosamtal.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} behöver tillstånd att komma åt din kamera för att kunna ta bilder och hålla videosamtal.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nVänligen ge åtkomst i nästa popup för att kunna utföra samtalet."</string>
-    <string name="permissions_rationale_msg_record_audio">Element behöver tillstånd att komma åt din mikrofon för hålla röstsamtal.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} behöver tillstånd att komma åt din mikrofon för hålla röstsamtal.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nVänligen ge åtkomst i nästa popup för att kunna utföra samtalet."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element behöver tillstånd att komma åt din kamera och mikrofon för att kunna utföra videosamtal. 
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} behöver tillstånd att komma åt din kamera och mikrofon för att kunna utföra videosamtal.
 \n 
 \nVänligen ge tillstånd i nästa popup för att kunna utföra samtalet.</string>
-    <string name="permissions_rationale_msg_contacts">Element kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer. Om du går med på att dela din adressbok för detta ändamål, vänligen ge tillstånd i nästa popup.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer. Om du går med på att dela din adressbok för detta ändamål, vänligen ge tillstånd i nästa popup.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer.
 \n
 \nVill du dela din adressbok för detta ändamål\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Tyvärr. Handlingen utfördes inte på grund av saknade rättigheter</string>
@@ -793,8 +793,8 @@
     <string name="settings_troubleshoot_test_account_settings_failed">Aviseringar är inaktiverade för ditt konto.
 \nVänligen kolla kontoinställningarna.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Aviseringar är aktiverade för den här sessionen.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Aviseringar är inaktiverade för den här sessionen.
-\nVänligen kolla Elementinställningarna.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Aviseringar är inaktiverade för den här sessionen.
+\nVänligen kolla ${app_name}inställningarna.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Observera att vissa meddelandetyper är satta till tyst (kommer att producera aviseringar utan ljud).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Vissa aviseringar är inaktiverade i dina anpassade inställningar.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_title">Aviseringstjänst</string>
@@ -802,8 +802,8 @@
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Aviseringstjänsten körs inte.
 \nFörsök att starta om appen.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Automatisk omstart av aviseringstjänsten</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Tjänsten kommer inte att starta när enheten startas om, så du kommer inte att få aviseringar förrens Element har öppnats en gång.</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Bakgrundsbegränsningar är aktiverade för Element.
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Tjänsten kommer inte att starta när enheten startas om, så du kommer inte att få aviseringar förrens ${app_name} har öppnats en gång.</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Bakgrundsbegränsningar är aktiverade för ${app_name}.
 \nSaker som appen försöker göra kommer att kraftigt begränsas när appen är bakgrunden, och detta kan påverka aviseringar.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_battery_failed">Om en användare lämnar sin enhet urkopplad och stilla en längre tid, med skärmen av, så går enheten in i Doze-läget. Detta hindrar appar från att komma åt nätverket och skjuter upp deras uppgifter, synkroniseringar och standardlarm.</string>
@@ -822,8 +822,8 @@
     <string name="settings_containing_my_user_name">Meddelanden innehållande mitt användarnamn</string>
     <string name="settings_messages_in_one_to_one">Meddelanden i direktchattar</string>
     <string name="settings_messages_in_group_chat">Meddelanden i gruppchattar</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element kommer att synka i bakgrunden periodiskt vid precisa tider (konfigurerbart). 
-\nDetta kommer att påverka data- och batterianvändning, och det kommer att visas en permanent avisering som säger att Element lyssnar efter händelser.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} kommer att synka i bakgrunden periodiskt vid precisa tider (konfigurerbart).
+\nDetta kommer att påverka data- och batterianvändning, och det kommer att visas en permanent avisering som säger att ${app_name} lyssnar efter händelser.</string>
     <string name="settings_version">Version</string>
     <string name="settings_olm_version">olm-version</string>
     <string name="settings_keep_media">Behåll media</string>
@@ -843,9 +843,9 @@
     <string name="settings_discovery_category">Upptäckbarhet</string>
     <string name="settings_discovery_manage">Hantera dina upptäckbarhetsinställningar.</string>
     <string name="startup_notification_privacy_title">Aviseringssekretess</string>
-    <string name="startup_notification_privacy_message">Element kan köra i bakgrunden för att hantera dina aviseringar säkert och privat. Detta kan påverka batteritiden.</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element behöver hålla en bakgrundsanslutning med låg påverkan för att ha pålitliga aviseringar.
-\nPå nästa skärm kommer du att frågas om du vill tillåta att Element alltid körs i bakgrunden, vänligen acceptera.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} kan köra i bakgrunden för att hantera dina aviseringar säkert och privat. Detta kan påverka batteritiden.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} behöver hålla en bakgrundsanslutning med låg påverkan för att ha pålitliga aviseringar.
+\nPå nästa skärm kommer du att frågas om du vill tillåta att ${app_name} alltid körs i bakgrunden, vänligen acceptera.</string>
     <string name="settings_logged_in">Inloggad som</string>
     <string name="settings_home_server">Hemserver</string>
     <string name="settings_identity_server">Identitetsserver</string>
@@ -986,7 +986,7 @@
 \nLogga in igen för att komma åt din kontodata och dina meddelanden.</string>
     <string name="settings_advanced_settings">Avancerade inställningar</string>
     <string name="autocomplete_limited_results">Visar endast de första resultaten, skriv mer…</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element kan krascha mer när ett oväntat fel inträffar</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} kan krascha mer när ett oväntat fel inträffar</string>
     <string name="create_room_encryption_description">Efter aktivering så kan kryptering inte avaktiveras.</string>
     <string name="login_error_threepid_denied">Din e-postdomän är inte auktoriserad för att registrera på den här servern</string>
     <string name="room_profile_not_encrypted_subtitle">Meddelanden i det här rummet är inte totalsträckskrypterade.</string>
@@ -1035,7 +1035,7 @@
     </plurals>
     <string name="invite_users_to_room_failure">Vi kunde inte bjuda in användarna. Vänligen kolla användarna du vill bjuda in och försök igen.</string>
     <string name="disconnect_identity_server_dialog_content">Koppla bort från identitetsservern %s\?</string>
-    <string name="identity_server_error_outdated_identity_server">Den här identitetsservern är utdaterat. Element stöder endast API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Den här identitetsservern är utdaterat. ${app_name} stöder endast API V2.</string>
     <string name="identity_server_error_no_identity_server_configured">Vänligen konfigurera en identitetsserver.</string>
     <string name="identity_server_error_terms_not_signed">Vänligen acceptera först identitetsserverns användarvillkor i inställningarna.</string>
     <string name="identity_server_set_default_notice">Din hemserver (%1$s) föreslår att du använder %2$s som din identitetsserver</string>
@@ -1171,7 +1171,7 @@
     <string name="sent_an_audio_file">Ljud</string>
     <string name="sent_a_file">Fil</string>
     <string name="send_a_sticker">Dekal</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element hanterar inte meddelanden av typen \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} hanterar inte meddelanden av typen \'%1$s\'</string>
     <string name="command_description_rainbow">Skickar det valda meddelandet I regnbågsfärger</string>
     <string name="settings_category_composer">Meddelanderedigering</string>
     <string name="message_key">Meddelandenyckel</string>
@@ -1208,7 +1208,7 @@
     <string name="cannot_call_yourself_with_invite">Du kan inte ringa ett samtal till dig själv, vänta tills deltagare accepterar inbjudan</string>
     <string name="failed_to_add_widget">Misslyckades att lägga till widget</string>
     <string name="failed_to_remove_widget">Misslyckades att ta bort widget</string>
-    <string name="call_failed_no_connection">Elementsamtal misslyckades</string>
+    <string name="template_call_failed_no_connection">${app_name}samtal misslyckades</string>
     <string name="call_failed_no_connection_description">Misslyckades att upprätta en realtidsuppkoppling.
 \nVänligen be administratören för din hemserver att konfigurera en TURN-server för att samtal ska fungera pålitligt.</string>
     <string name="call_select_sound_device">Välj ljudenhet</string>
@@ -1313,7 +1313,7 @@
     <string name="room_sliding_menu_copyright">Upphovsrätt</string>
     <string name="room_sliding_menu_privacy_policy">Integritetspolicy</string>
     <string name="settings_phone_number">Telefon</string>
-    <string name="settings_add_3pid_flow_not_supported">Du kan inte göra detta från element på mobilen</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Du kan inte göra detta från ${app_name} på mobilen</string>
     <string name="settings_add_3pid_authentication_needed">Autentisering krävs</string>
     <string name="settings_troubleshoot_diagnostic">Diagnostik för felsökning</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Kör tester</string>
@@ -1323,7 +1323,7 @@
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Misslyckades att ladda anpassade regler, vänligen försök igen.</string>
     <string name="settings_troubleshoot_test_play_services_title">Kolla Play-tjänster</string>
     <string name="settings_troubleshoot_test_play_services_success">APK:n Google Play-tjänster är tillgänglig och uppdaterad.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element använder Google Play-tjänster för att skicka pushmeddelanden, men den verkar inte vara korrekt konfigurerad:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} använder Google Play-tjänster för att skicka pushmeddelanden, men den verkar inte vara korrekt konfigurerad:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Fixa Play-tjänster</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase-token</string>
@@ -1331,12 +1331,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Misslyckades att hämta FCM-token:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nDet här felet är ur Elements kontroll, och enligt Google indikerar det här felet att den här enheten har för många appar registrerade med FCM. Felet händer endast i fall då extremt många appar är installerade, så det bör inte påverka normala användare.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nDet här felet är ur Elements kontroll. Det kan hända av flera anledningar. Det kanske funkar om du försöker igen senare, du kan kolla så att Google Play-tjänster inte är databegränsad i systeminställningarna, eller att enhetens klocka går rätt, eller så kan det hända på en alternativ ROM.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nDet här felet är ur Elements kontroll. Det finns inget Google-konto på telefonen. Vänligen öppna kontohanteraren och lägg till ett Google-konto.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nDet här felet är ur ${app_name}s kontroll, och enligt Google indikerar det här felet att den här enheten har för många appar registrerade med FCM. Felet händer endast i fall då extremt många appar är installerade, så det bör inte påverka normala användare.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nDet här felet är ur ${app_name}s kontroll. Det kan hända av flera anledningar. Det kanske funkar om du försöker igen senare, du kan kolla så att Google Play-tjänster inte är databegränsad i systeminställningarna, eller att enhetens klocka går rätt, eller så kan det hända på en alternativ ROM.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nDet här felet är ur ${app_name}s kontroll. Det finns inget Google-konto på telefonen. Vänligen öppna kontohanteraren och lägg till ett Google-konto.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lägg till konto</string>
     <string name="settings_troubleshoot_test_token_registration_title">Token-registrering</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM-token registrerades framgångsrikt på hemservern.</string>
@@ -1349,11 +1349,11 @@
     <string name="settings_troubleshoot_test_service_boot_success">Tjänsten kommer att startas när enheten startas om.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktivera start på boot</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Kolla bakgrundsrestriktioner</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Bakgrundsrestriktioner är inaktiverade för Element. Detta test bör köras med mobildata (inte Wi-Fi).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Bakgrundsrestriktioner är inaktiverade för ${app_name}. Detta test bör köras med mobildata (inte Wi-Fi).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Inaktivera restriktioner</string>
     <string name="settings_troubleshoot_test_battery_title">Batterioptimering</string>
-    <string name="settings_troubleshoot_test_battery_success">Element påverkas inte av batterioptimering.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} påverkas inte av batterioptimering.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorera optimering</string>
     <string name="settings_notification_privacy_reduced">Reducerad sekretess</string>
     <string name="settings_notification_privacy_need_permission">Den här appen behöver behörighet att köra i bakgrunden</string>
@@ -1478,7 +1478,7 @@
         <item quantity="one">%1$s, %2$s och %3$d annan har läst</item>
         <item quantity="other">%1$s, %2$s och %3$d andra har läst</item>
     </plurals>
-    <string name="permissions_rationale_msg_keys_backup_export">Element behöver behörighet för att spara dina nycklar för totalsträckskryptering i lagringen.
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} behöver behörighet för att spara dina nycklar för totalsträckskryptering i lagringen.
 \n
 \nVänligen ge tillstånd i nästa popup för att kunna manuellt exportera dina nycklar.</string>
     <string name="no_ignored_users">Du ignorerar inga användare</string>
@@ -1494,7 +1494,7 @@
     <string name="soft_logout_clear_data_notice">Varning: Din personliga data (inklusive krypteringsnycklar) lagras fortfarande på den här enheten.
 \n
 \nRensa den om du inte ska använda den här enheten längre, eller vill logga in på ett annat konto.</string>
-    <string name="soft_logout_sso_not_same_user_error">Den nuvarande sessionen är för användaren %1$s och du försedde uppgifter för användaren %2$s. Detta stöds inte av Element.
+    <string name="template_soft_logout_sso_not_same_user_error">Den nuvarande sessionen är för användaren %1$s och du försedde uppgifter för användaren %2$s. Detta stöds inte av ${app_name}.
 \nVänligen rensa först data, och logga sen in på ett annat konto.</string>
     <string name="settings_show_devices_list">Se alla mina sessioner</string>
     <string name="settings_developer_mode">Utvecklarläge</string>
@@ -1564,16 +1564,16 @@
     <string name="bootstrap_migration_backup_recovery_key">Återställningsnyckel för säkerhetskopiering</string>
     <string name="settings_security_prevent_screenshots_title">Förhindra skärmdumpar av appen</string>
     <string name="settings_security_prevent_screenshots_summary">Att aktivera den här inställningen lägger till FLAG_SECURE till alla aktiviteter. Starta om appen för att inställningen ska få effekt.</string>
-    <string name="use_other_session_content_description">Använd senaste Element på dina andra enheter; Element Web, Element iOS, Element för Android, eller annan Matrixklient som stöder korssignering</string>
+    <string name="template_use_other_session_content_description">Använd senaste ${app_name} på dina andra enheter; ${app_name} Web, ${app_name} iOS, ${app_name} för Android, eller annan Matrixklient som stöder korssignering</string>
     <string name="or_other_mx_capabale_client">eller en annan Matrixklient som städer korssignering</string>
-    <string name="use_latest_app">Använd senaste Element på dina andra enheter:</string>
+    <string name="template_use_latest_app">Använd senaste ${app_name} på dina andra enheter:</string>
     <string name="command_description_discard_session">Tvingar den nuvarande utgående gruppsessionen i ett krypterat rum att kasseras</string>
     <string name="keys_backup_recovery_key_error_decrypt">Säkerhetskopian kunde inte avkrypteras med den här återställningsnyckeln: vänligen verifiera att du skrev in rätt återställningsnyckel.</string>
     <string name="settings_setup_secure_backup">Sätt upp säker säkerhetskopiering</string>
     <string name="bottom_sheet_setup_secure_backup_title">Säker säkerhetskopiering</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Sätt upp</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Skriv in en hemlig fras endast du känner till, och generera en nyckel för säkerhetskopiering.</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element kommer att synka i bakgrunden på ett sätt som sparar på enhetens begränsade resurser (batteri).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} kommer att synka i bakgrunden på ett sätt som sparar på enhetens begränsade resurser (batteri).
 \nBeroende på din enhets resurser, så kan synkroniseringen bli uppskjuten av operativsystemet.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimerad för realtid</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Ingen bakgrundssynk</string>
@@ -1604,8 +1604,8 @@
     <string name="startup_notification_fdroid_battery_optim_button_grant">Ge behörighet</string>
     <string name="settings_analytics">Statistik</string>
     <string name="settings_opt_in_of_analytics">Skicka statistikdata</string>
-    <string name="settings_opt_in_of_analytics_summary">Element samlar in anonym statistik för att låta oss förbättra appen.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Vänligen aktivera statistik för att hjälpa oss att förbättra Element.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} samlar in anonym statistik för att låta oss förbättra appen.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Vänligen aktivera statistik för att hjälpa oss att förbättra ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, jag vill hjälpa till!</string>
     <string name="settings_data_save_mode">Databesparingsläge</string>
     <string name="devices_details_id_title">ID</string>
@@ -1844,7 +1844,7 @@
     <string name="passphrase_passphrase_does_not_match">Lösenfrasen matchar inte</string>
     <string name="passphrase_empty_error_message">Vänligen skriv en lösenfras</string>
     <string name="passphrase_passphrase_too_weak">Lösenfrasen är för svag</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Vänligen radera lösenfrasen om du vill att Element ska generera en återställningsnyckel.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Vänligen radera lösenfrasen om du vill att ${app_name} ska generera en återställningsnyckel.</string>
     <string name="keys_backup_setup_step2_button_title">Sätt lösenfras</string>
     <string name="keys_backup_setup_creating_backup">Skapar säkerhetskopia</string>
     <string name="keys_backup_setup_step3_success_title">Framgång !</string>
@@ -1887,7 +1887,7 @@
     </plurals>
     <string name="keys_backup_info_title_signature">Signatur</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Autokomplettera serveralternativ</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element detekterade en anpassad serverkonfiguration för din användar-ID-domän \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} detekterade en anpassad serverkonfiguration för din användar-ID-domän \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Använd konfig</string>
     <string name="sas_verify_title">Verifiera genom att jämföra en kort textsträng.</string>
@@ -1937,7 +1937,7 @@
     <string name="action_change">Ändra</string>
     <string name="please_wait">Vänligen vänta…</string>
     <string name="room_preview_no_preview">Det här rummet kan inte förhandsgranskas</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Förhandsgranskning av världsläsbara rum stöds inte än av Element</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Förhandsgranskning av världsläsbara rum stöds inte än av ${app_name}</string>
     <string name="create_room_title">Nytt rum</string>
     <string name="create_room_action_create">SKAPA</string>
     <string name="create_room_name_hint">Namn</string>
@@ -2155,8 +2155,8 @@
     <string name="room_member_power_level_default_in">Standardbehörig i %1$s</string>
     <string name="room_member_power_level_custom_in">Anpassad (%1$d) i %2$s</string>
     <string name="room_member_jump_to_read_receipt">Hoppa till läskvitto</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element hanterar inte händelser av typen \'%1$s\'</string>
-    <string name="rendering_event_error_exception">Element stötte på ett fel vid rendering av innehållet i händelsen med id \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} hanterar inte händelser av typen \'%1$s\'</string>
+    <string name="template_rendering_event_error_exception">${app_name} stötte på ett fel vid rendering av innehållet i händelsen med id \'%1$s\'</string>
     <string name="unignore">Avignorera</string>
     <string name="command_description_rainbow_emote">Skickar den givna emoten i regnbågsfärg</string>
     <string name="call_notification_answer">Godkänn</string>
@@ -2212,7 +2212,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Händelsen raderades av användaren, anledning: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Händelsen modererades av rumsadministratören. Anledning: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Nycklarna är redan uppdaterade!</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="refresh">Ladda om</string>
     <string name="new_session">Ny inloggning. Var det du\?</string>
     <string name="new_session_review">Tryck för att granska och verifiera</string>
@@ -2264,10 +2264,10 @@
     <string name="bootstrap_progress_generating_ssss_recovery">Generar SSSS-nyckel baserat på återställningsnyckel</string>
     <string name="bootstrap_progress_storing_in_sss">Lagrar hemlighet för nyckelsäkerhetskopiering i SSSS</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-    <string name="app_desktop_web">Element Webb
-\nElement Skrivbord</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_app_desktop_web">${app_name} Webb
+\n${app_name} Skrivbord</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="enter_secret_storage_passphrase_or_key">Använd din %1$s eller %2$s för att fortsätta.</string>
     <string name="use_recovery_key">Använd återställningsnyckel</string>
     <string name="enter_secret_storage_input_key">Välj din återställningsnyckel eller mata in den manuellt genom att skriva den eller klistra in från klippbordet</string>
@@ -2291,7 +2291,7 @@
     <string name="invitations_sent_to_two_users">Inbjudan skickad till %1$s och %2$s</string>
     <string name="open_terms_of">Öppna villkor för %s</string>
     <string name="identity_server_error_outdated_home_server">Den här operationen är inte möjlig. Hemservern är utdaterad.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">För ditt privatlivs skull stöder Element bara att skicka hashade e-postadresser och telefonnummer.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">För ditt privatlivs skull stöder ${app_name} bara att skicka hashade e-postadresser och telefonnummer.</string>
     <string name="identity_server_error_binding_error">Associationen har misslyckats.</string>
     <string name="identity_server_error_no_current_binding_error">Det finns ingen nuvarande association med den här identifieraren.</string>
     <string name="identity_server_set_default_submit">Använd %1$s</string>
@@ -2381,13 +2381,13 @@
 \n
 \nAnvänd varsamt, det kan leda till oväntat beteende.</string>
     <string name="secure_backup_reset_no_history">så kommer du att börja om utan historik, meddelanden, betrodda enheter eller betrodda användare</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN-kod krävs varje gång du öppnar Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN-kod krävs efter att du inte har använt Element på 2 minuter.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">PIN-kod krävs varje gång du öppnar ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">PIN-kod krävs efter att du inte har använt ${app_name} på 2 minuter.</string>
     <string name="settings_security_pin_code_grace_period_title">Kräv PIN-kod efter 2 minuter</string>
     <string name="settings_security_pin_code_notifications_summary_off">Visa bara antal olästa meddelanden i en enkel avisering.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Visa detaljer som rumsnamn och meddelandeinnehåll.</string>
     <string name="settings_security_pin_code_notifications_title">Visa innehåll i aviseringar</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-kod är det enda sättet att låsa upp Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN-kod är det enda sättet att låsa upp ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Aktivera enhetsspecifik biometri, som fingeravtryck och ansiktsigenkänning.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Aktivera biometri</string>
     <string name="settings_security_application_protection_screen_title">Ställ in skydd</string>
@@ -2468,8 +2468,8 @@
     <string name="user_code_share">Dela min kod</string>
     <string name="user_code_scan">Skanna en QR-kod</string>
     <string name="not_a_valid_qr_code">Det är inte en giltig Matrix-QR-kod</string>
-    <string name="invite_friends_rich_title">🔐️ Gå med mig i Element</string>
-    <string name="invite_friends_text">Hallå, prata med mig i Element: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Gå med mig i ${app_name}</string>
+    <string name="template_invite_friends_text">Hallå, prata med mig i ${app_name}: %s</string>
     <string name="invite_friends">Bjud in vänner</string>
     <string name="add_people">Lägg till personer</string>
     <string name="topic_prefix">"Ämne: "</string>
@@ -2576,7 +2576,7 @@
     <string name="room_participants_leave_private_warning">Det är rummet är inte offentligt. Du kommer inte kunna gå med igen utan en inbjudan.</string>
     <string name="system_theme">Systemets förval</string>
     <string name="authentication_error">Misslyckades att autentisera</string>
-    <string name="re_authentication_default_confirm_text">Element kräver att du anger dina autentiseringsuppgifter innan du gör det här.</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} kräver att du anger dina autentiseringsuppgifter innan du gör det här.</string>
     <string name="re_authentication_activity_title">Omautentisering krävs</string>
     <string name="failed_to_initialize_cross_signing">Mislyckades att ställa in korssignering</string>
     <string name="error_unauthorized">Obehörig, saknar giltiga autentiseringsuppgifter</string>
diff --git a/vector/src/main/res/values-te/strings.xml b/vector/src/main/res/values-te/strings.xml
index 56a76fa72c..14232e65eb 100644
--- a/vector/src/main/res/values-te/strings.xml
+++ b/vector/src/main/res/values-te/strings.xml
@@ -115,7 +115,7 @@
     <string name="local_address_book_header">స్థానిక చిరునామా పుస్తకం</string>
     <string name="matrix_only_filter">మ్యాట్రిక్స్ పరిచయాలు మాత్రమే</string>
     <string name="no_conversation_placeholder">సంభాషణలు లేవు</string>
-    <string name="no_contact_access_placeholder">మీరు మీ స్థానిక పరిచయాలను యాక్సెస్ చేయడానికి రియోట్ను అనుమతించలేదు</string>
+    <string name="template_no_contact_access_placeholder">మీరు మీ స్థానిక పరిచయాలను యాక్సెస్ చేయడానికి రియోట్ను అనుమతించలేదు</string>
     <string name="no_result_placeholder">ఫలితాలు లేవు</string>
 
     <string name="rooms_header">గదులు</string>
@@ -243,8 +243,8 @@
     <string name="media_picker_cannot_record_video">వీడియో రికార్డ్ చేయలేరు</string>
 
     <string name="permissions_rationale_popup_title">సమాచారం</string>
-    <string name="permissions_rationale_msg_camera">చిత్రాలను మరియు వీడియో కాల్లను తీయడానికి మీ కెమెరాను ప్రాప్తి చేయడానికి Elementకు అనుమతి అవసరం.</string>
-    <string name="permissions_rationale_msg_record_audio">ఆడియో కాల్లను చేయడానికి మీ మైక్రోఫోన్ను ప్రాప్యత చేయడానికి Elementకు అనుమతి అవసరం.</string>
+    <string name="template_permissions_rationale_msg_camera">చిత్రాలను మరియు వీడియో కాల్లను తీయడానికి మీ కెమెరాను ప్రాప్తి చేయడానికి ${app_name}కు అనుమతి అవసరం.</string>
+    <string name="template_permissions_rationale_msg_record_audio">ఆడియో కాల్లను చేయడానికి మీ మైక్రోఫోన్ను ప్రాప్యత చేయడానికి ${app_name}కు అనుమతి అవసరం.</string>
     <string name="permissions_action_not_performed_missing_permissions">క్షమించాలి… ఆమోదించని అనుమతుల కారణంగా చర్య చేయలేదు</string>
 
     <string name="media_slider_saved">దాయబడినది</string>
@@ -547,7 +547,7 @@
     <string name="login_error_login_email_not_yet">ఇంకా నొక్కని ఇ-తపాలా లింగక</string>
 
     <string name="call_error_camera_init_failed">కెమెరాను ప్రారంభించడం సాధ్యపడదు</string>
-    <string name="permissions_rationale_msg_storage">అటాచ్మెంట్లు పంపడానికి మరియు సేవ్ చేయడానికి మీ ఫోటో మరియు వీడియో లైబ్రరీని ప్రాప్తి చేయడానికి కలతకు అనుమతి అవసరం.
+    <string name="template_permissions_rationale_msg_storage">అటాచ్మెంట్లు పంపడానికి మరియు సేవ్ చేయడానికి మీ ఫోటో మరియు వీడియో లైబ్రరీని ప్రాప్తి చేయడానికి కలతకు అనుమతి అవసరం.
 \n
 \nదయచేసి మీ ఫోన్ నుండి ఫైల్లను పంపగల తదుపరి పాప్-అప్లో ప్రాప్యతను అనుమతించండి.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
@@ -556,7 +556,7 @@
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nదయచేసి కాల్ చేయడానికి వీలుగా తదుపరి పాప్-అప్లో ప్రాప్యతను అనుమతించండి."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">"మీ కెమెరాను మరియు మీ శబ్ద ప్రసారిణి సాంగత్యం చేయడానికి రియోట్కు అనుమతి అవసరం.
+    <string name="template_permissions_rationale_msg_camera_and_audio">"మీ కెమెరాను మరియు మీ శబ్ద ప్రసారిణి సాంగత్యం చేయడానికి రియోట్కు అనుమతి అవసరం.
 \n
 \nదయచేసి   పిలుపు చేయడానికి వీలుగా తదుపరి పాప్-అప్ల్లో ప్రాప్యతను అనుమతించండి."</string>
     <string name="preview">ప్రత్యేక ప్రదర్శన</string>
diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index 7eefd0fbd5..c677202fe5 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -42,7 +42,7 @@
     <string name="bottom_action_groups">ชุมชน</string>
     <string name="invitations_header">การเชิญ</string>
     <string name="system_alerts_header">การแจ้งเตือนจากระบบ</string>
-    <string name="no_contact_access_placeholder">คุณไม่ได้อนุญาตให้ Element เข้าถึงรายชื่อผู้ติดต่อในเครื่อง</string>
+    <string name="template_no_contact_access_placeholder">คุณไม่ได้อนุญาตให้ ${app_name} เข้าถึงรายชื่อผู้ติดต่อในเครื่อง</string>
     <string name="no_result_placeholder">ไม่มีผลลัพธ์</string>
     <string name="no_room_placeholder">ไม่มีห้อง</string>
     <plurals name="public_room_nb_users">
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 2eb31a80d5..13d4a7c313 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -85,7 +85,7 @@
     <string name="user_directory_header">Kullanıcı sözlüğü</string>
     <string name="matrix_only_filter">Sadece Matrix kullanıcıları</string>
     <string name="no_conversation_placeholder">Konuşma yok</string>
-    <string name="no_contact_access_placeholder">Element\'in yerel rehbere erişmesine izin vermediniz</string>
+    <string name="template_no_contact_access_placeholder">${app_name}\'in yerel rehbere erişmesine izin vermediniz</string>
     <string name="no_result_placeholder">Sonuç yok</string>
     <string name="rooms_header">Odalar</string>
     <string name="rooms_directory_header">Odalar dizini</string>
@@ -244,7 +244,7 @@
     <string name="e2e_re_request_encryption_key">Diğer oturumlardan <u>şifreleme anahtarlarını tekrar iste</u>.</string>
     <string name="e2e_re_request_encryption_key_sent">Anahtar isteği gönderildi.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">İstek gönderildi</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Element\'i mesajları çözebilen farklı bir cihazda açarsanız ordan anahtarları bu oturuma gönderebilirsiniz.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">${app_name}\'i mesajları çözebilen farklı bir cihazda açarsanız ordan anahtarları bu oturuma gönderebilirsiniz.</string>
     <string name="read_receipts_list">Makbuz Listesini Oku</string>
     <string name="groups_list">Grup Listesi</string>
     <plurals name="membership_changes">
@@ -265,7 +265,7 @@
     <string name="room_info_room_name">Oda adı</string>
     <string name="room_info_room_topic">Oda konusu</string>
     <string name="settings_call_category">Aramalar</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Gelen aramalar için varsayılan Element zil sesini kullan</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Gelen aramalar için varsayılan ${app_name} zil sesini kullan</string>
     <string name="settings_call_ringtone_title">Gelen arama zil sesi</string>
     <string name="settings_call_ringtone_dialog_title">Aramalar için zil sesi seç:</string>
     <string name="call">Arama</string>
@@ -285,22 +285,22 @@
     <string name="media_picker_both_capture_title">Resim ya da video çek</string>
     <string name="media_picker_cannot_record_video">Video kaydedilemiyor</string>
     <string name="permissions_rationale_popup_title">Bilgilendirme</string>
-    <string name="permissions_rationale_msg_storage">Element\'in ekleri göndermek ya da kaydetmek için galeriye erişmeye ihtiyacı var.
+    <string name="template_permissions_rationale_msg_storage">${app_name}\'in ekleri göndermek ya da kaydetmek için galeriye erişmeye ihtiyacı var.
 \n
 \nLütfen çıkacak ekranda telefonunuzdan dosya gönderebilmesine izin verin.</string>
-    <string name="permissions_rationale_msg_camera">Element\'in resim ya da video çekmek için kameraya erişmeye ihtiyacı var.</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name}\'in resim ya da video çekmek için kameraya erişmeye ihtiyacı var.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \nLütfen çıkacak ekranda kameraya erişebilmesine izin verin."</string>
-    <string name="permissions_rationale_msg_record_audio">Element\'in sesli arama yapması için mikrofonunuza erişmeye ihtiyacı var.</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name}\'in sesli arama yapması için mikrofonunuza erişmeye ihtiyacı var.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nLütfen çıkacak ekranda mikrofona erişebilmesine izin verin."</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element\'in görüntülü arama yapması için kameranıza ve mikrofonunuza erişmeye ihtiyacı var.
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name}\'in görüntülü arama yapması için kameranıza ve mikrofonunuza erişmeye ihtiyacı var.
 \n
 \nLütfen çıkacak ekranda kamera ve mikrofona erişebilmesine izin verin.</string>
-    <string name="permissions_rationale_msg_contacts">Element eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir. Eğer bu nedenle rehberinizi paylaşmak istiyorsanız, lütfen açılan ekranda erişime izin verin.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element\'in eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir. Eğer bu nedenle rehberinizi paylaşmak istiyorsanız, lütfen açılan ekranda erişime izin verin.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name}\'in eposta ve telefon numaralarına göre diğer Matrix kullanıcılarını bulmak için rehberinizi kontrol edebilir.
 \n 
 \nRehberinizi bu sebeple paylaşmayı kabul ediyor musunuz\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Üzgünüz. İsteğiniz, yetersiz izinlerden dolayı gerçekleştirilemedi</string>
@@ -516,8 +516,8 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Etkinleştir</string>
     <string name="settings_troubleshoot_test_device_settings_title">Oturum Ayarları.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Bildirimler bu oturum için etkinleştirilmiş.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Bildirimler bu oturum için etkin değil. 
-\nLütfen Element ayarlarını gözden geçirin.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Bildirimler bu oturum için etkin değil.
+\nLütfen ${app_name} ayarlarını gözden geçirin.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Etkinleştir</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Özel Ayarlar.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Bazı mesajların türü sessize ayarlanmıştır (sessiz bir bildirim gönderecektir).</string>
@@ -526,7 +526,7 @@
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Ayarları Gözden Geçir</string>
     <string name="settings_troubleshoot_test_play_services_title">Play Hizmetlerini Gözden Geçir</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Hizmetleri APK\'sı kullanılabilir ve güncel.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element bildirimleri göndermek için Google Play Hizmetleri kullanır, ancak düzgün ayarlanmış görünmüyor:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} bildirimleri göndermek için Google Play Hizmetleri kullanır, ancak düzgün ayarlanmış görünmüyor:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Google Play Hizmetlerini Düzelt</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase Belirteci</string>
@@ -534,12 +534,12 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM belirtecini alırken hata meydana geldi:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nBu hata Element\'in kontrolü dışında Google\'a bağlı ve cihazın çok fazla FCM ile kayıtlı uygulaması olduğunu belirtiyor. Bu hata sadece çok fazla uygulama kullanıldığı zaman olur ve genelde ortalama kullanıcıyı etkilemez.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nBu hata Element\'in kontrolü dışında ve birçok nedene bağlı olabilir. Belki sonra denediğin zaman çalışır. Ayrıca Google Play Hizmetlerinin veri kullanımı konusunda sistem ayarlarında kısıtlanmamış ya da cihaz saatinin doğru olduğundan emin olun, bu hata özel ROM\'larda meydana gelebiliyor.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nBu hata Element\'in kontrolü dışında. Telefonda hiç Google hesabı yok. Lütfen hesap yöneticisini açın ve bir tane Google hesabı ekleyin.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nBu hata ${app_name}\'in kontrolü dışında Google\'a bağlı ve cihazın çok fazla FCM ile kayıtlı uygulaması olduğunu belirtiyor. Bu hata sadece çok fazla uygulama kullanıldığı zaman olur ve genelde ortalama kullanıcıyı etkilemez.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nBu hata ${app_name}\'in kontrolü dışında ve birçok nedene bağlı olabilir. Belki sonra denediğin zaman çalışır. Ayrıca Google Play Hizmetlerinin veri kullanımı konusunda sistem ayarlarında kısıtlanmamış ya da cihaz saatinin doğru olduğundan emin olun, bu hata özel ROM\'larda meydana gelebiliyor.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nBu hata ${app_name}\'in kontrolü dışında. Telefonda hiç Google hesabı yok. Lütfen hesap yöneticisini açın ve bir tane Google hesabı ekleyin.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Hesap ekle</string>
     <string name="settings_troubleshoot_test_token_registration_title">Belirteç Kayıtı</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM belirteci başarı ile AnaMakineye kaydedildi.</string>
@@ -555,17 +555,17 @@
     <string name="settings_troubleshoot_test_service_restart_failed">Hizmet yeniden başlatılamadı</string>
     <string name="settings_troubleshoot_test_service_boot_title">Açılışta başlat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Hizmet cihaz yeniden başlatıldığında çalıştırılacak.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Hizmet cihaz yeniden başlatılınca çalıştırılmayacak, Element\'i açana kadar bildirimleri almakyacaksın.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Hizmet cihaz yeniden başlatılınca çalıştırılmayacak, ${app_name}\'i açana kadar bildirimleri almakyacaksın.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Açılışta başlatı etkinleştir</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Arkaplan kısıtlamalarını gözden geçir</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Arkaplan kısıtlamaları Element için devre dışı. Bu test mobil veri kullanacak (WIFI değil).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Arkaplan kısıtlamaları ${app_name} için devre dışı. Bu test mobil veri kullanacak (WIFI değil).
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Arkaplan kısıtlamaları Element için etkinleştirilmiş.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Arkaplan kısıtlamaları ${app_name} için etkinleştirilmiş.
 \nUygulamanın arkaplanda iken yapmaya çalıştığı şeyler agresif bir biçimde kısıtlanacak ve bu bildirimleri de etkileyebilir.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Kısıtlamaları devre dışı bırak</string>
     <string name="settings_troubleshoot_test_battery_title">Pil Optimizasyonu</string>
-    <string name="settings_troubleshoot_test_battery_success">Element Pil Optimizasyonundan etkilenmedi.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} Pil Optimizasyonundan etkilenmedi.</string>
     <string name="settings_troubleshoot_test_battery_failed">Eğer kullanıcı cihazını prize bağlanmamış sabit ve ekranı kapalı bir şekilde bir süre bırakırsa cihaz Derin uyku moduna geçer. Bu uygulamaların internete erişmesini engeller ve yapılacak işlerini, senkronizasyolarını, alarmını erteler.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Optimizasyonu Göz ardı et</string>
     <string name="settings_notification_privacy_normal">Normal</string>
@@ -639,17 +639,17 @@
     <string name="settings_deactivate_account_section">Hesabı devre dışı bırak</string>
     <string name="settings_deactivate_my_account">Hesabımı devre dışı bırak</string>
     <string name="startup_notification_privacy_title">Bildirim Gizliliği</string>
-    <string name="startup_notification_privacy_message">Element bildirimlerinizi güvenli ve gizli bir şekilde yönetmek için arkaplanda çalışır. Bu pil kullanımını etkileyebilir.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} bildirimlerinizi güvenli ve gizli bir şekilde yönetmek için arkaplanda çalışır. Bu pil kullanımını etkileyebilir.</string>
     <string name="startup_notification_privacy_button_grant">İzin ver</string>
     <string name="startup_notification_privacy_button_other">Farklı bir seçenek seç</string>
     <string name="startup_notification_fdroid_battery_optim_title">Arkaplan Bağlantısı</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element güvenilir bildirimlere sahip olmak için düşük arkaplan bağlatısı yapmaya ihtiyaç duyar.
-\nÇıkacak ekranda Element\'in arkaplanda sürekli çalışması için izin istenecek, lütfen kabul edin.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} güvenilir bildirimlere sahip olmak için düşük arkaplan bağlatısı yapmaya ihtiyaç duyar.
+\nÇıkacak ekranda ${app_name}\'in arkaplanda sürekli çalışması için izin istenecek, lütfen kabul edin.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">İzin ver</string>
     <string name="settings_analytics">Analiz</string>
     <string name="settings_opt_in_of_analytics">Analiz verilerini gönder</string>
-    <string name="settings_opt_in_of_analytics_summary">Element uygulamayı geliştirmemiz için anonim analitik veriler toplar.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Lütfen Element\'i geliştirebilmemiz için analizleri etkinleştirin.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} uygulamayı geliştirmemiz için anonim analitik veriler toplar.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Lütfen ${app_name}\'i geliştirebilmemiz için analizleri etkinleştirin.</string>
     <string name="settings_opt_in_of_analytics_ok">Evet, Yardım etmek istiyorum!</string>
     <string name="settings_data_save_mode">Veri kaydetme modu</string>
     <string name="settings_data_save_mode_summary">Veri kaydetme modu belirli filtreler uygular bu sayede ilerki güncellemeler ve yazıyor bildirimleri filtrelenir.</string>
@@ -973,7 +973,7 @@
     <string name="passphrase_passphrase_does_not_match">Parolalar uyuşmuyor</string>
     <string name="passphrase_empty_error_message">Lütfen bir parola girin</string>
     <string name="passphrase_passphrase_too_weak">Parola çok zayıf</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Eğer Element\'in kurtarma anahtarı oluşturmasını istiyorsanız lütfen parolayı silin.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Eğer ${app_name}\'in kurtarma anahtarı oluşturmasını istiyorsanız lütfen parolayı silin.</string>
     <string name="keys_backup_no_session_error">Matrix oturumu müsait değil</string>
     <string name="keys_backup_setup_step1_title">Şifrelenmiş mesajları asla kaybetme</string>
     <string name="keys_backup_setup_step1_description">Şifrelenmiş odalarda mesajlar uçtan-uca şifreleme ile korunur. Sadece sen ve makbuzcular bu mesajları okumak için anahtara sahip.
@@ -1089,11 +1089,11 @@
     <string name="settings_call_ringtone_use_default_stun_sum">Anasunucunuz çağrı yardımcı sunucusu vermez ise %s çağrı yardımcı sunucusu olarak kullanılacaktır (Çağrıda IP adresiniz paylaşılacaktır)</string>
     <string name="invite_no_identity_server_error">Bu eylemi gerçekleştirebilmek için ayarlarınızdan bir kimlik sunucusu ekleyin.</string>
     <string name="settings_add_3pid_confirm_password_title">Şifreni doğrula</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element, cihazın sınırlı kaynaklarını (pil) koruyacak şekilde arka planda senkronize olur.
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name}, cihazın sınırlı kaynaklarını (pil) koruyacak şekilde arka planda senkronize olur.
 \nCihazınızın kaynak durumuna bağlı olarak, senkronizasyon işletim sistemi tarafından ertelenebilir.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Gerçek zamanlı için optimize</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element periyodik olarak belirli bir zamanda (ayarlanabilir) arka planda senkronize olur.
-\nBu pil ve radyo kullanımını etkileyecek ve Element\'in olayları dinlediğini belirten kalıcı bir bildirim gösterecektir.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} periyodik olarak belirli bir zamanda (ayarlanabilir) arka planda senkronize olur.
+\nBu pil ve radyo kullanımını etkileyecek ve ${app_name}\'in olayları dinlediğini belirten kalıcı bir bildirim gösterecektir.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Arka plan senkronizasyonu yok</string>
     <string name="settings_set_workmanager_delay">Tercih Edilen Senkronize Aralığı</string>
     <string name="settings_set_workmanager_delay_summary">%s
@@ -1175,7 +1175,7 @@
     <string name="keys_backup_settings_checking_backup_state">Yedek durumu kontrol ediliyor</string>
     <string name="autodiscover_invalid_response">Geçersiz anasunucu keşif cevabı</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Sunucu Ayarlarını Otomatik Doldur</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element userld alan adı için özel sunucu yapılandırması buldu \"%1$s\":
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} userld alan adı için özel sunucu yapılandırması buldu \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Yapılandırmayı kullan</string>
     <string name="invalid_or_expired_credentials">Geçersiz ya da süresi dolmuş girdilerden dolayı çıkış yaptınız.</string>
@@ -1250,7 +1250,7 @@
     <string name="please_wait">Lütfen bekleyin…</string>
     <string name="group_all_communities">Tüm Topluluklar</string>
     <string name="room_preview_no_preview">Bu oda önizlenemez</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Element henüz herkese-açık odaları önizlemeyi desteklemiyor</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name} henüz herkese-açık odaları önizlemeyi desteklemiyor</string>
     <string name="fab_menu_create_room">Odalar</string>
     <string name="fab_menu_create_chat">Doğrudan Mesajlar</string>
     <string name="create_room_title">Yeni Oda</string>
@@ -1264,7 +1264,7 @@
     <string name="keys_backup_unable_to_get_keys_backup_data">Anahtar yedek verileri alınırken hata oluştu</string>
     <string name="login_error_no_homeserver_found">Bu geçerli bir Matrix sunucu adresi değil</string>
     <string name="login_error_homeserver_not_found">Bu URL ile ev-sunucusuna erişilemiyor, lütfen kontrol edin</string>
-    <string name="settings_add_3pid_flow_not_supported">Bunu Element mobil ile yapamazsınız</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Bunu ${app_name} mobil ile yapamazsınız</string>
     <string name="settings_add_3pid_authentication_needed">Kimlik doğrulama gereklidir</string>
     <string name="settings_background_fdroid_sync_mode">Arkaplan Senkronizasyon Modu (Deneysel)</string>
     <string name="settings_background_fdroid_sync_mode_battery">Batarya için optimize edildi</string>
@@ -1276,7 +1276,7 @@
     <string name="action_copy">Kopyala</string>
     <string name="dialog_title_success">Başarılı</string>
     <string name="bottom_action_notification">Bildirimler</string>
-    <string name="call_failed_no_connection">Element Araması Başarısız Oldu</string>
+    <string name="template_call_failed_no_connection">${app_name} Araması Başarısız Oldu</string>
     <string name="call_failed_no_connection_description">Eş zamanlı bağlantı kurulamadı.
 \nAramaların hatasız çalışması için snucunuzun yöneticisinden TURN sunucusu ayarlamasını rica edin.</string>
     <string name="call_select_sound_device">Ses Cihazı Seç</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 54d6dfeae9..1ae0223a8a 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -253,7 +253,7 @@
     <string name="user_directory_header">Каталог користувачів</string>
     <string name="matrix_only_filter">Лише Matrix-контакти</string>
     <string name="no_conversation_placeholder">Немає бесід</string>
-    <string name="no_contact_access_placeholder">Ви не надали Element доступу до контактів</string>
+    <string name="template_no_contact_access_placeholder">Ви не надали ${app_name} доступу до контактів</string>
     <string name="no_result_placeholder">Немає результатів</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Кімнати</string>
@@ -390,16 +390,16 @@
     <string name="media_picker_cannot_record_video">Не вдалося записати відео"</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Інформація</string>
-    <string name="permissions_rationale_msg_storage">Для передачі та збереження вкладень потрібен доступ до медіатеки.\n\nБудь ласка, надайте його у наступному виринаючому вікні, щоб отримати змогу надсилати файли з вашого телефону.</string>
-    <string name="permissions_rationale_msg_camera">Для зйомки та відеодзвінків необхідно мати доступ до камери.</string>
+    <string name="template_permissions_rationale_msg_storage">Для передачі та збереження вкладень потрібен доступ до медіатеки.\n\nБудь ласка, надайте його у наступному виринаючому вікні, щоб отримати змогу надсилати файли з вашого телефону.</string>
+    <string name="template_permissions_rationale_msg_camera">Для зйомки та відеодзвінків необхідно мати доступ до камери.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nБудь ласка, надайте його у наступному виринаючому вікні, щоб мати змогу здійснювати дзвінки.</string>
-    <string name="permissions_rationale_msg_record_audio">Для здійснення аудіодзвінків потрібен доступ до мікрофону.</string>
+    <string name="template_permissions_rationale_msg_record_audio">Для здійснення аудіодзвінків потрібен доступ до мікрофону.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nБудь ласка, надайте його у наступному виринаючому вікні, щоб мати змогу здійснити дзвінок.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Для здійснення відеодзвінків потрібен доступ до камери та мікрофону.\n\nБудь ласка, надайте його у наступних виринаючих вікнах, щоб мати змогу їх здійснити.</string>
-    <string name="permissions_rationale_msg_contacts">Element потребує доступу до ваших контактів, щоб знайти інших користувачів Matrix за їх електронними адресами та номерами телефонів. Якщо ви згодні, надайте його у наступному діалоговому вікні, щоб знати, які з контактів теж використовують Element.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element потребує доступу до ваших контактів, щоб знайти інших користувачів Matrix за електронною поштою чи номерами телефонів.
+    <string name="template_permissions_rationale_msg_camera_and_audio">Для здійснення відеодзвінків потрібен доступ до камери та мікрофону.\n\nБудь ласка, надайте його у наступних виринаючих вікнах, щоб мати змогу їх здійснити.</string>
+    <string name="template_permissions_rationale_msg_contacts">${app_name} потребує доступу до ваших контактів, щоб знайти інших користувачів Matrix за їх електронними адресами та номерами телефонів. Якщо ви згодні, надайте його у наступному діалоговому вікні, щоб знати, які з контактів теж використовують ${app_name}.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} потребує доступу до ваших контактів, щоб знайти інших користувачів Matrix за електронною поштою чи номерами телефонів.
 \n
-\nНадати Element доступ до ваших контактів\?</string>
+\nНадати ${app_name} доступ до ваших контактів\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Вибачте.. Дію не виконано через нестачу дозволів</string>
     <!-- medias slider string -->
     <string name="media_slider_saved">Збережено</string>
@@ -878,7 +878,7 @@
     <string name="settings_opt_in_of_analytics_ok">Так, я бажаю помогти!</string>
     <string name="settings_flair">Настрій</string>
     <string name="room_settings_room_notifications_title">Сповіщення</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Для відправлення ключа на цей пристрій, запустіть Element на іншому пристрої, що може дешифрувати повідомлення.</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Для відправлення ключа на цей пристрій, запустіть ${app_name} на іншому пристрої, що може дешифрувати повідомлення.</string>
     <string name="error_no_external_application_found">Вибачте, жодного стороннього застосунку не знайдено для завершення цієї дії.</string>
     <string name="option_send_voice">Відправити голосове повідомлення</string>
     <string name="missing_permissions_error">Ця дія неможлива через відсутність дозволів.</string>
@@ -940,9 +940,9 @@
     <string name="settings_notification_privacy_message_content_not_shown">• Сповіщення <b>не будуть показувати вміст повідомлень</b></string>
     <string name="settings_inline_url_preview">Попередній перегляд посилань</string>
     <string name="settings_preview_media_before_sending">Попередній перегляд медіа перед відправкою</string>
-    <string name="startup_notification_privacy_message">Element може працювати у фоновому режимі для керування безпекою та конфіденційністю ваших сповіщень. Це може вплинути на час роботи батареї.</string>
-    <string name="settings_opt_in_of_analytics_summary">Element збирає анонімну аналітику, щоб ми могли вдосконалювати цей додаток.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Будь ласка, увімкніть аналітику, щоб допомагати нам вдосконалювати Element.</string>
+    <string name="template_startup_notification_privacy_message">${app_name} може працювати у фоновому режимі для керування безпекою та конфіденційністю ваших сповіщень. Це може вплинути на час роботи батареї.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} збирає анонімну аналітику, щоб ми могли вдосконалювати цей додаток.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Будь ласка, увімкніть аналітику, щоб допомагати нам вдосконалювати ${app_name}.</string>
     <string name="settings_without_flair">Ви наразі не є учасником жодної спільноти.</string>
     <string name="room_settings_no_flair">Ця кімната не показує настрій для спільнот</string>
     <string name="room_settings_add_new_group">Новий ID спільноти (наприклад, +foo:matrix.org)</string>
@@ -1091,7 +1091,7 @@
     <string name="markdown_has_been_enabled">Markdown задіяно.</string>
     <string name="markdown_has_been_disabled">Markdown вимкнено.</string>
     <string name="settings_call_category">Виклики</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Використовувати стандартний рингтон Element для вхідних викликів</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Використовувати стандартний рингтон ${app_name} для вхідних викликів</string>
     <string name="settings_call_ringtone_title">Мелодія вхідного виклику</string>
     <string name="settings_call_ringtone_dialog_title">Виберіть мелодію викликів:</string>
     <string name="accept">Прийняти</string>
@@ -1106,7 +1106,7 @@
     <string name="bottom_action_people_x">Прямі чати</string>
     <string name="room_filtering_footer_create_new_direct_message">Відправити нове пряме повідомлення</string>
     <string name="command_description_shrug">Додає ¯\\_(ツ)_/¯ перед текстовим повідомленням</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element не підтримує повідомлення типу \'%1$s\'</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} не підтримує повідомлення типу \'%1$s\'</string>
     <string name="command_description_rainbow">Відправляє повідомлення розмальоване веселково</string>
     <string name="settings_category_composer">Редактор повідомлень</string>
     <string name="command_description_plain">Відправляє повідомлення як текст без інтерпретації його як Markdown</string>
@@ -1218,8 +1218,8 @@
     <string name="settings_phone_numbers">Номери телефонів</string>
     <string name="settings_emails">Email адреси</string>
     <string name="room_participants_action_cancel_invite">Скасувати запрошення</string>
-    <string name="invite_friends_rich_title">🔐️ Приєднуйтесь до мене в Element</string>
-    <string name="invite_friends_text">Привіт, поспілкуйся зі мною в Element: %s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Приєднуйтесь до мене в ${app_name}</string>
+    <string name="template_invite_friends_text">Привіт, поспілкуйся зі мною в ${app_name}: %s</string>
     <string name="invite_friends">Запросити друзів</string>
     <string name="group_all_communities">Всі спільноти</string>
     <string name="settings_show_redacted_summary">Показувати заглушку на місці видалених повідомлень</string>
@@ -1237,7 +1237,7 @@
     <string name="uploads_files_subtitle">%1$s о %2$s</string>
     <string name="settings_phone_number_empty">Жодного номера телефону не додано до вашого облікового запису</string>
     <string name="settings_emails_empty">У ваш обліковий запис не додано жодної електронної адреси</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Для вашої приватності Element підтримує лише надсилання хешованих електронних адрес користувачів та номера телефону.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Для вашої приватності ${app_name} підтримує лише надсилання хешованих електронних адрес користувачів та номера телефону.</string>
     <string name="settings_discovery_consent_notice_off">Ви не погодилися надіслати електронні адреси та телефонні номери на цей сервер ідентифікації для виявлення інших користувачів із ваших контактів.</string>
     <string name="settings_discovery_consent_notice_on">Ви погодилися надіслати електронні адреси та телефонні номери на цей сервер ідентифікації для виявлення інших користувачів із ваших контактів.</string>
     <string name="identity_server_consent_dialog_title">Надіслати електронні адреси та номери телефонів</string>
@@ -1258,8 +1258,8 @@
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Зверніть увагу, що для деяких типів повідомлень встановлено беззвучність (беззвучні сповіщення).</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Власні налаштування.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Увімкнути</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Сповіщення не ввімкнено для цього сеансу.
-\nПеревірте налаштування Element.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Сповіщення не ввімкнено для цього сеансу.
+\nПеревірте налаштування ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Сповіщення ввімкнено для цього сеансу.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Налаштування сеансу.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Увімкнути</string>
@@ -1296,7 +1296,7 @@
     <string name="settings_discovery_category">Видимість</string>
     <string name="call_failed_no_connection_description">Не вдалося встановити зв’язок у режимі реального часу.
 \nПопросіть адміністратора вашого домашнього сервера налаштувати сервер TURN для надійної роботи викликів.</string>
-    <string name="call_failed_no_connection">Element не вдалося здійснити виклик</string>
+    <string name="template_call_failed_no_connection">${app_name} не вдалося здійснити виклик</string>
     <string name="call_failed_no_ice_description">Попросіть адміністратора вашого домашнього сервера (%1$s) налаштувати сервер TURN для надійної роботи дзвінків.
 \n
 \nЯк варіант, ви можете спробувати використати загальнодоступний сервер на рівні %2$s, але це буде не так надійно й він надаватиме вашу IP-адресу цьому серверу. Ви також можете керувати цим у налаштуваннях.</string>
@@ -1361,7 +1361,7 @@
 \nБезпечно створюйте резервні копії ключів, щоб не втратити їх.</string>
     <string name="keys_backup_setup_step1_title">Ніколи не втрачайте зашифровані повідомлення</string>
     <string name="keys_backup_no_session_error">Немає доступного сеансу Matrix</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Видаліть парольну фразу, якщо хочете, щоб Element створив ключ відновлення.</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Видаліть парольну фразу, якщо хочете, щоб ${app_name} створив ключ відновлення.</string>
     <string name="passphrase_passphrase_too_weak">Парольна фраза занадто слабка</string>
     <string name="passphrase_empty_error_message">Введіть парольну фразу</string>
     <string name="no_valid_google_play_services_apk">Не знайдено дійсного файлу .apk сервісів Google Play. Сповіщення можуть працювати неправильно.</string>
@@ -1498,8 +1498,8 @@
     <string name="settings_integration_allow">Дозволити інтеграції</string>
     <string name="settings_data_save_mode_summary">Режим збереження даних застосовує певний фільтр, тому оновлення присутності та сповіщення про введення фільтруються.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Надати дозвіл</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Для отримання надійних сповіщень Element повинен підтримувати з’єднання у фоновому режимі з незначним споживанням даних.
-\nНа наступному екрані вам буде запропоновано дозволити Element завжди працювати у фоновому режимі, погодьтеся.</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">Для отримання надійних сповіщень ${app_name} повинен підтримувати з’єднання у фоновому режимі з незначним споживанням даних.
+\nНа наступному екрані вам буде запропоновано дозволити ${app_name} завжди працювати у фоновому режимі, погодьтеся.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Фонове з’єднання</string>
     <string name="reset_secure_backup_warning">Це замінить ваш поточний ключ або фразу.</string>
     <string name="reset_secure_backup_title">Створіть новий ключ безпеки або встановіть нову фразу безпеки для наявної резервної копії.</string>
@@ -1527,27 +1527,27 @@
     <string name="settings_background_sync_update_error">Не вдалося оновити налаштування.</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Ви не отримуватимете сповіщення про вхідні повідомлення, коли програма перебуває у фоновому режимі.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Немає фонової синхронізації</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element періодично синхронізуватиметься у фоновому режимі в певний час (налаштовується).
-\nЦе вплине на використання радіо та акумулятора, з’явиться постійне сповіщення про те, що Element очікує на події.</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} періодично синхронізуватиметься у фоновому режимі в певний час (налаштовується).
+\nЦе вплине на використання радіо та акумулятора, з’явиться постійне сповіщення про те, що ${app_name} очікує на події.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Оптимізовано для реального часу</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element синхронізується у фоновому режимі так, щоб зберегти обмежені ресурси пристрою (акумулятор).
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} синхронізується у фоновому режимі так, щоб зберегти обмежені ресурси пристрою (акумулятор).
 \nЗалежно від стану ресурсів вашого пристрою, синхронізацію може бути відкладено операційною системою.</string>
     <string name="settings_background_fdroid_sync_mode_battery">Оптимізовано для батареї</string>
     <string name="settings_background_fdroid_sync_mode">Режим фонової синхронізації</string>
     <string name="settings_notification_privacy_no_background_sync">Застосунки <b>не</b> потребують з\'єднання з HomeServer у фоновому режимі, це має скоротити споживання батареї</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Нехтувати оптимізацією</string>
     <string name="settings_troubleshoot_test_battery_failed">Якщо користувач залишає пристрій від\'єднаним та нерухомим впродовж певного часу з вимкненим екраном, пристрій переходить у режим дрімання. Це запобігає доступу програм до мережі та відкладає їх завдання, синхронізацію та стандартні сигнали тривоги.</string>
-    <string name="settings_troubleshoot_test_battery_success">Оптимізація акумулятора не впливає на Element.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">Оптимізація акумулятора не впливає на ${app_name}.</string>
     <string name="settings_troubleshoot_test_battery_title">Оптимізація акумулятора</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Вимкнути обмеження</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Фонові обмеження ввімкнено для Element.
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Фонові обмеження ввімкнено для ${app_name}.
 \nРобота, яку намагається виконати застосунок, буде агресивно обмежена, доки вона перебуває у фоновому режимі й це може вплинути на сповіщення.
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Фонові обмеження для Element вимкнено. Цю перевірку варто виконувати з використанням мобільних даних (без Wi-Fi).
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Фонові обмеження для ${app_name} вимкнено. Цю перевірку варто виконувати з використанням мобільних даних (без Wi-Fi).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Перевірте фонові обмеження</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Увімкніть Запуск під час завантаження</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">Служба не запуститься під час перезавантаження пристрою, ви не отримуватимете сповіщень, доки Element не буде відкрито.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Служба не запуститься під час перезавантаження пристрою, ви не отримуватимете сповіщень, доки ${app_name} не буде відкрито.</string>
     <string name="settings_troubleshoot_test_service_boot_success">Служба запуститься після перезапуску пристрою.</string>
     <string name="settings_troubleshoot_test_service_boot_title">Запускати під час завантаження</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Помилка перезапуску служби</string>
@@ -1571,19 +1571,19 @@
     <string name="settings_troubleshoot_test_token_registration_success">Токен FCM успішно зареєстровано на HomeServer.</string>
     <string name="settings_troubleshoot_test_token_registration_title">Реєстрація токена</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Додати обліковий запис</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nЦя помилка не підконтрольна Element. На телефоні немає облікового запису Google. Відкрийте менеджер облікових записів і додайте обліковий запис Google.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nЦя помилка не підконтрольна Element. Це може статися з кількох причин. Можливо все запрацює, якщо ви спробуєте пізніше, ви також можете перевірити, чи не обмежено використання даних для служби Google Play в налаштуваннях системи, чи правильний годинник вашого пристрою, або це може статися в користувацькому ROM.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nЦя помилка не підконтрольна Element й за даними Google, вона вказує на те, що на пристрої зареєстровано забагато програм у FCM. Помилка виникає лише у випадках, коли встановлено надзвичайно багато застосунків, тому вона не повинна впливати на звичайного користувача.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nЦя помилка не підконтрольна ${app_name}. На телефоні немає облікового запису Google. Відкрийте менеджер облікових записів і додайте обліковий запис Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nЦя помилка не підконтрольна ${app_name}. Це може статися з кількох причин. Можливо все запрацює, якщо ви спробуєте пізніше, ви також можете перевірити, чи не обмежено використання даних для служби Google Play в налаштуваннях системи, чи правильний годинник вашого пристрою, або це може статися в користувацькому ROM.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nЦя помилка не підконтрольна ${app_name} й за даними Google, вона вказує на те, що на пристрої зареєстровано забагато програм у FCM. Помилка виникає лише у випадках, коли встановлено надзвичайно багато застосунків, тому вона не повинна впливати на звичайного користувача.</string>
     <string name="settings_troubleshoot_test_fcm_failed">Не вдалося отримати токен FCM:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_success">Токен FCM отримано успішно:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_title">Токен Firebase</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Виправити служби Play</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element використовує сервіси Google Play для доставлення push-сповіщень, але, схоже, його налаштовано неправильно:
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} використовує сервіси Google Play для доставлення push-сповіщень, але, схоже, його налаштовано неправильно:
 \n%1$s</string>
     <string name="open_settings">Відкрити Налаштування</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Сповіщення вимкнено в налаштуваннях системи.
@@ -1595,7 +1595,7 @@
     <string name="error_threepid_auth_failed">Переконайтеся, що ви натиснули посилання в електронному листі, який ми надіслали вам.</string>
     <string name="settings_remove_three_pid_confirmation_content">Вилучити %s\?</string>
     <string name="settings_add_3pid_authentication_needed">Потрібна автентифікація</string>
-    <string name="settings_add_3pid_flow_not_supported">Це неможливо зробити за допомогою Element mobile</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Це неможливо зробити за допомогою ${app_name} mobile</string>
     <string name="settings_add_3pid_confirm_password_title">Підтвердити пароль</string>
     <string name="search_banned_user_hint">Фільтрувати заборонених користувачів</string>
     <string name="room_participants_unban_prompt_msg">Скасування блокування користувача дозволить їм знову приєднатися до кімнати.</string>
@@ -1663,10 +1663,10 @@
     <string name="auth_pin_reset_content">Щоб відновити PIN-код, потрібно буде повторно ввійти в систему та створити новий.</string>
     <string name="settings_security_pin_code_title">Увімкнути PIN-код</string>
     <string name="settings_security_pin_code_summary">Якщо хочете відновити PIN-код, торкніться «Забули PIN-код», щоб вийти та відновити.</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-код — єдиний спосіб розблокувати Element.</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN-код — єдиний спосіб розблокувати ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Вимагати PIN-код через 2 хвилини</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN-код вимагається після 2 хвилин не використання Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN-код потрібно вводити за кожного відкриття Element.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">PIN-код вимагається після 2 хвилин не використання ${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">PIN-код потрібно вводити за кожного відкриття ${app_name}.</string>
     <string name="settings_security_pin_code_change_pin_title">Змінити PIN-код</string>
     <string name="settings_security_pin_code_change_pin_summary">Зміна поточного PIN-коду</string>
     <string name="auth_pin_confirm_to_disable_title">Підтвердьте PIN-код, щоб вимкнути його</string>
@@ -1685,7 +1685,7 @@
     <string name="settings_active_sessions_show_all">Показати всі сеанси</string>
     <string name="authentication_error">Помилка автентифікації</string>
     <string name="re_authentication_activity_title">Потрібна повторна автентифікація</string>
-    <string name="re_authentication_default_confirm_text">Для виконання цієї дії Element вимагає ввести свої облікові дані.</string>
+    <string name="template_re_authentication_default_confirm_text">Для виконання цієї дії ${app_name} вимагає ввести свої облікові дані.</string>
     <string name="verify_cancel_self_verification_from_trusted">Якщо скасувати, ви не зможете читати зашифровані повідомлення на новому пристрої, а інші користувачі не довірятимуть йому</string>
     <string name="verify_cancel_self_verification_from_untrusted">Якщо скасувати, ви не зможете читати зашифровані повідомлення на цьому пристрої, а інші користувачі довірятимуть йому</string>
     <string name="settings_active_sessions_manage">Керування сеансами</string>
diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index b665fb925d..407fd31e8c 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -22,7 +22,7 @@
     <string name="ignore">Bỏ qua</string>
     <string name="conference_call_in_progress">Đã có một cuộc hội thoại đang diễn ra!</string>
     <string name="no_result_placeholder">Không có kết quả nào</string>
-    <string name="no_contact_access_placeholder">Bạn chưa cho phép Element truy cập danh bạ của bạn</string>
+    <string name="template_no_contact_access_placeholder">Bạn chưa cho phép ${app_name} truy cập danh bạ của bạn</string>
     <string name="no_conversation_placeholder">Không có cuộc trò chuyện nào</string>
     <string name="matrix_only_filter">Chỉ những liên hệ Matrix</string>
     <string name="user_directory_header">Thư mục người dùng</string>
@@ -206,7 +206,7 @@
     <string name="sound_device_speaker">Loa</string>
     <string name="sound_device_phone">Điện thoại</string>
     <string name="call_select_sound_device">Chọn thiết bị âm thanh</string>
-    <string name="call_failed_no_connection">Cuộc gọi Element thất bại</string>
+    <string name="template_call_failed_no_connection">Cuộc gọi ${app_name} thất bại</string>
     <string name="call_failed_dont_ask_again">Đừng hỏi lại tôi</string>
     <string name="call_failed_no_ice_use_alt">Hãy thử dùng %s</string>
     <string name="call_failed_no_ice_description">Vui lòng yêu cầu quản trị viên của máy chủ nhà của bạn (%1$s) thiết lập một máy chủ TURN để các cuộc gọi có thể hoạt động […].
@@ -254,7 +254,7 @@
     <string name="call">Gọi</string>
     <string name="settings_call_ringtone_dialog_title">Chọn nhạc chuông:</string>
     <string name="settings_call_ringtone_title">Nhạc chuông cho cuộc gọi đến</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Dùng nhạc chuông mặc định cho cuộc gọi đến</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Dùng nhạc chuông mặc định cho cuộc gọi đến</string>
     <string name="settings_call_show_confirmation_dialog_summary">Yêu cầu xác nhận trước khi gọi</string>
     <string name="settings_call_show_confirmation_dialog_title">Tránh gọi nhầm</string>
     <string name="room_info_room_topic">Chủ đề của phòng</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 8a197b914f..479e3f810f 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -395,11 +395,11 @@
     <string name="attachment_remaining_time_seconds">%d 秒</string>
     <string name="call_connected">通话已连接</string>
     <string name="call_connecting">通话正在连接…</string>
-    <string name="permissions_rationale_msg_storage">为了发送或保存附件，Element 需要访问您的图片和视频库。 
+    <string name="template_permissions_rationale_msg_storage">为了发送或保存附件，${app_name} 需要访问您的图片和视频库。
 \n
 \n请在接下来弹出的窗口中授权允许访问，以便应用能够从您的手机发送文件。</string>
-    <string name="permissions_rationale_msg_camera">为了拍照或进行视频通话，Element 需要访问您的相机。</string>
-    <string name="permissions_rationale_msg_record_audio">为了进行语音通话，Element 需要访问您的麦克风。</string>
+    <string name="template_permissions_rationale_msg_camera">为了拍照或进行视频通话，${app_name} 需要访问您的相机。</string>
+    <string name="template_permissions_rationale_msg_record_audio">为了进行语音通话，${app_name} 需要访问您的麦克风。</string>
     <string name="room_preview_try_join_an_unknown_room">您试图访问聊天室 %s。您是否愿意加入这个聊天室？</string>
     <string name="room_participants_header_admin_tools">管理工具</string>
     <string name="room_participants_header_direct_chats">私聊</string>
@@ -582,7 +582,7 @@
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \n请在接下来弹出的窗口中授权允许访问。"</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element需要许可才能访问您的摄像机和麦克风来执行视频通话。
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name}需要许可才能访问您的摄像机和麦克风来执行视频通话。
 \n
 \n请在接下来弹出的窗口中授权允许访问。</string>
     <string name="permissions_action_not_performed_missing_permissions">对不起。因为权限不足，操作已取消</string>
@@ -644,10 +644,10 @@
     <string name="send_files_in">发送至</string>
     <string name="read_receipts_list">已读标签清单</string>
     <string name="compression_options">发送为</string>
-    <string name="permissions_rationale_msg_contacts">Element 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
+    <string name="template_permissions_rationale_msg_contacts">${app_name} 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
 
 请在接下来的弹出窗口中授权允许访问。</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element可以检查您的通讯录，以根据电子邮件和电话号码找到其他Matrix用户。
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name}可以检查您的通讯录，以根据电子邮件和电话号码找到其他Matrix用户。
 \n
 \n你同意为此目的分享你的通讯录吗\?</string>
     <string name="room_participants_idle">空闲</string>
@@ -703,7 +703,7 @@
     <string name="matrix_only_filter">只显示 Matrix 联系人</string>
     <string name="no_conversation_placeholder">没有对话</string>
     <string name="no_result_placeholder">没有结果</string>
-    <string name="no_contact_access_placeholder">您没有授予 Element 访问本地通讯录的权限</string>
+    <string name="template_no_contact_access_placeholder">您没有授予 ${app_name} 访问本地通讯录的权限</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">聊天室</string>
     <string name="rooms_directory_header">聊天室目录</string>
@@ -887,7 +887,7 @@
         <item quantity="other">%d 条未读消息</item>
     </plurals>
     <string name="startup_notification_privacy_title">通知隐私</string>
-    <string name="startup_notification_privacy_message">Element 可以在后台运行以安全隐密地管理您的通知（这可能会影响电池消耗）。</string>
+    <string name="template_startup_notification_privacy_message">${app_name} 可以在后台运行以安全隐密地管理您的通知（这可能会影响电池消耗）。</string>
     <string name="startup_notification_privacy_button_grant">获取权限</string>
     <string name="startup_notification_privacy_button_other">选择其他选项</string>
     <string name="settings_notification_privacy_fcm">• 通知通过 Firebase Cloud Messaging 发送</string>
@@ -900,8 +900,8 @@
     <string name="settings_deactivate_account_section">停用账户</string>
     <string name="settings_deactivate_my_account">停用我的账户</string>
     <string name="settings_opt_in_of_analytics">发送统计分析数据</string>
-    <string name="settings_opt_in_of_analytics_summary">Element 会收集匿名统计数据来帮助我们改进程序。</string>
-    <string name="settings_opt_in_of_analytics_prompt">请允许资料分析以帮助我们改进 Element。</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} 会收集匿名统计数据来帮助我们改进程序。</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">请允许资料分析以帮助我们改进 ${app_name}。</string>
     <string name="settings_opt_in_of_analytics_ok">是的，我愿意帮助！</string>
     <string name="deactivate_account_title">停用账户</string>
     <string name="deactivate_account_content">这将使您的账户永远不再可用。您将不能登录，或使用相同的用户 ID 重新注册。您的账户将退出所有已加入的聊天室，身份服务器上的账户信息也会被删除。<b>此操作是不可逆的。</b> 停用您的账户<b>不会默认忘记您发送的消息</b>。如果您希望我们忘记您发送的消息，请勾选下面的选择框。 Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意味着您发送的消息不会被发给新注册或未注册的用户，但是已收到您的消息的注册用户依旧可以看到他们的副本。</string>
@@ -930,7 +930,7 @@
     <string name="e2e_re_request_encryption_key">从其他设备上 <u>重新请求密钥</u>。</string>
     <string name="e2e_re_request_encryption_key_sent">已发送密钥共享请求。</string>
     <string name="e2e_re_request_encryption_key_dialog_title">已请求</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">请在其他可解密此消息的设备上启动 Element，以便其将密钥发送至当前设备。</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">请在其他可解密此消息的设备上启动 ${app_name}，以便其将密钥发送至当前设备。</string>
     <string name="lock_screen_hint">在此输入…</string>
     <string name="settings_labs_enable_send_voice">发送语音消息</string>
     <string name="error_empty_field_your_password">请输入您的密码。</string>
@@ -1003,7 +1003,7 @@
     <string name="dialog_title_error">错误</string>
     <string name="auth_accept_policies">请审阅并接受此主服务器的政策：</string>
     <string name="settings_call_category">通话</string>
-    <string name="settings_call_ringtone_use_app_ringtone">为来电使用 Element 的默认铃声</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">为来电使用 ${app_name} 的默认铃声</string>
     <string name="settings_call_ringtone_title">来电铃声</string>
     <string name="settings_call_ringtone_dialog_title">请选择来电铃声：</string>
     <string name="room_participants_action_kick">移除</string>
@@ -1028,12 +1028,12 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">启用</string>
     <string name="settings_troubleshoot_test_device_settings_title">设备设置。</string>
     <string name="settings_troubleshoot_test_device_settings_success">已为此设备启用通知。</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">此会话未启用通知。 
-\n请检查 Element 设置。</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">此会话未启用通知。
+\n请检查 ${app_name} 设置。</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">启用</string>
     <string name="settings_troubleshoot_test_play_services_title">Play 服务检查</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play 服务的 APK 文件可用且为最新版本。</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element 使用 Google Play 服务来推送通知，但它似乎并未正确设置：
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} 使用 Google Play 服务来推送通知，但它似乎并未正确设置：
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">修复 Play 服务</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase 令牌</string>
@@ -1050,7 +1050,7 @@
     <string name="settings_troubleshoot_test_foreground_service_started_failed">通知服务未在运行。
 \n请尝试重启本应用程序。</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">启动服务</string>
-    <string name="settings_labs_native_camera_summary">调用系统相机应用而非使用 Element 内置的相机界面。</string>
+    <string name="settings_labs_native_camera_summary">调用系统相机应用而非使用 ${app_name} 内置的相机界面。</string>
     <string name="settings_labs_enable_send_voice_summary">此选项需要第三方应用录制消息。</string>
     <string name="settings_troubleshoot_test_service_boot_title">开机时启动</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">启用开机时启动</string>
@@ -1068,8 +1068,8 @@
     <string name="settings_show_avatar_display_name_changes_messages">显示账户变动事件</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">包括头像与显示名称的变动。</string>
     <string name="startup_notification_fdroid_battery_optim_title">后台连接</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element需要保持低影响的后台连接，以便获得可靠的通知。
-\n下一个屏幕中，系统将提示您允许 Element 始终在后台运行，请点击“允许“。</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name}需要保持低影响的后台连接，以便获得可靠的通知。
+\n下一个屏幕中，系统将提示您允许 ${app_name} 始终在后台运行，请点击“允许“。</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">授予权限</string>
     <string name="account_email_error">在验证您的电子邮件地址时发生了一个错误。</string>
     <string name="settings_password">密码</string>
@@ -1096,14 +1096,14 @@
     <string name="settings_troubleshoot_test_service_restart_success">服务被停止，并已自动重启。</string>
     <string name="settings_troubleshoot_test_service_restart_failed">服务重启失败</string>
     <string name="settings_troubleshoot_test_service_boot_success">服务将在设备重启后启动。</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">服务不会在设备重启后启动，在您打开 Element 一次之前您将不会收到消息通知。</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">已禁用对 Element 的后台限制。此测试应使用移动数据（非Wi-Fi）进行。
+    <string name="template_settings_troubleshoot_test_service_boot_failed">服务不会在设备重启后启动，在您打开 ${app_name} 一次之前您将不会收到消息通知。</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">已禁用对 ${app_name} 的后台限制。此测试应使用移动数据（非Wi-Fi）进行。
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">已启用对 Element 的后台限制。
-\nElement 在后台时的工作将被显著地限制，这可能会影响消息通知。 
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">已启用对 ${app_name} 的后台限制。
+\n${app_name} 在后台时的工作将被显著地限制，这可能会影响消息通知。
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">关闭后台限制</string>
-    <string name="settings_troubleshoot_test_battery_success">Element 未被电池优化影响。</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} 未被电池优化影响。</string>
     <string name="settings_troubleshoot_test_battery_failed">如果设备在未充电的情况下关屏静置一段时间，其将进入打盹模式（Doze）。这将阻止应用访问网络并延后其运行、同步、与响铃。</string>
     <string name="settings_troubleshoot_test_battery_quickfix">忽略电池优化</string>
     <string name="encryption_export_notice">请输入用于加密密钥备份的密码。您在恢复此备份时需要使用此密码。</string>
@@ -1135,12 +1135,12 @@
     <string name="settings_troubleshoot_test_bing_settings_failed">有些通知已在您的自定义设置中被禁用。</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">自定义规则加载失败，请重试。</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">检查设置</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\n此错误不受 Element 控制，根据 Google 的说法，此错误表示该设备在 FCM 中注册了太多应用。该错误仅在应用程序数量极多的情况下发生，因此不应影响普通用户。</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\n此错误不受 Element 控制。它的发生可能有几个原因。也许您稍后重试就有效了，您也可以检查一下 Google Play 服务是否被系统设置限制了数据使用，或者您的设备时钟是否正确，或者可能发生在自定义的 ROM 中。</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\n此错误不受 Element 控制。此设备上没有登录 Google 账号。请打开账号管理器并添加一个 Google 账号。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\n此错误不受 ${app_name} 控制，根据 Google 的说法，此错误表示该设备在 FCM 中注册了太多应用。该错误仅在应用程序数量极多的情况下发生，因此不应影响普通用户。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\n此错误不受 ${app_name} 控制。它的发生可能有几个原因。也许您稍后重试就有效了，您也可以检查一下 Google Play 服务是否被系统设置限制了数据使用，或者您的设备时钟是否正确，或者可能发生在自定义的 ROM 中。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\n此错误不受 ${app_name} 控制。此设备上没有登录 Google 账号。请打开账号管理器并添加一个 Google 账号。</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">添加账号</string>
     <string name="settings_noisy_notifications_preferences">设置响铃通知</string>
     <string name="settings_call_notifications_preferences">设置电话通知</string>
@@ -1154,7 +1154,7 @@
     <string name="error_empty_field_enter_user_name">请输入一个用户名。</string>
     <string name="passphrase_empty_error_message">请输入密码</string>
     <string name="passphrase_passphrase_too_weak">密码太弱</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">如果您想要 Element 生成一个恢复密钥，请删除密码。</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">如果您想要 ${app_name} 生成一个恢复密钥，请删除密码。</string>
     <string name="keys_backup_no_session_error">没有可用的 Matrix 会话</string>
     <string name="keys_backup_setup_step1_title">已加密信息永不丢失</string>
     <string name="keys_backup_setup_step1_description">加密聊天室中的信息会被端对端加密以确保安全。只有您和拥有密钥的接收方可以读取这些信息。
@@ -1266,7 +1266,7 @@
     <string name="passwords_do_not_match">密码不匹配</string>
     <string name="autodiscover_invalid_response">无效的主服务器探测响应</string>
     <string name="autodiscover_well_known_autofill_dialog_title">自动完成服务器选项</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element 侦测到您的 userId 域名 \"%1$s\" 有自定义的服务器设置：
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} 侦测到您的 userId 域名 \"%1$s\" 有自定义的服务器设置：
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">使用设置</string>
     <string name="notification_sync_init">正在初始化服务</string>
@@ -1392,7 +1392,7 @@
     <string name="action_copy">复制</string>
     <string name="dialog_title_success">成功</string>
     <string name="bottom_action_notification">通知</string>
-    <string name="call_failed_no_connection">Element 呼叫失败</string>
+    <string name="template_call_failed_no_connection">${app_name} 呼叫失败</string>
     <string name="call_failed_no_connection_description">无法建立实时连接。
 \n请要求您的家庭服务器管理员配置 TURN 服务器以使通话可靠工作。</string>
     <string name="call_select_sound_device">选择声音设备</string>
@@ -1433,15 +1433,15 @@
     <string name="room_participants_unban_title">取消封禁用户</string>
     <string name="room_participants_unban_prompt_msg">取消封禁用户将允许他们再次加入聊天室。</string>
     <string name="settings_add_3pid_confirm_password_title">确认您的密码</string>
-    <string name="settings_add_3pid_flow_not_supported">您无法在 Element 移动版中这么做</string>
+    <string name="template_settings_add_3pid_flow_not_supported">您无法在 ${app_name} 移动版中这么做</string>
     <string name="settings_add_3pid_authentication_needed">需要身份认证</string>
     <string name="settings_background_fdroid_sync_mode">后台同步模式</string>
     <string name="settings_background_fdroid_sync_mode_battery">电池优化</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element 将在后台以保留设备有限资源（电池）的方式同步。
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} 将在后台以保留设备有限资源（电池）的方式同步。
 \n取决于您的设备资源状态，同步可能被操作系统推迟。</string>
     <string name="settings_background_fdroid_sync_mode_real_time">实时优化</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element 将在后台定期准时同步（可配置）。
-\n这将影响网络和电池的使用，将显示一个永久通知表明 Element 正在监听事件。</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} 将在后台定期准时同步（可配置）。
+\n这将影响网络和电池的使用，将显示一个永久通知表明 ${app_name} 正在监听事件。</string>
     <string name="settings_background_fdroid_sync_mode_disabled">无后台同步</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">应用在后台时您不会收到消息通知。</string>
     <string name="settings_background_sync_update_error">更新设置失败。</string>
@@ -1543,7 +1543,7 @@
     <string name="malformed_message">格式错误事件，无法显示</string>
     <string name="error_no_network">无网络。请检查您的网络连接。</string>
     <string name="change_room_directory_network">更改网络</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Element 尚不支持公开聊天室预览</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name} 尚不支持公开聊天室预览</string>
     <string name="fab_menu_create_chat">私聊消息</string>
     <string name="create_room_title">新聊天室</string>
     <string name="create_room_public_title">公开</string>
@@ -1668,7 +1668,7 @@
     <string name="content_reported_as_inappropriate_content">此内容已报告为不合适。 
 \n 
 \n如果您不希望再看到此用户的更多内容，您可以忽略他们以隐藏他们的消息。</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element 需要权限在磁盘上保存您的端到端密钥。
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} 需要权限在磁盘上保存您的端到端密钥。
 \n
 \n请在下个弹窗中允许访问以便手动导出密钥。</string>
     <string name="no_network_indicator">目前没有网络连接</string>
@@ -1821,7 +1821,7 @@
 \n再次登入以访问您的帐户数据和消息。</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">除非您登入以恢复加密密钥，否则您将无法访问安全消息。</string>
     <string name="soft_logout_clear_data_dialog_submit">清除数据</string>
-    <string name="soft_logout_sso_not_same_user_error">当前会话用于用户 %1$s 而您提供了用户 %2$s 的凭证。Element 不支持此功能。
+    <string name="template_soft_logout_sso_not_same_user_error">当前会话用于用户 %1$s 而您提供了用户 %2$s 的凭证。${app_name} 不支持此功能。
 \n请先清除数据，然后重新登入另一个账户。</string>
     <string name="permalink_malformed">您的 matrix.to 链接更是不正确</string>
     <string name="bug_report_error_too_short">描述太短</string>
@@ -1839,7 +1839,7 @@
     <string name="devices_other_devices">其他会话</string>
     <string name="autocomplete_limited_results">仅显示第一个结果，请输入更多字符…</string>
     <string name="settings_developer_mode_fail_fast_title">快速失败</string>
-    <string name="settings_developer_mode_fail_fast_summary">发生意外错误时，Element 可能更经常崩溃</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">发生意外错误时，${app_name} 可能更经常崩溃</string>
     <string name="command_description_shrug">在明文消息前添加 ¯\\_(ツ)_/¯</string>
     <string name="create_room_encryption_title">启用加密</string>
     <string name="create_room_encryption_description">一旦启用，加密无法禁用。</string>
@@ -1911,9 +1911,9 @@
     <string name="room_member_power_level_moderator_in">%1$s 审查员</string>
     <string name="room_member_power_level_default_in">%1$s 默认权限</string>
     <string name="room_member_power_level_custom_in">%2$s 自定义权限 (%1$d)</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element 无法处理 \'%1$s\' 类型事件</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element 无法处理 \'%1$s\' 类型消息</string>
-    <string name="rendering_event_error_exception">Element 在渲染 id 为 \'%1$s\' 的事件内容时遇到了一个问题</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} 无法处理 \'%1$s\' 类型事件</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} 无法处理 \'%1$s\' 类型消息</string>
+    <string name="template_rendering_event_error_exception">${app_name} 在渲染 id 为 \'%1$s\' 的事件内容时遇到了一个问题</string>
     <string name="unignore">取消忽略</string>
     <string name="verify_cannot_cross_sign">该会话无法与您的其他会话共享此验证。
 \n验证将保存在本地，并在此应用的未来版本中共享。</string>
@@ -2003,7 +2003,7 @@
     <string name="delete_event_dialog_reason_checkbox">附加理由</string>
     <string name="delete_event_dialog_reason_hint">编辑理由</string>
     <string name="event_redacted_by_user_reason_with_reason">事件被用户删除，理由：%1$s</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">密钥请求</string>
     <string name="e2e_use_keybackup">解锁加密消息历史</string>
     <string name="refresh">刷新</string>
@@ -2119,13 +2119,13 @@
     <string name="error_adding_media_file_to_gallery">无法添加媒体文件到相册</string>
     <string name="error_saving_media_file">无法保存媒体文件</string>
     <string name="change_password_summary">选择新的账户密码…</string>
-    <string name="use_other_session_content_description">在你的其他设备上使用最新的Element 网页版、Element 桌面版、Element iOS 版、Element 安卓版，或其他能够交叉签名的 Matrix 客户端</string>
-    <string name="app_desktop_web">Element Web
-\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">在你的其他设备上使用最新的${app_name} 网页版、${app_name} 桌面版、${app_name} iOS 版、${app_name} 安卓版，或其他能够交叉签名的 Matrix 客户端</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} Desktop</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">或其他能够交叉签名的 Matrix 客户端</string>
-    <string name="use_latest_app">在您的其他设备上使用最新的 Element：</string>
+    <string name="template_use_latest_app">在您的其他设备上使用最新的 ${app_name}：</string>
     <string name="command_description_discard_session">强制丢弃加密聊天室中的当前出站群组会话</string>
     <string name="command_description_discard_session_not_handled">仅在加密聊天室中支持</string>
     <string name="enter_secret_storage_passphrase_or_key">使用您的 %1$s 或使用您的 %2$s 继续。</string>
@@ -2165,11 +2165,11 @@
     <string name="choose_locale_loading_locales">正在载入可用语言…</string>
     <string name="open_terms_of">打开 %s 条款</string>
     <string name="disconnect_identity_server_dialog_content">是否从身份服务器 %s 断开？</string>
-    <string name="identity_server_error_outdated_identity_server">身份服务器已过期。Element 仅支持 API V2。</string>
+    <string name="template_identity_server_error_outdated_identity_server">身份服务器已过期。${app_name} 仅支持 API V2。</string>
     <string name="identity_server_error_outdated_home_server">无法执行此操作。家庭服务器已过期。</string>
     <string name="identity_server_error_no_identity_server_configured">请先配置身份服务器。</string>
     <string name="identity_server_error_terms_not_signed">请先在设置中接受身份服务器的条款。</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">为了您的隐私，Element 仅支持发送用户电子邮件和电话号码的哈希值。</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">为了您的隐私，${app_name} 仅支持发送用户电子邮件和电话号码的哈希值。</string>
     <string name="identity_server_error_binding_error">关联失败。</string>
     <string name="identity_server_error_no_current_binding_error">此标识符无当前关联。</string>
     <string name="identity_server_set_default_notice">您的家庭服务器 (%1$s) 建议使用 %2$s 作为您的身份服务器</string>
@@ -2296,13 +2296,13 @@
 \n
 \n小心使用，它可能导致意外行为。</string>
     <string name="universal_link_malformed">链接格式不正确</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">每次打开 Element 都要求 PIN 码。</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">在 2 分钟未使用 Element 后要求 PIN 码。</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">每次打开 ${app_name} 都要求 PIN 码。</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">在 2 分钟未使用 ${app_name} 后要求 PIN 码。</string>
     <string name="settings_security_pin_code_grace_period_title">2 分钟后要求 PIN</string>
     <string name="settings_security_pin_code_notifications_summary_off">仅在一个简单通知中显示未读消息内容数量。</string>
     <string name="settings_security_pin_code_notifications_summary_on">显示细节如聊天室名称和消息内容。</string>
     <string name="settings_security_pin_code_notifications_title">在通知中显示内容</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN 码是解锁 Element 的唯一方式。</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN 码是解锁 ${app_name} 的唯一方式。</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">启用设备特定的生物特征识别，如指纹和面部识别。</string>
     <string name="settings_security_pin_code_use_biometrics_title">启用生物特征识别</string>
     <string name="settings_security_application_protection_screen_title">配置保护</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 15b18f2f38..3d2c119da8 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -334,7 +334,7 @@
     <string name="user_directory_header">使用者目錄</string>
     <string name="matrix_only_filter">僅 Matrix 聯絡人</string>
     <string name="no_conversation_placeholder">沒有對話</string>
-    <string name="no_contact_access_placeholder">您沒有允許 Element 存取裝置上的聯絡資訊</string>
+    <string name="template_no_contact_access_placeholder">您沒有允許 ${app_name} 存取裝置上的聯絡資訊</string>
     <string name="no_result_placeholder">沒有結果</string>
     <string name="rooms_header">聊天室</string>
     <string name="rooms_directory_header">聊天室目錄</string>
@@ -471,22 +471,22 @@
     <string name="media_picker_both_capture_title">拍照或錄影</string>
     <string name="media_picker_cannot_record_video">無法錄影</string>
     <string name="permissions_rationale_popup_title">資訊</string>
-    <string name="permissions_rationale_msg_storage">Element 需要權限來存取你的照片與影片庫，以傳送及儲存附件。 
+    <string name="template_permissions_rationale_msg_storage">${app_name} 需要權限來存取你的照片與影片庫，以傳送及儲存附件。
 \n
 \n請在下個彈跳視窗允許存取，來從手機傳送檔案。</string>
-    <string name="permissions_rationale_msg_camera">Element 需要權限存取您的相機，來拍照與視訊通話。</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} 需要權限存取您的相機，來拍照與視訊通話。</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
 \n為了要通話，請在下個彈跳視窗中允許存取。"</string>
-    <string name="permissions_rationale_msg_record_audio">Element 需要權限來存取麥克風，來撥打語音通話。</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} 需要權限來存取麥克風，來撥打語音通話。</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \n為了要通話，請在下個彈跳視窗中允許存取。"</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element 需要權限來存取相機及麥克風來撥打視訊通話。 
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} 需要權限來存取相機及麥克風來撥打視訊通話。
 \n
 \n為了可以正常使用通話功能，請在下個彈跳視窗中允許存取。</string>
-    <string name="permissions_rationale_msg_contacts">Element 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。如果您同意為此用途分享您的電話簿，請在下一個彈出式視窗中允許存取權限。</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。
+    <string name="template_permissions_rationale_msg_contacts">${app_name} 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。如果您同意為此用途分享您的電話簿，請在下一個彈出式視窗中允許存取權限。</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。
 \n
 \n您同意為此用途分享您的電話簿嗎？</string>
     <string name="permissions_action_not_performed_missing_permissions">抱歉。由於缺少權限，所以無法執行動作</string>
@@ -598,7 +598,7 @@
     <string name="e2e_re_request_encryption_key">從其他工作階段重新請求金鑰。<u>重新請求金鑰</u>。</string>
     <string name="e2e_re_request_encryption_key_sent">已發送金鑰分享請求。</string>
     <string name="e2e_re_request_encryption_key_dialog_title">已發送請求</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">請在另一個可以解密訊息的裝置上啟動 Element，以便它將金鑰發送到此工作階段。</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">請在另一個可以解密訊息的裝置上啟動 ${app_name}，以便它將金鑰發送到此工作階段。</string>
     <string name="ssl_expected_existing_expl">憑證已從以前受信任的更改為不受信任的憑證。伺服器可能已續訂其憑證。請與伺服器管理員聯繫以尋找所需的指紋。</string>
     <string name="ssl_only_accept">僅當伺服器管理員發佈的指紋與上面的指紋匹配時才接受此憑證。</string>
     <string name="room_details_title">聊天室詳情</string>
@@ -720,13 +720,13 @@
     <string name="settings_deactivate_account_section">停用帳號</string>
     <string name="settings_deactivate_my_account">停用我的帳號</string>
     <string name="startup_notification_privacy_title">通知隱私</string>
-    <string name="startup_notification_privacy_message">Element 可以在後臺安全隱密地管理通知。這可能會影響電池的使用。</string>
+    <string name="template_startup_notification_privacy_message">${app_name} 可以在後臺安全隱密地管理通知。這可能會影響電池的使用。</string>
     <string name="startup_notification_privacy_button_grant">獲取權限</string>
     <string name="startup_notification_privacy_button_other">選擇其他選項</string>
     <string name="settings_analytics">傳送分析資料</string>
     <string name="settings_opt_in_of_analytics">傳送分析資料</string>
-    <string name="settings_opt_in_of_analytics_summary">Element 會收集匿名分析以讓我們可以改進此應用程式。</string>
-    <string name="settings_opt_in_of_analytics_prompt">請允許收集匿名分析以讓我們可以改進此應用程式。</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} 會收集匿名分析以讓我們可以改進此應用程式。</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">請允許收集匿名分析以讓我們可以改進此應用程式。</string>
     <string name="settings_opt_in_of_analytics_ok">是的，我想要協助！</string>
     <string name="settings_data_save_mode">節省流量模式</string>
     <string name="devices_details_dialog_title">工作階段資訊</string>
@@ -1076,7 +1076,7 @@
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="settings_call_category">通話</string>
-    <string name="settings_call_ringtone_use_app_ringtone">為來電使用預設的 Element 鈴聲</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">為來電使用預設的 ${app_name} 鈴聲</string>
     <string name="settings_call_ringtone_title">來電鈴聲</string>
     <string name="settings_call_ringtone_dialog_title">選取通話鈴聲：</string>
     <string name="accept">接受</string>
@@ -1100,12 +1100,12 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">啟用</string>
     <string name="settings_troubleshoot_test_device_settings_title">工作階段設定。</string>
     <string name="settings_troubleshoot_test_device_settings_success">通知已為此工作階段啟用。</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">此工作階段未啟用通知。
-\n請檢查 Element 設定。</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">此工作階段未啟用通知。
+\n請檢查 ${app_name} 設定。</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">啟用</string>
     <string name="settings_troubleshoot_test_play_services_title">Play 服務檢查</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play 服務 APK 可用且已為最新。</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element 使用 Google Play 服務來傳遞推送訊息，但它似乎並未正確設定：
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} 使用 Google Play 服務來傳遞推送訊息，但它似乎並未正確設定：
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">修復 Play 服務</string>
     <string name="settings_troubleshoot_test_fcm_title">Firebase 權杖</string>
@@ -1127,22 +1127,22 @@
     <string name="settings_troubleshoot_test_service_restart_failed">服務重新啟動失敗</string>
     <string name="settings_troubleshoot_test_service_boot_title">開機時啟動</string>
     <string name="settings_troubleshoot_test_service_boot_success">服務將會在裝置重新啟動時自行啟動。</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">服務不會在裝置重心啟動時自行啟動，您將不能在 Element 開啟前收到通知。</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">服務不會在裝置重心啟動時自行啟動，您將不能在 ${app_name} 開啟前收到通知。</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">啟用開機時啟動</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">檢查背景限制</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">背景限制已為 Element 停用。本測試應該使用行動數據執行（不是 WiFi）。
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">背景限制已為 ${app_name} 停用。本測試應該使用行動數據執行（不是 WiFi）。
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">背景限制已為 Element 啟用。 
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">背景限制已為 ${app_name} 啟用。
 \n應用程式要在背景執行的工作將被嚴格限制，這可能會影響通知功能。
 \n %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">停用限制</string>
     <string name="settings_troubleshoot_test_battery_title">電池最佳化</string>
-    <string name="settings_troubleshoot_test_battery_success">Element 不會被電池最佳化影響。</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} 不會被電池最佳化影響。</string>
     <string name="settings_troubleshoot_test_battery_failed">如果使用者不為裝置充電，並讓其靜置一段時間，且將螢幕關閉，裝置將會進入 Doze 模式。這可能會導致應用程式無法存取網路，並延遲它們的工作、同步與標準警報。</string>
     <string name="settings_troubleshoot_test_battery_quickfix">忽略最佳化</string>
     <string name="startup_notification_fdroid_battery_optim_title">背景連線</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element 需要保持最低影響的背景連線以接收可靠的通知。 
-\n在下一個畫面，您必須允許 Element 總是在背景執行，請接受。</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} 需要保持最低影響的背景連線以接收可靠的通知。
+\n在下一個畫面，您必須允許 ${app_name} 總是在背景執行，請接受。</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">授予權限</string>
     <string name="account_email_error">當驗證您的電子郵件地址時遇到錯誤。</string>
     <string name="account_phone_number_error">當驗證您的手機號碼時遇到錯誤。</string>
@@ -1161,12 +1161,12 @@
     <string name="settings_troubleshoot_test_bing_settings_failed">有一些通知在您的自訂設定中被停用了。</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">載入自訂規則失敗，請重試。</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">檢查設定</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] 
-\n這個錯誤並非 Element 所能控制，而是與 Google 有關，這個錯誤代表裝置註冊了太多使用 FCM 的應用程式。這個錯誤只會發生在有超大量的應用程式的裝置上，所以不應該影響一般的使用者。</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\n這個錯誤並非 Element 所能控制。可能由多種原因所導致。也可能會在稍後重試時就可以運作，您也可以檢查 Google Play 服務在系統設定中有沒有被限制使用資料，或是您裝置的時鐘是否正確，或是也可能會在自訂的 ROM 上發生。</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\n這個錯誤並非 Element 所能控制。手機上沒有 Google 帳號。請開啟帳號管理員並新增一個 Google 帳號。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\n這個錯誤並非 ${app_name} 所能控制，而是與 Google 有關，這個錯誤代表裝置註冊了太多使用 FCM 的應用程式。這個錯誤只會發生在有超大量的應用程式的裝置上，所以不應該影響一般的使用者。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\n這個錯誤並非 ${app_name} 所能控制。可能由多種原因所導致。也可能會在稍後重試時就可以運作，您也可以檢查 Google Play 服務在系統設定中有沒有被限制使用資料，或是您裝置的時鐘是否正確，或是也可能會在自訂的 ROM 上發生。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\n這個錯誤並非 ${app_name} 所能控制。手機上沒有 Google 帳號。請開啟帳號管理員並新增一個 Google 帳號。</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">新增帳號</string>
     <string name="settings_noisy_notifications_preferences">設定吵鬧的通知</string>
     <string name="settings_call_notifications_preferences">設定通話通知</string>
@@ -1177,7 +1177,7 @@
     <string name="notification_silent">安靜</string>
     <string name="passphrase_empty_error_message">請輸入通關密語</string>
     <string name="passphrase_passphrase_too_weak">通關密語太弱了</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">如果您想要讓 Element 生成復原金鑰的話，請刪除通關密語。</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">如果您想要讓 ${app_name} 生成復原金鑰的話，請刪除通關密語。</string>
     <string name="keys_backup_no_session_error">沒有可用的 Matrix 工作階段</string>
     <string name="keys_backup_setup_step1_title">永不遺失已加密的訊息</string>
     <string name="keys_backup_setup_step1_description">在加密聊天室裡的訊息是使用端到端加密。只有您和接收者有金鑰可以閱讀這些訊息。
@@ -1304,7 +1304,7 @@
     <string name="passwords_do_not_match">密碼不符合</string>
     <string name="autodiscover_invalid_response">無效的家伺服器探索回應</string>
     <string name="autodiscover_well_known_autofill_dialog_title">自動完成伺服器選項</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element 偵測到您的 userId 網域「%1$s」有自訂的伺服器設定：
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} 偵測到您的 userId 網域「%1$s」有自訂的伺服器設定：
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">使用設定</string>
     <string name="notification_sync_init">正在初始化服務</string>
@@ -1417,7 +1417,7 @@
     <string name="please_wait">請稍候……</string>
     <string name="group_all_communities">所有社群</string>
     <string name="room_preview_no_preview">無法預覽此聊天室</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">Element 尚不支援預覽所有人皆可讀的聊天室</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">${app_name} 尚不支援預覽所有人皆可讀的聊天室</string>
     <string name="fab_menu_create_room">聊天室</string>
     <string name="fab_menu_create_chat">直接訊息</string>
     <string name="create_room_title">新聊天室</string>
@@ -1512,11 +1512,11 @@
     <string name="invite_no_identity_server_error">在您的設定中新增一臺身份識別伺服器以執行此動作。</string>
     <string name="settings_background_fdroid_sync_mode">背景同步模式</string>
     <string name="settings_background_fdroid_sync_mode_battery">為電池最佳化</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element 將會在背景同步以節省裝置的有限資源（電池）。
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} 將會在背景同步以節省裝置的有限資源（電池）。
 \n取決於您裝置的資源狀態，作業系統可能會延遲同步。</string>
     <string name="settings_background_fdroid_sync_mode_real_time">為即時作業最佳化</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element 將會精準地定期在背景同步（可設定）。
-\n這會影響到網路與電池的使用，並會顯示指出 Element 正在監聽某事件的永久通知。</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} 將會精準地定期在背景同步（可設定）。
+\n這會影響到網路與電池的使用，並會顯示指出 ${app_name} 正在監聽某事件的永久通知。</string>
     <string name="settings_background_fdroid_sync_mode_disabled">無背景同步</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">當應用程式在背景時，您將不會收到訊息通知。</string>
     <string name="settings_background_sync_update_error">更新設定失敗。</string>
@@ -1599,12 +1599,12 @@
     <string name="content_reported_as_inappropriate_content">此內容已被回報為不合適。 
 \n 
 \n如果您不想要看到從此使用者而來的更多內容，您可以忽略他們以隱藏他們的訊息。</string>
-    <string name="permissions_rationale_msg_keys_backup_export">Element 需要權限以在磁碟上儲存您的 E2E 金鑰。
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} 需要權限以在磁碟上儲存您的 E2E 金鑰。
 \n
 \n請在下個彈出視窗中允許存取以讓您可以手動匯出您的金鑰。</string>
     <string name="no_network_indicator">目前沒有網路連線</string>
     <string name="settings_add_3pid_confirm_password_title">確認您的密碼</string>
-    <string name="settings_add_3pid_flow_not_supported">您無法在行動裝置上的 Element 做這件事</string>
+    <string name="template_settings_add_3pid_flow_not_supported">您無法在行動裝置上的 ${app_name} 做這件事</string>
     <string name="settings_add_3pid_authentication_needed">需要驗證</string>
     <string name="settings_integrations">整合</string>
     <string name="settings_integrations_summary">使用整合管理員以管理機器人、橋接、小工具與貼紙包。
@@ -1771,7 +1771,7 @@
 \n再次登入以存取您的帳號資料與訊息。</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">除非您登入以復原您的加密金鑰，否則您將會失去對安全訊息的存取權。</string>
     <string name="soft_logout_clear_data_dialog_submit">清除資料</string>
-    <string name="soft_logout_sso_not_same_user_error">使用者 %1$s 目前的工作階段與您提供的使用者 %2$s 憑證。Element 並不支援。
+    <string name="template_soft_logout_sso_not_same_user_error">使用者 %1$s 目前的工作階段與您提供的使用者 %2$s 憑證。${app_name} 並不支援。
 \n請先清除您的資料，然後再以其他帳號登入。</string>
     <string name="permalink_malformed">您的 matrix.to 連結格式錯誤</string>
     <string name="bug_report_error_too_short">描述太短了</string>
@@ -1789,7 +1789,7 @@
     <string name="devices_other_devices">其他工作階段</string>
     <string name="autocomplete_limited_results">僅顯示第一個結果，輸入更多字母……</string>
     <string name="settings_developer_mode_fail_fast_title">快速失敗</string>
-    <string name="settings_developer_mode_fail_fast_summary">在發生非預期的錯誤時，Element 可能更常當機</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">在發生非預期的錯誤時，${app_name} 可能更常當機</string>
     <string name="command_description_shrug">將 ¯\\_(ツ)_/¯ 附加到純文字訊息中</string>
     <string name="create_room_encryption_title">啟用加密</string>
     <string name="create_room_encryption_description">加密一旦啟用就無法停用。</string>
@@ -1859,9 +1859,9 @@
     <string name="room_member_power_level_moderator_in">%1$s 中的板主</string>
     <string name="room_member_power_level_custom_in">%2$s 中的自訂 (%1$d)</string>
     <string name="room_member_jump_to_read_receipt">跳至讀取回條</string>
-    <string name="rendering_event_error_type_of_event_not_handled">Element 無法處理類型為「%1$s」的事件</string>
-    <string name="rendering_event_error_type_of_message_not_handled">Element 無法處理類型為「%1$s」的訊息</string>
-    <string name="rendering_event_error_exception">在彩現 id「%1$s」事件的內容時，Element 遇到問題</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} 無法處理類型為「%1$s」的事件</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} 無法處理類型為「%1$s」的訊息</string>
+    <string name="template_rendering_event_error_exception">在彩現 id「%1$s」事件的內容時，${app_name} 遇到問題</string>
     <string name="unignore">取消忽略</string>
     <string name="verify_cannot_cross_sign">此工作階段無法與您其他的工作階段分享此驗證。
 \n驗證將會儲存在本機並在未來版本的應用程式中共享。</string>
@@ -1952,7 +1952,7 @@
     <string name="event_redacted_by_user_reason_with_reason">被使用者刪除的活動，理由：%1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">由聊天室管理員管理的活動，理由：%1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">金鑰已為最新！</string>
-    <string name="login_default_session_public_name">Element Android</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
     <string name="settings_key_requests">金鑰請求</string>
     <string name="e2e_use_keybackup">解鎖已加密的訊息歷史</string>
     <string name="refresh">重新整理</string>
@@ -2053,13 +2053,13 @@
     <string name="media_file_added_to_gallery">媒體檔案已新增至媒體庫中</string>
     <string name="error_adding_media_file_to_gallery">無法新增媒體檔案到媒體庫中</string>
     <string name="change_password_summary">設定新的帳號密碼……</string>
-    <string name="use_other_session_content_description">在您的其他裝置上使用最新的 Element、Element Web、Element 桌面版、Element iOS、Element for Android 或其他有交叉簽章功能的 Matrix 客戶端</string>
-    <string name="app_desktop_web">Element Web
-\nElement 桌面版</string>
-    <string name="app_ios_android">Element iOS
-\nElement Android</string>
+    <string name="template_use_other_session_content_description">在您的其他裝置上使用最新的 ${app_name}、${app_name} Web、${app_name} 桌面版、${app_name} iOS、${app_name} for Android 或其他有交叉簽章功能的 Matrix 客戶端</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} 桌面版</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">或其他有交叉簽章功能的 Matrix 客戶端</string>
-    <string name="use_latest_app">在您的其他裝置上使用最新的 Element：</string>
+    <string name="template_use_latest_app">在您的其他裝置上使用最新的 ${app_name}：</string>
     <string name="command_description_discard_session">強制丟棄目前在加密聊天室中的外發群組工作階段</string>
     <string name="command_description_discard_session_not_handled">僅在加密聊天室中支援</string>
     <string name="enter_secret_storage_passphrase_or_key">使用您的 %1$s 或使用您的 %2$s 以繼續。</string>
@@ -2119,11 +2119,11 @@
     <string name="choose_locale_loading_locales">正在載入可用的語言……</string>
     <string name="open_terms_of">開啟 %s 的條款</string>
     <string name="disconnect_identity_server_dialog_content">從身份識別伺服器 %s 斷線？</string>
-    <string name="identity_server_error_outdated_identity_server">此身份識別伺服器太舊了。Element 僅支援 API V2。</string>
+    <string name="template_identity_server_error_outdated_identity_server">此身份識別伺服器太舊了。${app_name} 僅支援 API V2。</string>
     <string name="identity_server_error_outdated_home_server">此動作是不可能的。家伺服器太舊了。</string>
     <string name="identity_server_error_no_identity_server_configured">請先設定身份識別伺服器。</string>
     <string name="identity_server_error_terms_not_signed">請先在設定中同意身份識別伺服器的條款。</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，Element 僅支援傳送雜湊過的使用者電子郵件與電話號碼。</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，${app_name} 僅支援傳送雜湊過的使用者電子郵件與電話號碼。</string>
     <string name="identity_server_error_binding_error">關聯失敗。</string>
     <string name="identity_server_error_no_current_binding_error">目前沒有此識別符的關聯。</string>
     <string name="identity_server_set_default_notice">您的家伺服器 (%1$s) 建議將 %2$s 用於您的身份識別伺服器</string>
@@ -2137,7 +2137,7 @@
     <string name="action_copy">複製</string>
     <string name="dialog_title_success">成功</string>
     <string name="bottom_action_notification">通知</string>
-    <string name="call_failed_no_connection">Element 呼叫失敗</string>
+    <string name="template_call_failed_no_connection">${app_name} 呼叫失敗</string>
     <string name="call_failed_no_connection_description">建立即時連線失敗。
 \n請要求您家伺服器的管理員設定 TURN 伺服器以讓通話的運作更可靠。</string>
     <string name="call_select_sound_device">選取音效裝置</string>
@@ -2334,13 +2334,13 @@
     <string name="delete_account_data_warning">刪除類型為 %1$s 的帳號資料？
 \n
 \n小心使用，它可能會導致意料之外的行為。</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">每次打開 Element 時都需要 PIN 碼。</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">未使用 Element 2分鐘後，要求輸入 PIN 碼。</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">每次打開 ${app_name} 時都需要 PIN 碼。</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">未使用 ${app_name} 2分鐘後，要求輸入 PIN 碼。</string>
     <string name="settings_security_pin_code_grace_period_title">2分鐘後要求輸入 PIN 碼</string>
     <string name="settings_security_pin_code_notifications_summary_off">在簡易通知中僅顯示未讀訊息數量。</string>
     <string name="settings_security_pin_code_notifications_summary_on">顯示如聊天是名稱與訊息內容等詳細資訊。</string>
     <string name="settings_security_pin_code_notifications_title">在通知中顯示內容</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN 碼是解鎖 Element 的唯一方式。</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN 碼是解鎖 ${app_name} 的唯一方式。</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">啟用特定裝置的生物識別技術，如指紋與臉部辨識。</string>
     <string name="settings_security_application_protection_screen_title">設定保護</string>
     <string name="settings_security_application_protection_summary">使用 PIN 碼與生物識別技術來保護存取權。</string>
@@ -2413,8 +2413,8 @@
     <string name="user_code_share">分享我的條碼</string>
     <string name="user_code_scan">掃描 QR code</string>
     <string name="not_a_valid_qr_code">不是有效的 Matrix QR code</string>
-    <string name="invite_friends_rich_title">🔐️ 在 Element 上加入我</string>
-    <string name="invite_friends_text">嗨，和我在 Element 上聊天吧：%s</string>
+    <string name="template_invite_friends_rich_title">🔐️ 在 ${app_name} 上加入我</string>
+    <string name="template_invite_friends_text">嗨，和我在 ${app_name} 上聊天吧：%s</string>
     <string name="invite_friends">邀請朋友</string>
     <string name="topic_prefix">"主題： "</string>
     <string name="add_people">新增夥伴</string>
@@ -2528,7 +2528,7 @@
     <string name="settings_show_emoji_keyboard_summary">在訊息編輯器上新增按鈕以開啟表情符號鍵盤</string>
     <string name="settings_show_emoji_keyboard">顯示表情符號鍵盤</string>
     <string name="authentication_error">驗證失敗</string>
-    <string name="re_authentication_default_confirm_text">Element 需要您輸入您的憑證來執行此動作。</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} 需要您輸入您的憑證來執行此動作。</string>
     <string name="re_authentication_activity_title">需要重新驗證</string>
     <string name="failed_to_initialize_cross_signing">未能設定交叉簽章</string>
     <string name="error_unauthorized">未授權，缺少有效的身份驗證憑證</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 1e079346f6..06f3c037a1 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -481,7 +481,8 @@
     <string name="user_directory_header">User directory</string>
     <string name="matrix_only_filter">Matrix contacts only</string>
     <string name="no_conversation_placeholder">No conversations</string>
-    <string name="no_contact_access_placeholder">You didn’t allow Element to access your local contacts</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_no_contact_access_placeholder">You didn’t allow ${app_name} to access your local contacts</string>
     <string name="no_result_placeholder">No results</string>
     <string name="no_more_results">No more results</string>
     <string name="people_no_identity_server">No identity server configured.</string>
@@ -544,7 +545,8 @@
     <string name="call_failed_no_ice_use_alt">Try using %s</string>
     <string name="call_failed_dont_ask_again">Do not ask me again</string>
 
-    <string name="call_failed_no_connection">Element Call Failed</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_call_failed_no_connection">${app_name} Call Failed</string>
     <string name="call_failed_no_connection_description">Failed to establish real time connection.\nPlease ask the administrator of your homeserver to configure a TURN server in order for calls to work reliably.</string>
 
     <string name="call_select_sound_device">Select Sound Device</string>
@@ -653,7 +655,8 @@
     <string name="e2e_re_request_encryption_key_sent">Key request sent.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">Request sent</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">Please launch Element on another device that can decrypt the message so it can send the keys to this session.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Please launch ${app_name} on another device that can decrypt the message so it can send the keys to this session.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Read Receipts List</string>
@@ -694,7 +697,8 @@
     <string name="settings_call_category">Calls</string>
     <string name="settings_call_show_confirmation_dialog_title">Prevent accidental call</string>
     <string name="settings_call_show_confirmation_dialog_summary">Ask for confirmation before starting a call</string>
-    <string name="settings_call_ringtone_use_app_ringtone">Use default Element ringtone for incoming calls</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_call_ringtone_use_app_ringtone">Use default ${app_name} ringtone for incoming calls</string>
     <string name="settings_call_ringtone_use_default_stun">Allow fallback call assist server</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Will use "%s" as assist when your home server does not offer one (your IP address will be shared during a call)</string>
     <string name="settings_call_ringtone_title">Incoming call ringtone</string>
@@ -729,14 +733,20 @@
 
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
-    <string name="permissions_rationale_msg_storage">Element needs permission to access your photo and video library to send and save attachments.\n\nPlease allow access on the next pop-up to be able to send files from your phone.</string>
-    <string name="permissions_rationale_msg_camera">Element needs permission to access your camera to take pictures and video calls.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_permissions_rationale_msg_storage">${app_name} needs permission to access your photo and video library to send and save attachments.\n\nPlease allow access on the next pop-up to be able to send files from your phone.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_permissions_rationale_msg_camera">${app_name} needs permission to access your camera to take pictures and video calls.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nPlease allow access on the next pop-up to be able to make the call.</string>
-    <string name="permissions_rationale_msg_record_audio">Element needs permission to access your microphone to perform audio calls.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} needs permission to access your microphone to perform audio calls.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nPlease allow access on the next pop-up to be able to make the call.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Element needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
-    <string name="permissions_rationale_msg_contacts">Element can check your address book to find other Matrix users based on their email and phone numbers. If you agree to share your address book for this purpose, please allow access on the next pop-up.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element can check your address book to find other Matrix users based on their email and phone numbers.\n\nDo you agree to share your address book for this purpose?</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_permissions_rationale_msg_contacts">${app_name} can check your address book to find other Matrix users based on their email and phone numbers. If you agree to share your address book for this purpose, please allow access on the next pop-up.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} can check your address book to find other Matrix users based on their email and phone numbers.\n\nDo you agree to share your address book for this purpose?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Sorry. Action not performed, due to missing permissions</string>
     <string name="permissions_denied_qr_code">To scan a QR code, you need to allow camera access.</string>
@@ -1037,7 +1047,8 @@
     <string name="settings_app_info_link_title">Application info</string>
     <string name="settings_app_info_link_summary">Show the application info in the system settings.</string>
     <string name="settings_add_3pid_confirm_password_title">Confirm your password</string>
-    <string name="settings_add_3pid_flow_not_supported">You can\'t do this from Element mobile</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_add_3pid_flow_not_supported">You can\'t do this from ${app_name} mobile</string>
     <string name="settings_add_3pid_authentication_needed">Authentication is required</string>
 
     <string name="settings_emails">Email addresses</string>
@@ -1070,7 +1081,8 @@
 
     <string name="settings_troubleshoot_test_device_settings_title">Session Settings.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Notifications are enabled for this session.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Notifications are not enabled for this session.\nPlease check the Element settings.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Notifications are not enabled for this session.\nPlease check the ${app_name} settings.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Enable</string>
 
     <string name="settings_troubleshoot_test_bing_settings_title">Custom Settings.</string>
@@ -1081,15 +1093,19 @@
 
     <string name="settings_troubleshoot_test_play_services_title">Play Services Check</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK is available and up-to-date.</string>
-    <string name="settings_troubleshoot_test_play_services_failed">Element uses Google Play Services to deliver push messages but it doesn’t seem to be configured correctly:\n%1$s</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} uses Google Play Services to deliver push messages but it doesn’t seem to be configured correctly:\n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Fix Play Services</string>
 
     <string name="settings_troubleshoot_test_fcm_title">Firebase Token</string>
     <string name="settings_troubleshoot_test_fcm_success">FCM token successfully retrieved:\n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Failed to retrieved FCM token:\n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nThis error is out of control of Element and according to Google, this error indicates that the device has too many apps registered with FCM. The error only occurs in cases where there are extreme numbers of apps, so it should not affect the average user.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nThis error is out of control of Element. It can occur for several reasons. Maybe it will work if you retry later, you can also check that Google Play Service is not restricted in data usage in the system settings, or that your device clock is correct, or it can happen on custom ROM.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nThis error is out of control of Element. There is no Google account on the phone. Please open the account manager and add a Google account.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]\nThis error is out of control of ${app_name} and according to Google, this error indicates that the device has too many apps registered with FCM. The error only occurs in cases where there are extreme numbers of apps, so it should not affect the average user.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]\nThis error is out of control of ${app_name}. It can occur for several reasons. Maybe it will work if you retry later, you can also check that Google Play Service is not restricted in data usage in the system settings, or that your device clock is correct, or it can happen on custom ROM.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]\nThis error is out of control of ${app_name}. There is no Google account on the phone. Please open the account manager and add a Google account.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Add Account</string>
 
     <string name="settings_troubleshoot_test_token_registration_title">Token Registration</string>
@@ -1116,16 +1132,20 @@
 
     <string name="settings_troubleshoot_test_service_boot_title">Start on boot</string>
     <string name="settings_troubleshoot_test_service_boot_success">Service will start when the device is restarted.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">The service will not start when the device is restarted, you will not receive notifications until Element has been opened once.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_service_boot_failed">The service will not start when the device is restarted, you will not receive notifications until ${app_name} has been opened once.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Enable Start on boot</string>
 
     <string name="settings_troubleshoot_test_bg_restricted_title">Check background restrictions</string>
-    <string name="settings_troubleshoot_test_bg_restricted_success">Background restrictions are disabled for Element. This test should be run using mobile data (no WIFI).\n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_failed">Background restrictions are enabled for Element.\nWork that the app tries to do will be aggressively restricted while it is in the background, and this could affect notifications.\n%1$s</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Background restrictions are disabled for ${app_name}. This test should be run using mobile data (no WIFI).\n%1$s</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Background restrictions are enabled for ${app_name}.\nWork that the app tries to do will be aggressively restricted while it is in the background, and this could affect notifications.\n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Disable restrictions</string>
 
     <string name="settings_troubleshoot_test_battery_title">Battery Optimization</string>
-    <string name="settings_troubleshoot_test_battery_success">Element is not affected by Battery Optimization.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} is not affected by Battery Optimization.</string>
     <string name="settings_troubleshoot_test_battery_failed">If a user leaves a device unplugged and stationary for a period of time, with the screen off, the device enters Doze mode. This prevents apps from accessing the network and defers their jobs, syncs, and standard alarms. </string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignore Optimization</string>
 
@@ -1160,9 +1180,11 @@
     <string name="settings_background_sync">Background synchronization</string>
     <string name="settings_background_fdroid_sync_mode">Background Sync Mode</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimized for battery</string>
-    <string name="settings_background_fdroid_sync_mode_battery_description">Element will sync in background in way that preserves the device’s limited resources (battery).\nDepending on your device resource state, the sync may be deferred by the operating system.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} will sync in background in way that preserves the device’s limited resources (battery).\nDepending on your device resource state, the sync may be deferred by the operating system.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimized for real time</string>
-    <string name="settings_background_fdroid_sync_mode_real_time_description">Element will sync in background periodically at precise time (configurable).\nThis will impact radio and battery usage, there will be a permanent notification displayed stating that Element is listening for events.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} will sync in background periodically at precise time (configurable).\nThis will impact radio and battery usage, there will be a permanent notification displayed stating that ${app_name} is listening for events.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">No background sync</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">You will not be notified of incoming messages when the app is in background.</string>
     <string name="settings_background_sync_update_error">Failed to update settings.</string>
@@ -1245,19 +1267,23 @@
     <string name="settings_discovery_category">Discovery</string>
     <string name="settings_discovery_manage">Manage your discovery settings.</string>
     <string name="startup_notification_privacy_title">Notification Privacy</string>
-    <string name="startup_notification_privacy_message">Element can run in the background to manage your notifications securely and privately. This might affect battery usage.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_startup_notification_privacy_message">${app_name} can run in the background to manage your notifications securely and privately. This might affect battery usage.</string>
     <string name="startup_notification_privacy_button_grant">Grant permission</string>
     <string name="startup_notification_privacy_button_other">Choose another option</string>
 
     <string name="startup_notification_fdroid_battery_optim_title">Background Connection</string>
-    <string name="startup_notification_fdroid_battery_optim_message">Element needs to keep a low impact background connection in order to have reliable notifications.\nOn the next screen you will be prompted to allow Element to always run in background, please accept.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} needs to keep a low impact background connection in order to have reliable notifications.\nOn the next screen you will be prompted to allow ${app_name} to always run in background, please accept.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Grant permission</string>
 
     <!-- analytics -->
     <string name="settings_analytics">Analytics</string>
     <string name="settings_opt_in_of_analytics">Send analytics data</string>
-    <string name="settings_opt_in_of_analytics_summary">Element collects anonymous analytics to allow us to improve the application.</string>
-    <string name="settings_opt_in_of_analytics_prompt">Please enable analytics to help us improve Element.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} collects anonymous analytics to allow us to improve the application.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_opt_in_of_analytics_prompt">Please enable analytics to help us improve ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Yes, I want to help!</string>
 
     <string name="settings_data_save_mode">Data save mode</string>
@@ -1819,7 +1845,8 @@
 
     <!-- Key Backup -->
 
-    <string name="keys_backup_passphrase_not_empty_error_message">Please delete the passphrase if you want Element to generate a recovery key.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Please delete the passphrase if you want ${app_name} to generate a recovery key.</string>
     <string name="keys_backup_no_session_error">No Matrix session available</string>
 
     <string name="keys_backup_setup_step1_title">Never lose encrypted messages</string>
@@ -1961,7 +1988,8 @@
 
     <string name="autodiscover_invalid_response">Invalid homeserver discovery response</string>
     <string name="autodiscover_well_known_autofill_dialog_title">"Autocomplete Server Options</string>
-    <string name="autodiscover_well_known_autofill_dialog_message">Element detected a custom server configuration for your userId domain \"%1$s\":\n%2$s</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} detected a custom server configuration for your userId domain \"%1$s\":\n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Use Config</string>
 
     <string name="invalid_or_expired_credentials">You have been logged out due to invalid or expired credentials.</string>
@@ -2057,7 +2085,8 @@
     <string name="group_all_communities">"All Communities"</string>
 
     <string name="room_preview_no_preview">"This room can't be previewed"</string>
-    <string name="room_preview_world_readable_room_not_supported_yet">"The preview of world-readable room is not supported yet in Element"</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_room_preview_world_readable_room_not_supported_yet">The preview of world-readable room is not supported yet in ${app_name}</string>
     <string name="room_preview_not_found">This room is not accessible at this time.\nTry again later, or ask a room admin to check if you have access.</string>
     <string name="room_preview_no_preview_join">"This room can't be previewed. Do you want to join it?"</string>
     <string name="fab_menu_create_room">"Rooms"</string>
@@ -2282,7 +2311,8 @@
     <string name="content_reported_as_inappropriate_title">"Reported as inappropriate"</string>
     <string name="content_reported_as_inappropriate_content">"This content was reported as inappropriate.\n\nIf you don't want to see any more content from this user, you can ignore them to hide their messages."</string>
 
-    <string name="permissions_rationale_msg_keys_backup_export">Element needs permission to save your E2E keys on disk.\n\nPlease allow access on the next pop-up to be able to export your keys manually.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} needs permission to save your E2E keys on disk.\n\nPlease allow access on the next pop-up to be able to export your keys manually.</string>
 
     <string name="no_network_indicator">There is no network connection right now</string>
 
@@ -2475,7 +2505,8 @@
     <string name="soft_logout_clear_data_dialog_content">Clear all data currently stored on this device?\nSign in again to access your account data and messages.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">You’ll lose access to secure messages unless you sign in to recover your encryption keys.</string>
     <string name="soft_logout_clear_data_dialog_submit">Clear data</string>
-    <string name="soft_logout_sso_not_same_user_error">The current session is for user %1$s and you provide credentials for user %2$s. This is not supported by Element.\nPlease first clear data, then sign in again on another account.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_soft_logout_sso_not_same_user_error">The current session is for user %1$s and you provide credentials for user %2$s. This is not supported by ${app_name}.\nPlease first clear data, then sign in again on another account.</string>
 
     <string name="permalink_malformed">Your matrix.to link was malformed</string>
     <string name="bug_report_error_too_short">The description is too short</string>
@@ -2497,7 +2528,8 @@
     <string name="autocomplete_limited_results">Showing only the first results, type more letters…</string>
 
     <string name="settings_developer_mode_fail_fast_title">Fail-fast</string>
-    <string name="settings_developer_mode_fail_fast_summary">Element may crash more often when an unexpected error occurs</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} may crash more often when an unexpected error occurs</string>
 
     <string name="command_description_shrug">Prepends ¯\\_(ツ)_/¯ to a plain-text message</string>
 
@@ -2602,9 +2634,12 @@
     <string name="room_member_open_or_create_dm">Direct message</string>
     <string name="room_member_jump_to_read_receipt">Jump to read receipt</string>
 
-    <string name="rendering_event_error_type_of_event_not_handled">"Element does not handle events of type '%1$s'"</string>
-    <string name="rendering_event_error_type_of_message_not_handled">"Element does not handle message of type '%1$s'"</string>
-    <string name="rendering_event_error_exception">"Element encountered an issue when rendering content of event with id '%1$s'"</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} does not handle events of type \'%1$s\'</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} does not handle message of type \'%1$s\'</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_rendering_event_error_exception">${app_name} encountered an issue when rendering content of event with id \'%1$s\'</string>
 
     <string name="unignore">Unignore</string>
 
@@ -2741,7 +2776,8 @@
 
     <string name="keys_backup_restore_success_title_already_up_to_date">Keys are already up to date!</string>
 
-    <string name="login_default_session_public_name">Element Android</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
 
     <string name="settings_key_requests">Key Requests</string>
     <string name="settings_export_trail">Export Audit</string>
@@ -2900,11 +2936,15 @@
     <string name="error_saving_media_file">Could not save media file</string>
     <string name="change_password_summary">Set a new account password…</string>
 
-    <string name="use_other_session_content_description">Use the latest Element on your other devices, Element Web, Element Desktop, Element iOS, Element for Android, or another cross-signing capable Matrix client</string>
-    <string name="app_desktop_web">Element Web\nElement Desktop</string>
-    <string name="app_ios_android">Element iOS\nElement Android</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_use_other_session_content_description">Use the latest ${app_name} on your other devices, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} for Android, or another cross-signing capable Matrix client</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_app_desktop_web">${app_name} Web\n${app_name} Desktop</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_app_ios_android">${app_name} iOS\n${app_name} Android</string>
     <string name="or_other_mx_capabale_client">or another cross-signing capable Matrix client</string>
-    <string name="use_latest_app">Use the latest Element on your other devices:</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_use_latest_app">Use the latest ${app_name} on your other devices:</string>
     <string name="command_description_discard_session">Forces the current outbound group session in an encrypted room to be discarded</string>
     <string name="command_description_discard_session_not_handled">Only supported in encrypted rooms</string>
     <!-- first will be replaced by recovery_passphrase, second will be replaced by recovery_key-->
@@ -2925,9 +2965,9 @@
 
     <string name="command_confetti">Sends the given message with confetti</string>
     <string name="command_snow">Sends the given message with snow</string>
-    <!-- Note to translator: please use the same emoji 🎉 in your translation -->
+    <!-- Note to translators: please use the same emoji 🎉 in your translation -->
     <string name="default_message_emote_confetti">sends confetti 🎉</string>
-    <!-- Note to translator: please use the same emoji ❄️ in your translation -->
+    <!-- Note to translators: please use the same emoji ❄️ in your translation -->
     <string name="default_message_emote_snow">sends snow ❄️</string>
 
     <string name="unencrypted">Unencrypted</string>
@@ -2960,8 +3000,10 @@
     <string name="inviting_users_to_room">Inviting users…</string>
     <string name="invite_users_to_room_title">Invite Users</string>
     <string name="invite_friends">Invite friends</string>
-    <string name="invite_friends_text">Hey, talk to me on Element: %s</string>
-    <string name="invite_friends_rich_title">🔐️ Join me on element</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_invite_friends_text">Hey, talk to me on ${app_name}: %s</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_invite_friends_rich_title">🔐️ Join me on ${app_name}</string>
     <string name="invitation_sent_to_one_user">Invitation sent to %1$s</string>
     <string name="invitations_sent_to_two_users">Invitations sent to %1$s and %2$s</string>
     <string name="not_a_valid_qr_code">"It's not a valid matrix QR code"</string>
@@ -2982,11 +3024,13 @@
 
     <string name="open_terms_of">Open terms of %s</string>
     <string name="disconnect_identity_server_dialog_content">Disconnect from the identity server %s?</string>
-    <string name="identity_server_error_outdated_identity_server">This identity server is outdated. Element support only API V2.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_identity_server_error_outdated_identity_server">This identity server is outdated. ${app_name} support only API V2.</string>
     <string name="identity_server_error_outdated_home_server">This operation is not possible. The homeserver is outdated.</string>
     <string name="identity_server_error_no_identity_server_configured">Please first configure an identity server.</string>
     <string name="identity_server_error_terms_not_signed">Please first accepts the terms of the identity server in the settings.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">For your privacy, Element only supports sending hashed user emails and phone number.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_identity_server_error_bulk_sha256_not_supported">For your privacy, ${app_name} only supports sending hashed user emails and phone number.</string>
     <string name="identity_server_error_binding_error">The association has failed.</string>
     <string name="identity_server_error_no_current_binding_error">The is no current association with this identifier.</string>
     <string name="identity_server_user_consent_not_provided">The user consent has not been provided.</string>
@@ -3090,13 +3134,16 @@
     <string name="settings_security_pin_code_summary">If you want to reset your PIN, tap Forgot PIN to logout and reset.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Enable biometrics</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Enable device specific biometrics, like fingerprints and face recognition.</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN code is the only way to unlock Element.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">PIN code is the only way to unlock ${app_name}.</string>
     <string name="settings_security_pin_code_notifications_title">Show content in notifications</string>
     <string name="settings_security_pin_code_notifications_summary_on">Show details like room names and message content.</string>
     <string name="settings_security_pin_code_notifications_summary_off">Only display number of unread messages in a simple notification.</string>
     <string name="settings_security_pin_code_grace_period_title">Require PIN after 2 minutes</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN code is required after 2 minutes of not using Element.</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">PIN code is required every time you open Element.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_security_pin_code_grace_period_summary_on">PIN code is required after 2 minutes of not using ${app_name}.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_settings_security_pin_code_grace_period_summary_off">PIN code is required every time you open ${app_name}.</string>
     <string name="settings_security_pin_code_change_pin_title">Change PIN</string>
     <string name="settings_security_pin_code_change_pin_summary">Change your current PIN</string>
     <string name="auth_pin_confirm_to_disable_title">Confirm PIN to disable PIN</string>
@@ -3148,7 +3195,8 @@
 
 
     <string name="re_authentication_activity_title">Re-Authentication Needed</string>
-    <string name="re_authentication_default_confirm_text">Element requires you to enter your credentials to perform this action.</string>
+    <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->
+    <string name="template_re_authentication_default_confirm_text">${app_name} requires you to enter your credentials to perform this action.</string>
     <string name="authentication_error">Failed to authenticate</string>
 
     <string name="a11y_screenshot">Screenshot</string>

From b980ca5d31e87a9f84a026517e736eb6a2dd11f9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 17:54:14 +0100
Subject: [PATCH 183/578] Remove unused string

---
 vector/src/main/res/values-bg/strings.xml     | 1 -
 vector/src/main/res/values-ca/strings.xml     | 1 -
 vector/src/main/res/values-cs/strings.xml     | 1 -
 vector/src/main/res/values-de/strings.xml     | 3 +--
 vector/src/main/res/values-eo/strings.xml     | 1 -
 vector/src/main/res/values-es/strings.xml     | 1 -
 vector/src/main/res/values-et/strings.xml     | 1 -
 vector/src/main/res/values-eu/strings.xml     | 1 -
 vector/src/main/res/values-fa/strings.xml     | 1 -
 vector/src/main/res/values-fi/strings.xml     | 1 -
 vector/src/main/res/values-fr/strings.xml     | 1 -
 vector/src/main/res/values-he/strings.xml     | 1 -
 vector/src/main/res/values-hr/strings.xml     | 1 -
 vector/src/main/res/values-hu/strings.xml     | 1 -
 vector/src/main/res/values-it/strings.xml     | 1 -
 vector/src/main/res/values-iw/strings.xml     | 1 -
 vector/src/main/res/values-kab/strings.xml    | 1 -
 vector/src/main/res/values-nb-rNO/strings.xml | 1 -
 vector/src/main/res/values-pl/strings.xml     | 1 -
 vector/src/main/res/values-pt-rBR/strings.xml | 1 -
 vector/src/main/res/values-ru/strings.xml     | 1 -
 vector/src/main/res/values-sq/strings.xml     | 1 -
 vector/src/main/res/values-sv/strings.xml     | 1 -
 vector/src/main/res/values-zh-rCN/strings.xml | 1 -
 vector/src/main/res/values-zh-rTW/strings.xml | 1 -
 vector/src/main/res/values/strings.xml        | 1 -
 26 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index e8dc6aa0b4..0288b6faf6 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1660,7 +1660,6 @@
     <string name="login_server_url_form_other_hint">Адрес</string>
     <string name="login_server_url_form_modular_text">Премиум хостинг за организации</string>
     <string name="login_server_url_form_modular_notice">Въведете адреса на Modular Element или на сървър, който искате да използвате</string>
-    <string name="login_server_url_form_other_notice">Въведете адреса на сървър или Element към който да се свържете</string>
     <string name="login_sso_error_message">Възникна грешка при зареждане на страницата: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Приложението не може да влезе в този сървър. Сървъра поддържа следните методи за вход: %1$s.
 \n
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 7c09c778c5..d48de4ba3d 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1647,7 +1647,6 @@
     <string name="login_registration_disabled">Ho sentim, aquest servidor no accepta comptes nous.</string>
     <string name="login_sso_error_message">S\'ha produït un error en carregar la pàgina: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">Introdueix l\'adreça del servidor que vulguis utilitzar</string>
-    <string name="login_server_url_form_other_notice">Introdueix l\'adreça d\'un servidor o d\'un Element al qual et que vulguis connectar</string>
     <string name="attachment_type_gallery">Galeria</string>
     <string name="attachment_type_sticker">Adhesiu</string>
     <string name="error_attachment">S\'ha produït un error mentre es rebia el fitxer adjunt.</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index deacdeb266..ce59227221 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1741,7 +1741,6 @@
     <string name="login_server_url_form_other_hint">Adresa</string>
     <string name="login_server_url_form_modular_text">Prémiový hosting pro organizace</string>
     <string name="login_server_url_form_modular_notice">Zadejte adresu Modular Element nebo serveru, který chcete použít</string>
-    <string name="login_server_url_form_other_notice">Zadejte adresu serveru nebo Elementu, k němuž se chcete připojit</string>
     <string name="login_sso_error_message">Při načítání stránky došlo k chybě: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikace se nemůže přihlásit k tomuto homeserveru. Homeserver podporuje následující typy přihlášení: %1$s.
 \n
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index ee1a204172..5799625fe2 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1815,8 +1815,7 @@
     <string name="login_splash_title">Es ist deine Konversation. Mache sie dir zu eigen.</string>
     <string name="login_server_url_form_modular_text">Premium-Hosting für Organisationen</string>
     <string name="login_server_url_form_modular_notice">Gib die Adresse des Modular Element oder Servers ein, den du verwenden möchtest</string>
-    <string name="login_server_url_form_other_notice">Gibt die Adresse eines Servers oder eines Element ein, zu dem du dich verbinden möchtest</string>
-    <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Home-Server anmelden. Der Home-Server unterstützt die folgenden Anmeldetypen: %1$s. 
+    <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Home-Server anmelden. Der Home-Server unterstützt die folgenden Anmeldetypen: %1$s.
 \n 
 \nMöchtest du dich mit einem Webclient anmelden\?</string>
     <string name="login_reset_password_notice">Eine Bestätigungs-E-Mail wird an dich gesendet, um dein neues Passwort zu bestätigen.</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 54fa6c4007..b5c06a9dff 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -938,7 +938,6 @@
 \nĈu vi volas saluti per TTT-kliento\?</string>
     <string name="login_sso_error_message">Eraris enlegado de la paĝo: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">Enigu adreson de servilo, kiun vi volas uzi</string>
-    <string name="login_server_url_form_other_notice">Enigu la adreson de servilo aŭ Elemento, kien vi volas konektiĝi</string>
     <string name="login_server_url_form_other_hint">Adreso</string>
     <string name="login_server_url_form_modular_hint">Adreso de Element Matrix Services</string>
     <string name="login_signin_to">Saluti al %1$s</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 2658fd6b88..e091b26af8 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1766,7 +1766,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="login_server_url_form_other_hint">Dirección</string>
     <string name="login_server_url_form_modular_text">Alojamiento de pago para organizaciones</string>
     <string name="login_server_url_form_modular_notice">Introduzca la dirección de Modular Element o servidor que quieres usar</string>
-    <string name="login_server_url_form_other_notice">Introduzca la dirección del servidor Element al que quieres conectarte</string>
     <string name="login_sso_error_message">Se produjo un error al cargar la página: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">La aplicación no es capaz de iniciar sesión en este servidor. Éste solo soporta el acceso mediante: %1$s.
 \n
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 0c3f184a3e..0d2ccbb113 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -1008,7 +1008,6 @@
     <string name="login_server_url_form_other_hint">Aadress</string>
     <string name="login_server_url_form_modular_text">Tasuline Matrix\'i majutusteenus organisatsioonidele</string>
     <string name="login_server_url_form_modular_notice">Sisesta Modular Element teenuse või muu serveri aadress, mida sa soovid kasutada</string>
-    <string name="login_server_url_form_other_notice">Sisesta serveri või Element\'i aadress, mida sa soovid kasutada</string>
     <string name="login_server_url_form_common_notice">Sisesta serveri aadress, mida sa soovid kasutada</string>
     <string name="login_sso_error_message">Lehe laadimisel tekkis viga %1$s (%2$d)</string>
     <string name="login_mode_not_supported">See rakendus ei saa sisse logida antud koduserverisse. See koduserver toetab järgmisi sisselogimise tüüp(e): %1$s.
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 434556241b..8963d3e40c 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1907,7 +1907,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="login_server_url_form_other_hint">Helbidea</string>
     <string name="login_server_url_form_modular_text">Ordainpeko ostatatzea elkarteentzat</string>
     <string name="login_server_url_form_modular_notice">Sartu erabili nahi duzun Modular Element edo zerbitzariaren helbidea</string>
-    <string name="login_server_url_form_other_notice">Sartu konektatu nahi duzun zerbitzari edo Element-aren helbidea</string>
 
     <string name="login_sso_error_message">Errore bat gertatu da orria kargatzean: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikazioak ezin du hasiera-zerbitzari honetan saioa hasi. Hasiera-zerbitzariak honako saio mota onartzen du: %1$s.
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 189dd5aca0..b4a912bf66 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -2001,7 +2001,6 @@
 \nآیا می خواهید با استفاده از مرورگر وارد شوید؟</string>
     <string name="login_sso_error_message">هنگام بارگیری صفحه، خطایی روی داد: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">نشانی کارسازی که می‌خواهید استفاده کنید را وارد کنید</string>
-    <string name="login_server_url_form_other_notice">نشانی المنت یا کارسازی را که می‌‌خواهید به آن وصل شوید، وارد کنید</string>
     <string name="login_server_url_form_modular_notice">نشانی کارساز یا المنت ماژولاری که می‌خواهید استفاده کنید را وارد کنید</string>
     <string name="login_server_matrix_org_text">به میلیون‌ها نفر در بزرگ‌ترین کارساز عمومی بپیوندید</string>
     <string name="login_server_text">درست مانند ایمیل، حساب‌های کاربری یک خانه دارند؛ اگرچه می توانید با هر کسی که دوست دارید، صحبت کنید</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 5f4741f86a..1661178b50 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1818,7 +1818,6 @@
 \nPoista ensin tietosi ja kirjaudu sen jälkeen toisella tunnuksella. Voit vaihtoehtoisesti käyttää ${app_name}in selainversiota.</string>
     <string name="permalink_malformed">matrix.to-linkkisi oli epämuodostunut</string>
     <string name="bug_report_error_too_short">Kuvaus on liian lyhyt</string>
-    <string name="login_server_url_form_other_notice">Syötä palvelin tai sen Elementin osoite, mihin haluat yhdistää</string>
     <string name="signed_out_notice">Se voi johtua monesta eri syystä:
 \n
 \n• olet vaihtanut salasanasi toisella laitteella
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 397ff5a1e3..8b6a1d4925 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1682,7 +1682,6 @@
     <string name="login_server_url_form_other_hint">Adresse</string>
     <string name="login_server_url_form_modular_text">Hébergement privé pour les organisations</string>
     <string name="login_server_url_form_modular_notice">Saisir l’adresse de Element ou du serveur de Modular que vous voulez utiliser</string>
-    <string name="login_server_url_form_other_notice">Saisir l’adresse d’un serveur ou d’un Element auquel vous voulez vous connecter</string>
     <string name="login_sso_error_message">Une erreur est survenue pendant le chargement de la page : %1$s (%2$d)</string>
     <string name="login_mode_not_supported">L’application ne peut pas s’authentifier sur ce serveur d’accueil. Le serveur d’accueil prend en charge le(s) type(s) d’authentification suivant(s) : %1$s.
 \n
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
index abeed9287d..9f7299b8b2 100644
--- a/vector/src/main/res/values-he/strings.xml
+++ b/vector/src/main/res/values-he/strings.xml
@@ -1441,7 +1441,6 @@
 \nהאם אתה רוצה להיכנס באמצעות לקוח אינטרנט\?</string>
     <string name="login_sso_error_message">אירעה שגיאה בעת טעינת הדף: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">הזן את כתובת השרת שבו ברצונך להשתמש</string>
-    <string name="login_server_url_form_other_notice">הזן את כתובת השרת או האלמנט שאליו ברצונך להתחבר</string>
     <string name="login_server_url_form_modular_notice">הזן את כתובת האלמנט המודולרי או השרת שבו ברצונך להשתמש</string>
     <string name="login_server_url_form_modular_text">אירוח פרימיום לארגונים</string>
     <string name="login_server_url_form_other_hint">כתובת</string>
diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml
index 566025a7d0..ae1e86433d 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@@ -1233,7 +1233,6 @@
     <string name="login_server_url_form_other_hint">Adresa</string>
     <string name="login_server_url_form_modular_text">Plaćeno gošćenje za organizacije</string>
     <string name="login_server_url_form_modular_notice">Unesite adresu Modular Elementa ili poslužitelja koji želite koristiti</string>
-    <string name="login_server_url_form_other_notice">Unesite adresu poslužitelja ili Elementa na koji se želite spojiti</string>
     <string name="login_sso_error_message">Došlo je do greške pri učitavanju stranice: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikacija se ne može prijaviti na ovog poslužitelja. Poslužitelj podržava sljedeće vrste prijava: %1$s.
 \n
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index e491722d8d..d886194ee8 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1639,7 +1639,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="login_server_url_form_other_hint">Cím</string>
     <string name="login_server_url_form_modular_text">Prémium szerverüzemeltetés szervezetek részére</string>
     <string name="login_server_url_form_modular_notice">Add meg az általad használt Modular szerver, vagy a hozzá tartozó Element címét</string>
-    <string name="login_server_url_form_other_notice">Add meg a szerver vagy Element címét amihez csatlakozni szeretnél</string>
     <string name="login_sso_error_message">Az oldal betöltésekor hiba történt: %1$s (%2$d)</string>
     <string name="login_registration_disabled">Ne haragudj, ez a szerver nem fogad új fiókokat.</string>
     <string name="login_login_with_email_error">Ez az e-mail cím egyik fiókhoz sincs társítva.</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 2a13148bcd..71657131dd 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1769,7 +1769,6 @@
     <string name="login_server_url_form_other_hint">Indirizzo</string>
     <string name="login_server_url_form_modular_text">Hosting premium per organizzazioni</string>
     <string name="login_server_url_form_modular_notice">Inserisci l\'indirizzo del Element Modular o del server che vuoi usare</string>
-    <string name="login_server_url_form_other_notice">Inserisci l\'indirizzo di un server o di un Element a cui vuoi connetterti</string>
     <string name="login_sso_error_message">Si è verificato un errore caricando la pagina: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">L\'applicazione non riesce ad accedere a questo homeserver. L\'homeserver supporta i seguenti tipi di accesso: %1$s.
 \n
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index abeed9287d..9f7299b8b2 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -1441,7 +1441,6 @@
 \nהאם אתה רוצה להיכנס באמצעות לקוח אינטרנט\?</string>
     <string name="login_sso_error_message">אירעה שגיאה בעת טעינת הדף: %1$s (%2$d)</string>
     <string name="login_server_url_form_common_notice">הזן את כתובת השרת שבו ברצונך להשתמש</string>
-    <string name="login_server_url_form_other_notice">הזן את כתובת השרת או האלמנט שאליו ברצונך להתחבר</string>
     <string name="login_server_url_form_modular_notice">הזן את כתובת האלמנט המודולרי או השרת שבו ברצונך להשתמש</string>
     <string name="login_server_url_form_modular_text">אירוח פרימיום לארגונים</string>
     <string name="login_server_url_form_other_hint">כתובת</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 4e6dc67792..cf54619343 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -1975,7 +1975,6 @@
     <string name="login_connect_to_a_custom_server">Qqen aqeddac udmawan</string>
     <string name="login_server_url_form_modular_text">Tanezduɣt n Premium i tkebbaniyin</string>
     <string name="login_server_url_form_modular_notice">Sekcem tansa n Element Modular neɣ n uqeddac i tebɣiḍ ad t-tesqedceḍ</string>
-    <string name="login_server_url_form_other_notice">Sekcem tansa n uqeddac neɣ n Element i tebɣiḍ ad teqqneḍ ɣer-s</string>
     <string name="login_sso_error_message">Tella-d tuccḍa mi ara d-nessalay asebter: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Asnas ur yezmir ara ad yekcem ɣer uqeddac-a agejdan. Aqeddac agejdan yessefrak anaw-a n unekcum: %1$s.
 \n
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 98d324b696..1b1d538fd4 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1281,7 +1281,6 @@
     <string name="room_join_rules_public">%1$s gjorde rommet offentlig for den som kjenner lenken.</string>
     <string name="room_join_rules_public_by_you">Du gjorde rommet offentlig for den som kjenner lenken.</string>
     <string name="login_connect_to_a_custom_server">Koble til en tilpasset server</string>
-    <string name="login_server_url_form_other_notice">Skriv inn adressen til en server eller et Element du vil koble til</string>
     <string name="login_server_url_form_common_notice">Skriv inn adressen til serveren du vil bruke</string>
     <string name="login_reset_password_warning_content">Hvis du endrer passordet, tilbakestilles alle krypteringsnøkler fra ende-til-ende på alle øktene dine, noe som gjør kryptert chatlogg uleselig. Konfigurer sikkerhetskopiering av nøkkel eller eksporter romnøklene fra en annen økt før du tilbakestiller passordet.</string>
     <string name="login_reset_password_success_notice_2">Du er logget ut av alle økter og vil ikke lenger motta push-varsler. Logg på igjen på hver enhet for å aktivere varsler på nytt.</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 982f41b0cc..1edf1a3c9c 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1555,7 +1555,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="login_server_url_form_other_hint">Adres</string>
     <string name="login_server_url_form_modular_text">Hosting premium dla organizacji</string>
     <string name="login_server_url_form_modular_notice">Wprowadź adres Element Modular lub serwera którego chcesz użyć</string>
-    <string name="login_server_url_form_other_notice">Wprowadź adres serwera lub Element z którym chcesz się połączyć</string>
     <string name="login_sso_error_message">Wystąpił błąd podczas ładowania strony: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikacja nie jest w stanie zalogować się do tego serwera domowego. Serwer domowy obsluguje następujące metody logowania: %1$s.
 \n
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index ce104ed847..ddbb39a8b6 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1859,7 +1859,6 @@
     <string name="login_server_url_form_other_hint">Endereço</string>
     <string name="login_server_url_form_modular_text">Hospedagem Premium para organizações</string>
     <string name="login_server_url_form_modular_notice">Digite o endereço de Element Modular ou Servidor que você deseja usar</string>
-    <string name="login_server_url_form_other_notice">Digite o endereço do Servidor ou o servidor do Element que você quer entrar</string>
     <string name="login_server_url_form_common_notice">Digite o endereço do servidor que você deseja usar</string>
     <string name="login_sso_error_message">Ocorreu um erro ao carregar a página: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">O aplicativo não pode entrar neste servidor. O servidor suporta os seguintes tipos de login: %1$s.
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 4a4f4a31ba..3266a039af 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2080,7 +2080,6 @@
     <string name="login_splash_text3">Расширьте и персонализируйте свой опыт использования</string>
     <string name="login_server_matrix_org_text">Присоединяйтесь к миллионам бесплатных на самом большом публичном сервере</string>
     <string name="login_signin_to">Войти в %1$s</string>
-    <string name="login_server_url_form_other_notice">Введите адрес сервера или Element, к которому вы хотите подключиться</string>
     <string name="login_server_url_form_common_notice">Введите адрес сервера, который вы хотите использовать</string>
     <string name="login_reset_password_notice">На ваш почтовый ящик будет отправлено письмо с подтверждением установки нового пароля.</string>
     <string name="login_reset_password_mail_confirmation_submit">Я подтвердил свою электронную почту</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index b170fb9269..127a5cb3cd 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1693,7 +1693,6 @@
     <string name="login_server_url_form_other_hint">Adresë</string>
     <string name="login_server_url_form_modular_text">Strehim me pagesë për ente</string>
     <string name="login_server_url_form_modular_notice">Jepni adresën e Modular Element-it ose Shërbyesit që doni të përdoret</string>
-    <string name="login_server_url_form_other_notice">Jepni adresën e një shërbyesi ose një instance Element me të cilën doni të lidheni</string>
     <string name="login_sso_error_message">Ndodhi një gabim kur ngarkohej faqja: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikacioni s’është në gjendje të bëjë hyrje në llogari në këtë shërbyes Home. Shërbyesi Home mbulon llojet vijuese të hyrjes(ve): %1$s.
 \n
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 70de437eab..a514d3450a 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2033,7 +2033,6 @@
     <string name="login_server_url_form_other_hint">Adress</string>
     <string name="login_server_url_form_modular_text">Premiumservervärd för organisationer</string>
     <string name="login_server_url_form_modular_notice">Skriv in adressen för den Modular Element eller server du vill använda</string>
-    <string name="login_server_url_form_other_notice">Skriv in adressen för en server eller Element du vill ansluta till</string>
     <string name="login_server_url_form_common_notice">Skriv in adressen för servern du vill använda</string>
     <string name="login_sso_error_message">Ett fel inträffade vid laddning av sidan: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Appen kan inte logga in på den här hemservern. Hemservern stöder följande inloggningstyp(er): %1$s.
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 479e3f810f..89223bf9dd 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1714,7 +1714,6 @@
     <string name="login_server_url_form_other_hint">地址</string>
     <string name="login_server_url_form_modular_text">面向组织的高级托管</string>
     <string name="login_server_url_form_modular_notice">输入 Modular Element 或您想使用的服务器地址</string>
-    <string name="login_server_url_form_other_notice">输入您想要连接的服务器或 Element 的地址</string>
     <string name="login_server_url_form_common_notice">输入您想使用的服务器的地址</string>
     <string name="login_sso_error_message">载入页面时出错：%1$s (%2$d)</string>
     <string name="login_mode_not_supported">应用无法登录到此家庭服务器。家庭服务器支持以下登录类型：%1$s。
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 3d2c119da8..96e06d07ef 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1673,7 +1673,6 @@
     <string name="login_server_url_form_other_hint">位置</string>
     <string name="login_server_url_form_modular_text">組織有專業主機</string>
     <string name="login_server_url_form_modular_notice">輸入 Modular Element 或您想要使用的伺服器位置</string>
-    <string name="login_server_url_form_other_notice">輸入您想要連線的伺服器或 Element 的位置</string>
     <string name="login_sso_error_message">載入頁面時發生錯誤：%1$s (%2$d)</string>
     <string name="login_mode_not_supported">應用程式無法登入此家伺服器。家伺服器支援以下登入類型：%1$s。
 \n
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 06f3c037a1..259a63eb99 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2386,7 +2386,6 @@
     <string name="login_server_url_form_other_hint">Address</string>
     <string name="login_server_url_form_modular_text">Premium hosting for organisations</string>
     <string name="login_server_url_form_modular_notice">Enter the address of the Modular Element or Server you want to use</string>
-    <string name="login_server_url_form_other_notice">Enter the address of a server or a Element you want to connect to</string>
     <string name="login_server_url_form_common_notice">Enter the address of the server you want to use</string>
 
     <string name="login_sso_error_message">An error occurred when loading the page: %1$s (%2$d)</string>

From caea19bf381e4055ae593d2a03a6328ae3a60ad3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 17:56:48 +0100
Subject: [PATCH 184/578] Avoid using "element" in the resource id

---
 .../im/vector/app/features/disclaimer/DisclaimerDialog.kt | 4 ++--
 vector/src/main/res/layout/dialog_disclaimer_content.xml  | 4 ++--
 vector/src/main/res/values-bg/strings.xml                 | 8 ++++----
 vector/src/main/res/values-ca/strings.xml                 | 8 ++++----
 vector/src/main/res/values-cs/strings.xml                 | 8 ++++----
 vector/src/main/res/values-de/strings.xml                 | 8 ++++----
 vector/src/main/res/values-eo/strings.xml                 | 8 ++++----
 vector/src/main/res/values-es/strings.xml                 | 8 ++++----
 vector/src/main/res/values-et/strings.xml                 | 8 ++++----
 vector/src/main/res/values-fa/strings.xml                 | 8 ++++----
 vector/src/main/res/values-fr/strings.xml                 | 8 ++++----
 vector/src/main/res/values-he/strings.xml                 | 8 ++++----
 vector/src/main/res/values-hu/strings.xml                 | 8 ++++----
 vector/src/main/res/values-it/strings.xml                 | 8 ++++----
 vector/src/main/res/values-iw/strings.xml                 | 8 ++++----
 vector/src/main/res/values-kab/strings.xml                | 8 ++++----
 vector/src/main/res/values-nb-rNO/strings.xml             | 8 ++++----
 vector/src/main/res/values-pl/strings.xml                 | 8 ++++----
 vector/src/main/res/values-pt-rBR/strings.xml             | 8 ++++----
 vector/src/main/res/values-ru/strings.xml                 | 8 ++++----
 vector/src/main/res/values-sq/strings.xml                 | 8 ++++----
 vector/src/main/res/values-sv/strings.xml                 | 8 ++++----
 vector/src/main/res/values-uk/strings.xml                 | 2 +-
 vector/src/main/res/values-zh-rCN/strings.xml             | 8 ++++----
 vector/src/main/res/values-zh-rTW/strings.xml             | 8 ++++----
 vector/src/main/res/values/strings.xml                    | 8 ++++----
 26 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt b/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
index 028d37ff5f..8ea3365cf9 100644
--- a/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
+++ b/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
@@ -43,8 +43,8 @@ fun showDisclaimerDialog(activity: Activity) {
         AlertDialog.Builder(activity)
                 .setView(dialogLayout)
                 .setCancelable(false)
-                .setNegativeButton(R.string.element_disclaimer_negative_button, null)
-                .setPositiveButton(R.string.element_disclaimer_positive_button) { _, _ ->
+                .setNegativeButton(R.string.disclaimer_negative_button, null)
+                .setPositiveButton(R.string.disclaimer_positive_button) { _, _ ->
                     openUrlInChromeCustomTab(activity, null, VectorSettingsUrls.DISCLAIMER_URL)
                 }
                 .show()
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index e1442f39f4..ca808605d1 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -43,7 +43,7 @@
         android:id="@+id/disclaimerTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/element_disclaimer_title"
+        android:text="@string/disclaimer_title"
         android:textColor="?riotx_text_primary"
         android:textSize="20sp"
         android:textStyle="bold"
@@ -59,7 +59,7 @@
         android:layout_marginEnd="24dp"
         android:gravity="center"
         android:paddingBottom="32dp"
-        android:text="@string/element_disclaimer_content"
+        android:text="@string/disclaimer_content"
         android:textColor="?riotx_text_secondary"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 0288b6faf6..aefdc868db 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -2340,10 +2340,10 @@
     <string name="empty_phone_book">Телефонния указател е празен</string>
     <string name="add_from_phone_book">Добави от телефонния указател</string>
     <string name="save_recovery_key_chooser_hint">Запази ключа за възстановяване в</string>
-    <string name="element_disclaimer_positive_button">НАУЧИ ПОВЕЧЕ</string>
-    <string name="element_disclaimer_negative_button">РАЗБРАХ</string>
-    <string name="element_disclaimer_content">Развълнувани сме да съобщим, че променихме името! Приложението ви е обновено и сте вписани в профила си.</string>
-    <string name="element_disclaimer_title">Riot вече е Element!</string>
+    <string name="disclaimer_positive_button">НАУЧИ ПОВЕЧЕ</string>
+    <string name="disclaimer_negative_button">РАЗБРАХ</string>
+    <string name="disclaimer_content">Развълнувани сме да съобщим, че променихме името! Приложението ви е обновено и сте вписани в профила си.</string>
+    <string name="disclaimer_title">Riot вече е Element!</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Изчакване на история на шифроването</string>
     <string name="crypto_error_withheld_generic">Не можете да достъпите това съобщение, защото изпращача нарочно не е изпратил ключовете за него</string>
     <string name="crypto_error_withheld_unverified">Не можете да достъпите това съобщение, защото изпращача не се доверява на сесията ви</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index d48de4ba3d..850ef255bf 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -2455,8 +2455,8 @@
     </plurals>
     <string name="phone_book_perform_lookup">Busca contactes a Matrix</string>
     <string name="search_in_my_contacts">Busca als meus contactes</string>
-    <string name="element_disclaimer_positive_button">MÉS INFORMACIÓ</string>
-    <string name="element_disclaimer_title">Riot ara és Element!</string>
+    <string name="disclaimer_positive_button">MÉS INFORMACIÓ</string>
+    <string name="disclaimer_title">Riot ara és Element!</string>
     <string name="crypto_error_withheld_generic">No pots accedir al missatge perquè el remitent, intencionadament, no ha enviat les claus</string>
     <string name="crypto_error_withheld_unverified">No pots accedir al missatge perquè la teva sessió no és de confiança pel remitent</string>
     <string name="crypto_error_withheld_blacklisted">No pots accedir al missatge perquè el remitent t\'ha bloquejat</string>
@@ -2604,8 +2604,8 @@
     <string name="phone_book_title">Agenda</string>
     <string name="empty_contact_book">La teva llista de contactes està buida</string>
     <string name="loading_contact_book">Obtenint contactes…</string>
-    <string name="element_disclaimer_negative_button">D\'ACORD</string>
-    <string name="element_disclaimer_content">Estem contents d\'anunciar que hem canviat de nom! L\'aplicació està actualitzada i s\'ha iniciat sessió amb el teu compte.</string>
+    <string name="disclaimer_negative_button">D\'ACORD</string>
+    <string name="disclaimer_content">Estem contents d\'anunciar que hem canviat de nom! L\'aplicació està actualitzada i s\'ha iniciat sessió amb el teu compte.</string>
     <string name="save_your_security_key_title">Desa la clau de seguretat</string>
     <string name="set_a_security_phrase_again_notice">Torna a introduir la frase de seguretat per a confirmar-la.</string>
     <string name="set_a_security_phrase_hint">Frase de seguretat</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index ce59227221..4c2e939948 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2371,10 +2371,10 @@
     <string name="crypto_error_withheld_unverified">Nemůžete číst tuto zprávu, protože Vaše relace není pro odesílatele důvěryhodná</string>
     <string name="crypto_error_withheld_generic">Nemůžete číst tuto zprávu, protože odesílatel účelově neposlal klíče</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Čekám na historii šifrování</string>
-    <string name="element_disclaimer_title">Riot je nyní Element!</string>
-    <string name="element_disclaimer_content">Jsme nadšení, že smíme oznámit změnu jména! Vaše app je aktuální a jste přihlášeni do svého účtu.</string>
-    <string name="element_disclaimer_negative_button">ROZUMÍM</string>
-    <string name="element_disclaimer_positive_button">DOZVĚDĚT SE VÍCE</string>
+    <string name="disclaimer_title">Riot je nyní Element!</string>
+    <string name="disclaimer_content">Jsme nadšení, že smíme oznámit změnu jména! Vaše app je aktuální a jste přihlášeni do svého účtu.</string>
+    <string name="disclaimer_negative_button">ROZUMÍM</string>
+    <string name="disclaimer_positive_button">DOZVĚDĚT SE VÍCE</string>
     <string name="save_recovery_key_chooser_hint">Uložit klíče pro obnovu v</string>
     <string name="add_from_phone_book">Přidat z mého adresáře</string>
     <string name="empty_phone_book">Váš adresář je prázdný</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 5799625fe2..e8a3dad24a 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2352,10 +2352,10 @@
     <string name="crypto_error_withheld_unverified">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender deiner Sitzung nicht vertraut</string>
     <string name="crypto_error_withheld_generic">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender absichtlich die Schlüssel nicht gesendet hat</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Warte auf Verschlüsselungshistorie</string>
-    <string name="element_disclaimer_title">Riot heißt nun Element!</string>
-    <string name="element_disclaimer_content">Wir sind begeistert unsere Namensänderung mitteilen zu können! Deine App ist auf dem neusten Stand und du bist mit deinem Account angemeldet.</string>
-    <string name="element_disclaimer_negative_button">VERSTANDEN</string>
-    <string name="element_disclaimer_positive_button">MEHR ERFAHREN</string>
+    <string name="disclaimer_title">Riot heißt nun Element!</string>
+    <string name="disclaimer_content">Wir sind begeistert unsere Namensänderung mitteilen zu können! Deine App ist auf dem neusten Stand und du bist mit deinem Account angemeldet.</string>
+    <string name="disclaimer_negative_button">VERSTANDEN</string>
+    <string name="disclaimer_positive_button">MEHR ERFAHREN</string>
     <string name="save_recovery_key_chooser_hint">Speichere Wiederherstellungsschlüssel in</string>
     <string name="add_from_phone_book">Füge über Kontaktliste hinzu</string>
     <string name="empty_phone_book">Deine Kontaktliste ist leer</string>
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index b5c06a9dff..a872468f42 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -2054,10 +2054,10 @@
     <string name="phone_book_title">Adresaro</string>
     <string name="empty_phone_book">Via adresaro malplenas</string>
     <string name="add_from_phone_book">Aldoni per mia adresaro</string>
-    <string name="element_disclaimer_positive_button">EKSCIU PLION</string>
-    <string name="element_disclaimer_negative_button">KOMPRENITE</string>
-    <string name="element_disclaimer_content">Ni ĝojas anonci, ke ni ŝanĝis nian nomon! Via aplikaĵo estas ĝisdata kaj vi estas salutinta vian konton.</string>
-    <string name="element_disclaimer_title">Riot nun estas Element!</string>
+    <string name="disclaimer_positive_button">EKSCIU PLION</string>
+    <string name="disclaimer_negative_button">KOMPRENITE</string>
+    <string name="disclaimer_content">Ni ĝojas anonci, ke ni ŝanĝis nian nomon! Via aplikaĵo estas ĝisdata kaj vi estas salutinta vian konton.</string>
+    <string name="disclaimer_title">Riot nun estas Element!</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Atendante historion de ĉifrado</string>
     <string name="crypto_error_withheld_generic">Vi ne povas aliri ĉi tiun mesaĝon, ĉar la sendinto intence ne sendis la ŝlosilojn</string>
     <string name="crypto_error_withheld_unverified">Vi ne povas aliri ĉi tiun mesaĝon ĉar la sendinto ne fidas vian salutaĵon</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index e091b26af8..ea0f5d74e1 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1829,9 +1829,9 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="template_identity_server_error_outdated_identity_server">Servidor de identidad desactualizado. ${app_name} solo soporta API V2.</string>
     <string name="identity_server_error_outdated_home_server">Operación no posible. Servidor desactualizado.</string>
     <string name="identity_server_error_no_identity_server_configured">Por favor, configure primero un Servidor de Identidad.</string>
-    <string name="element_disclaimer_title">Riot ahora es Element!</string>
-    <string name="element_disclaimer_negative_button">Entendido</string>
-    <string name="element_disclaimer_positive_button">Aprender Mas</string>
+    <string name="disclaimer_title">Riot ahora es Element!</string>
+    <string name="disclaimer_negative_button">Entendido</string>
+    <string name="disclaimer_positive_button">Aprender Mas</string>
     <string name="search_in_my_contacts">Buscar en mis contactos</string>
     <string name="three_pid_revoke_invite_dialog_title">Rechazar invitación</string>
     <string name="auth_pin_confirm_to_disable_title">Confirma PIN para desabilitarlo</string>
@@ -2406,7 +2406,7 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="crypto_error_withheld_unverified">No puede acceder a este mensaje porque el remitente no confía en su sesión</string>
     <string name="crypto_error_withheld_generic">No puede acceder a este mensaje porque el remitente no envió las claves a propósito</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Esperando al historial de encriptación</string>
-    <string name="element_disclaimer_content">¡Nos complace anunciar que hemos cambiado de nombre! Tu aplicación está actualizada y accediste a tu cuenta.</string>
+    <string name="disclaimer_content">¡Nos complace anunciar que hemos cambiado de nombre! Tu aplicación está actualizada y accediste a tu cuenta.</string>
     <string name="save_recovery_key_chooser_hint">Guardar la clave de recuperación en</string>
     <string name="add_from_phone_book">Agregar desde mi directorio telefónico</string>
     <string name="empty_phone_book">Tu directorio telefónico está vacío</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 0d2ccbb113..3570b18368 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2017,10 +2017,10 @@
     <string name="crypto_error_withheld_unverified">Sa ei saa seda sõnumit lugeda, kuna saatja ei usalda sinu sessiooni</string>
     <string name="crypto_error_withheld_generic">Sa ei saa seda sõnumit lugeda, kuna saatja teadlikult ei saatnud vajalikke võtmeid</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Ootan krüptimise ajalugu</string>
-    <string name="element_disclaimer_title">Riot\'i uus nimi on Element!</string>
-    <string name="element_disclaimer_content">Meil on hea meel teatada, et oleme muutnud nime! Sinu rakendus on uuendatud ning sa oled oma kontole sisse logitud.</string>
-    <string name="element_disclaimer_negative_button">Selge lugu</string>
-    <string name="element_disclaimer_positive_button">Vaata lisateavet</string>
+    <string name="disclaimer_title">Riot\'i uus nimi on Element!</string>
+    <string name="disclaimer_content">Meil on hea meel teatada, et oleme muutnud nime! Sinu rakendus on uuendatud ning sa oled oma kontole sisse logitud.</string>
+    <string name="disclaimer_negative_button">Selge lugu</string>
+    <string name="disclaimer_positive_button">Vaata lisateavet</string>
     <string name="save_recovery_key_chooser_hint">Salvesta taastevõti järgnevalt</string>
     <string name="add_from_phone_book">Lisa telefoniraamatust</string>
     <string name="empty_phone_book">Sinu telefoniraamat on tühi</string>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index b4a912bf66..98775c2481 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1536,8 +1536,8 @@
     <string name="bottom_sheet_setup_secure_backup_subtitle">سپرامنیتی در برابر از دست دادن دسترسی به داده‌ها و پیام‌های رمزشده با پشتیبان گیری از کلیدها روی کارسازتان.</string>
     <string name="room_settings_name_hint">نام اتاق</string>
     <string name="room_settings_topic_hint">موضوع</string>
-    <string name="element_disclaimer_negative_button">گرفتم</string>
-    <string name="element_disclaimer_positive_button">اطّلاعات بیش‌تر</string>
+    <string name="disclaimer_negative_button">گرفتم</string>
+    <string name="disclaimer_positive_button">اطّلاعات بیش‌تر</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">هشدارهای نشانی اصلی</string>
     <string name="encryption_information_sender_device_information">اطّلاعات نشست فرستنده</string>
     <string name="encryption_information_decryption_error">خطای رمزگشایی</string>
@@ -1624,8 +1624,8 @@
     <string name="identity_server_set_alternative_submit">ثبت</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">استفاده از یک کلید امنیتی</string>
     <string name="bottom_sheet_setup_secure_backup_submit">برپا سازی</string>
-    <string name="element_disclaimer_content">مشتاقیم اعلام کنیم که ناممان را عوض کردیم! کاره‌تان به‌روز شده و وارد حسابتان شده‌اید.</string>
-    <string name="element_disclaimer_title">ریوت اکنون المنت است!</string>
+    <string name="disclaimer_content">مشتاقیم اعلام کنیم که ناممان را عوض کردیم! کاره‌تان به‌روز شده و وارد حسابتان شده‌اید.</string>
+    <string name="disclaimer_title">ریوت اکنون المنت است!</string>
     <string name="notice_crypto_unable_to_decrypt_merged">در انتظار تاریخچهٔ رمزنگاری</string>
     <string name="crypto_error_withheld_generic">به خاطر این که فرستنده از قصد کلیدها را نفرستاده است، نمی‌توانید به این پیام دسترسی داشته باشید</string>
     <string name="crypto_error_withheld_unverified">به خاطر این که نشستتان به دست فرستنده مطمئن نیست، نمی‌توانید به این پیام دسترسی داشته باشید</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 8b6a1d4925..caba64816a 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2211,10 +2211,10 @@
     <string name="empty_phone_book">Votre carnet d\'adresses est vide</string>
     <string name="add_from_phone_book">Ajouter depuis mon carnet d\'adresses</string>
     <string name="save_recovery_key_chooser_hint">Enregistrer la clé de récupération</string>
-    <string name="element_disclaimer_positive_button">EN SAVOIR PLUS</string>
-    <string name="element_disclaimer_negative_button">COMPRIS</string>
-    <string name="element_disclaimer_content">Nous sommes heureux de vous annoncer que nous avons un nouveau nom ! Votre application est à jour et vous êtes connectés à votre compte.</string>
-    <string name="element_disclaimer_title">Riot est maintenant Element !</string>
+    <string name="disclaimer_positive_button">EN SAVOIR PLUS</string>
+    <string name="disclaimer_negative_button">COMPRIS</string>
+    <string name="disclaimer_content">Nous sommes heureux de vous annoncer que nous avons un nouveau nom ! Votre application est à jour et vous êtes connectés à votre compte.</string>
+    <string name="disclaimer_title">Riot est maintenant Element !</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Attente de l\'historique du chiffrement</string>
     <string name="crypto_error_withheld_generic">Impossible d\'accéder à ce message car l\'envoyeur n\'a intentionnellement pas envoyé les clés</string>
     <string name="crypto_error_withheld_unverified">Vous ne pouvez pas accéder à ce message car l\'envoyeur n\'a pas confiance en votre session</string>
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
index 9f7299b8b2..c477b5c147 100644
--- a/vector/src/main/res/values-he/strings.xml
+++ b/vector/src/main/res/values-he/strings.xml
@@ -2281,10 +2281,10 @@
     <string name="empty_phone_book">ספר הטלפונים שלך ריק</string>
     <string name="add_from_phone_book">הוסף מפנקס הטלפונים שלי</string>
     <string name="save_recovery_key_chooser_hint">שמור מפתח שחזור פנימה</string>
-    <string name="element_disclaimer_positive_button">למד עוד</string>
-    <string name="element_disclaimer_negative_button">הבנת</string>
-    <string name="element_disclaimer_content">אנו שמחים לבשר ששינינו שם! האפליקציה שלך מעודכנת ואתה מחובר לחשבונך.</string>
-    <string name="element_disclaimer_title">Riot היא עכשיו Element!</string>
+    <string name="disclaimer_positive_button">למד עוד</string>
+    <string name="disclaimer_negative_button">הבנת</string>
+    <string name="disclaimer_content">אנו שמחים לבשר ששינינו שם! האפליקציה שלך מעודכנת ואתה מחובר לחשבונך.</string>
+    <string name="disclaimer_title">Riot היא עכשיו Element!</string>
     <string name="notice_crypto_unable_to_decrypt_merged">ממתין להיסטוריית הצפנה</string>
     <string name="crypto_error_withheld_generic">אינך יכול לגשת להודעה זו מכיוון שהשולח בכוונה לא שלח את המפתחות</string>
     <string name="crypto_error_withheld_unverified">אינך יכול לגשת להודעה זו מכיוון שהשולח אינו מהימן על ההפעלה שלך</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index d886194ee8..0c6558bcc9 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2246,10 +2246,10 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="crypto_error_withheld_unverified">Nem érheted el ezt az üzenetet, mert a feladó nem bízik a munkamenetedben</string>
     <string name="crypto_error_withheld_generic">Nem érheted el ezt az üzenetet, mert a feladó szándékosan nem küldte el a kulcsokat</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Várakozás a titkosítási előzményekre</string>
-    <string name="element_disclaimer_title">A Riot mostantól Element!</string>
-    <string name="element_disclaimer_content">Örömmel jelentjük be, hogy nevet változtattunk! Az alkalmazás naprakész, és be vagy jelentkezve a fiókodba.</string>
-    <string name="element_disclaimer_negative_button">ÉRTEM</string>
-    <string name="element_disclaimer_positive_button">TOVÁBBI INFORMÁCIÓK</string>
+    <string name="disclaimer_title">A Riot mostantól Element!</string>
+    <string name="disclaimer_content">Örömmel jelentjük be, hogy nevet változtattunk! Az alkalmazás naprakész, és be vagy jelentkezve a fiókodba.</string>
+    <string name="disclaimer_negative_button">ÉRTEM</string>
+    <string name="disclaimer_positive_button">TOVÁBBI INFORMÁCIÓK</string>
     <string name="save_recovery_key_chooser_hint">Helyreállítási kulcs mentése ide:</string>
     <string name="add_from_phone_book">Hozzáadás a telefonkönyvemből</string>
     <string name="empty_phone_book">A telefonkönyved üres</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 71657131dd..3eaa8bdd51 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2352,10 +2352,10 @@
     <string name="crypto_error_withheld_unverified">Non puoi accedere a questo messaggio perché la tua sessione non è fidata dal mittente</string>
     <string name="crypto_error_withheld_generic">Non puoi accedere a questo messaggio perché il mittente non ha inviato le chiavi di proposito</string>
     <string name="notice_crypto_unable_to_decrypt_merged">In attesa della cronologia di crittografia</string>
-    <string name="element_disclaimer_title">Riot ora si chiama Element!</string>
-    <string name="element_disclaimer_content">Siamo entusiasti di annunciare che abbiamo cambiato nome! La tua app è aggiornata e hai fatto l\'accesso al tuo account.</string>
-    <string name="element_disclaimer_negative_button">CAPITO</string>
-    <string name="element_disclaimer_positive_button">MAGGIORI INFO</string>
+    <string name="disclaimer_title">Riot ora si chiama Element!</string>
+    <string name="disclaimer_content">Siamo entusiasti di annunciare che abbiamo cambiato nome! La tua app è aggiornata e hai fatto l\'accesso al tuo account.</string>
+    <string name="disclaimer_negative_button">CAPITO</string>
+    <string name="disclaimer_positive_button">MAGGIORI INFO</string>
     <string name="save_recovery_key_chooser_hint">Salva chiave di ripristino in</string>
     <string name="add_from_phone_book">Aggiungi dalla mia rubrica</string>
     <string name="empty_phone_book">La tua rubrica è vuota</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index 9f7299b8b2..c477b5c147 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -2281,10 +2281,10 @@
     <string name="empty_phone_book">ספר הטלפונים שלך ריק</string>
     <string name="add_from_phone_book">הוסף מפנקס הטלפונים שלי</string>
     <string name="save_recovery_key_chooser_hint">שמור מפתח שחזור פנימה</string>
-    <string name="element_disclaimer_positive_button">למד עוד</string>
-    <string name="element_disclaimer_negative_button">הבנת</string>
-    <string name="element_disclaimer_content">אנו שמחים לבשר ששינינו שם! האפליקציה שלך מעודכנת ואתה מחובר לחשבונך.</string>
-    <string name="element_disclaimer_title">Riot היא עכשיו Element!</string>
+    <string name="disclaimer_positive_button">למד עוד</string>
+    <string name="disclaimer_negative_button">הבנת</string>
+    <string name="disclaimer_content">אנו שמחים לבשר ששינינו שם! האפליקציה שלך מעודכנת ואתה מחובר לחשבונך.</string>
+    <string name="disclaimer_title">Riot היא עכשיו Element!</string>
     <string name="notice_crypto_unable_to_decrypt_merged">ממתין להיסטוריית הצפנה</string>
     <string name="crypto_error_withheld_generic">אינך יכול לגשת להודעה זו מכיוון שהשולח בכוונה לא שלח את המפתחות</string>
     <string name="crypto_error_withheld_unverified">אינך יכול לגשת להודעה זו מכיוון שהשולח אינו מהימן על ההפעלה שלך</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index cf54619343..8725bb9f91 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -600,7 +600,7 @@
     <string name="set_a_security_phrase_title">Sbadu tafyirt taɣelsant</string>
     <string name="save_your_security_key_title">Sekles tasarut-ik·im n tɣellist</string>
     <string name="room_settings_name_hint">Isem n texxamt</string>
-    <string name="element_disclaimer_title">Tura, Riot d aferdis!</string>
+    <string name="disclaimer_title">Tura, Riot d aferdis!</string>
     <string name="three_pid_revoke_invite_dialog_title">Sefesex tinnubga</string>
     <string name="notification_sync_in_progress">Amtawi…</string>
     <string name="notification_listening_for_events">Timesliwt i yineḍruyen</string>
@@ -949,8 +949,8 @@
     <string name="set_a_security_phrase_hint">Tafyirt n tɣellist</string>
     <string name="room_settings_topic_hint">Asentel</string>
     <string name="crypto_utd">Ur yezmir ara ad yekkes awgelhen</string>
-    <string name="element_disclaimer_negative_button">AWI-T</string>
-    <string name="element_disclaimer_positive_button">ISSIN UGAR</string>
+    <string name="disclaimer_negative_button">AWI-T</string>
+    <string name="disclaimer_positive_button">ISSIN UGAR</string>
     <string name="save_recovery_key_chooser_hint">Sekles tasarut n tririt deg</string>
     <string name="add_from_phone_book">Rnu seg yidles n tiliɣri</string>
     <string name="empty_phone_book">Idles-ik·im n tiliɣri d ilem</string>
@@ -1305,7 +1305,7 @@
     <string name="crypto_error_withheld_blacklisted">Ur tezmireḍ ara ad tkecmeḍ ɣer yizen-a acku tettusweḥleḍ sɣur amazan</string>
     <string name="crypto_error_withheld_unverified">Ur tezmireḍ ara ad tkecmeḍ ɣer yizen-a acku tiɣimit-ik·im ur tt-yeḍmin ara umazan</string>
     <string name="crypto_error_withheld_generic">Ur tezmire ara ad tkecmeḍ ɣer yizen-a acku amazan iɛemmed ur d-yuzin ara tisura</string>
-    <string name="element_disclaimer_content">S tumert meqqren ara ak-d-nini nbeddel isem! Asnas-ik·im yettwaleqqem, ha-t-an tkecmeḍ ɣer umiḍan-ik·im.</string>
+    <string name="disclaimer_content">S tumert meqqren ara ak-d-nini nbeddel isem! Asnas-ik·im yettwaleqqem, ha-t-an tkecmeḍ ɣer umiḍan-ik·im.</string>
     <string name="auth_msisdn_already_defined">Uṭṭun-a n tilifun yettusbadu yakan.</string>
     <string name="auth_reset_password_success_message">Awal-ik·im uffir yettuwennez.
 \n
diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 1b1d538fd4..a4fd61011d 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -850,8 +850,8 @@
     <string name="room_settings_name_hint">Rommets navn</string>
     <string name="room_settings_topic_hint">Emne</string>
     <string name="crypto_utd">Kan ikke dekryptere</string>
-    <string name="element_disclaimer_negative_button">SKJØNNER</string>
-    <string name="element_disclaimer_positive_button">LÆR MER</string>
+    <string name="disclaimer_negative_button">SKJØNNER</string>
+    <string name="disclaimer_positive_button">LÆR MER</string>
     <string name="empty_phone_book">Telefonkatalogen din er tom</string>
     <string name="phone_book_title">Telefonkatalog</string>
     <string name="search_in_my_contacts">Søk i mine kontakter</string>
@@ -921,8 +921,8 @@
     <string name="crypto_error_withheld_unverified">Du får ikke tilgang til denne meldingen fordi økten ikke er klarert av avsenderen</string>
     <string name="crypto_error_withheld_generic">Du får ikke tilgang til denne meldingen fordi avsenderen med vilje ikke sendte nøklene</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Venter på krypteringshistorikk</string>
-    <string name="element_disclaimer_title">Riot er nå Element!</string>
-    <string name="element_disclaimer_content">Vi er glade for å kunngjøre at vi har byttet navn! Appen din er oppdatert, og du er logget på kontoen din.</string>
+    <string name="disclaimer_title">Riot er nå Element!</string>
+    <string name="disclaimer_content">Vi er glade for å kunngjøre at vi har byttet navn! Appen din er oppdatert, og du er logget på kontoen din.</string>
     <string name="save_recovery_key_chooser_hint">Lagre gjenopprettingsnøkkel i</string>
     <string name="loading_contact_book">Henter kontaktene dine…</string>
     <string name="empty_contact_book">Kontaktboken din er tom</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 1edf1a3c9c..02547d02b1 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1905,9 +1905,9 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="empty_phone_book">Twoja książka telefoniczna jest pusta</string>
     <string name="add_from_phone_book">Dodaj z mojej książki telefonicznej</string>
     <string name="save_recovery_key_chooser_hint">Zapisz klucz odzyskiwania w</string>
-    <string name="element_disclaimer_positive_button">DOWIEDZ SIĘ WIĘCEJ</string>
-    <string name="element_disclaimer_content">Jesteśmy podekscytowani mogąc oznajmić, że zmieniliśmy nazwę! Twoja aplikacja jest aktualna i jesteś zalogowany(-a) do swojego konta.</string>
-    <string name="element_disclaimer_title">Riot nazywa się teraz Element!</string>
+    <string name="disclaimer_positive_button">DOWIEDZ SIĘ WIĘCEJ</string>
+    <string name="disclaimer_content">Jesteśmy podekscytowani mogąc oznajmić, że zmieniliśmy nazwę! Twoja aplikacja jest aktualna i jesteś zalogowany(-a) do swojego konta.</string>
+    <string name="disclaimer_title">Riot nazywa się teraz Element!</string>
     <string name="crypto_error_withheld_generic">Nie masz dostępu do tej wiadomości ponieważ nadawca celowo nie wysłał jej kluczy</string>
     <string name="crypto_error_withheld_unverified">Nie masz dostępu do tej wiadomości ponieważ nadawca nie ufa Twojej sesji</string>
     <string name="crypto_error_withheld_blacklisted">Nie masz dostępu do tej wiadomości ponieważ zostałeś zablokowany przez jej nadawcę</string>
@@ -2268,7 +2268,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="bootstrap_save_key_description">Wykorzystaj ten %1$s jako zabezpieczenie na wypadek utraty %2$s.</string>
     <string name="bootstrap_loading_title">Konfigurowanie odzyskiwania.</string>
     <string name="verify_cancel_other">Nie zweryfikujesz %1$s (%2$s) jeżeli przerwiesz w tym momencie. Zacznij ponownie w ich profilu użytkownika.</string>
-    <string name="element_disclaimer_negative_button">ROZUMIEM</string>
+    <string name="disclaimer_negative_button">ROZUMIEM</string>
     <string name="save_your_security_key_title">Zapisz swój Klucz Bezpieczeństwa</string>
     <string name="set_a_security_phrase_hint">Fraza Bezpieczeństwa</string>
     <string name="set_a_security_phrase_title">Ustaw Frazę Bezpieczeństwa</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index ddbb39a8b6..d6745b5e86 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2359,10 +2359,10 @@
     <string name="crypto_error_withheld_unverified">Você não pode acessar esta mensagem porque a sessão não foi definida como confiável pelo remetente</string>
     <string name="crypto_error_withheld_generic">Você não pode acessar esta mensagem porque o remetente intencionalmente não enviou as chaves</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Aguardando o histórico de criptografia</string>
-    <string name="element_disclaimer_title">Riot agora é Element!</string>
-    <string name="element_disclaimer_content">Estamos felizes em anunciar que mudamos de nome! Seu aplicativo está atualizado e você está conectado à sua conta.</string>
-    <string name="element_disclaimer_negative_button">OK, ENTENDI</string>
-    <string name="element_disclaimer_positive_button">APRENDA MAIS</string>
+    <string name="disclaimer_title">Riot agora é Element!</string>
+    <string name="disclaimer_content">Estamos felizes em anunciar que mudamos de nome! Seu aplicativo está atualizado e você está conectado à sua conta.</string>
+    <string name="disclaimer_negative_button">OK, ENTENDI</string>
+    <string name="disclaimer_positive_button">APRENDA MAIS</string>
     <string name="save_recovery_key_chooser_hint">Salvar chave de recuperação em</string>
     <string name="add_from_phone_book">Adicionar da minha lista de contatos</string>
     <string name="empty_phone_book">Sua lista de contatos está vazia</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 3266a039af..e2e81e13f6 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2424,10 +2424,10 @@
     <string name="crypto_error_withheld_unverified">Нет доступа к этому сообщению, так как отправитель не доверяет вашей сессии</string>
     <string name="crypto_error_withheld_generic">Вы не можете получить доступ к этому сообщению, потому что отправитель намеренно не отправил ключи</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Ожидание истории шифрования</string>
-    <string name="element_disclaimer_title">Riot теперь Element!</string>
-    <string name="element_disclaimer_content">Мы рады сообщить, что сменили имя! Ваше приложение обновлено, и вы вошли в свою учетную запись.</string>
-    <string name="element_disclaimer_negative_button">ПОНЯТНО</string>
-    <string name="element_disclaimer_positive_button">УЗНАТЬ БОЛЬШЕ</string>
+    <string name="disclaimer_title">Riot теперь Element!</string>
+    <string name="disclaimer_content">Мы рады сообщить, что сменили имя! Ваше приложение обновлено, и вы вошли в свою учетную запись.</string>
+    <string name="disclaimer_negative_button">ПОНЯТНО</string>
+    <string name="disclaimer_positive_button">УЗНАТЬ БОЛЬШЕ</string>
     <string name="save_recovery_key_chooser_hint">Сохранить ключ восстановления в</string>
     <string name="add_from_phone_book">Добавить из моей телефонной книги</string>
     <string name="empty_phone_book">Ваша телефонная книга пуста</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 127a5cb3cd..03045e3885 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2329,10 +2329,10 @@
     <string name="crypto_error_withheld_unverified">S’mund të hapni këtë mesazh, ngaqë sesionit tuaj nuk i zihet besë nga dërguesi</string>
     <string name="crypto_error_withheld_generic">S’mund ta hapni këtë mesazh, ngaqë dërguesi qëllimisht nuk ju dërgoi kyçet</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Po pritet për historik fshehtëzimesh</string>
-    <string name="element_disclaimer_title">Riot-i tanimë quhet Element!</string>
-    <string name="element_disclaimer_content">Jemi të ngazëllyer t’ju njoftojmë se kemi ndërruar emër! Aplikacioni juaj është i përditësuar dhe jeni i futur në llogarinë tuaj.</string>
-    <string name="element_disclaimer_negative_button">E MORA VESH</string>
-    <string name="element_disclaimer_positive_button">MËSONI MË TEPËR</string>
+    <string name="disclaimer_title">Riot-i tanimë quhet Element!</string>
+    <string name="disclaimer_content">Jemi të ngazëllyer t’ju njoftojmë se kemi ndërruar emër! Aplikacioni juaj është i përditësuar dhe jeni i futur në llogarinë tuaj.</string>
+    <string name="disclaimer_negative_button">E MORA VESH</string>
+    <string name="disclaimer_positive_button">MËSONI MË TEPËR</string>
     <string name="save_recovery_key_chooser_hint">Ruaje kyçin e rimarrjeve te</string>
     <string name="add_from_phone_book">Shto prej numëratorit tim telefonik</string>
     <string name="empty_phone_book">Numëratori juaj telefonik është i zbrazët</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index a514d3450a..a750521f9b 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2316,10 +2316,10 @@
     <string name="room_settings_save_success">Du ändrade rumsinställningarna framgångsrikt</string>
     <string name="crypto_utd">Kan inte avkryptera</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Väntar på krypteringshistorik</string>
-    <string name="element_disclaimer_title">Riot är nu Element!</string>
-    <string name="element_disclaimer_content">Vi är glada att meddela att vi har bytt namn! Din app är uppdaterad och du är inloggad på ditt konto.</string>
-    <string name="element_disclaimer_negative_button">UPPFATTAT</string>
-    <string name="element_disclaimer_positive_button">LÄR DIG MER</string>
+    <string name="disclaimer_title">Riot är nu Element!</string>
+    <string name="disclaimer_content">Vi är glada att meddela att vi har bytt namn! Din app är uppdaterad och du är inloggad på ditt konto.</string>
+    <string name="disclaimer_negative_button">UPPFATTAT</string>
+    <string name="disclaimer_positive_button">LÄR DIG MER</string>
     <string name="save_recovery_key_chooser_hint">Spara återställningsnyckel i</string>
     <string name="add_from_phone_book">Lägg till från min telefonbok</string>
     <string name="empty_phone_book">Din telefonbok är tom</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 1ae0223a8a..09aafac703 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -1316,7 +1316,7 @@
     <string name="login_server_modular_learn_more">Дізнатись більше</string>
     <string name="room_profile_section_security">Безпека</string>
     <string name="settings_security_and_privacy">Безпека та приватність</string>
-    <string name="element_disclaimer_content">Ми раді повідомити, що змінили назву! Ваш застосунок оновлено й ви ввійшли у свій обліковий запис.</string>
+    <string name="disclaimer_content">Ми раді повідомити, що змінили назву! Ваш застосунок оновлено й ви ввійшли у свій обліковий запис.</string>
     <string name="login_reset_password_cancel_confirmation_content">Зміну параля ще не завершено.
 \n
 \nЗупинити змінювання пароля\?</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 89223bf9dd..92f6c849ef 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2210,10 +2210,10 @@
     <string name="crypto_error_withheld_unverified">您无法访问此消息因为您的会话不被发送者信任</string>
     <string name="crypto_error_withheld_generic">您无法访问此消息因为发送者有意不发送密钥</string>
     <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密历史</string>
-    <string name="element_disclaimer_title">Riot 现在是 Element！</string>
-    <string name="element_disclaimer_content">我们兴奋地宣布我们改名了！您的应用已经是最新的并且您已登入您的帐户。</string>
-    <string name="element_disclaimer_negative_button">明白了</string>
-    <string name="element_disclaimer_positive_button">了解更多</string>
+    <string name="disclaimer_title">Riot 现在是 Element！</string>
+    <string name="disclaimer_content">我们兴奋地宣布我们改名了！您的应用已经是最新的并且您已登入您的帐户。</string>
+    <string name="disclaimer_negative_button">明白了</string>
+    <string name="disclaimer_positive_button">了解更多</string>
     <string name="save_recovery_key_chooser_hint">将恢复密钥保存到</string>
     <string name="add_from_phone_book">从我的电话簿添加</string>
     <string name="empty_phone_book">您的电话簿是空的</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 96e06d07ef..f67585eb1e 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2248,10 +2248,10 @@
     <string name="crypto_error_withheld_unverified">您無法存取此訊息，因為您的工作階段未被傳送者所信任</string>
     <string name="crypto_error_withheld_generic">您無法存取此訊息，因為傳送者刻意未傳送金鑰</string>
     <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密歷史</string>
-    <string name="element_disclaimer_title">Riot 現在是 Element 了！</string>
-    <string name="element_disclaimer_content">我們很高興地我們已變更名稱！您的應用程式是最新的，而您也登入了您的帳號。</string>
-    <string name="element_disclaimer_negative_button">知道了</string>
-    <string name="element_disclaimer_positive_button">取得更多資訊</string>
+    <string name="disclaimer_title">Riot 現在是 Element 了！</string>
+    <string name="disclaimer_content">我們很高興地我們已變更名稱！您的應用程式是最新的，而您也登入了您的帳號。</string>
+    <string name="disclaimer_negative_button">知道了</string>
+    <string name="disclaimer_positive_button">取得更多資訊</string>
     <string name="save_recovery_key_chooser_hint">儲存復原金鑰於</string>
     <string name="add_from_phone_book">從我的電話簿新增</string>
     <string name="empty_phone_book">您的電話簿是空的</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 259a63eb99..a741997393 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3084,10 +3084,10 @@
     <string name="crypto_error_withheld_generic">You cannot access this message because the sender purposely did not send the keys</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Waiting for encryption history</string>
 
-    <string name="element_disclaimer_title">Riot is now Element!</string>
-    <string name="element_disclaimer_content">We’re excited to announce we’ve changed name! Your app is up to date and you’re signed in to your account.</string>
-    <string name="element_disclaimer_negative_button">GOT IT</string>
-    <string name="element_disclaimer_positive_button">LEARN MORE</string>
+    <string name="disclaimer_title">Riot is now Element!</string>
+    <string name="disclaimer_content">We’re excited to announce we’ve changed name! Your app is up to date and you’re signed in to your account.</string>
+    <string name="disclaimer_negative_button">GOT IT</string>
+    <string name="disclaimer_positive_button">LEARN MORE</string>
 
     <string name="save_recovery_key_chooser_hint">Save recovery key in</string>
 

From 035c10364db5ec15916f37b006287283b4e07bb0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 17:58:28 +0100
Subject: [PATCH 185/578] Template for not translatable string

---
 vector/src/main/res/values/donottranslate.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index ccafa41c9b..d22391ed8c 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -12,6 +12,6 @@
     <string name="matrix_room_alias_prefix" translatable="false">#</string>
 
     <!-- Temporary string -->
-    <string name="not_implemented" translatable="false">Not implemented yet in Element</string>
+    <string name="template_not_implemented" translatable="false">Not implemented yet in ${app_name}</string>
 
 </resources>

From 7eec98ea23cf36cb0dd77a9ba210e1f56ff62b56 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 18:08:05 +0100
Subject: [PATCH 186/578] Ensure we will not use the template string by mistake

---
 tools/check/forbidden_strings_in_code.txt      | 3 +++
 tools/check/forbidden_strings_in_resources.txt | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 9d22f882c6..98c49d6549 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -175,3 +175,6 @@ PreferenceManager\.getDefaultSharedPreferences==2
 
 ### Use ViewBindings
 # findViewById
+
+### Do not use `template_` string. Please remove the prefix `template_` to use the generated resource instead.
+R\.string\.template_
\ No newline at end of file
diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt
index 6fb6b184ba..cefeeb6351 100644
--- a/tools/check/forbidden_strings_in_resources.txt
+++ b/tools/check/forbidden_strings_in_resources.txt
@@ -40,6 +40,9 @@ android\:summary=\"[^@|\%s]
 app\:ms_floatingLabelText=\"[^@]
 app\:ms_hint=\"[^@]
 
+### Do not use `template_` string. Please remove the prefix `template_` to use the generated resource instead.
+\"@string/template_
+
 ### "DO NOT COMMIT" has been committed
 DO NOT COMMIT
 

From f3e0060195937e0fd1e8512192a590e8519e8eb8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 18:16:36 +0100
Subject: [PATCH 187/578] Fix lint issue

---
 vector/src/main/res/values-sk/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 6b47a2a536..e32f6906ec 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -56,8 +56,7 @@
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s a 1 ďalší</item>
         <item quantity="few">%1$s a %2$d ďalší</item>
-        <item quantity="many">%1$s a %2$d ďalších</item>
-        <item quantity="other"/>
+        <item quantity="other">%1$s a %2$d ďalších</item>
     </plurals>
     <string name="notice_room_update">%s aktualizoval/a túto miestnosť.</string>
     <string name="notice_event_redacted">Odstránená správa</string>

From c00a95d63934f21a68e0dc3220c2e86790193085 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 18:17:09 +0100
Subject: [PATCH 188/578] Ignore missing translation and error for typos

---
 vector/lint.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/vector/lint.xml b/vector/lint.xml
index 28da13ca8d..1c9e14a3cd 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -3,7 +3,7 @@
     <!-- Modify some severity -->
 
     <!-- Resource -->
-    <issue id="MissingTranslation" severity="warning" />
+    <issue id="MissingTranslation" severity="ignore" />
     <issue id="TypographyEllipsis" severity="error" />
     <issue id="ImpliedQuantity" severity="warning" />
     <issue id="UnusedQuantity" severity="error" />
@@ -65,6 +65,5 @@
     <!--    <issue id="BinaryOperationInTimber" severity="error" />-->
 
     <!-- Wording -->
-    <!-- TODO When strings are imported from Weblate, move this to error -->
-    <issue id="Typos" severity="warning" />
+    <issue id="Typos" severity="error" />
 </lint>

From 68364e0a8214985f951dafc44dd1c01fa50f0e93 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 18:50:21 +0100
Subject: [PATCH 189/578] Fix test compilation issue

---
 .../android/sdk/common/CommonTestHelper.kt    | 34 +++++++++-------
 .../TestRoomDisplayNameFallbackProvider.kt    | 40 +++++++++++++++++++
 2 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index c677d91f0a..287a4233d9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -19,6 +19,15 @@ package org.matrix.android.sdk.common
 import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.Observer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.matrix.android.sdk.api.Matrix
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixConfiguration
@@ -34,15 +43,6 @@ import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.api.session.sync.SyncState
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withTimeout
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertTrue
 import java.util.ArrayList
 import java.util.UUID
 import java.util.concurrent.CountDownLatch
@@ -59,7 +59,13 @@ class CommonTestHelper(context: Context) {
     fun getTestInterceptor(session: Session): MockOkHttpInterceptor? = TestNetworkModule.interceptorForSession(session.sessionId) as? MockOkHttpInterceptor
 
     init {
-        Matrix.initialize(context, MatrixConfiguration("TestFlavor"))
+        Matrix.initialize(
+                context,
+                MatrixConfiguration(
+                        applicationFlavor = "TestFlavor",
+                        roomDisplayNameFallbackProvider = TestRoomDisplayNameFallbackProvider()
+                )
+        )
         matrix = Matrix.getInstance(context)
     }
 
@@ -385,8 +391,8 @@ fun List<TimelineEvent>.checkSendOrder(baseTextMessage: String, numberOfMessages
     return drop(startIndex)
             .take(numberOfMessages)
             .foldRightIndexed(true) { index, timelineEvent, acc ->
-        val body = timelineEvent.root.content.toModel<MessageContent>()?.body
-        val currentMessageSuffix = numberOfMessages - index
-        acc && (body == null || body.startsWith(baseTextMessage) && body.endsWith("#$currentMessageSuffix"))
-    }
+                val body = timelineEvent.root.content.toModel<MessageContent>()?.body
+                val currentMessageSuffix = numberOfMessages - index
+                acc && (body == null || body.startsWith(baseTextMessage) && body.endsWith("#$currentMessageSuffix"))
+            }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
new file mode 100644
index 0000000000..f50e8a8a73
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.common
+
+import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
+
+class TestRoomDisplayNameFallbackProvider() : RoomDisplayNameFallbackProvider {
+
+    override fun getNameForRoomInvite() =
+            "Room invite"
+
+    override fun getNameForEmptyRoom() =
+            "Empty room"
+
+    override fun getNameFor2members(name1: String?, name2: String?) =
+            "$name1 and $name2"
+
+    override fun getNameFor3members(name1: String?, name2: String?, name3: String?) =
+            "$name1, $name2 and $name3"
+
+    override fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?) =
+            "$name1, $name2, $name3 and $name4"
+
+    override fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int) =
+            "$name1, $name2, $name3 and $remainingCount others"
+}

From b842e62563ae290987b25a58b55f13f60bab9f50 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 19:35:46 +0100
Subject: [PATCH 190/578] Ignore lint issue in generated resource file from
 templates

---
 vector/lint.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vector/lint.xml b/vector/lint.xml
index 1c9e14a3cd..1f964412b9 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -66,4 +66,12 @@
 
     <!-- Wording -->
     <issue id="Typos" severity="error" />
+
+    <!-- Ignore lint issue in generated resource file from templates.
+     https://github.com/LikeTheSalad/android-string-reference generates string from the default language
+     if the translation is missing, and it can lead to typos. Lint should only check the string from the
+     original file, so with id starting by `template_`. -->
+    <issue id="all">
+        <ignore path="**/generated/resolved/**/resolved.xml" />
+    </issue>
 </lint>

From 915295efc07a4dbdab7fc5e7b46edb7b289c9bf2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 19:36:39 +0100
Subject: [PATCH 191/578] Import SAS strings

---
 .../src/main/res/values-ar/strings_sas.xml    | 68 +++++++++++++++++++
 .../src/main/res/values-cs/strings_sas.xml    | 68 +++++++++++++++++++
 .../src/main/res/values-de/strings_sas.xml    | 10 +--
 .../src/main/res/values-es/strings_sas.xml    | 15 ++++
 .../src/main/res/values-hr/strings_sas.xml    | 68 +++++++++++++++++++
 .../src/main/res/values-si/strings_sas.xml    |  8 +++
 .../src/main/res/values-sr/strings_sas.xml    | 68 +++++++++++++++++++
 .../src/main/res/values-szl/strings_sas.xml   |  4 ++
 8 files changed, 304 insertions(+), 5 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/res/values-ar/strings_sas.xml
 create mode 100644 matrix-sdk-android/src/main/res/values-cs/strings_sas.xml
 create mode 100644 matrix-sdk-android/src/main/res/values-hr/strings_sas.xml
 create mode 100644 matrix-sdk-android/src/main/res/values-si/strings_sas.xml
 create mode 100644 matrix-sdk-android/src/main/res/values-sr/strings_sas.xml
 create mode 100644 matrix-sdk-android/src/main/res/values-szl/strings_sas.xml

diff --git a/matrix-sdk-android/src/main/res/values-ar/strings_sas.xml b/matrix-sdk-android/src/main/res/values-ar/strings_sas.xml
new file mode 100644
index 0000000000..423a8332bf
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-ar/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">كَلب</string>
+    <string name="verification_emoji_cat">هِرَّة</string>
+    <string name="verification_emoji_lion">أَسَد</string>
+    <string name="verification_emoji_horse">حِصَان</string>
+    <string name="verification_emoji_unicorn">حِصَانٌ بِقَرن</string>
+    <string name="verification_emoji_pig">خِنزِير</string>
+    <string name="verification_emoji_elephant">فِيل</string>
+    <string name="verification_emoji_rabbit">أَرنَب</string>
+    <string name="verification_emoji_panda">باندَا</string>
+    <string name="verification_emoji_rooster">دِيك</string>
+    <string name="verification_emoji_penguin">بِطريق</string>
+    <string name="verification_emoji_turtle">سُلحفاة</string>
+    <string name="verification_emoji_fish">سَمَكَة</string>
+    <string name="verification_emoji_octopus">أُخطُبُوط</string>
+    <string name="verification_emoji_butterfly">فَرَاشَة</string>
+    <string name="verification_emoji_flower">زَهرَة</string>
+    <string name="verification_emoji_tree">شَجَرَة</string>
+    <string name="verification_emoji_cactus">صبار</string>
+    <string name="verification_emoji_mushroom">فُطر</string>
+    <string name="verification_emoji_globe">كُرَةٌ أرضِيَّة</string>
+    <string name="verification_emoji_moon">قَمَر</string>
+    <string name="verification_emoji_cloud">سَحابَة</string>
+    <string name="verification_emoji_fire">نار</string>
+    <string name="verification_emoji_banana">مَوزَة</string>
+    <string name="verification_emoji_apple">تُفَّاحَة</string>
+    <string name="verification_emoji_strawberry">فَراوِلَة</string>
+    <string name="verification_emoji_corn">ذُرَة</string>
+    <string name="verification_emoji_pizza">بِيتزا</string>
+    <string name="verification_emoji_cake">كَعكَة</string>
+    <string name="verification_emoji_heart">قَلب</string>
+    <string name="verification_emoji_smiley">اِبتِسَامَة</string>
+    <string name="verification_emoji_robot">رُوبُوت</string>
+    <string name="verification_emoji_hat">قُبَّعَة</string>
+    <string name="verification_emoji_glasses">نَظَّارَة</string>
+    <string name="verification_emoji_spanner">مِفتَاحُ رَبط</string>
+    <string name="verification_emoji_santa">سانتا</string>
+    <string name="verification_emoji_thumbs_up">رَفعُ إِبهَام</string>
+    <string name="verification_emoji_umbrella">مِظَلَّة</string>
+    <string name="verification_emoji_hourglass">سَاعَةٌ رَملِيَّة</string>
+    <string name="verification_emoji_clock">سَاعَة</string>
+    <string name="verification_emoji_gift">هَدِيَّة</string>
+    <string name="verification_emoji_light_bulb">مِصبَاح</string>
+    <string name="verification_emoji_book">كِتَاب</string>
+    <string name="verification_emoji_pencil">قَلَمُ رَصاص</string>
+    <string name="verification_emoji_paperclip">مِشبَكُ وَرَق</string>
+    <string name="verification_emoji_scissors">مِقَصّ</string>
+    <string name="verification_emoji_lock">قُفل</string>
+    <string name="verification_emoji_key">مِفتَاح</string>
+    <string name="verification_emoji_hammer">مِطرَقَة</string>
+    <string name="verification_emoji_telephone">تِلِفُون</string>
+    <string name="verification_emoji_flag">عَلَم</string>
+    <string name="verification_emoji_train">قِطَار</string>
+    <string name="verification_emoji_bicycle">دَرّاجَة</string>
+    <string name="verification_emoji_aeroplane">طَائِرة</string>
+    <string name="verification_emoji_rocket">صَارُوخ</string>
+    <string name="verification_emoji_trophy">كَأسُ النَّصر</string>
+    <string name="verification_emoji_ball">كُرَة</string>
+    <string name="verification_emoji_guitar">غيتار</string>
+    <string name="verification_emoji_trumpet">بُوق</string>
+    <string name="verification_emoji_bell">جَرَس</string>
+    <string name="verification_emoji_anchor">مِرسَاة</string>
+    <string name="verification_emoji_headphones">سَمّاعَة رَأس</string>
+    <string name="verification_emoji_folder">مُجَلَّد</string>
+    <string name="verification_emoji_pin">دَبُّوس</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-cs/strings_sas.xml b/matrix-sdk-android/src/main/res/values-cs/strings_sas.xml
new file mode 100644
index 0000000000..1ef9d56f60
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-cs/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">Pes</string>
+    <string name="verification_emoji_cat">Kočka</string>
+    <string name="verification_emoji_lion">Lev</string>
+    <string name="verification_emoji_horse">Kůň</string>
+    <string name="verification_emoji_unicorn">Jednorožec</string>
+    <string name="verification_emoji_pig">Prase</string>
+    <string name="verification_emoji_elephant">Slon</string>
+    <string name="verification_emoji_rabbit">Králík</string>
+    <string name="verification_emoji_panda">Panda</string>
+    <string name="verification_emoji_rooster">Kohout</string>
+    <string name="verification_emoji_penguin">Tučňák</string>
+    <string name="verification_emoji_turtle">Želva</string>
+    <string name="verification_emoji_fish">Ryba</string>
+    <string name="verification_emoji_octopus">Chobotnice</string>
+    <string name="verification_emoji_butterfly">Motýl</string>
+    <string name="verification_emoji_flower">Květina</string>
+    <string name="verification_emoji_tree">Strom</string>
+    <string name="verification_emoji_cactus">Kaktus</string>
+    <string name="verification_emoji_mushroom">Houba</string>
+    <string name="verification_emoji_globe">Zeměkoule</string>
+    <string name="verification_emoji_moon">Měsíc</string>
+    <string name="verification_emoji_cloud">Mrak</string>
+    <string name="verification_emoji_fire">Oheň</string>
+    <string name="verification_emoji_banana">Banán</string>
+    <string name="verification_emoji_apple">Jablko</string>
+    <string name="verification_emoji_strawberry">Jahoda</string>
+    <string name="verification_emoji_corn">Kukuřice</string>
+    <string name="verification_emoji_pizza">Pizza</string>
+    <string name="verification_emoji_cake">Dort</string>
+    <string name="verification_emoji_heart">Srdce</string>
+    <string name="verification_emoji_smiley">Smajlík</string>
+    <string name="verification_emoji_robot">Robot</string>
+    <string name="verification_emoji_hat">Klobouk</string>
+    <string name="verification_emoji_glasses">Brýle</string>
+    <string name="verification_emoji_spanner">Klíč</string>
+    <string name="verification_emoji_santa">Mikuláš</string>
+    <string name="verification_emoji_thumbs_up">Palec nahoru</string>
+    <string name="verification_emoji_umbrella">Deštník</string>
+    <string name="verification_emoji_hourglass">Přesýpací hodiny</string>
+    <string name="verification_emoji_clock">Hodiny</string>
+    <string name="verification_emoji_gift">Dárek</string>
+    <string name="verification_emoji_light_bulb">Žárovka</string>
+    <string name="verification_emoji_book">Kniha</string>
+    <string name="verification_emoji_pencil">Tužka</string>
+    <string name="verification_emoji_paperclip">Sponka</string>
+    <string name="verification_emoji_scissors">Nůžky</string>
+    <string name="verification_emoji_lock">Zámek</string>
+    <string name="verification_emoji_key">Klíč</string>
+    <string name="verification_emoji_hammer">Kladivo</string>
+    <string name="verification_emoji_telephone">Telefon</string>
+    <string name="verification_emoji_flag">Vlajka</string>
+    <string name="verification_emoji_train">Vlak</string>
+    <string name="verification_emoji_bicycle">Kolo</string>
+    <string name="verification_emoji_aeroplane">Letadlo</string>
+    <string name="verification_emoji_rocket">Raketa</string>
+    <string name="verification_emoji_trophy">Pohár</string>
+    <string name="verification_emoji_ball">Míč</string>
+    <string name="verification_emoji_guitar">Kytara</string>
+    <string name="verification_emoji_trumpet">Trumpeta</string>
+    <string name="verification_emoji_bell">Zvonek</string>
+    <string name="verification_emoji_anchor">Kotva</string>
+    <string name="verification_emoji_headphones">Sluchátka</string>
+    <string name="verification_emoji_folder">Složka</string>
+    <string name="verification_emoji_pin">Špendlík</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-de/strings_sas.xml b/matrix-sdk-android/src/main/res/values-de/strings_sas.xml
index 108dedd1a5..be75f797f9 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings_sas.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings_sas.xml
@@ -27,20 +27,20 @@
     <string name="verification_emoji_banana">Banane</string>
     <string name="verification_emoji_apple">Apfel</string>
     <string name="verification_emoji_strawberry">Erdbeere</string>
-    <string name="verification_emoji_corn">Korn</string>
+    <string name="verification_emoji_corn">Mais</string>
     <string name="verification_emoji_pizza">Pizza</string>
     <string name="verification_emoji_cake">Kuchen</string>
     <string name="verification_emoji_heart">Herz</string>
-    <string name="verification_emoji_smiley">Smiley</string>
+    <string name="verification_emoji_smiley">Lächeln</string>
     <string name="verification_emoji_robot">Roboter</string>
     <string name="verification_emoji_hat">Hut</string>
     <string name="verification_emoji_glasses">Brille</string>
     <string name="verification_emoji_spanner">Schraubenschlüssel</string>
-    <string name="verification_emoji_santa">Nikolaus</string>
+    <string name="verification_emoji_santa">Weihnachtsmann</string>
     <string name="verification_emoji_thumbs_up">Daumen Hoch</string>
     <string name="verification_emoji_umbrella">Regenschirm</string>
     <string name="verification_emoji_hourglass">Sanduhr</string>
-    <string name="verification_emoji_clock">Wecker</string>
+    <string name="verification_emoji_clock">Uhr</string>
     <string name="verification_emoji_gift">Geschenk</string>
     <string name="verification_emoji_light_bulb">Glühbirne</string>
     <string name="verification_emoji_book">Buch</string>
@@ -56,7 +56,7 @@
     <string name="verification_emoji_bicycle">Fahrrad</string>
     <string name="verification_emoji_aeroplane">Flugzeug</string>
     <string name="verification_emoji_rocket">Rakete</string>
-    <string name="verification_emoji_trophy">Trophäe</string>
+    <string name="verification_emoji_trophy">Pokal</string>
     <string name="verification_emoji_ball">Ball</string>
     <string name="verification_emoji_guitar">Gitarre</string>
     <string name="verification_emoji_trumpet">Trompete</string>
diff --git a/matrix-sdk-android/src/main/res/values-es/strings_sas.xml b/matrix-sdk-android/src/main/res/values-es/strings_sas.xml
index fd396c1778..b5f062cb62 100644
--- a/matrix-sdk-android/src/main/res/values-es/strings_sas.xml
+++ b/matrix-sdk-android/src/main/res/values-es/strings_sas.xml
@@ -36,18 +36,33 @@
     <string name="verification_emoji_hat">Sombrero</string>
     <string name="verification_emoji_glasses">Gafas</string>
     <string name="verification_emoji_spanner">Llave inglesa</string>
+    <string name="verification_emoji_santa">Papá Noel</string>
+    <string name="verification_emoji_thumbs_up">Pulgar arriba</string>
+    <string name="verification_emoji_umbrella">Paraguas</string>
+    <string name="verification_emoji_hourglass">Reloj de arena</string>
     <string name="verification_emoji_clock">Reloj</string>
     <string name="verification_emoji_gift">Regalo</string>
+    <string name="verification_emoji_light_bulb">Bombilla</string>
     <string name="verification_emoji_book">Libro</string>
     <string name="verification_emoji_pencil">Lápiz</string>
+    <string name="verification_emoji_paperclip">Clip</string>
+    <string name="verification_emoji_scissors">Tijeras</string>
+    <string name="verification_emoji_lock">Candado</string>
     <string name="verification_emoji_key">Llave</string>
     <string name="verification_emoji_hammer">Martillo</string>
     <string name="verification_emoji_telephone">Telefono</string>
+    <string name="verification_emoji_flag">Bandera</string>
     <string name="verification_emoji_train">Tren</string>
     <string name="verification_emoji_bicycle">Bicicleta</string>
+    <string name="verification_emoji_aeroplane">Avión</string>
+    <string name="verification_emoji_rocket">Cohete</string>
+    <string name="verification_emoji_trophy">Trofeo</string>
     <string name="verification_emoji_ball">Bola</string>
     <string name="verification_emoji_guitar">Guitarra</string>
     <string name="verification_emoji_trumpet">Trompeta</string>
     <string name="verification_emoji_bell">Campana</string>
+    <string name="verification_emoji_anchor">Ancla</string>
+    <string name="verification_emoji_headphones">Cascos</string>
+    <string name="verification_emoji_folder">Carpeta</string>
     <string name="verification_emoji_pin">Alfiler</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values-hr/strings_sas.xml b/matrix-sdk-android/src/main/res/values-hr/strings_sas.xml
new file mode 100644
index 0000000000..423ab20186
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-hr/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">pas</string>
+    <string name="verification_emoji_cat">mačka</string>
+    <string name="verification_emoji_lion">lav</string>
+    <string name="verification_emoji_horse">konj</string>
+    <string name="verification_emoji_unicorn">jednorog</string>
+    <string name="verification_emoji_pig">svinja</string>
+    <string name="verification_emoji_elephant">slon</string>
+    <string name="verification_emoji_rabbit">zec</string>
+    <string name="verification_emoji_panda">panda</string>
+    <string name="verification_emoji_rooster">kokot</string>
+    <string name="verification_emoji_penguin">pingvin</string>
+    <string name="verification_emoji_turtle">kornjača</string>
+    <string name="verification_emoji_fish">riba</string>
+    <string name="verification_emoji_octopus">hobotnica</string>
+    <string name="verification_emoji_butterfly">leptir</string>
+    <string name="verification_emoji_flower">svijet</string>
+    <string name="verification_emoji_tree">drvo</string>
+    <string name="verification_emoji_cactus">kaktus</string>
+    <string name="verification_emoji_mushroom">gljiva</string>
+    <string name="verification_emoji_globe">Globus</string>
+    <string name="verification_emoji_moon">mjesec</string>
+    <string name="verification_emoji_cloud">oblak</string>
+    <string name="verification_emoji_fire">vatra</string>
+    <string name="verification_emoji_banana">banana</string>
+    <string name="verification_emoji_apple">jabuka</string>
+    <string name="verification_emoji_strawberry">jagoda</string>
+    <string name="verification_emoji_corn">kukuruza</string>
+    <string name="verification_emoji_pizza">pizza</string>
+    <string name="verification_emoji_cake">torta</string>
+    <string name="verification_emoji_heart">srca</string>
+    <string name="verification_emoji_smiley">smajlića</string>
+    <string name="verification_emoji_robot">robot</string>
+    <string name="verification_emoji_hat">kapa</string>
+    <string name="verification_emoji_glasses">naočale</string>
+    <string name="verification_emoji_spanner">ključ</string>
+    <string name="verification_emoji_santa">deda Mraz</string>
+    <string name="verification_emoji_thumbs_up">palac gore</string>
+    <string name="verification_emoji_umbrella">kišobran</string>
+    <string name="verification_emoji_hourglass">pješčani sat</string>
+    <string name="verification_emoji_clock">sat</string>
+    <string name="verification_emoji_gift">poklon</string>
+    <string name="verification_emoji_light_bulb">žarulja</string>
+    <string name="verification_emoji_book">knjiga</string>
+    <string name="verification_emoji_pencil">olovka</string>
+    <string name="verification_emoji_paperclip">spajalica</string>
+    <string name="verification_emoji_scissors">škare</string>
+    <string name="verification_emoji_lock">zaključati</string>
+    <string name="verification_emoji_key">ključ</string>
+    <string name="verification_emoji_hammer">čekić</string>
+    <string name="verification_emoji_telephone">telefon</string>
+    <string name="verification_emoji_flag">zastava</string>
+    <string name="verification_emoji_train">vlak</string>
+    <string name="verification_emoji_bicycle">bicikl</string>
+    <string name="verification_emoji_aeroplane">avion</string>
+    <string name="verification_emoji_rocket">raketa</string>
+    <string name="verification_emoji_trophy">trofej</string>
+    <string name="verification_emoji_ball">lopta</string>
+    <string name="verification_emoji_guitar">gitara</string>
+    <string name="verification_emoji_trumpet">truba</string>
+    <string name="verification_emoji_bell">zvono</string>
+    <string name="verification_emoji_anchor">sidro</string>
+    <string name="verification_emoji_headphones">slušalice</string>
+    <string name="verification_emoji_folder">mapu</string>
+    <string name="verification_emoji_pin">pribadača</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-si/strings_sas.xml b/matrix-sdk-android/src/main/res/values-si/strings_sas.xml
new file mode 100644
index 0000000000..7ea72d2a4d
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-si/strings_sas.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">බල්ලා</string>
+    <string name="verification_emoji_cat">පූසා</string>
+    <string name="verification_emoji_lion">සිංහයා</string>
+    <string name="verification_emoji_horse">අශ්වයා</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-sr/strings_sas.xml b/matrix-sdk-android/src/main/res/values-sr/strings_sas.xml
new file mode 100644
index 0000000000..04da7a11f0
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-sr/strings_sas.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+    <string name="verification_emoji_dog">пас</string>
+    <string name="verification_emoji_cat">мачка</string>
+    <string name="verification_emoji_lion">лав</string>
+    <string name="verification_emoji_horse">коњ</string>
+    <string name="verification_emoji_unicorn">једнорог</string>
+    <string name="verification_emoji_pig">прасе</string>
+    <string name="verification_emoji_elephant">слон</string>
+    <string name="verification_emoji_rabbit">зец</string>
+    <string name="verification_emoji_panda">панда</string>
+    <string name="verification_emoji_rooster">петао</string>
+    <string name="verification_emoji_penguin">пингвин</string>
+    <string name="verification_emoji_turtle">корњача</string>
+    <string name="verification_emoji_fish">риба</string>
+    <string name="verification_emoji_octopus">октопод</string>
+    <string name="verification_emoji_butterfly">лептир</string>
+    <string name="verification_emoji_flower">цвет</string>
+    <string name="verification_emoji_tree">дрво</string>
+    <string name="verification_emoji_cactus">кактус</string>
+    <string name="verification_emoji_mushroom">печурка</string>
+    <string name="verification_emoji_globe">глобус</string>
+    <string name="verification_emoji_moon">месец</string>
+    <string name="verification_emoji_cloud">облак</string>
+    <string name="verification_emoji_fire">ватра</string>
+    <string name="verification_emoji_banana">банана</string>
+    <string name="verification_emoji_apple">јабука</string>
+    <string name="verification_emoji_strawberry">јагода</string>
+    <string name="verification_emoji_corn">кукуруз</string>
+    <string name="verification_emoji_pizza">пица</string>
+    <string name="verification_emoji_cake">торта</string>
+    <string name="verification_emoji_heart">срце</string>
+    <string name="verification_emoji_smiley">смајли</string>
+    <string name="verification_emoji_robot">робот</string>
+    <string name="verification_emoji_hat">шешир</string>
+    <string name="verification_emoji_glasses">наочаре</string>
+    <string name="verification_emoji_spanner">кључ</string>
+    <string name="verification_emoji_santa">деда Мраз</string>
+    <string name="verification_emoji_thumbs_up">палчић горе</string>
+    <string name="verification_emoji_umbrella">кишобран</string>
+    <string name="verification_emoji_hourglass">пешчаник</string>
+    <string name="verification_emoji_clock">сат</string>
+    <string name="verification_emoji_gift">поклон</string>
+    <string name="verification_emoji_light_bulb">сијалица</string>
+    <string name="verification_emoji_book">књига</string>
+    <string name="verification_emoji_pencil">оловка</string>
+    <string name="verification_emoji_paperclip">спајалица</string>
+    <string name="verification_emoji_scissors">маказе</string>
+    <string name="verification_emoji_lock">катанац</string>
+    <string name="verification_emoji_key">кључ</string>
+    <string name="verification_emoji_hammer">чекић</string>
+    <string name="verification_emoji_telephone">телефон</string>
+    <string name="verification_emoji_flag">застава</string>
+    <string name="verification_emoji_train">воз</string>
+    <string name="verification_emoji_bicycle">бицикл</string>
+    <string name="verification_emoji_aeroplane">авион</string>
+    <string name="verification_emoji_rocket">ракета</string>
+    <string name="verification_emoji_trophy">пехар</string>
+    <string name="verification_emoji_ball">лопта</string>
+    <string name="verification_emoji_guitar">гитара</string>
+    <string name="verification_emoji_trumpet">труба</string>
+    <string name="verification_emoji_bell">звоно</string>
+    <string name="verification_emoji_anchor">сидро</string>
+    <string name="verification_emoji_headphones">слушалице</string>
+    <string name="verification_emoji_folder">фасцикла</string>
+    <string name="verification_emoji_pin">чиода</string>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-szl/strings_sas.xml b/matrix-sdk-android/src/main/res/values-szl/strings_sas.xml
new file mode 100644
index 0000000000..9769ad73ce
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values-szl/strings_sas.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Generated file, do not edit -->
+</resources>

From 663fc28cd5f5e8602bce3fe6e5220b959dcbcce9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 3 Mar 2021 19:51:11 +0100
Subject: [PATCH 192/578] Fix copyright

---
 .../android/sdk/common/TestRoomDisplayNameFallbackProvider.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
index f50e8a8a73..7a1d4604f0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 0b5135b841f8642a4bcad1745e6928d8f3e3dcde Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Feb 2021 12:35:52 +0100
Subject: [PATCH 193/578] Add a script to download and install APK from
 Buildkite

---
 CHANGES.md                                    |   1 +
 tools/install/androidSelectDevice.sh          | 116 ++++++++++++++++++
 tools/install/installFromBuildkite.sh         |  79 ++++++++++++
 tools/release/download_buildkite_artifacts.py |   6 +-
 4 files changed, 200 insertions(+), 2 deletions(-)
 create mode 100755 tools/install/androidSelectDevice.sh
 create mode 100755 tools/install/installFromBuildkite.sh

diff --git a/CHANGES.md b/CHANGES.md
index 8692a2cff8..cdd8b09b56 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ SDK API changes ⚠️:
 
 Build 🧱:
  - Update a lot of dependencies, with the help of dependabot.
+ - Add a script to download and install APK from the CI
 
 Test:
  -
diff --git a/tools/install/androidSelectDevice.sh b/tools/install/androidSelectDevice.sh
new file mode 100755
index 0000000000..d04afb70e1
--- /dev/null
+++ b/tools/install/androidSelectDevice.sh
@@ -0,0 +1,116 @@
+#! /bin/bash
+#=====================================================================
+# Selects an android device
+# Copyright (C) 2012-2020 Diego Torres Milano. All rights reserved.
+#
+# See:
+#    - http://dtmilano.blogspot.ca/2013/01/android-select-device.html
+#    - http://dtmilano.blogspot.ca/2012/03/selecting-adb-device.html
+# for details on usage.
+#=====================================================================
+
+# BMA: GIST FROM https://gist.github.com/dtmilano/4537110
+
+get_adb_devices() {
+    adb $ADB_SERVER devices $LONG 2>&1 | tail -n +2 | sed '/^$/d'
+}
+
+git_pull() {
+    [[ "$UNAME" == 'Linux' ]] && OPT=-e
+    ASD=$(readlink $OPT $0)
+    if [[ -n "$ASD" ]]
+    then
+        DIR=$(dirname $ASD)
+        if [[ -n "$DIR" && -d "$DIR/.git" ]]
+        then
+            (cd $DIR && git pull)
+        fi
+    fi
+}
+
+PROGNAME=$(basename $0)
+VERSION="3.3.0"
+UNAME=$(uname)
+DEVICE_OPT=
+LONG=
+ADB_SERVER=
+
+git_pull > /dev/null
+
+for opt in "$@"
+do
+    case "$opt" in
+        -d|-e|-s|-t)
+            DEVICE_OPT=$opt
+            ;;
+
+        -l|--long)
+            LONG=-l
+            ;;
+
+        start-server|kill-server|connect|pair|-help)
+            exit 0
+            ;;
+
+        -V|--version)
+            echo "$PROGNAME version $VERSION"
+            exit 0
+            ;;
+    esac
+done
+[ -n "$DEVICE_OPT" ] && exit 0
+DEV=$(get_adb_devices)
+if [ -z "$DEV" ]
+then
+    echo "$PROGNAME: ERROR: There's no locally connected devices." >&2
+    read -p "Do you want to connect to a remote adb server? [Y/n]: " REPLY
+    case "$REPLY" in
+        n|N)
+            exit 1
+            ;;
+
+        y|Y|"")
+            read -p "ADB server IP: " IP
+            ADB_SERVER="-H $IP"
+            DEV=$(get_adb_devices)
+            ;;
+    esac
+elif echo "$DEV" | grep -q 'daemon started successfully'
+then
+    # try again
+    DEV=$(get_adb_devices)
+fi
+N=$(echo "$DEV" | wc -l | sed 's/ //g')
+
+case $N in
+1)
+    # only one device detected
+    D=$DEV
+    ;;
+
+*)
+    # more than one device detected
+    OLDIFS=$IFS
+    IFS="
+"
+    PS3="Select the device to use, <Q> to quit: "
+    select D in $DEV
+    do
+        [ "$REPLY" = 'q' -o "$REPLY" = 'Q' ] && exit 2
+        [ -n "$D" ] && break
+    done < /dev/tty
+
+    IFS=$OLDIFS
+    ;;
+esac
+
+if [ -z "$D" ]
+then
+    echo "$PROGNAME: ERROR: target device couldn't be determined" >&2
+    exit 1
+fi
+
+# this didn't work on Darwin
+# echo "-s ${D%% *}"
+### BMA Modified printf -- '-s %s\n' "$(echo ${D} | sed 's/ .*$//')"
+printf -- '%s' "$(echo ${D} | sed 's/ .*$//')"
diff --git a/tools/install/installFromBuildkite.sh b/tools/install/installFromBuildkite.sh
new file mode 100755
index 0000000000..e47902e31b
--- /dev/null
+++ b/tools/install/installFromBuildkite.sh
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+# Exit on any error
+set -e
+
+if [[ "$#" -ne 1 ]]; then
+  echo "Usage: $0 BUILDKITE_TOKEN" >&2
+  exit 1
+fi
+
+buildkiteToken=$1
+
+# Path where the app is cloned (it's where this project has been cloned)
+appPath=$(dirname $(dirname $(dirname $0)))
+# Path where the APK will be downloaded from Buildkite (it's a dir)
+baseImportPath="${appPath}/tmp/DebugApks"
+
+# Select device
+serialNumber=$(${appPath}/tools/install/androidSelectDevice.sh)
+
+# Detect device architecture
+
+arch=$(adb -s ${serialNumber} shell getprop ro.product.cpu.abi)
+
+# FDroid or Gplay ?
+echo
+read -p "fdroid or gplay (default to gplay)? " fdroidOrGplay
+fdroidOrGplay=${fdroidOrGplay:-gplay}
+
+echo
+echo "Will install ${fdroidOrGplay} version on device ${serialNumber} with arch ${arch}"
+
+# Buildkite build number
+echo
+read -p "Buildkite build number (ex: '1792')? " buildkiteBuildNumber
+
+# Download files
+
+targetPath=${baseImportPath}/${buildkiteBuildNumber}
+
+filename="vector-${fdroidOrGplay}-${arch}-debug.apk"
+
+fullApkPath="${targetPath}/${filename}"
+
+# Check if file already exists
+if test -f "$fullApkPath"; then
+    read -p "$fullApkPath already exists. Override (yes/no) default to no ? " download
+    download=${download:-no}
+else
+    download="yes"
+fi
+
+# Ignore error from now
+set +e
+
+if [ ${download} == "yes" ]; then
+    echo "Downloading ${filename}..."
+    python3 ${appPath}/tools/release/download_buildkite_artifacts.py \
+        --token ${buildkiteToken} \
+        --build ${buildkiteBuildNumber} \
+        --directory ${targetPath} \
+        --filename ${filename} \
+        --ignoreErrors
+fi
+
+echo "Installing ${filename} to device ${serialNumber}..."
+adb -s ${serialNumber} install -r ${fullApkPath}
+
+# Check error and propose to uninstall and retry installing
+if [[ "$?" -ne 0 ]]; then
+    read -p "Error, do you want to uninstall the application then retry (yes/no) default to no ? " retry
+    retry=${retry:-no}
+    if [ ${retry} == "yes" ]; then
+        echo "Uninstalling..."
+        adb -s ${serialNumber} uninstall im.vector.app.debug
+        echo "Installing again..."
+        adb -s ${serialNumber} install -r ${fullApkPath}
+    fi
+fi
diff --git a/tools/release/download_buildkite_artifacts.py b/tools/release/download_buildkite_artifacts.py
index cd1abecfa5..7a824be806 100755
--- a/tools/release/download_buildkite_artifacts.py
+++ b/tools/release/download_buildkite_artifacts.py
@@ -81,7 +81,9 @@ base_url = "https://api.buildkite.com/v2/organizations/%s/pipelines/%s/builds/%s
 
 buildkite_build_state_url = base_url
 
-print("Getting build state of project %s/%s build %s" % (ORG_SLUG, PIPELINE_SLUG, build_str))
+buildkite_url = "https://buildkite.com/%s/%s/builds/%s" % (ORG_SLUG, PIPELINE_SLUG, build_str)
+
+print("Getting build state of project %s/%s build %s (%s)" % (ORG_SLUG, PIPELINE_SLUG, build_str, buildkite_url))
 
 if args.verbose:
     print("Url: %s" % buildkite_build_state_url)
@@ -141,7 +143,7 @@ else:
     targetDir = args.directory
 
 if not args.simulate:
-    os.mkdir(targetDir)
+    os.makedirs(targetDir, exist_ok=True)
 
 for elt in data:
     if args.verbose:

From 766a5d7c84f5f9d92d04ca12c05ad581619bc8ce Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Wed, 3 Mar 2021 23:30:44 +0000
Subject: [PATCH 194/578] Translated using Weblate (Catalan)

Currently translated at 98.5% (2317 of 2352 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
---
 vector/src/main/res/values-ca/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 850ef255bf..95233b9aea 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -2675,4 +2675,24 @@
     <string name="call_held_by_user">%s ha posat la trucada en espera</string>
     <string name="call_resume_action">Continua</string>
     <string name="action_return">Torna</string>
+    <string name="a11y_video">Vídeo</string>
+    <string name="a11y_error_some_message_not_sent">Alguns missatges no s\'han enviat</string>
+    <string name="a11y_image">Imatge</string>
+    <string name="a11y_import_key_from_file">Importa clau des d\'un fitxer</string>
+    <string name="a11y_screenshot">Captura de pantalla</string>
+    <plurals name="entries">
+        <item quantity="one">%d entrada</item>
+        <item quantity="other">%d entrades</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">Límit desconegut.</string>
+    <string name="settings_server_version">Versió del servidor</string>
+    <string name="settings_server_name">Nom del servidor</string>
+    <string name="room_list_quick_actions_room_settings">Configuració de sala</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Abandonar conferència actual i anar a l\'altra\?</string>
+    <string name="room_settings_room_version_title">Versió de sala</string>
+    <string name="dialog_edit_hint">Nou valor</string>
+    <string name="initial_sync_start_downloading">Sincronització inicial:
+\nBaixant dades…</string>
+    <string name="initial_sync_start_server_computing">Sincronització inicial:
+\nEsperant resposta del servidor…</string>
 </resources>
\ No newline at end of file

From 8d91140107691f5cf7751ef8beac7efcff5ff80c Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Thu, 4 Mar 2021 06:07:53 +0000
Subject: [PATCH 195/578] Translated using Weblate (Czech)

Currently translated at 100.0% (2352 of 2352 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
---
 vector/src/main/res/values-cs/strings.xml | 56 +++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 4c2e939948..ce53fb3617 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2657,4 +2657,60 @@
     <string name="call_hold_action">Přidržet</string>
     <string name="call_resume_action">Pokračovat</string>
     <string name="action_return">Návrat</string>
+    <string name="dev_tools_event_content_hint">Obsah události</string>
+    <string name="dev_tools_success_state_event">Stavová událost byla odeslána!</string>
+    <string name="dev_tools_success_event">Událost odeslána!</string>
+    <string name="dev_tools_error_malformed_event">Poškozená událost</string>
+    <string name="dev_tools_error_no_message_type">Chybí typ zprávy</string>
+    <string name="dev_tools_error_no_content">Žádný obsah</string>
+    <string name="dev_tools_form_hint_event_content">Obsah události</string>
+    <string name="dev_tools_form_hint_state_key">Stavový klíč</string>
+    <string name="dev_tools_form_hint_type">Typ</string>
+    <string name="dev_tools_send_custom_state_event">Odeslat vlastní stavovou událost</string>
+    <string name="dev_tools_edit_content">Upravit obsah</string>
+    <string name="dev_tools_state_event">Stavové události</string>
+    <string name="dev_tools_send_state_event">Odeslat stavovou událost</string>
+    <string name="dev_tools_send_custom_event">Odeslat vlastní událost</string>
+    <string name="dev_tools_explore_room_state">Prozkoumejte stav místnosti</string>
+    <string name="dev_tools_menu_name">Vývojové nástroje</string>
+    <string name="a11y_view_read_receipts">Zobrazit potvrzení o přečtení</string>
+    <string name="a11y_rule_notify_off">Neupozorňovat</string>
+    <string name="a11y_rule_notify_silent">Upozornit bez zvuku</string>
+    <string name="a11y_rule_notify_noisy">Upozornit zvukem</string>
+    <string name="a11y_error_message_not_sent">Zpráva nebyla odeslána z důvodu chyby</string>
+    <string name="a11y_checked">Zkontrolováno</string>
+    <string name="a11y_close_emoji_picker">Zavřít výběr emoji</string>
+    <string name="initial_sync_start_server_computing">Úvodní synchronizace:
+\nČekání na odpověď serveru…</string>
+    <string name="a11y_open_emoji_picker">Otevřít výběr emoji</string>
+    <string name="a11y_trust_level_trusted">Důvěryhodná úroveň důvěryhodnosti</string>
+    <string name="a11y_trust_level_warning">Úroveň důvěryhodnosti varování</string>
+    <string name="a11y_trust_level_default">Výchozí úroveň důvěryhodnosti</string>
+    <string name="a11y_selected">Vybrané</string>
+    <string name="a11y_video">Video</string>
+    <string name="a11y_unsent_draft">Tato místnost má neodeslaný koncept</string>
+    <string name="a11y_error_some_message_not_sent">Některé zprávy nebyly odeslány</string>
+    <string name="a11y_delete_avatar">Smazat avatar</string>
+    <string name="a11y_change_avatar">Změnit avatar</string>
+    <string name="a11y_image">Obrázek</string>
+    <string name="a11y_import_key_from_file">Importovat klíč ze souboru</string>
+    <string name="a11y_open_widget">Otevřít widgety</string>
+    <string name="a11y_screenshot">Snímek obrazovky</string>
+    <plurals name="entries">
+        <item quantity="one">%d položka</item>
+        <item quantity="few">%d položky</item>
+        <item quantity="other">%d položek</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">Limit není znám.</string>
+    <string name="settings_server_upload_size_content">Váš domovský server přijímá přílohy (soubory, média atd.) o velikosti až %s.</string>
+    <string name="settings_server_upload_size_title">Limit nahrávání souborů na server</string>
+    <string name="settings_server_version">Verze serveru</string>
+    <string name="settings_server_name">Název serveru</string>
+    <string name="room_list_quick_actions_room_settings">Nastavení místnosti</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Opustit aktuální konferenci a přepnout na jinou\?</string>
+    <string name="room_settings_room_version_title">Verze místnosti</string>
+    <string name="dialog_edit_hint">Nová hodnota</string>
+    <string name="action_switch">Přepnout</string>
+    <string name="initial_sync_start_downloading">Úvodní synchronizace:
+\nStahuji data…</string>
 </resources>
\ No newline at end of file

From 6286c426e24c3bbe391012c5f3678cab410d00fb Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Wed, 3 Mar 2021 21:43:00 +0000
Subject: [PATCH 196/578] Translated using Weblate (Swedish)

Currently translated at 98.4% (2315 of 2352 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index a750521f9b..a6a6b25e2b 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2607,4 +2607,22 @@
     <string name="call_hold_action">Parkera</string>
     <string name="call_resume_action">Återuppta</string>
     <string name="action_return">Tillbaka</string>
+    <plurals name="entries">
+        <item quantity="one">%d inmatning</item>
+        <item quantity="other">%d inmatningar</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">Gränsen är okänd.</string>
+    <string name="settings_server_upload_size_content">Din hemserver accepterar bilagor (filer, media o.s.v.) med en storlek upp till %s.</string>
+    <string name="settings_server_upload_size_title">Serverns filuppladdningsgräns</string>
+    <string name="settings_server_version">Serverversion</string>
+    <string name="settings_server_name">Servernamn</string>
+    <string name="room_list_quick_actions_room_settings">Rumsinställningar</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Lämna det nuvarande gruppsamtalet och byt till det andra\?</string>
+    <string name="room_settings_room_version_title">Rumsversion</string>
+    <string name="dialog_edit_hint">Nytt värde</string>
+    <string name="action_switch">Byt</string>
+    <string name="initial_sync_start_downloading">Initial synk:
+\nLaddar ner data…</string>
+    <string name="initial_sync_start_server_computing">Initial synk:
+\nVäntar på serversvar…</string>
 </resources>
\ No newline at end of file

From 0508fe60d944ecd062d0b5c69bd0032ceab0f316 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 4 Mar 2021 03:55:47 +0000
Subject: [PATCH 197/578] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2352 of 2352 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index f67585eb1e..495e60d33c 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2557,4 +2557,58 @@
     <string name="call_hold_action">保留</string>
     <string name="call_resume_action">恢復</string>
     <string name="action_return">返回</string>
+    <string name="dev_tools_event_content_hint">活動內容</string>
+    <string name="dev_tools_success_state_event">狀態活動已傳送！</string>
+    <string name="dev_tools_success_event">活動已傳送！</string>
+    <string name="dev_tools_error_malformed_event">活動格式錯誤</string>
+    <string name="dev_tools_error_no_message_type">訊息內容遺失</string>
+    <string name="dev_tools_error_no_content">無內容</string>
+    <string name="dev_tools_form_hint_event_content">活動內容</string>
+    <string name="dev_tools_form_hint_state_key">狀態金鑰</string>
+    <string name="dev_tools_form_hint_type">類型</string>
+    <string name="dev_tools_send_custom_state_event">傳送自訂狀態活動</string>
+    <string name="dev_tools_edit_content">編輯內容</string>
+    <string name="dev_tools_state_event">狀態活動</string>
+    <string name="dev_tools_send_state_event">傳送狀態活動</string>
+    <string name="dev_tools_send_custom_event">傳送自訂活動</string>
+    <string name="dev_tools_explore_room_state">探索聊天室狀態</string>
+    <string name="dev_tools_menu_name">開發工具</string>
+    <string name="a11y_view_read_receipts">檢視讀取回條</string>
+    <string name="a11y_rule_notify_off">不通知</string>
+    <string name="a11y_rule_notify_noisy">有聲通知</string>
+    <string name="a11y_rule_notify_silent">無聲通知</string>
+    <string name="a11y_error_message_not_sent">由於錯誤而未傳送訊息</string>
+    <string name="a11y_checked">已檢查</string>
+    <string name="a11y_close_emoji_picker">關閉表情符號挑選程式</string>
+    <string name="a11y_open_emoji_picker">開啟表情符號挑選程式</string>
+    <string name="a11y_trust_level_trusted">可信任的信任等級</string>
+    <string name="a11y_trust_level_warning">警告信任等級</string>
+    <string name="a11y_trust_level_default">預設信任等級</string>
+    <string name="a11y_selected">已選取</string>
+    <string name="a11y_video">視訊</string>
+    <string name="a11y_unsent_draft">此聊天室有未傳送的草稿</string>
+    <string name="a11y_error_some_message_not_sent">部份訊息未傳送</string>
+    <string name="a11y_delete_avatar">刪除大頭照</string>
+    <string name="a11y_change_avatar">變更大頭照</string>
+    <string name="a11y_image">圖片</string>
+    <string name="a11y_import_key_from_file">從檔案匯入金鑰</string>
+    <string name="a11y_open_widget">開啟小工具</string>
+    <string name="a11y_screenshot">螢幕截圖</string>
+    <plurals name="entries">
+        <item quantity="other">%d 項目</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">限制未知。</string>
+    <string name="settings_server_upload_size_content">您的家伺服器接受大小最大為 %s 的附件（檔案、媒體等）。</string>
+    <string name="settings_server_upload_size_title">伺服器檔案上傳限制</string>
+    <string name="settings_server_version">伺服器版本</string>
+    <string name="settings_server_name">伺服器名稱</string>
+    <string name="room_list_quick_actions_room_settings">聊天室設定</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">離開目前的會議並切換其他的？</string>
+    <string name="room_settings_room_version_title">聊天室版本</string>
+    <string name="dialog_edit_hint">新值</string>
+    <string name="action_switch">切換</string>
+    <string name="initial_sync_start_downloading">初始同步：
+\n正在下載資料……</string>
+    <string name="initial_sync_start_server_computing">初始同步：
+\n正在等待伺服器回應……</string>
 </resources>
\ No newline at end of file

From f24159504d97ff6f82cbeaf6cd980bf44281d511 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Wed, 3 Mar 2021 21:33:54 +0000
Subject: [PATCH 198/578] Translated using Weblate (Swedish)

Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
---
 fastlane/metadata/android/sv/changelogs/40101000.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/sv/changelogs/40101000.txt

diff --git a/fastlane/metadata/android/sv/changelogs/40101000.txt b/fastlane/metadata/android/sv/changelogs/40101000.txt
new file mode 100644
index 0000000000..1a5944da88
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Förbättringar för VoIP (ljud- och videosamtal i DM) och buggfixar!
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.0

From 8bd62dddc87151d0c6cc563d7d0de9b2f5549142 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 4 Mar 2021 02:06:27 +0000
Subject: [PATCH 199/578] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
---
 fastlane/metadata/android/zh_Hant/changelogs/40101000.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/zh_Hant/changelogs/40101000.txt

diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40101000.txt b/fastlane/metadata/android/zh_Hant/changelogs/40101000.txt
new file mode 100644
index 0000000000..3d5049ad65
--- /dev/null
+++ b/fastlane/metadata/android/zh_Hant/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+此版本的主要變更：VoIP（直接訊息中的音訊與視訊通話）改善與錯誤修復！
+完整變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.0

From 7c4ec1f81c86ec1a11aba742894e679fd63c7c91 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Mar 2021 13:42:07 +0100
Subject: [PATCH 200/578] Fix unused string issue

---
 .../im/vector/app/features/login/LoginServerUrlFormFragment.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
index 5d3a6aab49..5b98111645 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@@ -86,7 +86,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment<F
                 views.loginServerUrlFormText.text = getString(R.string.login_server_url_form_modular_text)
                 views.loginServerUrlFormLearnMore.isVisible = true
                 views.loginServerUrlFormHomeServerUrlTil.hint = getText(R.string.login_server_url_form_modular_hint)
-                views.loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_common_notice)
+                views.loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_modular_notice)
             }
             else           -> {
                 views.loginServerUrlFormIcon.isVisible = false

From ea293999df2e02f6bb75e9d392fdaff921a039fc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Mar 2021 13:45:54 +0100
Subject: [PATCH 201/578] Remove unused string

---
 vector/src/main/res/values-bg/strings.xml     | 1 -
 vector/src/main/res/values-ca/strings.xml     | 1 -
 vector/src/main/res/values-cs/strings.xml     | 1 -
 vector/src/main/res/values-de/strings.xml     | 1 -
 vector/src/main/res/values-eo/strings.xml     | 1 -
 vector/src/main/res/values-es/strings.xml     | 1 -
 vector/src/main/res/values-et/strings.xml     | 1 -
 vector/src/main/res/values-fa/strings.xml     | 1 -
 vector/src/main/res/values-fr/strings.xml     | 1 -
 vector/src/main/res/values-he/strings.xml     | 1 -
 vector/src/main/res/values-it/strings.xml     | 1 -
 vector/src/main/res/values-iw/strings.xml     | 1 -
 vector/src/main/res/values-kab/strings.xml    | 1 -
 vector/src/main/res/values-pl/strings.xml     | 1 -
 vector/src/main/res/values-pt-rBR/strings.xml | 1 -
 vector/src/main/res/values-ru/strings.xml     | 1 -
 vector/src/main/res/values-sq/strings.xml     | 1 -
 vector/src/main/res/values-sv/strings.xml     | 1 -
 vector/src/main/res/values-zh-rCN/strings.xml | 1 -
 vector/src/main/res/values-zh-rTW/strings.xml | 1 -
 vector/src/main/res/values/strings.xml        | 1 -
 21 files changed, 21 deletions(-)

diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index aefdc868db..cf51e0546d 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -2146,7 +2146,6 @@
     <string name="external_link_confirmation_title">Проверете тази връзка отново</string>
     <string name="error_empty_field_choose_password">Изберете парола.</string>
     <string name="error_empty_field_choose_user_name">Изберете потребителско име.</string>
-    <string name="error_sso_flow_not_supported_yet">Извинявайте, тази операция все още не е възможна за профили свързани чрез Single-Sign-On.</string>
     <string name="mark_as_verified">Маркирай като доверен</string>
     <string name="confirm_your_identity_quad_s">Потвърдете самоличността си потвърждавайки този вход, давайки му достъп до шифрованите съобщения.</string>
     <string name="confirm_your_identity">Потвърдете самоличността си потвърждавайки този вход от някоя от другите ви сесии, давайки му достъп до шифрованите съобщения.</string>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 95233b9aea..53946bf359 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1539,7 +1539,6 @@
     <string name="settings_expert">Expert</string>
     <string name="room_participants_kick_reason">Motiu de l\'expulsió</string>
     <string name="room_participants_kick_title">Expulsa usuari</string>
-    <string name="error_sso_flow_not_supported_yet">Aquesta operació encara no està disponible en comptes que utilitzen la inscripció única (SSO).</string>
     <string name="login_signin_sso">Continua amb SSO</string>
     <string name="template_identity_server_error_bulk_sha256_not_supported">Per a la teva pròpia privadesa, ${app_name} només admet l\'enviament del \"hash\" de correus electrònics i números de telèfon.</string>
     <string name="command_description_discard_session_not_handled">Només admès en sales xifrades</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index ce53fb3617..675ffb25b8 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2336,7 +2336,6 @@
     <string name="setup_cross_signing">Zapnout křížový podpis</string>
     <string name="error_saving_media_file">Uložit mediální soubor se nezdařilo</string>
     <string name="confirm_your_identity_quad_s">Potvrďte svou identitu ověřením tohoto přihlášení, udělujíce přístup k šifrovaným zprávám.</string>
-    <string name="error_sso_flow_not_supported_yet">Je nám líto, tato operace zatím není možná s účty připojenými pomocí Single Sign-On.</string>
     <string name="power_level_edit_title">Nastavit roli</string>
     <string name="power_level_title">Role</string>
     <string name="a11y_open_chat">Otevřít chat</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index e8a3dad24a..46126c6ff9 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2424,7 +2424,6 @@
     <string name="settings_text_message_sent_hint">Code</string>
     <string name="login_msisdn_notice">Verwende das internationale Format (Telefonnummer muss mit \'+\' beginnen)</string>
     <string name="confirm_your_identity_quad_s">Bestätige deine Identität, indem du dieses Login verifizierst, um Zugriff auf verschlüsselte Nachrichten zu erhalten.</string>
-    <string name="error_sso_flow_not_supported_yet">Leider ist dieser Vorgang für Konten, die über Single Sign-On verbunden sind, noch nicht möglich.</string>
     <string name="error_opening_banned_room">Raum, indem du gebannt wurdest, kann nicht geöffnet werden.</string>
     <string name="room_error_not_found">Raum kann nicht gefunden werden. Stelle sicher, dass er existiert.</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index a872468f42..747511f745 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -2120,7 +2120,6 @@
     <string name="inviting_users_to_room">Invitante uzantojn…</string>
     <string name="invite_users_to_room_action_invite">INVITI</string>
     <string name="add_members_to_room">Aldoni ĉambranojn</string>
-    <string name="error_sso_flow_not_supported_yet">Pardonu, ĉi tiu ago ankoraŭ ne eblas por kontoj konektitaj per ununura saluto.</string>
     <string name="confirm_your_identity_quad_s">Konfirmu vian identecon per kontrolo de ĉi tiu saluto, donante al ĝi aliron al ĉifritaj mesaĝoj.</string>
     <string name="verify_this_session">Kontrolu la novan saluton, kiu aliras vian konton: %1$s</string>
     <string name="verify_other_sessions">Rekontrolu ĉiujn viajn salutaĵojn por certigi, ke viaj konto kaj mesaĝoj estas sekuraj</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index ea0f5d74e1..b0357ab34c 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -2361,7 +2361,6 @@ Por favor permite el acceso en la próxima ventana emergente para descubrir usua
     <string name="confirm_your_identity">Confirme su identidad verificando este inicio de sesión de una de sus otras sesiones, otorgándole acceso a los mensajes encriptados.</string>
     <string name="confirm_your_identity_quad_s">Confirme su identidad verificando este inicio de sesión, otorgándole acceso a los mensajes encriptados.</string>
     <string name="mark_as_verified">Marcar como de confianza</string>
-    <string name="error_sso_flow_not_supported_yet">Lo sentimos, esta operación aún no es posible para las cuentas conectadas mediante el inicio de sesión único.</string>
     <string name="create_room_dm_failure">No pudimos crear tu DM. Marque los usuarios que desea invitar y vuelva a intentarlo.</string>
     <string name="identity_server_error_terms_not_signed">Primero acepta los términos del servidor de identidad en la configuración.</string>
     <string name="template_identity_server_error_bulk_sha256_not_supported">Para su privacidad, ${app_name} solo admite el envío de números de teléfono y correos electrónicos de usuario con hash.</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 3570b18368..4a168a3088 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2361,7 +2361,6 @@
 \n
 \nParima turvalisuse nimel kohtuge silmast silma.</string>
     <string name="confirm_your_identity_quad_s">Kinnita oma isikusamasust verifitseerides seda sisselogimissessiooni. Sellega tagad ligipääsu krüptitud sõnumitele.</string>
-    <string name="error_sso_flow_not_supported_yet">Vabandust, selline tegevus pole veel võimalik kasutajakontode puhul, kus kasutatakse ühekordset sisselogimist.</string>
     <string name="error_opening_banned_room">Ei ole võimalik avada sellise jututoa vaadet, kus sulle on seatud suhtluskeeld.</string>
     <string name="room_error_not_found">Ei leia sellist jututuba. Palun kontrolli, et ta ikka olemas on.</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 98775c2481..2a9fe70d8b 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1613,7 +1613,6 @@
     <string name="cross_signing_verify_by_emoji">تأیید برهم‌کنشی با اموجی</string>
     <string name="crosssigning_verify_session">تأیید ورود</string>
     <string name="unencrypted">رمزنشده</string>
-    <string name="error_sso_flow_not_supported_yet">متأسّفانه این عملیات هنوز برای حساب‌هایی که با استفاده از ورود یکپارچه وصل شده‌اند، ممکن نیست.</string>
     <string name="mark_as_verified">نشانه‌گذاری به عنوان مطمئن</string>
     <string name="identity_server_set_default_submit">استفاده از %1$s</string>
     <string name="a11y_unmute_microphone">ناخموش کردن میکروفون</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index caba64816a..8011534b00 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2193,7 +2193,6 @@
     <string name="bottom_sheet_setup_secure_backup_submit">Configuration</string>
     <string name="a11y_unmute_microphone">Activer le microphone</string>
     <string name="a11y_mute_microphone">Désactiver le microphone</string>
-    <string name="error_sso_flow_not_supported_yet">Désolé, cette opération n\'est pas encore possible pour les comptes connectés en Authentification unique (SSO).</string>
     <string name="confirm_your_identity_quad_s">Confirmez votre identité en vérifiant cet identifiant, lui donnant ainsi accès aux messages chiffrés.</string>
     <string name="setup_cross_signing">Activer la signature croisée</string>
     <plurals name="notification_invitations">
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
index c477b5c147..41d6e147c5 100644
--- a/vector/src/main/res/values-he/strings.xml
+++ b/vector/src/main/res/values-he/strings.xml
@@ -2362,7 +2362,6 @@
     <string name="external_link_confirmation_title">בדוק-פעמיים קישור זה</string>
     <string name="error_empty_field_choose_password">אנא בחר סיסמה.</string>
     <string name="error_empty_field_choose_user_name">אנא בחר שם משתמש.</string>
-    <string name="error_sso_flow_not_supported_yet">מצטערים, פעולה זו עדיין אינה אפשרית עבור חשבונות המחוברים באמצעות כניסה יחידה.</string>
     <string name="mark_as_verified">סמן כאמין</string>
     <string name="confirm_your_identity_quad_s">אשר את זהותך על ידי אימות התחברות זו והעניק לו גישה להודעות מוצפנות.</string>
     <string name="cross_signing_verify_by_emoji">אימות אינטראקטיבי על ידי Emoji</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 3eaa8bdd51..39ca954053 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2423,7 +2423,6 @@
     <string name="settings_text_message_sent_hint">Codice</string>
     <string name="login_msisdn_notice">Si prega di usare il formato internazionale (il numero deve iniziare con \'+\')</string>
     <string name="confirm_your_identity_quad_s">Conferma la tua identità verificando questo accesso, dandogli l\'accesso ai messaggi cifrati.</string>
-    <string name="error_sso_flow_not_supported_yet">Spiacente, questa operazione non è ancora possibile per gli account connessi tramite Single Sign-On.</string>
     <string name="error_opening_banned_room">Impossibile aprire una stanza dove sei stato bandito.</string>
     <string name="room_error_not_found">Impossibile trovare questa stanza. Assicurati che esista.</string>
     <string name="no_permissions_to_start_webrtc_call">Non hai il permesso di avviare una chiamata in questa stanza</string>
diff --git a/vector/src/main/res/values-iw/strings.xml b/vector/src/main/res/values-iw/strings.xml
index c477b5c147..41d6e147c5 100644
--- a/vector/src/main/res/values-iw/strings.xml
+++ b/vector/src/main/res/values-iw/strings.xml
@@ -2362,7 +2362,6 @@
     <string name="external_link_confirmation_title">בדוק-פעמיים קישור זה</string>
     <string name="error_empty_field_choose_password">אנא בחר סיסמה.</string>
     <string name="error_empty_field_choose_user_name">אנא בחר שם משתמש.</string>
-    <string name="error_sso_flow_not_supported_yet">מצטערים, פעולה זו עדיין אינה אפשרית עבור חשבונות המחוברים באמצעות כניסה יחידה.</string>
     <string name="mark_as_verified">סמן כאמין</string>
     <string name="confirm_your_identity_quad_s">אשר את זהותך על ידי אימות התחברות זו והעניק לו גישה להודעות מוצפנות.</string>
     <string name="cross_signing_verify_by_emoji">אימות אינטראקטיבי על ידי Emoji</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 8725bb9f91..516ccc1caf 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -2200,7 +2200,6 @@
     <string name="enter_secret_storage_input_key">Fren tasarut-ik·im n tririt, neɣ err-itt s ufus s tira-ines s uasiw neɣ s usenteḍ-ines seg ɣefafus-inek·inem</string>
     <string name="cross_signing_verify_by_emoji">Senqed amyigew s yimujit</string>
     <string name="confirm_your_identity_quad_s">Sentem timagit-inek·inem s usenqed n yinekcam-a, anef-as ad yekcem ɣer yiznan yettwawgelhen.</string>
-    <string name="error_sso_flow_not_supported_yet">Suref-aɣ, tamahelt-a ulamek i tedda akka tura i yimiḍanen i yettwaqqnen s useqdec n unekcum asuf.</string>
     <string name="external_link_confirmation_title">Senqed tikkelt-nniḍen aseɣwen-a</string>
     <string name="external_link_confirmation_message">Aseɣwen %1$s ad ak·akem-yawi ɣer usmel-nniḍen: %2$s.
 \n
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 02547d02b1..72c7faa1ca 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -2273,7 +2273,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="set_a_security_phrase_hint">Fraza Bezpieczeństwa</string>
     <string name="set_a_security_phrase_title">Ustaw Frazę Bezpieczeństwa</string>
     <string name="error_empty_field_choose_user_name">Wybierz nazwę użytkownika.</string>
-    <string name="error_sso_flow_not_supported_yet">Przepraszamy, ta operacja nie jest jeszcze dostępna dla kont wykorzystujących Single Sign-On.</string>
     <string name="mark_as_verified">Oznacz jako Zaufane</string>
     <string name="confirm_your_identity_quad_s">Potwierdź swoją tożsamość poprzez zweryfikowanie tego logowania aby uzyskać dostęp do zaszyfrowanych wiadomości.</string>
     <string name="confirm_your_identity">Potwierdź swoją tożsamość poprzez zweryfikowanie tego logowania przy pomocy którejś z pozostałych sesji w celu przyznania dostępu do zaszyfrowanych wiadomości.</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index d6745b5e86..d346cbff34 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2447,7 +2447,6 @@
     <string name="delete_account_data_warning">Remover os dados de %1$s desta conta\?
 \n
 \nProssiga com cuidado, pois não há como reverter esta escolha.</string>
-    <string name="error_sso_flow_not_supported_yet">Desculpe, esta funcionalidade ainda não está disponível para contas conectadas via acesso único.</string>
     <string name="template_settings_security_pin_code_grace_period_summary_off">O código PIN é solicitado todas as vezes que você abre o ${app_name}.</string>
     <string name="template_settings_security_pin_code_grace_period_summary_on">O código PIN é solicitado após 2 minutos sem usar o ${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Solicitar o PIN depois de 2 minutos</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index e2e81e13f6..e401e856ce 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2498,7 +2498,6 @@
     <string name="settings_text_message_sent_hint">Код</string>
     <string name="login_msisdn_notice">Используйте международный формат (номер телефона должен начинаться с \'+\')</string>
     <string name="confirm_your_identity_quad_s">Подтвердите свою личность, проверив этот логин, предоставив ему доступ к зашифрованным сообщениям.</string>
-    <string name="error_sso_flow_not_supported_yet">К сожалению, эта операция пока недоступна для учетных записей, подключенных с помощью единого входа.</string>
     <string name="error_opening_banned_room">Невозможно открыть комнату, в которую вам запрещён доступ.</string>
     <string name="room_error_not_found">Невозможно найти эту комнату. Убедитесь, что она существует.</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 03045e3885..90b0e45a9b 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2293,7 +2293,6 @@
     <string name="auth_invalid_login_deactivated_account">Kjo llogari është çaktivizuar.</string>
     <string name="error_saving_media_file">S’u ruajt dot kartelë media</string>
     <string name="confirm_your_identity_quad_s">Ripohoni identitetin tuaj duke verifikuar këto kredenciale hyrjeje, duke i akorduar hyrje te mesazhe të fshehtëzuar.</string>
-    <string name="error_sso_flow_not_supported_yet">Na ndjeni, ky veprim s’është ende i mundshëm për llogari të lidhura duke përdorur Hyrje Njëshe.</string>
     <string name="template_identity_server_error_bulk_sha256_not_supported">Për privatësinë tuaj, ${app_name}-i mbulon vetëm dërgim email-esh dhe numrash telefoni përdoruesi të koduar.</string>
     <string name="power_level_edit_title">Caktoni rol</string>
     <string name="power_level_title">Rol</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index a6a6b25e2b..150d4018ff 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2361,7 +2361,6 @@
     <string name="settings_text_message_sent_hint">Kod</string>
     <string name="login_msisdn_notice">Vänligen använd internationellt format (telefonnumret måste börja med \'+\')</string>
     <string name="confirm_your_identity_quad_s">Bekräfta din identitet genom att verifiera den här inloggningen, och ge den åtkomst till dina krypterade meddelanden.</string>
-    <string name="error_sso_flow_not_supported_yet">Tyvärr stöds den här handlingen inte än för konton anslutna med externt konto.</string>
     <string name="error_opening_banned_room">Kan inte öppna ett rum du är bannad från.</string>
     <string name="room_error_not_found">Kan inte hitta det här rummet. Se till att det existerar.</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 92f6c849ef..e40e95da82 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2278,7 +2278,6 @@
     <string name="settings_text_message_sent_hint">代码</string>
     <string name="login_msisdn_notice">请使用国际格式（电话号码必须以 ‘+’ 开始）</string>
     <string name="confirm_your_identity_quad_s">通过验证此登录确认您的身份，授权它访问加密信息。</string>
-    <string name="error_sso_flow_not_supported_yet">抱歉，对于连接到单点登录的账户此操作尚不可用。</string>
     <string name="error_opening_banned_room">无法打开您被封禁的聊天室。</string>
     <string name="room_error_not_found">无法找到此聊天室。请确认它存在。</string>
     <string name="no_permissions_to_start_webrtc_call">您没有权限在此聊天室发起通话</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 495e60d33c..842700b6eb 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2316,7 +2316,6 @@
     <string name="settings_text_message_sent_hint">代碼</string>
     <string name="login_msisdn_notice">請使用國際格式（電話號碼必須以 \'+\' 開頭）</string>
     <string name="confirm_your_identity_quad_s">透過確認此登入來驗證您的身份，以及授予存取加密訊息的權限。</string>
-    <string name="error_sso_flow_not_supported_yet">抱歉，對於使用單一登入的帳號，還無法執行此動作。</string>
     <string name="error_opening_banned_room">無法開啟禁止您進入的聊天室。</string>
     <string name="room_error_not_found">找不到此聊天室。請確定它存在。</string>
     <plurals name="seconds">
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index a741997393..4ebd663f9f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2983,7 +2983,6 @@
     <string name="confirm_your_identity_quad_s">Confirm your identity by verifying this login, granting it access to encrypted messages.</string>
     <string name="mark_as_verified">Mark as Trusted</string>
 
-    <string name="error_sso_flow_not_supported_yet">Sorry, this operation is not possible yet for accounts connected using Single Sign-On.</string>
     <string name="failed_to_initialize_cross_signing">Failed to set up Cross Signing</string>
 
     <string name="error_empty_field_choose_user_name">Please choose a username.</string>

From d5f5143c525d7e3e2d1e00746e4eecbbf7c6f844 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Mar 2021 13:56:08 +0100
Subject: [PATCH 202/578] Rename file

---
 .../src/main/res/values/{values.xml => attrs_reaction_button.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename vector/src/main/res/values/{values.xml => attrs_reaction_button.xml} (100%)

diff --git a/vector/src/main/res/values/values.xml b/vector/src/main/res/values/attrs_reaction_button.xml
similarity index 100%
rename from vector/src/main/res/values/values.xml
rename to vector/src/main/res/values/attrs_reaction_button.xml

From acbb7966498e2d6d53b962558ea2904415b53d95 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Feb 2021 18:18:31 +0100
Subject: [PATCH 203/578] Fix potential issue with link colors

---
 vector/src/main/res/values/colors.xml      | 1 -
 vector/src/main/res/values/styles_riot.xml | 4 ++--
 vector/src/main/res/values/theme_black.xml | 2 --
 vector/src/main/res/values/theme_dark.xml  | 2 +-
 vector/src/main/res/values/theme_light.xml | 4 ++--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index e4cfa18461..4b0d4d008d 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -131,7 +131,6 @@
     <color name="riotx_notice">#FFFF4B55</color>
     <color name="riotx_notice_secondary">#FF61708B</color>
     <color name="riotx_notice_secondary_alpha12">#1E61708B</color>
-    <color name="riotx_links">#FF368BD6</color>
 
     <color name="riotx_avatar_fill_1">#FF03B381</color>
     <color name="riotx_avatar_fill_2">#FF368bd6</color>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index d81b4cb6e9..8017376cc3 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -271,7 +271,7 @@
         <item name="android:textColorSecondary">@color/riot_secondary_text_color_dark</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/riot_tertiary_text_color_dark</item>
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_dark</item>
     </style>
 
     <style name="Vector.BottomSheet.Light" parent="Theme.Design.Light.BottomSheetDialog">
@@ -279,7 +279,7 @@
         <item name="android:textColorSecondary">@color/riot_secondary_text_color_light</item>
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/riot_tertiary_text_color_light</item>
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_light</item>
     </style>
 
 
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index e5c6851f40..5403c521b4 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -66,8 +66,6 @@
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
-
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
 
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 953691a6b7..eeba89ec44 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -66,7 +66,7 @@
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
         <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_dark</item>
 
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index cae2ef7794..2a8be2e557 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -65,7 +65,7 @@
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
         <item name="alertDialogTheme">@style/VectorAlertDialogStyleLight</item>
 
-        <item name="android:textColorLink">@color/riotx_links</item>
+        <item name="android:textColorLink">@color/link_color_light</item>
 
         <!-- Menu text color -->
         <item name="android:actionMenuTextColor">?colorAccent</item>
@@ -82,7 +82,7 @@
         <item name="vctr_toolbar_primary_text_color">@color/riotx_text_primary_light</item>
         <!-- Base Text Secondary-->
         <item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
-        <item name="vctr_toolbar_link_text_color">@color/riotx_links</item>
+        <item name="vctr_toolbar_link_text_color">@color/link_color_light</item>
 
         <!-- default text colors -->
         <item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>

From d4d7c6cb4a7996a6bff9651cde7c1067505407c7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Feb 2021 18:25:56 +0100
Subject: [PATCH 204/578] Cleanup riotx_base colors

---
 .../main/res/layout/fragment_home_drawer.xml   |  2 +-
 vector/src/main/res/values/colors.xml          | 18 ++++--------------
 vector/src/main/res/values/theme_black.xml     |  4 +---
 vector/src/main/res/values/theme_dark.xml      |  4 +---
 vector/src/main/res/values/theme_light.xml     |  4 +---
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 642119e5f8..0a4206b8c0 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -12,7 +12,7 @@
         android:id="@+id/homeDrawerHeader"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?riotx_base"
+        android:background="?vctr_home_drawer_header_background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index 4b0d4d008d..ec6daa4a94 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -161,10 +161,10 @@
     <color name="riotx_background_dark">#FF15191E</color>
     <color name="riotx_background_black">#FF000000</color>
 
-    <attr name="riotx_base" format="color" />
-    <color name="riotx_base_light">#FFF5F7FA</color>
-    <color name="riotx_base_dark">#FF22282F</color>
-    <color name="riotx_base_black">#FF000000</color>
+    <attr name="vctr_home_drawer_header_background" format="color" />
+    <color name="vctr_home_drawer_header_background_light">#FFF5F7FA</color>
+    <color name="vctr_home_drawer_header_background_dark">#FF22282F</color>
+    <color name="vctr_home_drawer_header_background_black">#FF000000</color>
 
     <!-- Background color of bottom sheets -->
     <attr name="riotx_bottom_sheet_background" format="color" />
@@ -172,16 +172,6 @@
     <color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
     <color name="riotx_bottom_sheet_background_black">#FF282C35</color>
 
-    <attr name="riotx_base_text_icon_primary" format="color" />
-    <color name="riotx_base_text_icon_primary_light">#FFFFFFFF</color>
-    <color name="riotx_base_text_icon_primary_dark">#FFEDF3FF</color>
-    <color name="riotx_base_text_icon_primary_black">#FFEDF3FF</color>
-
-    <attr name="riotx_base_text_icon_secondary" format="color" />
-    <color name="riotx_base_text_icon_secondary_light">#FFFFFFFF</color>
-    <color name="riotx_base_text_icon_secondary_dark">#FFEDF3FF</color>
-    <color name="riotx_base_text_icon_secondary_black">#FFEDF3FF</color>
-
     <attr name="riotx_search_background_mobile" format="color" />
     <color name="riotx_search_background_mobile_light">#FFFFFFFF</color>
     <color name="riotx_search_background_mobile_dark">#FF181B21</color>
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 5403c521b4..0d487127d6 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -8,9 +8,7 @@
 
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_black</item>
-        <item name="riotx_base">@color/riotx_base_black</item>
-        <item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_black</item>
-        <item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_black</item>
+        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_black</item>
         <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_black</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_black</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_black</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index eeba89ec44..8cdf76afb6 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -6,9 +6,7 @@
     <style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar.Bridge">
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_dark</item>
-        <item name="riotx_base">@color/riotx_base_dark</item>
-        <item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_dark</item>
-        <item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_dark</item>
+        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_dark</item>
         <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_dark</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_dark</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 2a8be2e557..6df21a4d47 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -6,9 +6,7 @@
     <style name="AppTheme.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_light</item>
-        <item name="riotx_base">@color/riotx_base_light</item>
-        <item name="riotx_base_text_icon_primary">@color/riotx_base_text_icon_primary_light</item>
-        <item name="riotx_base_text_icon_secondary">@color/riotx_base_text_icon_secondary_light</item>
+        <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item>
         <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_light</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_light</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_light</item>

From 7c5ea63a4f22dfa6c3d88c016aa3cb6b7cd69383 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Feb 2021 18:29:56 +0100
Subject: [PATCH 205/578] Remove unused colors

---
 vector/src/main/res/values/attrs.xml       | 3 ---
 vector/src/main/res/values/colors.xml      | 1 -
 vector/src/main/res/values/theme_dark.xml  | 3 ---
 vector/src/main/res/values/theme_light.xml | 3 ---
 4 files changed, 10 deletions(-)

diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 0b9852634d..0cf346a4b4 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -29,9 +29,6 @@
 
     <attr name="vctr_list_divider_color" format="color" />
 
-    <!-- outgoing call background color -->
-    <attr name="vctr_pending_outgoing_view_background_color" format="color" />
-
     <!-- room notification text color (typing, unsent...) -->
     <attr name="vctr_room_notification_text_color" format="color" />
 
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index ec6daa4a94..01379eee70 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -155,7 +155,6 @@
       'riotx_<name in the palette snake case>_<theme>'
       -->
 
-
     <attr name="riotx_background" format="color" />
     <color name="riotx_background_light">#FFFFFFFF</color>
     <color name="riotx_background_dark">#FF15191E</color>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 8cdf76afb6..bf4793033c 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -112,9 +112,6 @@
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item>
 
-        <!-- outgoing call background color -->
-        <item name="vctr_pending_outgoing_view_background_color">#33FFFFFF</item>
-
         <!-- room notification text color (typing, unsent...) -->
         <!--Notice (secondary)-->
         <item name="vctr_room_notification_text_color">#FF61708b</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 6df21a4d47..dc7a16b9ba 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -112,9 +112,6 @@
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_light</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item>
 
-        <!-- outgoing call background color -->
-        <item name="vctr_pending_outgoing_view_background_color">#33000000</item>
-
         <!-- room notification text color (typing, unsent...) -->
         <!--Notice (secondary)-->
         <item name="vctr_room_notification_text_color">#FF61708b</item>

From f636b28823f5aa82008b33e10fab6bab60aa8949 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Feb 2021 19:49:46 +0100
Subject: [PATCH 206/578] Remove unused style

---
 vector/src/main/res/values-w480dp/styles.xml | 10 ----------
 vector/src/main/res/values/styles_riot.xml   | 14 --------------
 2 files changed, 24 deletions(-)
 delete mode 100644 vector/src/main/res/values-w480dp/styles.xml

diff --git a/vector/src/main/res/values-w480dp/styles.xml b/vector/src/main/res/values-w480dp/styles.xml
deleted file mode 100644
index 5f117273a3..0000000000
--- a/vector/src/main/res/values-w480dp/styles.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Linear Layout orientation, depending on screen size, horizontal for width >= 480dp -->
-    <style name="VectorLinearLayout">
-        <item name="android:gravity">end</item>
-        <item name="android:orientation">horizontal</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 8017376cc3..f7efcd8f86 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -251,20 +251,6 @@
         <item name="android:paddingBottom">10dp</item>
     </style>
 
-    <style name="SpinnerTheme">
-        <item name="colorControlNormal">?attr/vctr_list_header_primary_text_color</item>
-    </style>
-
-    <style name="PopMenuStyle" parent="Widget.AppCompat.PopupMenu">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <!-- Linear Layout orientation, depending on screen size. Vertical by default -->
-    <style name="VectorLinearLayout">
-        <item name="android:gravity">end</item>
-        <item name="android:orientation">vertical</item>
-    </style>
-
     <!-- BottomSheet theming -->
     <style name="Vector.BottomSheet.Dark" parent="Theme.Design.BottomSheetDialog">
         <item name="android:textColorPrimary">@color/riot_primary_text_color_dark</item>

From 8cd02afd83d28ae574ddc72be0d23c9a84851794 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Feb 2021 20:07:49 +0100
Subject: [PATCH 207/578] Remove unused resource and useless color override

---
 .../main/res/layout/activity_bug_report.xml   |  1 -
 .../res/layout/dialog_export_e2e_keys.xml     |  2 -
 .../res/layout/dialog_import_e2e_keys.xml     |  1 -
 vector/src/main/res/values/attrs.xml          |  6 ---
 vector/src/main/res/values/colors.xml         | 40 -------------------
 vector/src/main/res/values/styles_riot.xml    | 12 ------
 vector/src/main/res/values/theme_black.xml    | 10 -----
 vector/src/main/res/values/theme_dark.xml     | 14 -------
 vector/src/main/res/values/theme_light.xml    | 14 -------
 9 files changed, 100 deletions(-)

diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 2347d84ee3..78a0139e1d 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -75,7 +75,6 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginEnd="10dp"
                     android:hint="@string/send_bug_report_placeholder"
-                    android:textColorHint="?attr/vctr_default_text_hint_color"
                     app:counterEnabled="true"
                     app:counterMaxLength="500">
 
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index 9561c59301..10c9dcd59b 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -39,7 +39,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:layout_constraintEnd_toStartOf="@+id/exportDialogShowPassword"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/exportDialogText">
@@ -61,7 +60,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:errorEnabled="true"
         app:layout_constraintEnd_toEndOf="@+id/exportDialogTil"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/dialog_import_e2e_keys.xml b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
index 68621f8230..177dbd1f66 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -29,7 +29,6 @@
         style="@style/VectorTextInputLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textColorHint="?attr/vctr_default_text_hint_color"
         app:layout_constraintEnd_toStartOf="@+id/importDialogShowPassword"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/dialog_e2e_keys_passphrase_filename">
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 0cf346a4b4..94a43037ae 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -6,9 +6,6 @@
     <attr name="vctr_toolbar_secondary_text_color" format="color" />
     <attr name="vctr_toolbar_link_text_color" format="color" />
 
-    <!-- default text colors -->
-    <attr name="vctr_default_text_hint_color" format="color" />
-
     <!-- room message colors -->
     <attr name="vctr_unsent_message_text_color" format="color" />
     <attr name="vctr_message_text_color" format="color" />
@@ -19,9 +16,6 @@
     <attr name="vctr_markdown_block_background_color" format="color" />
     <attr name="vctr_spoiler_background_color" format="color" />
 
-    <!-- tab bar colors -->
-    <attr name="vctr_tab_bar_inverted_background_color" format="color" />
-
     <!-- list colors -->
     <attr name="vctr_list_header_background_color" format="color" />
     <attr name="vctr_list_header_primary_text_color" format="color" />
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index 01379eee70..7561e6f843 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -171,11 +171,6 @@
     <color name="riotx_bottom_sheet_background_dark">#FF282C35</color>
     <color name="riotx_bottom_sheet_background_black">#FF282C35</color>
 
-    <attr name="riotx_search_background_mobile" format="color" />
-    <color name="riotx_search_background_mobile_light">#FFFFFFFF</color>
-    <color name="riotx_search_background_mobile_dark">#FF181B21</color>
-    <color name="riotx_search_background_mobile_black">#FF181B21</color>
-
     <attr name="riotx_header_panel_background" format="color" />
     <color name="riotx_header_panel_background_light">#FFF3F8FD</color>
     <color name="riotx_header_panel_background_dark">#FF22262E</color>
@@ -186,11 +181,6 @@
     <color name="riotx_header_panel_border_mobile_dark">#FF181B21</color>
     <color name="riotx_header_panel_border_mobile_black">#FF0D0F12</color>
 
-    <attr name="riotx_header_panel_text_primary" format="color" />
-    <color name="riotx_header_panel_text_primary_light">#FF171910</color>
-    <color name="riotx_header_panel_text_primary_dark">#FFFFFFFF</color>
-    <color name="riotx_header_panel_text_primary_black">#FFFFFFFF</color>
-
     <attr name="riotx_header_panel_text_secondary" format="color" />
     <color name="riotx_header_panel_text_secondary_light">#8F97A3</color>
     <color name="riotx_header_panel_text_secondary_dark">#FFA9B2BC</color>
@@ -223,47 +213,17 @@
     <color name="riotx_android_secondary_dark">#FF8F97A3</color>
     <color name="riotx_android_secondary_black">#FFA9B2BC</color>
 
-    <attr name="riotx_search_placeholder" format="color" />
-    <color name="riotx_search_placeholder_light">#FF8F97A3</color>
-    <color name="riotx_search_placeholder_dark">#FFA9B2BC</color>
-    <color name="riotx_search_placeholder_black">#FFA9B2BC</color>
-
-    <attr name="riotx_room_highlight" format="color" />
-    <color name="riotx_room_highlight_light">#FFF6F7F8</color>
-    <color name="riotx_room_highlight_dark">#FF343446</color>
-    <color name="riotx_room_highlight_black">#FF343446</color>
-
     <attr name="riotx_unread_room_indent" format="color" />
     <color name="riotx_unread_room_indent_light">#FF2E3648</color>
     <color name="riotx_unread_room_indent_dark">#FF2E3648</color>
     <color name="riotx_unread_room_indent_black">#FF2E3648</color>
 
-    <attr name="riotx_android_status_bar" format="color" />
-    <color name="riotx_android_status_bar_light">#FF2E3648</color>
-    <color name="riotx_android_status_bar_dark">#FF0D0E10</color>
-    <color name="riotx_android_status_bar_black">#FF0D0E10</color>
-
-    <attr name="riotx_line_break_mobile" format="color" />
-    <color name="riotx_line_break_mobile_light">#FFEEEFEF</color>
-    <color name="riotx_line_break_mobile_dark">#FF61708B</color>
-    <color name="riotx_line_break_mobile_black">#FF61708B</color>
-
     <!-- Other colors, which are not in the pallette -->
     <attr name="riotx_unread_room_badge" format="color" />
     <color name="riotx_unread_room_badge_light">#FF61708B</color>
     <color name="riotx_unread_room_badge_dark">#FF61708B</color>
     <color name="riotx_unread_room_badge_black">#FF61708B</color>
 
-    <attr name="riotx_fab_secondary_bg" format="color" />
-    <color name="riotx_fab_secondary_bg_light">@color/white</color>
-    <color name="riotx_fab_secondary_bg_dark">#FF181B21</color>
-    <color name="riotx_fab_secondary_bg_black">#FF181B21</color>
-
-    <attr name="riotx_fab_secondary_color" format="color" />
-    <color name="riotx_fab_secondary_color_light">@color/black</color>
-    <color name="riotx_fab_secondary_color_dark">@color/white</color>
-    <color name="riotx_fab_secondary_color_black">@color/white</color>
-
     <attr name="riotx_fab_label_bg" format="color" />
     <color name="riotx_fab_label_bg_light">@color/white</color>
     <color name="riotx_fab_label_bg_dark">#FF181B21</color>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index f7efcd8f86..bf74dd86fa 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -227,18 +227,6 @@
         <item name="tabMaxWidth">0dp</item>
     </style>
 
-    <style name="VectorUnifiedSearches.TabLayout" parent="Widget.Design.TabLayout">
-        <item name="tabGravity">fill</item>
-        <item name="tabMode">fixed</item>
-        <item name="tabPaddingStart">0dp</item>
-        <item name="tabPaddingEnd">0dp</item>
-        <item name="tabBackground">?attr/vctr_tab_bar_inverted_background_color</item>
-        <item name="tabTextColor">?attr/colorAccent</item>
-        <item name="tabSelectedTextColor">?attr/colorAccent</item>
-        <item name="tabIndicatorColor">?attr/colorAccent</item>
-        <item name="tabMaxWidth">0dp</item>
-    </style>
-
     <style name="ListHeader">
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">?vctr_list_header_primary_text_color</item>
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 0d487127d6..8a03e29375 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -9,24 +9,16 @@
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_black</item>
         <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_black</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_black</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_black</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_black</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_black</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_black</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_black</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_black</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_black</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_black</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_black</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_black</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_black</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_black</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_black</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_black</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_black</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_black</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_black</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_black</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_black</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_black</item>
@@ -39,8 +31,6 @@
         <item name="riotx_reaction_background_on">@color/riotx_reaction_background_on_black</item>
         <item name="riotx_alerter_background">@color/riotx_alerter_background_black</item>
 
-        <item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_black</item>
-
         <!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
         <item name="colorPrimary">@color/riotx_accent</item>
         <!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index bf4793033c..24500f6d78 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -7,24 +7,16 @@
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_dark</item>
         <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_dark</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_dark</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_dark</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_dark</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_dark</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_dark</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_dark</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_dark</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_dark</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_dark</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_dark</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_dark</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_dark</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_dark</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_dark</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_dark</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_dark</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_dark</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_dark</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_dark</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item>
@@ -82,9 +74,6 @@
         <item name="vctr_toolbar_secondary_text_color">@color/riot_secondary_text_color_dark</item>
         <item name="vctr_toolbar_link_text_color">@color/link_color_dark</item>
 
-        <!-- default text colors -->
-        <item name="vctr_default_text_hint_color">@color/default_text_hint_color_dark</item>
-
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
         <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
@@ -98,9 +87,6 @@
         <item name="riot_primary_text_color">@color/riot_primary_text_color_dark</item>
         <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_dark</item>
 
-        <!-- tab bar colors -->
-        <item name="vctr_tab_bar_inverted_background_color">?colorPrimary</item>
-
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">@color/primary_color_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index dc7a16b9ba..d0e33959c1 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -7,24 +7,16 @@
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_light</item>
         <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item>
-        <item name="riotx_search_background_mobile">@color/riotx_search_background_mobile_light</item>
         <item name="riotx_header_panel_background">@color/riotx_header_panel_background_light</item>
         <item name="riotx_header_panel_border_mobile">@color/riotx_header_panel_border_mobile_light</item>
-        <item name="riotx_header_panel_text_primary">@color/riotx_header_panel_text_primary_light</item>
         <item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_light</item>
         <item name="riotx_text_primary">@color/riotx_text_primary_light</item>
         <item name="riotx_text_secondary">@color/riotx_text_secondary_light</item>
         <item name="riotx_text_tertiary">@color/riotx_text_tertiary_light</item>
         <item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_light</item>
         <item name="riotx_android_secondary">@color/riotx_android_secondary_light</item>
-        <item name="riotx_search_placeholder">@color/riotx_search_placeholder_light</item>
-        <item name="riotx_room_highlight">@color/riotx_room_highlight_light</item>
         <item name="riotx_unread_room_indent">@color/riotx_unread_room_indent_light</item>
-        <item name="riotx_android_status_bar">@color/riotx_android_status_bar_light</item>
-        <item name="riotx_line_break_mobile">@color/riotx_line_break_mobile_light</item>
         <item name="riotx_unread_room_badge">@color/riotx_unread_room_badge_light</item>
-        <item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_light</item>
-        <item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_light</item>
         <item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item>
         <item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_light</item>
         <item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item>
@@ -82,9 +74,6 @@
         <item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
         <item name="vctr_toolbar_link_text_color">@color/link_color_light</item>
 
-        <!-- default text colors -->
-        <item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>
-
         <!-- room message colors -->
         <item name="vctr_notice_secondary">#61708B</item>
         <item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
@@ -98,9 +87,6 @@
         <item name="riot_primary_text_color">@color/riot_primary_text_color_light</item>
         <item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_light</item>
 
-        <!-- tab bar colors -->
-        <item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>
-
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">#FFF3F8FD</item>

From ea08ce24a921787fe4d5bf461b05aa0ff380f2e5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Feb 2021 20:21:16 +0100
Subject: [PATCH 208/578] Remove unused resource

---
 vector/src/debug/res/layout/item_test_linkify.xml  |  2 --
 .../detail/timeline/factory/MessageItemFactory.kt  |  2 +-
 vector/src/main/res/drawable/ic_sliders.xml        | 14 --------------
 .../src/main/res/drawable/pill_background_bing.xml |  6 ------
 .../src/main/res/drawable/rounded_rect_shape.xml   | 13 -------------
 .../main/res/drawable/rounded_rect_shape_off.xml   | 13 -------------
 vector/src/main/res/values/attrs.xml               |  2 --
 vector/src/main/res/values/styles_riot.xml         | 12 ------------
 vector/src/main/res/values/theme_dark.xml          |  4 ----
 vector/src/main/res/values/theme_light.xml         |  4 ----
 10 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 vector/src/main/res/drawable/ic_sliders.xml
 delete mode 100644 vector/src/main/res/drawable/pill_background_bing.xml
 delete mode 100644 vector/src/main/res/drawable/rounded_rect_shape.xml
 delete mode 100644 vector/src/main/res/drawable/rounded_rect_shape_off.xml

diff --git a/vector/src/debug/res/layout/item_test_linkify.xml b/vector/src/debug/res/layout/item_test_linkify.xml
index 19bebeaf50..89d1dade0d 100644
--- a/vector/src/debug/res/layout/item_test_linkify.xml
+++ b/vector/src/debug/res/layout/item_test_linkify.xml
@@ -12,7 +12,6 @@
         android:orientation="vertical">
 
         <TextView
-            style="@style/ListHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="AutoLink" />
@@ -26,7 +25,6 @@
             tools:text="www.example.org" />
 
         <TextView
-            style="@style/ListHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Custom Link" />
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index e9cf8251de..2e97abc32e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -468,7 +468,7 @@ class MessageItemFactory @Inject constructor(
         spannable.append(linkifiedBody)
         val editedSuffix = stringProvider.getString(R.string.edited_suffix)
         spannable.append(" ").append(editedSuffix)
-        val color = colorProvider.getColorFromAttribute(R.attr.vctr_list_header_secondary_text_color)
+        val color = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
         val editStart = spannable.lastIndexOf(editedSuffix)
         val editEnd = editStart + editedSuffix.length
         spannable.setSpan(
diff --git a/vector/src/main/res/drawable/ic_sliders.xml b/vector/src/main/res/drawable/ic_sliders.xml
deleted file mode 100644
index 55ccfcfb3d..0000000000
--- a/vector/src/main/res/drawable/ic_sliders.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="12dp"
-    android:viewportWidth="14"
-    android:viewportHeight="12">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M2.636,11V7.111M2.636,4.889V1M7,11V6M7,3.778V1M11.364,11V8.222M11.364,6V1M1,7.111h3.273M5.364,3.778h3.272M9.727,8.222H13"
-      android:strokeLineJoin="round"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#454545"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/pill_background_bing.xml b/vector/src/main/res/drawable/pill_background_bing.xml
deleted file mode 100644
index 70a2bda8a4..0000000000
--- a/vector/src/main/res/drawable/pill_background_bing.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/vector_fuchsia_color" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/rounded_rect_shape.xml b/vector/src/main/res/drawable/rounded_rect_shape.xml
deleted file mode 100644
index e9c0a27f59..0000000000
--- a/vector/src/main/res/drawable/rounded_rect_shape.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <!--<size android:width="40dp" android:height="22dp"/>-->
-
-    <solid android:color="?vctr_list_header_background_color" />
-
-    <stroke android:width="1dp" android:color="@color/accent_color_light" />
-
-    <corners android:radius="20dp" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_off.xml b/vector/src/main/res/drawable/rounded_rect_shape_off.xml
deleted file mode 100644
index 8dac3020e3..0000000000
--- a/vector/src/main/res/drawable/rounded_rect_shape_off.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size android:width="40dp" android:height="22dp"/>
-
-    <solid android:color="?vctr_list_header_background_color" />
-
-    <!--<stroke android:width="1dp" android:color="@color/list_divider_color_light" />-->
-
-    <corners android:radius="20dp" />
-
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 94a43037ae..ecc64bf07d 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -18,8 +18,6 @@
 
     <!-- list colors -->
     <attr name="vctr_list_header_background_color" format="color" />
-    <attr name="vctr_list_header_primary_text_color" format="color" />
-    <attr name="vctr_list_header_secondary_text_color" format="color" />
 
     <attr name="vctr_list_divider_color" format="color" />
 
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index bf74dd86fa..5f6890564a 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -227,18 +227,6 @@
         <item name="tabMaxWidth">0dp</item>
     </style>
 
-    <style name="ListHeader">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">?vctr_list_header_primary_text_color</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:background">?vctr_list_header_background_color</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">10dp</item>
-    </style>
-
     <!-- BottomSheet theming -->
     <style name="Vector.BottomSheet.Dark" parent="Theme.Design.BottomSheetDialog">
         <item name="android:textColorPrimary">@color/riot_primary_text_color_dark</item>
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 24500f6d78..5d22683b82 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -90,10 +90,6 @@
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">@color/primary_color_dark</item>
-        <!--Header/Panel Text Primary-->
-        <item name="vctr_list_header_primary_text_color">#FFA1B2D1</item>
-        <!--Header/Panel Text Secondary-->
-        <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item>
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index d0e33959c1..049f8dd1db 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -90,10 +90,6 @@
         <!-- list colors -->
         <!--Header/Panel Background-->
         <item name="vctr_list_header_background_color">#FFF3F8FD</item>
-        <!--Header/Panel Text Primary-->
-        <item name="vctr_list_header_primary_text_color">#FF61708B</item>
-        <!--Header/Panel Text Secondary-->
-        <item name="vctr_list_header_secondary_text_color">#FFC8C8CD</item>
 
         <item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_light</item>
         <item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item>

From 505d0995dea1b853de1bce6acf883484939d44e6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 15 Feb 2021 21:32:29 +0100
Subject: [PATCH 209/578] Remove unused resource

---
 .../sticker_description_background.xml        | 11 ------
 .../drawable/sticker_description_triangle.xml | 13 -------
 vector/src/main/res/values/styles_riot.xml    | 37 -------------------
 3 files changed, 61 deletions(-)
 delete mode 100644 vector/src/main/res/drawable/sticker_description_background.xml
 delete mode 100644 vector/src/main/res/drawable/sticker_description_triangle.xml

diff --git a/vector/src/main/res/drawable/sticker_description_background.xml b/vector/src/main/res/drawable/sticker_description_background.xml
deleted file mode 100644
index faa6f5b6f4..0000000000
--- a/vector/src/main/res/drawable/sticker_description_background.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/list_divider_color_light" />
-    <padding
-        android:bottom="5dp"
-        android:left="8dp"
-        android:right="5dp"
-        android:top="5dp" />
-</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/sticker_description_triangle.xml b/vector/src/main/res/drawable/sticker_description_triangle.xml
deleted file mode 100644
index 199c2e7313..0000000000
--- a/vector/src/main/res/drawable/sticker_description_triangle.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="15dp"
-    android:height="12dp"
-    android:viewportWidth="100"
-    android:viewportHeight="100">
-    <group android:name="triableGroup">
-        <path
-            android:name="triangle"
-            android:fillColor="#339D9D9D"
-            android:pathData="m 50,0 l 50,100 -100,0 z" />
-    </group>
-</vector>
\ No newline at end of file
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 5f6890564a..89d5ac12e2 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -97,11 +97,6 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-    <!-- home scroller menu -->
-    <style name="NavigationViewStyle">
-        <item name="android:textSize">14sp</item>
-    </style>
-
     <!-- Styles for login screen -->
     <style name="LoginEditTextStyle" parent="Widget.AppCompat.EditText">
         <item name="android:textSize">16sp</item>
@@ -195,38 +190,6 @@
         <item name="iconifiedByDefault">false</item>
     </style>
 
-    <style name="VectorSearches.EditText" parent="Widget.AppCompat.EditText">
-        <item name="android:textCursorDrawable">@drawable/searches_cursor_background</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="background">@android:color/transparent</item>
-    </style>
-
-    <style name="VectorSearches.Styled.ActionBar" parent="Vector.Styled.ActionBar">
-        <item name="android:background">?android:attr/colorBackground</item>
-        <item name="background">?android:attr/colorBackground</item>
-    </style>
-
-    <!-- tabbar text color -->
-    <style name="VectorSearches.TabText" parent="Widget.AppCompat.ActionBar.TabText">
-        <item name="android:textColor">?attr/colorAccent</item>
-    </style>
-
-    <style name="VectorSearches.ActionBarTheme" parent="ThemeOverlay.AppCompat.ActionBar">
-        <item name="colorControlNormal">?attr/colorAccent</item>
-    </style>
-
-    <style name="VectorPeopleSearches.TabLayout" parent="Widget.Design.TabLayout">
-        <item name="tabGravity">fill</item>
-        <item name="tabMode">fixed</item>
-        <item name="tabPaddingStart">0dp</item>
-        <item name="tabPaddingEnd">0dp</item>
-        <item name="tabBackground">?attr/colorAccent</item>
-        <item name="tabTextColor">@android:color/white</item>
-        <item name="tabSelectedTextColor">@android:color/white</item>
-        <item name="tabIndicatorColor">@android:color/white</item>
-        <item name="tabMaxWidth">0dp</item>
-    </style>
-
     <!-- BottomSheet theming -->
     <style name="Vector.BottomSheet.Dark" parent="Theme.Design.BottomSheetDialog">
         <item name="android:textColorPrimary">@color/riot_primary_text_color_dark</item>

From 9d7c31d531ecf79146085e4882524eee25dad7d3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Mar 2021 16:23:27 +0100
Subject: [PATCH 210/578] Riot -> Element

---
 .../sdk/api/session/sync/FilterService.kt        |  4 ++--
 .../sdk/internal/session/filter/FilterFactory.kt | 16 ++++++++--------
 .../internal/session/filter/SaveFilterTask.kt    | 12 ++++++------
 .../im/vector/app/core/extensions/Session.kt     |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
index 70de026857..6d1d12f1bc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
@@ -22,9 +22,9 @@ interface FilterService {
         NoFilter,
 
         /**
-         * Filter for Riot, will include only known event type
+         * Filter for Element, will include only known event type
          */
-        RiotFilter
+        ElementFilter
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 2eac0a5059..6b7f884708 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -33,11 +33,11 @@ internal object FilterFactory {
         return FilterUtil.enableLazyLoading(Filter(), true)
     }
 
-    fun createRiotFilter(): Filter {
+    fun createElementFilter(): Filter {
         return Filter(
                 room = RoomFilter(
-                        timeline = createRiotTimelineFilter(),
-                        state = createRiotStateFilter()
+                        timeline = createElementTimelineFilter(),
+                        state = createElementStateFilter()
                 )
         )
     }
@@ -48,7 +48,7 @@ internal object FilterFactory {
         )
     }
 
-    fun createRiotRoomFilter(): RoomEventFilter {
+    fun createElementRoomFilter(): RoomEventFilter {
         return RoomEventFilter(
                 lazyLoadMembers = true
                 // TODO Enable this for optimization
@@ -56,26 +56,26 @@ internal object FilterFactory {
         )
     }
 
-    private fun createRiotTimelineFilter(): RoomEventFilter {
+    private fun createElementTimelineFilter(): RoomEventFilter {
         return RoomEventFilter().apply {
             // TODO Enable this for optimization
             // types = listOfSupportedEventTypes.toMutableList()
         }
     }
 
-    private fun createRiotStateFilter(): RoomEventFilter {
+    private fun createElementStateFilter(): RoomEventFilter {
         return RoomEventFilter(
                 lazyLoadMembers = true
         )
     }
 
-    // Get only managed types by Riot
+    // Get only managed types by Element
     private val listOfSupportedEventTypes = listOf(
             // TODO Complete the list
             EventType.MESSAGE
     )
 
-    // Get only managed types by Riot
+    // Get only managed types by Element
     private val listOfSupportedStateEventTypes = listOf(
             // TODO Complete the list
             EventType.STATE_ROOM_MEMBER
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
index da747934e2..d42962d54a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
@@ -42,18 +42,18 @@ internal class DefaultSaveFilterTask @Inject constructor(
 
     override suspend fun execute(params: SaveFilterTask.Params) {
         val filterBody = when (params.filterPreset) {
-            FilterService.FilterPreset.RiotFilter -> {
-                FilterFactory.createRiotFilter()
+            FilterService.FilterPreset.ElementFilter -> {
+                FilterFactory.createElementFilter()
             }
-            FilterService.FilterPreset.NoFilter   -> {
+            FilterService.FilterPreset.NoFilter      -> {
                 FilterFactory.createDefaultFilter()
             }
         }
         val roomFilter = when (params.filterPreset) {
-            FilterService.FilterPreset.RiotFilter -> {
-                FilterFactory.createRiotRoomFilter()
+            FilterService.FilterPreset.ElementFilter -> {
+                FilterFactory.createElementRoomFilter()
             }
-            FilterService.FilterPreset.NoFilter   -> {
+            FilterService.FilterPreset.NoFilter      -> {
                 FilterFactory.createDefaultRoomFilter()
             }
         }
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
index 10dade70ea..a21d4ecab3 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Session.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
@@ -29,7 +29,7 @@ import timber.log.Timber
 fun Session.configureAndStart(context: Context) {
     Timber.i("Configure and start session for $myUserId")
     open()
-    setFilter(FilterService.FilterPreset.RiotFilter)
+    setFilter(FilterService.FilterPreset.ElementFilter)
     startSyncing(context)
     refreshPushers()
 }

From 9719c0b2f9730f2ebb7b7557ffbe161c85b2e57a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Mar 2021 21:45:05 +0100
Subject: [PATCH 211/578] Split init sync insertion into 2 transactions.
 Ephemeral Events can be inserted later, so the room list can be displayed
 faster.

---
 CHANGES.md                                    |  2 +-
 .../android/sdk/internal/di/MoshiProvider.kt  |  4 +-
 .../notification/ProcessEventForPushTask.kt   |  4 +-
 .../session/sync/InitialSyncStrategy.kt       |  6 +--
 .../internal/session/sync/RoomSyncHandler.kt  | 43 +++++++++++++------
 .../session/sync/SyncResponseHandler.kt       | 13 +++++-
 .../sdk/internal/session/sync/SyncTask.kt     | 38 +++++++++-------
 ...zyRoomSync.kt => LazyRoomSyncEphemeral.kt} | 12 +++---
 .../internal/session/sync/model/RoomSync.kt   |  2 +-
 .../session/sync/model/RoomsSyncResponse.kt   |  2 +-
 ...efaultLazyRoomSyncEphemeralJsonAdapter.kt} | 22 +++++-----
 11 files changed, 90 insertions(+), 58 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/{LazyRoomSync.kt => LazyRoomSyncEphemeral.kt} (71%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/{LazyRoomSyncJsonAdapters.kt => DefaultLazyRoomSyncEphemeralJsonAdapter.kt} (82%)

diff --git a/CHANGES.md b/CHANGES.md
index ea78fcaf7d..8783bce6d8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,7 +7,7 @@ Features ✨:
 Improvements 🙌:
  - Allow non-HTTPS connections to homeservers on Tor (#2941)
  - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831)
- - Improve initial sync performance (#983)
+ - Improve initial sync performance - split into 2 transactions (#983)
  - PIP support for Jitsi call (#2418)
  - Add tooltip for room quick actions
  - Pre-share session keys when opening a room or start typing (#2771)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index b6bc17eaa0..074f8dc43e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -36,7 +36,7 @@ import org.matrix.android.sdk.internal.network.parsing.ForceToBooleanJsonAdapter
 import org.matrix.android.sdk.internal.network.parsing.RuntimeJsonAdapterFactory
 import org.matrix.android.sdk.internal.network.parsing.TlsVersionMoshiAdapter
 import org.matrix.android.sdk.internal.network.parsing.UriMoshiAdapter
-import org.matrix.android.sdk.internal.session.sync.parsing.DefaultLazyRoomSyncJsonAdapter
+import org.matrix.android.sdk.internal.session.sync.parsing.DefaultLazyRoomSyncEphemeralJsonAdapter
 
 object MoshiProvider {
 
@@ -46,7 +46,7 @@ object MoshiProvider {
             .add(CipherSuiteMoshiAdapter())
             .add(TlsVersionMoshiAdapter())
             // Use addLast here so we can inject a SplitLazyRoomSyncJsonAdapter later to override the default parsing.
-            .addLast(DefaultLazyRoomSyncJsonAdapter())
+            .addLast(DefaultLazyRoomSyncEphemeralJsonAdapter())
             .add(RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java)
                     .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT)
                     .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
index 4754265c49..54883b51e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
@@ -50,7 +50,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
         }
         val newJoinEvents = params.syncResponse.join
                 .mapNotNull { (key, value) ->
-                    value.roomSync.timeline?.events?.map { it.copy(roomId = key) }
+                    value.timeline?.events?.map { it.copy(roomId = key) }
                 }
                 .flatten()
         val inviteEvents = params.syncResponse.invite
@@ -80,7 +80,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
 
         val allRedactedEvents = params.syncResponse.join
                 .asSequence()
-                .mapNotNull { (_, value) -> value.roomSync.timeline?.events }
+                .mapNotNull { it.value.timeline?.events }
                 .flatten()
                 .filter { it.type == EventType.REDACTION }
                 .mapNotNull { it.redacts }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
index fca92870ca..297cc213ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
@@ -41,10 +41,10 @@ sealed class InitialSyncStrategy {
              */
             val minSizeToSplit: Long = 1024 * 1024,
             /**
-             * Limit per room to reach to decide to store a join room into a file
-             * Empiric value: 10 kilobytes
+             * Limit per room to reach to decide to store a join room ephemeral Events into a file
+             * Empiric value: 6 kilobytes
              */
-            val minSizeToStoreInFile: Long = 10 * 1024,
+            val minSizeToStoreInFile: Long = 6 * 1024,
             /**
              * Max number of rooms to insert at a time in database (to avoid too much RAM usage)
              */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index eac5e7e6ba..20ea412f14 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -60,10 +60,8 @@ import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.internal.session.room.timeline.TimelineInput
 import org.matrix.android.sdk.internal.session.room.typing.TypingEventContent
 import org.matrix.android.sdk.internal.session.sync.model.InvitedRoomSync
-import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
 import org.matrix.android.sdk.internal.session.sync.model.RoomSync
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncAccountData
-import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral
 import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
 import timber.log.Timber
 import javax.inject.Inject
@@ -81,7 +79,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                                    private val timelineInput: TimelineInput) {
 
     sealed class HandlingStrategy {
-        data class JOINED(val data: Map<String, LazyRoomSync>) : HandlingStrategy()
+        data class JOINED(val data: Map<String, RoomSync>) : HandlingStrategy()
         data class INVITED(val data: Map<String, InvitedRoomSync>) : HandlingStrategy()
         data class LEFT(val data: Map<String, RoomSync>) : HandlingStrategy()
     }
@@ -96,6 +94,19 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, reporter)
     }
 
+    fun handleInitSyncEphemeral(realm: Realm,
+                                roomsSyncResponse: RoomsSyncResponse) {
+        roomsSyncResponse.join.forEach { roomSync ->
+            val ephemeralResult = roomSync.value.ephemeral
+                    ?.roomSyncEphemeral
+                    ?.events
+                    ?.takeIf { it.isNotEmpty() }
+                    ?.let { events -> handleEphemeral(realm, roomSync.key, events, true) }
+
+            roomTypingUsersHandler.handle(realm, roomSync.key, ephemeralResult)
+        }
+    }
+
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleRoomSync(realm: Realm, handlingStrategy: HandlingStrategy, isInitialSync: Boolean, reporter: ProgressReporter?) {
@@ -113,7 +124,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                     emptyList()
                 } else {
                     handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
-                        handleJoinedRoom(realm, it.key, it.value.roomSync, insertType, syncLocalTimeStampMillis)
+                        handleJoinedRoom(realm, it.key, it.value, true, insertType, syncLocalTimeStampMillis)
                     }
                 }
             }
@@ -152,11 +163,12 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                     .also { Timber.v("INIT_SYNC insert ${roomIds.size} rooms") }
                                     .map {
                                         handleJoinedRoom(
-                                                realm,
-                                                it,
-                                                (handlingStrategy.data[it] ?: error("Should not happen")).roomSync,
-                                                insertType,
-                                                syncLocalTimeStampMillis
+                                                realm = realm,
+                                                roomId = it,
+                                                roomSync = handlingStrategy.data[it] ?: error("Should not happen"),
+                                                handleEphemeralEvents = false,
+                                                insertType = insertType,
+                                                syncLocalTimestampMillis = syncLocalTimeStampMillis
                                         )
                                     }
                             realm.insertOrUpdate(roomEntities)
@@ -166,7 +178,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         } else {
             // No need to split
             val rooms = handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
-                handleJoinedRoom(realm, it.key, it.value.roomSync, insertType, syncLocalTimeStampMillis)
+                handleJoinedRoom(realm, it.key, it.value, false, insertType, syncLocalTimeStampMillis)
             }
             realm.insertOrUpdate(rooms)
         }
@@ -175,13 +187,16 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
     private fun handleJoinedRoom(realm: Realm,
                                  roomId: String,
                                  roomSync: RoomSync,
+                                 handleEphemeralEvents: Boolean,
                                  insertType: EventInsertType,
                                  syncLocalTimestampMillis: Long): RoomEntity {
         Timber.v("Handle join sync for room $roomId")
 
         var ephemeralResult: EphemeralResult? = null
-        if (roomSync.ephemeral?.events?.isNotEmpty() == true) {
-            ephemeralResult = handleEphemeral(realm, roomId, roomSync.ephemeral, insertType == EventInsertType.INITIAL_SYNC)
+        if (handleEphemeralEvents) {
+            ephemeralResult = roomSync.ephemeral?.roomSyncEphemeral?.events
+                    ?.takeIf { it.isNotEmpty() }
+                    ?.let { handleEphemeral(realm, roomId, it, false) }
         }
 
         if (roomSync.accountData?.events?.isNotEmpty() == true) {
@@ -421,10 +436,10 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
 
     private fun handleEphemeral(realm: Realm,
                                 roomId: String,
-                                ephemeral: RoomSyncEphemeral,
+                                ephemeralEvents: List<Event>,
                                 isInitialSync: Boolean): EphemeralResult {
         var result = EphemeralResult()
-        for (event in ephemeral.events) {
+        for (event in ephemeralEvents) {
             when (event.type) {
                 EventType.RECEIPT -> {
                     @Suppress("UNCHECKED_CAST")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index 167e45031c..d17a672485 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -25,10 +25,10 @@ import org.matrix.android.sdk.internal.crypto.DefaultCryptoService
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
-import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
 import org.matrix.android.sdk.internal.session.group.GetGroupDataWorker
-import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
+import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
 import org.matrix.android.sdk.internal.session.initsync.reportSubtask
+import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
 import org.matrix.android.sdk.internal.session.sync.model.GroupsSyncResponse
 import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
@@ -128,6 +128,15 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
         cryptoSyncHandler.onSyncCompleted(syncResponse)
     }
 
+    suspend fun handleInitSyncSecondTransaction(syncResponse: SyncResponse) {
+        // Start another transaction to handle the ephemeral events
+        monarchy.awaitTransaction { realm ->
+            if (syncResponse.rooms != null) {
+                roomSyncHandler.handleInitSyncEphemeral(realm, syncResponse.rooms)
+            }
+        }
+    }
+
     /**
      * At the moment we don't get any group data through the sync, so we poll where every hour.
      * You can also force to refetch group data using [Group] API.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 3d0368ef03..97badfa1e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -28,7 +28,7 @@ import org.matrix.android.sdk.internal.session.filter.FilterRepository
 import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilitiesTask
 import org.matrix.android.sdk.internal.session.initsync.DefaultInitialSyncProgressService
 import org.matrix.android.sdk.internal.session.initsync.reportSubtask
-import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
+import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.session.sync.parsing.InitialSyncResponseParser
 import org.matrix.android.sdk.internal.session.user.UserStore
@@ -98,10 +98,15 @@ internal class DefaultSyncTask @Inject constructor(
         val readTimeOut = (params.timeout + TIMEOUT_MARGIN).coerceAtLeast(TimeOutInterceptor.DEFAULT_LONG_TIMEOUT)
 
         if (isInitialSync) {
+            Timber.v("INIT_SYNC with filter: ${requestParams["filter"]}")
             val initSyncStrategy = initialSyncStrategy
+            var syncResp: SyncResponse? = null
             logDuration("INIT_SYNC strategy: $initSyncStrategy") {
                 if (initSyncStrategy is InitialSyncStrategy.Optimized) {
-                    safeInitialSync(requestParams, initSyncStrategy)
+                    val file = downloadInitSyncResponse(requestParams)
+                    syncResp = reportSubtask(initialSyncProgressService, InitSyncStep.ImportingAccount, 1, 0.7F) {
+                        handleSyncFile(file, initSyncStrategy)
+                    }
                 } else {
                     val syncResponse = logDuration("INIT_SYNC Request") {
                         executeRequest<SyncResponse>(globalErrorReceiver) {
@@ -118,6 +123,15 @@ internal class DefaultSyncTask @Inject constructor(
                 }
             }
             initialSyncProgressService.endAll()
+
+            if (initSyncStrategy is InitialSyncStrategy.Optimized) {
+                logDuration("INIT_SYNC Handle ephemeral") {
+                    syncResponseHandler.handleInitSyncSecondTransaction(syncResp!!)
+                }
+                initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
+                // Delete all files
+                workingDir.deleteRecursively()
+            }
         } else {
             val syncResponse = executeRequest<SyncResponse>(globalErrorReceiver) {
                 apiCall = syncAPI.sync(
@@ -130,12 +144,11 @@ internal class DefaultSyncTask @Inject constructor(
         Timber.v("Sync task finished on Thread: ${Thread.currentThread().name}")
     }
 
-    private suspend fun safeInitialSync(requestParams: Map<String, String>, initSyncStrategy: InitialSyncStrategy.Optimized) {
+    private suspend fun downloadInitSyncResponse(requestParams: Map<String, String>): File {
         workingDir.mkdirs()
         val workingFile = File(workingDir, "initSync.json")
         val status = initialSyncStatusRepository.getStep()
         if (workingFile.exists() && status >= InitialSyncStatus.STEP_DOWNLOADED) {
-            // Go directly to the parse step
             Timber.v("INIT_SYNC file is already here")
             reportSubtask(initialSyncProgressService, InitSyncStep.Downloading, 1, 0.3f) {
                 // Empty task
@@ -164,12 +177,7 @@ internal class DefaultSyncTask @Inject constructor(
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_DOWNLOADED)
         }
-        reportSubtask(initialSyncProgressService, InitSyncStep.ImportingAccount, 1, 0.7F) {
-            handleSyncFile(workingFile, initSyncStrategy)
-        }
-
-        // Delete all files
-        workingDir.deleteRecursively()
+        return workingFile
     }
 
     private suspend fun getSyncResponse(requestParams: Map<String, String>, maxNumberOfRetries: Int): Response<ResponseBody> {
@@ -191,21 +199,21 @@ internal class DefaultSyncTask @Inject constructor(
         }
     }
 
-    private suspend fun handleSyncFile(workingFile: File, initSyncStrategy: InitialSyncStrategy.Optimized) {
-        logDuration("INIT_SYNC handleSyncFile()") {
+    private suspend fun handleSyncFile(workingFile: File, initSyncStrategy: InitialSyncStrategy.Optimized): SyncResponse {
+        return logDuration("INIT_SYNC handleSyncFile()") {
             val syncResponse = logDuration("INIT_SYNC Read file and parse") {
                 syncResponseParser.parse(initSyncStrategy, workingFile)
             }
             initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_PARSED)
             // Log some stats
             val nbOfJoinedRooms = syncResponse.rooms?.join?.size ?: 0
-            val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it is LazyRoomSync.Stored }
-            Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile stored into files")
+            val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it.ephemeral is LazyRoomSyncEphemeral.Stored }
+            Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile ephemeral stored into files")
 
             logDuration("INIT_SYNC Database insertion") {
                 syncResponseHandler.handleResponse(syncResponse, null, initialSyncProgressService)
             }
-            initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
+            syncResponse
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt
similarity index 71%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt
index 1f6e3de9a4..938168b5f4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt
@@ -24,18 +24,18 @@ import okio.source
 import java.io.File
 
 @JsonClass(generateAdapter = false)
-internal sealed class LazyRoomSync {
-    data class Parsed(val _roomSync: RoomSync) : LazyRoomSync()
-    data class Stored(val roomSyncAdapter: JsonAdapter<RoomSync>, val file: File) : LazyRoomSync()
+internal sealed class LazyRoomSyncEphemeral {
+    data class Parsed(val _roomSyncEphemeral: RoomSyncEphemeral) : LazyRoomSyncEphemeral()
+    data class Stored(val roomSyncEphemeralAdapter: JsonAdapter<RoomSyncEphemeral>, val file: File) : LazyRoomSyncEphemeral()
 
-    val roomSync: RoomSync
+    val roomSyncEphemeral: RoomSyncEphemeral
         get() {
             return when (this) {
-                is Parsed -> _roomSync
+                is Parsed -> _roomSyncEphemeral
                 is Stored -> {
                     // Parse the file now
                     file.inputStream().use { pos ->
-                        roomSyncAdapter.fromJson(JsonReader.of(pos.source().buffer()))!!
+                        roomSyncEphemeralAdapter.fromJson(JsonReader.of(pos.source().buffer()))!!
                     }
                 }
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
index 212d319139..9aed0d37d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
@@ -34,7 +34,7 @@ internal data class RoomSync(
         /**
          * The ephemeral events in the room that aren't recorded in the timeline or state of the room (e.g. typing, receipts).
          */
-        @Json(name = "ephemeral") val ephemeral: RoomSyncEphemeral? = null,
+        @Json(name = "ephemeral") val ephemeral: LazyRoomSyncEphemeral? = null,
 
         /**
          * The account data events for the room (e.g. tags).
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
index a62d80a088..dd2f96c988 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
@@ -24,7 +24,7 @@ internal data class RoomsSyncResponse(
         /**
          * Joined rooms: keys are rooms ids.
          */
-        @Json(name = "join") val join: Map<String, LazyRoomSync> = emptyMap(),
+        @Json(name = "join") val join: Map<String, RoomSync> = emptyMap(),
 
         /**
          * Invitations. The rooms that the user has been invited to: keys are rooms ids.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
index 951fdf86aa..ef56802a66 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/LazyRoomSyncJsonAdapters.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
@@ -22,22 +22,22 @@ import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.ToJson
 import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
-import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSync
-import org.matrix.android.sdk.internal.session.sync.model.RoomSync
+import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral
+import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral
 import timber.log.Timber
 import java.io.File
 import java.util.concurrent.atomic.AtomicInteger
 
-internal class DefaultLazyRoomSyncJsonAdapter {
+internal class DefaultLazyRoomSyncEphemeralJsonAdapter {
 
     @FromJson
-    fun fromJson(reader: JsonReader, delegate: JsonAdapter<RoomSync>): LazyRoomSync? {
-        val roomSync = delegate.fromJson(reader) ?: return null
-        return LazyRoomSync.Parsed(roomSync)
+    fun fromJson(reader: JsonReader, delegate: JsonAdapter<RoomSyncEphemeral>): LazyRoomSyncEphemeral? {
+        val roomSyncEphemeral = delegate.fromJson(reader) ?: return null
+        return LazyRoomSyncEphemeral.Parsed(roomSyncEphemeral)
     }
 
     @ToJson
-    fun toJson(writer: JsonWriter, value: LazyRoomSync?) {
+    fun toJson(writer: JsonWriter, value: LazyRoomSyncEphemeral?) {
         // This Adapter is not supposed to serialize object
         Timber.v("To json $value with $writer")
         throw UnsupportedOperationException()
@@ -56,7 +56,7 @@ internal class SplitLazyRoomSyncJsonAdapter(
     }
 
     @FromJson
-    fun fromJson(reader: JsonReader, delegate: JsonAdapter<RoomSync>): LazyRoomSync? {
+    fun fromJson(reader: JsonReader, delegate: JsonAdapter<RoomSyncEphemeral>): LazyRoomSyncEphemeral? {
         val path = reader.path
         val json = reader.nextSource().inputStream().bufferedReader().use {
             it.readText()
@@ -67,16 +67,16 @@ internal class SplitLazyRoomSyncJsonAdapter(
             // Copy the source to a file
             val file = createFile()
             file.writeText(json)
-            LazyRoomSync.Stored(delegate, file)
+            LazyRoomSyncEphemeral.Stored(delegate, file)
         } else {
             Timber.v("INIT_SYNC $path content length: ${json.length} parse it now")
             val roomSync = delegate.fromJson(json) ?: return null
-            LazyRoomSync.Parsed(roomSync)
+            LazyRoomSyncEphemeral.Parsed(roomSync)
         }
     }
 
     @ToJson
-    fun toJson(writer: JsonWriter, value: LazyRoomSync?) {
+    fun toJson(writer: JsonWriter, value: LazyRoomSyncEphemeral?) {
         // This Adapter is not supposed to serialize object
         Timber.v("To json $value with $writer")
         throw UnsupportedOperationException()

From b25f13cceba53b3aae65e7ba7dbfecd2bd0cf986 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Mar 2021 21:46:30 +0100
Subject: [PATCH 212/578] Rename method for clarity

---
 .../sdk/internal/session/sync/RoomSyncHandler.kt     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 20ea412f14..7de64fd56e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -119,7 +119,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         val rooms = when (handlingStrategy) {
             is HandlingStrategy.JOINED  -> {
                 if (isInitialSync && initialSyncStrategy is InitialSyncStrategy.Optimized) {
-                    insertJoinRooms(realm, handlingStrategy, insertType, syncLocalTimeStampMillis, reporter)
+                    insertJoinRoomsFromInitSync(realm, handlingStrategy, insertType, syncLocalTimeStampMillis, reporter)
                     // Rooms are already inserted, return an empty list
                     emptyList()
                 } else {
@@ -142,11 +142,11 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         realm.insertOrUpdate(rooms)
     }
 
-    private fun insertJoinRooms(realm: Realm,
-                                handlingStrategy: HandlingStrategy.JOINED,
-                                insertType: EventInsertType,
-                                syncLocalTimeStampMillis: Long,
-                                reporter: ProgressReporter?) {
+    private fun insertJoinRoomsFromInitSync(realm: Realm,
+                                            handlingStrategy: HandlingStrategy.JOINED,
+                                            insertType: EventInsertType,
+                                            syncLocalTimeStampMillis: Long,
+                                            reporter: ProgressReporter?) {
         val maxSize = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
         val listSize = handlingStrategy.data.keys.size
         val numberOfChunks = ceil(listSize / maxSize.toDouble()).toInt()

From f28714c5b29652b7489cb9ee07568ceab3772955 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 4 Mar 2021 22:19:30 +0100
Subject: [PATCH 213/578] Avoid empty json in filter

---
 .../android/sdk/internal/session/filter/FilterFactory.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 6b7f884708..7415b988a4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -56,11 +56,11 @@ internal object FilterFactory {
         )
     }
 
-    private fun createElementTimelineFilter(): RoomEventFilter {
-        return RoomEventFilter().apply {
+    private fun createElementTimelineFilter(): RoomEventFilter? {
+        return null // RoomEventFilter().apply {
             // TODO Enable this for optimization
             // types = listOfSupportedEventTypes.toMutableList()
-        }
+        // }
     }
 
     private fun createElementStateFilter(): RoomEventFilter {

From ccf8e94c5e702f695010f549f7e5a6c3220505b1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Mar 2021 22:15:55 +0100
Subject: [PATCH 214/578] Small cleanup

---
 .../android/sdk/internal/session/sync/RoomSyncHandler.kt   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 7de64fd56e..0415754645 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -119,7 +119,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         val rooms = when (handlingStrategy) {
             is HandlingStrategy.JOINED  -> {
                 if (isInitialSync && initialSyncStrategy is InitialSyncStrategy.Optimized) {
-                    insertJoinRoomsFromInitSync(realm, handlingStrategy, insertType, syncLocalTimeStampMillis, reporter)
+                    insertJoinRoomsFromInitSync(realm, handlingStrategy, syncLocalTimeStampMillis, reporter)
                     // Rooms are already inserted, return an empty list
                     emptyList()
                 } else {
@@ -144,7 +144,6 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
 
     private fun insertJoinRoomsFromInitSync(realm: Realm,
                                             handlingStrategy: HandlingStrategy.JOINED,
-                                            insertType: EventInsertType,
                                             syncLocalTimeStampMillis: Long,
                                             reporter: ProgressReporter?) {
         val maxSize = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
@@ -167,7 +166,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                                 roomId = it,
                                                 roomSync = handlingStrategy.data[it] ?: error("Should not happen"),
                                                 handleEphemeralEvents = false,
-                                                insertType = insertType,
+                                                insertType = EventInsertType.INITIAL_SYNC,
                                                 syncLocalTimestampMillis = syncLocalTimeStampMillis
                                         )
                                     }
@@ -178,7 +177,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         } else {
             // No need to split
             val rooms = handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
-                handleJoinedRoom(realm, it.key, it.value, false, insertType, syncLocalTimeStampMillis)
+                handleJoinedRoom(realm, it.key, it.value, false, EventInsertType.INITIAL_SYNC, syncLocalTimeStampMillis)
             }
             realm.insertOrUpdate(rooms)
         }

From 490780b90675bdeece883b74ff621db12b0136e9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 5 Mar 2021 09:39:47 +0100
Subject: [PATCH 215/578] Fix classical init sync (not used anymore, except in
 debug mode) case.

---
 .../matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 0415754645..b2db6320f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -195,7 +195,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         if (handleEphemeralEvents) {
             ephemeralResult = roomSync.ephemeral?.roomSyncEphemeral?.events
                     ?.takeIf { it.isNotEmpty() }
-                    ?.let { handleEphemeral(realm, roomId, it, false) }
+                    ?.let { handleEphemeral(realm, roomId, it, insertType == EventInsertType.INITIAL_SYNC) }
         }
 
         if (roomSync.accountData?.events?.isNotEmpty() == true) {

From aaeb9a0fd7446e6da830862b8a33d2cbc8a0374a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 5 Mar 2021 13:56:43 +0000
Subject: [PATCH 216/578] rename zh as per
 https://github.com/vector-im/element-android/issues/2752

---
 .../metadata/android/{zh_Hans => zh-Hans}/changelogs/40100100.txt | 0
 .../metadata/android/{zh_Hans => zh-Hans}/changelogs/40100110.txt | 0
 .../metadata/android/{zh_Hans => zh-Hans}/full_description.txt    | 0
 .../metadata/android/{zh_Hans => zh-Hans}/short_description.txt   | 0
 fastlane/metadata/android/{zh_Hans => zh-Hans}/title.txt          | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40100100.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40100110.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40100120.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40100130.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40100140.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40100150.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40100160.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40100170.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/changelogs/40101000.txt | 0
 .../metadata/android/{zh_Hant => zh-Hant}/full_description.txt    | 0
 .../metadata/android/{zh_Hant => zh-Hant}/short_description.txt   | 0
 fastlane/metadata/android/{zh_Hant => zh-Hant}/title.txt          | 0
 17 files changed, 0 insertions(+), 0 deletions(-)
 rename fastlane/metadata/android/{zh_Hans => zh-Hans}/changelogs/40100100.txt (100%)
 rename fastlane/metadata/android/{zh_Hans => zh-Hans}/changelogs/40100110.txt (100%)
 rename fastlane/metadata/android/{zh_Hans => zh-Hans}/full_description.txt (100%)
 rename fastlane/metadata/android/{zh_Hans => zh-Hans}/short_description.txt (100%)
 rename fastlane/metadata/android/{zh_Hans => zh-Hans}/title.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40100100.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40100110.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40100120.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40100130.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40100140.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40100150.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40100160.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40100170.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/changelogs/40101000.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/full_description.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/short_description.txt (100%)
 rename fastlane/metadata/android/{zh_Hant => zh-Hant}/title.txt (100%)

diff --git a/fastlane/metadata/android/zh_Hans/changelogs/40100100.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hans/changelogs/40100100.txt
rename to fastlane/metadata/android/zh-Hans/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/zh_Hans/changelogs/40100110.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hans/changelogs/40100110.txt
rename to fastlane/metadata/android/zh-Hans/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/zh_Hans/full_description.txt b/fastlane/metadata/android/zh-Hans/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hans/full_description.txt
rename to fastlane/metadata/android/zh-Hans/full_description.txt
diff --git a/fastlane/metadata/android/zh_Hans/short_description.txt b/fastlane/metadata/android/zh-Hans/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hans/short_description.txt
rename to fastlane/metadata/android/zh-Hans/short_description.txt
diff --git a/fastlane/metadata/android/zh_Hans/title.txt b/fastlane/metadata/android/zh-Hans/title.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hans/title.txt
rename to fastlane/metadata/android/zh-Hans/title.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100100.txt b/fastlane/metadata/android/zh-Hant/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40100100.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100110.txt b/fastlane/metadata/android/zh-Hant/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40100110.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100120.txt b/fastlane/metadata/android/zh-Hant/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40100120.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100130.txt b/fastlane/metadata/android/zh-Hant/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40100130.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100140.txt b/fastlane/metadata/android/zh-Hant/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40100140.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100150.txt b/fastlane/metadata/android/zh-Hant/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40100150.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100160.txt b/fastlane/metadata/android/zh-Hant/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40100160.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40100170.txt b/fastlane/metadata/android/zh-Hant/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40100170.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/zh_Hant/changelogs/40101000.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101000.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/changelogs/40101000.txt
rename to fastlane/metadata/android/zh-Hant/changelogs/40101000.txt
diff --git a/fastlane/metadata/android/zh_Hant/full_description.txt b/fastlane/metadata/android/zh-Hant/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/full_description.txt
rename to fastlane/metadata/android/zh-Hant/full_description.txt
diff --git a/fastlane/metadata/android/zh_Hant/short_description.txt b/fastlane/metadata/android/zh-Hant/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/short_description.txt
rename to fastlane/metadata/android/zh-Hant/short_description.txt
diff --git a/fastlane/metadata/android/zh_Hant/title.txt b/fastlane/metadata/android/zh-Hant/title.txt
similarity index 100%
rename from fastlane/metadata/android/zh_Hant/title.txt
rename to fastlane/metadata/android/zh-Hant/title.txt

From 42ef81cf4099fb3f853d803f54ad9e7369ff9530 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 5 Mar 2021 14:07:39 +0000
Subject: [PATCH 217/578] apparently the others shouldn't have underscores
 either

---
 .../metadata/android/{nb_NO => nb-NO}/changelogs/40100100.txt     | 0
 .../metadata/android/{nb_NO => nb-NO}/changelogs/40100110.txt     | 0
 fastlane/metadata/android/{nb_NO => nb-NO}/short_description.txt  | 0
 fastlane/metadata/android/{nb_NO => nb-NO}/title.txt              | 0
 .../metadata/android/{pt_BR => pt-BR}/changelogs/40100100.txt     | 0
 .../metadata/android/{pt_BR => pt-BR}/changelogs/40100110.txt     | 0
 .../metadata/android/{pt_BR => pt-BR}/changelogs/40100120.txt     | 0
 .../metadata/android/{pt_BR => pt-BR}/changelogs/40100130.txt     | 0
 .../metadata/android/{pt_BR => pt-BR}/changelogs/40100140.txt     | 0
 .../metadata/android/{pt_BR => pt-BR}/changelogs/40100150.txt     | 0
 .../metadata/android/{pt_BR => pt-BR}/changelogs/40100160.txt     | 0
 .../metadata/android/{pt_BR => pt-BR}/changelogs/40100170.txt     | 0
 fastlane/metadata/android/{pt_BR => pt-BR}/full_description.txt   | 0
 fastlane/metadata/android/{pt_BR => pt-BR}/short_description.txt  | 0
 fastlane/metadata/android/{pt_BR => pt-BR}/title.txt              | 0
 15 files changed, 0 insertions(+), 0 deletions(-)
 rename fastlane/metadata/android/{nb_NO => nb-NO}/changelogs/40100100.txt (100%)
 rename fastlane/metadata/android/{nb_NO => nb-NO}/changelogs/40100110.txt (100%)
 rename fastlane/metadata/android/{nb_NO => nb-NO}/short_description.txt (100%)
 rename fastlane/metadata/android/{nb_NO => nb-NO}/title.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/changelogs/40100100.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/changelogs/40100110.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/changelogs/40100120.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/changelogs/40100130.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/changelogs/40100140.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/changelogs/40100150.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/changelogs/40100160.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/changelogs/40100170.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/full_description.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/short_description.txt (100%)
 rename fastlane/metadata/android/{pt_BR => pt-BR}/title.txt (100%)

diff --git a/fastlane/metadata/android/nb_NO/changelogs/40100100.txt b/fastlane/metadata/android/nb-NO/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/nb_NO/changelogs/40100100.txt
rename to fastlane/metadata/android/nb-NO/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/nb_NO/changelogs/40100110.txt b/fastlane/metadata/android/nb-NO/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/nb_NO/changelogs/40100110.txt
rename to fastlane/metadata/android/nb-NO/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/nb_NO/short_description.txt b/fastlane/metadata/android/nb-NO/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/nb_NO/short_description.txt
rename to fastlane/metadata/android/nb-NO/short_description.txt
diff --git a/fastlane/metadata/android/nb_NO/title.txt b/fastlane/metadata/android/nb-NO/title.txt
similarity index 100%
rename from fastlane/metadata/android/nb_NO/title.txt
rename to fastlane/metadata/android/nb-NO/title.txt
diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100100.txt b/fastlane/metadata/android/pt-BR/changelogs/40100100.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/changelogs/40100100.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100100.txt
diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100110.txt b/fastlane/metadata/android/pt-BR/changelogs/40100110.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/changelogs/40100110.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100110.txt
diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100120.txt b/fastlane/metadata/android/pt-BR/changelogs/40100120.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/changelogs/40100120.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100120.txt
diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100130.txt b/fastlane/metadata/android/pt-BR/changelogs/40100130.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/changelogs/40100130.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100130.txt
diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100140.txt b/fastlane/metadata/android/pt-BR/changelogs/40100140.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/changelogs/40100140.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100140.txt
diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100150.txt b/fastlane/metadata/android/pt-BR/changelogs/40100150.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/changelogs/40100150.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100150.txt
diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100160.txt b/fastlane/metadata/android/pt-BR/changelogs/40100160.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/changelogs/40100160.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100160.txt
diff --git a/fastlane/metadata/android/pt_BR/changelogs/40100170.txt b/fastlane/metadata/android/pt-BR/changelogs/40100170.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/changelogs/40100170.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100170.txt
diff --git a/fastlane/metadata/android/pt_BR/full_description.txt b/fastlane/metadata/android/pt-BR/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/full_description.txt
rename to fastlane/metadata/android/pt-BR/full_description.txt
diff --git a/fastlane/metadata/android/pt_BR/short_description.txt b/fastlane/metadata/android/pt-BR/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/short_description.txt
rename to fastlane/metadata/android/pt-BR/short_description.txt
diff --git a/fastlane/metadata/android/pt_BR/title.txt b/fastlane/metadata/android/pt-BR/title.txt
similarity index 100%
rename from fastlane/metadata/android/pt_BR/title.txt
rename to fastlane/metadata/android/pt-BR/title.txt

From 9174632cfc359cf392734aa2adedbef1e8ecd7df Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 5 Mar 2021 19:08:46 +0100
Subject: [PATCH 218/578] Send: use coroutines and let room sending queues be
 independent of each others

---
 .../sdk/internal/database/DatabaseCleaner.kt  |   2 +-
 .../database/RealmLiveEntityObserver.kt       |   4 +-
 .../internal/database/RealmSessionProvider.kt |   4 +-
 .../sdk/internal/session/DefaultSession.kt    |  10 +-
 .../session/SessionLifecycleObserver.kt       |   4 +-
 .../sdk/internal/session/SessionModule.kt     |  10 +
 .../identity/DefaultIdentityService.kt        |   4 +-
 .../integrationmanager/IntegrationManager.kt  |   4 +-
 .../room/send/queue/EventSenderProcessor.kt   | 233 +----------------
 .../queue/EventSenderProcessorCoroutine.kt    | 194 ++++++++++++++
 .../send/queue/EventSenderProcessorThread.kt  | 240 ++++++++++++++++++
 .../queue/HomeServerAvailabilityChecker.kt    |  45 ++++
 .../session/room/send/queue/QueueMemento.kt   |  31 ++-
 .../session/room/send/queue/QueuedTask.kt     |  12 +-
 .../room/send/queue/RedactQueuedTask.kt       |   4 +-
 .../room/send/queue/SendEventQueuedTask.kt    |   4 +-
 .../session/room/send/queue/TaskInfo.kt       |   4 +-
 .../widgets/DefaultWidgetURLFormatter.kt      |   4 +-
 .../internal/session/widgets/WidgetManager.kt |   4 +-
 19 files changed, 549 insertions(+), 268 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/HomeServerAvailabilityChecker.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
index 8b4ce6106b..f11ecc5d75 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
@@ -47,7 +47,7 @@ private const val MIN_NUMBER_OF_EVENTS_BY_CHUNK = 300
 internal class DatabaseCleaner @Inject constructor(@SessionDatabase private val realmConfiguration: RealmConfiguration,
                                                    private val taskExecutor: TaskExecutor) : SessionLifecycleObserver {
 
-    override fun onStart() {
+    override fun onSessionStarted() {
         taskExecutor.executorScope.launch(Dispatchers.Default) {
             awaitTransaction(realmConfiguration) { realm ->
                 val allRooms = realm.where(RoomEntity::class.java).findAll()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
index 3e2160e666..2a0cd963b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
@@ -46,7 +46,7 @@ internal abstract class RealmLiveEntityObserver<T : RealmObject>(protected val r
     private val backgroundRealm = AtomicReference<Realm>()
     private lateinit var results: AtomicReference<RealmResults<T>>
 
-    override fun onStart() {
+    override fun onSessionStarted() {
         if (isStarted.compareAndSet(false, true)) {
             BACKGROUND_HANDLER.post {
                 val realm = Realm.getInstance(realmConfiguration)
@@ -58,7 +58,7 @@ internal abstract class RealmLiveEntityObserver<T : RealmObject>(protected val r
         }
     }
 
-    override fun onStop() {
+    override fun onSessionStopped() {
         if (isStarted.compareAndSet(true, false)) {
             BACKGROUND_HANDLER.post {
                 results.getAndSet(null).removeAllChangeListeners()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
index 1947cc83e3..f8d5d323a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
@@ -44,14 +44,14 @@ internal class RealmSessionProvider @Inject constructor(@SessionDatabase private
     }
 
     @MainThread
-    override fun onStart() {
+    override fun onSessionStarted() {
         realmThreadLocal.getOrSet {
             Realm.getInstance(monarchy.realmConfiguration)
         }
     }
 
     @MainThread
-    override fun onStop() {
+    override fun onSessionStopped() {
         realmThreadLocal.get()?.close()
         realmThreadLocal.remove()
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 1204a9ccac..45fcc5af2d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -65,7 +65,6 @@ import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.network.GlobalErrorHandler
 import org.matrix.android.sdk.internal.session.identity.DefaultIdentityService
-import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessor
 import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
 import org.matrix.android.sdk.internal.session.sync.job.SyncThread
 import org.matrix.android.sdk.internal.session.sync.job.SyncWorker
@@ -120,8 +119,7 @@ internal class DefaultSession @Inject constructor(
         private val thirdPartyService: Lazy<ThirdPartyService>,
         private val callSignalingService: Lazy<CallSignalingService>,
         @UnauthenticatedWithCertificate
-        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>,
-        private val eventSenderProcessor: EventSenderProcessor
+        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>
 ) : Session,
         RoomService by roomService.get(),
         RoomDirectoryService by roomDirectoryService.get(),
@@ -158,10 +156,9 @@ internal class DefaultSession @Inject constructor(
         isOpen = true
         cryptoService.get().ensureDevice()
         uiHandler.post {
-            lifecycleObservers.forEach { it.onStart() }
+            lifecycleObservers.forEach { it.onSessionStarted() }
         }
         globalErrorHandler.listener = this
-        eventSenderProcessor.start()
     }
 
     override fun requireBackgroundSync() {
@@ -200,12 +197,11 @@ internal class DefaultSession @Inject constructor(
         stopSync()
         // timelineEventDecryptor.destroy()
         uiHandler.post {
-            lifecycleObservers.forEach { it.onStop() }
+            lifecycleObservers.forEach { it.onSessionStopped() }
         }
         cryptoService.get().close()
         isOpen = false
         globalErrorHandler.listener = null
-        eventSenderProcessor.interrupt()
     }
 
     override fun getSyncStateLive() = getSyncThread().liveState()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
index d26e9861d0..cb37fbec75 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
@@ -27,7 +27,7 @@ internal interface SessionLifecycleObserver {
     Called when the session is opened
      */
     @MainThread
-    fun onStart() {
+    fun onSessionStarted() {
         // noop
     }
 
@@ -43,7 +43,7 @@ internal interface SessionLifecycleObserver {
     Called when the session is closed
      */
     @MainThread
-    fun onStop() {
+    fun onSessionStopped() {
         // noop
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index 57c2336331..1b0a2fa027 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -83,6 +83,8 @@ import org.matrix.android.sdk.internal.session.permalinks.DefaultPermalinkServic
 import org.matrix.android.sdk.internal.session.room.EventRelationsAggregationProcessor
 import org.matrix.android.sdk.internal.session.room.create.RoomCreateEventProcessor
 import org.matrix.android.sdk.internal.session.room.prune.RedactionEventProcessor
+import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessor
+import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessorCoroutine
 import org.matrix.android.sdk.internal.session.room.tombstone.RoomTombstoneEventProcessor
 import org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService
 import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
@@ -339,6 +341,10 @@ internal abstract class SessionModule {
     @IntoSet
     abstract fun bindRealmSessionProvider(provider: RealmSessionProvider): SessionLifecycleObserver
 
+    @Binds
+    @IntoSet
+    abstract fun bindEventSenderProcessorAsSessionLifecycleObserver(processor: EventSenderProcessorCoroutine): SessionLifecycleObserver
+
     @Binds
     abstract fun bindInitialSyncProgressService(service: DefaultInitialSyncProgressService): InitialSyncProgressService
 
@@ -362,4 +368,8 @@ internal abstract class SessionModule {
 
     @Binds
     abstract fun bindRedactEventTask(task: DefaultRedactEventTask): RedactEventTask
+
+    @Binds
+    abstract fun bindEventSenderProcessor(processor: EventSenderProcessorCoroutine): EventSenderProcessor
+
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index c6fb34151c..948e387cb1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -92,7 +92,7 @@ internal class DefaultIdentityService @Inject constructor(
 
     private val listeners = mutableSetOf<IdentityServiceListener>()
 
-    override fun onStart() {
+    override fun onSessionStarted() {
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
         // Observe the account data change
         accountDataDataSource
@@ -117,7 +117,7 @@ internal class DefaultIdentityService @Inject constructor(
         }
     }
 
-    override fun onStop() {
+    override fun onSessionStopped() {
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
index 19a87103f4..e34615d269 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
@@ -77,7 +77,7 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
         currentConfigs.add(defaultConfig)
     }
 
-    override fun onStart() {
+    override fun onSessionStarted() {
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
         observeWellknownConfig()
         accountDataDataSource
@@ -105,7 +105,7 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
                 }
     }
 
-    override fun onStop() {
+    override fun onSessionStopped() {
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
index 62338a1d07..05d0876ef0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,235 +16,22 @@
 
 package org.matrix.android.sdk.internal.session.room.send.queue
 
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import org.matrix.android.sdk.api.auth.data.SessionParams
-import org.matrix.android.sdk.api.auth.data.sessionId
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.failure.MatrixError
-import org.matrix.android.sdk.api.failure.isTokenError
-import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.session.SessionScope
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import timber.log.Timber
-import java.io.IOException
-import java.net.InetAddress
-import java.net.InetSocketAddress
-import java.net.Socket
-import java.util.Timer
-import java.util.TimerTask
-import java.util.concurrent.LinkedBlockingQueue
-import javax.inject.Inject
-import kotlin.concurrent.schedule
+import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
 
-/**
- * A simple ever running thread unique for that session responsible of sending events in order.
- * Each send is retried 3 times, if there is no network (e.g if cannot ping home server) it will wait and
- * periodically test reachability before resume (does not count as a retry)
- *
- * If the app is killed before all event were sent, on next wakeup the scheduled events will be re posted
- */
-@SessionScope
-internal class EventSenderProcessor @Inject constructor(
-        private val cryptoService: CryptoService,
-        private val sessionParams: SessionParams,
-        private val queuedTaskFactory: QueuedTaskFactory,
-        private val taskExecutor: TaskExecutor,
-        private val memento: QueueMemento
-) : Thread("SENDER_THREAD_SID_${sessionParams.credentials.sessionId()}") {
+internal interface EventSenderProcessor: SessionLifecycleObserver {
 
-    private fun markAsManaged(task: QueuedTask) {
-        memento.track(task)
-    }
+    fun postEvent(event: Event): Cancelable
 
-    private fun markAsFinished(task: QueuedTask) {
-        memento.unTrack(task)
-    }
+    fun postEvent(event: Event, encrypt: Boolean): Cancelable
 
-    // API
-    fun postEvent(event: Event): Cancelable {
-        return postEvent(event, event.roomId?.let { cryptoService.isRoomEncrypted(it) } ?: false)
-    }
+    fun postRedaction(redactionLocalEcho: Event, reason: String?): Cancelable
 
-    override fun start() {
-        super.start()
-        // We should check for sending events not handled because app was killed
-        // But we should be careful of only took those that was submitted to us, because if it's
-        // for example it's a media event it is handled by some worker and he will handle it
-        // This is a bit fragile :/
-        // also some events cannot be retried manually by users, e.g reactions
-        // they were previously relying on workers to do the work :/ and was expected to always finally succeed
-        // Also some echos are not to be resent like redaction echos (fake event created for aggregation)
+    fun postRedaction(redactionLocalEchoId: String, eventToRedactId: String, roomId: String, reason: String?): Cancelable
 
-        tryOrNull {
-            taskExecutor.executorScope.launch {
-                Timber.d("## Send relaunched pending events on restart")
-                memento.restoreTasks(this@EventSenderProcessor)
-            }
-        }
-    }
+    fun postTask(task: QueuedTask): Cancelable
 
-    fun postEvent(event: Event, encrypt: Boolean): Cancelable {
-        val task = queuedTaskFactory.createSendTask(event, encrypt)
-        return postTask(task)
-    }
+    fun cancel(eventId: String, roomId: String)
 
-    fun postRedaction(redactionLocalEcho: Event, reason: String?): Cancelable {
-        return postRedaction(redactionLocalEcho.eventId!!, redactionLocalEcho.redacts!!, redactionLocalEcho.roomId!!, reason)
-    }
-
-    fun postRedaction(redactionLocalEchoId: String, eventToRedactId: String, roomId: String, reason: String?): Cancelable {
-        val task = queuedTaskFactory.createRedactTask(redactionLocalEchoId, eventToRedactId, roomId, reason)
-        return postTask(task)
-    }
-
-    fun postTask(task: QueuedTask): Cancelable {
-        // non blocking add to queue
-        sendingQueue.add(task)
-        markAsManaged(task)
-        return task
-    }
-
-    fun cancel(eventId: String, roomId: String) {
-        (currentTask as? SendEventQueuedTask)
-                ?.takeIf { it -> it.event.eventId == eventId && it.event.roomId == roomId }
-                ?.cancel()
-    }
-
-    companion object {
-        private const val RETRY_WAIT_TIME_MS = 10_000L
-    }
-
-    private var currentTask: QueuedTask? = null
-
-    private var sendingQueue = LinkedBlockingQueue<QueuedTask>()
-
-    private var networkAvailableLock = Object()
-    private var canReachServer = true
-    private var retryNoNetworkTask: TimerTask? = null
-
-    override fun run() {
-        Timber.v("## SendThread started ts:${System.currentTimeMillis()}")
-        try {
-            while (!isInterrupted) {
-                Timber.v("## SendThread wait for task to process")
-                val task = sendingQueue.take()
-                        .also { currentTask = it }
-                Timber.v("## SendThread Found task to process $task")
-
-                if (task.isCancelled()) {
-                    Timber.v("## SendThread send cancelled for $task")
-                    // we do not execute this one
-                    continue
-                }
-                // we check for network connectivity
-                while (!canReachServer) {
-                    Timber.v("## SendThread cannot reach server, wait ts:${System.currentTimeMillis()}")
-                    // schedule to retry
-                    waitForNetwork()
-                    // if thread as been killed meanwhile
-//                    if (state == State.KILLING) break
-                }
-                Timber.v("## Server is Reachable")
-                // so network is available
-
-                runBlocking {
-                    retryLoop@ while (task.retryCount < 3) {
-                        try {
-                            // SendPerformanceProfiler.startStage(task.event.eventId!!, SendPerformanceProfiler.Stages.SEND_WORKER)
-                            Timber.v("## SendThread retryLoop for $task retryCount ${task.retryCount}")
-                            task.execute()
-                            // sendEventTask.execute(SendEventTask.Params(task.event, task.encrypt, cryptoService))
-                            // SendPerformanceProfiler.stopStage(task.event.eventId, SendPerformanceProfiler.Stages.SEND_WORKER)
-                            break@retryLoop
-                        } catch (exception: Throwable) {
-                            when {
-                                exception is IOException || exception is Failure.NetworkConnection                         -> {
-                                    canReachServer = false
-                                    task.retryCount++
-                                    if (task.retryCount >= 3) task.onTaskFailed()
-                                    while (!canReachServer) {
-                                        Timber.v("## SendThread retryLoop cannot reach server, wait ts:${System.currentTimeMillis()}")
-                                        // schedule to retry
-                                        waitForNetwork()
-                                    }
-                                }
-                                (exception is Failure.ServerError && exception.error.code == MatrixError.M_LIMIT_EXCEEDED) -> {
-                                    task.retryCount++
-                                    if (task.retryCount >= 3) task.onTaskFailed()
-                                    Timber.v("## SendThread retryLoop retryable error for $task reason: ${exception.localizedMessage}")
-                                    // wait a bit
-                                    // Todo if its a quota exception can we get timout?
-                                    sleep(3_000)
-                                    continue@retryLoop
-                                }
-                                exception.isTokenError()                                                                   -> {
-                                    Timber.v("## SendThread retryLoop retryable TOKEN error, interrupt")
-                                    // we can exit the loop
-                                    task.onTaskFailed()
-                                    throw InterruptedException()
-                                }
-                                exception is CancellationException                                                         -> {
-                                    Timber.v("## SendThread task has been cancelled")
-                                    break@retryLoop
-                                }
-                                else                                                                                       -> {
-                                    Timber.v("## SendThread retryLoop Un-Retryable error, try next task")
-                                    // this task is in error, check next one?
-                                    task.onTaskFailed()
-                                    break@retryLoop
-                                }
-                            }
-                        }
-                    }
-                }
-                markAsFinished(task)
-            }
-        } catch (interruptionException: InterruptedException) {
-            // will be thrown is thread is interrupted while seeping
-            interrupt()
-            Timber.v("## InterruptedException!! ${interruptionException.localizedMessage}")
-        }
-//        state = State.KILLED
-        // is this needed?
-        retryNoNetworkTask?.cancel()
-        Timber.w("## SendThread finished ${System.currentTimeMillis()}")
-    }
-
-    private fun waitForNetwork() {
-        retryNoNetworkTask = Timer(SyncState.NoNetwork.toString(), false).schedule(RETRY_WAIT_TIME_MS) {
-            synchronized(networkAvailableLock) {
-                canReachServer = checkHostAvailable().also {
-                    Timber.v("## SendThread checkHostAvailable $it")
-                }
-                networkAvailableLock.notify()
-            }
-        }
-        synchronized(networkAvailableLock) { networkAvailableLock.wait() }
-    }
-
-    /**
-     * Check if homeserver is reachable.
-     */
-    private fun checkHostAvailable(): Boolean {
-        val host = sessionParams.homeServerConnectionConfig.homeServerUri.host ?: return false
-        val port = sessionParams.homeServerConnectionConfig.homeServerUri.port.takeIf { it != -1 } ?: 80
-        val timeout = 30_000
-        try {
-            Socket().use { socket ->
-                val inetAddress: InetAddress = InetAddress.getByName(host)
-                val inetSocketAddress = InetSocketAddress(inetAddress, port)
-                socket.connect(inetSocketAddress, timeout)
-                return true
-            }
-        } catch (e: IOException) {
-            Timber.v("## EventSender isHostAvailable failure ${e.localizedMessage}")
-            return false
-        }
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
new file mode 100644
index 0000000000..77e156f90a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.send.queue
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.task.CoroutineSequencer
+import org.matrix.android.sdk.internal.task.SemaphoreCoroutineSequencer
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.util.toCancelable
+import timber.log.Timber
+import java.io.IOException
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
+import javax.inject.Inject
+import kotlin.coroutines.cancellation.CancellationException
+
+private const val RETRY_WAIT_TIME_MS = 10_000L
+
+/**
+ * This class is responsible for sending events in order in each room. It uses the QueuedTask.queueIdentifier to execute tasks sequentially.
+ * Each send is retried 3 times, if there is no network (e.g if cannot ping home server) it will wait and
+ * periodically test reachability before resume (does not count as a retry)
+ *
+ * If the app is killed before all event were sent, on next wakeup the scheduled events will be re posted
+ *
+ */
+@SessionScope
+internal class EventSenderProcessorCoroutine @Inject constructor(
+        private val cryptoService: CryptoService,
+        private val sessionParams: SessionParams,
+        private val queuedTaskFactory: QueuedTaskFactory,
+        private val taskExecutor: TaskExecutor,
+        private val memento: QueueMemento,
+) : EventSenderProcessor {
+
+    /**
+     * sequencers use QueuedTask.queueIdentifier as key
+     */
+    private val sequencers = ConcurrentHashMap<String, CoroutineSequencer>()
+
+    /**
+     * cancelableBag use QueuedTask.taskIdentifier as key
+     */
+    private val cancelableBag = ConcurrentHashMap<String, Cancelable>()
+
+    override fun onSessionStarted() {
+        // We should check for sending events not handled because app was killed
+        // But we should be careful of only took those that was submitted to us, because if it's
+        // for example it's a media event it is handled by some worker and he will handle it
+        // This is a bit fragile :/
+        // also some events cannot be retried manually by users, e.g reactions
+        // they were previously relying on workers to do the work :/ and was expected to always finally succeed
+        // Also some echos are not to be resent like redaction echos (fake event created for aggregation)
+        taskExecutor.executorScope.launch {
+            Timber.d("## Send relaunched pending events on restart")
+            try {
+                memento.restoreTasks(this@EventSenderProcessorCoroutine)
+            } catch (failure: Throwable) {
+                Timber.e(failure, "Fail restoring send tasks")
+            }
+        }
+    }
+
+    override fun postEvent(event: Event): Cancelable {
+        return postEvent(event, event.roomId?.let { cryptoService.isRoomEncrypted(it) } ?: false)
+    }
+
+    override fun postEvent(event: Event, encrypt: Boolean): Cancelable {
+        val task = queuedTaskFactory.createSendTask(event, encrypt)
+        return postTask(task)
+    }
+
+    override fun postRedaction(redactionLocalEcho: Event, reason: String?): Cancelable {
+        return postRedaction(redactionLocalEcho.eventId!!, redactionLocalEcho.redacts!!, redactionLocalEcho.roomId!!, reason)
+    }
+
+    override fun postRedaction(redactionLocalEchoId: String, eventToRedactId: String, roomId: String, reason: String?): Cancelable {
+        val task = queuedTaskFactory.createRedactTask(redactionLocalEchoId, eventToRedactId, roomId, reason)
+        return postTask(task)
+    }
+
+    override fun postTask(task: QueuedTask): Cancelable {
+        markAsManaged(task)
+        val sequencer = sequencers.getOrPut(task.queueIdentifier) {
+            SemaphoreCoroutineSequencer()
+        }
+        return taskExecutor.executorScope
+                .launchWith(sequencer) {
+                    executeTask(task)
+                }.toCancelable()
+                .also {
+                    cancelableBag[task.taskIdentifier]
+                }
+    }
+
+    override fun cancel(eventId: String, roomId: String) {
+        // eventId is the taskIdentifier
+        cancelableBag[eventId]?.cancel()
+    }
+
+    private fun CoroutineScope.launchWith(sequencer: CoroutineSequencer, block: suspend CoroutineScope.() -> Unit) = launch {
+        sequencer.post {
+            block()
+        }
+    }
+
+    private suspend fun executeTask(task: QueuedTask) {
+        try {
+            if (task.isCancelled()) {
+                Timber.v("## task has been cancelled")
+                return
+            }
+            waitForNetwork()
+            Timber.v("## execute task with id: ${task.queueIdentifier}")
+            task.execute()
+        } catch (exception: Throwable) {
+            when {
+                exception is IOException || exception is Failure.NetworkConnection                         -> {
+                    canReachServer.set(false)
+                    task.retryCount++
+                    if (task.retryCount >= 3) task.onTaskFailed()
+                    Timber.v("## retryable error for $task reason: ${exception.localizedMessage}")
+                    // Retry
+                    executeTask(task)
+                }
+                (exception is Failure.ServerError && exception.error.code == MatrixError.M_LIMIT_EXCEEDED) -> {
+                    task.retryCount++
+                    if (task.retryCount >= 3) task.onTaskFailed()
+                    Timber.v("## retryable error for $task reason: ${exception.localizedMessage}")
+                    // Wait some time
+                    delay(exception.error.retryAfterMillis?.plus(100) ?: 3_000)
+                    // and retry
+                    executeTask(task)
+                }
+                exception is CancellationException                                                         -> {
+                    Timber.v("## task has been cancelled")
+                }
+                else                                                                                       -> {
+                    Timber.v("## Un-Retryable error, try next task")
+                    // this task is in error, check next one?
+                    task.onTaskFailed()
+                }
+            }
+        }
+        markAsFinished(task)
+    }
+
+    private fun markAsManaged(task: QueuedTask) {
+        memento.track(task)
+    }
+
+    private fun markAsFinished(task: QueuedTask) {
+        cancelableBag.remove(task.taskIdentifier)
+        memento.unTrack(task)
+    }
+
+    private val canReachServer = AtomicBoolean(true)
+
+    private suspend fun waitForNetwork() {
+        while (!canReachServer.get()) {
+            Timber.v("## Cannot reach server, wait ts:${System.currentTimeMillis()}")
+            delay(RETRY_WAIT_TIME_MS)
+            withContext(Dispatchers.IO) {
+                val hostAvailable = HomeServerAvailabilityChecker(sessionParams).check()
+                canReachServer.set(hostAvailable)
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
new file mode 100644
index 0000000000..c3a9eb4a07
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
@@ -0,0 +1,240 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.send.queue
+
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import org.matrix.android.sdk.api.auth.data.sessionId
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.failure.isTokenError
+import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.sync.SyncState
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import timber.log.Timber
+import java.io.IOException
+import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.net.Socket
+import java.util.Timer
+import java.util.TimerTask
+import java.util.concurrent.LinkedBlockingQueue
+import javax.inject.Inject
+import kotlin.concurrent.schedule
+
+/**
+ * A simple ever running thread unique for that session responsible of sending events in order.
+ * Each send is retried 3 times, if there is no network (e.g if cannot ping home server) it will wait and
+ * periodically test reachability before resume (does not count as a retry)
+ *
+ * If the app is killed before all event were sent, on next wakeup the scheduled events will be re posted
+ */
+@SessionScope
+internal class EventSenderProcessorThread @Inject constructor(
+        private val cryptoService: CryptoService,
+        private val sessionParams: SessionParams,
+        private val queuedTaskFactory: QueuedTaskFactory,
+        private val taskExecutor: TaskExecutor,
+        private val memento: QueueMemento
+) : Thread("SENDER_THREAD_SID_${sessionParams.credentials.sessionId()}"), EventSenderProcessor {
+
+    private fun markAsManaged(task: QueuedTask) {
+        memento.track(task)
+    }
+
+    private fun markAsFinished(task: QueuedTask) {
+        memento.unTrack(task)
+    }
+
+    override fun onSessionStarted() {
+        start()
+    }
+
+    override fun onSessionStopped() {
+        interrupt()
+    }
+
+
+    override fun start() {
+        super.start()
+        // We should check for sending events not handled because app was killed
+        // But we should be careful of only took those that was submitted to us, because if it's
+        // for example it's a media event it is handled by some worker and he will handle it
+        // This is a bit fragile :/
+        // also some events cannot be retried manually by users, e.g reactions
+        // they were previously relying on workers to do the work :/ and was expected to always finally succeed
+        // Also some echos are not to be resent like redaction echos (fake event created for aggregation)
+
+        tryOrNull {
+            taskExecutor.executorScope.launch {
+                Timber.d("## Send relaunched pending events on restart")
+                memento.restoreTasks(this@EventSenderProcessorThread)
+            }
+        }
+    }
+
+    // API
+    override fun postEvent(event: Event): Cancelable {
+        return postEvent(event, event.roomId?.let { cryptoService.isRoomEncrypted(it) } ?: false)
+    }
+
+    override fun postEvent(event: Event, encrypt: Boolean): Cancelable {
+        val task = queuedTaskFactory.createSendTask(event, encrypt)
+        return postTask(task)
+    }
+
+    override fun postRedaction(redactionLocalEcho: Event, reason: String?): Cancelable {
+        return postRedaction(redactionLocalEcho.eventId!!, redactionLocalEcho.redacts!!, redactionLocalEcho.roomId!!, reason)
+    }
+
+    override fun postRedaction(redactionLocalEchoId: String, eventToRedactId: String, roomId: String, reason: String?): Cancelable {
+        val task = queuedTaskFactory.createRedactTask(redactionLocalEchoId, eventToRedactId, roomId, reason)
+        return postTask(task)
+    }
+
+    override fun postTask(task: QueuedTask): Cancelable {
+        // non blocking add to queue
+        sendingQueue.add(task)
+        markAsManaged(task)
+        return task
+    }
+
+    override fun cancel(eventId: String, roomId: String) {
+        (currentTask as? SendEventQueuedTask)
+                ?.takeIf { it -> it.event.eventId == eventId && it.event.roomId == roomId }
+                ?.cancel()
+    }
+
+    companion object {
+        private const val RETRY_WAIT_TIME_MS = 10_000L
+    }
+
+    private var currentTask: QueuedTask? = null
+
+    private var sendingQueue = LinkedBlockingQueue<QueuedTask>()
+
+    private var networkAvailableLock = Object()
+    private var canReachServer = true
+    private var retryNoNetworkTask: TimerTask? = null
+
+    override fun run() {
+        Timber.v("## SendThread started ts:${System.currentTimeMillis()}")
+        try {
+            while (!isInterrupted) {
+                Timber.v("## SendThread wait for task to process")
+                val task = sendingQueue.take()
+                        .also { currentTask = it }
+                Timber.v("## SendThread Found task to process $task")
+
+                if (task.isCancelled()) {
+                    Timber.v("## SendThread send cancelled for $task")
+                    // we do not execute this one
+                    continue
+                }
+                // we check for network connectivity
+                while (!canReachServer) {
+                    Timber.v("## SendThread cannot reach server, wait ts:${System.currentTimeMillis()}")
+                    // schedule to retry
+                    waitForNetwork()
+                    // if thread as been killed meanwhile
+//                    if (state == State.KILLING) break
+                }
+                Timber.v("## Server is Reachable")
+                // so network is available
+
+                runBlocking {
+                    retryLoop@ while (task.retryCount < 3) {
+                        try {
+                            // SendPerformanceProfiler.startStage(task.event.eventId!!, SendPerformanceProfiler.Stages.SEND_WORKER)
+                            Timber.v("## SendThread retryLoop for $task retryCount ${task.retryCount}")
+                            task.execute()
+                            // sendEventTask.execute(SendEventTask.Params(task.event, task.encrypt, cryptoService))
+                            // SendPerformanceProfiler.stopStage(task.event.eventId, SendPerformanceProfiler.Stages.SEND_WORKER)
+                            break@retryLoop
+                        } catch (exception: Throwable) {
+                            when {
+                                exception is IOException || exception is Failure.NetworkConnection                         -> {
+                                    canReachServer = false
+                                    task.retryCount++
+                                    if (task.retryCount >= 3) task.onTaskFailed()
+                                    while (!canReachServer) {
+                                        Timber.v("## SendThread retryLoop cannot reach server, wait ts:${System.currentTimeMillis()}")
+                                        // schedule to retry
+                                        waitForNetwork()
+                                    }
+                                }
+                                (exception is Failure.ServerError && exception.error.code == MatrixError.M_LIMIT_EXCEEDED) -> {
+                                    task.retryCount++
+                                    if (task.retryCount >= 3) task.onTaskFailed()
+                                    Timber.v("## SendThread retryLoop retryable error for $task reason: ${exception.localizedMessage}")
+                                    // wait a bit
+                                    // Todo if its a quota exception can we get timout?
+                                    sleep(3_000)
+                                    continue@retryLoop
+                                }
+                                exception.isTokenError()                                                                   -> {
+                                    Timber.v("## SendThread retryLoop retryable TOKEN error, interrupt")
+                                    // we can exit the loop
+                                    task.onTaskFailed()
+                                    throw InterruptedException()
+                                }
+                                exception is CancellationException                                                         -> {
+                                    Timber.v("## SendThread task has been cancelled")
+                                    break@retryLoop
+                                }
+                                else                                                                                       -> {
+                                    Timber.v("## SendThread retryLoop Un-Retryable error, try next task")
+                                    // this task is in error, check next one?
+                                    task.onTaskFailed()
+                                    break@retryLoop
+                                }
+                            }
+                        }
+                    }
+                }
+                markAsFinished(task)
+            }
+        } catch (interruptionException: InterruptedException) {
+            // will be thrown is thread is interrupted while seeping
+            interrupt()
+            Timber.v("## InterruptedException!! ${interruptionException.localizedMessage}")
+        }
+//        state = State.KILLED
+        // is this needed?
+        retryNoNetworkTask?.cancel()
+        Timber.w("## SendThread finished ${System.currentTimeMillis()}")
+    }
+
+    private fun waitForNetwork() {
+        retryNoNetworkTask = Timer(SyncState.NoNetwork.toString(), false).schedule(RETRY_WAIT_TIME_MS) {
+            synchronized(networkAvailableLock) {
+                canReachServer = HomeServerAvailabilityChecker(sessionParams).check().also {
+                    Timber.v("## SendThread checkHostAvailable $it")
+                }
+                networkAvailableLock.notify()
+            }
+        }
+        synchronized(networkAvailableLock) { networkAvailableLock.wait() }
+    }
+
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/HomeServerAvailabilityChecker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/HomeServerAvailabilityChecker.kt
new file mode 100644
index 0000000000..c68be74a64
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/HomeServerAvailabilityChecker.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.send.queue
+
+import org.matrix.android.sdk.api.auth.data.SessionParams
+import timber.log.Timber
+import java.io.IOException
+import java.net.InetAddress
+import java.net.InetSocketAddress
+import java.net.Socket
+
+internal class HomeServerAvailabilityChecker(val sessionParams: SessionParams) {
+
+    fun check(): Boolean {
+        val host = sessionParams.homeServerConnectionConfig.homeServerUri.host ?: return false
+        val port = sessionParams.homeServerConnectionConfig.homeServerUri.port.takeIf { it != -1 } ?: 80
+        val timeout = 30_000
+        try {
+            Socket().use { socket ->
+                val inetAddress: InetAddress = InetAddress.getByName(host)
+                val inetSocketAddress = InetSocketAddress(inetAddress, port)
+                socket.connect(inetSocketAddress, timeout)
+                return true
+            }
+        } catch (e: IOException) {
+            Timber.v("## EventSender isHostAvailable failure ${e.localizedMessage}")
+            return false
+        }
+    }
+
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
index a6836c8086..472e4d440f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
@@ -32,6 +32,9 @@ import javax.inject.Inject
  * It is just used to remember what events/localEchos was managed by the event sender in order to
  * reschedule them (and only them) on next restart
  */
+
+private const val PERSISTENCE_KEY = "ManagedBySender"
+
 internal class QueueMemento @Inject constructor(context: Context,
                                                 @SessionId sessionId: String,
                                                 private val queuedTaskFactory: QueuedTaskFactory,
@@ -39,28 +42,28 @@ internal class QueueMemento @Inject constructor(context: Context,
                                                 private val cryptoService: CryptoService) {
 
     private val storage = context.getSharedPreferences("QueueMemento_$sessionId", Context.MODE_PRIVATE)
-    private val managedTaskInfos = mutableListOf<QueuedTask>()
+    private val trackedTasks = mutableListOf<QueuedTask>()
 
-    fun track(task: QueuedTask) {
-        synchronized(managedTaskInfos) {
-            managedTaskInfos.add(task)
-            persist()
-        }
+    fun track(task: QueuedTask) = synchronized(trackedTasks) {
+        trackedTasks.add(task)
+        persist()
     }
 
-    fun unTrack(task: QueuedTask) {
-        synchronized(managedTaskInfos) {
-            managedTaskInfos.remove(task)
-            persist()
-        }
+    fun unTrack(task: QueuedTask) = synchronized(trackedTasks) {
+        trackedTasks.remove(task)
+        persist()
+    }
+
+    fun trackedTasks() = synchronized(trackedTasks){
+
     }
 
     private fun persist() {
-        managedTaskInfos.mapIndexedNotNull { index, queuedTask ->
+        trackedTasks.mapIndexedNotNull { index, queuedTask ->
             toTaskInfo(queuedTask, index)?.let { TaskInfo.map(it) }
         }.toSet().let { set ->
             storage.edit()
-                    .putStringSet("ManagedBySender", set)
+                    .putStringSet(PERSISTENCE_KEY, set)
                     .apply()
         }
     }
@@ -82,7 +85,7 @@ internal class QueueMemento @Inject constructor(context: Context,
 
     suspend fun restoreTasks(eventProcessor: EventSenderProcessor) {
         // events should be restarted in correct order
-        storage.getStringSet("ManagedBySender", null)?.let { pending ->
+        storage.getStringSet(PERSISTENCE_KEY, null)?.let { pending ->
             Timber.d("## Send - Recovering unsent events $pending")
             pending.mapNotNull { tryOrNull { TaskInfo.map(it) } }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
index 9a7fcd8d91..a4eb9e9323 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
@@ -18,7 +18,17 @@ package org.matrix.android.sdk.internal.session.room.send.queue
 
 import org.matrix.android.sdk.api.util.Cancelable
 
-abstract class QueuedTask : Cancelable {
+/**
+ * @param queueIdentifier String value to identify a unique Queue
+ * @param taskIdentifier String value to identify a unique Task. Should be different from queueIdentifier
+ */
+internal abstract class QueuedTask(
+        val queueIdentifier: String,
+        val taskIdentifier: String
+) : Cancelable {
+
+    override fun toString() = "queueIdentifier: $queueIdentifier, taskIdentifier:  ${taskIdentifier})"
+
     var retryCount = 0
 
     private var hasBeenCancelled: Boolean = false
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt
index 8e7ba2f155..0e3d88aa79 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/RedactQueuedTask.kt
@@ -29,9 +29,7 @@ internal class RedactQueuedTask(
         private val redactEventTask: RedactEventTask,
         private val localEchoRepository: LocalEchoRepository,
         private val cancelSendTracker: CancelSendTracker
-) : QueuedTask() {
-
-    override fun toString() = "[RedactQueuedTask $redactionLocalEchoId]"
+) : QueuedTask(queueIdentifier = roomId, taskIdentifier = redactionLocalEchoId) {
 
     override suspend fun doExecute() {
         redactEventTask.execute(RedactEventTask.Params(redactionLocalEchoId, roomId, toRedactEventId, reason))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt
index ea097082c7..49492e7990 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/SendEventQueuedTask.kt
@@ -31,9 +31,7 @@ internal class SendEventQueuedTask(
         val cryptoService: CryptoService,
         val localEchoRepository: LocalEchoRepository,
         val cancelSendTracker: CancelSendTracker
-) : QueuedTask() {
-
-    override fun toString() = "[SendEventQueuedTask ${event.eventId}]"
+) : QueuedTask(queueIdentifier = event.roomId!!, taskIdentifier = event.eventId!!) {
 
     override suspend fun doExecute() {
         sendEventTask.execute(SendEventTask.Params(event, encrypt))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
index 87c6299c4d..a03ab778f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/TaskInfo.kt
@@ -36,7 +36,7 @@ internal interface TaskInfo {
         const val TYPE_SEND = "TYPE_SEND"
         const val TYPE_REDACT = "TYPE_REDACT"
 
-        val moshi = Moshi.Builder()
+        private val moshi = Moshi.Builder()
                 .add(RuntimeJsonAdapterFactory.of(TaskInfo::class.java, "type", FallbackTaskInfo::class.java)
                         .registerSubtype(SendEventTaskInfo::class.java, TYPE_SEND)
                         .registerSubtype(RedactEventTaskInfo::class.java, TYPE_REDACT)
@@ -71,6 +71,6 @@ internal data class RedactEventTaskInfo(
 
 @JsonClass(generateAdapter = true)
 internal data class FallbackTaskInfo(
-        @Json(name = "type") override val type: String = TaskInfo.TYPE_REDACT,
+        @Json(name = "type") override val type: String = TaskInfo.TYPE_UNKNOWN,
         @Json(name = "order") override val order: Int
 ) : TaskInfo
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
index db74e76b31..0937f6d18b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
@@ -37,12 +37,12 @@ internal class DefaultWidgetURLFormatter @Inject constructor(private val integra
     private lateinit var currentConfig: IntegrationManagerConfig
     private var whiteListedUrls: List<String> = emptyList()
 
-    override fun onStart() {
+    override fun onSessionStarted() {
         setupWithConfiguration()
         integrationManager.addListener(this)
     }
 
-    override fun onStop() {
+    override fun onSessionStopped() {
         integrationManager.removeListener(this)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
index f841a2a245..73a4cc697d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
@@ -62,12 +62,12 @@ internal class WidgetManager @Inject constructor(private val integrationManager:
     private val lifecycleOwner: LifecycleOwner = LifecycleOwner { lifecycleRegistry }
     private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(lifecycleOwner)
 
-    override fun onStart() {
+    override fun onSessionStarted() {
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
         integrationManager.addListener(this)
     }
 
-    override fun onStop() {
+    override fun onSessionStopped() {
         integrationManager.removeListener(this)
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
     }

From a0df20fcd2dcdbfd986298b75b027f4d690179ae Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Fri, 5 Mar 2021 21:03:52 +0100
Subject: [PATCH 219/578] Send: clean code and add more logs

---
 .../queue/EventSenderProcessorCoroutine.kt    | 47 +++++++++++--------
 .../send/queue/EventSenderProcessorThread.kt  |  8 ++--
 .../session/room/send/queue/QueuedTask.kt     |  8 +++-
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
index 77e156f90a..56fb3b8539 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
@@ -34,12 +34,14 @@ import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.toCancelable
 import timber.log.Timber
 import java.io.IOException
+import java.util.Queue
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 import kotlin.coroutines.cancellation.CancellationException
 
 private const val RETRY_WAIT_TIME_MS = 10_000L
+private const val MAX_RETRY_COUNT = 3
 
 /**
  * This class is responsible for sending events in order in each room. It uses the QueuedTask.queueIdentifier to execute tasks sequentially.
@@ -58,6 +60,8 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
         private val memento: QueueMemento,
 ) : EventSenderProcessor {
 
+    private val waitForNetworkSequencer = SemaphoreCoroutineSequencer()
+
     /**
      * sequencers use QueuedTask.queueIdentifier as key
      */
@@ -109,6 +113,7 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
         val sequencer = sequencers.getOrPut(task.queueIdentifier) {
             SemaphoreCoroutineSequencer()
         }
+        Timber.v("## post $task")
         return taskExecutor.executorScope
                 .launchWith(sequencer) {
                     executeTask(task)
@@ -119,7 +124,7 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
     }
 
     override fun cancel(eventId: String, roomId: String) {
-        // eventId is the taskIdentifier
+        // eventId is most likely the taskIdentifier
         cancelableBag[eventId]?.cancel()
     }
 
@@ -132,36 +137,26 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
     private suspend fun executeTask(task: QueuedTask) {
         try {
             if (task.isCancelled()) {
-                Timber.v("## task has been cancelled")
+                Timber.v("## $task has been cancelled, try next task")
                 return
             }
-            waitForNetwork()
-            Timber.v("## execute task with id: ${task.queueIdentifier}")
+            task.waitForNetwork()
             task.execute()
         } catch (exception: Throwable) {
             when {
                 exception is IOException || exception is Failure.NetworkConnection                         -> {
                     canReachServer.set(false)
-                    task.retryCount++
-                    if (task.retryCount >= 3) task.onTaskFailed()
-                    Timber.v("## retryable error for $task reason: ${exception.localizedMessage}")
-                    // Retry
-                    executeTask(task)
+                    task.markAsFailedOrRetry(exception, 0)
                 }
                 (exception is Failure.ServerError && exception.error.code == MatrixError.M_LIMIT_EXCEEDED) -> {
-                    task.retryCount++
-                    if (task.retryCount >= 3) task.onTaskFailed()
-                    Timber.v("## retryable error for $task reason: ${exception.localizedMessage}")
-                    // Wait some time
-                    delay(exception.error.retryAfterMillis?.plus(100) ?: 3_000)
-                    // and retry
-                    executeTask(task)
+                    val delay = exception.error.retryAfterMillis?.plus(100) ?: 3_000
+                    task.markAsFailedOrRetry(exception, delay)
                 }
                 exception is CancellationException                                                         -> {
-                    Timber.v("## task has been cancelled")
+                    Timber.v("## $task has been cancelled, try next task")
                 }
                 else                                                                                       -> {
-                    Timber.v("## Un-Retryable error, try next task")
+                    Timber.v("## un-retryable error for $task, try next task")
                     // this task is in error, check next one?
                     task.onTaskFailed()
                 }
@@ -170,6 +165,18 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
         markAsFinished(task)
     }
 
+    private suspend fun QueuedTask.markAsFailedOrRetry(failure: Throwable, retryDelay: Long){
+        if (retryCount.incrementAndGet() >= MAX_RETRY_COUNT) {
+            onTaskFailed()
+        } else {
+            Timber.v("## retryable error for $this reason: ${failure.localizedMessage}")
+            // Wait if necessary
+            delay(retryDelay)
+            // And then retry
+            executeTask(this)
+        }
+    }
+
     private fun markAsManaged(task: QueuedTask) {
         memento.track(task)
     }
@@ -181,9 +188,9 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
 
     private val canReachServer = AtomicBoolean(true)
 
-    private suspend fun waitForNetwork() {
+    private suspend fun QueuedTask.waitForNetwork() = waitForNetworkSequencer.post {
         while (!canReachServer.get()) {
-            Timber.v("## Cannot reach server, wait ts:${System.currentTimeMillis()}")
+            Timber.v("## $this cannot reach server wait ts:${System.currentTimeMillis()}")
             delay(RETRY_WAIT_TIME_MS)
             withContext(Dispatchers.IO) {
                 val hostAvailable = HomeServerAvailabilityChecker(sessionParams).check()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
index c3a9eb4a07..2e1acf710c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
@@ -163,7 +163,7 @@ internal class EventSenderProcessorThread @Inject constructor(
                 // so network is available
 
                 runBlocking {
-                    retryLoop@ while (task.retryCount < 3) {
+                    retryLoop@ while (task.retryCount.get() < 3) {
                         try {
                             // SendPerformanceProfiler.startStage(task.event.eventId!!, SendPerformanceProfiler.Stages.SEND_WORKER)
                             Timber.v("## SendThread retryLoop for $task retryCount ${task.retryCount}")
@@ -175,8 +175,7 @@ internal class EventSenderProcessorThread @Inject constructor(
                             when {
                                 exception is IOException || exception is Failure.NetworkConnection                         -> {
                                     canReachServer = false
-                                    task.retryCount++
-                                    if (task.retryCount >= 3) task.onTaskFailed()
+                                    if (task.retryCount.getAndIncrement() >= 3) task.onTaskFailed()
                                     while (!canReachServer) {
                                         Timber.v("## SendThread retryLoop cannot reach server, wait ts:${System.currentTimeMillis()}")
                                         // schedule to retry
@@ -184,8 +183,7 @@ internal class EventSenderProcessorThread @Inject constructor(
                                     }
                                 }
                                 (exception is Failure.ServerError && exception.error.code == MatrixError.M_LIMIT_EXCEEDED) -> {
-                                    task.retryCount++
-                                    if (task.retryCount >= 3) task.onTaskFailed()
+                                    if (task.retryCount.getAndIncrement() >= 3) task.onTaskFailed()
                                     Timber.v("## SendThread retryLoop retryable error for $task reason: ${exception.localizedMessage}")
                                     // wait a bit
                                     // Todo if its a quota exception can we get timout?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
index a4eb9e9323..e5302c171c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
@@ -17,6 +17,8 @@
 package org.matrix.android.sdk.internal.session.room.send.queue
 
 import org.matrix.android.sdk.api.util.Cancelable
+import timber.log.Timber
+import java.util.concurrent.atomic.AtomicInteger
 
 /**
  * @param queueIdentifier String value to identify a unique Queue
@@ -27,15 +29,17 @@ internal abstract class QueuedTask(
         val taskIdentifier: String
 ) : Cancelable {
 
-    override fun toString() = "queueIdentifier: $queueIdentifier, taskIdentifier:  ${taskIdentifier})"
+    override fun toString() = "${javaClass.simpleName} queueIdentifier: $queueIdentifier, taskIdentifier:  ${taskIdentifier})"
 
-    var retryCount = 0
+    var retryCount = AtomicInteger(0)
 
     private var hasBeenCancelled: Boolean = false
 
     suspend fun execute() {
         if (!isCancelled()) {
+            Timber.v("Execute: $this start")
             doExecute()
+            Timber.v("Execute: $this finish")
         }
     }
 

From 961af9e8764722883cfd8ae02a601961e98fa258 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Fri, 5 Mar 2021 17:38:39 +0000
Subject: [PATCH 220/578] Translated using Weblate (Catalan)

Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
---
 vector/src/main/res/values-ca/strings.xml | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 53946bf359..8e99a0a924 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -2694,4 +2694,39 @@
 \nBaixant dades…</string>
     <string name="initial_sync_start_server_computing">Sincronització inicial:
 \nEsperant resposta del servidor…</string>
+    <string name="a11y_view_read_receipts">Mostra confirmacions de lectura</string>
+    <string name="a11y_open_widget">Obre giny</string>
+    <string name="settings_server_upload_size_title">Límit de càrrega de fitxers al servidor</string>
+    <string name="action_switch">Commuta</string>
+    <string name="dev_tools_event_content_hint">Contingut de l\'esdeveniment</string>
+    <string name="dev_tools_success_state_event">Esdeveniment d\'estat enviat!</string>
+    <string name="dev_tools_success_event">Esdeveniment enviat!</string>
+    <string name="dev_tools_error_malformed_event">Esdeveniment mal format</string>
+    <string name="dev_tools_error_no_message_type">Falta el tipus de missatge</string>
+    <string name="dev_tools_error_no_content">Sense contingut</string>
+    <string name="dev_tools_form_hint_event_content">Contingut de l\'esdeveniment</string>
+    <string name="dev_tools_form_hint_state_key">Clau d\'estat</string>
+    <string name="dev_tools_form_hint_type">Tipus</string>
+    <string name="dev_tools_send_custom_state_event">Envia esdeveniment d\'estat personalitzat</string>
+    <string name="dev_tools_edit_content">Edita el contingut</string>
+    <string name="dev_tools_state_event">Esdeveniments d\'estat</string>
+    <string name="dev_tools_send_state_event">Envia esdeveniment d\'estat</string>
+    <string name="dev_tools_send_custom_event">Envia esdeveniment personalitzat</string>
+    <string name="dev_tools_explore_room_state">Explora l\'estat de la sala</string>
+    <string name="dev_tools_menu_name">Eines per desenvolupadors</string>
+    <string name="a11y_rule_notify_off">No notifiquis</string>
+    <string name="a11y_rule_notify_silent">Notifica sense so</string>
+    <string name="a11y_rule_notify_noisy">Notifica amb so</string>
+    <string name="a11y_error_message_not_sent">No s\'ha enviat el missatge per culpa d\'un error</string>
+    <string name="a11y_checked">Comprovat</string>
+    <string name="a11y_close_emoji_picker">Tanca selector d\'emoticones</string>
+    <string name="a11y_open_emoji_picker">Obre selector d\'emoticones</string>
+    <string name="a11y_trust_level_trusted">Nivell de confiança segur</string>
+    <string name="a11y_trust_level_warning">Nivell de confiança d\'alerta</string>
+    <string name="a11y_trust_level_default">Nivell de confiança predeterminat</string>
+    <string name="a11y_selected">Seleccionats</string>
+    <string name="a11y_unsent_draft">La sala conté un esborrany no enviat</string>
+    <string name="a11y_delete_avatar">Elimina la icona</string>
+    <string name="a11y_change_avatar">Canvia la icona</string>
+    <string name="settings_server_upload_size_content">El servidor local accepta fitxers adjunts (fotos, fitxers, etc) de fins a una mida de %s.</string>
 </resources>
\ No newline at end of file

From a08177ef3d73932990f5c5f93cf61a5640b5107b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Fri, 5 Mar 2021 14:02:04 +0000
Subject: [PATCH 221/578] Translated using Weblate (Estonian)

Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
---
 vector/src/main/res/values-et/strings.xml | 55 +++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 4a168a3088..2dd13ede4a 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2606,4 +2606,59 @@
     <string name="call_hold_action">Pane ootele</string>
     <string name="call_resume_action">Jätka</string>
     <string name="action_return">Pöördu tagasi</string>
+    <string name="dev_tools_event_content_hint">Sündmuse sisu</string>
+    <string name="dev_tools_success_state_event">Olekusündmus on saadetud!</string>
+    <string name="dev_tools_success_event">Sündmus on saadetud!</string>
+    <string name="dev_tools_error_malformed_event">Vigaselt vormistatud sündmus</string>
+    <string name="dev_tools_error_no_message_type">Sõnumi tüüp puudub</string>
+    <string name="dev_tools_error_no_content">Sisu puudub</string>
+    <string name="dev_tools_form_hint_event_content">Sündmuse sisu</string>
+    <string name="dev_tools_form_hint_state_key">Oleku võti</string>
+    <string name="dev_tools_form_hint_type">Tüüp</string>
+    <string name="dev_tools_send_custom_state_event">Saada kohandatud olekusündmus</string>
+    <string name="dev_tools_edit_content">Muuda sisu</string>
+    <string name="dev_tools_state_event">Olekusündmused</string>
+    <string name="dev_tools_send_state_event">Saada olekusündmus</string>
+    <string name="dev_tools_send_custom_event">Saada kohandatud sündmus</string>
+    <string name="dev_tools_explore_room_state">Uuri jututoa olekut</string>
+    <string name="dev_tools_menu_name">Arendaja töövahendid</string>
+    <string name="a11y_view_read_receipts">Vaata lugemisteatiseid</string>
+    <string name="a11y_rule_notify_off">Ära teavita</string>
+    <string name="a11y_rule_notify_silent">Teavita helita</string>
+    <string name="a11y_rule_notify_noisy">Teavita heliga</string>
+    <string name="a11y_error_message_not_sent">Vea tõttu on sõnum saatmata</string>
+    <string name="a11y_checked">Kontrollitud</string>
+    <string name="a11y_close_emoji_picker">Sulge emojivalija</string>
+    <string name="a11y_open_emoji_picker">Ava emojivalija</string>
+    <string name="a11y_trust_level_trusted">Tugev usaldusmäär</string>
+    <string name="a11y_trust_level_warning">Hoiatav usaldusmäär</string>
+    <string name="a11y_trust_level_default">Vaikmisi usaldusmäär</string>
+    <string name="a11y_selected">Valitud</string>
+    <string name="a11y_video">Video</string>
+    <string name="a11y_unsent_draft">Selles jututoas on ärasaatmata sõnumimustand</string>
+    <string name="a11y_error_some_message_not_sent">Mõned sõnumid on saatmata</string>
+    <string name="a11y_delete_avatar">Kustuta tunnuspilt</string>
+    <string name="a11y_change_avatar">Muuda tunnuspilti</string>
+    <string name="a11y_image">Pilt</string>
+    <string name="a11y_import_key_from_file">Impordi krüptovõti failist</string>
+    <string name="a11y_open_widget">Ava vidinad</string>
+    <string name="a11y_screenshot">Ekraanitõmmis</string>
+    <plurals name="entries">
+        <item quantity="one">%d kirje</item>
+        <item quantity="other">%d kirjet</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">Üleslaadimispiirang on teadmata.</string>
+    <string name="settings_server_upload_size_content">Sinu koduserver võimaldab kuni suurusega %s failide (meedia, dokumendid, jne) üleslaadimist.</string>
+    <string name="settings_server_upload_size_title">Serveris seadistatud failide üleslaadimise piirang</string>
+    <string name="settings_server_version">Serveri versioon</string>
+    <string name="settings_server_name">Serveri nimi</string>
+    <string name="room_list_quick_actions_room_settings">Jututoa seadistused</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Kas soovid lahkuda praegusest rühmakõnest ja liituda uuega\?</string>
+    <string name="room_settings_room_version_title">Jututoa versioon</string>
+    <string name="dialog_edit_hint">Uus väärtus</string>
+    <string name="action_switch">Vaheta</string>
+    <string name="initial_sync_start_downloading">Esmane sünkroniseerimine:
+\nLaadin andmed alla…</string>
+    <string name="initial_sync_start_server_computing">Esmane sünkroniseerimine:
+\nOotan serveri vastust…</string>
 </resources>
\ No newline at end of file

From 3457e0a7570c78e18b598c646e68b71df70c2c75 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Fri, 5 Mar 2021 20:42:49 +0000
Subject: [PATCH 222/578] Translated using Weblate (Swedish)

Currently translated at 99.3% (2335 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 150d4018ff..6cce5c8c92 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2624,4 +2624,25 @@
 \nLaddar ner data…</string>
     <string name="initial_sync_start_server_computing">Initial synk:
 \nVäntar på serversvar…</string>
+    <string name="a11y_view_read_receipts">Visa läskvitton</string>
+    <string name="a11y_rule_notify_off">Avisera inte</string>
+    <string name="a11y_rule_notify_silent">Avisera utan ljud</string>
+    <string name="a11y_rule_notify_noisy">Avisera med ljud</string>
+    <string name="a11y_error_message_not_sent">Meddelandet skickades inte på grund av ett fel</string>
+    <string name="a11y_checked">Ikryssad</string>
+    <string name="a11y_close_emoji_picker">Stäng emojival</string>
+    <string name="a11y_open_emoji_picker">Öppna emojival</string>
+    <string name="a11y_trust_level_trusted">Betrodd förtroendenivå</string>
+    <string name="a11y_trust_level_warning">Varningsförtroendenivå</string>
+    <string name="a11y_trust_level_default">Förvald förtroendenivå</string>
+    <string name="a11y_selected">Vald</string>
+    <string name="a11y_video">Video</string>
+    <string name="a11y_unsent_draft">Det här rummet har oskickade utkast</string>
+    <string name="a11y_error_some_message_not_sent">Vissa meddelanden har inte skickats</string>
+    <string name="a11y_delete_avatar">Radera avatar</string>
+    <string name="a11y_change_avatar">Byt avatar</string>
+    <string name="a11y_image">Bild</string>
+    <string name="a11y_import_key_from_file">Importera nyckel från fil</string>
+    <string name="a11y_open_widget">Öppna widgets</string>
+    <string name="a11y_screenshot">Skärmdump</string>
 </resources>
\ No newline at end of file

From 427a3d1be374645f4a3a3bd43284cf7a69bc9065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Fri, 5 Mar 2021 12:41:53 +0000
Subject: [PATCH 223/578] Translated using Weblate (Estonian)

Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
---
 fastlane/metadata/android/et/changelogs/40101000.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/40101000.txt

diff --git a/fastlane/metadata/android/et/changelogs/40101000.txt b/fastlane/metadata/android/et/changelogs/40101000.txt
new file mode 100644
index 0000000000..4d3facffc8
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Olulisemad muutused selles versioonis: Heli- ja videokõnede parandused otsevestluses ning üldised veaparandused!
+Muudatuste logi täismahus: https://github.com/vector-im/element-android/releases/tag/v1.1.0

From fda8ac1f51edaada232e63eee6f2f3792a8bbb04 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Fri, 5 Mar 2021 17:41:13 +0000
Subject: [PATCH 224/578] Translated using Weblate (Catalan)

Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
---
 fastlane/metadata/android/ca/changelogs/40101000.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/ca/changelogs/40101000.txt

diff --git a/fastlane/metadata/android/ca/changelogs/40101000.txt b/fastlane/metadata/android/ca/changelogs/40101000.txt
new file mode 100644
index 0000000000..2c651e1801
--- /dev/null
+++ b/fastlane/metadata/android/ca/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Canvis principals d'aquesta versió: millora de VoIP (trucades i videotrucades en xats personals) i correcció d'errors!
+Registre de canvis complet: https://github.com/vector-im/element-android/releases/tag/v1.1.0

From cd9718b7ef50da4ff78f836cdc9c7323601cceca Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Fri, 5 Mar 2021 22:07:02 +0000
Subject: [PATCH 225/578] Translated using Weblate (Czech)

Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
---
 fastlane/metadata/android/cs/changelogs/40101000.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/cs/changelogs/40101000.txt

diff --git a/fastlane/metadata/android/cs/changelogs/40101000.txt b/fastlane/metadata/android/cs/changelogs/40101000.txt
new file mode 100644
index 0000000000..7c1e140601
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: VoIP (audio a video hovory v DM), vylepšení a opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.0

From a1e6e234cc17afbb3d263ca07bb314f3199f2863 Mon Sep 17 00:00:00 2001
From: Hivaa <hivaa@hivaa.im>
Date: Mon, 8 Mar 2021 09:48:09 +0000
Subject: [PATCH 226/578] Translated using Weblate (Persian)

Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
---
 vector/src/main/res/values-fa/strings.xml | 103 +++++++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 2a9fe70d8b..5b075bcb63 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -98,7 +98,7 @@
     </plurals>
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s، %2$s را به عنوان نشانی‌ای برای این اتاق پاک کرد.</item>
-        <item quantity="other">%1$s، %3$s را به عنوان نشانی‌هایی برای این اتاق پاک کرد.</item>
+        <item quantity="other">%1$s، %2$s را به عنوان نشانی‌هایی برای این اتاق پاک کرد.</item>
     </plurals>
     <string name="notice_room_aliases_added_and_removed">%1$s برای نشانی این اتاق، %2$s را افزود و %3$s را پاک کرد.</string>
     <string name="notice_room_canonical_alias_set">%1$s نشانی اصلی این اتاق را به %2$s تنظیم کرد.</string>
@@ -2560,4 +2560,105 @@
     <string name="call_resume_action">از سرگیری</string>
     <string name="error_unauthorized">غیر مجاز، اطلاعات هویت‌سنجی موجود نمی‌باشد</string>
     <string name="action_return">بازگشت</string>
+    <string name="dev_tools_event_content_hint">محتوای رخداد</string>
+    <string name="dev_tools_success_state_event">رخداد وضعیتی ارسال شد!</string>
+    <string name="dev_tools_success_event">رخداد ارسال شد!</string>
+    <string name="dev_tools_error_malformed_event">رخداد معیوب</string>
+    <string name="dev_tools_error_no_message_type">نوع پیام فراموش شده‌است</string>
+    <string name="dev_tools_error_no_content">بدون محتوا</string>
+    <string name="dev_tools_form_hint_event_content">محتوای رخداد</string>
+    <string name="dev_tools_form_hint_state_key">کلید وضعیت</string>
+    <string name="dev_tools_form_hint_type">نوع</string>
+    <string name="dev_tools_send_custom_state_event">ارسال رخداد وضعیت سفارشی</string>
+    <string name="dev_tools_edit_content">ویرایش محتوا</string>
+    <string name="dev_tools_state_event">رخدادهای وضعیتی</string>
+    <string name="dev_tools_send_state_event">ارسال رخداد وضعیتی</string>
+    <string name="dev_tools_send_custom_event">ارسال رخداد سفارشی</string>
+    <string name="dev_tools_explore_room_state">کاوش وضعیت اتاق</string>
+    <string name="dev_tools_menu_name">ابزارهای توسعه</string>
+    <string name="a11y_view_read_receipts">مشاهده رسیدهای خوانده‌شده</string>
+    <string name="a11y_rule_notify_off">خبر نده</string>
+    <string name="a11y_rule_notify_silent">بدون صدا خبر بده</string>
+    <string name="a11y_rule_notify_noisy">با صدا خبر بده</string>
+    <string name="a11y_error_message_not_sent">پیام به دلیل رخداد خطا ارسال نشد</string>
+    <string name="a11y_checked">تیک‌خورده</string>
+    <string name="a11y_close_emoji_picker">بستن پنجره ی شکلک‌ها</string>
+    <string name="a11y_open_emoji_picker">بازکردن پنجره‌ی شکلک‌ها</string>
+    <string name="a11y_trust_level_trusted">سطح اعتماد کامل</string>
+    <string name="a11y_trust_level_warning">سطح اعتماد هشداری</string>
+    <string name="a11y_trust_level_default">سطح اعتماد پیش‌فرض</string>
+    <string name="a11y_selected">انتخاب‌شده</string>
+    <string name="a11y_image">عکس</string>
+    <string name="a11y_video">ویدئو</string>
+    <string name="a11y_unsent_draft">این اتاق حاوی پیش‌نویس‌هایی است که هنوز ارسال نشده‌اند</string>
+    <string name="a11y_error_some_message_not_sent">بعضی از پیام‌ها هنوز ارسال نشده‌اند</string>
+    <string name="a11y_delete_avatar">حذف نمایه</string>
+    <string name="a11y_change_avatar">تغییر نمایه</string>
+    <string name="a11y_import_key_from_file">واردکردن کلید از فایل</string>
+    <string name="a11y_open_widget">ابزارک‌های باز</string>
+    <string name="a11y_screenshot">اسکرین‌شات</string>
+    <string name="call_transfer_consult_first">ابتدا مشاوره بگیرید</string>
+    <plurals name="entries">
+        <item quantity="one">%d ورودی</item>
+        <item quantity="other">%d ورودی</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">این محدودیت ناشناخته است.</string>
+    <string name="settings_server_upload_size_content">سرور شما فایل‌های ضمیمه (پرونده‌ها، فایل‌های چندرسانه‌ای و غیره) تا حجم %s را می‌پذیرد.</string>
+    <string name="settings_server_upload_size_title">محدودیت بارگذاری فایل بر روی سرور</string>
+    <string name="settings_server_version">ورژن سرور</string>
+    <string name="settings_server_name">نام سرور</string>
+    <string name="room_list_quick_actions_room_settings">تنظیمات اتاق</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">آیا مایل به ترک جلسه‌ی فعلی و ورود به جلسه‌ی دیگری هستید؟</string>
+    <string name="room_settings_room_version_title">ورژن اتاق</string>
+    <string name="dialog_edit_hint">مقدار جدید</string>
+    <string name="action_switch">تعویض</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">شما نشانی‌های این اتاق را تغییر دادید.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s نشانی‌های این اتاق را تغییر داد.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">شما نشانی‌های اصلی و جایگزین این اتاق را تغییر دادید.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s نشانی‌های اصلی و جایگزین این اتاق را تغییر داد.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">شما نشانی‌های جایگزین این اتاق را تغییر دادید.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s نشانی‌های جایگزین این اتاق را تغییر داد.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">شما نشانی جایگزین %1$s را برای این اتاق حذف کردید.</item>
+        <item quantity="other">شما نشانی‌های جایگزین %1$s را برای این اتاق حذف کردید.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s نشانی جایگزین %2$s را برای این اتاق حذف کرد.</item>
+        <item quantity="other">%1$s نشانی‌های جایگزین %2$s را برای این اتاق حذف کرد.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">شما نشانی جایگزین %1$s را برای این اتاق اضافه کردید.</item>
+        <item quantity="other">شما نشانی‌های جایگزین %1$s را برای این اتاق اضافه کردید.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s یک نشانی جایگزین %2$s را برای این اتاق اضافه کرد.</item>
+        <item quantity="other">%1$s نشانی‌های جایگزین %2$s را برای این اتاق اضافه کرد.</item>
+    </plurals>
+    <string name="initial_sync_start_downloading">همگام‌سازی اولیه:
+\nبارگیری داده‌ها…</string>
+    <string name="initial_sync_start_server_computing">همگام‌سازی اولیه:
+\nمنتظر پاسخ سرور بمانید…</string>
+    <string name="room_displayname_empty_room_was">اتاق خالی (%s بود)</string>
+    <string name="notice_widget_jitsi_modified_by_you">شما جلسه‌ی تصویری را تغییر دادید</string>
+    <string name="notice_widget_jitsi_modified">جلسه‌ی تصویری توسط %1$s تغییر کرد</string>
+    <string name="notice_widget_jitsi_added_by_you">شما جلسه‌ی تصویری را شروع کردید</string>
+    <string name="notice_widget_jitsi_added">جلسه‌ی تصویری توسط %1$s آغاز گردید</string>
+    <string name="notice_widget_jitsi_removed">جلسه‌ی تصویری توسط %1$s خاتمه یافت</string>
+    <string name="notice_widget_jitsi_removed_by_you">شما به جلسه‌ی تصویری خاتمه دادید</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 همه‌ی سرورها از مشارکت منع شده‌اند! این اتاق دیگر قابل استفاده نیست.</string>
+    <string name="notice_room_server_acl_updated_no_change">بدون تغییر.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">لیترال‌های آی‌پی برای تطبیق سرور هم‌اکنون ممنوع شد.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">لیترال‌های آی‌پی برای تطبیق سرور هم‌اکنون اجازه داده‌شد.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">تطبیق سرور %s از لیست موارد مجاز حذف گردید.</string>
+    <string name="notice_room_server_acl_updated_allowed">تطبیق سرور %s هم‌اکنون اجازه داده‌شد.</string>
+    <string name="notice_room_server_acl_updated_was_banned">تطبیق سرور %s از لیست ممنوعیت‌ها حذف شد.</string>
+    <string name="notice_room_server_acl_updated_banned">تطبیق سرور %s هم‌اکنون ممنوع شد.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">شما سطح کنترل دسترسی این اتاق را تغییر دادید.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">لیترال‌های آی‌پی برای تطبیق سرور اجازه داده شده‌است.</string>
+    <string name="notice_room_server_acl_set_title">%s سطح کنترل دسترسی‌ها برای این اتاق را بر روی سرور تنظیم کرد.</string>
+    <string name="notice_room_server_acl_updated_title">%s سطح کنترل دسترسی برای این اتاق را تغییر داد.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">لیترال‌های آی‌پی برای تطبیق سرور ممنوع است.</string>
+    <string name="notice_room_server_acl_set_allowed">تطبیق سرور %s اجازه داده شده‌است.</string>
+    <string name="notice_room_server_acl_set_banned">تطبیق سرور %s ممنوع شده‌است.</string>
+    <string name="notice_room_server_acl_set_title_by_you">شما ACL های سرور را برای این اتاق تنظیم کردید.</string>
 </resources>
\ No newline at end of file

From 07d2d2921233f917e9a938b15b776fa1bc1fd2df Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Mar 2021 13:23:34 +0100
Subject: [PATCH 227/578] No need to have list of public room here

---
 .../vector/app/features/roomdirectory/PublicRoomsViewState.kt   | 2 +-
 .../vector/app/features/roomdirectory/RoomDirectoryViewModel.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt
index b4cdb2f009..16e5428b9c 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt
@@ -29,7 +29,7 @@ data class PublicRoomsViewState(
         // Store cumul of pagination result
         val publicRooms: List<PublicRoom> = emptyList(),
         // Current pagination request
-        val asyncPublicRoomsRequest: Async<List<PublicRoom>> = Uninitialized,
+        val asyncPublicRoomsRequest: Async<Unit> = Uninitialized,
         // True if more result are available server side
         val hasMore: Boolean = false,
         // Set of joined roomId,
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index f5c545c34d..7a57be773f 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -171,7 +171,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
 
                         setState {
                             copy(
-                                    asyncPublicRoomsRequest = Success(data.chunk!!),
+                                    asyncPublicRoomsRequest = Success(Unit),
                                     // It's ok to append at the end of the list, so I use publicRooms.size()
                                     publicRooms = publicRooms.appendAt(data.chunk!!, publicRooms.size)
                                             // Rageshake #8206 tells that we can have several times the same room

From 043ddcae2cb81e30b3e266cc93c9cf2ac3a51ce8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Mar 2021 13:30:24 +0100
Subject: [PATCH 228/578] Migrate RoomDirectoryService to coroutines (#2449)

---
 .../api/session/room/RoomDirectoryService.kt  |  7 +-
 .../room/DefaultRoomDirectoryService.kt       | 19 ++--
 .../roomdirectory/RoomDirectoryViewModel.kt   | 90 ++++++++++---------
 3 files changed, 54 insertions(+), 62 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
index 55f3b76760..176de8e408 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
@@ -16,11 +16,9 @@
 
 package org.matrix.android.sdk.api.session.room
 
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
-import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to get and join public rooms. It's implemented at the session level.
@@ -30,9 +28,8 @@ interface RoomDirectoryService {
     /**
      * Get rooms from directory
      */
-    fun getPublicRooms(server: String?,
-                       publicRoomsParams: PublicRoomsParams,
-                       callback: MatrixCallback<PublicRoomsResponse>): Cancelable
+    suspend fun getPublicRooms(server: String?,
+                               publicRoomsParams: PublicRoomsParams): PublicRoomsResponse
 
     /**
      * Get the visibility of a room in the directory
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
index f9047fdf3c..218d846afb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
@@ -16,33 +16,24 @@
 
 package org.matrix.android.sdk.internal.session.room
 
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.session.room.directory.GetPublicRoomTask
 import org.matrix.android.sdk.internal.session.room.directory.GetRoomDirectoryVisibilityTask
 import org.matrix.android.sdk.internal.session.room.directory.SetRoomDirectoryVisibilityTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultRoomDirectoryService @Inject constructor(
         private val getPublicRoomTask: GetPublicRoomTask,
         private val getRoomDirectoryVisibilityTask: GetRoomDirectoryVisibilityTask,
-        private val setRoomDirectoryVisibilityTask: SetRoomDirectoryVisibilityTask,
-        private val taskExecutor: TaskExecutor) : RoomDirectoryService {
+        private val setRoomDirectoryVisibilityTask: SetRoomDirectoryVisibilityTask
+) : RoomDirectoryService {
 
-    override fun getPublicRooms(server: String?,
-                                publicRoomsParams: PublicRoomsParams,
-                                callback: MatrixCallback<PublicRoomsResponse>): Cancelable {
-        return getPublicRoomTask
-                .configureWith(GetPublicRoomTask.Params(server, publicRoomsParams)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun getPublicRooms(server: String?,
+                                        publicRoomsParams: PublicRoomsParams): PublicRoomsResponse {
+        return getPublicRoomTask.execute(GetPublicRoomTask.Params(server, publicRoomsParams))
     }
 
     override suspend fun getRoomDirectoryVisibility(roomId: String): RoomDirectoryVisibility {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 7a57be773f..ea1a5d3ada 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.roomdirectory
 
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
@@ -24,9 +25,11 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.airbnb.mvrx.appendAt
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
@@ -34,10 +37,8 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsFilter
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
-import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
 import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
@@ -63,7 +64,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
 
     private var since: String? = null
 
-    private var currentTask: Cancelable? = null
+    private var currentJob: Job? = null
 
     init {
         // Observe joined room (from the sync)
@@ -122,7 +123,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
 
     private fun filterWith(action: RoomDirectoryAction.FilterWith) = withState { state ->
         if (state.currentFilter != action.filter) {
-            currentTask?.cancel()
+            currentJob?.cancel()
 
             reset(action.filter)
             load(action.filter, state.roomDirectoryData)
@@ -144,7 +145,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
     }
 
     private fun loadMore() = withState { state ->
-        if (currentTask == null) {
+        if (currentJob == null) {
             setState {
                 copy(
                         asyncPublicRoomsRequest = Loading()
@@ -155,47 +156,50 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
     }
 
     private fun load(filter: String, roomDirectoryData: RoomDirectoryData) {
-        currentTask = session.getPublicRooms(roomDirectoryData.homeServer,
-                PublicRoomsParams(
-                        limit = PUBLIC_ROOMS_LIMIT,
-                        filter = PublicRoomsFilter(searchTerm = filter),
-                        includeAllNetworks = roomDirectoryData.includeAllNetworks,
-                        since = since,
-                        thirdPartyInstanceId = roomDirectoryData.thirdPartyInstanceId
-                ),
-                object : MatrixCallback<PublicRoomsResponse> {
-                    override fun onSuccess(data: PublicRoomsResponse) {
-                        currentTask = null
+        currentJob = viewModelScope.launch {
+            val data = try {
+                session.getPublicRooms(roomDirectoryData.homeServer,
+                        PublicRoomsParams(
+                                limit = PUBLIC_ROOMS_LIMIT,
+                                filter = PublicRoomsFilter(searchTerm = filter),
+                                includeAllNetworks = roomDirectoryData.includeAllNetworks,
+                                since = since,
+                                thirdPartyInstanceId = roomDirectoryData.thirdPartyInstanceId
+                        )
+                )
+            } catch (failure: Throwable) {
+                if (failure is Failure.Cancelled) {
+                    // Ignore, another request should be already started
+                    return@launch
+                }
 
-                        since = data.nextBatch
+                currentJob = null
 
-                        setState {
-                            copy(
-                                    asyncPublicRoomsRequest = Success(Unit),
-                                    // It's ok to append at the end of the list, so I use publicRooms.size()
-                                    publicRooms = publicRooms.appendAt(data.chunk!!, publicRooms.size)
-                                            // Rageshake #8206 tells that we can have several times the same room
-                                            .distinctBy { it.roomId },
-                                    hasMore = since != null
-                            )
-                        }
-                    }
+                setState {
+                    copy(
+                            asyncPublicRoomsRequest = Fail(failure)
+                    )
+                }
+                null
+            }
 
-                    override fun onFailure(failure: Throwable) {
-                        if (failure is Failure.Cancelled) {
-                            // Ignore, another request should be already started
-                            return
-                        }
+            data ?: return@launch
 
-                        currentTask = null
+            currentJob = null
 
-                        setState {
-                            copy(
-                                    asyncPublicRoomsRequest = Fail(failure)
-                            )
-                        }
-                    }
-                })
+            since = data.nextBatch
+
+            setState {
+                copy(
+                        asyncPublicRoomsRequest = Success(Unit),
+                        // It's ok to append at the end of the list, so I use publicRooms.size()
+                        publicRooms = publicRooms.appendAt(data.chunk!!, publicRooms.size)
+                                // Rageshake #8206 tells that we can have several times the same room
+                                .distinctBy { it.roomId },
+                        hasMore = since != null
+                )
+            }
+        }
     }
 
     private fun joinRoom(action: RoomDirectoryAction.JoinRoom) = withState { state ->
@@ -222,7 +226,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
     }
 
     override fun onCleared() {
-        currentTask?.cancel()
+        currentJob?.cancel()
         super.onCleared()
     }
 }

From 85b1edc6d263b8563d975a9775c0d144521dce8f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Mar 2021 13:53:04 +0100
Subject: [PATCH 229/578] Filter out rooms with "nsfw" in room name or room
 topic (enabled by default)

---
 .../roomdirectory/RoomDirectoryViewModel.kt   | 32 +++++++++++++++----
 .../features/settings/VectorPreferences.kt    | 10 ++++++
 vector/src/main/res/values/strings.xml        |  4 +++
 .../res/xml/vector_settings_preferences.xml   |  8 +++++
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index ea1a5d3ada..3c5f3d4701 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -28,6 +28,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
@@ -41,12 +42,13 @@ import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryDat
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
+import java.util.Locale
 
-private const val PUBLIC_ROOMS_LIMIT = 20
-
-class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState: PublicRoomsViewState,
-                                                         private val session: Session)
-    : VectorViewModel<PublicRoomsViewState, RoomDirectoryAction, RoomDirectoryViewEvents>(initialState) {
+class RoomDirectoryViewModel @AssistedInject constructor(
+        @Assisted initialState: PublicRoomsViewState,
+        vectorPreferences: VectorPreferences,
+        private val session: Session
+) : VectorViewModel<PublicRoomsViewState, RoomDirectoryAction, RoomDirectoryViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory {
@@ -54,6 +56,12 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
     }
 
     companion object : MvRxViewModelFactory<RoomDirectoryViewModel, PublicRoomsViewState> {
+        private const val PUBLIC_ROOMS_LIMIT = 20
+
+        // List of forbidden terms, in lower case
+        private val explicitContentTerms = listOf(
+                "nsfw"
+        )
 
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: PublicRoomsViewState): RoomDirectoryViewModel? {
@@ -62,6 +70,8 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
         }
     }
 
+    private val showAllRooms = vectorPreferences.showAllPublicRooms()
+
     private var since: String? = null
 
     private var currentJob: Job? = null
@@ -189,11 +199,21 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
 
             since = data.nextBatch
 
+            // Filter
+            val newPublicRooms = data.chunk.orEmpty()
+                    .filter {
+                        showAllRooms
+                                || "${it.name} ${it.topic}".toLowerCase(Locale.ROOT)
+                                .let { str ->
+                                    explicitContentTerms.all { term -> term !in str }
+                                }
+                    }
+
             setState {
                 copy(
                         asyncPublicRoomsRequest = Success(Unit),
                         // It's ok to append at the end of the list, so I use publicRooms.size()
-                        publicRooms = publicRooms.appendAt(data.chunk!!, publicRooms.size)
+                        publicRooms = publicRooms.appendAt(newPublicRooms, publicRooms.size)
                                 // Rageshake #8206 tells that we can have several times the same room
                                 .distinctBy { it.roomId },
                         hasMore = since != null
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index d3ef36a80b..a1151162c8 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -100,6 +100,9 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         private const val SETTINGS_ENABLE_CHAT_EFFECTS = "SETTINGS_ENABLE_CHAT_EFFECTS"
         private const val SETTINGS_SHOW_EMOJI_KEYBOARD = "SETTINGS_SHOW_EMOJI_KEYBOARD"
 
+        // Room directory
+        private const val SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS = "SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS"
+
         // Help
         private const val SETTINGS_SHOULD_SHOW_HELP_ON_ROOM_LIST_KEY = "SETTINGS_SHOULD_SHOW_HELP_ON_ROOM_LIST_KEY"
 
@@ -399,6 +402,13 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY, false)
     }
 
+    /**
+     * Show all rooms in room directory
+     */
+    fun showAllPublicRooms(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS, false)
+    }
+
     /**
      * Tells which compression level to use by default
      *
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 4ebd663f9f..e49ce6df6a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -497,6 +497,10 @@
         <item quantity="other">%d users</item>
     </plurals>
 
+    <string name="settings_category_room_directory">Room directory</string>
+    <string name="settings_room_directory_show_all_rooms">Show all rooms in the room directory</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Show all rooms, including rooms with explicit content.</string>
+
     <!-- Groups fragment -->
     <string name="groups_invite_header">Invite</string>
     <string name="groups_header">Communities</string>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index c2ee0ac03b..6a3c60a021 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -177,4 +177,12 @@
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
+    <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_room_directory">
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:key="SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS"
+        android:summary="@string/settings_room_directory_show_all_rooms_summary"
+        android:title="@string/settings_room_directory_show_all_rooms" />
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file

From 98a89564e12bbd23f2d3d2dc3db13ea4b06d230f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Mar 2021 13:59:44 +0100
Subject: [PATCH 230/578] Also filter out using the canonical alias

---
 .../vector/app/features/roomdirectory/RoomDirectoryViewModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 3c5f3d4701..4ef38758c7 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -203,7 +203,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(
             val newPublicRooms = data.chunk.orEmpty()
                     .filter {
                         showAllRooms
-                                || "${it.name} ${it.topic}".toLowerCase(Locale.ROOT)
+                                || "${it.name.orEmpty()} ${it.topic.orEmpty()} ${it.canonicalAlias.orEmpty()}".toLowerCase(Locale.ROOT)
                                 .let { str ->
                                     explicitContentTerms.all { term -> term !in str }
                                 }

From 8ab2cd9ff8571a74229d9bcd2097134967eac22d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Mar 2021 11:46:04 +0100
Subject: [PATCH 231/578] Update wording

---
 vector/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index e49ce6df6a..297be6faca 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -498,8 +498,8 @@
     </plurals>
 
     <string name="settings_category_room_directory">Room directory</string>
-    <string name="settings_room_directory_show_all_rooms">Show all rooms in the room directory</string>
-    <string name="settings_room_directory_show_all_rooms_summary">Show all rooms, including rooms with explicit content.</string>
+    <string name="settings_room_directory_show_all_rooms">Show rooms with explicit content</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Show all rooms in the room directory, including rooms with explicit content.</string>
 
     <!-- Groups fragment -->
     <string name="groups_invite_header">Invite</string>

From c57236da3046a17a958f8d33839e91012719a200 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 5 Mar 2021 11:41:13 +0100
Subject: [PATCH 232/578] Code clarity

---
 .../matrix/android/sdk/internal/session/sync/SyncTask.kt    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 97badfa1e7..00060a33b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -68,8 +68,10 @@ internal class DefaultSyncTask @Inject constructor(
     private val workingDir = File(fileDirectory, "is")
     private val initialSyncStatusRepository: InitialSyncStatusRepository = FileInitialSyncStatusRepository(workingDir)
 
-    override suspend fun execute(params: SyncTask.Params) = syncTaskSequencer.post {
-        doSync(params)
+    override suspend fun execute(params: SyncTask.Params) {
+        syncTaskSequencer.post {
+            doSync(params)
+        }
     }
 
     private suspend fun doSync(params: SyncTask.Params) {

From 63329499ac8dd8ec255c0b9603bf87af395ce9bd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Mar 2021 16:03:48 +0100
Subject: [PATCH 233/578] Add comments

---
 .../android/sdk/api/session/room/timeline/TimelineEvent.kt     | 3 +++
 .../home/room/detail/timeline/TimelineEventController.kt       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
index 7010a80233..32f6b94cd8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
@@ -38,6 +38,9 @@ import org.matrix.android.sdk.api.util.ContentUtils.extractUsefulTextFromReply
  */
 data class TimelineEvent(
         val root: Event,
+        /**
+         * Uniquely identify an event, computed locally by the sdk
+         */
         val localId: Long,
         val eventId: String,
         val displayIndex: Int,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 9acd34c827..41d9fd6de2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -427,6 +427,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             val formattedDayModel: DaySeparatorItem? = null
     ) {
         fun shouldTriggerBuild(): Boolean {
+            // Since those items can change when we paginate, force a re-build
             return mergedHeaderModel != null || formattedDayModel != null
         }
     }

From 33eed443d9a8620c2b791cb98493cfd62e77bea0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 5 Mar 2021 18:48:33 +0100
Subject: [PATCH 234/578] Split into smaller file - separation of concern

---
 .../session/room/timeline/DefaultTimeline.kt  | 248 +++---------------
 .../session/room/timeline/Extensions.kt       |  50 ++++
 .../room/timeline/ReactionUiEchoData.kt       |  23 ++
 .../session/room/timeline/TimelineState.kt    |  24 ++
 .../session/room/timeline/UIEchoManager.kt    | 183 +++++++++++++
 5 files changed, 316 insertions(+), 212 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/Extensions.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/ReactionUiEchoData.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineState.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index ca272a3520..f3f7e5d162 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -28,13 +28,7 @@ import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.RelationType
-import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
-import org.matrix.android.sdk.api.session.room.model.ReactionAggregatedSummary
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
-import org.matrix.android.sdk.api.session.room.model.message.MessageContent
-import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -46,7 +40,6 @@ import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.RoomEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
-import org.matrix.android.sdk.internal.database.query.filterEvents
 import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.database.query.whereRoomId
@@ -83,7 +76,8 @@ internal class DefaultTimeline(
         private val loadRoomMembersTask: LoadRoomMembersTask
 ) : Timeline,
         TimelineHiddenReadReceipts.Delegate,
-        TimelineInput.Listener {
+        TimelineInput.Listener,
+        UIEchoManager.Listener {
 
     companion object {
         val BACKGROUND_HANDLER = createBackgroundHandler("TIMELINE_DB_THREAD")
@@ -104,12 +98,12 @@ internal class DefaultTimeline(
     private var prevDisplayIndex: Int? = null
     private var nextDisplayIndex: Int? = null
 
-    private val uiEchoManager = UIEchoManager()
+    private val uiEchoManager = UIEchoManager(settings, this)
 
     private val builtEvents = Collections.synchronizedList<TimelineEvent>(ArrayList())
     private val builtEventsIdMap = Collections.synchronizedMap(HashMap<String, Int>())
-    private val backwardsState = AtomicReference(State())
-    private val forwardsState = AtomicReference(State())
+    private val backwardsState = AtomicReference(TimelineState())
+    private val forwardsState = AtomicReference(TimelineState())
 
     override val timelineID = UUID.randomUUID().toString()
 
@@ -174,7 +168,7 @@ internal class DefaultTimeline(
 
                 nonFilteredEvents = buildEventQuery(realm).sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING).findAll()
                 filteredEvents = nonFilteredEvents.where()
-                        .filterEventsWithSettings()
+                        .filterEventsWithSettings(settings)
                         .findAll()
                 nonFilteredEvents.addChangeListener(eventsChangeListener)
                 handleInitialLoad()
@@ -260,7 +254,9 @@ internal class DefaultTimeline(
                     .equalTo(TimelineEventEntityFields.EVENT_ID, eventId)
                     .findFirst()
 
-            val filteredEvents = nonFilteredEvents.where().filterEventsWithSettings().findAll()
+            val filteredEvents = nonFilteredEvents.where()
+                    .filterEventsWithSettings(settings)
+                    .findAll()
             val isEventInDb = nonFilteredEvent != null
 
             val isHidden = isEventInDb && filteredEvents.where()
@@ -326,20 +322,29 @@ internal class DefaultTimeline(
     }
 
     override fun onLocalEchoCreated(roomId: String, timelineEvent: TimelineEvent) {
-        if (uiEchoManager.onLocalEchoCreated(roomId, timelineEvent)) {
+        if (roomId != this.roomId || !isLive) return
+
+        val postSnapShot = uiEchoManager.onLocalEchoCreated(timelineEvent)
+
+        if (listOf(timelineEvent).filterEventsWithSettings(settings).isNotEmpty()) {
+            listeners.forEach {
+                it.onNewTimelineEvents(listOf(timelineEvent.eventId))
+            }
+        }
+
+        if (postSnapShot) {
             postSnapshot()
         }
     }
 
     override fun onLocalEchoUpdated(roomId: String, eventId: String, sendState: SendState) {
-        if (uiEchoManager.onLocalEchoUpdated(roomId, eventId, sendState)) {
+        if (roomId != this.roomId || !isLive) return
+        if (uiEchoManager.onLocalEchoUpdated(eventId, sendState)) {
             postSnapshot()
         }
     }
 
-// Private methods *****************************************************************************
-
-    private fun rebuildEvent(eventId: String, builder: (TimelineEvent) -> TimelineEvent?): Boolean {
+    override fun rebuildEvent(eventId: String, builder: (TimelineEvent) -> TimelineEvent?): Boolean {
         return tryOrNull {
             builtEventsIdMap[eventId]?.let { builtIndex ->
                 // Update the relation of existing event
@@ -359,6 +364,8 @@ internal class DefaultTimeline(
         } ?: false
     }
 
+// Private methods *****************************************************************************
+
     private fun hasMoreInCache(direction: Timeline.Direction) = getState(direction).hasMoreInCache
 
     private fun hasReachedEnd(direction: Timeline.Direction) = getState(direction).hasReachedEnd
@@ -413,11 +420,15 @@ internal class DefaultTimeline(
     private fun buildSendingEvents(): List<TimelineEvent> {
         val builtSendingEvents = ArrayList<TimelineEvent>()
         if (hasReachedEnd(Timeline.Direction.FORWARDS) && !hasMoreInCache(Timeline.Direction.FORWARDS)) {
-            builtSendingEvents.addAll(uiEchoManager.getInMemorySendingEvents().filterEventsWithSettings())
+            builtSendingEvents.addAll(
+                    uiEchoManager.getInMemorySendingEvents()
+                            .filterEventsWithSettings(settings)
+            )
+
             sendingEvents
                     .map { timelineEventMapper.map(it) }
                     // Filter out sending event that are not displayable!
-                    .filterEventsWithSettings()
+                    .filterEventsWithSettings(settings)
                     .forEach { timelineEvent ->
                         if (builtSendingEvents.find { it.eventId == timelineEvent.eventId } == null) {
                             uiEchoManager.updateSentStateWithUiEcho(timelineEvent)
@@ -432,14 +443,14 @@ internal class DefaultTimeline(
         return isReady.get() && !getState(direction).isPaginating && hasMoreToLoad(direction)
     }
 
-    private fun getState(direction: Timeline.Direction): State {
+    private fun getState(direction: Timeline.Direction): TimelineState {
         return when (direction) {
             Timeline.Direction.FORWARDS  -> forwardsState.get()
             Timeline.Direction.BACKWARDS -> backwardsState.get()
         }
     }
 
-    private fun updateState(direction: Timeline.Direction, update: (State) -> State) {
+    private fun updateState(direction: Timeline.Direction, update: (TimelineState) -> TimelineState) {
         val stateReference = when (direction) {
             Timeline.Direction.FORWARDS  -> forwardsState
             Timeline.Direction.BACKWARDS -> backwardsState
@@ -511,7 +522,7 @@ internal class DefaultTimeline(
             eventEntity?.eventId?.let { eventId ->
                 postSnapshot = rebuildEvent(eventId) {
                     val builtEvent = buildTimelineEvent(eventEntity)
-                    listOf(builtEvent).filterEventsWithSettings().firstOrNull()
+                    listOf(builtEvent).filterEventsWithSettings(settings).firstOrNull()
                 } || postSnapshot
             }
         }
@@ -744,8 +755,8 @@ internal class DefaultTimeline(
         nextDisplayIndex = null
         builtEvents.clear()
         builtEventsIdMap.clear()
-        backwardsState.set(State())
-        forwardsState.set(State())
+        backwardsState.set(TimelineState())
+        forwardsState.set(TimelineState())
     }
 
     private fun createPaginationCallback(limit: Int, direction: Timeline.Direction): MatrixCallback<TokenChunkEventPersistor.Result> {
@@ -779,191 +790,4 @@ internal class DefaultTimeline(
     private fun Timeline.Direction.toPaginationDirection(): PaginationDirection {
         return if (this == Timeline.Direction.BACKWARDS) PaginationDirection.BACKWARDS else PaginationDirection.FORWARDS
     }
-
-    private fun RealmQuery<TimelineEventEntity>.filterEventsWithSettings(): RealmQuery<TimelineEventEntity> {
-        return filterEvents(settings.filters)
-    }
-
-    private fun List<TimelineEvent>.filterEventsWithSettings(): List<TimelineEvent> {
-        return filter { event ->
-            val filterType = !settings.filters.filterTypes
-                    || settings.filters.allowedTypes.any { it.eventType == event.root.type && (it.stateKey == null || it.stateKey == event.root.senderId) }
-            if (!filterType) return@filter false
-
-            val filterEdits = if (settings.filters.filterEdits && event.root.getClearType() == EventType.MESSAGE) {
-                val messageContent = event.root.getClearContent().toModel<MessageContent>()
-                messageContent?.relatesTo?.type != RelationType.REPLACE && messageContent?.relatesTo?.type != RelationType.RESPONSE
-            } else {
-                true
-            }
-            if (!filterEdits) return@filter false
-
-            val filterRedacted = settings.filters.filterRedacted && event.root.isRedacted()
-            !filterRedacted
-        }
-    }
-
-    private data class State(
-            val hasReachedEnd: Boolean = false,
-            val hasMoreInCache: Boolean = true,
-            val isPaginating: Boolean = false,
-            val requestedPaginationCount: Int = 0
-    )
-
-    private data class ReactionUiEchoData(
-            val localEchoId: String,
-            val reactedOnEventId: String,
-            val reaction: String
-    )
-
-    inner class UIEchoManager {
-
-        private val inMemorySendingEvents = Collections.synchronizedList<TimelineEvent>(ArrayList())
-
-        fun getInMemorySendingEvents(): List<TimelineEvent> {
-            return inMemorySendingEvents.toList()
-        }
-
-        /**
-         * Due to lag of DB updates, we keep some UI echo of some properties to update timeline faster
-         */
-        private val inMemorySendingStates = Collections.synchronizedMap<String, SendState>(HashMap())
-
-        private val inMemoryReactions = Collections.synchronizedMap<String, MutableList<ReactionUiEchoData>>(HashMap())
-
-        fun sentEventsUpdated(events: RealmResults<TimelineEventEntity>) {
-            // Remove in memory as soon as they are known by database
-            events.forEach { te ->
-                inMemorySendingEvents.removeAll { te.eventId == it.eventId }
-            }
-            inMemorySendingStates.keys.removeAll { key ->
-                events.find { it.eventId == key } == null
-            }
-
-            inMemoryReactions.forEach { (_, uiEchoData) ->
-                uiEchoData.removeAll { data ->
-                    // I remove the uiEcho, when the related event is not anymore in the sending list
-                    // (means that it is synced)!
-                    events.find { it.eventId == data.localEchoId } == null
-                }
-            }
-        }
-
-        fun onLocalEchoUpdated(roomId: String, eventId: String, sendState: SendState): Boolean {
-            if (isLive && roomId == this@DefaultTimeline.roomId) {
-                val existingState = inMemorySendingStates[eventId]
-                inMemorySendingStates[eventId] = sendState
-                if (existingState != sendState) {
-                    return true
-                }
-            }
-            return false
-        }
-
-        // return true if should update
-        fun onLocalEchoCreated(roomId: String, timelineEvent: TimelineEvent): Boolean {
-            var postSnapshot = false
-            if (isLive && roomId == this@DefaultTimeline.roomId) {
-                // Manage some ui echos (do it before filter because actual event could be filtered out)
-                when (timelineEvent.root.getClearType()) {
-                    EventType.REDACTION -> {
-                    }
-                    EventType.REACTION  -> {
-                        val content = timelineEvent.root.content?.toModel<ReactionContent>()
-                        if (RelationType.ANNOTATION == content?.relatesTo?.type) {
-                            val reaction = content.relatesTo.key
-                            val relatedEventID = content.relatesTo.eventId
-                            inMemoryReactions.getOrPut(relatedEventID) { mutableListOf() }
-                                    .add(
-                                            ReactionUiEchoData(
-                                                    localEchoId = timelineEvent.eventId,
-                                                    reactedOnEventId = relatedEventID,
-                                                    reaction = reaction
-                                            )
-                                    )
-                            postSnapshot = rebuildEvent(relatedEventID) {
-                                decorateEventWithReactionUiEcho(it)
-                            } || postSnapshot
-                        }
-                    }
-                }
-
-                // do not add events that would have been filtered
-                if (listOf(timelineEvent).filterEventsWithSettings().isNotEmpty()) {
-                    listeners.forEach {
-                        it.onNewTimelineEvents(listOf(timelineEvent.eventId))
-                    }
-                    Timber.v("On local echo created: ${timelineEvent.eventId}")
-                    inMemorySendingEvents.add(0, timelineEvent)
-                    postSnapshot = true
-                }
-            }
-            return postSnapshot
-        }
-
-        fun decorateEventWithReactionUiEcho(timelineEvent: TimelineEvent): TimelineEvent? {
-            val relatedEventID = timelineEvent.eventId
-            val contents = inMemoryReactions[relatedEventID] ?: return null
-
-            var existingAnnotationSummary = timelineEvent.annotations ?: EventAnnotationsSummary(
-                    relatedEventID
-            )
-            val updateReactions = existingAnnotationSummary.reactionsSummary.toMutableList()
-
-            contents.forEach { uiEchoReaction ->
-                val existing = updateReactions.firstOrNull { it.key == uiEchoReaction.reaction }
-                if (existing == null) {
-                    // just add the new key
-                    ReactionAggregatedSummary(
-                            key = uiEchoReaction.reaction,
-                            count = 1,
-                            addedByMe = true,
-                            firstTimestamp = System.currentTimeMillis(),
-                            sourceEvents = emptyList(),
-                            localEchoEvents = listOf(uiEchoReaction.localEchoId)
-                    ).let { updateReactions.add(it) }
-                } else {
-                    // update Existing Key
-                    if (!existing.localEchoEvents.contains(uiEchoReaction.localEchoId)) {
-                        updateReactions.remove(existing)
-                        // only update if echo is not yet there
-                        ReactionAggregatedSummary(
-                                key = existing.key,
-                                count = existing.count + 1,
-                                addedByMe = true,
-                                firstTimestamp = existing.firstTimestamp,
-                                sourceEvents = existing.sourceEvents,
-                                localEchoEvents = existing.localEchoEvents + uiEchoReaction.localEchoId
-
-                        ).let { updateReactions.add(it) }
-                    }
-                }
-            }
-
-            existingAnnotationSummary = existingAnnotationSummary.copy(
-                    reactionsSummary = updateReactions
-            )
-            return timelineEvent.copy(
-                    annotations = existingAnnotationSummary
-            )
-        }
-
-        fun updateSentStateWithUiEcho(element: TimelineEvent) {
-            inMemorySendingStates[element.eventId]?.let {
-                // Timber.v("## ${System.currentTimeMillis()} Send event refresh echo with live state ${it} from state ${element.root.sendState}")
-                element.root.sendState = element.root.sendState.takeIf { it == SendState.SENT } ?: it
-            }
-        }
-
-        fun onSyncedEvent(transactionId: String?) {
-            val sendingEvent = inMemorySendingEvents.find {
-                it.eventId == transactionId
-            }
-            inMemorySendingEvents.remove(sendingEvent)
-            // Is it too early to clear it? will be done when removed from sending anyway?
-            inMemoryReactions.forEach { (_, u) ->
-                u.filterNot { it.localEchoId == transactionId }
-            }
-        }
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/Extensions.kt
new file mode 100644
index 0000000000..b2c8021f3b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/Extensions.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.timeline
+
+import io.realm.RealmQuery
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.filterEvents
+
+internal fun RealmQuery<TimelineEventEntity>.filterEventsWithSettings(settings: TimelineSettings): RealmQuery<TimelineEventEntity> {
+    return filterEvents(settings.filters)
+}
+
+internal fun List<TimelineEvent>.filterEventsWithSettings(settings: TimelineSettings): List<TimelineEvent> {
+    return filter { event ->
+        val filterType = !settings.filters.filterTypes
+                || settings.filters.allowedTypes.any { it.eventType == event.root.type && (it.stateKey == null || it.stateKey == event.root.senderId) }
+        if (!filterType) return@filter false
+
+        val filterEdits = if (settings.filters.filterEdits && event.root.getClearType() == EventType.MESSAGE) {
+            val messageContent = event.root.getClearContent().toModel<MessageContent>()
+            messageContent?.relatesTo?.type != RelationType.REPLACE && messageContent?.relatesTo?.type != RelationType.RESPONSE
+        } else {
+            true
+        }
+        if (!filterEdits) return@filter false
+
+        val filterRedacted = settings.filters.filterRedacted && event.root.isRedacted()
+        !filterRedacted
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/ReactionUiEchoData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/ReactionUiEchoData.kt
new file mode 100644
index 0000000000..521120c415
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/ReactionUiEchoData.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.timeline
+
+internal data class ReactionUiEchoData(
+        val localEchoId: String,
+        val reactedOnEventId: String,
+        val reaction: String
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineState.kt
new file mode 100644
index 0000000000..0143d9bab3
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineState.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.timeline
+
+internal data class TimelineState(
+        val hasReachedEnd: Boolean = false,
+        val hasMoreInCache: Boolean = true,
+        val isPaginating: Boolean = false,
+        val requestedPaginationCount: Int = 0
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
new file mode 100644
index 0000000000..f37532744d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.timeline
+
+import io.realm.RealmResults
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
+import org.matrix.android.sdk.api.session.room.model.ReactionAggregatedSummary
+import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import timber.log.Timber
+import java.util.Collections
+
+internal class UIEchoManager(
+        private val settings: TimelineSettings,
+        private val listener: Listener
+) {
+
+    interface Listener {
+        fun rebuildEvent(eventId: String, builder: (TimelineEvent) -> TimelineEvent?): Boolean
+    }
+
+    private val inMemorySendingEvents = Collections.synchronizedList<TimelineEvent>(ArrayList())
+
+    fun getInMemorySendingEvents(): List<TimelineEvent> {
+        return inMemorySendingEvents.toList()
+    }
+
+    /**
+     * Due to lag of DB updates, we keep some UI echo of some properties to update timeline faster
+     */
+    private val inMemorySendingStates = Collections.synchronizedMap<String, SendState>(HashMap())
+
+    private val inMemoryReactions = Collections.synchronizedMap<String, MutableList<ReactionUiEchoData>>(HashMap())
+
+    fun sentEventsUpdated(events: RealmResults<TimelineEventEntity>) {
+        // Remove in memory as soon as they are known by database
+        events.forEach { te ->
+            inMemorySendingEvents.removeAll { te.eventId == it.eventId }
+        }
+        inMemorySendingStates.keys.removeAll { key ->
+            events.find { it.eventId == key } == null
+        }
+
+        inMemoryReactions.forEach { (_, uiEchoData) ->
+            uiEchoData.removeAll { data ->
+                // I remove the uiEcho, when the related event is not anymore in the sending list
+                // (means that it is synced)!
+                events.find { it.eventId == data.localEchoId } == null
+            }
+        }
+    }
+
+    fun onLocalEchoUpdated(eventId: String, sendState: SendState): Boolean {
+        val existingState = inMemorySendingStates[eventId]
+        inMemorySendingStates[eventId] = sendState
+        return existingState != sendState
+    }
+
+    // return true if should update
+    fun onLocalEchoCreated(timelineEvent: TimelineEvent): Boolean {
+        var postSnapshot = false
+
+        // Manage some ui echos (do it before filter because actual event could be filtered out)
+        when (timelineEvent.root.getClearType()) {
+            EventType.REDACTION -> {
+            }
+            EventType.REACTION  -> {
+                val content = timelineEvent.root.content?.toModel<ReactionContent>()
+                if (RelationType.ANNOTATION == content?.relatesTo?.type) {
+                    val reaction = content.relatesTo.key
+                    val relatedEventID = content.relatesTo.eventId
+                    inMemoryReactions.getOrPut(relatedEventID) { mutableListOf() }
+                            .add(
+                                    ReactionUiEchoData(
+                                            localEchoId = timelineEvent.eventId,
+                                            reactedOnEventId = relatedEventID,
+                                            reaction = reaction
+                                    )
+                            )
+                    postSnapshot = listener.rebuildEvent(relatedEventID) {
+                        decorateEventWithReactionUiEcho(it)
+                    } || postSnapshot
+                }
+            }
+        }
+
+        // do not add events that would have been filtered
+        if (listOf(timelineEvent).filterEventsWithSettings(settings).isNotEmpty()) {
+            Timber.v("On local echo created: ${timelineEvent.eventId}")
+            inMemorySendingEvents.add(0, timelineEvent)
+            postSnapshot = true
+        }
+
+        return postSnapshot
+    }
+
+    fun decorateEventWithReactionUiEcho(timelineEvent: TimelineEvent): TimelineEvent? {
+        val relatedEventID = timelineEvent.eventId
+        val contents = inMemoryReactions[relatedEventID] ?: return null
+
+        var existingAnnotationSummary = timelineEvent.annotations ?: EventAnnotationsSummary(
+                relatedEventID
+        )
+        val updateReactions = existingAnnotationSummary.reactionsSummary.toMutableList()
+
+        contents.forEach { uiEchoReaction ->
+            val existing = updateReactions.firstOrNull { it.key == uiEchoReaction.reaction }
+            if (existing == null) {
+                // just add the new key
+                ReactionAggregatedSummary(
+                        key = uiEchoReaction.reaction,
+                        count = 1,
+                        addedByMe = true,
+                        firstTimestamp = System.currentTimeMillis(),
+                        sourceEvents = emptyList(),
+                        localEchoEvents = listOf(uiEchoReaction.localEchoId)
+                ).let { updateReactions.add(it) }
+            } else {
+                // update Existing Key
+                if (!existing.localEchoEvents.contains(uiEchoReaction.localEchoId)) {
+                    updateReactions.remove(existing)
+                    // only update if echo is not yet there
+                    ReactionAggregatedSummary(
+                            key = existing.key,
+                            count = existing.count + 1,
+                            addedByMe = true,
+                            firstTimestamp = existing.firstTimestamp,
+                            sourceEvents = existing.sourceEvents,
+                            localEchoEvents = existing.localEchoEvents + uiEchoReaction.localEchoId
+
+                    ).let { updateReactions.add(it) }
+                }
+            }
+        }
+
+        existingAnnotationSummary = existingAnnotationSummary.copy(
+                reactionsSummary = updateReactions
+        )
+        return timelineEvent.copy(
+                annotations = existingAnnotationSummary
+        )
+    }
+
+    fun updateSentStateWithUiEcho(element: TimelineEvent) {
+        inMemorySendingStates[element.eventId]?.let {
+            // Timber.v("## ${System.currentTimeMillis()} Send event refresh echo with live state ${it} from state ${element.root.sendState}")
+            if(element.root.sendState != SendState.SENT) {
+                element.root.sendState = it
+            }
+        }
+    }
+
+    fun onSyncedEvent(transactionId: String?) {
+        val sendingEvent = inMemorySendingEvents.find {
+            it.eventId == transactionId
+        }
+        inMemorySendingEvents.remove(sendingEvent)
+        // Is it too early to clear it? will be done when removed from sending anyway?
+        inMemoryReactions.forEach { (_, u) ->
+            u.filterNot { it.localEchoId == transactionId }
+        }
+    }
+}

From 66aa9cd8881b9cb4ffffd010b530b9bebc2fbf50 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 8 Mar 2021 10:55:49 +0100
Subject: [PATCH 235/578] Cleanup

---
 .../session/room/timeline/DefaultTimeline.kt       |  4 ++--
 .../session/room/timeline/UIEchoManager.kt         | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index f3f7e5d162..33ce93b5a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -162,7 +162,7 @@ internal class DefaultTimeline(
                 // are still used for ui echo (relation like reaction)
                 sendingEvents = roomEntity.sendingTimelineEvents.where()/*.filterEventsWithSettings()*/.findAll()
                 sendingEvents.addChangeListener { events ->
-                    uiEchoManager.sentEventsUpdated(events)
+                    uiEchoManager.onSentEventsInDatabase(events.map { it.eventId })
                     postSnapshot()
                 }
 
@@ -339,7 +339,7 @@ internal class DefaultTimeline(
 
     override fun onLocalEchoUpdated(roomId: String, eventId: String, sendState: SendState) {
         if (roomId != this.roomId || !isLive) return
-        if (uiEchoManager.onLocalEchoUpdated(eventId, sendState)) {
+        if (uiEchoManager.onSendStateUpdated(eventId, sendState)) {
             postSnapshot()
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
index f37532744d..fdafdb161d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.session.room.timeline
 
-import io.realm.RealmResults
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -26,7 +25,6 @@ import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import timber.log.Timber
 import java.util.Collections
 
@@ -52,25 +50,25 @@ internal class UIEchoManager(
 
     private val inMemoryReactions = Collections.synchronizedMap<String, MutableList<ReactionUiEchoData>>(HashMap())
 
-    fun sentEventsUpdated(events: RealmResults<TimelineEventEntity>) {
+    fun onSentEventsInDatabase(eventIds: List<String>) {
         // Remove in memory as soon as they are known by database
-        events.forEach { te ->
-            inMemorySendingEvents.removeAll { te.eventId == it.eventId }
+        eventIds.forEach { eventId ->
+            inMemorySendingEvents.removeAll { eventId == it.eventId }
         }
         inMemorySendingStates.keys.removeAll { key ->
-            events.find { it.eventId == key } == null
+            eventIds.find { it == key } == null
         }
 
         inMemoryReactions.forEach { (_, uiEchoData) ->
             uiEchoData.removeAll { data ->
                 // I remove the uiEcho, when the related event is not anymore in the sending list
                 // (means that it is synced)!
-                events.find { it.eventId == data.localEchoId } == null
+                eventIds.find { it == data.localEchoId } == null
             }
         }
     }
 
-    fun onLocalEchoUpdated(eventId: String, sendState: SendState): Boolean {
+    fun onSendStateUpdated(eventId: String, sendState: SendState): Boolean {
         val existingState = inMemorySendingStates[eventId]
         inMemorySendingStates[eventId] = sendState
         return existingState != sendState

From 0cd728222ec4baefdb999f39d9a5831b547aa7e0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 8 Mar 2021 15:17:41 +0100
Subject: [PATCH 236/578] Cleanup

---
 .../home/room/detail/timeline/TimelineEventController.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 41d9fd6de2..d7295176fe 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -155,6 +155,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
                 (position until (position + count)).forEach {
+                    // Invalidate cache
                     modelCache[it] = null
                 }
                 requestModelBuild()
@@ -173,7 +174,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         override fun onInserted(position: Int, count: Int) {
             synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
-                (0 until count).forEach {
+                repeat(count) {
                     modelCache.add(position, null)
                 }
                 requestModelBuild()
@@ -183,7 +184,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         override fun onRemoved(position: Int, count: Int) {
             synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
-                (0 until count).forEach {
+                repeat(count) {
                     modelCache.removeAt(position)
                 }
                 requestModelBuild()

From 25ea1ba641e9bb182e171841d4f5f8371d681778 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 9 Mar 2021 13:55:56 +0100
Subject: [PATCH 237/578] Fix issue with local echo

---
 CHANGES.md                                    |  1 +
 .../sdk/api/session/events/model/Event.kt     | 13 ++++++++
 .../session/room/send/LocalEchoRepository.kt  |  4 +--
 .../session/room/timeline/DefaultTimeline.kt  | 30 ++++++++++---------
 .../session/room/timeline/UIEchoManager.kt    | 20 ++++++-------
 5 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8783bce6d8..7ab26c1d04 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)
  - Be robust if Event.type is missing (#2946)
+ - Snappier message send status
 
 Translations 🗣:
  - All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index a208b15364..844e8dbbab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -98,6 +98,19 @@ data class Event(
     @Transient
     var ageLocalTs: Long? = null
 
+    /**
+     * Copy all fields, including transient fields
+     */
+    fun copyAll(): Event {
+        return copy().also {
+            it.mxDecryptionResult = mxDecryptionResult
+            it.mCryptoError = mCryptoError
+            it.mCryptoErrorReason = mCryptoErrorReason
+            it.sendState = sendState
+            it.ageLocalTs = ageLocalTs
+        }
+    }
+
     /**
      * Check if event is a state event.
      * @return true if event is state event.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
index 1277e81fe3..70245cbd5e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
@@ -27,7 +27,6 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.database.RealmSessionProvider
 import org.matrix.android.sdk.internal.database.asyncTransaction
-import org.matrix.android.sdk.internal.database.helper.nextId
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.mapper.toEntity
@@ -45,6 +44,7 @@ import org.matrix.android.sdk.internal.session.room.timeline.TimelineInput
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.awaitTransaction
 import timber.log.Timber
+import java.util.UUID
 import javax.inject.Inject
 
 internal class LocalEchoRepository @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
@@ -64,7 +64,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
             val eventEntity = event.toEntity(roomId, SendState.UNSENT, System.currentTimeMillis())
             val roomMemberHelper = RoomMemberHelper(realm, roomId)
             val myUser = roomMemberHelper.getLastRoomMember(senderId)
-            val localId = TimelineEventEntity.nextId(realm)
+            val localId = UUID.randomUUID().mostSignificantBits
             TimelineEventEntity(localId).also {
                 it.root = eventEntity
                 it.eventId = event.eventId
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 33ce93b5a8..d0946abe28 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -418,27 +418,29 @@ internal class DefaultTimeline(
     }
 
     private fun buildSendingEvents(): List<TimelineEvent> {
-        val builtSendingEvents = ArrayList<TimelineEvent>()
+        val builtSendingEvents = mutableListOf<TimelineEvent>()
         if (hasReachedEnd(Timeline.Direction.FORWARDS) && !hasMoreInCache(Timeline.Direction.FORWARDS)) {
-            builtSendingEvents.addAll(
-                    uiEchoManager.getInMemorySendingEvents()
-                            .filterEventsWithSettings(settings)
-            )
-
+            uiEchoManager.getInMemorySendingEvents()
+                    .filterSendingEventsTo(builtSendingEvents)
             sendingEvents
-                    .map { timelineEventMapper.map(it) }
-                    // Filter out sending event that are not displayable!
-                    .filterEventsWithSettings(settings)
-                    .forEach { timelineEvent ->
-                        if (builtSendingEvents.find { it.eventId == timelineEvent.eventId } == null) {
-                            uiEchoManager.updateSentStateWithUiEcho(timelineEvent)
-                            builtSendingEvents.add(timelineEvent)
-                        }
+                    .filter { timelineEvent ->
+                        builtSendingEvents.none { it.eventId == timelineEvent.eventId }
                     }
+                    .map { timelineEventMapper.map(it) }
+                    .filterSendingEventsTo(builtSendingEvents)
         }
         return builtSendingEvents
     }
 
+    private fun List<TimelineEvent>.filterSendingEventsTo(target: MutableList<TimelineEvent>) {
+        target.addAll(
+                // Filter out sending event that are not displayable!
+                filterEventsWithSettings(settings)
+                        // Get most up to date send state (in memory)
+                        .map { uiEchoManager.updateSentStateWithUiEcho(it) }
+        )
+    }
+
     private fun canPaginate(direction: Timeline.Direction): Boolean {
         return isReady.get() && !getState(direction).isPaginating && hasMoreToLoad(direction)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
index fdafdb161d..67d0d90d77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
@@ -55,10 +55,6 @@ internal class UIEchoManager(
         eventIds.forEach { eventId ->
             inMemorySendingEvents.removeAll { eventId == it.eventId }
         }
-        inMemorySendingStates.keys.removeAll { key ->
-            eventIds.find { it == key } == null
-        }
-
         inMemoryReactions.forEach { (_, uiEchoData) ->
             uiEchoData.removeAll { data ->
                 // I remove the uiEcho, when the related event is not anymore in the sending list
@@ -159,13 +155,14 @@ internal class UIEchoManager(
         )
     }
 
-    fun updateSentStateWithUiEcho(element: TimelineEvent) {
-        inMemorySendingStates[element.eventId]?.let {
-            // Timber.v("## ${System.currentTimeMillis()} Send event refresh echo with live state ${it} from state ${element.root.sendState}")
-            if(element.root.sendState != SendState.SENT) {
-                element.root.sendState = it
-            }
-        }
+    fun updateSentStateWithUiEcho(timelineEvent: TimelineEvent): TimelineEvent {
+        if (timelineEvent.root.sendState.isSent()) return timelineEvent
+        val inMemoryState = inMemorySendingStates[timelineEvent.eventId] ?: return timelineEvent
+        // Timber.v("## ${System.currentTimeMillis()} Send event refresh echo with live state $inMemoryState from state ${element.root.sendState}")
+        return timelineEvent.copy(
+                root = timelineEvent.root.copyAll()
+                        .also { it.sendState = inMemoryState }
+        )
     }
 
     fun onSyncedEvent(transactionId: String?) {
@@ -177,5 +174,6 @@ internal class UIEchoManager(
         inMemoryReactions.forEach { (_, u) ->
             u.filterNot { it.localEchoId == transactionId }
         }
+        inMemorySendingStates.remove(transactionId)
     }
 }

From 46bc252a519cc0ff1300f3c979cf24fcefc75f6e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Mar 2021 15:19:15 +0100
Subject: [PATCH 238/578] Add arrows to room widget item

---
 .../src/main/res/layout/item_room_widget.xml  | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/res/layout/item_room_widget.xml b/vector/src/main/res/layout/item_room_widget.xml
index d86fa2d1cf..22842264e7 100644
--- a/vector/src/main/res/layout/item_room_widget.xml
+++ b/vector/src/main/res/layout/item_room_widget.xml
@@ -8,19 +8,20 @@
     android:gravity="center_vertical"
     android:minHeight="64dp"
     android:orientation="horizontal"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp">
+    android:paddingStart="@dimen/layout_horizontal_margin"
+    android:paddingEnd="@dimen/layout_horizontal_margin">
 
     <ImageView
         android:id="@+id/roomWidgetAvatar"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:layout_marginEnd="8dp"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@tools:sample/avatars"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/roomWidgetName"
@@ -28,21 +29,35 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         app:layout_constraintBottom_toTopOf="@id/roomWidgetUrl"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/roomWidgetEditable"
         app:layout_constraintStart_toEndOf="@id/roomWidgetAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
+        app:layout_goneMarginStart="0dp"
         tools:text="Widget name" />
 
-
     <TextView
         android:id="@+id/roomWidgetUrl"
         style="@style/BottomSheetItemTextSecondary"
+        android:layout_marginEnd="8dp"
         android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/roomWidgetName"
+        app:layout_constraintEnd_toStartOf="@id/roomWidgetEditable"
         app:layout_constraintStart_toStartOf="@id/roomWidgetName"
         app:layout_constraintTop_toBottomOf="@id/roomWidgetName"
         tools:text="https://foobar" />
 
+    <ImageView
+        android:id="@+id/roomWidgetEditable"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_arrow_right"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 3c7a108940376ff68dc88494563ce3fdc4dca1c1 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 9 Mar 2021 18:18:28 +0100
Subject: [PATCH 239/578] Send: clean and update CHANGES

---
 CHANGES.md                                                 | 1 +
 .../matrix/android/sdk/internal/session/SessionModule.kt   | 1 -
 .../session/room/send/queue/EventSenderProcessor.kt        | 3 +--
 .../room/send/queue/EventSenderProcessorCoroutine.kt       | 7 +++----
 .../session/room/send/queue/EventSenderProcessorThread.kt  | 5 -----
 .../room/send/queue/HomeServerAvailabilityChecker.kt       | 3 +--
 .../sdk/internal/session/room/send/queue/QueueMemento.kt   | 3 +--
 .../sdk/internal/session/room/send/queue/QueuedTask.kt     | 2 +-
 8 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ea78fcaf7d..8136abeffd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
  - PIP support for Jitsi call (#2418)
  - Add tooltip for room quick actions
  - Pre-share session keys when opening a room or start typing (#2771)
+ - Sending is now queuing by room and not uniquely to the session
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index 1b0a2fa027..f10eb67921 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -371,5 +371,4 @@ internal abstract class SessionModule {
 
     @Binds
     abstract fun bindEventSenderProcessor(processor: EventSenderProcessorCoroutine): EventSenderProcessor
-
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
index 05d0876ef0..8bafa5f882 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,5 +33,4 @@ internal interface EventSenderProcessor: SessionLifecycleObserver {
     fun postTask(task: QueuedTask): Cancelable
 
     fun cancel(eventId: String, roomId: String)
-
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
index 56fb3b8539..e93ebe9048 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.toCancelable
 import timber.log.Timber
 import java.io.IOException
-import java.util.Queue
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
@@ -57,7 +56,7 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
         private val sessionParams: SessionParams,
         private val queuedTaskFactory: QueuedTaskFactory,
         private val taskExecutor: TaskExecutor,
-        private val memento: QueueMemento,
+        private val memento: QueueMemento
 ) : EventSenderProcessor {
 
     private val waitForNetworkSequencer = SemaphoreCoroutineSequencer()
@@ -165,7 +164,7 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
         markAsFinished(task)
     }
 
-    private suspend fun QueuedTask.markAsFailedOrRetry(failure: Throwable, retryDelay: Long){
+    private suspend fun QueuedTask.markAsFailedOrRetry(failure: Throwable, retryDelay: Long) {
         if (retryCount.incrementAndGet() >= MAX_RETRY_COUNT) {
             onTaskFailed()
         } else {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
index 2e1acf710c..2d2111f838 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
@@ -33,9 +33,6 @@ import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import timber.log.Timber
 import java.io.IOException
-import java.net.InetAddress
-import java.net.InetSocketAddress
-import java.net.Socket
 import java.util.Timer
 import java.util.TimerTask
 import java.util.concurrent.LinkedBlockingQueue
@@ -74,7 +71,6 @@ internal class EventSenderProcessorThread @Inject constructor(
         interrupt()
     }
 
-
     override fun start() {
         super.start()
         // We should check for sending events not handled because app was killed
@@ -234,5 +230,4 @@ internal class EventSenderProcessorThread @Inject constructor(
         }
         synchronized(networkAvailableLock) { networkAvailableLock.wait() }
     }
-
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/HomeServerAvailabilityChecker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/HomeServerAvailabilityChecker.kt
index c68be74a64..2d53699917 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/HomeServerAvailabilityChecker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/HomeServerAvailabilityChecker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,5 +41,4 @@ internal class HomeServerAvailabilityChecker(val sessionParams: SessionParams) {
             return false
         }
     }
-
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
index 472e4d440f..116c8d5c6b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt
@@ -54,8 +54,7 @@ internal class QueueMemento @Inject constructor(context: Context,
         persist()
     }
 
-    fun trackedTasks() = synchronized(trackedTasks){
-
+    fun trackedTasks() = synchronized(trackedTasks) {
     }
 
     private fun persist() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
index e5302c171c..948786677d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueuedTask.kt
@@ -29,7 +29,7 @@ internal abstract class QueuedTask(
         val taskIdentifier: String
 ) : Cancelable {
 
-    override fun toString() = "${javaClass.simpleName} queueIdentifier: $queueIdentifier, taskIdentifier:  ${taskIdentifier})"
+    override fun toString() = "${javaClass.simpleName} queueIdentifier: $queueIdentifier, taskIdentifier:  $taskIdentifier)"
 
     var retryCount = AtomicInteger(0)
 

From 7936c2c6f841c9456d3c3526999881c5ea19eb51 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 9 Mar 2021 20:23:06 +0100
Subject: [PATCH 240/578] Send: clean after Benoits review

---
 .../session/room/send/queue/EventSenderProcessorCoroutine.kt    | 2 +-
 .../session/room/send/queue/EventSenderProcessorThread.kt       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
index e93ebe9048..2972332989 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
@@ -118,7 +118,7 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
                     executeTask(task)
                 }.toCancelable()
                 .also {
-                    cancelableBag[task.taskIdentifier]
+                    cancelableBag[task.taskIdentifier] = it
                 }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
index 2d2111f838..b79a86dd7e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
@@ -46,6 +46,7 @@ import kotlin.concurrent.schedule
  *
  * If the app is killed before all event were sent, on next wakeup the scheduled events will be re posted
  */
+@Deprecated("You should know use EventSenderProcessorCoroutine instead")
 @SessionScope
 internal class EventSenderProcessorThread @Inject constructor(
         private val cryptoService: CryptoService,

From c178535cc860c9f00356216e06338fef5b0d5640 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 25 Feb 2021 13:32:56 +0300
Subject: [PATCH 241/578] Show send status of text messages.

---
 .../timeline/TimelineEventController.kt       |  4 ++-
 .../timeline/factory/CallItemFactory.kt       |  2 +-
 .../timeline/factory/DefaultItemFactory.kt    |  2 +-
 .../timeline/factory/EncryptedItemFactory.kt  |  3 ++-
 .../timeline/factory/EncryptionItemFactory.kt |  2 +-
 .../timeline/factory/MessageItemFactory.kt    |  3 ++-
 .../timeline/factory/NoticeItemFactory.kt     |  2 +-
 .../timeline/factory/TimelineItemFactory.kt   |  7 ++---
 .../factory/VerificationItemFactory.kt        |  4 +--
 .../timeline/factory/WidgetItemFactory.kt     |  2 +-
 .../helper/MessageInformationDataFactory.kt   | 27 ++++++++++++++++---
 .../detail/timeline/item/AbsMessageItem.kt    | 24 ++++++++++++++++-
 .../timeline/item/MessageInformationData.kt   | 10 ++++++-
 .../drawable/ic_delete_unsent_messages.xml    |  9 +++++++
 .../src/main/res/drawable/ic_message_sent.xml | 13 +++++++++
 .../drawable/ic_retry_sending_messages.xml    | 10 +++++++
 .../main/res/drawable/ic_sending_message.xml  | 10 +++++++
 .../drawable/ic_sending_message_failed.xml    | 10 +++++++
 .../res/layout/item_timeline_event_base.xml   | 12 +++++++++
 19 files changed, 138 insertions(+), 18 deletions(-)
 create mode 100644 vector/src/main/res/drawable/ic_delete_unsent_messages.xml
 create mode 100644 vector/src/main/res/drawable/ic_message_sent.xml
 create mode 100644 vector/src/main/res/drawable/ic_retry_sending_messages.xml
 create mode 100644 vector/src/main/res/drawable/ic_sending_message.xml
 create mode 100644 vector/src/main/res/drawable/ic_sending_message_failed.xml

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index d7295176fe..7a1b758f3a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -30,6 +30,7 @@ import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.epoxy.LoadingItem_
 import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.extensions.nextOrNull
+import im.vector.app.core.extensions.prevOrNull
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.RoomDetailViewState
@@ -336,11 +337,12 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     private fun buildCacheItem(currentPosition: Int, items: List<TimelineEvent>): CacheItemData {
         val event = items[currentPosition]
         val nextEvent = items.nextOrNull(currentPosition)
+        val prevEvent = items.prevOrNull(currentPosition)
         if (hasReachedInvite && hasUTD) {
             return CacheItemData(event.localId, event.root.eventId, null, null, null)
         }
         updateUTDStates(event, nextEvent)
-        val eventModel = timelineItemFactory.create(event, nextEvent, eventIdToHighlight, callback).also {
+        val eventModel = timelineItemFactory.create(event, prevEvent, nextEvent, eventIdToHighlight, callback).also {
             it.id(event.localId)
             it.setOnVisibilityStateChanged(TimelineEventVisibilityStateChangedListener(callback, event))
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
index d3dd94eae7..548f7a3b1c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
@@ -52,7 +52,7 @@ class CallItemFactory @Inject constructor(
     ): VectorEpoxyModel<*>? {
         if (event.root.eventId == null) return null
         val roomId = event.roomId
-        val informationData = messageInformationDataFactory.create(event, null)
+        val informationData = messageInformationDataFactory.create(event, null, null)
         val callSignalingContent = event.getCallSignallingContent() ?: return null
         val callId = callSignalingContent.callId ?: return null
         val call = callManager.getCallById(callId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
index 9d82103d3b..71ac46307b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
@@ -61,7 +61,7 @@ class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: Ava
         } else {
             stringProvider.getString(R.string.rendering_event_error_exception, event.root.eventId)
         }
-        val informationData = informationDataFactory.create(event, null)
+        val informationData = informationDataFactory.create(event, null, null)
         return create(text, informationData, highlight, callback)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
index e88c1f3797..b531e08359 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
@@ -47,6 +47,7 @@ class EncryptedItemFactory @Inject constructor(private val messageInformationDat
                                                private val vectorPreferences: VectorPreferences) {
 
     fun create(event: TimelineEvent,
+               prevEvent: TimelineEvent?,
                nextEvent: TimelineEvent?,
                highlight: Boolean,
                callback: TimelineEventController.Callback?): VectorEpoxyModel<*>? {
@@ -108,7 +109,7 @@ class EncryptedItemFactory @Inject constructor(private val messageInformationDat
                     }
                 }
 
-                val informationData = messageInformationDataFactory.create(event, nextEvent)
+                val informationData = messageInformationDataFactory.create(event, prevEvent, nextEvent)
                 val attributes = attributesFactory.create(event.root.content.toModel<EncryptedEventContent>(), informationData, callback)
                 return MessageTextItem_()
                         .leftGuideline(avatarSizeProvider.leftGuideline)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index 1eb09f2e7a..68716a3eba 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -48,7 +48,7 @@ class EncryptionItemFactory @Inject constructor(
             return null
         }
         val algorithm = event.root.getClearContent().toModel<EncryptionEventContent>()?.algorithm
-        val informationData = informationDataFactory.create(event, null)
+        val informationData = informationDataFactory.create(event, null, null)
         val attributes = messageItemAttributesFactory.create(null, informationData, callback)
 
         val isSafeAlgorithm = algorithm == MXCRYPTO_ALGORITHM_MEGOLM
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 2e97abc32e..e969998613 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -119,13 +119,14 @@ class MessageItemFactory @Inject constructor(
     }
 
     fun create(event: TimelineEvent,
+               prevEvent: TimelineEvent?,
                nextEvent: TimelineEvent?,
                highlight: Boolean,
                callback: TimelineEventController.Callback?
     ): VectorEpoxyModel<*>? {
         event.root.eventId ?: return null
         roomId = event.roomId
-        val informationData = messageInformationDataFactory.create(event, nextEvent)
+        val informationData = messageInformationDataFactory.create(event, prevEvent, nextEvent)
         if (event.root.isRedacted()) {
             // message is redacted
             val attributes = messageItemAttributesFactory.create(null, informationData, callback)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
index 12c7c2318a..dfabf96199 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
@@ -35,7 +35,7 @@ class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEv
                highlight: Boolean,
                callback: TimelineEventController.Callback?): NoticeItem? {
         val formattedText = eventFormatter.format(event) ?: return null
-        val informationData = informationDataFactory.create(event, null)
+        val informationData = informationDataFactory.create(event, null, null)
         val attributes = NoticeItem.Attributes(
                 avatarRenderer = avatarRenderer,
                 informationData = informationData,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 7fd50147d4..f1df2ae802 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -38,6 +38,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                                               private val userPreferencesProvider: UserPreferencesProvider) {
 
     fun create(event: TimelineEvent,
+               prevEvent: TimelineEvent?,
                nextEvent: TimelineEvent?,
                eventIdToHighlight: String?,
                callback: TimelineEventController.Callback?): VectorEpoxyModel<*> {
@@ -46,7 +47,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
         val computedModel = try {
             when (event.root.getClearType()) {
                 EventType.STICKER,
-                EventType.MESSAGE               -> messageItemFactory.create(event, nextEvent, highlight, callback)
+                EventType.MESSAGE               -> messageItemFactory.create(event, prevEvent, nextEvent, highlight, callback)
                 // State and call
                 EventType.STATE_ROOM_TOMBSTONE,
                 EventType.STATE_ROOM_NAME,
@@ -76,9 +77,9 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.ENCRYPTED             -> {
                     if (event.root.isRedacted()) {
                         // Redacted event, let the MessageItemFactory handle it
-                        messageItemFactory.create(event, nextEvent, highlight, callback)
+                        messageItemFactory.create(event, prevEvent, nextEvent, highlight, callback)
                     } else {
-                        encryptedItemFactory.create(event, nextEvent, highlight, callback)
+                        encryptedItemFactory.create(event, prevEvent, nextEvent, highlight, callback)
                     }
                 }
                 EventType.STATE_ROOM_ALIASES,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
index eb539d2b8a..960487140d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
@@ -75,9 +75,9 @@ class VerificationItemFactory @Inject constructor(
         // If it's not a request ignore this event
         // if (refEvent.root.getClearContent().toModel<MessageVerificationRequestContent>() == null) return ignoredConclusion(event, highlight, callback)
 
-        val referenceInformationData = messageInformationDataFactory.create(refEvent, null)
+        val referenceInformationData = messageInformationDataFactory.create(refEvent, null, null)
 
-        val informationData = messageInformationDataFactory.create(event, null)
+        val informationData = messageInformationDataFactory.create(event, null, null)
         val attributes = messageItemAttributesFactory.create(null, informationData, callback)
 
         when (event.root.getClearType()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
index 260958b19e..a6a88a3444 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
@@ -64,7 +64,7 @@ class WidgetItemFactory @Inject constructor(
                                 callback: TimelineEventController.Callback?,
                                 widgetContent: WidgetContent,
                                 previousWidgetContent: WidgetContent?): VectorEpoxyModel<*> {
-        val informationData = informationDataFactory.create(timelineEvent, null)
+        val informationData = informationDataFactory.create(timelineEvent, null, null)
         val attributes = messageItemAttributesFactory.create(null, informationData, callback)
 
         val disambiguatedDisplayName = timelineEvent.senderInfo.disambiguatedDisplayName
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 951a4d3fa0..2f71c555f9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -25,6 +25,7 @@ import im.vector.app.features.home.room.detail.timeline.item.PollResponseData
 import im.vector.app.features.home.room.detail.timeline.item.ReactionInfoData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.ReferencesInfoData
+import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.extensions.orFalse
@@ -49,7 +50,7 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                                                         private val dateFormatter: VectorDateFormatter,
                                                         private val vectorPreferences: VectorPreferences) {
 
-    fun create(event: TimelineEvent, nextEvent: TimelineEvent?): MessageInformationData {
+    fun create(event: TimelineEvent, prevEvent: TimelineEvent?, nextEvent: TimelineEvent?): MessageInformationData {
         // Non nullability has been tested before
         val eventId = event.root.eventId!!
 
@@ -70,6 +71,13 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         val time = dateFormatter.format(event.root.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
         val e2eDecoration = getE2EDecoration(event)
 
+        val isSentByMe = event.root.senderId == session.myUserId
+        val sendStateDecoration = if (isSentByMe) {
+            getSendStateDecoration(event.root.sendState, prevEvent?.root?.sendState, event.readReceipts.any { it.user.userId != session.myUserId })
+        } else {
+            SendStateDecoration.NONE
+        }
+
         return MessageInformationData(
                 eventId = eventId,
                 senderId = event.root.senderId ?: "",
@@ -110,11 +118,24 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                             ?: VerificationState.REQUEST
                     ReferencesInfoData(verificationState)
                 },
-                sentByMe = event.root.senderId == session.myUserId,
-                e2eDecoration = e2eDecoration
+                sentByMe = isSentByMe,
+                e2eDecoration = e2eDecoration,
+                sendStateDecoration = sendStateDecoration
         )
     }
 
+    private fun getSendStateDecoration(eventSendState: SendState, prevEventSendState: SendState?, anyReadReceipts: Boolean): SendStateDecoration {
+        return if (eventSendState.isSending()) {
+            SendStateDecoration.SENDING
+        } else if (eventSendState.hasFailed()) {
+            SendStateDecoration.FAILED
+        } else if (eventSendState.isSent() && !prevEventSendState?.isSent().orFalse() && !anyReadReceipts) {
+            SendStateDecoration.SENT
+        } else {
+            SendStateDecoration.NONE
+        }
+    }
+
     private fun getE2EDecoration(event: TimelineEvent): E2EDecoration {
         val roomSummary = roomSummariesHolder.get(event.roomId)
         return if (
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index d4b1b8859a..9f73a504ac 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -31,7 +31,7 @@ import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 /**
- * Base timeline item that adds an optional information bar with the sender avatar, name and time
+ * Base timeline item that adds an optional information bar with the sender avatar, name, time, send state
  * Adds associated click listeners (on avatar, displayname)
  */
 abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>() {
@@ -82,6 +82,27 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
             holder.avatarImageView.setOnLongClickListener(null)
             holder.memberNameView.setOnLongClickListener(null)
         }
+
+        // Render send state indicator
+        holder.sendStateImageView.isVisible = true
+        when (attributes.informationData.sendStateDecoration) {
+            SendStateDecoration.SENDING  -> {
+                holder.sendStateImageView
+                        .apply { setImageResource(R.drawable.ic_sending_message) }
+                        .apply { contentDescription = context.getString(R.string.event_status_a11y_sending) }
+            }
+            SendStateDecoration.SENT     -> {
+                holder.sendStateImageView
+                        .apply { setImageResource(R.drawable.ic_message_sent) }
+                        .apply { contentDescription = context.getString(R.string.event_status_a11y_sent) }
+            }
+            SendStateDecoration.FAILED   -> {
+                holder.sendStateImageView
+                        .apply { setImageResource(R.drawable.ic_sending_message_failed) }
+                        .apply { contentDescription = context.getString(R.string.event_status_a11y_failed) }
+            }
+            SendStateDecoration.NONE     -> holder.sendStateImageView.isVisible = false
+        }
     }
 
     override fun unbind(holder: H) {
@@ -99,6 +120,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
         val avatarImageView by bind<ImageView>(R.id.messageAvatarImageView)
         val memberNameView by bind<TextView>(R.id.messageMemberNameView)
         val timeView by bind<TextView>(R.id.messageTimeView)
+        val sendStateImageView by bind<ImageView>(R.id.messageSendStateImageView)
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index 48bd4db94c..25929f7118 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -42,7 +42,8 @@ data class MessageInformationData(
         val readReceipts: List<ReadReceiptData> = emptyList(),
         val referencesInfoData: ReferencesInfoData? = null,
         val sentByMe: Boolean,
-        val e2eDecoration: E2EDecoration = E2EDecoration.NONE
+        val e2eDecoration: E2EDecoration = E2EDecoration.NONE,
+        val sendStateDecoration: SendStateDecoration = SendStateDecoration.NONE
 ) : Parcelable {
 
     val matrixItem: MatrixItem
@@ -84,4 +85,11 @@ enum class E2EDecoration {
     WARN_SENT_BY_UNKNOWN
 }
 
+enum class SendStateDecoration {
+    NONE,
+    SENDING,
+    SENT,
+    FAILED
+}
+
 fun ReadReceiptData.toMatrixItem() = MatrixItem.UserItem(userId, displayName, avatarUrl)
diff --git a/vector/src/main/res/drawable/ic_delete_unsent_messages.xml b/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
new file mode 100644
index 0000000000..24fdbc94c2
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_delete_unsent_messages.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="30"
+    android:viewportHeight="30">
+  <path
+      android:pathData="M8.5714,22.5C8.5714,23.6864 9.5357,25 10.7143,25H19.2857C20.4643,25 21.4286,23.4428 21.4286,22.2564V11.4711C21.4286,10.2848 20.4643,9.3141 19.2857,9.3141H10.7143C9.5357,9.3141 8.5714,10.2848 8.5714,11.4711V22.5ZM21.4286,6.0785H18.75L17.9893,5.3128C17.7964,5.1186 17.5179,5 17.2393,5H12.7607C12.4821,5 12.2036,5.1186 12.0107,5.3128L11.25,6.0785H8.5714C7.9821,6.0785 7.5,6.5639 7.5,7.1571C7.5,7.7502 7.9821,8.2356 8.5714,8.2356H21.4286C22.0179,8.2356 22.5,7.7502 22.5,7.1571C22.5,6.5639 22.0179,6.0785 21.4286,6.0785Z"
+      android:fillColor="#FE2928"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_message_sent.xml b/vector/src/main/res/drawable/ic_message_sent.xml
new file mode 100644
index 0000000000..3729f3d60f
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_message_sent.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M9,16C12.866,16 16,12.866 16,9C16,5.134 12.866,2 9,2C5.134,2 2,5.134 2,9C2,12.866 5.134,16 9,16ZM9,17C13.4183,17 17,13.4183 17,9C17,4.5817 13.4183,1 9,1C4.5817,1 1,4.5817 1,9C1,13.4183 4.5817,17 9,17Z"
+      android:fillColor="#8D99A5"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.8697,5.9531C12.6784,5.7576 12.3597,5.7473 12.1578,5.9325L7.6207,10.048L5.9524,8.9163C5.7293,8.7722 5.4212,8.7722 5.2087,8.9574C4.9536,9.1632 4.9324,9.5336 5.1449,9.7805L7.0681,11.9206C7.1,11.9515 7.1319,11.9926 7.1744,12.0132C7.5356,12.3013 8.0776,12.2498 8.3751,11.9L8.4069,11.8589L12.891,6.6013C13.0397,6.4161 13.0397,6.1383 12.8697,5.9531Z"
+      android:fillColor="#8D99A5"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_retry_sending_messages.xml b/vector/src/main/res/drawable/ic_retry_sending_messages.xml
new file mode 100644
index 0000000000..6ea08bb654
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_retry_sending_messages.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M4.0227,2.9646C5.1159,2.1 6.4987,1.5835 8,1.5835C11.3187,1.5835 14.049,4.1029 14.3825,7.3335H15.6723C15.9336,7.3335 16.0894,7.625 15.9445,7.8426L13.9388,10.8543C13.8094,11.0488 13.524,11.0488 13.3945,10.8543L11.3888,7.8426C11.2439,7.625 11.3997,7.3335 11.661,7.3335H12.8719C12.5465,4.9334 10.4893,3.0835 8,3.0835C6.8483,3.0835 5.7909,3.4786 4.9531,4.1411C4.8969,4.1856 4.8485,4.2213 4.813,4.2467C4.7951,4.2595 4.7803,4.2698 4.7692,4.2774L4.7553,4.2869L4.7505,4.2901L4.7487,4.2913L4.7479,4.2918L4.7476,4.2921L4.7474,4.2922L4.7473,4.2922L4.3334,3.6669L4.7472,4.2923C4.4018,4.5209 3.9365,4.4262 3.7079,4.0807C3.4798,3.736 3.5736,3.2719 3.9173,3.0428L3.9202,3.0408L3.9401,3.0268C3.9591,3.0132 3.988,2.992 4.0227,2.9646ZM3.1281,8.6668H4.339C4.6003,8.6668 4.7561,8.3753 4.6112,8.1577L2.6055,5.146C2.476,4.9516 2.1906,4.9516 2.0612,5.146L0.0555,8.1577C-0.0894,8.3753 0.0664,8.6668 0.3277,8.6668H1.6176C1.951,11.8974 4.6813,14.4168 8,14.4168C9.5683,14.4168 11.0069,13.8532 12.1215,12.9184C12.4388,12.6522 12.4803,12.1791 12.2141,11.8617C11.9479,11.5444 11.4749,11.5029 11.1575,11.7691C10.303,12.4859 9.2028,12.9168 8,12.9168C5.5107,12.9168 3.4535,11.0669 3.1281,8.6668Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_sending_message.xml b/vector/src/main/res/drawable/ic_sending_message.xml
new file mode 100644
index 0000000000..05fa0fb2a2
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_sending_message.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M9,16C12.866,16 16,12.866 16,9C16,5.134 12.866,2 9,2C5.134,2 2,5.134 2,9C2,12.866 5.134,16 9,16ZM9,17C13.4183,17 17,13.4183 17,9C17,4.5817 13.4183,1 9,1C4.5817,1 1,4.5817 1,9C1,13.4183 4.5817,17 9,17Z"
+      android:fillColor="#8D99A5"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_sending_message_failed.xml b/vector/src/main/res/drawable/ic_sending_message_failed.xml
new file mode 100644
index 0000000000..c720a1cbbf
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_sending_message_failed.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,16C12.4183,16 16,12.4183 16,8C16,3.5817 12.4183,0 8,0C3.5817,0 0,3.5817 0,8C0,12.4183 3.5817,16 8,16ZM6.9806,4.5101C6.9306,3.9401 7.3506,3.4401 7.9206,3.4001C8.4806,3.3601 8.9806,3.7801 9.0406,4.3501V4.5101L8.7206,8.5101C8.6906,8.8801 8.3806,9.1601 8.0106,9.1601H7.9506C7.6006,9.1301 7.3306,8.8601 7.3006,8.5101L6.9806,4.5101ZM8.8801,11.1202C8.8801,11.6062 8.4861,12.0002 8.0001,12.0002C7.5141,12.0002 7.1201,11.6062 7.1201,11.1202C7.1201,10.6342 7.5141,10.2402 8.0001,10.2402C8.4861,10.2402 8.8801,10.6342 8.8801,11.1202Z"
+      android:fillColor="#FF4B55"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index cba12f7515..236222ec1b 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -81,6 +81,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/messageMemberNameView"
         android:layout_toEndOf="@id/messageStartGuideline"
+        android:layout_toStartOf="@id/messageSendStateImageView"
         android:addStatesFromChildren="true">
 
         <ViewStub
@@ -133,6 +134,17 @@
 
     </FrameLayout>
 
+    <ImageView
+        android:id="@+id/messageSendStateImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_sending_message"
+        android:layout_alignBottom="@+id/viewStubContainer"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:contentDescription="@string/event_status_a11y_sending" />
+
     <LinearLayout
         android:id="@+id/informationBottom"
         android:layout_width="match_parent"

From c741916d9fb4e4d30aaa35cd595c687657590adb Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 25 Feb 2021 15:44:47 +0300
Subject: [PATCH 242/578] Cancel sending event dialog.

---
 .../home/room/detail/RoomDetailFragment.kt     | 18 +++++++++++++++---
 vector/src/main/res/values/strings.xml         |  5 +++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index d51ed08083..8087a0072f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -157,6 +157,7 @@ import im.vector.app.features.permalink.NavigationInterceptor
 import im.vector.app.features.permalink.PermalinkHandler
 import im.vector.app.features.reactions.EmojiReactionPickerActivity
 import im.vector.app.features.roomprofile.RoomProfileActivity
+import im.vector.app.features.roomprofile.alias.RoomAliasAction
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
@@ -1544,9 +1545,20 @@ class RoomDetailFragment @Inject constructor(
 
         this.view?.hideKeyboard()
 
-        MessageActionsBottomSheet
-                .newInstance(roomId, informationData)
-                .show(requireActivity().supportFragmentManager, "MESSAGE_CONTEXTUAL_ACTIONS")
+        if (informationData.sendState.isSending()) {
+            AlertDialog.Builder(requireContext())
+                    .setTitle(R.string.dialog_title_confirmation)
+                    .setMessage(getString(R.string.event_status_cancel_sending_dialog_message))
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(R.string.yes) { _, _ ->
+                        sharedActionViewModel.post(EventSharedAction.Cancel(informationData.eventId))
+                    }
+                    .show()
+        } else {
+            MessageActionsBottomSheet
+                    .newInstance(roomId, informationData)
+                    .show(requireActivity().supportFragmentManager, "MESSAGE_CONTEXTUAL_ACTIONS")
+        }
         return true
     }
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 297be6faca..237b23a272 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3239,4 +3239,9 @@
     <string name="dev_tools_success_event">Event sent!</string>
     <string name="dev_tools_success_state_event">State event sent!</string>
     <string name="dev_tools_event_content_hint">Event content</string>
+
+    <string name="event_status_a11y_sending">Sending</string>
+    <string name="event_status_a11y_sent">Sent</string>
+    <string name="event_status_a11y_failed">Failed</string>
+    <string name="event_status_cancel_sending_dialog_message">Do you want to cancel sending message?</string>
 </resources>

From 0b98dfc9769cf4d39a996ea31430ccdaf5bfe374 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 25 Feb 2021 18:24:23 +0300
Subject: [PATCH 243/578] Media messages send status implementation.

---
 .../helper/MessageInformationDataFactory.kt   | 18 ++++++++++++---
 .../detail/timeline/item/AbsMessageItem.kt    | 15 +++++++++----
 .../detail/timeline/item/MessageFileItem.kt   |  8 -------
 .../timeline/item/MessageImageVideoItem.kt    | 12 ----------
 .../timeline/item/MessageInformationData.kt   |  3 ++-
 .../res/layout/item_timeline_event_base.xml   | 22 ++++++++++++++++---
 .../layout/item_timeline_event_file_stub.xml  | 10 ---------
 ...item_timeline_event_media_message_stub.xml | 21 ------------------
 8 files changed, 47 insertions(+), 62 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 2f71c555f9..201067e7b4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -33,7 +33,12 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
@@ -73,7 +78,14 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
 
         val isSentByMe = event.root.senderId == session.myUserId
         val sendStateDecoration = if (isSentByMe) {
-            getSendStateDecoration(event.root.sendState, prevEvent?.root?.sendState, event.readReceipts.any { it.user.userId != session.myUserId })
+            val isMedia = when (event.root.content?.toModel<MessageContent>()) {
+                is MessageImageContent,
+                is MessageVideoContent,
+                is MessageAudioContent,
+                is MessageFileContent   -> true
+                else                    -> false
+            }
+            getSendStateDecoration(event.root.sendState, prevEvent?.root?.sendState, event.readReceipts.any { it.user.userId != session.myUserId }, isMedia)
         } else {
             SendStateDecoration.NONE
         }
@@ -124,9 +136,9 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         )
     }
 
-    private fun getSendStateDecoration(eventSendState: SendState, prevEventSendState: SendState?, anyReadReceipts: Boolean): SendStateDecoration {
+    private fun getSendStateDecoration(eventSendState: SendState, prevEventSendState: SendState?, anyReadReceipts: Boolean, isMedia: Boolean): SendStateDecoration {
         return if (eventSendState.isSending()) {
-            SendStateDecoration.SENDING
+            if (isMedia) SendStateDecoration.SENDING_MEDIA else SendStateDecoration.SENDING_NON_MEDIA
         } else if (eventSendState.hasFailed()) {
             SendStateDecoration.FAILED
         } else if (eventSendState.isSent() && !prevEventSendState?.isSent().orFalse() && !anyReadReceipts) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 9f73a504ac..3d7fe21c9a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.home.room.detail.timeline.item
 import android.graphics.Typeface
 import android.view.View
 import android.widget.ImageView
+import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.annotation.IdRes
 import androidx.core.view.isInvisible
@@ -85,23 +86,28 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
 
         // Render send state indicator
         holder.sendStateImageView.isVisible = true
+        holder.eventSendingIndicator.isVisible = false
         when (attributes.informationData.sendStateDecoration) {
-            SendStateDecoration.SENDING  -> {
+            SendStateDecoration.SENDING_NON_MEDIA  -> {
                 holder.sendStateImageView
                         .apply { setImageResource(R.drawable.ic_sending_message) }
                         .apply { contentDescription = context.getString(R.string.event_status_a11y_sending) }
             }
-            SendStateDecoration.SENT     -> {
+            SendStateDecoration.SENT               -> {
                 holder.sendStateImageView
                         .apply { setImageResource(R.drawable.ic_message_sent) }
                         .apply { contentDescription = context.getString(R.string.event_status_a11y_sent) }
             }
-            SendStateDecoration.FAILED   -> {
+            SendStateDecoration.FAILED             -> {
                 holder.sendStateImageView
                         .apply { setImageResource(R.drawable.ic_sending_message_failed) }
                         .apply { contentDescription = context.getString(R.string.event_status_a11y_failed) }
             }
-            SendStateDecoration.NONE     -> holder.sendStateImageView.isVisible = false
+            SendStateDecoration.SENDING_MEDIA      -> {
+                holder.sendStateImageView.isVisible = false
+                holder.eventSendingIndicator.isVisible = true
+            }
+            SendStateDecoration.NONE               -> holder.sendStateImageView.isVisible = false
         }
     }
 
@@ -121,6 +127,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
         val memberNameView by bind<TextView>(R.id.messageMemberNameView)
         val timeView by bind<TextView>(R.id.messageTimeView)
         val sendStateImageView by bind<ImageView>(R.id.messageSendStateImageView)
+        val eventSendingIndicator by bind<ProgressBar>(R.id.eventSendingIndicator)
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
index 5160a7cd84..9dc777676a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
@@ -87,13 +87,6 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
         holder.fileImageWrapper.setOnClickListener(attributes.itemClickListener)
         holder.fileImageWrapper.setOnLongClickListener(attributes.itemLongClickListener)
         holder.filenameView.paintFlags = (holder.filenameView.paintFlags or Paint.UNDERLINE_TEXT_FLAG)
-
-        holder.eventSendingIndicator.isVisible = when (attributes.informationData.sendState) {
-            SendState.UNSENT,
-            SendState.ENCRYPTING,
-            SendState.SENDING -> true
-            else              -> false
-        }
     }
 
     override fun unbind(holder: Holder) {
@@ -111,7 +104,6 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
         val fileImageWrapper by bind<ViewGroup>(R.id.messageFileImageView)
         val fileDownloadProgress by bind<ProgressBar>(R.id.messageFileProgressbar)
         val filenameView by bind<TextView>(R.id.messageFilenameView)
-        val eventSendingIndicator by bind<ProgressBar>(R.id.eventSendingIndicator)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index b121b14b4a..e0085105d2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -69,16 +69,7 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
         ViewCompat.setTransitionName(holder.imageView, "imagePreview_${id()}")
         holder.mediaContentView.setOnClickListener(attributes.itemClickListener)
         holder.mediaContentView.setOnLongClickListener(attributes.itemLongClickListener)
-        // The sending state color will be apply to the progress text
-        renderSendState(holder.imageView, null, holder.failedToSendIndicator)
         holder.playContentView.visibility = if (playable) View.VISIBLE else View.GONE
-
-        holder.eventSendingIndicator.isVisible = when (attributes.informationData.sendState) {
-            SendState.UNSENT,
-            SendState.ENCRYPTING,
-            SendState.SENDING -> true
-            else              -> false
-        }
     }
 
     override fun unbind(holder: Holder) {
@@ -96,10 +87,7 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
         val progressLayout by bind<ViewGroup>(R.id.messageMediaUploadProgressLayout)
         val imageView by bind<ImageView>(R.id.messageThumbnailView)
         val playContentView by bind<ImageView>(R.id.messageMediaPlayView)
-
         val mediaContentView by bind<ViewGroup>(R.id.messageContentMedia)
-        val failedToSendIndicator by bind<ImageView>(R.id.messageFailToSendIndicator)
-        val eventSendingIndicator by bind<ProgressBar>(R.id.eventSendingIndicator)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index 25929f7118..67b79bab9b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -87,7 +87,8 @@ enum class E2EDecoration {
 
 enum class SendStateDecoration {
     NONE,
-    SENDING,
+    SENDING_NON_MEDIA,
+    SENDING_MEDIA,
     SENT,
     FAILED
 }
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 236222ec1b..50e3777804 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -80,8 +80,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/messageMemberNameView"
-        android:layout_toEndOf="@id/messageStartGuideline"
         android:layout_toStartOf="@id/messageSendStateImageView"
+        android:layout_toEndOf="@id/messageStartGuideline"
         android:addStatesFromChildren="true">
 
         <ViewStub
@@ -138,12 +138,28 @@
         android:id="@+id/messageSendStateImageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_sending_message"
         android:layout_alignBottom="@+id/viewStubContainer"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:contentDescription="@string/event_status_a11y_sending" />
+        android:layout_marginBottom="4dp"
+        android:contentDescription="@string/event_status_a11y_sending"
+        android:src="@drawable/ic_sending_message"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <ProgressBar
+        android:id="@+id/eventSendingIndicator"
+        style="?android:attr/progressBarStyleSmall"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_alignBottom="@+id/viewStubContainer"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="4dp"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
     <LinearLayout
         android:id="@+id/informationBottom"
diff --git a/vector/src/main/res/layout/item_timeline_event_file_stub.xml b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
index 67b520c269..3c551bea88 100644
--- a/vector/src/main/res/layout/item_timeline_event_file_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_file_stub.xml
@@ -55,16 +55,6 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="A filename here" />
 
-    <ProgressBar
-        android:id="@+id/eventSendingIndicator"
-        style="?android:attr/progressBarStyleSmall"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:visibility="gone"
-        app:layout_constraintStart_toEndOf="@id/messageFilenameView"
-        app:layout_constraintTop_toTopOf="@id/messageFilenameView"
-        tools:visibility="visible" />
-
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/horizontalBarrier"
diff --git a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
index 715b115c82..ebbb0913ff 100644
--- a/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
@@ -18,27 +18,6 @@
         tools:layout_height="300dp"
         tools:src="@tools:sample/backgrounds/scenic" />
 
-    <ImageView
-        android:id="@+id/messageFailToSendIndicator"
-        android:layout_width="14dp"
-        android:layout_height="14dp"
-        android:layout_marginStart="2dp"
-        android:contentDescription="@string/a11y_error_message_not_sent"
-        android:src="@drawable/ic_warning_badge"
-        android:visibility="gone"
-        app:layout_constraintStart_toEndOf="@id/messageThumbnailView"
-        app:layout_constraintTop_toTopOf="@id/messageThumbnailView"
-        tools:visibility="visible" />
-
-    <ProgressBar
-        android:id="@+id/eventSendingIndicator"
-        style="?android:attr/progressBarStyleSmall"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:visibility="gone"
-        app:layout_constraintStart_toEndOf="@id/messageThumbnailView"
-        app:layout_constraintTop_toBottomOf="@id/messageFailToSendIndicator" />
-
     <ImageView
         android:id="@+id/messageMediaPlayView"
         android:layout_width="40dp"

From 9eedac3e6d884ca8de293bc4a000193203be7cbf Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 25 Feb 2021 18:31:42 +0300
Subject: [PATCH 244/578] Fix color of sending media progress bar.

---
 vector/src/main/res/layout/item_timeline_event_base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 50e3777804..4b03d71c6a 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -150,10 +150,10 @@
 
     <ProgressBar
         android:id="@+id/eventSendingIndicator"
-        style="?android:attr/progressBarStyleSmall"
         android:layout_width="16dp"
         android:layout_height="16dp"
         android:layout_alignBottom="@+id/viewStubContainer"
+        android:indeterminateTint="?riotx_text_secondary"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"

From a3d45bbba89e611336b54a26dfb2c7a5940963bf Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Sun, 28 Feb 2021 19:34:19 +0300
Subject: [PATCH 245/578] Failed messages bottom sheet UI fixes.

---
 .../action/MessageActionsEpoxyController.kt   |  8 +----
 .../item_bottom_sheet_message_preview.xml     | 34 ++++++++-----------
 .../item_bottom_sheet_message_status.xml      |  2 +-
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index cc3d5cc463..57558efef1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -63,13 +63,7 @@ class MessageActionsEpoxyController @Inject constructor(
         }
 
         // Send state
-        if (state.informationData.sendState.isSending()) {
-            bottomSheetSendStateItem {
-                id("send_state")
-                showProgress(true)
-                text(stringProvider.getString(R.string.event_status_sending_message))
-            }
-        } else if (state.informationData.sendState.hasFailed()) {
+        if (state.informationData.sendState.hasFailed()) {
             bottomSheetSendStateItem {
                 id("send_state")
                 showProgress(false)
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 0e4a613662..5ad3c7bb8b 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -8,8 +8,8 @@
 
     <ImageView
         android:id="@+id/bottom_sheet_message_preview_avatar"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_margin="@dimen/layout_horizontal_margin"
         android:adjustViewBounds="true"
         android:background="@drawable/circle"
@@ -23,7 +23,7 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_sender"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"
         android:layout_marginStart="8dp"
@@ -31,14 +31,24 @@
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
-        android:textColor="?riotx_text_primary"
+        android:textColor="@color/riotx_accent"
         android:textSize="14sp"
         android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
         tools:text="@tools:sample/full_names" />
 
+    <TextView
+        android:id="@+id/bottom_sheet_message_preview_timestamp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/bottom_sheet_message_preview_sender"
+        tools:text="Friday 8pm" />
+
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body"
         android:layout_width="0dp"
@@ -52,22 +62,8 @@
         android:textColor="?riotx_text_secondary"
         android:textIsSelectable="false"
         android:textSize="14sp"
-        app:layout_constraintBottom_toTopOf="@id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_sender"
         tools:text="Quis harum id autem cumque consequatur laboriosam aliquam sed. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. " />
-
-    <TextView
-        android:id="@+id/bottom_sheet_message_preview_timestamp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/layout_horizontal_margin"
-        android:layout_marginBottom="8dp"
-        android:textColor="?riotx_text_secondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_body"
-        tools:text="Friday 8pm" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index fcb373fa0d..3d50cce72a 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -5,7 +5,7 @@
     android:id="@+id/messageStatusInfo"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="16dp"
+    android:layout_marginStart="64dp"
     android:layout_marginEnd="16dp"
     android:layout_marginBottom="4dp">
 

From f5f16fd330ad9db5a856bcda9ee990f66fbd27d7 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 1 Mar 2021 17:27:52 +0300
Subject: [PATCH 246/578] Retry and delete options added for all failed
 messages.

---
 .../sdk/api/session/room/send/SendService.kt  |  5 ++
 .../session/room/send/DefaultSendService.kt   |  8 +++
 .../ui/views/FailedMessagesWarningView.kt     | 56 ++++++++++++++++
 .../home/room/detail/RoomDetailAction.kt      |  3 +
 .../home/room/detail/RoomDetailFragment.kt    | 27 ++++++--
 .../home/room/detail/RoomDetailViewModel.kt   | 10 ++-
 .../home/room/detail/RoomDetailViewState.kt   |  3 +-
 .../detail/timeline/item/MessageFileItem.kt   |  1 -
 .../timeline/item/MessageImageVideoItem.kt    |  2 -
 .../main/res/layout/fragment_room_detail.xml  | 14 +++-
 .../layout/view_failed_messages_warning.xml   | 65 +++++++++++++++++++
 vector/src/main/res/menu/menu_timeline.xml    | 16 -----
 vector/src/main/res/values/strings.xml        |  6 +-
 13 files changed, 185 insertions(+), 31 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/ui/views/FailedMessagesWarningView.kt
 create mode 100644 vector/src/main/res/layout/view_failed_messages_warning.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
index 152a018e78..6ae42de90c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
@@ -132,4 +132,9 @@ interface SendService {
      * Resend all failed messages one by one (and keep order)
      */
     fun resendAllFailedMessages()
+
+    /**
+     * Cancel all failed messages
+     */
+    fun cancelAllFailedMessages()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index a12962b51f..c5b8b42b3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -232,6 +232,14 @@ internal class DefaultSendService @AssistedInject constructor(
         }
     }
 
+    override fun cancelAllFailedMessages() {
+        taskExecutor.executorScope.launch {
+            localEchoRepository.getAllFailedEventsToResend(roomId).forEach { event ->
+                cancelSend(event.eventId)
+            }
+        }
+    }
+
     override fun sendMedia(attachment: ContentAttachmentData,
                            compressBeforeSending: Boolean,
                            roomIds: Set<String>): Cancelable {
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/FailedMessagesWarningView.kt b/vector/src/main/java/im/vector/app/core/ui/views/FailedMessagesWarningView.kt
new file mode 100644
index 0000000000..f9518552a3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/FailedMessagesWarningView.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
+import im.vector.app.R
+import im.vector.app.databinding.ViewFailedMessagesWarningBinding
+
+class FailedMessagesWarningView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    interface Callback {
+        fun onDeleteAllClicked()
+        fun onRetryClicked()
+    }
+
+    var callback: Callback? = null
+
+    private lateinit var views: ViewFailedMessagesWarningBinding
+
+    init {
+        setupViews()
+    }
+
+    private fun setupViews() {
+        inflate(context, R.layout.view_failed_messages_warning, this)
+        views = ViewFailedMessagesWarningBinding.bind(this)
+
+        views.failedMessagesDeleteAllButton.setOnClickListener { callback?.onDeleteAllClicked() }
+        views.failedMessagesRetryButton.setOnClickListener { callback?.onRetryClicked() }
+    }
+
+    fun render(hasFailedMessages: Boolean) {
+        isVisible = hasFailedMessages
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index efc495a379..ecbd0b0d30 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -106,4 +106,7 @@ sealed class RoomDetailAction : VectorViewModelAction {
     data class DoNotShowPreviewUrlFor(val eventId: String, val url: String) : RoomDetailAction()
 
     data class ComposerFocusChange(val focused: Boolean) : RoomDetailAction()
+
+    // Failed messages
+    object RemoveAllFailedMessages : RoomDetailAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 8087a0072f..1df583187e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -94,6 +94,7 @@ import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.ui.views.CurrentCallsView
 import im.vector.app.core.ui.views.KnownCallsViewHolder
 import im.vector.app.core.ui.views.ActiveConferenceView
+import im.vector.app.core.ui.views.FailedMessagesWarningView
 import im.vector.app.core.ui.views.JumpToReadMarkerView
 import im.vector.app.core.ui.views.NotificationAreaView
 import im.vector.app.core.utils.Debouncer
@@ -157,7 +158,6 @@ import im.vector.app.features.permalink.NavigationInterceptor
 import im.vector.app.features.permalink.PermalinkHandler
 import im.vector.app.features.reactions.EmojiReactionPickerActivity
 import im.vector.app.features.roomprofile.RoomProfileActivity
-import im.vector.app.features.roomprofile.alias.RoomAliasAction
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
@@ -326,6 +326,7 @@ class RoomDetailFragment @Inject constructor(
         setupJumpToBottomView()
         setupConfBannerView()
         setupEmojiPopup()
+        setupFailedMessagesWarningView()
 
         views.roomToolbarContentView.debouncedClicks {
             navigator.openRoomProfile(requireActivity(), roomDetailArgs.roomId)
@@ -558,6 +559,25 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
+    private fun setupFailedMessagesWarningView() {
+        views.failedMessagesWarningView.callback = object : FailedMessagesWarningView.Callback {
+            override fun onDeleteAllClicked() {
+                AlertDialog.Builder(requireContext())
+                        .setTitle(R.string.event_status_delete_all_failed_dialog_title)
+                        .setMessage(getString(R.string.event_status_delete_all_failed_dialog_message))
+                        .setNegativeButton(R.string.no, null)
+                        .setPositiveButton(R.string.yes) { _, _ ->
+                            roomDetailViewModel.handle(RoomDetailAction.RemoveAllFailedMessages)
+                        }
+                        .show()
+            }
+
+            override fun onRetryClicked() {
+                roomDetailViewModel.handle(RoomDetailAction.ResendAll)
+            }
+        }
+    }
+
     private fun joinJitsiRoom(jitsiWidget: Widget, enableVideo: Boolean) {
         navigator.openRoomWidget(requireContext(), roomDetailArgs.roomId, jitsiWidget, mapOf(JitsiCallViewModel.ENABLE_VIDEO_OPTION to enableVideo))
     }
@@ -777,10 +797,6 @@ class RoomDetailFragment @Inject constructor(
                 navigator.openRoomProfile(requireActivity(), roomDetailArgs.roomId)
                 true
             }
-            R.id.resend_all       -> {
-                roomDetailViewModel.handle(RoomDetailAction.ResendAll)
-                true
-            }
             R.id.open_matrix_apps -> {
                 roomDetailViewModel.handle(RoomDetailAction.ManageIntegrations)
                 true
@@ -1172,6 +1188,7 @@ class RoomDetailFragment @Inject constructor(
         val summary = state.asyncRoomSummary()
         renderToolbar(summary, state.typingMessage)
         views.activeConferenceView.render(state)
+        views.failedMessagesWarningView.render(state.hasFailedSending)
         val inviter = state.asyncInviter()
         if (summary?.membership == Membership.JOIN) {
             views.jumpToBottomView.count = summary.notificationCount
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index f293eadf50..cf6862a28d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -322,6 +322,8 @@ class RoomDetailViewModel @AssistedInject constructor(
                 )
             }
             is RoomDetailAction.DoNotShowPreviewUrlFor -> handleDoNotShowPreviewUrlFor(action)
+            RoomDetailAction.RemoveAllFailedMessages -> handleRemoveAllFailedMessages()
+            RoomDetailAction.ResendAll -> handleResendAll()
         }.exhaustive
     }
 
@@ -660,10 +662,8 @@ class RoomDetailViewModel @AssistedInject constructor(
             return@withState false
         }
         when (itemId) {
-            R.id.resend_all -> state.asyncRoomSummary()?.hasFailedSending == true
             R.id.timeline_setting -> true
             R.id.invite -> state.canInvite
-            R.id.clear_all -> state.asyncRoomSummary()?.hasFailedSending == true
             R.id.open_matrix_apps -> true
             R.id.voice_call,
             R.id.video_call       -> callManager.getCallsByRoomId(state.roomId).isEmpty()
@@ -1223,6 +1223,10 @@ class RoomDetailViewModel @AssistedInject constructor(
         room.resendAllFailedMessages()
     }
 
+    private fun handleRemoveAllFailedMessages() {
+        room.cancelAllFailedMessages()
+    }
+
     private fun observeEventDisplayedActions() {
         // We are buffering scroll events for one second
         // and keep the most recent one to set the read receipt on.
@@ -1437,7 +1441,7 @@ class RoomDetailViewModel @AssistedInject constructor(
             roomSummariesHolder.set(summary)
             setState {
                 val typingMessage = typingHelper.getTypingMessage(summary.typingUsers)
-                copy(typingMessage = typingMessage)
+                copy(typingMessage = typingMessage, hasFailedSending = summary.hasFailedSending)
             }
             if (summary.membership == Membership.INVITE) {
                 summary.inviterId?.let { inviterId ->
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 8c2b3ffe98..965733c424 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -75,7 +75,8 @@ data class RoomDetailViewState(
         val canInvite: Boolean = true,
         val isAllowedToManageWidgets: Boolean = false,
         val isAllowedToStartWebRTCCall: Boolean = true,
-        val showDialerOption: Boolean = false
+        val showDialerOption: Boolean = false,
+        val hasFailedSending: Boolean = false
 ) : MvRxState {
 
     constructor(args: RoomDetailArgs) : this(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
index 9dc777676a..b215fa5dd5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
@@ -28,7 +28,6 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
-import org.matrix.android.sdk.api.session.room.send.SendState
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index e0085105d2..2c0d1fcfbd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.home.room.detail.timeline.item
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.ProgressBar
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
@@ -29,7 +28,6 @@ import im.vector.app.core.files.LocalFilesHelper
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 import im.vector.app.features.media.ImageContentRenderer
-import org.matrix.android.sdk.api.session.room.send.SendState
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base)
 abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Holder>() {
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index df36d7e225..a6909a2893 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -86,7 +86,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:barrierDirection="top"
-        app:constraint_referenced_ids="composerLayout,notificationAreaView" />
+        app:constraint_referenced_ids="composerLayout,notificationAreaView, failedMessagesWarningView" />
 
     <im.vector.app.features.sync.widget.SyncStateView
         android:id="@+id/syncStateView"
@@ -159,6 +159,16 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <im.vector.app.core.ui.views.FailedMessagesWarningView
+        android:id="@+id/failedMessagesWarningView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/composerLayout"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:visibility="visible" />
+
     <im.vector.app.features.home.room.detail.composer.TextComposerView
         android:id="@+id/composerLayout"
         android:layout_width="match_parent"
@@ -186,7 +196,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:barrierDirection="top"
-        app:constraint_referenced_ids="composerLayout,notificationAreaView" />
+        app:constraint_referenced_ids="composerLayout,notificationAreaView, failedMessagesWarningView" />
 
     <androidx.cardview.widget.CardView
         android:id="@+id/activeCallPiPWrap"
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
new file mode 100644
index 0000000000..080d22b630
--- /dev/null
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp">
+
+    <View
+        android:id="@+id/failedMessagesWarningDivider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/vctr_list_divider_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/failedMessageWarningImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/event_status_a11y_failed"
+        android:src="@drawable/ic_sending_message_failed"
+        app:layout_constraintBottom_toBottomOf="@id/failedMessagesRetryButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/failedMessagesRetryButton" />
+
+    <TextView
+        android:id="@+id/failedMessagesWarningTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:text="@string/event_status_failed_messages_warning"
+        android:textColor="?riotx_text_primary"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@id/failedMessageWarningImageView"
+        app:layout_constraintStart_toEndOf="@id/failedMessageWarningImageView"
+        app:layout_constraintTop_toTopOf="@id/failedMessageWarningImageView" />
+
+    <ImageButton
+        android:id="@+id/failedMessagesDeleteAllButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/event_status_a11y_delete_all"
+        android:src="@drawable/ic_delete_unsent_messages"
+        app:layout_constraintBottom_toBottomOf="@id/failedMessagesRetryButton"
+        app:layout_constraintEnd_toStartOf="@id/failedMessagesRetryButton"
+        app:layout_constraintTop_toTopOf="@id/failedMessagesRetryButton" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/failedMessagesRetryButton"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="4dp"
+        android:text="@string/global_retry"
+        android:textSize="14sp"
+        app:icon="@drawable/ic_retry_sending_messages"
+        app:iconTint="@android:color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/failedMessagesWarningDivider" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index 1f4e2736b1..e3208c4cc4 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -52,22 +52,6 @@
         app:actionLayout="@layout/custom_action_item_layout_badge"
         app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/resend_all"
-        android:icon="@drawable/ic_refresh_cw"
-        android:title="@string/room_prompt_resend"
-        android:visible="false"
-        app:showAsAction="never"
-        tools:visible="true" />
-
-    <item
-        android:id="@+id/clear_all"
-        android:icon="@drawable/ic_trash"
-        android:title="@string/room_prompt_cancel"
-        android:visible="false"
-        app:showAsAction="never"
-        tools:visible="true" />
-
     <item
         android:id="@+id/dev_tools"
         android:icon="@drawable/ic_settings_root_general"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 237b23a272..36ee7898e5 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2051,7 +2051,7 @@
     <string name="edit">Edit</string>
     <string name="reply">Reply</string>
 
-    <string name="global_retry">"Retry"</string>
+    <string name="global_retry">Retry</string>
     <string name="room_list_empty">"Join a room to start using the app."</string>
     <string name="send_you_invite">"Sent you an invitation"</string>
     <string name="invited_by">Invited by %s</string>
@@ -3243,5 +3243,9 @@
     <string name="event_status_a11y_sending">Sending</string>
     <string name="event_status_a11y_sent">Sent</string>
     <string name="event_status_a11y_failed">Failed</string>
+    <string name="event_status_a11y_delete_all">Delete all failed messages</string>
     <string name="event_status_cancel_sending_dialog_message">Do you want to cancel sending message?</string>
+    <string name="event_status_failed_messages_warning">Messages failed to send</string>
+    <string name="event_status_delete_all_failed_dialog_title">Delete unsent messages</string>
+    <string name="event_status_delete_all_failed_dialog_message">Are you sure you want to delete all unsent messages in this room?</string>
 </resources>

From ab304b0b9f41dd51823d1f229fc4093985ac50c4 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 4 Mar 2021 14:17:07 +0300
Subject: [PATCH 247/578] Do not decorate local echos as sent.

---
 .../helper/MessageInformationDataFactory.kt   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 201067e7b4..7f7e03663b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -31,6 +31,7 @@ import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
@@ -76,7 +77,9 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         val time = dateFormatter.format(event.root.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
         val e2eDecoration = getE2EDecoration(event)
 
+        // SendState Decoration
         val isSentByMe = event.root.senderId == session.myUserId
+        val isLocalEcho = LocalEcho.isLocalEchoId(event.eventId)
         val sendStateDecoration = if (isSentByMe) {
             val isMedia = when (event.root.content?.toModel<MessageContent>()) {
                 is MessageImageContent,
@@ -85,7 +88,12 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                 is MessageFileContent   -> true
                 else                    -> false
             }
-            getSendStateDecoration(event.root.sendState, prevEvent?.root?.sendState, event.readReceipts.any { it.user.userId != session.myUserId }, isMedia)
+            getSendStateDecoration(
+                    eventSendState = event.root.sendState,
+                    prevEventSendState = prevEvent?.root?.sendState,
+                    anyReadReceipts = event.readReceipts.any { it.user.userId != session.myUserId },
+                    isMedia = isMedia,
+                    isLocalEcho = isLocalEcho)
         } else {
             SendStateDecoration.NONE
         }
@@ -136,8 +144,14 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         )
     }
 
-    private fun getSendStateDecoration(eventSendState: SendState, prevEventSendState: SendState?, anyReadReceipts: Boolean, isMedia: Boolean): SendStateDecoration {
-        return if (eventSendState.isSending()) {
+    private fun getSendStateDecoration(
+            eventSendState: SendState,
+            prevEventSendState: SendState?,
+            anyReadReceipts: Boolean,
+            isMedia: Boolean,
+            isLocalEcho: Boolean
+    ): SendStateDecoration {
+        return if (eventSendState.isSending() || (eventSendState.isSent() && isLocalEcho)) {
             if (isMedia) SendStateDecoration.SENDING_MEDIA else SendStateDecoration.SENDING_NON_MEDIA
         } else if (eventSendState.hasFailed()) {
             SendStateDecoration.FAILED

From f64086a25fda968cdc35542bc715fb76c6299f7f Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 4 Mar 2021 14:36:26 +0300
Subject: [PATCH 248/578] Do not show different text color for sending state.

---
 .../features/home/room/detail/timeline/MessageColorProvider.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
index d1bef4c8c7..253619fdae 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
@@ -55,7 +55,7 @@ class MessageColorProvider @Inject constructor(
                 SendState.UNKNOWN,
                 SendState.UNSENT,
                 SendState.ENCRYPTING,
-                SendState.SENDING                -> colorProvider.getColorFromAttribute(R.attr.vctr_sending_message_text_color)
+                SendState.SENDING,
                 SendState.SENT,
                 SendState.SYNCED                 -> colorProvider.getColorFromAttribute(R.attr.vctr_message_text_color)
                 SendState.UNDELIVERED,

From 3ca25f900690a43b8c9ed3cea9bd8ea9d98f6539 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Mar 2021 16:56:31 +0100
Subject: [PATCH 249/578] Some cleanup

---
 .../app/core/ui/views/SendStateImageView.kt   |  61 +++++++++
 .../home/room/detail/RoomDetailViewModel.kt   | 127 +++++++++---------
 .../helper/MessageInformationDataFactory.kt   |   8 +-
 .../detail/timeline/item/AbsMessageItem.kt    |  29 +---
 .../main/res/layout/fragment_room_detail.xml  |   2 +-
 .../res/layout/item_timeline_event_base.xml   |   2 +-
 .../layout/view_failed_messages_warning.xml   |  37 +++--
 7 files changed, 154 insertions(+), 112 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/ui/views/SendStateImageView.kt

diff --git a/vector/src/main/java/im/vector/app/core/ui/views/SendStateImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/SendStateImageView.kt
new file mode 100644
index 0000000000..9acb82581f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/views/SendStateImageView.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.core.view.isVisible
+import im.vector.app.R
+import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
+
+class SendStateImageView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : AppCompatImageView(context, attrs, defStyleAttr) {
+
+    init {
+        if (isInEditMode) {
+            render(SendStateDecoration.SENT)
+        }
+    }
+
+    fun render(sendState: SendStateDecoration) {
+        isVisible = when (sendState) {
+            SendStateDecoration.SENDING_NON_MEDIA -> {
+                setImageResource(R.drawable.ic_sending_message)
+                contentDescription = context.getString(R.string.event_status_a11y_sending)
+                true
+            }
+            SendStateDecoration.SENT              -> {
+                setImageResource(R.drawable.ic_message_sent)
+                contentDescription = context.getString(R.string.event_status_a11y_sent)
+                true
+            }
+            SendStateDecoration.FAILED            -> {
+                setImageResource(R.drawable.ic_sending_message_failed)
+                contentDescription = context.getString(R.string.event_status_a11y_failed)
+                true
+            }
+            SendStateDecoration.SENDING_MEDIA,
+            SendStateDecoration.NONE              -> {
+                false
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index cf6862a28d..fdb7717e49 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -262,68 +262,68 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     override fun handle(action: RoomDetailAction) {
         when (action) {
-            is RoomDetailAction.UserIsTyping -> handleUserIsTyping(action)
-            is RoomDetailAction.ComposerFocusChange -> handleComposerFocusChange(action)
-            is RoomDetailAction.SaveDraft -> handleSaveDraft(action)
-            is RoomDetailAction.SendMessage -> handleSendMessage(action)
-            is RoomDetailAction.SendMedia -> handleSendMedia(action)
-            is RoomDetailAction.SendSticker -> handleSendSticker(action)
-            is RoomDetailAction.TimelineEventTurnsVisible -> handleEventVisible(action)
-            is RoomDetailAction.TimelineEventTurnsInvisible -> handleEventInvisible(action)
-            is RoomDetailAction.LoadMoreTimelineEvents -> handleLoadMore(action)
-            is RoomDetailAction.SendReaction -> handleSendReaction(action)
-            is RoomDetailAction.AcceptInvite -> handleAcceptInvite()
-            is RoomDetailAction.RejectInvite -> handleRejectInvite()
-            is RoomDetailAction.RedactAction -> handleRedactEvent(action)
-            is RoomDetailAction.UndoReaction -> handleUndoReact(action)
-            is RoomDetailAction.UpdateQuickReactAction -> handleUpdateQuickReaction(action)
-            is RoomDetailAction.EnterRegularMode -> handleEnterRegularMode(action)
-            is RoomDetailAction.EnterEditMode -> handleEditAction(action)
-            is RoomDetailAction.EnterQuoteMode -> handleQuoteAction(action)
-            is RoomDetailAction.EnterReplyMode -> handleReplyAction(action)
-            is RoomDetailAction.DownloadOrOpen -> handleOpenOrDownloadFile(action)
-            is RoomDetailAction.NavigateToEvent -> handleNavigateToEvent(action)
-            is RoomDetailAction.HandleTombstoneEvent -> handleTombstoneEvent(action)
-            is RoomDetailAction.ResendMessage -> handleResendEvent(action)
-            is RoomDetailAction.RemoveFailedEcho -> handleRemove(action)
-            is RoomDetailAction.ResendAll -> handleResendAll()
-            is RoomDetailAction.MarkAllAsRead -> handleMarkAllAsRead()
-            is RoomDetailAction.ReportContent -> handleReportContent(action)
-            is RoomDetailAction.IgnoreUser -> handleIgnoreUser(action)
+            is RoomDetailAction.UserIsTyping                     -> handleUserIsTyping(action)
+            is RoomDetailAction.ComposerFocusChange              -> handleComposerFocusChange(action)
+            is RoomDetailAction.SaveDraft                        -> handleSaveDraft(action)
+            is RoomDetailAction.SendMessage                      -> handleSendMessage(action)
+            is RoomDetailAction.SendMedia                        -> handleSendMedia(action)
+            is RoomDetailAction.SendSticker                      -> handleSendSticker(action)
+            is RoomDetailAction.TimelineEventTurnsVisible        -> handleEventVisible(action)
+            is RoomDetailAction.TimelineEventTurnsInvisible      -> handleEventInvisible(action)
+            is RoomDetailAction.LoadMoreTimelineEvents           -> handleLoadMore(action)
+            is RoomDetailAction.SendReaction                     -> handleSendReaction(action)
+            is RoomDetailAction.AcceptInvite                     -> handleAcceptInvite()
+            is RoomDetailAction.RejectInvite                     -> handleRejectInvite()
+            is RoomDetailAction.RedactAction                     -> handleRedactEvent(action)
+            is RoomDetailAction.UndoReaction                     -> handleUndoReact(action)
+            is RoomDetailAction.UpdateQuickReactAction           -> handleUpdateQuickReaction(action)
+            is RoomDetailAction.EnterRegularMode                 -> handleEnterRegularMode(action)
+            is RoomDetailAction.EnterEditMode                    -> handleEditAction(action)
+            is RoomDetailAction.EnterQuoteMode                   -> handleQuoteAction(action)
+            is RoomDetailAction.EnterReplyMode                   -> handleReplyAction(action)
+            is RoomDetailAction.DownloadOrOpen                   -> handleOpenOrDownloadFile(action)
+            is RoomDetailAction.NavigateToEvent                  -> handleNavigateToEvent(action)
+            is RoomDetailAction.HandleTombstoneEvent             -> handleTombstoneEvent(action)
+            is RoomDetailAction.ResendMessage                    -> handleResendEvent(action)
+            is RoomDetailAction.RemoveFailedEcho                 -> handleRemove(action)
+            is RoomDetailAction.ResendAll                        -> handleResendAll()
+            is RoomDetailAction.MarkAllAsRead                    -> handleMarkAllAsRead()
+            is RoomDetailAction.ReportContent                    -> handleReportContent(action)
+            is RoomDetailAction.IgnoreUser                       -> handleIgnoreUser(action)
             is RoomDetailAction.EnterTrackingUnreadMessagesState -> startTrackingUnreadMessages()
-            is RoomDetailAction.ExitTrackingUnreadMessagesState -> stopTrackingUnreadMessages()
-            is RoomDetailAction.ReplyToOptions -> handleReplyToOptions(action)
-            is RoomDetailAction.AcceptVerificationRequest -> handleAcceptVerification(action)
-            is RoomDetailAction.DeclineVerificationRequest -> handleDeclineVerification(action)
-            is RoomDetailAction.RequestVerification -> handleRequestVerification(action)
-            is RoomDetailAction.ResumeVerification -> handleResumeRequestVerification(action)
-            is RoomDetailAction.ReRequestKeys -> handleReRequestKeys(action)
-            is RoomDetailAction.TapOnFailedToDecrypt -> handleTapOnFailedToDecrypt(action)
-            is RoomDetailAction.SelectStickerAttachment -> handleSelectStickerAttachment()
-            is RoomDetailAction.OpenIntegrationManager -> handleOpenIntegrationManager()
-            is RoomDetailAction.StartCallWithPhoneNumber -> handleStartCallWithPhoneNumber(action)
-            is RoomDetailAction.StartCall -> handleStartCall(action)
-            is RoomDetailAction.AcceptCall -> handleAcceptCall(action)
-            is RoomDetailAction.EndCall -> handleEndCall()
-            is RoomDetailAction.ManageIntegrations -> handleManageIntegrations()
-            is RoomDetailAction.AddJitsiWidget -> handleAddJitsiConference(action)
-            is RoomDetailAction.RemoveWidget -> handleDeleteWidget(action.widgetId)
-            is RoomDetailAction.EnsureNativeWidgetAllowed -> handleCheckWidgetAllowed(action)
-            is RoomDetailAction.CancelSend -> handleCancel(action)
-            is RoomDetailAction.OpenOrCreateDm -> handleOpenOrCreateDm(action)
-            is RoomDetailAction.JumpToReadReceipt -> handleJumpToReadReceipt(action)
-            RoomDetailAction.QuickActionInvitePeople -> handleInvitePeople()
-            RoomDetailAction.QuickActionSetAvatar -> handleQuickSetAvatar()
-            is RoomDetailAction.SetAvatarAction -> handleSetNewAvatar(action)
-            RoomDetailAction.QuickActionSetTopic -> _viewEvents.post(RoomDetailViewEvents.OpenRoomSettings)
-            is RoomDetailAction.ShowRoomAvatarFullScreen -> {
+            is RoomDetailAction.ExitTrackingUnreadMessagesState  -> stopTrackingUnreadMessages()
+            is RoomDetailAction.ReplyToOptions                   -> handleReplyToOptions(action)
+            is RoomDetailAction.AcceptVerificationRequest        -> handleAcceptVerification(action)
+            is RoomDetailAction.DeclineVerificationRequest       -> handleDeclineVerification(action)
+            is RoomDetailAction.RequestVerification              -> handleRequestVerification(action)
+            is RoomDetailAction.ResumeVerification               -> handleResumeRequestVerification(action)
+            is RoomDetailAction.ReRequestKeys                    -> handleReRequestKeys(action)
+            is RoomDetailAction.TapOnFailedToDecrypt             -> handleTapOnFailedToDecrypt(action)
+            is RoomDetailAction.SelectStickerAttachment          -> handleSelectStickerAttachment()
+            is RoomDetailAction.OpenIntegrationManager           -> handleOpenIntegrationManager()
+            is RoomDetailAction.StartCallWithPhoneNumber         -> handleStartCallWithPhoneNumber(action)
+            is RoomDetailAction.StartCall                        -> handleStartCall(action)
+            is RoomDetailAction.AcceptCall                       -> handleAcceptCall(action)
+            is RoomDetailAction.EndCall                          -> handleEndCall()
+            is RoomDetailAction.ManageIntegrations               -> handleManageIntegrations()
+            is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
+            is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
+            is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
+            is RoomDetailAction.CancelSend                       -> handleCancel(action)
+            is RoomDetailAction.OpenOrCreateDm                   -> handleOpenOrCreateDm(action)
+            is RoomDetailAction.JumpToReadReceipt                -> handleJumpToReadReceipt(action)
+            RoomDetailAction.QuickActionInvitePeople             -> handleInvitePeople()
+            RoomDetailAction.QuickActionSetAvatar                -> handleQuickSetAvatar()
+            is RoomDetailAction.SetAvatarAction                  -> handleSetNewAvatar(action)
+            RoomDetailAction.QuickActionSetTopic                 -> _viewEvents.post(RoomDetailViewEvents.OpenRoomSettings)
+            is RoomDetailAction.ShowRoomAvatarFullScreen         -> {
                 _viewEvents.post(
                         RoomDetailViewEvents.ShowRoomAvatarFullScreen(action.matrixItem, action.transitionView)
                 )
             }
-            is RoomDetailAction.DoNotShowPreviewUrlFor -> handleDoNotShowPreviewUrlFor(action)
-            RoomDetailAction.RemoveAllFailedMessages -> handleRemoveAllFailedMessages()
-            RoomDetailAction.ResendAll -> handleResendAll()
+            is RoomDetailAction.DoNotShowPreviewUrlFor           -> handleDoNotShowPreviewUrlFor(action)
+            RoomDetailAction.RemoveAllFailedMessages             -> handleRemoveAllFailedMessages()
+            RoomDetailAction.ResendAll                           -> handleResendAll()
         }.exhaustive
     }
 
@@ -663,7 +663,7 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
         when (itemId) {
             R.id.timeline_setting -> true
-            R.id.invite -> state.canInvite
+            R.id.invite           -> state.canInvite
             R.id.open_matrix_apps -> true
             R.id.voice_call,
             R.id.video_call       -> callManager.getCallsByRoomId(state.roomId).isEmpty()
@@ -816,7 +816,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                         }
                     }.exhaustive
                 }
-                is SendMode.EDIT -> {
+                is SendMode.EDIT    -> {
                     // is original event a reply?
                     val inReplyTo = state.sendMode.timelineEvent.getRelationContent()?.inReplyTo?.eventId
                     if (inReplyTo != null) {
@@ -839,7 +839,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.QUOTE -> {
+                is SendMode.QUOTE   -> {
                     val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
                     val textMsg = messageContent?.body
 
@@ -860,7 +860,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.REPLY -> {
+                is SendMode.REPLY   -> {
                     state.sendMode.timelineEvent.let {
                         room.replyToMessage(it, action.text.toString(), action.autoMarkdown)
                         _viewEvents.post(RoomDetailViewEvents.MessageSent)
@@ -1441,7 +1441,10 @@ class RoomDetailViewModel @AssistedInject constructor(
             roomSummariesHolder.set(summary)
             setState {
                 val typingMessage = typingHelper.getTypingMessage(summary.typingUsers)
-                copy(typingMessage = typingMessage, hasFailedSending = summary.hasFailedSending)
+                copy(
+                        typingMessage = typingMessage,
+                        hasFailedSending = summary.hasFailedSending
+                )
             }
             if (summary.membership == Membership.INVITE) {
                 summary.inviterId?.let { inviterId ->
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 7f7e03663b..360702e928 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -79,21 +79,21 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
 
         // SendState Decoration
         val isSentByMe = event.root.senderId == session.myUserId
-        val isLocalEcho = LocalEcho.isLocalEchoId(event.eventId)
         val sendStateDecoration = if (isSentByMe) {
             val isMedia = when (event.root.content?.toModel<MessageContent>()) {
                 is MessageImageContent,
                 is MessageVideoContent,
                 is MessageAudioContent,
-                is MessageFileContent   -> true
-                else                    -> false
+                is MessageFileContent -> true
+                else                  -> false
             }
             getSendStateDecoration(
                     eventSendState = event.root.sendState,
                     prevEventSendState = prevEvent?.root?.sendState,
                     anyReadReceipts = event.readReceipts.any { it.user.userId != session.myUserId },
                     isMedia = isMedia,
-                    isLocalEcho = isLocalEcho)
+                    isLocalEcho = LocalEcho.isLocalEchoId(event.eventId)
+            )
         } else {
             SendStateDecoration.NONE
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 3d7fe21c9a..ed61abcf6e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -26,6 +26,7 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import im.vector.app.R
+import im.vector.app.core.ui.views.SendStateImageView
 import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
@@ -85,30 +86,8 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
         }
 
         // Render send state indicator
-        holder.sendStateImageView.isVisible = true
-        holder.eventSendingIndicator.isVisible = false
-        when (attributes.informationData.sendStateDecoration) {
-            SendStateDecoration.SENDING_NON_MEDIA  -> {
-                holder.sendStateImageView
-                        .apply { setImageResource(R.drawable.ic_sending_message) }
-                        .apply { contentDescription = context.getString(R.string.event_status_a11y_sending) }
-            }
-            SendStateDecoration.SENT               -> {
-                holder.sendStateImageView
-                        .apply { setImageResource(R.drawable.ic_message_sent) }
-                        .apply { contentDescription = context.getString(R.string.event_status_a11y_sent) }
-            }
-            SendStateDecoration.FAILED             -> {
-                holder.sendStateImageView
-                        .apply { setImageResource(R.drawable.ic_sending_message_failed) }
-                        .apply { contentDescription = context.getString(R.string.event_status_a11y_failed) }
-            }
-            SendStateDecoration.SENDING_MEDIA      -> {
-                holder.sendStateImageView.isVisible = false
-                holder.eventSendingIndicator.isVisible = true
-            }
-            SendStateDecoration.NONE               -> holder.sendStateImageView.isVisible = false
-        }
+        holder.sendStateImageView.render(attributes.informationData.sendStateDecoration)
+        holder.eventSendingIndicator.isVisible = attributes.informationData.sendStateDecoration == SendStateDecoration.SENDING_MEDIA
     }
 
     override fun unbind(holder: H) {
@@ -126,7 +105,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
         val avatarImageView by bind<ImageView>(R.id.messageAvatarImageView)
         val memberNameView by bind<TextView>(R.id.messageMemberNameView)
         val timeView by bind<TextView>(R.id.messageTimeView)
-        val sendStateImageView by bind<ImageView>(R.id.messageSendStateImageView)
+        val sendStateImageView by bind<SendStateImageView>(R.id.messageSendStateImageView)
         val eventSendingIndicator by bind<ProgressBar>(R.id.eventSendingIndicator)
     }
 
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index a6909a2893..11d97c9f4b 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -86,7 +86,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:barrierDirection="top"
-        app:constraint_referenced_ids="composerLayout,notificationAreaView, failedMessagesWarningView" />
+        app:constraint_referenced_ids="composerLayout,notificationAreaView,failedMessagesWarningView" />
 
     <im.vector.app.features.sync.widget.SyncStateView
         android:id="@+id/syncStateView"
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 4b03d71c6a..422cd5fef2 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -134,7 +134,7 @@
 
     </FrameLayout>
 
-    <ImageView
+    <im.vector.app.core.ui.views.SendStateImageView
         android:id="@+id/messageSendStateImageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/view_failed_messages_warning.xml b/vector/src/main/res/layout/view_failed_messages_warning.xml
index 080d22b630..bfe901497b 100644
--- a/vector/src/main/res/layout/view_failed_messages_warning.xml
+++ b/vector/src/main/res/layout/view_failed_messages_warning.xml
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="8dp">
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <View
         android:id="@+id/failedMessagesWarningDivider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:background="?attr/vctr_list_divider_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:id="@+id/failedMessageWarningImageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/event_status_a11y_failed"
-        android:src="@drawable/ic_sending_message_failed"
-        app:layout_constraintBottom_toBottomOf="@id/failedMessagesRetryButton"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/failedMessagesRetryButton" />
-
     <TextView
         android:id="@+id/failedMessagesWarningTextView"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="8dp"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical"
         android:text="@string/event_status_failed_messages_warning"
         android:textColor="?riotx_text_primary"
         android:textSize="14sp"
-        app:layout_constraintBottom_toBottomOf="@id/failedMessageWarningImageView"
-        app:layout_constraintStart_toEndOf="@id/failedMessageWarningImageView"
-        app:layout_constraintTop_toTopOf="@id/failedMessageWarningImageView" />
+        app:drawableStartCompat="@drawable/ic_sending_message_failed"
+        app:layout_constraintBottom_toBottomOf="@id/failedMessagesRetryButton"
+        app:layout_constraintEnd_toStartOf="@+id/failedMessagesDeleteAllButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/failedMessagesRetryButton" />
 
     <ImageButton
         android:id="@+id/failedMessagesDeleteAllButton"
@@ -53,7 +52,7 @@
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="4dp"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:text="@string/global_retry"
         android:textSize="14sp"
         app:icon="@drawable/ic_retry_sending_messages"
@@ -62,4 +61,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/failedMessagesWarningDivider" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file

From b7c0951cbe495022343d3bc24fb0e6cc39c2710e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Mar 2021 17:19:27 +0100
Subject: [PATCH 250/578] Speed up sent state display for local echo

---
 .../helper/MessageInformationDataFactory.kt     | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 360702e928..a6bafd6bbd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -31,7 +31,6 @@ import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.LocalEcho
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
@@ -91,8 +90,7 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                     eventSendState = event.root.sendState,
                     prevEventSendState = prevEvent?.root?.sendState,
                     anyReadReceipts = event.readReceipts.any { it.user.userId != session.myUserId },
-                    isMedia = isMedia,
-                    isLocalEcho = LocalEcho.isLocalEchoId(event.eventId)
+                    isMedia = isMedia
             )
         } else {
             SendStateDecoration.NONE
@@ -144,14 +142,11 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         )
     }
 
-    private fun getSendStateDecoration(
-            eventSendState: SendState,
-            prevEventSendState: SendState?,
-            anyReadReceipts: Boolean,
-            isMedia: Boolean,
-            isLocalEcho: Boolean
-    ): SendStateDecoration {
-        return if (eventSendState.isSending() || (eventSendState.isSent() && isLocalEcho)) {
+    private fun getSendStateDecoration(eventSendState: SendState,
+                                       prevEventSendState: SendState?,
+                                       anyReadReceipts: Boolean,
+                                       isMedia: Boolean): SendStateDecoration {
+        return if (eventSendState.isSending()) {
             if (isMedia) SendStateDecoration.SENDING_MEDIA else SendStateDecoration.SENDING_NON_MEDIA
         } else if (eventSendState.hasFailed()) {
             SendStateDecoration.FAILED

From 47f7c91a3bd65d1e2994289e4d05acd9ff4e55b3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Mar 2021 18:23:25 +0100
Subject: [PATCH 251/578] Fix issue in e2e rooms.

---
 .../timeline/factory/TimelineItemFactory.kt       |  3 +++
 .../helper/MessageInformationDataFactory.kt       | 15 ++-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index f1df2ae802..ccc8289e08 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -37,6 +37,9 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                                               private val callItemFactory: CallItemFactory,
                                               private val userPreferencesProvider: UserPreferencesProvider) {
 
+    /**
+     * Reminder: nextEvent is older and prevEvent is newer.
+     */
     fun create(event: TimelineEvent,
                prevEvent: TimelineEvent?,
                nextEvent: TimelineEvent?,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index a6bafd6bbd..09f173de14 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -31,14 +31,10 @@ import org.matrix.android.sdk.api.crypto.VerificationState
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.ReferencesAggregatedContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
@@ -79,18 +75,11 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         // SendState Decoration
         val isSentByMe = event.root.senderId == session.myUserId
         val sendStateDecoration = if (isSentByMe) {
-            val isMedia = when (event.root.content?.toModel<MessageContent>()) {
-                is MessageImageContent,
-                is MessageVideoContent,
-                is MessageAudioContent,
-                is MessageFileContent -> true
-                else                  -> false
-            }
             getSendStateDecoration(
                     eventSendState = event.root.sendState,
                     prevEventSendState = prevEvent?.root?.sendState,
                     anyReadReceipts = event.readReceipts.any { it.user.userId != session.myUserId },
-                    isMedia = isMedia
+                    isMedia = event.root.isAttachmentMessage()
             )
         } else {
             SendStateDecoration.NONE

From c9c4a203d1566f78cdcdd82de12bfe049e195279 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Mar 2021 18:29:33 +0100
Subject: [PATCH 252/578] Code quality

---
 tools/check/forbidden_strings_in_code.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 98c49d6549..468fe717c0 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===91
+enum class===92
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From 6977ee45da97080704e3b0fa7da65ef73c6d70a5 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 9 Mar 2021 20:18:30 +0100
Subject: [PATCH 253/578] Timeline: force a build if decoration is SENT

---
 .../room/detail/timeline/TimelineEventController.kt   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 7a1b758f3a..44f1e9b759 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -43,11 +43,13 @@ import im.vector.app.features.home.room.detail.timeline.helper.TimelineControlle
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
+import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem
 import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem
 import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
 import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
@@ -364,7 +366,9 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             requestModelBuild()
         }
         val daySeparatorItem = buildDaySeparatorItem(addDaySeparator, event.root.originServerTs)
-        return CacheItemData(event.localId, event.root.eventId, eventModel, mergedHeaderModel, daySeparatorItem)
+        // If we have a SENT decoration, we want to built again as it might have to be changed to NONE if more recent event has also SENT decoration
+        val forceTriggerBuild = eventModel is AbsMessageItem && eventModel.attributes.informationData.sendStateDecoration == SendStateDecoration.SENT
+        return CacheItemData(event.localId, event.root.eventId, eventModel, mergedHeaderModel, daySeparatorItem, forceTriggerBuild)
     }
 
     private fun buildDaySeparatorItem(addDaySeparator: Boolean, originServerTs: Long?): DaySeparatorItem? {
@@ -427,11 +431,12 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             val eventId: String?,
             val eventModel: EpoxyModel<*>? = null,
             val mergedHeaderModel: BasedMergedItem<*>? = null,
-            val formattedDayModel: DaySeparatorItem? = null
+            val formattedDayModel: DaySeparatorItem? = null,
+            val forceTriggerBuild: Boolean = false
     ) {
         fun shouldTriggerBuild(): Boolean {
             // Since those items can change when we paginate, force a re-build
-            return mergedHeaderModel != null || formattedDayModel != null
+            return forceTriggerBuild || mergedHeaderModel != null || formattedDayModel != null
         }
     }
 }

From fa406676333194aaac49a773f6c7a5e345e35b66 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 09:51:56 +0100
Subject: [PATCH 254/578] Restore BottomSheet for event not sent. Move the
 confirmation dialog when the action is selected from the bottom sheet.

---
 .../home/room/detail/RoomDetailFragment.kt    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 1df583187e..c1c32a417b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1562,23 +1562,24 @@ class RoomDetailFragment @Inject constructor(
 
         this.view?.hideKeyboard()
 
-        if (informationData.sendState.isSending()) {
-            AlertDialog.Builder(requireContext())
-                    .setTitle(R.string.dialog_title_confirmation)
-                    .setMessage(getString(R.string.event_status_cancel_sending_dialog_message))
-                    .setNegativeButton(R.string.no, null)
-                    .setPositiveButton(R.string.yes) { _, _ ->
-                        sharedActionViewModel.post(EventSharedAction.Cancel(informationData.eventId))
-                    }
-                    .show()
-        } else {
-            MessageActionsBottomSheet
-                    .newInstance(roomId, informationData)
-                    .show(requireActivity().supportFragmentManager, "MESSAGE_CONTEXTUAL_ACTIONS")
-        }
+        MessageActionsBottomSheet
+                .newInstance(roomId, informationData)
+                .show(requireActivity().supportFragmentManager, "MESSAGE_CONTEXTUAL_ACTIONS")
+
         return true
     }
 
+    private fun handleCancelSend(action: EventSharedAction.Cancel) {
+        AlertDialog.Builder(requireContext())
+                .setTitle(R.string.dialog_title_confirmation)
+                .setMessage(getString(R.string.event_status_cancel_sending_dialog_message))
+                .setNegativeButton(R.string.no, null)
+                .setPositiveButton(R.string.yes) { _, _ ->
+                    roomDetailViewModel.handle(RoomDetailAction.CancelSend(action.eventId))
+                }
+                .show()
+    }
+
     override fun onAvatarClicked(informationData: MessageInformationData) {
         // roomDetailViewModel.handle(RoomDetailAction.RequestVerification(informationData.userId))
         openRoomMemberProfile(informationData.senderId)
@@ -1774,7 +1775,7 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.RemoveFailedEcho(action.eventId))
             }
             is EventSharedAction.Cancel                     -> {
-                roomDetailViewModel.handle(RoomDetailAction.CancelSend(action.eventId))
+                handleCancelSend(action)
             }
             is EventSharedAction.ReportContentSpam          -> {
                 roomDetailViewModel.handle(RoomDetailAction.ReportContent(

From e51b3bd3992e76bf2b876173b12ddcd87a6ec2dc Mon Sep 17 00:00:00 2001
From: Zet <abidin24@disroot.org>
Date: Mon, 8 Mar 2021 14:46:04 +0000
Subject: [PATCH 255/578] Translated using Weblate (Arabic)

Currently translated at 38.8% (913 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
---
 vector/src/main/res/values-ar/strings.xml | 50 +++++++++++------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index ac07bc890c..aac9d1b6cd 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="summary_user_sent_image">إنَّ %1$s قد أرسلَ صُّورة.</string>
+    <string name="summary_user_sent_image">أرسلَ %1$s صُّورة.</string>
     <string name="notice_room_invite_no_invitee">دعوة مِن %s</string>
-    <string name="notice_room_invite">إنَّ %1$s قد دَعى %2$s</string>
-    <string name="notice_room_invite_you">إنَّ %1$s قد دعاكَ أنت</string>
-    <string name="notice_room_join">إنَّ %1$s قد إنضّم إلى الغُرفة</string>
-    <string name="notice_room_leave">إنَّ %1$s قد غادر الغرفة</string>
-    <string name="notice_room_reject">إنَّ %1$s قد رفضَ الدعوة</string>
-    <string name="notice_room_kick">إنَّ %1$s قد طردَ %2$s</string>
+    <string name="notice_room_invite">%1$s دَعى %2$s</string>
+    <string name="notice_room_invite_you">دعاكَ %1$s</string>
+    <string name="notice_room_join">إنضّم %1$s إلى الغُرفة</string>
+    <string name="notice_room_leave">غادر %1$s الغرفة</string>
+    <string name="notice_room_reject">رفضَ %1$s الدعوة</string>
+    <string name="notice_room_kick">%1$s طردَ %2$s</string>
     <string name="notice_room_unban">إنَّ %1$s قد رفعَ الحظر عن %2$s</string>
     <string name="notice_room_ban">إنَّ %1$s قد حظرَ %2$s</string>
     <string name="notice_avatar_url_changed">إنَّ %1$s قد غيَّرَ صورته الشخصية</string>
@@ -47,30 +47,30 @@
     <string name="notice_placed_voice_call">إنَّ %s قد أجرى مُكالمة صوتية.</string>
     <string name="notice_room_third_party_registered_invite">إنَّ %1$s قد قَبَل دعوة %2$s</string>
     <string name="could_not_redact">يتعذَّر التنقيح</string>
-    <string name="summary_user_sent_sticker">إنَّ %1$s قد أرسلَ مُلصقًا.</string>
+    <string name="summary_user_sent_sticker">أرسلَ %1$s مُلصقًا.</string>
     <string name="notice_avatar_changed_too">(تمَّ تغيِّير الصُّورة أيضًا)</string>
     <string name="room_displayname_invite_from">دَعوة مِن ⁨%s⁩</string>
     <string name="room_displayname_empty_room">غُرفة فارِغة</string>
     <string name="room_displayname_two_members">%1$s وَ %2$s</string>
     <string name="room_displayname_room_invite">دَعوة غُرفة</string>
     <plurals name="room_displayname_three_and_more_members">
-        <item quantity="zero"></item>
+        <item quantity="zero"/>
         <item quantity="one">%1$s وواحد آخر</item>
         <item quantity="two">%1$s و%2$d آخران</item>
         <item quantity="few">%1$s و%2$d آخرين</item>
         <item quantity="many">%1$s و%2$d آخرون</item>
         <item quantity="other">%1$s و%2$d آخرون</item>
     </plurals>
-    <string name="summary_you_sent_image">أنتَ قد أرسلتَ صُّورة.</string>
-    <string name="summary_you_sent_sticker">أنتَ قد أرسلتَ مُلصقًا.</string>
-    <string name="notice_room_invite_no_invitee_by_you">دعوة مِنكَ أنت</string>
-    <string name="notice_room_created">إنَّ %1$s قد أنشأ الغُرفة</string>
-    <string name="notice_room_created_by_you">أنتَ قد أنشأتَ الغُرفة</string>
-    <string name="notice_room_invite_by_you">أنتَ قد دعوتَ %1$s</string>
-    <string name="notice_room_join_by_you">أنتَ قد انضممت إلى الغُرفة</string>
-    <string name="notice_room_leave_by_you">أنتَ قد غادرتَ الغُرفة</string>
-    <string name="notice_room_reject_by_you">أنت قد رفضت الدعوة</string>
-    <string name="notice_room_kick_by_you">أنتَ قد طردتَ %1$s</string>
+    <string name="summary_you_sent_image">أرسلتَ صُّورة.</string>
+    <string name="summary_you_sent_sticker">أرسلتَ مُلصقًا.</string>
+    <string name="notice_room_invite_no_invitee_by_you">دعوة مِنكَ</string>
+    <string name="notice_room_created">أنشأ %1$s الغُرفة</string>
+    <string name="notice_room_created_by_you">أنتَ أنشأتَ الغُرفة</string>
+    <string name="notice_room_invite_by_you">أنتَ دعوتَ %1$s</string>
+    <string name="notice_room_join_by_you">أنتَ انضممت إلى الغُرفة</string>
+    <string name="notice_room_leave_by_you">أنتَ غادرتَ الغُرفة</string>
+    <string name="notice_room_reject_by_you">رفضتَ الدعوة</string>
+    <string name="notice_room_kick_by_you">طردتَ %1$s</string>
     <string name="notice_room_unban_by_you">أنتَ قد رفعتَ الحظر عن %1$s</string>
     <string name="notice_room_ban_by_you">أنتَ قد حظرتَ %1$s</string>
     <string name="notice_room_withdraw_by_you">أنتَ قد سحبتَ دعوة %1$s</string>
@@ -140,12 +140,12 @@
     <string name="notice_direct_room_update">إنَّ %s قد قامَ بالترقية هُنا.</string>
     <string name="notice_made_future_direct_room_visibility_by_you">أنتَ قد جعلتَ الرسائل المُستقبلية مرئية لـ %1$s</string>
     <string name="notice_made_future_direct_room_visibility">إنَّ %1$s قد جعلَ الرسائل المُستقبلية مرئية لـ %2$s</string>
-    <string name="notice_direct_room_leave_by_you">أنتَ قد غادرتَ الغُرفة</string>
-    <string name="notice_direct_room_leave">إنَّ %1$s قد غادر الغرفة</string>
-    <string name="notice_direct_room_join_by_you">أنت قد انضممت</string>
-    <string name="notice_direct_room_join">إنَّ %1$s قد انضم</string>
-    <string name="notice_direct_room_created_by_you">أنتَ قد أنشأتَ المُناقشة</string>
-    <string name="notice_direct_room_created">إنَّ %1$s قد أنشأ المُناقشة</string>
+    <string name="notice_direct_room_leave_by_you">غادرت الغرفة</string>
+    <string name="notice_direct_room_leave">غادر ⁨%1$s⁩ الغرفة</string>
+    <string name="notice_direct_room_join_by_you">أنت انضممت</string>
+    <string name="notice_direct_room_join">انضم %1$s</string>
+    <string name="notice_direct_room_created_by_you">أنتَ أنشأتَ المُناقشة</string>
+    <string name="notice_direct_room_created">أنشأ %1$s المُناقشة</string>
     <string name="notice_room_withdraw_with_reason_by_you">أنتَ قد سحبتَ دعوة %1$s. السبب: %2$s</string>
     <string name="notice_room_withdraw_with_reason">إنَّ %1$s قد سحبَ دعوة %2$s. السبب: %3$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">أنتَ قد ألغيتَ دعوة %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>

From 0ad1e46b0b49dd255f867bf3a4572e8365353ab5 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Mon, 8 Mar 2021 08:40:57 +0000
Subject: [PATCH 256/578] Translated using Weblate (Czech)

Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
---
 vector/src/main/res/values-cs/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 675ffb25b8..03b733be05 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -762,7 +762,7 @@
     <string name="settings_add_phone_number">Přidat telefonní číslo</string>
     <string name="settings_app_info_link_title">Informace o aplikaci</string>
     <string name="settings_app_info_link_summary">Zobrazit informace o aplikaci v systémovém nastavení.</string>
-    <string name="settings_notification_advanced">Rozšířená nestavení oznámení</string>
+    <string name="settings_notification_advanced">Rozšířená nastavení oznámení</string>
     <string name="settings_notification_by_event">Důležitost oznámení na základě události</string>
     <string name="notification_sync_init">Spouštím služby</string>
     <string name="title_activity_verify_device">Ověřit relaci</string>

From 0ae9abd6ada4a6f6b80b3c4fb1644100c0a2b343 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 8 Mar 2021 23:26:22 +0000
Subject: [PATCH 257/578] Translated using Weblate (German)

Currently translated at 99.8% (2348 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 68 ++++++++++++++++++++---
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 46126c6ff9..d94811782d 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -161,7 +161,7 @@
     <string name="notice_widget_modified">%1$s hat das %2$s Widget modifiziert</string>
     <string name="notice_widget_modified_by_you">Du hast das %1$s Widget modifiziert</string>
     <string name="power_level_admin">Administrator</string>
-    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_moderator">Moderator:in</string>
     <string name="power_level_default">Standard</string>
     <string name="power_level_custom">Benutzerdefiniert (%1$d)</string>
     <string name="power_level_custom_no_value">Benutzerdefiniert</string>
@@ -541,7 +541,7 @@
     <string name="room_participants_action_ban">Verbannen</string>
     <string name="room_participants_action_unban">Verbannung aufheben</string>
     <string name="room_participants_action_set_default_power_level">Zum/r normalen Benutzer/in herabstufen</string>
-    <string name="room_participants_action_set_moderator">Zum Moderator machen</string>
+    <string name="room_participants_action_set_moderator">Zum/r Moderator:in machen</string>
     <string name="room_participants_action_set_admin">Zum Admin machen</string>
     <string name="room_participants_action_ignore">Alle Nachrichten dieses/r Nutzers/in verbergen</string>
     <string name="room_participants_action_unignore">Alle Nachrichten dieses/r Nutzers/in anzeigen</string>
@@ -582,10 +582,10 @@
     <string name="ssl_fingerprint_hash">Fingerabdruck (%s):</string>
     <string name="ssl_could_not_verify">Konnte Identität des Remote-Servers nicht verifizieren.</string>
     <string name="ssl_cert_not_trust">Dies kann bedeuten, dass jemand böswillig deinen Internetverkehr abfängt oder dass dein Telefon dem Zertifikat, dass der Remote-Server anbietet, nicht vertraut.</string>
-    <string name="ssl_cert_new_account_expl">Wenn der Server-Administrator dir mitgeteilt hat, dass dies zu erwarten sei, stelle sicher, dass der Fingerabdruck unten mit dem von deinem Administrator bereitgestellten übereinstimmt.</string>
+    <string name="ssl_cert_new_account_expl">Wenn der/die Server-Administrator:in dir mitgeteilt hat, dass dies zu erwarten sei, stelle sicher, dass der Fingerabdruck unten mit dem von deinem/r Administrator:in bereitgestellten übereinstimmt.</string>
     <string name="ssl_unexpected_existing_expl">Das Zertifikat unterscheidet sich von dem Zertifikat, dem dein Gerät ursprünglich vertraut hat. Dies ist SEHR UNGEWÖHNLICH. Es wird empfohlen, dass du dieses neue Zertifikat NICHT AKZEPTIERST.</string>
     <string name="ssl_expected_existing_expl">Das Zertifikat hat sich von einem ursprünglich vertrauenswürdigem Zertifikat in ein nicht vertrauenswürdiges Zertifikat geändert. Eventuell wurde das Zertifikat des Servers erneuert. Bitte erkundige dich beim Server-Administrator, welcher Fingerprint als vertrauenswürdig gilt.</string>
-    <string name="ssl_only_accept">Akzeptiere das Zertifikat nur dann, wenn der Server-Administrator einen Fingerprint veröffentlicht hat, der mit dem obigen übereinstimmt.</string>
+    <string name="ssl_only_accept">Akzeptiere das Zertifikat nur dann, wenn der/die Server-Administrator:in einen Fingerprint veröffentlicht hat, der mit dem obigen übereinstimmt.</string>
     <!-- Room Details -->
     <string name="room_details_title">Raum-Details</string>
     <string name="room_details_people">Personen</string>
@@ -951,7 +951,7 @@
     <string name="invited">Eingeladen</string>
     <string name="filter_group_members">Filter Gruppen-Mitglieder</string>
     <string name="filter_group_rooms">Filter Gruppen-Räume</string>
-    <string name="group_no_long_description">Der Community-Administrator hat keine lange Beschreibung für diese Community zur Verfügung gestellt.</string>
+    <string name="group_no_long_description">Die Community-Administration hat keine lange Beschreibung für diese Community zur Verfügung gestellt.</string>
     <string name="has_been_kicked">Du wurdest von %2$s aus %1$s gekickt</string>
     <string name="has_been_banned">Du wurdest von %2$s aus %1$s verbannt</string>
     <string name="reason_colon">Grund: %1$s</string>
@@ -2292,7 +2292,7 @@
     <string name="send_a_sticker">Sticker</string>
     <string name="room_profile_section_admin">Administrative Aktionen</string>
     <string name="room_member_power_level_default_in">Standard in %1$s</string>
-    <string name="settings_hs_admin_e2e_disabled">Dein Serveradministrator hat in privaten Räumen &amp; Direktnachrichten Ende-zu-Ende Verschlüsselung standardmäßig deaktiviert.</string>
+    <string name="settings_hs_admin_e2e_disabled">Dein:e Serveradministrator:in hat in privaten Räumen &amp; Direktnachrichten Ende-zu-Ende Verschlüsselung standardmäßig deaktiviert.</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Flugzeugmodus ist aktiv</string>
     <string name="bootstrap_info_text_2">Gib eine Sicherheitsphrase ein, die nur du kennst. Diese wird benutzt um deine Daten auf dem Server geheim zu halten.</string>
     <string name="bootstrap_cancel_text">Wenn du jetzt abbrichst und den Zugriff zu deinen Sitzungen verlierst, kannst du verschlüsselte Nachrichten &amp; Daten verlieren.
@@ -2545,7 +2545,7 @@
     <string name="settings_security_pin_code_change_pin_summary">Ändere deine aktuelle PIN</string>
     <string name="settings_security_pin_code_change_pin_title">PIN ändern</string>
     <string name="phone_book_perform_lookup">Suche nach Kontakten auf Matrix</string>
-    <string name="room_settings_set_avatar">Avatar einrichten</string>
+    <string name="room_settings_set_avatar">Raum-Bild einrichten</string>
     <string name="identity_server_user_consent_not_provided">Einverständnis wurde nicht abgegeben.</string>
     <string name="user_code_info_text">Teile diesen Code mit Leuten, damit sie ihn scannen und mit dir chatten können.</string>
     <string name="user_code_share">Meinen Code teilen</string>
@@ -2668,4 +2668,58 @@
     <string name="call_hold_action">Halten</string>
     <string name="call_resume_action">Fortsetzen</string>
     <string name="action_return">Zurück</string>
+    <string name="dev_tools_event_content_hint">Ereignis-Inhalt</string>
+    <string name="dev_tools_success_state_event">Status-Event gesendet!</string>
+    <string name="dev_tools_success_event">Ereignis gesendet!</string>
+    <string name="dev_tools_error_malformed_event">Falsch geformtes Ereignis</string>
+    <string name="dev_tools_error_no_message_type">Fehlender Nachrichtentyp</string>
+    <string name="dev_tools_error_no_content">Kein Inhalt</string>
+    <string name="dev_tools_form_hint_event_content">Ereignisinhalt</string>
+    <string name="dev_tools_form_hint_state_key">Statusschlüssel</string>
+    <string name="dev_tools_form_hint_type">Typ</string>
+    <string name="dev_tools_send_custom_state_event">Benutzendendefiniertes Status-Event senden</string>
+    <string name="dev_tools_edit_content">Inhalt bearbeiten</string>
+    <string name="dev_tools_state_event">Status-Events</string>
+    <string name="dev_tools_send_state_event">Status-Event senden</string>
+    <string name="dev_tools_send_custom_event">Benutzendendefiniertes Ereignis senden</string>
+    <string name="dev_tools_explore_room_state">Raum-Status erkunden</string>
+    <string name="dev_tools_menu_name">Entwicklungswerkzeuge</string>
+    <string name="a11y_view_read_receipts">Lesebestätigungen anzeigen</string>
+    <string name="a11y_rule_notify_off">Nicht benachrichtigen</string>
+    <string name="a11y_rule_notify_noisy">Mit Ton benachrichtigen</string>
+    <string name="a11y_rule_notify_silent">Ohne Ton benachrichtigen</string>
+    <string name="a11y_error_message_not_sent">Nachricht wegen eines Errors nicht gesendet</string>
+    <string name="a11y_checked">Geprüft</string>
+    <string name="a11y_close_emoji_picker">Emoji-Auswahl schließen</string>
+    <string name="a11y_open_emoji_picker">Emoji-Auswahl öffnen</string>
+    <string name="a11y_trust_level_trusted">Vertraute Vertrauensstufe</string>
+    <string name="a11y_trust_level_warning">Warnungsvertrauensstufe</string>
+    <string name="a11y_trust_level_default">Standart-Vertrauensstufe</string>
+    <string name="a11y_selected">Ausgewählt</string>
+    <string name="a11y_video">Video</string>
+    <string name="a11y_unsent_draft">Dieser Raum enthält einen ungesendeten Entwurf</string>
+    <string name="a11y_error_some_message_not_sent">Einige Nachrichten wurden nicht gesendet</string>
+    <string name="a11y_delete_avatar">Avatar löschen</string>
+    <string name="a11y_change_avatar">Avatar ändern</string>
+    <string name="a11y_image">Bild</string>
+    <string name="a11y_import_key_from_file">Schlüssel von Datei importieren</string>
+    <string name="a11y_open_widget">Widgets öffnen</string>
+    <string name="a11y_screenshot">Bildschirmfoto</string>
+    <plurals name="entries">
+        <item quantity="one">%d Eintrag</item>
+        <item quantity="other">%d Einträge</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">Die Obergrenze ist nicht bekannt.</string>
+    <string name="settings_server_upload_size_content">Dein Homeserver akzeptiert Anhänge (wie Dateien, Medien, etc.) mit einer Größe bis zu %s.</string>
+    <string name="settings_server_upload_size_title">Datei-Upload-Obergrenze des Servers</string>
+    <string name="settings_server_version">Server-Version</string>
+    <string name="settings_server_name">Severname</string>
+    <string name="room_list_quick_actions_room_settings">Raum-Einstellungen</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Derzeitige Konferenz verlassen und zu einer anderen wechseln\?</string>
+    <string name="room_settings_room_version_title">Raum-Version</string>
+    <string name="dialog_edit_hint">Neuer Wert</string>
+    <string name="initial_sync_start_downloading">Erste Synchronisation:
+\nLade Daten herunter…</string>
+    <string name="initial_sync_start_server_computing">Erste Synchronisation:
+\nWarte auf Serverantwort…</string>
 </resources>
\ No newline at end of file

From 660129e690c74098b5f241e2ad267e5db5b14276 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Tue, 9 Mar 2021 17:11:14 +0000
Subject: [PATCH 258/578] Translated using Weblate (French)

Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 883 +++++++++++++---------
 1 file changed, 536 insertions(+), 347 deletions(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 8011534b00..e6d00365a3 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -9,17 +9,17 @@
     <string name="notice_room_leave">%1$s est parti du salon</string>
     <string name="notice_room_reject">%1$s a rejeté l’invitation</string>
     <string name="notice_room_kick">%1$s a expulsé %2$s</string>
-    <string name="notice_room_unban">%1$s a révoqué l\'exclusion de %2$s</string>
-    <string name="notice_room_ban">%1$s a exclus %2$s</string>
+    <string name="notice_room_unban">%1$s a révoqué le bannissement de %2$s</string>
+    <string name="notice_room_ban">%1$s a banni %2$s</string>
     <string name="notice_room_withdraw">%1$s a annulé l’invitation de %2$s</string>
     <string name="notice_avatar_url_changed">%1$s a changé d’avatar</string>
-    <string name="notice_display_name_set">%1$s a modifié son nom affiché en %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s a modifié son nom affiché de %2$s en %3$s</string>
-    <string name="notice_display_name_removed">%1$s a supprimé son nom affiché (précédemment %2$s)</string>
+    <string name="notice_display_name_set">%1$s a modifié son nom d’affichage en %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s a modifié son nom d’affichage de %2$s en %3$s</string>
+    <string name="notice_display_name_removed">%1$s a supprimé son nom d’affichage (précédemment %2$s)</string>
     <string name="notice_room_topic_changed">%1$s a changé le sujet en : %2$s</string>
     <string name="notice_room_name_changed">%1$s a changé le nom du salon en : %2$s</string>
     <string name="notice_placed_video_call">%s a passé un appel vidéo.</string>
-    <string name="notice_placed_voice_call">%s a passé un appel vocal.</string>
+    <string name="notice_placed_voice_call">%s a passé un appel audio.</string>
     <string name="notice_answered_call">%s a répondu à l’appel.</string>
     <string name="notice_ended_call">%s a raccroché.</string>
     <string name="notice_made_future_room_visibility">%1$s a rendu l’historique futur du salon visible pour %2$s</string>
@@ -37,7 +37,7 @@
     <string name="notice_room_topic_removed">%1$s a supprimé le sujet du salon</string>
     <string name="notice_profile_change_redacted">%1$s a mis à jour son profil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s a envoyé une invitation à %2$s pour rejoindre le salon</string>
-    <string name="notice_room_third_party_registered_invite">%1$s a accepté l’invitation pour %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s a accepté l’invitation de %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Déchiffrement impossible : %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
     <string name="could_not_redact">Effacement impossible</string>
@@ -48,7 +48,7 @@
     <string name="room_error_join_failed_empty_room">Il est impossible pour le moment de revenir dans un salon vide.</string>
     <string name="medium_email">Adresse e-mail</string>
     <string name="medium_phone_number">Numéro de téléphone</string>
-    <string name="summary_user_sent_sticker">%1$s a envoyé un sticker.</string>
+    <string name="summary_user_sent_sticker">%1$s a envoyé un autocollant.</string>
     <string name="room_displayname_invite_from">Invitation de %s</string>
     <string name="room_displayname_room_invite">Invitation au salon</string>
     <string name="room_displayname_empty_room">Salon vide</string>
@@ -70,7 +70,7 @@
     <string name="initial_sync_start_importing_account_joined_rooms">Synchronisation initiale :
 \nImportation des salons que vous avez rejoints</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Synchronisation initiale :
-\nImportation des salons où vous avez été invités</string>
+\nImportation des salons où vous avez été invité</string>
     <string name="initial_sync_start_importing_account_left_rooms">Synchronisation initiale :
 \nImportation des salons que vous avez quittés</string>
     <string name="initial_sync_start_importing_account_groups">Synchronisation initiale :
@@ -80,20 +80,20 @@
     <string name="notice_room_update">%s a mis à niveau ce salon.</string>
     <string name="event_status_sending_message">Envoi du message…</string>
     <string name="clear_timeline_send_queue">Vider la file d’envoi</string>
-    <string name="notice_room_third_party_revoked_invite">%1$s a révoqué l’invitation pour %2$s à rejoindre le salon</string>
-    <string name="notice_room_invite_no_invitee_with_reason">Invitation de %1$s. Raison : %2$s</string>
-    <string name="notice_room_invite_with_reason">%1$s a invité %2$s. Raison : %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s vous a invité. Raison : %2$s</string>
-    <string name="notice_room_join_with_reason">%1$s a rejoint le salon. Raison : %2$s</string>
-    <string name="notice_room_leave_with_reason">%1$s est parti du salon. Raison : %2$s</string>
-    <string name="notice_room_reject_with_reason">%1$s a refusé l’invitation. Raison : %2$s</string>
-    <string name="notice_room_kick_with_reason">%1$s a expulsé %2$s. Raison : %3$s</string>
-    <string name="notice_room_unban_with_reason">%1$s a révoqué l\'exclusion de %2$s. Raison : %3$s</string>
-    <string name="notice_room_ban_with_reason">%1$s a exclus %2$s. Raison : %3$s</string>
-    <string name="notice_room_third_party_invite_with_reason">%1$s a envoyé une invitation à %2$s pour rejoindre le salon. Raison : %3$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s a révoqué l’invitation de %2$s à rejoindre le salon. Raison : %3$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason">%1$s a accepté l’invitation pour %2$s. Raison : %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s a annulé l’invitation de %2$s. Raison : %3$s</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s a révoqué l’invitation de %2$s à rejoindre le salon</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Invitation de %1$s. Raison : %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s a invité %2$s. Raison : %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s vous a invité. Raison : %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s a rejoint le salon. Raison : %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s est parti du salon. Raison : %2$s</string>
+    <string name="notice_room_reject_with_reason">%1$s a refusé l’invitation. Raison : %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s a expulsé %2$s. Raison : %3$s</string>
+    <string name="notice_room_unban_with_reason">%1$s a révoqué le bannissement de %2$s. Raison : %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s a banni %2$s. Raison : %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s a envoyé une invitation à %2$s à rejoindre le salon. Raison : %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s a révoqué l’invitation de %2$s à rejoindre le salon. Raison : %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s a accepté l’invitation de %2$s. Raison : %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s a annulé l’invitation de %2$s. Raison : %3$s</string>
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s a ajouté %2$s comme adresse pour ce salon.</item>
         <item quantity="other">%1$s a ajouté %2$s comme adresses pour ce salon.</item>
@@ -114,7 +114,7 @@
     <string name="notice_direct_room_update">%s a mis cet endroit à niveau.</string>
     <string name="notice_room_update_by_you">Vous avez mis à niveau ce salon.</string>
     <string name="notice_room_kick_by_you">Vous avez expulsé %1$s</string>
-    <string name="notice_room_reject_by_you">Vous avez rejeté l\'invitation</string>
+    <string name="notice_room_reject_by_you">Vous avez rejeté l’invitation</string>
     <string name="notice_direct_room_leave_by_you">Vous avez quitté le salon</string>
     <string name="notice_direct_room_leave">%1$s a quitté le salon</string>
     <string name="notice_room_leave_by_you">Vous avez quitté le salon</string>
@@ -122,8 +122,8 @@
     <string name="notice_direct_room_join">%1$s a rejoint le salon</string>
     <string name="notice_room_join_by_you">Vous avez rejoint le salon</string>
     <string name="notice_room_invite_by_you">Vous avez invité %1$s</string>
-    <string name="notice_direct_room_created_by_you">Vous avez créé la discussion</string>
-    <string name="notice_direct_room_created">%1$s a créé la discussion</string>
+    <string name="notice_direct_room_created_by_you">Vous avez créé la conversation</string>
+    <string name="notice_direct_room_created">%1$s a créé la conversation</string>
     <string name="notice_room_created_by_you">Vous avez créé le salon</string>
     <string name="notice_room_invite_no_invitee_by_you">Votre invitation</string>
     <string name="summary_you_sent_sticker">Vous avez envoyé un autocollant.</string>
@@ -147,22 +147,22 @@
         <item quantity="one">Vous avez ajouté %1$s comme adresse pour ce salon.</item>
         <item quantity="other">Vous avez ajouté %1$s comme adresses pour ce salon.</item>
     </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">Vous avez annulé l’invitation de %1$s. Raison : %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Vous avez accepté l’invitation pour %1$s. Raison : %2$s</string>
-    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vous avez révoqué l’invitation de %1$s à rejoindre le salon. Raison : %2$s</string>
-    <string name="notice_room_third_party_invite_with_reason_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon. Raison : %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">Vous avez refusé l’invitation. Raison : %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">Vous êtes parti. Raison : %1$s</string>
-    <string name="notice_direct_room_leave_with_reason">%1$s est parti. Raison : %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">Vous êtes parti du salon. Raison : %1$s</string>
-    <string name="notice_direct_room_join_with_reason">%1$s rejoint. Raison : %2$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">Vous avez rejoint. Raison : %1$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Vous avez annulé l’invitation de %1$s. Raison : %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Vous avez accepté l’invitation de %1$s. Raison : %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vous avez révoqué l’invitation de %1$s à rejoindre le salon. Raison : %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Vous avez envoyé une invitation à %1$s à rejoindre le salon. Raison : %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Vous avez refusé l’invitation. Raison : %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Vous êtes parti. Raison : %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s est parti. Raison : %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Vous êtes parti du salon. Raison : %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s rejoint. Raison : %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Vous avez rejoint. Raison : %1$s</string>
     <string name="notice_room_join_with_reason_by_you">Vous avez rejoint le salon. Raison : %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Vous avez invité %1$s. Raison : %2$s</string>
-    <string name="notice_room_invite_no_invitee_with_reason_by_you">Votre invitation. Raison %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Votre invitation. Raison : %1$s</string>
     <string name="notice_power_level_diff">%1$s de %2$s à %3$s</string>
-    <string name="notice_power_level_changed">%1$s a modifié le niveau de pouvoir de %2$s.</string>
-    <string name="notice_power_level_changed_by_you">Vous avez modifié le niveau de pouvoir de %1$s.</string>
+    <string name="notice_power_level_changed">%1$s a modifié le rang de %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Vous avez modifié le rang de %1$s.</string>
     <string name="power_level_custom_no_value">Personnalisé</string>
     <string name="power_level_custom">Personnalisé (%1$d)</string>
     <string name="power_level_default">Défaut</string>
@@ -174,42 +174,42 @@
     <string name="notice_widget_removed">%1$s a supprimé le widget %2$s</string>
     <string name="notice_widget_added_by_you">Vous avez ajouté le widget %1$s</string>
     <string name="notice_widget_added">%1$s a ajouté le widget %2$s</string>
-    <string name="notice_room_third_party_registered_invite_by_you">Vous avez accepté l’invitation pour %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">Vous avez révoqué l\'invitation pour %1$s</string>
-    <string name="notice_direct_room_third_party_revoked_invite">%1$s a révoqué l\'invitation pour %2$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Vous avez accepté l’invitation de %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Vous avez révoqué l’invitation de %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s a révoqué l’invitation de %2$s</string>
     <string name="notice_made_future_direct_room_visibility_by_you">Vous avez rendu les futurs messages visible pour %1$s</string>
     <string name="notice_made_future_direct_room_visibility">%1$s a rendu les futurs messages visible pour %2$s</string>
-    <string name="notice_room_avatar_removed_by_you">Vous avez supprimé l\'avatar du salon</string>
-    <string name="notice_room_avatar_removed">%1$s a supprimé l\'avatar du salon</string>
+    <string name="notice_room_avatar_removed_by_you">Vous avez supprimé l’avatar du salon</string>
+    <string name="notice_room_avatar_removed">%1$s a supprimé l’avatar du salon</string>
     <string name="notice_room_name_removed_by_you">Vous avez supprimé le nom du salon</string>
     <string name="notice_requested_voip_conference_by_you">Vous avez demandé une téléconférence VoIP</string>
     <string name="notice_end_to_end_by_you">Vous avez activé le chiffrement de bout en bout (%1$s)</string>
     <string name="notice_made_future_room_visibility_by_you">Vous avez rendu l’historique futur du salon visible pour %1$s</string>
     <string name="notice_ended_call_by_you">Vous avez raccroché.</string>
     <string name="notice_answered_call_by_you">Vous avez répondu à l’appel.</string>
-    <string name="notice_call_candidates_by_you">Vous avez envoyé les données pour configurer l\'appel.</string>
-    <string name="notice_call_candidates">%s a envoyé les données pour configurer l\'appel.</string>
-    <string name="notice_placed_voice_call_by_you">Vous avez passé un appel vocal.</string>
+    <string name="notice_call_candidates_by_you">Vous avez envoyé les données pour configurer l’appel.</string>
+    <string name="notice_call_candidates">%s a envoyé les données pour configurer l’appel.</string>
+    <string name="notice_placed_voice_call_by_you">Vous avez passé un appel audio.</string>
     <string name="notice_placed_video_call_by_you">Vous avez passé un appel vidéo.</string>
-    <string name="notice_room_name_changed_by_you">Vous avez changé le nom du salon en : %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">Vous avez modifié l\'avatar du salon</string>
-    <string name="notice_room_avatar_changed">%1$s a modifié l\'avatar du salon</string>
-    <string name="notice_display_name_changed_from_by_you">Vous avez modifié votre nom affiché de %1$s en %2$s</string>
-    <string name="notice_display_name_set_by_you">Vous avez modifié votre nom affiché en %1$s</string>
+    <string name="notice_room_name_changed_by_you">Vous avez changé le nom du salon en : %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Vous avez modifié l’avatar du salon</string>
+    <string name="notice_room_avatar_changed">%1$s a modifié l’avatar du salon</string>
+    <string name="notice_display_name_changed_from_by_you">Vous avez modifié votre nom d’affichage de %1$s en %2$s</string>
+    <string name="notice_display_name_set_by_you">Vous avez modifié votre nom d’affichage en %1$s</string>
     <string name="notice_avatar_url_changed_by_you">Vous avez changé votre avatar</string>
     <string name="notice_room_withdraw_by_you">Vous avez annulé l’invitation de %1$s</string>
-    <string name="notice_room_topic_changed_by_you">Vous avez changé le sujet en : %1$s</string>
-    <string name="notice_display_name_removed_by_you">Vous avez supprimé votre nom affiché (précédemment %1$s)</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Vous avez révoqué l’invitation pour %1$s à rejoindre le salon</string>
+    <string name="notice_room_topic_changed_by_you">Vous avez changé le sujet en : %1$s</string>
+    <string name="notice_display_name_removed_by_you">Vous avez supprimé votre nom d’affichage (précédemment %1$s)</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Vous avez révoqué l’invitation de %1$s à rejoindre le salon</string>
     <string name="notice_direct_room_third_party_invite_by_you">Vous avez invité %1$s</string>
     <string name="notice_direct_room_third_party_invite">%1$s a invité %2$s</string>
     <string name="notice_room_third_party_invite_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon</string>
-    <string name="notice_profile_change_redacted_by_you">Vous avez mis à jour votre profile %1$s</string>
+    <string name="notice_profile_change_redacted_by_you">Vous avez mis à jour votre profil %1$s</string>
     <string name="notice_room_topic_removed_by_you">Vous avez supprimé le sujet du salon</string>
-    <string name="notice_room_ban_with_reason_by_you">Vous avez exclus %1$s. Raison : %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">Vous avez révoqué l\'exclusion de %1$s. Raison : %2$s</string>
-    <string name="notice_room_ban_by_you">Vous avez exclus %1$s</string>
-    <string name="notice_room_unban_by_you">Vous avez révoqué l\'exclusion de %1$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Vous avez banni %1$s. Raison : %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Vous avez révoqué le bannissement de %1$s. Raison : %2$s</string>
+    <string name="notice_room_ban_by_you">Vous avez banni %1$s</string>
+    <string name="notice_room_unban_by_you">Vous avez révoqué le bannissement de %1$s</string>
     <string name="notice_room_kick_with_reason_by_you">Vous avez expulsé %1$s. Raison : %2$s</string>
     <string name="room_displayname_empty_room_was">Salon vide (était %s)</string>
     <plurals name="room_displayname_four_and_more_members">
@@ -218,13 +218,13 @@
     </plurals>
     <string name="room_displayname_4_members">%1$s, %2$s, %3$s et %4$s</string>
     <string name="room_displayname_3_members">%1$s, %2$s et %3$s</string>
-    <string name="notice_room_server_acl_allow_is_empty">🎉 Tous les serveurs sont interdits de participer ! Ce salon ne peut plus être utilisé.</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Tous les serveurs sont interdits de participation ! Ce salon ne peut plus être utilisé.</string>
     <string name="notice_room_server_acl_updated_no_change">Aucun changement.</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Les serveurs correspondant à des IP littérales sont maintenant interdits.</string>
     <string name="notice_room_server_acl_set_banned">• Les serveurs correspondant à %s sont interdits.</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Les serveurs correspondants à des IP littérales sont interdites.</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont autorisés.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont maintenant autorisées.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont maintenant autorisés.</string>
     <string name="notice_room_server_acl_updated_was_allowed">• Les serveurs correspondant à %s sont supprimés de la liste autorisée.</string>
     <string name="notice_room_server_acl_updated_allowed">• les serveur correspondant à %s sont maintenant autorisés.</string>
     <string name="notice_room_server_acl_updated_was_banned">• Les serveurs correspondant à %s étaient supprimés de la liste des interdits.</string>
@@ -255,18 +255,18 @@
     <string name="active_call">Appel en cours</string>
     <string name="ongoing_conference_call">Téléconférence en cours.
 \nLa rejoindre en %1$s ou en %2$s</string>
-    <string name="ongoing_conference_call_voice">Audio</string>
+    <string name="ongoing_conference_call_voice">audio</string>
     <string name="ongoing_conference_call_video">vidéo</string>
     <string name="cannot_start_call">Impossible d’initier l’appel, réessayez plus tard</string>
     <string name="missing_permissions_warning">En raison de permissions manquantes, certaines fonctionnalités peuvent être absentes…</string>
-    <string name="missing_permissions_to_start_conf_call">Vous avez besoin de la permission d’invitation pour initier une téléconférence dans ce salon</string>
-    <string name="missing_permissions_title_to_start_conf_call">Impossible d’initier l’appel</string>
+    <string name="missing_permissions_to_start_conf_call">Vous avez besoin de la permission d’invitation pour lancer une téléconférence dans ce salon</string>
+    <string name="missing_permissions_title_to_start_conf_call">Impossible de lancer l’appel</string>
     <string name="device_information">Informations sur la session</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Les téléconférences ne sont pas prises en charge dans les salons chiffrés</string>
     <string name="or">ou</string>
     <string name="invite">Inviter</string>
     <string name="action_sign_out">Se déconnecter</string>
-    <string name="action_voice_call">Appel vocal</string>
+    <string name="action_voice_call">Appel audio</string>
     <string name="action_video_call">Appel vidéo</string>
     <string name="action_global_search">Recherche globale</string>
     <string name="action_mark_all_as_read">Tout marquer comme lu</string>
@@ -292,7 +292,7 @@
     <string name="local_address_book_header">Carnet d’adresses local</string>
     <string name="matrix_only_filter">Contacts Matrix uniquement</string>
     <string name="no_conversation_placeholder">Aucune discussion</string>
-    <string name="template_no_contact_access_placeholder">Vous n’avez pas autorisé ${app_name} à accéder à vos contacts locaux</string>
+    <string name="template_no_contact_access_placeholder">Vous n’avez pas autorisé ${app_name} à accéder à votre carnet d’adresses</string>
     <string name="no_result_placeholder">Aucun résultat</string>
     <string name="rooms_header">Salons</string>
     <string name="rooms_directory_header">Répertoire de salons</string>
@@ -318,7 +318,7 @@
     <string name="identity_url">URL du serveur d’identité</string>
     <string name="search">Rechercher</string>
     <string name="start_new_chat">Nouvelle discussion</string>
-    <string name="start_voice_call">Nouvel appel vocal</string>
+    <string name="start_voice_call">Nouvel appel audio</string>
     <string name="start_video_call">Nouvel appel vidéo</string>
     <string name="option_send_files">Envoyer des fichiers</string>
     <string name="option_take_photo_video">Prendre une photo ou une vidéo</string>
@@ -332,8 +332,8 @@
     <string name="auth_password_placeholder">Mot de passe</string>
     <string name="auth_new_password_placeholder">Nouveau mot de passe</string>
     <string name="auth_user_name_placeholder">Nom d’utilisateur</string>
-    <string name="auth_email_placeholder">Adresse électronique</string>
-    <string name="auth_opt_email_placeholder">Adresse électronique (facultatif)</string>
+    <string name="auth_email_placeholder">Adresse e-mail</string>
+    <string name="auth_opt_email_placeholder">Adresse e-mail (facultatif)</string>
     <string name="auth_phone_number_placeholder">Numéro de téléphone</string>
     <string name="auth_opt_phone_number_placeholder">Numéro de téléphone (facultatif)</string>
     <string name="auth_repeat_password_placeholder">Répéter le mot de passe</string>
@@ -346,24 +346,24 @@
     <string name="auth_missing_email_or_phone">Adresse e-mail ou numéro de téléphone manquant</string>
     <string name="auth_invalid_token">Jeton non valide</string>
     <string name="auth_password_dont_match">Les mots de passe ne correspondent pas</string>
-    <string name="auth_forgot_password">Mot de passe oublié ?</string>
+    <string name="auth_forgot_password">Mot de passe oublié \?</string>
     <string name="auth_use_server_options">Utiliser des options de serveur personnalisées (avancé)</string>
     <string name="auth_username_in_use">Nom d’utilisateur déjà utilisé</string>
-    <string name="auth_home_server">Serveur d’accueil :</string>
-    <string name="auth_identity_server">Serveur d’identité :</string>
+    <string name="auth_home_server">Serveur d’accueil :</string>
+    <string name="auth_identity_server">Serveur d’identité :</string>
     <string name="login_error_unable_register">Impossible de s’inscrire</string>
-    <string name="login_error_unable_register_mail_ownership">Impossible de s’inscrire : erreur sur le propriétaire de l’adresse e-mail</string>
+    <string name="login_error_unable_register_mail_ownership">Impossible de s’inscrire : erreur d’appartenance de l’adresse e-mail</string>
     <string name="login_error_invalid_home_server">Veuillez saisir une URL valide</string>
     <string name="login_error_forbidden">Nom d’utilisateur/mot de passe invalide</string>
     <string name="login_error_bad_json">JSON malformé</string>
     <string name="login_error_not_json">Ne contient pas de JSON valide</string>
     <string name="read_receipts_list">Liste des accusés de lecture</string>
-    <string name="compression_options">Envoyer en</string>
+    <string name="compression_options">Envoyer en tant que</string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Grand</string>
     <string name="compression_opt_list_medium">Moyen</string>
     <string name="compression_opt_list_small">Petit</string>
-    <string name="attachment_cancel_download">Annuler le téléchargement ?</string>
+    <string name="attachment_cancel_download">Annuler le téléchargement \?</string>
     <string name="today">Aujourd’hui</string>
     <string name="yesterday">Hier</string>
     <string name="room_info_room_name">Nom du salon</string>
@@ -374,11 +374,11 @@
     <string name="call_ring">Appel…</string>
     <string name="incoming_call">Appel entrant</string>
     <string name="incoming_video_call">Appel vidéo entrant</string>
-    <string name="incoming_voice_call">Appel vocal entrant</string>
+    <string name="incoming_voice_call">Appel audio entrant</string>
     <string name="call_in_progress">Appel en cours…</string>
     <string name="call_error_ice_failed">Échec de la connexion</string>
     <string name="call_error_camera_init_failed">Impossible d’initialiser l’appareil photo</string>
-    <string name="call_error_answered_elsewhere">Appel répondu ailleurs</string>
+    <string name="call_error_answered_elsewhere">Appel décroché ailleurs</string>
     <string name="media_picker_cannot_record_video">Impossible d’enregistrer une vidéo</string>
     <string name="media_slider_saved">Enregistré</string>
     <string name="media_slider_saved_message">Enregistrer dans les téléchargements ?</string>
@@ -399,7 +399,7 @@
     <string name="room_participants_offline">Hors ligne</string>
     <string name="room_participants_header_admin_tools">OUTILS DE L’ADMINISTRATEUR</string>
     <string name="room_participants_header_call">APPEL</string>
-    <string name="room_participants_header_direct_chats">DISCUSSIONS DIRECTES</string>
+    <string name="room_participants_header_direct_chats">Conversations privées</string>
     <string name="room_participants_header_devices">SESSIONS</string>
     <string name="room_participants_action_invite">Inviter</string>
     <string name="room_participants_action_leave">Quitter ce salon</string>
@@ -457,7 +457,7 @@
     <string name="directory_searching_title">Recherche dans le répertoire…</string>
     <string name="room_settings_favourite">Favori</string>
     <string name="room_settings_de_prioritize">Passer en faible priorité</string>
-    <string name="room_settings_direct_chat">Discussion directe</string>
+    <string name="room_settings_direct_chat">Conversation privée</string>
     <string name="room_settings_leave_conversation">Quitter la discussion</string>
     <string name="room_settings_forget">Abandonner</string>
     <string name="room_sliding_menu_messages">Messages</string>
@@ -477,7 +477,7 @@
     <string name="settings_app_info_link_title">Informations sur l’application</string>
     <string name="settings_enable_all_notif">Activer les notifications pour ce compte</string>
     <string name="settings_enable_this_device">Activer les notifications pour cette session</string>
-    <string name="settings_messages_in_one_to_one">Messages dans les discussions directes</string>
+    <string name="settings_messages_in_one_to_one">Messages dans les conversations privées</string>
     <string name="settings_messages_in_group_chat">Messages dans les discussions de groupe</string>
     <string name="settings_call_invitations">Appels entrants</string>
     <string name="settings_messages_sent_by_bot">Messages envoyés par un robot</string>
@@ -511,7 +511,7 @@
     <string name="devices_details_device_name">Mettre à jour le nom public</string>
     <string name="devices_details_last_seen_title">Vu la dernière fois</string>
     <string name="devices_delete_dialog_title">Authentification</string>
-    <string name="devices_delete_pswd">Mot de passe :</string>
+    <string name="devices_delete_pswd">Mot de passe :</string>
     <string name="devices_delete_submit_button_label">Valider</string>
     <string name="settings_logged_in">Connecté en tant que</string>
     <string name="settings_home_server">Serveur d’accueil</string>
@@ -540,7 +540,7 @@
     <string name="room_settings_room_read_history_rules_pref_title">Accès à l’historique du salon</string>
     <string name="room_settings_read_history_entry_anyone">N’importe qui</string>
     <string name="room_settings_read_history_entry_members_only_joined">Uniquement les membres (depuis qu’ils sont arrivés)</string>
-    <string name="room_settings_banned_users_title">Utilisateurs exclus</string>
+    <string name="room_settings_banned_users_title">Utilisateurs bannis</string>
     <string name="room_settings_category_advanced_title">Avancé</string>
     <string name="room_settings_room_internal_id">L’identifiant interne de ce salon</string>
     <string name="room_settings_addresses_pref_title">Adresses</string>
@@ -576,7 +576,7 @@
     <string name="encryption_export_export">Exporter</string>
     <string name="passphrase_enter_passphrase">Saisir la phrase secrète</string>
     <string name="passphrase_confirm_passphrase">Confirmer la phrase secrète</string>
-    <string name="encryption_import_e2e_room_keys">Importer les clés E2E des salons</string>
+    <string name="encryption_import_e2e_room_keys">Importer les clés de chiffrement des salons</string>
     <string name="encryption_import_room_keys">Importer les clés des salons</string>
     <string name="encryption_import_import">Importer</string>
     <string name="encryption_never_send_to_unverified_devices_title">Chiffrer uniquement vers les sessions vérifiées</string>
@@ -599,12 +599,12 @@
         <item quantity="one">%d participant</item>
         <item quantity="other">%d participants</item>
     </plurals>
-    <string name="send_bug_report_description">Veuillez décrire l’erreur. Qu’avez-vous fait ? Quel était le comportement attendu ? Que s’est-il réellement passé ?</string>
-    <string name="send_bug_report_logs_description">Afin de diagnostiquer les problèmes, les journaux de ce client seront envoyés avec ce rapport d’erreur. Ce rapport d’erreur, y compris les journaux et la capture d’écran, ne seront pas visibles publiquement. Si vous préférez envoyer le texte ci-dessus uniquement, veuillez décochez :</string>
-    <string name="send_bug_report_alert_message">Vous semblez secouer le téléphone avec frustration. Souhaitez-vous ouvrir l’écran pour soumettre un rapport d’erreur ?</string>
-    <string name="send_bug_report_app_crashed">L’application s’est arrêtée anormalement la dernière fois. Souhaitez-vous ouvrir l’écran de rapport d’anomalie ?</string>
-    <string name="send_bug_report_sent">Le rapport d’erreur a bien été envoyé</string>
-    <string name="send_bug_report_failed">L’envoi du rapport d’erreur a échoué (%s)</string>
+    <string name="send_bug_report_description">Veuillez décrire l’erreur. Qu’avez-vous fait \? Quel était le comportement attendu \? Que s’est-il réellement passé \?</string>
+    <string name="send_bug_report_logs_description">Afin de diagnostiquer les problèmes, les journaux de ce client seront envoyés avec ce rapport d’erreur. Ce rapport d’erreur, y compris les journaux et la capture d’écran, ne seront pas visibles publiquement. Si vous préférez envoyer le texte ci-dessus uniquement, veuillez décocher :</string>
+    <string name="send_bug_report_alert_message">Vous semblez secouer le téléphone avec agacement. Souhaitez-vous ouvrir soumettre un rapport d’anomalie \?</string>
+    <string name="send_bug_report_app_crashed">L’application s’est arrêtée anormalement la dernière fois. Souhaitez-vous ouvrir l’écran de rapport d’anomalie \?</string>
+    <string name="send_bug_report_sent">Le rapport d’anomalie a bien été envoyé</string>
+    <string name="send_bug_report_failed">L’envoi du rapport d’anomalie a échoué (%s)</string>
     <string name="auth_invalid_user_name">Les noms d’utilisateurs ne peuvent contenir que des lettres, des nombres, des points, des traits d’union et des tirets bas</string>
     <string name="auth_invalid_email">Cela ne ressemble pas à une adresse e-mail valide</string>
     <string name="auth_invalid_phone">Cela ne ressemble pas à un numéro de téléphone valide</string>
@@ -615,23 +615,23 @@
 \nVous pouvez ajouter votre adresse e-mail à votre profil dans les paramètres.</string>
     <string name="auth_recaptcha_message">Ce serveur d’accueil souhaite s’assurer que vous n’êtes pas un robot</string>
     <string name="auth_reset_password_next_step_button">J’ai vérifié mon adresse e-mail</string>
-    <string name="auth_reset_password_message">Pour réinitialiser votre mot de passe, saisissez l’adresse e-mail associée à votre compte :</string>
+    <string name="auth_reset_password_message">Pour réinitialiser votre mot de passe, saisissez l’adresse e-mail associée à votre compte :</string>
     <string name="auth_reset_password_missing_email">L’adresse e-mail liée à votre compte doit être saisie.</string>
     <string name="auth_reset_password_missing_password">Un nouveau mot de passe doit être saisi.</string>
     <string name="auth_reset_password_email_validation_message">Un e-mail a été envoyé à %s. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
-    <string name="auth_reset_password_error_unauthorized">Impossible de vérifier l’adresse e-mail : assurez-vous d’avoir cliqué sur le lien dans l’e-mail</string>
+    <string name="auth_reset_password_error_unauthorized">Impossible de vérifier l’adresse e-mail : assurez-vous d’avoir cliqué sur le lien dans l’e-mail</string>
     <string name="auth_reset_password_success_message">Votre mot de passe a été réinitialisé.
 \n
 \nVous avez été déconnecté de toutes les sessions et ne recevrez plus de notifications. Pour réactiver les notifications, reconnectez-vous sur chaque appareil.</string>
     <string name="login_error_must_start_http">L’URL doit commencer par http[s]://</string>
-    <string name="login_error_network_error">Impossible de se connecter : erreur réseau</string>
+    <string name="login_error_network_error">Impossible de se connecter : erreur réseau</string>
     <string name="login_error_unable_login">Impossible de se connecter</string>
-    <string name="login_error_registration_network_error">Impossible de s’inscrire : erreur réseau</string>
+    <string name="login_error_registration_network_error">Impossible de s’inscrire : erreur réseau</string>
     <string name="login_error_unknown_token">Le jeton d’accès fourni n’a pas été reconnu</string>
     <string name="login_error_limit_exceeded">Trop de requêtes ont été envoyées</string>
     <string name="login_error_user_in_use">Ce nom d’utilisateur est déjà utilisé</string>
     <string name="login_error_login_email_not_yet">Vous n’avez pas encore cliqué sur le lien dans l’e-mail</string>
-    <string name="attachment_cancel_upload">Annuler l’envoi ?</string>
+    <string name="attachment_cancel_upload">Annuler l’envoi \?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$d min %2$d s</string>
     <string name="leave">Quitter</string>
@@ -641,55 +641,55 @@
     <string name="permissions_rationale_popup_title">Information</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} a besoin d’accéder à vos photos et vidéos pour envoyer et enregistrer des pièces jointes
 \n
-\nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir envoyer des fichiers depuis votre téléphone.</string>
+\nVeuillez autoriser l’accès dans la prochaine fenêtre pour pouvoir envoyer des fichiers depuis votre téléphone.</string>
     <string name="template_permissions_rationale_msg_camera">${app_name} a besoin d’accéder à votre appareil photo pour prendre des photos et passer des appels vidéo.</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
-\nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir effectuer l’appel."</string>
+\nVeuillez autoriser l’accès dans la prochaine fenêtre pour pouvoir effectuer l’appel."</string>
     <string name="template_permissions_rationale_msg_record_audio">${app_name} a besoin d’accéder à votre microphone pour passer des appels audio.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir effectuer l’appel."</string>
     <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} a besoin d’accéder à votre appareil photo et à votre microphone pour passer des appels vidéo.
 \n
-\nVeuillez autoriser l’accès dans les prochaines fenêtres contextuelles pour pouvoir effectuer l’appel.</string>
-    <string name="template_permissions_rationale_msg_contacts">${app_name} peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail. Veuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour découvrir les utilisateurs du carnet d’adresses joignables via ${app_name}.</string>
+\nVeuillez autoriser l’accès dans les prochaines fenêtres pour pouvoir effectuer l’appel.</string>
+    <string name="template_permissions_rationale_msg_contacts">${app_name} peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse e-mail. Veuillez autoriser l’accès dans la prochaine fenêtre pour découvrir les utilisateurs du carnet d’adresses joignables via ${app_name}.</string>
     <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur adresse e-mail et leur numéro de téléphone.
-\n 
-\nAutorisez-vous l\'accès à vos contacts à cette fin \?</string>
-    <string name="permissions_action_not_performed_missing_permissions">Désolé. L’action n’a pas été réalisée, faute d’autorisations</string>
+\n
+\nAutorisez-vous l’accès à vos contacts à cette fin \?</string>
+    <string name="permissions_action_not_performed_missing_permissions">Désolé. L’action n’a pas été réalisée faute d’autorisations</string>
     <string name="room_jump_to_first_unread">Aller au premier message non lu.</string>
     <string name="room_preview_invitation_format">%s vous a invité à rejoindre ce salon</string>
     <string name="room_preview_unlinked_email_warning">Cette invitation a été envoyée à %s, qui n’est pas associé à ce compte.
 \nVous pouvez vous identifier avec un compte différent ou ajouter cette adresse e-mail à votre compte.</string>
-    <string name="room_preview_try_join_an_unknown_room">Vous essayez d’accéder à %s. Souhaitez-vous rejoindre le salon pour participer à la discussion ?</string>
+    <string name="room_preview_try_join_an_unknown_room">Vous essayez d’accéder à %s. Souhaitez-vous rejoindre le salon pour participer à la discussion \?</string>
     <string name="room_preview_room_interactions_disabled">Ceci est un aperçu du salon. Vous ne pouvez pas interagir.</string>
-    <string name="room_participants_leave_prompt_msg">Voulez-vous vraiment quitter le salon ?</string>
-    <string name="room_participants_remove_prompt_msg">Voulez-vous vraiment exclure %s de cette discussion ?</string>
+    <string name="room_participants_leave_prompt_msg">Voulez-vous vraiment quitter le salon \?</string>
+    <string name="room_participants_remove_prompt_msg">Voulez-vous vraiment bannir %s de cette discussion \?</string>
     <string name="room_participants_idle">Inactif</string>
-    <string name="room_participants_action_ignore">Masquer tous les messages de cet utilisateur</string>
+    <string name="room_participants_action_ignore">Ignorer</string>
     <string name="room_participants_action_unignore">Afficher tous les messages de cet utilisateur</string>
     <string name="room_participants_invite_search_another_user">Identifiant, nom ou adresse e-mail</string>
     <string name="room_participants_power_level_prompt">Vous ne pourrez pas annuler cette modification car vous promouvez l’utilisateur au même rang que le vôtre.
 \nLe voulez-vous vraiment \?</string>
-    <string name="room_participants_invite_prompt_msg">Voulez-vous vraiment inviter %s à cette discussion ?</string>
+    <string name="room_participants_invite_prompt_msg">Voulez-vous vraiment inviter %s à cette discussion \?</string>
     <string name="people_search_invite_by_id"><u>Inviter par identifiant</u></string>
     <string name="people_search_invite_by_id_dialog_description">Entrez une ou plusieurs adresses e-mail ou identifiants Matrix</string>
     <string name="room_one_user_is_typing">%s écrit…</string>
     <string name="room_two_users_are_typing">%1$s et %2$s écrivent…</string>
     <string name="room_many_users_are_typing">%1$s, %2$s et d’autres écrivent…</string>
     <string name="room_offline_notification">La connexion au serveur a été perdue.</string>
-    <string name="room_unsent_messages_notification">Messages non envoyés. %1$s ou %2$s maintenant ?</string>
-    <string name="room_unknown_devices_messages_notification">Messages non envoyés car des sessions inconnues sont présentes. %1$s ou %2$s maintenant \?</string>
-    <string name="room_do_not_have_permission_to_post">Vous n’avez pas le droit de poster dans ce salon</string>
-    <string name="ssl_fingerprint_hash">Empreinte (%s) :</string>
+    <string name="room_unsent_messages_notification">Messages non envoyés. %1$s ou %2$s maintenant \?</string>
+    <string name="room_unknown_devices_messages_notification">Messages non envoyés car des sessions inconnues sont présentes. %1$s ou %2$s maintenant \?</string>
+    <string name="room_do_not_have_permission_to_post">Vous n’avez pas la permission de poster dans ce salon</string>
+    <string name="ssl_fingerprint_hash">Empreinte (%s) :</string>
     <string name="ssl_could_not_verify">Impossible de vérifier l’identité du serveur distant.</string>
     <string name="ssl_cert_not_trust">Cela pourrait signifier que quelqu’un intercepte malicieusement votre trafic ou que votre téléphone ne fait pas confiance au certificat fourni par le serveur distant.</string>
     <string name="ssl_cert_new_account_expl">Si l’administrateur du serveur a confirmé que cela était normal, assurez-vous que l’empreinte ci-dessous correspond à l’empreinte fournie par l’administrateur.</string>
     <string name="ssl_unexpected_existing_expl">Le certificat n’est plus celui qui a été approuvé par votre téléphone. Ce comportement est INATTENDU. Il est recommandé de ne PAS ACCEPTER ce nouveau certificat.</string>
     <string name="ssl_expected_existing_expl">Le certificat n’est plus celui qui a été approuvé par votre téléphone. Le serveur a peut-être renouvelé son certificat. Contactez l’administrateur du serveur pour lui demander l’empreinte de son certificat.</string>
     <string name="ssl_only_accept">Acceptez le certificat uniquement si l’administrateur du serveur a publié une empreinte correspondant à celle ci-dessus.</string>
-    <string name="malformed_id">Identifiant au mauvais format. Une adresse e-mail ou un identifiant Matrix au format \"@utilisateur:domaine\" est attendu</string>
+    <string name="malformed_id">Identifiant au mauvais format. Une adresse e-mail ou un identifiant Matrix au format « @utilisateur:domaine » est attendu</string>
     <string name="room_event_action_report_prompt_ignore_user">Voulez-vous cacher tous les messages de cet utilisateur \?
 \n
 \nVeuillez noter que cette action redémarrera l’application et pourra prendre un certain temps.</string>
@@ -705,17 +705,17 @@
     <string name="settings_unignore_user">Afficher tous les messages de %s \?
 \n
 \nVeuillez noter que cette action redémarrera l’application et pourra prendre un certain temps.</string>
-    <string name="settings_delete_notification_targets_confirmation">Voulez-vous vraiment supprimer cette cible de notification ?</string>
-    <string name="settings_delete_threepid_confirmation">Voulez-vous vraiment supprimer le %1$s %2$s ?</string>
+    <string name="settings_delete_notification_targets_confirmation">Voulez-vous vraiment supprimer cette cible de notification \?</string>
+    <string name="settings_delete_threepid_confirmation">Voulez-vous vraiment supprimer le %1$s %2$s \?</string>
     <string name="settings_phone_number_error">Numéro de téléphone non valide pour le pays sélectionné</string>
     <string name="settings_phone_number_verification_instruction">Nous avons envoyé un SMS avec un code d’activation. Veuillez saisir ce code ci-dessous.</string>
     <string name="settings_phone_number_verification_error">Erreur lors de la validation de votre numéro de téléphone</string>
-    <string name="room_settings_room_photo">Vignette du salon</string>
-    <string name="room_settings_tag_pref_dialog_title">Étiqueté :</string>
+    <string name="room_settings_room_photo">Photo du salon</string>
+    <string name="room_settings_tag_pref_dialog_title">Étiqueté comme :</string>
     <string name="room_settings_category_access_visibility_title">Accès et visibilité</string>
     <string name="room_settings_directory_visibility">Lister ce salon dans le répertoire des salons</string>
-    <string name="room_settings_room_read_history_rules_pref_dialog_title">Qui peut lire l’historique ?</string>
-    <string name="room_settings_room_access_rules_pref_dialog_title">Qui peut accéder à ce salon ?</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Qui peut lire l’historique \?</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Qui peut accéder à ce salon \?</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Uniquement les membres (à partir de l’activation de cette option)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Uniquement les membres (depuis leur invitation)</string>
     <string name="room_settings_room_access_warning">Pour faire référence à un salon, il doit avoir une adresse.</string>
@@ -734,7 +734,7 @@
 \n(attention : ne peut plus être désactivé par la suite !)</string>
     <string name="failed_to_load_timeline_position">%s a essayé de charger un point précis dans l’historique du salon mais ne l’a pas trouvé.</string>
     <string name="encryption_export_room_keys_summary">Exporter les clés vers un fichier local</string>
-    <string name="encryption_export_saved_as">Les clés E2E du salons ont été sauvegardées dans « %s ».
+    <string name="encryption_export_saved_as">Les clés de chiffrement du salon ont été sauvegardées dans « %s ».
 \n
 \nAttention : ce fichier peut être supprimé si l’application est désinstallée.</string>
     <string name="encryption_import_room_keys_summary">Importer les clés à partir d’un fichier local</string>
@@ -747,7 +747,7 @@
 \nCela signifie qu’il n’y a aucune garantie que les sessions appartiennent aux utilisateurs qu’elles prétendent.
 \nNous vous recommandons d’effectuer le processus de vérification pour chaque session avant de continuer, mais vous pouvez renvoyer le message sans vérifier si vous préférez.
 \n
-\nSessions inconnues :</string>
+\nSessions inconnues :</string>
     <string name="directory_server_fail_to_retrieve_server">Le serveur est peut-être indisponible ou surchargé</string>
     <string name="directory_server_type_homeserver">Saisir un serveur d’accueil pour lister ses salons publics</string>
     <string name="settings_user_interface">Interface utilisateur</string>
@@ -784,7 +784,7 @@
     <string name="notification_listening_for_events">Écoute d’évènements</string>
     <string name="settings_notification_ringtone">Son de notification</string>
     <string name="settings_12_24_timestamps">Afficher l’horodatage au format 12 heures</string>
-    <string name="widget_no_power_to_manage">Vous avez besoin d’une permission pour gérer les widgets de ce salon</string>
+    <string name="widget_no_power_to_manage">Vous avez besoin de la permission pour gérer les widgets de ce salon</string>
     <string name="widget_creation_failure">La création du widget a échoué</string>
     <string name="settings_labs_create_conference_with_jitsi">Créer des appels en téléconférence avec jitsi</string>
     <string name="widget_delete_message_confirmation">Voulez-vous vraiment supprimer le widget de ce salon ?</string>
@@ -813,12 +813,12 @@
     <string name="settings_analytics">Statistiques d’utilisation</string>
     <string name="settings_labs_native_camera">Utiliser la caméra native</string>
     <!-- share keys -->
-    <string name="title_activity_bug_report">Rapport d’erreur</string>
-    <string name="conference_call_warning_title">Attention !</string>
+    <string name="title_activity_bug_report">Rapport d’anomalie</string>
+    <string name="conference_call_warning_title">Attention !</string>
     <string name="conference_call_warning_message">L’appel en téléconférence est en cours de développement et peut ne pas être fiable.</string>
     <!-- slash commands -->
     <string name="command_error">Erreur de commande</string>
-    <string name="unrecognized_command">Commande non reconnue : %s</string>
+    <string name="unrecognized_command">Commande non reconnue : %s</string>
     <!-- notification statuses -->
     <string name="notification_off">Désactivé</string>
     <string name="notification_noisy">Notification sonore</string>
@@ -830,11 +830,11 @@
     <string name="groups_invite_header">Inviter</string>
     <string name="groups_header">Communautés</string>
     <string name="no_group_placeholder">Aucun groupe</string>
-    <string name="start_new_chat_prompt_msg">Voulez-vous vraiment engager une nouvelle discussion avec %s ?</string>
-    <string name="start_voice_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel vocal ?</string>
-    <string name="start_video_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel vidéo ?</string>
+    <string name="start_new_chat_prompt_msg">Voulez-vous vraiment engager une nouvelle discussion avec %s \?</string>
+    <string name="start_voice_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel audio \?</string>
+    <string name="start_video_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel vidéo \?</string>
     <string name="groups_list">Liste des Groupes</string>
-    <string name="room_participants_ban_prompt_msg">Exclure un utilisateur va l\'expulser du salon et l\'empêcher de le rejoindre à nouveau.</string>
+    <string name="room_participants_ban_prompt_msg">Bannir un utilisateur va l’expulser du salon et l’empêcher de le rejoindre à nouveau.</string>
     <string name="action_exit">Quitter</string>
     <string name="room_settings_all_messages_noisy">Notification sonore pour chaque message</string>
     <string name="room_settings_all_messages">Notification pour chaque message</string>
@@ -844,10 +844,10 @@
     <string name="settings_inline_url_preview">Aperçu des liens</string>
     <string name="settings_vibrate_on_mention">Vibrer lorsque l’on mentionne un utilisateur</string>
     <string name="room_settings_room_notifications_title">Notifications</string>
-    <string name="room_settings_no_flair">Ce salon n’a de vignettes pour aucune communauté</string>
+    <string name="room_settings_no_flair">Ce salon n’a de badge pour aucune communauté</string>
     <string name="room_settings_add_new_group">Nouvel identifiant de communauté (ex. +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Identifiant de communauté invalide</string>
-    <string name="room_settings_invalid_group_format_dialog_body">\"%s\" n’est pas un identifiant de communauté valide</string>
+    <string name="room_settings_invalid_group_format_dialog_body">« %s » n’est pas un identifiant de communauté valide</string>
     <string name="create">Créer</string>
     <string name="create_community">Créer une communauté</string>
     <string name="community_name">Nom de la communauté</string>
@@ -866,12 +866,12 @@
     <string name="filter_group_rooms">Filtrer les salons du groupe</string>
     <string name="group_no_long_description">L’administrateur de cette communauté n’a pas encore fourni de description.</string>
     <string name="has_been_kicked">%2$s vous a expulsé de %1$s</string>
-    <string name="has_been_banned">%2$s vous a exclus de %1$s</string>
-    <string name="reason_colon">Motif : %1$s</string>
+    <string name="has_been_banned">%2$s vous a banni de %1$s</string>
+    <string name="reason_colon">Motif : %1$s</string>
     <string name="rejoin">Rejoindre</string>
     <string name="forget_room">Oublier le salon</string>
     <string name="settings_flair">Badge</string>
-    <string name="send_bug_report_rage_shake">Secouer avec frustration pour signaler une anomalie</string>
+    <string name="send_bug_report_rage_shake">Secouer avec agacement pour signaler une anomalie</string>
     <string name="actions">Actions</string>
     <string name="room_sync_in_progress">Synchronisation…</string>
     <plurals name="room_header_active_members_count">
@@ -909,8 +909,8 @@
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s dans %2$s</string>
     <plurals name="active_widgets">
-        <item quantity="one">%d gadget actif</item>
-        <item quantity="other">%d gadgets actifs</item>
+        <item quantity="one">%d widgets actif</item>
+        <item quantity="other">%d widgets actifs</item>
     </plurals>
     <!-- Widget Integration Manager -->
     <string name="avatar">Avatar</string>
@@ -923,7 +923,7 @@
     <string name="settings_notification_privacy">Confidentialité des notifications</string>
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="settings_notification_privacy_reduced">Confidentialité réduite</string>
-    <string name="settings_notification_privacy_need_permission">L\'application a besoin de la permission de fonctionner en arrière-plan</string>
+    <string name="settings_notification_privacy_need_permission">L’application a besoin de la permission de fonctionner en arrière-plan</string>
     <string name="settings_notification_privacy_fcm">• Les notifications sont envoyées via Firebase Cloud Messaging</string>
     <string name="settings_notification_privacy_metadata">• Les notifications ne contiennent que des métadonnées</string>
     <string name="settings_notification_privacy_secure_message_content">• Le contenu du message de notification est <b>issu directement du serveur d’accueil Matrix</b></string>
@@ -941,8 +941,8 @@
 \nVoulez-vous en ajouter \?</string>
     <string name="settings_deactivate_account_section">Désactiver le compte</string>
     <string name="settings_deactivate_my_account">Désactiver mon compte</string>
-    <string name="settings_opt_in_of_analytics">Envoyer des données analytiques</string>
-    <string name="template_settings_opt_in_of_analytics_summary">${app_name} collecte des données analytiques anonymes pour nous permettre d’améliorer l’application.</string>
+    <string name="settings_opt_in_of_analytics">Envoyer des statistiques d’utilisation</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} collecte des données statistiques anonymes pour nous permettre d’améliorer l’application.</string>
     <string name="template_settings_opt_in_of_analytics_prompt">Veuillez autoriser la collecte des données pour nous aider à améliorer ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Oui, je veux aider !</string>
     <string name="widget_integration_missing_parameter">Un paramètre requis est manquant.</string>
@@ -956,7 +956,7 @@
 \n 
 \nLa visibilité des messages dans Matrix est identique à celle des e-mails. Si nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront plus partagés avec les nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà accès à ces messages en conserveront leur copie.</string>
     <string name="deactivate_account_delete_checkbox">Veuillez oublier tous les messages que j’ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront une version incomplète des conversations)</string>
-    <string name="deactivate_account_prompt_password">Pour continuer, veuillez renseigner votre mot de passe :</string>
+    <string name="deactivate_account_prompt_password">Pour poursuivre, veuillez renseigner votre mot de passe :</string>
     <string name="deactivate_account_submit">Désactiver le compte</string>
     <string name="dialog_title_third_party_licences">Licences tierces</string>
     <string name="download">Télécharger</string>
@@ -966,8 +966,8 @@
     <string name="e2e_re_request_encryption_key_sent">Demande de clé envoyée.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Demande envoyée</string>
     <string name="template_e2e_re_request_encryption_key_dialog_content">Veuillez lancer ${app_name} sur un autre appareil qui peut déchiffrer le message pour qu’il puisse envoyer les clés à cette session.</string>
-    <string name="lock_screen_hint">Tapez ici…</string>
-    <string name="option_send_voice">Envoyer votre voix</string>
+    <string name="lock_screen_hint">Saisir du texte ici…</string>
+    <string name="option_send_voice">Envoyer un message vocal</string>
     <string name="go_on_with">continuer avec…</string>
     <string name="error_no_external_application_found">Désolé, aucune application externe n’a été trouvée pour effectuer cette action.</string>
     <string name="settings_labs_enable_send_voice">Envoyer des messages vocaux</string>
@@ -975,26 +975,26 @@
     <string name="send_bug_report_description_in_english">Si possible, veuillez écrire la description en anglais.</string>
     <string name="room_message_placeholder_reply_to_encrypted">Envoyer une réponse chiffrée…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Envoyer une réponse (non chiffrée)…</string>
-    <string name="settings_preview_media_before_sending">Prévisualiser le média avant de l’envoyer</string>
+    <string name="settings_preview_media_before_sending">Afficher un aperçu du média avant de l’envoyer</string>
     <string name="settings_without_flair">Vous n’êtes pour le moment membre d’aucune communauté.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Utiliser la touche Entrée du clavier pour envoyer un message</string>
     <string name="command_description_emote">Affiche une action</string>
     <string name="command_description_ban_user">Exclus l’utilisateur avec l’identifiant fourni</string>
-    <string name="command_description_unban_user">Révoque l\'exclusion de l’utilisateur avec l’identifiant fourni</string>
-    <string name="command_description_op_user">Défini le rang d’un utilisateur</string>
-    <string name="command_description_deop_user">Enlève le rang d’opérateur de l’utilisateur avec l’identifiant fourni</string>
+    <string name="command_description_unban_user">Révoque le bannissement de l’utilisateur avec l’identifiant fourni</string>
+    <string name="command_description_op_user">Définit le rang d’un utilisateur</string>
+    <string name="command_description_deop_user">Rétrograde l’utilisateur avec l’identifiant fourni</string>
     <string name="command_description_invite_user">Invite l’utilisateur avec l’identifiant fourni dans le salon actuel</string>
     <string name="command_description_join_room">Rejoint le salon avec l’alias fourni</string>
     <string name="command_description_part_room">Quitte le salon</string>
-    <string name="command_description_topic">Défini le sujet du salon</string>
+    <string name="command_description_topic">Définit le sujet du salon</string>
     <string name="command_description_kick_user">Expulse l’utilisateur avec l’identifiant fourni</string>
-    <string name="command_description_nick">Change le surnom affiché</string>
+    <string name="command_description_nick">Change le nom d’affichage</string>
     <string name="command_description_markdown">Markdown activé/désactivé</string>
     <string name="command_description_clear_scalar_token">Pour réparer la gestion des applications Matrix</string>
     <string name="room_tombstone_versioned_description">Ce salon a été remplacé et n’est plus actif</string>
     <string name="room_tombstone_continuation_link">La conversation continue ici</string>
     <string name="room_tombstone_continuation_description">Ce salon est la suite d’une autre conversation</string>
-    <string name="room_tombstone_predecessor_link">Cliquer ici pour voir les vieux messages</string>
+    <string name="room_tombstone_predecessor_link">Cliquer ici pour voir les anciens messages</string>
     <string name="missing_permissions_error">En raison de permissions manquantes, cette action n’est pas possible.</string>
     <plurals name="format_time_s">
         <item quantity="one">%d s</item>
@@ -1054,7 +1054,7 @@
     <string name="show_info_area_always">Toujours</string>
     <string name="show_info_area_messages_and_errors">Pour les messages et les erreurs</string>
     <string name="show_info_area_only_errors">Seulement pour les erreurs</string>
-    <string name="generic_label">%1$s :</string>
+    <string name="generic_label">%1$s :</string>
     <string name="generic_label_and_value">%1$s : %2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
@@ -1071,7 +1071,7 @@
     <string name="settings_show_join_leave_messages">Afficher les notifications d’arrivée et de départ</string>
     <string name="settings_show_join_leave_messages_summary">Les invitations, expulsions et exclusions ne sont pas concernés.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Afficher les événements liés au compte</string>
-    <string name="settings_show_avatar_display_name_changes_messages_summary">Cela inclut les changements d’avatar et de nom affiché.</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Cela inclut les changements d’avatar et de nom d’affichage.</string>
     <string name="settings_password">Mot de passe</string>
     <string name="settings_labs_native_camera_summary">Lancer l’appareil photo du système plutôt que l’écran d’appareil photo personnalisé.</string>
     <string name="settings_labs_enable_send_voice_summary">Cette option nécessite une autre application pour enregistrer les messages.</string>
@@ -1136,15 +1136,15 @@
     <string name="template_settings_troubleshoot_test_bg_restricted_success">Les restrictions en arrière-plan sont désactivées pour ${app_name}. Ce test devrait être lancé en utilisant les données mobiles (pas le Wi-Fi).
 \n%1$s</string>
     <string name="template_settings_troubleshoot_test_bg_restricted_failed">Les restrictions en arrière-plan sont activées pour ${app_name}.
-\nLe travail qu’essayera de faire l’application sera restreint agressivement tant qu’elle sera en arrière-plan et cela pourra affecter les notifications.
+\nLes tâches que l’application essaiera d’effectuer seront fortement restreintes tant qu’elle sera en arrière-plan et cela pourra affecter les notifications.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Désactiver les restrictions</string>
     <string name="settings_troubleshoot_test_battery_title">Optimisation de la batterie</string>
     <string name="template_settings_troubleshoot_test_battery_success">${app_name} n’est pas affecté par l’optimisation de la batterie.</string>
-    <string name="settings_troubleshoot_test_battery_failed">Si un utilisateur laisse un appareil débranché et immobile pour une longue durée, avec l’écran éteint, l’appareil entre dans le mode Doze. Cela empêche les applications d’accéder au réseau et reporte leurs travaux, synchronisations et alarmes standard.</string>
+    <string name="settings_troubleshoot_test_battery_failed">Si un utilisateur laisse un appareil débranché et immobile pour une longue durée, avec l’écran éteint, l’appareil entre en mode veille.. Cela empêche les applications d’accéder au réseau et reporte leurs tâches, synchronisations et alarmes standard.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorer l’optimisation</string>
     <string name="startup_notification_fdroid_battery_optim_title">Connexion en arrière-plan</string>
-    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} doit garder une connexion à faible impact en arrière-plan afin d’avoir des notifications fiables.
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} doit garder une connexion à faible empreinte en arrière-plan afin d’avoir des notifications fiables.
 \nSur l’écran suivant on vous demandera d’autoriser ${app_name} à toujours fonctionner en arrière-plan, veuillez accepter.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Donner la permission</string>
     <string name="account_email_error">Une erreur est survenue lors de la vérification de votre adresse e-mail.</string>
@@ -1152,8 +1152,8 @@
     <string name="account_additional_info">Informations additionnelles : %s</string>
     <string name="no_valid_google_play_services_apk">Aucun APK des services Google Play valide n’a été trouvé. Les notifications peuvent ne pas fonctionner correctement.</string>
     <string name="video_call_in_progress">Appel vidéo en cours…</string>
-    <string name="title_activity_keys_backup_setup">Sauvegarde de clés</string>
-    <string name="title_activity_keys_backup_restore">Utiliser la sauvegarde de clés</string>
+    <string name="title_activity_keys_backup_setup">Sauvegarde de clé</string>
+    <string name="title_activity_keys_backup_restore">Utiliser la sauvegarde de clé</string>
     <string name="keys_backup_is_not_finished_please_wait">La sauvegarde des clés n’est pas terminée, veuillez patienter…</string>
     <string name="skip">Passer</string>
     <string name="done">Terminé</string>
@@ -1165,7 +1165,7 @@
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Échec du chargement de vos règles personnalisées, veuillez réessayer.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Vérifier les paramètres</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nCette erreur est indépendante de ${app_name} et, selon Google, cette erreur indique que l’appareil a enregistré trop d’applications avec FCM. Cette erreur ne survient que s’il y a un nombre d’applications extrême, et ne devrait donc pas affecter un utilisateur normal.</string>
+\nCette erreur est indépendante de ${app_name} et, selon Google, cette erreur indique que l’appareil a enregistré trop d’applications avec FCM. Cette erreur ne survient que s’il y a un nombre d’applications anormalement élevé, et ne devrait donc pas affecter un utilisateur normal.</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
 \nCette erreur est indépendante de ${app_name}. Elle peut survenir pour plusieurs raisons. Cela peut fonctionner si vous réessayez plus tard. Vous pouvez aussi vérifier que le Service Google Play n’a pas un usage limité de données dans les paramètres système. Cela peut aussi arriver sur une ROM personnalisée.</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
@@ -1190,7 +1190,7 @@
     <string name="keys_backup_setup_step3_button_title">Terminé</string>
     <string name="keys_backup_setup_step3_copy_button_title">Sauvegarder la clé de récupération</string>
     <string name="keys_backup_setup_step3_save_button_title">Enregistrer dans un fichier</string>
-    <string name="recovery_key_export_saved_as_warning">La clé de récupération a bien été enregistrée vers « %s ».
+    <string name="recovery_key_export_saved_as_warning">La clé de récupération a bien été enregistrée vers « %s ».
 \n
 \nAttention : ce fichier pourrait être supprimé si l’application est désinstallée.</string>
     <string name="keys_backup_setup_step3_please_make_copy">Veuillez en faire une copie</string>
@@ -1200,7 +1200,7 @@
     <string name="unexpected_error">Erreur inattendue</string>
     <string name="keys_backup_setup_backup_started_title">La sauvegarde a commencé</string>
     <string name="keys_backup_setup_backup_started_message">Vos clés de chiffrement sont sauvegardées en arrière-plan sur votre serveur d’accueil. La sauvegarde initiale peut prendre plusieurs minutes.</string>
-    <string name="keys_backup_setup_skip_title">En êtes-vous certain(e) ?</string>
+    <string name="keys_backup_setup_skip_title">En êtes-vous sûr \?</string>
     <string name="keys_backup_setup_skip_msg">Vous pourriez perdre l’accès vos messages si vous vous déconnectez ou si vous perdez votre appareil.</string>
     <string name="keys_backup_restore_is_getting_backup_version">Récupération de la version de la sauvegarde…</string>
     <string name="keys_backup_restore_with_passphrase">Utilisez votre phrase secrète de récupération pour déverrouiller l’historique de vos messages chiffrés</string>
@@ -1209,14 +1209,14 @@
     <string name="keys_backup_restore_with_recovery_key">Utilisez votre clé de récupération pour déverrouiller l’historique de vos messages chiffrés</string>
     <string name="keys_backup_restore_key_enter_hint">Saisir la clé de récupération</string>
     <string name="keys_backup_restore_setup_recovery_key">Récupération des messages</string>
-    <string name="keys_backup_restore_with_key_helper">Vous avez perdu votre clé de récupération ? Vous pouvez en configurer une autre dans les paramètres.</string>
+    <string name="keys_backup_restore_with_key_helper">Vous avez perdu votre clé de récupération \? Vous pouvez en configurer une autre dans les paramètres.</string>
     <string name="keys_backup_passphrase_error_decrypt">La sauvegarde n’a pas pu être déchiffrée avec cette phrase secrète. Veuillez vérifier que vous avez saisi la bonne phrase secrète de récupération.</string>
-    <string name="network_error_please_check_and_retry">Erreur de réseau : veuillez vérifier votre connexion et réessayer.</string>
+    <string name="network_error_please_check_and_retry">Erreur de réseau : veuillez vérifier votre connexion et réessayer.</string>
     <string name="keys_backup_restoring_waiting_message">Restauration de la sauvegarde :</string>
     <string name="keys_backup_unlock_button">Déverrouiller l’historique</string>
     <string name="keys_backup_recovery_code_empty_error_message">Veuillez saisir une clé de récupération</string>
-    <string name="keys_backup_recovery_code_error_decrypt">La sauvegarde n’a pas pu être déchiffrée avec cette clé de récupération : veuillez vérifier que vous avez saisi la bonne clé de récupération.</string>
-    <string name="keys_backup_restore_success_title">Sauvegarde restaurée %s !</string>
+    <string name="keys_backup_recovery_code_error_decrypt">La sauvegarde n’a pas pu être déchiffrée avec cette clé de récupération : veuillez vérifier que vous avez saisi la bonne clé de récupération.</string>
+    <string name="keys_backup_restore_success_title">Sauvegarde restaurée %s !</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Sauvegarde restaurée avec %d clé.</item>
         <item quantity="other">Sauvegarde restaurée avec %d clés.</item>
@@ -1242,14 +1242,14 @@
     <string name="keys_backup_settings_deleting_backup">Suppression de la sauvegarde…</string>
     <string name="keys_backup_settings_delete_backup_error">Échec lors de la suppression de la sauvegarde (%s)</string>
     <string name="keys_backup_settings_delete_confirm_title">Supprimer la sauvegarde</string>
-    <string name="keys_backup_settings_delete_confirm_message">Supprimer les clés de chiffrement sauvegardées sur le serveur ? Vous ne pourrez plus utiliser votre clé de récupération pour lire l’historique des messages chiffrés.</string>
+    <string name="keys_backup_settings_delete_confirm_message">Supprimer les clés de chiffrement sauvegardées sur le serveur \? Vous ne pourrez plus utiliser votre clé de récupération pour lire l’historique des messages chiffrés.</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Vous perdrez vos messages chiffrés si vous vous déconnectez maintenant</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Sauvegarde de clés en cours. Si vous vous déconnectez maintenant, vous perdrez accès à vos messages chiffrés.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">La sauvegarde de clés sécurisées devrait être activée pour toutes vos sessions afin d’éviter de perdre l’accès à vos messages chiffrés.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Je ne veux pas de mes messages chiffrés</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Sauvegarde de clés…</string>
     <string name="keys_backup_activate">Utiliser la sauvegarde de clés</string>
-    <string name="are_you_sure">En êtes-vous sûr(e) ?</string>
+    <string name="are_you_sure">En êtes-vous sûr \?</string>
     <string name="backup">Sauvegarder</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Vous n’aurez plus accès à vos messages chiffrés, sauf si vous sauvegardez vos clés avant de vous déconnecter.</string>
     <string name="stay">Rester</string>
@@ -1321,7 +1321,7 @@
     <string name="media_source_choose">Choisir</string>
     <string name="settings_play_shutter_sound">Jouer le son de l’obturateur</string>
     <string name="action_mark_room_read">Marquer comme lu</string>
-    <string name="settings_notification_privacy_no_background_sync">Les applications &lt;b&gt;n’&lt;/a&gt;ont &lt;b&gt;pas&lt;/b&gt; besoin d’être connectées au serveur d’accueil en arrière-plan, cela devrait diminuer l’utilisation de la batterie<b>not</b> need to connect to the HomeServer in the background, it should reduce battery usage</string>
+    <string name="settings_notification_privacy_no_background_sync">Les applications <b>n’ont pas</b> besoin d’être connectées au serveur d’accueil en arrière-plan, cela devrait diminuer l’utilisation de la batterie</string>
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s : %2$d message</item>
         <item quantity="other">%1$s : %2$d messages</item>
@@ -1336,7 +1336,7 @@
     <string name="notification_new_invitation">Nouvelle invitation</string>
     <string name="notification_sender_me">Moi</string>
     <string name="notification_inline_reply_failed">** Échec de l’envoi − veuillez ouvrir le salon</string>
-    <string name="error_jitsi_not_supported_on_old_device">Désolé, les appels en visioconférence avec Jitsi ne sont pas pris en charge sur les vieux appareils (avec une version d\'Android antérieure à 6.0)</string>
+    <string name="error_jitsi_not_supported_on_old_device">Désolé, les appels en visioconférence avec Jitsi ne sont pas pris en charge sur les anciens appareils (avec une version d\'Android antérieure à 6.0)</string>
     <string name="title_activity_verify_device">Vérifier la session</string>
     <string name="encryption_information_unknown_ip">adresse IP inconnue</string>
     <string name="you_added_a_new_device_with_info">Une nouvelle session demande les clés de chiffrement.
@@ -1344,8 +1344,8 @@
 \nVu : %2$s
 \nSi vous ne vous êtes pas connecté à une autre session, ignorez cette demande.</string>
     <string name="your_unverified_device_requesting_with_info">Une session non vérifiée demande les clés de chiffrement.
-\nNom de la session : %1$s
-\nVu : %2$s
+\nNom de la session : %1$s
+\nVu : %2$s
 \nSi vous ne vous êtes pas connecté à une autre session, ignorez cette demande.</string>
     <string name="start_verification_short_label">Vérifier</string>
     <string name="share_without_verifying_short_label">Partager</string>
@@ -1392,12 +1392,12 @@
     <string name="keys_backup_setup_override_replace">Remplacer</string>
     <string name="keys_backup_setup_override_stop">Arrêter</string>
     <string name="keys_backup_settings_checking_backup_state">Vérification de l’état de la sauvegarde</string>
-    <string name="invalid_or_expired_credentials">Vous avez été déconnecté(e) car vos identifiants sont incorrects ou ont expiré.</string>
-    <string name="edit">Éditer</string>
+    <string name="invalid_or_expired_credentials">Vous avez été déconnecté car vos identifiants sont incorrects ou ont expiré.</string>
+    <string name="edit">Modifier</string>
     <string name="reply">Répondre</string>
     <string name="global_retry">Réessayer</string>
     <string name="send_you_invite">Vous a envoyé une invitation</string>
-    <string name="invited_by">Invité(e) par %s</string>
+    <string name="invited_by">Invité par %s</string>
     <string name="room_list_catchup_empty_title">Vous êtes à jour !</string>
     <string name="room_list_catchup_empty_body">Vous n’avez plus de messages non lus</string>
     <string name="room_list_people_empty_title">Discussions</string>
@@ -1407,9 +1407,9 @@
     <string name="room_list_empty">Rejoignez un salon pour commencer à utiliser l’application.</string>
     <string name="room_list_catchup_welcome_title">Bienvenue chez vous !</string>
     <string name="room_list_catchup_welcome_body">Rattrapez votre retard sur vos messages non lus ici</string>
-    <string name="room_list_people_empty_body">Vos conversations directes seront affichées ici</string>
+    <string name="room_list_people_empty_body">Vos conversations privées seront affichées ici. Appuyez sur « + » en bas à droite pour en démarrer une.</string>
     <string name="room_list_rooms_empty_title">Salons</string>
-    <string name="room_list_rooms_empty_body">Vos salons seront affichés ici</string>
+    <string name="room_list_rooms_empty_body">Vos salons seront affichés ici. Appuyez sur le « + » en bas à droite pour trouver ceux existant ou en créer de nouveaux.</string>
     <string name="title_activity_emoji_reaction_picker">Réactions</string>
     <string name="reactions_agree">D’accord</string>
     <string name="reactions_like">J’aime</string>
@@ -1427,7 +1427,7 @@
     <string name="room_preview_no_preview">Impossible d’avoir un aperçu de ce salon</string>
     <string name="template_room_preview_world_readable_room_not_supported_yet">L’aperçu des salons visibles par tout le monde n’est pas encore pris en charge par ${app_name}</string>
     <string name="fab_menu_create_room">Salons</string>
-    <string name="fab_menu_create_chat">Messages directs</string>
+    <string name="fab_menu_create_chat">Conversations privées</string>
     <string name="create_room_title">Nouveau salon</string>
     <string name="create_room_action_create">CRÉER</string>
     <string name="create_room_name_hint">Nom</string>
@@ -1464,7 +1464,7 @@
     <string name="send_suggestion_sent">Merci, la suggestion a bien été envoyée</string>
     <string name="send_suggestion_failed">Échec d’envoi de la suggestion (%s)</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Afficher les évènements cachés dans les discussions</string>
-    <string name="bottom_action_people_x">Messages directs</string>
+    <string name="bottom_action_people_x">Conversations privées</string>
     <string name="send_file_step_idle">Attente…</string>
     <string name="send_file_step_encrypting_thumbnail">Chiffrement de la miniature…</string>
     <string name="send_file_step_sending_thumbnail">Envoi de la miniature (%1$s / %2$s)</string>
@@ -1472,16 +1472,16 @@
     <string name="send_file_step_sending_file">Envoi du fichier (%1$s / %2$s)</string>
     <string name="downloading_file">Téléchargement du fichier %1$s…</string>
     <string name="downloaded_file">Le fichier %1$s a été téléchargé !</string>
-    <string name="edited_suffix">(édité)</string>
-    <string name="message_edits">Éditions de message</string>
-    <string name="no_message_edits_found">Aucune édition trouvée</string>
+    <string name="edited_suffix">(modifié)</string>
+    <string name="message_edits">Modifications de message</string>
+    <string name="no_message_edits_found">Aucune modification trouvée</string>
     <string name="room_filtering_filter_hint">Filtrer les conversations…</string>
     <string name="room_filtering_footer_title">Vous ne trouvez pas ce que vous cherchez \?</string>
     <string name="room_filtering_footer_create_new_room">Créer un nouveau salon</string>
-    <string name="room_filtering_footer_create_new_direct_message">Envoyer un nouveau message direct</string>
+    <string name="room_filtering_footer_create_new_direct_message">Envoyer un nouveau message privé</string>
     <string name="room_filtering_footer_open_room_directory">Voir le répertoire des salons</string>
     <string name="room_directory_search_hint">Nom ou identifiant (#exemple:matrix.org)</string>
-    <string name="labs_swipe_to_reply_in_timeline">Activer le balayement pour répondre dans les discussions</string>
+    <string name="labs_swipe_to_reply_in_timeline">Activer le balayage pour répondre dans les l’historique</string>
     <string name="link_copied_to_clipboard">Lien copié dans le presse-papiers</string>
     <string name="settings_integration_manager">Gestionnaire d’intégrations</string>
     <string name="integration_manager_not_configured">Aucun gestionnaire d’intégrations n’est configuré.</string>
@@ -1498,7 +1498,7 @@
     <string name="terms_of_service">Conditions de service</string>
     <string name="review_terms">Examiner les conditions</string>
     <string name="terms_description_for_identity_server">Être découvrable par les autres</string>
-    <string name="terms_description_for_integration_manager">Utiliser des robots, passerelles, widgets et jeux d\'autocollants</string>
+    <string name="terms_description_for_integration_manager">Utiliser des robots, passerelles, widgets et jeux d’autocollants</string>
     <string name="read_at">Lu à</string>
     <string name="none">Aucun</string>
     <string name="revoke">Révoquer</string>
@@ -1519,14 +1519,14 @@
     <string name="settings_call_ringtone_use_default_stun_sum">Utilisera %s comme assistant quand votre serveur d’accueil n’en offre pas (votre adresse IP sera partagée lors d’un appel)</string>
     <string name="invite_no_identity_server_error">Ajoutez un serveur d’identité dans vos paramètres pour réaliser cette action.</string>
     <string name="settings_background_fdroid_sync_mode">Mode de synchronisation en arrière-plan</string>
-    <string name="settings_background_fdroid_sync_mode_battery">Optimisé pour la batterie</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimisé pour préserver la batterie</string>
     <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} se synchronisera en arrière-plan de façon à préserver les ressources limitées de l’appareil (batterie).
 \nSelon l’état des ressources de votre appareil, la synchronisation peut être retardée par le système d’exploitation.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimisé pour le temps réel</string>
     <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} se synchronisera en arrière-plan de façon périodique à un moment précis (configurable).
-\nCela aura un impact sur l’utilisation de la radio et de la batterie, une notification permanente sera affichée indiquant que ${app_name} est à l’écoute des évènements.</string>
+\nCela aura un impact sur l’utilisation des données mobiles et de la batterie, une notification permanente sera affichée indiquant que ${app_name} est à l’écoute des évènements.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Aucune synchronisation en arrière-plan</string>
-    <string name="settings_background_fdroid_sync_mode_disabled_description">Vous ne serez pas notifié(e) des messages entrants quand l’application est en arrière-plan.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Vous ne serez pas notifié des messages entrants quand l’application est en arrière-plan.</string>
     <string name="settings_background_sync_update_error">Échec de la mise à jour des paramètres.</string>
     <string name="settings_set_workmanager_delay">Intervalle de synchronisation préféré</string>
     <string name="settings_set_workmanager_delay_summary">%s
@@ -1545,11 +1545,11 @@
     <string name="settings_discovery_identity_server_info">Vous utilisez actuellement %1$s pour découvrir et être découvrable par les contacts existants que vous connaissez.</string>
     <string name="settings_discovery_identity_server_info_none">Vous n’utilisez actuellement aucun serveur d’identité. Pour découvrir et être découvrable par les contacts existants que vous connaissez, configurez-en un ci-dessous.</string>
     <string name="settings_discovery_emails_title">Adresses e-mail découvrables</string>
-    <string name="settings_discovery_no_mails">Les options de découverte apparaîtront quand vous aurez ajouté(e) un e-mail.</string>
+    <string name="settings_discovery_no_mails">Les options de découverte apparaîtront quand vous aurez ajouté un e-mail.</string>
     <string name="settings_discovery_no_msisdn">Les options de découverte apparaîtront quand vous aurez ajouté un numéro de téléphone.</string>
     <string name="settings_discovery_disconnect_identity_server_info">La déconnexion du serveur d’identité signifie que vous ne pourrez plus être découvrable par les autres utilisateurs et que vous ne pourrez plus inviter d’autres personnes par e-mail ou par téléphone.</string>
     <string name="settings_discovery_msisdn_title">Numéros de téléphone découvrables</string>
-    <string name="settings_discovery_confirm_mail">Nous vous avons envoyé un e-mail de confirmation à %s, vérifiez vos e-mails et cliquez sur le lien de confirmation</string>
+    <string name="settings_discovery_confirm_mail">Nous vous avons envoyé un e-mail de confirmation à %s, consultez vos e-mails et cliquez sur le lien de confirmation</string>
     <string name="settings_discovery_mail_pending">En attente</string>
     <string name="settings_discovery_enter_identity_server">Renseignez l’URL d’un serveur d’identité</string>
     <string name="settings_discovery_bad_identity_server">Impossible de se connecter au serveur d’identité</string>
@@ -1567,7 +1567,7 @@
     <string name="a11y_open_drawer">Ouvrir le menu de navigation</string>
     <string name="a11y_create_menu_open">Ouvrir le menu de création de salon</string>
     <string name="a11y_create_menu_close">Fermer le menu de création de salon…</string>
-    <string name="a11y_create_direct_message">Créer une nouvelle conversation directe</string>
+    <string name="a11y_create_direct_message">Créer une nouvelle conversation privée</string>
     <string name="a11y_create_room">Créer un nouveau salon</string>
     <string name="a11y_close_keys_backup_banner">Fermer la bannière de sauvegarde des clés</string>
     <string name="a11y_show_password">Afficher le mot de passe</string>
@@ -1589,7 +1589,7 @@
     <string name="attachment_type_gallery">Galerie</string>
     <string name="attachment_type_sticker">Autocollants</string>
     <string name="error_handling_incoming_share">Impossible de traiter les données de partage</string>
-    <string name="report_content_spam">C’est du pourriel</string>
+    <string name="report_content_spam">C’est du spam</string>
     <string name="report_content_inappropriate">C’est inapproprié</string>
     <string name="report_content_custom">Signalement personnalisé…</string>
     <string name="report_content_custom_title">Signaler ce contenu</string>
@@ -1597,17 +1597,17 @@
     <string name="report_content_custom_submit">SIGNALER</string>
     <string name="block_user">BLOQUER L’UTILISATEUR</string>
     <string name="content_reported_title">Contenu signalé</string>
-    <string name="content_reported_content">Ce contenu a été signalé. 
-\n 
-\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l\'ignorer pour masquer ses messages.</string>
-    <string name="content_reported_as_spam_title">Signalé comme pourriel</string>
-    <string name="content_reported_as_spam_content">Ce contenu a été signalé comme pourriel. 
-\n 
-\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l\'ignorer pour masquer ses messages.</string>
+    <string name="content_reported_content">Ce contenu a été signalé.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l’ignorer pour masquer ses messages.</string>
+    <string name="content_reported_as_spam_title">Signalé comme spam</string>
+    <string name="content_reported_as_spam_content">Ce contenu a été signalé comme spam.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l’ignorer pour masquer ses messages.</string>
     <string name="content_reported_as_inappropriate_title">Signalé comme inapproprié</string>
-    <string name="content_reported_as_inappropriate_content">Ce contenu a été signalé comme inapproprié. 
-\n 
-\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l\'ignorer pour masquer ses messages.</string>
+    <string name="content_reported_as_inappropriate_content">Ce contenu a été signalé comme inapproprié.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l’ignorer pour masquer ses messages.</string>
     <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} a besoin de votre permission pour sauvegarder vos clés de chiffrement sur le disque.
 \n
 \nAutorisez l’accès dans le prochaine fenêtre pour pouvoir exporter vos clés manuellement.</string>
@@ -1616,7 +1616,7 @@
     <string name="settings_add_3pid_flow_not_supported">Vous ne pouvez pas faire cela depuis Element mobile</string>
     <string name="settings_add_3pid_authentication_needed">Une authentification est nécessaire</string>
     <string name="settings_integrations">Intégrations</string>
-    <string name="settings_integrations_summary">Utilisez un gestionnaire d’intégrations pour gérer les bots, les passerelles, les widgets et les jeux d\'autocollants.
+    <string name="settings_integrations_summary">Utilisez un gestionnaire d’intégrations pour gérer les robots, les passerelles, les widgets et les jeux d’autocollants.
 \nLes gestionnaires d’intégrations reçoivent des données de configuration et peuvent modifier des widgets, envoyer des invitations de salon et définir des rangs à votre place.</string>
     <string name="settings_integration_allow">Autoriser les intégrations</string>
     <string name="room_widget_activity_title">Widget</string>
@@ -1629,7 +1629,7 @@
     <string name="room_widget_reload">Recharger le widget</string>
     <string name="room_widget_open_in_browser">Ouvrir dans le navigateur</string>
     <string name="room_widget_revoke_access">Révoquer l’accès pour moi</string>
-    <string name="room_widget_permission_display_name">Votre nom affiché</string>
+    <string name="room_widget_permission_display_name">Votre nom d’affichage</string>
     <string name="room_widget_permission_avatar_url">L’URL de votre avatar</string>
     <string name="room_widget_permission_user_id">Votre identifiant utilisateur</string>
     <string name="room_widget_permission_theme">Votre thème</string>
@@ -1664,13 +1664,13 @@
     <string name="login_splash_text3">Étendez et personnalisez votre expérience</string>
     <string name="login_splash_submit">Démarrer</string>
     <string name="login_server_title">Sélectionner un serveur</string>
-    <string name="login_server_text">Comme les e-mails, les comptes ont un serveur d\'accueil, même si vous pouvez parler à tout le monde</string>
+    <string name="login_server_text">Tout comme les e-mails, les comptes ont un serveur d’accueil, même si vous pouvez parler à tout le monde</string>
     <string name="login_server_matrix_org_text">Rejoignez des millions de personnes gratuitement sur le plus grand serveur public</string>
     <string name="login_server_modular_text">Hébergement premium pour les organisations</string>
     <string name="login_server_modular_learn_more">En savoir plus</string>
     <string name="login_server_other_title">Autre</string>
     <string name="login_server_other_text">Paramètres personnalisés et avancés</string>
-    <string name="login_continue">Continuer</string>
+    <string name="login_continue">Poursuivre</string>
     <string name="login_connect_to">Se connecter à %1$s</string>
     <string name="login_connect_to_modular">Se connecter à Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Se connecter à un serveur personnalisé</string>
@@ -1682,36 +1682,36 @@
     <string name="login_server_url_form_other_hint">Adresse</string>
     <string name="login_server_url_form_modular_text">Hébergement privé pour les organisations</string>
     <string name="login_server_url_form_modular_notice">Saisir l’adresse de Element ou du serveur de Modular que vous voulez utiliser</string>
-    <string name="login_sso_error_message">Une erreur est survenue pendant le chargement de la page : %1$s (%2$d)</string>
-    <string name="login_mode_not_supported">L’application ne peut pas s’authentifier sur ce serveur d’accueil. Le serveur d’accueil prend en charge le(s) type(s) d’authentification suivant(s) : %1$s.
+    <string name="login_sso_error_message">Une erreur est survenue pendant le chargement de la page : %1$s (%2$d)</string>
+    <string name="login_mode_not_supported">L’application ne peut pas s’authentifier sur ce serveur d’accueil. Le serveur d’accueil prend en charge le(s) type(s) d’authentification suivant(s) : %1$s.
 \n
-\nVoulez-vous vous connecter en utilisant un client web \?</string>
+\nVoulez-vous vous connecter en utilisant un client web \?</string>
     <string name="login_registration_disabled">Désolé, ce serveur n’accepte pas de nouveau compte.</string>
     <string name="login_registration_not_supported">L’application ne peut pas créer de compte sur ce serveur d’accueil.
 \n
-\nVoulez-vous vous inscrire en utilisant un client web \?</string>
+\nVoulez-vous vous inscrire en utilisant un client web \?</string>
     <string name="login_login_with_email_error">Cet e-mail n’est associé à aucun compte.</string>
     <string name="login_reset_password_on">Réinitialiser le mot de passe sur %1$s</string>
     <string name="login_reset_password_notice">Un e-mail de vérification sera envoyé à votre adresse pour confirmer la configuration de votre nouveau mot de passe.</string>
     <string name="login_reset_password_submit">Suivant</string>
     <string name="login_reset_password_email_hint">E-mail</string>
     <string name="login_reset_password_password_hint">Nouveau mot de passe</string>
-    <string name="login_reset_password_warning_title">Attention !</string>
+    <string name="login_reset_password_warning_title">Attention !</string>
     <string name="login_reset_password_warning_content">Le changement de mot de passe réinitialisera toutes les clés de chiffrement sur toutes vos sessions, rendant l’historique des discussions chiffrées illisible. Configurez la sauvegarde de clés ou exportez vos clés de salon depuis une autre session avant de réinitialiser votre mot de passe.</string>
-    <string name="login_reset_password_warning_submit">Continuer</string>
+    <string name="login_reset_password_warning_submit">Poursuivre</string>
     <string name="login_reset_password_error_not_found">Cet e-mail n’est lié à aucun compte</string>
     <string name="login_reset_password_mail_confirmation_title">Vérifiez votre boîte de réception</string>
     <string name="login_reset_password_mail_confirmation_notice">Un e-mail de vérification a été envoyé à %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Touchez le lien pour confirmer votre nouveau mot de passe. Après avoir suivi le lien qu’il contient, cliquez ci-dessous.</string>
     <string name="login_reset_password_mail_confirmation_submit">J’ai vérifié mon adresse e-mail</string>
-    <string name="login_reset_password_success_title">Réussi !</string>
+    <string name="login_reset_password_success_title">Succès !</string>
     <string name="login_reset_password_success_notice">Votre mot de passe a été réinitialisé.</string>
     <string name="login_reset_password_success_notice_2">Vous avez été déconnecté de toutes les sessions et ne recevrez plus de notification. Pour réactiver les notifications, reconnectez-vous sur chaque appareil.</string>
     <string name="login_reset_password_success_submit">Retourner à l’authentification</string>
     <string name="login_reset_password_cancel_confirmation_title">Attention</string>
     <string name="login_reset_password_cancel_confirmation_content">Votre mot de passe n’a pas encore été changé.
 \n
-\nArrêter le processus de changement \?</string>
+\nArrêter le processus de changement \?</string>
     <string name="login_set_email_title">Définir l’adresse e-mail</string>
     <string name="login_set_email_notice">Définir une adresse e-mail pour récupérer votre compte. Plus tard, vous pourrez éventuellement autoriser des personnes à vous retrouver avec votre adresse e-mail.</string>
     <string name="login_set_email_mandatory_hint">E-mail</string>
@@ -1728,7 +1728,7 @@
     <string name="login_msisdn_confirm_hint">Saisir le code</string>
     <string name="login_msisdn_confirm_send_again">Renvoyer</string>
     <string name="login_msisdn_confirm_submit">Suivant</string>
-    <string name="login_msisdn_error_not_international">Les numéros de téléphone internationaux doivent commencer par « + »</string>
+    <string name="login_msisdn_error_not_international">Les numéros de téléphone internationaux doivent commencer par « + »</string>
     <string name="login_msisdn_error_other">Le numéro de téléphone n’a pas l’air d’être valide. Veuillez le vérifier</string>
     <string name="login_signup_to">S’inscrire sur %1$s</string>
     <string name="login_signin_username_hint">Nom d’utilisateur ou e-mail</string>
@@ -1738,7 +1738,7 @@
     <string name="login_signup_cancel_confirmation_title">Attention</string>
     <string name="login_signup_cancel_confirmation_content">Votre compte n’est pas encore crée.
 \n
-\nArrêter le processus de création \?</string>
+\nArrêter le processus de création \?</string>
     <string name="login_a11y_choose_matrix_org">Sélectionner matrix.org</string>
     <string name="login_a11y_choose_modular">Sélectionner Element Matrix Services</string>
     <string name="login_a11y_choose_other">Sélectionner un serveur d’accueil personnalisé</string>
@@ -1748,20 +1748,20 @@
     <string name="login_wait_for_email_notice">Nous avons envoyé un e-mail à %1$s.
 \nCliquez sur le lien qu’il contient pour continuer la création du compte.</string>
     <string name="login_validation_code_is_not_correct">Le code saisi n’est pas correct. Veuillez vérifier.</string>
-    <string name="login_error_outdated_homeserver_title">Serveur d’accueil trop vieux</string>
-    <string name="login_error_outdated_homeserver_content">Ce serveur d’accueil utilise une version trop ancienne pour s’y connecter. Demandez à l’administrateur de votre serveur d’accueil de le mettre à niveau.</string>
+    <string name="login_error_outdated_homeserver_title">Serveur d’accueil obsolète</string>
+    <string name="login_error_outdated_homeserver_content">Ce serveur d’accueil utilise une version trop ancienne pour s’y connecter. Demandez à l’administrateur de votre serveur d’accueil de le mettre à jour.</string>
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Trop de requêtes ont été envoyées. Vous pouvez réessayer dans %1$d seconde…</item>
         <item quantity="other">Trop de requêtes ont été envoyées. Vous pouvez réessayer dans %1$d secondes…</item>
     </plurals>
     <string name="seen_by">Vu par</string>
     <string name="signed_out_title">Vous êtes déconnecté</string>
-    <string name="signed_out_notice">Cela peut être dû à plusieurs raisons : 
-\n 
-\n• Vous avez changé votre mot de passe sur une autre session. 
-\n 
-\n• Vous avez supprimé cette session depuis une autre session. 
-\n 
+    <string name="signed_out_notice">Cela peut être dû à plusieurs raisons :
+\n
+\n• Vous avez changé votre mot de passe sur une autre session.
+\n
+\n• Vous avez supprimé cette session depuis une autre session.
+\n
 \n• L’administrateur de votre serveur a invalidé votre accès pour des raisons de sécurité.</string>
     <string name="signed_out_submit">Se reconnecter</string>
     <string name="soft_logout_title">Vous êtes déconnecté</string>
@@ -1771,12 +1771,12 @@
     <string name="soft_logout_signin_submit">Se connecter</string>
     <string name="soft_logout_signin_password_hint">Mot de passe</string>
     <string name="soft_logout_clear_data_title">Effacer les données personnelles</string>
-    <string name="soft_logout_clear_data_notice">Attention : Vos données personnelles (y compris les clés de chiffrement) sont toujours stockées sur cet appareil.
+    <string name="soft_logout_clear_data_notice">Attention : Vos données personnelles (y compris les clés de chiffrement) sont toujours stockées sur cet appareil.
 \n
 \nEffacez-les si vous n’utilisez plus cet appareil ou si vous voulez vous connecter à un autre compte.</string>
     <string name="soft_logout_clear_data_submit">Effacer toutes les données</string>
     <string name="soft_logout_clear_data_dialog_title">Effacer les données</string>
-    <string name="soft_logout_clear_data_dialog_content">Effacer toutes les données stockées sur cet appareil \?
+    <string name="soft_logout_clear_data_dialog_content">Effacer toutes les données stockées sur cet appareil \?
 \nReconnectez-vous pour accéder aux données et aux messages de votre compte.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Vous perdrez l’accès à vos messages sécurisés sauf si vous vous connectez pour récupérer vos clés de chiffrement.</string>
     <string name="soft_logout_clear_data_dialog_submit">Effacer les données</string>
@@ -1879,15 +1879,15 @@
     <string name="room_list_sharing_header_other_rooms">Autres salons</string>
     <string name="command_description_rainbow">Envoie le message fourni coloré comme un arc-en-ciel</string>
     <string name="command_description_rainbow_emote">Envoie la réaction fournie colorée comme un arc-en-ciel</string>
-    <string name="settings_category_timeline">Discussions</string>
+    <string name="settings_category_timeline">Fil de discussion</string>
     <string name="settings_category_composer">Éditeur de messages</string>
     <string name="room_settings_enable_encryption">Active le chiffrement de bout en bout…</string>
     <string name="room_settings_enable_encryption_warning">Une fois qu’il est activé, le chiffrement ne peut pas être désactivé.</string>
     <string name="room_settings_enable_encryption_dialog_title">Activer le chiffrement \?</string>
     <string name="room_settings_enable_encryption_dialog_content">Une fois qu’il est activé, le chiffrement ne peut pas être désactivé. Les messages envoyés dans les salons chiffrés ne peuvent pas être vus par le serveur, uniquement par les participants du salon. Activer le chiffrement empêchera peut-être les robots et les passerelles de fonctionner correctement.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Activer le chiffrement</string>
-    <string name="verification_request_notice">Pour être sécurisé, vérifiez %s en comparant un code à usage unique.</string>
-    <string name="verification_request_start_notice">Pour être sécurisé, faites cela en personne ou utilisez un autre moyen de communication.</string>
+    <string name="verification_request_notice">Pour plus de sécurité, vérifiez %s en comparant un code à usage unique.</string>
+    <string name="verification_request_start_notice">Pour plus de sécurité, faites cela en personne ou utilisez un autre moyen de communication.</string>
     <string name="verification_emoji_notice">Comparez les émojis uniques, en vous assurant qu’ils apparaissent dans le même ordre.</string>
     <string name="verification_code_notice">Comparez le code avec celui qui s’affiche sur l’écran de l’autre utilisateur.</string>
     <string name="verification_conclusion_ok_notice">Les messages avec cet utilisateur sont chiffrés de bout en bout et ne peuvent pas être lus par des tiers.</string>
@@ -1914,7 +1914,7 @@
     </plurals>
     <string name="crosssigning_verify_this_session">Vérifier cette session</string>
     <string name="crosssigning_other_user_not_trust">Les autres utilisateurs ne lui font peut-être pas confiance</string>
-    <string name="complete_security">Compléter la sécurité</string>
+    <string name="complete_security">Améliorer la sécurité</string>
     <string name="verification_open_other_to_verify">Utilisez une session existante pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.</string>
     <string name="verification_profile_verify">Vérifier</string>
     <string name="verification_profile_verified">Vérifié</string>
@@ -1932,7 +1932,7 @@
     <string name="qr_code_scanned_by_other_notice">On y est presque ! Est-ce que %s affiche le même bouclier \?</string>
     <string name="qr_code_scanned_by_other_yes">Oui</string>
     <string name="qr_code_scanned_by_other_no">Non</string>
-    <string name="no_connectivity_to_the_server_indicator">La connectivité avec le serveur a été perdue</string>
+    <string name="no_connectivity_to_the_server_indicator">La connexion avec le serveur a été perdue</string>
     <string name="login_signup_username_hint">Nom d’utilisateur</string>
     <string name="settings_dev_tools">Outils de développement</string>
     <string name="settings_account_data">Données du compte</string>
@@ -2014,7 +2014,7 @@
     <string name="bootstrap_crosssigning_progress_key_backup">Configuration de la sauvegarde de clés</string>
     <string name="bootstrap_cross_signing_success">Votre %2$s et votre %1$s sont bien réglés.
 \n
-\nConservez-les en lieu sûr ! Vous en aurez besoin pour débloquer les messages chiffrés et vos informations sécurisées si vous perdez toutes vos sessions actives.</string>
+\nConservez-les en lieu sûr ! Vous en aurez besoin pour accéder aux messages chiffrés et à vos informations sécurisées si vous perdez toutes vos sessions actives.</string>
     <string name="bootstrap_crosssigning_print_it">Imprimez-le et conservez-le en lieu sûr</string>
     <string name="bootstrap_crosssigning_save_usb">Sauvegardez-le sur une clé USB ou un disque de sauvegarde</string>
     <string name="bootstrap_crosssigning_save_cloud">Copiez-le sur votre stockage dans le cloud personnel</string>
@@ -2022,10 +2022,10 @@
     <string name="bootstrap_skip_text">La configuration d’un mot de passe de messages vous permet des sécuriser et déverrouiller les messages chiffrés et les vérifications.
 \n
 \nSi vous ne voulez pas définir un mot de passe de messages, générez plutôt une clé de messages.</string>
-    <string name="bootstrap_skip_text_no_gen_key">La configuration d’une Phrase de récupération vous permet des sécuriser et déverrouiller les messages chiffrés et les vérifications.</string>
+    <string name="bootstrap_skip_text_no_gen_key">La configuration d’une phrase de récupération vous permet des sécuriser et déverrouiller les messages chiffrés et les vérifications.</string>
     <string name="encryption_enabled">Chiffrement activé</string>
     <string name="encryption_enabled_tile_description">Les messages de ce salon sont chiffrés de bout en bout. Apprenez-en plus et vérifiez les utilisateurs sur leur profil.</string>
-    <string name="encryption_not_enabled">Chiffrement pas activé</string>
+    <string name="encryption_not_enabled">Chiffrement désactivé</string>
     <string name="encryption_unknown_algorithm_tile_description">Le chiffrement utilisé par ce salon n’est pas pris en charge</string>
     <string name="room_created_summary_item">%s a créé et configuré ce salon.</string>
     <string name="qr_code_scanned_self_verif_notice">On y est presque ! L’autre appareil affiche-t-il le même bouclier \?</string>
@@ -2034,8 +2034,8 @@
     <string name="error_failed_to_import_keys">Échec de l’importation des clés</string>
     <string name="settings_notification_configuration">Configuration des notifications</string>
     <string name="settings_messages_at_room">Messages contenant @room</string>
-    <string name="settings_messages_in_e2e_one_to_one">Messages chiffrés dans les discussions individuelles</string>
-    <string name="settings_messages_in_e2e_group_chat">Messages chiffrés dans les discussions de groupe</string>
+    <string name="settings_messages_in_e2e_one_to_one">Messages chiffrés dans les conversations individuelles</string>
+    <string name="settings_messages_in_e2e_group_chat">Messages chiffrés dans les conversations de groupe</string>
     <string name="settings_when_rooms_are_upgraded">Quand les salons sont mis à niveau</string>
     <string name="settings_troubleshoot_title">Résolution de problèmes</string>
     <string name="settings_notification_advanced_summary">Définir l’importance des notifications par évènement</string>
@@ -2047,7 +2047,7 @@
     <string name="use_file">Utiliser un fichier</string>
     <string name="enter_backup_passphrase">Entrez %s</string>
     <string name="backup_recovery_passphrase">Phrase de récupération</string>
-    <string name="bootstrap_invalid_recovery_key">Ce n\'est pas une clé de récupération valide</string>
+    <string name="bootstrap_invalid_recovery_key">Ce n’est pas une clé de récupération valide</string>
     <string name="recovery_key_empty_error_message">Veuillez entrer une clé de récupération</string>
     <string name="bootstrap_progress_checking_backup">Vérification de la clé de sauvegarde</string>
     <string name="bootstrap_progress_checking_backup_with_info">Vérification de la clé de sauvegarde (%s)</string>
@@ -2089,10 +2089,10 @@
     <string name="error_empty_field_choose_user_name">Veuillez choisir un nom d’utilisateur.</string>
     <string name="error_empty_field_choose_password">Veuillez choisir un mot de passe.</string>
     <string name="external_link_confirmation_title">Vérifiez ce lien</string>
-    <string name="external_link_confirmation_message">Le lien %1$s vous emmène à un autre site : %2$s.
+    <string name="external_link_confirmation_message">Le lien %1$s vous emmène sur un autre site : %2$s.
 \n
-\nVoulez-vous vraiment continuer \?</string>
-    <string name="create_room_dm_failure">Nous n’avons pas pu créer votre conversation directe. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.</string>
+\nVoulez-vous vraiment poursuivre \?</string>
+    <string name="create_room_dm_failure">Nous n’avons pas pu créer votre conversation privée. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.</string>
     <string name="unencrypted">Non chiffré</string>
     <string name="encrypted_unverified">Chiffré par un appareil non vérifié</string>
     <string name="review_logins">Vérifiez où vous vous êtes connecté</string>
@@ -2107,14 +2107,14 @@
     <string name="invitation_sent_to_one_user">Invitation envoyée à %1$s</string>
     <string name="invitations_sent_to_two_users">Invitations envoyées à %1$s et %2$s</string>
     <plurals name="invitations_sent_to_one_and_more_users">
-        <item quantity="one">Invitations envoyées à %1$s et un·e autre</item>
+        <item quantity="one">Invitations envoyées à %1$s et un autre</item>
         <item quantity="other">Invitations envoyées à %1$s et %2$d autres</item>
     </plurals>
     <string name="invite_users_to_room_failure">Nous n’avons pas pu inviter les utilisateurs. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.</string>
     <string name="event_redacted">Message supprimé</string>
     <string name="settings_show_redacted">Afficher les messages supprimés</string>
     <string name="settings_show_redacted_summary">Afficher un remplaçant pour les messages supprimés</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">Nous vous avons envoyé un e-mail de confirmation à %s, vérifiez vos e-mails et cliquez sur le lien de confirmation</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Nous vous avons envoyé un e-mail de confirmation à %s, consultez vos e-mails et cliquez sur le lien de confirmation</string>
     <string name="settings_text_message_sent_wrong_code">Le code de vérification n’est pas correct.</string>
     <string name="uploads_media_title">MÉDIA</string>
     <string name="uploads_media_no_result">Il n’y a aucun média dans ce salon</string>
@@ -2124,7 +2124,7 @@
     <string name="login_connect_using_matrix_id_notice">Sinon, si vous avez déjà un compte et que vous connaissez votre identifiant Matrix et votre mot de passe, vous pouvez utiliser cette méthode :</string>
     <string name="login_connect_using_matrix_id_submit">Me connecter avec mon identifiant Matrix</string>
     <string name="login_signin_matrix_id_title">Se connecter</string>
-    <string name="login_signin_matrix_id_notice">Si vous avez créé un compte sur un serveur d\'accueil, utilisez ci-dessous votre identifiant Matrix (ex : @utilisateur:domaine.com) et mot de passe.</string>
+    <string name="login_signin_matrix_id_notice">Si vous avez créé un compte sur un serveur d\'accueil, utilisez ci-dessous votre identifiant Matrix (par ex. : @utilisateur:domaine.com) et mot de passe.</string>
     <string name="login_signin_matrix_id_hint">Identifiant de l’utilisateur</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Ce n’est pas un identifiant d’utilisateur valide. Format attendu : « @utilisateur:serveuraccueil.org »</string>
     <string name="autodiscover_well_known_error">Impossible de trouver un serveur d’accueil valide. Veuillez vérifier votre identifiant</string>
@@ -2134,7 +2134,7 @@
     <string name="choose_locale_loading_locales">Chargement des langues disponibles…</string>
     <string name="open_terms_of">Ouvrir les termes de %s</string>
     <string name="disconnect_identity_server_dialog_content">Se déconnecter du serveur d’identité %s \?</string>
-    <string name="template_identity_server_error_outdated_identity_server">Ce serveur d’identité est obsolète. ${app_name} ne supporte que l’API V2.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Ce serveur d’identité est obsolète. ${app_name} ne prend en charge que l’API V2.</string>
     <string name="identity_server_error_outdated_home_server">Cette opération n’est pas possible. Le serveur d’accueil est obsolète.</string>
     <string name="identity_server_error_no_identity_server_configured">Veuillez d’abord configurer un serveur d’identité.</string>
     <string name="identity_server_error_terms_not_signed">Veuillez d’abord accepter les termes du serveur d’identité dans les paramètres.</string>
@@ -2149,16 +2149,16 @@
     <string name="play_video">Lancer</string>
     <string name="pause_video">Pause</string>
     <string name="dismiss">Ignorer</string>
-    <string name="no_permissions_to_start_conf_call">Vous n\'avez pas la permission de commencer une téléconférence dans ce salon</string>
-    <string name="no_permissions_to_start_webrtc_call">Vous n\'avez pas la permission de commencer un appel dans ce salon</string>
-    <string name="conference_call_in_progress">Une téléconférence est déjà en cours !</string>
-    <string name="video_meeting">Commencer une réunion vidéo</string>
-    <string name="audio_meeting">Commencer une réunion audio</string>
-    <string name="audio_video_meeting_description">Les réunions utilisent les règles de sécurités et les permissions de Jitsi. Toutes les personnes actuellement dans ce salon recevrons une invitation à participer à la réunion.</string>
+    <string name="no_permissions_to_start_conf_call">Vous n’avez pas la permission de lancer une téléconférence dans ce salon</string>
+    <string name="no_permissions_to_start_webrtc_call">Vous n\'avez pas la permission de lancer un appel dans ce salon</string>
+    <string name="conference_call_in_progress">Une téléconférence est déjà en cours !</string>
+    <string name="video_meeting">Commencer une téléconférence vidéo</string>
+    <string name="audio_meeting">Commencer une téléconférence audio</string>
+    <string name="audio_video_meeting_description">Les réunions utilisent les règles de sécurité et les permissions de Jitsi. Toutes les personnes actuellement dans ce salon recevront une invitation à participer à la réunion.</string>
     <string name="cannot_call_yourself">Vous ne pouvez pas passer un appel avec vous-même</string>
-    <string name="cannot_call_yourself_with_invite">Vous ne pouvez pas passer un appel avec vous-même, attendez que les participants accepte l\'invitation</string>
-    <string name="failed_to_add_widget">Échec de l\'ajout du module d\'information (widget)</string>
-    <string name="failed_to_remove_widget">Échec de la suppression du module d\'information (widget)</string>
+    <string name="cannot_call_yourself_with_invite">Vous ne pouvez pas passer un appel avec vous-même, attendez que les participants acceptent l’invitation</string>
+    <string name="failed_to_add_widget">Échec de l’ajout du widget</string>
+    <string name="failed_to_remove_widget">Échec de la suppression du widget</string>
     <string name="call_notification_answer">Accepter</string>
     <string name="call_notification_reject">Refuser</string>
     <string name="call_notification_hangup">Raccrocher</string>
@@ -2166,8 +2166,8 @@
     <string name="dialog_title_success">Succès</string>
     <string name="bottom_action_notification">Notifications</string>
     <string name="call_failed_no_connection_description">Impossible d\'établir une connexion en temps réel.
-\nVeuillez demander à l\'administrateur de votre serveur domestique de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.</string>
-    <string name="call_select_sound_device">Sélectionner un appareil audio</string>
+\nVeuillez demander à l’administrateur de votre serveur d’accueil de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.</string>
+    <string name="call_select_sound_device">Sélectionner un périphérique audio</string>
     <string name="sound_device_phone">Téléphone</string>
     <string name="sound_device_speaker">Hauts-parleurs</string>
     <string name="sound_device_headset">Écouteurs</string>
@@ -2176,20 +2176,20 @@
     <string name="auth_msisdn_already_defined">Le numéro de téléphone est déjà défini.</string>
     <string name="login_error_ssl_peer_unverified">Erreur SSL : l\'identité du pair n\'a pas été vérifiée.</string>
     <string name="login_error_ssl_other">Erreur SSL.</string>
-    <string name="settings_call_show_confirmation_dialog_title">Prévenir les appels accidentels</string>
-    <string name="settings_call_show_confirmation_dialog_summary">Demandez une confirmation avant de commencer un appel</string>
+    <string name="settings_call_show_confirmation_dialog_title">Éviter les appels accidentels</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Demander une confirmation avant de lancer un appel</string>
     <string name="active_call_with_duration">Appel actif (%s)</string>
-    <string name="return_to_call">Retour à l\'appel</string>
-    <string name="room_participants_action_cancel_invite">Annuler l\'invitation</string>
-    <string name="room_participants_action_ignore_title">Ignorer l\'utilisateur</string>
+    <string name="return_to_call">Retour à l’appel</string>
+    <string name="room_participants_action_cancel_invite">Annuler l’invitation</string>
+    <string name="room_participants_action_ignore_title">Ignorer l’utilisateur</string>
     <string name="room_participants_action_ignore_prompt_msg">Ignorer cet utilisateur aura pour effet de supprimer ses messages des espaces que vous partagez.
 \n
 \nVous pouvez annuler cette action à tout moment dans les paramètres généraux.</string>
-    <string name="room_participants_action_cancel_invite_title">Annuler l\'invitation</string>
-    <string name="room_participants_action_cancel_invite_prompt_msg">Êtes-vous sûr de vouloir annuler l\'invitation pour cet utilisateur \?</string>
-    <string name="room_participants_ban_title">Exclure l\'utilisateur</string>
-    <string name="room_participants_ban_reason">Motif de l\'exclusion</string>
-    <string name="room_participants_unban_title">Ne plus exclure l\'utilisateur</string>
+    <string name="room_participants_action_cancel_invite_title">Annuler l’invitation</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Êtes-vous sûr de vouloir annuler l’invitation pour cet utilisateur \?</string>
+    <string name="room_participants_ban_title">Bannir l’utilisateur</string>
+    <string name="room_participants_ban_reason">Motif du bannissement</string>
+    <string name="room_participants_unban_title">Révoquer le bannissement de l’utilisateur</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Configuration</string>
     <string name="a11y_unmute_microphone">Activer le microphone</string>
     <string name="a11y_mute_microphone">Désactiver le microphone</string>
@@ -2199,29 +2199,29 @@
         <item quantity="one">%d invitation</item>
         <item quantity="other">%d invitations</item>
     </plurals>
-    <string name="member_banned_by">Exclus par %1$s</string>
-    <string name="three_pid_revoke_invite_dialog_content">Révoquer l\'invitation à %1$s \?</string>
-    <string name="three_pid_revoke_invite_dialog_title">Révoquer l\'invitation</string>
-    <string name="contacts_book_title">Carnet d\'adresses</string>
-    <string name="empty_contact_book">Votre carnet d\'adresses est vide</string>
+    <string name="member_banned_by">Banni par %1$s</string>
+    <string name="three_pid_revoke_invite_dialog_content">Révoquer l’invitation à %1$s \?</string>
+    <string name="three_pid_revoke_invite_dialog_title">Révoquer l’invitation</string>
+    <string name="contacts_book_title">Carnet d’adresses</string>
+    <string name="empty_contact_book">Votre carnet d’adresses est vide</string>
     <string name="loading_contact_book">Récupération de vos contacts…</string>
     <string name="search_in_my_contacts">Rechercher dans mes contacts</string>
-    <string name="phone_book_title">Carnet d\'adresse</string>
-    <string name="empty_phone_book">Votre carnet d\'adresses est vide</string>
-    <string name="add_from_phone_book">Ajouter depuis mon carnet d\'adresses</string>
+    <string name="phone_book_title">Carnet d’adresse</string>
+    <string name="empty_phone_book">Votre carnet d’adresses est vide</string>
+    <string name="add_from_phone_book">Ajouter depuis mon carnet d’adresses</string>
     <string name="save_recovery_key_chooser_hint">Enregistrer la clé de récupération</string>
     <string name="disclaimer_positive_button">EN SAVOIR PLUS</string>
     <string name="disclaimer_negative_button">COMPRIS</string>
     <string name="disclaimer_content">Nous sommes heureux de vous annoncer que nous avons un nouveau nom ! Votre application est à jour et vous êtes connectés à votre compte.</string>
-    <string name="disclaimer_title">Riot est maintenant Element !</string>
-    <string name="notice_crypto_unable_to_decrypt_merged">Attente de l\'historique du chiffrement</string>
-    <string name="crypto_error_withheld_generic">Impossible d\'accéder à ce message car l\'envoyeur n\'a intentionnellement pas envoyé les clés</string>
-    <string name="crypto_error_withheld_unverified">Vous ne pouvez pas accéder à ce message car l\'envoyeur n\'a pas confiance en votre session</string>
-    <string name="crypto_error_withheld_blacklisted">Impossible d\'accéder à ce message car vous avez été bloqué par l\'envoyeur</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">À cause du chiffrement de bout en bout, vous pouvez avoir besoin d\'attendre l\'arrivée du message de quelqu\'un car les clés de chiffrement ne vous ont pas été correctement envoyées.</string>
+    <string name="disclaimer_title">Riot est désormais Element !</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Attente de l’historique du chiffrement</string>
+    <string name="crypto_error_withheld_generic">Impossible d’accéder à ce message car l’envoyeur n’a intentionnellement pas envoyé les clés</string>
+    <string name="crypto_error_withheld_unverified">Vous ne pouvez pas accéder à ce message car l’envoyeur n’a pas confiance en votre session</string>
+    <string name="crypto_error_withheld_blacklisted">Impossible d’accéder à ce message car vous avez été bloqué par l’envoyeur</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">À cause du chiffrement de bout en bout, vous pouvez avoir besoin d’attendre l’arrivée du message de quelqu’un car les clés de chiffrement ne vous ont pas été correctement envoyées.</string>
     <string name="crypto_utd">Impossible de déchiffrer</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Attente du message, cela peut prendre du temps</string>
-    <string name="notice_crypto_unable_to_decrypt_final">Vous n\'avez pas accès à ce message</string>
+    <string name="notice_crypto_unable_to_decrypt_final">Vous n’avez pas accès à ce message</string>
     <string name="room_settings_save_success">Vous avez bien changé les paramètres du salon</string>
     <string name="room_settings_topic_hint">Sujet</string>
     <string name="room_settings_name_hint">Nom du salon</string>
@@ -2245,17 +2245,17 @@
 \n
 \nVous pouvez aussi activer la sauvegarde sécurisée et gérer vos clés dans les paramètres.</string>
     <string name="bootstrap_info_text_2">Entrez une phrase de sécurité que seul vous connaissez, celle-ci est utilisée pour sécuriser les mots de passe sur le serveur.</string>
-    <string name="settings_hs_admin_e2e_disabled">L\'administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons privés et les messages directs.</string>
+    <string name="settings_hs_admin_e2e_disabled">L\'administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons et conversations privés.</string>
     <string name="room_member_power_level_default_in">Par défaut dans %1$s</string>
     <string name="direct_room_profile_section_more_settings">Paramètres</string>
     <string name="direct_room_profile_encrypted_subtitle">Les messages ici sont chiffrés de bout en bout.
 \n
 \nVos messages sont sécurisés avec des verrous et seuls vous et le destinataire en possédez la clé unique pour les déverrouiller.</string>
-    <string name="sent_a_bot_buttons">Boutons de bot</string>
+    <string name="sent_a_bot_buttons">Boutons de robot</string>
     <string name="send_a_sticker">Autocollants</string>
-    <string name="login_error_outdated_homeserver_warning_content">Ce serveur d\'accueil utilise une ancienne version. Demandez à l\'administrateur de votre serveur d\'accueil de le mettre à jour. Vous pouvez continuer, mais certains fonctionnalités peuvent ne pas fonctionner correctement.</string>
-    <string name="login_server_url_form_common_notice">Entrez l\'adresse du serveur que vous voulez utiliser</string>
-    <string name="secure_backup_banner_setup_line2">Sécurité contre la perte d\'accès aux messages et données chiffrées</string>
+    <string name="login_error_outdated_homeserver_warning_content">Ce serveur d\'accueil utilise une version obsolète. Demandez à l’administrateur de votre serveur d\'accueil de le mettre à jour. Vous pouvez continuer, mais certaines fonctionnalités peuvent ne pas fonctionner correctement.</string>
+    <string name="login_server_url_form_common_notice">Entrez l’adresse du serveur que vous voulez utiliser</string>
+    <string name="secure_backup_banner_setup_line2">Sécurité contre la perte d’accès aux messages et données chiffrées</string>
     <string name="disabled_integration_dialog_content">Activer « Autoriser les intégrations » dans les paramètres pour faire ceci.</string>
     <string name="settings_show_room_member_state_events">Afficher les événement des membres du salon</string>
     <string name="settings_troubleshoot_test_notification_notice">Veuillez cliquer sur la notification. Si vous ne voyez pas la notification, veuillez vérifier les paramètres système.</string>
@@ -2265,9 +2265,9 @@
     <string name="template_call_failed_no_connection">Appel échoué</string>
     <string name="direct_room_encryption_enabled_tile_description">Les messages de ce salon sont chiffrés de bout en bout.</string>
     <string name="room_created_summary_item_by_you">Vous avez créé et configuré ce salon.</string>
-    <string name="auth_pin_confirm_to_disable_title">Confirmer le code pour le désactiver</string>
-    <string name="template_settings_security_pin_code_grace_period_summary_off">Le code est requis à l\'ouverture d\'${app_name}.</string>
-    <string name="template_settings_security_pin_code_grace_period_summary_on">Le code est demandé après 2 minutes d\'inutilisation d\'${app_name}.</string>
+    <string name="auth_pin_confirm_to_disable_title">Confirmer le code PIN pour le désactiver</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Le code est requis à l’ouverture d’${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Le code est demandé après 2 minutes d\'inutilisation d’${app_name}.</string>
     <string name="settings_security_pin_code_grace_period_title">Demander le code après 2 minutes</string>
     <string name="settings_security_pin_code_notifications_summary_off">Afficher uniquement le numéro de messages non-lus dans une simple notification.</string>
     <string name="settings_security_pin_code_notifications_summary_on">Afficher les détails comme les noms des salons et le contenu du message.</string>
@@ -2275,27 +2275,27 @@
     <string name="template_settings_security_pin_code_use_biometrics_summary_off">Le code est la seule façon de déverrouiller ${app_name}.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Activer les données biométriques comme les empreintes digitales ou la reconnaissance faciale.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Activer les données biométriques</string>
-    <string name="settings_security_pin_code_summary">Si vous voulez réinitialiser votre code, appuyez sur Code oublié pour vous déconnecter et le réinitialiser.</string>
+    <string name="settings_security_pin_code_summary">Si vous voulez réinitialiser votre code, appuyez sur Code PIN oublié pour vous déconnecter et le réinitialiser.</string>
     <string name="settings_security_pin_code_title">Activer le code</string>
     <string name="settings_security_application_protection_screen_title">Configurer la protection</string>
-    <string name="settings_security_application_protection_summary">Protéger l\'accès en utilisant un code et des données biométriques.</string>
-    <string name="settings_security_application_protection_title">Protéger l\'accès</string>
+    <string name="settings_security_application_protection_summary">Protéger l’accès en utilisant un code PIN et des données biométriques.</string>
+    <string name="settings_security_application_protection_title">Protéger l’accès</string>
     <string name="auth_pin_reset_content">Pour réinitialiser votre code, vous devez vous reconnecter et en créer un nouveau.</string>
-    <string name="auth_pin_new_pin_action">Nouveau code</string>
-    <string name="auth_pin_reset_title">Réinitialiser le code</string>
-    <string name="auth_pin_forgot">Code oublié \?</string>
-    <string name="auth_pin_title">Entrez votre code</string>
-    <string name="create_pin_confirm_failure">Impossible de valider le code, veillez en composer un nouveau.</string>
-    <string name="create_pin_confirm_title">Confirmez le code</string>
-    <string name="create_pin_title">Choisissez un code de sécurité</string>
-    <string name="too_many_pin_failures">Trop d\'erreurs, vous avez été déconnecté</string>
+    <string name="auth_pin_new_pin_action">Nouveau code PIN</string>
+    <string name="auth_pin_reset_title">Réinitialiser le code PIN</string>
+    <string name="auth_pin_forgot">Code PIN oublié \?</string>
+    <string name="auth_pin_title">Entrez votre code PIN</string>
+    <string name="create_pin_confirm_failure">Impossible de valider le code PIN, veillez en composer un nouveau.</string>
+    <string name="create_pin_confirm_title">Confirmez le code PIN</string>
+    <string name="create_pin_title">Choisissez un code PIN par sécurité</string>
+    <string name="too_many_pin_failures">Trop d’erreurs, vous avez été déconnecté</string>
     <string name="wrong_pin_message_last_remaining_attempt">Attention ! Dernière tentative avant déconnexion !</string>
     <plurals name="wrong_pin_message_remaining_attempts">
         <item quantity="one">Mauvais code, %d tentative restante</item>
         <item quantity="other">Mauvais code, %d tentatives restantes</item>
     </plurals>
-    <string name="error_opening_banned_room">Impossible d\'ouvrir un salon dont vous êtes exclus.</string>
-    <string name="room_error_not_found">Impossible de trouver ce salon. Assurez-vous qu\'il existe.</string>
+    <string name="error_opening_banned_room">Impossible d’ouvrir un salon dont vous êtes banni.</string>
+    <string name="room_error_not_found">Impossible de trouver ce salon. Assurez-vous qu’il existe.</string>
     <string name="universal_link_malformed">Le lien est malformé</string>
     <string name="room_join_rules_public_by_you">Vous avez rendu ce salon public à tous ceux qui en connaissent le lien.</string>
     <string name="direct_room_join_rules_invite_by_you">Vous avez rendu ceci uniquement accessible par invitation.</string>
@@ -2303,21 +2303,21 @@
     <string name="direct_room_join_rules_invite">%1$s a rendu ceci uniquement accessible par invitation.</string>
     <string name="room_list_quick_actions_favorite_remove">Supprimer des favoris</string>
     <plurals name="two_and_some_others_read">
-        <item quantity="one">%1$s, %2$s et %3$d autre lecture</item>
-        <item quantity="other">%1$s, %2$s et %3$d autres lectures</item>
+        <item quantity="one">%1$s, %2$s et %3$d autre ont lu</item>
+        <item quantity="other">%1$s, %2$s et %3$d autres ont lu</item>
     </plurals>
-    <string name="labs_show_unread_notifications_as_tab">Ajouter un onglet dédié aux notifications non-lues sur l\'écran principal.</string>
+    <string name="labs_show_unread_notifications_as_tab">Ajouter un onglet dédié aux notifications non-lues sur l’écran principal.</string>
     <string name="create_room_federation_error">Le salon a été créé, mais certaines invitations n’ont pas été envoyées pour la raison suivante :
 \n
 \n%s</string>
     <string name="active_widgets_title">Widgets actifs</string>
     <string name="direct_room_profile_section_more_leave">Quitter</string>
-    <string name="room_profile_section_admin">Actions d\'administrateur</string>
+    <string name="room_profile_section_admin">Actions d’administrateur</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Les messages ici ne sont pas chiffrés de bout en bout.</string>
     <string name="sent_a_reaction">A réagi avec : %s</string>
     <string name="sent_a_poll">Sondage</string>
     <string name="login_signin_matrix_id_password_notice">Si vous ne connaissez pas votre mot de passe, faites précédent et réinitialisez-le.</string>
-    <string name="login_msisdn_notice">Veuillez utiliser le format international (le numéro de téléphone doit commencer avec « + »)</string>
+    <string name="login_msisdn_notice">Veuillez utiliser le format international (le numéro de téléphone doit commencer par « + »)</string>
     <string name="notice_member_no_changes_by_you">Vous n’avez rien changé</string>
     <string name="room_list_quick_actions_favorite_add">Ajouter aux favoris</string>
     <string name="settings_text_message_sent_hint">Code</string>
@@ -2325,7 +2325,7 @@
     <string name="secure_backup_setup">Activer la sauvegarde sécurisée</string>
     <string name="secure_backup_banner_setup_line1">Sauvegarde sécurisée</string>
     <string name="recovery_key_export_saved">La clé de récupération a été enregistrée.</string>
-    <string name="room_no_active_widgets">Aucun widget n\'est activé</string>
+    <string name="room_no_active_widgets">Aucun widget n’est activé</string>
     <string name="room_manage_integrations">Gérer les intégrations</string>
     <string name="active_widget_view_action">VUE</string>
     <string name="notification_unread_notified_messages_and_invitation">%1$s et %2$s</string>
@@ -2336,8 +2336,8 @@
     </plurals>
     <string name="encryption_exported_successfully">Les clés ont bien été exportées</string>
     <plurals name="room_settings_banned_users_count">
-        <item quantity="one">%d utilisateur exclu</item>
-        <item quantity="other">%d utilisateurs exclus</item>
+        <item quantity="one">%d utilisateur banni</item>
+        <item quantity="other">%d utilisateurs bannis</item>
     </plurals>
     <string name="settings_emails_and_phone_numbers_summary">Gérer les e-mails et numéros de téléphone liés à votre compte Matrix</string>
     <string name="settings_emails_and_phone_numbers_title">E-mails et numéros de téléphone</string>
@@ -2352,7 +2352,7 @@
     <string name="settings_secure_backup_reset">Réinitialiser la sauvegarde sécurisée</string>
     <string name="settings_secure_backup_setup">Activer la sauvegarde sécurisée</string>
     <string name="settings_secure_backup_section_title">Sauvegarde sécurisée</string>
-    <string name="room_participants_unban_prompt_msg">Ne plus exclure l\'utilisateur lui permettra de rejoindre le salon.</string>
+    <string name="room_participants_unban_prompt_msg">Révoquer le bannissement de l’utilisateur lui permettra de rejoindre le salon.</string>
     <string name="room_participants_power_level_demote_warning_title">Vous rétrograder vous-même \?</string>
     <string name="room_participants_power_level_demote_warning_prompt">Vous ne pourrez pas annuler cette modification car vous vous rétrogradez vous-même, il ne vous sera pas possible de regagner ces privilèges si vous êtes le dernier utilisateur privilégié de ce salon.</string>
     <string name="room_participants_power_level_demote">Rétrograder</string>
@@ -2361,7 +2361,7 @@
     <string name="settings_secure_backup_section_info">Protection contre la perte d\'accès aux messages et données chiffrées en sauvegardant les clés de chiffrage sur votre serveur.</string>
     <string name="settings_secure_backup_enter_to_setup">Activer sur cet appareil</string>
     <string name="settings_secure_backup_manage">Gérer</string>
-    <string name="settings_show_room_member_state_events_summary">Inclure les événement d\'invitation/ajout/départ/expulsion/exclusion ainsi que les changements d\'avatar et de nom affiché.</string>
+    <string name="settings_show_room_member_state_events_summary">Inclure les événement d’invitation/ajout/départ/expulsion/exclusion ainsi que les changements d’avatar et de nom d’affichage.</string>
     <plurals name="seconds">
         <item quantity="one">%d seconde</item>
         <item quantity="other">%d secondes</item>
@@ -2369,7 +2369,7 @@
     <string name="error_threepid_auth_failed">Assurez-vous d\'avoir cliqué sur le lien envoyé par e-mail.</string>
     <string name="settings_remove_three_pid_confirmation_content">Supprimer %s \?</string>
     <string name="settings_phone_numbers">Numéros de téléphone</string>
-    <string name="settings_emails_empty">Aucune adresse e-mail n\'a été ajoutée à votre compte</string>
+    <string name="settings_emails_empty">Aucune adresse e-mail n’a été ajoutée à votre compte</string>
     <string name="settings_emails">Adresses e-mail</string>
     <string name="settings_phone_number_empty">Aucun numéro de téléphone n’a été ajouté à votre compte</string>
     <string name="search_is_not_supported_in_e2e_room">La recherche dans les espaces chiffrés n\'est pas encore prise en charge.</string>
@@ -2377,41 +2377,41 @@
     <string name="room_participants_action_unignore_prompt_msg">Ne plus ignorer cet utilisateur aura pour effet de ré-afficher ses messages.</string>
     <string name="room_participants_kick_prompt_msg">expulser un utilisateur le supprimera de cet espace.
 \n
-\nPour l’empêcher de revenir, vous devez plutôt les exclure.</string>
+\nPour l’empêcher de revenir, vous devez plutôt le bannir.</string>
     <string name="room_participants_kick_reason">Motif d’expulsion</string>
     <string name="room_participants_kick_title">Expulser l’utilisateur</string>
     <string name="room_participants_action_unignore_title">Ne plus ignorer l’utilisateur</string>
     <string name="call_format_turn_hd_on">Activer la HD</string>
     <string name="call_format_turn_hd_off">Désactiver la HD</string>
     <string name="call_camera_back">Arrière</string>
-    <string name="call_camera_front">Frontal</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Vous n’avez pas la permission de démarrer un appel</string>
-    <string name="no_permissions_to_start_conf_call_in_direct_room">Vous n’avez pas la permission de démarrer une téléconférence</string>
+    <string name="call_camera_front">Frontale</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Vous n’avez pas la permission de lancer un appel</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Vous n’avez pas la permission de lancer une téléconférence</string>
     <string name="reset">Réinitialiser</string>
-    <string name="failed_to_unban">Échec de la révocation de l\'exclusion de l\'utilisateur</string>
+    <string name="failed_to_unban">Échec de la révocation du bannissement de l’utilisateur</string>
     <string name="alert_push_are_disabled_description">Vérifiez vos paramètres pour activer les notifications push</string>
     <string name="save_your_security_key_notice">Stockez votre clé de sécurité en lieu sûr comme un gestionnaire de mots de passe ou un coffre-fort.</string>
     <string name="bottom_sheet_save_your_recovery_key_content">Stockez votre clé de sécurité en lieu sûr comme un gestionnaire de mots de passe ou un coffre-fort.</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Générez une clé de sécurité à stocker en lieu sûr comme un gestionnaire de mots de passe ou un coffre-fort.</string>
-    <string name="settings_troubleshoot_test_push_loop_failed">Erreur de réception du push. Une solution possible est de réinstaller l\'application.</string>
-    <string name="settings_troubleshoot_test_push_loop_success">L\'application reçois le PUSH</string>
-    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">L\'application attend le PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">Erreur de réception du push. La solution pourrait être de réinstaller l’application.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">L’application reçoit le PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">L’application attend le PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">Tester le Push</string>
     <string name="alert_push_are_disabled_title">Les notifications push sont désactivées</string>
     <string name="set_a_security_phrase_notice">Entrez une phrase de sécurité que seul vous connaissez, celle-ci est utilisée pour sécuriser les mots de passe sur le serveur.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Entrez une phrase secrète que seul vous connaissez, et générez une clé de sauvegarde.</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Protection contre la perte d\'accès aux messages et données chiffrées en sauvegardant les clés de chiffrage sur votre serveur.</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Protection contre la perte d’accès aux messages et données chiffrées en sauvegardant les clés de chiffrement sur votre serveur.</string>
     <plurals name="secure_backup_reset_devices_you_can_verify">
-        <item quantity="one">Afficher le périphérique avec lequel vous pouvez dès à présent vérifier</item>
-        <item quantity="other">Afficher les %d périphériques avec lesquels vous pouvez dès à présent vérifier</item>
+        <item quantity="one">Afficher le périphérique avec lequel vous pouvez vérifier</item>
+        <item quantity="other">Afficher les %d périphériques avec lesquels vous pouvez vérifier</item>
     </plurals>
     <string name="delete_account_data_warning">Supprimer les données du compte de type %1$s \?
 \n
 \nÀ utiliser avec précaution, ceci peut entraîner des comportements inattendus.</string>
     <string name="sent_verification_conclusion">Conclusion de la vérification</string>
     <string name="warning_unsaved_change_discard">Annuler les changements</string>
-    <string name="warning_unsaved_change">Il y a des modifications non-enregistrées. Annuler les changements \?</string>
-    <string name="warning_room_not_created_yet">Le salon n\'est pas encore créé. Annuler la création du salon \?</string>
+    <string name="warning_unsaved_change">Il y a des modifications non-enregistrées. Annuler les changements \?</string>
+    <string name="warning_room_not_created_yet">Le salon n\'est pas encore créé. Annuler la création du salon \?</string>
     <string name="room_list_quick_actions_low_priority_remove">Retirer de la priorité faible</string>
     <string name="room_list_quick_actions_low_priority_add">Ajouter à la priorité faible</string>
     <string name="rotate_and_crop_screen_title">Pivoter et rogner</string>
@@ -2420,63 +2420,252 @@
     <string name="create_room_topic_hint">Sujet</string>
     <string name="create_room_topic_section">Sujet du salon (facultatif)</string>
     <string name="create_room_name_section">Nom du salon</string>
-    <string name="room_member_open_or_create_dm">Message direct</string>
-    <string name="send_bug_report_include_key_share_history">Inclure l\'historique d\'échange de clés</string>
+    <string name="room_member_open_or_create_dm">Conversation privée</string>
+    <string name="send_bug_report_include_key_share_history">Inclure l’historique d’échange de clés</string>
     <string name="no_more_results">Plus aucun résultat</string>
-    <string name="settings_export_trail">Exporter le rapport d\'audit</string>
+    <string name="settings_export_trail">Exporter le rapport d’audit</string>
     <string name="room_created_summary_no_topic_creation_text">%s pour permettre aux gens de connaître le sujet de ce salon.</string>
-    <string name="this_is_the_beginning_of_dm">Ceci est le début de l\'historique de vos messages directs avec %s.</string>
+    <string name="this_is_the_beginning_of_dm">Ceci est le début de l’historique de votre conversation privée avec %s.</string>
     <string name="this_is_the_beginning_of_room_no_name">Ceci est le début de cette conversation.</string>
     <string name="this_is_the_beginning_of_room">Ceci est le début de %s.</string>
-    <string name="room_settings_enable_encryption_no_permission">Vous n\'avez pas le droit d\'activer le chiffrement dans ce salon.</string>
+    <string name="room_settings_enable_encryption_no_permission">Vous n\'avez pas le droit d’activer le chiffrement dans ce salon.</string>
     <string name="create_room_in_progress">Création du salon…</string>
     <string name="create_room_alias_invalid">Certains caractères sont interdits</string>
     <string name="create_room_alias_empty">Veuillez fournir une adresse de salon</string>
     <string name="create_room_alias_already_in_use">Cette adresse est déjà utilisée</string>
     <string name="create_room_alias_hint">Adresse du salon</string>
-    <string name="a11y_create_direct_message_by_qr_code">Créer une nouvelle conversation directe en scannant un QR Code</string>
+    <string name="a11y_create_direct_message_by_qr_code">Créer une nouvelle conversation privée en scannant un code QR</string>
     <string name="attachment_viewer_item_x_of_y">%1$d de %2$d</string>
-    <string name="a11y_create_direct_message_by_mxid">Créer une nouvelle conversation directe avec un identifiant Matrix</string>
-    <string name="identity_server_consent_dialog_content">Dans le but de découvrir des contacts que vous connaîtriez, acceptez-vous d\'envoyer vos données de contact (numéros de téléphone et/ou e-mails) au serveur d\'identité configuré (%1$s) \?
+    <string name="a11y_create_direct_message_by_mxid">Créer une nouvelle conversation privée avec un identifiant Matrix</string>
+    <string name="identity_server_consent_dialog_content">Dans le but de découvrir des contacts que vous connaîtriez, acceptez-vous d\'envoyer vos données de contact (numéros de téléphone et/ou e-mails) au serveur d’identité configuré (%1$s) \?
 \n
-\nPour une meilleure protection de la vie privée, les données seront condensées (hash) avant l\'envoi.</string>
+\nPour une meilleure protection de la vie privée, les données seront condensées (hash) avant l’envoi.</string>
     <string name="identity_server_consent_dialog_title">Envoyer des e-mails et des numéros de téléphone</string>
     <string name="settings_discovery_consent_action_give_consent">Autoriser</string>
     <string name="settings_discovery_consent_action_revoke">Révoquer mon autorisation</string>
-    <string name="settings_discovery_consent_notice_off">Vous n\'avez pas donné votre autorisation pour envoyer des e-mails et des numéros de téléphone à ce serveur d\'identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
-    <string name="settings_discovery_consent_notice_on">Vous avez donné votre autorisation pour envoyer des e-mails et des numéros de téléphone à ce serveur d\'identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
+    <string name="settings_discovery_consent_notice_off">Vous n’avez pas donné votre autorisation pour envoyer des e-mails et des numéros de téléphone à ce serveur d’identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
+    <string name="settings_discovery_consent_notice_on">Vous avez donné votre autorisation pour envoyer des e-mails et des numéros de téléphone à ce serveur d’identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
     <string name="settings_discovery_consent_title">Envoyer des e-mails et des numéros de téléphone</string>
     <string name="direct_room_user_list_suggestions_title">Suggestions</string>
     <string name="direct_room_user_list_contacts_title">Contacts</string>
     <string name="direct_room_user_list_known_title">Utilisateurs connus</string>
     <string name="direct_room_user_list_recent_title">Récent</string>
-    <string name="qr_code">QR code</string>
-    <string name="add_by_qr_code">Ajouter avec un QR Code</string>
+    <string name="qr_code">code QR</string>
+    <string name="add_by_qr_code">Ajouter avec un code QR</string>
     <string name="user_directory_search_hint">Chercher par nom ou identifiant</string>
-    <string name="permissions_denied_add_contact">Autoriser l\'accès à vos contacts.</string>
-    <string name="permissions_denied_qr_code">Pour scanner un QR code, vous devez autoriser l\'accès à votre appareil photo.</string>
-    <string name="start_chatting">Débuter la discussion</string>
+    <string name="permissions_denied_add_contact">Autoriser l’accès à vos contacts.</string>
+    <string name="permissions_denied_qr_code">Pour scanner un code QR, vous devez autoriser l’accès à votre appareil photo.</string>
+    <string name="start_chatting">Commencer une conversation</string>
     <string name="matrix_to_card_title">Lien Matrix</string>
     <string name="qr_code_not_scanned">Code QR non scanné !</string>
     <string name="invalid_qr_code_uri">Code QR invalide (URI invalide) !</string>
     <string name="cannot_dm_self">Impossible avec vous-même !</string>
-    <string name="share_by_text">Partager par texto</string>
+    <string name="share_by_text">Partager par SMS</string>
     <string name="phone_book_perform_lookup">Rechercher des contacts sur Matrix</string>
-    <string name="room_settings_set_avatar">Définir l\'avatar</string>
-    <string name="identity_server_user_consent_not_provided">Le consentement de l\'utilisateur n\'a pas été fourni.</string>
-    <string name="user_code_info_text">Partagez ce code avec des gens pour qu\'ils puissent le scanner pour vous ajouter et commencer à discuter.</string>
+    <string name="room_settings_set_avatar">Définir l’avatar</string>
+    <string name="identity_server_user_consent_not_provided">Le consentement de l\'utilisateur n’a pas été fourni.</string>
+    <string name="user_code_info_text">Partagez ce code avec des gens pour qu’ils puissent le scanner pour vous ajouter et commencer à discuter.</string>
     <string name="user_code_my_code">Mon code</string>
     <string name="user_code_share">Partager mon code</string>
     <string name="user_code_scan">Scanner un code QR</string>
-    <string name="not_a_valid_qr_code">Ce n\'est pas un code QR matrix valide</string>
+    <string name="not_a_valid_qr_code">Ce n’est pas un code QR matrix valide</string>
     <string name="template_invite_friends_rich_title">🔐️ Rejoins-moi sur ${app_name}</string>
     <string name="template_invite_friends_text">Salut, parle-moi sur ${app_name} : %s</string>
     <string name="invite_friends">Ajouter des amis</string>
-    <string name="add_people">Ajouter des gens</string>
+    <string name="add_people">Ajouter des personnes</string>
     <string name="topic_prefix">"Sujet : "</string>
     <string name="add_a_topic_link_text">Ajouter un sujet</string>
-    <string name="create_room_disable_federation_description">Vous devriez l\'activer si le salon n\'est utilisé que pour collaborer avec des équipes internes sur votre serveur d\'accueil. Ceci ne peut pas être changé plus tard.</string>
-    <string name="create_room_disable_federation_title">Bloquer les personnes qui ne sont pas membres de %s de rejoindre ce salon</string>
-    <string name="hide_advanced">Masquer les avancés</string>
-    <string name="show_advanced">Afficher les avancés</string>
+    <string name="create_room_disable_federation_description">Vous devriez l’activer si le salon n’est utilisé que pour collaborer avec des équipes internes sur votre serveur d’accueil. Ceci ne peut pas être changé plus tard.</string>
+    <string name="create_room_disable_federation_title">Empêcher les personnes qui ne sont pas membres de %s de rejoindre ce salon</string>
+    <string name="hide_advanced">Masquer les paramètres avancés</string>
+    <string name="show_advanced">Afficher les paramètres avancés</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Vous ne pouvez pas faire ceci depuis ${app_name} mobile</string>
+    <string name="dev_tools_event_content_hint">Contenu de l’événement</string>
+    <string name="dev_tools_success_state_event">Événement d’état envoyé !</string>
+    <string name="dev_tools_success_event">Événement envoyé !</string>
+    <string name="dev_tools_error_malformed_event">Événement malformé</string>
+    <string name="dev_tools_error_no_message_type">Type de message manquant</string>
+    <string name="dev_tools_error_no_content">Pas de contenu</string>
+    <string name="dev_tools_form_hint_event_content">Contenu d’événement</string>
+    <string name="dev_tools_form_hint_state_key">Clé d’état</string>
+    <string name="dev_tools_form_hint_type">Type</string>
+    <string name="dev_tools_send_custom_state_event">Envoyer des événements d’état personnalisés</string>
+    <string name="dev_tools_edit_content">Modifier le contenu</string>
+    <string name="dev_tools_state_event">Événements d’état</string>
+    <string name="dev_tools_send_state_event">Envoyer un événement d’état</string>
+    <string name="dev_tools_send_custom_event">Envoyer un événement personnalisé</string>
+    <string name="dev_tools_explore_room_state">Explorer l’état du salon</string>
+    <string name="dev_tools_menu_name">Outils de développement</string>
+    <string name="a11y_view_read_receipts">Voir les accusés de réception</string>
+    <string name="a11y_rule_notify_off">Ne pas notifier</string>
+    <string name="a11y_rule_notify_silent">Notifier sans son</string>
+    <string name="a11y_rule_notify_noisy">Notifier avec son</string>
+    <string name="a11y_error_message_not_sent">Message non envoyé suite à une erreur</string>
+    <string name="a11y_checked">Vérifié</string>
+    <string name="a11y_close_emoji_picker">Fermer le sélecteur d’émojis</string>
+    <string name="a11y_open_emoji_picker">Ouvrir le sélecteur d’émojis</string>
+    <string name="a11y_trust_level_trusted">Reconnu</string>
+    <string name="a11y_trust_level_warning">Douteux</string>
+    <string name="a11y_trust_level_default">Niveau de confiance par défaut</string>
+    <string name="a11y_selected">Sélectionné</string>
+    <string name="a11y_video">Vidéo</string>
+    <string name="a11y_unsent_draft">Ce salon a des brouillons non envoyés</string>
+    <string name="a11y_error_some_message_not_sent">Certains messages n’ont pas été envoyés</string>
+    <string name="a11y_delete_avatar">Supprimer l’avatar</string>
+    <string name="a11y_change_avatar">Changer l’avatar</string>
+    <string name="a11y_image">Image</string>
+    <string name="a11y_import_key_from_file">Importer la clé depuis le fichier</string>
+    <string name="a11y_open_widget">Ouvrir les widgets</string>
+    <string name="a11y_screenshot">Capture d’écran</string>
+    <string name="authentication_error">Échec d’authentification</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} requiert que vous saisissiez vos identifiants à nouveau pour effectuer cette action.</string>
+    <string name="re_authentication_activity_title">Une nouvelle authentification est requise</string>
+    <string name="call_transfer_users_tab_title">Utilisateurs</string>
+    <string name="call_transfer_failure">Une erreur s’est produite lors du transfert de l’appel</string>
+    <string name="call_transfer_title">Transférer</string>
+    <string name="call_transfer_connect_action">Rejoindre</string>
+    <string name="call_transfer_consult_first">Consulter d’abord</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 appel en cours (%1$d) ⋅ 1 appel en attente</item>
+        <item quantity="other">1 appel en cours (%1$d) ⋅ %2$d appels en attente</item>
+    </plurals>
+    <plurals name="call_only_paused">
+        <item quantity="one">Appel en attente</item>
+        <item quantity="other">%1$d appels en attente</item>
+    </plurals>
+    <string name="call_only_active">Appel en cours (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">Il y a eu une erreur lors de la recherche du numéro de téléphone</string>
+    <string name="call_dial_pad_title">Pavé de numérotation</string>
+    <string name="call_tile_call_back">Rappeler</string>
+    <string name="call_tile_ended">Cet appel est terminé</string>
+    <string name="call_tile_other_declined">%1$s a refusé cet appel</string>
+    <string name="call_tile_you_declined">Vous avez refusé cet appel %1$s</string>
+    <string name="call_tile_in_call">Vous êtes actuellement dans cet appel</string>
+    <string name="call_tile_other_started_call">%1$s a lancé un appel</string>
+    <string name="call_tile_you_started_call">Vous avez lancé un appel</string>
+    <string name="settings_security_pin_code_change_pin_summary">Changer votre code PIN actuel</string>
+    <string name="settings_security_pin_code_change_pin_title">Changer le code PIN</string>
+    <plurals name="entries">
+        <item quantity="one">%d entrée</item>
+        <item quantity="other">%d entrées</item>
+    </plurals>
+    <string name="failed_to_initialize_cross_signing">Échec de la mise en place de la signature croisée</string>
+    <string name="default_message_emote_snow">envoie de la neige ❄️</string>
+    <string name="default_message_emote_confetti">envoie des confettis 🎉</string>
+    <string name="command_snow">Envoie le message avec de la neige</string>
+    <string name="command_confetti">Envoie le message avec des confettis</string>
+    <string name="settings_server_upload_size_unknown">La limite n’est pas connue.</string>
+    <string name="settings_server_upload_size_content">Votre serveur d’accueil accepte les pièces jointes (fichiers, médias, etc.) jusqu’à %s.</string>
+    <string name="settings_server_upload_size_title">Taille maximum pour des envois sur ce serveur</string>
+    <string name="settings_server_version">Version du serveur</string>
+    <string name="settings_server_name">Nom du serveur</string>
+    <string name="login_clear_homeserver_history">Effacer l’historique</string>
+    <string name="login_social_sso">authentification unique</string>
+    <string name="login_social_signin_with">Se connecter avec %s</string>
+    <string name="login_social_signup_with">S’inscrire avec %s</string>
+    <string name="login_social_continue_with">Poursuivre avec %s</string>
+    <string name="login_social_continue">Ou</string>
+    <string name="room_list_quick_actions_room_settings">Paramètres du salon</string>
+    <string name="room_preview_no_preview_join">Impossible d’afficher un aperçu du salon. Voulez-vous le rejoindre \?</string>
+    <string name="room_preview_not_found">Ce salon n’est pas accessible en ce moment.
+\nRéessayez plus tard, ou demandez à un administrateur de ce salon de vérifier que vous pouvez y accéder.</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Partir de la téléconférence actuelle et basculer sur une autre \?</string>
+    <string name="room_settings_room_version_title">Version du salon</string>
+    <string name="room_alias_publish_to_directory_error">Impossible de récupérer la visibilité du répertoire de salons actuel (%1$s).</string>
+    <string name="room_alias_publish_to_directory">Publier ce salon dans le répertoire public de %1$s \?</string>
+    <string name="room_alias_action_unpublish">Dé-publier cette adresse</string>
+    <string name="room_alias_action_publish">Publier cette adresse</string>
+    <string name="room_alias_local_address_add">Ajouter une adresse locale</string>
+    <string name="room_alias_local_address_empty">Ce salon n’a pas d’adresse locale</string>
+    <string name="room_alias_local_address_subtitle">Définissez des adresses pour ce salon afin que les utilisateurs puissent le trouver via votre serveur d’accueil(%1$s)</string>
+    <string name="room_alias_local_address_title">Adresse locale</string>
+    <string name="room_alias_address_hint">Nouvelle adresse publiée (par ex. #alias:serveur)</string>
+    <string name="room_alias_address_empty">Aucune adresse publiée pour le moment.</string>
+    <string name="room_alias_address_empty_can_add">Aucune adresse publiée pour le moment, ajoutez en une ci-dessous.</string>
+    <string name="room_alias_publish">Publier ce salon dans le répertoire public de %1$s \?</string>
+    <string name="room_alias_delete_confirmation">Supprimer l’adresse « %1$s » \?</string>
+    <string name="room_alias_unpublish_confirmation">Dé-publier l’adresse « %&amp;$s » \?</string>
+    <string name="room_alias_published_alias_add_manually_submit">Publier</string>
+    <string name="room_alias_published_alias_add_manually">Publier une nouvelle adresse manuellement</string>
+    <string name="room_alias_published_other">Autres adresses publiées :</string>
+    <string name="room_alias_main_address_hint">Adresse principale</string>
+    <string name="room_alias_published_alias_main">Ceci est l’adresse principale</string>
+    <string name="room_alias_published_alias_subtitle">Les adresses publiées peuvent être utilisées par n’importe qui pour rejoindre votre salon. Pour pouvoir publier une adresse, elle doit d’abord être définie comme adresse locale.</string>
+    <string name="room_alias_published_alias_title">Adresses publiées</string>
+    <string name="room_alias_title">Adresses du salon</string>
+    <string name="room_settings_alias_subtitle">Voir et gérer les adresses de ce salon, et sa visibilité dans le répertoire des salons.</string>
+    <string name="room_settings_alias_title">Adresses du salon</string>
+    <string name="room_settings_room_access_title">Accès au salon</string>
+    <string name="room_settings_room_read_history_dialog_subtitle">Les modifications de visibilité de l’historique ne s’appliqueront qu’aux messages ultérieurs dans ce salon. La visibilité de l’historique actuel demeurera inchangée.</string>
+    <string name="settings_show_emoji_keyboard_summary">Ajoute un bouton sur le compositeur pour ouvrir le clavier des emojis</string>
+    <string name="settings_show_emoji_keyboard">Afficher le clavier des emojis</string>
+    <string name="settings_chat_effects_description">Utilisez la commande /confetti ou envoyez un message contenant ❄️ ou 🎉</string>
+    <string name="settings_chat_effects_title">Afficher les animations de conversation</string>
+    <string name="room_permissions_change_topic">Changer le sujet</string>
+    <string name="room_permissions_upgrade_the_room">Mettre à niveau le salon</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Envoyer des événements m.room.server_acl</string>
+    <string name="room_permissions_change_permissions">Changer les permissions</string>
+    <string name="room_permissions_change_room_name">Changer le nom du salon</string>
+    <string name="room_permissions_change_history_visibility">Changer la visibilité de l’historique</string>
+    <string name="room_permissions_enable_room_encryption">Activer le chiffrement du salon</string>
+    <string name="room_permissions_change_main_address_for_the_room">Changer l’adresse principale du salon</string>
+    <string name="room_permissions_change_room_avatar">Changer l’avatar du salon</string>
+    <string name="room_permissions_modify_widgets">Modifier les widgets</string>
+    <string name="room_permissions_notify_everyone">Notifier tout le monde</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Supprimer les messages des autres</string>
+    <string name="room_permissions_ban_users">Bannir des utilisateurs</string>
+    <string name="room_permissions_kick_users">Expulser des utilisateurs</string>
+    <string name="room_permissions_change_settings">Mettre à jour les paramètres</string>
+    <string name="room_permissions_invite_users">Inviter des utilisateurs</string>
+    <string name="room_permissions_send_messages">Envoyer des messages</string>
+    <string name="room_permissions_default_role">Rôle par défaut</string>
+    <string name="room_permissions_notice_read_only">Vous n’avez pas la permission de changer les rôles requis pour changer différentes parties du salon</string>
+    <string name="room_permissions_notice">Indiquer les rôles requis pour changer les différentes parties du salon</string>
+    <string name="room_permissions_title">Permissions</string>
+    <string name="room_settings_permissions_subtitle">Voir et changer les rôles requis pour changer les différentes parties du salon.</string>
+    <string name="room_settings_permissions_title">Permissions du salon</string>
+    <string name="room_participants_leave_private_warning">Ce salon n’est pas public. Vous ne pourrez pas le rejoindre sans invitation.</string>
+    <string name="call_held_by_you">Vous avez mis l’appel en attente</string>
+    <string name="call_held_by_user">%s a mis l’appel en attente</string>
+    <string name="call_hold_action">Mettre en attente</string>
+    <string name="call_resume_action">Reprendre</string>
+    <string name="error_unauthorized">Non autorisé, informations d’authentification manquantes</string>
+    <string name="dialog_edit_hint">Nouvelle valeur</string>
+    <string name="action_return">Revenir</string>
+    <string name="action_unpublish">Dé-publier</string>
+    <string name="action_switch">Changer</string>
+    <string name="action_add">Ajouter</string>
+    <string name="system_theme">Comme le système</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Vous avez modifié les adresses de ce salon.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s a modifié les adresses de ce salon.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Vous avez modifié les adresses principale et alternative de ce salon.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s a modifié les adresses principale et alternative de ce salon.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Vous avez modifié les adresses alternatives de ce salon.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s a modifié les adresses alternatives de ce salon.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Vous avez supprimé l’adresse alternative %2$s de ce salon.</item>
+        <item quantity="other">Vous avez supprimé les adresses alternatives %2$s de ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s a supprimé l’adresse alternative %2$s de ce salon.</item>
+        <item quantity="other">%1$s a supprimé les adresses alternatives %2$s de ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Vous avez ajouté %2$s comme adresse alternative pour ce salon.</item>
+        <item quantity="other">Vous avez ajouté %2$s comme adresses alternatives pour ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s a ajouté %2$s comme adresse alternative pour ce salon.</item>
+        <item quantity="other">%1$s a ajouté %2$s comme adresses alternatives pour ce salon.</item>
+    </plurals>
+    <string name="initial_sync_start_downloading">Synchronisation initiale :
+\nTéléchargement des données…</string>
+    <string name="initial_sync_start_server_computing">Synchronisation initiale :
+\nEn attente de la réponse du serveur…</string>
+    <string name="notice_widget_jitsi_modified_by_you">Vous avez modifié la téléconférence</string>
+    <string name="notice_widget_jitsi_modified">%1$s a modifié la téléconférence</string>
+    <string name="notice_widget_jitsi_removed_by_you">Vous avez mis fin à la téléconférence</string>
+    <string name="notice_widget_jitsi_removed">%1$s a mis fin à la téléconférence</string>
+    <string name="notice_widget_jitsi_added_by_you">Vous avez démarré la téléconférence</string>
+    <string name="notice_widget_jitsi_added">Téléconférence démarrée par %1$s</string>
 </resources>
\ No newline at end of file

From 8b867086aa546c957f72e5f99f6d7ed08a61f9e8 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Sun, 7 Mar 2021 19:53:59 +0000
Subject: [PATCH 259/578] Translated using Weblate (Swedish)

Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 6cce5c8c92..87f7144994 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2645,4 +2645,20 @@
     <string name="a11y_import_key_from_file">Importera nyckel från fil</string>
     <string name="a11y_open_widget">Öppna widgets</string>
     <string name="a11y_screenshot">Skärmdump</string>
+    <string name="dev_tools_event_content_hint">Händelseinnehåll</string>
+    <string name="dev_tools_success_state_event">Lägeshändelse skickad!</string>
+    <string name="dev_tools_success_event">Händelse skickad!</string>
+    <string name="dev_tools_error_malformed_event">Felformaterad händelse</string>
+    <string name="dev_tools_error_no_message_type">Meddelandetyp saknas</string>
+    <string name="dev_tools_error_no_content">Inget innehåll</string>
+    <string name="dev_tools_form_hint_event_content">Händelseinnehåll</string>
+    <string name="dev_tools_form_hint_state_key">Lägesnyckel</string>
+    <string name="dev_tools_form_hint_type">Typ</string>
+    <string name="dev_tools_send_custom_state_event">Skicka anpassad lägeshändelse</string>
+    <string name="dev_tools_edit_content">Redigera innehåll</string>
+    <string name="dev_tools_state_event">Lägeshändelser</string>
+    <string name="dev_tools_send_state_event">Skicka lägeshändelse</string>
+    <string name="dev_tools_send_custom_event">Skicka anpassad rumshändelse</string>
+    <string name="dev_tools_explore_room_state">Utforska rumsläge</string>
+    <string name="dev_tools_menu_name">Utvecklingsverktyg</string>
 </resources>
\ No newline at end of file

From b373957b6b1b20a0302cd68528d760740efaf6bd Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 8 Mar 2021 23:05:32 +0000
Subject: [PATCH 260/578] Translated using Weblate (German)

Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
---
 fastlane/metadata/android/de/changelogs/40101000.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/de/changelogs/40101000.txt

diff --git a/fastlane/metadata/android/de/changelogs/40101000.txt b/fastlane/metadata/android/de/changelogs/40101000.txt
new file mode 100644
index 0000000000..03a85ba86a
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: VoIP-Verbesserung (Audio- und Video-Anrufe in Direktnachrichten) und Fehlerkorrekturen!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.0

From f7abda5d1ff5f5c6322b02ca6807f7921871dacf Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 9 Mar 2021 19:47:10 +0000
Subject: [PATCH 261/578] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
---
 fastlane/metadata/android/uk/changelogs/40101000.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/40101000.txt

diff --git a/fastlane/metadata/android/uk/changelogs/40101000.txt b/fastlane/metadata/android/uk/changelogs/40101000.txt
new file mode 100644
index 0000000000..36870f5ef7
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: поліпшення VoIP (аудіо та відео дзвінки в DM) та виправлення помилок!
+Повний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.1.0

From 8356d18a67dc39ad06f381366ee8fddb4cbfc595 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 14:49:52 +0100
Subject: [PATCH 262/578] Improve Snackbar duration (Fixes #2929)

---
 .idea/dictionaries/bmarty.xml                 |  1 +
 CHANGES.md                                    |  1 +
 .../im/vector/app/core/extensions/TextView.kt |  4 +--
 .../vector/app/core/platform/SnackbarExt.kt   | 32 +++++++++++++++++++
 .../app/core/platform/VectorBaseActivity.kt   |  4 +--
 .../app/core/platform/VectorBaseFragment.kt   |  5 +--
 .../home/room/detail/RoomDetailFragment.kt    | 12 +++----
 .../roomdirectory/PublicRoomsFragment.kt      |  5 ++-
 8 files changed, 46 insertions(+), 18 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/platform/SnackbarExt.kt

diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml
index 4de90e9405..4585842153 100644
--- a/.idea/dictionaries/bmarty.xml
+++ b/.idea/dictionaries/bmarty.xml
@@ -31,6 +31,7 @@
       <w>signin</w>
       <w>signout</w>
       <w>signup</w>
+      <w>snackbar</w>
       <w>ssss</w>
       <w>sygnal</w>
       <w>threepid</w>
diff --git a/CHANGES.md b/CHANGES.md
index 586291e9c7..a69e1f866b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Improvements 🙌:
  - Add tooltip for room quick actions
  - Pre-share session keys when opening a room or start typing (#2771)
  - Sending is now queuing by room and not uniquely to the session
+ - Improve Snackbar duration (#2929)
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)
diff --git a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
index b7f97dc6f7..574e25a5ee 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt
@@ -32,8 +32,8 @@ import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.isVisible
-import com.google.android.material.snackbar.Snackbar
 import im.vector.app.R
+import im.vector.app.core.platform.showOptimizedSnackbar
 import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.features.themes.ThemeUtils
 
@@ -116,7 +116,7 @@ fun TextView.copyOnLongClick() {
                 ?.text
                 ?.let { text ->
                     copyToClipboard(view.context, text, false)
-                    Snackbar.make(view, view.resources.getString(R.string.copied_to_clipboard), Snackbar.LENGTH_SHORT).show()
+                    view.showOptimizedSnackbar(view.resources.getString(R.string.copied_to_clipboard))
                 }
         true
     }
diff --git a/vector/src/main/java/im/vector/app/core/platform/SnackbarExt.kt b/vector/src/main/java/im/vector/app/core/platform/SnackbarExt.kt
new file mode 100644
index 0000000000..6cdcfabe63
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/platform/SnackbarExt.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.platform
+
+import android.view.View
+import com.google.android.material.snackbar.Snackbar
+
+private const val MIN_SNACKBAR_DURATION = 2000
+private const val MAX_SNACKBAR_DURATION = 8000
+private const val DURATION_PER_LETTER = 50
+
+fun View.showOptimizedSnackbar(message: String) {
+    Snackbar.make(this, message, getDuration(message)).show()
+}
+
+private fun getDuration(message: String): Int {
+    return (message.length * DURATION_PER_LETTER).coerceIn(MIN_SNACKBAR_DURATION, MAX_SNACKBAR_DURATION)
+}
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 43c96d2468..b35d582a00 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -597,9 +597,7 @@ abstract class VectorBaseActivity<VB: ViewBinding> : AppCompatActivity(), HasScr
      * ========================================================================================== */
 
     fun showSnackbar(message: String) {
-        getCoordinatorLayout()?.let {
-            Snackbar.make(it, message, Snackbar.LENGTH_SHORT).show()
-        }
+        getCoordinatorLayout()?.showOptimizedSnackbar(message)
     }
 
     fun showSnackbar(message: String, @StringRes withActionTitle: Int?, action: (() -> Unit)?) {
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index 0b951fb5a2..b692ea3703 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -193,10 +193,7 @@ abstract class VectorBaseFragment<VB: ViewBinding> : BaseMvRxFragment(), HasScre
     }
 
     protected fun showErrorInSnackbar(throwable: Throwable) {
-        vectorBaseActivity.getCoordinatorLayout()?.let {
-            Snackbar.make(it, errorFormatter.toHumanReadable(throwable), Snackbar.LENGTH_SHORT)
-                    .show()
-        }
+        vectorBaseActivity.getCoordinatorLayout()?.showOptimizedSnackbar(errorFormatter.toHumanReadable(throwable))
     }
 
     protected fun showLoadingDialog(message: CharSequence? = null, cancelable: Boolean = false) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index d51ed08083..c627a4a94b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -69,7 +69,6 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.rxbinding3.view.focusChanges
 import com.jakewharton.rxbinding3.widget.textChanges
 import com.vanniktech.emoji.EmojiPopup
@@ -90,6 +89,7 @@ import im.vector.app.core.glide.GlideRequests
 import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.platform.showOptimizedSnackbar
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.ui.views.CurrentCallsView
 import im.vector.app.core.ui.views.KnownCallsViewHolder
@@ -370,7 +370,7 @@ class RoomDetailFragment @Inject constructor(
                 is RoomDetailViewEvents.OnNewTimelineEvents              -> scrollOnNewMessageCallback.addNewTimelineEventIds(it.eventIds)
                 is RoomDetailViewEvents.ActionSuccess                    -> displayRoomDetailActionSuccess(it)
                 is RoomDetailViewEvents.ActionFailure                    -> displayRoomDetailActionFailure(it)
-                is RoomDetailViewEvents.ShowMessage                      -> showSnackWithMessage(it.message, Snackbar.LENGTH_LONG)
+                is RoomDetailViewEvents.ShowMessage                      -> showSnackWithMessage(it.message)
                 is RoomDetailViewEvents.NavigateToEvent                  -> navigateToEvent(it)
                 is RoomDetailViewEvents.FileTooBigError                  -> displayFileTooBigError(it)
                 is RoomDetailViewEvents.DownloadFileState                -> handleDownloadFileState(it)
@@ -1692,7 +1692,7 @@ class RoomDetailFragment @Inject constructor(
             is EventSharedAction.Copy                       -> {
                 // I need info about the current selected message :/
                 copyToClipboard(requireContext(), action.content, false)
-                showSnackWithMessage(getString(R.string.copied_to_clipboard), Snackbar.LENGTH_SHORT)
+                showSnackWithMessage(getString(R.string.copied_to_clipboard))
             }
             is EventSharedAction.Redact                     -> {
                 promptConfirmationToRedactEvent(action)
@@ -1736,7 +1736,7 @@ class RoomDetailFragment @Inject constructor(
             is EventSharedAction.CopyPermalink              -> {
                 val permalink = session.permalinkService().createPermalink(roomDetailArgs.roomId, action.eventId)
                 copyToClipboard(requireContext(), permalink, false)
-                showSnackWithMessage(getString(R.string.copied_to_clipboard), Snackbar.LENGTH_SHORT)
+                showSnackWithMessage(getString(R.string.copied_to_clipboard))
             }
             is EventSharedAction.Resend                     -> {
                 roomDetailViewModel.handle(RoomDetailAction.ResendMessage(action.eventId))
@@ -1847,8 +1847,8 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-    private fun showSnackWithMessage(message: String, duration: Int = Snackbar.LENGTH_SHORT) {
-        Snackbar.make(requireView(), message, duration).show()
+    private fun showSnackWithMessage(message: String) {
+        view?.showOptimizedSnackbar(message)
     }
 
     private fun showDialogWithMessage(message: String) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
index d200129ed9..cee30e7def 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
@@ -23,7 +23,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.rxbinding3.appcompat.queryTextChanges
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
@@ -31,6 +30,7 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.trackItemsVisibilityChange
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.platform.showOptimizedSnackbar
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.FragmentPublicRoomsBinding
 import im.vector.app.features.permalink.NavigationInterceptor
@@ -95,8 +95,7 @@ class PublicRoomsFragment @Inject constructor(
     private fun handleViewEvents(viewEvents: RoomDirectoryViewEvents) {
         when (viewEvents) {
             is RoomDirectoryViewEvents.Failure -> {
-                Snackbar.make(views.coordinatorLayout, errorFormatter.toHumanReadable(viewEvents.throwable), Snackbar.LENGTH_SHORT)
-                        .show()
+                views.coordinatorLayout.showOptimizedSnackbar(errorFormatter.toHumanReadable(viewEvents.throwable))
             }
         }.exhaustive
     }

From 5aa8b0255ad96a7ef495132d33ef7a314f746318 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 15:34:28 +0100
Subject: [PATCH 263/578] Fix MainActivity display (Fixes #2927)

---
 CHANGES.md                                    |  1 +
 .../im/vector/app/features/MainActivity.kt    |  6 ++---
 vector/src/main/res/layout/activity_main.xml  | 26 +++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 vector/src/main/res/layout/activity_main.xml

diff --git a/CHANGES.md b/CHANGES.md
index a69e1f866b..2bf6249423 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)
  - Be robust if Event.type is missing (#2946)
  - Snappier message send status
+ - Fix MainActivity display (#2927)
 
 Translations 🗣:
  - All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed.
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index 351163b026..143506d4df 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -31,7 +31,7 @@ import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.startSyncing
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.deleteAllFiles
-import im.vector.app.databinding.FragmentLoadingBinding
+import im.vector.app.databinding.ActivityMainBinding
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.home.ShortcutsHandler
 import im.vector.app.features.login.LoginActivity
@@ -66,7 +66,7 @@ data class MainActivityArgs(
  * This Activity, when started with argument, is also doing some cleanup when user signs out,
  * clears cache, is logged out, or is soft logged out
  */
-class MainActivity : VectorBaseActivity<FragmentLoadingBinding>(), UnlockedActivity {
+class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity {
 
     companion object {
         private const val EXTRA_ARGS = "EXTRA_ARGS"
@@ -81,7 +81,7 @@ class MainActivity : VectorBaseActivity<FragmentLoadingBinding>(), UnlockedActiv
         }
     }
 
-    override fun getBinding() = FragmentLoadingBinding.inflate(layoutInflater)
+    override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
 
     private lateinit var args: MainActivityArgs
 
diff --git a/vector/src/main/res/layout/activity_main.xml b/vector/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000000..2ca8afcccf
--- /dev/null
+++ b/vector/src/main/res/layout/activity_main.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- The background of this Activity is in the theme (so just added as tools here, for preview),
+ so we just add a ProgressBar here -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="@drawable/splash"
+    tools:context=".features.MainActivity">
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="120dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="160dp"
+        android:indeterminate="true"
+        android:indeterminateTint="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From 5c07a5780cc14d407cee2548026f8fd42afd17d2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 15:38:29 +0100
Subject: [PATCH 264/578] Better with horizontal progress bar

---
 vector/src/main/res/layout/fragment_loading.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_loading.xml b/vector/src/main/res/layout/fragment_loading.xml
index 7a6a791edf..27ae764a73 100644
--- a/vector/src/main/res/layout/fragment_loading.xml
+++ b/vector/src/main/res/layout/fragment_loading.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <!-- Note: Animation will be started in the code -->
     <ImageView
         android:id="@+id/animatedLogoImageView"
         android:layout_width="72dp"
@@ -18,9 +17,9 @@
 
     <ProgressBar
         android:id="@+id/progressBar"
-        android:layout_width="wrap_content"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="120dp"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
         android:layout_marginTop="@dimen/layout_vertical_margin_big"
         android:indeterminate="true"
         app:layout_constraintEnd_toEndOf="parent"

From 38f2c4c43d06979a12467819cbf50d9395fc52d2 Mon Sep 17 00:00:00 2001
From: Hivaa <hivaa@hivaa.im>
Date: Wed, 10 Mar 2021 15:20:56 +0000
Subject: [PATCH 265/578] Translated using Weblate (Persian)

Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
---
 vector/src/main/res/values-fa/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 5b075bcb63..0c7ab7a71c 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -470,8 +470,8 @@
     <string name="action_mark_room_read">علامت‌گذاری به عنوان خوانده شده</string>
     <string name="auth_login_sso">ورود با سامانه‌های احراز هویت مرکزی</string>
     <string name="notification_sync_init">در حال راه‌اندازی سرویس</string>
-    <string name="notification_noisy_notifications">آگاهی‌های پرصدا</string>
-    <string name="notification_silent_notifications">آگاهی‌های صامت</string>
+    <string name="notification_noisy_notifications">اعلان‌های پرصدا</string>
+    <string name="notification_silent_notifications">اعلان‌های صامت</string>
     <string name="title_activity_historical">تاریخچه</string>
     <string name="title_activity_group_details">جزییات انجمن</string>
     <string name="title_activity_choose_sticker">ارسال برچسب</string>
@@ -852,7 +852,7 @@
     <string name="pause_video">توقف</string>
     <string name="action_copy">رونوشت</string>
     <string name="dialog_title_success">موفقیت</string>
-    <string name="bottom_action_notification">آگاهی‌ها</string>
+    <string name="bottom_action_notification">اعلان‌ها</string>
     <string name="dismiss">خاتمه</string>
     <string name="no_permissions_to_start_conf_call">اجازهٔ شروع تماس کنفرانسی در این اتاق را ندارید</string>
     <string name="no_permissions_to_start_webrtc_call">اجازهٔ شروع تماس در این اتاق را ندارید</string>

From edb31ddec0eaa587e56b6225f4e1170e32d85d1a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 17:20:51 +0100
Subject: [PATCH 266/578] Cleanup

---
 .../main/java/im/vector/app/core/platform/VectorBaseFragment.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index b692ea3703..f515060db6 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -35,7 +35,6 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.viewbinding.ViewBinding
 import com.airbnb.mvrx.BaseMvRxFragment
 import com.bumptech.glide.util.Util.assertMainThread
-import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.rxbinding3.view.clicks
 import im.vector.app.R
 import im.vector.app.core.di.DaggerScreenComponent

From fad41409246eb15ce4c366ea9f7233cea7679425 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 10 Mar 2021 15:30:01 +0100
Subject: [PATCH 267/578] Message states: makes sure the actions bottom sheet
 is updated with synced event

---
 .../session/room/timeline/TimelineService.kt  | 14 +++
 .../internal/crypto/tasks/SendEventTask.kt    |  8 +-
 .../room/timeline/DefaultTimelineService.kt   | 10 +--
 .../room/timeline/LiveTimelineEvent.kt        | 90 +++++++++++++++++++
 .../session/room/timeline/TimelineInput.kt    | 11 ++-
 .../internal/session/sync/RoomSyncHandler.kt  |  1 +
 .../timeline/action/MessageActionState.kt     |  4 +
 .../action/MessageActionsEpoxyController.kt   | 10 ++-
 .../action/MessageActionsViewModel.kt         |  9 +-
 9 files changed, 139 insertions(+), 18 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
index 2876ec69e5..3c021384e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
@@ -36,9 +36,23 @@ interface TimelineService {
      */
     fun createTimeline(eventId: String?, settings: TimelineSettings): Timeline
 
+    /**
+     * Returns a snapshot of TimelineEvent event with eventId.
+     * At the opposite of getTimeLineEventLive which will be updated when local echo event is synced, it will return null in this case.
+     * @param eventId the eventId to get the TimelineEvent
+     */
     fun getTimeLineEvent(eventId: String): TimelineEvent?
 
+    /**
+     * Creates a LiveData of Optional TimelineEvent event with eventId.
+     * If the eventId is a local echo eventId, it will make the LiveData be updated with the synced TimelineEvent when coming through the sync.
+     * In this case, makes sure to use the new synced eventId from the TimelineEvent class if you want to interact, as the local echo is removed from the SDK.
+     * @param eventId the eventId to listen for TimelineEvent
+     */
     fun getTimeLineEventLive(eventId: String): LiveData<Optional<TimelineEvent>>
 
+    /**
+     * Returns a snapshot list of TimelineEvent with EventType.MESSAGE and MessageType.MSGTYPE_IMAGE or MessageType.MSGTYPE_VIDEO.
+     */
     fun getAttachmentMessages(): List<TimelineEvent>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index 1fbc30d6f6..04a4e3e52d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -15,7 +15,10 @@
  */
 package org.matrix.android.sdk.internal.crypto.tasks
 
+import kotlinx.coroutines.delay
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
@@ -24,6 +27,7 @@ import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTa
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.task.Task
+import java.lang.IllegalStateException
 import javax.inject.Inject
 
 internal interface SendEventTask : Task<SendEventTask.Params, String> {
@@ -51,7 +55,9 @@ internal class DefaultSendEventTask @Inject constructor(
 
             val event = handleEncryption(params)
             val localId = event.eventId!!
-
+            if((event.content?.get("body") as? String)?.contains("Fail").orFalse()){
+                throw  IllegalStateException()
+            }
             localEchoRepository.updateSendState(localId, params.event.roomId, SendState.SENDING)
             val executeRequest = executeRequest<SendResponse>(globalErrorReceiver) {
                 apiCall = roomAPI.send(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index ef890db79e..9d003c1ff6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.room.timeline
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
@@ -31,7 +30,6 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.api.util.Optional
-import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.RealmSessionProvider
 import org.matrix.android.sdk.internal.database.mapper.ReadReceiptsSummaryMapper
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
@@ -89,13 +87,7 @@ internal class DefaultTimelineService @AssistedInject constructor(@Assisted priv
     }
 
     override fun getTimeLineEventLive(eventId: String): LiveData<Optional<TimelineEvent>> {
-        val liveData = monarchy.findAllMappedWithChanges(
-                { TimelineEventEntity.where(it, roomId = roomId, eventId = eventId) },
-                { timelineEventMapper.map(it) }
-        )
-        return Transformations.map(liveData) { events ->
-            events.firstOrNull().toOptional()
-        }
+        return LiveTimelineEvent(timelineInput, monarchy, taskExecutor, timelineEventMapper, roomId, eventId)
     }
 
     override fun getAttachmentMessages(): List<TimelineEvent> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
new file mode 100644
index 0000000000..0e9c917b05
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.timeline
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.Transformations
+import com.zhuinden.monarchy.Monarchy
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.events.model.LocalEcho
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.task.TaskExecutor
+
+/**
+ * This class takes care of handling case where local echo is replaced by the synced event in the db.
+ */
+internal class LiveTimelineEvent(private val timelineInput: TimelineInput,
+                                 private val monarchy: Monarchy,
+                                 private val taskExecutor: TaskExecutor,
+                                 private val timelineEventMapper: TimelineEventMapper,
+                                 private val roomId: String,
+                                 private val eventId: String)
+    : TimelineInput.Listener,
+        MediatorLiveData<Optional<TimelineEvent>>() {
+
+    private var queryLiveData: LiveData<Optional<TimelineEvent>>? = null
+
+    init {
+        buildAndObserveQuery(eventId)
+    }
+
+    // Makes sure it's made on the main thread
+    private fun buildAndObserveQuery(eventIdToObserve: String) = taskExecutor.executorScope.launch(Dispatchers.Main) {
+        queryLiveData?.also {
+            removeSource(it)
+        }
+        val liveData = monarchy.findAllMappedWithChanges(
+                { TimelineEventEntity.where(it, roomId = roomId, eventId = eventIdToObserve) },
+                { timelineEventMapper.map(it) }
+        )
+        queryLiveData = Transformations.map(liveData) { events ->
+            events.firstOrNull().toOptional()
+        }
+        queryLiveData?.also {
+            addSource(it) { newValue -> value = newValue }
+        }
+    }
+
+    override fun onLocalEchoSynced(roomId: String, localEchoEventId: String, syncedEventId: String) {
+        if (localEchoEventId == eventId) {
+            // rebuild the query with the new eventId
+            buildAndObserveQuery(syncedEventId)
+        }
+    }
+
+    override fun onActive() {
+        super.onActive()
+        // If we are listening to local echo, we want to be aware when event is synced
+        if (LocalEcho.isLocalEchoId(eventId)) {
+            timelineInput.listeners.add(this)
+        }
+    }
+
+    override fun onInactive() {
+        super.onInactive()
+        if (LocalEcho.isLocalEchoId(eventId)) {
+            timelineInput.listeners.remove(this)
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineInput.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineInput.kt
index 002ab1dd8a..8911f265d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineInput.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineInput.kt
@@ -35,11 +35,16 @@ internal class TimelineInput @Inject constructor() {
         listeners.toSet().forEach { it.onNewTimelineEvents(roomId, eventIds) }
     }
 
+    fun onLocalEchoSynced(roomId: String, localEchoEventId: String, syncEventId: String) {
+        listeners.toSet().forEach { it.onLocalEchoSynced(roomId, localEchoEventId, syncEventId) }
+    }
+
     val listeners = mutableSetOf<Listener>()
 
     internal interface Listener {
-        fun onLocalEchoCreated(roomId: String, timelineEvent: TimelineEvent)
-        fun onLocalEchoUpdated(roomId: String, eventId: String, sendState: SendState)
-        fun onNewTimelineEvents(roomId: String, eventIds: List<String>)
+        fun onLocalEchoCreated(roomId: String, timelineEvent: TimelineEvent) = Unit
+        fun onLocalEchoUpdated(roomId: String, eventId: String, sendState: SendState) = Unit
+        fun onNewTimelineEvents(roomId: String, eventIds: List<String>) = Unit
+        fun onLocalEchoSynced(roomId: String, localEchoEventId: String, syncedEventId: String) = Unit
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index b2db6320f1..336a83eaad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -400,6 +400,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                             event.mxDecryptionResult = adapter.fromJson(json)
                         }
                     }
+                    timelineInput.onLocalEchoSynced(roomId, it, event.eventId)
                     // Finally delete the local echo
                     sendingEventEntity.deleteOnCascade(true)
                 } else {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
index 83d56a65c9..b11be0fe77 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
@@ -21,6 +21,7 @@ import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import im.vector.app.core.extensions.canReact
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 /**
@@ -56,4 +57,7 @@ data class MessageActionState(
     fun senderName(): String = informationData.memberName?.toString() ?: ""
 
     fun canReact() = timelineEvent()?.canReact() == true && actionPermissions.canReact
+
+    fun sendState(): SendState? = timelineEvent()?.root?.sendState
+
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index 57558efef1..fa92d5f136 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -34,6 +34,7 @@ import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
 import im.vector.app.features.home.room.detail.timeline.tools.linkify
+import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 
 /**
@@ -63,7 +64,14 @@ class MessageActionsEpoxyController @Inject constructor(
         }
 
         // Send state
-        if (state.informationData.sendState.hasFailed()) {
+        val sendState = state.sendState()
+        if (sendState?.isSending().orFalse()) {
+            bottomSheetSendStateItem {
+                id("send_state")
+                showProgress(true)
+                text(stringProvider.getString(R.string.event_status_sending_message))
+            }
+        } else if (sendState?.hasFailed().orFalse()) {
             bottomSheetSendStateItem {
                 id("send_state")
                 showProgress(false)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 363899c4f9..aac622e45e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -69,7 +69,6 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                                                           private val vectorPreferences: VectorPreferences
 ) : VectorViewModel<MessageActionState, MessageActionsAction, EmptyViewEvents>(initialState) {
 
-    private val eventId = initialState.eventId
     private val informationData = initialState.informationData
     private val room = session.getRoom(initialState.roomId)
     private val pillsPostProcessor by lazy {
@@ -91,7 +90,6 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
 
     init {
         observeEvent()
-        observeReactions()
         observePowerLevel()
         observeTimelineEventState()
     }
@@ -130,14 +128,14 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     private fun observeEvent() {
         if (room == null) return
         room.rx()
-                .liveTimelineEvent(eventId)
+                .liveTimelineEvent(initialState.eventId)
                 .unwrap()
                 .execute {
                     copy(timelineEvent = it)
                 }
     }
 
-    private fun observeReactions() {
+    private fun observeReactions(eventId: String) {
         if (room == null) return
         room.rx()
                 .liveAnnotationSummary(eventId)
@@ -154,8 +152,10 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     private fun observeTimelineEventState() {
         selectSubscribe(MessageActionState::timelineEvent, MessageActionState::actionPermissions) { timelineEvent, permissions ->
             val nonNullTimelineEvent = timelineEvent() ?: return@selectSubscribe
+            observeReactions(nonNullTimelineEvent.eventId)
             setState {
                 copy(
+                        eventId = nonNullTimelineEvent.eventId,
                         messageBody = computeMessageBody(nonNullTimelineEvent),
                         actions = actionsForEvent(nonNullTimelineEvent, permissions)
                 )
@@ -229,6 +229,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun actionsForEvent(timelineEvent: TimelineEvent, actionPermissions: ActionPermissions): List<EventSharedAction> {
+        val eventId = timelineEvent.eventId
         val messageContent = timelineEvent.getLastMessageContent()
         val msgType = messageContent?.msgType
 

From bbb5dd06a24e5479de8452cd05af0f2cf8ef4d5a Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 10 Mar 2021 17:57:15 +0100
Subject: [PATCH 268/578] Message state: adjust some ui

---
 .../detail/timeline/MessageColorProvider.kt   |  13 +-
 .../action/MessageActionsEpoxyController.kt   |  17 +-
 .../action/MessageActionsViewModel.kt         | 210 ++++++++++--------
 .../item_bottom_sheet_message_status.xml      |   2 +-
 .../res/layout/item_timeline_event_base.xml   |   8 +-
 .../main/res/layout/view_read_receipts.xml    |  22 +-
 vector/src/main/res/values/dimens.xml         |   1 +
 7 files changed, 148 insertions(+), 125 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
index 253619fdae..2b39eb1e26 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt
@@ -50,17 +50,8 @@ class MessageColorProvider @Inject constructor(
                 SendState.FAILED_UNKNOWN_DEVICES -> colorProvider.getColorFromAttribute(R.attr.vctr_unsent_message_text_color)
             }
         } else {
-            // When not in developer mode, we do not use special color for the encrypting state
-            when (sendState) {
-                SendState.UNKNOWN,
-                SendState.UNSENT,
-                SendState.ENCRYPTING,
-                SendState.SENDING,
-                SendState.SENT,
-                SendState.SYNCED                 -> colorProvider.getColorFromAttribute(R.attr.vctr_message_text_color)
-                SendState.UNDELIVERED,
-                SendState.FAILED_UNKNOWN_DEVICES -> colorProvider.getColorFromAttribute(R.attr.vctr_unsent_message_text_color)
-            }
+            // When not in developer mode, we use only one color
+            colorProvider.getColorFromAttribute(R.attr.vctr_message_text_color)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index fa92d5f136..1e93c29673 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -35,6 +35,7 @@ import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
 import im.vector.app.features.home.room.detail.timeline.tools.linkify
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.send.SendState
 import javax.inject.Inject
 
 /**
@@ -65,23 +66,23 @@ class MessageActionsEpoxyController @Inject constructor(
 
         // Send state
         val sendState = state.sendState()
-        if (sendState?.isSending().orFalse()) {
-            bottomSheetSendStateItem {
-                id("send_state")
-                showProgress(true)
-                text(stringProvider.getString(R.string.event_status_sending_message))
-            }
-        } else if (sendState?.hasFailed().orFalse()) {
+        if (sendState?.hasFailed().orFalse()) {
             bottomSheetSendStateItem {
                 id("send_state")
                 showProgress(false)
                 text(stringProvider.getString(R.string.unable_to_send_message))
                 drawableStart(R.drawable.ic_warning_badge)
             }
+        } else if (sendState != SendState.SYNCED) {
+            bottomSheetSendStateItem {
+                id("send_state")
+                showProgress(true)
+                text(stringProvider.getString(R.string.event_status_sending_message))
+            }
         }
 
         when (state.informationData.e2eDecoration) {
-            E2EDecoration.WARN_IN_CLEAR        -> {
+            E2EDecoration.WARN_IN_CLEAR -> {
                 bottomSheetSendStateItem {
                     id("e2e_clear")
                     showProgress(false)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index aac622e45e..0b1f67c7b7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -18,10 +18,10 @@ package im.vector.app.features.home.room.detail.timeline.action
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import dagger.assisted.AssistedFactory
 import dagger.Lazy
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.R
 import im.vector.app.core.extensions.canReact
 import im.vector.app.core.platform.EmptyViewEvents
@@ -229,99 +229,19 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun actionsForEvent(timelineEvent: TimelineEvent, actionPermissions: ActionPermissions): List<EventSharedAction> {
-        val eventId = timelineEvent.eventId
         val messageContent = timelineEvent.getLastMessageContent()
         val msgType = messageContent?.msgType
 
         return arrayListOf<EventSharedAction>().apply {
-            if (timelineEvent.root.sendState.hasFailed()) {
-                if (canRetry(timelineEvent, actionPermissions)) {
-                    add(EventSharedAction.Resend(eventId))
+            when {
+                timelineEvent.root.sendState.hasFailed()         -> {
+                    addActionsForFailedState(timelineEvent, actionPermissions, messageContent, msgType)
                 }
-                add(EventSharedAction.Remove(eventId))
-                if (vectorPreferences.developerMode()) {
-                    addViewSourceItems(timelineEvent)
+                timelineEvent.root.sendState.isSending()         -> {
+                    addActionsForSendingState(timelineEvent)
                 }
-            } else if (timelineEvent.root.sendState.isSending()) {
-                // TODO is uploading attachment?
-                if (canCancel(timelineEvent)) {
-                    add(EventSharedAction.Cancel(eventId))
-                }
-            } else if (timelineEvent.root.sendState == SendState.SYNCED) {
-                if (!timelineEvent.root.isRedacted()) {
-                    if (canReply(timelineEvent, messageContent, actionPermissions)) {
-                        add(EventSharedAction.Reply(eventId))
-                    }
-
-                    if (canEdit(timelineEvent, session.myUserId, actionPermissions)) {
-                        add(EventSharedAction.Edit(eventId))
-                    }
-
-                    if (canRedact(timelineEvent, actionPermissions)) {
-                        add(EventSharedAction.Redact(eventId, askForReason = informationData.senderId != session.myUserId))
-                    }
-
-                    if (canCopy(msgType)) {
-                        // TODO copy images? html? see ClipBoard
-                        add(EventSharedAction.Copy(messageContent!!.body))
-                    }
-
-                    if (timelineEvent.canReact() && actionPermissions.canReact) {
-                        add(EventSharedAction.AddReaction(eventId))
-                    }
-
-                    if (canQuote(timelineEvent, messageContent, actionPermissions)) {
-                        add(EventSharedAction.Quote(eventId))
-                    }
-
-                    if (canViewReactions(timelineEvent)) {
-                        add(EventSharedAction.ViewReactions(informationData))
-                    }
-
-                    if (timelineEvent.hasBeenEdited()) {
-                        add(EventSharedAction.ViewEditHistory(informationData))
-                    }
-
-                    if (canShare(msgType)) {
-                        add(EventSharedAction.Share(timelineEvent.eventId, messageContent!!))
-                    }
-
-                    if (canSave(msgType) && messageContent is MessageWithAttachmentContent) {
-                        add(EventSharedAction.Save(timelineEvent.eventId, messageContent))
-                    }
-
-                    if (timelineEvent.root.sendState == SendState.SENT) {
-                        // TODO Can be redacted
-
-                        // TODO sent by me or sufficient power level
-                    }
-                }
-
-                if (vectorPreferences.developerMode()) {
-                    if (timelineEvent.isEncrypted() && timelineEvent.root.mCryptoError != null) {
-                        val keysBackupService = session.cryptoService().keysBackupService()
-                        if (keysBackupService.state == KeysBackupState.NotTrusted
-                                || (keysBackupService.state == KeysBackupState.ReadyToBackUp
-                                        && keysBackupService.canRestoreKeys())
-                        ) {
-                            add(EventSharedAction.UseKeyBackup)
-                        }
-                        if (session.cryptoService().getCryptoDeviceInfo(session.myUserId).size > 1
-                                || timelineEvent.senderInfo.userId != session.myUserId) {
-                            add(EventSharedAction.ReRequestKey(timelineEvent.eventId))
-                        }
-                    }
-                    addViewSourceItems(timelineEvent)
-                }
-                add(EventSharedAction.CopyPermalink(eventId))
-                if (session.myUserId != timelineEvent.root.senderId) {
-                    // not sent by me
-                    if (timelineEvent.root.getClearType() == EventType.MESSAGE) {
-                        add(EventSharedAction.ReportContent(eventId, timelineEvent.root.senderId))
-                    }
-
-                    add(EventSharedAction.Separator)
-                    add(EventSharedAction.IgnoreUser(timelineEvent.root.senderId))
+                timelineEvent.root.sendState == SendState.SYNCED -> {
+                    addActionsForSyncedState(timelineEvent, actionPermissions, messageContent, msgType)
                 }
             }
         }
@@ -336,6 +256,116 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
         }
     }
 
+    private fun ArrayList<EventSharedAction>.addActionsForFailedState(timelineEvent: TimelineEvent,
+                                                                      actionPermissions: ActionPermissions,
+                                                                      messageContent: MessageContent?,
+                                                                      msgType: String?) {
+        val eventId = timelineEvent.eventId
+        if (canRetry(timelineEvent, actionPermissions)) {
+            add(EventSharedAction.Resend(eventId))
+        }
+        add(EventSharedAction.Remove(eventId))
+        if (canEdit(timelineEvent, session.myUserId, actionPermissions)) {
+            add(EventSharedAction.Edit(eventId))
+        }
+        if (canCopy(msgType)) {
+            // TODO copy images? html? see ClipBoard
+            add(EventSharedAction.Copy(messageContent!!.body))
+        }
+        if (vectorPreferences.developerMode()) {
+            addViewSourceItems(timelineEvent)
+        }
+    }
+
+    private fun ArrayList<EventSharedAction>.addActionsForSendingState(timelineEvent: TimelineEvent) {
+        // TODO is uploading attachment?
+        if (canCancel(timelineEvent)) {
+            add(EventSharedAction.Cancel(timelineEvent.eventId))
+        }
+    }
+
+    private fun ArrayList<EventSharedAction>.addActionsForSyncedState(timelineEvent: TimelineEvent,
+                                                                      actionPermissions: ActionPermissions,
+                                                                      messageContent: MessageContent?,
+                                                                      msgType: String?) {
+        val eventId = timelineEvent.eventId
+        if (!timelineEvent.root.isRedacted()) {
+            if (canReply(timelineEvent, messageContent, actionPermissions)) {
+                add(EventSharedAction.Reply(eventId))
+            }
+
+            if (canEdit(timelineEvent, session.myUserId, actionPermissions)) {
+                add(EventSharedAction.Edit(eventId))
+            }
+
+            if (canRedact(timelineEvent, actionPermissions)) {
+                add(EventSharedAction.Redact(eventId, askForReason = informationData.senderId != session.myUserId))
+            }
+
+            if (canCopy(msgType)) {
+                // TODO copy images? html? see ClipBoard
+                add(EventSharedAction.Copy(messageContent!!.body))
+            }
+
+            if (timelineEvent.canReact() && actionPermissions.canReact) {
+                add(EventSharedAction.AddReaction(eventId))
+            }
+
+            if (canQuote(timelineEvent, messageContent, actionPermissions)) {
+                add(EventSharedAction.Quote(eventId))
+            }
+
+            if (canViewReactions(timelineEvent)) {
+                add(EventSharedAction.ViewReactions(informationData))
+            }
+
+            if (timelineEvent.hasBeenEdited()) {
+                add(EventSharedAction.ViewEditHistory(informationData))
+            }
+
+            if (canShare(msgType)) {
+                add(EventSharedAction.Share(timelineEvent.eventId, messageContent!!))
+            }
+
+            if (canSave(msgType) && messageContent is MessageWithAttachmentContent) {
+                add(EventSharedAction.Save(timelineEvent.eventId, messageContent))
+            }
+
+            if (timelineEvent.root.sendState == SendState.SENT) {
+                // TODO Can be redacted
+
+                // TODO sent by me or sufficient power level
+            }
+        }
+
+        if (vectorPreferences.developerMode()) {
+            if (timelineEvent.isEncrypted() && timelineEvent.root.mCryptoError != null) {
+                val keysBackupService = session.cryptoService().keysBackupService()
+                if (keysBackupService.state == KeysBackupState.NotTrusted
+                        || (keysBackupService.state == KeysBackupState.ReadyToBackUp
+                                && keysBackupService.canRestoreKeys())
+                ) {
+                    add(EventSharedAction.UseKeyBackup)
+                }
+                if (session.cryptoService().getCryptoDeviceInfo(session.myUserId).size > 1
+                        || timelineEvent.senderInfo.userId != session.myUserId) {
+                    add(EventSharedAction.ReRequestKey(timelineEvent.eventId))
+                }
+            }
+            addViewSourceItems(timelineEvent)
+        }
+        add(EventSharedAction.CopyPermalink(eventId))
+        if (session.myUserId != timelineEvent.root.senderId) {
+            // not sent by me
+            if (timelineEvent.root.getClearType() == EventType.MESSAGE) {
+                add(EventSharedAction.ReportContent(eventId, timelineEvent.root.senderId))
+            }
+
+            add(EventSharedAction.Separator)
+            add(EventSharedAction.IgnoreUser(timelineEvent.root.senderId))
+        }
+    }
+
     private fun canCancel(@Suppress("UNUSED_PARAMETER") event: TimelineEvent): Boolean {
         return true
     }
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index 3d50cce72a..fcb373fa0d 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -5,7 +5,7 @@
     android:id="@+id/messageStatusInfo"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="64dp"
+    android:layout_marginStart="16dp"
     android:layout_marginEnd="16dp"
     android:layout_marginBottom="4dp">
 
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 422cd5fef2..ce3460a21c 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -136,8 +136,8 @@
 
     <im.vector.app.core.ui.views.SendStateImageView
         android:id="@+id/messageSendStateImageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
         android:layout_alignBottom="@+id/viewStubContainer"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
@@ -150,8 +150,8 @@
 
     <ProgressBar
         android:id="@+id/eventSendingIndicator"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
         android:layout_alignBottom="@+id/viewStubContainer"
         android:indeterminateTint="?riotx_text_secondary"
         android:layout_alignParentEnd="true"
diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index 3e4c49fe00..ac4351b379 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -9,7 +9,7 @@
     <TextView
         android:id="@+id/receiptMore"
         android:layout_width="wrap_content"
-        android:layout_height="18dp"
+        android:layout_height="@dimen/item_event_message_state_size"
         android:background="@drawable/pill_receipt"
         android:gravity="center"
         android:importantForAccessibility="no"
@@ -20,8 +20,8 @@
 
     <ImageView
         android:id="@+id/receiptAvatar5"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
         android:layout_marginStart="2dp"
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
@@ -30,8 +30,8 @@
 
     <ImageView
         android:id="@+id/receiptAvatar4"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
         android:layout_marginStart="2dp"
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
@@ -40,8 +40,8 @@
 
     <ImageView
         android:id="@+id/receiptAvatar3"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
         android:layout_marginStart="2dp"
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
@@ -50,8 +50,8 @@
 
     <ImageView
         android:id="@+id/receiptAvatar2"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
         android:layout_marginStart="2dp"
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
@@ -60,8 +60,8 @@
 
     <ImageView
         android:id="@+id/receiptAvatar1"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="@dimen/item_event_message_state_size"
+        android:layout_height="@dimen/item_event_message_state_size"
         android:layout_marginStart="2dp"
         android:adjustViewBounds="true"
         android:importantForAccessibility="no"
diff --git a/vector/src/main/res/values/dimens.xml b/vector/src/main/res/values/dimens.xml
index 06ca39950c..88338f799b 100644
--- a/vector/src/main/res/values/dimens.xml
+++ b/vector/src/main/res/values/dimens.xml
@@ -13,6 +13,7 @@
     <dimen name="navigation_view_height">196dp</dimen>
     <dimen name="navigation_avatar_top_margin">44dp</dimen>
     <dimen name="item_decoration_left_margin">72dp</dimen>
+    <dimen name="item_event_message_state_size">16dp</dimen>
 
     <dimen name="chat_avatar_size">40dp</dimen>
     <dimen name="member_list_avatar_size">60dp</dimen>

From 6c8e2f1fd662ffae3ea19422202deb540d73fbde Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 10 Mar 2021 18:10:03 +0100
Subject: [PATCH 269/578] Message state: allow edit and copy when failed

---
 .../room/model/relation/RelationService.kt    |   4 +-
 .../internal/crypto/tasks/SendEventTask.kt    |   7 --
 .../room/relation/DefaultRelationService.kt   |  28 ++---
 .../session/room/relation/EventEditor.kt      | 104 ++++++++++++++++++
 .../home/room/detail/RoomDetailViewModel.kt   |   2 +-
 .../timeline/action/MessageActionState.kt     |   1 -
 6 files changed, 115 insertions(+), 31 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
index 2c0e378efb..59d84ef40f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
@@ -66,11 +66,11 @@ interface RelationService {
 
     /**
      * Edit a text message body. Limited to "m.text" contentType
-     * @param targetEventId The event to edit
+     * @param targetEvent The event to edit
      * @param newBodyText The edited body
      * @param compatibilityBodyText The text that will appear on clients that don't support yet edition
      */
-    fun editTextMessage(targetEventId: String,
+    fun editTextMessage(targetEvent: TimelineEvent,
                         msgType: String,
                         newBodyText: CharSequence,
                         newBodyAutoMarkdown: Boolean,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index 04a4e3e52d..573f2c3a54 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -15,10 +15,7 @@
  */
 package org.matrix.android.sdk.internal.crypto.tasks
 
-import kotlinx.coroutines.delay
-import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
@@ -27,7 +24,6 @@ import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTa
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.task.Task
-import java.lang.IllegalStateException
 import javax.inject.Inject
 
 internal interface SendEventTask : Task<SendEventTask.Params, String> {
@@ -55,9 +51,6 @@ internal class DefaultSendEventTask @Inject constructor(
 
             val event = handleEncryption(params)
             val localId = event.eventId!!
-            if((event.content?.get("body") as? String)?.contains("Fail").orFalse()){
-                throw  IllegalStateException()
-            }
             localEchoRepository.updateSendState(localId, params.event.roomId, SendState.SENDING)
             val executeRequest = executeRequest<SendResponse>(globalErrorReceiver) {
                 apiCall = roomAPI.send(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index da0cf45946..778550a7c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -17,14 +17,13 @@ package org.matrix.android.sdk.internal.session.room.relation
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import dagger.assisted.AssistedFactory
 import com.zhuinden.monarchy.Monarchy
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
-import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.relation.RelationService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Cancelable
@@ -39,6 +38,7 @@ import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessor
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
@@ -47,6 +47,7 @@ import timber.log.Timber
 
 internal class DefaultRelationService @AssistedInject constructor(
         @Assisted private val roomId: String,
+        private val eventEditor: EventEditor,
         private val eventSenderProcessor: EventSenderProcessor,
         private val eventFactory: LocalEchoEventFactory,
         private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
@@ -112,32 +113,19 @@ internal class DefaultRelationService @AssistedInject constructor(
                 .executeBy(taskExecutor)
     }
 
-    override fun editTextMessage(targetEventId: String,
+    override fun editTextMessage(targetEvent: TimelineEvent,
                                  msgType: String,
                                  newBodyText: CharSequence,
                                  newBodyAutoMarkdown: Boolean,
                                  compatibilityBodyText: String): Cancelable {
-        val event = eventFactory
-                .createReplaceTextEvent(roomId, targetEventId, newBodyText, newBodyAutoMarkdown, msgType, compatibilityBodyText)
-                .also { saveLocalEcho(it) }
-        return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        return eventEditor.editTextMessage(targetEvent, msgType, newBodyText, newBodyAutoMarkdown, compatibilityBodyText)
     }
 
     override fun editReply(replyToEdit: TimelineEvent,
                            originalTimelineEvent: TimelineEvent,
                            newBodyText: String,
                            compatibilityBodyText: String): Cancelable {
-        val event = eventFactory.createReplaceTextOfReply(
-                roomId,
-                replyToEdit,
-                originalTimelineEvent,
-                newBodyText,
-                true,
-                MessageType.MSGTYPE_TEXT,
-                compatibilityBodyText
-        )
-                .also { saveLocalEcho(it) }
-        return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        return eventEditor.editReply(replyToEdit, originalTimelineEvent, newBodyText, compatibilityBodyText)
     }
 
     override suspend fun fetchEditHistory(eventId: String): List<Event> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
new file mode 100644
index 0000000000..5fe06287d2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.relation
+
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.NoOpCancellable
+import org.matrix.android.sdk.internal.crypto.CryptoSessionInfoProvider
+import org.matrix.android.sdk.internal.database.mapper.toEntity
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
+import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
+import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessor
+import timber.log.Timber
+import javax.inject.Inject
+
+internal class EventEditor @Inject constructor(private val eventSenderProcessor: EventSenderProcessor,
+                                               private val eventFactory: LocalEchoEventFactory,
+                                               private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
+                                               private val localEchoRepository: LocalEchoRepository) {
+
+    fun editTextMessage(targetEvent: TimelineEvent,
+                        msgType: String,
+                        newBodyText: CharSequence,
+                        newBodyAutoMarkdown: Boolean,
+                        compatibilityBodyText: String): Cancelable {
+        val roomId = targetEvent.roomId
+        if (targetEvent.root.sendState.hasFailed()) {
+            // We create a new in memory event for the EventSenderProcessor but we keep the eventId of the failed event.
+            val editedEvent = eventFactory.createTextEvent(roomId, msgType, newBodyText, newBodyAutoMarkdown).copy(
+                    eventId = targetEvent.eventId
+            )
+            updateFailedEchoWithEvent(roomId, targetEvent.eventId, editedEvent)
+            return eventSenderProcessor.postEvent(editedEvent, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        } else if (targetEvent.root.sendState.isSent()) {
+            val event = eventFactory
+                    .createReplaceTextEvent(roomId, targetEvent.eventId, newBodyText, newBodyAutoMarkdown, msgType, compatibilityBodyText)
+                    .also { localEchoRepository.createLocalEcho(it) }
+            return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        } else {
+            // Should we throw?
+            Timber.w("Can't edit a sending event")
+            return NoOpCancellable
+        }
+    }
+
+    fun editReply(replyToEdit: TimelineEvent,
+                  originalTimelineEvent: TimelineEvent,
+                  newBodyText: String,
+                  compatibilityBodyText: String): Cancelable {
+        val roomId = replyToEdit.roomId
+        if (replyToEdit.root.sendState.hasFailed()) {
+            // We create a new in memory event for the EventSenderProcessor but we keep the eventId of the failed event.
+            val editedEvent = eventFactory.createReplyTextEvent(roomId, originalTimelineEvent, newBodyText, false)?.copy(
+                    eventId = replyToEdit.eventId
+            ) ?: return NoOpCancellable
+            updateFailedEchoWithEvent(roomId, replyToEdit.eventId, editedEvent)
+            return eventSenderProcessor.postEvent(editedEvent, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        } else if (replyToEdit.root.sendState.isSent()) {
+            val event = eventFactory.createReplaceTextOfReply(
+                    roomId,
+                    replyToEdit,
+                    originalTimelineEvent,
+                    newBodyText,
+                    true,
+                    MessageType.MSGTYPE_TEXT,
+                    compatibilityBodyText
+            )
+                    .also { localEchoRepository.createLocalEcho(it) }
+            return eventSenderProcessor.postEvent(event, cryptoSessionInfoProvider.isRoomEncrypted(roomId))
+        } else {
+            // Should we throw?
+            Timber.w("Can't edit a sending event")
+            return NoOpCancellable
+        }
+    }
+
+    private fun updateFailedEchoWithEvent(roomId: String, failedEchoEventId: String, editedEvent: Event) {
+        val editedEventEntity = editedEvent.toEntity(roomId, SendState.UNSENT, System.currentTimeMillis())
+        localEchoRepository.updateEchoAsync(failedEchoEventId) { _, entity ->
+            entity.content = editedEventEntity.content
+            entity.ageLocalTs = editedEventEntity.ageLocalTs
+            entity.age = editedEventEntity.age
+            entity.originServerTs = editedEventEntity.originServerTs
+            entity.sendState = editedEventEntity.sendState
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index fdb7717e49..115b0b29dd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -828,7 +828,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                         val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
                         val existingBody = messageContent?.body ?: ""
                         if (existingBody != action.text) {
-                            room.editTextMessage(state.sendMode.timelineEvent.root.eventId ?: "",
+                            room.editTextMessage(state.sendMode.timelineEvent,
                                     messageContent?.msgType ?: MessageType.MSGTYPE_TEXT,
                                     action.text,
                                     action.autoMarkdown)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
index b11be0fe77..caee485aba 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt
@@ -59,5 +59,4 @@ data class MessageActionState(
     fun canReact() = timelineEvent()?.canReact() == true && actionPermissions.canReact
 
     fun sendState(): SendState? = timelineEvent()?.root?.sendState
-
 }

From ea21892d0358a320d904d411984d057cb2f53e0a Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 10 Mar 2021 19:32:50 +0100
Subject: [PATCH 270/578] Message state: fix and clean code after Benoits
 review

---
 .../room/relation/DefaultRelationService.kt   |  1 -
 .../room/timeline/DefaultTimelineService.kt   |  2 +-
 .../room/timeline/LiveTimelineEvent.kt        | 22 ++++++++++--------
 .../action/MessageActionsViewModel.kt         | 23 ++++++++++++-------
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index 778550a7c4..9693e56ff0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -38,7 +38,6 @@ import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoEventFactory
-import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProcessor
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index 9d003c1ff6..d000bbeb50 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -87,7 +87,7 @@ internal class DefaultTimelineService @AssistedInject constructor(@Assisted priv
     }
 
     override fun getTimeLineEventLive(eventId: String): LiveData<Optional<TimelineEvent>> {
-        return LiveTimelineEvent(timelineInput, monarchy, taskExecutor, timelineEventMapper, roomId, eventId)
+        return LiveTimelineEvent(timelineInput, monarchy, taskExecutor.executorScope, timelineEventMapper, roomId, eventId)
     }
 
     override fun getAttachmentMessages(): List<TimelineEvent> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
index 0e9c917b05..3c0f101e11 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
@@ -20,6 +20,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.events.model.LocalEcho
@@ -29,14 +30,14 @@ import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.where
-import org.matrix.android.sdk.internal.task.TaskExecutor
+import java.util.concurrent.atomic.AtomicBoolean
 
 /**
  * This class takes care of handling case where local echo is replaced by the synced event in the db.
  */
 internal class LiveTimelineEvent(private val timelineInput: TimelineInput,
                                  private val monarchy: Monarchy,
-                                 private val taskExecutor: TaskExecutor,
+                                 private val coroutineScope: CoroutineScope,
                                  private val timelineEventMapper: TimelineEventMapper,
                                  private val roomId: String,
                                  private val eventId: String)
@@ -45,12 +46,15 @@ internal class LiveTimelineEvent(private val timelineInput: TimelineInput,
 
     private var queryLiveData: LiveData<Optional<TimelineEvent>>? = null
 
+    // If we are listening to local echo, we want to be aware when event is synced
+    private var shouldObserveSync = AtomicBoolean(LocalEcho.isLocalEchoId(eventId))
+
     init {
         buildAndObserveQuery(eventId)
     }
 
     // Makes sure it's made on the main thread
-    private fun buildAndObserveQuery(eventIdToObserve: String) = taskExecutor.executorScope.launch(Dispatchers.Main) {
+    private fun buildAndObserveQuery(eventIdToObserve: String) = coroutineScope.launch(Dispatchers.Main) {
         queryLiveData?.also {
             removeSource(it)
         }
@@ -60,14 +64,15 @@ internal class LiveTimelineEvent(private val timelineInput: TimelineInput,
         )
         queryLiveData = Transformations.map(liveData) { events ->
             events.firstOrNull().toOptional()
-        }
-        queryLiveData?.also {
+        }.also {
             addSource(it) { newValue -> value = newValue }
         }
     }
 
     override fun onLocalEchoSynced(roomId: String, localEchoEventId: String, syncedEventId: String) {
-        if (localEchoEventId == eventId) {
+        if (this.roomId == roomId && localEchoEventId == this.eventId) {
+            timelineInput.listeners.remove(this)
+            shouldObserveSync.set(false)
             // rebuild the query with the new eventId
             buildAndObserveQuery(syncedEventId)
         }
@@ -75,15 +80,14 @@ internal class LiveTimelineEvent(private val timelineInput: TimelineInput,
 
     override fun onActive() {
         super.onActive()
-        // If we are listening to local echo, we want to be aware when event is synced
-        if (LocalEcho.isLocalEchoId(eventId)) {
+        if (shouldObserveSync.get()) {
             timelineInput.listeners.add(this)
         }
     }
 
     override fun onInactive() {
         super.onInactive()
-        if (LocalEcho.isLocalEchoId(eventId)) {
+        if (shouldObserveSync.get()) {
             timelineInput.listeners.remove(this)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 0b1f67c7b7..adf315a955 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.detail.timeline.action
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
+import com.jakewharton.rxrelay2.BehaviorRelay
 import dagger.Lazy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -75,6 +76,8 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
         pillsPostProcessorFactory.create(initialState.roomId)
     }
 
+    private val eventIdObservable = BehaviorRelay.createDefault(initialState.eventId)
+
     @AssistedFactory
     interface Factory {
         fun create(initialState: MessageActionState): MessageActionsViewModel
@@ -90,6 +93,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
 
     init {
         observeEvent()
+        observeReactions()
         observePowerLevel()
         observeTimelineEventState()
     }
@@ -135,14 +139,17 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                 }
     }
 
-    private fun observeReactions(eventId: String) {
+    private fun observeReactions() {
         if (room == null) return
-        room.rx()
-                .liveAnnotationSummary(eventId)
-                .map { annotations ->
-                    EmojiDataSource.quickEmojis.map { emoji ->
-                        ToggleState(emoji, annotations.getOrNull()?.reactionsSummary?.firstOrNull { it.key == emoji }?.addedByMe ?: false)
-                    }
+        eventIdObservable
+                .switchMap { eventId ->
+                    room.rx()
+                            .liveAnnotationSummary(eventId)
+                            .map { annotations ->
+                                EmojiDataSource.quickEmojis.map { emoji ->
+                                    ToggleState(emoji, annotations.getOrNull()?.reactionsSummary?.firstOrNull { it.key == emoji }?.addedByMe ?: false)
+                                }
+                            }
                 }
                 .execute {
                     copy(quickStates = it)
@@ -152,7 +159,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     private fun observeTimelineEventState() {
         selectSubscribe(MessageActionState::timelineEvent, MessageActionState::actionPermissions) { timelineEvent, permissions ->
             val nonNullTimelineEvent = timelineEvent() ?: return@selectSubscribe
-            observeReactions(nonNullTimelineEvent.eventId)
+            eventIdObservable.accept(nonNullTimelineEvent.eventId)
             setState {
                 copy(
                         eventId = nonNullTimelineEvent.eventId,

From c5a4c805b5f88c9e2fee0dde96bbab4f3e82a909 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 18:28:53 +0100
Subject: [PATCH 271/578] Fix lint error

---
 vector/src/main/res/values-de/strings.xml | 2 +-
 vector/src/main/res/values-fr/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index d94811782d..437c517574 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2694,7 +2694,7 @@
     <string name="a11y_open_emoji_picker">Emoji-Auswahl öffnen</string>
     <string name="a11y_trust_level_trusted">Vertraute Vertrauensstufe</string>
     <string name="a11y_trust_level_warning">Warnungsvertrauensstufe</string>
-    <string name="a11y_trust_level_default">Standart-Vertrauensstufe</string>
+    <string name="a11y_trust_level_default">Standard-Vertrauensstufe</string>
     <string name="a11y_selected">Ausgewählt</string>
     <string name="a11y_video">Video</string>
     <string name="a11y_unsent_draft">Dieser Raum enthält einen ungesendeten Entwurf</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index e6d00365a3..315e3fe978 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2584,7 +2584,7 @@
     <string name="room_alias_address_empty_can_add">Aucune adresse publiée pour le moment, ajoutez en une ci-dessous.</string>
     <string name="room_alias_publish">Publier ce salon dans le répertoire public de %1$s \?</string>
     <string name="room_alias_delete_confirmation">Supprimer l’adresse « %1$s » \?</string>
-    <string name="room_alias_unpublish_confirmation">Dé-publier l’adresse « %&amp;$s » \?</string>
+    <string name="room_alias_unpublish_confirmation">Dé-publier l’adresse « %1$s » \?</string>
     <string name="room_alias_published_alias_add_manually_submit">Publier</string>
     <string name="room_alias_published_alias_add_manually">Publier une nouvelle adresse manuellement</string>
     <string name="room_alias_published_other">Autres adresses publiées :</string>

From c6828a86129f6cf1b53d39fd44b748808ecf4e4f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 18:36:23 +0100
Subject: [PATCH 272/578] Fix issue with Locale folder. Hoping Weblate will eat
 that correctly.

---
 vector/lint.xml                               |    1 +
 vector/src/main/res/values-he/strings.xml     | 2386 -----------------
 vector/src/main/res/values-id/strings.xml     | 1085 --------
 .../main/res/values-id/strings_no_weblate.xml |    7 -
 4 files changed, 1 insertion(+), 3478 deletions(-)
 delete mode 100644 vector/src/main/res/values-he/strings.xml
 delete mode 100644 vector/src/main/res/values-id/strings.xml
 delete mode 100644 vector/src/main/res/values-id/strings_no_weblate.xml

diff --git a/vector/lint.xml b/vector/lint.xml
index 1f964412b9..caed34f2d6 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -12,6 +12,7 @@
     <issue id="IconDuplicatesConfig" severity="error" />
     <issue id="IconDuplicates" severity="error" />
     <issue id="IconExpectedSize" severity="error" />
+    <issue id="LocaleFolder" severity="error" />
 
     <!-- UX -->
     <issue id="ButtonOrder" severity="error" />
diff --git a/vector/src/main/res/values-he/strings.xml b/vector/src/main/res/values-he/strings.xml
deleted file mode 100644
index 41d6e147c5..0000000000
--- a/vector/src/main/res/values-he/strings.xml
+++ /dev/null
@@ -1,2386 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="bottom_action_notification">התראות</string>
-    <string name="bottom_action_home">כפתורי ניווט תחתונים</string>
-    <string name="dialog_title_success">הצלחה</string>
-    <string name="dialog_title_error">שגיאה</string>
-    <string name="dialog_title_warning">אזהרה</string>
-    <string name="dialog_title_confirmation">אישור</string>
-    <string name="disable">השבת</string>
-    <string name="copied_to_clipboard">העתק ללוח הגזירים</string>
-    <string name="action_unpublish">הסר פרסום</string>
-    <string name="action_add">הוסף</string>
-    <string name="action_copy">העתק</string>
-    <string name="action_close">סגור</string>
-    <string name="action_mark_room_read">סמן כ\'נקרא\'</string>
-    <string name="action_quick_reply">תגובה מהירה</string>
-    <string name="action_historical">היסטורי</string>
-    <string name="action_mark_all_as_read">סמן הכל כ\'נקרא\'</string>
-    <string name="action_global_search">חיפוש כללי</string>
-    <string name="action_video_call">שיחת וידאו</string>
-    <string name="action_voice_call">שיחה קולית</string>
-    <string name="action_sign_out_confirmation_simple">האם אתה בטוח שברצונך לצאת מחשבונך\?</string>
-    <string name="action_sign_out">יציאה מהחשבון</string>
-    <string name="actions">פעולות</string>
-    <string name="action_exit">יציאה</string>
-    <string name="call_notification_hangup">נתק</string>
-    <string name="call_notification_reject">להסיר</string>
-    <string name="call_notification_answer">לקבל</string>
-    <string name="decline">יְרִידָה</string>
-    <string name="review">סקירה</string>
-    <string name="ignore">להתעלם</string>
-    <string name="abort">לְהַפִּיל</string>
-    <string name="done">בוצע</string>
-    <string name="skip">לדלג</string>
-    <string name="accept">לְקַבֵּל</string>
-    <string name="offline">לא מקוון</string>
-    <string name="invite">להזמין</string>
-    <string name="send_anyway">לשלוח בכל מקרה</string>
-    <string name="call_anyway">תתקשר בכל מקרה</string>
-    <string name="room_no_conference_call_in_encrypted_rooms">שיחות ועידה אינן נתמכות בחדרים מוצפנים</string>
-    <string name="failed_to_remove_widget">הסרת היישומון נכשלה</string>
-    <string name="failed_to_add_widget">הוספת היישומון נכשלה</string>
-    <string name="device_information">מידע על מושב</string>
-    <string name="cannot_call_yourself_with_invite">אתה לא יכול להתקשר עם עצמך, לחכות שהמשתתפים יקבלו את ההזמנה</string>
-    <string name="cannot_call_yourself">אינך יכול להתקשר עם עצמך</string>
-    <string name="missing_permissions_title_to_start_conf_call">לא ניתן להתחיל להתקשר</string>
-    <string name="audio_video_meeting_description">הפגישות משתמשות במדיניות האבטחה וההרשאה של Jitsi. כל האנשים שנמצאים כעת בחדר יראו הזמנה להצטרף בזמן שהפגישה שלך מתרחשת.</string>
-    <string name="audio_meeting">התחל פגישת שמע</string>
-    <string name="video_meeting">התחל פגישת וידאו</string>
-    <string name="conference_call_in_progress">ועידה כבר בעיצומה!</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">אין לך הרשאה להתחיל שיחה</string>
-    <string name="no_permissions_to_start_webrtc_call">אין לך הרשאה להתחיל שיחה בחדר זה</string>
-    <string name="no_permissions_to_start_conf_call_in_direct_room">אין לך הרשאה להתחיל שיחת ועידה</string>
-    <string name="no_permissions_to_start_conf_call">אין לך הרשאה להתחיל שיחת ועידה בחדר זה</string>
-    <string name="missing_permissions_to_start_conf_call">אתה זקוק להרשאה כדי להזמין כדי להתחיל כנס בחדר זה</string>
-    <string name="missing_permissions_error">בגלל הרשאות חסרות, פעולה זו אינה אפשרית.</string>
-    <string name="missing_permissions_warning">בגלל הרשאות חסרות, ייתכן שחלק מהתכונות חסרות …</string>
-    <string name="cannot_start_call">לא יכול להתחיל את השיחה, נסה שוב מאוחר יותר</string>
-    <string name="ongoing_conference_call_video">וידאו</string>
-    <string name="ongoing_conference_call_voice">קול</string>
-    <string name="start_chatting">התחל לצ\'וטט</string>
-    <string name="reset">אתחול</string>
-    <string name="pause_video">השהה</string>
-    <string name="play_video">לנגן</string>
-    <string name="active_call">שיחה פעילה</string>
-    <string name="report_content">דווח על תוכן</string>
-    <string name="disconnect">התנתק</string>
-    <string name="revoke">לבטל</string>
-    <string name="none">אין</string>
-    <string name="rename">שנה שם</string>
-    <string name="delete">מחק</string>
-    <string name="view_decrypted_source">צפה במקור המפוענח</string>
-    <string name="view_source">צפה במקור הדף</string>
-    <string name="permalink">קישור קבוע</string>
-    <string name="forward">העבר</string>
-    <string name="later">מאוחר יותר</string>
-    <string name="clear">ניקוי</string>
-    <string name="speak">דבר</string>
-    <string name="share">שתף</string>
-    <string name="download">הורדה</string>
-    <string name="quote">צטט</string>
-    <string name="redact">הסר</string>
-    <string name="resend">שלח שוב</string>
-    <string name="send">שלח</string>
-    <string name="stay">הישאר</string>
-    <string name="leave">עזיבה</string>
-    <string name="save">שמירה</string>
-    <string name="cancel">ביטול</string>
-    <string name="ok">אוקיי</string>
-    <string name="loading">טוען…</string>
-    <string name="dialog_title_third_party_licences">רישיונות צד ג \'</string>
-    <string name="sign_out_bottom_sheet_will_lose_secure_messages">תאבד את הגישה להודעות המוצפנות שלך אלא אם כן תגבה את המפתחות לפני היציאה.</string>
-    <string name="backup">גבה</string>
-    <string name="are_you_sure">האם אתה בטוח\?</string>
-    <string name="keys_backup_activate">השתמש בגיבוי מפתח</string>
-    <string name="sign_out_bottom_sheet_backing_up_keys">מגבה מקשים …</string>
-    <string name="sign_out_bottom_sheet_dont_want_secure_messages">אני לא רוצה את ההודעות המוצפנות שלי</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">גיבוי מפתח מאובטח צריך להיות פעיל בכל ההפעלות שלך כדי למנוע אובדן גישה להודעות המוצפנות שלך.</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">גיבוי המפתח מתבצע. אם תצא עכשיו תאבד את הגישה להודעות המוצפנות שלך.</string>
-    <string name="sign_out_bottom_sheet_warning_no_backup">אם תצא עכשיו, תאבד את ההודעות המוצפנות שלך</string>
-    <string name="matrix_to_card_title">קישור למטריקס</string>
-    <string name="or">או</string>
-    <string name="action_open">פתיחה</string>
-    <string name="login_signin">כניסה</string>
-    <string name="dismiss">שחרר</string>
-    <string name="keys_backup_is_not_finished_please_wait">גיבוי המפתחות לא הסתיים, אנא המתן …</string>
-    <string name="title_activity_verify_device">אמת מושב</string>
-    <string name="title_activity_keys_backup_restore">השתמש במפתח גיבוי</string>
-    <string name="title_activity_keys_backup_setup">גיבוי מפתח</string>
-    <string name="title_activity_choose_sticker">שלח מדבקה</string>
-    <string name="title_activity_group_details">פרטי קהילה</string>
-    <string name="title_activity_bug_report">דיווח תקלות</string>
-    <string name="title_activity_historical">הסטוריה</string>
-    <string name="title_activity_member_details">פרטי משתמש</string>
-    <string name="title_activity_settings">הגדרות</string>
-    <string name="title_activity_room">חדר</string>
-    <string name="title_activity_home">הודעות</string>
-    <string name="notification_silent_notifications">התראות שקטות</string>
-    <string name="notification_noisy_notifications">התראות רועשות</string>
-    <string name="notification_listening_for_events">האזנה לאירועים</string>
-    <string name="notification_sync_in_progress">מסנכרן…</string>
-    <string name="notification_sync_init">אתחול השירות</string>
-    <string name="black_theme">ערכת נושא שחורה</string>
-    <string name="dark_theme">ערכת נושא כהה</string>
-    <string name="light_theme">ערכת נושא בהירה</string>
-    <plurals name="public_room_nb_users">
-        <item quantity="one">משתמש %d</item>
-        <item quantity="two">%d משתמשים</item>
-        <item quantity="many">מעט</item>
-        <item quantity="other">אחר</item>
-    </plurals>
-    <string name="no_public_room_placeholder">אין חדרים ציבורים</string>
-    <string name="no_room_placeholder">אין חדרים</string>
-    <string name="rooms_directory_header">רשימת חדרים</string>
-    <string name="rooms_header">חדרים</string>
-    <string name="no_conversation_placeholder">אין שיחות</string>
-    <string name="matrix_only_filter">אנשי קשר מטריקס בלבד</string>
-    <string name="user_directory_header">תיקיית האב של המשתמש</string>
-    <string name="local_address_book_header">פנקס כתובות מקומי</string>
-    <string name="direct_chats_header">שיחות</string>
-    <string name="system_alerts_header">התראות מערכת</string>
-    <string name="low_priority_header">בעדיפות נמוכה</string>
-    <string name="invitations_header">הזמנות</string>
-    <string name="home_filter_placeholder_groups">סנן שמות מבין רשימת הקהילות</string>
-    <string name="home_filter_placeholder_rooms">סנן מבין רשימת החדרים</string>
-    <string name="home_filter_placeholder_people">סנן מבין רשימת האנשים</string>
-    <string name="home_filter_placeholder_favorites">סנן מהמועדפים</string>
-    <string name="home_filter_placeholder_home">סנן שמות חדרים</string>
-    <string name="bottom_action_groups">קהילות</string>
-    <string name="bottom_action_rooms">חדרים</string>
-    <string name="people_no_identity_server">לא הוגדר שרת זהות.</string>
-    <string name="no_more_results">אין תוצאות נוספות</string>
-    <string name="no_result_placeholder">אין תוצאות</string>
-    <string name="template_no_contact_access_placeholder">לא אפשרת לאלמנט לגשת לאנשי הקשר המקומיים שלך</string>
-    <string name="start_new_chat_prompt_msg">האם אתה בטוח שברצונך להתחיל צ\'אט חדש עם %s\?</string>
-    <string name="option_send_voice">שלח קול</string>
-    <string name="start_video_call">התחל שיחת וידאו</string>
-    <string name="start_voice_call">התחל שיחה קולית</string>
-    <string name="start_new_chat">התחל צ\'אט חדש</string>
-    <string name="search">חיפוש</string>
-    <string name="identity_url">קישור לשרת הזיהוי</string>
-    <string name="hs_url">קישור לשרת הבית</string>
-    <string name="logout">יציאה</string>
-    <string name="login">כניסה</string>
-    <string name="create_account">צור חשבון</string>
-    <string name="username">שם משתמש</string>
-    <string name="join_room">הצטרף אל חדר</string>
-    <string name="read_receipt">קרא</string>
-    <string name="send_files_in">שלח פנימה</string>
-    <string name="send_bug_report_failed">לא ניתן היה לשלוח את דוח הבאג (%s)</string>
-    <string name="send_bug_report_sent">דוח הבאג נשלח בהצלחה</string>
-    <string name="send_bug_report_rage_shake">טלטול זעם כדי לדווח על באג</string>
-    <string name="send_bug_report_app_crashed">היישום התרסק בפעם האחרונה. האם ברצונך לפתוח את מסך דוח הקריסה\?</string>
-    <string name="send_bug_report_alert_message">נראה שאתה מטלטל את הטלפון בתסכול. האם ברצונך לפתוח את מסך דוח הבאג\?</string>
-    <string name="send_bug_report_logs_description">על מנת לאבחן בעיות, יומני הלקוח יישלחו עם דוח הבאג הזה. דוח באגים זה, כולל היומנים וצילום המסך, לא יהיה גלוי לציבור. אם אתה מעדיף לשלוח רק את הטקסט למעלה, בטל את הסימון:</string>
-    <string name="send_bug_report_placeholder">תאר את הבעיה שלך כאן</string>
-    <string name="send_bug_report_description_in_english">אם אפשר, אנא כתוב את התיאור באנגלית.</string>
-    <string name="send_bug_report_description">אנא תאר את הבאג. מה עשית\? מה ציפית שיקרה\? מה באמת קרה\?</string>
-    <string name="send_bug_report">דווח על באג</string>
-    <string name="send_bug_report_include_screenshot">שלח צילום מסך</string>
-    <string name="send_bug_report_include_key_share_history">שלח היסטוריית בקשות לשיתוף מפתח</string>
-    <string name="send_bug_report_include_crash_logs">שלח יומני תקלות</string>
-    <string name="send_bug_report_include_logs">שלח יומנים</string>
-    <string name="no_group_placeholder">אין קבוצות</string>
-    <string name="groups_header">קהילות</string>
-    <string name="groups_invite_header">הזמנה</string>
-    <string name="login_error_user_in_use">שם משתמש זה כבר בשימוש</string>
-    <string name="login_error_limit_exceeded">יותר מדי בקשות נשלחו</string>
-    <string name="login_error_not_json">לא מכיל JSON חוקי</string>
-    <string name="login_error_bad_json">JSON פגום</string>
-    <string name="login_error_unknown_token">אסימון הגישה שצוין לא זוהה</string>
-    <string name="login_error_forbidden">שם משתמש / סיסמא שגויים</string>
-    <string name="login_error_ssl_handshake">המכשיר שלך משתמש בפרוטוקול אבטחה TLS מיושן, הפגיע להתקפה, למען ביטחונך לא תוכל להתחבר</string>
-    <string name="login_error_ssl_other">שגיאת SSL.</string>
-    <string name="login_error_ssl_peer_unverified">שגיאת SSL: זהות העמית לא אומתה.</string>
-    <string name="login_error_homeserver_not_found">לא ניתן להגיע לשרת בית בכתובת אתר זו, אנא בדוק זאת</string>
-    <string name="login_error_no_homeserver_found">זו אינה כתובת שרת מטריקס חוקית</string>
-    <string name="login_error_unknown_host">לא ניתן להגיע לכתובת אתר זו, אנא בדוק אותה</string>
-    <string name="login_error_invalid_home_server">אנא הכנס כתובת תקינה</string>
-    <string name="login_error_unable_register_mail_ownership">לא ניתן להירשם: כשל בבעלות על דוא\"ל</string>
-    <string name="login_error_unable_register">לא ניתן להירשם</string>
-    <string name="login_error_registration_network_error">לא ניתן להירשם: שגיאת רשת</string>
-    <string name="login_error_unable_login">לא מצליח להתחבר</string>
-    <string name="login_error_network_error">לא ניתן להתחבר: שגיאת רשת</string>
-    <string name="login_error_must_start_http">כתובת האתר חייבת להתחיל ב- http [s]: //</string>
-    <string name="auth_accept_policies">אנא עיין וקבל את המדיניות של שרת בית זה:</string>
-    <string name="auth_reset_password_success_message">הסיסמה שלך אופסה.
-\n
-\nהוצאת מכל ההפעלות ולא תקבל עוד התראות דחיפה. כדי להפעיל מחדש התראות, התחבר מחדש בכל מכשיר.</string>
-    <string name="auth_reset_password_error_unauthorized">אימות כתובת הדוא\"ל נכשל: ודא שלחצת על הקישור בדוא\"ל</string>
-    <string name="auth_reset_password_email_validation_message">דוא\"ל נשלח אל%s. לאחר שתעקוב אחר הקישור שהוא מכיל, לחץ למטה.</string>
-    <string name="auth_reset_password_missing_password">יש להזין סיסמה חדשה.</string>
-    <string name="auth_reset_password_missing_email">יש להזין את כתובת הדוא\"ל המקושרת לחשבונך.</string>
-    <string name="auth_reset_password_message">כדי לאפס את הסיסמה שלך, הזן את כתובת הדוא\"ל המקושרת לחשבונך:</string>
-    <string name="auth_reset_password_next_step_button">אימתתי את כתובת הדוא\"ל שלי</string>
-    <string name="auth_identity_server">שרת זיהוי:</string>
-    <string name="auth_home_server">שרת הבית:</string>
-    <string name="auth_username_in_use">שם משתמש כבר נמצא בשימוש</string>
-    <string name="auth_recaptcha_message">שרת בית זה רוצה לוודא שאתה לא רובוט</string>
-    <string name="auth_threepid_warning_message">הרשמה באמצעות דוא\"ל ומספר טלפון בבת אחת עדיין אינה נתמכת עד להתקנת ה- API. רק מספר הטלפון ייקח בחשבון.
-\n
-\nתוכל להוסיף את הדוא\"ל שלך לפרופיל שלך בהגדרות.</string>
-    <string name="auth_email_validation_message">אנא בדוק את הדוא\"ל שלך כדי להמשיך בהרשמה</string>
-    <string name="auth_use_server_options">השתמש באפשרויות שרת מותאמות אישית (מתקדם)</string>
-    <string name="auth_forgot_password">שכחת סיסמה\?</string>
-    <string name="auth_password_dont_match">סיסמא אינה תואמת לקודמתה</string>
-    <string name="auth_invalid_token">מטבע אינו חוקי</string>
-    <string name="auth_missing_email_or_phone">כתובת דוא\"ל או מספר טלפון חסרים</string>
-    <string name="auth_missing_phone">מספר טלפון חסר</string>
-    <string name="auth_missing_email">כתובת דוא\"ל חסרה</string>
-    <string name="auth_msisdn_already_defined">מספר הטלפון הזה כבר קיים ומעודכן במערכת.</string>
-    <string name="auth_email_already_defined">כתובת הדוא\"ל הזו כבר קיימת ומוגדרת במערכת.</string>
-    <string name="auth_invalid_phone">זה אינו נראה כמספר טלפון חוקי</string>
-    <string name="auth_invalid_email">זה לא נראה כמו כתובת דוא\"ל חוקית</string>
-    <string name="auth_missing_password">סיסמה חסרה</string>
-    <string name="auth_invalid_password">סיסמה קצרה מדי (נדרש לפחות 6 תווים)</string>
-    <string name="auth_invalid_user_name">שמות משתמשים עשויים להכיל רק אותיות, מספרים, נקודות, מקפים וקו תחתון</string>
-    <string name="auth_invalid_login_param">שם משתמש ו/או סיסמה לא נכונים</string>
-    <string name="auth_repeat_new_password_placeholder">אשר את סיסמתך החדשה</string>
-    <string name="auth_repeat_password_placeholder">חזור על הסיסמה</string>
-    <string name="auth_opt_phone_number_placeholder">מספר טלפון (אופציונלי)</string>
-    <string name="auth_phone_number_placeholder">מספר טלפון</string>
-    <string name="auth_opt_email_placeholder">כתובת דוא\"ל (אופציונלי)</string>
-    <string name="auth_email_placeholder">כתובת דוא\"ל</string>
-    <string name="auth_add_email_and_phone_message_2">הגדר דוא\"ל לשחזור חשבון. השתמש באימייל או בטלפון מאוחרים יותר כדי שאפשר יהיה לגלות אותו על ידי אנשים שמכירים אותך.</string>
-    <string name="auth_add_email_phone_message_2">הגדר דוא\"ל לשחזור חשבון. השתמש באימייל או בטלפון מאוחרים יותר כדי שאפשר יהיה לגלות אותו על ידי אנשים שמכירים אותך.</string>
-    <string name="auth_add_phone_message_2">הגדר טלפון, ואחר כך יהיה ניתן לגלות אותו על ידי אנשים שמכירים אותך.</string>
-    <string name="auth_add_email_message_2">הגדר דוא\"ל לשחזור חשבון, ומאוחר יותר כך שניתן יהיה לגלות אותו על ידי אנשים שמכירים אותך.</string>
-    <string name="auth_user_name_placeholder">שם משתמש</string>
-    <string name="auth_new_password_placeholder">סיסמה חדשה</string>
-    <string name="auth_password_placeholder">סיסמה</string>
-    <string name="auth_user_id_placeholder">מייל או שם משתמש</string>
-    <string name="auth_return_to_login">חזור למסך כניסה</string>
-    <string name="auth_send_reset_email">שלח מייל איפוס</string>
-    <string name="auth_skip">דלג</string>
-    <string name="auth_submit">הגש</string>
-    <string name="auth_register">צור חשבון</string>
-    <string name="auth_login_sso">היכנס באמצעות כניסה יחידה</string>
-    <string name="auth_login">היכנס</string>
-    <string name="error_no_external_application_found">מצטערים, לא נמצאה יישום חיצוני להשלמת פעולה זו.</string>
-    <string name="go_on_with">המשך עם…</string>
-    <string name="no_sticker_application_dialog_content">כרגע אין לך חבילות מדבקה מופעלות.
-\n
-\nלהוסיף כמה עכשיו\?</string>
-    <string name="option_take_video">צלם סרטון</string>
-    <string name="option_take_photo">צלם תמונה</string>
-    <string name="option_take_photo_video">צלם תמונה או סרטון</string>
-    <string name="option_send_sticker">שלח סטיקר</string>
-    <string name="option_send_files">שלח קבצים</string>
-    <string name="call_format_turn_hd_on">הפעל מצב HD</string>
-    <string name="call_format_turn_hd_off">כבה מצב HD</string>
-    <string name="call_camera_back">אחורה</string>
-    <string name="call_camera_front">קדימה</string>
-    <string name="call_switch_camera">החלף בין מצלמה</string>
-    <string name="sound_device_wireless_headset">אוזניות אלחוטיות</string>
-    <string name="sound_device_headset">אוזניות</string>
-    <string name="sound_device_speaker">רמקול</string>
-    <string name="sound_device_phone">טלפון</string>
-    <string name="call_select_sound_device">בחר מכשיר סאונד</string>
-    <string name="call_failed_no_connection_description">נכשל החיבור בזמן אמת.
-\nאנא בקש ממנהל שרת הבית שלך להגדיר שרת TURN על מנת שהשיחות יעבדו בצורה אמינה.</string>
-    <string name="template_call_failed_no_connection">שיחת האלמנט נכשלה</string>
-    <string name="call_failed_dont_ask_again">אל תשאל אותי שוב</string>
-    <string name="call_failed_no_ice_use_alt">נסה להשתמש ב-%s</string>
-    <string name="call_failed_no_ice_title">השיחה נכשלה עקב שרת שהוגדר כהלכה</string>
-    <string name="start_video_call_prompt_msg">האם אתה בטוח שברצונך להתחיל שיחת וידאו\?</string>
-    <string name="start_voice_call_prompt_msg">האם אתה בטוח שברצונך להתחיל שיחה קולית\?</string>
-    <string name="room_creation_title">צ\'ט חדש</string>
-    <string name="invite_no_identity_server_error">הוסף שרת זהות בהגדרות שלך כדי לבצע פעולה זו.</string>
-    <string name="room_preview_room_interactions_disabled">זו תצוגה מקדימה של החדר הזה. אינטראקציות בחדר הושבתו.</string>
-    <string name="room_preview_try_join_an_unknown_room_default">חדר</string>
-    <string name="room_preview_try_join_an_unknown_room">אתה מנסה לגשת ל-%s. האם תרצה להצטרף על מנת להשתתף בדיון\?</string>
-    <string name="room_preview_unlinked_email_warning">הזמנה זו נשלחה אל%s, שאינה משויכת לחשבון זה.
-\nייתכן שתרצה להתחבר עם חשבון אחר, או להוסיף דוא\"ל זה לחשבונך.</string>
-    <string name="room_preview_invitation_format">הוזמנת להצטרף לחדר זה על ידי%s</string>
-    <string name="room_jump_to_first_unread">קפיצה להודעה הראשונה שלא נקראה.</string>
-    <string name="room_sync_in_progress">מסנכרן…</string>
-    <string name="open_chat_header">פתח כותרת</string>
-    <string name="list_members">חברי רשימה</string>
-    <string name="reject">דחייה</string>
-    <string name="preview">תצוגה מקדימה</string>
-    <string name="join">הצטרף</string>
-    <string name="remove">הסר</string>
-    <string name="_continue">המשך</string>
-    <string name="no">לא</string>
-    <string name="yes">כן</string>
-    <string name="media_slider_saved_message">שמור להורדות\?</string>
-    <string name="media_slider_saved">נשמר</string>
-    <string name="permissions_denied_add_contact">אפשר הרשאה לגשת לאנשי הקשר שלך.</string>
-    <string name="permissions_denied_qr_code">כדי לסרוק קוד QR, עליך לאפשר גישה למצלמה.</string>
-    <string name="permissions_action_not_performed_missing_permissions">מצטער. הפעולה לא בוצעה בגלל הרשאות חסרות</string>
-    <string name="template_permissions_msg_contacts_warning_other_androids">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם.
-\n
-\nהאם אתה מסכים לשתף את פנקס הכתובות שלך למטרה זו\?</string>
-    <string name="template_permissions_rationale_msg_contacts">אלמנט יכול לבדוק את פנקס הכתובות שלך כדי למצוא משתמשי מטריקס אחרים על סמך מספרי הדוא\"ל והטלפון שלהם. אם אתה מסכים לשתף את פנקס הכתובות שלך למטרה זו, אנא הגש גישה בחלון הקופץ הבא.</string>
-    <string name="template_permissions_rationale_msg_camera_and_audio">אלמנט זקוק להרשאה כדי לגשת למצלמה ולמיקרופון שלך כדי לבצע שיחות וידאו.
-\n
-\nאנא אפשר גישה בחלונות הקופצים הבאים כדי להיות מסוגל לבצע את השיחה.</string>
-    <string name="permissions_rationale_msg_record_audio_explanation">"
-\n
-\nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לבצע את השיחה."</string>
-    <string name="template_permissions_rationale_msg_record_audio">אלמנט זקוק להרשאה כדי לגשת למיקרופון שלך כדי לבצע שיחות שמע.</string>
-    <string name="permissions_rationale_msg_camera_explanation">"
-\n
-\nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לבצע את השיחה."</string>
-    <string name="template_permissions_rationale_msg_camera">אלמנט זקוק להרשאה כדי לגשת למצלמה שלך כדי לצלם תמונות ושיחות וידאו.</string>
-    <string name="template_permissions_rationale_msg_storage">אלמנט זקוק להרשאה כדי לגשת לספריית התמונות והווידיאו שלך כדי לשלוח ולשמור קבצים מצורפים.
-\n
-\nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לשלוח קבצים מהטלפון שלך.</string>
-    <string name="permissions_rationale_popup_title">מידע</string>
-    <string name="media_picker_cannot_record_video">לא ניתן להקליט וידאו</string>
-    <string name="media_picker_both_capture_title">צלם תמונה או סרטון</string>
-    <string name="call_error_answered_elsewhere">השיחה נענתה במקום אחר</string>
-    <string name="call_error_camera_init_failed">לא ניתן לאתחל את המצלמה</string>
-    <string name="call_error_ice_failed">חיבור המדיה נכשל</string>
-    <string name="call_error_user_not_responding">הצד המרוחק לא הצליח להרים.</string>
-    <string name="return_to_call">חזור לשיחה</string>
-    <string name="active_call_with_duration">שיחה פעילה (%s)</string>
-    <string name="video_call_in_progress">שיחת וידאו מתבצעת …</string>
-    <string name="call_in_progress">במהלך התקשרות…</string>
-    <string name="incoming_voice_call">שיחה קולית נכנסת</string>
-    <string name="incoming_video_call">שיחת וידאו נכנסת</string>
-    <string name="incoming_call">שיחה נכנסת</string>
-    <string name="call_ring">מתקשר…</string>
-    <string name="call_ended">שיחה הסתיימה</string>
-    <string name="call_connecting">שיחה מתחברת …</string>
-    <string name="call_connected">שיחה מחוברת</string>
-    <string name="call">שִׂיחָה</string>
-    <string name="settings_call_ringtone_dialog_title">בחר רינגטון לשיחות:</string>
-    <string name="settings_call_ringtone_title">רינגטון שיחה נכנסת</string>
-    <string name="settings_call_ringtone_use_default_stun_sum">ישתמש ב-%s כסיוע כאשר השרת הביתי שלך אינו מציע כזה (כתובת ה- IP שלך תשותף במהלך שיחה)</string>
-    <string name="settings_call_ringtone_use_default_stun">אפשר שרת עזרה לשיחות</string>
-    <string name="template_settings_call_ringtone_use_app_ringtone">השתמש ברינגטון ברירת המחדל של אלמנט לשיחות נכנסות</string>
-    <string name="settings_call_show_confirmation_dialog_summary">בקש אישור לפני שמתחילים בשיחה</string>
-    <string name="settings_call_show_confirmation_dialog_title">מנע שיחה מקרית</string>
-    <string name="settings_call_category">שיחות</string>
-    <string name="room_info_room_topic">נושא החדר</string>
-    <string name="room_info_room_name">שם חדר</string>
-    <string name="today">היום</string>
-    <string name="yesterday">אתמול</string>
-    <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-    <string name="attachment_remaining_time_seconds">%d s</string>
-    <string name="attachment_cancel_upload">האם לבטל את ההעלאה\?</string>
-    <string name="attachment_cancel_download">האם לבטל את ההורדה\?</string>
-    <string name="compression_opt_list_small">קטן</string>
-    <string name="compression_opt_list_medium">בינוני</string>
-    <string name="compression_opt_list_large">גדול</string>
-    <string name="compression_opt_list_original">מקור</string>
-    <string name="compression_options">שלח כ</string>
-    <plurals name="membership_changes">
-        <item quantity="one">שינוי בפרט חברות</item>
-        <item quantity="two">שינוי בפרטי חברות</item>
-        <item quantity="many">שינוי בפרטי חברות</item>
-        <item quantity="other">שינוי בפרטי חברות</item>
-    </plurals>
-    <string name="groups_list">רשימת קבוצות</string>
-    <string name="read_receipts_list">קרא את רשימת הקבלות</string>
-    <string name="template_e2e_re_request_encryption_key_dialog_content">הפעל את Element במכשיר אחר שיכול לפענח את ההודעה כדי שיוכל לשלוח את המפתחות להפעלה זו.</string>
-    <string name="e2e_re_request_encryption_key_dialog_title">הבקשה נשלחה</string>
-    <string name="e2e_re_request_encryption_key_sent">בקשת המפתח נשלחה.</string>
-    <string name="e2e_re_request_encryption_key">בקש מחדש מפתחות הצפנה מהפעלות האחרות שלך.</string>
-    <string name="room_prompt_cancel">בטל הכל</string>
-    <string name="room_prompt_resend">שלח מחדש הכל</string>
-    <string name="room_unknown_devices_messages_notification">הודעות לא נשלחו בגלל הימצאות פעילויות לא ידועות. %1$s או %2$s עכשיו\?</string>
-    <string name="room_unsent_messages_notification">הודעות לא נשלחו. %1$s או %2$s עכשיו\?</string>
-    <string name="room_offline_notification">הקישוריות לשרת אבדה.</string>
-    <string name="room_message_placeholder_reply_to_not_encrypted">שלח תשובה (לא מוצפן) …</string>
-    <string name="settings_notifications_targets">יעדי התראות</string>
-    <string name="settings_cryptography_manage_keys">ניהול מפתחות קריפטוגרפיה</string>
-    <string name="settings_cryptography">קריפטוגרפיה</string>
-    <string name="settings_integrations_summary">השתמש במנהל שילוב לניהול בוטים, גשרים, ווידג\'טים וחבילות מדבקות.
-\nמנהלי אינטגרציה מקבלים נתוני תצורה ויכולים לשנות ווידג\'טים, לשלוח הזמנות לחדר ולהגדיר רמות כוח מטעמכם.</string>
-    <string name="settings_integrations">אינטגרציות</string>
-    <string name="settings_advanced">מתקדם</string>
-    <string name="settings_other">אחר</string>
-    <string name="settings_ignored_users">משתמשים שמתעלמים מהם</string>
-    <string name="settings_notifications">התראות</string>
-    <string name="settings_user_settings">הגדרות משתמש</string>
-    <string name="settings_clear_media_cache">נקה מטמון מדיה</string>
-    <string name="settings_clear_cache">נקה את זיכרון המטמון</string>
-    <string name="settings_keep_media">שמור על מדיה</string>
-    <string name="settings_privacy_policy">מדיניות הפרטיות</string>
-    <string name="settings_copyright">זכויות יוצרים</string>
-    <string name="settings_third_party_notices">התראות צד שלישי</string>
-    <string name="settings_app_term_conditions">תנאים והגבלות</string>
-    <string name="settings_olm_version">גרסת olm</string>
-    <string name="settings_version">גִרְסָה</string>
-    <plurals name="seconds">
-        <item quantity="one">%d שנייה</item>
-        <item quantity="two">%d שניות</item>
-        <item quantity="many">%d שניות</item>
-        <item quantity="other">%d שניות</item>
-    </plurals>
-    <string name="settings_set_sync_delay">עיכוב בין כל סינכרון</string>
-    <string name="settings_set_workmanager_delay_summary">%s
-\nהסנכרון עשוי להידחות בהתאם למשאבים (סוללה) או מצב ההתקן (שינה).</string>
-    <string name="settings_set_workmanager_delay">מרווח סינכרון מועדף</string>
-    <string name="settings_set_sync_timeout">פסק-זמן לבקשה לסנכרון</string>
-    <string name="settings_enable_background_sync">אפשר סנכרון רקע</string>
-    <string name="settings_start_on_boot">החל באתחול</string>
-    <string name="settings_background_sync_update_error">עדכון ההגדרות נכשל.</string>
-    <string name="settings_background_fdroid_sync_mode_disabled_description">לא תקבל הודעה על הודעות נכנסות כאשר האפליקציה ברקע.</string>
-    <string name="settings_background_fdroid_sync_mode_disabled">אין סנכרון רקע</string>
-    <string name="template_settings_background_fdroid_sync_mode_real_time_description">אלמנט יסונכרן ברקע מעת לעת בזמן מדויק (ניתן להגדרה).
-\nזה ישפיע על השימוש ברדיו ובסוללה, תוצג הודעה קבועה לפיה אלמנט מאזין לאירועים.</string>
-    <string name="settings_background_fdroid_sync_mode_real_time">מותאם לזמן אמת</string>
-    <string name="template_settings_background_fdroid_sync_mode_battery_description">אלמנט יסונכרן ברקע באופן שישמור על המשאבים המוגבלים של המכשיר (סוללה).
-\nבהתאם למצב משאבי המכשיר שלך, ייתכן שהסנכרון יידחה על ידי מערכת ההפעלה.</string>
-    <string name="settings_background_fdroid_sync_mode_battery">מותאם לסוללה</string>
-    <string name="settings_background_fdroid_sync_mode">מצב סנכרון רקע</string>
-    <string name="settings_background_sync">סנכרון רקע</string>
-    <string name="settings_messages_sent_by_bot">הודעות שנשלחו על ידי בוט</string>
-    <string name="settings_call_invitations">הזמנות לשיחות</string>
-    <string name="settings_invited_to_room">כשאני מוזמן לחדר</string>
-    <string name="settings_messages_in_group_chat">הודעות בצ\'אטים קבוצתיים</string>
-    <string name="settings_messages_in_one_to_one">הודעות בצ\'אטים אחד-על-אחד</string>
-    <string name="settings_containing_my_user_name">הודעות שמכילות את שם המשתמש שלי</string>
-    <string name="settings_containing_my_display_name">הודעות שמכילות את שם התצוגה שלי</string>
-    <string name="settings_system_preferences_summary">בחר צבע LED, רטט, צליל …</string>
-    <string name="settings_silent_notifications_preferences">הגדר התראות שקטות</string>
-    <string name="settings_call_notifications_preferences">הגדר התראות על שיחות</string>
-    <string name="settings_noisy_notifications_preferences">הגדר תצורה של התראות רועשות</string>
-    <string name="settings_turn_screen_on">הדלק את המסך למשך 3 שניות</string>
-    <string name="settings_enable_this_device">אפשר התראות עבור מושב זה</string>
-    <string name="settings_enable_all_notif">אפשר התראות עבור חשבון זה</string>
-    <string name="settings_notification_ringtone">צליל התראה</string>
-    <string name="settings_notification_privacy_message_content_not_shown">• התראות &lt;b&gt; לא יציגו את תוכן ההודעה &lt;/ b&gt;<b>not show message content</b></string>
-    <string name="settings_notification_privacy_nosecure_message_content">• התראות מכילות &lt;b&gt; נתוני ליבה והודעות &lt;/ b&gt;<b>meta and message data</b></string>
-    <string name="settings_notification_privacy_secure_message_content">• תוכן ההודעה של ההודעה &lt;b&gt; ממוקם בצורה מאובטחת ישירות משרת הבית של מטריקס &lt;/ b&gt;<b>located securely direct from the Matrix homeserver</b></string>
-    <string name="settings_notification_privacy_metadata">• התראות מכילות רק נתוני ליבה</string>
-    <string name="settings_notification_privacy_fcm">• התראות נשלחות באמצעות Firebase Cloud Messaging</string>
-    <string name="settings_notification_privacy_no_background_sync">היישומים &lt;b&gt; לא &lt;/ b&gt; צריכים להתחבר ל- HomeServer ברקע, זה אמור להפחית את השימוש בסוללה<b>not</b> need to connect to the HomeServer in the background, it should reduce battery usage</string>
-    <string name="settings_notification_privacy_need_permission">האפליקציה זקוקה לאישורך כדי לפעול ברקע</string>
-    <string name="settings_notification_privacy_reduced">פרטיות מצומצמת</string>
-    <string name="settings_notification_privacy_normal">רגיל</string>
-    <string name="settings_troubleshoot_test_battery_quickfix">התעלם מאופטימיזציה</string>
-    <string name="settings_troubleshoot_test_battery_failed">אם משתמש משאיר מכשיר מחובר לחשמל ויציב לתקופה מסוימת, כשהמסך כבוי, המכשיר עובר למצב Doze. זה מונע מאפליקציות גישה לרשת ומגדיר את העבודות, הסנכרונים וההתראות הסטנדרטיות שלהם.</string>
-    <string name="template_settings_troubleshoot_test_battery_success">אלמנט אינו מושפע מתהליך מיטוב הסוללה.</string>
-    <string name="settings_troubleshoot_test_battery_title">אופטימיזציה של הסוללה</string>
-    <string name="settings_troubleshoot_test_bg_restricted_quickfix">השבת הגבלות</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_failed">מגבלות רקע מופעלות עבור Element.
-\nהעבודה שהאפליקציה מנסה לעשות תוגבל באגרסיביות בזמן שהיא ברקע, וזה עלול להשפיע על ההודעות.
-\n%1$s</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_success">מגבלות רקע מושבתות עבור Element. יש להריץ בדיקה זו באמצעות נתונים ניידים (ללא WIFI).
-\n%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_title">בדוק מגבלות רקע</string>
-    <string name="settings_troubleshoot_test_service_boot_quickfix">הפעל את התחלה לאחר אתחול</string>
-    <string name="template_settings_troubleshoot_test_service_boot_failed">השירות לא יופעל עם הפעלת המכשיר מחדש, לא תקבל התראות עד שאלמנט ייפתח לפחות פעם אחת.</string>
-    <string name="settings_troubleshoot_test_service_boot_success">השירות יתחיל עם הפעלת המכשיר מחדש.</string>
-    <string name="settings_troubleshoot_test_service_boot_title">הפעל לאחר אתחול</string>
-    <string name="settings_troubleshoot_test_service_restart_failed">השירות נכשל מלעלות מחדש</string>
-    <string name="settings_troubleshoot_test_service_restart_success">השירות נסגר והופעל מחדש אוטומטית.</string>
-    <string name="settings_troubleshoot_test_service_restart_title">הפעלה מחדש אוטומטית לשירות ההתראות</string>
-    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">החל שירות</string>
-    <string name="settings_troubleshoot_test_foreground_service_started_failed">שירות ההתראות אינו פועל.
-\nנסה להפעיל מחדש את היישום.</string>
-    <string name="settings_troubleshoot_test_foreground_service_startedt_success">שירות ההתראות פועל.</string>
-    <string name="settings_troubleshoot_test_foreground_service_started_title">שירות התראות</string>
-    <string name="settings_troubleshoot_test_notification_notification_clicked">ההודעה נלחצה!</string>
-    <string name="settings_troubleshoot_test_notification_notice">אנא לחץ על ההודעה. אם אינך רואה את ההודעה, אנא בדוק את הגדרות המערכת.</string>
-    <string name="settings_troubleshoot_test_notification_title">תצוגת התראות</string>
-    <string name="settings_troubleshoot_test_push_notification_content">אתה צופה בהודעה! לחץ עלי!</string>
-    <string name="settings_troubleshoot_test_push_loop_failed">קבלת הדחיפה נכשלה. הפתרון יכול להיות התקנה מחדש של היישום.</string>
-    <string name="settings_troubleshoot_test_push_loop_title">בדיקת שליחה בדחיפה (PUSH)</string>
-    <string name="settings_troubleshoot_test_push_loop_success">היישום מקבל PUSH</string>
-    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">היישום ממתין ל- PUSH</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">נכשל רישום אסימון FCM ל- HomeServer:
-\n%1$s</string>
-    <string name="settings_troubleshoot_test_token_registration_success">אסימון FCM נרשם בהצלחה ל- HomeServer.</string>
-    <string name="settings_troubleshoot_test_token_registration_title">רישום אסימונים</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">הוסף חשבון</string>
-    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nשגיאה זו אינה בשליטה על אלמנט. אין חשבון Google בטלפון. אנא פתח את מנהל החשבון והוסף חשבון Google.</string>
-    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nשגיאה זו אינה בשליטה על אלמנט. זה יכול להתרחש מכמה סיבות. אולי זה יעבוד אם תנסה שוב מאוחר יותר, תוכל גם לבדוק ששירות Google Play אינו מוגבל בשימוש נתונים בהגדרות המערכת, או ששעון המכשיר שלך תקין, או שזה יכול לקרות ב- ROM מותאם אישית.</string>
-    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nשגיאה זו איננה בשליטה על Element ולפי גוגל, שגיאה זו מצביעה על כך שלמכשיר יש יותר מדי אפליקציות הרשומות ב- FCM. השגיאה מתרחשת רק במקרים שבהם ישנם מספרים קיצוניים של אפליקציות, כך שהיא לא אמורה להשפיע על המשתמש הממוצע.</string>
-    <string name="settings_troubleshoot_test_fcm_failed">נכשל באחזור אסימון FCM:
-\n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_success">אסימון FCM אוחזר בהצלחה:
-\n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_title">אסימון Firebase</string>
-    <string name="settings_troubleshoot_test_play_services_quickfix">תקן שירותי Google Play</string>
-    <string name="template_settings_troubleshoot_test_play_services_failed">אלמנט משתמש בשירותי Google Play כדי להעביר הודעות פוש אך נראה שהוא אינו מוגדר כהלכה:
-\n%1$s</string>
-    <string name="settings_troubleshoot_test_play_services_success">ה- APK של שירותי Google Play זמין ומעודכן.</string>
-    <string name="settings_troubleshoot_test_play_services_title">בדיקת שירותי הפעלה</string>
-    <string name="settings_troubleshoot_test_bing_settings_quickfix">בדוק בהגדרות</string>
-    <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">טעינת הכללים המותאמים אישית נכשלה, אנא נסה שוב.</string>
-    <string name="tab_title_search_rooms">חדרים</string>
-    <string name="search_no_results">אין תוצאות</string>
-    <string name="search_banned_user_hint">סנן משתמשים מודרים</string>
-    <string name="search_members_hint">סנן חברים מהחדר</string>
-    <string name="search_hint">חפש</string>
-    <string name="room_event_action_cancel_download">בטל הורדה</string>
-    <string name="room_event_action_cancel_upload">בטל העלאה</string>
-    <string name="room_event_action_report_prompt_ignore_user">האם ברצונך להסתיר את כל ההודעות ממשתמש זה\?
-\nשים לב שפעולה זו תפעיל מחדש את האפליקציה והיא עשויה להימשך זמן מה.</string>
-    <string name="room_event_action_report_prompt_reason">סיבה לדיווח על תוכן זה</string>
-    <string name="room_details_people_present_group_name">הצטרף</string>
-    <string name="room_details_people_invited_group_name">מוזמן</string>
-    <string name="malformed_id">תעודת זהות שגויה. צריכה להיות כתובת דוא\"ל או מזהה מטריצה כמו \'@localpart: domain\'</string>
-    <plurals name="room_details_selected">
-        <item quantity="one">%d נבחר</item>
-        <item quantity="two">%d נבחרים</item>
-        <item quantity="many">%d נבחרים</item>
-        <item quantity="other">%d נבחרים</item>
-    </plurals>
-    <string name="room_details_settings">הגדרות</string>
-    <string name="room_details_files">קבצים</string>
-    <string name="room_details_people">אנשים</string>
-    <string name="room_details_title">פרטי החדר</string>
-    <string name="ssl_only_accept">קבל את האישור רק אם מנהל השרת פרסם טביעת אצבע התואמת את זו שלמעלה.</string>
-    <string name="ssl_expected_existing_expl">האישור השתנה מאישור מהימן בעבר לאיש מהימן. ייתכן שהשרת חידש את האישור שלו. פנה למנהל השרת לקבלת טביעת האצבע הצפויה.</string>
-    <string name="ssl_unexpected_existing_expl">האישור השתנה מאישור שהטלפון שלך אמין עליו. זה מאוד לא שגרתי. מומלץ לא לקבל את האישור החדש הזה.</string>
-    <string name="ssl_cert_new_account_expl">אם מנהל השרת אמר שזה צפוי, ודא שטביעת האצבע שלמטה תואמת את טביעת האצבע שמספקת אותם.</string>
-    <string name="ssl_cert_not_trust">יכול להיות שמישהו מיירט את התעבורה שלך בזדון, או שהטלפון שלך לא סומך על האישור שמספק השרת המרוחק.</string>
-    <string name="ssl_could_not_verify">לא ניתן לאמת את זהות השרת המרוחק.</string>
-    <string name="ssl_fingerprint_hash">טביעת אצבע (%s):</string>
-    <string name="ssl_remain_offline">התעלם</string>
-    <string name="ssl_logout_account">יציאה</string>
-    <string name="ssl_do_not_trust">אל תתן אמון</string>
-    <string name="ssl_trust">אמון</string>
-    <plurals name="room_new_messages_notification">
-        <item quantity="one">הודעה חדשה</item>
-        <item quantity="two">הודעות חדשות</item>
-        <item quantity="many">הודעות חדשות</item>
-        <item quantity="other">הודעות חדשות</item>
-    </plurals>
-    <string name="room_do_not_have_permission_to_post">אין לך הרשאה לפרסם בחדר זה</string>
-    <string name="room_message_file_not_found">הקובץ לא נמצא</string>
-    <string name="room_delete_unsent_messages">מחק הודעות שלא נשלחו</string>
-    <string name="room_resend_unsent_messages">שלח שוב הודעות שלא נשלחו</string>
-    <string name="room_message_placeholder_reply_to_encrypted">שלח תשובה מוצפנת …</string>
-    <string name="room_message_placeholder_not_encrypted">שלח הודעה (לא מוצפן) …</string>
-    <string name="room_message_placeholder_encrypted">שלח הודעה מוצפנת …</string>
-    <string name="room_many_users_are_typing">%1$s &amp;%2$s ואחרים מקלידים …</string>
-    <string name="room_two_users_are_typing">%1$s &amp;%2$s מקלידים …</string>
-    <string name="room_one_user_is_typing">%s מקליד …</string>
-    <string name="room_menu_search">חפש</string>
-    <string name="people_search_invite_by_id_dialog_hint">אימייל או מזהה מטריקס</string>
-    <string name="people_search_invite_by_id_dialog_description">אנא הזן כתובת דוא\"ל אחת או יותר או מזהה מטריקס</string>
-    <string name="people_search_invite_by_id_dialog_title">הזמן משתמש לפי מזהה</string>
-    <string name="people_search_filter_text">משתמשי מטריקס בלבד</string>
-    <string name="people_search_local_contacts">אנשי קשר מקומיים (%d)</string>
-    <string name="people_search_invite_by_id">&lt;u&gt; הזמן לפי מזהה &lt;/ u&gt;<u>Invite by ID</u></string>
-    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-    <string name="room_participants_invite_join_names_and">%1$s ו %2$s</string>
-    <string name="room_participants_invite_join_names">"%1$s, "</string>
-    <string name="room_participants_invite_prompt_msg">האם אתה בטוח שברצונך להזמין את%s לצ\'אט זה\?</string>
-    <string name="reason_hint">סיבה</string>
-    <string name="room_participants_unban_prompt_msg">הסרת נידוי ממשתמש יאפשר לו להצטרף שוב לחדר.</string>
-    <string name="room_participants_ban_prompt_msg">איסור על המשתמש יבעט בהם מחדר זה וימנע מהם להצטרף שוב.</string>
-    <string name="room_participants_unban_title">הסר נידוי ממשתמש</string>
-    <string name="room_participants_ban_reason">סיבות לנידוי</string>
-    <string name="room_participants_ban_title">נדה משתמש</string>
-    <string name="room_participants_kick_prompt_msg">משתמש מעיף יסיר אותם מחדר זה.
-\n
-\nכדי למנוע מהם להצטרף שוב, עליך לאסור אותם במקום זאת.</string>
-    <string name="room_participants_kick_reason">סיבות להעפה</string>
-    <string name="room_participants_kick_title">העף משתמש</string>
-    <string name="room_participants_action_cancel_invite_prompt_msg">האם אתה בטוח שברצונך לבטל את ההזמנה עבור משתמש זה\?</string>
-    <string name="room_participants_action_cancel_invite_title">בטל הזמנה</string>
-    <string name="room_participants_action_unignore">הסרת התעלמות</string>
-    <string name="room_participants_action_unignore_prompt_msg">ביטול חתימת משתמש זה יציג את כל ההודעות מהם שוב.</string>
-    <string name="room_participants_action_unignore_title">הסרת התעלמות ממשתמש</string>
-    <string name="room_participants_action_ignore">התעלם</string>
-    <string name="room_participants_action_ignore_prompt_msg">התעלמות ממשתמש זה תסיר את ההודעות שלו מחדרים שאתה משתף.
-\n
-\nאתה יכול להפוך פעולה זו בכל עת בהגדרות הכלליות.</string>
-    <string name="room_participants_action_ignore_title">התעלם ממשתמש</string>
-    <string name="room_participants_power_level_demote">לְהוֹרִיד בְּדַרגָה</string>
-    <string name="room_participants_power_level_demote_warning_prompt">לא תוכל לבטל את השינוי הזה מכיוון שאתה מוריד את עצמך בדרגה, אם אתה המשתמש המיועד האחרון בחדר, אי אפשר יהיה להחזיר לו הרשאות.</string>
-    <string name="room_participants_power_level_demote_warning_title">להוריד את עצמך\?</string>
-    <string name="room_participants_power_level_prompt">לא תוכל לבטל את השינוי הזה מכיוון שאתה מקדם את המשתמש לאותה רמת כוח כמוך.
-\nהאם אתה בטוח\?</string>
-    <string name="room_participants_action_devices_list">הצג רשימת מושבים</string>
-    <string name="room_participants_action_mention">אזכר</string>
-    <string name="room_participants_invite_search_another_user">מזהה משתמש, שם או דוא\"ל</string>
-    <string name="room_participants_action_set_admin">הפוך למנהל</string>
-    <string name="room_participants_action_set_moderator">הפוך למנחה</string>
-    <string name="room_participants_action_set_default_power_level">אפס למשתמש רגיל</string>
-    <string name="room_participants_action_kick">העף</string>
-    <string name="room_participants_action_unban">הסרת התעלמות</string>
-    <string name="room_participants_action_ban">התעלם</string>
-    <string name="room_participants_action_remove">הסר מחדר זה</string>
-    <string name="room_participants_action_leave">עזוב חדר זה</string>
-    <string name="room_participants_action_cancel_invite">בטל הזמנה</string>
-    <string name="room_participants_action_invite">הזמן</string>
-    <string name="room_participants_header_devices">מושבים</string>
-    <string name="room_participants_header_direct_chats">הודעות ישירות</string>
-    <string name="room_participants_header_call">שיחה</string>
-    <string name="room_participants_header_admin_tools">כלי אדמיניסטרציה</string>
-    <string name="room_participants_idle">זמין</string>
-    <string name="room_participants_offline">אופליין</string>
-    <string name="room_participants_online">אונליין</string>
-    <string name="room_participants_create">צור</string>
-    <string name="settings_troubleshoot_test_bing_settings_failed">חלק מההתראות מושבתות בהגדרות המותאמות אישית שלך.</string>
-    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">שים לב שחלק מסוגי ההודעות מוגדרים כשתיקים (יפיקו התראה ללא צליל).</string>
-    <string name="settings_troubleshoot_test_bing_settings_title">הגדרות מותאמות אישית.</string>
-    <string name="settings_troubleshoot_test_device_settings_quickfix">אפשר</string>
-    <string name="template_settings_troubleshoot_test_device_settings_failed">התראות אינן מופעלות עבור הפעלה זו.
-\nאנא בדוק את הגדרות האלמנט.</string>
-    <string name="settings_troubleshoot_test_device_settings_success">התראות מופעלות להפעלה זו.</string>
-    <string name="settings_troubleshoot_test_device_settings_title">הגדרות מושב.</string>
-    <string name="settings_troubleshoot_test_account_settings_quickfix">אפשר</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">התראות מושבתות עבור חשבונך.
-\nאנא בדוק את הגדרות החשבון.</string>
-    <string name="settings_troubleshoot_test_account_settings_success">התראות מופעלות עבור חשבונך.</string>
-    <string name="settings_troubleshoot_test_account_settings_title">הגדרות חשבון.</string>
-    <string name="open_settings">פתח את ההגדרות</string>
-    <string name="settings_troubleshoot_test_system_settings_failed">התראות מושבתות בהגדרות המערכת.
-\nאנא בדוק את הגדרות המערכת.</string>
-    <string name="settings_troubleshoot_test_system_settings_success">התראות מופעלות בהגדרות המערכת.</string>
-    <string name="settings_troubleshoot_test_system_settings_title">הגדרות מערכת.</string>
-    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">בדיקה אחת או יותר נכשלו, אנא שלח דו\"ח שגיאה שיעזור לנו לחקור זאת.</string>
-    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">בדיקה אחת או יותר נכשלו, נסה הצעה/ות אלו לתיקון.</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">אבחון בסיסי תקין. אם עדיין אינך מקבל התראות, אנא שלח דו\"ח שגיאה שיעזור לנו לחקור זאת.</string>
-    <string name="settings_troubleshoot_diagnostic_run_button_title">הרץ מבדקים</string>
-    <string name="settings_troubleshoot_diagnostic">אבחון לפתרון בעיות</string>
-    <string name="settings_notification_troubleshoot">פותר בעיות התראות</string>
-    <string name="settings_notification_privacy">פרטיות הודעות</string>
-    <string name="settings_notification_by_event">חשיבות ההודעה לפי אירוע</string>
-    <string name="settings_notification_advanced">הגדרות התראה מתקדמות</string>
-    <string name="error_threepid_auth_failed">וודא שלחצת על הקישור בהודעת הדוא\"ל ששלחנו אליך.</string>
-    <string name="settings_remove_three_pid_confirmation_content">להסיר את%s\?</string>
-    <string name="settings_phone_numbers">מספרי טלפון</string>
-    <string name="settings_emails_empty">לא הוספה כתובת דוא\"ל לחשבונך</string>
-    <string name="settings_emails">כתובות דוא\"ל</string>
-    <string name="settings_add_3pid_authentication_needed">נדרש אימות</string>
-    <string name="template_settings_add_3pid_flow_not_supported">אינך יכול לעשות זאת ממכשיר נייד</string>
-    <string name="settings_add_3pid_confirm_password_title">אשר את סיסמתך</string>
-    <string name="settings_app_info_link_summary">הצג את פרטי היישום בהגדרות המערכת.</string>
-    <string name="settings_app_info_link_title">מידע על האפליקציה</string>
-    <string name="settings_add_phone_number">הוסף מספר טלפון</string>
-    <string name="settings_phone_number_empty">לא הוסף מספר טלפון לחשבונך</string>
-    <string name="settings_phone_number">מספר טלפון</string>
-    <string name="settings_add_email_address">הוסף כתובת דוא\"ל</string>
-    <string name="settings_email_address">כתובת דוא\"ל</string>
-    <string name="settings_display_name">שם תצוגה</string>
-    <string name="settings_profile_picture">תמונת פרופיל</string>
-    <string name="room_sliding_menu_privacy_policy">מדיניות הפרטיות</string>
-    <string name="room_sliding_menu_copyright">זכויות יוצרים</string>
-    <string name="room_sliding_menu_third_party_notices">התראות צד שלישי</string>
-    <string name="room_sliding_menu_term_and_conditions">תנאים והגבלות</string>
-    <string name="room_sliding_menu_version">גרסה</string>
-    <string name="room_sliding_menu_settings">הגדרות</string>
-    <string name="room_sliding_menu_messages">הודעות</string>
-    <string name="room_settings_add_homescreen_shortcut">הוסף למסך הבית</string>
-    <string name="room_settings_forget">שכח</string>
-    <string name="room_settings_leave_conversation">עזוב את השיחה</string>
-    <string name="room_settings_direct_chat">צ\'אט ישיר</string>
-    <string name="room_settings_de_prioritize">בטל עדיפות</string>
-    <string name="room_settings_favourite">מועדף</string>
-    <string name="room_settings_mute">השתק</string>
-    <string name="room_settings_mention_only">אזכורים בלבד</string>
-    <string name="room_settings_all_messages">כל ההודעות</string>
-    <string name="room_settings_all_messages_noisy">כל ההודעות (קוליות)</string>
-    <string name="directory_searching_title">מחפש בתיקייה…</string>
-    <plurals name="directory_search_rooms">
-        <item quantity="one">%d חדר</item>
-        <item quantity="two">%d חדרים</item>
-        <item quantity="many">%d חדרים</item>
-        <item quantity="other">%d חדרים</item>
-    </plurals>
-    <string name="directory_search_results_title">חפש בתיקיות</string>
-    <string name="room_recents_join_room_prompt">הקלד מזהה חדר או כינוי לחדר</string>
-    <string name="room_recents_join_room_title">הצטרף לחדר</string>
-    <string name="room_recents_join_room">הצטרף לחדר</string>
-    <string name="room_recents_create_room">צור חדר</string>
-    <string name="room_recents_start_chat">התחלת שיחת צ\'אט</string>
-    <string name="room_recents_invites">הזמנות</string>
-    <string name="room_recents_low_priority">עדיפות נמוכה</string>
-    <string name="room_recents_conversations">חדרים</string>
-    <string name="room_recents_favourites">מועדפים</string>
-    <string name="room_recents_directory">תיקייה ראשית</string>
-    <string name="room_recents_join">הצטרף</string>
-    <string name="search_is_not_supported_in_e2e_room">עדיין אין תמיכה בחיפוש בחדרים מוצפנים.</string>
-    <string name="tab_title_search_files">קבצים</string>
-    <string name="tab_title_search_people">אנשים</string>
-    <string name="tab_title_search_messages">הודעות</string>
-    <string name="room_participants_remove_prompt_msg">האם אתה בטוח שברצונך להסיר את%s מהצ\'אט הזה\?</string>
-    <string name="room_participants_leave_prompt_msg">האם ברצונך לעזוב את החדר\?</string>
-    <string name="room_participants_leave_prompt_title">עזוב חדר</string>
-    <plurals name="format_time_d">
-        <item quantity="one">%dd</item>
-        <item quantity="two">%dd</item>
-        <item quantity="many">%dd</item>
-        <item quantity="other">%dd</item>
-    </plurals>
-    <plurals name="format_time_h">
-        <item quantity="one">%dh</item>
-        <item quantity="two">%dh</item>
-        <item quantity="many">%dh</item>
-        <item quantity="other">%dh</item>
-    </plurals>
-    <plurals name="format_time_m">
-        <item quantity="one">%dm</item>
-        <item quantity="two">%dm</item>
-        <item quantity="many">%dm</item>
-        <item quantity="other">%dm</item>
-    </plurals>
-    <plurals name="format_time_s">
-        <item quantity="one">%ds</item>
-        <item quantity="two">%ds</item>
-        <item quantity="many">%ds</item>
-        <item quantity="other">%ds</item>
-    </plurals>
-    <string name="room_title_one_member">חבר אחד</string>
-    <plurals name="room_title_members">
-        <item quantity="one">חבר</item>
-        <item quantity="two">חברים</item>
-        <item quantity="many">חברים</item>
-        <item quantity="other">חברים</item>
-    </plurals>
-    <plurals name="room_header_active_members_count">
-        <item quantity="one">חבר פעיל</item>
-        <item quantity="two">חברים פעילים</item>
-        <item quantity="many">חברים פעילים</item>
-        <item quantity="other">חברים פעילים</item>
-    </plurals>
-    <string name="room_creation_add_member">הוסף חבר</string>
-    <string name="start_verification">התחל אימות</string>
-    <string name="your_unverified_device_requesting_with_info">מושב לא מאומת מבקש מפתחות הצפנה.
-\nשם מושב: %1$s
-\nנראה לאחרונה: %2$s
-\nאם לא נכנסת למפגש אחר, התעלם מבקשה זו.</string>
-    <string name="your_unverified_device_requesting">ההפעלה \'%s\' לא מאומתת מבקשת מפתחות הצפנה.</string>
-    <string name="you_added_a_new_device_with_info">מושב חדש מבקש מפתחות הצפנה.
-\nשם מושב: %1$s
-\nנראה לאחרונה: %2$s
-\nאם לא נכנסת למפגש אחר, התעלם מבקשה זו.</string>
-    <string name="you_added_a_new_device">הוספת מושב חדש \'%s\', המבקש מפתחות הצפנה.</string>
-    <string name="widget_integration_review_terms">כדי להמשיך עליך לקבל את תנאי השירות הזה.</string>
-    <string name="settings_labs_enable_send_voice_summary">אפשרות זו מחייבת יישום צד שלישי להקליט את ההודעות.</string>
-    <string name="settings_labs_enable_send_voice">שלח הודעות קוליות</string>
-    <string name="settings_labs_keyboard_options_to_send_message">השתמש במקש הזנת המקלדת כדי לשלוח הודעה</string>
-    <string name="settings_labs_native_camera_summary">הפעל את מצלמת המערכת במקום את מסך המצלמה המותאם אישית.</string>
-    <string name="settings_labs_native_camera">השתמש במצלמה מקומית</string>
-    <string name="room_no_active_widgets">אין יישומונים פעילים</string>
-    <string name="room_manage_integrations">נהל אינטגרציות</string>
-    <string name="room_add_matrix_apps">הוסף אפליקציות מטריקס</string>
-    <string name="integration_manager_not_configured">לא הוגדר מנהל אינטגרציה.</string>
-    <string name="widget_integration_invalid_parameter">פרמטר אינו חוקי.</string>
-    <string name="widget_integration_missing_parameter">פרמטר חובה חסר.</string>
-    <string name="widget_integration_room_not_visible">החדר %s אינו גלוי.</string>
-    <string name="widget_integration_missing_user_id">חסר זהות משתמש בבקשה.</string>
-    <string name="widget_integration_missing_room_id">חסר מספר זהות חדר בבקשה.</string>
-    <string name="widget_integration_no_permission_in_room">אין לך אישור לעשות זאת בחדר זה.</string>
-    <string name="widget_integration_must_be_in_room">אתה לא בחדר הזה.</string>
-    <string name="widget_integration_positive_power_level">רמת הרשאה חייבת להיות חיובית שלמה.</string>
-    <string name="widget_integration_failed_to_send_request">שליחת הבקשה נכשלה.</string>
-    <string name="widget_integration_unable_to_create">לא ניתן ליצור יישומון.</string>
-    <string name="room_widget_webview_read_protected_media">קרא מדיה מוגנת DRM</string>
-    <string name="room_widget_webview_access_microphone">השתמש במיקרופון</string>
-    <string name="room_widget_webview_access_camera">השתמש במצלמה</string>
-    <string name="room_widget_resource_decline_permission">חסום הכל</string>
-    <string name="room_widget_resource_grant_permission">אפשר</string>
-    <string name="room_widget_resource_permission_title">יישומון זה רוצה להשתמש במשאבים הבאים:</string>
-    <string name="error_jitsi_not_supported_on_old_device">מצטערים, שיחות ועידה עם Jitsi אינן נתמכות במכשירים ישנים (מכשירים עם מערכת הפעלה אנדרואיד מתחת ל -5.0)</string>
-    <string name="room_widget_permission_room_id">מזהה חדר</string>
-    <string name="room_widget_permission_widget_id">מזהה ישומון</string>
-    <string name="room_widget_permission_theme">ערכת הנושא שלכם</string>
-    <string name="room_widget_permission_user_id">מזהה המשתמש שלך</string>
-    <string name="room_widget_permission_avatar_url">כתובת האתר של הדמות שלך</string>
-    <string name="room_widget_permission_display_name">שם התצוגה שלך</string>
-    <string name="room_widget_revoke_access">בטל גישה עבורי</string>
-    <string name="room_widget_open_in_browser">פתח בדפדפן</string>
-    <string name="room_widget_reload">טען יישומון מחדש</string>
-    <string name="room_widget_permission_shared_info_title">השימוש בו עשוי לשתף נתונים עם %s:</string>
-    <string name="room_widget_permission_webview_shared_info_title">השימוש בו עשוי להגדיר קובצי cookie ולשתף נתונים עם %s:</string>
-    <string name="room_widget_permission_added_by">ישומון זה התווסף על ידי:</string>
-    <string name="room_widget_permission_title">טען ישומון</string>
-    <string name="room_widget_activity_title">ישומון</string>
-    <string name="active_widgets_title">ישומונים פעילים</string>
-    <string name="active_widget_view_action">צפה</string>
-    <plurals name="active_widgets">
-        <item quantity="one">%d יישומון פעיל</item>
-        <item quantity="two">%d ישומונים פעילים</item>
-        <item quantity="many">%d ישומונים פעילים</item>
-        <item quantity="other">%d ישומונים אחרים פעילים</item>
-    </plurals>
-    <string name="widget_delete_message_confirmation">האם אתה בטוח שברצונך למחוק את היישומון מחדר זה\?</string>
-    <string name="settings_labs_create_conference_with_jitsi">צור שיחות ועידה עם jitsi</string>
-    <string name="widget_creation_failure">יצירת היישומון נכשלה</string>
-    <string name="widget_no_power_to_manage">אתה זקוק להרשאה כדי לנהל יישומונים בחדר זה</string>
-    <string name="huge">ענק</string>
-    <string name="largest">הכי גדול</string>
-    <string name="larger">גדול יותר</string>
-    <string name="large">גדול</string>
-    <string name="normal">רגיל</string>
-    <string name="small">קטן</string>
-    <string name="tiny">זעיר</string>
-    <string name="font_size">גודל גופן</string>
-    <string name="historical_placeholder">חפש היסטורי</string>
-    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-    <string name="notification_ticker_text_dm">%1$s:%2$s</string>
-    <string name="notification_inline_reply_failed">** השליחה נכשלה - אנא פתח את החדר</string>
-    <string name="notification_sender_me">אני</string>
-    <string name="notification_new_invitation">הזמנות חדשות</string>
-    <string name="notification_new_messages">הודעות חדשות</string>
-    <string name="notification_unknown_room_name">חדר</string>
-    <string name="notification_unknown_new_event">מאורע חדש</string>
-    <string name="notification_unread_notified_messages_and_invitation">%1$s ו %2$s</string>
-    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s ב %2$s ו %3$s</string>
-    <string name="notification_unread_notified_messages_in_room">%1$s ב %2$s</string>
-    <plurals name="notification_compat_summary_title">
-        <item quantity="one">התראה %1$s: %2$d</item>
-        <item quantity="two">התראות %1$s: %2$d</item>
-        <item quantity="many">התראות מועטות %1$s: %2$d</item>
-        <item quantity="other">התראות אחרות %1$s: %2$d</item>
-    </plurals>
-    <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="one">הודעה %1$s: %2$d</item>
-        <item quantity="two">הודעות %1$s: %2$d</item>
-        <item quantity="many">הודעות מעטות %1$s: %2$d</item>
-        <item quantity="other">הודעות אחרות %1$s: %2$d</item>
-    </plurals>
-    <plurals name="notification_invitations">
-        <item quantity="one">%d הזמנה</item>
-        <item quantity="two">%d הזמנות</item>
-        <item quantity="many">%d הזמנות מעטות</item>
-        <item quantity="other">%d הזמנות אחרות</item>
-    </plurals>
-    <plurals name="notification_unread_notified_messages_in_room_rooms">
-        <item quantity="one">%d חדר</item>
-        <item quantity="two">%d חדרים</item>
-        <item quantity="many">%d חדרים מועטים</item>
-        <item quantity="other">%d חדרים אחרים</item>
-    </plurals>
-    <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="one">%d הודעת התראה שלא נקראה</item>
-        <item quantity="two">%d הודעות התראה שלא נקראו</item>
-        <item quantity="many">%d הודעות התראה מעטות שלא נקראו</item>
-        <item quantity="other">%d הודעות התראה אחרות שלא נקראו</item>
-    </plurals>
-    <plurals name="notification_unread_notified_messages">
-        <item quantity="one">הודעת התראה %d שלא נקראה</item>
-        <item quantity="two">%d הודעות התראה שלא נקראו</item>
-        <item quantity="many">%d הודעות התראה מעטות שלא נקראו</item>
-        <item quantity="other">%d הודעות התראה אחרות שלא נקראו</item>
-    </plurals>
-    <string name="lock_screen_hint">הקלד פה…</string>
-    <string name="directory_server_native_rooms">כל החדרים המקומיים %s</string>
-    <string name="directory_server_all_rooms_on_server">כל החדרים בשרת %s</string>
-    <string name="directory_server_placeholder">כתובת אתר של שרת בית</string>
-    <string name="directory_server_type_homeserver">הקלד שרת בית כדי לרשום ממנו חדרים ציבוריים</string>
-    <string name="directory_server_fail_to_retrieve_server">ייתכן שהשרת אינו זמין או עומס יתר</string>
-    <string name="select_room_directory">בחר מדריך חדרים</string>
-    <string name="unknown_devices_alert_message">חדר זה מכיל פעילויות לא ידועות שלא אומתו.
-\nהמשמעות היא שאין ערובה לכך שההפעלות שייכות למשתמשים שהם טוענים להם.
-\nאנו ממליצים שתעבור את תהליך האימות של כל מפגש לפני שתמשיך, אך תוכל לשלוח שוב את ההודעה מבלי לאמת אם אתה מעדיף.
-\n
-\nהפעלות לא ידועות:</string>
-    <string name="unknown_devices_alert_title">החדר מכיל הפעלות לא ידועות</string>
-    <string name="encryption_information_verify_key_match">אני מאשר שהמפתחות תואמים</string>
-    <string name="encryption_information_verify_device_warning2">אם הם לא תואמים, אבטחת התקשורת שלך עלולה להיפגע.</string>
-    <string name="encryption_information_verify_device_warning">אשרו על ידי השוואה בין הדברים הבאים להגדרות המשתמש בפגישה האחרת שלכם:</string>
-    <string name="encryption_information_verify_device">אמת מושב</string>
-    <string name="encryption_information_unblock">הסר מרשימה שחורה</string>
-    <string name="encryption_information_block">רשימה שחורה</string>
-    <string name="encryption_information_unverify">הסר אימות</string>
-    <string name="encryption_information_verify">אמת</string>
-    <string name="encryption_information_none">ללא</string>
-    <string name="encryption_information_unknown_ip">IP לא ידוע</string>
-    <string name="encryption_information_unknown_device">מושב לא ידוע</string>
-    <string name="encryption_information_blocked">ברשימה שחורה</string>
-    <string name="encryption_information_verified">מאומת</string>
-    <string name="encryption_information_not_verified">לא תקין</string>
-    <plurals name="encryption_import_room_keys_success">
-        <item quantity="one">מפתח %1$d/%2$d מיובא בהצלחה.</item>
-        <item quantity="two">מפתחות %1$d/%2$d יובאו בהצלחה.</item>
-        <item quantity="many">מפתחות %1$d/%2$d מעטים יובאו בהצלחה.</item>
-        <item quantity="other">מפתחות %1$d/%2$d אחרים יובאו בהצלחה.</item>
-    </plurals>
-    <string name="encryption_never_send_to_unverified_devices_summary">לעולם אל תשלח הודעות מוצפנות להפעלות לא מאומתות מהפגישה זו.</string>
-    <string name="encryption_never_send_to_unverified_devices_title">הצפן למפגשים מאומתים בלבד</string>
-    <string name="encryption_import_import">יבא</string>
-    <string name="encryption_import_room_keys_summary">ייבא את המפתחות מקובץ מקומי</string>
-    <string name="encryption_import_room_keys">ייבא מפתחות לחדר</string>
-    <string name="encryption_import_e2e_room_keys">ייבא מפתחות לחדר E2E</string>
-    <string name="encryption_settings_manage_message_recovery_summary">נהל גיבוי מפתח</string>
-    <string name="encryption_message_recovery">שחזור הודעות מוצפנות</string>
-    <string name="encryption_exported_successfully">מפתחות יוצאו בהצלחה</string>
-    <string name="encryption_export_saved_as">מקשי החדר E2E נשמרו ב- \'%s\'.
-\n
-\nאזהרה: קובץ זה עשוי להימחק אם הסרת ההתקנה של היישום.</string>
-    <string name="encryption_export_notice">אנא צור משפט סיסמה להצפנת המפתחות המיוצאים. יהיה עליך להזין את אותו ביטוי סיסמה כדי שתוכל לייבא את המפתחות.</string>
-    <string name="encryption_export_export">יצא</string>
-    <string name="encryption_export_room_keys_summary">יצא מפתחות לקובץ מקומי</string>
-    <string name="encryption_export_room_keys">יצא מפתחות חדר</string>
-    <string name="encryption_export_e2e_room_keys">ייצא מפתחות חדר E2E</string>
-    <string name="encryption_information_ed25519_fingerprint">טביעת אצבע Ed25519</string>
-    <string name="encryption_information_verification">אימות</string>
-    <string name="encryption_information_device_key">מזהה מפתח</string>
-    <string name="encryption_information_device_id">מזהה מושב</string>
-    <string name="encryption_information_name">שם ציבורי</string>
-    <string name="device_name_warning">השם הציבורי של הפגישה גלוי לאנשים שאיתם אתה מתקשר</string>
-    <string name="encryption_information_device_name_with_warning">שם ציבורי (גלוי לאנשים שאיתם אתה מתקשר)</string>
-    <string name="encryption_information_device_name">שם ציבורי</string>
-    <string name="encryption_information_sender_device_information">מידע על מושב השולח</string>
-    <string name="encryption_information_decryption_error">שגיאת פענוח</string>
-    <string name="encryption_information_session_id">מזהה מושב</string>
-    <string name="encryption_information_user_id">מזהה משתמש</string>
-    <string name="encryption_information_algorithm">אַלגוֹרִיתְם</string>
-    <string name="encryption_information_claimed_ed25519_fingerprint_key">תביעת מפתח טביעת אצבע של Ed25519</string>
-    <string name="encryption_information_curve25519_identity_key">מפתח זהות Curve25519</string>
-    <string name="encryption_information_device_info">מידע על האירוע</string>
-    <string name="encryption_information_title">מידע על הצפנה מקצה לקצה</string>
-    <string name="failed_to_load_timeline_position">%s ניסתה לטעון נקודה מסוימת בציר הזמן של החדר הזה אך לא הצליחה למצוא אותה.</string>
-    <string name="settings_theme">ערכת נושא</string>
-    <string name="directory_title">מַדרִיך</string>
-    <string name="room_settings_addresses_e2e_encryption_warning">אפשר הצפנה
-\n(אזהרה: לא ניתן להשבית שוב!)</string>
-    <string name="room_settings_addresses_e2e_disabled">הצפנה מושבתת בחדר זה.</string>
-    <string name="room_settings_addresses_e2e_enabled">הצפנה מופעלת בחדר זה.</string>
-    <string name="room_settings_copy_room_address">העתק כתובת חדר</string>
-    <string name="room_settings_copy_room_id">העתק מזהה חדר</string>
-    <string name="room_settings_unset_main_address">ביטול ההגדרה ככתובת הראשית</string>
-    <string name="room_settings_set_main_address">הגדר ככתובת ראשית</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_title">אזהרות כתובת עיקריות</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_msg">לא תהיה לך כתובת ראשית שצוינה לחדר זה.</string>
-    <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' אינו פורמט חוקי לכינוי</string>
-    <string name="room_settings_addresses_invalid_format_dialog_title">פורמט כינוי לא חוקי</string>
-    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' אינו מזהה קהילה חוקי</string>
-    <string name="room_settings_invalid_group_format_dialog_title">מזהה קהילה לא חוקי</string>
-    <string name="room_settings_add_new_group">מזהה קהילה חדש (למשל + foo: matrix.org)</string>
-    <string name="room_settings_no_flair">חדר זה אינו מגלה כישרון בקרב קהילות כלשהן</string>
-    <string name="room_settings_addresses_add_new_address">כתובת חדשה (למשל #foo: matrix.org)</string>
-    <string name="room_settings_addresses_no_local_addresses">לחדר זה אין כתובות מקומיות</string>
-    <string name="room_settings_never_send_to_unverified_devices_summary">לעולם אל תשלח הודעות מוצפנות להפעלות לא מאומתות בחדר זה מהפגישה זו.</string>
-    <string name="room_settings_never_send_to_unverified_devices_title">הצפן לביקורים מאומתים בלבד</string>
-    <string name="room_settings_labs_end_to_end_warnings">עליך להתנתק כדי שתוכל לאפשר את ההצפנה.</string>
-    <string name="room_settings_labs_end_to_end_is_active">הצפנה מקצה לקצה פעילה</string>
-    <string name="room_settings_labs_end_to_end">הצפנה מקצה לקצה</string>
-    <string name="room_settings_labs_warning_message">אלה תכונות ניסיוניות שעשויות להישבר בדרכים לא צפויות. השתמש בזהירות.</string>
-    <string name="room_settings_labs_pref_title">מעבדות</string>
-    <string name="room_settings_addresses_pref_title">כתובות</string>
-    <string name="room_settings_room_internal_id">תעודת הזהות הפנימית של החדר הזה</string>
-    <string name="room_settings_category_advanced_title">מתקדם</string>
-    <string name="room_settings_banned_users_title">משתמשים אסורים</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">כל מי שמכיר את הקישור לחדר, כולל אורחים</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">כל מי שמכיר את הקישור לחדר, מלבד האורחים</string>
-    <string name="room_settings_room_access_entry_only_invited">רק אנשים שהוזמנו</string>
-    <string name="room_settings_room_access_warning">כדי לקשר לחדר חייבת להיות כתובת.</string>
-    <string name="room_settings_read_history_entry_members_only_joined">חברים בלבד (מאז שהצטרפו)</string>
-    <string name="room_settings_read_history_entry_members_only_invited">חברים בלבד (מאז שהוזמנו)</string>
-    <string name="room_settings_read_history_entry_members_only_option_time_shared">חברים בלבד (מאז נקודת הזמן לבחירת אפשרות זו)</string>
-    <string name="room_settings_read_history_entry_anyone">כל אדם</string>
-    <string name="room_alias_publish_to_directory_error">לא ניתן לאחזר את הראות הנוכחית של ספריית החדרים (%1$s).</string>
-    <string name="room_alias_publish_to_directory">לפרסם את החדר הזה לציבור במדריך החדרים של %1$s\?</string>
-    <string name="room_alias_action_unpublish">בטל את הפרסום של כתובת זו</string>
-    <string name="room_alias_action_publish">פרסם כתובת זו</string>
-    <string name="room_alias_local_address_add">הוסף כתובת מקומית</string>
-    <string name="room_alias_local_address_empty">לחדר זה אין כתובות מקומיות</string>
-    <string name="room_alias_local_address_subtitle">הגדר כתובות לחדר זה כדי שמשתמשים יוכלו למצוא את החדר הזה דרך שרת הבית שלך (%1$s)</string>
-    <string name="room_alias_local_address_title">כתובות מקומיות</string>
-    <string name="room_alias_address_hint">כתובת שפורסמה חדשה (למשל alias:server#)</string>
-    <string name="room_alias_address_empty">עדיין אין כתובות שפורסמו.</string>
-    <string name="room_alias_address_empty_can_add">עדיין אין כתובות שפורסמו, הוסף כתובת למטה.</string>
-    <string name="room_alias_publish">פרסם חדר זה כציבורי ברשימת החדרים של \"%1$s\"\?</string>
-    <string name="room_alias_delete_confirmation">מחק את הכתובת \"%1$s\"\?</string>
-    <string name="room_alias_unpublish_confirmation">הסר פרסום של הכתובת \"%1$s\"\?</string>
-    <string name="room_alias_published_alias_add_manually_submit">פרסם</string>
-    <string name="room_alias_published_alias_add_manually">פרסם כתובת חדשה באופן ידני</string>
-    <string name="room_alias_published_other">כתובות אחרות שפורסמו:</string>
-    <string name="room_alias_main_address_hint">כתובת ראשית</string>
-    <string name="room_alias_published_alias_main">זו הכתובת העיקרית</string>
-    <string name="room_alias_published_alias_subtitle">כל אחד מכל שרת יכול להשתמש בכתובות שפורסמו כדי להצטרף לחדר שלך. כדי לפרסם כתובת, תחילה יש להגדיר אותה ככתובת מקומית.</string>
-    <string name="room_alias_published_alias_title">כתובות שפורסמו</string>
-    <string name="room_alias_title">כתובות חדרים</string>
-    <string name="room_settings_alias_subtitle">ראה וניהול כתובות של חדר זה, והנראות שלו בספריית החדרים.</string>
-    <string name="room_settings_alias_title">כתובות החדר</string>
-    <string name="room_settings_room_access_title">גישה לחדר</string>
-    <string name="room_settings_room_access_rules_pref_dialog_title">מי יכול לגשת לחדר הזה\?</string>
-    <string name="room_settings_room_read_history_dialog_subtitle">שינויים במי שיכול לקרוא היסטוריה יחולו רק על הודעות עתידיות בחדר זה. נראות ההיסטוריה הקיימת לא תשתנה.</string>
-    <string name="room_settings_room_read_history_rules_pref_dialog_title">מי יכול לקרוא היסטוריה\?</string>
-    <string name="room_settings_room_read_history_rules_pref_title">הקריאה בהיסטוריה של החדרים</string>
-    <string name="room_settings_room_access_rules_pref_title">גישה לחדר</string>
-    <string name="room_settings_room_notifications_title">התראות</string>
-    <string name="room_settings_directory_visibility">רשום חדר זה ברשימת החדרים</string>
-    <string name="room_settings_category_access_visibility_title">כניסה ונראות</string>
-    <string name="room_settings_tag_pref_entry_none">ללא</string>
-    <string name="room_settings_tag_pref_entry_low_priority">עדיפות נמוכה</string>
-    <string name="room_settings_tag_pref_entry_favourite">מועדפים</string>
-    <string name="room_settings_tag_pref_dialog_title">תוייג כ-:</string>
-    <string name="room_settings_room_tag">תגית חדר</string>
-    <string name="room_settings_topic">נושא</string>
-    <string name="room_settings_room_name">שם חדר</string>
-    <string name="room_settings_room_photo">תמונת חדר</string>
-    <string name="media_saving_period_forever">לעד</string>
-    <string name="media_saving_period_1_month">חודש 1</string>
-    <string name="media_saving_period_1_week">שבוע 1</string>
-    <string name="media_saving_period_3_days">3 ימים</string>
-    <string name="settings_without_flair">אינכם חברים בשום קהילה.</string>
-    <string name="settings_flair">כשרון</string>
-    <string name="settings_play_shutter_sound">השמע צליל תריס</string>
-    <string name="media_source_choose">בחרו</string>
-    <string name="settings_default_media_source">מקור מדיה ברירת מחדל</string>
-    <string name="compression_opt_list_choose">בחרו</string>
-    <string name="settings_default_compression">דחיסת ברירת מחדל</string>
-    <string name="settings_media">מדיה</string>
-    <string name="account_additional_info">מידע נוסף: %s</string>
-    <string name="account_phone_number_error">אירעה שגיאה במהלך אימות מספר הטלפון שלך.</string>
-    <string name="settings_phone_number_code">קוד</string>
-    <string name="settings_phone_number_verification_error">שגיאה בעת אימות מספר הטלפון שלך</string>
-    <string name="settings_phone_number_verification_error_empty_code">הזן קוד הפעלה</string>
-    <string name="settings_phone_number_verification_instruction">שלחנו SMS עם קוד הפעלה. אנא הזן קוד זה למטה.</string>
-    <string name="settings_phone_number_verification">אימות טלפון</string>
-    <string name="settings_phone_number_error">מספר טלפון לא חוקי עבור המדינה שנבחרה</string>
-    <string name="settings_phone_number_label">מספר טלפון</string>
-    <string name="settings_phone_number_country_error">בבקשה בחרו מדינה</string>
-    <string name="settings_phone_number_country_label">מדינה</string>
-    <string name="settings_select_country">בחר\\י מדינה</string>
-    <string name="settings_delete_threepid_confirmation">האם אתה בטוח שברצונך להסיר את %1$s %2$s \?</string>
-    <string name="settings_delete_notification_targets_confirmation">האם אתה בטוח שברצונך להסיר את יעד ההודעות הזה\?</string>
-    <string name="settings_emails_and_phone_numbers_summary">נהל מיילים ומספרי טלפון המקושרים לחשבון מטריקס שלך</string>
-    <string name="settings_emails_and_phone_numbers_title">דוא\"ל ומספר טלפון</string>
-    <string name="passwords_do_not_match">סיסמאות לא תואמות</string>
-    <string name="settings_unignore_user">הצג את כל ההודעות מ- %s\?
-\n
-\nשים לב שפעולה זו תפעיל מחדש את האפליקציה והיא עשויה להימשך זמן מה.</string>
-    <string name="settings_password_updated">הסיסמה שלכם עודכנה</string>
-    <string name="settings_fail_to_update_password_invalid_current_password">הסיסמה אינה תקינה</string>
-    <string name="settings_fail_to_update_password">עדכון הסיסמה נכשל</string>
-    <string name="settings_change_password_submit">עדכון סיסמה</string>
-    <string name="settings_confirm_password">אישור סיסמה חדשה</string>
-    <string name="settings_new_password">סיסמה חדשה</string>
-    <string name="settings_old_password">סיסמה נוכחית</string>
-    <string name="settings_change_password">שינוי סיסמה</string>
-    <string name="settings_password">סיסמה</string>
-    <string name="keys_backup_setup_step3_button_title">הסתיים</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">שמור על מפתח התאוששות שלך במקום כלשהו מאובטח מאוד, כמו מנהל סיסמאות (או כספת)</string>
-    <string name="keys_backup_setup_step3_text_line2">מפתח השחזור שלך הוא רשת ביטחון - אתה יכול להשתמש בו כדי להחזיר את הגישה להודעות המוצפנות שלך אם תשכח את משפט הסיסמה שלך.
-\nשמור על מפתח התאוששות שלך במקום כלשהו מאובטח מאוד, כמו מנהל סיסמאות (או כספת)</string>
-    <string name="keys_backup_setup_step3_text_line1">המפתחות שלך מגובים.</string>
-    <string name="keys_backup_setup_step3_success_title">הצלחה!</string>
-    <string name="keys_backup_setup_step2_skip_button_title">(מתקדם) הגדר עם מפתח השחזור</string>
-    <string name="keys_backup_setup_step1_recovery_key_alternative">לחלופין, אבטח את הגיבוי שלך באמצעות מפתח שחזור ושמור אותו במקום בטוח.</string>
-    <string name="keys_backup_setup_creating_backup">יוצר גיבוי</string>
-    <string name="keys_backup_setup_step2_button_title">הגדר ביטוי</string>
-    <string name="keys_backup_setup_step2_text_description">אנו נאחסן עותק מוצפן של המפתחות שלך בשרת הבית שלך. הגן על הגיבוי שלך באמצעות משפט סיסמה כדי לשמור על אבטחתו.
-\n
-\nליתר ביטחון, זה צריך להיות שונה מסיסמת החשבון שלך.</string>
-    <string name="keys_backup_setup_step2_text_title">אבטח את הגיבוי שלך באמצעות משפט סיסמה.</string>
-    <string name="keys_backup_setup_step1_manual_export">ייצא ידנית מפתחות</string>
-    <string name="keys_backup_setup_step1_advanced">(מתקדם)</string>
-    <string name="keys_backup_setup">התחל להשתמש בגיבוי מקשים</string>
-    <string name="keys_backup_setup_step1_description">הודעות בחדרים מוצפנים מאובטחות באמצעות הצפנה מקצה לקצה. רק אתה והנמען / ים יש את המקשים לקריאת ההודעות האלה.
-\n
-\nגבה את המפתחות שלך בצורה מאובטחת כדי לא לאבד אותם.</string>
-    <string name="keys_backup_setup_step1_title">לעולם אל תאבד הודעות מוצפנות</string>
-    <string name="keys_backup_no_session_error">אין מושב מטריקס זמין</string>
-    <string name="template_keys_backup_passphrase_not_empty_error_message">אנא מחק את משפט הסיסמה אם ברצונך ש- Element ייצור מפתח שחזור.</string>
-    <string name="passphrase_passphrase_too_weak">משפט הסיסמה חלש מדי</string>
-    <string name="passphrase_empty_error_message">אנא הזן משפט סיסמה</string>
-    <string name="passphrase_passphrase_does_not_match">משפט הסיסמה אינו תואם</string>
-    <string name="passphrase_enter_passphrase">הזן ביטוי סיסמה</string>
-    <string name="passphrase_confirm_passphrase">אשר את ביטוי הסיסמה</string>
-    <string name="passphrase_create_passphrase">צור ביטוי סיסמה</string>
-    <string name="no_valid_google_play_services_apk">לא נמצא APK חוקי של שירותי Google Play. ייתכן שההודעות לא יפעלו כראוי.</string>
-    <string name="x_plus">%d+</string>
-    <string name="plus_x">+%d</string>
-    <string name="generic_label_and_value">%1$s: %2$s</string>
-    <string name="generic_label">%1$s:</string>
-    <string name="show_info_area_only_errors">רק עבור שגיאות</string>
-    <string name="show_info_area_messages_and_errors">עבור הודעות ושגיאות</string>
-    <string name="show_info_area_always">לעולם</string>
-    <string name="settings_info_area_show">הראה את אזור המידע</string>
-    <string name="merged_events_collapse">כווץ</string>
-    <string name="merged_events_expand">הרחב</string>
-    <string name="unknown_error">סליחה, שגיאה התרחשה</string>
-    <string name="error_lazy_loading_not_supported_by_home_server">שרת הבית שלך עדיין לא תומך בטעינה עצלה של חברי החדר. נסה מאוחר יותר.</string>
-    <string name="settings_lazy_loading_description">הגדל את הביצועים רק על ידי חברי חדר העמסה בתצוגה הראשונה.</string>
-    <string name="settings_lazy_loading_title">טעינה עצלה של חברים וחדרים</string>
-    <string name="resource_limit_hard_contact">אנא %s להמשיך להשתמש בשירות זה.</string>
-    <string name="resource_limit_soft_contact">אנא %s כדי להגדיל מגבלה זו.</string>
-    <string name="resource_limit_hard_mau">שרת בית זה הגיע למגבלת המשתמשים הפעילים החודשיים שלו.</string>
-    <string name="resource_limit_soft_mau"> שרת בית זה הגיע למגבלת המשתמשים הפעילים החודשיים כך ש <b> חלק מהמשתמשים לא יוכלו להתחבר </b>.</string>
-    <string name="resource_limit_hard_default">שרת בית זה חרג מאחד ממגבלות המשאבים שלו.</string>
-    <string name="resource_limit_soft_default">שרת בית זה חרג מאחד ממגבלות המשאבים שלו כך ש <b> משתמשים מסוימים לא יוכלו להתחבר </b>.</string>
-    <string name="resource_limit_contact_admin">פנה למנהל השירות שלך</string>
-    <string name="resource_limit_contact_action">צור קשר עם מנהל המערכת</string>
-    <string name="resource_limit_exceeded_title">לחץ כאן כדי לראות הודעות ישנות יותר ממגבלת המשאבים</string>
-    <string name="room_tombstone_predecessor_link">לחץ כאן לצפייה בהודעות ישנות יותר</string>
-    <string name="room_tombstone_continuation_description">החדר הזה הוא המשך לשיחה אחרת</string>
-    <string name="room_tombstone_continuation_link">השיחה נמשכת כאן</string>
-    <string name="room_tombstone_versioned_description">חדר זה הוחלף ואינו פעיל יותר</string>
-    <string name="error_empty_field_your_password">אנא הזינו את סיסמה שלכם.</string>
-    <string name="error_empty_field_enter_user_name">אהא הזינו שם משתמש.</string>
-    <string name="deactivate_account_submit">השבת חשבון</string>
-    <string name="deactivate_account_prompt_password">להמשך, הזן את הסיסמה שלך:</string>
-    <string name="deactivate_account_delete_checkbox">אנא שכח את כל ההודעות ששלחתי כאשר חשבוני מושבת (אזהרה: הדבר יגרום למשתמשים עתידיים לראות תצוגה חלקית של השיחות)</string>
-    <string name="deactivate_account_content">זה יהפוך את חשבונך ללא שימוש לצמיתות. לא תוכל להתחבר, ואף אחד לא יוכל לרשום מחדש את אותו מזהה משתמש. הדבר יביא לחשבונך לעזוב את כל החדרים בהם הוא משתתף, והוא יסיר את פרטי חשבונך משרת הזהות שלך. <b> פעולה זו היא בלתי הפיכה </b>.
-\n
-\nהשבתת חשבונך <b> אינה גורמת לנו כברירת מחדל לשכוח הודעות ששלחת </b>. אם תרצה שנשכח את ההודעות שלך, סמן את התיבה למטה.
-\n
-\nנראות ההודעות במטריקס דומה לדוא\"ל. המשמעות של שכחת ההודעות שלך היא שהודעות ששלחת לא ישותפו עם משתמשים חדשים או לא רשומים, אך למשתמשים רשומים שכבר יש גישה להודעות אלה עדיין תהיה גישה להעתק שלהם.</string>
-    <string name="deactivate_account_title">השבת חשבון</string>
-    <string name="dialog_user_consent_submit">בדוק כעת</string>
-    <string name="dialog_user_consent_content">כדי להמשיך להשתמש בשרת הבית %1$s עליך לבדוק ולהסכים לתנאים ולהגבלות.</string>
-    <string name="avatar">אווטאר</string>
-    <string name="notice_avatar">אוואטר התרעה</string>
-    <string name="receipt_avatar">אווטאר קבלה</string>
-    <string name="forget_room">שכח חדר</string>
-    <string name="rejoin">לָשׁוּב וֵלְהִצְטַרֵף</string>
-    <string name="reason_colon">סיבה: %1$s</string>
-    <string name="has_been_banned">חסום על ידי %2$s מ- %1$s</string>
-    <string name="has_been_kicked">אתה נבעט מ- %1$s על ידי %2$s</string>
-    <string name="group_no_long_description">מנהל הקהילה לא סיפק תיאור ארוך לקהילה זו.</string>
-    <plurals name="group_rooms">
-        <item quantity="one">חדר %d</item>
-        <item quantity="two">%d חדרים</item>
-        <item quantity="many">%d חדרים</item>
-        <item quantity="other">%d חדרים אחרים</item>
-    </plurals>
-    <plurals name="group_members">
-        <item quantity="one">חבר %d</item>
-        <item quantity="two">%d חברים</item>
-        <item quantity="many">%d חברים</item>
-        <item quantity="other">%d חברים אחרים</item>
-    </plurals>
-    <string name="filter_group_rooms">סנן קבוצות חדרים</string>
-    <string name="filter_group_members">סנן חברי קבוצה</string>
-    <string name="invited">הוזמנו</string>
-    <string name="joined">הצתרפו</string>
-    <string name="rooms">חדרים</string>
-    <string name="no_users_placeholder">אין משתמשים</string>
-    <string name="group_details_rooms">חדרים</string>
-    <string name="group_details_people">אנשים</string>
-    <string name="group_details_home">בית</string>
-    <string name="community_id_hint">דוגמא</string>
-    <string name="community_id">מזהה קהילה</string>
-    <string name="community_name_hint">דוגמא</string>
-    <string name="community_name">שם הקהילה</string>
-    <string name="create_community">צור קהילה</string>
-    <string name="create">צור</string>
-    <string name="encrypted_message">הודעה מוצפנת</string>
-    <string name="notification_noisy">רועש</string>
-    <string name="notification_silent">שקט</string>
-    <string name="notification_off">כבוי</string>
-    <string name="markdown_has_been_disabled">סימון ההפעלה הושבת.</string>
-    <string name="markdown_has_been_enabled">סימון ההפעלה הופעל.</string>
-    <string name="command_description_clear_scalar_token">כדי לתקן את ניהול אפליקציות מטריקס</string>
-    <string name="command_description_markdown">הפעלה / כיבוי של סימון MARKDOWN</string>
-    <string name="command_description_nick">משנה את כינוי התצוגה שלך</string>
-    <string name="command_description_kick_user">בועט משתמש עם מזהה נתון</string>
-    <string name="command_description_topic">הגדר את נושא החדר</string>
-    <string name="command_description_part_room">עזוב חדר</string>
-    <string name="command_description_join_room">מצטרף לחדר עם כינוי נתון</string>
-    <string name="command_description_invite_user">מזמין משתמש עם זיהוי נתון לחדר הנוכחי</string>
-    <string name="command_description_deop_user">משתמש מבוטל עם מזהה נתון</string>
-    <string name="command_description_op_user">הגדר את רמת ההרשאה של המשתמש</string>
-    <string name="command_description_unban_user">הסר חסימה למשתמש עם מזהה נתון</string>
-    <string name="command_description_ban_user">חסום משתמש עם מזהה נתון</string>
-    <string name="command_description_emote">הצג פעולה</string>
-    <string name="command_problem_with_parameters">הפקודה \"%s\" זקוקה ליותר פרמטרים, או שחלק מהפרמטרים שגויים.</string>
-    <string name="unrecognized_command">פקודה לא מוכרת: %s</string>
-    <string name="command_error">שגיאת פקודה</string>
-    <string name="conference_call_warning_message">שיחת ועידה נמצאת בפיתוח ואולי לא אמינה.</string>
-    <string name="conference_call_warning_title">אזהרה!</string>
-    <string name="ignore_request_short_label">התעלם</string>
-    <string name="ignore_request">התעלם מהבקשה</string>
-    <string name="key_share_request">בקשה לשיתוף מפתח</string>
-    <string name="share_without_verifying_short_label">שיתוף</string>
-    <string name="share_without_verifying">שתף ללא אימות</string>
-    <string name="start_verification_short_label">אמת</string>
-    <string name="settings_send_message_with_enter_summary">כפתור Enter על המקלדת הרכה ישלח הודעה במקום להוסיף מעבר שורה</string>
-    <string name="settings_send_message_with_enter">שלח הודעה עם Enter</string>
-    <string name="settings_preview_media_before_sending">הצג תצוגה מקדימה של מדיה לפני השליחה</string>
-    <string name="settings_vibrate_on_mention">רטוט בעת אזכור משתמש</string>
-    <string name="settings_show_avatar_display_name_changes_messages_summary">כולל שינויים באווטאר ושמות תצוגה.</string>
-    <string name="settings_show_avatar_display_name_changes_messages">הצג אירועי חשבון</string>
-    <string name="settings_show_join_leave_messages_summary">הזמנות, בעיטות ואיסורים אינם מושפעים.</string>
-    <string name="settings_show_join_leave_messages">הראה אירועי הצטרפות ועזיבה</string>
-    <string name="settings_show_room_member_state_events_summary">כולל אירועי הזמנה / הצטרפות / שמאל / בעיטה / איסור ושינוי שם אווטאר / תצוגה.</string>
-    <string name="settings_show_room_member_state_events">הצג אירועים של מדינת החברים בחדר</string>
-    <string name="settings_show_read_receipts_summary">לחץ על אישורי הקריאה לרשימה מפורטת.</string>
-    <string name="settings_show_read_receipts">הצג קבלות הצג קבלות קריאה</string>
-    <string name="settings_12_24_timestamps">הצג חותמות זמן בפורמט של 12 שעות</string>
-    <string name="settings_always_show_timestamps">הצג חותמות זמן לכל ההודעות</string>
-    <string name="settings_send_markdown_summary">עצב הודעות באמצעות תחביר הסימון לפני שהן נשלחות. זה מאפשר עיצוב מתקדם כגון שימוש בכוכביות להצגת טקסט נטוי.</string>
-    <string name="settings_send_markdown">עיצוב Markdown</string>
-    <string name="settings_send_typing_notifs_summary">הודע למשתמשים אחרים שאתה מקליד.</string>
-    <string name="settings_send_typing_notifs">שלח הודעות הקלדה</string>
-    <string name="settings_inline_url_preview_summary">תצוגה מקדימה של קישורים בצ\'אט כאשר שרת הבית שלך תומך בתכונה זו.</string>
-    <string name="settings_inline_url_preview">תצוגה מקדימה של כתובת אתר מוטמעת</string>
-    <string name="settings_devices_list">מושבים</string>
-    <string name="settings_pin_unread_messages">הצמד חדרים עם הודעות שלא נקראו</string>
-    <string name="settings_pin_missed_notifications">הצמד חדרים עם התראות שלא נענו</string>
-    <string name="settings_contacts_phonebook_country">ארץ ספר הטלפונים</string>
-    <string name="settings_home_display">מסך ראשי</string>
-    <string name="settings_contacts_app_permission">הרשאת אנשי קשר</string>
-    <string name="settings_contact">אנשי קשר מקומיים</string>
-    <string name="keys_backup_banner_recover_line1">לעולם אל תאבד הודעות מוצפנות</string>
-    <string name="secure_backup_banner_setup_line2">להגן מפני אובדן גישה להודעות ונתונים מוצפנים</string>
-    <string name="secure_backup_banner_setup_line1">גיבוי מאובטח</string>
-    <string name="keys_backup_banner_setup_line2">התחל להשתמש בגיבוי מפתח</string>
-    <string name="keys_backup_banner_setup_line1">לעולם אל תאבד הודעות מוצפנות</string>
-    <string name="new_recovery_method_popup_was_me">זה היה אני</string>
-    <string name="new_recovery_method_popup_description">גיבוי מפתח חדש גיבוי חדש של מפתח הודעות מאובטח.
-\n
-\nאם לא הגדרת את שיטת השחזור החדשה, ייתכן שתוקף מנסה לגשת לחשבונך. שנה את סיסמת החשבון שלך והגדר מיד שיטת שחזור חדשה בהגדרות.</string>
-    <string name="new_recovery_method_popup_title">גיבוי מפתח חדש</string>
-    <string name="keys_backup_settings_delete_confirm_message">מחק גיבוי למחוק את מפתחות ההצפנה המגובים שלך מהשרת\? לא תוכל עוד להשתמש במפתח השחזור שלך כדי לקרוא את היסטוריית ההודעות המוצפנת.</string>
-    <string name="keys_backup_settings_delete_confirm_title">מחק את הגיבוי</string>
-    <string name="keys_backup_settings_checking_backup_state">בודק מצב גיבוי</string>
-    <string name="keys_backup_settings_delete_backup_error">מחיקת הגיבוי נכשלה (%s)</string>
-    <string name="keys_backup_settings_deleting_backup">מוחק גיבוי …</string>
-    <string name="keys_backup_settings_untrusted_backup">כדי להשתמש בגיבוי מקשים בהפעלה זו, שחזר באמצעות משפט הסיסמה או מפתח השחזור שלך כעת.</string>
-    <string name="keys_backup_get_trust_error">נכשל קבלת פרטי אמון לגיבוי (%s).</string>
-    <string name="keys_backup_settings_invalid_signature_from_unverified_device">לגיבוי יש חתימה לא חוקית מהפעלה %s לא מאומתת</string>
-    <string name="keys_backup_settings_invalid_signature_from_verified_device">לגיבוי יש חתימה לא חוקית מההפעלה %s המאומתת</string>
-    <string name="keys_backup_settings_valid_signature_from_unverified_device">לגיבוי יש חתימה חוקית מהפעלה %s לא מאומתת</string>
-    <string name="keys_backup_settings_signature_from_unknown_device">לגיבוי יש חתימה מהפעלה לא ידועה עם מזהה %s.</string>
-    <string name="keys_backup_settings_valid_signature_from_verified_device">לגיבוי יש חתימה חוקית מההפעלה המאומתת %s.</string>
-    <string name="keys_backup_settings_valid_signature_from_this_device">לגיבוי יש חתימה חוקית מהפגישה זו.</string>
-    <string name="keys_backup_settings_status_not_setup">לא מגובים את המפתחות שלך מהפגישה זו.</string>
-    <string name="keys_backup_settings_status_ko">גיבוי המפתח אינו פעיל בהפעלה זו.</string>
-    <string name="keys_backup_settings_status_ok">גיבוי המפתח הוגדר כהלכה להפעלה זו.</string>
-    <string name="keys_backup_settings_delete_backup_button">מחק את הגיבוי</string>
-    <string name="keys_backup_settings_restore_backup_button">שחזר מגיבוי</string>
-    <string name="keys_backup_no_keysbackup_sdk_error">הצפנת מושב אינה מופעלת</string>
-    <string name="keys_backup_get_version_error">השגת הגרסה האחרונה של מפתחות השחזור (%s) נכשלה.</string>
-    <string name="keys_backup_restore_success_title">הגיבוי שוחזר %s!</string>
-    <string name="keys_backup_recovery_code_error_decrypt">לא ניתן היה לפענח את הגיבוי באמצעות מפתח שחזור זה: ודא שהזנת את מפתח השחזור הנכון.</string>
-    <string name="keys_backup_recovery_code_empty_error_message">אנא הכנס מפתח שחזור</string>
-    <string name="keys_backup_unlock_button">בטל נעילת היסטוריה</string>
-    <string name="keys_backup_restoring_importing_keys_waiting_message">מייבא מפתחות …</string>
-    <string name="keys_backup_restoring_downloading_backup_waiting_message">מוריד מקשים …</string>
-    <string name="keys_backup_restoring_computing_key_waiting_message">מפתח שחזור מחשוב …</string>
-    <string name="keys_backup_restoring_waiting_message">שחזור הגיבוי:</string>
-    <string name="network_error_please_check_and_retry">שגיאת רשת: אנא בדוק את החיבור שלך ונסה שוב.</string>
-    <string name="keys_backup_passphrase_error_decrypt">לא ניתן לפענח גיבוי באמצעות ביטוי סיסמה זה: אנא ודא שהזנת את ביטוי הסיסמה לשחזור הנכון.</string>
-    <string name="keys_backup_restore_with_key_helper">איבדת את מפתח ההתאוששות שלך\? אתה יכול להגדיר אחד חדש בהגדרות.</string>
-    <string name="keys_backup_restore_setup_recovery_key">שחזור הודעות</string>
-    <string name="keys_backup_restore_key_enter_hint">הזן מפתח שחזור</string>
-    <string name="keys_backup_restore_with_recovery_key">השתמש במפתח השחזור שלך כדי לפתוח את היסטוריית ההודעות המוצפנות שלך</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">אינך יודע את ביטוי הסיסמה לשחזור שלך, אתה יכול %s.</string>
-    <string name="keys_backup_restore_use_recovery_key">השתמש במפתח השחזור שלך</string>
-    <string name="keys_backup_restore_with_passphrase">השתמש בביטוי הסיסמה לשחזור כדי לבטל את נעילת היסטוריית ההודעות המוצפנות שלך</string>
-    <string name="keys_backup_restore_is_getting_backup_version">מביא גרסת גיבוי …</string>
-    <string name="keys_backup_setup_skip_msg">אתה עלול לאבד גישה להודעות שלך אם אתה מתנתק או מאבד מכשיר זה.</string>
-    <string name="keys_backup_setup_skip_title">האם אתה בטוח\?</string>
-    <string name="keys_backup_setup_backup_started_message">מפתחות ההצפנה שלך מגובים כעת ברקע לשרת הבית שלך. הגיבוי הראשוני עשוי להימשך מספר דקות.</string>
-    <string name="keys_backup_setup_backup_started_title">הגיבוי התחיל</string>
-    <string name="unexpected_error">שגיאה לא צפויה</string>
-    <string name="recovery_key">מפתח שחזור</string>
-    <string name="keys_backup_setup_step3_generating_key_status">יצירת מפתח שחזור באמצעות ביטוי סיסמה, תהליך זה יכול להימשך מספר שניות.</string>
-    <string name="keys_backup_setup_step3_share_intent_chooser_title">שתף מפתח שחזור עם …</string>
-    <string name="keys_backup_setup_step3_please_make_copy">בבקשה צרו העתק</string>
-    <string name="keys_backup_setup_override_stop">עצור</string>
-    <string name="keys_backup_setup_override_replace">החלפה</string>
-    <string name="keys_backup_setup_override_backup_prompt_description">נראה שכבר יש לך גיבוי מפתח הגדרה מהפעלה אחרת. האם אתה רוצה להחליף אותו לזה שאתה יוצר\?</string>
-    <string name="keys_backup_setup_override_backup_prompt_tile">גיבוי כבר קיים בשרת הבית שלך</string>
-    <string name="recovery_key_export_saved">מפתח השחזור נשמר.</string>
-    <string name="recovery_key_export_saved_as_warning">מפתח השחזור נשמר ב- \'%s\'.
-\n
-\nאזהרה: קובץ זה עשוי להימחק אם הסרת ההתקנה של היישום.</string>
-    <string name="keys_backup_setup_step3_save_button_title">שמירת קובץ בשם</string>
-    <string name="keys_backup_setup_step3_share_recovery_file">שיתוף</string>
-    <string name="keys_backup_setup_step3_copy_button_title">שמור מפתח שחזור</string>
-    <string name="keys_backup_setup_step3_button_title_no_passphrase">הכנתי עותק</string>
-    <string name="sent_verification_conclusion">מסקנת אימות</string>
-    <string name="sent_a_reaction">הגיב עם: %s</string>
-    <string name="sent_a_bot_buttons">כפתורי בוט</string>
-    <string name="sent_a_poll">משאל</string>
-    <string name="send_a_sticker">מדבקה</string>
-    <string name="sent_a_file">קובץ</string>
-    <string name="sent_an_audio_file">קול</string>
-    <string name="sent_an_image">תמונה.</string>
-    <string name="sent_a_video">וידאו.</string>
-    <string name="verification_conclusion_compromised">אחד מהדברים הבאים עלול להתפשר:
-\n
-\n - שרת הבית שלך
-\n - שרת הבית שהמשתמש שאתה מאמת מחובר אליו
-\n - שלך, או חיבור האינטרנט של המשתמשים האחרים
-\n - שלך, או המכשיר של המשתמשים האחרים</string>
-    <string name="verification_conclusion_not_secure">לא מאובטח</string>
-    <string name="verification_green_shield">חפש את המגן הירוק כדי להבטיחשהמשתמש אמין. סמכו על כל המשתמשים בחדר שיבטיחו שהחדר יהיה מאובטח.</string>
-    <string name="verify_user_sas_emoji_security_tip">ליתר ביטחון, השתמש באמצעי תקשורת בטוח אחר או עשה זאת באופן אישי.</string>
-    <string name="verify_user_sas_emoji_help_text">אמת משתמש זה על ידי אישור שהאימוג\'י הייחודי הבא מופיע על גבי המסך, באותו סדר.</string>
-    <string name="verification_sas_do_not_match">הם לא תואמים</string>
-    <string name="verification_sas_match">הם מתאימים</string>
-    <string name="verification_conclusion_warning">כניסה לא בטוחה</string>
-    <string name="login_error_threepid_denied">דומיין הדוא\"ל שלך אינו מורשה להירשם בשרת זה</string>
-    <string name="create_room_in_progress">יוצר חדר…</string>
-    <string name="create_room_alias_invalid">תווים מסוימים אינם מורשים</string>
-    <string name="create_room_alias_empty">אנא ציינו כתובת לחדר</string>
-    <string name="create_room_alias_already_in_use">כתובת זו כבר בשימוש</string>
-    <string name="create_room_alias_hint">כתובת חדר</string>
-    <string name="create_room_disable_federation_description">ייתכן שתאפשר זאת אם החדר ישמש רק לשיתוף פעולה עם צוותים פנימיים בשרת הבית שלך. לא ניתן לשנות זאת מאוחר יותר.</string>
-    <string name="create_room_disable_federation_title">חסום כל אחד שאינו חלק מ- %s מלהצטרף אי פעם לחדר זה</string>
-    <string name="hide_advanced">הסתר מתקדם</string>
-    <string name="show_advanced">הצג מתקדם</string>
-    <string name="create_room_encryption_description">לאחר הפעלתו, לא ניתן להשבית את ההצפנה.</string>
-    <string name="create_room_encryption_title">אפשר הצפנה</string>
-    <string name="command_description_shrug">הוסף לפני ¯ \\ _ (ツ) _ / ¯ להודעת טקסט רגיל</string>
-    <string name="template_settings_developer_mode_fail_fast_summary">אלמנט עלול לקרוס לעיתים קרובות יותר כאשר מתרחשת שגיאה בלתי צפויה</string>
-    <string name="settings_developer_mode_fail_fast_title">כישלון-מהיר</string>
-    <string name="autocomplete_limited_results">מציג רק את התוצאות הראשונות, הקלד עוד אותיות …</string>
-    <string name="devices_other_devices">פעולות אחרות</string>
-    <string name="devices_current_device">פעולה נוכחית</string>
-    <string name="settings">הגדרות</string>
-    <string name="rageshake_detected">טלטלה זוהתה!</string>
-    <string name="settings_rageshake_detection_threshold_summary">טלטל את הטלפון שלך כדי לבדוק את סף הזיהוי</string>
-    <string name="settings_rageshake_detection_threshold">סף איתור</string>
-    <string name="settings_rageshake">ראג\'שייק</string>
-    <string name="settings_developer_mode_summary">מצב המפתח מפעיל תכונות נסתרות ועשוי גם להפוך את היישום לפחות יציב. למפתחים בלבד!</string>
-    <string name="settings_developer_mode">מצב מפתח</string>
-    <string name="settings_advanced_settings">הגדרות מתקדמות</string>
-    <string name="settings_show_devices_list">לראות את כל ההפעלות שלי</string>
-    <string name="notification_initial_sync">סנכרון ראשוני …</string>
-    <string name="bug_report_error_too_short">התיאור קצר מדי</string>
-    <string name="permalink_malformed">הקישור שלך ל- matrix.to היה תקין</string>
-    <string name="template_soft_logout_sso_not_same_user_error">ההפעלה הנוכחית מיועדת למשתמש %1$s ואתה מספק אישורי משתמש %2$s. זה אינו נתמך על ידי אלמנט.
-\nראשית נקה נתונים ואז היכנס שוב לחשבון אחר.</string>
-    <string name="soft_logout_clear_data_dialog_submit">נקה נתונים</string>
-    <string name="soft_logout_clear_data_dialog_e2e_warning_content">תאבד את הגישה להודעות מאובטחות אלא אם תיכנס בכדי לשחזר את מפתחות ההצפנה שלך.</string>
-    <string name="soft_logout_clear_data_dialog_content">למחוק את כל הנתונים השמורים כעת במכשיר זה\?
-\nהיכנס שוב כדי לגשת לנתוני החשבון ולהודעות שלך.</string>
-    <string name="soft_logout_clear_data_dialog_title">נקה נתונים</string>
-    <string name="soft_logout_clear_data_submit">נקה את כל הנתונים</string>
-    <string name="soft_logout_clear_data_notice">אזהרה: הנתונים האישיים שלך (כולל מפתחות הצפנה) עדיין שמורים במכשיר זה.
-\n
-\nנקה אותה אם סיימת להשתמש במכשיר זה, או אם ברצונך להיכנס לחשבון אחר.</string>
-    <string name="soft_logout_clear_data_title">נקה מידע אישי</string>
-    <string name="soft_logout_signin_password_hint">סיסמה</string>
-    <string name="soft_logout_signin_submit">כניסה</string>
-    <string name="soft_logout_signin_e2e_warning_notice">היכנס לשחזור מפתחות הצפנה המאוחסנים אך ורק במכשיר זה. אתה צריך אותם כדי לקרוא את כל ההודעות המאובטחות שלך בכל מכשיר.</string>
-    <string name="soft_logout_signin_notice">מנהל שרת הבית שלך (%1$s) הוציא אותך מחשבונך %2$s (%3$s).</string>
-    <string name="soft_logout_signin_title">כניסה</string>
-    <string name="soft_logout_title">התנתקתם</string>
-    <string name="signed_out_submit">התחבר שוב</string>
-    <string name="signed_out_notice">זה יכול להיות מסיבות שונות:
-\n
-\n• שינית את הסיסמה שלך בפגישה אחרת.
-\n
-\n• מחקת את ההפעלה הזו מהפעלה אחרת.
-\n
-\n• מנהל השרת שלך ביטל את גישתך מסיבות אבטחה.</string>
-    <string name="signed_out_title">התנתקתם</string>
-    <string name="seen_by">נראה על ידי</string>
-    <string name="autodiscover_well_known_error">לא ניתן למצוא שרת בית חוקי. אנא בדוק את המזהה שלך</string>
-    <string name="login_signin_matrix_id_error_invalid_matrix_id">זה לא מזהה משתמש חוקי. פורמט צפוי: \'@ user: homeserver.org\'</string>
-    <string name="login_signin_matrix_id_password_notice">אם אינך יודע את הסיסמה שלך, חזור לאפס אותה.</string>
-    <string name="login_signin_matrix_id_hint">מזהה מטריקס</string>
-    <string name="login_signin_matrix_id_notice">אם אתה מגדיר חשבון בשרת ביתי, השתמש במזהה המטריצה שלך (למשל @user:domain.com) והסיסמה שלך למטה.</string>
-    <string name="login_signin_matrix_id_title">היכנס באמצעות מזהה מטריקס</string>
-    <string name="login_connect_using_matrix_id_submit">היכנס באמצעות מזהה מטריקס</string>
-    <string name="login_connect_using_matrix_id_notice">לחלופין, אם כבר יש לך חשבון ואתה יודע את מזהה המטריצה והסיסמה שלך, תוכל להשתמש בשיטה זו:</string>
-    <string name="login_error_outdated_homeserver_warning_content">שרת בית זה מריץ גרסה ישנה. בקש ממנהל שרת הבית שלך לשדרג. אתה יכול להמשיך, אך ייתכן שתכונות מסוימות לא יפעלו כהלכה.</string>
-    <string name="login_error_outdated_homeserver_content">שרת בית זה מריץ גרסה ישנה מדי מכדי להתחבר אליה. בקש ממנהל שרת הבית שלך לשדרג.</string>
-    <string name="login_error_outdated_homeserver_title">שרת בית מיושן</string>
-    <string name="login_validation_code_is_not_correct">הקוד שהוזן אינו נכון. בבקשה תבדוק.</string>
-    <string name="login_wait_for_email_notice">פשוט שלחנו אימייל ל- %1$s.
-\nאנא לחץ על הקישור שהוא מכיל להמשך יצירת החשבון.</string>
-    <string name="login_wait_for_email_title">אנא בדוק את הדוא\"ל שלך</string>
-    <string name="login_terms_title">קבל תנאים להמשך</string>
-    <string name="login_a11y_captcha_container">אנא בצע את אתגר ה- captcha</string>
-    <string name="login_a11y_choose_other">בחר שרת בית מותאם אישית</string>
-    <string name="login_a11y_choose_modular">בחר שירותי מטריקס אלמנט</string>
-    <string name="login_a11y_choose_matrix_org">בחר matrix.org</string>
-    <string name="login_signup_cancel_confirmation_content">חשבונך טרם נוצר.
-\n
-\nלהפסיק את תהליך ההרשמה\?</string>
-    <string name="login_signup_cancel_confirmation_title">אזהרה</string>
-    <string name="login_signup_error_user_in_use">שם המשתמש הזה תפוס</string>
-    <string name="login_signup_submit">הבא</string>
-    <string name="login_signup_password_hint">סיסמה</string>
-    <string name="login_signup_username_hint">שם משתמש</string>
-    <string name="login_signin_username_hint">שם משתמש או מייל</string>
-    <string name="login_signup_to">הירשם ל- %1$s</string>
-    <string name="login_msisdn_error_other">מספר הטלפון נראה לא חוקי. בבקשה בדקו את זה</string>
-    <string name="login_msisdn_error_not_international">מספרי טלפון בינלאומיים חייבים להתחיל עם \'+\'</string>
-    <string name="login_msisdn_notice">אנא השתמש בפורמט הבינלאומי (מספר הטלפון חייב להתחיל ב- \'+\')</string>
-    <string name="login_msisdn_confirm_submit">הבא</string>
-    <string name="login_msisdn_confirm_send_again">שלח שוב</string>
-    <string name="login_msisdn_confirm_hint">הזן קוד</string>
-    <string name="login_msisdn_confirm_notice">פשוט שלחנו קוד ל- %1$s. הזן אותו למטה כדי לוודא שאתה זה.</string>
-    <string name="login_msisdn_confirm_title">אשרו מספר טלפון</string>
-    <string name="login_set_msisdn_submit">הבא</string>
-    <string name="login_set_msisdn_optional_hint">מספר טלפון (לא חובה)</string>
-    <string name="login_set_msisdn_mandatory_hint">מספר טלפון</string>
-    <string name="login_set_msisdn_notice2">אנא השתמש בפורמט הבינלאומי.</string>
-    <string name="login_set_msisdn_notice">הגדר מספר טלפון כדי לאפשר לאנשים שאתה מכיר לגלות אותך.</string>
-    <string name="login_set_msisdn_title">הגדר מספר טלפון</string>
-    <string name="login_set_email_submit">הבא</string>
-    <string name="login_set_email_optional_hint">דוא\"ל (לא חובה)</string>
-    <string name="login_set_email_mandatory_hint">דוא\"ל</string>
-    <string name="login_set_email_notice">הגדר דוא\"ל לשחזור חשבונך. מאוחר יותר, באפשרותך לאפשר לאנשים שאתה מכיר לגלות אותך באמצעות הדוא\"ל שלך.</string>
-    <string name="login_set_email_title">הגדר כתובת דוא\"ל</string>
-    <string name="login_reset_password_cancel_confirmation_content">הסיסמה שלך טרם שונתה.
-\n
-\nלהפסיק את תהליך שינוי הסיסמה\?</string>
-    <string name="login_reset_password_cancel_confirmation_title">אזהרה</string>
-    <string name="login_reset_password_success_submit">חזרה לכניסה</string>
-    <string name="login_reset_password_success_notice_2">הוצאת אותך מכל ההפעלות ולא תקבל עוד התראות דחיפה. כדי להפעיל מחדש התראות, היכנס שוב בכל מכשיר.</string>
-    <string name="login_reset_password_success_notice">הסיסמה שלך אופסה.</string>
-    <string name="login_reset_password_success_title">הצלחה!</string>
-    <string name="login_reset_password_mail_confirmation_submit">אימתתי את כתובת הדוא\"ל שלי</string>
-    <string name="login_reset_password_mail_confirmation_notice_2">הקש על הקישור כדי לאשר את הסיסמה החדשה שלך. לאחר שתעקוב אחר הקישור שהוא מכיל, לחץ למטה.</string>
-    <string name="login_reset_password_mail_confirmation_notice">דוא\"ל אימות נשלח אל %1$s.</string>
-    <string name="login_reset_password_mail_confirmation_title">לבדוק את תיבת הדואר הנכנס שלך</string>
-    <string name="login_reset_password_error_not_found">דוא\"ל זה אינו מקושר לשום חשבון</string>
-    <string name="login_reset_password_warning_submit">המשך</string>
-    <string name="login_reset_password_warning_content">שינוי הסיסמה שלך יאפס את כל מפתחות ההצפנה מקצה לקצה בכל ההפעלות שלך, מה שהופך את היסטוריית הצ\'אט המוצפנת לבלתי קריאה. הגדר גיבוי מקשים או ייצא את מפתחות החדר שלך מהפעלה אחרת לפני איפוס הסיסמה שלך.</string>
-    <string name="login_reset_password_warning_title">אזהרה!</string>
-    <string name="login_reset_password_password_hint">סיסמה חדשה</string>
-    <string name="login_reset_password_email_hint">דוא\"ל</string>
-    <string name="login_reset_password_submit">הבא</string>
-    <string name="login_reset_password_notice">דוא\"ל אימות יישלח לתיבת הדואר הנכנס שלך כדי לאשר את הגדרת הסיסמה החדשה שלך.</string>
-    <string name="login_reset_password_on">אפס סיסמה ב- %1$s</string>
-    <string name="login_login_with_email_error">דוא\"ל זה אינו משויך לשום חשבון.</string>
-    <string name="login_registration_not_supported">היישום אינו מסוגל ליצור חשבון בשרת הבית הזה.
-\n
-\nהאם אתה רוצה להירשם באמצעות לקוח אינטרנט\?</string>
-    <string name="login_registration_disabled">מצטערים, שרת זה אינו מקבל חשבונות חדשים.</string>
-    <string name="login_mode_not_supported">היישום אינו מסוגל להיכנס לשרת ביתי זה. שרת הבית תומך בסוגי הכניסה הבאים: %1$s.
-\n
-\nהאם אתה רוצה להיכנס באמצעות לקוח אינטרנט\?</string>
-    <string name="login_sso_error_message">אירעה שגיאה בעת טעינת הדף: %1$s (%2$d)</string>
-    <string name="login_server_url_form_common_notice">הזן את כתובת השרת שבו ברצונך להשתמש</string>
-    <string name="login_server_url_form_modular_notice">הזן את כתובת האלמנט המודולרי או השרת שבו ברצונך להשתמש</string>
-    <string name="login_server_url_form_modular_text">אירוח פרימיום לארגונים</string>
-    <string name="login_server_url_form_other_hint">כתובת</string>
-    <string name="login_server_url_form_modular_hint">כתובת שירותי מטריקס אלמנט</string>
-    <string name="login_signin_sso">המשך עם SSO</string>
-    <string name="login_signup">הרשמה</string>
-    <string name="login_signin_to">התחברות אל %1$s</string>
-    <string name="login_connect_to_a_custom_server">התחבר לשרת מותאם אישית</string>
-    <string name="login_connect_to_modular">התחבר לשירותי מטריקס אלמנט</string>
-    <string name="login_connect_to">התחברות אל %1$s</string>
-    <string name="login_continue">המשך</string>
-    <string name="login_server_other_text">התאמה אישית והגדרות מתקדמות</string>
-    <string name="login_server_other_title">אחר</string>
-    <string name="login_server_modular_learn_more">למד עוד</string>
-    <string name="login_server_modular_text">אירוח פרימיום לארגונים</string>
-    <string name="login_server_matrix_org_text">הצטרף למיליונים בחינם בשרת הציבורי הגדול ביותר</string>
-    <string name="login_server_text">בדיוק כמו דוא\"ל, לחשבונות יש בית אחד, אם כי אתה יכול לדבר עם כל אחד</string>
-    <string name="login_server_title">בחר שרת</string>
-    <string name="login_splash_submit">להתחיל</string>
-    <string name="login_splash_text3">הרחב והתאם אישית את החוויה שלך</string>
-    <string name="login_splash_text2">שמור על שיחות פרטיות באמצעות הצפנה</string>
-    <string name="login_splash_text1">שוחח עם אנשים ישירות או בקבוצות</string>
-    <string name="login_splash_title">זו השיחה שלך. נהל אותה.</string>
-    <string name="timeline_unread_messages">הודעות שלא נקראו</string>
-    <string name="direct_room_join_rules_invite_by_you">ביצעת את ההזמנה הזו בלבד.</string>
-    <string name="direct_room_join_rules_invite">%1$s ביצע הזמנה זו בלבד.</string>
-    <string name="room_join_rules_invite_by_you">הכנת את החדר להזמין בלבד.</string>
-    <string name="room_join_rules_invite">%1$s גרם לחדר להזמין בלבד.</string>
-    <string name="room_join_rules_public_by_you">הפכת את החדר לציבורי לכל מי שמכיר את הקישור.</string>
-    <string name="room_join_rules_public">%1$s הפך את החדר לציבורי לכל מי שמכיר את הקישור.</string>
-    <string name="help_long_click_on_room_for_more_options">לחץ לחיצה ארוכה על חדר כדי לראות אפשרויות נוספות</string>
-    <string name="no_ignored_users">אתה לא מתעלם מאף משתמש</string>
-    <string name="reaction_search_type_hint">הקלד מילות מפתח כדי למצוא תגובה.</string>
-    <string name="spoiler">ספויילר</string>
-    <string name="command_description_spoiler">שולח את ההודעה הנתונה כספוילר</string>
-    <string name="notice_member_no_changes_by_you">לא ביצעת שינויים</string>
-    <string name="notice_member_no_changes">%1$s לא ביצע שינויים</string>
-    <string name="room_list_quick_actions_leave">יציאה מהחדר</string>
-    <string name="room_list_quick_actions_low_priority_remove">הסרה מעדיפות נמוכה</string>
-    <string name="room_list_quick_actions_low_priority_add">הוסף לעדיפות נמוכה</string>
-    <string name="room_list_quick_actions_favorite_remove">הסרה ממועדפים</string>
-    <string name="room_list_quick_actions_favorite_add">הוספה למועדפים</string>
-    <string name="room_list_quick_actions_settings">הגדרות</string>
-    <string name="room_list_quick_actions_notifications_mute">השתקה</string>
-    <string name="room_list_quick_actions_notifications_mentions">אזכורים בלבד</string>
-    <string name="room_list_quick_actions_notifications_all">כל ההודעות</string>
-    <string name="room_list_quick_actions_notifications_all_noisy">כל ההודעות (רועשות)</string>
-    <string name="message_ignore_user">התעלם ממשתמש זה</string>
-    <string name="no_network_indicator">אין חיבור רשת כרגע</string>
-    <string name="template_permissions_rationale_msg_keys_backup_export">אלמנט זקוק להרשאה כדי לשמור את מפתחות ה- E2E שלך בדיסק.
-\n
-\nאנא אפשר גישה בחלון הקופץ הבא כדי שתוכל לייצא את המפתחות שלך באופן ידני.</string>
-    <string name="content_reported_as_inappropriate_content">תוכן זה דווח כבלתי הולם.
-\n
-\nאם אינך רוצה לראות תוכן נוסף ממשתמש זה, תוכל להתעלם ממנו כדי להסתיר את ההודעות שלו.</string>
-    <string name="content_reported_as_inappropriate_title">דווח כבלתי הולם</string>
-    <string name="content_reported_as_spam_content">תוכן זה דווח כספאם.
-\n
-\nאם אינך רוצה לראות תוכן נוסף ממשתמש זה, תוכל להתעלם ממנו כדי להסתיר את ההודעות שלו.</string>
-    <string name="content_reported_as_spam_title">דווח כספאם</string>
-    <string name="content_reported_content">תוכן זה דווח.
-\n
-\nאם אינך רוצה לראות תוכן נוסף ממשתמש זה, תוכל להתעלם ממנו כדי להסתיר את ההודעות שלו.</string>
-    <string name="content_reported_title">תוכן מדווח</string>
-    <string name="block_user">התעלם ממשתמש</string>
-    <string name="report_content_custom_submit">דיווח</string>
-    <string name="report_content_custom_hint">סיבה לדיווח על תוכן זה</string>
-    <string name="report_content_custom_title">דווח על תוכן זה</string>
-    <string name="report_content_custom">דוח מותאם אישית …</string>
-    <string name="report_content_inappropriate">זה לא הולם</string>
-    <string name="report_content_spam">זה ספאם</string>
-    <string name="uploads_files_no_result">אין קבצים בחדר זה</string>
-    <string name="uploads_files_subtitle">%1$s ב- %2$s</string>
-    <string name="uploads_files_title">קבצים</string>
-    <string name="uploads_media_no_result">אין מדיה בחדר זה</string>
-    <string name="uploads_media_title">מדיה</string>
-    <string name="attachment_viewer_item_x_of_y">%1$d מ- %2$d</string>
-    <string name="error_handling_incoming_share">לא ניתן היה לטפל בנתוני שיתוף</string>
-    <string name="rotate_and_crop_screen_title">סובב וחתוך</string>
-    <string name="attachment_type_sticker">מדבקה</string>
-    <string name="attachment_type_gallery">גלריה</string>
-    <string name="attachment_type_audio">קול</string>
-    <string name="attachment_type_camera">מצלמה</string>
-    <string name="attachment_type_contact">איש קשר</string>
-    <string name="attachment_type_file">קובץ</string>
-    <string name="attachment_type_dialog_title">הוסף תמונה מ</string>
-    <string name="error_attachment">אירעה שגיאה בעת אחזור הקובץ המצורף.</string>
-    <string name="error_file_too_big">הקובץ \'%1$s\' (%2$s) גדול מדי להעלאה. המגבלה היא %3$s.</string>
-    <string name="one_user_read">%s נקרא</string>
-    <string name="two_users_read">%1$s ו- %2$s נקראו</string>
-    <string name="three_users_read">%1$s, %2$s ו- %3$s נקראו</string>
-    <string name="a11y_jump_to_bottom">קפוץ לתחתית</string>
-    <string name="a11y_hide_password">הסתר סיסמה</string>
-    <string name="a11y_show_password">הראה סיסמה</string>
-    <string name="a11y_close_keys_backup_banner">סגור את הבאנר לגיבוי המפתחות</string>
-    <string name="a11y_create_room">צרו חדר חדש</string>
-    <string name="a11y_create_direct_message_by_qr_code">צור שיחה ישירה חדשה על ידי סריקת קוד QR</string>
-    <string name="a11y_create_direct_message_by_mxid">צור שיחה ישירה חדשה לפי מזהה מטריקס</string>
-    <string name="a11y_create_direct_message">צור שיחה ישירה חדשה</string>
-    <string name="a11y_create_menu_close">סגור את תפריט החדר ליצור …</string>
-    <string name="a11y_create_menu_open">פתח את תפריט יצירת החדר</string>
-    <string name="a11y_open_drawer">פתח את מגירת הניווט</string>
-    <string name="send_attachment">שלח קובץ מצורף</string>
-    <string name="error_network_timeout">נראה שלוקח יותר מדי זמן להגיב לשרת, זה יכול להיגרם מקישוריות לקויה או משגיאה בשרת. נסה שוב בעוד זמן מה.</string>
-    <string name="error_terms_not_accepted">אנא נסה שוב לאחר שתקבל את התנאים וההגבלות של שרת הבית שלך.</string>
-    <string name="labs_allow_extended_logging_summary">יומני מילוליות יסייעו למפתחים על ידי אספקת יומנים נוספים כאשר אתה שולח RageShake. גם כאשר הוא מופעל, היישום אינו רושם תוכן הודעה או נתונים פרטיים אחרים.</string>
-    <string name="labs_allow_extended_logging">אפשר יומני מילוליות.</string>
-    <string name="settings_agree_to_terms">הסכים לתנאי השירות של שרת הזהות (%s) כדי לאפשר לעצמך להיות גלוי באמצעות כתובת דוא\"ל או מספר טלפון.</string>
-    <string name="settings_discovery_disconnect_with_bound_pid">אתה משתף כרגע כתובות דוא\"ל או מספרי טלפון בשרת הזהות %1$s. יהיה עליך להתחבר מחדש ל- %2$s כדי להפסיק לשתף אותם.</string>
-    <string name="settings_text_message_sent_wrong_code">קוד האימות אינו נכון.</string>
-    <string name="settings_text_message_sent_hint">קוד</string>
-    <string name="settings_text_message_sent">הודעת טקסט נשלחה אל %s. אנא הזן את קוד האימות שהוא מכיל.</string>
-    <string name="settings_discovery_no_terms">בשרת הזהות שבחרת אין שום תנאי שירות. המשך רק אם אתה סומך על בעל השירות</string>
-    <string name="settings_discovery_no_terms_title">לשרת זהות אין תנאי שירות</string>
-    <string name="settings_discovery_please_enter_server">אנא הזן את כתובת ה- URL של שרת הזהות</string>
-    <string name="settings_discovery_bad_identity_server">לא ניתן היה להתחבר לשרת זהות</string>
-    <string name="settings_discovery_enter_identity_server">הזן כתובת אתר של שרת זהות</string>
-    <string name="identity_server_consent_dialog_content">על מנת לגלות אנשי קשר קיימים שאתה מכיר, האם אתה מקבל לשלוח את נתוני הקשר שלך (מספרי טלפון ו / או אימיילים) לשרת הזהות המוגדר (%1$s)\?
-\n
-\nלקבלת פרטיות רבה יותר, הנתונים שנשלחו ייחסמו לפני שנשלחו.</string>
-    <string name="identity_server_consent_dialog_title">שלח מיילים ומספרי טלפון</string>
-    <string name="settings_discovery_consent_action_give_consent">תן הסכמה</string>
-    <string name="settings_discovery_consent_action_revoke">בטל את הסכמתי</string>
-    <string name="settings_discovery_consent_notice_off">לא נתת את הסכמתך לשלוח מיילים ומספרי טלפון לשרת זהות זה כדי לגלות משתמשים אחרים מאנשי הקשר שלך.</string>
-    <string name="settings_discovery_consent_notice_on">נתת את הסכמתך לשלוח מיילים ומספרי טלפון לשרת זהות זה כדי לגלות משתמשים אחרים מאנשי הקשר שלך.</string>
-    <string name="settings_discovery_consent_title">שלח מיילים ומספרי טלפון</string>
-    <string name="settings_discovery_mail_pending">ממתין ל</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">שלחנו לך אישור דוא\"ל ל- %s, אנא בדוק תחילה את הדוא\"ל שלך ולחץ על קישור האישור</string>
-    <string name="settings_discovery_confirm_mail">שלחנו לך אישור דוא\"ל ל- %s, בדוק את הדוא\"ל שלך ולחץ על קישור האישור</string>
-    <string name="settings_discovery_msisdn_title">מספרי טלפון נגלים</string>
-    <string name="settings_discovery_disconnect_identity_server_info">ההתנתקות משרת הזהות שלך פירושה שלא תגלה משתמשים אחרים ולא תוכל להזמין אחרים בדוא\"ל או בטלפון.</string>
-    <string name="settings_discovery_no_msisdn">אפשרויות גילוי יופיעו לאחר הוספת מספר טלפון.</string>
-    <string name="settings_discovery_no_mails">אפשרויות גילוי יופיעו לאחר הוספת דוא\"ל.</string>
-    <string name="settings_discovery_emails_title">כתובות דוא\"ל הניתנות לגילוי</string>
-    <string name="settings_discovery_identity_server_info_none">אינך משתמש כרגע בשרת זהות. כדי לגלות ולהיות נגלים על ידי אנשי קשר קיימים שאתה מכיר, הגדר אחד למטה.</string>
-    <string name="settings_discovery_identity_server_info">אתה משתמש כרגע ב-%1$s כדי לגלות ולהתגלה על ידי אנשי קשר קיימים שאתה מכיר.</string>
-    <string name="change_identity_server">שנה שרת זהות</string>
-    <string name="add_identity_server">הגדר את שרת הזהות</string>
-    <string name="disconnect_identity_server">נתק את שרת הזהות</string>
-    <string name="identity_server">שרת זהות</string>
-    <string name="read_at">קרא ב</string>
-    <string name="terms_description_for_integration_manager">השתמש בבוטים, גשרים, ווידג\'טים וחבילות מדבקות</string>
-    <string name="terms_description_for_identity_server">להיות גלוי על ידי אחרים</string>
-    <string name="review_terms">סקור תנאים</string>
-    <string name="terms_of_service">תנאי השירות</string>
-    <string name="message_view_edit_history">הצג היסטוריית עריכה</string>
-    <string name="joining_room">מצטרף לחדר …</string>
-    <string name="direct_room_user_list_suggestions_title">הצעות</string>
-    <string name="direct_room_user_list_contacts_title">אנשי קשר</string>
-    <string name="direct_room_user_list_known_title">משתמשים ידועים</string>
-    <string name="direct_room_user_list_recent_title">לאחרונה</string>
-    <string name="direct_room_filter_hint">סנן לפי שם משתמש או מזהה …</string>
-    <string name="direct_room_start_search">התחל להקליד כדי להשיג תוצאות</string>
-    <string name="direct_room_no_known_users">לא נמצאה תוצאה, השתמש בהוסף לפי מזהה מטריצה כדי לחפש בשרת.</string>
-    <string name="creating_direct_room">יוצר חדר …</string>
-    <string name="qr_code">קוד QR</string>
-    <string name="add_by_qr_code">הוסף באמצעות קוד QR</string>
-    <string name="add_by_matrix_id">הוסף לפי מזהה מטריצה</string>
-    <string name="link_copied_to_clipboard">הקישור הועתק ללוח</string>
-    <string name="labs_show_unread_notifications_as_tab">הוסף כרטיסייה ייעודית להתראות שלא נקראו על המסך הראשי.</string>
-    <string name="labs_swipe_to_reply_in_timeline">אפשר החלקה כדי להשיב בציר הזמן</string>
-    <string name="user_directory_search_hint">חפש לפי שם או תעודת זהות</string>
-    <string name="room_directory_search_hint">שם או מזהה (# לדוגמא: matrix.ahava528.com)</string>
-    <string name="room_filtering_footer_open_room_directory">צפו בספריית החדרים</string>
-    <string name="room_filtering_footer_create_new_direct_message">שלח הודעה ישירה חדשה</string>
-    <string name="room_filtering_footer_create_new_room">צרו חדר חדש</string>
-    <string name="room_filtering_footer_title">לא מצליחים למצוא את מבוקשכם\?</string>
-    <string name="room_filtering_filter_hint">סנן שיחות …</string>
-    <string name="no_message_edits_found">לא נמצאו עריכות</string>
-    <string name="message_edits">עריכת הודעות</string>
-    <string name="edited_suffix">(נערך)</string>
-    <string name="downloaded_file">הורדת הקובץ %1$s הושלמה!</string>
-    <string name="downloading_file">מוריד קובץ %1$s…</string>
-    <string name="send_file_step_sending_file">שולח קובץ (%1$s / %2$s)</string>
-    <string name="send_file_step_encrypting_file">מצפין קובץ …</string>
-    <string name="send_file_step_sending_thumbnail">שולח תמונה ממוזערת (%1$s / %2$s)</string>
-    <string name="send_file_step_encrypting_thumbnail">מצפין תמונה ממוזערת …</string>
-    <string name="send_file_step_idle">ממתין…</string>
-    <string name="bottom_action_people_x">הודעות ישירות</string>
-    <string name="settings_labs_show_complete_history_in_encrypted_room">הצג היסטוריה מלאה בחדרים מוצפנים</string>
-    <string name="settings_labs_show_hidden_events_in_timeline">הצג אירועים מוסתרים בציר הזמן</string>
-    <string name="send_suggestion_failed">ההצעה לא נשלחה (%s)</string>
-    <string name="send_suggestion_sent">תודה, ההצעה נשלחה בהצלחה</string>
-    <string name="send_suggestion_report_placeholder">תאר כאן את הצעתך</string>
-    <string name="send_suggestion_content">אנא כתוב את הצעתך למטה.</string>
-    <string name="send_suggestion">תן הצעה</string>
-    <string name="settings_troubleshoot_test_token_registration_quick_fix">הרשמת אסימון</string>
-    <string name="preference_root_help_about">עזרה ואודות</string>
-    <string name="preference_voice_and_video">קול ווידאו</string>
-    <string name="push_gateway_item_format">מבנה:</string>
-    <string name="push_gateway_item_url">קישור:</string>
-    <string name="push_gateway_item_device_name">שם מושב:</string>
-    <string name="push_gateway_item_app_display_name">תצוגת שם אפליקציה:</string>
-    <string name="push_gateway_item_push_key">מפתח דחיפה:</string>
-    <string name="push_gateway_item_app_id">זהות אפליקציה:</string>
-    <string name="settings_push_gateway_no_pushers">אין שערי דחיפה רשומים</string>
-    <string name="settings_push_rules_no_rules">לא הוגדרו כללי דחיפה</string>
-    <string name="settings_push_rules">לדחוף כללים</string>
-    <string name="settings_expert">מומחה</string>
-    <string name="settings_security_and_privacy">אבטחה ופרטיות</string>
-    <string name="settings_preferences">העדפות</string>
-    <string name="settings_general_title">כללי</string>
-    <string name="quick_reactions">תגובות מהירות</string>
-    <string name="navigate_to_room_when_already_in_the_room">אתה כבר צופה בחדר הזה!</string>
-    <string name="settings_other_third_party_notices">הודעות צד שלישי אחרות</string>
-    <string name="settings_sdk_version">גרסת SDK של מטריקס</string>
-    <string name="import_e2e_keys_from_file">ייבא מפתחות e2e מהקובץ \"%1$s\".</string>
-    <string name="keys_backup_unable_to_get_keys_backup_data">אירעה שגיאה בקבלת נתוני גיבוי למפתחות</string>
-    <string name="keys_backup_unable_to_get_trust_info">אירעה שגיאה בקבלת פרטי אמון</string>
-    <string name="create_room_federation_error">החדר נוצר, אך כמה הזמנות לא נשלחו מהסיבה הבאה:
-\n
-\n%s</string>
-    <string name="create_room_directory_description">פרסם חדר זה במדריך החדרים</string>
-    <string name="create_room_directory_title">מדריך חדרים</string>
-    <string name="create_room_public_description">כל אחד יוכל להצטרף לחדר זה</string>
-    <string name="create_room_public_title">ציבורי</string>
-    <string name="room_member_power_level_admins">מנהלים</string>
-    <string name="room_profile_leaving_room">יוצא מהחדר…</string>
-    <string name="direct_room_profile_section_more_leave">יציאה</string>
-    <string name="room_profile_section_more_leave">יציאה מהחדר</string>
-    <string name="room_profile_section_more_uploads">העלאות</string>
-    <string name="room_profile_section_more_notifications">התראות</string>
-    <string name="direct_room_profile_section_more_settings">הגדרות</string>
-    <string name="room_profile_section_more_settings">הגדרות חדר</string>
-    <string name="room_profile_section_admin">פעולות מנהל</string>
-    <string name="room_profile_section_more">עוד</string>
-    <string name="room_profile_section_security_learn_more">למד עוד</string>
-    <string name="room_profile_section_security">אבטחה</string>
-    <string name="direct_room_profile_encrypted_subtitle">ההודעות כאן מוצפנות מקצה לקצה.
-\n
-\nההודעות שלך מאובטחות במנעולים ורק לך ולמקבל יש את המפתחות הייחודיים לפתיחתם.</string>
-    <string name="room_profile_encrypted_subtitle">ההודעות בחדר זה מוצפנות מקצה לקצה.
-\n
-\nההודעות שלך מאובטחות במנעולים ורק לך ולמקבל יש את המפתחות הייחודיים לפתיחתם.</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">ההודעות כאן אינן מוצפנות מקצה לקצה.</string>
-    <string name="room_profile_not_encrypted_subtitle">הודעות בחדר זה אינן מוצפנות מקצה לקצה.</string>
-    <string name="verification_request_alert_description">ליתר ביטחון, אמת את %s על ידי בדיקת קוד חד פעמי בשני המכשירים שלך.
-\n
-\nליתר ביטחון, עשה זאת באופן אישי.</string>
-    <string name="verification_request_waiting_for">ממתין ל- %s…</string>
-    <string name="verification_verified_user">%s מאומת</string>
-    <string name="verification_verify_user">אמת. את %s</string>
-    <string name="a13n_qr_code_description">תמונת קוד QR</string>
-    <string name="verify_by_emoji_description">אם אינך יכול לסרוק את הקוד שלמעלה, ודא על ידי השוואה בין מבחר קצר וייחודי של אמוג\'י.</string>
-    <string name="verify_by_emoji_title">אמת על ידי אימוג\'י</string>
-    <string name="verification_no_scan_emoji_title">אמת את זה על ידי השוואת אימוג\'ים</string>
-    <string name="verification_scan_emoji_subtitle">אם אינך נמצא באופן אישי, השווה במקום זאת אימוג\'י</string>
-    <string name="verification_scan_emoji_title">לא יכול לסרוק</string>
-    <string name="verification_scan_their_code">סרוק את הקוד שלהם</string>
-    <string name="verification_scan_notice">סרוק את הקוד עם מכשיר המשתמש האחר כדי לאמת זה את זה בצורה מאובטחת</string>
-    <string name="you">את\\ה</string>
-    <string name="verification_verify_device_manually">אימות ידני</string>
-    <string name="verification_verify_device">אמת את הפעולה הזו</string>
-    <string name="verification_request">בקשת אימות</string>
-    <string name="verification_sent">אימות נשלח</string>
-    <string name="verification_request_you_accepted">קבלתם</string>
-    <string name="verification_request_other_accepted">%s קיבל</string>
-    <string name="verification_request_you_cancelled">ביטלתם</string>
-    <string name="verification_request_other_cancelled">%s ביטל</string>
-    <string name="verification_request_waiting">ממתין…</string>
-    <string name="create_room_settings_section">הגדרות החדר</string>
-    <string name="create_room_topic_hint">נושא</string>
-    <string name="create_room_topic_section">נושא החדר (לא חובה)</string>
-    <string name="create_room_name_hint">שם</string>
-    <string name="create_room_name_section">שם החדר</string>
-    <string name="create_room_action_create">צור</string>
-    <string name="create_room_title">חדר חדש</string>
-    <string name="fab_menu_create_chat">הודעות ישירות</string>
-    <string name="fab_menu_create_room">חדרים</string>
-    <string name="room_preview_no_preview_join">לא ניתן להציג תצוגה מקדימה של חדר זה. האם אתה רוצה להצטרף אליו\?</string>
-    <string name="room_preview_not_found">בשלב זה אין גישה לחדר זה.
-\nנסה שוב מאוחר יותר, או בקש ממנהל החדר לבדוק אם יש לך גישה.</string>
-    <string name="template_room_preview_world_readable_room_not_supported_yet">התצוגה המקדימה של החדר הקריא בעולם עדיין אינה נתמכת ב- Element</string>
-    <string name="room_preview_no_preview">לא ניתן להציג תצוגה מקדימה של חדר זה</string>
-    <string name="group_all_communities">כל הקהילות</string>
-    <string name="please_wait">אנא המתינו…</string>
-    <string name="change_room_directory_network">שנה רשת</string>
-    <string name="action_change">שנה</string>
-    <string name="error_no_network">אין רשת. אנא בדוק את חיבור האינטרנט שלך.</string>
-    <string name="create_new_room">צור חדר חדש</string>
-    <string name="malformed_message">אירוע לקוי, לא יכול להופיע</string>
-    <string name="last_edited_info_message">נערך לאחרונה על ידי %1$s ב-%2$s</string>
-    <string name="event_redacted_by_admin_reason">האירוע בהנחיית מנהל החדר</string>
-    <string name="event_redacted_by_user_reason">האירוע נמחק על ידי המשתמש</string>
-    <string name="settings_show_redacted_summary">הראה מציין מיקום להודעות שהוסרו</string>
-    <string name="settings_show_redacted">הצג הודעות שנמחקו</string>
-    <string name="event_redacted">הודעה נמחקה</string>
-    <string name="reactions">תגובות</string>
-    <string name="message_view_reaction">צפה בתגובות</string>
-    <string name="message_add_reaction">הוסף תגובה</string>
-    <string name="reactions_like">אהבתי</string>
-    <string name="reactions_agree">מסכים</string>
-    <string name="title_activity_emoji_reaction_picker">תגובות</string>
-    <string name="room_list_rooms_empty_body">החדרים שלך יוצגו כאן. הקש על + שמאל למטה כדי למצוא את הקיים או התחל כמה משלך.</string>
-    <string name="room_list_rooms_empty_title">חדרים</string>
-    <string name="room_list_people_empty_body">שיחות ההודעה הישירה שלך יוצגו כאן. הקש על + שמאל למטה כדי להתחיל כמה.</string>
-    <string name="room_list_people_empty_title">שיחות</string>
-    <string name="room_list_catchup_welcome_body">התעדכן כאן בהודעות שלא נקראו</string>
-    <string name="room_list_catchup_welcome_title">ברוך הבא הביתה!</string>
-    <string name="room_list_catchup_empty_body">אין לך יותר הודעות שלא נקראו</string>
-    <string name="room_list_catchup_empty_title">כולכם נתפסתם!</string>
-    <string name="invited_by">הוזמן על ידי%s</string>
-    <string name="send_you_invite">שלחתי לך הזמנה</string>
-    <string name="room_list_empty">הצטרף לחדר כדי להתחיל להשתמש באפליקציה.</string>
-    <string name="global_retry">נסה שוב</string>
-    <string name="reply">השב</string>
-    <string name="edit">עריכה</string>
-    <string name="error_user_already_logged_in">נראה שאתה מנסה להתחבר לשרת בית אחר. האם אתה רוצה לצאת\?</string>
-    <string name="identity_server_not_defined_for_password_reset">לא הוגדר שום שרת זהות, הוא נדרש לאפס את הסיסמה שלך.</string>
-    <string name="identity_server_not_defined">אינך משתמש באף שרת זהות</string>
-    <string name="sas_error_unknown">שגיאה לא ידועה</string>
-    <string name="sas_error_m_user_error">חוסר התאמה למשתמש</string>
-    <string name="sas_error_m_key_mismatch">חוסר התאמה מפתח</string>
-    <string name="sas_error_m_invalid_message">התקבלה הודעה לא חוקית</string>
-    <string name="sas_error_m_unexpected_message">המושב קיבל הודעה לא צפויה</string>
-    <string name="sas_error_m_mismatched_sas">ה- SAS לא התאים</string>
-    <string name="sas_error_m_mismatched_commitment">התחייבות החשיש לא התאימה</string>
-    <string name="sas_error_m_unknown_method">הפגישה לא יכולה להסכים על הסכם מפתח, שיטת hash, MAC או SAS</string>
-    <string name="sas_error_m_unknown_transaction">המושב לא יודע על אותה עסקה</string>
-    <string name="sas_error_m_timeout">זמן קצוב לתהליך האימות</string>
-    <string name="sas_error_m_user">המשתמש ביטל את האימות</string>
-    <string name="sas_incoming_request_notif_content">%s רוצה לאמת את ההפעלה שלך</string>
-    <string name="sas_incoming_request_notif_title">בקשת אימות</string>
-    <string name="sas_verification_request_notification_channel">אימות מושב אינטראקטיבי</string>
-    <string name="sas_cancelled_by_me">האימות בוטל.
-\nסיבה:%s</string>
-    <string name="sas_cancelled_by_other">הצד השני ביטל את האימות.
-\n%s</string>
-    <string name="sas_cancelled_dialog_title">בקשה בוטלה</string>
-    <string name="sas_verification_request_notification_channel_title">אימות מפתח</string>
-    <string name="sas_legacy_verification_button_title">השתמש באימות מדור קודם.</string>
-    <string name="sas_verifying_keys">שום דבר לא מופיע\? לא כל הלקוחות עדיין תומכים באימות אינטראקטיבי. השתמש באימות מדור קודם.</string>
-    <string name="sas_got_it">הבנתי</string>
-    <string name="sas_verified_successful_description">הודעות מאובטחות עם משתמש זה מוצפנות מקצה לקצה ואינן ניתנות לקריאה על ידי צדדים שלישיים.</string>
-    <string name="sas_verified_successful">אימתת בהצלחה את ההפעלה הזו.</string>
-    <string name="sas_verified">מאומת!</string>
-    <string name="sas_waiting_for_partner">ממתין לאישור השותף …</string>
-    <string name="sas_view_request_action">צפה בבקשה</string>
-    <string name="sas_incoming_verification_request_dialog">קיבלת בקשת אימות נכנסת.</string>
-    <string name="sas_decimal_description">אמת את ההפעלה על ידי אישור המספרים הבאים מופיעים על גבי המסך של השותף</string>
-    <string name="sas_emoji_description">אמת את ההפעלה על ידי אישור שהאימוג\'י הבא מופיע על גבי המסך של השותף</string>
-    <string name="sas_incoming_request_description_2">אימות הפגישה הזו יסמן אותה כאמינה, וגם תסמן את הפגישה שלך כאמינה לשותף.</string>
-    <string name="sas_incoming_request_description">אמת את ההפעלה הזו כדי לסמן אותה כאמינה. מפגשי אמון של שותפים מעניקים לכם שקט נפשי נוסף בשימוש בהודעות מוצפנות מקצה לקצה.</string>
-    <string name="sas_incoming_request_title">בקשת אימות נכנסת</string>
-    <string name="sas_verify_start_button_title">התחל לאמת</string>
-    <string name="sas_security_advise">למען ביטחון מרבי אנו ממליצים לך לעשות זאת באופן אישי או להשתמש באמצעי תקשורת מהימן אחר.</string>
-    <string name="sas_verify_title">אמת את זה על ידי השוואה של מחרוזת טקסט קצרה.</string>
-    <string name="invalid_or_expired_credentials">הוצאת מחשבון בגלל אישורים לא חוקיים או שפג תוקפם.</string>
-    <string name="autodiscover_well_known_autofill_confirm">השתמש בקונפיגורציה</string>
-    <string name="template_autodiscover_well_known_autofill_dialog_message">אלמנט זיהה תצורת שרת מותאמת אישית לדומיין userId שלך \"%1$s\":
-\n%2$s</string>
-    <string name="autodiscover_well_known_autofill_dialog_title">השלם אוטומטית אפשרויות שרת</string>
-    <string name="autodiscover_invalid_response">תגובת גילוי שרת בית לא חוקית</string>
-    <string name="keys_backup_info_title_signature">חתימה</string>
-    <string name="keys_backup_info_title_algorithm">אלגוריתם</string>
-    <string name="keys_backup_info_title_version">גירסה</string>
-    <string name="keys_backup_info_keys_all_backup_up">כל המקשים מגובים</string>
-    <string name="secure_backup_setup">הגדר גיבוי מאובטח</string>
-    <string name="keys_backup_banner_in_progress">מגבה את המפתחות שלך. זה עשוי לקחת מספר דקות…</string>
-    <string name="keys_backup_banner_update_line2">נהל גיבוי מפתח</string>
-    <string name="keys_backup_banner_update_line1">מקשי הודעות מאובטחים חדשים</string>
-    <string name="keys_backup_banner_recover_line2">השתמש במפתח גיבוי</string>
-    <string name="warning_unsaved_change_discard">בטל שינויים</string>
-    <string name="warning_unsaved_change">יש שינויים שלא נשמרו. למחוק את השינויים\?</string>
-    <string name="warning_room_not_created_yet">החדר עדיין לא נוצר. לבטל את יצירת החדר\?</string>
-    <string name="universal_link_malformed">הקישור היה לקוי</string>
-    <string name="qr_code_not_scanned">קוד QR לא נסרק!</string>
-    <string name="invalid_qr_code_uri">קוד QR לא חוקי (URI לא חוקי)!</string>
-    <string name="cannot_dm_self">לא ניתן לשלוח הודעה ישירה לעצמך!</string>
-    <string name="share_by_text">שתף לפי טקסט</string>
-    <string name="room_error_not_found">לא יכול למצוא את החדר הזה. וודא שהוא קיים.</string>
-    <string name="error_opening_banned_room">לא ניתן לפתוח חדר בו נחסמת.</string>
-    <string name="auth_pin_confirm_to_disable_title">אשר PIN כדי להשבית PIN</string>
-    <string name="settings_security_pin_code_change_pin_summary">שנה את קוד ה- PIN הנוכחי שלך</string>
-    <string name="settings_security_pin_code_change_pin_title">שנה PIN</string>
-    <string name="template_settings_security_pin_code_grace_period_summary_off">קוד PIN נדרש בכל פעם שאתה פותח את Element.</string>
-    <string name="template_settings_security_pin_code_grace_period_summary_on">קוד PIN נדרש לאחר שתי דקות של אי שימוש ב- Element.</string>
-    <string name="settings_security_pin_code_grace_period_title">דרוש מספר PIN לאחר 2 דקות</string>
-    <string name="settings_security_pin_code_notifications_summary_off">הצג רק מספר הודעות שלא נקראו בהודעה פשוטה.</string>
-    <string name="settings_security_pin_code_notifications_summary_on">הצג פרטים כמו שמות החדרים ותוכן ההודעה.</string>
-    <string name="settings_security_pin_code_notifications_title">הצג תוכן בהתראות</string>
-    <string name="template_settings_security_pin_code_use_biometrics_summary_off">קוד PIN הוא הדרך היחידה לפתוח את Element.</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_on">אפשר ביומטריה ספציפית למכשירים, כמו טביעות אצבע וזיהוי פנים.</string>
-    <plurals name="directory_search_rooms_for">
-        <item quantity="one">%2$s חדר נמצא עבור %1$s</item>
-        <item quantity="two">%2$s חדרים נמצאו עבור %1$s</item>
-        <item quantity="many">%2$s חדרים נמצאו עבור %1$s</item>
-        <item quantity="other">%2$s חדרים נמצאו עבור %1$s</item>
-    </plurals>
-    <string name="settings_secure_backup_manage">נהל</string>
-    <string name="settings_secure_backup_section_title">גיבוי מאובטח</string>
-    <string name="settings_show_emoji_keyboard_summary">הוסף לחצן במלחין ההודעות כדי לפתוח מקלדת אימוג\'י</string>
-    <string name="settings_show_emoji_keyboard">הצג מקלדת אימוג\'י</string>
-    <string name="settings_chat_effects_description">השתמש בפקודה / confetti או שלח הודעה המכילה ❄️ או 🎉</string>
-    <string name="settings_chat_effects_title">הצג אפקטים של צ\'אט</string>
-    <string name="settings_troubleshoot_diagnostic_running_status">פועל … (%1$d מתוך%2$d)</string>
-    <string name="room_sliding_menu_version_x">גרסה%s</string>
-    <string name="room_permissions_change_topic">שנה נושא שיחה</string>
-    <string name="room_permissions_upgrade_the_room">שדרג את החדר</string>
-    <string name="room_permissions_send_m_room_server_acl_events">שלח אירועים m.room.server_acl</string>
-    <string name="room_permissions_change_permissions">שנה הרשאות</string>
-    <string name="room_permissions_change_room_name">שנה את שם החדר</string>
-    <string name="room_permissions_change_history_visibility">שינוי נראות ההיסטוריה</string>
-    <string name="room_permissions_enable_room_encryption">אפשר הצפנת חדרים</string>
-    <string name="room_permissions_change_main_address_for_the_room">שנה את הכתובת הראשית של החדר</string>
-    <string name="room_permissions_change_room_avatar">שנה אוואטר חדר</string>
-    <string name="room_permissions_modify_widgets">שנה יישומונים</string>
-    <string name="room_permissions_notify_everyone">הודע לכולם</string>
-    <string name="room_permissions_remove_messages_sent_by_others">הסר הודעות שנשלחו על ידי אחרים</string>
-    <string name="room_permissions_ban_users">נדה משתמשים</string>
-    <string name="room_permissions_kick_users">בעט החוצה משתמשים</string>
-    <string name="room_permissions_change_settings">שנה הגדרות</string>
-    <string name="room_permissions_invite_users">הזמן משתמשם</string>
-    <string name="room_permissions_send_messages">שלח הודעות</string>
-    <string name="room_permissions_default_role">תפקיד ברירת מחדל</string>
-    <string name="room_permissions_notice_read_only">אין לך הרשאה לעדכן את התפקידים הנדרשים לשינוי חלקים שונים בחדר</string>
-    <string name="room_permissions_notice">בחר את התפקידים הנדרשים לשינוי חלקים שונים של החדר</string>
-    <string name="room_permissions_title">הרשאות</string>
-    <string name="room_settings_permissions_subtitle">צפה ועדכן את התפקידים הנדרשים לשינוי חלקים שונים בחדר.</string>
-    <string name="room_settings_permissions_title">הרשאות חדרים</string>
-    <string name="people_search_user_directory">מדריך למשתמש (%s)</string>
-    <string name="room_participants_ago">לפני%1$s%2$s</string>
-    <string name="room_participants_now">%1$s עכשיו</string>
-    <string name="room_participants_leave_private_warning">חדר זה אינו ציבורי. לא תוכל להצטרף שוב ללא הזמנה.</string>
-    <string name="login_error_login_email_not_yet">קישור הדוא\"ל שעדיין לא נלחץ עליו</string>
-    <string name="call_failed_no_ice_description">אנא בקש ממנהל שרת הבית שלך (%1$s) להגדיר שרת TURN כדי שהשיחות יעבדו בצורה אמינה.
-\n
-\nלחלופין, אתה יכול לנסות להשתמש בשרת הציבורי ב-%2$s, אך זה לא יהיה אמין כל כך, והוא ישתף את כתובת ה- IP שלך עם השרת הזה. תוכל לנהל זאת גם בהגדרות.</string>
-    <string name="send_bug_report_progress">(%%%s)התקדמות</string>
-    <string name="bottom_action_people">אנשים</string>
-    <string name="bottom_action_favourites">מועדפים</string>
-    <string name="ongoing_conference_call">שיחת ועידה מתמשכת.
-\nהצטרף כ- %1$s או %2$s</string>
-    <string name="system_theme">ברירת מחדל מערכת</string>
-    <string name="room_member_jump_to_read_receipt">קפצו לקבלת קריאה</string>
-    <string name="room_member_open_or_create_dm">הודעה ישירה</string>
-    <string name="room_member_power_level_custom_in">מותאם אישית (%1$d) ב-%2$s</string>
-    <string name="room_member_power_level_default_in">ברירת מחדל ב-%1$s</string>
-    <string name="room_member_power_level_moderator_in">מנחה ב-%1$s</string>
-    <string name="room_member_power_level_admin_in">מנהל מערכת ב-%1$s</string>
-    <string name="room_member_power_level_users">משתמשים</string>
-    <string name="room_member_power_level_invites">הזמנות</string>
-    <string name="room_member_power_level_custom">מותאם אישית</string>
-    <string name="room_member_power_level_moderators">מנחים</string>
-    <plurals name="room_profile_section_more_member_list">
-        <item quantity="one">אדם אחד</item>
-        <item quantity="two">%1$d אנשים</item>
-        <item quantity="many">%1$d אנשים</item>
-        <item quantity="other">%1$d אנשים</item>
-    </plurals>
-    <plurals name="login_error_limit_exceeded_retry_after">
-        <item quantity="one">יותר מדי בקשות נשלחו. תוכל לנסות שוב בעוד%1$d שנייה …</item>
-        <item quantity="two">יותר מדי בקשות נשלחו. תוכלו לנסות שוב בעוד%1$d שניות …</item>
-        <item quantity="many">יותר מדי בקשות נשלחו. תוכלו לנסות שוב בעוד%1$d שניות …</item>
-        <item quantity="other">יותר מדי בקשות נשלחו. תוכלו לנסות שוב בעוד%1$d שניות …</item>
-    </plurals>
-    <string name="login_clear_homeserver_history">נקה היסטוריה</string>
-    <string name="login_social_sso">כניסה יחידה</string>
-    <string name="login_social_signin_with">היכנס באמצעות%s</string>
-    <string name="login_social_signup_with">הירשם עם%s</string>
-    <string name="login_social_continue_with">המשך עם%s</string>
-    <string name="login_social_continue">או</string>
-    <plurals name="fallback_users_read">
-        <item quantity="one">משתמש %d קרא</item>
-        <item quantity="two">%d משתמשים קראו</item>
-        <item quantity="many">%d משתמשים קראו</item>
-        <item quantity="other">%d משתמשים קראו</item>
-    </plurals>
-    <plurals name="two_and_some_others_read">
-        <item quantity="one">%1$s,%2$s ו-%3$d אחרים קראו</item>
-        <item quantity="two">%1$s,%2$s ו-%3$d אחרים קוראים</item>
-        <item quantity="many">%1$s,%2$s ו-%3$d אחרים קוראים</item>
-        <item quantity="other">%1$s,%2$s ו-%3$d אחרים קוראים</item>
-    </plurals>
-    <plurals name="keys_backup_info_keys_backing_up">
-        <item quantity="one">גיבוי המפתח%d …</item>
-        <item quantity="two">גיבוי%d המפתחות …</item>
-        <item quantity="many">מגבה%d המפתחות …</item>
-        <item quantity="other">מגבה%d המפתחות …</item>
-    </plurals>
-    <plurals name="keys_backup_restore_success_description_part2">
-        <item quantity="one">%d מפתח חדש נוסף להפעלה זו.</item>
-        <item quantity="two">%d מפתחות חדשים נוספו להפעלה זו.</item>
-        <item quantity="many">%d מפתחות חדשים נוספו להפעלה זו.</item>
-        <item quantity="other">%d מפתחות חדשים נוספו להפעלה זו.</item>
-    </plurals>
-    <plurals name="keys_backup_restore_success_description_part1">
-        <item quantity="one">שוחזרו גיבויים עם %d מפתח.</item>
-        <item quantity="two">שוחזרו גיבויים עם מפתחות%d.</item>
-        <item quantity="many">שוחזרו גיבויים עם מפתחות%d.</item>
-        <item quantity="other">שוחזרו גיבויים עם מפתחות%d.</item>
-    </plurals>
-    <string name="room_widget_failed_to_load">טעינת היישומון נכשלה.
-\n%s</string>
-    <plurals name="room_settings_banned_users_count">
-        <item quantity="one">%b משתמש נחסם</item>
-        <item quantity="two">%b משתמשים נחסמו</item>
-        <item quantity="many">%b משתמשים נחסמו</item>
-        <item quantity="other">%b משתמשים אחרים נחסמו</item>
-    </plurals>
-    <string name="account_email_error">אירעה שגיאה בעת אימות כתובת הדוא\"ל שלך.</string>
-    <string name="account_phone_number_already_used_error">מספר הטלפון הזה כבר נמצא בשימוש.</string>
-    <string name="account_email_not_found_error">כתובת דוא\"ל זו לא נמצאה.</string>
-    <string name="account_email_already_used_error">כתובת דוא\"ל זו כבר נמצאת בשימוש.</string>
-    <string name="account_email_validation_error">לא ניתן לאמת את כתובת הדוא\"ל. אנא בדוק את הדוא\"ל שלך ולחץ על הקישור שהוא מכיל. לאחר שתסיים, לחץ על המשך.</string>
-    <string name="account_email_validation_message">אנא בדוק את הדוא\"ל שלך ולחץ על הקישור שהוא מכיל. לאחר שתסיים, לחץ על המשך.</string>
-    <string name="account_email_validation_title">אימות בהמתנה</string>
-    <string name="settings_select_language">בחר שפה</string>
-    <string name="settings_interface_language">שפה</string>
-    <string name="settings_user_interface">ממשק משתמש</string>
-    <string name="disabled_integration_dialog_content">הפעל את \'אפשר שילובים\' בהגדרות כדי לעשות זאת.</string>
-    <string name="disabled_integration_dialog_title">שילובים מושבתים</string>
-    <string name="settings_integration_manager">מנהל אינטגרציה</string>
-    <string name="settings_integration_allow">אפשר שילובים</string>
-    <string name="settings_identity_server">שרת הזדהות</string>
-    <string name="settings_home_server">שרת ביתי</string>
-    <string name="settings_logged_in">מחובר כ</string>
-    <string name="devices_delete_submit_button_label">הגש</string>
-    <string name="devices_delete_pswd">סיסמה:</string>
-    <string name="devices_delete_dialog_title">הזדהות</string>
-    <string name="devices_delete_dialog_text">פעולה זו דורשת אימות נוסף.
-\nכדי להמשיך, הזן את הסיסמה שלך.</string>
-    <string name="devices_details_last_seen_title">נראה לאחרונה</string>
-    <string name="devices_details_device_name">עדכן שם ציבורי</string>
-    <string name="devices_details_name_title">שם ציבורי</string>
-    <string name="devices_details_id_title">תעודת זהות</string>
-    <string name="devices_details_dialog_title">מידע על מושב</string>
-    <string name="settings_data_save_mode_summary">מצב שמירת נתונים מחיל מסנן ספציפי כך שמסוננים עדכוני נוכחות והודעות הקלדה.</string>
-    <string name="settings_data_save_mode">מצב שמירת נתונים</string>
-    <string name="settings_opt_in_of_analytics_ok">כן, אני רוצה לעזור!</string>
-    <string name="template_settings_opt_in_of_analytics_prompt">אנא אפשר ניתוח נתונים כדי לעזור לנו לשפר את Element.</string>
-    <string name="template_settings_opt_in_of_analytics_summary">אלמנט אוסף ניתוח אנונימי כדי לאפשר לנו לשפר את היישום.</string>
-    <string name="settings_opt_in_of_analytics">שלח נתוני ניתוח</string>
-    <string name="settings_analytics">ניתוח נתונים</string>
-    <string name="startup_notification_fdroid_battery_optim_button_grant">הענק הרשאה</string>
-    <string name="template_startup_notification_fdroid_battery_optim_message">אלמנט צריך לשמור על חיבור רקע בעל השפעה נמוכה על מנת לקבל הודעות אמינות.
-\nבמסך הבא תתבקש לאפשר לאלמנט לרוץ תמיד ברקע, אנא קבל.</string>
-    <string name="startup_notification_fdroid_battery_optim_title">חיבור ברקע</string>
-    <string name="startup_notification_privacy_button_other">בחר באפשרות אחרת</string>
-    <string name="startup_notification_privacy_button_grant">מתן הרשאה</string>
-    <string name="template_startup_notification_privacy_message">אלמנט יכול לרוץ ברקע כדי לנהל את ההתראות שלך בצורה מאובטחת ופרטית. זה עשוי להשפיע על השימוש בסוללה.</string>
-    <string name="startup_notification_privacy_title">פרטיות הודעות</string>
-    <string name="settings_discovery_manage">נהל את הגדרות הגילוי שלך.</string>
-    <string name="settings_discovery_category">תַגלִית</string>
-    <string name="settings_deactivate_my_account">הפוך את המשתמש שלי ללא פעיל</string>
-    <string name="settings_deactivate_account_section">השבת את החשבון</string>
-    <string name="reset_secure_backup_warning">זה יחליף את המפתח או את הביטוי הנוכחי שלך.</string>
-    <string name="reset_secure_backup_title">צור מפתח אבטחה חדש או הגדר ביטוי אבטחה חדש לגיבוי הקיים שלך.</string>
-    <string name="settings_secure_backup_section_info">הגן מפני אובדן גישה להודעות ונתונים מוצפנים על ידי גיבוי של מפתחות הצפנה בשרת שלך.</string>
-    <string name="settings_secure_backup_enter_to_setup">הגדר במכשיר זה</string>
-    <string name="settings_secure_backup_reset">אפס גיבוי מאובטח</string>
-    <string name="settings_secure_backup_setup">הגדר גיבוי מאובטח</string>
-    <string name="verify_cancel_self_verification_from_trusted">אם תבטל, לא תוכל לקרוא הודעות מוצפנות במכשיר החדש שלך, ומשתמשים אחרים לא יסמכו עליו</string>
-    <string name="verify_cancel_self_verification_from_untrusted">אם תבטל, לא תוכל לקרוא הודעות מוצפנות במכשיר זה, ומשתמשים אחרים לא יסמכו על כך</string>
-    <string name="verify_new_session_compromized">ייתכן שחשבונך נפגע</string>
-    <string name="verify_new_session_was_not_me">זה לא אני</string>
-    <string name="verify_new_session_notice">השתמש בפגישה זו כדי לאמת את הפגישה החדשה שלך, והעניק לה גישה להודעות מוצפנות.</string>
-    <string name="new_session_review">הקש כדי לבדוק ולאמת</string>
-    <string name="new_session">כניסה חדשה. זה אתם\?</string>
-    <string name="refresh">ריענון</string>
-    <string name="e2e_use_keybackup">בטל את נעילת היסטוריית ההודעות המוצפנות</string>
-    <string name="settings_export_trail">ייצוא ביקורת</string>
-    <string name="settings_key_requests">בקשות מפתח</string>
-    <string name="template_login_default_session_public_name">אלמנט אנדרואיד</string>
-    <string name="keys_backup_restore_success_title_already_up_to_date">המפתחות כבר מעודכנים!</string>
-    <string name="event_redacted_by_admin_reason_with_reason">האירוע בהנחיית מנהל החדר, סיבה: %1$s</string>
-    <string name="event_redacted_by_user_reason_with_reason">האירוע נמחק על ידי המשתמש, הסיבה: %1$s</string>
-    <string name="delete_event_dialog_reason_hint">סיבה לניתוח מחדש</string>
-    <string name="delete_event_dialog_reason_checkbox">כלול סיבה</string>
-    <string name="delete_event_dialog_content">האם אתה בטוח שברצונך להסיר (למחוק) אירוע זה\? שים לב שאם תמחק שם של חדר או שינוי נושא, זה עלול לבטל את השינוי.</string>
-    <string name="delete_event_dialog_title">אשר הסרהאשר הסרה</string>
-    <string name="share_confirm_room">האם אתה רוצה לשלוח את הקובץ המצורף ל- %1$s\?</string>
-    <string name="message_action_item_redact">הסר…</string>
-    <string name="enter_secret_storage_passphrase_warning_text">עליך לגשת לאחסון סודי רק ממכשיר מהימן</string>
-    <string name="enter_secret_storage_passphrase_warning">אזהרה:</string>
-    <string name="enter_secret_storage_passphrase">הזן ביטוי סיסמא לאחסון סודי</string>
-    <string name="enter_secret_storage_invalid">לא ניתן למצוא סודות באחסון</string>
-    <string name="new_signin">כניסה חדשה</string>
-    <string name="verification_use_passphrase">אם אינך יכול לגשת להפעלה קיימת</string>
-    <string name="verification_cannot_access_other_session">השתמש בביטוי סיסמה או מפתח שחזור</string>
-    <string name="command_description_poll">יוצר סקר פשוט</string>
-    <string name="poll_item_selected_aria">אפשרות נבחרת</string>
-    <string name="delete_account_data_warning">למחוק את נתוני החשבון מסוג %1$s\?
-\n
-\nהשתמש בזהירות, זה עלול להוביל להתנהגות בלתי צפויה.</string>
-    <string name="settings_account_data">נתוני חשבון</string>
-    <string name="settings_security_pin_code_use_biometrics_title">אפשר ביומטריה</string>
-    <string name="settings_security_pin_code_summary">אם ברצונך לאפס את הקוד שלך, הקש על שכחת קוד כדי לצאת ולאפס.</string>
-    <string name="settings_security_pin_code_title">אפשר PIN</string>
-    <string name="settings_security_application_protection_screen_title">הגדר הגנה</string>
-    <string name="settings_security_application_protection_summary">הגן על הגישה באמצעות קוד וביומטריה.</string>
-    <string name="settings_security_application_protection_title">הגן על הגישה</string>
-    <string name="auth_pin_reset_content">כדי לאפס את הקוד שלך, יהיה עליך להתחבר מחדש וליצור קוד חדש.</string>
-    <string name="auth_pin_new_pin_action">קוד חדש</string>
-    <string name="auth_pin_reset_title">אתחל קוד</string>
-    <string name="auth_pin_forgot">שכחתם קוד\?</string>
-    <string name="auth_pin_title">הכנס את הקוד שלך</string>
-    <string name="create_pin_confirm_failure">אימות ה- PIN נכשל, הקש על קוד חדש.</string>
-    <string name="create_pin_confirm_title">אשר PIN</string>
-    <string name="bottom_sheet_setup_secure_backup_security_key_title">השתמש במפתח אבטחה</string>
-    <string name="bottom_sheet_setup_secure_backup_submit">התקן</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">הגן מפני אובדן גישה להודעות ונתונים מוצפנים על ידי גיבוי של מפתחות הצפנה בשרת שלך.</string>
-    <plurals name="poll_info">
-        <item quantity="one">%d הצבעה</item>
-        <item quantity="two">%d הצבעות</item>
-        <item quantity="many">%d הצבעות</item>
-        <item quantity="other">%d הצבעות</item>
-    </plurals>
-    <string name="settings_dev_tools">כלי מפתחים</string>
-    <string name="no_connectivity_to_the_server_indicator_airplane">מצב טיסה פועל</string>
-    <string name="no_connectivity_to_the_server_indicator">הקישוריות לשרת אבדה</string>
-    <string name="qr_code_scanned_by_other_no">לא</string>
-    <string name="qr_code_scanned_by_other_yes">כן</string>
-    <string name="qr_code_scanned_by_other_notice">כמעט שם! האם%s מציג את אותו מגן\?</string>
-    <string name="a11y_qr_code_for_verification">קוד QR</string>
-    <string name="reset_cross_signing">אפס מקשים</string>
-    <string name="initialize_cross_signing">אתחל את CrossSigning</string>
-    <string name="verification_profile_device_untrust_info">עד שמשתמש זה בוטח בהפעלה זו, הודעות שנשלחות אליה וממנה מתויגות באזהרות. לחילופין, ניתן לאמת זאת ידנית.</string>
-    <string name="verification_profile_device_new_signing">%1$s (%2$s) נכנס באמצעות הפעלה חדשה:</string>
-    <string name="verification_profile_device_verified_because">הפעלה זו מהימנה להודעות מאובטחות מכיוון ש-%1$s (%2$s) אימת אותה:</string>
-    <string name="not_trusted">לא מהימן</string>
-    <string name="trusted">מהימן</string>
-    <string name="room_member_profile_sessions_section_title">מושבים</string>
-    <string name="room_member_profile_failed_to_get_devices">קבלת הפעלות נכשלה</string>
-    <string name="verification_profile_warning">אזהרה</string>
-    <string name="verification_profile_verified">מאומת</string>
-    <string name="verification_profile_verify">בצע אימות</string>
-    <string name="verification_open_other_to_verify">השתמש בפגישה קיימת כדי לאמת את זה, והעניק לו גישה להודעות מוצפנות.</string>
-    <string name="complete_security">אבטחה מלאה</string>
-    <string name="crosssigning_other_user_not_trust">משתמשים אחרים עשויים שלא לסמוך על כך</string>
-    <string name="crosssigning_verify_this_session">אמת כניסה זו</string>
-    <plurals name="settings_active_sessions_count">
-        <item quantity="one">%d מושב פעיל</item>
-        <item quantity="two">%d מושבים פעילים</item>
-        <item quantity="many">%d מושבים פעילים</item>
-        <item quantity="other">%d מושבים פעילים</item>
-    </plurals>
-    <string name="settings_active_sessions_unverified_device_desc">אמת את ההפעלה הזו כדי לסמן אותה כאמינה והענק לה גישה להודעות מוצפנות. אם לא נכנסת למפגש זה ייתכן שחשבונך נפגע:</string>
-    <string name="settings_active_sessions_verified_device_desc">הפגישה הזו מהימנה בהודעות מאובטחות מכיוון שאמתת אותה:</string>
-    <string name="settings_failed_to_get_crypto_device_info">אין מידע קריפטוגרפי זמין</string>
-    <string name="settings_active_sessions_signout_device">צא מפגישה זו</string>
-    <string name="settings_active_sessions_manage">נהל מושבים</string>
-    <string name="settings_active_sessions_show_all">הצג את כל הפעילויות באתר</string>
-    <string name="settings_active_sessions_list">מושבים אקטיביים</string>
-    <string name="settings_hs_admin_e2e_disabled">מנהל השרת שלך השבית הצפנה מקצה לקצה כברירת מחדל בחדרים פרטיים ובהודעות ישירות.</string>
-    <string name="encryption_information_dg_xsigning_disabled">חתימה צולבת אינה מופעלת</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">חתימה צולבת מופעלת.
-\nלא סומכים על מקשים</string>
-    <string name="encryption_information_dg_xsigning_trusted">חתימה צולבת מופעלת
-\nמקשים מהימנים.
-\nמפתחות פרטיים אינם ידועים</string>
-    <string name="encryption_information_dg_xsigning_complete">חתימה צולבת מופעלת
-\nמפתחות פרטיים במכשיר.</string>
-    <string name="encryption_information_cross_signing_state">חתימה צולבת</string>
-    <string name="verification_conclusion_ok_self_notice">ההפעלה החדשה שלך אומתה. יש לו גישה להודעות המוצפנות שלך, ומשתמשים אחרים יראו בכך אמינים.</string>
-    <string name="verification_conclusion_ok_notice">הודעות עם משתמש זה מוצפנות מקצה לקצה ולא ניתן לקרוא על ידי צדדים שלישיים.</string>
-    <string name="verification_code_notice">השווה את הקוד לזה שמוצג על מסך המשתמש האחר.</string>
-    <string name="verification_emoji_notice">השווה את האימוג\'י הייחודי, וודא שהם מופיעים באותו סדר.</string>
-    <string name="verification_request_start_notice">כדי להיות בטוחים, עשו זאת באופן אישי או השתמשו בדרך אחרת לתקשר.</string>
-    <string name="verification_request_notice">כדי להיות בטוחים, אמת את%s על ידי בדיקת קוד חד פעמי.</string>
-    <string name="room_settings_enable_encryption_dialog_submit">אפשר הצפנה</string>
-    <string name="room_settings_enable_encryption_dialog_content">לאחר הפעלתו, לא ניתן להשבית את ההצפנה לחדר. הודעות שנשלחות בחדר מוצפן אינן נראות על ידי השרת, רק על ידי משתתפי החדר. הפעלת הצפנה עשויה למנוע בוטים וגשרים רבים לעבוד כראוי.</string>
-    <string name="room_settings_enable_encryption_dialog_title">לאפשר הצפנה\?</string>
-    <string name="room_settings_enable_encryption_warning">לאחר הפעלתו, לא ניתן להשבית את ההצפנה.</string>
-    <string name="room_settings_enable_encryption_no_permission">אין לך הרשאה לאפשר הצפנה בחדר זה.</string>
-    <string name="room_settings_enable_encryption">אפשר הצפנה מקצה לקצה …</string>
-    <string name="settings_category_composer">עורך הודעה</string>
-    <string name="settings_category_timeline">ציר הזמן</string>
-    <string name="command_description_rainbow_emote">שולח את הטקסט הנתון בצבע קשת</string>
-    <string name="command_description_rainbow">שולח את ההודעה הנתונה בצבע קשת</string>
-    <string name="room_list_sharing_header_other_rooms">חדרים אחרים</string>
-    <string name="room_list_sharing_header_recent_rooms">חדרים אחרונים</string>
-    <string name="verify_cannot_cross_sign">הפעלה זו אינה יכולה לשתף את האימות הזה עם הפעלות אחרות שלך.
-\nהאימות יישמר באופן מקומי וישותף בגרסה עתידית של האפליקציה.</string>
-    <string name="unignore">בטל התעלמות</string>
-    <string name="template_rendering_event_error_exception">אלמנט נתקל בבעיה בעת הצגת תוכן האירוע עם המזהה \'%1$s\'</string>
-    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
-    <string name="command_confetti">שולח את ההודעה הנתונה עם קונפטי</string>
-    <string name="secure_backup_reset_no_history">תתחיל מחדש ללא היסטוריה, ללא הודעות, מכשירים מאומתים או משתמשים מאומתים</string>
-    <string name="secure_backup_reset_if_you_reset_all">אם תאפס הכל</string>
-    <string name="secure_backup_reset_all_no_other_devices">עשה זאת רק אם אין לך מכשיר אחר שאיתו תוכל לאמת מכשיר זה.</string>
-    <string name="secure_backup_reset_all">אפס הכל</string>
-    <string name="bad_passphrase_key_reset_all_action">שכחת או איבדת את כל אפשרויות הגיבוי\? אפס הכל</string>
-    <string name="failed_to_access_secure_storage">הגישה לאחסון מאובטח נכשלה</string>
-    <string name="keys_backup_recovery_key_error_decrypt">לא ניתן היה לפענח את הגיבוי באמצעות מפתח השחזור הזה: ודא שהזנת את מפתח השחזור הנכון.</string>
-    <string name="enter_secret_storage_input_key">בחר במפתח השחזור שלך, או הזן אותו ידנית על ידי הקלדתו או הדבקתו מהלוח שלך</string>
-    <string name="use_recovery_key">השתמש במפתח השחזור</string>
-    <string name="enter_secret_storage_passphrase_or_key">השתמש ב- %1$s שלך או השתמש ב- %2$s שלך כדי להמשיך.</string>
-    <string name="command_description_discard_session_not_handled">נתמך רק בחדרים מוצפנים</string>
-    <string name="command_description_discard_session">מכריח את ההפעלה הקבוצתית החוצה הנוכחית בחדר מוצפן להיזרק</string>
-    <string name="template_use_latest_app">השתמש באלמנט האחרון במכשירים האחרים שלך:</string>
-    <string name="or_other_mx_capabale_client">או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
-    <string name="template_app_ios_android">אלמנט iOS
-\nאלמנט אנדרואיד</string>
-    <string name="template_app_desktop_web">רשת האינטרנט
-\nשולחן העבודה של אלמנט</string>
-    <string name="template_use_other_session_content_description">השתמש באלמנט העדכני ביותר במכשירים האחרים שלך, Element Web, Element Desktop, Element iOS, Element for Android, או לקוח מטריקס אחר עם יכולת חתימה צולבת</string>
-    <string name="change_password_summary">הגדר סיסמת חשבון חדשה …</string>
-    <string name="error_saving_media_file">לא ניתן היה לשמור את קובץ המדיה</string>
-    <string name="error_adding_media_file_to_gallery">לא ניתן היה להוסיף קובץ מדיה לגלריה</string>
-    <string name="media_file_added_to_gallery">קובץ מדיה נוסף לגלריה</string>
-    <string name="settings_security_prevent_screenshots_summary">הפעלת הגדרה זו מוסיפה את FLAG_SECURE לכל הפעילויות. הפעל מחדש את היישום כדי שהשינוי ייכנס לתוקף.</string>
-    <string name="settings_security_prevent_screenshots_title">מנע צילומי מסך של היישום</string>
-    <string name="bootstrap_migration_backup_recovery_key">מפתח שחזור גיבוי מפתח</string>
-    <string name="bootstrap_migration_with_passphrase_helper_with_link">אינך יודע את משפט הסיסמה לגיבוי מפתח שלך, אתה יכול %s.</string>
-    <string name="bootstrap_migration_use_recovery_key">השתמש במפתח השחזור של גיבוי המפתח שלך</string>
-    <string name="bootstrap_migration_enter_backup_password">הזן את משפט הסיסמה לגיבוי מפתח כדי להמשיך.</string>
-    <string name="new_session_review_with_info">%1$s (%2$s)</string>
-    <string name="bootstrap_progress_storing_in_sss">אחסון סוד הגיבוי המקשים ב- SSSS</string>
-    <string name="bootstrap_progress_generating_ssss_recovery">יצירת מפתח SSSS ממפתח התאוששות</string>
-    <string name="bootstrap_progress_generating_ssss_with_info">יוצר מפתח SSSS מביטוי סיסמה (%s)</string>
-    <string name="bootstrap_progress_generating_ssss">יצירת מפתח SSSS מביטוי סיסמה</string>
-    <string name="bootstrap_progress_compute_curve_key">קבלת מפתח עקומה</string>
-    <string name="bootstrap_progress_checking_backup_with_info">בודק מפתח גיבוי (%s)</string>
-    <string name="bootstrap_progress_checking_backup">בודק מפתח גיבוי</string>
-    <string name="recovery_key_empty_error_message">אנא הכנס מפתח שחזור</string>
-    <string name="bootstrap_invalid_recovery_key">זה לא מפתח שחזור תקף</string>
-    <string name="backup_recovery_passphrase">ביטוי סיסמה לשחזור</string>
-    <string name="enter_backup_passphrase">הזן %s</string>
-    <string name="use_file">השתמש בקובץ</string>
-    <string name="bootstrap_enter_recovery">הזן את %s שלך כדי להמשיך</string>
-    <string name="security_prompt_text">אמת את עצמך ואחרים בכדי לשמור על הצ\'אטים שלך</string>
-    <string name="setup_cross_signing">אפשר חתימה צולבת</string>
-    <string name="upgrade_security">שדרוג הצפנה זמין</string>
-    <string name="room_message_placeholder">הודעה…</string>
-    <string name="auth_invalid_login_deactivated_account">חשבון זה הושבת.</string>
-    <string name="auth_invalid_login_param_space_in_password">שם משתמש ו / או סיסמה שגויים. הסיסמה שהוזנה מתחילה או מסתיימת ברווחים, אנא בדוק אותה.</string>
-    <string name="command_description_plain">שולח הודעה כטקסט רגיל, מבלי לפרש אותה כסימון</string>
-    <string name="settings_notification_advanced_summary">הגדר חשיבות התראה לפי אירוע</string>
-    <string name="settings_troubleshoot_title">פתרון בעיות</string>
-    <string name="settings_when_rooms_are_upgraded">כאשר משודרגים חדרים</string>
-    <string name="settings_messages_in_e2e_group_chat">הודעות מוצפנות בצ\'אטים קבוצתיים</string>
-    <string name="settings_messages_in_e2e_one_to_one">הודעות מוצפנות בצ\'אטים אחד לאחד</string>
-    <string name="settings_messages_at_room">הודעות המכילות @room</string>
-    <string name="settings_notification_configuration">תצורת התראות</string>
-    <string name="error_failed_to_import_keys">ייבוא המפתחות נכשל</string>
-    <string name="qr_code_scanned_verif_waiting">ממתין ל-%s …</string>
-    <string name="qr_code_scanned_verif_waiting_notice">כמעט שם! מחכה לאישור…</string>
-    <string name="qr_code_scanned_self_verif_notice">כמעט שם! האם המכשיר השני מציג את אותו מגן\?</string>
-    <string name="topic_prefix">"נושא: "</string>
-    <string name="add_a_topic_link_text">הוספת נושא</string>
-    <string name="room_created_summary_no_topic_creation_text">%s כדי להודיע לאנשים על מה החדר הזה.</string>
-    <string name="this_is_the_beginning_of_dm">זוהי ההתחלה של היסטוריית ההודעות הישירות שלך עם%s.</string>
-    <string name="this_is_the_beginning_of_room_no_name">זו תחילתה של השיחה הזו.</string>
-    <string name="this_is_the_beginning_of_room">זו ההתחלה ש ל%s.</string>
-    <string name="direct_room_created_summary_item_by_you">הצתרפתם.</string>
-    <string name="direct_room_created_summary_item">%s הצטרף.</string>
-    <string name="room_created_summary_item_by_you">יצרת ותגדרת את החדר.</string>
-    <string name="room_created_summary_item">%s יצר את החדר והגדיר אותו.</string>
-    <string name="encryption_unknown_algorithm_tile_description">ההצפנה בה משתמשים בחדר זה אינה נתמכת</string>
-    <string name="encryption_not_enabled">ההצפנה לא מופעלת</string>
-    <string name="direct_room_encryption_enabled_tile_description">ההודעות בחדר זה מוצפנות מקצה לקצה.</string>
-    <string name="encryption_enabled_tile_description">ההודעות בחדר זה מוצפנות מקצה לקצה. למידע נוסף ואמת משתמשים בפרופיל שלהם.</string>
-    <string name="encryption_enabled">ההצפנה מופעלת</string>
-    <string name="bootstrap_cancel_text">אם תבטל עכשיו, אתה עלול לאבד הודעות ונתונים מוצפנים אם תאבד את הגישה לכניסות שלך.
-\n
-\nאתה יכול גם להגדיר גיבוי מאובטח ולנהל את המפתחות שלך בהגדרות.</string>
-    <string name="bootstrap_skip_text_no_gen_key">הגדרת ביטוי סיסמה לשחזור מאפשרת לך לאבטח ולפתוח הודעות מוצפנות ואמון.</string>
-    <string name="bootstrap_skip_text">הגדרת ביטוי סיסמה לשחזור מאפשרת לך לאבטח ולפתוח הודעות מוצפנות ואמון.
-\n
-\nאם אינך רוצה להגדיר סיסמת הודעה, צור במקום זאת מפתח הודעה.</string>
-    <string name="auth_flow_not_supported">אינך יכול לעשות זאת מנייד</string>
-    <string name="bootstrap_crosssigning_save_cloud">העתק אותו לאחסון הענן האישי שלך</string>
-    <string name="bootstrap_crosssigning_save_usb">שמור אותו במפתח USB או בכונן גיבוי</string>
-    <string name="bootstrap_crosssigning_print_it">הדפיסו ואחסנו במקום בטוח</string>
-    <string name="bootstrap_cross_signing_success">%2$s ו %1$s מוגדרים כעת.
-\n
-\nתשמור עליהם! תזדקק להם בכדי לפתוח הודעות מוצפנות ומידע מאובטח אם תאבד את כל ההפעלות הפעילות שלך.</string>
-    <string name="bootstrap_crosssigning_progress_key_backup">הגדרת גיבוי מקשים</string>
-    <string name="bootstrap_crosssigning_progress_save_ssk">סנכרון מפתח חתימה עצמית</string>
-    <string name="bootstrap_crosssigning_progress_save_usk">סנכרון מפתח משתמש</string>
-    <string name="bootstrap_crosssigning_progress_save_msk">סנכרון מפתח ראשי</string>
-    <string name="bootstrap_crosssigning_progress_default_key">הגדרת מפתח ברירת מחדל של SSSS</string>
-    <string name="bootstrap_crosssigning_progress_pbkdf2">יצירת מפתח מאובטח מביטוי סיסמה</string>
-    <string name="bootstrap_crosssigning_progress_initializing">פרסום מפתחות זהות שנוצרו</string>
-    <string name="bootstrap_save_key_description">השתמש ב- %1$s זה כרשת ביטחון למקרה שאתה שוכח את %2$s שלך.</string>
-    <string name="finish">סיום</string>
-    <string name="keep_it_safe">שמור על זה בטוח</string>
-    <string name="bootstrap_finish_title">סיימתם!</string>
-    <string name="your_recovery_key">מפתח ההתאוששות שלך</string>
-    <string name="bootstrap_loading_title">הגדרת התאוששות.</string>
-    <string name="bootstrap_loading_text">פעולה זו עשויה לארוך מספר שניות, אנא התאזר בסבלנות.</string>
-    <string name="bootstrap_info_text_2">הזן ביטוי אבטחה רק אתה מכיר, המשמש לאבטחת סודות בשרת שלך.</string>
-    <string name="bootstrap_dont_reuse_pwd">אל תשתמש בסיסמת חשבונך.</string>
-    <string name="bootstrap_info_confirm_text">הזן שוב את %s שלך כדי לאשר זאת.</string>
-    <string name="bootstrap_info_text">אבטח ופתח נעילת הודעות מוצפנות ואמון באמצעות %s.</string>
-    <string name="enter_account_password">הזן את ה- %s בכדי להמשיך.</string>
-    <string name="confirm_recovery_passphrase">אשר %s</string>
-    <string name="generate_message_key">צור מפתח הודעה</string>
-    <string name="set_recovery_passphrase">הגדר %s</string>
-    <string name="account_password">סיסמת חשבון</string>
-    <string name="message_key">מפתח הודעה</string>
-    <string name="recovery_passphrase">ביטוי סיסמה לשחזור</string>
-    <string name="verification_cancelled">האימות בוטל</string>
-    <string name="verify_cancelled_notice">אמת את המכשירים שלך מההגדרות.</string>
-    <string name="verify_not_me_self_verification">אחד מהדברים הבאים עלול להתפשר:
-\n
-\n- הסיסמה שלך
-\n- שרת הבית שלך
-\n- מכשיר זה, או המכשיר האחר
-\n- חיבור האינטרנט שמשני המכשירים משתמשים בו
-\n
-\nאנו ממליצים לך לשנות את הסיסמה ומפתח השחזור שלך בהגדרות באופן מיידי.</string>
-    <string name="verify_cancel_other">לא תאמת את %1$s (%2$s) אם תבטל עכשיו. התחל שוב בפרופיל המשתמש שלהם.</string>
-    <plurals name="send_images_with_original_size">
-        <item quantity="one">שלח תמונה בגודל המקורי</item>
-        <item quantity="two">שלח תמוננות בגודל המקורי</item>
-        <item quantity="many">שלח תמונות בגודל המקורי</item>
-        <item quantity="other">שלח תמונות בגודל המקורי</item>
-    </plurals>
-    <plurals name="poll_info_final">
-        <item quantity="one">%d הצבעה - תוצאות סופיות</item>
-        <item quantity="two">%d הצבעות - תוצאות סופיות</item>
-        <item quantity="many">%d הצבעעות - תוצאות סופיות</item>
-        <item quantity="other">%d הצבעות - תוצאות סופיות</item>
-    </plurals>
-    <string name="create_pin_title">בחר PIN לאבטחה</string>
-    <string name="too_many_pin_failures">שגיאות רבות מדי, יצאת מהחשבון</string>
-    <string name="wrong_pin_message_last_remaining_attempt">אַזהָרָה! ניסיון אחרון שנותר לפני היציאה!</string>
-    <plurals name="wrong_pin_message_remaining_attempts">
-        <item quantity="one">קוד שגוי,%d ניסיון נוסף</item>
-        <item quantity="two">קוד שגוי,%d ניסיונות נוספים</item>
-        <item quantity="many">קוד שגוי,%d ניסיונות נוספים</item>
-        <item quantity="other">קוד שגוי,%d ניסיונות נוספים</item>
-    </plurals>
-    <string name="alert_push_are_disabled_description">בדוק את ההגדרות שלך כדי לאפשר התראות דחיפה</string>
-    <string name="alert_push_are_disabled_title">התראות קופצות מושבתות</string>
-    <string name="failed_to_unban">נכשל המשתמש לבטל את הסילוק</string>
-    <string name="member_banned_by">נחסם על ידי%1$s</string>
-    <string name="three_pid_revoke_invite_dialog_content">לבטל את ההזמנה ל-%1$s\?</string>
-    <string name="three_pid_revoke_invite_dialog_title">בטל הזמנה</string>
-    <string name="phone_book_perform_lookup">חפש אנשי קשר ב-Matrix</string>
-    <string name="contacts_book_title">אנשי הקשר</string>
-    <string name="empty_contact_book">ספר אנשי הקשר שלך ריק</string>
-    <string name="loading_contact_book">מאחזר את אנשי הקשר שלך …</string>
-    <string name="search_in_my_contacts">חפש באנשי הקשר שלי</string>
-    <string name="phone_book_title">ספר טלפונים</string>
-    <string name="empty_phone_book">ספר הטלפונים שלך ריק</string>
-    <string name="add_from_phone_book">הוסף מפנקס הטלפונים שלי</string>
-    <string name="save_recovery_key_chooser_hint">שמור מפתח שחזור פנימה</string>
-    <string name="disclaimer_positive_button">למד עוד</string>
-    <string name="disclaimer_negative_button">הבנת</string>
-    <string name="disclaimer_content">אנו שמחים לבשר ששינינו שם! האפליקציה שלך מעודכנת ואתה מחובר לחשבונך.</string>
-    <string name="disclaimer_title">Riot היא עכשיו Element!</string>
-    <string name="notice_crypto_unable_to_decrypt_merged">ממתין להיסטוריית הצפנה</string>
-    <string name="crypto_error_withheld_generic">אינך יכול לגשת להודעה זו מכיוון שהשולח בכוונה לא שלח את המפתחות</string>
-    <string name="crypto_error_withheld_unverified">אינך יכול לגשת להודעה זו מכיוון שהשולח אינו מהימן על ההפעלה שלך</string>
-    <string name="crypto_error_withheld_blacklisted">אינך יכול לגשת להודעה זו מכיוון שנחסמת על ידי השולח</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">עקב הצפנה מקצה לקצה, ייתכן שיהיה עליך להמתין להגעת ההודעה של מישהו מכיוון שמפתחות ההצפנה לא נשלחו אליך כראוי.</string>
-    <string name="crypto_utd">לא ניתן לפענח</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly">בהמתנה להודעה זו, זה עשוי לקחת זמן מה</string>
-    <string name="notice_crypto_unable_to_decrypt_final">אינך יכול לגשת להודעה זו</string>
-    <string name="room_settings_set_avatar">הגדר אווטר</string>
-    <string name="room_settings_save_success">שינית בהצלחה את הגדרות החדר</string>
-    <string name="room_settings_topic_hint">נושא</string>
-    <string name="room_settings_name_hint">שם החדר</string>
-    <string name="save_your_security_key_notice">אחסן את מפתח האבטחה שלך במקום בטוח, כמו מנהל סיסמאות או כספת.</string>
-    <string name="save_your_security_key_title">שמור את מפתח האבטחה שלך</string>
-    <string name="set_a_security_phrase_again_notice">הזן את ביטוי האבטחה שלך שוב כדי לאשר אותו.</string>
-    <string name="set_a_security_phrase_hint">ביטוי אבטחה</string>
-    <string name="set_a_security_phrase_notice">הזן ביטוי אבטחה רק אתה מכיר, המשמש לאבטחת סודות בשרת שלך.</string>
-    <string name="set_a_security_phrase_title">הגדר ביטוי אבטחה</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">אחסן את מפתח האבטחה שלך במקום בטוח, כמו מנהל סיסמאות או כספת.</string>
-    <string name="bottom_sheet_save_your_recovery_key_title">שמור את מפתח האבטחה שלך</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">הזן ביטוי סודי שרק אתה יודע, וצור מפתח לגיבוי.</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">השתמש בביטוי אבטחה</string>
-    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">צור מפתח אבטחה כדי לאחסן מקום בטוח כמו מנהל סיסמאות או כספת.</string>
-    <string name="bottom_sheet_setup_secure_backup_title">הגדר גיבוי מאובטח</string>
-    <string name="settings_setup_secure_backup">הגדר גיבוי מאובטח</string>
-    <string name="a11y_start_camera">הפעל את המצלמה</string>
-    <string name="a11y_stop_camera">עצור את המצלמה</string>
-    <string name="a11y_unmute_microphone">בטל את ההשתקה של המיקרופון</string>
-    <string name="a11y_mute_microphone">השתק את המיקרופון</string>
-    <string name="a11y_open_chat">פתח צ\'אט</string>
-    <string name="power_level_title">תַפְקִיד</string>
-    <string name="power_level_edit_title">הגדר תפקיד</string>
-    <string name="identity_server_set_alternative_submit">שלח</string>
-    <string name="identity_server_set_alternative_notice_no_default">הזן את כתובת ה- URL של שרת זהות</string>
-    <string name="identity_server_set_alternative_notice">לחלופין, תוכל להזין כל כתובת אתר אחרת של שרת URL</string>
-    <string name="identity_server_set_default_submit">השתמש ב-%1$s</string>
-    <string name="identity_server_set_default_notice">שרת הבית שלך (%1$s) מציע להשתמש ב-%2$s עבור שרת הזהות שלך</string>
-    <string name="identity_server_user_consent_not_provided">הסכמת המשתמש לא סופקה.</string>
-    <string name="identity_server_error_no_current_binding_error">אין קשר נוכחי למזהה זה.</string>
-    <string name="identity_server_error_binding_error">העמותה נכשלה.</string>
-    <string name="template_identity_server_error_bulk_sha256_not_supported">למען הפרטיות שלך, אלמנט תומך רק בשליחת הודעות דוא\"ל של משתמשים, בליל ומספר טלפון.</string>
-    <string name="identity_server_error_terms_not_signed">אנא קבל תחילה את התנאים של שרת הזהות בהגדרות.</string>
-    <string name="identity_server_error_no_identity_server_configured">אנא הגדר תחילה שרת זהות.</string>
-    <string name="identity_server_error_outdated_home_server">פעולה זו אינה אפשרית. שרת הבית מיושן.</string>
-    <string name="template_identity_server_error_outdated_identity_server">שרת זהות זה מיושן .Element תומך רק ב- API V2.</string>
-    <string name="disconnect_identity_server_dialog_content">להתנתק משרת הזהות%s\?</string>
-    <string name="open_terms_of">תנאים פתוחים של%s</string>
-    <string name="choose_locale_loading_locales">טוען שפות זמינות …</string>
-    <string name="choose_locale_other_locales_title">שפות זמינות אחרות</string>
-    <string name="choose_locale_current_locale_title">שפה נוכחית</string>
-    <string name="user_code_info_text">שתף את הקוד הזה עם אנשים כדי שיוכלו לסרוק אותו כדי להוסיף אותך ולהתחיל לשוחח.</string>
-    <string name="user_code_my_code">הקוד שלי</string>
-    <string name="user_code_scan">סרוק קוד QR</string>
-    <string name="invite_users_to_room_failure">לא יכולנו להזמין משתמשים. אנא בדוק את המשתמשים שברצונך להזמין ונסה שוב.</string>
-    <plurals name="invitations_sent_to_one_and_more_users">
-        <item quantity="one">הזמנות נשלחו אל%1$s ואחד נוסף</item>
-        <item quantity="two">הזמנות נשלחו אל%1$s ואחרים</item>
-        <item quantity="many">הזמנות נשלחו אל%1$s ואחרים</item>
-        <item quantity="other">הזמנות נשלחו אל%1$s ואחריםה</item>
-    </plurals>
-    <string name="not_a_valid_qr_code">זה לא קוד QR מטריציוני תקף</string>
-    <string name="invitations_sent_to_two_users">הזמנות נשלחו אל%1$s ו-%2$s</string>
-    <string name="invitation_sent_to_one_user">ההזמנה נשלחה אל%1$s</string>
-    <string name="template_invite_friends_rich_title">🔐️ הצטרפו אלי באלמנט</string>
-    <string name="template_invite_friends_text">היי, דבר איתי באלמנט:%s</string>
-    <string name="invite_friends">להזמין חברים</string>
-    <string name="invite_users_to_room_title">הזמן משתמשים</string>
-    <string name="inviting_users_to_room">מזמין משתמשים …</string>
-    <string name="invite_users_to_room_action_invite">להזמין</string>
-    <string name="add_people">הוסף אנשים</string>
-    <string name="create_room_dm_failure">לא הצלחנו ליצור את ה- DM שלך. אנא בדוק את המשתמשים שברצונך להזמין ונסה שוב.</string>
-    <string name="external_link_confirmation_message">הקישור%1$s מעביר אותך לאתר אחר:%2$s.
-\n
-\nהאם אתה בטוח שאתה רוצה להמשיך\?</string>
-    <string name="external_link_confirmation_title">בדוק-פעמיים קישור זה</string>
-    <string name="error_empty_field_choose_password">אנא בחר סיסמה.</string>
-    <string name="error_empty_field_choose_user_name">אנא בחר שם משתמש.</string>
-    <string name="mark_as_verified">סמן כאמין</string>
-    <string name="confirm_your_identity_quad_s">אשר את זהותך על ידי אימות התחברות זו והעניק לו גישה להודעות מוצפנות.</string>
-    <string name="cross_signing_verify_by_emoji">אימות אינטראקטיבי על ידי Emoji</string>
-    <string name="crosssigning_verify_session">אמת כניסה</string>
-    <plurals name="secure_backup_reset_devices_you_can_verify">
-        <item quantity="one">הראה את המכשיר שאיתו תוכל לאמת כעת</item>
-        <item quantity="two">הראה את המכשירים שאיתם תוכל לאמת כעת</item>
-        <item quantity="many">הראה את המכשירים שאיתם תוכל לאמת כעת</item>
-        <item quantity="other">הראה את המכשירים שאיתם תוכל לאמת כעת</item>
-    </plurals>
-    <string name="cross_signing_verify_by_text">אמת ידנית באמצעות טקסט</string>
-    <string name="verify_this_session">אמת את הכניסה החדשה שניגשת לחשבונך: %1$s</string>
-    <string name="verify_other_sessions">אמת את כל ההפעלות שלך כדי להבטיח שהחשבון וההודעות שלך בטוחים</string>
-    <string name="review_logins">בדוק היכן נכנסת</string>
-    <string name="encrypted_unverified">מוצפן על ידי מכשיר לא מאומת</string>
-    <string name="unencrypted">לא מוצפן</string>
-    <string name="default_message_emote_snow">שולח שלג ❄️</string>
-    <string name="default_message_emote_confetti">שולח קונפטי 🎉</string>
-    <string name="user_code_share">שתף את הקוד שלי</string>
-    <string name="add_members_to_room">הוסף משתמשים</string>
-    <string name="confirm_your_identity">אשר את זהותך על ידי אימות התחברות זו מאחד מהפגישות האחרות שלך, והעניק לה גישה להודעות מוצפנות.</string>
-</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml
deleted file mode 100644
index af8863355c..0000000000
--- a/vector/src/main/res/values-id/strings.xml
+++ /dev/null
@@ -1,1085 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-    <string name="room_displayname_invite_from">Undang dari %s</string>
-    <string name="room_displayname_room_invite">Undangan Ruang</string>
-    <string name="room_displayname_two_members">%1$s dan %2$s</string>
-
-    <string name="room_displayname_empty_room">Ruang kosong</string>
-
-    <plurals name="room_displayname_three_and_more_members">
-        <item quantity="other">%1$s dan %2$d yang lain</item>
-    </plurals>
-    <string name="title_activity_home">Pesan</string>
-    <string name="title_activity_room">Ruang</string>
-    <string name="title_activity_settings">Pengaturan</string>
-    <string name="title_activity_member_details">Detail Anggota</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Batal</string>
-    <string name="save">Simpan</string>
-    <string name="leave">Tinggalkan</string>
-    <string name="send">Kirim</string>
-    <string name="quote">Kutip</string>
-    <string name="share">Bagikan</string>
-    <string name="delete">Hapus</string>
-    <string name="rename">Ubah Nama</string>
-    <string name="report_content">Laporkan konten</string>
-    <string name="device_information">Informasi Perangkat</string>
-    <string name="or">atau</string>
-    <string name="invite">Undang</string>
-    <string name="action_voice_call">Panggilan Suara</string>
-    <string name="action_video_call">Panggilan Video</string>
-    <string name="action_quick_reply">Balasan Cepat</string>
-    <string name="dialog_title_warning">Peringatan</string>
-
-    <string name="dialog_title_confirmation">Konfirmasi</string>
-    <string name="action_open">Buka</string>
-    <string name="action_close">Tutup</string>
-    <string name="disable">Nonaktifkan</string>
-
-    <string name="bottom_action_favourites">Favorit</string>
-    <string name="home_filter_placeholder_home">Cari ruang</string>
-    <string name="home_filter_placeholder_favorites">Cari favorit</string>
-    <string name="home_filter_placeholder_people">Cari orang</string>
-    <string name="home_filter_placeholder_rooms">Cari ruang</string>
-
-    <string name="user_directory_header">Direktori Pengguna</string>
-    <string name="no_result_placeholder">Tidak ada hasil</string>
-
-    <string name="no_public_room_placeholder">Ruang umum belum tersedia</string>
-    <string name="rooms_directory_header">Direktori ruang</string>
-    <string name="send_bug_report_include_logs">Kirim log</string>
-    <string name="send_bug_report_placeholder">Deskripsikan kendala Anda di sini</string>
-    <string name="send_bug_report_sent">Laporan bug telah berhasil dikirimkan</string>
-    <string name="read_receipt">Baca</string>
-
-    <string name="create_account">Daftar</string>
-    <string name="login">Masuk</string>
-    <string name="logout">Copot akun</string>
-    <string name="hs_url">URL Server Mula</string>
-    <string name="search">Cari</string>
-
-    <string name="start_new_chat">Mulai Obrolan Baru</string>
-    <string name="option_take_photo_video">Ambil foto atau video</string>
-
-    <string name="auth_submit">Kirim</string>
-    <string name="auth_password_placeholder">Password</string>
-    <string name="auth_new_password_placeholder">Password Baru</string>
-    <string name="auth_send_reset_email">Kirim Email Untuk Mengatur Ulang</string>
-    <string name="auth_skip">Lewati</string>
-    <string name="auth_user_id_placeholder">Email atau nama pengguna</string>
-    <string name="auth_return_to_login">Kembali ke halaman masuk</string>
-    <string name="auth_user_name_placeholder">Nama pengguna</string>
-    <string name="auth_email_placeholder">Alamat email</string>
-    <string name="auth_opt_email_placeholder">Alamat Email (pilihan)</string>
-    <string name="auth_phone_number_placeholder">Nomor Telpon</string>
-    <string name="auth_opt_phone_number_placeholder">Nomor Telpon (piihan)</string>
-    <string name="auth_repeat_password_placeholder">Ulangi password</string>
-    <string name="auth_repeat_new_password_placeholder">Konfirmasi password baru</string>
-    <string name="resend">Kirim Ulang</string>
-    <string name="forward">Teruskan</string>
-    <string name="view_source">Tampilkan Sumber</string>
-    <string name="permalink">Buat Tautan</string>
-    <string name="view_decrypted_source">Tampilkan Sumber Terdekripsi</string>
-    <string name="active_call">Panggilan aktif</string>
-    <string name="cannot_start_call">Tidak dapat memulai panggilan, coba lagi nanti</string>
-    <string name="missing_permissions_title_to_start_conf_call">Tidak dapat memulai panggilan</string>
-    <string name="action_sign_out">Keluar</string>
-    <string name="offline">Offline</string>
-
-    <string name="action_global_search">Pencarian global</string>
-    <string name="action_mark_all_as_read">Tandai semua sudah dibaca</string>
-    <string name="bottom_action_people">Orang</string>
-    <string name="bottom_action_rooms">Ruang</string>
-
-    <string name="invitations_header">Undangan</string>
-    <string name="direct_chats_header">Percakapan</string>
-    <string name="local_address_book_header">Buku alamat lokal</string>
-    <string name="low_priority_header">Prioritas rendah</string>
-
-    <string name="matrix_only_filter">Hanya kontak Matrix</string>
-    <string name="rooms_header">Ruang</string>
-    <string name="send_bug_report">Laporan bug</string>
-    <string name="send_bug_report_app_crashed">"Aplikasi gagal saat terakhir digunakan. Apakah Anda ingin membuka  halaman laporan kegagalan?"</string>
-
-    <string name="join_room">Gabung di Ruang</string>
-    <string name="identity_url">URL Server Identity</string>
-    <string name="start_voice_call">Mulai Panggilan Suara</string>
-    <string name="auth_login">Masuk</string>
-    <string name="auth_register">Buat Akun</string>
-    <string name="start_video_call">Mulai Panggilan Video</string>
-
-    <string name="option_send_files">Kirim file</string>
-    <string name="auth_invalid_password">Password terlalu pendek (min 6)</string>
-    <string name="auth_email_already_defined">Alamat email ini sudah terdefinisi.</string>
-    <string name="auth_forgot_password">Lupa password?</string>
-    <string name="auth_invalid_token">Token tidak berlaku</string>
-    <string name="auth_invalid_email">Sepertinya alamat email tidak benar</string>
-    <string name="auth_invalid_phone">Sepertinya nomor telepon tidak benar</string>
-    <string name="auth_password_dont_match">Kata sandi tidak cocok</string>
-    <string name="auth_recaptcha_message">Serve Home ingin memastikan bahwa Anda bukan robot</string>
-    <string name="auth_home_server">Server Home:</string>
-    <string name="auth_reset_password_next_step_button">Saya sudah verifikasi alamat email saya</string>
-    <string name="auth_reset_password_missing_password">Kata sandi baru perlu dimasukkan.</string>
-    <string name="login_error_must_start_http">URL diawali dengan http[s]://</string>
-    <string name="login_error_unable_login">Tidak bisa masuk</string>
-    <string name="login_error_unable_register">Tidak bisa registrasi</string>
-    <string name="login_error_invalid_home_server">Masukkan URL yang benar</string>
-
-    <string name="login_error_user_in_use">Nama pengguna sudah terpakai</string>
-    <string name="compression_opt_list_original">Asli</string>
-    <string name="compression_opt_list_large">Besar</string>
-    <string name="compression_opt_list_medium">Sedang</string>
-    <string name="compression_opt_list_small">Kecil</string>
-
-    <string name="yesterday">Kemarin</string>
-    <string name="attachment_cancel_download">Batalkan unduhan?</string>
-    <string name="attachment_cancel_upload">Batalkan unggahan?</string>
-    <string name="today">Hari ini</string>
-
-    <string name="room_info_room_name">Nama ruang</string>
-    <string name="call_connected">Panggilan terhubung</string>
-    <string name="call_connecting">Menyambungkan panggilan…</string>
-    <string name="call_ended">Panggilan diakhiri</string>
-
-    <string name="permissions_rationale_popup_title">Informasi</string>
-    <string name="media_slider_saved">Tersimpan</string>
-    <string name="media_slider_saved_message">Simpan di Downloads?</string>
-    <string name="yes">YA</string>
-    <string name="no">TIDAK</string>
-    <string name="_continue">Lanjut</string>
-
-    <string name="remove">Hapus</string>
-    <string name="join">Gabung</string>
-    <string name="preview">Pratinjau</string>
-    <string name="reject">Tolak</string>
-
-    <string name="later">Nanti</string>
-    <string name="send_anyway">Kirim Saja</string>
-    <string name="template_no_contact_access_placeholder">${app_name} belum diijinkan untuk mengakses kontak lokal</string>
-    <string name="send_bug_report_include_crash_logs">Kirim log gangguan</string>
-    <string name="huge">Raksasa</string>
-    <string name="small">Kecil</string>
-    <string name="normal">Normal</string>
-    <string name="large">Besar</string>
-    <string name="larger">Lebih Besar</string>
-    <string name="largest">Terbesar</string>
-    <string name="font_size">Ukuran font</string>
-    <string name="tiny">Sangat Kecil</string>
-    <string name="directory_server_placeholder">URL server Home</string>
-    <string name="select_room_directory">Pilih direktori ruang</string>
-    <string name="unknown_devices_alert_title">Terdapat perangkat tidak diketahui di ruang</string>
-    <string name="encryption_information_verify_key_match">Saya verifikasi bahwa kuncinya sesuai</string>
-
-    <string name="encryption_information_unknown_device">perangkat tidak diketahui</string>
-    <string name="encryption_information_verified">Terverifikasi</string>
-    <string name="title_activity_historical">Jejak Percakapan</string>
-
-    <string name="redact">Hapus</string>
-    <string name="ongoing_conference_call">Panggilan massal sedang berlangsung.\nBergabunglah lewat %1$s atau %2$s.</string>
-    <string name="ongoing_conference_call_voice">suara</string>
-    <string name="ongoing_conference_call_video">video</string>
-    <string name="missing_permissions_warning">Beberapa fitur tidak dapat digunakan karena aplikasi belum mendapat ijin…</string>
-    <string name="missing_permissions_to_start_conf_call">Anda membutuhkan ijin mengundang untuk memulai panggilan massal di ruang ini</string>
-    <string name="room_no_conference_call_in_encrypted_rooms">Panggilan massal tidak dapat diselenggarakan di ruang terenkripsi</string>
-    <string name="action_historical">Jejak Percakapan</string>
-    <string name="copied_to_clipboard">Gandakan ke clipboard</string>
-    <string name="bottom_action_home">Tampilan Awal</string>
-    <string name="no_conversation_placeholder">Belum ada percakapan</string>
-    <string name="no_room_placeholder">Belum ada ruang</string>
-    <plurals name="public_room_nb_users">
-        <item quantity="other">%d pengguna</item>
-    </plurals>
-
-    <string name="send_bug_report_include_screenshot">Kirim tampilan layar</string>
-    <string name="send_bug_report_description">Mohon uraikan bug tersebut. Apa yang Anda lakukan? Apa yang Anda harapkan terjadi? Apa yang sebenarnya terjadi?</string>
-    <string name="send_bug_report_logs_description">Log dari klien akan dikirim bersama laporan gangguan ini untuk mendalami kendala yang Anda temukan. Laporan gangguan ini, termasuk log dan rekalayar, tidak akan dilihat oleh khalayak umum. Jika Anda hanya ingin mengirimkan tulisan di atas, silahkan hapus centang:</string>
-    <string name="send_bug_report_alert_message">Sepertinya Anda mengguncang telepon akibat frustrasi. Apakah Anda ingin membuka halaman laporan bug?</string>
-    <string name="send_bug_report_failed">Pengiriman laporan bug gagal (%s)</string>
-    <string name="send_bug_report_progress">Kemajuan (%s%%)</string>
-
-    <string name="send_files_in">Kirim ke</string>
-    <string name="username">Nama Pengguna</string>
-    <string name="auth_invalid_login_param">Nama pengguna dan/atau kata sandi salah</string>
-    <string name="auth_invalid_user_name">Nama pengguna hanya boleh memuat huruf, angka, titik, tanda hubung ( - ), dan garis bawah ( _ )</string>
-    <string name="auth_missing_password">Password belum dimasukkan</string>
-    <string name="auth_missing_email">Alamat email belum dimasukkan</string>
-    <string name="auth_missing_phone">Nomor telpon belum dimasukkan</string>
-    <string name="auth_missing_email_or_phone">Alamat email atau nomor telpon belum dimasukkan</string>
-    <string name="auth_use_server_options">Gunakan server lain (lanjutan)</string>
-    <string name="auth_email_validation_message">Silahkan periksa email Anda untuk melanjutkan pendaftaran</string>
-    <string name="auth_threepid_warning_message">Pendaftaran dengan email sekaligus nomor telpon belum didukung sampai API dihadirkan. Hanya nomor telpon yang akan digunakan.
-
-Anda dapat menambah email di profile Anda dalam pengaturan nantinya.</string>
-    <string name="auth_username_in_use">Nama pengguna yang terpakai</string>
-    <string name="auth_reset_password_message">Untuk menyetel ulang kata sandi Anda, silahkan masukkan alamat email yang tertaut ke akun Anda:</string>
-    <string name="auth_reset_password_missing_email">Anda perlu memasukkan alamat email yang tertaut pada akun.</string>
-    <string name="auth_reset_password_email_validation_message">"Selembar email telah dikirim ke %s. Setelah Anda mengikuti tautan yang termuat di dalamnya, klik  yang di bawah."</string>
-    <string name="auth_reset_password_error_unauthorized">Verifikasi alamat email gagal: pastikan tautan yang termuat di email telah diklik</string>
-    <string name="auth_reset_password_success_message">Kata sandi Anda telah disetel ulang.
-
-Anda telah dikeluarkan dari semua perangkat dan tidak lagi menerima pemberitahuan dorongan. Untuk menerima kembali pemberitahuan, masuk kembali dengan tiap perangkat.</string>
-
-    <string name="login_error_network_error">Tidak dapat masuk: Gangguan jaringan</string>
-    <string name="login_error_registration_network_error">Tidak dapat mendaftar: Gangguan jaringan</string>
-    <string name="login_error_unable_register_mail_ownership">Tidak dapat mendaftar : gagal memastikan kepemilikan alamat email</string>
-    <string name="login_error_forbidden">Nama pengguna/kata sandi tidak tepat</string>
-    <string name="login_error_unknown_token">Rincian token akses tidak dikenal</string>
-    <string name="login_error_bad_json">JSON amburadul</string>
-    <string name="login_error_not_json">Tidak berisi JSON yang sah</string>
-    <string name="login_error_limit_exceeded">Pengajuan yang dikirimkan terlalu banyak</string>
-    <string name="login_error_login_email_not_yet">Tautan email masih belum diklik</string>
-
-    <string name="read_receipts_list">Baca Daftar Penerimaan</string>
-
-    <string name="compression_options">"Kirim sebagai "</string>
-    <string name="attachment_remaining_time_seconds">%d d</string>
-    <string name="attachment_remaining_time_minutes">%1$dm %2$dd</string>
-
-    <string name="room_info_room_topic">Topik ruang</string>
-
-    <string name="call_ring">Memanggil…</string>
-    <string name="incoming_call">Panggilan Masuk</string>
-    <string name="incoming_video_call">Panggilan Video Masuk</string>
-    <string name="incoming_voice_call">Panggilan Suara Masuk</string>
-    <string name="call_in_progress">Panggilan Sedang Berlangsung…</string>
-
-    <string name="call_error_ice_failed">Hubungan Media Gagal</string>
-    <string name="auth_identity_server">Server Identitas:</string>
-    <string name="call_error_camera_init_failed">Tidak dapat memulai kamera</string>
-    <string name="call_error_answered_elsewhere">panggilan terjawab di tempat lain</string>
-    <string name="media_picker_both_capture_title">Ambil gambar atau video</string>
-    <string name="media_picker_cannot_record_video">Tidak bisa merekam video</string>
-
-    <string name="template_permissions_rationale_msg_storage">${app_name} membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
-
-Harap berikan akses pada halaman berikut agar berkas dapat dikirim dari ponsel Anda.</string>
-    <string name="template_permissions_rationale_msg_camera">${app_name} membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
-    <string name="permissions_rationale_msg_camera_explanation">
-
-Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="template_permissions_rationale_msg_record_audio">${app_name} membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
-    <string name="permissions_rationale_msg_record_audio_explanation">
-
-Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
-
-Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
-    <string name="light_theme">Tema Terang</string>
-    <string name="dark_theme">Tema Kelam</string>
-    <string name="black_theme">Tema Gelap</string>
-
-    <string name="notification_sync_in_progress">Sedang Sinkronisasi</string>
-    <string name="notification_noisy_notifications">Pemberitahuan Berisik</string>
-    <string name="notification_silent_notifications">Pemberitahuan Tenteram</string>
-
-    <string name="title_activity_bug_report">Laporan Gangguan</string>
-    <string name="title_activity_group_details">Detail Komunitas</string>
-    <string name="title_activity_choose_sticker">Kirimkan Sticker</string>
-
-    <string name="dialog_title_third_party_licences">Lisensi Pihak Ketiga</string>
-
-    <string name="loading">Memuat…</string>
-
-    <string name="download">Unduh</string>
-    <string name="speak">Bicaralah</string>
-    <string name="clear">Bersihkan</string>
-    <string name="missing_permissions_error">Ini tidak dapat dilakukan karena belum mendapat permisi.</string>
-    <string name="action_exit">Keluar</string>
-    <string name="actions">Tindakan</string>
-    <string name="bottom_action_groups">Komunitas</string>
-
-    <string name="home_filter_placeholder_groups">Mencari komunitas</string>
-
-    <string name="system_alerts_header">Peringatan Sistem</string>
-
-    <string name="groups_invite_header">Undang</string>
-    <string name="groups_header">Komunitas</string>
-    <string name="no_group_placeholder">Tidak ada grup</string>
-
-    <string name="send_bug_report_description_in_english">Mohon deskripsikan dengan bahasa Inggris apabila memungkinkan.</string>
-    <string name="send_bug_report_rage_shake">Guncang perangkat untuk laporan gangguan</string>
-
-    <string name="option_send_voice">Kirim Pesan Suara</string>
-
-    <string name="start_new_chat_prompt_msg">Apa benar Anda ingin memulai percakapan baru dengan %s?</string>
-    <string name="start_voice_call_prompt_msg">Apa benar Anda ingin memulai panggilan suara?</string>
-    <string name="start_video_call_prompt_msg">Apa benar Anda ingin memulai panggilan video?</string>
-
-    <string name="option_send_sticker">Kirim Sticker</string>
-    <string name="option_take_photo">Ambil foto</string>
-    <string name="option_take_video">Ambil video</string>
-
-    <string name="no_sticker_application_dialog_content">Saat ini Anda belum memiliki pak stiker.
-\n
-\nMau tambah sekarang\?</string>
-
-    <string name="go_on_with">lanjutkan dengan…</string>
-    <string name="error_no_external_application_found">Maaf, tidak ada aplikasi eksternal yang mendukung apa yang ingin dilakukan.</string>
-
-    <string name="e2e_re_request_encryption_key"><u>Meminta ulang kunci enkripsi</u> dari perangkat Anda yang lain.</string>
-
-    <string name="e2e_re_request_encryption_key_sent">Permintaan kunci terkirim.</string>
-
-    <string name="e2e_re_request_encryption_key_dialog_title">Permintaan terkirim</string>
-    <string name="template_e2e_re_request_encryption_key_dialog_content">Jalankan ${app_name} di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
-
-    <string name="groups_list">Daftar Grup</string>
-
-    <plurals name="membership_changes">
-        <item quantity="other">%d perubahan keanggotaan</item>
-    </plurals>
-
-    <string name="call">Panggilan</string>
-    <string name="template_permissions_rationale_msg_contacts">${app_name} memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
-
-Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna ${app_name} yang terdapat di daftar kontak Anda.</string>
-    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
-
-Bolehkah ${app_name} mengakses daftar kontak Anda?</string>
-
-    <string name="permissions_action_not_performed_missing_permissions">"Maaf.  Tidak dapat dilakukan karena belum menerima permisi"</string>
-
-    <string name="list_members">Daftar Anggota</string>
-    <string name="open_chat_header">Buka kop</string>
-    <string name="room_sync_in_progress">Menyinkronkan…</string>
-    <string name="room_jump_to_first_unread">Arahkan ke pesan pertama yang belum terbaca.</string>
-
-    <string name="room_preview_invitation_format">Anda telah diundang untuk bergabung ke ruang ini oleh %s</string>
-    <string name="room_preview_unlinked_email_warning">Undangan ini dikirim oleh %s, yang tidak terhubung dengan akun ini.
-Anda mungkin ingin masuk dengan akun lain, atau tambahkan email ini ke akun Anda.</string>
-    <string name="room_preview_try_join_an_unknown_room">Anda sedang berupaya untuk mengakses %s. Maukah Anda bergabung untuk berpartisipasi dalam diskusi ini?</string>
-    <string name="room_preview_room_interactions_disabled">Ini adalah pratinjau untuk ruang ini. Interaksi dengan ruang belum dapat dilakukan.</string>
-
-    <string name="room_creation_title">Percakapan Baru</string>
-    <string name="room_creation_add_member">Tambah anggota</string>
-    <plurals name="room_header_active_members_count">
-        <item quantity="other">%d anggota aktif</item>
-    </plurals>
-    <plurals name="room_title_members">
-        <item quantity="other">%d anggota</item>
-    </plurals>
-    <string name="room_title_one_member">1 anggota</string>
-
-    <plurals name="format_time_s">
-        <item quantity="other">%dd</item>
-    </plurals>
-    <plurals name="format_time_m">
-        <item quantity="other">%dm</item>
-    </plurals>
-    <plurals name="format_time_h">
-        <item quantity="other">%dj</item>
-    </plurals>
-    <plurals name="format_time_d">
-        <item quantity="other">$dh</item>
-    </plurals>
-
-    <string name="room_participants_leave_prompt_title">Tinggalkan ruang</string>
-    <string name="room_participants_leave_prompt_msg">Apa benar Anda ingin meninggalkan ruang ini?</string>
-    <string name="room_participants_remove_prompt_msg">Apa benar Anda ingin mengeluarkan %s dari percakapan ini?</string>
-    <string name="room_participants_create">Buat</string>
-
-    <string name="room_participants_online">Online</string>
-    <string name="room_participants_offline">Offline</string>
-    <string name="room_participants_idle">Berdiam Diri</string>
-    <string name="room_participants_now">%1$s sekarang</string>
-    <string name="room_participants_ago">%1$s %2$s yang lalu</string>
-
-    <string name="room_participants_header_admin_tools">PERALATAN ADMIN</string>
-    <string name="room_participants_header_call">PANGGIL</string>
-    <string name="room_participants_header_direct_chats">PERCAKAPAN LANGSUNG</string>
-    <string name="room_participants_header_devices">PERANGKAT</string>
-
-    <string name="room_participants_action_invite">Undang</string>
-    <string name="room_participants_action_leave">Tinggalkan ruang ini</string>
-    <string name="room_participants_action_remove">Keluarkan dari ruang ini</string>
-    <string name="room_participants_action_ban">Larang</string>
-    <string name="room_participants_action_unban">Hapus Larangan</string>
-    <string name="room_participants_action_set_default_power_level">Setel ulang ke user biasa</string>
-    <string name="room_participants_action_set_moderator">Jadikan moderator</string>
-    <string name="room_participants_action_set_admin">Jadikan admin</string>
-    <string name="room_participants_action_ignore">Sembunyikan semua pesan dari pengguna ini</string>
-    <string name="room_participants_action_unignore">Tunjukkan semua pesan dari pengguna ini</string>
-    <string name="room_participants_invite_search_another_user">ID Pengguna, Nama atau email</string>
-    <string name="room_participants_action_mention">Sebut</string>
-    <string name="room_participants_action_devices_list">Tunjukkan Daftar Perangkat</string>
-    <string name="room_participants_power_level_prompt">Anda tidak akan dapat membalik perubahan ini karena Anda mengangkat pengguna ini agar memiliki kuasa yang setara dengan Anda.
-Yakin?</string>
-
-    <string name="room_participants_ban_prompt_msg">Apa benar Anda ingin melarang pengguna ini dari percakapan ini?</string>
-
-    <string name="room_participants_invite_prompt_msg">Apa benar Anda ingin mengundang %s ke percakapan ini?</string>
-    <string name="room_participants_invite_join_names_and">%1$s dan %2$s</string>
-    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
-    <string name="call_error_user_not_responding">Gagal terjawab oleh pihak lain.</string>
-    <string name="room_preview_try_join_an_unknown_room_default">ruang</string>
-    <string name="room_participants_invite_join_names">"%1$s, "</string>
-    <string name="people_search_invite_by_id"><u>Undang dengan ID</u></string>
-    <string name="people_search_local_contacts">KONTAK LOKAL (%d)</string>
-    <string name="people_search_user_directory">DIREKTORI PENGGUNA (%s)</string>
-    <string name="people_search_filter_text">Pengguna Matrix saja</string>
-
-    <string name="people_search_invite_by_id_dialog_title">Undang pengguna dengan ID</string>
-    <string name="people_search_invite_by_id_dialog_description">Masukkan satu atau lebih alamat email atau ID Matrix</string>
-    <string name="people_search_invite_by_id_dialog_hint">Email atau ID Matrix</string>
-
-    <string name="room_menu_search">Cari</string>
-    <string name="room_one_user_is_typing">%s sedang mengetik…</string>
-    <string name="room_two_users_are_typing">%1$s &amp; %2$s sedang mengetik…</string>
-    <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; lainnya sedang mengetik…</string>
-    <string name="room_message_placeholder_encrypted">Kirim pesan terenkripsi…</string>
-    <string name="room_message_placeholder_not_encrypted">Kirim pesan (tidak terenkripsi)…</string>
-    <string name="room_message_placeholder_reply_to_encrypted">Kirim balasan terenkripsi…</string>
-    <string name="room_message_placeholder_reply_to_not_encrypted">Kirim balasan (tidak terenkripsi)…</string>
-    <string name="room_offline_notification">Sambungan dengan server terputus.</string>
-    <string name="room_unsent_messages_notification">Pesan tidak terkirim. %1$s or %2$s sekarang?</string>
-    <string name="room_unknown_devices_messages_notification">Pesan tidak terkirim akibat kehadiran perangkat tidak dikenal. %1$s or %2$s sekarang?</string>
-    <string name="room_prompt_resend">Kirim ulang semua</string>
-    <string name="room_prompt_cancel">Batalkan semua</string>
-    <string name="room_resend_unsent_messages">Kirim ulang pesan yang belum terkirim</string>
-    <string name="room_delete_unsent_messages">Hapus pesan yang belum terkirim</string>
-    <string name="room_message_file_not_found">Berkas tidak ditemukan</string>
-    <string name="room_do_not_have_permission_to_post">Anda belum mendapat permisi untuk mengirim di ruang ini</string>
-    <plurals name="room_new_messages_notification">
-        <item quantity="other">%d pesan baru</item>
-    </plurals>
-
-    <string name="ssl_trust">Percaya</string>
-    <string name="ssl_do_not_trust">Tidak percaya</string>
-    <string name="ssl_logout_account">Keluar</string>
-    <string name="ssl_remain_offline">Abaikan</string>
-    <string name="ssl_fingerprint_hash">Sidik jari (%s):</string>
-    <string name="ssl_could_not_verify">Tidak dapat memastikan identitas remote server.</string>
-    <string name="ssl_cert_not_trust">Ini bisa terjadi ketika seseorang sedang mensabotase arus data Anda, atau perangkat Anda tidak percaya terhadap sertifikat remote server.</string>
-    <string name="ssl_cert_new_account_expl">Apabila administrator server telah menyatakan ini memang akan terjadi, pastikan sidik jari berikut cocok dengan sidik jari yang mereka sediakan.</string>
-    <string name="ssl_unexpected_existing_expl">Sertifikat ini tidak lagi sesuai dengan yang dipercayai oleh perangkat Anda sebelumnya. Ini SANGAT JANGGAL. Kami rekomendasikan Anda untuk TIDAK MENERIMA sertifikat baru ini.</string>
-    <string name="ssl_expected_existing_expl">Terdapat perubahan sertifikat yang tidak lagi dipercayai perangkat. Server mungkin telah memperbaharui sertifikatnya. Hubungi administrator server untuk pencocokan sidik jari.</string>
-    <string name="ssl_only_accept">Hanya terima sertifikat ini apabila administrator server telah menerbitkan sidik jari yang cocok dengan yang tertera di atas.</string>
-
-    <string name="room_details_title">Detail Ruang</string>
-    <string name="room_details_people">Orang</string>
-    <string name="room_details_files">Berkas</string>
-    <string name="room_details_settings">Pengaturan</string>
-    <plurals name="room_details_selected">
-        <item quantity="other">%d terpilih</item>
-    </plurals>
-    <string name="malformed_id">ID tidak sesuai. Seharusnya alamat email atau ID Matrix semisal \'@localport:domain\'</string>
-    <string name="room_details_people_invited_group_name">DIUNDANG</string>
-    <string name="room_details_people_present_group_name">BERGABUNG</string>
-
-    <string name="room_event_action_report_prompt_reason">Alasan laporan konten ini</string>
-    <string name="room_event_action_report_prompt_ignore_user">Apa benar Anda ingin menyembunyikan semua pesan dari pengguna ini?
-
-Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</string>
-    <string name="room_event_action_cancel_upload">Batalkan Unggahan</string>
-    <string name="room_event_action_cancel_download">Batalkan Unduhan</string>
-
-    <string name="search_hint">Cari</string>
-    <string name="search_members_hint">Saring anggota ruang</string>
-    <string name="search_no_results">Tiada hasil</string>
-    <string name="tab_title_search_rooms">RUANG</string>
-    <string name="tab_title_search_messages">PESAN</string>
-    <string name="tab_title_search_people">ORANG</string>
-    <string name="tab_title_search_files">BERKAS</string>
-
-    <string name="room_recents_join">GABUNG</string>
-    <string name="room_recents_directory">DIREKTORI</string>
-    <string name="room_recents_favourites">FAVORIT</string>
-    <string name="room_recents_conversations">RUANG</string>
-    <string name="room_recents_low_priority">PRIORITAS RENDAH</string>
-    <string name="room_recents_invites">UNDANGAN</string>
-    <string name="room_recents_start_chat">Mulai percakapan</string>
-    <string name="room_recents_create_room">Buat ruang</string>
-    <string name="room_recents_join_room">Gabung ke ruang</string>
-    <string name="room_recents_join_room_title">Gabung ke ruang</string>
-    <string name="room_recents_join_room_prompt">Ketik id atau alias ruang</string>
-
-    <string name="directory_search_results_title">Jelajahi direktori</string>
-    <plurals name="directory_search_rooms">
-        <item quantity="other">%d ruang</item>
-    </plurals>
-    <plurals name="directory_search_rooms_for">
-        <item quantity="other">%1$s ruang ditemukan untuk %2$s</item>
-    </plurals>
-    <string name="directory_searching_title">Mencari direktori…</string>
-
-    <string name="room_settings_all_messages_noisy">Semua pesan (berisik)</string>
-    <string name="room_settings_all_messages">Semua pesan</string>
-    <string name="room_settings_mention_only">Hanya sebutan</string>
-    <string name="room_settings_mute">Diamkan</string>
-    <string name="room_settings_favourite">Favorit</string>
-    <string name="room_settings_de_prioritize">Menurunkan prioritas</string>
-    <string name="room_settings_direct_chat">Percakapan Langsung</string>
-    <string name="room_settings_leave_conversation">Tinggalkan Percakapan</string>
-    <string name="room_settings_forget">Lupakan</string>
-    <string name="room_settings_add_homescreen_shortcut">Tambahkan Shortcut pada Homescreen</string>
-
-    <string name="room_sliding_menu_messages">Pesan</string>
-    <string name="room_sliding_menu_settings">Pengaturan</string>
-    <string name="room_sliding_menu_version">Versi</string>
-    <string name="room_sliding_menu_term_and_conditions">Syarat &amp; ketentuan</string>
-    <string name="room_sliding_menu_third_party_notices">Pemberitahuan pihak ketiga</string>
-    <string name="room_sliding_menu_copyright">Hak Cipta</string>
-    <string name="room_sliding_menu_privacy_policy">Kebijakan Pribadi</string>
-
-    <string name="settings_profile_picture">Gambar Profil</string>
-    <string name="settings_display_name">Nama Layar</string>
-    <string name="settings_email_address">Email</string>
-    <string name="settings_add_email_address">Tambahkan alamat email</string>
-    <string name="settings_phone_number">Telepon</string>
-    <string name="settings_add_phone_number">Tambahkan nomor telepon</string>
-    <string name="settings_app_info_link_summary">Tampilkan info aplikasi dalam pengaturan sistem.</string>
-    <string name="settings_app_info_link_title">Info aplikasi</string>
-
-    <string name="settings_notification_privacy">Kerahasiaan pemberitahuan</string>
-    <string name="settings_notification_privacy_normal">Normal</string>
-    <string name="settings_notification_privacy_reduced">Kerahasiaan diperlemah</string>
-    <string name="settings_notification_privacy_need_permission">Aplikasi ini membutuhkan permisi untuk beroperasi di balik layar</string>
-    <string name="settings_notification_privacy_fcm">• Pemberitahuan dikirim melalui Google Cloud Messaging</string>
-    <string name="settings_notification_privacy_metadata">• Pemberitahuan hanya memuat meta data</string>
-    <string name="settings_notification_privacy_secure_message_content">• Isi pesan pemberitahuan <b> tersimpan langsung dengan aman di homeserver Matrix</b></string>
-    <string name="settings_notification_privacy_nosecure_message_content">• Pemberitahuan memuat <b>meta data dan data pesan</b></string>
-    <string name="settings_notification_privacy_message_content_not_shown">• Pemberitahuan <b>tidak akan menunjukkan isi pesan</b></string>
-
-    <string name="settings_notification_ringtone">Suara pemberitahuan</string>
-    <string name="settings_enable_all_notif">Perbolehkan pemberitahuan untuk akun ini</string>
-    <string name="settings_enable_this_device">Perbolehkan pemberitahuan untuk perangkat ini</string>
-    <string name="settings_turn_screen_on">Nyalakan layar selama 3 detik</string>
-
-    <string name="settings_containing_my_display_name">Pesan yang berisikan nama layarku</string>
-    <string name="settings_containing_my_user_name">Pesan berisikan nama layarku</string>
-    <string name="settings_messages_in_one_to_one">Pesan percakapan empat mata</string>
-    <string name="settings_messages_in_group_chat">Pesan percakapan grup</string>
-    <string name="settings_invited_to_room">Kapan saya diundang ke suatu ruang</string>
-    <string name="settings_call_invitations">Undangan panggilan</string>
-    <string name="settings_messages_sent_by_bot">Pesan yang dikirim bot</string>
-
-    <string name="settings_start_on_boot">Mulai sedari boot</string>
-    <string name="settings_background_sync">Sinkronisasi di balik layar</string>
-    <string name="settings_enable_background_sync">Perbolehkan sinkronisasi di balik layar</string>
-    <string name="settings_set_sync_timeout">Batas waktu permohonan sinkronisasi</string>
-    <string name="settings_set_sync_delay">Masa tunda sebelum permohonan berikutnya</string>
-
-    <string name="settings_version">Versi</string>
-    <string name="settings_olm_version">versi olm</string>
-    <string name="settings_app_term_conditions">Syarat &amp; ketentuan</string>
-    <plurals name="notification_unread_notified_messages_in_room_rooms">
-        <item quantity="other">%d ruang</item>
-    </plurals>
-    <string name="notification_unread_notified_messages_in_room">%1$s dalam %2$s</string>
-
-    <string name="historical_placeholder">Cari sejarah</string>
-
-    <string name="widget_no_power_to_manage">Anda butuh permisi untuk mengurus widget di ruang ini</string>
-    <string name="widget_creation_failure">Pembuatan widget gagal</string>
-    <string name="settings_labs_create_conference_with_jitsi">Buat panggilan konferensi dengan jitsi</string>
-    <string name="widget_delete_message_confirmation">Apa Anda yakin ingin menghapus widget tersebut dari ruang ini?</string>
-    <plurals name="active_widgets">
-        <item quantity="other">%d widget aktif</item>
-    </plurals>
-
-    <string name="widget_integration_unable_to_create">Tidak dapat membuat widget.</string>
-    <string name="widget_integration_failed_to_send_request">Gagal mengirim permohonan.</string>
-    <string name="widget_integration_positive_power_level">Tingkat energi harus bilangan positif.</string>
-    <string name="widget_integration_must_be_in_room">Anda tidak tergabung dengan ruang ini.</string>
-    <string name="widget_integration_no_permission_in_room">Anda tidak memiliki permisi untuk melakukan itu di ruang ini.</string>
-    <string name="widget_integration_missing_room_id">Tidak ada room_id dalam permohonan.</string>
-    <string name="widget_integration_missing_user_id">Tidak ada user_id dalam permohonan.</string>
-    <string name="widget_integration_room_not_visible">Ruang %s tidak terlihat.</string>
-    <string name="widget_integration_missing_parameter">Ada parameter penting yang hilang.</string>
-    <string name="widget_integration_invalid_parameter">Ada parameter yang tidak valid.</string>
-    <string name="room_add_matrix_apps">Tambahkan apps Matrix</string>
-    <string name="settings_labs_native_camera">Gunakan kamera bawaan</string>
-    <string name="settings_labs_keyboard_options_to_send_message">Gunakan tombol enter keyboard untuk mengirim pesan</string>
-    <string name="settings_labs_enable_send_voice">Kirim pesan suara</string>
-
-    <string name="you_added_a_new_device">Anda menambahkan perangkat baru \'%s\', yang sedang meminta kunci enkripsi.</string>
-    <string name="your_unverified_device_requesting">Perangkat Anda yang belum terverifikasi \'%s\' sedang meminta kunci enkripsi.</string>
-    <string name="start_verification">Mulai verifikasi</string>
-    <string name="share_without_verifying">Bagikan tanpa verifikasi</string>
-    <string name="ignore_request">Abaikan verifikasi</string>
-
-    <string name="conference_call_warning_title">Peringatan!</string>
-    <string name="conference_call_warning_message">Panggilan konferensi masih sedang pengembangan dan mungkin belum dapat diandalkan.</string>
-
-    <string name="command_error">Kesalahan perintah</string>
-    <string name="unrecognized_command">Perintah tak dikenal: %s</string>
-    <string name="command_description_emote">Tunjukkan tindakan</string>
-    <string name="command_description_ban_user">Larang user dengan id berikut</string>
-    <string name="command_description_unban_user">Cabut larangan pengguna dengan id berikut</string>
-    <string name="command_description_op_user">Tentukan tingkat kuasa seorang pengguna</string>
-    <string name="command_description_invite_user">Undang pengguna dengan id berikut bergabung ke ruang ini</string>
-    <string name="command_description_join_room">Gabung ke ruang dengan alias berikut</string>
-    <string name="command_description_part_room">Tinggalkan ruang</string>
-    <string name="command_description_topic">Tentukan topik ruang</string>
-    <string name="command_description_kick_user">Keluarkan pengguna dengan id berikut</string>
-    <string name="command_description_nick">Ubah nama panggilan layar Anda</string>
-    <string name="command_description_markdown">Mati/Nyalakan markdown</string>
-    <string name="command_description_clear_scalar_token">Untuk memperbaiki kepengurusan Apps Matrix</string>
-
-    <string name="notification_off">Mati</string>
-    <string name="notification_noisy">Berisik</string>
-
-    <string name="encrypted_message">Pesan terenkripsi</string>
-
-    <string name="create">Buat</string>
-    <string name="create_community">Buat Komunitas</string>
-    <string name="community_name">Nama komunitas</string>
-    <string name="community_name_hint">Contoh</string>
-    <string name="community_id">Id Komunitas</string>
-    <string name="community_id_hint">contoh</string>
-
-    <string name="group_details_home">Pangkal</string>
-    <string name="group_details_people">Orang</string>
-    <string name="group_details_rooms">Ruang</string>
-    <string name="no_users_placeholder">Tidak ada pengguna</string>
-
-    <string name="rooms">Ruang</string>
-    <string name="joined">Telah bergabung</string>
-    <string name="invited">Telah Diundang</string>
-    <string name="filter_group_members">Saring anggota grup</string>
-    <string name="filter_group_rooms">Saring ruang grup</string>
-
-    <plurals name="group_members">
-        <item quantity="other">%d anggota</item>
-    </plurals>
-
-    <plurals name="group_rooms">
-        <item quantity="other">%d ruang</item>
-    </plurals>
-    <string name="group_no_long_description">Admin komunitas belum menyediakan deskripsi panjang untuk komunitas ini.</string>
-
-    <string name="has_been_kicked">Anda telah dikeluarkan dari %1$s oleh %2$s</string>
-    <string name="has_been_banned">Anda telah dilarang dari %1$s oleh %2$s</string>
-    <string name="reason_colon">Alasan: %1$s</string>
-    <string name="rejoin">Gabung lagi</string>
-    <string name="forget_room">Lupakan ruang</string>
-
-    <string name="dialog_user_consent_content">Untuk terus menggunakan homeserver %1$s Anda harus membaca dan menyetujui syarat dan ketentuan.</string>
-    <string name="avatar">Avatar</string>
-
-    <string name="dialog_user_consent_submit">Baca sekarang</string>
-
-    <string name="deactivate_account_title">Deaktivasi Akun</string>
-    <string name="deactivate_account_content">Ini akan mengakibatkan akun Anda tidak dapat digunakan secara permanen. Anda tidak akan dapat masuk dan orang lain tidak dapat mendaftar ulang dengan ID pengguna yang sama. Ini akan mengakibatkan akun Anda keluar dari semua ruang di mana Anda berpartisipasi dan menghapus semua detail akun dari identity server Anda. <b> Tindakan ini tidak dapat dibalikkan</b>.
-
-Mendeaktivasi akun Anda <b> tidak semerta membuat kami melupakan pesan-pesan yang Anda kirim</b>. Jika Anda ingin kami melupakan pesan-pesan Anda, mohon centang kotak berikut.
-
-Pembacaan pesan di Matrix serupa dengan email. Dengan kami melupakan pesan-pesan Anda berarti pesan-pesan yang Anda kirim tidak akan dibagikan kepada pengguna baru atau yang belum terdaftar, tapi pengguna yang terdaftar dan telah dapat mengakses pesan-pesan tersebut masih bisa membaca rangkap yang mereka simpan.</string>
-    <string name="deactivate_account_delete_checkbox">Mohon lupakan semua pesan yang telah kukirim ketika akunku dideaktivasi (Peringatan: ini akan mengakibatkan pengguna mendatang membaca percakapan yang tidak lengkap)</string>
-    <string name="deactivate_account_prompt_password">Untuk melanjutkan, masukkan kata sandi Anda:</string>
-    <string name="deactivate_account_submit">Deaktivasi Akun</string>
-
-    <string name="error_empty_field_your_password">Mohon masukkan kata sandi Anda.</string>
-    <string name="room_tombstone_versioned_description">Ruang ini telah berubah dan tidak lagi aktif</string>
-    <string name="room_tombstone_continuation_link">Percakapan berlanjut di sini</string>
-    <string name="room_tombstone_continuation_description">Ruang ini adalah kelanjutan percakapan lain</string>
-    <string name="room_tombstone_predecessor_link">Klik di sini untuk melihat pesan lama</string>
-
-    <string name="resource_limit_exceeded_title">Melampaui Batasan Sumber Daya</string>
-    <string name="resource_limit_contact_action">Kontak Administrator</string>
-
-    <string name="resource_limit_contact_admin">kontak administrator layanan Anda</string>
-
-    <string name="resource_limit_soft_default">Homeserver ini telah melampaui salah satu batas sumber dayanya sehingga <b>beberapa pengguna tidak dapat masuk</b>.</string>
-    <string name="resource_limit_hard_default">Homeserver ini telah melampaui salah satu batasan sumber dayanya.</string>
-
-    <string name="resource_limit_soft_mau"> Homeserver ini telah mencapai batas Pengguna Aktif Bulanan sehingga <b>beberapa pengguna tidak dapat masuk</b>.</string>
-    <string name="resource_limit_hard_mau">Homeserver ini telah mencapai batas Pengguna Aktif Bulanan.</string>
-
-    <string name="resource_limit_soft_contact">Mohon %s untuk meningkatkan batasan ini.</string>
-    <string name="resource_limit_hard_contact">Mohon %s untuk terus menggunakan layanan ini.</string>
-
-    <string name="encryption_import_e2e_room_keys">Impor kunci ruang terenkripsi</string>
-    <string name="encryption_import_room_keys">Impor kunci ruang</string>
-    <string name="encryption_import_room_keys_summary">Impor kunci dari berkas lokal</string>
-    <string name="encryption_import_import">Impor</string>
-    <string name="encryption_never_send_to_unverified_devices_title">Hanya enkripsi ke perangkat terverifikasi</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Jangan kirim pesan terenkripsi ke perangkat yang tidak terverifikasi dari perangkat ini.</string>
-
-    <string name="encryption_information_not_verified">TIDAK terverifikasi</string>
-    <string name="encryption_information_blocked">Ter-blacklist</string>
-
-    <string name="encryption_information_none">tidak ada</string>
-
-    <string name="encryption_information_verify">Verifikasi</string>
-    <string name="encryption_information_unverify">Batalkan verifikasi</string>
-    <string name="encryption_information_block">Blacklist</string>
-    <string name="encryption_information_unblock">Batalkan blacklist</string>
-
-    <string name="encryption_information_verify_device">Verifikasi perangkat</string>
-    <string name="encryption_information_verify_device_warning">Untuk memastikan perangkat dapat dipercaya, mohon kontak pengguna dengan medium lain (misalnya tatap muka atau panggilan telepon) dan tanya apakah kunci yang mereka lihat di Pengaturan Pengguna untuk perangkat ini cocok dengan kunci berikut:</string>
-    <string name="encryption_information_verify_device_warning2">Apabila cocok, tekan tombol verifikasi berikut.
-Apabila tidak, seseorang sedang menyadap perangkat ini dan mungkin perlu diblokir.
-Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
-
-    <string name="unknown_devices_alert_message">Ruang ini terisi oleh perangkat tak dikenal yang belum diverifikasi.
-Ini berarti tidak ada jaminan pengguna perangkat tersebut sesuai dengan klaim mereka.
-Kami sarankan Anda untuk memverifikasi untuk setiap perangkat terlebih dahulu sebelum melanjutkan, tapi Anda boleh mengirim ulang pesan tanpa verifikasi jika Anda mau.
-
-Perangkat tak dikenal:</string>
-
-    <string name="directory_server_fail_to_retrieve_server">Server mungkin belum siap atau kelebihan beban</string>
-    <string name="directory_server_type_homeserver">Ketik homeserver yang ingin Anda lihat daftar ruang publiknya</string>
-    <string name="directory_server_all_rooms_on_server">Semua ruang dalam server %s</string>
-    <string name="directory_server_native_rooms">Semua ruang bawaan %s</string>
-
-    <string name="lock_screen_hint">Ketik di sini…</string>
-
-    <plurals name="notification_unread_notified_messages">
-        <item quantity="other">%d pesan pemberitahuan yang belum terbaca</item>
-    </plurals>
-    <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="other">%d pesan pemberitahuan yang belum terbaca</item>
-    </plurals>
-    <string name="room_settings_tag_pref_entry_low_priority">Prioritas rendah</string>
-    <string name="room_settings_tag_pref_entry_none">Tidak Ada</string>
-
-    <string name="room_settings_category_access_visibility_title">Akses dan visibilitas</string>
-    <string name="room_settings_directory_visibility">Daftarkan ruang ini di direktori ruang</string>
-    <string name="room_settings_room_notifications_title">Pemberitahuan</string>
-    <string name="room_settings_room_access_rules_pref_title">Akses Ruang</string>
-    <string name="room_settings_room_read_history_rules_pref_title">Singkapan Sejarah Ruang</string>
-    <string name="room_settings_room_read_history_rules_pref_dialog_title">Siapa yang bisa membaca sejarah?</string>
-    <string name="room_settings_room_access_rules_pref_dialog_title">Siapa yang bisa mengakses ruang ini?</string>
-
-    <string name="room_settings_read_history_entry_anyone">Siapapun</string>
-    <string name="room_settings_read_history_entry_members_only_option_time_shared">Hanya anggota (dimulai sejak opsi ini dipilih)</string>
-    <string name="room_settings_read_history_entry_members_only_invited">Hanya anggota (dimulai sejak mereka diundang)</string>
-    <string name="room_settings_read_history_entry_members_only_joined">Hanya anggota (dimulai sejak mereka bergabung)</string>
-
-    <string name="room_settings_room_access_warning">Ruang harus memiliki alamat agar dapat ditautkan.</string>
-    <string name="room_settings_room_access_entry_only_invited">Hanya orang yang telah diundang</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Siapapun yang tahu tautan ruang, selain tamu</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Siapapun yang tahu tautan ruang, termasuk tamu</string>
-
-    <string name="room_settings_banned_users_title">Pengguna yang dilarang</string>
-
-    <string name="room_settings_category_advanced_title">Lanjutan</string>
-    <string name="room_settings_room_internal_id">ID internal ruang ini</string>
-    <string name="room_settings_addresses_pref_title">Alamat</string>
-    <string name="room_settings_labs_pref_title">Lab</string>
-    <string name="room_settings_labs_warning_message">Ini adalah fitur uji coba dan mungkin rusak tanpa terduga. Hati-hati menggunakannya.</string>
-    <string name="room_settings_labs_end_to_end">Enkripsi Ujung-ke-Ujung</string>
-    <string name="room_settings_labs_end_to_end_is_active">Enkripsi Ujung-ke-Ujung aktif</string>
-    <string name="room_settings_labs_end_to_end_warnings">Anda perlu keluar dulu untuk mengaktifkan enkripsi.</string>
-    <string name="room_settings_never_send_to_unverified_devices_title">Enkripsi ke perangkat terverifikasi saja</string>
-    <string name="room_settings_never_send_to_unverified_devices_summary">Jangan mengirim pesan terenkripsi ke perangkat yang belum diverifikasi di ruang ini dengan perangkat ini.</string>
-
-    <string name="room_settings_addresses_no_local_addresses">Ruang ini tidak punya alamat lokal</string>
-    <string name="room_settings_addresses_add_new_address">Alamat baru (misalnya #foo:matrix.org)</string>
-
-    <string name="room_settings_no_flair">Ruang ini tidak menunjukkan flair untuk komunitas manapun</string>
-    <string name="room_settings_add_new_group">ID komunitas baru (misalnya +foo:matrix.org)</string>
-    <string name="room_settings_invalid_group_format_dialog_title">ID komunitas tidak valid</string>
-    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' bukan ID komunitas yang valid</string>
-
-
-    <string name="room_settings_addresses_invalid_format_dialog_title">Format alias tidak valid</string>
-    <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' bukanlah format alias yang valid</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_msg">Anda tidak akan mendapat alamat utama untuk ruang ini.</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_title">Peringatan alamat utama</string>
-
-    <string name="room_settings_set_main_address">Tentukan sebagai Alamat Utama</string>
-    <string name="room_settings_unset_main_address">Jangan tentukan sebagai Alamat Utama</string>
-    <string name="room_settings_copy_room_id">Salin ID Ruang</string>
-    <string name="room_settings_copy_room_address">Salin Alamat Ruang</string>
-
-    <string name="room_settings_addresses_e2e_enabled">Enkripsi diaktifkan untuk ruang ini.</string>
-    <string name="room_settings_addresses_e2e_disabled">Enkripsi dinonaktifkan untuk ruang ini.</string>
-    <string name="room_settings_addresses_e2e_encryption_warning">Aktifkan enkripsi
-(peringatan: tidak lagi bisa dinonaktifkan!)</string>
-
-    <string name="directory_title">Direktori</string>
-    <string name="settings_theme">Tema</string>
-
-    <string name="failed_to_load_timeline_position">%s sedang mencoba memuat titik tertentu di rentang waktu ruang ini tapi belum dapat menemukannya.</string>
-
-    <string name="encryption_information_title">Informasi enkripsi ujung-ke-ujung</string>
-
-    <string name="encryption_information_device_info">Informasi peristiwa</string>
-    <string name="encryption_information_user_id">Id pengguna</string>
-    <string name="encryption_information_curve25519_identity_key">Kunci identitas Curve25519</string>
-    <string name="encryption_information_claimed_ed25519_fingerprint_key">Kunci sidik jadi Ed25519 terklaim</string>
-    <string name="encryption_information_algorithm">Algoritma</string>
-    <string name="encryption_information_session_id">ID Sesi</string>
-    <string name="encryption_information_decryption_error">Kesalahan dekripsi</string>
-
-    <string name="encryption_information_sender_device_information">Informasi perangkat pengirim</string>
-    <string name="encryption_information_device_name">Nama perangkat</string>
-    <string name="encryption_information_name">Nama</string>
-    <string name="encryption_information_device_id">ID Perangkat</string>
-    <string name="encryption_information_device_key">Kunci perangkat</string>
-    <string name="encryption_information_verification">Verifikasi</string>
-    <string name="encryption_information_ed25519_fingerprint">Sidik jari Ed25519</string>
-
-    <string name="encryption_export_e2e_room_keys">Ekspor kunci ruang terenkripsi</string>
-    <string name="encryption_export_room_keys">Ekspor ruang kunci</string>
-    <string name="encryption_export_room_keys_summary">Ekspor kunci ke berkas lokal</string>
-    <string name="encryption_export_export">Ekspor</string>
-    <string name="passphrase_enter_passphrase">Masukkan kata sandi</string>
-    <string name="passphrase_confirm_passphrase">Tegaskan kata sandi</string>
-    <string name="encryption_export_saved_as">Kunci ruang terenkripsi telah disimpan di \'%s\'.
-
-Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
-
-    <string name="notification_listening_for_events">Mendengarkan peristiwa</string>
-    <string name="settings_third_party_notices">Pemberitahuan pihak ketiga</string>
-    <string name="settings_copyright">Hak Cipta</string>
-    <string name="settings_privacy_policy">Kebijakan Pribadi</string>
-    <string name="settings_clear_cache">Bersihkan cache</string>
-    <string name="settings_clear_media_cache">Bersihkan cache media</string>
-    <string name="settings_keep_media">Pertahankan media</string>
-
-    <string name="settings_user_settings">Pengaturan pengguna</string>
-    <string name="settings_notifications">Pemberitahuan</string>
-    <string name="settings_ignored_users">Pengguna yang diabaikan</string>
-    <string name="settings_other">Lainnya</string>
-    <string name="settings_advanced">Lanjutan</string>
-    <string name="settings_cryptography">Kriptografi</string>
-    <string name="settings_notifications_targets">Sasaran Pemberitahuan</string>
-    <string name="settings_contact">Kontak lokal</string>
-    <string name="settings_contacts_app_permission">Permisi atas kontak</string>
-    <string name="settings_contacts_phonebook_country">Negara Nomor Telepon</string>
-    <string name="settings_home_display">Tampilan halaman awal</string>
-    <string name="settings_pin_missed_notifications">Semat ruang yang pemberitahuannya terlewatkan</string>
-    <string name="settings_pin_unread_messages">Semat ruang yang pesannya belum terbaca</string>
-    <string name="settings_devices_list">Perangkat</string>
-    <string name="settings_inline_url_preview">Pratinjau URL dalam obrolan</string>
-    <string name="settings_always_show_timestamps">Tampilkan waktu kirim untuk seluruh pesan</string>
-    <string name="settings_12_24_timestamps">Tampilkan waktu kirim dalam format 12 jam</string>
-    <string name="settings_vibrate_on_mention">Bergetar ketika menyebut seorang pengguna</string>
-    <string name="settings_preview_media_before_sending">Pratinjau media sebelum dikirim</string>
-
-    <string name="settings_deactivate_account_section">Deaktivasi akun</string>
-    <string name="settings_deactivate_my_account">Deaktivasi akunku</string>
-
-    <string name="startup_notification_privacy_title">Kerahasiaan Notifikasi</string>
-    <string name="template_startup_notification_privacy_message">${app_name} dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
-    <string name="startup_notification_privacy_button_grant">Kabulkan permisi</string>
-    <string name="startup_notification_privacy_button_other">Pilih opsi lain</string>
-
-    <string name="settings_analytics">Analitik</string>
-    <string name="settings_opt_in_of_analytics">Kirim data analitik</string>
-    <string name="template_settings_opt_in_of_analytics_summary">${app_name} mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
-    <string name="template_settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan ${app_name}.</string>
-    <string name="settings_opt_in_of_analytics_ok">Ya, saya ingin membantu!</string>
-
-    <string name="settings_data_save_mode">Mode hemat data</string>
-
-    <string name="devices_details_dialog_title">Rincian perangkat</string>
-    <string name="devices_details_id_title">ID</string>
-    <string name="devices_details_name_title">Nama</string>
-    <string name="devices_details_device_name">Nama Perangkat</string>
-    <string name="devices_details_last_seen_title">Terakhir terlihat</string>
-    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
-    <string name="devices_delete_dialog_text">Operasi ini membutuhkan otentikasi tambahan.
-Untuk melanjutkan, masukkan kata sandi Anda.</string>
-    <string name="devices_delete_dialog_title">Otentikasi</string>
-    <string name="devices_delete_pswd">Kata Sandi:</string>
-    <string name="devices_delete_submit_button_label">Serahkan</string>
-
-    <string name="settings_logged_in">Masuk sebagai</string>
-    <string name="settings_home_server">Home Server</string>
-    <string name="settings_identity_server">Server Identitas</string>
-
-    <string name="settings_user_interface">Antarmuka pengguna</string>
-    <string name="settings_interface_language">Bahasa</string>
-    <string name="settings_select_language">Pilih bahasa</string>
-
-    <string name="account_email_validation_title">Verifikasi Tertunda</string>
-    <string name="account_email_validation_message">Mohon cek email Anda dan klik tautan yang termuat di sana. Setelah itu, klik lanjutkan.</string>
-    <string name="account_email_validation_error">Tidak dapat memverifikasi alamat email. Mohon periksa email Anda dan klik tautan yang termuat di sana. Setelah itu, klik lanjutkan.</string>
-    <string name="account_email_already_used_error">Alamat email ini telah digunakan.</string>
-    <string name="account_email_not_found_error">Gagal mengirim email: Alamat email ini tidak dapat ditemukan.</string>
-    <string name="account_phone_number_already_used_error">Nomor telepon ini telah digunakan.</string>
-
-    <string name="settings_change_password">Ubah kata sandi</string>
-    <string name="settings_old_password">Sandi lama</string>
-    <string name="settings_new_password">Sandi baru</string>
-    <string name="settings_confirm_password">Ulangi sandi</string>
-    <string name="settings_fail_to_update_password">Gagal memperbaharui kata sandi</string>
-    <string name="settings_password_updated">Kata sandi Anda telah diperbaharui</string>
-    <string name="settings_unignore_user">Tunjukkan semua pesan dari %s?
-
-Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</string>
-
-    <string name="settings_delete_notification_targets_confirmation">Apa benar Anda ingin menyingkirkan sasaran pemberitahuan ini?</string>
-
-    <string name="settings_delete_threepid_confirmation">Apa benar Anda ingin menyingkirkan %1$s %2$s?</string>
-
-    <string name="settings_select_country">Pilih negara</string>
-
-    <string name="settings_phone_number_country_label">Negara</string>
-    <string name="settings_phone_number_country_error">Mohon pilih negara</string>
-    <string name="settings_phone_number_label">Nomor telepon</string>
-    <string name="settings_phone_number_error">Nomor telepon tidak valid untuk negara yang dipilih</string>
-    <string name="settings_phone_number_verification">Verifikasi telepon</string>
-    <string name="settings_phone_number_verification_instruction">Kami telah mengirim SMS dengan kode aktivasi. Masukkan kode tersebut ke bawah.</string>
-    <string name="settings_phone_number_verification_error_empty_code">Masukkan kode aktivasi</string>
-    <string name="settings_phone_number_verification_error">Ada kesalahan ketika memvalidasi nomor telepon Anda</string>
-    <string name="settings_phone_number_code">Kode</string>
-
-
-    <string name="settings_flair">Flair</string>
-    <string name="settings_without_flair">Anda belum menjadi anggota komunitas manapun saat ini.</string>
-
-    <string name="media_saving_period_3_days">3 hari</string>
-    <string name="media_saving_period_1_week">1 minggu</string>
-    <string name="media_saving_period_1_month">1 bulan</string>
-    <string name="media_saving_period_forever">Selamanya</string>
-
-    <string name="room_settings_room_photo">Foto Ruang</string>
-    <string name="room_settings_room_name">Nama Ruang</string>
-    <string name="room_settings_topic">Topik</string>
-    <string name="room_settings_room_tag">Tanda Ruang</string>
-    <string name="room_settings_tag_pref_dialog_title">Ditandai sebagai:</string>
-
-    <string name="room_settings_tag_pref_entry_favourite">Favorit</string>
-    <string name="notice_avatar">Avatar pemberitahu</string>
-    <string name="receipt_avatar">Avatar penerima</string>
-    <string name="command_description_deop_user">Demosi pengguna dengan id berikut</string>
-
-    <string name="call_anyway">Tetap Panggil</string>
-    <string name="accept">Terima</string>
-
-    <string name="dialog_title_error">Error</string>
-
-    <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
-
-    <string name="settings_call_category">Panggilan</string>
-    <string name="template_settings_call_ringtone_use_app_ringtone">Gunakan nada dering semula ${app_name} untuk panggilan masuk</string>
-    <string name="settings_call_ringtone_title">Nada dering panggilan masuk</string>
-    <string name="settings_call_ringtone_dialog_title">Pilih nada dering untuk panggilan:</string>
-
-    <string name="video_call_in_progress">Panggilan Video Sedang Berlangsung…</string>
-
-    <string name="room_participants_action_kick">Keluarkan</string>
-    <string name="reason_hint">Alasan</string>
-
-    <string name="room_sliding_menu_version_x">Versi %s</string>
-    <string name="settings_notification_troubleshoot">Periksa Keadaan Pemberitahuan</string>
-    <string name="settings_troubleshoot_diagnostic">Hasil diagnosa pemeriksaan keadaan</string>
-    <string name="settings_troubleshoot_diagnostic_run_button_title">Lansungkan Ujicoba</string>
-    <string name="settings_troubleshoot_diagnostic_running_status">Berlangsung… (%1$d of %2$d)</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">Diagnosa dasar berlangsung lancar. Apabila Anda masih belum dapat menerima pemberitahuan, mohon kirim laporan bug untuk kami selidiki.</string>
-    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Satu atau beberapa ujicoba gagal, coba sugesti yang kami tawarkan.</string>
-    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Satu atau beberapa ujicoba gagal, mohon kirim laporan bug untuk kami selidiki.</string>
-
-    <string name="settings_troubleshoot_test_system_settings_title">Pengaturan Sistem.</string>
-    <string name="settings_troubleshoot_test_system_settings_success">Pemberitahuan diperbolehkan dalam pengaturan sistem.</string>
-    <string name="settings_troubleshoot_test_system_settings_failed">Pemberitahuan tidak diperbolehkan dalam pengaturan sistem.
-Silakan periksa pengaturan sistem.</string>
-    <string name="open_settings">Buka Pengaturan</string>
-
-    <string name="settings_troubleshoot_test_account_settings_title">Pengaturan Akun.</string>
-    <string name="settings_troubleshoot_test_account_settings_success">Pemberitahuan diperbolehkan dalam pengaturan akun Anda.</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">Pemberitahuan tidak diperbolehkan dalam pengaturan akun Anda.
-Mohon periksa pengaturan akun.</string>
-    <string name="settings_troubleshoot_test_account_settings_quickfix">Perbolehkan</string>
-
-    <string name="settings_troubleshoot_test_device_settings_title">Pengaturan Perangkat.</string>
-    <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk perangkat ini.</string>
-    <string name="template_settings_troubleshoot_test_device_settings_failed">Pemberitahuan tidak diperbolehkan untuk perangkat ini.
-Mohon periksa pengaturan ${app_name}.</string>
-    <string name="settings_troubleshoot_test_device_settings_quickfix">Perbolehkan</string>
-
-    <string name="settings_troubleshoot_test_play_services_title">Pemeriksaan Layanan Google Play</string>
-    <string name="settings_troubleshoot_test_play_services_success">APK Layanan Google Play ditemukan dan telah diperbaharui.</string>
-    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
-\n%1$s</string>
-    <string name="settings_troubleshoot_test_play_services_quickfix">Perbaiki Layanan Google Play</string>
-
-    <string name="settings_troubleshoot_test_fcm_title">Token Firebase</string>
-    <string name="settings_troubleshoot_test_fcm_success">Sukses mengambil token FCM.
-%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed">Gagal mengambil token FCM.
-%1$s</string>
-
-    <string name="settings_troubleshoot_test_token_registration_title">Pendaftaran Token</string>
-    <string name="settings_troubleshoot_test_token_registration_success">Sukses mendaftarkan token FCM di HomeServer.</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">Gagal mendaftarkan token FCM di HomeServer.
-%1$s</string>
-
-    <string name="settings_troubleshoot_test_foreground_service_started_title">Layanan Pemberitahuan</string>
-    <string name="settings_troubleshoot_test_foreground_service_startedt_success">Layanan Pemberitahuan sedang berjalan.</string>
-    <string name="settings_troubleshoot_test_foreground_service_started_failed">Layanan Pemberitahuan terhenti.
-Coba nyalakan kembali aplikasi.</string>
-    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Mulai Layanan</string>
-
-    <string name="settings_troubleshoot_test_service_restart_title">Nyalakan Layanan Pemberitahuan dengan Otomatis</string>
-    <string name="settings_troubleshoot_test_service_restart_success">Layanan terhenti dan dinyalakan kembali secara otomatis.</string>
-    <string name="settings_troubleshoot_test_service_restart_failed">Layanan tidak dapat dinyalakan kembali</string>
-
-    <string name="settings_troubleshoot_test_service_boot_title">Mulai ketika menyalakan perangkat</string>
-    <string name="settings_troubleshoot_test_service_boot_success">Layanan akan dimulai ketika perangkat dinyalakan kembali.</string>
-    <string name="template_settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka ${app_name}.</string>
-    <string name="settings_troubleshoot_test_service_boot_quickfix">Perbolehkan memulai ketika perangkat dinyalakan</string>
-
-    <string name="settings_troubleshoot_test_bg_restricted_title">Periksa halangan di balik layar</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk ${app_name}. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
-%1$s</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk ${app_name}.
-Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik layar, dan ini dapat mempengaruhi pemberitahuan.
-%1$s</string>
-    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Matikan penghalang</string>
-
-    <string name="settings_troubleshoot_test_battery_title">Optimisasi Baterai</string>
-    <string name="template_settings_troubleshoot_test_battery_success">${app_name} tidak terpengaruh oleh Optimisasi Baterai.</string>
-    <string name="title_activity_keys_backup_setup">Cadangkan Kunci</string>
-    <string name="title_activity_keys_backup_restore">Gunakan Cadangan Kunci</string>
-
-    <string name="keys_backup_is_not_finished_please_wait">Pencadangan kunci belum selesai, mohon tunggu…</string>
-    <string name="sign_out_bottom_sheet_warning_no_backup">Pesan terenkripsi Anda akan hilang apabila Anda mencopot akun sekarang</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">Pencadangan kunci sedang berlangsung. Pesan terenkripsi Anda akan hilang apabila Anda mencopot akun sekarang.</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">Cadangan Kunci Aman harus aktif pada semua perangkat agar terhindar dari hilangnya akses ke pesan yang terenkripsi.</string>
-    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Saya tidak perlu pesan terenkripsi saya</string>
-    <string name="sign_out_bottom_sheet_backing_up_keys">Mencadangkan kunci…</string>
-    <string name="keys_backup_activate">Gunakan Cadangan Kunci</string>
-    <string name="are_you_sure">Yakin\?</string>
-    <string name="backup">Cadangkan</string>
-    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Akses ke pesan terenkripsi akan hilang apabila Anda tidak mencadangkan kunci sebelum mencopot akun.</string>
-
-    <string name="skip">Lewatkan</string>
-    <string name="done">Selesai</string>
-    <string name="abort">Hentikan</string>
-
-    <string name="action_sign_out_confirmation_simple">Anda yakin ingin mencopot akun\?</string>
-    <string name="settings_notification_advanced">Pengaturan Pemberitahuan Lanjutan</string>
-    <string name="settings_notification_by_event">Urgensi pemberitahuan lewat kejadian</string>
-
-    <string name="settings_troubleshoot_test_bing_settings_title">Pengaturan Sesukanya.</string>
-    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Perhatikan bahwa sebagian jenis pesan tersetel diam (mengeluarkan pemberitahuan tanpa suara).</string>
-    <string name="settings_troubleshoot_test_bing_settings_failed">Sebagian pemberitahuan dimatikan dalam aturan Anda.</string>
-    <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Gagal memuat aturan, mohon coba lagi.</string>
-    <string name="settings_troubleshoot_test_bing_settings_quickfix">Periksa Aturan</string>
-
-    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nError ini di luar kendali ${app_name} dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
-    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nError ini di luar kendali ${app_name}, dan dapat muncul karena berbagai alasan. Coba lagi nanti, atau Anda juga dapat memeriksa apabila penggunaan jaringan data Layanan Google Play tidak terhalang oleh sistem, atau waktu pada perangkat sudah benar, atau ini dapat terjadi pada ROM tidak resmi.</string>
-    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
-\nError ini di luar kendali ${app_name}. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
-    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Tambah Akun</string>
-
-    <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode Doze. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
-    <string name="settings_troubleshoot_test_battery_quickfix">Abaikan Optimisasi</string>
-
-    <string name="settings_noisy_notifications_preferences">Kelola Pemberitahuan Berisik</string>
-    <string name="settings_call_notifications_preferences">Kelola Pemberitahuan Panggilan</string>
-    <string name="settings_silent_notifications_preferences">Kelola Pemberitahuan Diam</string>
-    <string name="settings_system_preferences_summary">Pilih warna LED, getaran, suara…</string>
-
-
-    <string name="settings_cryptography_manage_keys">Pengelolaan Kunci Kriptografi</string>
-    <string name="settings_inline_url_preview_summary">Pratinjau tautan dalam obrolan apabila homeserver mendukung fitur ini.</string>
-    <string name="settings_send_typing_notifs">Kirim pemberitahuan mengetik</string>
-    <string name="settings_send_typing_notifs_summary">Beritahu pengguna lain bahwa Anda sedang mengetik.</string>
-    <string name="settings_send_markdown">Format markdown</string>
-    <string name="settings_send_markdown_summary">Format pesan menggunakan sintaks markdown sebelum dikirim. Ini mengijinkan format lanjutan seperti menggunakan tanda bintang untuk menunjukkan teks miring.</string>
-    <string name="settings_show_read_receipts">Tunjukkan tanda telah dibaca</string>
-    <string name="settings_show_read_receipts_summary">Klik tanda telah dibaca untuk daftar yang lebih rinci.</string>
-    <string name="settings_show_join_leave_messages">Tunjukkan kejadian bergabung dan meninggalkan</string>
-    <string name="settings_show_join_leave_messages_summary">Undangan, pengeluaran, dan larangan tidak terpengaruh.</string>
-    <string name="settings_show_avatar_display_name_changes_messages">Tunjukkan kejadian akun</string>
-</resources>
diff --git a/vector/src/main/res/values-id/strings_no_weblate.xml b/vector/src/main/res/values-id/strings_no_weblate.xml
deleted file mode 100644
index adab6505cd..0000000000
--- a/vector/src/main/res/values-id/strings_no_weblate.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="resources_language">in</string>
-    <string name="resources_country_code">ID</string>
-
-</resources>
\ No newline at end of file

From 8c24dd0fba3ce74b96ca21cdda4510943a618388 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 21:55:59 +0100
Subject: [PATCH 273/578] Add entry in changelog

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 2bf6249423..c4d4c00980 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Improvements 🙌:
  - Pre-share session keys when opening a room or start typing (#2771)
  - Sending is now queuing by room and not uniquely to the session
  - Improve Snackbar duration (#2929)
+ - Improve sending message state (#2937)
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)

From ac02d1d48af27941ce8706ea3c98a3ef5ffee3db Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 22:03:57 +0100
Subject: [PATCH 274/578] Prepare release 1.1.1

---
 fastlane/metadata/android/en-US/changelogs/40101010.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/40101010.txt b/fastlane/metadata/android/en-US/changelogs/40101010.txt
new file mode 100644
index 0000000000..e411a6889c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Main changes in this version: performance improvement and bug fixes!
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.1
\ No newline at end of file

From 4e3ad91c6776afc93ef8ee4f1c10a1e9598d5253 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 10 Mar 2021 22:05:31 +0100
Subject: [PATCH 275/578] Version++

---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 8bcc5bc02b..d3d98026a7 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 1
-ext.versionPatch = 1
+ext.versionPatch = 2
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 507eba3ddb24cd37958461a433dc15bec0900652 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Mar 2021 21:08:12 +0000
Subject: [PATCH 276/578] Bump barista from 3.8.0 to 3.9.0

Bumps barista from 3.8.0 to 3.9.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index d3d98026a7..94fa820346 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -476,7 +476,7 @@ dependencies {
     // Plant Timber tree for test
     androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
     // "The one who serves a great Espresso"
-    androidTestImplementation('com.schibsted.spain:barista:3.8.0') {
+    androidTestImplementation('com.schibsted.spain:barista:3.9.0') {
         exclude group: 'org.jetbrains.kotlin'
     }
 }

From cbfb5d3fcc6f1fb13466a9aca0476eb2267800d3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 11 Mar 2021 10:58:07 +0100
Subject: [PATCH 277/578] Fix color and bottom margin And improve a11y

---
 .../bottomsheet/BottomSheetMessagePreviewItem.kt |  1 +
 .../layout/item_bottom_sheet_message_preview.xml | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
index cf14cc3557..a323ce995b 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
@@ -57,6 +57,7 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         super.bind(holder)
         avatarRenderer.render(matrixItem, holder.avatar)
         holder.avatar.setOnClickListener { userClicked?.invoke() }
+        holder.sender.setOnClickListener { userClicked?.invoke() }
         holder.sender.setTextOrHide(matrixItem.displayName)
         holder.body.movementMethod = movementMethod
         holder.body.text = body
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 5ad3c7bb8b..5fbed68955 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_sheet_message_preview"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:background="#1FF00FF0">
 
     <ImageView
         android:id="@+id/bottom_sheet_message_preview_avatar"
@@ -13,7 +14,7 @@
         android:layout_margin="@dimen/layout_horizontal_margin"
         android:adjustViewBounds="true"
         android:background="@drawable/circle"
-        android:contentDescription="@string/avatar"
+        android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,17 +24,17 @@
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_sender"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="start"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:ellipsize="end"
         android:fontFamily="sans-serif-bold"
         android:singleLine="true"
-        android:textColor="@color/riotx_accent"
+        android:textColor="?riotx_text_primary"
         android:textSize="14sp"
         android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
         tools:text="@tools:sample/full_names" />
@@ -45,15 +46,14 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="@id/bottom_sheet_message_preview_sender"
+        app:layout_constraintEnd_toEndOf="parent"
         tools:text="Friday 8pm" />
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="start"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:layout_marginBottom="4dp"
@@ -62,8 +62,10 @@
         android:textColor="?riotx_text_secondary"
         android:textIsSelectable="false"
         android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_sender"
         tools:text="Quis harum id autem cumque consequatur laboriosam aliquam sed. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. " />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

From 4b8c59a23b2fad3150ee189aebabab18f09b03a8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 11 Mar 2021 14:14:55 +0100
Subject: [PATCH 278/578] Fix crash on ViewSource of event

---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index d3d98026a7..c568a49fb3 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -434,7 +434,7 @@ dependencies {
 
     implementation "androidx.emoji:emoji-appcompat:1.1.0"
 
-    implementation 'com.github.BillCarsonFr:JsonViewer:0.5'
+    implementation 'com.github.BillCarsonFr:JsonViewer:0.6'
 
     // WebRTC
     // org.webrtc:google-webrtc is for development purposes only

From a407ed19037865876f195a5f771ecfaca51a68d7 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 11 Mar 2021 15:21:20 +0100
Subject: [PATCH 279/578] Fix live timeline event race condition

---
 .../room/timeline/DefaultTimelineService.kt   |  2 +-
 .../room/timeline/LiveTimelineEvent.kt        | 70 ++++++++-----------
 .../session/room/timeline/TimelineInput.kt    |  5 --
 .../internal/session/sync/RoomSyncHandler.kt  |  1 -
 4 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index d000bbeb50..bb774022d4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -87,7 +87,7 @@ internal class DefaultTimelineService @AssistedInject constructor(@Assisted priv
     }
 
     override fun getTimeLineEventLive(eventId: String): LiveData<Optional<TimelineEvent>> {
-        return LiveTimelineEvent(timelineInput, monarchy, taskExecutor.executorScope, timelineEventMapper, roomId, eventId)
+        return LiveTimelineEvent(monarchy, taskExecutor.executorScope, timelineEventMapper, roomId, eventId)
     }
 
     override fun getAttachmentMessages(): List<TimelineEvent> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
index 3c0f101e11..eb4900553b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LiveTimelineEvent.kt
@@ -18,8 +18,9 @@ package org.matrix.android.sdk.internal.session.room.timeline
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
+import io.realm.RealmQuery
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -29,66 +30,57 @@ import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.database.query.where
-import java.util.concurrent.atomic.AtomicBoolean
 
 /**
  * This class takes care of handling case where local echo is replaced by the synced event in the db.
  */
-internal class LiveTimelineEvent(private val timelineInput: TimelineInput,
-                                 private val monarchy: Monarchy,
+internal class LiveTimelineEvent(private val monarchy: Monarchy,
                                  private val coroutineScope: CoroutineScope,
                                  private val timelineEventMapper: TimelineEventMapper,
                                  private val roomId: String,
                                  private val eventId: String)
-    : TimelineInput.Listener,
-        MediatorLiveData<Optional<TimelineEvent>>() {
-
-    private var queryLiveData: LiveData<Optional<TimelineEvent>>? = null
-
-    // If we are listening to local echo, we want to be aware when event is synced
-    private var shouldObserveSync = AtomicBoolean(LocalEcho.isLocalEchoId(eventId))
+    : MediatorLiveData<Optional<TimelineEvent>>() {
 
     init {
-        buildAndObserveQuery(eventId)
+        buildAndObserveQuery()
     }
 
+    private var initialLiveData: LiveData<List<TimelineEvent>>? = null
+
     // Makes sure it's made on the main thread
-    private fun buildAndObserveQuery(eventIdToObserve: String) = coroutineScope.launch(Dispatchers.Main) {
-        queryLiveData?.also {
-            removeSource(it)
-        }
+    private fun buildAndObserveQuery() = coroutineScope.launch(Dispatchers.Main) {
         val liveData = monarchy.findAllMappedWithChanges(
-                { TimelineEventEntity.where(it, roomId = roomId, eventId = eventIdToObserve) },
+                { TimelineEventEntity.where(it, roomId = roomId, eventId = eventId) },
                 { timelineEventMapper.map(it) }
         )
-        queryLiveData = Transformations.map(liveData) { events ->
-            events.firstOrNull().toOptional()
-        }.also {
-            addSource(it) { newValue -> value = newValue }
+        addSource(liveData) { newValue ->
+            value = newValue.firstOrNull().toOptional()
+        }
+        initialLiveData = liveData
+        if (LocalEcho.isLocalEchoId(eventId)) {
+            observeTimelineEventWithTxId()
         }
     }
 
-    override fun onLocalEchoSynced(roomId: String, localEchoEventId: String, syncedEventId: String) {
-        if (this.roomId == roomId && localEchoEventId == this.eventId) {
-            timelineInput.listeners.remove(this)
-            shouldObserveSync.set(false)
-            // rebuild the query with the new eventId
-            buildAndObserveQuery(syncedEventId)
+    private fun observeTimelineEventWithTxId() {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { it.queryTimelineEventWithTxId() },
+                { timelineEventMapper.map(it) }
+        )
+        addSource(liveData) { newValue ->
+            val optionalValue = newValue.firstOrNull().toOptional()
+            if (optionalValue.hasValue()) {
+                initialLiveData?.also { removeSource(it) }
+                value = optionalValue
+            }
         }
     }
 
-    override fun onActive() {
-        super.onActive()
-        if (shouldObserveSync.get()) {
-            timelineInput.listeners.add(this)
-        }
-    }
-
-    override fun onInactive() {
-        super.onInactive()
-        if (shouldObserveSync.get()) {
-            timelineInput.listeners.remove(this)
-        }
+    private fun Realm.queryTimelineEventWithTxId(): RealmQuery<TimelineEventEntity> {
+        return where(TimelineEventEntity::class.java)
+                .equalTo(TimelineEventEntityFields.ROOM_ID, roomId)
+                .like(TimelineEventEntityFields.ROOT.UNSIGNED_DATA, """{*"transaction_id":*"$eventId"*}""")
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineInput.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineInput.kt
index 8911f265d5..cdc85ea722 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineInput.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineInput.kt
@@ -35,16 +35,11 @@ internal class TimelineInput @Inject constructor() {
         listeners.toSet().forEach { it.onNewTimelineEvents(roomId, eventIds) }
     }
 
-    fun onLocalEchoSynced(roomId: String, localEchoEventId: String, syncEventId: String) {
-        listeners.toSet().forEach { it.onLocalEchoSynced(roomId, localEchoEventId, syncEventId) }
-    }
-
     val listeners = mutableSetOf<Listener>()
 
     internal interface Listener {
         fun onLocalEchoCreated(roomId: String, timelineEvent: TimelineEvent) = Unit
         fun onLocalEchoUpdated(roomId: String, eventId: String, sendState: SendState) = Unit
         fun onNewTimelineEvents(roomId: String, eventIds: List<String>) = Unit
-        fun onLocalEchoSynced(roomId: String, localEchoEventId: String, syncedEventId: String) = Unit
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 336a83eaad..b2db6320f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -400,7 +400,6 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                             event.mxDecryptionResult = adapter.fromJson(json)
                         }
                     }
-                    timelineInput.onLocalEchoSynced(roomId, it, event.eventId)
                     // Finally delete the local echo
                     sendingEventEntity.deleteOnCascade(true)
                 } else {

From 992cc0addd405cc692150f20ca06c7bc31ae740b Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 11 Mar 2021 19:34:34 +0100
Subject: [PATCH 280/578] Message state: add sent status in BottomSheet

---
 .../action/MessageActionsEpoxyController.kt     | 17 +++++++++++++----
 vector/src/main/res/values/strings.xml          |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index 1e93c29673..4e1492aaba 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -73,12 +73,19 @@ class MessageActionsEpoxyController @Inject constructor(
                 text(stringProvider.getString(R.string.unable_to_send_message))
                 drawableStart(R.drawable.ic_warning_badge)
             }
-        } else if (sendState != SendState.SYNCED) {
+        } else if (sendState?.isSending().orFalse()) {
             bottomSheetSendStateItem {
                 id("send_state")
                 showProgress(true)
                 text(stringProvider.getString(R.string.event_status_sending_message))
             }
+        } else if (sendState == SendState.SENT) {
+            bottomSheetSendStateItem {
+                id("send_state")
+                showProgress(false)
+                drawableStart(R.drawable.ic_message_sent)
+                text(stringProvider.getString(R.string.event_status_sent_message))
+            }
         }
 
         when (state.informationData.e2eDecoration) {
@@ -124,9 +131,11 @@ class MessageActionsEpoxyController @Inject constructor(
             }
         }
 
-        // Separator
-        dividerItem {
-            id("actions_separator")
+        if (state.actions.isNotEmpty()) {
+            // Separator
+            dividerItem {
+                id("actions_separator")
+            }
         }
 
         // Action
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 36ee7898e5..634b91bf90 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -208,6 +208,8 @@
     <string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
     <string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
 
+
+    <string name="event_status_sent_message">Message sent</string>
     <string name="event_status_sending_message">Sending message…</string>
     <string name="clear_timeline_send_queue">Clear sending queue</string>
 

From e8d4fab3055eac7a523062381950985e1839f4df Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 12 Mar 2021 12:17:29 +0100
Subject: [PATCH 281/578] Add template for 1.1.2

---
 CHANGES.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index c4d4c00980..e4ff049550 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+Changes in Element 1.1.2 (2021-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ -
+
+Build 🧱:
+ -
+
+Test:
+ -
+
+Other changes:
+ -
+
 Changes in Element 1.1.1 (2021-XX-XX)
 ===================================================
 

From 3777b00ad7448876ee508f260040d9820885ef6f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 11 Mar 2021 21:54:33 +0100
Subject: [PATCH 282/578] Store Ephemeral in files to handle them later (no
 second transaction)

---
 .../session/sync/InitialSyncStrategy.kt       |  4 +-
 .../session/sync/ReadReceiptHandler.kt        | 57 +++++++++++++-
 .../sync/RoomSyncEphemeralTemporaryStore.kt   | 77 +++++++++++++++++++
 .../internal/session/sync/RoomSyncHandler.kt  | 31 ++------
 .../sdk/internal/session/sync/SyncModule.kt   |  3 +
 .../session/sync/SyncResponseHandler.kt       |  9 ---
 .../sdk/internal/session/sync/SyncTask.kt     | 26 +++----
 .../sync/model/LazyRoomSyncEphemeral.kt       | 20 +----
 ...DefaultLazyRoomSyncEphemeralJsonAdapter.kt | 21 ++---
 .../sync/parsing/InitialSyncResponseParser.kt | 12 ++-
 10 files changed, 171 insertions(+), 89 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
index 297cc213ed..7d93e30191 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt
@@ -42,9 +42,9 @@ sealed class InitialSyncStrategy {
             val minSizeToSplit: Long = 1024 * 1024,
             /**
              * Limit per room to reach to decide to store a join room ephemeral Events into a file
-             * Empiric value: 6 kilobytes
+             * Empiric value: 1 kilobytes
              */
-            val minSizeToStoreInFile: Long = 6 * 1024,
+            val minSizeToStoreInFile: Long = 1024,
             /**
              * Max number of rooms to insert at a time in database (to avoid too much RAM usage)
              */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index a3c5891f68..7379962620 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -16,12 +16,13 @@
 
 package org.matrix.android.sdk.internal.session.sync
 
+import io.realm.Realm
+import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.internal.database.model.ReadReceiptEntity
 import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
 import org.matrix.android.sdk.internal.database.query.createUnmanaged
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
-import io.realm.Realm
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -35,7 +36,9 @@ typealias ReadReceiptContent = Map<String, Map<String, Map<String, Map<String, D
 private const val READ_KEY = "m.read"
 private const val TIMESTAMP_KEY = "ts"
 
-internal class ReadReceiptHandler @Inject constructor() {
+internal class ReadReceiptHandler @Inject constructor(
+        private val roomSyncEphemeralTemporaryStore: RoomSyncEphemeralTemporaryStore
+) {
 
     companion object {
 
@@ -87,7 +90,57 @@ internal class ReadReceiptHandler @Inject constructor() {
         realm.insertOrUpdate(readReceiptSummaries)
     }
 
+    /**
+     * Example of content:
+     *
+     * <pre>
+     * {
+     *     "type": "m.receipt",
+     *     "content": {
+     *         "$ofZhdeinmEReG_X-agD3J2TIhosEPkuvl62HJ8pVMMs": {
+     *             "m.read": {
+     *                 "@benoit.marty:matrix.org": {
+     *                     "ts": 1610468193999
+     *                 }
+     *             }
+     *         },
+     *         "$ZMa_qwE_w_ZOj_vAxv7JuJeHCQfYzuQblmIZxkYmNMs": {
+     *             "m.read": {
+     *                 "@benoitx:matrix.org": {
+     *                     "ts": 1610468049579
+     *                 },
+     *                 "@benoit.marty:matrix.org": {
+     *                     "ts": 1609156029466
+     *                 }
+     *             }
+     *         }
+     *     }
+     * }
+     * </pre>
+     */
     private fun incrementalSyncStrategy(realm: Realm, roomId: String, content: ReadReceiptContent) {
+        // First check if we have data from init sync to handle
+        // TODO Rename contentFromInitSync
+        val initSyncContent = roomSyncEphemeralTemporaryStore.read(roomId)
+                ?.events
+                ?.firstOrNull { it.type == EventType.RECEIPT }
+                ?.let {
+                    @Suppress("UNCHECKED_CAST")
+                    it.content as? ReadReceiptContent
+                }
+                ?.also {
+                    Timber.w("INIT_SYNC Copy RR for room $roomId")
+                }
+
+        initSyncContent?.let {
+            Timber.w("BOOK Copy RR for room $roomId")
+
+            // TODO Merge with data we just received
+            // TODO Store that when we enter the timeline
+            initialSyncStrategy(realm, roomId, it)
+            roomSyncEphemeralTemporaryStore.delete(roomId)
+        }
+
         for ((eventId, receiptDict) in content) {
             val userIdsDict = receiptDict[READ_KEY] ?: continue
             val readReceiptsSummary = ReadReceiptsSummaryEntity.where(realm, eventId).findFirst()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
new file mode 100644
index 0000000000..8d53c63bcc
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+import com.squareup.moshi.JsonReader
+import okio.buffer
+import okio.source
+import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.SessionFilesDirectory
+import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral
+import org.matrix.android.sdk.internal.util.md5
+import timber.log.Timber
+import java.io.File
+import javax.inject.Inject
+
+internal interface RoomSyncEphemeralTemporaryStore {
+    fun write(roomId: String, roomSyncEphemeralJson: String)
+    fun read(roomId: String): RoomSyncEphemeral?
+    fun reset()
+    fun delete(roomId: String)
+}
+
+internal class RoomSyncEphemeralTemporaryStoreFile @Inject constructor(
+        @SessionFilesDirectory private val fileDirectory: File
+) : RoomSyncEphemeralTemporaryStore {
+
+    private val workingDir = File(fileDirectory, "rr")
+            .also { it.mkdirs() }
+
+    /**
+     * Write RoomSyncEphemeral to a file
+     */
+    override fun write(roomId: String, roomSyncEphemeralJson: String) {
+        Timber.w("INIT_SYNC Store RR for room $roomId")
+        getFile(roomId).writeText(roomSyncEphemeralJson)
+    }
+
+    /**
+     * Read RoomSyncEphemeral from a file, or null if there is no file to read
+     */
+    override fun read(roomId: String): RoomSyncEphemeral? {
+        return getFile(roomId)
+                .takeIf { it.exists() }
+                ?.inputStream()
+                ?.use { pos ->
+                    MoshiProvider.providesMoshi().adapter(RoomSyncEphemeral::class.java)
+                            .fromJson(JsonReader.of(pos.source().buffer()))
+                }
+    }
+
+    override fun delete(roomId: String) {
+        getFile(roomId).delete()
+    }
+
+    override fun reset() {
+        workingDir.deleteRecursively()
+        workingDir.mkdirs()
+    }
+
+    private fun getFile(roomId: String): File {
+        return File(workingDir, "${roomId.md5()}.json")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index b2db6320f1..99ffa80760 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -60,6 +60,7 @@ import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.internal.session.room.timeline.TimelineInput
 import org.matrix.android.sdk.internal.session.room.typing.TypingEventContent
 import org.matrix.android.sdk.internal.session.sync.model.InvitedRoomSync
+import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral
 import org.matrix.android.sdk.internal.session.sync.model.RoomSync
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncAccountData
 import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
@@ -94,19 +95,6 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, reporter)
     }
 
-    fun handleInitSyncEphemeral(realm: Realm,
-                                roomsSyncResponse: RoomsSyncResponse) {
-        roomsSyncResponse.join.forEach { roomSync ->
-            val ephemeralResult = roomSync.value.ephemeral
-                    ?.roomSyncEphemeral
-                    ?.events
-                    ?.takeIf { it.isNotEmpty() }
-                    ?.let { events -> handleEphemeral(realm, roomSync.key, events, true) }
-
-            roomTypingUsersHandler.handle(realm, roomSync.key, ephemeralResult)
-        }
-    }
-
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleRoomSync(realm: Realm, handlingStrategy: HandlingStrategy, isInitialSync: Boolean, reporter: ProgressReporter?) {
@@ -124,7 +112,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                     emptyList()
                 } else {
                     handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
-                        handleJoinedRoom(realm, it.key, it.value, true, insertType, syncLocalTimeStampMillis)
+                        handleJoinedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
                     }
                 }
             }
@@ -165,7 +153,6 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                                 realm = realm,
                                                 roomId = it,
                                                 roomSync = handlingStrategy.data[it] ?: error("Should not happen"),
-                                                handleEphemeralEvents = false,
                                                 insertType = EventInsertType.INITIAL_SYNC,
                                                 syncLocalTimestampMillis = syncLocalTimeStampMillis
                                         )
@@ -177,7 +164,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         } else {
             // No need to split
             val rooms = handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
-                handleJoinedRoom(realm, it.key, it.value, false, EventInsertType.INITIAL_SYNC, syncLocalTimeStampMillis)
+                handleJoinedRoom(realm, it.key, it.value, EventInsertType.INITIAL_SYNC, syncLocalTimeStampMillis)
             }
             realm.insertOrUpdate(rooms)
         }
@@ -186,17 +173,15 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
     private fun handleJoinedRoom(realm: Realm,
                                  roomId: String,
                                  roomSync: RoomSync,
-                                 handleEphemeralEvents: Boolean,
                                  insertType: EventInsertType,
                                  syncLocalTimestampMillis: Long): RoomEntity {
         Timber.v("Handle join sync for room $roomId")
 
-        var ephemeralResult: EphemeralResult? = null
-        if (handleEphemeralEvents) {
-            ephemeralResult = roomSync.ephemeral?.roomSyncEphemeral?.events
-                    ?.takeIf { it.isNotEmpty() }
-                    ?.let { handleEphemeral(realm, roomId, it, insertType == EventInsertType.INITIAL_SYNC) }
-        }
+        val ephemeralResult = (roomSync.ephemeral as? LazyRoomSyncEphemeral.Parsed)
+                ?._roomSyncEphemeral
+                ?.events
+                ?.takeIf { it.isNotEmpty() }
+                ?.let { handleEphemeral(realm, roomId, it, insertType == EventInsertType.INITIAL_SYNC) }
 
         if (roomSync.accountData?.events?.isNotEmpty() == true) {
             handleRoomAccountDataEvents(realm, roomId, roomSync.accountData)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
index 010c029c97..4b31dc4d9b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
@@ -37,4 +37,7 @@ internal abstract class SyncModule {
 
     @Binds
     abstract fun bindSyncTask(task: DefaultSyncTask): SyncTask
+
+    @Binds
+    abstract fun bindRoomSyncEphemeralTemporaryStore(store: RoomSyncEphemeralTemporaryStoreFile): RoomSyncEphemeralTemporaryStore
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index d17a672485..fab1369aff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -128,15 +128,6 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
         cryptoSyncHandler.onSyncCompleted(syncResponse)
     }
 
-    suspend fun handleInitSyncSecondTransaction(syncResponse: SyncResponse) {
-        // Start another transaction to handle the ephemeral events
-        monarchy.awaitTransaction { realm ->
-            if (syncResponse.rooms != null) {
-                roomSyncHandler.handleInitSyncEphemeral(realm, syncResponse.rooms)
-            }
-        }
-    }
-
     /**
      * At the moment we don't get any group data through the sync, so we poll where every hour.
      * You can also force to refetch group data using [Group] API.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 00060a33b1..d47ca8fa68 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -62,7 +62,8 @@ internal class DefaultSyncTask @Inject constructor(
         private val globalErrorReceiver: GlobalErrorReceiver,
         @SessionFilesDirectory
         private val fileDirectory: File,
-        private val syncResponseParser: InitialSyncResponseParser
+        private val syncResponseParser: InitialSyncResponseParser,
+        private val roomSyncEphemeralTemporaryStore: RoomSyncEphemeralTemporaryStore
 ) : SyncTask {
 
     private val workingDir = File(fileDirectory, "is")
@@ -102,13 +103,16 @@ internal class DefaultSyncTask @Inject constructor(
         if (isInitialSync) {
             Timber.v("INIT_SYNC with filter: ${requestParams["filter"]}")
             val initSyncStrategy = initialSyncStrategy
-            var syncResp: SyncResponse? = null
             logDuration("INIT_SYNC strategy: $initSyncStrategy") {
                 if (initSyncStrategy is InitialSyncStrategy.Optimized) {
+                    roomSyncEphemeralTemporaryStore.reset()
+                    workingDir.mkdirs()
                     val file = downloadInitSyncResponse(requestParams)
-                    syncResp = reportSubtask(initialSyncProgressService, InitSyncStep.ImportingAccount, 1, 0.7F) {
+                    reportSubtask(initialSyncProgressService, InitSyncStep.ImportingAccount, 1, 0.7F) {
                         handleSyncFile(file, initSyncStrategy)
                     }
+                    // Delete all files
+                    workingDir.deleteRecursively()
                 } else {
                     val syncResponse = logDuration("INIT_SYNC Request") {
                         executeRequest<SyncResponse>(globalErrorReceiver) {
@@ -125,15 +129,6 @@ internal class DefaultSyncTask @Inject constructor(
                 }
             }
             initialSyncProgressService.endAll()
-
-            if (initSyncStrategy is InitialSyncStrategy.Optimized) {
-                logDuration("INIT_SYNC Handle ephemeral") {
-                    syncResponseHandler.handleInitSyncSecondTransaction(syncResp!!)
-                }
-                initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
-                // Delete all files
-                workingDir.deleteRecursively()
-            }
         } else {
             val syncResponse = executeRequest<SyncResponse>(globalErrorReceiver) {
                 apiCall = syncAPI.sync(
@@ -147,7 +142,6 @@ internal class DefaultSyncTask @Inject constructor(
     }
 
     private suspend fun downloadInitSyncResponse(requestParams: Map<String, String>): File {
-        workingDir.mkdirs()
         val workingFile = File(workingDir, "initSync.json")
         val status = initialSyncStatusRepository.getStep()
         if (workingFile.exists() && status >= InitialSyncStatus.STEP_DOWNLOADED) {
@@ -201,8 +195,8 @@ internal class DefaultSyncTask @Inject constructor(
         }
     }
 
-    private suspend fun handleSyncFile(workingFile: File, initSyncStrategy: InitialSyncStrategy.Optimized): SyncResponse {
-        return logDuration("INIT_SYNC handleSyncFile()") {
+    private suspend fun handleSyncFile(workingFile: File, initSyncStrategy: InitialSyncStrategy.Optimized) {
+        logDuration("INIT_SYNC handleSyncFile()") {
             val syncResponse = logDuration("INIT_SYNC Read file and parse") {
                 syncResponseParser.parse(initSyncStrategy, workingFile)
             }
@@ -215,7 +209,7 @@ internal class DefaultSyncTask @Inject constructor(
             logDuration("INIT_SYNC Database insertion") {
                 syncResponseHandler.handleResponse(syncResponse, null, initialSyncProgressService)
             }
-            syncResponse
+            initialSyncStatusRepository.setStep(InitialSyncStatus.STEP_SUCCESS)
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt
index 938168b5f4..83006c646b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/LazyRoomSyncEphemeral.kt
@@ -16,28 +16,10 @@
 
 package org.matrix.android.sdk.internal.session.sync.model
 
-import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonClass
-import com.squareup.moshi.JsonReader
-import okio.buffer
-import okio.source
-import java.io.File
 
 @JsonClass(generateAdapter = false)
 internal sealed class LazyRoomSyncEphemeral {
     data class Parsed(val _roomSyncEphemeral: RoomSyncEphemeral) : LazyRoomSyncEphemeral()
-    data class Stored(val roomSyncEphemeralAdapter: JsonAdapter<RoomSyncEphemeral>, val file: File) : LazyRoomSyncEphemeral()
-
-    val roomSyncEphemeral: RoomSyncEphemeral
-        get() {
-            return when (this) {
-                is Parsed -> _roomSyncEphemeral
-                is Stored -> {
-                    // Parse the file now
-                    file.inputStream().use { pos ->
-                        roomSyncEphemeralAdapter.fromJson(JsonReader.of(pos.source().buffer()))!!
-                    }
-                }
-            }
-        }
+    object Stored : LazyRoomSyncEphemeral()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
index ef56802a66..22ac4f911d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
@@ -22,11 +22,10 @@ import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.ToJson
 import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
+import org.matrix.android.sdk.internal.session.sync.RoomSyncEphemeralTemporaryStore
 import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral
 import timber.log.Timber
-import java.io.File
-import java.util.concurrent.atomic.AtomicInteger
 
 internal class DefaultLazyRoomSyncEphemeralJsonAdapter {
 
@@ -44,20 +43,15 @@ internal class DefaultLazyRoomSyncEphemeralJsonAdapter {
     }
 }
 
-internal class SplitLazyRoomSyncJsonAdapter(
-        private val workingDirectory: File,
+internal class SplitLazyRoomSyncEphemeralJsonAdapter(
+        private val roomSyncEphemeralTemporaryStore: RoomSyncEphemeralTemporaryStore,
         private val syncStrategy: InitialSyncStrategy.Optimized
 ) {
-    private val atomicInteger = AtomicInteger(0)
-
-    private fun createFile(): File {
-        val index = atomicInteger.getAndIncrement()
-        return File(workingDirectory, "room_$index.json")
-    }
-
     @FromJson
     fun fromJson(reader: JsonReader, delegate: JsonAdapter<RoomSyncEphemeral>): LazyRoomSyncEphemeral? {
         val path = reader.path
+        val roomId = path.substringAfter("\$.rooms.join.").substringBeforeLast(".ephemeral")
+
         val json = reader.nextSource().inputStream().bufferedReader().use {
             it.readText()
         }
@@ -65,9 +59,8 @@ internal class SplitLazyRoomSyncJsonAdapter(
         return if (json.length > limit) {
             Timber.v("INIT_SYNC $path content length: ${json.length} copy to a file")
             // Copy the source to a file
-            val file = createFile()
-            file.writeText(json)
-            LazyRoomSyncEphemeral.Stored(delegate, file)
+            roomSyncEphemeralTemporaryStore.write(roomId, json)
+            LazyRoomSyncEphemeral.Stored
         } else {
             Timber.v("INIT_SYNC $path content length: ${json.length} parse it now")
             val roomSync = delegate.fromJson(json) ?: return null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
index ae7b2a4468..bfa9974b77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
@@ -20,29 +20,33 @@ import com.squareup.moshi.Moshi
 import okio.buffer
 import okio.source
 import org.matrix.android.sdk.internal.session.sync.InitialSyncStrategy
+import org.matrix.android.sdk.internal.session.sync.RoomSyncEphemeralTemporaryStore
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
 
-internal class InitialSyncResponseParser @Inject constructor(private val moshi: Moshi) {
+internal class InitialSyncResponseParser @Inject constructor(
+        private val moshi: Moshi,
+        private val roomSyncEphemeralTemporaryStore: RoomSyncEphemeralTemporaryStore
+) {
 
     fun parse(syncStrategy: InitialSyncStrategy.Optimized, workingFile: File): SyncResponse {
         val syncResponseLength = workingFile.length().toInt()
         Timber.v("INIT_SYNC Sync file size is $syncResponseLength bytes")
         val shouldSplit = syncResponseLength >= syncStrategy.minSizeToSplit
         Timber.v("INIT_SYNC should split in several files: $shouldSplit")
-        return getMoshi(syncStrategy, workingFile.parentFile!!, shouldSplit)
+        return getMoshi(syncStrategy, shouldSplit)
                 .adapter(SyncResponse::class.java)
                 .fromJson(workingFile.source().buffer())!!
     }
 
-    private fun getMoshi(syncStrategy: InitialSyncStrategy.Optimized, workingDirectory: File, shouldSplit: Boolean): Moshi {
+    private fun getMoshi(syncStrategy: InitialSyncStrategy.Optimized, shouldSplit: Boolean): Moshi {
         // If we don't have to split we'll rely on the already default moshi
         if (!shouldSplit) return moshi
         // Otherwise, we create a new adapter for handling Map of Lazy sync
         return moshi.newBuilder()
-                .add(SplitLazyRoomSyncJsonAdapter(workingDirectory, syncStrategy))
+                .add(SplitLazyRoomSyncEphemeralJsonAdapter(roomSyncEphemeralTemporaryStore, syncStrategy))
                 .build()
     }
 }

From fe39c92e25a54ffc5437e58e828cc64bcf03728f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 11 Mar 2021 22:24:23 +0100
Subject: [PATCH 283/578] Load RR when opening a timeline

---
 .../session/room/timeline/DefaultTimeline.kt  | 19 +++++-
 .../room/timeline/DefaultTimelineService.kt   | 36 ++++++-----
 .../session/sync/ReadReceiptHandler.kt        | 61 +++++--------------
 .../sync/RoomSyncEphemeralTemporaryStore.kt   |  2 +-
 4 files changed, 54 insertions(+), 64 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index d0946abe28..92877950eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -44,6 +44,7 @@ import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendState
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.database.query.whereRoomId
 import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
+import org.matrix.android.sdk.internal.session.sync.ReadReceiptHandler
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.Debouncer
@@ -73,7 +74,8 @@ internal class DefaultTimeline(
         private val timelineInput: TimelineInput,
         private val eventDecryptor: TimelineEventDecryptor,
         private val realmSessionProvider: RealmSessionProvider,
-        private val loadRoomMembersTask: LoadRoomMembersTask
+        private val loadRoomMembersTask: LoadRoomMembersTask,
+        private val readReceiptHandler: ReadReceiptHandler
 ) : Timeline,
         TimelineHiddenReadReceipts.Delegate,
         TimelineInput.Listener,
@@ -182,11 +184,26 @@ internal class DefaultTimeline(
                         }
                         .executeBy(taskExecutor)
 
+                // Ensure ReadReceipt from init sync are loaded
+                ensureReadReceiptAreLoaded(realm)
+
                 isReady.set(true)
             }
         }
     }
 
+    private fun ensureReadReceiptAreLoaded(realm: Realm) {
+        readReceiptHandler.getContentFromInitSync(roomId)
+                ?.also {
+                    Timber.w("INIT_SYNC Insert when opening timeline RR for room $roomId")
+                }
+                ?.let { readReceiptContent ->
+                    realm.executeTransactionAsync {
+                        readReceiptHandler.handle(it, roomId, readReceiptContent, true)
+                    }
+                }
+    }
+
     private fun TimelineSettings.shouldHandleHiddenReadReceipts(): Boolean {
         return buildReadReceipts && (filters.filterEdits || filters.filterTypes)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index bb774022d4..c3714a1303 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -17,10 +17,10 @@
 package org.matrix.android.sdk.internal.session.room.timeline
 
 import androidx.lifecycle.LiveData
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import dagger.assisted.AssistedFactory
 import com.zhuinden.monarchy.Monarchy
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import io.realm.Sort
 import io.realm.kotlin.where
 import org.matrix.android.sdk.api.session.events.model.isImageMessage
@@ -38,20 +38,23 @@ import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
+import org.matrix.android.sdk.internal.session.sync.ReadReceiptHandler
 import org.matrix.android.sdk.internal.task.TaskExecutor
 
-internal class DefaultTimelineService @AssistedInject constructor(@Assisted private val roomId: String,
-                                                                  @SessionDatabase private val monarchy: Monarchy,
-                                                                  private val realmSessionProvider: RealmSessionProvider,
-                                                                  private val timelineInput: TimelineInput,
-                                                                  private val taskExecutor: TaskExecutor,
-                                                                  private val contextOfEventTask: GetContextOfEventTask,
-                                                                  private val eventDecryptor: TimelineEventDecryptor,
-                                                                  private val paginationTask: PaginationTask,
-                                                                  private val fetchTokenAndPaginateTask: FetchTokenAndPaginateTask,
-                                                                  private val timelineEventMapper: TimelineEventMapper,
-                                                                  private val readReceiptsSummaryMapper: ReadReceiptsSummaryMapper,
-                                                                  private val loadRoomMembersTask: LoadRoomMembersTask
+internal class DefaultTimelineService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        @SessionDatabase private val monarchy: Monarchy,
+        private val realmSessionProvider: RealmSessionProvider,
+        private val timelineInput: TimelineInput,
+        private val taskExecutor: TaskExecutor,
+        private val contextOfEventTask: GetContextOfEventTask,
+        private val eventDecryptor: TimelineEventDecryptor,
+        private val paginationTask: PaginationTask,
+        private val fetchTokenAndPaginateTask: FetchTokenAndPaginateTask,
+        private val timelineEventMapper: TimelineEventMapper,
+        private val readReceiptsSummaryMapper: ReadReceiptsSummaryMapper,
+        private val loadRoomMembersTask: LoadRoomMembersTask,
+        private val readReceiptHandler: ReadReceiptHandler
 ) : TimelineService {
 
     @AssistedFactory
@@ -74,7 +77,8 @@ internal class DefaultTimelineService @AssistedInject constructor(@Assisted priv
                 eventDecryptor = eventDecryptor,
                 fetchTokenAndPaginateTask = fetchTokenAndPaginateTask,
                 realmSessionProvider = realmSessionProvider,
-                loadRoomMembersTask = loadRoomMembersTask
+                loadRoomMembersTask = loadRoomMembersTask,
+                readReceiptHandler = readReceiptHandler
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index 7379962620..c24196ca8f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -90,55 +90,11 @@ internal class ReadReceiptHandler @Inject constructor(
         realm.insertOrUpdate(readReceiptSummaries)
     }
 
-    /**
-     * Example of content:
-     *
-     * <pre>
-     * {
-     *     "type": "m.receipt",
-     *     "content": {
-     *         "$ofZhdeinmEReG_X-agD3J2TIhosEPkuvl62HJ8pVMMs": {
-     *             "m.read": {
-     *                 "@benoit.marty:matrix.org": {
-     *                     "ts": 1610468193999
-     *                 }
-     *             }
-     *         },
-     *         "$ZMa_qwE_w_ZOj_vAxv7JuJeHCQfYzuQblmIZxkYmNMs": {
-     *             "m.read": {
-     *                 "@benoitx:matrix.org": {
-     *                     "ts": 1610468049579
-     *                 },
-     *                 "@benoit.marty:matrix.org": {
-     *                     "ts": 1609156029466
-     *                 }
-     *             }
-     *         }
-     *     }
-     * }
-     * </pre>
-     */
     private fun incrementalSyncStrategy(realm: Realm, roomId: String, content: ReadReceiptContent) {
         // First check if we have data from init sync to handle
-        // TODO Rename contentFromInitSync
-        val initSyncContent = roomSyncEphemeralTemporaryStore.read(roomId)
-                ?.events
-                ?.firstOrNull { it.type == EventType.RECEIPT }
-                ?.let {
-                    @Suppress("UNCHECKED_CAST")
-                    it.content as? ReadReceiptContent
-                }
-                ?.also {
-                    Timber.w("INIT_SYNC Copy RR for room $roomId")
-                }
-
-        initSyncContent?.let {
-            Timber.w("BOOK Copy RR for room $roomId")
-
-            // TODO Merge with data we just received
-            // TODO Store that when we enter the timeline
+        getContentFromInitSync(roomId)?.let {
+            Timber.w("INIT_SYNC Insert during incremental sync RR for room $roomId")
             initialSyncStrategy(realm, roomId, it)
-            roomSyncEphemeralTemporaryStore.delete(roomId)
         }
 
         for ((eventId, receiptDict) in content) {
@@ -163,4 +119,17 @@ internal class ReadReceiptHandler @Inject constructor(
             }
         }
     }
+
+    fun getContentFromInitSync(roomId: String): ReadReceiptContent? {
+        return roomSyncEphemeralTemporaryStore.read(roomId)
+                ?.events
+                ?.firstOrNull { it.type == EventType.RECEIPT }
+                ?.let {
+                    @Suppress("UNCHECKED_CAST")
+                    it.content as? ReadReceiptContent
+                }
+                ?.also {
+                    roomSyncEphemeralTemporaryStore.delete(roomId)
+                }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
index 8d53c63bcc..5241c6f725 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
@@ -45,7 +45,7 @@ internal class RoomSyncEphemeralTemporaryStoreFile @Inject constructor(
      * Write RoomSyncEphemeral to a file
      */
     override fun write(roomId: String, roomSyncEphemeralJson: String) {
-        Timber.w("INIT_SYNC Store RR for room $roomId")
+        Timber.w("INIT_SYNC Store ephemeral events for room $roomId")
         getFile(roomId).writeText(roomSyncEphemeralJson)
     }
 

From 0b0634b53138b941941e312b803d14cb8885b5fb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 11 Mar 2021 22:37:56 +0100
Subject: [PATCH 284/578] Ensure tmp file is always deleted when it is read

---
 .../android/sdk/internal/session/sync/ReadReceiptHandler.kt   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index c24196ca8f..68beddfc5a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -122,14 +122,12 @@ internal class ReadReceiptHandler @Inject constructor(
 
     fun getContentFromInitSync(roomId: String): ReadReceiptContent? {
         return roomSyncEphemeralTemporaryStore.read(roomId)
+                ?.also { roomSyncEphemeralTemporaryStore.delete(roomId) }
                 ?.events
                 ?.firstOrNull { it.type == EventType.RECEIPT }
                 ?.let {
                     @Suppress("UNCHECKED_CAST")
                     it.content as? ReadReceiptContent
                 }
-                ?.also {
-                    roomSyncEphemeralTemporaryStore.delete(roomId)
-                }
     }
 }

From 857bfcb9710784ab073a164d7d67eeb151a52a80 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 12 Mar 2021 12:16:25 +0100
Subject: [PATCH 285/578] Cleanup

---
 CHANGES.md                                                  | 2 +-
 .../android/sdk/internal/session/sync/ReadReceiptHandler.kt | 6 ++----
 .../session/sync/RoomSyncEphemeralTemporaryStore.kt         | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e4ff049550..33bc122e57 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Lazy storage of ReadReceipts
 
 Bugfix 🐛:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index 68beddfc5a..efa578f2b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -121,13 +121,11 @@ internal class ReadReceiptHandler @Inject constructor(
     }
 
     fun getContentFromInitSync(roomId: String): ReadReceiptContent? {
+        @Suppress("UNCHECKED_CAST")
         return roomSyncEphemeralTemporaryStore.read(roomId)
                 ?.also { roomSyncEphemeralTemporaryStore.delete(roomId) }
                 ?.events
                 ?.firstOrNull { it.type == EventType.RECEIPT }
-                ?.let {
-                    @Suppress("UNCHECKED_CAST")
-                    it.content as? ReadReceiptContent
-                }
+                ?.content as? ReadReceiptContent
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
index 5241c6f725..b9fd4e3d57 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
@@ -35,7 +35,7 @@ internal interface RoomSyncEphemeralTemporaryStore {
 }
 
 internal class RoomSyncEphemeralTemporaryStoreFile @Inject constructor(
-        @SessionFilesDirectory private val fileDirectory: File
+        @SessionFilesDirectory fileDirectory: File
 ) : RoomSyncEphemeralTemporaryStore {
 
     private val workingDir = File(fileDirectory, "rr")

From e3d2186c25eeaf2446f55420250c259dd454485e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 12 Mar 2021 18:41:31 +0100
Subject: [PATCH 286/578] Rework UpdateTrustWorker, should have better perf.

---
 .../crypto/crosssigning/UpdateTrustWorker.kt  | 326 +++++++++---------
 .../android/sdk/internal/util/LogUtil.kt      |  12 +
 2 files changed, 176 insertions(+), 162 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
index 1660bae0b7..a2a90c49cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
@@ -36,12 +36,14 @@ import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.CryptoDatabase
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.SessionComponent
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.util.logLimit
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import timber.log.Timber
@@ -65,11 +67,14 @@ internal class UpdateTrustWorker(context: Context,
     @Inject lateinit var crossSigningService: DefaultCrossSigningService
 
     // It breaks the crypto store contract, but we need to batch things :/
-    @CryptoDatabase @Inject lateinit var realmConfiguration: RealmConfiguration
-    @UserId @Inject lateinit var myUserId: String
+    @CryptoDatabase
+    @Inject lateinit var cryptoRealmConfiguration: RealmConfiguration
+    @SessionDatabase
+    @Inject lateinit var sessionRealmConfiguration: RealmConfiguration
+    @UserId
+    @Inject lateinit var myUserId: String
     @Inject lateinit var crossSigningKeysMapper: CrossSigningKeysMapper
     @Inject lateinit var updateTrustWorkerDataRepository: UpdateTrustWorkerDataRepository
-    @SessionDatabase @Inject lateinit var sessionRealmConfiguration: RealmConfiguration
 
     //    @Inject lateinit var roomSummaryUpdater: RoomSummaryUpdater
     @Inject lateinit var cryptoStore: IMXCryptoStore
@@ -79,118 +84,115 @@ internal class UpdateTrustWorker(context: Context,
     }
 
     override suspend fun doSafeWork(params: Params): Result {
-        var userList = params.filename
+        val userList = params.filename
                 ?.let { updateTrustWorkerDataRepository.getParam(it) }
                 ?.userIds
                 ?: params.updatedUserIds.orEmpty()
 
-        if (userList.isEmpty()) {
-            // This should not happen, but let's avoid go further in case of empty list
-            cleanup(params)
-            return Result.success()
+        // List should not be empty, but let's avoid go further in case of empty list
+        if (userList.isNotEmpty()) {
+            // Unfortunately we don't have much info on what did exactly changed (is it the cross signing keys of that user,
+            // or a new device?) So we check all again :/
+            Timber.d("## CrossSigning - Updating trust for users: ${userList.logLimit()}")
+
+            Realm.getInstance(cryptoRealmConfiguration).use { cryptoRealm ->
+                Realm.getInstance(sessionRealmConfiguration).use { sessionRealm ->
+                    updateTrust(userList, cryptoRealm, sessionRealm)
+                }
+            }
         }
 
-        // Unfortunately we don't have much info on what did exactly changed (is it the cross signing keys of that user,
-        // or a new device?) So we check all again :/
-
-        Timber.d("## CrossSigning - Updating trust for $userList")
+        cleanup(params)
+        return Result.success()
+    }
 
+    private fun updateTrust(userListParam: List<String>,
+                            cRealm: Realm,
+                            sRealm: Realm) {
+        var userList = userListParam
+        var myCrossSigningInfo: MXCrossSigningInfo? = null
         // First we check that the users MSK are trusted by mine
         // After that we check the trust chain for each devices of each users
-        Realm.getInstance(realmConfiguration).use { realm ->
-            realm.executeTransaction {
-                // By mapping here to model, this object is not live
-                // I should update it if needed
-                var myCrossSigningInfo = realm.where(CrossSigningInfoEntity::class.java)
-                        .equalTo(CrossSigningInfoEntityFields.USER_ID, myUserId)
-                        .findFirst()?.let { mapCrossSigningInfoEntity(it) }
+        cRealm.executeTransaction { cryptoRealm ->
+            // By mapping here to model, this object is not live
+            // I should update it if needed
+            myCrossSigningInfo = getCrossSigningInfo(cryptoRealm, myUserId)
 
-                var myTrustResult: UserTrustResult? = null
+            var myTrustResult: UserTrustResult? = null
 
-                if (userList.contains(myUserId)) {
-                    Timber.d("## CrossSigning - Clear all trust as a change on my user was detected")
-                    // i am in the list.. but i don't know exactly the delta of change :/
-                    // If it's my cross signing keys we should refresh all trust
-                    // do it anyway ?
-                    userList = realm.where(CrossSigningInfoEntity::class.java)
-                            .findAll().mapNotNull { it.userId }
-                    Timber.d("## CrossSigning - Updating trust for all $userList")
+            if (userList.contains(myUserId)) {
+                Timber.d("## CrossSigning - Clear all trust as a change on my user was detected")
+                // i am in the list.. but i don't know exactly the delta of change :/
+                // If it's my cross signing keys we should refresh all trust
+                // do it anyway ?
+                userList = cryptoRealm.where(CrossSigningInfoEntity::class.java)
+                        .findAll()
+                        .mapNotNull { it.userId }
 
-                    // check right now my keys and mark it as trusted as other trust depends on it
-                    val myDevices = realm.where<UserEntity>()
-                            .equalTo(UserEntityFields.USER_ID, myUserId)
-                            .findFirst()
-                            ?.devices
-                            ?.map { deviceInfo ->
-                                CryptoMapper.mapToModel(deviceInfo)
-                            }
-                    myTrustResult = crossSigningService.checkSelfTrust(myCrossSigningInfo, myDevices).also {
-                        updateCrossSigningKeysTrust(realm, myUserId, it.isVerified())
-                        // update model reference
-                        myCrossSigningInfo = realm.where(CrossSigningInfoEntity::class.java)
-                                .equalTo(CrossSigningInfoEntityFields.USER_ID, myUserId)
-                                .findFirst()?.let { mapCrossSigningInfoEntity(it) }
-                    }
-                }
+                // check right now my keys and mark it as trusted as other trust depends on it
+                val myDevices = cryptoRealm.where<UserEntity>()
+                        .equalTo(UserEntityFields.USER_ID, myUserId)
+                        .findFirst()
+                        ?.devices
+                        ?.map { CryptoMapper.mapToModel(it) }
 
-                val otherInfos = userList.map {
-                    it to realm.where(CrossSigningInfoEntity::class.java)
-                            .equalTo(CrossSigningInfoEntityFields.USER_ID, it)
-                            .findFirst()?.let { mapCrossSigningInfoEntity(it) }
-                }
-                        .toMap()
+                myTrustResult = crossSigningService.checkSelfTrust(myCrossSigningInfo, myDevices)
+                updateCrossSigningKeysTrust(cryptoRealm, myUserId, myTrustResult.isVerified())
+                // update model reference
+                myCrossSigningInfo = getCrossSigningInfo(cryptoRealm, myUserId)
+            }
 
-                val trusts = otherInfos.map { infoEntry ->
-                    infoEntry.key to when (infoEntry.key) {
-                        myUserId -> myTrustResult
-                        else     -> {
-                            crossSigningService.checkOtherMSKTrusted(myCrossSigningInfo, infoEntry.value).also {
-                                Timber.d("## CrossSigning - user:${infoEntry.key} result:$it")
-                            }
+            val otherInfos = userList.associateWith { userId ->
+                getCrossSigningInfo(cryptoRealm, userId)
+            }
+
+            val trusts = otherInfos.mapValues { entry ->
+                when (entry.key) {
+                    myUserId -> myTrustResult
+                    else     -> {
+                        crossSigningService.checkOtherMSKTrusted(myCrossSigningInfo, entry.value).also {
+                            Timber.d("## CrossSigning - user:${entry.key} result:$it")
                         }
                     }
-                }.toMap()
+                }
+            }
 
-                // TODO! if it's me and my keys has changed... I have to reset trust for everyone!
-                // i have all the new trusts, update DB
-                trusts.forEach {
-                    val verified = it.value?.isVerified() == true
-                    updateCrossSigningKeysTrust(realm, it.key, verified)
+            // TODO! if it's me and my keys has changed... I have to reset trust for everyone!
+            // i have all the new trusts, update DB
+            trusts.forEach {
+                val verified = it.value?.isVerified() == true
+                updateCrossSigningKeysTrust(cryptoRealm, it.key, verified)
+            }
+
+            // Ok so now we have to check device trust for all these users..
+            Timber.v("## CrossSigning - Updating devices cross trust users: ${trusts.keys.logLimit()}")
+            trusts.keys.forEach { userId ->
+                val devicesEntities = cryptoRealm.where<UserEntity>()
+                        .equalTo(UserEntityFields.USER_ID, userId)
+                        .findFirst()
+                        ?.devices
+
+                val trustMap = devicesEntities?.associateWith { device ->
+                    // get up to date from DB has could have been updated
+                    val otherInfo = getCrossSigningInfo(cryptoRealm, userId)
+                    crossSigningService.checkDeviceTrust(myCrossSigningInfo, otherInfo, CryptoMapper.mapToModel(device))
                 }
 
-                // Ok so now we have to check device trust for all these users..
-                Timber.v("## CrossSigning - Updating devices cross trust users ${trusts.keys}")
-                trusts.keys.forEach {
-                    val devicesEntities = realm.where<UserEntity>()
-                            .equalTo(UserEntityFields.USER_ID, it)
-                            .findFirst()
-                            ?.devices
-
-                    val trustMap = devicesEntities?.map { device ->
-                        // get up to date from DB has could have been updated
-                        val otherInfo = realm.where(CrossSigningInfoEntity::class.java)
-                                .equalTo(CrossSigningInfoEntityFields.USER_ID, it)
-                                .findFirst()?.let { mapCrossSigningInfoEntity(it) }
-                        device to crossSigningService.checkDeviceTrust(myCrossSigningInfo, otherInfo, CryptoMapper.mapToModel(device))
-                    }?.toMap()
-
-                    // Update trust if needed
-                    devicesEntities?.forEach { device ->
-                        val crossSignedVerified = trustMap?.get(device)?.isCrossSignedVerified()
-                        Timber.d("## CrossSigning - Trust for ${device.userId}|${device.deviceId} : cross verified: ${trustMap?.get(device)}")
-                        if (device.trustLevelEntity?.crossSignedVerified != crossSignedVerified) {
-                            Timber.d("## CrossSigning - Trust change detected for ${device.userId}|${device.deviceId} : cross verified: $crossSignedVerified")
-                            // need to save
-                            val trustEntity = device.trustLevelEntity
-                            if (trustEntity == null) {
-                                realm.createObject(TrustLevelEntity::class.java).let {
-                                    it.locallyVerified = false
-                                    it.crossSignedVerified = crossSignedVerified
-                                    device.trustLevelEntity = it
-                                }
-                            } else {
-                                trustEntity.crossSignedVerified = crossSignedVerified
+                // Update trust if needed
+                devicesEntities?.forEach { device ->
+                    val crossSignedVerified = trustMap?.get(device)?.isCrossSignedVerified()
+                    Timber.d("## CrossSigning - Trust for ${device.userId}|${device.deviceId} : cross verified: ${trustMap?.get(device)}")
+                    if (device.trustLevelEntity?.crossSignedVerified != crossSignedVerified) {
+                        Timber.d("## CrossSigning - Trust change detected for ${device.userId}|${device.deviceId} : cross verified: $crossSignedVerified")
+                        // need to save
+                        val trustEntity = device.trustLevelEntity
+                        if (trustEntity == null) {
+                            device.trustLevelEntity = cryptoRealm.createObject(TrustLevelEntity::class.java).also {
+                                it.locallyVerified = false
+                                it.crossSignedVerified = crossSignedVerified
                             }
+                        } else {
+                            trustEntity.crossSignedVerified = crossSignedVerified
                         }
                     }
                 }
@@ -201,35 +203,44 @@ internal class UpdateTrustWorker(context: Context,
         // We can now update room shields? in the session DB?
 
         Timber.d("## CrossSigning - Updating shields for impacted rooms...")
-        Realm.getInstance(sessionRealmConfiguration).use { it ->
-            it.executeTransaction { realm ->
-                val distinctRoomIds = realm.where(RoomMemberSummaryEntity::class.java)
-                        .`in`(RoomMemberSummaryEntityFields.USER_ID, userList.toTypedArray())
-                        .distinct(RoomMemberSummaryEntityFields.ROOM_ID)
-                        .findAll()
-                        .map { it.roomId }
-                Timber.d("## CrossSigning -  ... impacted rooms $distinctRoomIds")
-                distinctRoomIds.forEach { roomId ->
-                    val roomSummary = RoomSummaryEntity.where(realm, roomId).findFirst()
-                    if (roomSummary?.isEncrypted == true) {
-                        Timber.d("## CrossSigning - Check shield state for room $roomId")
-                        val allActiveRoomMembers = RoomMemberHelper(realm, roomId).getActiveRoomMemberIds()
-                        try {
-                            val updatedTrust = computeRoomShield(allActiveRoomMembers, roomSummary)
-                            if (roomSummary.roomEncryptionTrustLevel != updatedTrust) {
-                                Timber.d("## CrossSigning - Shield change detected for $roomId -> $updatedTrust")
-                                roomSummary.roomEncryptionTrustLevel = updatedTrust
-                            }
-                        } catch (failure: Throwable) {
-                            Timber.e(failure)
-                        }
+        sRealm.executeTransaction { sessionRealm ->
+            sessionRealm.where(RoomMemberSummaryEntity::class.java)
+                    .`in`(RoomMemberSummaryEntityFields.USER_ID, userList.toTypedArray())
+                    .distinct(RoomMemberSummaryEntityFields.ROOM_ID)
+                    .findAll()
+                    .map { it.roomId }
+                    .also { Timber.d("## CrossSigning -  ... impacted rooms ${it.logLimit()}") }
+                    .forEach { roomId ->
+                        RoomSummaryEntity.where(sessionRealm, roomId)
+                                .equalTo(RoomSummaryEntityFields.IS_ENCRYPTED, true)
+                                .findFirst()
+                                ?.let { roomSummary ->
+                                    Timber.d("## CrossSigning - Check shield state for room $roomId")
+                                    val allActiveRoomMembers = RoomMemberHelper(sessionRealm, roomId).getActiveRoomMemberIds()
+                                    try {
+                                        val updatedTrust = computeRoomShield(
+                                                myCrossSigningInfo,
+                                                cRealm,
+                                                allActiveRoomMembers,
+                                                roomSummary
+                                        )
+                                        if (roomSummary.roomEncryptionTrustLevel != updatedTrust) {
+                                            Timber.d("## CrossSigning - Shield change detected for $roomId -> $updatedTrust")
+                                            roomSummary.roomEncryptionTrustLevel = updatedTrust
+                                        }
+                                    } catch (failure: Throwable) {
+                                        Timber.e(failure)
+                                    }
+                                }
                     }
-                }
-            }
         }
+    }
 
-        cleanup(params)
-        return Result.success()
+    private fun getCrossSigningInfo(cryptoRealm: Realm, userId: String): MXCrossSigningInfo? {
+        return cryptoRealm.where(CrossSigningInfoEntity::class.java)
+                .equalTo(CrossSigningInfoEntityFields.USER_ID, userId)
+                .findFirst()
+                ?.let { mapCrossSigningInfoEntity(it) }
     }
 
     private fun cleanup(params: Params) {
@@ -237,30 +248,34 @@ internal class UpdateTrustWorker(context: Context,
                 ?.let { updateTrustWorkerDataRepository.delete(it) }
     }
 
-    private fun updateCrossSigningKeysTrust(realm: Realm, userId: String, verified: Boolean) {
-        val xInfoEntity = realm.where(CrossSigningInfoEntity::class.java)
+    private fun updateCrossSigningKeysTrust(cryptoRealm: Realm, userId: String, verified: Boolean) {
+        cryptoRealm.where(CrossSigningInfoEntity::class.java)
                 .equalTo(CrossSigningInfoEntityFields.USER_ID, userId)
                 .findFirst()
-        xInfoEntity?.crossSigningKeys?.forEach { info ->
-            // optimization to avoid trigger updates when there is no change..
-            if (info.trustLevelEntity?.isVerified() != verified) {
-                Timber.d("## CrossSigning - Trust change for $userId : $verified")
-                val level = info.trustLevelEntity
-                if (level == null) {
-                    val newLevel = realm.createObject(TrustLevelEntity::class.java)
-                    newLevel.locallyVerified = verified
-                    newLevel.crossSignedVerified = verified
-                    info.trustLevelEntity = newLevel
-                } else {
-                    level.locallyVerified = verified
-                    level.crossSignedVerified = verified
+                ?.crossSigningKeys
+                ?.forEach { info ->
+                    // optimization to avoid trigger updates when there is no change..
+                    if (info.trustLevelEntity?.isVerified() != verified) {
+                        Timber.d("## CrossSigning - Trust change for $userId : $verified")
+                        val level = info.trustLevelEntity
+                        if (level == null) {
+                            info.trustLevelEntity = cryptoRealm.createObject(TrustLevelEntity::class.java).also {
+                                it.locallyVerified = verified
+                                it.crossSignedVerified = verified
+                            }
+                        } else {
+                            level.locallyVerified = verified
+                            level.crossSignedVerified = verified
+                        }
+                    }
                 }
-            }
-        }
     }
 
-    private fun computeRoomShield(activeMemberUserIds: List<String>, roomSummaryEntity: RoomSummaryEntity): RoomEncryptionTrustLevel {
-        Timber.d("## CrossSigning - computeRoomShield ${roomSummaryEntity.roomId} -> $activeMemberUserIds")
+    private fun computeRoomShield(myCrossSigningInfo: MXCrossSigningInfo?,
+                                  cryptoRealm: Realm,
+                                  activeMemberUserIds: List<String>,
+                                  roomSummaryEntity: RoomSummaryEntity): RoomEncryptionTrustLevel {
+        Timber.d("## CrossSigning - computeRoomShield ${roomSummaryEntity.roomId} -> ${activeMemberUserIds.logLimit()}")
         // The set of “all users” depends on the type of room:
         // For regular / topic rooms which have more than 2 members (including yourself) are considered when decorating a room
         // For 1:1 and group DM rooms, all other users (i.e. excluding yourself) are considered when decorating a room
@@ -272,17 +287,8 @@ internal class UpdateTrustWorker(context: Context,
 
         val allTrustedUserIds = listToCheck
                 .filter { userId ->
-                    Realm.getInstance(realmConfiguration).use {
-                        it.where(CrossSigningInfoEntity::class.java)
-                                .equalTo(CrossSigningInfoEntityFields.USER_ID, userId)
-                                .findFirst()?.let { mapCrossSigningInfoEntity(it) }?.isTrusted() == true
-                    }
+                    getCrossSigningInfo(cryptoRealm, userId)?.isTrusted() == true
                 }
-        val myCrossKeys = Realm.getInstance(realmConfiguration).use {
-            it.where(CrossSigningInfoEntity::class.java)
-                    .equalTo(CrossSigningInfoEntityFields.USER_ID, myUserId)
-                    .findFirst()?.let { mapCrossSigningInfoEntity(it) }
-        }
 
         return if (allTrustedUserIds.isEmpty()) {
             RoomEncryptionTrustLevel.Default
@@ -291,21 +297,17 @@ internal class UpdateTrustWorker(context: Context,
             // If all devices of all verified users are trusted -> green
             // else -> black
             allTrustedUserIds
-                    .mapNotNull { uid ->
-                        Realm.getInstance(realmConfiguration).use {
-                            it.where<UserEntity>()
-                                    .equalTo(UserEntityFields.USER_ID, uid)
-                                    .findFirst()
-                                    ?.devices
-                                    ?.map {
-                                        CryptoMapper.mapToModel(it)
-                                    }
-                        }
+                    .mapNotNull { userId ->
+                        cryptoRealm.where<UserEntity>()
+                                .equalTo(UserEntityFields.USER_ID, userId)
+                                .findFirst()
+                                ?.devices
+                                ?.map { CryptoMapper.mapToModel(it) }
                     }
                     .flatten()
                     .let { allDevices ->
-                        Timber.v("## CrossSigning - computeRoomShield ${roomSummaryEntity.roomId} devices ${allDevices.map { it.deviceId }}")
-                        if (myCrossKeys != null) {
+                        Timber.v("## CrossSigning - computeRoomShield ${roomSummaryEntity.roomId} devices ${allDevices.map { it.deviceId }.logLimit()}")
+                        if (myCrossSigningInfo != null) {
                             allDevices.any { !it.trustLevel?.crossSigningVerified.orFalse() }
                         } else {
                             // Legacy method
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
index fe68b49a5c..bfa723c160 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
@@ -19,6 +19,18 @@ package org.matrix.android.sdk.internal.util
 import org.matrix.android.sdk.BuildConfig
 import timber.log.Timber
 
+internal fun <T> Collection<T>.logLimit(maxQuantity: Int = 5): String {
+    return buildString {
+        append(size)
+        append(" item(s)")
+        if (size > maxQuantity) {
+            append(", first $maxQuantity items")
+        }
+        append(": ")
+        append(this@logLimit.take(maxQuantity))
+    }
+}
+
 internal suspend fun <T> logDuration(message: String,
                                      block: suspend () -> T): T {
     Timber.v("$message -- BEGIN")

From 0c774c098f5b4d5deb9586a1c1658648c2d9e0ff Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 12 Mar 2021 19:08:57 +0100
Subject: [PATCH 287/578] No op for empty list

---
 .../sdk/internal/session/room/summary/RoomSummaryUpdater.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index fff780fb0c..4a89e1ccb4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -144,7 +144,7 @@ internal class RoomSummaryUpdater @Inject constructor(
 
             roomSummaryEntity.otherMemberIds.clear()
             roomSummaryEntity.otherMemberIds.addAll(otherRoomMembers)
-            if (roomSummaryEntity.isEncrypted) {
+            if (roomSummaryEntity.isEncrypted && otherRoomMembers.isNotEmpty()) {
                 // mmm maybe we could only refresh shield instead of checking trust also?
                 crossSigningService.onUsersDeviceUpdate(otherRoomMembers)
             }

From 70ad270f266b577e99d652de95c5684438a378e7 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Thu, 11 Mar 2021 20:29:55 +0000
Subject: [PATCH 288/578] Translated using Weblate (Catalan)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
---
 vector/src/main/res/values-ca/strings.xml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 8e99a0a924..d5a9ed5b3e 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -880,7 +880,7 @@
 \n
 \nSessions desconegudes:</string>
     <!-- directory activity  -->
-    <string name="select_room_directory">Escolliu un directori de sale</string>
+    <string name="select_room_directory">Tria un directori de sales</string>
     <string name="directory_server_fail_to_retrieve_server">És possible que el servidor no estigui disponible o que estigui sobrecarregat</string>
     <string name="directory_server_type_homeserver">Introdueix un servidor base per veure les seves sales públiques</string>
     <string name="directory_server_placeholder">URL del servidor base</string>
@@ -1513,7 +1513,7 @@
     <string name="create_new_room">Crea sala nova</string>
     <string name="error_no_network">No hi ha xarxa. Si us plau comproveu la vostra connexió a internet.</string>
     <string name="action_change">Canviar</string>
-    <string name="change_room_directory_network">Canviar de xarxa</string>
+    <string name="change_room_directory_network">Canvia de xarxa</string>
     <string name="please_wait">Espereu, si us plau…</string>
     <string name="group_all_communities">Totes les comunitats</string>
     <string name="room_preview_no_preview">Aquesta sala no es pot pre-visualitzar</string>
@@ -1702,7 +1702,7 @@
     <string name="labs_swipe_to_reply_in_timeline">Activa lliscar per respondre a la cronologia</string>
     <string name="user_directory_search_hint">Cerca a partir del nom o l\'ID</string>
     <string name="room_directory_search_hint">Nom o ID (#exemple:matrix.org)</string>
-    <string name="room_filtering_footer_open_room_directory">Veu el directori de la sala</string>
+    <string name="room_filtering_footer_open_room_directory">Mostra el directori de la sales</string>
     <string name="room_filtering_footer_create_new_room">Crea una nova sala</string>
     <string name="room_filtering_footer_title">No trobes el què busques\?</string>
     <string name="no_message_edits_found">No s\'han trobat edicions</string>
@@ -2145,7 +2145,7 @@
         <item quantity="one">%d usuari vetat</item>
         <item quantity="other">%d usuaris vetats</item>
     </plurals>
-    <string name="room_alias_publish_to_directory_error">No s\'ha pogut obtenir la visibilitat actual del directori de sala (%1$s).</string>
+    <string name="room_alias_publish_to_directory_error">No s\'ha pogut obtenir la visibilitat actual del directori de sales (%1$s).</string>
     <string name="room_alias_publish_to_directory">Publicar aquesta sala al directori públic de sales %1$s\?</string>
     <string name="room_alias_action_publish">Publica l\'adreça</string>
     <string name="room_alias_action_unpublish">Anul·la la publicació de l\'adreça</string>
@@ -2729,4 +2729,15 @@
     <string name="a11y_delete_avatar">Elimina la icona</string>
     <string name="a11y_change_avatar">Canvia la icona</string>
     <string name="settings_server_upload_size_content">El servidor local accepta fitxers adjunts (fotos, fitxers, etc) de fins a una mida de %s.</string>
+    <string name="settings_category_room_directory">Directori de sales</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Mostra totes les sales al directori de sales, incloses aquelles amb contingut explícit.</string>
+    <string name="settings_room_directory_show_all_rooms">Mostra sales amb contingut explícit</string>
+    <string name="event_status_delete_all_failed_dialog_message">Estàs segur que vols eliminar tots els missatges no enviats d\'aquesta sala\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Elimina missatges no enviats</string>
+    <string name="event_status_failed_messages_warning">Missatges amb enviament fallit</string>
+    <string name="event_status_cancel_sending_dialog_message">Vols aturar l\'enviament del missatge\?</string>
+    <string name="event_status_a11y_delete_all">Elimina tots els missatges fallits</string>
+    <string name="event_status_a11y_failed">Ha fallat</string>
+    <string name="event_status_a11y_sent">Enviat</string>
+    <string name="event_status_a11y_sending">Enviant</string>
 </resources>
\ No newline at end of file

From 116ed9b4a85bfd05461a430d73d8390ca7da0ea0 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Thu, 11 Mar 2021 19:09:26 +0000
Subject: [PATCH 289/578] Translated using Weblate (Czech)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
---
 vector/src/main/res/values-cs/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 03b733be05..341300cbf9 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2712,4 +2712,15 @@
     <string name="action_switch">Přepnout</string>
     <string name="initial_sync_start_downloading">Úvodní synchronizace:
 \nStahuji data…</string>
+    <string name="event_status_delete_all_failed_dialog_message">Opravdu chcete smazat všechny neodeslané zprávy v této místnosti\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Smazat neodeslané zprávy</string>
+    <string name="event_status_failed_messages_warning">Zprávy se nepodařilo odeslat</string>
+    <string name="event_status_cancel_sending_dialog_message">Chcete zrušit odesílání zprávy\?</string>
+    <string name="event_status_a11y_delete_all">Smazat všechny zprávy, které se nepodařilo odeslat</string>
+    <string name="event_status_a11y_failed">Selhalo</string>
+    <string name="event_status_a11y_sent">Odesláno</string>
+    <string name="event_status_a11y_sending">Odesílá se</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Zobrazit všechny místnosti v adresáři místností, včetně místností s explicitním obsahem.</string>
+    <string name="settings_room_directory_show_all_rooms">Zobrazit místnosti s explicitním obsahem</string>
+    <string name="settings_category_room_directory">Adresář místností</string>
 </resources>
\ No newline at end of file

From a00a6d3fb5c9a740f80e7e2e5e85f21751864076 Mon Sep 17 00:00:00 2001
From: tiptoptom <ichbintom@telegmail.com>
Date: Thu, 11 Mar 2021 20:52:40 +0000
Subject: [PATCH 290/578] Translated using Weblate (German)

Currently translated at 99.5% (2351 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 437c517574..a343090949 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2722,4 +2722,5 @@
 \nLade Daten herunter…</string>
     <string name="initial_sync_start_server_computing">Erste Synchronisation:
 \nWarte auf Serverantwort…</string>
+    <string name="event_status_a11y_sent">Gesendet</string>
 </resources>
\ No newline at end of file

From db9933f2a1112f6e8f8fe7d3a9f570546e748e03 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Thu, 11 Mar 2021 20:50:54 +0000
Subject: [PATCH 291/578] Translated using Weblate (German)

Currently translated at 99.5% (2351 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index a343090949..1e9adff2d1 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -348,7 +348,7 @@
     <string name="no_result_placeholder">Keine Ergebnisse</string>
     <!-- Rooms fragment -->
     <string name="rooms_header">Räume</string>
-    <string name="rooms_directory_header">Raum-Verzeichnis</string>
+    <string name="rooms_directory_header">Raumverzeichnis</string>
     <string name="no_room_placeholder">Keine Räume</string>
     <string name="no_public_room_placeholder">Keine öffentl. Räume verfügbar</string>
     <plurals name="public_room_nb_users">
@@ -2723,4 +2723,5 @@
     <string name="initial_sync_start_server_computing">Erste Synchronisation:
 \nWarte auf Serverantwort…</string>
     <string name="event_status_a11y_sent">Gesendet</string>
+    <string name="settings_category_room_directory">Raumverzeichnis</string>
 </resources>
\ No newline at end of file

From deabaf2e34f9146d41b0c6186cbf56ffb0d57363 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Thu, 11 Mar 2021 20:02:42 +0000
Subject: [PATCH 292/578] Translated using Weblate (German)

Currently translated at 99.5% (2351 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 1e9adff2d1..6c646775a7 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2724,4 +2724,5 @@
 \nWarte auf Serverantwort…</string>
     <string name="event_status_a11y_sent">Gesendet</string>
     <string name="settings_category_room_directory">Raumverzeichnis</string>
+    <string name="action_switch">Wechseln</string>
 </resources>
\ No newline at end of file

From 840ee66903b25d60e370c677448a6a4b162438f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 11 Mar 2021 18:40:40 +0000
Subject: [PATCH 293/578] Translated using Weblate (Estonian)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
---
 vector/src/main/res/values-et/strings.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 2dd13ede4a..2b4a0e0590 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2556,7 +2556,7 @@
     <string name="room_permissions_change_history_visibility">Muuda vestlusajaloo nähtavust</string>
     <string name="room_permissions_enable_room_encryption">Võta jututoas kasutusele krüptimine</string>
     <string name="room_permissions_change_main_address_for_the_room">Muuda jututoa põhiaadressi</string>
-    <string name="room_permissions_change_room_avatar">Muuda jututoa profiilipilti ehk avatari</string>
+    <string name="room_permissions_change_room_avatar">Muuda jututoa tunnuspilti ehk avatari</string>
     <string name="room_permissions_modify_widgets">Muuda vidinaid</string>
     <string name="room_permissions_notify_everyone">Teavita kõiki</string>
     <string name="room_permissions_remove_messages_sent_by_others">Kustuta teiste saadetud sõnumid</string>
@@ -2598,7 +2598,7 @@
     <string name="call_tile_ended">See kõne on lõppenud</string>
     <string name="call_tile_other_declined">%1$s keeldus kõnest</string>
     <string name="call_tile_you_declined">Sa keeldusid %1$s kõnest</string>
-    <string name="call_tile_in_call">Sul on parasjagu see mõne pooleli</string>
+    <string name="call_tile_in_call">Sul on parasjagu see kõne pooleli</string>
     <string name="call_tile_other_started_call">%1$s alustas kõnet</string>
     <string name="call_tile_you_started_call">Sa alustasid kõnet</string>
     <string name="call_held_by_you">Sina panid kõne ootele</string>
@@ -2661,4 +2661,15 @@
 \nLaadin andmed alla…</string>
     <string name="initial_sync_start_server_computing">Esmane sünkroniseerimine:
 \nOotan serveri vastust…</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Näita jututubade kataloogist kõiki jututubasid, sealhulgas neid, kus on ebasobilikku sisu.</string>
+    <string name="settings_room_directory_show_all_rooms">Näita jututubasid, kus on ebasobilikku sisu</string>
+    <string name="event_status_failed_messages_warning">Nende sõnumite saatmine ei õnnestunud</string>
+    <string name="event_status_delete_all_failed_dialog_message">Kas sa kindlasti soovid sellest jututoast kustutada kõik saatmata sõnumid\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Kustuta saatmata sõnumid</string>
+    <string name="event_status_cancel_sending_dialog_message">Kas sa soovid katkestada sõnumi saatmist\?</string>
+    <string name="event_status_a11y_delete_all">Kustuta kõik sõnumid, mille saatmine ei õnnestunud</string>
+    <string name="event_status_a11y_failed">Saatmine ei õnnestunud</string>
+    <string name="event_status_a11y_sent">Saadetud</string>
+    <string name="event_status_a11y_sending">Saadan</string>
+    <string name="settings_category_room_directory">Jututubade kataloog</string>
 </resources>
\ No newline at end of file

From 77f2ceaef913d35701cba40b4de619ab6606c933 Mon Sep 17 00:00:00 2001
From: Louis Raymond <blackccxex@gmail.com>
Date: Fri, 12 Mar 2021 08:07:27 +0000
Subject: [PATCH 294/578] Translated using Weblate (Indonesian)

Currently translated at 33.5% (792 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
---
 vector/src/main/res/values-in/strings.xml | 318 +++++-----------------
 1 file changed, 72 insertions(+), 246 deletions(-)

diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index af8863355c..3afab6fa23 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -1,11 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="room_displayname_invite_from">Undang dari %s</string>
     <string name="room_displayname_room_invite">Undangan Ruang</string>
     <string name="room_displayname_two_members">%1$s dan %2$s</string>
-
     <string name="room_displayname_empty_room">Ruang kosong</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="other">%1$s dan %2$d yang lain</item>
     </plurals>
@@ -30,37 +28,30 @@
     <string name="action_video_call">Panggilan Video</string>
     <string name="action_quick_reply">Balasan Cepat</string>
     <string name="dialog_title_warning">Peringatan</string>
-
     <string name="dialog_title_confirmation">Konfirmasi</string>
     <string name="action_open">Buka</string>
     <string name="action_close">Tutup</string>
     <string name="disable">Nonaktifkan</string>
-
     <string name="bottom_action_favourites">Favorit</string>
     <string name="home_filter_placeholder_home">Cari ruang</string>
     <string name="home_filter_placeholder_favorites">Cari favorit</string>
     <string name="home_filter_placeholder_people">Cari orang</string>
     <string name="home_filter_placeholder_rooms">Cari ruang</string>
-
     <string name="user_directory_header">Direktori Pengguna</string>
     <string name="no_result_placeholder">Tidak ada hasil</string>
-
     <string name="no_public_room_placeholder">Ruang umum belum tersedia</string>
     <string name="rooms_directory_header">Direktori ruang</string>
     <string name="send_bug_report_include_logs">Kirim log</string>
     <string name="send_bug_report_placeholder">Deskripsikan kendala Anda di sini</string>
     <string name="send_bug_report_sent">Laporan bug telah berhasil dikirimkan</string>
     <string name="read_receipt">Baca</string>
-
     <string name="create_account">Daftar</string>
     <string name="login">Masuk</string>
     <string name="logout">Copot akun</string>
     <string name="hs_url">URL Server Mula</string>
     <string name="search">Cari</string>
-
     <string name="start_new_chat">Mulai Obrolan Baru</string>
     <string name="option_take_photo_video">Ambil foto atau video</string>
-
     <string name="auth_submit">Kirim</string>
     <string name="auth_password_placeholder">Password</string>
     <string name="auth_new_password_placeholder">Password Baru</string>
@@ -85,29 +76,24 @@
     <string name="missing_permissions_title_to_start_conf_call">Tidak dapat memulai panggilan</string>
     <string name="action_sign_out">Keluar</string>
     <string name="offline">Offline</string>
-
     <string name="action_global_search">Pencarian global</string>
     <string name="action_mark_all_as_read">Tandai semua sudah dibaca</string>
     <string name="bottom_action_people">Orang</string>
     <string name="bottom_action_rooms">Ruang</string>
-
     <string name="invitations_header">Undangan</string>
     <string name="direct_chats_header">Percakapan</string>
     <string name="local_address_book_header">Buku alamat lokal</string>
     <string name="low_priority_header">Prioritas rendah</string>
-
     <string name="matrix_only_filter">Hanya kontak Matrix</string>
     <string name="rooms_header">Ruang</string>
     <string name="send_bug_report">Laporan bug</string>
     <string name="send_bug_report_app_crashed">"Aplikasi gagal saat terakhir digunakan. Apakah Anda ingin membuka  halaman laporan kegagalan?"</string>
-
     <string name="join_room">Gabung di Ruang</string>
     <string name="identity_url">URL Server Identity</string>
     <string name="start_voice_call">Mulai Panggilan Suara</string>
     <string name="auth_login">Masuk</string>
     <string name="auth_register">Buat Akun</string>
     <string name="start_video_call">Mulai Panggilan Video</string>
-
     <string name="option_send_files">Kirim file</string>
     <string name="auth_invalid_password">Password terlalu pendek (min 6)</string>
     <string name="auth_email_already_defined">Alamat email ini sudah terdefinisi.</string>
@@ -124,35 +110,29 @@
     <string name="login_error_unable_login">Tidak bisa masuk</string>
     <string name="login_error_unable_register">Tidak bisa registrasi</string>
     <string name="login_error_invalid_home_server">Masukkan URL yang benar</string>
-
     <string name="login_error_user_in_use">Nama pengguna sudah terpakai</string>
     <string name="compression_opt_list_original">Asli</string>
     <string name="compression_opt_list_large">Besar</string>
     <string name="compression_opt_list_medium">Sedang</string>
     <string name="compression_opt_list_small">Kecil</string>
-
     <string name="yesterday">Kemarin</string>
     <string name="attachment_cancel_download">Batalkan unduhan?</string>
     <string name="attachment_cancel_upload">Batalkan unggahan?</string>
     <string name="today">Hari ini</string>
-
     <string name="room_info_room_name">Nama ruang</string>
     <string name="call_connected">Panggilan terhubung</string>
     <string name="call_connecting">Menyambungkan panggilan…</string>
     <string name="call_ended">Panggilan diakhiri</string>
-
     <string name="permissions_rationale_popup_title">Informasi</string>
     <string name="media_slider_saved">Tersimpan</string>
     <string name="media_slider_saved_message">Simpan di Downloads?</string>
     <string name="yes">YA</string>
     <string name="no">TIDAK</string>
     <string name="_continue">Lanjut</string>
-
     <string name="remove">Hapus</string>
     <string name="join">Gabung</string>
     <string name="preview">Pratinjau</string>
     <string name="reject">Tolak</string>
-
     <string name="later">Nanti</string>
     <string name="send_anyway">Kirim Saja</string>
     <string name="template_no_contact_access_placeholder">${app_name} belum diijinkan untuk mengakses kontak lokal</string>
@@ -169,13 +149,12 @@
     <string name="select_room_directory">Pilih direktori ruang</string>
     <string name="unknown_devices_alert_title">Terdapat perangkat tidak diketahui di ruang</string>
     <string name="encryption_information_verify_key_match">Saya verifikasi bahwa kuncinya sesuai</string>
-
     <string name="encryption_information_unknown_device">perangkat tidak diketahui</string>
     <string name="encryption_information_verified">Terverifikasi</string>
     <string name="title_activity_historical">Jejak Percakapan</string>
-
     <string name="redact">Hapus</string>
-    <string name="ongoing_conference_call">Panggilan massal sedang berlangsung.\nBergabunglah lewat %1$s atau %2$s.</string>
+    <string name="ongoing_conference_call">Panggilan massal sedang berlangsung.
+\nBergabung sebagai %1$s atau %2$s</string>
     <string name="ongoing_conference_call_voice">suara</string>
     <string name="ongoing_conference_call_video">video</string>
     <string name="missing_permissions_warning">Beberapa fitur tidak dapat digunakan karena aplikasi belum mendapat ijin…</string>
@@ -189,14 +168,12 @@
     <plurals name="public_room_nb_users">
         <item quantity="other">%d pengguna</item>
     </plurals>
-
     <string name="send_bug_report_include_screenshot">Kirim tampilan layar</string>
     <string name="send_bug_report_description">Mohon uraikan bug tersebut. Apa yang Anda lakukan? Apa yang Anda harapkan terjadi? Apa yang sebenarnya terjadi?</string>
     <string name="send_bug_report_logs_description">Log dari klien akan dikirim bersama laporan gangguan ini untuk mendalami kendala yang Anda temukan. Laporan gangguan ini, termasuk log dan rekalayar, tidak akan dilihat oleh khalayak umum. Jika Anda hanya ingin mengirimkan tulisan di atas, silahkan hapus centang:</string>
     <string name="send_bug_report_alert_message">Sepertinya Anda mengguncang telepon akibat frustrasi. Apakah Anda ingin membuka halaman laporan bug?</string>
     <string name="send_bug_report_failed">Pengiriman laporan bug gagal (%s)</string>
     <string name="send_bug_report_progress">Kemajuan (%s%%)</string>
-
     <string name="send_files_in">Kirim ke</string>
     <string name="username">Nama Pengguna</string>
     <string name="auth_invalid_login_param">Nama pengguna dan/atau kata sandi salah</string>
@@ -207,18 +184,17 @@
     <string name="auth_missing_email_or_phone">Alamat email atau nomor telpon belum dimasukkan</string>
     <string name="auth_use_server_options">Gunakan server lain (lanjutan)</string>
     <string name="auth_email_validation_message">Silahkan periksa email Anda untuk melanjutkan pendaftaran</string>
-    <string name="auth_threepid_warning_message">Pendaftaran dengan email sekaligus nomor telpon belum didukung sampai API dihadirkan. Hanya nomor telpon yang akan digunakan.
-
-Anda dapat menambah email di profile Anda dalam pengaturan nantinya.</string>
+    <string name="auth_threepid_warning_message">Pendaftaran dengan menggunakan email dan nomor telepon tidak didukung sampai API dihadirkan. Hanya nomor telepon anda yang akan digunakan.
+\n
+\nAnda dapat menambahkan email di profil anda melalui menu pengaturan.</string>
     <string name="auth_username_in_use">Nama pengguna yang terpakai</string>
     <string name="auth_reset_password_message">Untuk menyetel ulang kata sandi Anda, silahkan masukkan alamat email yang tertaut ke akun Anda:</string>
     <string name="auth_reset_password_missing_email">Anda perlu memasukkan alamat email yang tertaut pada akun.</string>
-    <string name="auth_reset_password_email_validation_message">"Selembar email telah dikirim ke %s. Setelah Anda mengikuti tautan yang termuat di dalamnya, klik  yang di bawah."</string>
+    <string name="auth_reset_password_email_validation_message">Surel telah dikirim ke alamat %s. Setelah Anda mengikuti tautan yang termuat di dalamnya, klik di bawah.</string>
     <string name="auth_reset_password_error_unauthorized">Verifikasi alamat email gagal: pastikan tautan yang termuat di email telah diklik</string>
     <string name="auth_reset_password_success_message">Kata sandi Anda telah disetel ulang.
-
-Anda telah dikeluarkan dari semua perangkat dan tidak lagi menerima pemberitahuan dorongan. Untuk menerima kembali pemberitahuan, masuk kembali dengan tiap perangkat.</string>
-
+\n
+\nAnda telah dikeluarkan dari seluruh sesi dan tidak lagi menerima push notification. Untuk kembali menerima pemberitahuan, masuklah kembali dengan tiap perangkat.</string>
     <string name="login_error_network_error">Tidak dapat masuk: Gangguan jaringan</string>
     <string name="login_error_registration_network_error">Tidak dapat mendaftar: Gangguan jaringan</string>
     <string name="login_error_unable_register_mail_ownership">Tidak dapat mendaftar : gagal memastikan kepemilikan alamat email</string>
@@ -228,58 +204,47 @@ Anda telah dikeluarkan dari semua perangkat dan tidak lagi menerima pemberitahua
     <string name="login_error_not_json">Tidak berisi JSON yang sah</string>
     <string name="login_error_limit_exceeded">Pengajuan yang dikirimkan terlalu banyak</string>
     <string name="login_error_login_email_not_yet">Tautan email masih belum diklik</string>
-
     <string name="read_receipts_list">Baca Daftar Penerimaan</string>
-
-    <string name="compression_options">"Kirim sebagai "</string>
+    <string name="compression_options">Kirim sebagai</string>
     <string name="attachment_remaining_time_seconds">%d d</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$dd</string>
-
     <string name="room_info_room_topic">Topik ruang</string>
-
     <string name="call_ring">Memanggil…</string>
     <string name="incoming_call">Panggilan Masuk</string>
     <string name="incoming_video_call">Panggilan Video Masuk</string>
     <string name="incoming_voice_call">Panggilan Suara Masuk</string>
     <string name="call_in_progress">Panggilan Sedang Berlangsung…</string>
-
     <string name="call_error_ice_failed">Hubungan Media Gagal</string>
     <string name="auth_identity_server">Server Identitas:</string>
     <string name="call_error_camera_init_failed">Tidak dapat memulai kamera</string>
     <string name="call_error_answered_elsewhere">panggilan terjawab di tempat lain</string>
     <string name="media_picker_both_capture_title">Ambil gambar atau video</string>
     <string name="media_picker_cannot_record_video">Tidak bisa merekam video</string>
-
-    <string name="template_permissions_rationale_msg_storage">${app_name} membutuhkan permisi atas akses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
-
-Harap berikan akses pada halaman berikut agar berkas dapat dikirim dari ponsel Anda.</string>
+    <string name="template_permissions_rationale_msg_storage">${app_name} membutuhkan izin untuk mengakses galeri foto dan video Anda untuk mengirim dan menyimpan lampiran.
+\n
+\nHarap berikan akses pada halaman berikut ini agar berkas dapat dikirim dari ponsel Anda.</string>
     <string name="template_permissions_rationale_msg_camera">${app_name} membutuhkan izin Anda untuk mengakses kamera untuk mengambil gambar dan melakukan panggilan video.</string>
-    <string name="permissions_rationale_msg_camera_explanation">
-
-Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
+    <string name="permissions_rationale_msg_camera_explanation">"
+\n
+\nHarap berikan akses pada halaman berikut ini agar dapat melakukan panggilan."</string>
     <string name="template_permissions_rationale_msg_record_audio">${app_name} membutuhkan permisi atas akses mikrofon Anda untuk melakukan panggilan audio.</string>
-    <string name="permissions_rationale_msg_record_audio_explanation">
-
-Harap berikan akses pada halaman berikut agar dapat melakukan panggilan.</string>
-    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} membutuhkan permisi atas akses kamera dan mikrofon Anda untuk melakukan panggilan video.
-
-Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">"
+\n
+\nHarap berikan akses pada halaman berikut ini agar dapat melakukan panggilan."</string>
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} membutuhkan izin untuk mengakses kamera dan mikrofon Anda untuk melakukan panggilan video.
+\n
+\nHarap berikan akses pada halaman berikut ini untuk melakukan panggilan.</string>
     <string name="light_theme">Tema Terang</string>
     <string name="dark_theme">Tema Kelam</string>
     <string name="black_theme">Tema Gelap</string>
-
-    <string name="notification_sync_in_progress">Sedang Sinkronisasi</string>
+    <string name="notification_sync_in_progress">Menyinkronkan…</string>
     <string name="notification_noisy_notifications">Pemberitahuan Berisik</string>
     <string name="notification_silent_notifications">Pemberitahuan Tenteram</string>
-
     <string name="title_activity_bug_report">Laporan Gangguan</string>
     <string name="title_activity_group_details">Detail Komunitas</string>
     <string name="title_activity_choose_sticker">Kirimkan Sticker</string>
-
     <string name="dialog_title_third_party_licences">Lisensi Pihak Ketiga</string>
-
     <string name="loading">Memuat…</string>
-
     <string name="download">Unduh</string>
     <string name="speak">Bicaralah</string>
     <string name="clear">Bersihkan</string>
@@ -287,69 +252,50 @@ Harap berikan akses pada halaman selanjutnya untuk melakukan panggilan.</string>
     <string name="action_exit">Keluar</string>
     <string name="actions">Tindakan</string>
     <string name="bottom_action_groups">Komunitas</string>
-
     <string name="home_filter_placeholder_groups">Mencari komunitas</string>
-
     <string name="system_alerts_header">Peringatan Sistem</string>
-
     <string name="groups_invite_header">Undang</string>
     <string name="groups_header">Komunitas</string>
     <string name="no_group_placeholder">Tidak ada grup</string>
-
     <string name="send_bug_report_description_in_english">Mohon deskripsikan dengan bahasa Inggris apabila memungkinkan.</string>
     <string name="send_bug_report_rage_shake">Guncang perangkat untuk laporan gangguan</string>
-
     <string name="option_send_voice">Kirim Pesan Suara</string>
-
     <string name="start_new_chat_prompt_msg">Apa benar Anda ingin memulai percakapan baru dengan %s?</string>
     <string name="start_voice_call_prompt_msg">Apa benar Anda ingin memulai panggilan suara?</string>
     <string name="start_video_call_prompt_msg">Apa benar Anda ingin memulai panggilan video?</string>
-
     <string name="option_send_sticker">Kirim Sticker</string>
     <string name="option_take_photo">Ambil foto</string>
     <string name="option_take_video">Ambil video</string>
-
     <string name="no_sticker_application_dialog_content">Saat ini Anda belum memiliki pak stiker.
 \n
 \nMau tambah sekarang\?</string>
-
     <string name="go_on_with">lanjutkan dengan…</string>
     <string name="error_no_external_application_found">Maaf, tidak ada aplikasi eksternal yang mendukung apa yang ingin dilakukan.</string>
-
     <string name="e2e_re_request_encryption_key"><u>Meminta ulang kunci enkripsi</u> dari perangkat Anda yang lain.</string>
-
     <string name="e2e_re_request_encryption_key_sent">Permintaan kunci terkirim.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Permintaan terkirim</string>
     <string name="template_e2e_re_request_encryption_key_dialog_content">Jalankan ${app_name} di perangkat yang dapat mendekripsi pesan tersebut agar kunci dapat dikirim ke perangkat ini.</string>
-
     <string name="groups_list">Daftar Grup</string>
-
     <plurals name="membership_changes">
         <item quantity="other">%d perubahan keanggotaan</item>
     </plurals>
-
     <string name="call">Panggilan</string>
     <string name="template_permissions_rationale_msg_contacts">${app_name} memerlukan permisi untuk mengakses daftar kontak agar dapat mencari pengguna Matrix lain berdasarkan email dan nomor telepon.
 
 Ijinkan akses lewat halaman selanjutnya untuk menemukan pengguna ${app_name} yang terdapat di daftar kontak Anda.</string>
-    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} memerlukan permisi akses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
-
-Bolehkah ${app_name} mengakses daftar kontak Anda?</string>
-
-    <string name="permissions_action_not_performed_missing_permissions">"Maaf.  Tidak dapat dilakukan karena belum menerima permisi"</string>
-
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} memerlukan izin untuk mengakses daftar kontak Anda untuk menemukan pengguna Matrix lain berdasarkan email dan nomor telepon mereka.
+\n
+\nApakah anda bersedia bila ${app_name} mengakses daftar kontak Anda\?</string>
+    <string name="permissions_action_not_performed_missing_permissions">Mohon Maaf. Aksi ini tidak dapat dilakukan karena belum menerima izin terkait</string>
     <string name="list_members">Daftar Anggota</string>
     <string name="open_chat_header">Buka kop</string>
     <string name="room_sync_in_progress">Menyinkronkan…</string>
     <string name="room_jump_to_first_unread">Arahkan ke pesan pertama yang belum terbaca.</string>
-
     <string name="room_preview_invitation_format">Anda telah diundang untuk bergabung ke ruang ini oleh %s</string>
     <string name="room_preview_unlinked_email_warning">Undangan ini dikirim oleh %s, yang tidak terhubung dengan akun ini.
-Anda mungkin ingin masuk dengan akun lain, atau tambahkan email ini ke akun Anda.</string>
+\nAnda mungkin ingin masuk dengan akun lain, atau tambahkan email ini ke akun Anda.</string>
     <string name="room_preview_try_join_an_unknown_room">Anda sedang berupaya untuk mengakses %s. Maukah Anda bergabung untuk berpartisipasi dalam diskusi ini?</string>
     <string name="room_preview_room_interactions_disabled">Ini adalah pratinjau untuk ruang ini. Interaksi dengan ruang belum dapat dilakukan.</string>
-
     <string name="room_creation_title">Percakapan Baru</string>
     <string name="room_creation_add_member">Tambah anggota</string>
     <plurals name="room_header_active_members_count">
@@ -359,7 +305,6 @@ Anda mungkin ingin masuk dengan akun lain, atau tambahkan email ini ke akun Anda
         <item quantity="other">%d anggota</item>
     </plurals>
     <string name="room_title_one_member">1 anggota</string>
-
     <plurals name="format_time_s">
         <item quantity="other">%dd</item>
     </plurals>
@@ -372,23 +317,19 @@ Anda mungkin ingin masuk dengan akun lain, atau tambahkan email ini ke akun Anda
     <plurals name="format_time_d">
         <item quantity="other">$dh</item>
     </plurals>
-
     <string name="room_participants_leave_prompt_title">Tinggalkan ruang</string>
     <string name="room_participants_leave_prompt_msg">Apa benar Anda ingin meninggalkan ruang ini?</string>
     <string name="room_participants_remove_prompt_msg">Apa benar Anda ingin mengeluarkan %s dari percakapan ini?</string>
     <string name="room_participants_create">Buat</string>
-
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Berdiam Diri</string>
     <string name="room_participants_now">%1$s sekarang</string>
     <string name="room_participants_ago">%1$s %2$s yang lalu</string>
-
     <string name="room_participants_header_admin_tools">PERALATAN ADMIN</string>
     <string name="room_participants_header_call">PANGGIL</string>
     <string name="room_participants_header_direct_chats">PERCAKAPAN LANGSUNG</string>
     <string name="room_participants_header_devices">PERANGKAT</string>
-
     <string name="room_participants_action_invite">Undang</string>
     <string name="room_participants_action_leave">Tinggalkan ruang ini</string>
     <string name="room_participants_action_remove">Keluarkan dari ruang ini</string>
@@ -402,15 +343,12 @@ Anda mungkin ingin masuk dengan akun lain, atau tambahkan email ini ke akun Anda
     <string name="room_participants_invite_search_another_user">ID Pengguna, Nama atau email</string>
     <string name="room_participants_action_mention">Sebut</string>
     <string name="room_participants_action_devices_list">Tunjukkan Daftar Perangkat</string>
-    <string name="room_participants_power_level_prompt">Anda tidak akan dapat membalik perubahan ini karena Anda mengangkat pengguna ini agar memiliki kuasa yang setara dengan Anda.
-Yakin?</string>
-
-    <string name="room_participants_ban_prompt_msg">Apa benar Anda ingin melarang pengguna ini dari percakapan ini?</string>
-
+    <string name="room_participants_power_level_prompt">Anda tidak akan dapat mengembalikan perubahan ini setelah Anda mengangkat pengguna ini agar memiliki kuasa yang setara dengan Anda.
+\nApakah anda yakin untuk melanjutkan\?</string>
+    <string name="room_participants_ban_prompt_msg">Melakukan banning pengguna akan mengeluarkannya dari ruangan ini dan mencegahnya untuk kembali masuk.</string>
     <string name="room_participants_invite_prompt_msg">Apa benar Anda ingin mengundang %s ke percakapan ini?</string>
     <string name="room_participants_invite_join_names_and">%1$s dan %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <string name="call_error_user_not_responding">Gagal terjawab oleh pihak lain.</string>
     <string name="room_preview_try_join_an_unknown_room_default">ruang</string>
     <string name="room_participants_invite_join_names">"%1$s, "</string>
@@ -418,11 +356,9 @@ Yakin?</string>
     <string name="people_search_local_contacts">KONTAK LOKAL (%d)</string>
     <string name="people_search_user_directory">DIREKTORI PENGGUNA (%s)</string>
     <string name="people_search_filter_text">Pengguna Matrix saja</string>
-
     <string name="people_search_invite_by_id_dialog_title">Undang pengguna dengan ID</string>
     <string name="people_search_invite_by_id_dialog_description">Masukkan satu atau lebih alamat email atau ID Matrix</string>
     <string name="people_search_invite_by_id_dialog_hint">Email atau ID Matrix</string>
-
     <string name="room_menu_search">Cari</string>
     <string name="room_one_user_is_typing">%s sedang mengetik…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s sedang mengetik…</string>
@@ -443,7 +379,6 @@ Yakin?</string>
     <plurals name="room_new_messages_notification">
         <item quantity="other">%d pesan baru</item>
     </plurals>
-
     <string name="ssl_trust">Percaya</string>
     <string name="ssl_do_not_trust">Tidak percaya</string>
     <string name="ssl_logout_account">Keluar</string>
@@ -455,7 +390,6 @@ Yakin?</string>
     <string name="ssl_unexpected_existing_expl">Sertifikat ini tidak lagi sesuai dengan yang dipercayai oleh perangkat Anda sebelumnya. Ini SANGAT JANGGAL. Kami rekomendasikan Anda untuk TIDAK MENERIMA sertifikat baru ini.</string>
     <string name="ssl_expected_existing_expl">Terdapat perubahan sertifikat yang tidak lagi dipercayai perangkat. Server mungkin telah memperbaharui sertifikatnya. Hubungi administrator server untuk pencocokan sidik jari.</string>
     <string name="ssl_only_accept">Hanya terima sertifikat ini apabila administrator server telah menerbitkan sidik jari yang cocok dengan yang tertera di atas.</string>
-
     <string name="room_details_title">Detail Ruang</string>
     <string name="room_details_people">Orang</string>
     <string name="room_details_files">Berkas</string>
@@ -466,14 +400,12 @@ Yakin?</string>
     <string name="malformed_id">ID tidak sesuai. Seharusnya alamat email atau ID Matrix semisal \'@localport:domain\'</string>
     <string name="room_details_people_invited_group_name">DIUNDANG</string>
     <string name="room_details_people_present_group_name">BERGABUNG</string>
-
     <string name="room_event_action_report_prompt_reason">Alasan laporan konten ini</string>
-    <string name="room_event_action_report_prompt_ignore_user">Apa benar Anda ingin menyembunyikan semua pesan dari pengguna ini?
-
-Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</string>
+    <string name="room_event_action_report_prompt_ignore_user">Apa Anda ingin menyembunyikan seluruh pesan dari pengguna ini\?
+\n
+\nHarap diperhatikan bahwa tindakan ini akan me-restart aplikasi dan mungkin akan memakan waktu beberapa saat.</string>
     <string name="room_event_action_cancel_upload">Batalkan Unggahan</string>
     <string name="room_event_action_cancel_download">Batalkan Unduhan</string>
-
     <string name="search_hint">Cari</string>
     <string name="search_members_hint">Saring anggota ruang</string>
     <string name="search_no_results">Tiada hasil</string>
@@ -481,7 +413,6 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="tab_title_search_messages">PESAN</string>
     <string name="tab_title_search_people">ORANG</string>
     <string name="tab_title_search_files">BERKAS</string>
-
     <string name="room_recents_join">GABUNG</string>
     <string name="room_recents_directory">DIREKTORI</string>
     <string name="room_recents_favourites">FAVORIT</string>
@@ -493,7 +424,6 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="room_recents_join_room">Gabung ke ruang</string>
     <string name="room_recents_join_room_title">Gabung ke ruang</string>
     <string name="room_recents_join_room_prompt">Ketik id atau alias ruang</string>
-
     <string name="directory_search_results_title">Jelajahi direktori</string>
     <plurals name="directory_search_rooms">
         <item quantity="other">%d ruang</item>
@@ -502,7 +432,6 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
         <item quantity="other">%1$s ruang ditemukan untuk %2$s</item>
     </plurals>
     <string name="directory_searching_title">Mencari direktori…</string>
-
     <string name="room_settings_all_messages_noisy">Semua pesan (berisik)</string>
     <string name="room_settings_all_messages">Semua pesan</string>
     <string name="room_settings_mention_only">Hanya sebutan</string>
@@ -513,7 +442,6 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="room_settings_leave_conversation">Tinggalkan Percakapan</string>
     <string name="room_settings_forget">Lupakan</string>
     <string name="room_settings_add_homescreen_shortcut">Tambahkan Shortcut pada Homescreen</string>
-
     <string name="room_sliding_menu_messages">Pesan</string>
     <string name="room_sliding_menu_settings">Pengaturan</string>
     <string name="room_sliding_menu_version">Versi</string>
@@ -521,7 +449,6 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="room_sliding_menu_third_party_notices">Pemberitahuan pihak ketiga</string>
     <string name="room_sliding_menu_copyright">Hak Cipta</string>
     <string name="room_sliding_menu_privacy_policy">Kebijakan Pribadi</string>
-
     <string name="settings_profile_picture">Gambar Profil</string>
     <string name="settings_display_name">Nama Layar</string>
     <string name="settings_email_address">Email</string>
@@ -530,7 +457,6 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="settings_add_phone_number">Tambahkan nomor telepon</string>
     <string name="settings_app_info_link_summary">Tampilkan info aplikasi dalam pengaturan sistem.</string>
     <string name="settings_app_info_link_title">Info aplikasi</string>
-
     <string name="settings_notification_privacy">Kerahasiaan pemberitahuan</string>
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="settings_notification_privacy_reduced">Kerahasiaan diperlemah</string>
@@ -540,12 +466,10 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="settings_notification_privacy_secure_message_content">• Isi pesan pemberitahuan <b> tersimpan langsung dengan aman di homeserver Matrix</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Pemberitahuan memuat <b>meta data dan data pesan</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Pemberitahuan <b>tidak akan menunjukkan isi pesan</b></string>
-
     <string name="settings_notification_ringtone">Suara pemberitahuan</string>
     <string name="settings_enable_all_notif">Perbolehkan pemberitahuan untuk akun ini</string>
     <string name="settings_enable_this_device">Perbolehkan pemberitahuan untuk perangkat ini</string>
     <string name="settings_turn_screen_on">Nyalakan layar selama 3 detik</string>
-
     <string name="settings_containing_my_display_name">Pesan yang berisikan nama layarku</string>
     <string name="settings_containing_my_user_name">Pesan berisikan nama layarku</string>
     <string name="settings_messages_in_one_to_one">Pesan percakapan empat mata</string>
@@ -553,13 +477,11 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="settings_invited_to_room">Kapan saya diundang ke suatu ruang</string>
     <string name="settings_call_invitations">Undangan panggilan</string>
     <string name="settings_messages_sent_by_bot">Pesan yang dikirim bot</string>
-
     <string name="settings_start_on_boot">Mulai sedari boot</string>
     <string name="settings_background_sync">Sinkronisasi di balik layar</string>
     <string name="settings_enable_background_sync">Perbolehkan sinkronisasi di balik layar</string>
     <string name="settings_set_sync_timeout">Batas waktu permohonan sinkronisasi</string>
     <string name="settings_set_sync_delay">Masa tunda sebelum permohonan berikutnya</string>
-
     <string name="settings_version">Versi</string>
     <string name="settings_olm_version">versi olm</string>
     <string name="settings_app_term_conditions">Syarat &amp; ketentuan</string>
@@ -567,9 +489,7 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
         <item quantity="other">%d ruang</item>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s dalam %2$s</string>
-
     <string name="historical_placeholder">Cari sejarah</string>
-
     <string name="widget_no_power_to_manage">Anda butuh permisi untuk mengurus widget di ruang ini</string>
     <string name="widget_creation_failure">Pembuatan widget gagal</string>
     <string name="settings_labs_create_conference_with_jitsi">Buat panggilan konferensi dengan jitsi</string>
@@ -577,7 +497,6 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <plurals name="active_widgets">
         <item quantity="other">%d widget aktif</item>
     </plurals>
-
     <string name="widget_integration_unable_to_create">Tidak dapat membuat widget.</string>
     <string name="widget_integration_failed_to_send_request">Gagal mengirim permohonan.</string>
     <string name="widget_integration_positive_power_level">Tingkat energi harus bilangan positif.</string>
@@ -592,16 +511,13 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="settings_labs_native_camera">Gunakan kamera bawaan</string>
     <string name="settings_labs_keyboard_options_to_send_message">Gunakan tombol enter keyboard untuk mengirim pesan</string>
     <string name="settings_labs_enable_send_voice">Kirim pesan suara</string>
-
     <string name="you_added_a_new_device">Anda menambahkan perangkat baru \'%s\', yang sedang meminta kunci enkripsi.</string>
     <string name="your_unverified_device_requesting">Perangkat Anda yang belum terverifikasi \'%s\' sedang meminta kunci enkripsi.</string>
     <string name="start_verification">Mulai verifikasi</string>
     <string name="share_without_verifying">Bagikan tanpa verifikasi</string>
     <string name="ignore_request">Abaikan verifikasi</string>
-
     <string name="conference_call_warning_title">Peringatan!</string>
     <string name="conference_call_warning_message">Panggilan konferensi masih sedang pengembangan dan mungkin belum dapat diandalkan.</string>
-
     <string name="command_error">Kesalahan perintah</string>
     <string name="unrecognized_command">Perintah tak dikenal: %s</string>
     <string name="command_description_emote">Tunjukkan tindakan</string>
@@ -616,116 +532,90 @@ Perhatikan bahwa tindakan ini akan memulai ulang aplikasi dan mungkin cukup mema
     <string name="command_description_nick">Ubah nama panggilan layar Anda</string>
     <string name="command_description_markdown">Mati/Nyalakan markdown</string>
     <string name="command_description_clear_scalar_token">Untuk memperbaiki kepengurusan Apps Matrix</string>
-
     <string name="notification_off">Mati</string>
     <string name="notification_noisy">Berisik</string>
-
     <string name="encrypted_message">Pesan terenkripsi</string>
-
     <string name="create">Buat</string>
     <string name="create_community">Buat Komunitas</string>
     <string name="community_name">Nama komunitas</string>
     <string name="community_name_hint">Contoh</string>
     <string name="community_id">Id Komunitas</string>
     <string name="community_id_hint">contoh</string>
-
     <string name="group_details_home">Pangkal</string>
     <string name="group_details_people">Orang</string>
     <string name="group_details_rooms">Ruang</string>
     <string name="no_users_placeholder">Tidak ada pengguna</string>
-
     <string name="rooms">Ruang</string>
     <string name="joined">Telah bergabung</string>
     <string name="invited">Telah Diundang</string>
     <string name="filter_group_members">Saring anggota grup</string>
     <string name="filter_group_rooms">Saring ruang grup</string>
-
     <plurals name="group_members">
         <item quantity="other">%d anggota</item>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="other">%d ruang</item>
     </plurals>
     <string name="group_no_long_description">Admin komunitas belum menyediakan deskripsi panjang untuk komunitas ini.</string>
-
     <string name="has_been_kicked">Anda telah dikeluarkan dari %1$s oleh %2$s</string>
     <string name="has_been_banned">Anda telah dilarang dari %1$s oleh %2$s</string>
     <string name="reason_colon">Alasan: %1$s</string>
     <string name="rejoin">Gabung lagi</string>
     <string name="forget_room">Lupakan ruang</string>
-
     <string name="dialog_user_consent_content">Untuk terus menggunakan homeserver %1$s Anda harus membaca dan menyetujui syarat dan ketentuan.</string>
     <string name="avatar">Avatar</string>
-
     <string name="dialog_user_consent_submit">Baca sekarang</string>
-
     <string name="deactivate_account_title">Deaktivasi Akun</string>
-    <string name="deactivate_account_content">Ini akan mengakibatkan akun Anda tidak dapat digunakan secara permanen. Anda tidak akan dapat masuk dan orang lain tidak dapat mendaftar ulang dengan ID pengguna yang sama. Ini akan mengakibatkan akun Anda keluar dari semua ruang di mana Anda berpartisipasi dan menghapus semua detail akun dari identity server Anda. <b> Tindakan ini tidak dapat dibalikkan</b>.
-
-Mendeaktivasi akun Anda <b> tidak semerta membuat kami melupakan pesan-pesan yang Anda kirim</b>. Jika Anda ingin kami melupakan pesan-pesan Anda, mohon centang kotak berikut.
-
-Pembacaan pesan di Matrix serupa dengan email. Dengan kami melupakan pesan-pesan Anda berarti pesan-pesan yang Anda kirim tidak akan dibagikan kepada pengguna baru atau yang belum terdaftar, tapi pengguna yang terdaftar dan telah dapat mengakses pesan-pesan tersebut masih bisa membaca rangkap yang mereka simpan.</string>
+    <string name="deactivate_account_content">Ini akan mengakibatkan akun Anda tidak dapat digunakan secara permanen. Anda tidak akan dapat masuk dan orang lain tidak dapat mendaftar ulang dengan ID pengguna yang sama. Ini akan mengakibatkan akun Anda keluar dari semua ruang tempat Anda berpartisipasi serta menghapus semua detail akun dari identity server Anda. <b> Tindakan ini tidak dapat diubah kembali</b>.
+\n
+\nMenonaktifkan akun Anda <b> tidak serta-merta membuat kami melupakan pesan-pesan yang Anda kirim</b>. Jika Anda ingin kami melupakan pesan-pesan Anda, mohon centang kotak berikut.
+\n
+\nKeterbacaan pesan di Matrix serupa dengan email. Dengan kami melupakan pesan-pesan Anda, berarti pesan-pesan yang Anda kirim tidak akan dibagikan kepada pengguna baru ataupun yang belum terdaftar. Tetapi pengguna yang terdaftar dan telah dapat mengakses pesan-pesan tersebut masih bisa membaca rangkap yang mereka simpan.</string>
     <string name="deactivate_account_delete_checkbox">Mohon lupakan semua pesan yang telah kukirim ketika akunku dideaktivasi (Peringatan: ini akan mengakibatkan pengguna mendatang membaca percakapan yang tidak lengkap)</string>
     <string name="deactivate_account_prompt_password">Untuk melanjutkan, masukkan kata sandi Anda:</string>
     <string name="deactivate_account_submit">Deaktivasi Akun</string>
-
     <string name="error_empty_field_your_password">Mohon masukkan kata sandi Anda.</string>
     <string name="room_tombstone_versioned_description">Ruang ini telah berubah dan tidak lagi aktif</string>
     <string name="room_tombstone_continuation_link">Percakapan berlanjut di sini</string>
     <string name="room_tombstone_continuation_description">Ruang ini adalah kelanjutan percakapan lain</string>
     <string name="room_tombstone_predecessor_link">Klik di sini untuk melihat pesan lama</string>
-
     <string name="resource_limit_exceeded_title">Melampaui Batasan Sumber Daya</string>
     <string name="resource_limit_contact_action">Kontak Administrator</string>
-
     <string name="resource_limit_contact_admin">kontak administrator layanan Anda</string>
-
     <string name="resource_limit_soft_default">Homeserver ini telah melampaui salah satu batas sumber dayanya sehingga <b>beberapa pengguna tidak dapat masuk</b>.</string>
     <string name="resource_limit_hard_default">Homeserver ini telah melampaui salah satu batasan sumber dayanya.</string>
-
     <string name="resource_limit_soft_mau"> Homeserver ini telah mencapai batas Pengguna Aktif Bulanan sehingga <b>beberapa pengguna tidak dapat masuk</b>.</string>
     <string name="resource_limit_hard_mau">Homeserver ini telah mencapai batas Pengguna Aktif Bulanan.</string>
-
     <string name="resource_limit_soft_contact">Mohon %s untuk meningkatkan batasan ini.</string>
     <string name="resource_limit_hard_contact">Mohon %s untuk terus menggunakan layanan ini.</string>
-
     <string name="encryption_import_e2e_room_keys">Impor kunci ruang terenkripsi</string>
     <string name="encryption_import_room_keys">Impor kunci ruang</string>
     <string name="encryption_import_room_keys_summary">Impor kunci dari berkas lokal</string>
     <string name="encryption_import_import">Impor</string>
     <string name="encryption_never_send_to_unverified_devices_title">Hanya enkripsi ke perangkat terverifikasi</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Jangan kirim pesan terenkripsi ke perangkat yang tidak terverifikasi dari perangkat ini.</string>
-
     <string name="encryption_information_not_verified">TIDAK terverifikasi</string>
     <string name="encryption_information_blocked">Ter-blacklist</string>
-
     <string name="encryption_information_none">tidak ada</string>
-
     <string name="encryption_information_verify">Verifikasi</string>
     <string name="encryption_information_unverify">Batalkan verifikasi</string>
     <string name="encryption_information_block">Blacklist</string>
     <string name="encryption_information_unblock">Batalkan blacklist</string>
-
     <string name="encryption_information_verify_device">Verifikasi perangkat</string>
     <string name="encryption_information_verify_device_warning">Untuk memastikan perangkat dapat dipercaya, mohon kontak pengguna dengan medium lain (misalnya tatap muka atau panggilan telepon) dan tanya apakah kunci yang mereka lihat di Pengaturan Pengguna untuk perangkat ini cocok dengan kunci berikut:</string>
     <string name="encryption_information_verify_device_warning2">Apabila cocok, tekan tombol verifikasi berikut.
 Apabila tidak, seseorang sedang menyadap perangkat ini dan mungkin perlu diblokir.
 Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
-
-    <string name="unknown_devices_alert_message">Ruang ini terisi oleh perangkat tak dikenal yang belum diverifikasi.
-Ini berarti tidak ada jaminan pengguna perangkat tersebut sesuai dengan klaim mereka.
-Kami sarankan Anda untuk memverifikasi untuk setiap perangkat terlebih dahulu sebelum melanjutkan, tapi Anda boleh mengirim ulang pesan tanpa verifikasi jika Anda mau.
-
-Perangkat tak dikenal:</string>
-
+    <string name="unknown_devices_alert_message">Ruang ini terdapat sesi yang yang belum diverifikasi.
+\nIni artinya, tidak ada jaminan pengguna sesi tersebut sesuai dengan klaim mereka.
+\nKami sarankan Anda untuk memverifikasi untuk setiap sesi terlebih dahulu sebelum melanjutkan, namun Anda juga boleh mengirim ulang pesan tanpa verifikasi bila anda memilih demikian.
+\n
+\nSesi yang tak dikenal:</string>
     <string name="directory_server_fail_to_retrieve_server">Server mungkin belum siap atau kelebihan beban</string>
     <string name="directory_server_type_homeserver">Ketik homeserver yang ingin Anda lihat daftar ruang publiknya</string>
     <string name="directory_server_all_rooms_on_server">Semua ruang dalam server %s</string>
     <string name="directory_server_native_rooms">Semua ruang bawaan %s</string>
-
     <string name="lock_screen_hint">Ketik di sini…</string>
-
     <plurals name="notification_unread_notified_messages">
         <item quantity="other">%d pesan pemberitahuan yang belum terbaca</item>
     </plurals>
@@ -734,7 +624,6 @@ Perangkat tak dikenal:</string>
     </plurals>
     <string name="room_settings_tag_pref_entry_low_priority">Prioritas rendah</string>
     <string name="room_settings_tag_pref_entry_none">Tidak Ada</string>
-
     <string name="room_settings_category_access_visibility_title">Akses dan visibilitas</string>
     <string name="room_settings_directory_visibility">Daftarkan ruang ini di direktori ruang</string>
     <string name="room_settings_room_notifications_title">Pemberitahuan</string>
@@ -742,19 +631,15 @@ Perangkat tak dikenal:</string>
     <string name="room_settings_room_read_history_rules_pref_title">Singkapan Sejarah Ruang</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Siapa yang bisa membaca sejarah?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Siapa yang bisa mengakses ruang ini?</string>
-
     <string name="room_settings_read_history_entry_anyone">Siapapun</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Hanya anggota (dimulai sejak opsi ini dipilih)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Hanya anggota (dimulai sejak mereka diundang)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Hanya anggota (dimulai sejak mereka bergabung)</string>
-
     <string name="room_settings_room_access_warning">Ruang harus memiliki alamat agar dapat ditautkan.</string>
     <string name="room_settings_room_access_entry_only_invited">Hanya orang yang telah diundang</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Siapapun yang tahu tautan ruang, selain tamu</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Siapapun yang tahu tautan ruang, termasuk tamu</string>
-
     <string name="room_settings_banned_users_title">Pengguna yang dilarang</string>
-
     <string name="room_settings_category_advanced_title">Lanjutan</string>
     <string name="room_settings_room_internal_id">ID internal ruang ini</string>
     <string name="room_settings_addresses_pref_title">Alamat</string>
@@ -765,38 +650,28 @@ Perangkat tak dikenal:</string>
     <string name="room_settings_labs_end_to_end_warnings">Anda perlu keluar dulu untuk mengaktifkan enkripsi.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Enkripsi ke perangkat terverifikasi saja</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Jangan mengirim pesan terenkripsi ke perangkat yang belum diverifikasi di ruang ini dengan perangkat ini.</string>
-
     <string name="room_settings_addresses_no_local_addresses">Ruang ini tidak punya alamat lokal</string>
     <string name="room_settings_addresses_add_new_address">Alamat baru (misalnya #foo:matrix.org)</string>
-
     <string name="room_settings_no_flair">Ruang ini tidak menunjukkan flair untuk komunitas manapun</string>
     <string name="room_settings_add_new_group">ID komunitas baru (misalnya +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">ID komunitas tidak valid</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' bukan ID komunitas yang valid</string>
-
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Format alias tidak valid</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' bukanlah format alias yang valid</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Anda tidak akan mendapat alamat utama untuk ruang ini.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Peringatan alamat utama</string>
-
     <string name="room_settings_set_main_address">Tentukan sebagai Alamat Utama</string>
     <string name="room_settings_unset_main_address">Jangan tentukan sebagai Alamat Utama</string>
     <string name="room_settings_copy_room_id">Salin ID Ruang</string>
     <string name="room_settings_copy_room_address">Salin Alamat Ruang</string>
-
     <string name="room_settings_addresses_e2e_enabled">Enkripsi diaktifkan untuk ruang ini.</string>
     <string name="room_settings_addresses_e2e_disabled">Enkripsi dinonaktifkan untuk ruang ini.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Aktifkan enkripsi
-(peringatan: tidak lagi bisa dinonaktifkan!)</string>
-
+\n(peringatan: tidak dapat dinonaktifkan kembali!)</string>
     <string name="directory_title">Direktori</string>
     <string name="settings_theme">Tema</string>
-
     <string name="failed_to_load_timeline_position">%s sedang mencoba memuat titik tertentu di rentang waktu ruang ini tapi belum dapat menemukannya.</string>
-
     <string name="encryption_information_title">Informasi enkripsi ujung-ke-ujung</string>
-
     <string name="encryption_information_device_info">Informasi peristiwa</string>
     <string name="encryption_information_user_id">Id pengguna</string>
     <string name="encryption_information_curve25519_identity_key">Kunci identitas Curve25519</string>
@@ -804,7 +679,6 @@ Perangkat tak dikenal:</string>
     <string name="encryption_information_algorithm">Algoritma</string>
     <string name="encryption_information_session_id">ID Sesi</string>
     <string name="encryption_information_decryption_error">Kesalahan dekripsi</string>
-
     <string name="encryption_information_sender_device_information">Informasi perangkat pengirim</string>
     <string name="encryption_information_device_name">Nama perangkat</string>
     <string name="encryption_information_name">Nama</string>
@@ -812,17 +686,15 @@ Perangkat tak dikenal:</string>
     <string name="encryption_information_device_key">Kunci perangkat</string>
     <string name="encryption_information_verification">Verifikasi</string>
     <string name="encryption_information_ed25519_fingerprint">Sidik jari Ed25519</string>
-
     <string name="encryption_export_e2e_room_keys">Ekspor kunci ruang terenkripsi</string>
     <string name="encryption_export_room_keys">Ekspor ruang kunci</string>
     <string name="encryption_export_room_keys_summary">Ekspor kunci ke berkas lokal</string>
     <string name="encryption_export_export">Ekspor</string>
     <string name="passphrase_enter_passphrase">Masukkan kata sandi</string>
     <string name="passphrase_confirm_passphrase">Tegaskan kata sandi</string>
-    <string name="encryption_export_saved_as">Kunci ruang terenkripsi telah disimpan di \'%s\'.
-
-Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
-
+    <string name="encryption_export_saved_as">Kunci E2E ruang tersebut telah disimpan di \'%s\'.
+\n
+\nPeringatan: berkas ini mungkin ikut terhapus bila aplikasi ini dihapus.</string>
     <string name="notification_listening_for_events">Mendengarkan peristiwa</string>
     <string name="settings_third_party_notices">Pemberitahuan pihak ketiga</string>
     <string name="settings_copyright">Hak Cipta</string>
@@ -830,7 +702,6 @@ Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
     <string name="settings_clear_cache">Bersihkan cache</string>
     <string name="settings_clear_media_cache">Bersihkan cache media</string>
     <string name="settings_keep_media">Pertahankan media</string>
-
     <string name="settings_user_settings">Pengaturan pengguna</string>
     <string name="settings_notifications">Pemberitahuan</string>
     <string name="settings_ignored_users">Pengguna yang diabaikan</string>
@@ -850,23 +721,18 @@ Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
     <string name="settings_12_24_timestamps">Tampilkan waktu kirim dalam format 12 jam</string>
     <string name="settings_vibrate_on_mention">Bergetar ketika menyebut seorang pengguna</string>
     <string name="settings_preview_media_before_sending">Pratinjau media sebelum dikirim</string>
-
     <string name="settings_deactivate_account_section">Deaktivasi akun</string>
     <string name="settings_deactivate_my_account">Deaktivasi akunku</string>
-
     <string name="startup_notification_privacy_title">Kerahasiaan Notifikasi</string>
     <string name="template_startup_notification_privacy_message">${app_name} dapat beroperasi di balik layar untuk mengurus pemberitahuan Anda dengan aman dan rahasia. Ini dapat mempengaruhi masa tahan baterai.</string>
     <string name="startup_notification_privacy_button_grant">Kabulkan permisi</string>
     <string name="startup_notification_privacy_button_other">Pilih opsi lain</string>
-
     <string name="settings_analytics">Analitik</string>
     <string name="settings_opt_in_of_analytics">Kirim data analitik</string>
     <string name="template_settings_opt_in_of_analytics_summary">${app_name} mengumpulkan data analitik anonim dalam upaya kami meningkatkan aplikasi.</string>
     <string name="template_settings_opt_in_of_analytics_prompt">Mohon aktifkan analitik untuk membantu kami meningkatkan ${app_name}.</string>
     <string name="settings_opt_in_of_analytics_ok">Ya, saya ingin membantu!</string>
-
     <string name="settings_data_save_mode">Mode hemat data</string>
-
     <string name="devices_details_dialog_title">Rincian perangkat</string>
     <string name="devices_details_id_title">ID</string>
     <string name="devices_details_name_title">Nama</string>
@@ -874,42 +740,34 @@ Peringatan: berkas ini mungkin ikut terhapus jika aplikasi dihapus.</string>
     <string name="devices_details_last_seen_title">Terakhir terlihat</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_text">Operasi ini membutuhkan otentikasi tambahan.
-Untuk melanjutkan, masukkan kata sandi Anda.</string>
+\nUntuk melanjutkan operasi ini, mohon masukkan kata sandi anda.</string>
     <string name="devices_delete_dialog_title">Otentikasi</string>
     <string name="devices_delete_pswd">Kata Sandi:</string>
     <string name="devices_delete_submit_button_label">Serahkan</string>
-
     <string name="settings_logged_in">Masuk sebagai</string>
     <string name="settings_home_server">Home Server</string>
     <string name="settings_identity_server">Server Identitas</string>
-
     <string name="settings_user_interface">Antarmuka pengguna</string>
     <string name="settings_interface_language">Bahasa</string>
     <string name="settings_select_language">Pilih bahasa</string>
-
     <string name="account_email_validation_title">Verifikasi Tertunda</string>
     <string name="account_email_validation_message">Mohon cek email Anda dan klik tautan yang termuat di sana. Setelah itu, klik lanjutkan.</string>
     <string name="account_email_validation_error">Tidak dapat memverifikasi alamat email. Mohon periksa email Anda dan klik tautan yang termuat di sana. Setelah itu, klik lanjutkan.</string>
     <string name="account_email_already_used_error">Alamat email ini telah digunakan.</string>
     <string name="account_email_not_found_error">Gagal mengirim email: Alamat email ini tidak dapat ditemukan.</string>
     <string name="account_phone_number_already_used_error">Nomor telepon ini telah digunakan.</string>
-
     <string name="settings_change_password">Ubah kata sandi</string>
     <string name="settings_old_password">Sandi lama</string>
     <string name="settings_new_password">Sandi baru</string>
     <string name="settings_confirm_password">Ulangi sandi</string>
     <string name="settings_fail_to_update_password">Gagal memperbaharui kata sandi</string>
     <string name="settings_password_updated">Kata sandi Anda telah diperbaharui</string>
-    <string name="settings_unignore_user">Tunjukkan semua pesan dari %s?
-
-Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</string>
-
+    <string name="settings_unignore_user">Tunjukkan semua pesan dari %s\?
+\n
+\nMohon perhatikan bahwa tindakan ini akan me-restart aplikasi dan mungkin akan memakan waktu.</string>
     <string name="settings_delete_notification_targets_confirmation">Apa benar Anda ingin menyingkirkan sasaran pemberitahuan ini?</string>
-
     <string name="settings_delete_threepid_confirmation">Apa benar Anda ingin menyingkirkan %1$s %2$s?</string>
-
     <string name="settings_select_country">Pilih negara</string>
-
     <string name="settings_phone_number_country_label">Negara</string>
     <string name="settings_phone_number_country_error">Mohon pilih negara</string>
     <string name="settings_phone_number_label">Nomor telepon</string>
@@ -919,44 +777,32 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="settings_phone_number_verification_error_empty_code">Masukkan kode aktivasi</string>
     <string name="settings_phone_number_verification_error">Ada kesalahan ketika memvalidasi nomor telepon Anda</string>
     <string name="settings_phone_number_code">Kode</string>
-
-
     <string name="settings_flair">Flair</string>
     <string name="settings_without_flair">Anda belum menjadi anggota komunitas manapun saat ini.</string>
-
     <string name="media_saving_period_3_days">3 hari</string>
     <string name="media_saving_period_1_week">1 minggu</string>
     <string name="media_saving_period_1_month">1 bulan</string>
     <string name="media_saving_period_forever">Selamanya</string>
-
     <string name="room_settings_room_photo">Foto Ruang</string>
     <string name="room_settings_room_name">Nama Ruang</string>
     <string name="room_settings_topic">Topik</string>
     <string name="room_settings_room_tag">Tanda Ruang</string>
     <string name="room_settings_tag_pref_dialog_title">Ditandai sebagai:</string>
-
     <string name="room_settings_tag_pref_entry_favourite">Favorit</string>
     <string name="notice_avatar">Avatar pemberitahu</string>
     <string name="receipt_avatar">Avatar penerima</string>
     <string name="command_description_deop_user">Demosi pengguna dengan id berikut</string>
-
     <string name="call_anyway">Tetap Panggil</string>
     <string name="accept">Terima</string>
-
     <string name="dialog_title_error">Error</string>
-
     <string name="auth_accept_policies">Mohon telaah dan terima kebijakan homeserver ini:</string>
-
     <string name="settings_call_category">Panggilan</string>
     <string name="template_settings_call_ringtone_use_app_ringtone">Gunakan nada dering semula ${app_name} untuk panggilan masuk</string>
     <string name="settings_call_ringtone_title">Nada dering panggilan masuk</string>
     <string name="settings_call_ringtone_dialog_title">Pilih nada dering untuk panggilan:</string>
-
     <string name="video_call_in_progress">Panggilan Video Sedang Berlangsung…</string>
-
     <string name="room_participants_action_kick">Keluarkan</string>
     <string name="reason_hint">Alasan</string>
-
     <string name="room_sliding_menu_version_x">Versi %s</string>
     <string name="settings_notification_troubleshoot">Periksa Keadaan Pemberitahuan</string>
     <string name="settings_troubleshoot_diagnostic">Hasil diagnosa pemeriksaan keadaan</string>
@@ -965,70 +811,58 @@ Tindakan ini akan memulai ulang aplikasi dan mungkin cukup memakan waktu.</strin
     <string name="settings_troubleshoot_diagnostic_success_status">Diagnosa dasar berlangsung lancar. Apabila Anda masih belum dapat menerima pemberitahuan, mohon kirim laporan bug untuk kami selidiki.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Satu atau beberapa ujicoba gagal, coba sugesti yang kami tawarkan.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Satu atau beberapa ujicoba gagal, mohon kirim laporan bug untuk kami selidiki.</string>
-
     <string name="settings_troubleshoot_test_system_settings_title">Pengaturan Sistem.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Pemberitahuan diperbolehkan dalam pengaturan sistem.</string>
-    <string name="settings_troubleshoot_test_system_settings_failed">Pemberitahuan tidak diperbolehkan dalam pengaturan sistem.
-Silakan periksa pengaturan sistem.</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">Notifikasi dinonaktifkan dalam pengaturan sistem.
+\nMohon periksa pengaturan sistem anda.</string>
     <string name="open_settings">Buka Pengaturan</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">Pengaturan Akun.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Pemberitahuan diperbolehkan dalam pengaturan akun Anda.</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">Pemberitahuan tidak diperbolehkan dalam pengaturan akun Anda.
-Mohon periksa pengaturan akun.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Notifikasi dinonaktifkan dalam pengaturan akun anda.
+\nMohon periksa pengaturan akun anda.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Perbolehkan</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">Pengaturan Perangkat.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Pemberitahuan diperbolehkan untuk perangkat ini.</string>
-    <string name="template_settings_troubleshoot_test_device_settings_failed">Pemberitahuan tidak diperbolehkan untuk perangkat ini.
-Mohon periksa pengaturan ${app_name}.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Notifikasi tidak diaktifkan pada sesi ini. 
+\nMohon periksa pengaturan ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Perbolehkan</string>
-
     <string name="settings_troubleshoot_test_play_services_title">Pemeriksaan Layanan Google Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Layanan Google Play ditemukan dan telah diperbaharui.</string>
     <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} menggunakan Layanan Google Play untuk mendorong pesan tapi tampaknya tidak diatur sebagaimana harusnya.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Perbaiki Layanan Google Play</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Token Firebase</string>
-    <string name="settings_troubleshoot_test_fcm_success">Sukses mengambil token FCM.
-%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed">Gagal mengambil token FCM.
-%1$s</string>
-
+    <string name="settings_troubleshoot_test_fcm_success">Sukses mengambil token FCM:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed">Gagal mengambil token FCM:
+\n%1$s</string>
     <string name="settings_troubleshoot_test_token_registration_title">Pendaftaran Token</string>
     <string name="settings_troubleshoot_test_token_registration_success">Sukses mendaftarkan token FCM di HomeServer.</string>
-    <string name="settings_troubleshoot_test_token_registration_failed">Gagal mendaftarkan token FCM di HomeServer.
-%1$s</string>
-
+    <string name="settings_troubleshoot_test_token_registration_failed">Gagal mendaftarkan token FCM ke HomeServer:
+\n%1$s</string>
     <string name="settings_troubleshoot_test_foreground_service_started_title">Layanan Pemberitahuan</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Layanan Pemberitahuan sedang berjalan.</string>
-    <string name="settings_troubleshoot_test_foreground_service_started_failed">Layanan Pemberitahuan terhenti.
-Coba nyalakan kembali aplikasi.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">Layanan notifikasi tidak berjalan.
+\nCoba buka ulang aplikasi ini.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Mulai Layanan</string>
-
     <string name="settings_troubleshoot_test_service_restart_title">Nyalakan Layanan Pemberitahuan dengan Otomatis</string>
     <string name="settings_troubleshoot_test_service_restart_success">Layanan terhenti dan dinyalakan kembali secara otomatis.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Layanan tidak dapat dinyalakan kembali</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">Mulai ketika menyalakan perangkat</string>
     <string name="settings_troubleshoot_test_service_boot_success">Layanan akan dimulai ketika perangkat dinyalakan kembali.</string>
     <string name="template_settings_troubleshoot_test_service_boot_failed">Layanan tidak akan mulai ketika perangkat dinyalakan kembali, Anda tidak akan menerima pemberitahuan hingga Anda membuka ${app_name}.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Perbolehkan memulai ketika perangkat dinyalakan</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">Periksa halangan di balik layar</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_success">Halangan di balik layar dimatikan untuk ${app_name}. Ujicoba ini harus dijalankan menggunakan jaringan data (bukan WIFI).
-%1$s</string>
-    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Halangan di balik layar dinyalakan untuk ${app_name}.
-Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik layar, dan ini dapat mempengaruhi pemberitahuan.
-%1$s</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Larangan background dinonaktifkan untuk ${app_name}. Percobaan ini sebaiknya dijalankan menggunakan jaringan mobile data (bukan WIFI).
+\n%1$s</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Larangan background dinonaktifkan untuk ${app_name}.
+\nAktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik layar, dan ini dapat mempengaruhi pemunculan notifikasi.
+\n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Matikan penghalang</string>
-
     <string name="settings_troubleshoot_test_battery_title">Optimisasi Baterai</string>
     <string name="template_settings_troubleshoot_test_battery_success">${app_name} tidak terpengaruh oleh Optimisasi Baterai.</string>
     <string name="title_activity_keys_backup_setup">Cadangkan Kunci</string>
     <string name="title_activity_keys_backup_restore">Gunakan Cadangan Kunci</string>
-
     <string name="keys_backup_is_not_finished_please_wait">Pencadangan kunci belum selesai, mohon tunggu…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Pesan terenkripsi Anda akan hilang apabila Anda mencopot akun sekarang</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Pencadangan kunci sedang berlangsung. Pesan terenkripsi Anda akan hilang apabila Anda mencopot akun sekarang.</string>
@@ -1039,21 +873,17 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
     <string name="are_you_sure">Yakin\?</string>
     <string name="backup">Cadangkan</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Akses ke pesan terenkripsi akan hilang apabila Anda tidak mencadangkan kunci sebelum mencopot akun.</string>
-
     <string name="skip">Lewatkan</string>
     <string name="done">Selesai</string>
     <string name="abort">Hentikan</string>
-
     <string name="action_sign_out_confirmation_simple">Anda yakin ingin mencopot akun\?</string>
     <string name="settings_notification_advanced">Pengaturan Pemberitahuan Lanjutan</string>
     <string name="settings_notification_by_event">Urgensi pemberitahuan lewat kejadian</string>
-
     <string name="settings_troubleshoot_test_bing_settings_title">Pengaturan Sesukanya.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Perhatikan bahwa sebagian jenis pesan tersetel diam (mengeluarkan pemberitahuan tanpa suara).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Sebagian pemberitahuan dimatikan dalam aturan Anda.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Gagal memuat aturan, mohon coba lagi.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Periksa Aturan</string>
-
     <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nError ini di luar kendali ${app_name} dan menurut Google, error ini muncul ketika terlalu banyak aplikasi terdaftar dengan FCM pada perangkat tersebut. Error ini tidak seharusnya mempengaruhi pengguna biasa.</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -1061,16 +891,12 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
     <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nError ini di luar kendali ${app_name}. Tidak terdapat akun Google pada perangkat. Mohon buka pengelola akun dan tambahkan akun Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Tambah Akun</string>
-
     <string name="settings_troubleshoot_test_battery_failed">Apabila perangkat tidak sedang diisi atau dipergunakan dengan layar dimatikan, perangkat masuk mode Doze. Ini akan menghalangi aplikasi mengakses jaringan dan menunda tugas, sinkronisasi, dan alarm standar.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Abaikan Optimisasi</string>
-
     <string name="settings_noisy_notifications_preferences">Kelola Pemberitahuan Berisik</string>
     <string name="settings_call_notifications_preferences">Kelola Pemberitahuan Panggilan</string>
     <string name="settings_silent_notifications_preferences">Kelola Pemberitahuan Diam</string>
     <string name="settings_system_preferences_summary">Pilih warna LED, getaran, suara…</string>
-
-
     <string name="settings_cryptography_manage_keys">Pengelolaan Kunci Kriptografi</string>
     <string name="settings_inline_url_preview_summary">Pratinjau tautan dalam obrolan apabila homeserver mendukung fitur ini.</string>
     <string name="settings_send_typing_notifs">Kirim pemberitahuan mengetik</string>
@@ -1082,4 +908,4 @@ Aktivitas yang dilakukan aplikasi ini akan terhalang ketika beroperasi di balik
     <string name="settings_show_join_leave_messages">Tunjukkan kejadian bergabung dan meninggalkan</string>
     <string name="settings_show_join_leave_messages_summary">Undangan, pengeluaran, dan larangan tidak terpengaruh.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Tunjukkan kejadian akun</string>
-</resources>
+</resources>
\ No newline at end of file

From 35ff4cc7cd32e38b12570bb6d73fdf0d0d38b80a Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 11 Mar 2021 09:57:56 +0000
Subject: [PATCH 295/578] Translated using Weblate (Italian)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
---
 vector/src/main/res/values-it/strings.xml | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 39ca954053..a60946c593 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2668,4 +2668,70 @@
     <string name="call_resume_action">Riprendi</string>
     <string name="error_unauthorized">Non autorizzato, credenziali di autenticazione valide mancanti</string>
     <string name="action_return">Torna</string>
+    <string name="event_status_delete_all_failed_dialog_message">Vuoi veramente eliminare tutti i messaggi non inviati in questa stanza\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Elimina i messaggi non inviati</string>
+    <string name="event_status_failed_messages_warning">Invio dei messaggi fallito</string>
+    <string name="event_status_cancel_sending_dialog_message">Vuoi annullare l\'invio del messaggio\?</string>
+    <string name="event_status_a11y_delete_all">Elimina tutti i messaggi falliti</string>
+    <string name="event_status_a11y_failed">Fallito</string>
+    <string name="event_status_a11y_sent">Inviato</string>
+    <string name="event_status_a11y_sending">Invio in corso</string>
+    <string name="dev_tools_event_content_hint">Contenuto dell\'evento</string>
+    <string name="dev_tools_success_state_event">Evento di stato inviato!</string>
+    <string name="dev_tools_success_event">Evento inviato!</string>
+    <string name="dev_tools_error_malformed_event">Evento malformato</string>
+    <string name="dev_tools_error_no_message_type">Tipo di messaggio mancante</string>
+    <string name="dev_tools_error_no_content">Nessun contenuto</string>
+    <string name="dev_tools_form_hint_event_content">Contenuto dell\'evento</string>
+    <string name="dev_tools_form_hint_state_key">Chiave dello stato</string>
+    <string name="dev_tools_form_hint_type">Tipo</string>
+    <string name="dev_tools_send_custom_state_event">Invia evento di stato personalizzato</string>
+    <string name="dev_tools_edit_content">Modifica contenuto</string>
+    <string name="dev_tools_state_event">Eventi di stato</string>
+    <string name="dev_tools_send_state_event">Invia evento di stato</string>
+    <string name="dev_tools_send_custom_event">Invia evento personalizzato</string>
+    <string name="dev_tools_explore_room_state">Esplora stato stanza</string>
+    <string name="dev_tools_menu_name">Strumenti Svil</string>
+    <string name="a11y_view_read_receipts">Vedi le conferme di lettura</string>
+    <string name="a11y_rule_notify_off">Non notificare</string>
+    <string name="a11y_rule_notify_silent">Notifica senza suono</string>
+    <string name="a11y_rule_notify_noisy">Notifica con suono</string>
+    <string name="a11y_error_message_not_sent">Messaggio non inviato per un errore</string>
+    <string name="a11y_checked">Selezionato</string>
+    <string name="a11y_close_emoji_picker">Chiudi selettore emoji</string>
+    <string name="a11y_open_emoji_picker">Apri selettore emoji</string>
+    <string name="a11y_trust_level_trusted">Livello di fiducia di affidabilità</string>
+    <string name="a11y_trust_level_warning">Livello di fiducia di allerta</string>
+    <string name="a11y_trust_level_default">Livello di fiducia predefinito</string>
+    <string name="a11y_selected">Selezionato</string>
+    <string name="a11y_video">Video</string>
+    <string name="a11y_unsent_draft">Questa stanza ha una bozza non inviata</string>
+    <string name="a11y_error_some_message_not_sent">Alcuni messaggi non sono stati inviati</string>
+    <string name="a11y_delete_avatar">Elimina avatar</string>
+    <string name="a11y_change_avatar">Cambia avatar</string>
+    <string name="a11y_image">Immagine</string>
+    <string name="a11y_import_key_from_file">Importa chiave da file</string>
+    <string name="a11y_open_widget">Apri i widget</string>
+    <string name="a11y_screenshot">Schermata</string>
+    <plurals name="entries">
+        <item quantity="one">%d elemento</item>
+        <item quantity="other">%d elementi</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">Il limite è sconosciuto.</string>
+    <string name="settings_server_upload_size_content">Il tuo homeserver accetta allegati (file, multimedia, ecc.) di una dimensione fino a %s.</string>
+    <string name="settings_server_upload_size_title">Limite di invio file al server</string>
+    <string name="settings_server_version">Versione server</string>
+    <string name="settings_server_name">Nome server</string>
+    <string name="room_list_quick_actions_room_settings">Impostazioni stanza</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Abbandonare la conferenza attuale e passare all\'altra\?</string>
+    <string name="room_settings_room_version_title">Versione stanza</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Mostra tutte le stanze nell\'elenco, incluse quelle con contenuti espliciti.</string>
+    <string name="settings_room_directory_show_all_rooms">Mostra stanze con contenuti espliciti</string>
+    <string name="settings_category_room_directory">Elenco delle stanze</string>
+    <string name="dialog_edit_hint">Nuovo valore</string>
+    <string name="action_switch">Cambia</string>
+    <string name="initial_sync_start_downloading">Sinc. iniziale:
+\nScaricamento dati…</string>
+    <string name="initial_sync_start_server_computing">Sinc. iniziale:
+\nIn attesa di risposta dal server…</string>
 </resources>
\ No newline at end of file

From 1346d232e683bfde440ed52f693136eff85b4e2a Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Thu, 11 Mar 2021 19:47:00 +0000
Subject: [PATCH 296/578] Translated using Weblate (Portuguese (Brazil))

Currently translated at 98.4% (2325 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
---
 vector/src/main/res/values-pt-rBR/strings.xml | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index d346cbff34..a2f930a272 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2675,4 +2675,30 @@
     <string name="call_hold_action">Pausar</string>
     <string name="call_resume_action">Retomar</string>
     <string name="action_return">Voltar</string>
+    <string name="a11y_trust_level_default">Nível de confiança padrão</string>
+    <string name="a11y_selected">Selecionado</string>
+    <string name="a11y_video">Vídeo</string>
+    <string name="a11y_error_some_message_not_sent">Algumas mensagens não foram enviadas</string>
+    <string name="a11y_delete_avatar">Remover foto de perfil</string>
+    <string name="a11y_change_avatar">Mudar foto de perfil</string>
+    <string name="a11y_image">Imagem</string>
+    <string name="a11y_import_key_from_file">Importar chave do arquivo</string>
+    <string name="a11y_open_widget">Abrir widgets</string>
+    <string name="a11y_screenshot">Captura de tela</string>
+    <string name="settings_server_upload_size_unknown">O limite é desconhecido.</string>
+    <string name="settings_server_upload_size_content">O seu servidor local aceita anexos (arquivos, mídia, etc) com tamanhos de até %s.</string>
+    <string name="settings_server_version">Versão do servidor</string>
+    <string name="settings_server_name">Nome do servidor</string>
+    <string name="room_list_quick_actions_room_settings">Configurações da sala</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Sair da chamada atual e mudar para a outra\?</string>
+    <string name="room_settings_room_version_title">Versão da sala</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Mostrar todas as salas na lista de salas, incluindo as salas com conteúdo sensível.</string>
+    <string name="settings_room_directory_show_all_rooms">Mostrar salas com conteúdo sensível</string>
+    <string name="settings_category_room_directory">Lista de salas</string>
+    <string name="dialog_edit_hint">Novo valor</string>
+    <string name="action_switch">Alterar</string>
+    <string name="initial_sync_start_downloading">Sincronização inicial:
+\nBaixando dados…</string>
+    <string name="initial_sync_start_server_computing">Sincronização inicial:
+\nAguardando resposta do servidor…</string>
 </resources>
\ No newline at end of file

From f8391f07b40d1258bdefe5678ac4498e6193c7f2 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 11 Mar 2021 21:32:45 +0000
Subject: [PATCH 297/578] Translated using Weblate (Swedish)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 87f7144994..31ac8d13c6 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2661,4 +2661,15 @@
     <string name="dev_tools_send_custom_event">Skicka anpassad rumshändelse</string>
     <string name="dev_tools_explore_room_state">Utforska rumsläge</string>
     <string name="dev_tools_menu_name">Utvecklingsverktyg</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Visa alla rum i rumskatalogen, inklusive rum med stötande innehåll.</string>
+    <string name="settings_room_directory_show_all_rooms">Visa rum med stötande innehåll</string>
+    <string name="event_status_delete_all_failed_dialog_message">Är du säker på att du vill radera alla oskickade meddelanden i det här rummet\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Radera oskickade meddelanden</string>
+    <string name="event_status_failed_messages_warning">Meddelanden misslyckades att skickas</string>
+    <string name="event_status_cancel_sending_dialog_message">Vill du avbryta sändning av meddelanden\?</string>
+    <string name="event_status_a11y_delete_all">Radera alla misslyckade meddelanden</string>
+    <string name="event_status_a11y_failed">Misslyckad</string>
+    <string name="event_status_a11y_sent">Skickad</string>
+    <string name="event_status_a11y_sending">Skickar</string>
+    <string name="settings_category_room_directory">Rumskatalog</string>
 </resources>
\ No newline at end of file

From 2c0a0a8e5a53c92c696b2a42143bf6d65bb15bc7 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 11 Mar 2021 03:17:14 +0000
Subject: [PATCH 298/578] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 842700b6eb..f9345b146f 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2610,4 +2610,15 @@
 \n正在下載資料……</string>
     <string name="initial_sync_start_server_computing">初始同步：
 \n正在等待伺服器回應……</string>
+    <string name="event_status_delete_all_failed_dialog_message">您確定您想要刪除此聊天室中所有未傳送的訊息嗎？</string>
+    <string name="event_status_delete_all_failed_dialog_title">刪除未傳送的訊息</string>
+    <string name="event_status_failed_messages_warning">訊息傳送失敗</string>
+    <string name="event_status_cancel_sending_dialog_message">您想要取消傳送訊息嗎？</string>
+    <string name="event_status_a11y_delete_all">刪除所有失敗的訊息</string>
+    <string name="event_status_a11y_failed">失敗</string>
+    <string name="event_status_a11y_sent">已傳送</string>
+    <string name="event_status_a11y_sending">正在傳送</string>
+    <string name="settings_room_directory_show_all_rooms_summary">顯示聊天室目錄中的所有聊天室，包含有明確內容的聊天室。</string>
+    <string name="settings_room_directory_show_all_rooms">顯示帶有明確內容的聊天室</string>
+    <string name="settings_category_room_directory">聊天室目錄</string>
 </resources>
\ No newline at end of file

From 6e757f88b6224f617eea67233bfc267cc8cd8849 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Thu, 11 Mar 2021 19:38:05 +0000
Subject: [PATCH 299/578] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
---
 fastlane/metadata/android/pt-BR/changelogs/40101000.txt | 2 ++
 fastlane/metadata/android/pt-BR/changelogs/40101010.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/pt-BR/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/pt-BR/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/pt-BR/changelogs/40101000.txt b/fastlane/metadata/android/pt-BR/changelogs/40101000.txt
new file mode 100644
index 0000000000..8138e376c6
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Melhoria de VoIP (chamadas de áudio e vídeo em conversas) e correção de erros!
+Registro de alterações completo: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/pt-BR/changelogs/40101010.txt b/fastlane/metadata/android/pt-BR/changelogs/40101010.txt
new file mode 100644
index 0000000000..56f9c2955d
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: melhoria de desempenho e correção de erros!
+Registro de alterações completo: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From e7d78863974c864f5fb7a996b1549f2af3912359 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 11 Mar 2021 15:36:31 +0000
Subject: [PATCH 300/578] Translated using Weblate (Swedish)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
---
 fastlane/metadata/android/sv/changelogs/40101010.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/sv/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/sv/changelogs/40101010.txt b/fastlane/metadata/android/sv/changelogs/40101010.txt
new file mode 100644
index 0000000000..66a3751aac
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Förbättringar och buggfixar!
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 6148b2647fe0d75c177748e57efcba0e56c010cf Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 11 Mar 2021 01:02:47 +0000
Subject: [PATCH 301/578] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
---
 fastlane/metadata/android/uk/changelogs/40101010.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/uk/changelogs/40101010.txt b/fastlane/metadata/android/uk/changelogs/40101010.txt
new file mode 100644
index 0000000000..085ac5a118
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: поліпшення продуктивності та виправлення помилок!
+Повний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 7651df1228c0bed7a954b35393a48059435d7bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 11 Mar 2021 17:07:01 +0000
Subject: [PATCH 302/578] Translated using Weblate (Estonian)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
---
 fastlane/metadata/android/et/changelogs/40101010.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/et/changelogs/40101010.txt b/fastlane/metadata/android/et/changelogs/40101010.txt
new file mode 100644
index 0000000000..4db2c52cb0
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jõudluse parandused ja pisikohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 3ad6c7a18b4f6b22bc497c24eeea4ea97c32d0aa Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 11 Mar 2021 09:36:24 +0000
Subject: [PATCH 303/578] Translated using Weblate (Italian)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
---
 fastlane/metadata/android/it/changelogs/40101000.txt | 2 ++
 fastlane/metadata/android/it/changelogs/40101010.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/it/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/it/changelogs/40101000.txt b/fastlane/metadata/android/it/changelogs/40101000.txt
new file mode 100644
index 0000000000..bd13c2c185
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: migliorato il VoIP (chiamate audio e video in MD) e correzione di errori!
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/it/changelogs/40101010.txt b/fastlane/metadata/android/it/changelogs/40101010.txt
new file mode 100644
index 0000000000..51e6659827
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: prestazioni migliorate e correzione di errori!
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 7edb45d9b71c692968cc72dd0f0338ee4560d3fa Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 11 Mar 2021 02:25:36 +0000
Subject: [PATCH 304/578] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
---
 fastlane/metadata/android/zh-Hant/changelogs/40101010.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-Hant/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101010.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101010.txt
new file mode 100644
index 0000000000..8b0e45e6b3
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+此版本的主要變更：效能改進與錯誤修復！
+完整變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 8f0319a1382f25d589804904d7b12007b1c6e9f2 Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Thu, 11 Mar 2021 22:47:16 +0000
Subject: [PATCH 305/578] Translated using Weblate (Czech)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
---
 fastlane/metadata/android/cs/changelogs/40101010.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/cs/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/cs/changelogs/40101010.txt b/fastlane/metadata/android/cs/changelogs/40101010.txt
new file mode 100644
index 0000000000..73c691da06
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení výkonnosti a opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 2d5a3b71e2f7bcc19684e833feac5cc2265ba6c2 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Sat, 13 Mar 2021 14:52:36 +0000
Subject: [PATCH 306/578] Translated using Weblate (German)

Currently translated at 99.7% (2355 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 6c646775a7..71cdb25616 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2725,4 +2725,7 @@
     <string name="event_status_a11y_sent">Gesendet</string>
     <string name="settings_category_room_directory">Raumverzeichnis</string>
     <string name="action_switch">Wechseln</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Zeige alle Räume im Raumverzeichnis, inklusive der Räume mit anstößigen Inhalten.</string>
+    <string name="settings_room_directory_show_all_rooms">Zeige Räume mit anstößigen Inhalten</string>
+    <string name="event_status_delete_all_failed_dialog_message">Bist du dir sicher, dass du alle nicht gesendete Nachrichten in diesem Raum löschen willst\?</string>
 </resources>
\ No newline at end of file

From a5c113137a44502a84fe326e22f422ab1e0ca778 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Sat, 13 Mar 2021 14:00:14 +0000
Subject: [PATCH 307/578] Translated using Weblate (German)

Currently translated at 99.7% (2355 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 71cdb25616..51fe3937fd 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2728,4 +2728,5 @@
     <string name="settings_room_directory_show_all_rooms_summary">Zeige alle Räume im Raumverzeichnis, inklusive der Räume mit anstößigen Inhalten.</string>
     <string name="settings_room_directory_show_all_rooms">Zeige Räume mit anstößigen Inhalten</string>
     <string name="event_status_delete_all_failed_dialog_message">Bist du dir sicher, dass du alle nicht gesendete Nachrichten in diesem Raum löschen willst\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Nicht gesendete Nachrichten löschen</string>
 </resources>
\ No newline at end of file

From 04a27aa41854bc078e46296315f060337d9c81d6 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sun, 14 Mar 2021 02:45:49 +0000
Subject: [PATCH 308/578] Translated using Weblate (Ukrainian)

Currently translated at 63.2% (1494 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
---
 vector/src/main/res/values-uk/strings.xml | 71 ++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 09aafac703..a9ad29004f 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -869,8 +869,8 @@
     <string name="e2e_re_request_encryption_key_sent">Запит ключа відправлений.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Запит відправлений</string>
     <string name="settings_vibrate_on_mention">Вібрація при згадуванні користувача</string>
-    <string name="settings_deactivate_account_section">Деактивація аккаунта</string>
-    <string name="settings_deactivate_my_account">Деактивувати мій аккаунт</string>
+    <string name="settings_deactivate_account_section">Деактивація облікового запису</string>
+    <string name="settings_deactivate_my_account">Деактивувати мій обліковий запис</string>
     <string name="startup_notification_privacy_title">Конфіденційність сповіщень</string>
     <string name="startup_notification_privacy_button_grant">Надати дозвіл</string>
     <string name="startup_notification_privacy_button_other">Вибрати другий варіант</string>
@@ -1702,4 +1702,71 @@
     <string name="sas_emoji_description">Перевірте цей сеанс, підтвердивши, що на екрані партнера з’являються ці емоджі</string>
     <string name="sas_incoming_request_description">Перевірте цей сеанс, щоб позначити його надійним. Довірені сеанси партнерів дають вам додаткову впевненість під час використання наскрізно зашифрованих повідомлень.</string>
     <string name="settings_active_sessions_unverified_device_desc">Перевірте цей сеанс, щоб позначити його надійним та надати йому доступ до зашифрованих повідомлень. Якщо ви не входили в цей сеанс, ваш обліковий запис може бути зламано:</string>
+    <string name="room_directory_search_hint">Назва або ID (#example:matrix.org)</string>
+    <string name="create_room_name_hint">Назва</string>
+    <string name="direct_room_filter_hint">Фільтрувати за іменем користувача або ID…</string>
+    <string name="this_is_the_beginning_of_room_no_name">Це початок цієї розмови.</string>
+    <string name="room_settings_name_hint">Назва кімнати</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Показувати такі подробиці, як назви кімнат та вміст повідомлень.</string>
+    <string name="create_room_topic_section">Тема кімнати (необов\'язково)</string>
+    <string name="create_room_topic_hint">Тема</string>
+    <string name="delete_event_dialog_content">Ви впевнені, що хочете вилучити (видалити) цю подію\? Зауважте, що, якщо ви видалите назву кімнати або зміните тему, це може скасувати зміну.</string>
+    <string name="room_created_summary_no_topic_creation_text">%s щоб люди знали, про що ця кімната.</string>
+    <string name="add_a_topic_link_text">Додати тему</string>
+    <string name="topic_prefix">"Тема: "</string>
+    <string name="create_room_name_section">Назва кімнати</string>
+    <string name="room_settings_topic_hint">Тема</string>
+    <string name="open_terms_of">Відкрити умови %s</string>
+    <string name="choose_locale_loading_locales">Завантаження інших доступних мов…</string>
+    <string name="choose_locale_other_locales_title">Інші доступні мови</string>
+    <string name="choose_locale_current_locale_title">Поточна мова</string>
+    <string name="user_code_info_text">Поділіться цим кодом з людьми, щоб вони змогли сканувати його, щоб додати вас і почати спілкуватися в чаті.</string>
+    <string name="user_code_my_code">Мій код</string>
+    <string name="user_code_share">Поділитися моїм кодом</string>
+    <string name="user_code_scan">Сканувати QR-код</string>
+    <string name="invite_users_to_room_failure">Ми не можемо запросити користувачів. Перевірте користувачів, яких ви хочете запросити та повторіть спробу.</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="one">Запрошення надіслано для %1$s та ще одній особі</item>
+        <item quantity="few">Запрошення надіслано для %1$s та ще %2$d особам</item>
+        <item quantity="many">Запрошення надіслано для %1$s та ще %2$d осіб</item>
+        <item quantity="other">Запрошення надіслано для %1$s та ще %2$d осіб</item>
+    </plurals>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="one">Одна особа</item>
+        <item quantity="few">%1$d особи</item>
+        <item quantity="many">%1$d осіб</item>
+        <item quantity="other">%1$d осіб</item>
+    </plurals>
+    <string name="room_profile_section_more">Більше</string>
+    <string name="disclaimer_positive_button">ДОКЛАДНІШЕ</string>
+    <string name="encryption_enabled_tile_description">Повідомлення в цій кімнаті захищені наскрізним шифруванням. Дізнайтеся більше та підтвердьте користувачів у їхньому профілі.</string>
+    <string name="room_permissions_change_topic">Змінювати тему</string>
+    <string name="room_permissions_upgrade_the_room">Оновлювати кімнату</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Надсилати події m.room.server_acl</string>
+    <string name="room_permissions_change_permissions">Змінювати дозволи</string>
+    <string name="room_permissions_change_room_name">Змінювати назву кімнати</string>
+    <string name="room_permissions_change_history_visibility">Змінювати видимість історії</string>
+    <string name="room_permissions_enable_room_encryption">Вмикати шифрування кімнати</string>
+    <string name="room_permissions_change_main_address_for_the_room">Змінювати основну адресу кімнати</string>
+    <string name="room_permissions_change_room_avatar">Змінювати аватар кімнати</string>
+    <string name="room_permissions_modify_widgets">Змінювати віджети</string>
+    <string name="room_permissions_notify_everyone">Сповіщати всіх</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Вилучати повідомлення, надіслані іншими</string>
+    <string name="room_permissions_ban_users">Блокувати користувачів</string>
+    <string name="room_permissions_kick_users">Викидати користувачів</string>
+    <string name="room_permissions_change_settings">Змінювати налаштування</string>
+    <string name="room_permissions_invite_users">Запрошувати користувачів</string>
+    <string name="room_permissions_send_messages">Надсилати повідомлення</string>
+    <string name="room_permissions_default_role">Типова роль</string>
+    <string name="room_permissions_notice_read_only">У вас немає дозволу на оновлення ролей, необхідних для зміни різних частин кімнати</string>
+    <string name="room_permissions_notice">Виберіть ролі, необхідні для зміни різних частин кімнати</string>
+    <string name="room_permissions_title">Дозволи</string>
+    <string name="room_settings_permissions_subtitle">Перегляд та оновлення ролей, необхідних для зміни різних частин кімнати.</string>
+    <string name="room_list_quick_actions_leave">Залишити кімнату</string>
+    <string name="room_profile_section_more_leave">Залишити кімнату</string>
+    <string name="direct_room_profile_section_more_leave">Залишити</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Залишити поточну конференцію та перейти до іншої\?</string>
+    <string name="room_participants_leave_private_warning">Це не загальнодоступна кімната. Ви не зможете знову приєднатися без запрошення.</string>
+    <string name="room_settings_enable_encryption_no_permission">У вас немає дозволу на ввімкнення шифрування в цій кімнаті.</string>
+    <string name="room_settings_permissions_title">Дозволи кімнати</string>
 </resources>
\ No newline at end of file

From 256ddc1831408a8723fb119bbedfd416347be78e Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Sat, 13 Mar 2021 09:53:04 +0000
Subject: [PATCH 309/578] Translated using Weblate (Catalan)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
---
 fastlane/metadata/android/ca/changelogs/40101010.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/ca/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/ca/changelogs/40101010.txt b/fastlane/metadata/android/ca/changelogs/40101010.txt
new file mode 100644
index 0000000000..26ce0562d0
--- /dev/null
+++ b/fastlane/metadata/android/ca/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Canvis principals d'aquesta versió: millora de rendiment i correcció d'errors!
+Registre de canvis complet: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 9bfc1d09cd05209514b47c0f658e1e1d8685c174 Mon Sep 17 00:00:00 2001
From: Graeme Power <gjpower@tcd.ie>
Date: Sun, 14 Mar 2021 12:44:08 +0000
Subject: [PATCH 310/578] Added translation using Weblate (Irish)

---
 vector/src/main/res/values-ga/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 vector/src/main/res/values-ga/strings.xml

diff --git a/vector/src/main/res/values-ga/strings.xml b/vector/src/main/res/values-ga/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/vector/src/main/res/values-ga/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From cb0445c785c123714c2fe2daf7c8f883b5abdc98 Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathan@automatia.nl>
Date: Sun, 14 Mar 2021 19:14:53 +0100
Subject: [PATCH 311/578] Change bold to headers

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 12 ++++++------
 .github/ISSUE_TEMPLATE/feature_request.md |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index f2fa4ef02d..d7c3506fa0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,27 +7,27 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+#### Describe the bug
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+#### To Reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+#### Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+#### Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Smartphone (please complete the following information):**
+#### Smartphone (please complete the following information):
  - Device: [e.g. Samsung S6]
  - OS: [e.g. Android 6.0]
 
-**Additional context**
+#### Additional context
  - App version and store [e.g. 1.0.0 - F-Droid]
  - Homeserver: [e.g. matrix.org]
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 73c93186d7..5f643c26df 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+#### *Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+#### Describe the solution you'd like.
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+#### Describe alternatives you've considered.
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+#### Additional context
 Add any other context or screenshots about the feature request here.

From 2708b85a209ce53e12ea8a26a073cbd7890ebcf6 Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathan@automatia.nl>
Date: Sun, 14 Mar 2021 19:17:05 +0100
Subject: [PATCH 312/578] Update CHANGES.md

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index e4ff049550..8ad8d3c774 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,7 +23,7 @@ Test:
  -
 
 Other changes:
- -
+ - Change formatting on issue templates to proper headings.
 
 Changes in Element 1.1.1 (2021-XX-XX)
 ===================================================

From c998f5fd8f037e39788d13664f9a22ef673fa62c Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathan@automatia.nl>
Date: Sun, 14 Mar 2021 19:20:35 +0100
Subject: [PATCH 313/578] whoops

---
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5f643c26df..da96d461c5 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-#### *Is your feature request related to a problem? Please describe.
+#### Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
 #### Describe the solution you'd like.

From e8015bfbd4f8e24faa0fd21917b150defcb17a82 Mon Sep 17 00:00:00 2001
From: oogm <ga84dom@mytum.de>
Date: Mon, 15 Mar 2021 00:19:04 +0100
Subject: [PATCH 314/578] Update emoji_picker_datasource.json to Unicode 13.1
 and dynamically filter reactions by renderability

---
 CHANGES.md                                    |  1 +
 .../reactions/data/EmojiDataSourceTest.kt     |  8 ++---
 .../reactions/data/EmojiDataSource.kt         | 29 ++++++++++++++++---
 .../main/res/raw/emoji_picker_datasource.json |  2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e4ff049550..c6f98124d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -41,6 +41,7 @@ Improvements 🙌:
  - Sending is now queuing by room and not uniquely to the session
  - Improve Snackbar duration (#2929)
  - Improve sending message state (#2937)
+ - Update reactions to Unicode 13.1 (#1481)
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)
diff --git a/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
index 8959416445..79090c42dd 100644
--- a/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt
@@ -42,17 +42,15 @@ class EmojiDataSourceTest : InstrumentedTest {
     @Test
     fun checkNumberOfResult() {
         val emojiDataSource = EmojiDataSource(context().resources)
-
-        assertEquals("Wrong number of emojis", 1545, emojiDataSource.rawData.emojis.size)
-        assertEquals("Wrong number of categories", 8, emojiDataSource.rawData.categories.size)
-        assertEquals("Wrong number of aliases", 57, emojiDataSource.rawData.aliases.size)
+        assertTrue("Wrong number of emojis", emojiDataSource.rawData.emojis.size >= 500)
+        assertTrue("Wrong number of categories", emojiDataSource.rawData.categories.size >= 8)
     }
 
     @Test
     fun searchTestEmptySearch() {
         val emojiDataSource = EmojiDataSource(context().resources)
 
-        assertEquals("Empty search should return 1545 results", 1545, emojiDataSource.filterWith("").size)
+        assertTrue("Empty search should return at least 500 results", emojiDataSource.filterWith("").size >= 500)
     }
 
     @Test
diff --git a/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
index 891f083644..97f85ea1f5 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
@@ -16,6 +16,8 @@
 package im.vector.app.features.reactions.data
 
 import android.content.res.Resources
+import android.graphics.Paint
+import androidx.core.graphics.PaintCompat
 import com.squareup.moshi.Moshi
 import im.vector.app.R
 import javax.inject.Inject
@@ -25,6 +27,7 @@ import javax.inject.Singleton
 class EmojiDataSource @Inject constructor(
         resources: Resources
 ) {
+    private val paint = Paint()
     val rawData = resources.openRawResource(R.raw.emoji_picker_datasource)
             .use { input ->
                 Moshi.Builder()
@@ -34,18 +37,32 @@ class EmojiDataSource @Inject constructor(
             }
             ?.let { parsedRawData ->
                 // Add key as a keyword, it will solve the issue that ":tada" is not available in completion
+                // Only add emojis to emojis/categories that can be rendered by the system
                 parsedRawData.copy(
                         emojis = mutableMapOf<String, EmojiItem>().apply {
                             parsedRawData.emojis.keys.forEach { key ->
                                 val origin = parsedRawData.emojis[key] ?: return@forEach
 
                                 // Do not add keys containing '_'
-                                if (origin.keywords.contains(key) || key.contains("_")) {
-                                    put(key, origin)
-                                } else {
-                                    put(key, origin.copy(keywords = origin.keywords + key))
+                                if (isEmojiRenderable(origin.emoji)) {
+                                    if (origin.keywords.contains(key) || key.contains("_")) {
+                                        put(key, origin)
+                                    } else {
+                                        put(key, origin.copy(keywords = origin.keywords + key))
+                                    }
                                 }
                             }
+                        },
+                        categories = mutableListOf<EmojiCategory>().apply {
+                            parsedRawData.categories.forEach { entry ->
+                                add(EmojiCategory(entry.id, entry.name, mutableListOf<String>().apply {
+                                    entry.emojis.forEach { e ->
+                                        if (isEmojiRenderable(parsedRawData.emojis[e]!!.emoji)) {
+                                            add(e)
+                                        }
+                                    }
+                                }))
+                            }
                         }
                 )
             }
@@ -53,6 +70,10 @@ class EmojiDataSource @Inject constructor(
 
     private val quickReactions = mutableListOf<EmojiItem>()
 
+    private fun isEmojiRenderable(emoji: String): Boolean {
+        return PaintCompat.hasGlyph(paint, emoji)
+    }
+
     fun filterWith(query: String): List<EmojiItem> {
         val words = query.split("\\s".toRegex())
 
diff --git a/vector/src/main/res/raw/emoji_picker_datasource.json b/vector/src/main/res/raw/emoji_picker_datasource.json
index 431b7d420c..bf33808f2f 100644
--- a/vector/src/main/res/raw/emoji_picker_datasource.json
+++ b/vector/src/main/res/raw/emoji_picker_datasource.json
@@ -1 +1 @@
-{"compressed":true,"categories":[{"id":"people","name":"Smileys & People","emojis":["grinning","grin","joy","rolling_on_the_floor_laughing","smiley","smile","sweat_smile","laughing","wink","blush","yum","sunglasses","heart_eyes","kissing_heart","kissing","kissing_smiling_eyes","kissing_closed_eyes","relaxed","slightly_smiling_face","hugging_face","star-struck","thinking_face","face_with_raised_eyebrow","neutral_face","expressionless","no_mouth","face_with_rolling_eyes","smirk","persevere","disappointed_relieved","open_mouth","zipper_mouth_face","hushed","sleepy","tired_face","sleeping","relieved","stuck_out_tongue","stuck_out_tongue_winking_eye","stuck_out_tongue_closed_eyes","drooling_face","unamused","sweat","pensive","confused","upside_down_face","money_mouth_face","astonished","white_frowning_face","slightly_frowning_face","confounded","disappointed","worried","triumph","cry","sob","frowning","anguished","fearful","weary","exploding_head","grimacing","cold_sweat","scream","flushed","zany_face","dizzy_face","rage","angry","face_with_symbols_on_mouth","mask","face_with_thermometer","face_with_head_bandage","nauseated_face","face_vomiting","sneezing_face","innocent","face_with_cowboy_hat","clown_face","lying_face","shushing_face","face_with_hand_over_mouth","face_with_monocle","nerd_face","smiling_imp","imp","japanese_ogre","japanese_goblin","skull","skull_and_crossbones","ghost","alien","space_invader","robot_face","hankey","smiley_cat","smile_cat","joy_cat","heart_eyes_cat","smirk_cat","kissing_cat","scream_cat","crying_cat_face","pouting_cat","see_no_evil","hear_no_evil","speak_no_evil","baby","child","boy","girl","adult","man","woman","older_adult","older_man","older_woman","male-doctor","female-doctor","male-student","female-student","male-teacher","female-teacher","male-judge","female-judge","male-farmer","female-farmer","male-cook","female-cook","male-mechanic","female-mechanic","male-factory-worker","female-factory-worker","male-office-worker","female-office-worker","male-scientist","female-scientist","male-technologist","female-technologist","male-singer","female-singer","male-artist","female-artist","male-pilot","female-pilot","male-astronaut","female-astronaut","male-firefighter","female-firefighter","cop","male-police-officer","female-police-officer","sleuth_or_spy","male-detective","female-detective","guardsman","male-guard","female-guard","construction_worker","male-construction-worker","female-construction-worker","prince","princess","man_with_turban","man-wearing-turban","woman-wearing-turban","man_with_gua_pi_mao","person_with_headscarf","bearded_person","person_with_blond_hair","blond-haired-man","blond-haired-woman","man_in_tuxedo","bride_with_veil","pregnant_woman","breast-feeding","angel","santa","mrs_claus","mage","female_mage","male_mage","fairy","female_fairy","male_fairy","vampire","female_vampire","male_vampire","merperson","mermaid","merman","elf","female_elf","male_elf","genie","female_genie","male_genie","zombie","female_zombie","male_zombie","person_frowning","man-frowning","woman-frowning","person_with_pouting_face","man-pouting","woman-pouting","no_good","man-gesturing-no","woman-gesturing-no","ok_woman","man-gesturing-ok","woman-gesturing-ok","information_desk_person","man-tipping-hand","woman-tipping-hand","raising_hand","man-raising-hand","woman-raising-hand","bow","man-bowing","woman-bowing","face_palm","man-facepalming","woman-facepalming","shrug","man-shrugging","woman-shrugging","massage","man-getting-massage","woman-getting-massage","haircut","man-getting-haircut","woman-getting-haircut","walking","man-walking","woman-walking","runner","man-running","woman-running","dancer","man_dancing","dancers","man-with-bunny-ears-partying","woman-with-bunny-ears-partying","person_in_steamy_room","woman_in_steamy_room","man_in_steamy_room","person_climbing","woman_climbing","man_climbing","person_in_lotus_position","woman_in_lotus_position","man_in_lotus_position","bath","sleeping_accommodation","man_in_business_suit_levitating","speaking_head_in_silhouette","bust_in_silhouette","busts_in_silhouette","fencer","horse_racing","skier","snowboarder","golfer","man-golfing","woman-golfing","surfer","man-surfing","woman-surfing","rowboat","man-rowing-boat","woman-rowing-boat","swimmer","man-swimming","woman-swimming","person_with_ball","man-bouncing-ball","woman-bouncing-ball","weight_lifter","man-lifting-weights","woman-lifting-weights","bicyclist","man-biking","woman-biking","mountain_bicyclist","man-mountain-biking","woman-mountain-biking","racing_car","racing_motorcycle","person_doing_cartwheel","man-cartwheeling","woman-cartwheeling","wrestlers","man-wrestling","woman-wrestling","water_polo","man-playing-water-polo","woman-playing-water-polo","handball","man-playing-handball","woman-playing-handball","juggling","man-juggling","woman-juggling","couple","two_men_holding_hands","two_women_holding_hands","couplekiss","woman-kiss-man","man-kiss-man","woman-kiss-woman","couple_with_heart","woman-heart-man","man-heart-man","woman-heart-woman","family","man-woman-boy","man-woman-girl","man-woman-girl-boy","man-woman-boy-boy","man-woman-girl-girl","man-man-boy","man-man-girl","man-man-girl-boy","man-man-boy-boy","man-man-girl-girl","woman-woman-boy","woman-woman-girl","woman-woman-girl-boy","woman-woman-boy-boy","woman-woman-girl-girl","man-boy","man-boy-boy","man-girl","man-girl-boy","man-girl-girl","woman-boy","woman-boy-boy","woman-girl","woman-girl-boy","woman-girl-girl","selfie","muscle","point_left","point_right","point_up","point_up_2","middle_finger","point_down","v","crossed_fingers","spock-hand","the_horns","call_me_hand","raised_hand_with_fingers_splayed","hand","ok_hand","+1","-1","fist","facepunch","left-facing_fist","right-facing_fist","raised_back_of_hand","wave","i_love_you_hand_sign","writing_hand","clap","open_hands","raised_hands","palms_up_together","pray","handshake","nail_care","ear","nose","footprints","eyes","eye","eye-in-speech-bubble","brain","tongue","lips","kiss","cupid","heart","heartbeat","broken_heart","two_hearts","sparkling_heart","heartpulse","blue_heart","green_heart","yellow_heart","orange_heart","purple_heart","black_heart","gift_heart","revolving_hearts","heart_decoration","heavy_heart_exclamation_mark_ornament","love_letter","zzz","anger","bomb","boom","sweat_drops","dash","dizzy","speech_balloon","left_speech_bubble","right_anger_bubble","thought_balloon","hole","eyeglasses","dark_sunglasses","necktie","shirt","jeans","scarf","gloves","coat","socks","dress","kimono","bikini","womans_clothes","purse","handbag","pouch","shopping_bags","school_satchel","mans_shoe","athletic_shoe","high_heel","sandal","boot","crown","womans_hat","tophat","mortar_board","billed_cap","helmet_with_white_cross","prayer_beads","lipstick","ring","gem"]},{"id":"nature","name":"Animals & Nature","emojis":["monkey_face","monkey","gorilla","dog","dog2","poodle","wolf","fox_face","cat","cat2","lion_face","tiger","tiger2","leopard","horse","racehorse","unicorn_face","zebra_face","deer","cow","ox","water_buffalo","cow2","pig","pig2","boar","pig_nose","ram","sheep","goat","dromedary_camel","camel","giraffe_face","elephant","rhinoceros","mouse","mouse2","rat","hamster","rabbit","rabbit2","chipmunk","hedgehog","bat","bear","koala","panda_face","feet","turkey","chicken","rooster","hatching_chick","baby_chick","hatched_chick","bird","penguin","dove_of_peace","eagle","duck","owl","frog","crocodile","turtle","lizard","snake","dragon_face","dragon","sauropod","t-rex","whale","whale2","dolphin","fish","tropical_fish","blowfish","shark","octopus","shell","crab","shrimp","squid","snail","butterfly","bug","ant","bee","beetle","cricket","spider","spider_web","scorpion","bouquet","cherry_blossom","white_flower","rosette","rose","wilted_flower","hibiscus","sunflower","blossom","tulip","seedling","evergreen_tree","deciduous_tree","palm_tree","cactus","ear_of_rice","herb","shamrock","four_leaf_clover","maple_leaf","fallen_leaf","leaves"]},{"id":"foods","name":"Food & Drink","emojis":["grapes","melon","watermelon","tangerine","lemon","banana","pineapple","apple","green_apple","pear","peach","cherries","strawberry","kiwifruit","tomato","coconut","avocado","eggplant","potato","carrot","corn","hot_pepper","cucumber","broccoli","mushroom","peanuts","chestnut","bread","croissant","baguette_bread","pretzel","pancakes","cheese_wedge","meat_on_bone","poultry_leg","cut_of_meat","bacon","hamburger","fries","pizza","hotdog","sandwich","taco","burrito","stuffed_flatbread","egg","fried_egg","shallow_pan_of_food","stew","bowl_with_spoon","green_salad","popcorn","canned_food","bento","rice_cracker","rice_ball","rice","curry","ramen","spaghetti","sweet_potato","oden","sushi","fried_shrimp","fish_cake","dango","dumpling","fortune_cookie","takeout_box","icecream","shaved_ice","ice_cream","doughnut","cookie","birthday","cake","pie","chocolate_bar","candy","lollipop","custard","honey_pot","baby_bottle","glass_of_milk","coffee","tea","sake","champagne","wine_glass","cocktail","tropical_drink","beer","beers","clinking_glasses","tumbler_glass","cup_with_straw","chopsticks","knife_fork_plate","fork_and_knife","spoon","hocho","amphora"]},{"id":"activity","name":"Activities","emojis":["jack_o_lantern","christmas_tree","fireworks","sparkler","sparkles","balloon","tada","confetti_ball","tanabata_tree","bamboo","dolls","flags","wind_chime","rice_scene","ribbon","gift","reminder_ribbon","admission_tickets","ticket","medal","trophy","sports_medal","first_place_medal","second_place_medal","third_place_medal","soccer","baseball","basketball","volleyball","football","rugby_football","tennis","8ball","bowling","cricket_bat_and_ball","field_hockey_stick_and_ball","ice_hockey_stick_and_puck","table_tennis_paddle_and_ball","badminton_racquet_and_shuttlecock","boxing_glove","martial_arts_uniform","goal_net","dart","golf","ice_skate","fishing_pole_and_fish","running_shirt_with_sash","ski","sled","curling_stone","video_game","joystick","game_die","spades","hearts","diamonds","clubs","black_joker","mahjong","flower_playing_cards"]},{"id":"places","name":"Travel & Places","emojis":["earth_africa","earth_americas","earth_asia","globe_with_meridians","world_map","japan","snow_capped_mountain","mountain","volcano","mount_fuji","camping","beach_with_umbrella","desert","desert_island","national_park","stadium","classical_building","building_construction","house_buildings","cityscape","derelict_house_building","house","house_with_garden","office","post_office","european_post_office","hospital","bank","hotel","love_hotel","convenience_store","school","department_store","factory","japanese_castle","european_castle","wedding","tokyo_tower","statue_of_liberty","church","mosque","synagogue","shinto_shrine","kaaba","fountain","tent","foggy","night_with_stars","sunrise_over_mountains","sunrise","city_sunset","city_sunrise","bridge_at_night","hotsprings","milky_way","carousel_horse","ferris_wheel","roller_coaster","barber","circus_tent","performing_arts","frame_with_picture","art","slot_machine","steam_locomotive","railway_car","bullettrain_side","bullettrain_front","train2","metro","light_rail","station","tram","monorail","mountain_railway","train","bus","oncoming_bus","trolleybus","minibus","ambulance","fire_engine","police_car","oncoming_police_car","taxi","oncoming_taxi","car","oncoming_automobile","blue_car","truck","articulated_lorry","tractor","bike","scooter","motor_scooter","busstop","motorway","railway_track","fuelpump","rotating_light","traffic_light","vertical_traffic_light","construction","octagonal_sign","anchor","boat","canoe","speedboat","passenger_ship","ferry","motor_boat","ship","airplane","small_airplane","airplane_departure","airplane_arriving","seat","helicopter","suspension_railway","mountain_cableway","aerial_tramway","satellite","rocket","flying_saucer","bellhop_bell","door","bed","couch_and_lamp","toilet","shower","bathtub","hourglass","hourglass_flowing_sand","watch","alarm_clock","stopwatch","timer_clock","mantelpiece_clock","clock12","clock1230","clock1","clock130","clock2","clock230","clock3","clock330","clock4","clock430","clock5","clock530","clock6","clock630","clock7","clock730","clock8","clock830","clock9","clock930","clock10","clock1030","clock11","clock1130","new_moon","waxing_crescent_moon","first_quarter_moon","moon","full_moon","waning_gibbous_moon","last_quarter_moon","waning_crescent_moon","crescent_moon","new_moon_with_face","first_quarter_moon_with_face","last_quarter_moon_with_face","thermometer","sunny","full_moon_with_face","sun_with_face","star","star2","stars","cloud","partly_sunny","thunder_cloud_and_rain","mostly_sunny","barely_sunny","partly_sunny_rain","rain_cloud","snow_cloud","lightning","tornado","fog","wind_blowing_face","cyclone","rainbow","closed_umbrella","umbrella","umbrella_with_rain_drops","umbrella_on_ground","zap","snowflake","snowman","snowman_without_snow","comet","fire","droplet","ocean"]},{"id":"objects","name":"Objects","emojis":["mute","speaker","sound","loud_sound","loudspeaker","mega","postal_horn","bell","no_bell","musical_score","musical_note","notes","studio_microphone","level_slider","control_knobs","microphone","headphones","radio","saxophone","guitar","musical_keyboard","trumpet","violin","drum_with_drumsticks","iphone","calling","phone","telephone_receiver","pager","fax","battery","electric_plug","computer","desktop_computer","printer","keyboard","three_button_mouse","trackball","minidisc","floppy_disk","cd","dvd","movie_camera","film_frames","film_projector","clapper","tv","camera","camera_with_flash","video_camera","vhs","mag","mag_right","microscope","telescope","satellite_antenna","candle","bulb","flashlight","izakaya_lantern","notebook_with_decorative_cover","closed_book","book","green_book","blue_book","orange_book","books","notebook","ledger","page_with_curl","scroll","page_facing_up","newspaper","rolled_up_newspaper","bookmark_tabs","bookmark","label","moneybag","yen","dollar","euro","pound","money_with_wings","credit_card","chart","currency_exchange","heavy_dollar_sign","email","e-mail","incoming_envelope","envelope_with_arrow","outbox_tray","inbox_tray","package","mailbox","mailbox_closed","mailbox_with_mail","mailbox_with_no_mail","postbox","ballot_box_with_ballot","pencil2","black_nib","lower_left_fountain_pen","lower_left_ballpoint_pen","lower_left_paintbrush","lower_left_crayon","memo","briefcase","file_folder","open_file_folder","card_index_dividers","date","calendar","spiral_note_pad","spiral_calendar_pad","card_index","chart_with_upwards_trend","chart_with_downwards_trend","bar_chart","clipboard","pushpin","round_pushpin","paperclip","linked_paperclips","straight_ruler","triangular_ruler","scissors","card_file_box","file_cabinet","wastebasket","lock","unlock","lock_with_ink_pen","closed_lock_with_key","key","old_key","hammer","pick","hammer_and_pick","hammer_and_wrench","dagger_knife","crossed_swords","gun","bow_and_arrow","shield","wrench","nut_and_bolt","gear","compression","alembic","scales","link","chains","syringe","pill","smoking","coffin","funeral_urn","moyai","oil_drum","crystal_ball","shopping_trolley"]},{"id":"symbols","name":"Symbols","emojis":["atm","put_litter_in_its_place","potable_water","wheelchair","mens","womens","restroom","baby_symbol","wc","passport_control","customs","baggage_claim","left_luggage","warning","children_crossing","no_entry","no_entry_sign","no_bicycles","no_smoking","do_not_litter","non-potable_water","no_pedestrians","no_mobile_phones","underage","radioactive_sign","biohazard_sign","arrow_up","arrow_upper_right","arrow_right","arrow_lower_right","arrow_down","arrow_lower_left","arrow_left","arrow_upper_left","arrow_up_down","left_right_arrow","leftwards_arrow_with_hook","arrow_right_hook","arrow_heading_up","arrow_heading_down","arrows_clockwise","arrows_counterclockwise","back","end","on","soon","top","place_of_worship","atom_symbol","om_symbol","star_of_david","wheel_of_dharma","yin_yang","latin_cross","orthodox_cross","star_and_crescent","peace_symbol","menorah_with_nine_branches","six_pointed_star","aries","taurus","gemini","cancer","leo","virgo","libra","scorpius","sagittarius","capricorn","aquarius","pisces","ophiuchus","twisted_rightwards_arrows","repeat","repeat_one","arrow_forward","fast_forward","black_right_pointing_double_triangle_with_vertical_bar","black_right_pointing_triangle_with_double_vertical_bar","arrow_backward","rewind","black_left_pointing_double_triangle_with_vertical_bar","arrow_up_small","arrow_double_up","arrow_down_small","arrow_double_down","double_vertical_bar","black_square_for_stop","black_circle_for_record","eject","cinema","low_brightness","high_brightness","signal_strength","vibration_mode","mobile_phone_off","female_sign","male_sign","medical_symbol","recycle","fleur_de_lis","trident","name_badge","beginner","o","white_check_mark","ballot_box_with_check","heavy_check_mark","heavy_multiplication_x","x","negative_squared_cross_mark","heavy_plus_sign","heavy_minus_sign","heavy_division_sign","curly_loop","loop","part_alternation_mark","eight_spoked_asterisk","eight_pointed_black_star","sparkle","bangbang","interrobang","question","grey_question","grey_exclamation","exclamation","wavy_dash","copyright","registered","tm","hash","keycap_star","zero","one","two","three","four","five","six","seven","eight","nine","keycap_ten","100","capital_abcd","abcd","1234","symbols","abc","a","ab","b","cl","cool","free","information_source","id","m","new","ng","o2","ok","parking","sos","up","vs","koko","sa","u6708","u6709","u6307","ideograph_advantage","u5272","u7121","u7981","accept","u7533","u5408","u7a7a","congratulations","secret","u55b6","u6e80","black_small_square","white_small_square","white_medium_square","black_medium_square","white_medium_small_square","black_medium_small_square","black_large_square","white_large_square","large_orange_diamond","large_blue_diamond","small_orange_diamond","small_blue_diamond","small_red_triangle","small_red_triangle_down","diamond_shape_with_a_dot_inside","radio_button","black_square_button","white_square_button","white_circle","black_circle","red_circle","large_blue_circle"]},{"id":"flags","name":"Flags","emojis":["checkered_flag","cn","crossed_flags","de","es","flag-ac","flag-ad","flag-ae","flag-af","flag-ag","flag-ai","flag-al","flag-am","flag-ao","flag-aq","flag-ar","flag-as","flag-at","flag-au","flag-aw","flag-ax","flag-az","flag-ba","flag-bb","flag-bd","flag-be","flag-bf","flag-bg","flag-bh","flag-bi","flag-bj","flag-bm","flag-bn","flag-bo","flag-br","flag-bs","flag-bt","flag-bv","flag-bw","flag-by","flag-bz","flag-ca","flag-cc","flag-cd","flag-cf","flag-cg","flag-ch","flag-ci","flag-ck","flag-cl","flag-cm","flag-co","flag-cp","flag-cr","flag-cu","flag-cv","flag-cw","flag-cx","flag-cy","flag-cz","flag-dj","flag-dk","flag-dm","flag-do","flag-dz","flag-ec","flag-ee","flag-eg","flag-england","flag-er","flag-et","flag-eu","flag-fi","flag-fj","flag-fm","flag-fo","flag-ga","flag-gd","flag-ge","flag-gg","flag-gh","flag-gi","flag-gl","flag-gm","flag-gn","flag-gq","flag-gr","flag-gt","flag-gu","flag-gw","flag-gy","flag-hk","flag-hm","flag-hn","flag-hr","flag-ht","flag-hu","flag-ic","flag-id","flag-ie","flag-il","flag-im","flag-in","flag-io","flag-iq","flag-ir","flag-is","flag-je","flag-jm","flag-jo","flag-ke","flag-kg","flag-kh","flag-ki","flag-km","flag-kn","flag-kp","flag-kw","flag-ky","flag-kz","flag-la","flag-lb","flag-lc","flag-li","flag-lk","flag-lr","flag-ls","flag-lt","flag-lu","flag-lv","flag-ly","flag-ma","flag-mc","flag-md","flag-me","flag-mg","flag-mh","flag-mk","flag-ml","flag-mm","flag-mn","flag-mo","flag-mp","flag-mr","flag-ms","flag-mt","flag-mu","flag-mv","flag-mw","flag-mx","flag-my","flag-mz","flag-na","flag-ne","flag-nf","flag-ng","flag-ni","flag-nl","flag-no","flag-np","flag-nr","flag-nu","flag-nz","flag-om","flag-pa","flag-pe","flag-pf","flag-pg","flag-ph","flag-pk","flag-pl","flag-pn","flag-pr","flag-ps","flag-pt","flag-pw","flag-py","flag-qa","flag-ro","flag-rs","flag-rw","flag-sa","flag-sb","flag-sc","flag-scotland","flag-sd","flag-se","flag-sg","flag-sh","flag-si","flag-sj","flag-sk","flag-sl","flag-sm","flag-sn","flag-so","flag-sr","flag-ss","flag-st","flag-sv","flag-sx","flag-sy","flag-sz","flag-ta","flag-tc","flag-td","flag-tg","flag-th","flag-tj","flag-tk","flag-tl","flag-tm","flag-tn","flag-to","flag-tr","flag-tt","flag-tv","flag-tw","flag-tz","flag-ua","flag-ug","flag-um","flag-uy","flag-uz","flag-va","flag-vc","flag-ve","flag-vg","flag-vi","flag-vn","flag-vu","flag-wales","flag-ws","flag-ye","flag-za","flag-zm","flag-zw","fr","gb","it","jp","kr","rainbow-flag","ru","triangular_flag_on_post","us","waving_black_flag","waving_white_flag"]}],"emojis":{"100":{"a":"Hundred Points Symbol","b":"1F4AF","j":["score","perfect","numbers","century","exam","quiz","test","pass","hundred"],"k":[25,26]},"1234":{"a":"Input Symbol for Numbers","b":"1F522","j":["numbers","blue-square"],"k":[27,36]},"monkey_face":{"a":"Monkey Face","b":"1F435","j":["animal","nature","circus"],"k":[13,31],"l":[":o)"]},"grinning":{"a":"Grinning Face","b":"1F600","j":["face","smile","happy","joy",":D","grin"],"k":[30,24],"m":":D"},"earth_africa":{"a":"Earth Globe Europe-Africa","b":"1F30D","j":["globe","world","international"],"k":[6,5]},"checkered_flag":{"a":"Chequered Flag","b":"1F3C1","j":["contest","finishline","race","gokart"],"k":[9,27]},"mute":{"a":"Speaker with Cancellation Stroke","b":"1F507","j":["sound","volume","silence","quiet"],"k":[27,9]},"jack_o_lantern":{"a":"Jack-O-Lantern","b":"1F383","j":["halloween","light","pumpkin","creepy","fall"],"k":[8,17]},"atm":{"a":"Automated Teller Machine","b":"1F3E7","j":["money","sales","cash","blue-square","payment","bank"],"k":[12,4]},"grapes":{"a":"Grapes","b":"1F347","j":["fruit","food","wine"],"k":[7,9]},"earth_americas":{"a":"Earth Globe Americas","b":"1F30E","j":["globe","world","USA","international"],"k":[6,6]},"grin":{"a":"Grinning Face with Smiling Eyes","b":"1F601","j":["face","happy","smile","joy","kawaii"],"k":[30,25]},"melon":{"a":"Melon","b":"1F348","j":["fruit","nature","food"],"k":[7,10]},"triangular_flag_on_post":{"a":"Triangular Flag on Post","b":"1F6A9","j":["mark","milestone","place"],"k":[35,14]},"monkey":{"a":"Monkey","b":"1F412","j":["animal","nature","banana","circus"],"k":[12,48]},"christmas_tree":{"a":"Christmas Tree","b":"1F384","j":["festival","vacation","december","xmas","celebration"],"k":[8,18]},"put_litter_in_its_place":{"a":"Put Litter in Its Place Symbol","b":"1F6AE","j":["blue-square","sign","human","info"],"k":[35,19]},"speaker":{"a":"Speaker","b":"1F508","j":["sound","volume","silence","broadcast"],"k":[27,10]},"earth_asia":{"a":"Earth Globe Asia-Australia","b":"1F30F","j":["globe","world","east","international"],"k":[6,7]},"crossed_flags":{"a":"Crossed Flags","b":"1F38C","j":["japanese","nation","country","border"],"k":[8,31]},"joy":{"a":"Face with Tears of Joy","b":"1F602","j":["face","cry","tears","weep","happy","happytears","haha"],"k":[30,26]},"sound":{"a":"Speaker with One Sound Wave","b":"1F509","j":["volume","speaker","broadcast"],"k":[27,11]},"watermelon":{"a":"Watermelon","b":"1F349","j":["fruit","food","picnic","summer"],"k":[7,11]},"gorilla":{"a":"Gorilla","b":"1F98D","j":["animal","nature","circus"],"k":[42,37],"o":9},"fireworks":{"a":"Fireworks","b":"1F386","j":["photo","festival","carnival","congratulations"],"k":[8,25]},"potable_water":{"a":"Potable Water Symbol","b":"1F6B0","j":["blue-square","liquid","restroom","cleaning","faucet"],"k":[35,21]},"wheelchair":{"a":"Wheelchair Symbol","b":"267F","j":["blue-square","disabled","a11y","accessibility"],"k":[48,10],"o":4},"rolling_on_the_floor_laughing":{"a":"Rolling on the Floor Laughing","b":"1F923","k":[38,26],"o":9},"loud_sound":{"a":"Speaker with Three Sound Waves","b":"1F50A","j":["volume","noise","noisy","speaker","broadcast"],"k":[27,12]},"waving_black_flag":{"a":"Waving Black Flag","b":"1F3F4","k":[12,19],"o":7},"tangerine":{"a":"Tangerine","b":"1F34A","j":["food","fruit","nature","orange"],"k":[7,12]},"dog":{"a":"Dog Face","b":"1F436","j":["animal","friend","nature","woof","puppy","pet","faithful"],"k":[13,32]},"sparkler":{"a":"Firework Sparkler","b":"1F387","j":["stars","night","shine"],"k":[8,26]},"globe_with_meridians":{"a":"Globe with Meridians","b":"1F310","j":["earth","international","world","internet","interweb","i18n"],"k":[6,8]},"smiley":{"a":"Smiling Face with Open Mouth","b":"1F603","j":["face","happy","joy","haha",":D",":)","smile","funny"],"k":[30,27],"l":["=)","=-)"],"m":":)"},"loudspeaker":{"a":"Public Address Loudspeaker","b":"1F4E2","j":["volume","sound"],"k":[26,25]},"sparkles":{"a":"Sparkles","b":"2728","j":["stars","shine","shiny","cool","awesome","good","magic"],"k":[49,48]},"dog2":{"a":"Dog","b":"1F415","j":["animal","nature","friend","doge","pet","faithful"],"k":[12,51]},"waving_white_flag":{"a":"Waving White Flag","b":"1F3F3-FE0F","c":"1F3F3","k":[12,15],"o":7},"world_map":{"a":"World Map","b":"1F5FA-FE0F","c":"1F5FA","j":["location","direction"],"k":[30,18],"o":7},"lemon":{"a":"Lemon","b":"1F34B","j":["fruit","nature"],"k":[7,13]},"mens":{"a":"Mens Symbol","b":"1F6B9","j":["toilet","restroom","wc","blue-square","gender","male"],"k":[36,29]},"womens":{"a":"Womens Symbol","b":"1F6BA","j":["purple-square","woman","female","toilet","loo","restroom","gender"],"k":[36,30]},"rainbow-flag":{"a":"Rainbow Flag","b":"1F3F3-FE0F-200D-1F308","c":"1F3F3-200D-1F308","k":[12,14],"o":7},"smile":{"a":"Smiling Face with Open Mouth and Smiling Eyes","b":"1F604","j":["face","happy","joy","funny","haha","laugh","like",":D",":)"],"k":[30,28],"l":["C:","c:",":D",":-D"],"m":":)"},"banana":{"a":"Banana","b":"1F34C","j":["fruit","food","monkey"],"k":[7,14]},"mega":{"a":"Cheering Megaphone","b":"1F4E3","j":["sound","speaker","volume"],"k":[26,26]},"japan":{"a":"Silhouette of Japan","b":"1F5FE","j":["nation","country","japanese","asia"],"k":[30,22]},"poodle":{"a":"Poodle","b":"1F429","j":["dog","animal","101","nature","pet"],"k":[13,19]},"balloon":{"a":"Balloon","b":"1F388","j":["party","celebration","birthday","circus"],"k":[8,27]},"flag-ac":{"a":"Ascension Island Flag","b":"1F1E6-1F1E8","k":[0,31]},"sweat_smile":{"a":"Smiling Face with Open Mouth and Cold Sweat","b":"1F605","j":["face","hot","happy","laugh","sweat","smile","relief"],"k":[30,29]},"pineapple":{"a":"Pineapple","b":"1F34D","j":["fruit","nature","food"],"k":[7,15]},"restroom":{"a":"Restroom","b":"1F6BB","j":["blue-square","toilet","refresh","wc","gender"],"k":[36,31]},"postal_horn":{"a":"Postal Horn","b":"1F4EF","j":["instrument","music"],"k":[26,38]},"wolf":{"a":"Wolf Face","b":"1F43A","j":["animal","nature","wild"],"k":[13,36]},"tada":{"a":"Party Popper","b":"1F389","j":["party","congratulations","birthday","magic","circus","celebration"],"k":[8,28]},"snow_capped_mountain":{"a":"Snow Capped Mountain","b":"1F3D4-FE0F","c":"1F3D4","k":[11,37],"o":7},"laughing":{"a":"Smiling Face with Open Mouth and Tightly-Closed Eyes","b":"1F606","j":["happy","joy","lol","satisfied","haha","face","glad","XD","laugh"],"k":[30,30],"l":[":>",":->"],"n":["satisfied"]},"apple":{"a":"Red Apple","b":"1F34E","j":["fruit","mac","school"],"k":[7,16]},"flag-ad":{"a":"Andorra Flag","b":"1F1E6-1F1E9","k":[0,32]},"fox_face":{"a":"Fox Face","b":"1F98A","j":["animal","nature","face"],"k":[42,34],"o":9},"confetti_ball":{"a":"Confetti Ball","b":"1F38A","j":["festival","party","birthday","circus"],"k":[8,29]},"bell":{"a":"Bell","b":"1F514","j":["sound","notification","christmas","xmas","chime"],"k":[27,22]},"mountain":{"a":"Mountain","b":"26F0-FE0F","c":"26F0","j":["photo","nature","environment"],"k":[48,38],"o":5},"baby_symbol":{"a":"Baby Symbol","b":"1F6BC","j":["orange-square","child"],"k":[36,32]},"wc":{"a":"Water Closet","b":"1F6BE","j":["toilet","restroom","blue-square"],"k":[36,34]},"wink":{"a":"Winking Face","b":"1F609","j":["face","happy","mischievous","secret",";)","smile","eye"],"k":[30,33],"l":[";)",";-)"],"m":";)"},"no_bell":{"a":"Bell with Cancellation Stroke","b":"1F515","j":["sound","volume","mute","quiet","silent"],"k":[27,23]},"green_apple":{"a":"Green Apple","b":"1F34F","j":["fruit","nature"],"k":[7,17]},"tanabata_tree":{"a":"Tanabata Tree","b":"1F38B","j":["plant","nature","branch","summer"],"k":[8,30]},"flag-ae":{"a":"United Arab Emirates Flag","b":"1F1E6-1F1EA","k":[0,33]},"volcano":{"a":"Volcano","b":"1F30B","j":["photo","nature","disaster"],"k":[6,3]},"cat":{"a":"Cat Face","b":"1F431","j":["animal","meow","nature","pet","kitten"],"k":[13,27]},"flag-af":{"a":"Afghanistan Flag","b":"1F1E6-1F1EB","k":[0,34]},"musical_score":{"a":"Musical Score","b":"1F3BC","j":["treble","clef","compose"],"k":[9,22]},"blush":{"a":"Smiling Face with Smiling Eyes","b":"1F60A","j":["face","smile","happy","flushed","crush","embarrassed","shy","joy"],"k":[30,34],"m":":)"},"pear":{"a":"Pear","b":"1F350","j":["fruit","nature","food"],"k":[7,18]},"bamboo":{"a":"Pine Decoration","b":"1F38D","j":["plant","nature","vegetable","panda","pine_decoration"],"k":[8,32]},"passport_control":{"a":"Passport Control","b":"1F6C2","j":["custom","blue-square"],"k":[36,43]},"mount_fuji":{"a":"Mount Fuji","b":"1F5FB","j":["photo","mountain","nature","japanese"],"k":[30,19]},"cat2":{"a":"Cat","b":"1F408","j":["animal","meow","pet","cats"],"k":[12,38]},"musical_note":{"a":"Musical Note","b":"1F3B5","j":["score","tone","sound"],"k":[9,15]},"dolls":{"a":"Japanese Dolls","b":"1F38E","j":["japanese","toy","kimono"],"k":[8,33]},"lion_face":{"a":"Lion Face","b":"1F981","k":[42,25],"o":8},"camping":{"a":"Camping","b":"1F3D5-FE0F","c":"1F3D5","j":["photo","outdoors","tent"],"k":[11,38],"o":7},"flag-ag":{"a":"Antigua & Barbuda Flag","b":"1F1E6-1F1EC","k":[0,35]},"customs":{"a":"Customs","b":"1F6C3","j":["passport","border","blue-square"],"k":[36,44]},"yum":{"a":"Face Savouring Delicious Food","b":"1F60B","j":["happy","joy","tongue","smile","face","silly","yummy","nom","delicious","savouring"],"k":[30,35]},"peach":{"a":"Peach","b":"1F351","j":["fruit","nature","food"],"k":[7,19]},"tiger":{"a":"Tiger Face","b":"1F42F","j":["animal","cat","danger","wild","nature","roar"],"k":[13,25]},"notes":{"a":"Multiple Musical Notes","b":"1F3B6","j":["music","score"],"k":[9,16]},"flags":{"a":"Carp Streamer","b":"1F38F","j":["fish","japanese","koinobori","carp","banner"],"k":[8,34]},"beach_with_umbrella":{"a":"Beach with Umbrella","b":"1F3D6-FE0F","c":"1F3D6","k":[11,39],"o":7},"cherries":{"a":"Cherries","b":"1F352","j":["food","fruit"],"k":[7,20]},"flag-ai":{"a":"Anguilla Flag","b":"1F1E6-1F1EE","k":[0,36]},"baggage_claim":{"a":"Baggage Claim","b":"1F6C4","j":["blue-square","airport","transport"],"k":[36,45]},"sunglasses":{"a":"Smiling Face with Sunglasses","b":"1F60E","j":["face","cool","smile","summer","beach","sunglass"],"k":[30,38],"l":["8)"]},"left_luggage":{"a":"Left Luggage","b":"1F6C5","j":["blue-square","travel"],"k":[36,46]},"wind_chime":{"a":"Wind Chime","b":"1F390","j":["nature","ding","spring","bell"],"k":[8,35]},"strawberry":{"a":"Strawberry","b":"1F353","j":["fruit","food","nature"],"k":[7,21]},"desert":{"a":"Desert","b":"1F3DC-FE0F","c":"1F3DC","j":["photo","warm","saharah"],"k":[11,45],"o":7},"studio_microphone":{"a":"Studio Microphone","b":"1F399-FE0F","c":"1F399","j":["sing","recording","artist","talkshow"],"k":[8,41],"o":7},"flag-al":{"a":"Albania Flag","b":"1F1E6-1F1F1","k":[0,37]},"tiger2":{"a":"Tiger","b":"1F405","j":["animal","nature","roar"],"k":[12,35]},"heart_eyes":{"a":"Smiling Face with Heart-Shaped Eyes","b":"1F60D","j":["face","love","like","affection","valentines","infatuation","crush","heart"],"k":[30,37]},"desert_island":{"a":"Desert Island","b":"1F3DD-FE0F","c":"1F3DD","j":["photo","tropical","mojito"],"k":[11,46],"o":7},"kiwifruit":{"a":"Kiwifruit","b":"1F95D","k":[42,9],"o":9},"rice_scene":{"a":"Moon Viewing Ceremony","b":"1F391","j":["photo","japan","asia","tsukimi"],"k":[8,36]},"kissing_heart":{"a":"Face Throwing a Kiss","b":"1F618","j":["face","love","like","affection","valentines","infatuation","kiss"],"k":[30,48],"l":[":*",":-*"]},"warning":{"a":"Warning Sign","b":"26A0-FE0F","c":"26A0","j":["exclamation","wip","alert","error","problem","issue"],"k":[48,20],"o":4},"flag-am":{"a":"Armenia Flag","b":"1F1E6-1F1F2","k":[0,38]},"leopard":{"a":"Leopard","b":"1F406","j":["animal","nature"],"k":[12,36]},"level_slider":{"a":"Level Slider","b":"1F39A-FE0F","c":"1F39A","j":["scale"],"k":[8,42],"o":7},"horse":{"a":"Horse Face","b":"1F434","j":["animal","brown","nature"],"k":[13,30]},"children_crossing":{"a":"Children Crossing","b":"1F6B8","j":["school","warning","danger","sign","driving","yellow-diamond"],"k":[36,28]},"ribbon":{"a":"Ribbon","b":"1F380","j":["decoration","pink","girl","bowtie"],"k":[8,14]},"national_park":{"a":"National Park","b":"1F3DE-FE0F","c":"1F3DE","j":["photo","environment","nature"],"k":[11,47],"o":7},"control_knobs":{"a":"Control Knobs","b":"1F39B-FE0F","c":"1F39B","j":["dial"],"k":[8,43],"o":7},"kissing":{"a":"Kissing Face","b":"1F617","j":["love","like","face","3","valentines","infatuation","kiss"],"k":[30,47]},"tomato":{"a":"Tomato","b":"1F345","j":["fruit","vegetable","nature","food"],"k":[7,7]},"flag-ao":{"a":"Angola Flag","b":"1F1E6-1F1F4","k":[0,39]},"stadium":{"a":"Stadium","b":"1F3DF-FE0F","c":"1F3DF","j":["photo","place","sports","concert","venue"],"k":[11,48],"o":7},"flag-aq":{"a":"Antarctica Flag","b":"1F1E6-1F1F6","k":[0,40]},"gift":{"a":"Wrapped Present","b":"1F381","j":["present","birthday","christmas","xmas"],"k":[8,15]},"no_entry":{"a":"No Entry","b":"26D4","j":["limit","security","privacy","bad","denied","stop","circle"],"k":[48,35],"o":5},"kissing_smiling_eyes":{"a":"Kissing Face with Smiling Eyes","b":"1F619","j":["face","affection","valentines","infatuation","kiss"],"k":[30,49]},"coconut":{"a":"Coconut","b":"1F965","k":[42,17],"o":10},"racehorse":{"a":"Horse","b":"1F40E","j":["animal","gamble","luck"],"k":[12,44]},"microphone":{"a":"Microphone","b":"1F3A4","j":["sound","music","PA","sing","talkshow"],"k":[8,50]},"classical_building":{"a":"Classical Building","b":"1F3DB-FE0F","c":"1F3DB","j":["art","culture","history"],"k":[11,44],"o":7},"no_entry_sign":{"a":"No Entry Sign","b":"1F6AB","j":["forbid","stop","limit","denied","disallow","circle"],"k":[35,16]},"reminder_ribbon":{"a":"Reminder Ribbon","b":"1F397-FE0F","c":"1F397","j":["sports","cause","support","awareness"],"k":[8,40],"o":7},"kissing_closed_eyes":{"a":"Kissing Face with Closed Eyes","b":"1F61A","j":["face","love","like","affection","valentines","infatuation","kiss"],"k":[30,50]},"unicorn_face":{"a":"Unicorn Face","b":"1F984","k":[42,28],"o":8},"flag-ar":{"a":"Argentina Flag","b":"1F1E6-1F1F7","k":[0,41]},"headphones":{"a":"Headphone","b":"1F3A7","j":["music","score","gadgets"],"k":[9,1]},"avocado":{"a":"Avocado","b":"1F951","j":["fruit","food"],"k":[41,49],"o":9},"relaxed":{"a":"White Smiling Face","b":"263A-FE0F","c":"263A","j":["face","blush","massage","happiness"],"k":[47,41],"o":1},"zebra_face":{"a":"Zebra Face","b":"1F993","k":[42,43],"o":10},"eggplant":{"a":"Aubergine","b":"1F346","j":["vegetable","nature","food","aubergine"],"k":[7,8]},"radio":{"a":"Radio","b":"1F4FB","j":["communication","music","podcast","program"],"k":[26,50]},"building_construction":{"a":"Building Construction","b":"1F3D7-FE0F","c":"1F3D7","j":["wip","working","progress"],"k":[11,40],"o":7},"flag-as":{"a":"American Samoa Flag","b":"1F1E6-1F1F8","k":[0,42]},"admission_tickets":{"a":"Admission Tickets","b":"1F39F-FE0F","c":"1F39F","k":[8,45],"o":7},"no_bicycles":{"a":"No Bicycles","b":"1F6B3","j":["cyclist","prohibited","circle"],"k":[35,24]},"no_smoking":{"a":"No Smoking Symbol","b":"1F6AD","j":["cigarette","blue-square","smell","smoke"],"k":[35,18]},"slightly_smiling_face":{"a":"Slightly Smiling Face","b":"1F642","j":["face","smile"],"k":[31,38],"l":[":)","(:",":-)"],"o":7},"flag-at":{"a":"Austria Flag","b":"1F1E6-1F1F9","k":[0,43]},"ticket":{"a":"Ticket","b":"1F3AB","j":["event","concert","pass"],"k":[9,5]},"saxophone":{"a":"Saxophone","b":"1F3B7","j":["music","instrument","jazz","blues"],"k":[9,17]},"deer":{"a":"Deer","b":"1F98C","j":["animal","nature","horns","venison"],"k":[42,36],"o":9},"house_buildings":{"a":"House Buildings","b":"1F3D8-FE0F","c":"1F3D8","k":[11,41],"o":7},"potato":{"a":"Potato","b":"1F954","j":["food","tuber","vegatable","starch"],"k":[42,0],"o":9},"guitar":{"a":"Guitar","b":"1F3B8","j":["music","instrument"],"k":[9,18]},"carrot":{"a":"Carrot","b":"1F955","j":["vegetable","food","orange"],"k":[42,1],"o":9},"cityscape":{"a":"Cityscape","b":"1F3D9-FE0F","c":"1F3D9","j":["photo","night life","urban"],"k":[11,42],"o":7},"flag-au":{"a":"Australia Flag","b":"1F1E6-1F1FA","k":[0,44]},"do_not_litter":{"a":"Do Not Litter Symbol","b":"1F6AF","j":["trash","bin","garbage","circle"],"k":[35,20]},"hugging_face":{"a":"Hugging Face","b":"1F917","k":[37,31],"o":8},"cow":{"a":"Cow Face","b":"1F42E","j":["beef","ox","animal","nature","moo","milk"],"k":[13,24]},"medal":{"a":"Medal","b":"1F396-FE0F","c":"1F396","k":[8,39],"o":7},"musical_keyboard":{"a":"Musical Keyboard","b":"1F3B9","j":["piano","instrument","compose"],"k":[9,19]},"corn":{"a":"Ear of Maize","b":"1F33D","j":["food","vegetable","plant"],"k":[6,51]},"derelict_house_building":{"a":"Derelict House Building","b":"1F3DA-FE0F","c":"1F3DA","k":[11,43],"o":7},"non-potable_water":{"a":"Non-Potable Water Symbol","b":"1F6B1","j":["drink","faucet","tap","circle"],"k":[35,22]},"trophy":{"a":"Trophy","b":"1F3C6","j":["win","award","contest","place","ftw","ceremony"],"k":[10,19]},"flag-aw":{"a":"Aruba Flag","b":"1F1E6-1F1FC","k":[0,45]},"star-struck":{"a":"Grinning Face with Star Eyes","b":"1F929","k":[38,49],"n":["grinning_face_with_star_eyes"],"o":10},"ox":{"a":"Ox","b":"1F402","j":["animal","cow","beef"],"k":[12,32]},"trumpet":{"a":"Trumpet","b":"1F3BA","j":["music","brass"],"k":[9,20]},"hot_pepper":{"a":"Hot Pepper","b":"1F336-FE0F","c":"1F336","j":["food","spicy","chilli","chili"],"k":[6,44],"o":7},"sports_medal":{"a":"Sports Medal","b":"1F3C5","k":[10,18],"o":7},"flag-ax":{"a":"Åland Islands Flag","b":"1F1E6-1F1FD","k":[0,46]},"water_buffalo":{"a":"Water Buffalo","b":"1F403","j":["animal","nature","ox","cow"],"k":[12,33]},"no_pedestrians":{"a":"No Pedestrians","b":"1F6B7","j":["rules","crossing","walking","circle"],"k":[36,27]},"thinking_face":{"a":"Thinking Face","b":"1F914","k":[37,28],"o":8},"house":{"a":"House Building","b":"1F3E0","j":["building","home"],"k":[11,49]},"no_mobile_phones":{"a":"No Mobile Phones","b":"1F4F5","j":["iphone","mute","circle"],"k":[26,44]},"flag-az":{"a":"Azerbaijan Flag","b":"1F1E6-1F1FF","k":[0,47]},"first_place_medal":{"a":"First Place Medal","b":"1F947","k":[41,42],"o":9},"house_with_garden":{"a":"House with Garden","b":"1F3E1","j":["home","plant","nature"],"k":[11,50]},"violin":{"a":"Violin","b":"1F3BB","j":["music","instrument","orchestra","symphony"],"k":[9,21]},"face_with_raised_eyebrow":{"a":"Face with One Eyebrow Raised","b":"1F928","k":[38,48],"n":["face_with_one_eyebrow_raised"],"o":10},"cucumber":{"a":"Cucumber","b":"1F952","j":["fruit","food","pickle"],"k":[41,50],"o":9},"cow2":{"a":"Cow","b":"1F404","j":["beef","ox","animal","nature","moo","milk"],"k":[12,34]},"flag-ba":{"a":"Bosnia & Herzegovina Flag","b":"1F1E7-1F1E6","k":[0,48]},"pig":{"a":"Pig Face","b":"1F437","j":["animal","oink","nature"],"k":[13,33]},"drum_with_drumsticks":{"a":"Drum with Drumsticks","b":"1F941","k":[41,37],"o":9},"underage":{"a":"No One Under Eighteen Symbol","b":"1F51E","j":["18","drink","pub","night","minor","circle"],"k":[27,32]},"broccoli":{"a":"Broccoli","b":"1F966","k":[42,18],"o":10},"office":{"a":"Office Building","b":"1F3E2","j":["building","bureau","work"],"k":[11,51]},"second_place_medal":{"a":"Second Place Medal","b":"1F948","k":[41,43],"o":9},"neutral_face":{"a":"Neutral Face","b":"1F610","j":["indifference","meh",":|","neutral"],"k":[30,40],"l":[":|",":-|"]},"third_place_medal":{"a":"Third Place Medal","b":"1F949","k":[41,44],"o":9},"mushroom":{"a":"Mushroom","b":"1F344","j":["plant","vegetable"],"k":[7,6]},"flag-bb":{"a":"Barbados Flag","b":"1F1E7-1F1E7","k":[0,49]},"radioactive_sign":{"a":"Radioactive Sign","b":"2622-FE0F","c":"2622","k":[47,33],"o":1},"pig2":{"a":"Pig","b":"1F416","j":["animal","nature"],"k":[13,0]},"expressionless":{"a":"Expressionless Face","b":"1F611","j":["face","indifferent","-_-","meh","deadpan"],"k":[30,41]},"iphone":{"a":"Mobile Phone","b":"1F4F1","j":["technology","apple","gadgets","dial"],"k":[26,40]},"post_office":{"a":"Japanese Post Office","b":"1F3E3","j":["building","envelope","communication"],"k":[12,0]},"european_post_office":{"a":"European Post Office","b":"1F3E4","j":["building","email"],"k":[12,1]},"soccer":{"a":"Soccer Ball","b":"26BD","j":["sports","football"],"k":[48,26],"o":5},"boar":{"a":"Boar","b":"1F417","j":["animal","nature"],"k":[13,1]},"peanuts":{"a":"Peanuts","b":"1F95C","j":["food","nut"],"k":[42,8],"o":9},"calling":{"a":"Mobile Phone with Rightwards Arrow at Left","b":"1F4F2","j":["iphone","incoming"],"k":[26,41]},"biohazard_sign":{"a":"Biohazard Sign","b":"2623-FE0F","c":"2623","k":[47,34],"o":1},"flag-bd":{"a":"Bangladesh Flag","b":"1F1E7-1F1E9","k":[0,50]},"no_mouth":{"a":"Face Without Mouth","b":"1F636","j":["face","hellokitty"],"k":[31,26]},"face_with_rolling_eyes":{"a":"Face with Rolling Eyes","b":"1F644","k":[31,40],"o":8},"phone":{"a":"Black Telephone","b":"260E-FE0F","c":"260E","j":["technology","communication","dial","telephone"],"k":[47,21],"n":["telephone"],"o":1},"pig_nose":{"a":"Pig Nose","b":"1F43D","j":["animal","oink"],"k":[13,39]},"chestnut":{"a":"Chestnut","b":"1F330","j":["food","squirrel"],"k":[6,38]},"arrow_up":{"a":"Upwards Black Arrow","b":"2B06-FE0F","c":"2B06","j":["blue-square","continue","top","direction"],"k":[50,18],"o":4},"hospital":{"a":"Hospital","b":"1F3E5","j":["building","health","surgery","doctor"],"k":[12,2]},"flag-be":{"a":"Belgium Flag","b":"1F1E7-1F1EA","k":[0,51]},"baseball":{"a":"Baseball","b":"26BE","j":["sports","balls"],"k":[48,27],"o":5},"smirk":{"a":"Smirking Face","b":"1F60F","j":["face","smile","mean","prank","smug","sarcasm"],"k":[30,39]},"arrow_upper_right":{"a":"North East Arrow","b":"2197-FE0F","c":"2197","j":["blue-square","point","direction","diagonal","northeast"],"k":[46,36],"o":1},"flag-bf":{"a":"Burkina Faso Flag","b":"1F1E7-1F1EB","k":[1,0]},"basketball":{"a":"Basketball and Hoop","b":"1F3C0","j":["sports","balls","NBA"],"k":[9,26]},"ram":{"a":"Ram","b":"1F40F","j":["animal","sheep","nature"],"k":[12,45]},"bank":{"a":"Bank","b":"1F3E6","j":["building","money","sales","cash","business","enterprise"],"k":[12,3]},"bread":{"a":"Bread","b":"1F35E","j":["food","wheat","breakfast","toast"],"k":[7,32]},"telephone_receiver":{"a":"Telephone Receiver","b":"1F4DE","j":["technology","communication","dial"],"k":[26,21]},"croissant":{"a":"Croissant","b":"1F950","j":["food","bread","french"],"k":[41,48],"o":9},"pager":{"a":"Pager","b":"1F4DF","j":["bbcall","oldschool","90s"],"k":[26,22]},"sheep":{"a":"Sheep","b":"1F411","j":["animal","nature","wool","shipit"],"k":[12,47]},"arrow_right":{"a":"Black Rightwards Arrow","b":"27A1-FE0F","c":"27A1","j":["blue-square","next"],"k":[50,12],"o":1},"persevere":{"a":"Persevering Face","b":"1F623","j":["face","sick","no","upset","oops"],"k":[31,7]},"flag-bg":{"a":"Bulgaria Flag","b":"1F1E7-1F1EC","k":[1,1]},"volleyball":{"a":"Volleyball","b":"1F3D0","j":["sports","balls"],"k":[11,33],"o":8},"hotel":{"a":"Hotel","b":"1F3E8","j":["building","accomodation","checkin"],"k":[12,5]},"arrow_lower_right":{"a":"South East Arrow","b":"2198-FE0F","c":"2198","j":["blue-square","direction","diagonal","southeast"],"k":[46,37],"o":1},"goat":{"a":"Goat","b":"1F410","j":["animal","nature"],"k":[12,46]},"flag-bh":{"a":"Bahrain Flag","b":"1F1E7-1F1ED","k":[1,2]},"love_hotel":{"a":"Love Hotel","b":"1F3E9","j":["like","affection","dating"],"k":[12,6]},"disappointed_relieved":{"a":"Disappointed but Relieved Face","b":"1F625","j":["face","phew","sweat","nervous"],"k":[31,9]},"baguette_bread":{"a":"Baguette Bread","b":"1F956","j":["food","bread","french"],"k":[42,2],"o":9},"football":{"a":"American Football","b":"1F3C8","j":["sports","balls","NFL"],"k":[10,26]},"fax":{"a":"Fax Machine","b":"1F4E0","j":["communication","technology"],"k":[26,23]},"convenience_store":{"a":"Convenience Store","b":"1F3EA","j":["building","shopping","groceries"],"k":[12,7]},"dromedary_camel":{"a":"Dromedary Camel","b":"1F42A","j":["animal","hot","desert","hump"],"k":[13,20]},"arrow_down":{"a":"Downwards Black Arrow","b":"2B07-FE0F","c":"2B07","j":["blue-square","direction","bottom"],"k":[50,19],"o":4},"battery":{"a":"Battery","b":"1F50B","j":["power","energy","sustain"],"k":[27,13]},"rugby_football":{"a":"Rugby Football","b":"1F3C9","j":["sports","team"],"k":[10,27]},"pretzel":{"a":"Pretzel","b":"1F968","k":[42,20],"o":10},"open_mouth":{"a":"Face with Open Mouth","b":"1F62E","j":["face","surprise","impressed","wow","whoa",":O"],"k":[31,18],"l":[":o",":-o",":O",":-O"]},"flag-bi":{"a":"Burundi Flag","b":"1F1E7-1F1EE","k":[1,3]},"flag-bj":{"a":"Benin Flag","b":"1F1E7-1F1EF","k":[1,4]},"pancakes":{"a":"Pancakes","b":"1F95E","j":["food","breakfast","flapjacks","hotcakes"],"k":[42,10],"o":9},"school":{"a":"School","b":"1F3EB","j":["building","student","education","learn","teach"],"k":[12,8]},"tennis":{"a":"Tennis Racquet and Ball","b":"1F3BE","j":["sports","balls","green"],"k":[9,24]},"zipper_mouth_face":{"a":"Zipper-Mouth Face","b":"1F910","j":["face","sealed","zipper","secret"],"k":[37,24],"o":8},"camel":{"a":"Bactrian Camel","b":"1F42B","j":["animal","nature","hot","desert","hump"],"k":[13,21]},"arrow_lower_left":{"a":"South West Arrow","b":"2199-FE0F","c":"2199","j":["blue-square","direction","diagonal","southwest"],"k":[46,38],"o":1},"electric_plug":{"a":"Electric Plug","b":"1F50C","j":["charger","power"],"k":[27,14]},"cheese_wedge":{"a":"Cheese Wedge","b":"1F9C0","k":[42,48],"o":8},"hushed":{"a":"Hushed Face","b":"1F62F","j":["face","woo","shh"],"k":[31,19]},"computer":{"a":"Personal Computer","b":"1F4BB","j":["technology","laptop","screen","display","monitor"],"k":[25,38]},"giraffe_face":{"a":"Giraffe Face","b":"1F992","k":[42,42],"o":10},"8ball":{"a":"Billiards","b":"1F3B1","j":["pool","hobby","game","luck","magic"],"k":[9,11]},"arrow_left":{"a":"Leftwards Black Arrow","b":"2B05-FE0F","c":"2B05","j":["blue-square","previous","back"],"k":[50,17],"o":4},"department_store":{"a":"Department Store","b":"1F3EC","j":["building","shopping","mall"],"k":[12,9]},"meat_on_bone":{"a":"Meat on Bone","b":"1F356","j":["good","food","drumstick"],"k":[7,24]},"arrow_upper_left":{"a":"North West Arrow","b":"2196-FE0F","c":"2196","j":["blue-square","point","direction","diagonal","northwest"],"k":[46,35],"o":1},"flag-bm":{"a":"Bermuda Flag","b":"1F1E7-1F1F2","k":[1,6]},"sleepy":{"a":"Sleepy Face","b":"1F62A","j":["face","tired","rest","nap"],"k":[31,14]},"bowling":{"a":"Bowling","b":"1F3B3","j":["sports","fun","play"],"k":[9,13]},"factory":{"a":"Factory","b":"1F3ED","j":["building","industry","pollution","smoke"],"k":[12,10]},"desktop_computer":{"a":"Desktop Computer","b":"1F5A5-FE0F","c":"1F5A5","j":["technology","computing","screen"],"k":[29,51],"o":7},"elephant":{"a":"Elephant","b":"1F418","j":["animal","nature","nose","th","circus"],"k":[13,2]},"rhinoceros":{"a":"Rhinoceros","b":"1F98F","j":["animal","nature","horn"],"k":[42,39],"o":9},"arrow_up_down":{"a":"Up Down Arrow","b":"2195-FE0F","c":"2195","j":["blue-square","direction","way","vertical"],"k":[46,34],"o":1},"cricket_bat_and_ball":{"a":"Cricket Bat and Ball","b":"1F3CF","k":[11,32],"o":8},"printer":{"a":"Printer","b":"1F5A8-FE0F","c":"1F5A8","j":["paper","ink"],"k":[30,0],"o":7},"poultry_leg":{"a":"Poultry Leg","b":"1F357","j":["food","meat","drumstick","bird","chicken","turkey"],"k":[7,25]},"tired_face":{"a":"Tired Face","b":"1F62B","j":["sick","whine","upset","frustrated"],"k":[31,15]},"japanese_castle":{"a":"Japanese Castle","b":"1F3EF","j":["photo","building"],"k":[12,12]},"flag-bn":{"a":"Brunei Flag","b":"1F1E7-1F1F3","k":[1,7]},"field_hockey_stick_and_ball":{"a":"Field Hockey Stick and Ball","b":"1F3D1","k":[11,34],"o":8},"sleeping":{"a":"Sleeping Face","b":"1F634","j":["face","tired","sleepy","night","zzz"],"k":[31,24]},"left_right_arrow":{"a":"Left Right Arrow","b":"2194-FE0F","c":"2194","j":["shape","direction","horizontal","sideways"],"k":[46,33],"o":1},"keyboard":{"a":"Keyboard","b":"2328-FE0F","c":"2328","j":["technology","computer","type","input","text"],"k":[46,43],"o":1},"european_castle":{"a":"European Castle","b":"1F3F0","j":["building","royalty","history"],"k":[12,13]},"mouse":{"a":"Mouse Face","b":"1F42D","j":["animal","nature","cheese_wedge","rodent"],"k":[13,23]},"flag-bo":{"a":"Bolivia Flag","b":"1F1E7-1F1F4","k":[1,8]},"cut_of_meat":{"a":"Cut of Meat","b":"1F969","k":[42,21],"o":10},"ice_hockey_stick_and_puck":{"a":"Ice Hockey Stick and Puck","b":"1F3D2","k":[11,35],"o":8},"mouse2":{"a":"Mouse","b":"1F401","j":["animal","nature","rodent"],"k":[12,31]},"three_button_mouse":{"a":"Three Button Mouse","b":"1F5B1-FE0F","c":"1F5B1","k":[30,1],"o":7},"leftwards_arrow_with_hook":{"a":"Leftwards Arrow with Hook","b":"21A9-FE0F","c":"21A9","j":["back","return","blue-square","undo","enter"],"k":[46,39],"o":1},"bacon":{"a":"Bacon","b":"1F953","j":["food","breakfast","pork","pig","meat"],"k":[41,51],"o":9},"relieved":{"a":"Relieved Face","b":"1F60C","j":["face","relaxed","phew","massage","happiness"],"k":[30,36]},"wedding":{"a":"Wedding","b":"1F492","j":["love","like","affection","couple","marriage","bride","groom"],"k":[24,44]},"tokyo_tower":{"a":"Tokyo Tower","b":"1F5FC","j":["photo","japanese"],"k":[30,20]},"arrow_right_hook":{"a":"Rightwards Arrow with Hook","b":"21AA-FE0F","c":"21AA","j":["blue-square","return","rotate","direction"],"k":[46,40],"o":1},"hamburger":{"a":"Hamburger","b":"1F354","j":["meat","fast food","beef","cheeseburger","mcdonalds","burger king"],"k":[7,22]},"stuck_out_tongue":{"a":"Face with Stuck-out Tongue","b":"1F61B","j":["face","prank","childish","playful","mischievous","smile","tongue"],"k":[30,51],"l":[":p",":-p",":P",":-P",":b",":-b"],"m":":p"},"trackball":{"a":"Trackball","b":"1F5B2-FE0F","c":"1F5B2","j":["technology","trackpad"],"k":[30,2],"o":7},"flag-br":{"a":"Brazil Flag","b":"1F1E7-1F1F7","k":[1,10]},"rat":{"a":"Rat","b":"1F400","j":["animal","mouse","rodent"],"k":[12,30]},"table_tennis_paddle_and_ball":{"a":"Table Tennis Paddle and Ball","b":"1F3D3","k":[11,36],"o":8},"minidisc":{"a":"Minidisc","b":"1F4BD","j":["technology","record","data","disk","90s"],"k":[25,40]},"stuck_out_tongue_winking_eye":{"a":"Face with Stuck-out Tongue and Winking Eye","b":"1F61C","j":["face","prank","childish","playful","mischievous","smile","wink","tongue"],"k":[31,0],"l":[";p",";-p",";b",";-b",";P",";-P"],"m":";p"},"fries":{"a":"French Fries","b":"1F35F","j":["chips","snack","fast food"],"k":[7,33]},"badminton_racquet_and_shuttlecock":{"a":"Badminton Racquet and Shuttlecock","b":"1F3F8","k":[12,22],"o":8},"statue_of_liberty":{"a":"Statue of Liberty","b":"1F5FD","j":["american","newyork"],"k":[30,21]},"flag-bs":{"a":"Bahamas Flag","b":"1F1E7-1F1F8","k":[1,11]},"arrow_heading_up":{"a":"Arrow Pointing Rightwards Then Curving Upwards","b":"2934-FE0F","c":"2934","j":["blue-square","direction","top"],"k":[50,15],"o":3},"hamster":{"a":"Hamster Face","b":"1F439","j":["animal","nature"],"k":[13,35]},"stuck_out_tongue_closed_eyes":{"a":"Face with Stuck-out Tongue and Tightly-Closed Eyes","b":"1F61D","j":["face","prank","playful","mischievous","smile","tongue"],"k":[31,1]},"pizza":{"a":"Slice of Pizza","b":"1F355","j":["food","party"],"k":[7,23]},"boxing_glove":{"a":"Boxing Glove","b":"1F94A","j":["sports","fighting"],"k":[41,45],"o":9},"floppy_disk":{"a":"Floppy Disk","b":"1F4BE","j":["oldschool","technology","save","90s","80s"],"k":[25,41]},"arrow_heading_down":{"a":"Arrow Pointing Rightwards Then Curving Downwards","b":"2935-FE0F","c":"2935","j":["blue-square","direction","bottom"],"k":[50,16],"o":3},"flag-bt":{"a":"Bhutan Flag","b":"1F1E7-1F1F9","k":[1,12]},"rabbit":{"a":"Rabbit Face","b":"1F430","j":["animal","nature","pet","spring","magic","bunny"],"k":[13,26]},"church":{"a":"Church","b":"26EA","j":["building","religion","christ"],"k":[48,37],"o":5},"drooling_face":{"a":"Drooling Face","b":"1F924","j":["face"],"k":[38,27],"o":9},"flag-bv":{"a":"Bouvet Island Flag","b":"1F1E7-1F1FB","k":[1,13]},"mosque":{"a":"Mosque","b":"1F54C","j":["islam","worship","minaret"],"k":[28,15],"o":8},"rabbit2":{"a":"Rabbit","b":"1F407","j":["animal","nature","pet","magic","spring"],"k":[12,37]},"hotdog":{"a":"Hot Dog","b":"1F32D","j":["food","frankfurter"],"k":[6,35],"o":8},"martial_arts_uniform":{"a":"Martial Arts Uniform","b":"1F94B","j":["judo","karate","taekwondo"],"k":[41,46],"o":9},"arrows_clockwise":{"a":"Clockwise Downwards and Upwards Open Circle Arrows","b":"1F503","j":["sync","cycle","round","repeat"],"k":[27,5]},"cd":{"a":"Optical Disc","b":"1F4BF","j":["technology","dvd","disk","disc","90s"],"k":[25,42]},"arrows_counterclockwise":{"a":"Anticlockwise Downwards and Upwards Open Circle Arrows","b":"1F504","j":["blue-square","sync","cycle"],"k":[27,6]},"sandwich":{"a":"Sandwich","b":"1F96A","k":[42,22],"o":10},"chipmunk":{"a":"Chipmunk","b":"1F43F-FE0F","c":"1F43F","j":["animal","nature","rodent","squirrel"],"k":[13,41],"o":7},"synagogue":{"a":"Synagogue","b":"1F54D","j":["judaism","worship","temple","jewish"],"k":[28,16],"o":8},"unamused":{"a":"Unamused Face","b":"1F612","j":["indifference","bored","straight face","serious","sarcasm"],"k":[30,42],"m":":("},"goal_net":{"a":"Goal Net","b":"1F945","j":["sports"],"k":[41,41],"o":9},"flag-bw":{"a":"Botswana Flag","b":"1F1E7-1F1FC","k":[1,14]},"dvd":{"a":"Dvd","b":"1F4C0","j":["cd","disk","disc"],"k":[25,43]},"hedgehog":{"a":"Hedgehog","b":"1F994","k":[42,44],"o":10},"dart":{"a":"Direct Hit","b":"1F3AF","j":["game","play","bar"],"k":[9,9]},"taco":{"a":"Taco","b":"1F32E","j":["food","mexican"],"k":[6,36],"o":8},"back":{"a":"Back with Leftwards Arrow Above","b":"1F519","j":["arrow","words","return"],"k":[27,27]},"flag-by":{"a":"Belarus Flag","b":"1F1E7-1F1FE","k":[1,15]},"shinto_shrine":{"a":"Shinto Shrine","b":"26E9-FE0F","c":"26E9","j":["temple","japan","kyoto"],"k":[48,36],"o":5},"movie_camera":{"a":"Movie Camera","b":"1F3A5","j":["film","record"],"k":[8,51]},"sweat":{"a":"Face with Cold Sweat","b":"1F613","j":["face","hot","sad","tired","exercise"],"k":[30,43]},"burrito":{"a":"Burrito","b":"1F32F","j":["food","mexican"],"k":[6,37],"o":8},"flag-bz":{"a":"Belize Flag","b":"1F1E7-1F1FF","k":[1,16]},"pensive":{"a":"Pensive Face","b":"1F614","j":["face","sad","depressed","upset"],"k":[30,44]},"kaaba":{"a":"Kaaba","b":"1F54B","j":["mecca","mosque","islam"],"k":[28,14],"o":8},"film_frames":{"a":"Film Frames","b":"1F39E-FE0F","c":"1F39E","k":[8,44],"o":7},"bat":{"a":"Bat","b":"1F987","j":["animal","nature","blind","vampire"],"k":[42,31],"o":9},"golf":{"a":"Flag in Hole","b":"26F3","j":["sports","business","flag","hole","summer"],"k":[48,41],"o":5},"end":{"a":"End with Leftwards Arrow Above","b":"1F51A","j":["words","arrow"],"k":[27,28]},"film_projector":{"a":"Film Projector","b":"1F4FD-FE0F","c":"1F4FD","j":["video","tape","record","movie"],"k":[27,0],"o":7},"bear":{"a":"Bear Face","b":"1F43B","j":["animal","nature","wild"],"k":[13,37]},"ice_skate":{"a":"Ice Skate","b":"26F8-FE0F","c":"26F8","j":["sports"],"k":[48,45],"o":5},"fountain":{"a":"Fountain","b":"26F2","j":["photo","summer","water","fresh"],"k":[48,40],"o":5},"confused":{"a":"Confused Face","b":"1F615","j":["face","indifference","huh","weird","hmmm",":/"],"k":[30,45],"l":[":\\",":-\\",":/",":-/"]},"flag-ca":{"a":"Canada Flag","b":"1F1E8-1F1E6","k":[1,17]},"on":{"a":"On with Exclamation Mark with Left Right Arrow Above","b":"1F51B","j":["arrow","words"],"k":[27,29]},"stuffed_flatbread":{"a":"Stuffed Flatbread","b":"1F959","j":["food","flatbread","stuffed","gyro"],"k":[42,5],"o":9},"soon":{"a":"Soon with Rightwards Arrow Above","b":"1F51C","j":["arrow","words"],"k":[27,30]},"upside_down_face":{"a":"Upside-Down Face","b":"1F643","j":["face","flipped","silly","smile"],"k":[31,39],"o":8},"fishing_pole_and_fish":{"a":"Fishing Pole and Fish","b":"1F3A3","j":["food","hobby","summer"],"k":[8,49]},"tent":{"a":"Tent","b":"26FA","j":["photo","camping","outdoors"],"k":[49,12],"o":5},"clapper":{"a":"Clapper Board","b":"1F3AC","j":["movie","film","record"],"k":[9,6]},"egg":{"a":"Egg","b":"1F95A","j":["food","chicken","breakfast"],"k":[42,6],"o":9},"flag-cc":{"a":"Cocos (keeling) Islands Flag","b":"1F1E8-1F1E8","k":[1,18]},"koala":{"a":"Koala","b":"1F428","j":["animal","nature"],"k":[13,18]},"foggy":{"a":"Foggy","b":"1F301","j":["photo","mountain"],"k":[5,45]},"tv":{"a":"Television","b":"1F4FA","j":["technology","program","oldschool","show","television"],"k":[26,49]},"panda_face":{"a":"Panda Face","b":"1F43C","j":["animal","nature","panda"],"k":[13,38]},"fried_egg":{"a":"Cooking","b":"1F373","j":["food","breakfast","kitchen","egg"],"k":[8,1],"n":["cooking"]},"top":{"a":"Top with Upwards Arrow Above","b":"1F51D","j":["words","blue-square"],"k":[27,31]},"flag-cd":{"a":"Congo - Kinshasa Flag","b":"1F1E8-1F1E9","k":[1,19]},"money_mouth_face":{"a":"Money-Mouth Face","b":"1F911","j":["face","rich","dollar","money"],"k":[37,25],"o":8},"running_shirt_with_sash":{"a":"Running Shirt with Sash","b":"1F3BD","j":["play","pageant"],"k":[9,23]},"astonished":{"a":"Astonished Face","b":"1F632","j":["face","xox","surprised","poisoned"],"k":[31,22]},"feet":{"a":"Paw Prints","b":"1F43E","k":[13,40],"n":["paw_prints"]},"camera":{"a":"Camera","b":"1F4F7","j":["gadgets","photography"],"k":[26,46]},"flag-cf":{"a":"Central African Republic Flag","b":"1F1E8-1F1EB","k":[1,20]},"place_of_worship":{"a":"Place of Worship","b":"1F6D0","j":["religion","church","temple","prayer"],"k":[37,5],"o":8},"night_with_stars":{"a":"Night with Stars","b":"1F303","j":["evening","city","downtown"],"k":[5,47]},"ski":{"a":"Ski and Ski Boot","b":"1F3BF","j":["sports","winter","cold","snow"],"k":[9,25]},"shallow_pan_of_food":{"a":"Shallow Pan of Food","b":"1F958","j":["food","cooking","casserole","paella"],"k":[42,4],"o":9},"camera_with_flash":{"a":"Camera with Flash","b":"1F4F8","k":[26,47],"o":7},"sunrise_over_mountains":{"a":"Sunrise over Mountains","b":"1F304","j":["view","vacation","photo"],"k":[5,48]},"turkey":{"a":"Turkey","b":"1F983","j":["animal","bird"],"k":[42,27],"o":8},"white_frowning_face":{"a":"White Frowning Face","b":"2639-FE0F","c":"2639","k":[47,40],"o":1},"flag-cg":{"a":"Congo - Brazzaville Flag","b":"1F1E8-1F1EC","k":[1,21]},"stew":{"a":"Pot of Food","b":"1F372","j":["food","meat","soup"],"k":[8,0]},"sled":{"a":"Sled","b":"1F6F7","k":[37,22],"o":10},"atom_symbol":{"a":"Atom Symbol","b":"269B-FE0F","c":"269B","j":["science","physics","chemistry"],"k":[48,18],"o":4},"curling_stone":{"a":"Curling Stone","b":"1F94C","k":[41,47],"o":10},"slightly_frowning_face":{"a":"Slightly Frowning Face","b":"1F641","j":["face","frowning","disappointed","sad","upset"],"k":[31,37],"o":7},"sunrise":{"a":"Sunrise","b":"1F305","j":["morning","view","vacation","photo"],"k":[5,49]},"om_symbol":{"a":"Om Symbol","b":"1F549-FE0F","c":"1F549","k":[28,12],"o":7},"chicken":{"a":"Chicken","b":"1F414","j":["animal","cluck","nature","bird"],"k":[12,50]},"bowl_with_spoon":{"a":"Bowl with Spoon","b":"1F963","k":[42,15],"o":10},"flag-ch":{"a":"Switzerland Flag","b":"1F1E8-1F1ED","k":[1,22]},"video_camera":{"a":"Video Camera","b":"1F4F9","j":["film","record"],"k":[26,48]},"video_game":{"a":"Video Game","b":"1F3AE","j":["play","console","PS4","controller"],"k":[9,8]},"rooster":{"a":"Rooster","b":"1F413","j":["animal","nature","chicken"],"k":[12,49]},"vhs":{"a":"Videocassette","b":"1F4FC","j":["record","video","oldschool","90s","80s"],"k":[26,51]},"city_sunset":{"a":"Cityscape at Dusk","b":"1F306","j":["photo","evening","sky","buildings"],"k":[5,50]},"confounded":{"a":"Confounded Face","b":"1F616","j":["face","confused","sick","unwell","oops",":S"],"k":[30,46]},"green_salad":{"a":"Green Salad","b":"1F957","j":["food","healthy","lettuce"],"k":[42,3],"o":9},"star_of_david":{"a":"Star of David","b":"2721-FE0F","c":"2721","j":["judaism"],"k":[49,47],"o":1},"flag-ci":{"a":"Côte D’ivoire Flag","b":"1F1E8-1F1EE","k":[1,23]},"popcorn":{"a":"Popcorn","b":"1F37F","j":["food","movie theater","films","snack"],"k":[8,13],"o":8},"city_sunrise":{"a":"Sunset over Buildings","b":"1F307","j":["photo","good morning","dawn"],"k":[5,51]},"disappointed":{"a":"Disappointed Face","b":"1F61E","j":["face","sad","upset","depressed",":("],"k":[31,2],"l":["):",":(",":-("],"m":":("},"mag":{"a":"Left-Pointing Magnifying Glass","b":"1F50D","j":["search","zoom","find","detective"],"k":[27,15]},"hatching_chick":{"a":"Hatching Chick","b":"1F423","j":["animal","chicken","egg","born","baby","bird"],"k":[13,13]},"joystick":{"a":"Joystick","b":"1F579-FE0F","c":"1F579","j":["game","play"],"k":[29,20],"o":7},"wheel_of_dharma":{"a":"Wheel of Dharma","b":"2638-FE0F","c":"2638","j":["hinduism","buddhism","sikhism","jainism"],"k":[47,39],"o":1},"flag-ck":{"a":"Cook Islands Flag","b":"1F1E8-1F1F0","k":[1,24]},"canned_food":{"a":"Canned Food","b":"1F96B","k":[42,23],"o":10},"worried":{"a":"Worried Face","b":"1F61F","j":["face","concern","nervous",":("],"k":[31,3]},"baby_chick":{"a":"Baby Chick","b":"1F424","j":["animal","chicken","bird"],"k":[13,14]},"flag-cl":{"a":"Chile Flag","b":"1F1E8-1F1F1","k":[1,25]},"game_die":{"a":"Game Die","b":"1F3B2","j":["dice","random","tabletop","play","luck"],"k":[9,12]},"mag_right":{"a":"Right-Pointing Magnifying Glass","b":"1F50E","j":["search","zoom","find","detective"],"k":[27,16]},"yin_yang":{"a":"Yin Yang","b":"262F-FE0F","c":"262F","j":["balance"],"k":[47,38],"o":1},"bridge_at_night":{"a":"Bridge at Night","b":"1F309","j":["photo","sanfrancisco"],"k":[6,1]},"spades":{"a":"Black Spade Suit","b":"2660-FE0F","c":"2660","j":["poker","cards","suits","magic"],"k":[48,4],"o":1},"hatched_chick":{"a":"Front-Facing Baby Chick","b":"1F425","j":["animal","chicken","baby","bird"],"k":[13,15]},"flag-cm":{"a":"Cameroon Flag","b":"1F1E8-1F1F2","k":[1,26]},"latin_cross":{"a":"Latin Cross","b":"271D-FE0F","c":"271D","j":["christianity"],"k":[49,46],"o":1},"triumph":{"a":"Face with Look of Triumph","b":"1F624","j":["face","gas","phew","proud","pride"],"k":[31,8]},"hotsprings":{"a":"Hot Springs","b":"2668-FE0F","c":"2668","j":["bath","warm","relax"],"k":[48,8],"o":1},"bento":{"a":"Bento Box","b":"1F371","j":["food","japanese","box"],"k":[7,51]},"microscope":{"a":"Microscope","b":"1F52C","j":["laboratory","experiment","zoomin","science","study"],"k":[27,46]},"cry":{"a":"Crying Face","b":"1F622","j":["face","tears","sad","depressed","upset",":'("],"k":[31,6],"l":[":'("],"m":":'("},"bird":{"a":"Bird","b":"1F426","j":["animal","nature","fly","tweet","spring"],"k":[13,16]},"cn":{"a":"China Flag","b":"1F1E8-1F1F3","j":["china","chinese","prc","flag","country","nation","banner"],"k":[1,27],"n":["flag-cn"]},"telescope":{"a":"Telescope","b":"1F52D","j":["stars","space","zoom","science","astronomy"],"k":[27,47]},"rice_cracker":{"a":"Rice Cracker","b":"1F358","j":["food","japanese"],"k":[7,26]},"hearts":{"a":"Black Heart Suit","b":"2665-FE0F","c":"2665","j":["poker","cards","magic","suits"],"k":[48,6],"o":1},"orthodox_cross":{"a":"Orthodox Cross","b":"2626-FE0F","c":"2626","j":["suppedaneum","religion"],"k":[47,35],"o":1},"milky_way":{"a":"Milky Way","b":"1F30C","j":["photo","space","stars"],"k":[6,4]},"rice_ball":{"a":"Rice Ball","b":"1F359","j":["food","japanese"],"k":[7,27]},"satellite_antenna":{"a":"Satellite Antenna","b":"1F4E1","k":[26,24]},"flag-co":{"a":"Colombia Flag","b":"1F1E8-1F1F4","k":[1,28]},"carousel_horse":{"a":"Carousel Horse","b":"1F3A0","j":["photo","carnival"],"k":[8,46]},"sob":{"a":"Loudly Crying Face","b":"1F62D","j":["face","cry","tears","sad","upset","depressed"],"k":[31,17],"m":":'("},"diamonds":{"a":"Black Diamond Suit","b":"2666-FE0F","c":"2666","j":["poker","cards","magic","suits"],"k":[48,7],"o":1},"star_and_crescent":{"a":"Star and Crescent","b":"262A-FE0F","c":"262A","j":["islam"],"k":[47,36],"o":1},"penguin":{"a":"Penguin","b":"1F427","j":["animal","nature"],"k":[13,17]},"dove_of_peace":{"a":"Dove of Peace","b":"1F54A-FE0F","c":"1F54A","k":[28,13],"o":7},"flag-cp":{"a":"Clipperton Island Flag","b":"1F1E8-1F1F5","k":[1,29]},"ferris_wheel":{"a":"Ferris Wheel","b":"1F3A1","j":["photo","carnival","londoneye"],"k":[8,47]},"clubs":{"a":"Black Club Suit","b":"2663-FE0F","c":"2663","j":["poker","cards","magic","suits"],"k":[48,5],"o":1},"peace_symbol":{"a":"Peace Symbol","b":"262E-FE0F","c":"262E","j":["hippie"],"k":[47,37],"o":1},"candle":{"a":"Candle","b":"1F56F-FE0F","c":"1F56F","j":["fire","wax"],"k":[28,42],"o":7},"frowning":{"a":"Frowning Face with Open Mouth","b":"1F626","j":["face","aw","what"],"k":[31,10]},"rice":{"a":"Cooked Rice","b":"1F35A","j":["food","china","asian"],"k":[7,28]},"flag-cr":{"a":"Costa Rica Flag","b":"1F1E8-1F1F7","k":[1,30]},"roller_coaster":{"a":"Roller Coaster","b":"1F3A2","j":["carnival","playground","photo","fun"],"k":[8,48]},"menorah_with_nine_branches":{"a":"Menorah with Nine Branches","b":"1F54E","k":[28,17],"o":8},"black_joker":{"a":"Playing Card Black Joker","b":"1F0CF","j":["poker","cards","game","play","magic"],"k":[0,15]},"eagle":{"a":"Eagle","b":"1F985","j":["animal","nature","bird"],"k":[42,29],"o":9},"curry":{"a":"Curry and Rice","b":"1F35B","j":["food","spicy","hot","indian"],"k":[7,29]},"bulb":{"a":"Electric Light Bulb","b":"1F4A1","j":["light","electricity","idea"],"k":[25,7]},"anguished":{"a":"Anguished Face","b":"1F627","j":["face","stunned","nervous"],"k":[31,11],"l":["D:"]},"flag-cu":{"a":"Cuba Flag","b":"1F1E8-1F1FA","k":[1,31]},"barber":{"a":"Barber Pole","b":"1F488","j":["hair","salon","style"],"k":[24,34]},"duck":{"a":"Duck","b":"1F986","j":["animal","nature","bird","mallard"],"k":[42,30],"o":9},"six_pointed_star":{"a":"Six Pointed Star with Middle Dot","b":"1F52F","j":["purple-square","religion","jewish","hexagram"],"k":[27,49]},"ramen":{"a":"Steaming Bowl","b":"1F35C","j":["food","japanese","noodle","chopsticks"],"k":[7,30]},"flashlight":{"a":"Electric Torch","b":"1F526","j":["dark","camping","sight","night"],"k":[27,40]},"mahjong":{"a":"Mahjong Tile Red Dragon","b":"1F004","j":["game","play","chinese","kanji"],"k":[0,14],"o":5},"fearful":{"a":"Fearful Face","b":"1F628","j":["face","scared","terrified","nervous","oops","huh"],"k":[31,12]},"aries":{"a":"Aries","b":"2648","j":["sign","purple-square","zodiac","astrology"],"k":[47,44],"o":1},"spaghetti":{"a":"Spaghetti","b":"1F35D","j":["food","italian","noodle"],"k":[7,31]},"circus_tent":{"a":"Circus Tent","b":"1F3AA","j":["festival","carnival","party"],"k":[9,4]},"izakaya_lantern":{"a":"Izakaya Lantern","b":"1F3EE","j":["light","paper","halloween","spooky"],"k":[12,11],"n":["lantern"]},"flag-cv":{"a":"Cape Verde Flag","b":"1F1E8-1F1FB","k":[1,32]},"weary":{"a":"Weary Face","b":"1F629","j":["face","tired","sleepy","sad","frustrated","upset"],"k":[31,13]},"flower_playing_cards":{"a":"Flower Playing Cards","b":"1F3B4","j":["game","sunset","red"],"k":[9,14]},"owl":{"a":"Owl","b":"1F989","j":["animal","nature","bird","hoot"],"k":[42,33],"o":9},"performing_arts":{"a":"Performing Arts","b":"1F3AD","j":["acting","theater","drama"],"k":[9,7]},"frog":{"a":"Frog Face","b":"1F438","j":["animal","nature","croak","toad"],"k":[13,34]},"flag-cw":{"a":"Curaçao Flag","b":"1F1E8-1F1FC","k":[1,33]},"notebook_with_decorative_cover":{"a":"Notebook with Decorative Cover","b":"1F4D4","j":["classroom","notes","record","paper","study"],"k":[26,11]},"exploding_head":{"a":"Shocked Face with Exploding Head","b":"1F92F","k":[39,3],"n":["shocked_face_with_exploding_head"],"o":10},"taurus":{"a":"Taurus","b":"2649","j":["purple-square","sign","zodiac","astrology"],"k":[47,45],"o":1},"sweet_potato":{"a":"Roasted Sweet Potato","b":"1F360","j":["food","nature"],"k":[7,34]},"closed_book":{"a":"Closed Book","b":"1F4D5","j":["read","library","knowledge","textbook","learn"],"k":[26,12]},"gemini":{"a":"Gemini","b":"264A","j":["sign","zodiac","purple-square","astrology"],"k":[47,46],"o":1},"frame_with_picture":{"a":"Frame with Picture","b":"1F5BC-FE0F","c":"1F5BC","k":[30,3],"o":7},"flag-cx":{"a":"Christmas Island Flag","b":"1F1E8-1F1FD","k":[1,34]},"grimacing":{"a":"Grimacing Face","b":"1F62C","j":["face","grimace","teeth"],"k":[31,16]},"crocodile":{"a":"Crocodile","b":"1F40A","j":["animal","nature","reptile","lizard","alligator"],"k":[12,40]},"oden":{"a":"Oden","b":"1F362","j":["food","japanese"],"k":[7,36]},"flag-cy":{"a":"Cyprus Flag","b":"1F1E8-1F1FE","k":[1,35]},"book":{"a":"Open Book","b":"1F4D6","k":[26,13],"n":["open_book"]},"turtle":{"a":"Turtle","b":"1F422","j":["animal","slow","nature","tortoise"],"k":[13,12]},"art":{"a":"Artist Palette","b":"1F3A8","j":["design","paint","draw","colors"],"k":[9,2]},"sushi":{"a":"Sushi","b":"1F363","j":["food","fish","japanese","rice"],"k":[7,37]},"cold_sweat":{"a":"Face with Open Mouth and Cold Sweat","b":"1F630","j":["face","nervous","sweat"],"k":[31,20]},"cancer":{"a":"Cancer","b":"264B","j":["sign","zodiac","purple-square","astrology"],"k":[47,47],"o":1},"fried_shrimp":{"a":"Fried Shrimp","b":"1F364","j":["food","animal","appetizer","summer"],"k":[7,38]},"slot_machine":{"a":"Slot Machine","b":"1F3B0","j":["bet","gamble","vegas","fruit machine","luck","casino"],"k":[9,10]},"scream":{"a":"Face Screaming in Fear","b":"1F631","j":["face","munch","scared","omg"],"k":[31,21]},"green_book":{"a":"Green Book","b":"1F4D7","j":["read","library","knowledge","study"],"k":[26,14]},"leo":{"a":"Leo","b":"264C","j":["sign","purple-square","zodiac","astrology"],"k":[47,48],"o":1},"flag-cz":{"a":"Czechia Flag","b":"1F1E8-1F1FF","k":[1,36]},"lizard":{"a":"Lizard","b":"1F98E","j":["animal","nature","reptile"],"k":[42,38],"o":9},"virgo":{"a":"Virgo","b":"264D","j":["sign","zodiac","purple-square","astrology"],"k":[47,49],"o":1},"steam_locomotive":{"a":"Steam Locomotive","b":"1F682","j":["transportation","vehicle","train"],"k":[34,10]},"de":{"a":"Germany Flag","b":"1F1E9-1F1EA","j":["german","nation","flag","country","banner"],"k":[1,37],"n":["flag-de"]},"flushed":{"a":"Flushed Face","b":"1F633","j":["face","blush","shy","flattered"],"k":[31,23]},"blue_book":{"a":"Blue Book","b":"1F4D8","j":["read","library","knowledge","learn","study"],"k":[26,15]},"snake":{"a":"Snake","b":"1F40D","j":["animal","evil","nature","hiss","python"],"k":[12,43]},"fish_cake":{"a":"Fish Cake with Swirl Design","b":"1F365","j":["food","japan","sea","beach","narutomaki","pink","swirl","kamaboko","surimi","ramen"],"k":[7,39]},"railway_car":{"a":"Railway Car","b":"1F683","j":["transportation","vehicle"],"k":[34,11]},"dango":{"a":"Dango","b":"1F361","j":["food","dessert","sweet","japanese","barbecue","meat"],"k":[7,35]},"orange_book":{"a":"Orange Book","b":"1F4D9","j":["read","library","knowledge","textbook","study"],"k":[26,16]},"libra":{"a":"Libra","b":"264E","j":["sign","purple-square","zodiac","astrology"],"k":[47,50],"o":1},"dragon_face":{"a":"Dragon Face","b":"1F432","j":["animal","myth","nature","chinese","green"],"k":[13,28]},"zany_face":{"a":"Grinning Face with One Large and One Small Eye","b":"1F92A","k":[38,50],"n":["grinning_face_with_one_large_and_one_small_eye"],"o":10},"books":{"a":"Books","b":"1F4DA","j":["literature","library","study"],"k":[26,17]},"dragon":{"a":"Dragon","b":"1F409","j":["animal","myth","nature","chinese","green"],"k":[12,39]},"flag-dj":{"a":"Djibouti Flag","b":"1F1E9-1F1EF","k":[1,39]},"dumpling":{"a":"Dumpling","b":"1F95F","k":[42,11],"o":10},"dizzy_face":{"a":"Dizzy Face","b":"1F635","j":["spent","unconscious","xox","dizzy"],"k":[31,25]},"scorpius":{"a":"Scorpius","b":"264F","j":["sign","zodiac","purple-square","astrology","scorpio"],"k":[47,51],"o":1},"bullettrain_side":{"a":"High-Speed Train","b":"1F684","j":["transportation","vehicle"],"k":[34,12]},"bullettrain_front":{"a":"High-Speed Train with Bullet Nose","b":"1F685","j":["transportation","vehicle","speed","fast","public","travel"],"k":[34,13]},"notebook":{"a":"Notebook","b":"1F4D3","j":["stationery","record","notes","paper","study"],"k":[26,10]},"fortune_cookie":{"a":"Fortune Cookie","b":"1F960","k":[42,12],"o":10},"sagittarius":{"a":"Sagittarius","b":"2650","j":["sign","zodiac","purple-square","astrology"],"k":[48,0],"o":1},"sauropod":{"a":"Sauropod","b":"1F995","k":[42,45],"o":10},"flag-dk":{"a":"Denmark Flag","b":"1F1E9-1F1F0","k":[1,40]},"rage":{"a":"Pouting Face","b":"1F621","j":["angry","mad","hate","despise"],"k":[31,5]},"ledger":{"a":"Ledger","b":"1F4D2","j":["notes","paper"],"k":[26,9]},"angry":{"a":"Angry Face","b":"1F620","j":["mad","face","annoyed","frustrated"],"k":[31,4],"l":[">:(",">:-("]},"t-rex":{"a":"T-Rex","b":"1F996","k":[42,46],"o":10},"capricorn":{"a":"Capricorn","b":"2651","j":["sign","zodiac","purple-square","astrology"],"k":[48,1],"o":1},"takeout_box":{"a":"Takeout Box","b":"1F961","k":[42,13],"o":10},"flag-dm":{"a":"Dominica Flag","b":"1F1E9-1F1F2","k":[1,41]},"train2":{"a":"Train","b":"1F686","j":["transportation","vehicle"],"k":[34,14]},"page_with_curl":{"a":"Page with Curl","b":"1F4C3","j":["documents","office","paper"],"k":[25,46]},"whale":{"a":"Spouting Whale","b":"1F433","j":["animal","nature","sea","ocean"],"k":[13,29]},"face_with_symbols_on_mouth":{"a":"Serious Face with Symbols Covering Mouth","b":"1F92C","k":[39,0],"n":["serious_face_with_symbols_covering_mouth"],"o":10},"flag-do":{"a":"Dominican Republic Flag","b":"1F1E9-1F1F4","k":[1,42]},"metro":{"a":"Metro","b":"1F687","j":["transportation","blue-square","mrt","underground","tube"],"k":[34,15]},"icecream":{"a":"Soft Ice Cream","b":"1F366","j":["food","hot","dessert","summer"],"k":[7,40]},"aquarius":{"a":"Aquarius","b":"2652","j":["sign","purple-square","zodiac","astrology"],"k":[48,2],"o":1},"flag-dz":{"a":"Algeria Flag","b":"1F1E9-1F1FF","k":[1,43]},"whale2":{"a":"Whale","b":"1F40B","j":["animal","nature","sea","ocean"],"k":[12,41]},"mask":{"a":"Face with Medical Mask","b":"1F637","j":["face","sick","ill","disease"],"k":[31,27]},"scroll":{"a":"Scroll","b":"1F4DC","j":["documents","ancient","history","paper"],"k":[26,19]},"shaved_ice":{"a":"Shaved Ice","b":"1F367","j":["hot","dessert","summer"],"k":[7,41]},"pisces":{"a":"Pisces","b":"2653","j":["purple-square","sign","zodiac","astrology"],"k":[48,3],"o":1},"light_rail":{"a":"Light Rail","b":"1F688","j":["transportation","vehicle"],"k":[34,16]},"dolphin":{"a":"Dolphin","b":"1F42C","j":["animal","nature","fish","sea","ocean","flipper","fins","beach"],"k":[13,22],"n":["flipper"]},"face_with_thermometer":{"a":"Face with Thermometer","b":"1F912","j":["sick","temperature","thermometer","cold","fever"],"k":[37,26],"o":8},"ophiuchus":{"a":"Ophiuchus","b":"26CE","j":["sign","purple-square","constellation","astrology"],"k":[48,31]},"station":{"a":"Station","b":"1F689","j":["transportation","vehicle","public"],"k":[34,17]},"ice_cream":{"a":"Ice Cream","b":"1F368","j":["food","hot","dessert"],"k":[7,42]},"page_facing_up":{"a":"Page Facing Up","b":"1F4C4","j":["documents","office","paper","information"],"k":[25,47]},"doughnut":{"a":"Doughnut","b":"1F369","j":["food","dessert","snack","sweet","donut"],"k":[7,43]},"face_with_head_bandage":{"a":"Face with Head-Bandage","b":"1F915","j":["injured","clumsy","bandage","hurt"],"k":[37,29],"o":8},"fish":{"a":"Fish","b":"1F41F","j":["animal","food","nature"],"k":[13,9]},"newspaper":{"a":"Newspaper","b":"1F4F0","j":["press","headline"],"k":[26,39]},"tram":{"a":"Tram","b":"1F68A","j":["transportation","vehicle"],"k":[34,18]},"flag-ec":{"a":"Ecuador Flag","b":"1F1EA-1F1E8","k":[1,45]},"twisted_rightwards_arrows":{"a":"Twisted Rightwards Arrows","b":"1F500","j":["blue-square","shuffle","music","random"],"k":[27,2]},"flag-ee":{"a":"Estonia Flag","b":"1F1EA-1F1EA","k":[1,46]},"cookie":{"a":"Cookie","b":"1F36A","j":["food","snack","oreo","chocolate","sweet","dessert"],"k":[7,44]},"monorail":{"a":"Monorail","b":"1F69D","j":["transportation","vehicle"],"k":[34,37]},"tropical_fish":{"a":"Tropical Fish","b":"1F420","j":["animal","swim","ocean","beach","nemo"],"k":[13,10]},"rolled_up_newspaper":{"a":"Rolled Up Newspaper","b":"1F5DE-FE0F","c":"1F5DE","k":[30,12],"o":7},"nauseated_face":{"a":"Nauseated Face","b":"1F922","j":["face","vomit","gross","green","sick","throw up","ill"],"k":[38,25],"o":9},"repeat":{"a":"Clockwise Rightwards and Leftwards Open Circle Arrows","b":"1F501","j":["loop","record"],"k":[27,3]},"bookmark_tabs":{"a":"Bookmark Tabs","b":"1F4D1","j":["favorite","save","order","tidy"],"k":[26,8]},"repeat_one":{"a":"Clockwise Rightwards and Leftwards Open Circle Arrows with Circled One Overlay","b":"1F502","j":["blue-square","loop"],"k":[27,4]},"flag-eg":{"a":"Egypt Flag","b":"1F1EA-1F1EC","k":[1,47]},"mountain_railway":{"a":"Mountain Railway","b":"1F69E","j":["transportation","vehicle"],"k":[34,38]},"birthday":{"a":"Birthday Cake","b":"1F382","j":["food","dessert","cake"],"k":[8,16]},"blowfish":{"a":"Blowfish","b":"1F421","j":["animal","nature","food","sea","ocean"],"k":[13,11]},"face_vomiting":{"a":"Face with Open Mouth Vomiting","b":"1F92E","k":[39,2],"n":["face_with_open_mouth_vomiting"],"o":10},"arrow_forward":{"a":"Black Right-Pointing Triangle","b":"25B6-FE0F","c":"25B6","j":["blue-square","right","direction","play"],"k":[47,10],"o":1},"bookmark":{"a":"Bookmark","b":"1F516","j":["favorite","label","save"],"k":[27,24]},"shark":{"a":"Shark","b":"1F988","j":["animal","nature","fish","sea","ocean","jaws","fins","beach"],"k":[42,32],"o":9},"train":{"a":"Tram Car","b":"1F68B","j":["transportation","vehicle","carriage","public","travel"],"k":[34,19]},"sneezing_face":{"a":"Sneezing Face","b":"1F927","j":["face","gesundheit","sneeze","sick","allergy"],"k":[38,47],"o":9},"cake":{"a":"Shortcake","b":"1F370","j":["food","dessert"],"k":[7,50]},"bus":{"a":"Bus","b":"1F68C","j":["car","vehicle","transportation"],"k":[34,20]},"pie":{"a":"Pie","b":"1F967","k":[42,19],"o":10},"innocent":{"a":"Smiling Face with Halo","b":"1F607","j":["face","angel","heaven","halo"],"k":[30,31]},"fast_forward":{"a":"Black Right-Pointing Double Triangle","b":"23E9","j":["blue-square","play","speed","continue"],"k":[46,45]},"label":{"a":"Label","b":"1F3F7-FE0F","c":"1F3F7","j":["sale","tag"],"k":[12,21],"o":7},"octopus":{"a":"Octopus","b":"1F419","j":["animal","creature","ocean","sea","nature","beach"],"k":[13,3]},"flag-er":{"a":"Eritrea Flag","b":"1F1EA-1F1F7","k":[1,49]},"black_right_pointing_double_triangle_with_vertical_bar":{"a":"Black Right Pointing Double Triangle with Vertical Bar","b":"23ED-FE0F","c":"23ED","k":[46,49]},"chocolate_bar":{"a":"Chocolate Bar","b":"1F36B","j":["food","snack","dessert","sweet"],"k":[7,45]},"oncoming_bus":{"a":"Oncoming Bus","b":"1F68D","j":["vehicle","transportation"],"k":[34,21]},"shell":{"a":"Spiral Shell","b":"1F41A","j":["nature","sea","beach"],"k":[13,4]},"face_with_cowboy_hat":{"a":"Face with Cowboy Hat","b":"1F920","k":[38,23],"o":9},"moneybag":{"a":"Money Bag","b":"1F4B0","j":["dollar","payment","coins","sale"],"k":[25,27]},"es":{"a":"Spain Flag","b":"1F1EA-1F1F8","j":["spain","flag","nation","country","banner"],"k":[1,50],"n":["flag-es"]},"crab":{"a":"Crab","b":"1F980","j":["animal","crustacean"],"k":[42,24],"o":8},"yen":{"a":"Banknote with Yen Sign","b":"1F4B4","j":["money","sales","japanese","dollar","currency"],"k":[25,31]},"flag-et":{"a":"Ethiopia Flag","b":"1F1EA-1F1F9","k":[1,51]},"clown_face":{"a":"Clown Face","b":"1F921","j":["face"],"k":[38,24],"o":9},"black_right_pointing_triangle_with_double_vertical_bar":{"a":"Black Right Pointing Triangle with Double Vertical Bar","b":"23EF-FE0F","c":"23EF","k":[46,51]},"trolleybus":{"a":"Trolleybus","b":"1F68E","j":["bart","transportation","vehicle"],"k":[34,22]},"candy":{"a":"Candy","b":"1F36C","j":["snack","dessert","sweet","lolly"],"k":[7,46]},"lying_face":{"a":"Lying Face","b":"1F925","j":["face","lie","pinocchio"],"k":[38,28],"o":9},"arrow_backward":{"a":"Black Left-Pointing Triangle","b":"25C0-FE0F","c":"25C0","j":["blue-square","left","direction"],"k":[47,11],"o":1},"dollar":{"a":"Banknote with Dollar Sign","b":"1F4B5","j":["money","sales","bill","currency"],"k":[25,32]},"shrimp":{"a":"Shrimp","b":"1F990","j":["animal","ocean","nature","seafood"],"k":[42,40],"o":9},"minibus":{"a":"Minibus","b":"1F690","j":["vehicle","car","transportation"],"k":[34,24]},"flag-eu":{"a":"European Union Flag","b":"1F1EA-1F1FA","k":[2,0]},"lollipop":{"a":"Lollipop","b":"1F36D","j":["food","snack","candy","sweet"],"k":[7,47]},"squid":{"a":"Squid","b":"1F991","j":["animal","nature","ocean","sea"],"k":[42,41],"o":9},"euro":{"a":"Banknote with Euro Sign","b":"1F4B6","j":["money","sales","dollar","currency"],"k":[25,33]},"flag-fi":{"a":"Finland Flag","b":"1F1EB-1F1EE","k":[2,1]},"ambulance":{"a":"Ambulance","b":"1F691","j":["health","911","hospital"],"k":[34,25]},"custard":{"a":"Custard","b":"1F36E","j":["dessert","food"],"k":[7,48]},"shushing_face":{"a":"Face with Finger Covering Closed Lips","b":"1F92B","k":[38,51],"n":["face_with_finger_covering_closed_lips"],"o":10},"rewind":{"a":"Black Left-Pointing Double Triangle","b":"23EA","j":["play","blue-square"],"k":[46,46]},"black_left_pointing_double_triangle_with_vertical_bar":{"a":"Black Left Pointing Double Triangle with Vertical Bar","b":"23EE-FE0F","c":"23EE","k":[46,50]},"face_with_hand_over_mouth":{"a":"Smiling Face with Smiling Eyes and Hand Covering Mouth","b":"1F92D","k":[39,1],"n":["smiling_face_with_smiling_eyes_and_hand_covering_mouth"],"o":10},"flag-fj":{"a":"Fiji Flag","b":"1F1EB-1F1EF","k":[2,2]},"honey_pot":{"a":"Honey Pot","b":"1F36F","j":["bees","sweet","kitchen"],"k":[7,49]},"snail":{"a":"Snail","b":"1F40C","j":["slow","animal","shell"],"k":[12,42]},"pound":{"a":"Banknote with Pound Sign","b":"1F4B7","j":["british","sterling","money","sales","bills","uk","england","currency"],"k":[25,34]},"fire_engine":{"a":"Fire Engine","b":"1F692","j":["transportation","cars","vehicle"],"k":[34,26]},"baby_bottle":{"a":"Baby Bottle","b":"1F37C","j":["food","container","milk"],"k":[8,10]},"butterfly":{"a":"Butterfly","b":"1F98B","j":["animal","insect","nature","caterpillar"],"k":[42,35],"o":9},"money_with_wings":{"a":"Money with Wings","b":"1F4B8","j":["dollar","bills","payment","sale"],"k":[25,35]},"face_with_monocle":{"a":"Face with Monocle","b":"1F9D0","k":[42,49],"o":10},"police_car":{"a":"Police Car","b":"1F693","j":["vehicle","cars","transportation","law","legal","enforcement"],"k":[34,27]},"arrow_up_small":{"a":"Up-Pointing Small Red Triangle","b":"1F53C","j":["blue-square","triangle","direction","point","forward","top"],"k":[28,10]},"flag-fm":{"a":"Micronesia Flag","b":"1F1EB-1F1F2","k":[2,4]},"glass_of_milk":{"a":"Glass of Milk","b":"1F95B","k":[42,7],"o":9},"credit_card":{"a":"Credit Card","b":"1F4B3","j":["money","sales","dollar","bill","payment","shopping"],"k":[25,30]},"oncoming_police_car":{"a":"Oncoming Police Car","b":"1F694","j":["vehicle","law","legal","enforcement","911"],"k":[34,28]},"bug":{"a":"Bug","b":"1F41B","j":["animal","insect","nature","worm"],"k":[13,5]},"nerd_face":{"a":"Nerd Face","b":"1F913","j":["face","nerdy","geek","dork"],"k":[37,27],"o":8},"arrow_double_up":{"a":"Black Up-Pointing Double Triangle","b":"23EB","j":["blue-square","direction","top"],"k":[46,47]},"chart":{"a":"Chart with Upwards Trend and Yen Sign","b":"1F4B9","j":["green-square","graph","presentation","stats"],"k":[25,36]},"flag-fo":{"a":"Faroe Islands Flag","b":"1F1EB-1F1F4","k":[2,5]},"ant":{"a":"Ant","b":"1F41C","j":["animal","insect","nature","bug"],"k":[13,6]},"arrow_down_small":{"a":"Down-Pointing Small Red Triangle","b":"1F53D","j":["blue-square","direction","bottom"],"k":[28,11]},"smiling_imp":{"a":"Smiling Face with Horns","b":"1F608","j":["devil","horns"],"k":[30,32]},"taxi":{"a":"Taxi","b":"1F695","j":["uber","vehicle","cars","transportation"],"k":[34,29]},"coffee":{"a":"Hot Beverage","b":"2615","j":["beverage","caffeine","latte","espresso"],"k":[47,24],"o":4},"fr":{"a":"France Flag","b":"1F1EB-1F1F7","j":["banner","flag","nation","france","french","country"],"k":[2,6],"n":["flag-fr"]},"oncoming_taxi":{"a":"Oncoming Taxi","b":"1F696","j":["vehicle","cars","uber"],"k":[34,30]},"arrow_double_down":{"a":"Black Down-Pointing Double Triangle","b":"23EC","j":["blue-square","direction","bottom"],"k":[46,48]},"imp":{"a":"Imp","b":"1F47F","j":["devil","angry","horns"],"k":[22,51]},"currency_exchange":{"a":"Currency Exchange","b":"1F4B1","j":["money","sales","dollar","travel"],"k":[25,28]},"tea":{"a":"Teacup Without Handle","b":"1F375","j":["drink","bowl","breakfast","green","british"],"k":[8,3]},"bee":{"a":"Honeybee","b":"1F41D","k":[13,7],"n":["honeybee"]},"heavy_dollar_sign":{"a":"Heavy Dollar Sign","b":"1F4B2","j":["money","sales","payment","currency","buck"],"k":[25,29]},"car":{"a":"Automobile","b":"1F697","k":[34,31],"n":["red_car"]},"sake":{"a":"Sake Bottle and Cup","b":"1F376","j":["wine","drink","drunk","beverage","japanese","alcohol","booze"],"k":[8,4]},"flag-ga":{"a":"Gabon Flag","b":"1F1EC-1F1E6","k":[2,7]},"beetle":{"a":"Lady Beetle","b":"1F41E","j":["animal","insect","nature","ladybug"],"k":[13,8]},"japanese_ogre":{"a":"Japanese Ogre","b":"1F479","j":["monster","red","mask","halloween","scary","creepy","devil","demon","japanese","ogre"],"k":[22,40]},"double_vertical_bar":{"a":"Double Vertical Bar","b":"23F8-FE0F","c":"23F8","k":[47,4],"o":7},"champagne":{"a":"Bottle with Popping Cork","b":"1F37E","j":["drink","wine","bottle","celebration"],"k":[8,12],"o":8},"japanese_goblin":{"a":"Japanese Goblin","b":"1F47A","j":["red","evil","mask","monster","scary","creepy","japanese","goblin"],"k":[22,41]},"black_square_for_stop":{"a":"Black Square for Stop","b":"23F9-FE0F","c":"23F9","k":[47,5],"o":7},"oncoming_automobile":{"a":"Oncoming Automobile","b":"1F698","j":["car","vehicle","transportation"],"k":[34,32]},"email":{"a":"Envelope","b":"2709-FE0F","c":"2709","j":["letter","postal","inbox","communication"],"k":[49,17],"n":["envelope"],"o":1},"cricket":{"a":"Cricket","b":"1F997","j":["sports"],"k":[42,47],"o":10},"gb":{"a":"United Kingdom Flag","b":"1F1EC-1F1E7","k":[2,8],"n":["uk","flag-gb"]},"black_circle_for_record":{"a":"Black Circle for Record","b":"23FA-FE0F","c":"23FA","k":[47,6],"o":7},"flag-gd":{"a":"Grenada Flag","b":"1F1EC-1F1E9","k":[2,9]},"spider":{"a":"Spider","b":"1F577-FE0F","c":"1F577","j":["animal","arachnid"],"k":[29,18],"o":7},"blue_car":{"a":"Recreational Vehicle","b":"1F699","j":["transportation","vehicle"],"k":[34,33]},"skull":{"a":"Skull","b":"1F480","j":["dead","skeleton","creepy","death"],"k":[23,0]},"e-mail":{"a":"E-Mail Symbol","b":"1F4E7","j":["communication","inbox"],"k":[26,30]},"wine_glass":{"a":"Wine Glass","b":"1F377","j":["drink","beverage","drunk","alcohol","booze"],"k":[8,5]},"spider_web":{"a":"Spider Web","b":"1F578-FE0F","c":"1F578","j":["animal","insect","arachnid","silk"],"k":[29,19],"o":7},"cocktail":{"a":"Cocktail Glass","b":"1F378","j":["drink","drunk","alcohol","beverage","booze","mojito"],"k":[8,6]},"skull_and_crossbones":{"a":"Skull and Crossbones","b":"2620-FE0F","c":"2620","j":["poison","danger","deadly","scary","death","pirate","evil"],"k":[47,32],"o":1},"flag-ge":{"a":"Georgia Flag","b":"1F1EC-1F1EA","k":[2,10]},"eject":{"a":"Eject","b":"23CF-FE0F","c":"23CF","k":[46,44],"o":4},"truck":{"a":"Delivery Truck","b":"1F69A","j":["cars","transportation"],"k":[34,34]},"incoming_envelope":{"a":"Incoming Envelope","b":"1F4E8","j":["email","inbox"],"k":[26,31]},"tropical_drink":{"a":"Tropical Drink","b":"1F379","j":["beverage","cocktail","summer","beach","alcohol","booze","mojito"],"k":[8,7]},"scorpion":{"a":"Scorpion","b":"1F982","j":["animal","arachnid"],"k":[42,26],"o":8},"cinema":{"a":"Cinema","b":"1F3A6","j":["blue-square","record","film","movie","curtain","stage","theater"],"k":[9,0]},"articulated_lorry":{"a":"Articulated Lorry","b":"1F69B","j":["vehicle","cars","transportation","express"],"k":[34,35]},"envelope_with_arrow":{"a":"Envelope with Downwards Arrow Above","b":"1F4E9","j":["email","communication"],"k":[26,32]},"ghost":{"a":"Ghost","b":"1F47B","j":["halloween","spooky","scary"],"k":[22,42]},"bouquet":{"a":"Bouquet","b":"1F490","j":["flowers","nature","spring"],"k":[24,42]},"tractor":{"a":"Tractor","b":"1F69C","j":["vehicle","car","farming","agriculture"],"k":[34,36]},"beer":{"a":"Beer Mug","b":"1F37A","j":["relax","beverage","drink","drunk","party","pub","summer","alcohol","booze"],"k":[8,8]},"outbox_tray":{"a":"Outbox Tray","b":"1F4E4","j":["inbox","email"],"k":[26,27]},"low_brightness":{"a":"Low Brightness Symbol","b":"1F505","j":["sun","afternoon","warm","summer"],"k":[27,7]},"alien":{"a":"Extraterrestrial Alien","b":"1F47D","j":["UFO","paul","weird","outer_space"],"k":[22,49]},"flag-gg":{"a":"Guernsey Flag","b":"1F1EC-1F1EC","k":[2,12]},"cherry_blossom":{"a":"Cherry Blossom","b":"1F338","j":["nature","plant","spring","flower"],"k":[6,46]},"inbox_tray":{"a":"Inbox Tray","b":"1F4E5","j":["email","documents"],"k":[26,28]},"flag-gh":{"a":"Ghana Flag","b":"1F1EC-1F1ED","k":[2,13]},"bike":{"a":"Bicycle","b":"1F6B2","j":["sports","bicycle","exercise","hipster"],"k":[35,23]},"space_invader":{"a":"Alien Monster","b":"1F47E","j":["game","arcade","play"],"k":[22,50]},"beers":{"a":"Clinking Beer Mugs","b":"1F37B","j":["relax","beverage","drink","drunk","party","pub","summer","alcohol","booze"],"k":[8,9]},"high_brightness":{"a":"High Brightness Symbol","b":"1F506","j":["sun","light"],"k":[27,8]},"package":{"a":"Package","b":"1F4E6","j":["mail","gift","cardboard","box","moving"],"k":[26,29]},"scooter":{"a":"Scooter","b":"1F6F4","k":[37,19],"o":9},"white_flower":{"a":"White Flower","b":"1F4AE","j":["japanese","spring"],"k":[25,25]},"clinking_glasses":{"a":"Clinking Glasses","b":"1F942","j":["beverage","drink","party","alcohol","celebrate","cheers"],"k":[41,38],"o":9},"robot_face":{"a":"Robot Face","b":"1F916","k":[37,30],"o":8},"signal_strength":{"a":"Antenna with Bars","b":"1F4F6","j":["blue-square","reception","phone","internet","connection","wifi","bluetooth","bars"],"k":[26,45]},"flag-gi":{"a":"Gibraltar Flag","b":"1F1EC-1F1EE","k":[2,14]},"flag-gl":{"a":"Greenland Flag","b":"1F1EC-1F1F1","k":[2,15]},"motor_scooter":{"a":"Motor Scooter","b":"1F6F5","j":["vehicle","vespa","sasha"],"k":[37,20],"o":9},"mailbox":{"a":"Closed Mailbox with Raised Flag","b":"1F4EB","j":["email","inbox","communication"],"k":[26,34]},"vibration_mode":{"a":"Vibration Mode","b":"1F4F3","j":["orange-square","phone"],"k":[26,42]},"hankey":{"a":"Pile of Poo","b":"1F4A9","k":[25,15],"n":["poop","shit"]},"rosette":{"a":"Rosette","b":"1F3F5-FE0F","c":"1F3F5","j":["flower","decoration","military"],"k":[12,20],"o":7},"tumbler_glass":{"a":"Tumbler Glass","b":"1F943","j":["drink","beverage","drunk","alcohol","liquor","booze","bourbon","scotch","whisky","glass","shot"],"k":[41,39],"o":9},"cup_with_straw":{"a":"Cup with Straw","b":"1F964","k":[42,16],"o":10},"flag-gm":{"a":"Gambia Flag","b":"1F1EC-1F1F2","k":[2,16]},"mailbox_closed":{"a":"Closed Mailbox with Lowered Flag","b":"1F4EA","j":["email","communication","inbox"],"k":[26,33]},"mobile_phone_off":{"a":"Mobile Phone off","b":"1F4F4","j":["mute","orange-square","silence","quiet"],"k":[26,43]},"busstop":{"a":"Bus Stop","b":"1F68F","j":["transportation","wait"],"k":[34,23]},"smiley_cat":{"a":"Smiling Cat Face with Open Mouth","b":"1F63A","j":["animal","cats","happy","smile"],"k":[31,30]},"rose":{"a":"Rose","b":"1F339","j":["flowers","valentines","love","spring"],"k":[6,47]},"motorway":{"a":"Motorway","b":"1F6E3-FE0F","c":"1F6E3","j":["road","cupertino","interstate","highway"],"k":[37,11],"o":7},"smile_cat":{"a":"Grinning Cat Face with Smiling Eyes","b":"1F638","j":["animal","cats","smile"],"k":[31,28]},"flag-gn":{"a":"Guinea Flag","b":"1F1EC-1F1F3","k":[2,17]},"wilted_flower":{"a":"Wilted Flower","b":"1F940","j":["plant","nature","flower"],"k":[41,36],"o":9},"mailbox_with_mail":{"a":"Open Mailbox with Raised Flag","b":"1F4EC","j":["email","inbox","communication"],"k":[26,35]},"chopsticks":{"a":"Chopsticks","b":"1F962","k":[42,14],"o":10},"female_sign":{"a":"Female Sign","b":"2640-FE0F","c":"2640","k":[47,42],"o":1},"mailbox_with_no_mail":{"a":"Open Mailbox with Lowered Flag","b":"1F4ED","j":["email","inbox"],"k":[26,36]},"knife_fork_plate":{"a":"Knife Fork Plate","b":"1F37D-FE0F","c":"1F37D","k":[8,11],"o":7},"hibiscus":{"a":"Hibiscus","b":"1F33A","j":["plant","vegetable","flowers","beach"],"k":[6,48]},"railway_track":{"a":"Railway Track","b":"1F6E4-FE0F","c":"1F6E4","j":["train","transportation"],"k":[37,12],"o":7},"male_sign":{"a":"Male Sign","b":"2642-FE0F","c":"2642","k":[47,43],"o":1},"joy_cat":{"a":"Cat Face with Tears of Joy","b":"1F639","j":["animal","cats","haha","happy","tears"],"k":[31,29]},"fuelpump":{"a":"Fuel Pump","b":"26FD","j":["gas station","petroleum"],"k":[49,13],"o":5},"sunflower":{"a":"Sunflower","b":"1F33B","j":["nature","plant","fall"],"k":[6,49]},"postbox":{"a":"Postbox","b":"1F4EE","j":["email","letter","envelope"],"k":[26,37]},"flag-gq":{"a":"Equatorial Guinea Flag","b":"1F1EC-1F1F6","k":[2,19]},"heart_eyes_cat":{"a":"Smiling Cat Face with Heart-Shaped Eyes","b":"1F63B","j":["animal","love","like","affection","cats","valentines","heart"],"k":[31,31]},"fork_and_knife":{"a":"Fork and Knife","b":"1F374","j":["cutlery","kitchen"],"k":[8,2]},"medical_symbol":{"a":"Medical Symbol","b":"2695-FE0F","c":"2695","k":[48,14],"n":["staff_of_aesculapius"],"o":4},"recycle":{"a":"Black Universal Recycling Symbol","b":"267B-FE0F","c":"267B","j":["arrow","environment","garbage","trash"],"k":[48,9],"o":3},"spoon":{"a":"Spoon","b":"1F944","j":["cutlery","kitchen","tableware"],"k":[41,40],"o":9},"blossom":{"a":"Blossom","b":"1F33C","j":["nature","flowers","yellow"],"k":[6,50]},"rotating_light":{"a":"Police Cars Revolving Light","b":"1F6A8","j":["police","ambulance","911","emergency","alert","error","pinged","law","legal"],"k":[35,13]},"smirk_cat":{"a":"Cat Face with Wry Smile","b":"1F63C","j":["animal","cats","smirk"],"k":[31,32]},"ballot_box_with_ballot":{"a":"Ballot Box with Ballot","b":"1F5F3-FE0F","c":"1F5F3","k":[30,17],"o":7},"flag-gr":{"a":"Greece Flag","b":"1F1EC-1F1F7","k":[2,20]},"kissing_cat":{"a":"Kissing Cat Face with Closed Eyes","b":"1F63D","j":["animal","cats","kiss"],"k":[31,33]},"pencil2":{"a":"Pencil","b":"270F-FE0F","c":"270F","j":["stationery","write","paper","writing","school","study"],"k":[49,42],"o":1},"traffic_light":{"a":"Horizontal Traffic Light","b":"1F6A5","j":["transportation","signal"],"k":[35,10]},"fleur_de_lis":{"a":"Fleur De Lis","b":"269C-FE0F","c":"269C","j":["decorative","scout"],"k":[48,19],"o":4},"tulip":{"a":"Tulip","b":"1F337","j":["flowers","plant","nature","summer","spring"],"k":[6,45]},"hocho":{"a":"Hocho","b":"1F52A","j":["knife","blade","cutlery","kitchen","weapon"],"k":[27,44],"n":["knife"]},"seedling":{"a":"Seedling","b":"1F331","j":["plant","nature","grass","lawn","spring"],"k":[6,39]},"amphora":{"a":"Amphora","b":"1F3FA","j":["vase","jar"],"k":[12,24],"o":8},"scream_cat":{"a":"Weary Cat Face","b":"1F640","j":["animal","cats","munch","scared","scream"],"k":[31,36]},"vertical_traffic_light":{"a":"Vertical Traffic Light","b":"1F6A6","j":["transportation","driving"],"k":[35,11]},"black_nib":{"a":"Black Nib","b":"2712-FE0F","c":"2712","j":["pen","stationery","writing","write"],"k":[49,43],"o":1},"flag-gt":{"a":"Guatemala Flag","b":"1F1EC-1F1F9","k":[2,22]},"trident":{"a":"Trident Emblem","b":"1F531","j":["weapon","spear"],"k":[27,51]},"flag-gu":{"a":"Guam Flag","b":"1F1EC-1F1FA","k":[2,23]},"name_badge":{"a":"Name Badge","b":"1F4DB","j":["fire","forbid"],"k":[26,18]},"construction":{"a":"Construction Sign","b":"1F6A7","j":["wip","progress","caution","warning"],"k":[35,12]},"lower_left_fountain_pen":{"a":"Lower Left Fountain Pen","b":"1F58B-FE0F","c":"1F58B","k":[29,29],"o":7},"evergreen_tree":{"a":"Evergreen Tree","b":"1F332","j":["plant","nature"],"k":[6,40]},"crying_cat_face":{"a":"Crying Cat Face","b":"1F63F","j":["animal","tears","weep","sad","cats","upset","cry"],"k":[31,35]},"flag-gw":{"a":"Guinea-Bissau Flag","b":"1F1EC-1F1FC","k":[2,24]},"lower_left_ballpoint_pen":{"a":"Lower Left Ballpoint Pen","b":"1F58A-FE0F","c":"1F58A","k":[29,28],"o":7},"pouting_cat":{"a":"Pouting Cat Face","b":"1F63E","j":["animal","cats"],"k":[31,34]},"deciduous_tree":{"a":"Deciduous Tree","b":"1F333","j":["plant","nature"],"k":[6,41]},"octagonal_sign":{"a":"Octagonal Sign","b":"1F6D1","k":[37,6],"o":9},"beginner":{"a":"Japanese Symbol for Beginner","b":"1F530","j":["badge","shield"],"k":[27,50]},"flag-gy":{"a":"Guyana Flag","b":"1F1EC-1F1FE","k":[2,25]},"lower_left_paintbrush":{"a":"Lower Left Paintbrush","b":"1F58C-FE0F","c":"1F58C","k":[29,30],"o":7},"o":{"a":"Heavy Large Circle","b":"2B55","j":["circle","round"],"k":[50,23],"o":5},"palm_tree":{"a":"Palm Tree","b":"1F334","j":["plant","vegetable","nature","summer","beach","mojito","tropical"],"k":[6,42]},"anchor":{"a":"Anchor","b":"2693","j":["ship","ferry","sea","boat"],"k":[48,12],"o":4},"see_no_evil":{"a":"See-No-Evil Monkey","b":"1F648","j":["monkey","animal","nature","haha"],"k":[32,43]},"boat":{"a":"Sailboat","b":"26F5","k":[48,43],"n":["sailboat"],"o":5},"white_check_mark":{"a":"White Heavy Check Mark","b":"2705","j":["green-square","ok","agree","vote","election","answer","tick"],"k":[49,15]},"flag-hk":{"a":"Hong Kong Sar China Flag","b":"1F1ED-1F1F0","k":[2,26]},"lower_left_crayon":{"a":"Lower Left Crayon","b":"1F58D-FE0F","c":"1F58D","k":[29,31],"o":7},"hear_no_evil":{"a":"Hear-No-Evil Monkey","b":"1F649","j":["animal","monkey","nature"],"k":[32,44]},"cactus":{"a":"Cactus","b":"1F335","j":["vegetable","plant","nature"],"k":[6,43]},"ear_of_rice":{"a":"Ear of Rice","b":"1F33E","j":["nature","plant"],"k":[7,0]},"speak_no_evil":{"a":"Speak-No-Evil Monkey","b":"1F64A","j":["monkey","animal","nature","omg"],"k":[32,45]},"flag-hm":{"a":"Heard & Mcdonald Islands Flag","b":"1F1ED-1F1F2","k":[2,27]},"ballot_box_with_check":{"a":"Ballot Box with Check","b":"2611-FE0F","c":"2611","j":["ok","agree","confirm","black-square","vote","election","yes","tick"],"k":[47,22],"o":1},"canoe":{"a":"Canoe","b":"1F6F6","j":["boat","paddle","water","ship"],"k":[37,21],"o":9},"memo":{"a":"Memo","b":"1F4DD","j":["write","documents","stationery","pencil","paper","writing","legal","exam","quiz","test","study","compose"],"k":[26,20],"n":["pencil"]},"herb":{"a":"Herb","b":"1F33F","j":["vegetable","plant","medicine","weed","grass","lawn"],"k":[7,1]},"flag-hn":{"a":"Honduras Flag","b":"1F1ED-1F1F3","k":[2,28]},"heavy_check_mark":{"a":"Heavy Check Mark","b":"2714-FE0F","c":"2714","j":["ok","nike","answer","yes","tick"],"k":[49,44],"o":1},"briefcase":{"a":"Briefcase","b":"1F4BC","j":["business","documents","work","law","legal","job","career"],"k":[25,39]},"speedboat":{"a":"Speedboat","b":"1F6A4","j":["ship","transportation","vehicle","summer"],"k":[35,9]},"baby":{"skin_variations":{"1F3FB":{"unified":"1F476-1F3FB","non_qualified":null,"image":"1f476-1f3fb.png","sheet_x":22,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F476-1F3FC","non_qualified":null,"image":"1f476-1f3fc.png","sheet_x":22,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F476-1F3FD","non_qualified":null,"image":"1f476-1f3fd.png","sheet_x":22,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F476-1F3FE","non_qualified":null,"image":"1f476-1f3fe.png","sheet_x":22,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F476-1F3FF","non_qualified":null,"image":"1f476-1f3ff.png","sheet_x":22,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Baby","b":"1F476","j":["child","boy","girl","toddler"],"k":[22,10]},"heavy_multiplication_x":{"a":"Heavy Multiplication X","b":"2716-FE0F","c":"2716","j":["math","calculation"],"k":[49,45],"o":1},"child":{"skin_variations":{"1F3FB":{"unified":"1F9D2-1F3FB","non_qualified":null,"image":"1f9d2-1f3fb.png","sheet_x":43,"sheet_y":5,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F9D2-1F3FC","non_qualified":null,"image":"1f9d2-1f3fc.png","sheet_x":43,"sheet_y":6,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F9D2-1F3FD","non_qualified":null,"image":"1f9d2-1f3fd.png","sheet_x":43,"sheet_y":7,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F9D2-1F3FE","non_qualified":null,"image":"1f9d2-1f3fe.png","sheet_x":43,"sheet_y":8,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F9D2-1F3FF","non_qualified":null,"image":"1f9d2-1f3ff.png","sheet_x":43,"sheet_y":9,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Child","b":"1F9D2","k":[43,4],"o":10},"shamrock":{"a":"Shamrock","b":"2618-FE0F","c":"2618","j":["vegetable","plant","nature","irish","clover"],"k":[47,25],"o":4},"passenger_ship":{"a":"Passenger Ship","b":"1F6F3-FE0F","c":"1F6F3","j":["yacht","cruise","ferry"],"k":[37,18],"o":7},"flag-hr":{"a":"Croatia Flag","b":"1F1ED-1F1F7","k":[2,29]},"file_folder":{"a":"File Folder","b":"1F4C1","j":["documents","business","office"],"k":[25,44]},"x":{"a":"Cross Mark","b":"274C","j":["no","delete","remove","cancel"],"k":[50,1]},"four_leaf_clover":{"a":"Four Leaf Clover","b":"1F340","j":["vegetable","plant","nature","lucky","irish"],"k":[7,2]},"open_file_folder":{"a":"Open File Folder","b":"1F4C2","j":["documents","load"],"k":[25,45]},"boy":{"skin_variations":{"1F3FB":{"unified":"1F466-1F3FB","non_qualified":null,"image":"1f466-1f3fb.png","sheet_x":15,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F466-1F3FC","non_qualified":null,"image":"1f466-1f3fc.png","sheet_x":15,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F466-1F3FD","non_qualified":null,"image":"1f466-1f3fd.png","sheet_x":15,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F466-1F3FE","non_qualified":null,"image":"1f466-1f3fe.png","sheet_x":15,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F466-1F3FF","non_qualified":null,"image":"1f466-1f3ff.png","sheet_x":15,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Boy","b":"1F466","j":["man","male","guy","teenager"],"k":[15,42]},"ferry":{"a":"Ferry","b":"26F4-FE0F","c":"26F4","j":["boat","ship","yacht"],"k":[48,42],"o":5},"flag-ht":{"a":"Haiti Flag","b":"1F1ED-1F1F9","k":[2,30]},"girl":{"skin_variations":{"1F3FB":{"unified":"1F467-1F3FB","non_qualified":null,"image":"1f467-1f3fb.png","sheet_x":15,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F467-1F3FC","non_qualified":null,"image":"1f467-1f3fc.png","sheet_x":15,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F467-1F3FD","non_qualified":null,"image":"1f467-1f3fd.png","sheet_x":15,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F467-1F3FE","non_qualified":null,"image":"1f467-1f3fe.png","sheet_x":16,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F467-1F3FF","non_qualified":null,"image":"1f467-1f3ff.png","sheet_x":16,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Girl","b":"1F467","j":["female","woman","teenager"],"k":[15,48]},"negative_squared_cross_mark":{"a":"Negative Squared Cross Mark","b":"274E","j":["x","green-square","no","deny"],"k":[50,2]},"flag-hu":{"a":"Hungary Flag","b":"1F1ED-1F1FA","k":[2,31]},"card_index_dividers":{"a":"Card Index Dividers","b":"1F5C2-FE0F","c":"1F5C2","j":["organizing","business","stationery"],"k":[30,4],"o":7},"maple_leaf":{"a":"Maple Leaf","b":"1F341","j":["nature","plant","vegetable","ca","fall"],"k":[7,3]},"motor_boat":{"a":"Motor Boat","b":"1F6E5-FE0F","c":"1F6E5","j":["ship"],"k":[37,13],"o":7},"flag-ic":{"a":"Canary Islands Flag","b":"1F1EE-1F1E8","k":[2,32]},"fallen_leaf":{"a":"Fallen Leaf","b":"1F342","j":["nature","plant","vegetable","leaves"],"k":[7,4]},"adult":{"skin_variations":{"1F3FB":{"unified":"1F9D1-1F3FB","non_qualified":null,"image":"1f9d1-1f3fb.png","sheet_x":42,"sheet_y":51,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F9D1-1F3FC","non_qualified":null,"image":"1f9d1-1f3fc.png","sheet_x":43,"sheet_y":0,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F9D1-1F3FD","non_qualified":null,"image":"1f9d1-1f3fd.png","sheet_x":43,"sheet_y":1,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F9D1-1F3FE","non_qualified":null,"image":"1f9d1-1f3fe.png","sheet_x":43,"sheet_y":2,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F9D1-1F3FF","non_qualified":null,"image":"1f9d1-1f3ff.png","sheet_x":43,"sheet_y":3,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Adult","b":"1F9D1","k":[42,50],"o":10},"ship":{"a":"Ship","b":"1F6A2","j":["transportation","titanic","deploy"],"k":[34,42]},"heavy_plus_sign":{"a":"Heavy Plus Sign","b":"2795","j":["math","calculation","addition","more","increase"],"k":[50,9]},"date":{"a":"Calendar","b":"1F4C5","j":["calendar","schedule"],"k":[25,48]},"man":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB","non_qualified":null,"image":"1f468-1f3fb.png","sheet_x":18,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F468-1F3FC","non_qualified":null,"image":"1f468-1f3fc.png","sheet_x":18,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F468-1F3FD","non_qualified":null,"image":"1f468-1f3fd.png","sheet_x":18,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F468-1F3FE","non_qualified":null,"image":"1f468-1f3fe.png","sheet_x":18,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F468-1F3FF","non_qualified":null,"image":"1f468-1f3ff.png","sheet_x":18,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Man","b":"1F468","j":["mustache","father","dad","guy","classy","sir","moustache"],"k":[18,11]},"flag-id":{"a":"Indonesia Flag","b":"1F1EE-1F1E9","k":[2,33]},"leaves":{"a":"Leaf Fluttering in Wind","b":"1F343","j":["nature","plant","tree","vegetable","grass","lawn","spring"],"k":[7,5]},"heavy_minus_sign":{"a":"Heavy Minus Sign","b":"2796","j":["math","calculation","subtract","less"],"k":[50,10]},"calendar":{"a":"Tear-off Calendar","b":"1F4C6","j":["schedule","date","planning"],"k":[25,49]},"airplane":{"a":"Airplane","b":"2708-FE0F","c":"2708","j":["vehicle","transportation","flight","fly"],"k":[49,16],"o":1},"spiral_note_pad":{"a":"Spiral Note Pad","b":"1F5D2-FE0F","c":"1F5D2","k":[30,8],"o":7},"heavy_division_sign":{"a":"Heavy Division Sign","b":"2797","j":["divide","math","calculation"],"k":[50,11]},"small_airplane":{"a":"Small Airplane","b":"1F6E9-FE0F","c":"1F6E9","j":["flight","transportation","fly","vehicle"],"k":[37,14],"o":7},"woman":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB","non_qualified":null,"image":"1f469-1f3fb.png","sheet_x":20,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F469-1F3FC","non_qualified":null,"image":"1f469-1f3fc.png","sheet_x":20,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F469-1F3FD","non_qualified":null,"image":"1f469-1f3fd.png","sheet_x":20,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F469-1F3FE","non_qualified":null,"image":"1f469-1f3fe.png","sheet_x":20,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F469-1F3FF","non_qualified":null,"image":"1f469-1f3ff.png","sheet_x":20,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Woman","b":"1F469","j":["female","girls","lady"],"k":[20,23]},"flag-ie":{"a":"Ireland Flag","b":"1F1EE-1F1EA","k":[2,34]},"curly_loop":{"a":"Curly Loop","b":"27B0","j":["scribble","draw","shape","squiggle"],"k":[50,13]},"flag-il":{"a":"Israel Flag","b":"1F1EE-1F1F1","k":[2,35]},"airplane_departure":{"a":"Airplane Departure","b":"1F6EB","k":[37,15],"o":7},"spiral_calendar_pad":{"a":"Spiral Calendar Pad","b":"1F5D3-FE0F","c":"1F5D3","k":[30,9],"o":7},"older_adult":{"skin_variations":{"1F3FB":{"unified":"1F9D3-1F3FB","non_qualified":null,"image":"1f9d3-1f3fb.png","sheet_x":43,"sheet_y":11,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F9D3-1F3FC","non_qualified":null,"image":"1f9d3-1f3fc.png","sheet_x":43,"sheet_y":12,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F9D3-1F3FD","non_qualified":null,"image":"1f9d3-1f3fd.png","sheet_x":43,"sheet_y":13,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F9D3-1F3FE","non_qualified":null,"image":"1f9d3-1f3fe.png","sheet_x":43,"sheet_y":14,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F9D3-1F3FF","non_qualified":null,"image":"1f9d3-1f3ff.png","sheet_x":43,"sheet_y":15,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Older Adult","b":"1F9D3","k":[43,10],"o":10},"airplane_arriving":{"a":"Airplane Arriving","b":"1F6EC","k":[37,16],"o":7},"card_index":{"a":"Card Index","b":"1F4C7","j":["business","stationery"],"k":[25,50]},"loop":{"a":"Double Curly Loop","b":"27BF","j":["tape","cassette"],"k":[50,14]},"older_man":{"skin_variations":{"1F3FB":{"unified":"1F474-1F3FB","non_qualified":null,"image":"1f474-1f3fb.png","sheet_x":21,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F474-1F3FC","non_qualified":null,"image":"1f474-1f3fc.png","sheet_x":22,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F474-1F3FD","non_qualified":null,"image":"1f474-1f3fd.png","sheet_x":22,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F474-1F3FE","non_qualified":null,"image":"1f474-1f3fe.png","sheet_x":22,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F474-1F3FF","non_qualified":null,"image":"1f474-1f3ff.png","sheet_x":22,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Older Man","b":"1F474","j":["human","male","men","old","elder","senior"],"k":[21,50]},"flag-im":{"a":"Isle of Man Flag","b":"1F1EE-1F1F2","k":[2,36]},"flag-in":{"a":"India Flag","b":"1F1EE-1F1F3","k":[2,37]},"chart_with_upwards_trend":{"a":"Chart with Upwards Trend","b":"1F4C8","j":["graph","presentation","stats","recovery","business","economics","money","sales","good","success"],"k":[25,51]},"part_alternation_mark":{"a":"Part Alternation Mark","b":"303D-FE0F","c":"303D","j":["graph","presentation","stats","business","economics","bad"],"k":[50,25],"o":3},"seat":{"a":"Seat","b":"1F4BA","j":["sit","airplane","transport","bus","flight","fly"],"k":[25,37]},"older_woman":{"skin_variations":{"1F3FB":{"unified":"1F475-1F3FB","non_qualified":null,"image":"1f475-1f3fb.png","sheet_x":22,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F475-1F3FC","non_qualified":null,"image":"1f475-1f3fc.png","sheet_x":22,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F475-1F3FD","non_qualified":null,"image":"1f475-1f3fd.png","sheet_x":22,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F475-1F3FE","non_qualified":null,"image":"1f475-1f3fe.png","sheet_x":22,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F475-1F3FF","non_qualified":null,"image":"1f475-1f3ff.png","sheet_x":22,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Older Woman","b":"1F475","j":["human","female","women","lady","old","elder","senior"],"k":[22,4]},"eight_spoked_asterisk":{"a":"Eight Spoked Asterisk","b":"2733-FE0F","c":"2733","j":["star","sparkle","green-square"],"k":[49,49],"o":1},"chart_with_downwards_trend":{"a":"Chart with Downwards Trend","b":"1F4C9","j":["graph","presentation","stats","recession","business","economics","money","sales","bad","failure"],"k":[26,0]},"flag-io":{"a":"British Indian Ocean Territory Flag","b":"1F1EE-1F1F4","k":[2,38]},"male-doctor":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-2695-FE0F","non_qualified":"1F468-1F3FB-200D-2695","image":"1f468-1f3fb-200d-2695-fe0f.png","sheet_x":17,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-2695-FE0F","non_qualified":"1F468-1F3FC-200D-2695","image":"1f468-1f3fc-200d-2695-fe0f.png","sheet_x":17,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-2695-FE0F","non_qualified":"1F468-1F3FD-200D-2695","image":"1f468-1f3fd-200d-2695-fe0f.png","sheet_x":17,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-2695-FE0F","non_qualified":"1F468-1F3FE-200D-2695","image":"1f468-1f3fe-200d-2695-fe0f.png","sheet_x":17,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-2695-FE0F","non_qualified":"1F468-1F3FF-200D-2695","image":"1f468-1f3ff-200d-2695-fe0f.png","sheet_x":17,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Male Doctor","b":"1F468-200D-2695-FE0F","c":"1F468-200D-2695","k":[17,43]},"helicopter":{"a":"Helicopter","b":"1F681","j":["transportation","vehicle","fly"],"k":[34,9]},"female-doctor":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-2695-FE0F","non_qualified":"1F469-1F3FB-200D-2695","image":"1f469-1f3fb-200d-2695-fe0f.png","sheet_x":20,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-2695-FE0F","non_qualified":"1F469-1F3FC-200D-2695","image":"1f469-1f3fc-200d-2695-fe0f.png","sheet_x":20,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-2695-FE0F","non_qualified":"1F469-1F3FD-200D-2695","image":"1f469-1f3fd-200d-2695-fe0f.png","sheet_x":20,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-2695-FE0F","non_qualified":"1F469-1F3FE-200D-2695","image":"1f469-1f3fe-200d-2695-fe0f.png","sheet_x":20,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-2695-FE0F","non_qualified":"1F469-1F3FF-200D-2695","image":"1f469-1f3ff-200d-2695-fe0f.png","sheet_x":20,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Female Doctor","b":"1F469-200D-2695-FE0F","c":"1F469-200D-2695","k":[20,1]},"suspension_railway":{"a":"Suspension Railway","b":"1F69F","j":["vehicle","transportation"],"k":[34,39]},"bar_chart":{"a":"Bar Chart","b":"1F4CA","j":["graph","presentation","stats"],"k":[26,1]},"flag-iq":{"a":"Iraq Flag","b":"1F1EE-1F1F6","k":[2,39]},"eight_pointed_black_star":{"a":"Eight Pointed Black Star","b":"2734-FE0F","c":"2734","j":["orange-square","shape","polygon"],"k":[49,50],"o":1},"mountain_cableway":{"a":"Mountain Cableway","b":"1F6A0","j":["transportation","vehicle","ski"],"k":[34,40]},"male-student":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F393","non_qualified":null,"image":"1f468-1f3fb-200d-1f393.png","sheet_x":16,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F393","non_qualified":null,"image":"1f468-1f3fc-200d-1f393.png","sheet_x":16,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F393","non_qualified":null,"image":"1f468-1f3fd-200d-1f393.png","sheet_x":16,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F393","non_qualified":null,"image":"1f468-1f3fe-200d-1f393.png","sheet_x":16,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F393","non_qualified":null,"image":"1f468-1f3ff-200d-1f393.png","sheet_x":16,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Student","b":"1F468-200D-1F393","k":[16,14]},"clipboard":{"a":"Clipboard","b":"1F4CB","j":["stationery","documents"],"k":[26,2]},"flag-ir":{"a":"Iran Flag","b":"1F1EE-1F1F7","k":[2,40]},"sparkle":{"a":"Sparkle","b":"2747-FE0F","c":"2747","j":["stars","green-square","awesome","good","fireworks"],"k":[50,0],"o":1},"female-student":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F393","non_qualified":null,"image":"1f469-1f3fb-200d-1f393.png","sheet_x":18,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F393","non_qualified":null,"image":"1f469-1f3fc-200d-1f393.png","sheet_x":18,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F393","non_qualified":null,"image":"1f469-1f3fd-200d-1f393.png","sheet_x":18,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F393","non_qualified":null,"image":"1f469-1f3fe-200d-1f393.png","sheet_x":18,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F393","non_qualified":null,"image":"1f469-1f3ff-200d-1f393.png","sheet_x":18,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Student","b":"1F469-200D-1F393","k":[18,29]},"pushpin":{"a":"Pushpin","b":"1F4CC","j":["stationery","mark","here"],"k":[26,3]},"aerial_tramway":{"a":"Aerial Tramway","b":"1F6A1","j":["transportation","vehicle","ski"],"k":[34,41]},"flag-is":{"a":"Iceland Flag","b":"1F1EE-1F1F8","k":[2,41]},"bangbang":{"a":"Double Exclamation Mark","b":"203C-FE0F","c":"203C","j":["exclamation","surprise"],"k":[46,29],"o":1},"interrobang":{"a":"Exclamation Question Mark","b":"2049-FE0F","c":"2049","j":["wat","punctuation","surprise"],"k":[46,30],"o":3},"satellite":{"a":"Satellite","b":"1F6F0-FE0F","c":"1F6F0","j":["communication","future","radio","space"],"k":[37,17],"o":7},"it":{"a":"Italy Flag","b":"1F1EE-1F1F9","j":["italy","flag","nation","country","banner"],"k":[2,42],"n":["flag-it"]},"male-teacher":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F3EB","non_qualified":null,"image":"1f468-1f3fb-200d-1f3eb.png","sheet_x":16,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F3EB","non_qualified":null,"image":"1f468-1f3fc-200d-1f3eb.png","sheet_x":16,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F3EB","non_qualified":null,"image":"1f468-1f3fd-200d-1f3eb.png","sheet_x":16,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F3EB","non_qualified":null,"image":"1f468-1f3fe-200d-1f3eb.png","sheet_x":16,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F3EB","non_qualified":null,"image":"1f468-1f3ff-200d-1f3eb.png","sheet_x":16,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Teacher","b":"1F468-200D-1F3EB","k":[16,32]},"round_pushpin":{"a":"Round Pushpin","b":"1F4CD","j":["stationery","location","map","here"],"k":[26,4]},"flag-je":{"a":"Jersey Flag","b":"1F1EF-1F1EA","k":[2,43]},"question":{"a":"Black Question Mark Ornament","b":"2753","j":["doubt","confused"],"k":[50,3]},"rocket":{"a":"Rocket","b":"1F680","j":["launch","ship","staffmode","NASA","outer space","outer_space","fly"],"k":[34,8]},"female-teacher":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F3EB","non_qualified":null,"image":"1f469-1f3fb-200d-1f3eb.png","sheet_x":18,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F3EB","non_qualified":null,"image":"1f469-1f3fc-200d-1f3eb.png","sheet_x":18,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F3EB","non_qualified":null,"image":"1f469-1f3fd-200d-1f3eb.png","sheet_x":18,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F3EB","non_qualified":null,"image":"1f469-1f3fe-200d-1f3eb.png","sheet_x":18,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F3EB","non_qualified":null,"image":"1f469-1f3ff-200d-1f3eb.png","sheet_x":19,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Teacher","b":"1F469-200D-1F3EB","k":[18,47]},"paperclip":{"a":"Paperclip","b":"1F4CE","j":["documents","stationery"],"k":[26,5]},"linked_paperclips":{"a":"Linked Paperclips","b":"1F587-FE0F","c":"1F587","k":[29,27],"o":7},"flying_saucer":{"a":"Flying Saucer","b":"1F6F8","k":[37,23],"o":10},"male-judge":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-2696-FE0F","non_qualified":"1F468-1F3FB-200D-2696","image":"1f468-1f3fb-200d-2696-fe0f.png","sheet_x":17,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-2696-FE0F","non_qualified":"1F468-1F3FC-200D-2696","image":"1f468-1f3fc-200d-2696-fe0f.png","sheet_x":17,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-2696-FE0F","non_qualified":"1F468-1F3FD-200D-2696","image":"1f468-1f3fd-200d-2696-fe0f.png","sheet_x":18,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-2696-FE0F","non_qualified":"1F468-1F3FE-200D-2696","image":"1f468-1f3fe-200d-2696-fe0f.png","sheet_x":18,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-2696-FE0F","non_qualified":"1F468-1F3FF-200D-2696","image":"1f468-1f3ff-200d-2696-fe0f.png","sheet_x":18,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Male Judge","b":"1F468-200D-2696-FE0F","c":"1F468-200D-2696","k":[17,49]},"grey_question":{"a":"White Question Mark Ornament","b":"2754","j":["doubts","gray","huh","confused"],"k":[50,4]},"flag-jm":{"a":"Jamaica Flag","b":"1F1EF-1F1F2","k":[2,44]},"bellhop_bell":{"a":"Bellhop Bell","b":"1F6CE-FE0F","c":"1F6CE","j":["service"],"k":[37,3],"o":7},"straight_ruler":{"a":"Straight Ruler","b":"1F4CF","j":["stationery","calculate","length","math","school","drawing","architect","sketch"],"k":[26,6]},"flag-jo":{"a":"Jordan Flag","b":"1F1EF-1F1F4","k":[2,45]},"female-judge":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-2696-FE0F","non_qualified":"1F469-1F3FB-200D-2696","image":"1f469-1f3fb-200d-2696-fe0f.png","sheet_x":20,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-2696-FE0F","non_qualified":"1F469-1F3FC-200D-2696","image":"1f469-1f3fc-200d-2696-fe0f.png","sheet_x":20,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-2696-FE0F","non_qualified":"1F469-1F3FD-200D-2696","image":"1f469-1f3fd-200d-2696-fe0f.png","sheet_x":20,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-2696-FE0F","non_qualified":"1F469-1F3FE-200D-2696","image":"1f469-1f3fe-200d-2696-fe0f.png","sheet_x":20,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-2696-FE0F","non_qualified":"1F469-1F3FF-200D-2696","image":"1f469-1f3ff-200d-2696-fe0f.png","sheet_x":20,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Female Judge","b":"1F469-200D-2696-FE0F","c":"1F469-200D-2696","k":[20,7]},"grey_exclamation":{"a":"White Exclamation Mark Ornament","b":"2755","j":["surprise","punctuation","gray","wow","warning"],"k":[50,5]},"door":{"a":"Door","b":"1F6AA","j":["house","entry","exit"],"k":[35,15]},"male-farmer":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F33E","non_qualified":null,"image":"1f468-1f3fb-200d-1f33e.png","sheet_x":16,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F33E","non_qualified":null,"image":"1f468-1f3fc-200d-1f33e.png","sheet_x":16,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F33E","non_qualified":null,"image":"1f468-1f3fd-200d-1f33e.png","sheet_x":16,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F33E","non_qualified":null,"image":"1f468-1f3fe-200d-1f33e.png","sheet_x":16,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F33E","non_qualified":null,"image":"1f468-1f3ff-200d-1f33e.png","sheet_x":16,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Farmer","b":"1F468-200D-1F33E","k":[16,2]},"jp":{"a":"Japan Flag","b":"1F1EF-1F1F5","j":["japanese","nation","flag","country","banner"],"k":[2,46],"n":["flag-jp"]},"triangular_ruler":{"a":"Triangular Ruler","b":"1F4D0","j":["stationery","math","architect","sketch"],"k":[26,7]},"exclamation":{"a":"Heavy Exclamation Mark Symbol","b":"2757","j":["heavy_exclamation_mark","danger","surprise","punctuation","wow","warning"],"k":[50,6],"n":["heavy_exclamation_mark"],"o":5},"bed":{"a":"Bed","b":"1F6CF-FE0F","c":"1F6CF","j":["sleep","rest"],"k":[37,4],"o":7},"female-farmer":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F33E","non_qualified":null,"image":"1f469-1f3fb-200d-1f33e.png","sheet_x":18,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F33E","non_qualified":null,"image":"1f469-1f3fc-200d-1f33e.png","sheet_x":18,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F33E","non_qualified":null,"image":"1f469-1f3fd-200d-1f33e.png","sheet_x":18,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F33E","non_qualified":null,"image":"1f469-1f3fe-200d-1f33e.png","sheet_x":18,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F33E","non_qualified":null,"image":"1f469-1f3ff-200d-1f33e.png","sheet_x":18,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Farmer","b":"1F469-200D-1F33E","k":[18,17]},"scissors":{"a":"Black Scissors","b":"2702-FE0F","c":"2702","j":["stationery","cut"],"k":[49,14],"o":1},"wavy_dash":{"a":"Wavy Dash","b":"3030-FE0F","c":"3030","j":["draw","line","moustache","mustache","squiggle","scribble"],"k":[50,24],"o":1},"flag-ke":{"a":"Kenya Flag","b":"1F1F0-1F1EA","k":[2,47]},"flag-kg":{"a":"Kyrgyzstan Flag","b":"1F1F0-1F1EC","k":[2,48]},"couch_and_lamp":{"a":"Couch and Lamp","b":"1F6CB-FE0F","c":"1F6CB","j":["read","chill"],"k":[36,47],"o":7},"male-cook":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F373","non_qualified":null,"image":"1f468-1f3fb-200d-1f373.png","sheet_x":16,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F373","non_qualified":null,"image":"1f468-1f3fc-200d-1f373.png","sheet_x":16,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F373","non_qualified":null,"image":"1f468-1f3fd-200d-1f373.png","sheet_x":16,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F373","non_qualified":null,"image":"1f468-1f3fe-200d-1f373.png","sheet_x":16,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F373","non_qualified":null,"image":"1f468-1f3ff-200d-1f373.png","sheet_x":16,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Cook","b":"1F468-200D-1F373","k":[16,8]},"card_file_box":{"a":"Card File Box","b":"1F5C3-FE0F","c":"1F5C3","j":["business","stationery"],"k":[30,5],"o":7},"copyright":{"a":"Copyright Sign","b":"00A9-FE0F","c":"00A9","j":["ip","license","circle","law","legal"],"k":[0,12],"o":1},"file_cabinet":{"a":"File Cabinet","b":"1F5C4-FE0F","c":"1F5C4","j":["filing","organizing"],"k":[30,6],"o":7},"registered":{"a":"Registered Sign","b":"00AE-FE0F","c":"00AE","j":["alphabet","circle"],"k":[0,13],"o":1},"flag-kh":{"a":"Cambodia Flag","b":"1F1F0-1F1ED","k":[2,49]},"female-cook":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F373","non_qualified":null,"image":"1f469-1f3fb-200d-1f373.png","sheet_x":18,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F373","non_qualified":null,"image":"1f469-1f3fc-200d-1f373.png","sheet_x":18,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F373","non_qualified":null,"image":"1f469-1f3fd-200d-1f373.png","sheet_x":18,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F373","non_qualified":null,"image":"1f469-1f3fe-200d-1f373.png","sheet_x":18,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F373","non_qualified":null,"image":"1f469-1f3ff-200d-1f373.png","sheet_x":18,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Cook","b":"1F469-200D-1F373","k":[18,23]},"toilet":{"a":"Toilet","b":"1F6BD","j":["restroom","wc","washroom","bathroom","potty"],"k":[36,33]},"wastebasket":{"a":"Wastebasket","b":"1F5D1-FE0F","c":"1F5D1","j":["bin","trash","rubbish","garbage","toss"],"k":[30,7],"o":7},"flag-ki":{"a":"Kiribati Flag","b":"1F1F0-1F1EE","k":[2,50]},"shower":{"a":"Shower","b":"1F6BF","j":["clean","water","bathroom"],"k":[36,35]},"male-mechanic":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F527","non_qualified":null,"image":"1f468-1f3fb-200d-1f527.png","sheet_x":17,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F527","non_qualified":null,"image":"1f468-1f3fc-200d-1f527.png","sheet_x":17,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F527","non_qualified":null,"image":"1f468-1f3fd-200d-1f527.png","sheet_x":17,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F527","non_qualified":null,"image":"1f468-1f3fe-200d-1f527.png","sheet_x":17,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F527","non_qualified":null,"image":"1f468-1f3ff-200d-1f527.png","sheet_x":17,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Mechanic","b":"1F468-200D-1F527","k":[17,19]},"tm":{"a":"Trade Mark Sign","b":"2122-FE0F","c":"2122","j":["trademark","brand","law","legal"],"k":[46,31],"o":1},"hash":{"a":"Hash Key","b":"0023-FE0F-20E3","c":"0023-20E3","j":["symbol","blue-square","twitter"],"k":[0,0],"o":3},"flag-km":{"a":"Comoros Flag","b":"1F1F0-1F1F2","k":[2,51]},"bathtub":{"a":"Bathtub","b":"1F6C1","j":["clean","shower","bathroom"],"k":[36,42]},"female-mechanic":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F527","non_qualified":null,"image":"1f469-1f3fb-200d-1f527.png","sheet_x":19,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F527","non_qualified":null,"image":"1f469-1f3fc-200d-1f527.png","sheet_x":19,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F527","non_qualified":null,"image":"1f469-1f3fd-200d-1f527.png","sheet_x":19,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F527","non_qualified":null,"image":"1f469-1f3fe-200d-1f527.png","sheet_x":19,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F527","non_qualified":null,"image":"1f469-1f3ff-200d-1f527.png","sheet_x":19,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Mechanic","b":"1F469-200D-1F527","k":[19,29]},"lock":{"a":"Lock","b":"1F512","j":["security","password","padlock"],"k":[27,20]},"male-factory-worker":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F3ED","non_qualified":null,"image":"1f468-1f3fb-200d-1f3ed.png","sheet_x":16,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F3ED","non_qualified":null,"image":"1f468-1f3fc-200d-1f3ed.png","sheet_x":16,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F3ED","non_qualified":null,"image":"1f468-1f3fd-200d-1f3ed.png","sheet_x":16,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F3ED","non_qualified":null,"image":"1f468-1f3fe-200d-1f3ed.png","sheet_x":16,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F3ED","non_qualified":null,"image":"1f468-1f3ff-200d-1f3ed.png","sheet_x":16,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Factory Worker","b":"1F468-200D-1F3ED","k":[16,38]},"flag-kn":{"a":"St. Kitts & Nevis Flag","b":"1F1F0-1F1F3","k":[3,0]},"hourglass":{"a":"Hourglass","b":"231B","j":["time","clock","oldschool","limit","exam","quiz","test"],"k":[46,42],"o":1},"keycap_star":{"a":"Keycap Star","b":"002A-FE0F-20E3","c":"002A-20E3","k":[0,1],"o":3},"unlock":{"a":"Open Lock","b":"1F513","j":["privacy","security"],"k":[27,21]},"flag-kp":{"a":"North Korea Flag","b":"1F1F0-1F1F5","k":[3,1]},"female-factory-worker":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F3ED","non_qualified":null,"image":"1f469-1f3fb-200d-1f3ed.png","sheet_x":19,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F3ED","non_qualified":null,"image":"1f469-1f3fc-200d-1f3ed.png","sheet_x":19,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F3ED","non_qualified":null,"image":"1f469-1f3fd-200d-1f3ed.png","sheet_x":19,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F3ED","non_qualified":null,"image":"1f469-1f3fe-200d-1f3ed.png","sheet_x":19,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F3ED","non_qualified":null,"image":"1f469-1f3ff-200d-1f3ed.png","sheet_x":19,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Factory Worker","b":"1F469-200D-1F3ED","k":[19,1]},"zero":{"a":"Keycap 0","b":"0030-FE0F-20E3","c":"0030-20E3","j":["0","numbers","blue-square","null"],"k":[0,2],"o":3},"lock_with_ink_pen":{"a":"Lock with Ink Pen","b":"1F50F","j":["security","secret"],"k":[27,17]},"hourglass_flowing_sand":{"a":"Hourglass with Flowing Sand","b":"23F3","j":["oldschool","time","countdown"],"k":[47,3]},"one":{"a":"Keycap 1","b":"0031-FE0F-20E3","c":"0031-20E3","j":["blue-square","numbers","1"],"k":[0,3],"o":3},"kr":{"a":"South Korea Flag","b":"1F1F0-1F1F7","j":["south","korea","nation","flag","country","banner"],"k":[3,2],"n":["flag-kr"]},"watch":{"a":"Watch","b":"231A","j":["time","accessories"],"k":[46,41],"o":1},"male-office-worker":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F4BC","non_qualified":null,"image":"1f468-1f3fb-200d-1f4bc.png","sheet_x":17,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F4BC","non_qualified":null,"image":"1f468-1f3fc-200d-1f4bc.png","sheet_x":17,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F4BC","non_qualified":null,"image":"1f468-1f3fd-200d-1f4bc.png","sheet_x":17,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F4BC","non_qualified":null,"image":"1f468-1f3fe-200d-1f4bc.png","sheet_x":17,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F4BC","non_qualified":null,"image":"1f468-1f3ff-200d-1f4bc.png","sheet_x":17,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Office Worker","b":"1F468-200D-1F4BC","k":[17,13]},"closed_lock_with_key":{"a":"Closed Lock with Key","b":"1F510","j":["security","privacy"],"k":[27,18]},"female-office-worker":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F4BC","non_qualified":null,"image":"1f469-1f3fb-200d-1f4bc.png","sheet_x":19,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F4BC","non_qualified":null,"image":"1f469-1f3fc-200d-1f4bc.png","sheet_x":19,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F4BC","non_qualified":null,"image":"1f469-1f3fd-200d-1f4bc.png","sheet_x":19,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F4BC","non_qualified":null,"image":"1f469-1f3fe-200d-1f4bc.png","sheet_x":19,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F4BC","non_qualified":null,"image":"1f469-1f3ff-200d-1f4bc.png","sheet_x":19,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Office Worker","b":"1F469-200D-1F4BC","k":[19,23]},"two":{"a":"Keycap 2","b":"0032-FE0F-20E3","c":"0032-20E3","j":["numbers","2","prime","blue-square"],"k":[0,4],"o":3},"alarm_clock":{"a":"Alarm Clock","b":"23F0","j":["time","wake"],"k":[47,0]},"key":{"a":"Key","b":"1F511","j":["lock","door","password"],"k":[27,19]},"flag-kw":{"a":"Kuwait Flag","b":"1F1F0-1F1FC","k":[3,3]},"stopwatch":{"a":"Stopwatch","b":"23F1-FE0F","c":"23F1","j":["time","deadline"],"k":[47,1]},"male-scientist":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F52C","non_qualified":null,"image":"1f468-1f3fb-200d-1f52c.png","sheet_x":17,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F52C","non_qualified":null,"image":"1f468-1f3fc-200d-1f52c.png","sheet_x":17,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F52C","non_qualified":null,"image":"1f468-1f3fd-200d-1f52c.png","sheet_x":17,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F52C","non_qualified":null,"image":"1f468-1f3fe-200d-1f52c.png","sheet_x":17,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F52C","non_qualified":null,"image":"1f468-1f3ff-200d-1f52c.png","sheet_x":17,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Scientist","b":"1F468-200D-1F52C","k":[17,25]},"three":{"a":"Keycap 3","b":"0033-FE0F-20E3","c":"0033-20E3","j":["3","numbers","prime","blue-square"],"k":[0,5],"o":3},"flag-ky":{"a":"Cayman Islands Flag","b":"1F1F0-1F1FE","k":[3,4]},"old_key":{"a":"Old Key","b":"1F5DD-FE0F","c":"1F5DD","j":["lock","door","password"],"k":[30,11],"o":7},"flag-kz":{"a":"Kazakhstan Flag","b":"1F1F0-1F1FF","k":[3,5]},"hammer":{"a":"Hammer","b":"1F528","j":["tools","build","create"],"k":[27,42]},"female-scientist":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F52C","non_qualified":null,"image":"1f469-1f3fb-200d-1f52c.png","sheet_x":19,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F52C","non_qualified":null,"image":"1f469-1f3fc-200d-1f52c.png","sheet_x":19,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F52C","non_qualified":null,"image":"1f469-1f3fd-200d-1f52c.png","sheet_x":19,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F52C","non_qualified":null,"image":"1f469-1f3fe-200d-1f52c.png","sheet_x":19,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F52C","non_qualified":null,"image":"1f469-1f3ff-200d-1f52c.png","sheet_x":19,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Scientist","b":"1F469-200D-1F52C","k":[19,35]},"timer_clock":{"a":"Timer Clock","b":"23F2-FE0F","c":"23F2","j":["alarm"],"k":[47,2]},"four":{"a":"Keycap 4","b":"0034-FE0F-20E3","c":"0034-20E3","j":["4","numbers","blue-square"],"k":[0,6],"o":3},"male-technologist":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F4BB","non_qualified":null,"image":"1f468-1f3fb-200d-1f4bb.png","sheet_x":17,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F4BB","non_qualified":null,"image":"1f468-1f3fc-200d-1f4bb.png","sheet_x":17,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F4BB","non_qualified":null,"image":"1f468-1f3fd-200d-1f4bb.png","sheet_x":17,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F4BB","non_qualified":null,"image":"1f468-1f3fe-200d-1f4bb.png","sheet_x":17,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F4BB","non_qualified":null,"image":"1f468-1f3ff-200d-1f4bb.png","sheet_x":17,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Technologist","b":"1F468-200D-1F4BB","k":[17,7]},"mantelpiece_clock":{"a":"Mantelpiece Clock","b":"1F570-FE0F","c":"1F570","j":["time"],"k":[28,43],"o":7},"five":{"a":"Keycap 5","b":"0035-FE0F-20E3","c":"0035-20E3","j":["5","numbers","blue-square","prime"],"k":[0,7],"o":3},"flag-la":{"a":"Laos Flag","b":"1F1F1-1F1E6","k":[3,6]},"pick":{"a":"Pick","b":"26CF-FE0F","c":"26CF","j":["tools","dig"],"k":[48,32],"o":5},"flag-lb":{"a":"Lebanon Flag","b":"1F1F1-1F1E7","k":[3,7]},"clock12":{"a":"Clock Face Twelve Oclock","b":"1F55B","j":["time","noon","midnight","midday","late","early","schedule"],"k":[28,29]},"hammer_and_pick":{"a":"Hammer and Pick","b":"2692-FE0F","c":"2692","j":["tools","build","create"],"k":[48,11],"o":4},"six":{"a":"Keycap 6","b":"0036-FE0F-20E3","c":"0036-20E3","j":["6","numbers","blue-square"],"k":[0,8],"o":3},"female-technologist":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F4BB","non_qualified":null,"image":"1f469-1f3fb-200d-1f4bb.png","sheet_x":19,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F4BB","non_qualified":null,"image":"1f469-1f3fc-200d-1f4bb.png","sheet_x":19,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F4BB","non_qualified":null,"image":"1f469-1f3fd-200d-1f4bb.png","sheet_x":19,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F4BB","non_qualified":null,"image":"1f469-1f3fe-200d-1f4bb.png","sheet_x":19,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F4BB","non_qualified":null,"image":"1f469-1f3ff-200d-1f4bb.png","sheet_x":19,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Technologist","b":"1F469-200D-1F4BB","k":[19,17]},"hammer_and_wrench":{"a":"Hammer and Wrench","b":"1F6E0-FE0F","c":"1F6E0","j":["tools","build","create"],"k":[37,8],"o":7},"flag-lc":{"a":"St. Lucia Flag","b":"1F1F1-1F1E8","k":[3,8]},"clock1230":{"a":"Clock Face Twelve-Thirty","b":"1F567","j":["time","late","early","schedule"],"k":[28,41]},"seven":{"a":"Keycap 7","b":"0037-FE0F-20E3","c":"0037-20E3","j":["7","numbers","blue-square","prime"],"k":[0,9],"o":3},"male-singer":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F3A4","non_qualified":null,"image":"1f468-1f3fb-200d-1f3a4.png","sheet_x":16,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F3A4","non_qualified":null,"image":"1f468-1f3fc-200d-1f3a4.png","sheet_x":16,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F3A4","non_qualified":null,"image":"1f468-1f3fd-200d-1f3a4.png","sheet_x":16,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F3A4","non_qualified":null,"image":"1f468-1f3fe-200d-1f3a4.png","sheet_x":16,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F3A4","non_qualified":null,"image":"1f468-1f3ff-200d-1f3a4.png","sheet_x":16,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Singer","b":"1F468-200D-1F3A4","k":[16,20]},"eight":{"a":"Keycap 8","b":"0038-FE0F-20E3","c":"0038-20E3","j":["8","blue-square","numbers"],"k":[0,10],"o":3},"flag-li":{"a":"Liechtenstein Flag","b":"1F1F1-1F1EE","k":[3,9]},"dagger_knife":{"a":"Dagger Knife","b":"1F5E1-FE0F","c":"1F5E1","k":[30,13],"o":7},"clock1":{"a":"Clock Face One Oclock","b":"1F550","j":["time","late","early","schedule"],"k":[28,18]},"female-singer":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F3A4","non_qualified":null,"image":"1f469-1f3fb-200d-1f3a4.png","sheet_x":18,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F3A4","non_qualified":null,"image":"1f469-1f3fc-200d-1f3a4.png","sheet_x":18,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F3A4","non_qualified":null,"image":"1f469-1f3fd-200d-1f3a4.png","sheet_x":18,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F3A4","non_qualified":null,"image":"1f469-1f3fe-200d-1f3a4.png","sheet_x":18,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F3A4","non_qualified":null,"image":"1f469-1f3ff-200d-1f3a4.png","sheet_x":18,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Singer","b":"1F469-200D-1F3A4","k":[18,35]},"male-artist":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F3A8","non_qualified":null,"image":"1f468-1f3fb-200d-1f3a8.png","sheet_x":16,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F3A8","non_qualified":null,"image":"1f468-1f3fc-200d-1f3a8.png","sheet_x":16,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F3A8","non_qualified":null,"image":"1f468-1f3fd-200d-1f3a8.png","sheet_x":16,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F3A8","non_qualified":null,"image":"1f468-1f3fe-200d-1f3a8.png","sheet_x":16,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F3A8","non_qualified":null,"image":"1f468-1f3ff-200d-1f3a8.png","sheet_x":16,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Artist","b":"1F468-200D-1F3A8","k":[16,26]},"crossed_swords":{"a":"Crossed Swords","b":"2694-FE0F","c":"2694","j":["weapon"],"k":[48,13],"o":4},"nine":{"a":"Keycap 9","b":"0039-FE0F-20E3","c":"0039-20E3","j":["blue-square","numbers","9"],"k":[0,11],"o":3},"flag-lk":{"a":"Sri Lanka Flag","b":"1F1F1-1F1F0","k":[3,10]},"clock130":{"a":"Clock Face One-Thirty","b":"1F55C","j":["time","late","early","schedule"],"k":[28,30]},"clock2":{"a":"Clock Face Two Oclock","b":"1F551","j":["time","late","early","schedule"],"k":[28,19]},"gun":{"a":"Pistol","b":"1F52B","j":["violence","weapon","pistol","revolver"],"k":[27,45]},"keycap_ten":{"a":"Keycap Ten","b":"1F51F","j":["numbers","10","blue-square"],"k":[27,33]},"female-artist":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F3A8","non_qualified":null,"image":"1f469-1f3fb-200d-1f3a8.png","sheet_x":18,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F3A8","non_qualified":null,"image":"1f469-1f3fc-200d-1f3a8.png","sheet_x":18,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F3A8","non_qualified":null,"image":"1f469-1f3fd-200d-1f3a8.png","sheet_x":18,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F3A8","non_qualified":null,"image":"1f469-1f3fe-200d-1f3a8.png","sheet_x":18,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F3A8","non_qualified":null,"image":"1f469-1f3ff-200d-1f3a8.png","sheet_x":18,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Artist","b":"1F469-200D-1F3A8","k":[18,41]},"flag-lr":{"a":"Liberia Flag","b":"1F1F1-1F1F7","k":[3,11]},"clock230":{"a":"Clock Face Two-Thirty","b":"1F55D","j":["time","late","early","schedule"],"k":[28,31]},"bow_and_arrow":{"a":"Bow and Arrow","b":"1F3F9","j":["sports"],"k":[12,23],"o":8},"male-pilot":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-2708-FE0F","non_qualified":"1F468-1F3FB-200D-2708","image":"1f468-1f3fb-200d-2708-fe0f.png","sheet_x":18,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-2708-FE0F","non_qualified":"1F468-1F3FC-200D-2708","image":"1f468-1f3fc-200d-2708-fe0f.png","sheet_x":18,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-2708-FE0F","non_qualified":"1F468-1F3FD-200D-2708","image":"1f468-1f3fd-200d-2708-fe0f.png","sheet_x":18,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-2708-FE0F","non_qualified":"1F468-1F3FE-200D-2708","image":"1f468-1f3fe-200d-2708-fe0f.png","sheet_x":18,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-2708-FE0F","non_qualified":"1F468-1F3FF-200D-2708","image":"1f468-1f3ff-200d-2708-fe0f.png","sheet_x":18,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Male Pilot","b":"1F468-200D-2708-FE0F","c":"1F468-200D-2708","k":[18,3]},"flag-ls":{"a":"Lesotho Flag","b":"1F1F1-1F1F8","k":[3,12]},"flag-lt":{"a":"Lithuania Flag","b":"1F1F1-1F1F9","k":[3,13]},"capital_abcd":{"a":"Input Symbol for Latin Capital Letters","b":"1F520","j":["alphabet","words","blue-square"],"k":[27,34]},"female-pilot":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-2708-FE0F","non_qualified":"1F469-1F3FB-200D-2708","image":"1f469-1f3fb-200d-2708-fe0f.png","sheet_x":20,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-2708-FE0F","non_qualified":"1F469-1F3FC-200D-2708","image":"1f469-1f3fc-200d-2708-fe0f.png","sheet_x":20,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-2708-FE0F","non_qualified":"1F469-1F3FD-200D-2708","image":"1f469-1f3fd-200d-2708-fe0f.png","sheet_x":20,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-2708-FE0F","non_qualified":"1F469-1F3FE-200D-2708","image":"1f469-1f3fe-200d-2708-fe0f.png","sheet_x":20,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-2708-FE0F","non_qualified":"1F469-1F3FF-200D-2708","image":"1f469-1f3ff-200d-2708-fe0f.png","sheet_x":20,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Female Pilot","b":"1F469-200D-2708-FE0F","c":"1F469-200D-2708","k":[20,13]},"clock3":{"a":"Clock Face Three Oclock","b":"1F552","j":["time","late","early","schedule"],"k":[28,20]},"shield":{"a":"Shield","b":"1F6E1-FE0F","c":"1F6E1","j":["protection","security"],"k":[37,9],"o":7},"male-astronaut":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F680","non_qualified":null,"image":"1f468-1f3fb-200d-1f680.png","sheet_x":17,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F680","non_qualified":null,"image":"1f468-1f3fc-200d-1f680.png","sheet_x":17,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F680","non_qualified":null,"image":"1f468-1f3fd-200d-1f680.png","sheet_x":17,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F680","non_qualified":null,"image":"1f468-1f3fe-200d-1f680.png","sheet_x":17,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F680","non_qualified":null,"image":"1f468-1f3ff-200d-1f680.png","sheet_x":17,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Astronaut","b":"1F468-200D-1F680","k":[17,31]},"abcd":{"a":"Input Symbol for Latin Small Letters","b":"1F521","j":["blue-square","alphabet"],"k":[27,35]},"clock330":{"a":"Clock Face Three-Thirty","b":"1F55E","j":["time","late","early","schedule"],"k":[28,32]},"flag-lu":{"a":"Luxembourg Flag","b":"1F1F1-1F1FA","k":[3,14]},"wrench":{"a":"Wrench","b":"1F527","j":["tools","diy","ikea","fix","maintainer"],"k":[27,41]},"nut_and_bolt":{"a":"Nut and Bolt","b":"1F529","j":["handy","tools","fix"],"k":[27,43]},"clock4":{"a":"Clock Face Four Oclock","b":"1F553","j":["time","late","early","schedule"],"k":[28,21]},"female-astronaut":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F680","non_qualified":null,"image":"1f469-1f3fb-200d-1f680.png","sheet_x":19,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F680","non_qualified":null,"image":"1f469-1f3fc-200d-1f680.png","sheet_x":19,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F680","non_qualified":null,"image":"1f469-1f3fd-200d-1f680.png","sheet_x":19,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F680","non_qualified":null,"image":"1f469-1f3fe-200d-1f680.png","sheet_x":19,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F680","non_qualified":null,"image":"1f469-1f3ff-200d-1f680.png","sheet_x":19,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Astronaut","b":"1F469-200D-1F680","k":[19,41]},"flag-lv":{"a":"Latvia Flag","b":"1F1F1-1F1FB","k":[3,15]},"gear":{"a":"Gear","b":"2699-FE0F","c":"2699","j":["cog"],"k":[48,17],"o":4},"male-firefighter":{"skin_variations":{"1F3FB":{"unified":"1F468-1F3FB-200D-1F692","non_qualified":null,"image":"1f468-1f3fb-200d-1f692.png","sheet_x":17,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F468-1F3FC-200D-1F692","non_qualified":null,"image":"1f468-1f3fc-200d-1f692.png","sheet_x":17,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F468-1F3FD-200D-1F692","non_qualified":null,"image":"1f468-1f3fd-200d-1f692.png","sheet_x":17,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F468-1F3FE-200D-1F692","non_qualified":null,"image":"1f468-1f3fe-200d-1f692.png","sheet_x":17,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F468-1F3FF-200D-1F692","non_qualified":null,"image":"1f468-1f3ff-200d-1f692.png","sheet_x":17,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Male Firefighter","b":"1F468-200D-1F692","k":[17,37]},"flag-ly":{"a":"Libya Flag","b":"1F1F1-1F1FE","k":[3,16]},"symbols":{"a":"Input Symbol for Symbols","b":"1F523","j":["blue-square","music","note","ampersand","percent","glyphs","characters"],"k":[27,37]},"clock430":{"a":"Clock Face Four-Thirty","b":"1F55F","j":["time","late","early","schedule"],"k":[28,33]},"flag-ma":{"a":"Morocco Flag","b":"1F1F2-1F1E6","k":[3,17]},"compression":{"a":"Compression","b":"1F5DC-FE0F","c":"1F5DC","k":[30,10],"o":7},"female-firefighter":{"skin_variations":{"1F3FB":{"unified":"1F469-1F3FB-200D-1F692","non_qualified":null,"image":"1f469-1f3fb-200d-1f692.png","sheet_x":19,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F469-1F3FC-200D-1F692","non_qualified":null,"image":"1f469-1f3fc-200d-1f692.png","sheet_x":19,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F469-1F3FD-200D-1F692","non_qualified":null,"image":"1f469-1f3fd-200d-1f692.png","sheet_x":19,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F469-1F3FE-200D-1F692","non_qualified":null,"image":"1f469-1f3fe-200d-1f692.png","sheet_x":19,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F469-1F3FF-200D-1F692","non_qualified":null,"image":"1f469-1f3ff-200d-1f692.png","sheet_x":20,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Female Firefighter","b":"1F469-200D-1F692","k":[19,47]},"abc":{"a":"Input Symbol for Latin Letters","b":"1F524","j":["blue-square","alphabet"],"k":[27,38]},"clock5":{"a":"Clock Face Five Oclock","b":"1F554","j":["time","late","early","schedule"],"k":[28,22]},"clock530":{"a":"Clock Face Five-Thirty","b":"1F560","j":["time","late","early","schedule"],"k":[28,34]},"a":{"a":"Negative Squared Latin Capital Letter a","b":"1F170-FE0F","c":"1F170","j":["red-square","alphabet","letter"],"k":[0,16]},"alembic":{"a":"Alembic","b":"2697-FE0F","c":"2697","j":["distilling","science","experiment","chemistry"],"k":[48,16],"o":4},"flag-mc":{"a":"Monaco Flag","b":"1F1F2-1F1E8","k":[3,18]},"cop":{"skin_variations":{"1F3FB":{"unified":"1F46E-1F3FB","non_qualified":null,"image":"1f46e-1f3fb.png","sheet_x":20,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F46E-1F3FC","non_qualified":null,"image":"1f46e-1f3fc.png","sheet_x":20,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F46E-1F3FD","non_qualified":null,"image":"1f46e-1f3fd.png","sheet_x":20,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F46E-1F3FE","non_qualified":null,"image":"1f46e-1f3fe.png","sheet_x":20,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F46E-1F3FF","non_qualified":null,"image":"1f46e-1f3ff.png","sheet_x":20,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F46E-200D-2642-FE0F","a":"Police Officer","b":"1F46E","k":[20,45]},"scales":{"a":"Scales","b":"2696-FE0F","c":"2696","k":[48,15],"o":4},"clock6":{"a":"Clock Face Six Oclock","b":"1F555","j":["time","late","early","schedule","dawn","dusk"],"k":[28,23]},"flag-md":{"a":"Moldova Flag","b":"1F1F2-1F1E9","k":[3,19]},"ab":{"a":"Negative Squared Ab","b":"1F18E","j":["red-square","alphabet"],"k":[0,20]},"male-police-officer":{"skin_variations":{"1F3FB":{"unified":"1F46E-1F3FB-200D-2642-FE0F","non_qualified":"1F46E-1F3FB-200D-2642","image":"1f46e-1f3fb-200d-2642-fe0f.png","sheet_x":20,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F46E-1F3FC-200D-2642-FE0F","non_qualified":"1F46E-1F3FC-200D-2642","image":"1f46e-1f3fc-200d-2642-fe0f.png","sheet_x":20,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F46E-1F3FD-200D-2642-FE0F","non_qualified":"1F46E-1F3FD-200D-2642","image":"1f46e-1f3fd-200d-2642-fe0f.png","sheet_x":20,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F46E-1F3FE-200D-2642-FE0F","non_qualified":"1F46E-1F3FE-200D-2642","image":"1f46e-1f3fe-200d-2642-fe0f.png","sheet_x":20,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F46E-1F3FF-200D-2642-FE0F","non_qualified":"1F46E-1F3FF-200D-2642","image":"1f46e-1f3ff-200d-2642-fe0f.png","sheet_x":20,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F46E","a":"Male Police Officer","b":"1F46E-200D-2642-FE0F","c":"1F46E-200D-2642","k":[20,39]},"link":{"a":"Link Symbol","b":"1F517","j":["rings","url"],"k":[27,25]},"flag-me":{"a":"Montenegro Flag","b":"1F1F2-1F1EA","k":[3,20]},"clock630":{"a":"Clock Face Six-Thirty","b":"1F561","j":["time","late","early","schedule"],"k":[28,35]},"b":{"a":"Negative Squared Latin Capital Letter B","b":"1F171-FE0F","c":"1F171","j":["red-square","alphabet","letter"],"k":[0,17]},"female-police-officer":{"skin_variations":{"1F3FB":{"unified":"1F46E-1F3FB-200D-2640-FE0F","non_qualified":"1F46E-1F3FB-200D-2640","image":"1f46e-1f3fb-200d-2640-fe0f.png","sheet_x":20,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F46E-1F3FC-200D-2640-FE0F","non_qualified":"1F46E-1F3FC-200D-2640","image":"1f46e-1f3fc-200d-2640-fe0f.png","sheet_x":20,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F46E-1F3FD-200D-2640-FE0F","non_qualified":"1F46E-1F3FD-200D-2640","image":"1f46e-1f3fd-200d-2640-fe0f.png","sheet_x":20,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F46E-1F3FE-200D-2640-FE0F","non_qualified":"1F46E-1F3FE-200D-2640","image":"1f46e-1f3fe-200d-2640-fe0f.png","sheet_x":20,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F46E-1F3FF-200D-2640-FE0F","non_qualified":"1F46E-1F3FF-200D-2640","image":"1f46e-1f3ff-200d-2640-fe0f.png","sheet_x":20,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Female Police Officer","b":"1F46E-200D-2640-FE0F","c":"1F46E-200D-2640","k":[20,33]},"clock7":{"a":"Clock Face Seven Oclock","b":"1F556","j":["time","late","early","schedule"],"k":[28,24]},"cl":{"a":"Squared Cl","b":"1F191","j":["alphabet","words","red-square"],"k":[0,21]},"sleuth_or_spy":{"skin_variations":{"1F3FB":{"unified":"1F575-1F3FB","non_qualified":null,"image":"1f575-1f3fb.png","sheet_x":29,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F575-1F3FC","non_qualified":null,"image":"1f575-1f3fc.png","sheet_x":29,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F575-1F3FD","non_qualified":null,"image":"1f575-1f3fd.png","sheet_x":29,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F575-1F3FE","non_qualified":null,"image":"1f575-1f3fe.png","sheet_x":29,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F575-1F3FF","non_qualified":null,"image":"1f575-1f3ff.png","sheet_x":29,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoleted_by":"1F575-FE0F-200D-2642-FE0F","a":"Sleuth or Spy","b":"1F575-FE0F","c":"1F575","k":[29,11],"o":7},"chains":{"a":"Chains","b":"26D3-FE0F","c":"26D3","j":["lock","arrest"],"k":[48,34],"o":5},"syringe":{"a":"Syringe","b":"1F489","j":["health","hospital","drugs","blood","medicine","needle","doctor","nurse"],"k":[24,35]},"male-detective":{"skin_variations":{"1F3FB":{"unified":"1F575-1F3FB-200D-2642-FE0F","non_qualified":"1F575-1F3FB-200D-2642","image":"1f575-1f3fb-200d-2642-fe0f.png","sheet_x":29,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F575-1F3FC-200D-2642-FE0F","non_qualified":"1F575-1F3FC-200D-2642","image":"1f575-1f3fc-200d-2642-fe0f.png","sheet_x":29,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F575-1F3FD-200D-2642-FE0F","non_qualified":"1F575-1F3FD-200D-2642","image":"1f575-1f3fd-200d-2642-fe0f.png","sheet_x":29,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F575-1F3FE-200D-2642-FE0F","non_qualified":"1F575-1F3FE-200D-2642","image":"1f575-1f3fe-200d-2642-fe0f.png","sheet_x":29,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F575-1F3FF-200D-2642-FE0F","non_qualified":"1F575-1F3FF-200D-2642","image":"1f575-1f3ff-200d-2642-fe0f.png","sheet_x":29,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F575-FE0F","a":"Male Detective","b":"1F575-FE0F-200D-2642-FE0F","k":[29,5],"o":7},"cool":{"a":"Squared Cool","b":"1F192","j":["words","blue-square"],"k":[0,22]},"clock730":{"a":"Clock Face Seven-Thirty","b":"1F562","j":["time","late","early","schedule"],"k":[28,36]},"flag-mg":{"a":"Madagascar Flag","b":"1F1F2-1F1EC","k":[3,22]},"free":{"a":"Squared Free","b":"1F193","j":["blue-square","words"],"k":[0,23]},"flag-mh":{"a":"Marshall Islands Flag","b":"1F1F2-1F1ED","k":[3,23]},"clock8":{"a":"Clock Face Eight Oclock","b":"1F557","j":["time","late","early","schedule"],"k":[28,25]},"pill":{"a":"Pill","b":"1F48A","j":["health","medicine","doctor","pharmacy","drug"],"k":[24,36]},"female-detective":{"skin_variations":{"1F3FB":{"unified":"1F575-1F3FB-200D-2640-FE0F","non_qualified":"1F575-1F3FB-200D-2640","image":"1f575-1f3fb-200d-2640-fe0f.png","sheet_x":29,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F575-1F3FC-200D-2640-FE0F","non_qualified":"1F575-1F3FC-200D-2640","image":"1f575-1f3fc-200d-2640-fe0f.png","sheet_x":29,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F575-1F3FD-200D-2640-FE0F","non_qualified":"1F575-1F3FD-200D-2640","image":"1f575-1f3fd-200d-2640-fe0f.png","sheet_x":29,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F575-1F3FE-200D-2640-FE0F","non_qualified":"1F575-1F3FE-200D-2640","image":"1f575-1f3fe-200d-2640-fe0f.png","sheet_x":29,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F575-1F3FF-200D-2640-FE0F","non_qualified":"1F575-1F3FF-200D-2640","image":"1f575-1f3ff-200d-2640-fe0f.png","sheet_x":29,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Female Detective","b":"1F575-FE0F-200D-2640-FE0F","k":[28,51],"o":7},"clock830":{"a":"Clock Face Eight-Thirty","b":"1F563","j":["time","late","early","schedule"],"k":[28,37]},"guardsman":{"skin_variations":{"1F3FB":{"unified":"1F482-1F3FB","non_qualified":null,"image":"1f482-1f3fb.png","sheet_x":23,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F482-1F3FC","non_qualified":null,"image":"1f482-1f3fc.png","sheet_x":23,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F482-1F3FD","non_qualified":null,"image":"1f482-1f3fd.png","sheet_x":23,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F482-1F3FE","non_qualified":null,"image":"1f482-1f3fe.png","sheet_x":23,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F482-1F3FF","non_qualified":null,"image":"1f482-1f3ff.png","sheet_x":23,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F482-200D-2642-FE0F","a":"Guardsman","b":"1F482","j":["uk","gb","british","male","guy","royal"],"k":[23,31]},"information_source":{"a":"Information Source","b":"2139-FE0F","c":"2139","j":["blue-square","alphabet","letter"],"k":[46,32],"o":3},"flag-mk":{"a":"Macedonia Flag","b":"1F1F2-1F1F0","k":[3,24]},"smoking":{"a":"Smoking Symbol","b":"1F6AC","j":["kills","tobacco","cigarette","joint","smoke"],"k":[35,17]},"id":{"a":"Squared Id","b":"1F194","j":["purple-square","words"],"k":[0,24]},"clock9":{"a":"Clock Face Nine Oclock","b":"1F558","j":["time","late","early","schedule"],"k":[28,26]},"flag-ml":{"a":"Mali Flag","b":"1F1F2-1F1F1","k":[3,25]},"coffin":{"a":"Coffin","b":"26B0-FE0F","c":"26B0","j":["vampire","dead","die","death","rip","graveyard","cemetery","casket","funeral","box"],"k":[48,24],"o":4},"male-guard":{"skin_variations":{"1F3FB":{"unified":"1F482-1F3FB-200D-2642-FE0F","non_qualified":"1F482-1F3FB-200D-2642","image":"1f482-1f3fb-200d-2642-fe0f.png","sheet_x":23,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F482-1F3FC-200D-2642-FE0F","non_qualified":"1F482-1F3FC-200D-2642","image":"1f482-1f3fc-200d-2642-fe0f.png","sheet_x":23,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F482-1F3FD-200D-2642-FE0F","non_qualified":"1F482-1F3FD-200D-2642","image":"1f482-1f3fd-200d-2642-fe0f.png","sheet_x":23,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F482-1F3FE-200D-2642-FE0F","non_qualified":"1F482-1F3FE-200D-2642","image":"1f482-1f3fe-200d-2642-fe0f.png","sheet_x":23,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F482-1F3FF-200D-2642-FE0F","non_qualified":"1F482-1F3FF-200D-2642","image":"1f482-1f3ff-200d-2642-fe0f.png","sheet_x":23,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F482","a":"Male Guard","b":"1F482-200D-2642-FE0F","c":"1F482-200D-2642","k":[23,25]},"m":{"a":"Circled Latin Capital Letter M","b":"24C2-FE0F","c":"24C2","j":["alphabet","blue-circle","letter"],"k":[47,7],"o":1},"funeral_urn":{"a":"Funeral Urn","b":"26B1-FE0F","c":"26B1","j":["dead","die","death","rip","ashes"],"k":[48,25],"o":4},"female-guard":{"skin_variations":{"1F3FB":{"unified":"1F482-1F3FB-200D-2640-FE0F","non_qualified":"1F482-1F3FB-200D-2640","image":"1f482-1f3fb-200d-2640-fe0f.png","sheet_x":23,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F482-1F3FC-200D-2640-FE0F","non_qualified":"1F482-1F3FC-200D-2640","image":"1f482-1f3fc-200d-2640-fe0f.png","sheet_x":23,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F482-1F3FD-200D-2640-FE0F","non_qualified":"1F482-1F3FD-200D-2640","image":"1f482-1f3fd-200d-2640-fe0f.png","sheet_x":23,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F482-1F3FE-200D-2640-FE0F","non_qualified":"1F482-1F3FE-200D-2640","image":"1f482-1f3fe-200d-2640-fe0f.png","sheet_x":23,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F482-1F3FF-200D-2640-FE0F","non_qualified":"1F482-1F3FF-200D-2640","image":"1f482-1f3ff-200d-2640-fe0f.png","sheet_x":23,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Female Guard","b":"1F482-200D-2640-FE0F","c":"1F482-200D-2640","k":[23,19]},"flag-mm":{"a":"Myanmar (burma) Flag","b":"1F1F2-1F1F2","k":[3,26]},"clock930":{"a":"Clock Face Nine-Thirty","b":"1F564","j":["time","late","early","schedule"],"k":[28,38]},"moyai":{"a":"Moyai","b":"1F5FF","j":["rock","easter island","moai"],"k":[30,23]},"new":{"a":"Squared New","b":"1F195","j":["blue-square","words","start"],"k":[0,25]},"flag-mn":{"a":"Mongolia Flag","b":"1F1F2-1F1F3","k":[3,27]},"construction_worker":{"skin_variations":{"1F3FB":{"unified":"1F477-1F3FB","non_qualified":null,"image":"1f477-1f3fb.png","sheet_x":22,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F477-1F3FC","non_qualified":null,"image":"1f477-1f3fc.png","sheet_x":22,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F477-1F3FD","non_qualified":null,"image":"1f477-1f3fd.png","sheet_x":22,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F477-1F3FE","non_qualified":null,"image":"1f477-1f3fe.png","sheet_x":22,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F477-1F3FF","non_qualified":null,"image":"1f477-1f3ff.png","sheet_x":22,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F477-200D-2642-FE0F","a":"Construction Worker","b":"1F477","k":[22,28]},"clock10":{"a":"Clock Face Ten Oclock","b":"1F559","j":["time","late","early","schedule"],"k":[28,27]},"clock1030":{"a":"Clock Face Ten-Thirty","b":"1F565","j":["time","late","early","schedule"],"k":[28,39]},"ng":{"a":"Squared Ng","b":"1F196","j":["blue-square","words","shape","icon"],"k":[0,26]},"male-construction-worker":{"skin_variations":{"1F3FB":{"unified":"1F477-1F3FB-200D-2642-FE0F","non_qualified":"1F477-1F3FB-200D-2642","image":"1f477-1f3fb-200d-2642-fe0f.png","sheet_x":22,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F477-1F3FC-200D-2642-FE0F","non_qualified":"1F477-1F3FC-200D-2642","image":"1f477-1f3fc-200d-2642-fe0f.png","sheet_x":22,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F477-1F3FD-200D-2642-FE0F","non_qualified":"1F477-1F3FD-200D-2642","image":"1f477-1f3fd-200d-2642-fe0f.png","sheet_x":22,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F477-1F3FE-200D-2642-FE0F","non_qualified":"1F477-1F3FE-200D-2642","image":"1f477-1f3fe-200d-2642-fe0f.png","sheet_x":22,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F477-1F3FF-200D-2642-FE0F","non_qualified":"1F477-1F3FF-200D-2642","image":"1f477-1f3ff-200d-2642-fe0f.png","sheet_x":22,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F477","a":"Male Construction Worker","b":"1F477-200D-2642-FE0F","c":"1F477-200D-2642","k":[22,22]},"flag-mo":{"a":"Macau Sar China Flag","b":"1F1F2-1F1F4","k":[3,28]},"oil_drum":{"a":"Oil Drum","b":"1F6E2-FE0F","c":"1F6E2","j":["barrell"],"k":[37,10],"o":7},"o2":{"a":"Negative Squared Latin Capital Letter O","b":"1F17E-FE0F","c":"1F17E","j":["alphabet","red-square","letter"],"k":[0,18]},"female-construction-worker":{"skin_variations":{"1F3FB":{"unified":"1F477-1F3FB-200D-2640-FE0F","non_qualified":"1F477-1F3FB-200D-2640","image":"1f477-1f3fb-200d-2640-fe0f.png","sheet_x":22,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F477-1F3FC-200D-2640-FE0F","non_qualified":"1F477-1F3FC-200D-2640","image":"1f477-1f3fc-200d-2640-fe0f.png","sheet_x":22,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F477-1F3FD-200D-2640-FE0F","non_qualified":"1F477-1F3FD-200D-2640","image":"1f477-1f3fd-200d-2640-fe0f.png","sheet_x":22,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F477-1F3FE-200D-2640-FE0F","non_qualified":"1F477-1F3FE-200D-2640","image":"1f477-1f3fe-200d-2640-fe0f.png","sheet_x":22,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F477-1F3FF-200D-2640-FE0F","non_qualified":"1F477-1F3FF-200D-2640","image":"1f477-1f3ff-200d-2640-fe0f.png","sheet_x":22,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Female Construction Worker","b":"1F477-200D-2640-FE0F","c":"1F477-200D-2640","k":[22,16]},"clock11":{"a":"Clock Face Eleven Oclock","b":"1F55A","j":["time","late","early","schedule"],"k":[28,28]},"crystal_ball":{"a":"Crystal Ball","b":"1F52E","j":["disco","party","magic","circus","fortune_teller"],"k":[27,48]},"flag-mp":{"a":"Northern Mariana Islands Flag","b":"1F1F2-1F1F5","k":[3,29]},"prince":{"skin_variations":{"1F3FB":{"unified":"1F934-1F3FB","non_qualified":null,"image":"1f934-1f3fb.png","sheet_x":39,"sheet_y":29,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F934-1F3FC","non_qualified":null,"image":"1f934-1f3fc.png","sheet_x":39,"sheet_y":30,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F934-1F3FD","non_qualified":null,"image":"1f934-1f3fd.png","sheet_x":39,"sheet_y":31,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F934-1F3FE","non_qualified":null,"image":"1f934-1f3fe.png","sheet_x":39,"sheet_y":32,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F934-1F3FF","non_qualified":null,"image":"1f934-1f3ff.png","sheet_x":39,"sheet_y":33,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Prince","b":"1F934","j":["boy","man","male","crown","royal","king"],"k":[39,28],"o":9},"ok":{"a":"Squared Ok","b":"1F197","j":["good","agree","yes","blue-square"],"k":[0,27]},"clock1130":{"a":"Clock Face Eleven-Thirty","b":"1F566","j":["time","late","early","schedule"],"k":[28,40]},"shopping_trolley":{"a":"Shopping Trolley","b":"1F6D2","k":[37,7],"o":9},"flag-mr":{"a":"Mauritania Flag","b":"1F1F2-1F1F7","k":[3,31]},"princess":{"skin_variations":{"1F3FB":{"unified":"1F478-1F3FB","non_qualified":null,"image":"1f478-1f3fb.png","sheet_x":22,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F478-1F3FC","non_qualified":null,"image":"1f478-1f3fc.png","sheet_x":22,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F478-1F3FD","non_qualified":null,"image":"1f478-1f3fd.png","sheet_x":22,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F478-1F3FE","non_qualified":null,"image":"1f478-1f3fe.png","sheet_x":22,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F478-1F3FF","non_qualified":null,"image":"1f478-1f3ff.png","sheet_x":22,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Princess","b":"1F478","j":["girl","woman","female","blond","crown","royal","queen"],"k":[22,34]},"new_moon":{"a":"New Moon Symbol","b":"1F311","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,9]},"parking":{"a":"Negative Squared Latin Capital Letter P","b":"1F17F-FE0F","c":"1F17F","j":["cars","blue-square","alphabet","letter"],"k":[0,19],"o":5},"sos":{"a":"Squared Sos","b":"1F198","j":["help","red-square","words","emergency","911"],"k":[0,28]},"man_with_turban":{"skin_variations":{"1F3FB":{"unified":"1F473-1F3FB","non_qualified":null,"image":"1f473-1f3fb.png","sheet_x":21,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F473-1F3FC","non_qualified":null,"image":"1f473-1f3fc.png","sheet_x":21,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F473-1F3FD","non_qualified":null,"image":"1f473-1f3fd.png","sheet_x":21,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F473-1F3FE","non_qualified":null,"image":"1f473-1f3fe.png","sheet_x":21,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F473-1F3FF","non_qualified":null,"image":"1f473-1f3ff.png","sheet_x":21,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F473-200D-2642-FE0F","a":"Man with Turban","b":"1F473","j":["male","indian","hinduism","arabs"],"k":[21,44]},"flag-ms":{"a":"Montserrat Flag","b":"1F1F2-1F1F8","k":[3,32]},"waxing_crescent_moon":{"a":"Waxing Crescent Moon Symbol","b":"1F312","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,10]},"up":{"a":"Squared Up with Exclamation Mark","b":"1F199","j":["blue-square","above","high"],"k":[0,29]},"first_quarter_moon":{"a":"First Quarter Moon Symbol","b":"1F313","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,11]},"flag-mt":{"a":"Malta Flag","b":"1F1F2-1F1F9","k":[3,33]},"man-wearing-turban":{"skin_variations":{"1F3FB":{"unified":"1F473-1F3FB-200D-2642-FE0F","non_qualified":"1F473-1F3FB-200D-2642","image":"1f473-1f3fb-200d-2642-fe0f.png","sheet_x":21,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F473-1F3FC-200D-2642-FE0F","non_qualified":"1F473-1F3FC-200D-2642","image":"1f473-1f3fc-200d-2642-fe0f.png","sheet_x":21,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F473-1F3FD-200D-2642-FE0F","non_qualified":"1F473-1F3FD-200D-2642","image":"1f473-1f3fd-200d-2642-fe0f.png","sheet_x":21,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F473-1F3FE-200D-2642-FE0F","non_qualified":"1F473-1F3FE-200D-2642","image":"1f473-1f3fe-200d-2642-fe0f.png","sheet_x":21,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F473-1F3FF-200D-2642-FE0F","non_qualified":"1F473-1F3FF-200D-2642","image":"1f473-1f3ff-200d-2642-fe0f.png","sheet_x":21,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F473","a":"Man Wearing Turban","b":"1F473-200D-2642-FE0F","c":"1F473-200D-2642","k":[21,38]},"moon":{"a":"Waxing Gibbous Moon Symbol","b":"1F314","k":[6,12],"n":["waxing_gibbous_moon"]},"woman-wearing-turban":{"skin_variations":{"1F3FB":{"unified":"1F473-1F3FB-200D-2640-FE0F","non_qualified":"1F473-1F3FB-200D-2640","image":"1f473-1f3fb-200d-2640-fe0f.png","sheet_x":21,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F473-1F3FC-200D-2640-FE0F","non_qualified":"1F473-1F3FC-200D-2640","image":"1f473-1f3fc-200d-2640-fe0f.png","sheet_x":21,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F473-1F3FD-200D-2640-FE0F","non_qualified":"1F473-1F3FD-200D-2640","image":"1f473-1f3fd-200d-2640-fe0f.png","sheet_x":21,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F473-1F3FE-200D-2640-FE0F","non_qualified":"1F473-1F3FE-200D-2640","image":"1f473-1f3fe-200d-2640-fe0f.png","sheet_x":21,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F473-1F3FF-200D-2640-FE0F","non_qualified":"1F473-1F3FF-200D-2640","image":"1f473-1f3ff-200d-2640-fe0f.png","sheet_x":21,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Wearing Turban","b":"1F473-200D-2640-FE0F","c":"1F473-200D-2640","k":[21,32]},"vs":{"a":"Squared Vs","b":"1F19A","j":["words","orange-square"],"k":[0,30]},"flag-mu":{"a":"Mauritius Flag","b":"1F1F2-1F1FA","k":[3,34]},"man_with_gua_pi_mao":{"skin_variations":{"1F3FB":{"unified":"1F472-1F3FB","non_qualified":null,"image":"1f472-1f3fb.png","sheet_x":21,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F472-1F3FC","non_qualified":null,"image":"1f472-1f3fc.png","sheet_x":21,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F472-1F3FD","non_qualified":null,"image":"1f472-1f3fd.png","sheet_x":21,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F472-1F3FE","non_qualified":null,"image":"1f472-1f3fe.png","sheet_x":21,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F472-1F3FF","non_qualified":null,"image":"1f472-1f3ff.png","sheet_x":21,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Man with Gua Pi Mao","b":"1F472","j":["male","boy","chinese"],"k":[21,26]},"koko":{"a":"Squared Katakana Koko","b":"1F201","j":["blue-square","here","katakana","japanese","destination"],"k":[5,29]},"full_moon":{"a":"Full Moon Symbol","b":"1F315","j":["nature","yellow","twilight","planet","space","night","evening","sleep"],"k":[6,13]},"flag-mv":{"a":"Maldives Flag","b":"1F1F2-1F1FB","k":[3,35]},"person_with_headscarf":{"skin_variations":{"1F3FB":{"unified":"1F9D5-1F3FB","non_qualified":null,"image":"1f9d5-1f3fb.png","sheet_x":43,"sheet_y":23,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F9D5-1F3FC","non_qualified":null,"image":"1f9d5-1f3fc.png","sheet_x":43,"sheet_y":24,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F9D5-1F3FD","non_qualified":null,"image":"1f9d5-1f3fd.png","sheet_x":43,"sheet_y":25,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F9D5-1F3FE","non_qualified":null,"image":"1f9d5-1f3fe.png","sheet_x":43,"sheet_y":26,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F9D5-1F3FF","non_qualified":null,"image":"1f9d5-1f3ff.png","sheet_x":43,"sheet_y":27,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Person with Headscarf","b":"1F9D5","k":[43,22],"o":10},"waning_gibbous_moon":{"a":"Waning Gibbous Moon Symbol","b":"1F316","j":["nature","twilight","planet","space","night","evening","sleep","waxing_gibbous_moon"],"k":[6,14]},"sa":{"a":"Squared Katakana Sa","b":"1F202-FE0F","c":"1F202","j":["japanese","blue-square","katakana"],"k":[5,30]},"flag-mw":{"a":"Malawi Flag","b":"1F1F2-1F1FC","k":[3,36]},"last_quarter_moon":{"a":"Last Quarter Moon Symbol","b":"1F317","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,15]},"u6708":{"a":"Squared Cjk Unified Ideograph-6708","b":"1F237-FE0F","c":"1F237","j":["chinese","month","moon","japanese","orange-square","kanji"],"k":[5,38]},"bearded_person":{"skin_variations":{"1F3FB":{"unified":"1F9D4-1F3FB","non_qualified":null,"image":"1f9d4-1f3fb.png","sheet_x":43,"sheet_y":17,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F9D4-1F3FC","non_qualified":null,"image":"1f9d4-1f3fc.png","sheet_x":43,"sheet_y":18,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F9D4-1F3FD","non_qualified":null,"image":"1f9d4-1f3fd.png","sheet_x":43,"sheet_y":19,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F9D4-1F3FE","non_qualified":null,"image":"1f9d4-1f3fe.png","sheet_x":43,"sheet_y":20,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F9D4-1F3FF","non_qualified":null,"image":"1f9d4-1f3ff.png","sheet_x":43,"sheet_y":21,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Bearded Person","b":"1F9D4","k":[43,16],"o":10},"flag-mx":{"a":"Mexico Flag","b":"1F1F2-1F1FD","k":[3,37]},"u6709":{"a":"Squared Cjk Unified Ideograph-6709","b":"1F236","j":["orange-square","chinese","have","kanji"],"k":[5,37]},"person_with_blond_hair":{"skin_variations":{"1F3FB":{"unified":"1F471-1F3FB","non_qualified":null,"image":"1f471-1f3fb.png","sheet_x":21,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F471-1F3FC","non_qualified":null,"image":"1f471-1f3fc.png","sheet_x":21,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F471-1F3FD","non_qualified":null,"image":"1f471-1f3fd.png","sheet_x":21,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F471-1F3FE","non_qualified":null,"image":"1f471-1f3fe.png","sheet_x":21,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F471-1F3FF","non_qualified":null,"image":"1f471-1f3ff.png","sheet_x":21,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F471-200D-2642-FE0F","a":"Person with Blond Hair","b":"1F471","k":[21,20]},"waning_crescent_moon":{"a":"Waning Crescent Moon Symbol","b":"1F318","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,16]},"flag-my":{"a":"Malaysia Flag","b":"1F1F2-1F1FE","k":[3,38]},"u6307":{"a":"Squared Cjk Unified Ideograph-6307","b":"1F22F","j":["chinese","point","green-square","kanji"],"k":[5,32],"o":5},"blond-haired-man":{"skin_variations":{"1F3FB":{"unified":"1F471-1F3FB-200D-2642-FE0F","non_qualified":"1F471-1F3FB-200D-2642","image":"1f471-1f3fb-200d-2642-fe0f.png","sheet_x":21,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F471-1F3FC-200D-2642-FE0F","non_qualified":"1F471-1F3FC-200D-2642","image":"1f471-1f3fc-200d-2642-fe0f.png","sheet_x":21,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F471-1F3FD-200D-2642-FE0F","non_qualified":"1F471-1F3FD-200D-2642","image":"1f471-1f3fd-200d-2642-fe0f.png","sheet_x":21,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F471-1F3FE-200D-2642-FE0F","non_qualified":"1F471-1F3FE-200D-2642","image":"1f471-1f3fe-200d-2642-fe0f.png","sheet_x":21,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F471-1F3FF-200D-2642-FE0F","non_qualified":"1F471-1F3FF-200D-2642","image":"1f471-1f3ff-200d-2642-fe0f.png","sheet_x":21,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F471","a":"Blond Haired Man","b":"1F471-200D-2642-FE0F","c":"1F471-200D-2642","k":[21,14]},"crescent_moon":{"a":"Crescent Moon","b":"1F319","j":["night","sleep","sky","evening","magic"],"k":[6,17]},"flag-mz":{"a":"Mozambique Flag","b":"1F1F2-1F1FF","k":[3,39]},"new_moon_with_face":{"a":"New Moon with Face","b":"1F31A","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,18]},"flag-na":{"a":"Namibia Flag","b":"1F1F3-1F1E6","k":[3,40]},"blond-haired-woman":{"skin_variations":{"1F3FB":{"unified":"1F471-1F3FB-200D-2640-FE0F","non_qualified":"1F471-1F3FB-200D-2640","image":"1f471-1f3fb-200d-2640-fe0f.png","sheet_x":21,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F471-1F3FC-200D-2640-FE0F","non_qualified":"1F471-1F3FC-200D-2640","image":"1f471-1f3fc-200d-2640-fe0f.png","sheet_x":21,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F471-1F3FD-200D-2640-FE0F","non_qualified":"1F471-1F3FD-200D-2640","image":"1f471-1f3fd-200d-2640-fe0f.png","sheet_x":21,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F471-1F3FE-200D-2640-FE0F","non_qualified":"1F471-1F3FE-200D-2640","image":"1f471-1f3fe-200d-2640-fe0f.png","sheet_x":21,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F471-1F3FF-200D-2640-FE0F","non_qualified":"1F471-1F3FF-200D-2640","image":"1f471-1f3ff-200d-2640-fe0f.png","sheet_x":21,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Blond Haired Woman","b":"1F471-200D-2640-FE0F","c":"1F471-200D-2640","k":[21,8]},"ideograph_advantage":{"a":"Circled Ideograph Advantage","b":"1F250","j":["chinese","kanji","obtain","get","circle"],"k":[5,42]},"first_quarter_moon_with_face":{"a":"First Quarter Moon with Face","b":"1F31B","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,19]},"man_in_tuxedo":{"skin_variations":{"1F3FB":{"unified":"1F935-1F3FB","non_qualified":null,"image":"1f935-1f3fb.png","sheet_x":39,"sheet_y":35,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F935-1F3FC","non_qualified":null,"image":"1f935-1f3fc.png","sheet_x":39,"sheet_y":36,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F935-1F3FD","non_qualified":null,"image":"1f935-1f3fd.png","sheet_x":39,"sheet_y":37,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F935-1F3FE","non_qualified":null,"image":"1f935-1f3fe.png","sheet_x":39,"sheet_y":38,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F935-1F3FF","non_qualified":null,"image":"1f935-1f3ff.png","sheet_x":39,"sheet_y":39,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Man in Tuxedo","b":"1F935","j":["couple","marriage","wedding","groom"],"k":[39,34],"o":9},"u5272":{"a":"Squared Cjk Unified Ideograph-5272","b":"1F239","j":["cut","divide","chinese","kanji","pink-square"],"k":[5,40]},"flag-ne":{"a":"Niger Flag","b":"1F1F3-1F1EA","k":[3,42]},"last_quarter_moon_with_face":{"a":"Last Quarter Moon with Face","b":"1F31C","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,20]},"u7121":{"a":"Squared Cjk Unified Ideograph-7121","b":"1F21A","j":["nothing","chinese","kanji","japanese","orange-square"],"k":[5,31],"o":5},"bride_with_veil":{"skin_variations":{"1F3FB":{"unified":"1F470-1F3FB","non_qualified":null,"image":"1f470-1f3fb.png","sheet_x":21,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F470-1F3FC","non_qualified":null,"image":"1f470-1f3fc.png","sheet_x":21,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F470-1F3FD","non_qualified":null,"image":"1f470-1f3fd.png","sheet_x":21,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F470-1F3FE","non_qualified":null,"image":"1f470-1f3fe.png","sheet_x":21,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F470-1F3FF","non_qualified":null,"image":"1f470-1f3ff.png","sheet_x":21,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Bride with Veil","b":"1F470","j":["couple","marriage","wedding","woman","bride"],"k":[21,2]},"u7981":{"a":"Squared Cjk Unified Ideograph-7981","b":"1F232","j":["kanji","japanese","chinese","forbidden","limit","restricted","red-square"],"k":[5,33]},"pregnant_woman":{"skin_variations":{"1F3FB":{"unified":"1F930-1F3FB","non_qualified":null,"image":"1f930-1f3fb.png","sheet_x":39,"sheet_y":5,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F930-1F3FC","non_qualified":null,"image":"1f930-1f3fc.png","sheet_x":39,"sheet_y":6,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F930-1F3FD","non_qualified":null,"image":"1f930-1f3fd.png","sheet_x":39,"sheet_y":7,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F930-1F3FE","non_qualified":null,"image":"1f930-1f3fe.png","sheet_x":39,"sheet_y":8,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F930-1F3FF","non_qualified":null,"image":"1f930-1f3ff.png","sheet_x":39,"sheet_y":9,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Pregnant Woman","b":"1F930","j":["baby"],"k":[39,4],"o":9},"thermometer":{"a":"Thermometer","b":"1F321-FE0F","c":"1F321","j":["weather","temperature","hot","cold"],"k":[6,25],"o":7},"flag-nf":{"a":"Norfolk Island Flag","b":"1F1F3-1F1EB","k":[3,43]},"sunny":{"a":"Black Sun with Rays","b":"2600-FE0F","c":"2600","j":["weather","nature","brightness","summer","beach","spring"],"k":[47,16],"o":1},"accept":{"a":"Circled Ideograph Accept","b":"1F251","j":["ok","good","chinese","kanji","agree","yes","orange-circle"],"k":[5,43]},"flag-ng":{"a":"Nigeria Flag","b":"1F1F3-1F1EC","k":[3,44]},"breast-feeding":{"skin_variations":{"1F3FB":{"unified":"1F931-1F3FB","non_qualified":null,"image":"1f931-1f3fb.png","sheet_x":39,"sheet_y":11,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F931-1F3FC","non_qualified":null,"image":"1f931-1f3fc.png","sheet_x":39,"sheet_y":12,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F931-1F3FD","non_qualified":null,"image":"1f931-1f3fd.png","sheet_x":39,"sheet_y":13,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F931-1F3FE","non_qualified":null,"image":"1f931-1f3fe.png","sheet_x":39,"sheet_y":14,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F931-1F3FF","non_qualified":null,"image":"1f931-1f3ff.png","sheet_x":39,"sheet_y":15,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Breast-Feeding","b":"1F931","k":[39,10],"o":10},"full_moon_with_face":{"a":"Full Moon with Face","b":"1F31D","j":["nature","twilight","planet","space","night","evening","sleep"],"k":[6,21]},"flag-ni":{"a":"Nicaragua Flag","b":"1F1F3-1F1EE","k":[3,45]},"u7533":{"a":"Squared Cjk Unified Ideograph-7533","b":"1F238","j":["chinese","japanese","kanji","orange-square"],"k":[5,39]},"angel":{"skin_variations":{"1F3FB":{"unified":"1F47C-1F3FB","non_qualified":null,"image":"1f47c-1f3fb.png","sheet_x":22,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F47C-1F3FC","non_qualified":null,"image":"1f47c-1f3fc.png","sheet_x":22,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F47C-1F3FD","non_qualified":null,"image":"1f47c-1f3fd.png","sheet_x":22,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F47C-1F3FE","non_qualified":null,"image":"1f47c-1f3fe.png","sheet_x":22,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F47C-1F3FF","non_qualified":null,"image":"1f47c-1f3ff.png","sheet_x":22,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Baby Angel","b":"1F47C","j":["heaven","wings","halo"],"k":[22,43]},"sun_with_face":{"a":"Sun with Face","b":"1F31E","j":["nature","morning","sky"],"k":[6,22]},"santa":{"skin_variations":{"1F3FB":{"unified":"1F385-1F3FB","non_qualified":null,"image":"1f385-1f3fb.png","sheet_x":8,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F385-1F3FC","non_qualified":null,"image":"1f385-1f3fc.png","sheet_x":8,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F385-1F3FD","non_qualified":null,"image":"1f385-1f3fd.png","sheet_x":8,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F385-1F3FE","non_qualified":null,"image":"1f385-1f3fe.png","sheet_x":8,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F385-1F3FF","non_qualified":null,"image":"1f385-1f3ff.png","sheet_x":8,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Father Christmas","b":"1F385","j":["festival","man","male","xmas","father christmas"],"k":[8,19]},"u5408":{"a":"Squared Cjk Unified Ideograph-5408","b":"1F234","j":["japanese","chinese","join","kanji","red-square"],"k":[5,35]},"flag-nl":{"a":"Netherlands Flag","b":"1F1F3-1F1F1","k":[3,46]},"mrs_claus":{"skin_variations":{"1F3FB":{"unified":"1F936-1F3FB","non_qualified":null,"image":"1f936-1f3fb.png","sheet_x":39,"sheet_y":41,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F936-1F3FC","non_qualified":null,"image":"1f936-1f3fc.png","sheet_x":39,"sheet_y":42,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F936-1F3FD","non_qualified":null,"image":"1f936-1f3fd.png","sheet_x":39,"sheet_y":43,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F936-1F3FE","non_qualified":null,"image":"1f936-1f3fe.png","sheet_x":39,"sheet_y":44,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F936-1F3FF","non_qualified":null,"image":"1f936-1f3ff.png","sheet_x":39,"sheet_y":45,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Mother Christmas","b":"1F936","j":["woman","female","xmas","mother christmas"],"k":[39,40],"n":["mother_christmas"],"o":9},"u7a7a":{"a":"Squared Cjk Unified Ideograph-7a7a","b":"1F233","j":["kanji","japanese","chinese","empty","sky","blue-square"],"k":[5,34]},"star":{"a":"White Medium Star","b":"2B50","j":["night","yellow"],"k":[50,22],"o":5},"flag-no":{"a":"Norway Flag","b":"1F1F3-1F1F4","k":[3,47]},"mage":{"skin_variations":{"1F3FB":{"unified":"1F9D9-1F3FB","non_qualified":null,"image":"1f9d9-1f3fb.png","sheet_x":44,"sheet_y":43,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D9-1F3FB-200D-2640-FE0F"},"1F3FC":{"unified":"1F9D9-1F3FC","non_qualified":null,"image":"1f9d9-1f3fc.png","sheet_x":44,"sheet_y":44,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D9-1F3FC-200D-2640-FE0F"},"1F3FD":{"unified":"1F9D9-1F3FD","non_qualified":null,"image":"1f9d9-1f3fd.png","sheet_x":44,"sheet_y":45,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D9-1F3FD-200D-2640-FE0F"},"1F3FE":{"unified":"1F9D9-1F3FE","non_qualified":null,"image":"1f9d9-1f3fe.png","sheet_x":44,"sheet_y":46,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D9-1F3FE-200D-2640-FE0F"},"1F3FF":{"unified":"1F9D9-1F3FF","non_qualified":null,"image":"1f9d9-1f3ff.png","sheet_x":44,"sheet_y":47,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D9-1F3FF-200D-2640-FE0F"}},"obsoleted_by":"1F9D9-200D-2640-FE0F","a":"Mage","b":"1F9D9","k":[44,42],"o":10},"star2":{"a":"Glowing Star","b":"1F31F","j":["night","sparkle","awesome","good","magic"],"k":[6,23]},"flag-np":{"a":"Nepal Flag","b":"1F1F3-1F1F5","k":[3,48]},"congratulations":{"a":"Circled Ideograph Congratulation","b":"3297-FE0F","c":"3297","j":["chinese","kanji","japanese","red-circle"],"k":[50,26],"o":1},"flag-nr":{"a":"Nauru Flag","b":"1F1F3-1F1F7","k":[3,49]},"stars":{"a":"Shooting Star","b":"1F320","j":["night","photo"],"k":[6,24]},"female_mage":{"skin_variations":{"1F3FB":{"unified":"1F9D9-1F3FB-200D-2640-FE0F","non_qualified":"1F9D9-1F3FB-200D-2640","image":"1f9d9-1f3fb-200d-2640-fe0f.png","sheet_x":44,"sheet_y":31,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D9-1F3FB"},"1F3FC":{"unified":"1F9D9-1F3FC-200D-2640-FE0F","non_qualified":"1F9D9-1F3FC-200D-2640","image":"1f9d9-1f3fc-200d-2640-fe0f.png","sheet_x":44,"sheet_y":32,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D9-1F3FC"},"1F3FD":{"unified":"1F9D9-1F3FD-200D-2640-FE0F","non_qualified":"1F9D9-1F3FD-200D-2640","image":"1f9d9-1f3fd-200d-2640-fe0f.png","sheet_x":44,"sheet_y":33,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D9-1F3FD"},"1F3FE":{"unified":"1F9D9-1F3FE-200D-2640-FE0F","non_qualified":"1F9D9-1F3FE-200D-2640","image":"1f9d9-1f3fe-200d-2640-fe0f.png","sheet_x":44,"sheet_y":34,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D9-1F3FE"},"1F3FF":{"unified":"1F9D9-1F3FF-200D-2640-FE0F","non_qualified":"1F9D9-1F3FF-200D-2640","image":"1f9d9-1f3ff-200d-2640-fe0f.png","sheet_x":44,"sheet_y":35,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D9-1F3FF"}},"obsoletes":"1F9D9","a":"Female Mage","b":"1F9D9-200D-2640-FE0F","c":"1F9D9-200D-2640","k":[44,30],"o":10},"secret":{"a":"Circled Ideograph Secret","b":"3299-FE0F","c":"3299","j":["privacy","chinese","sshh","kanji","red-circle"],"k":[50,27],"o":1},"flag-nu":{"a":"Niue Flag","b":"1F1F3-1F1FA","k":[3,50]},"u55b6":{"a":"Squared Cjk Unified Ideograph-55b6","b":"1F23A","j":["japanese","opening hours","orange-square"],"k":[5,41]},"male_mage":{"skin_variations":{"1F3FB":{"unified":"1F9D9-1F3FB-200D-2642-FE0F","non_qualified":"1F9D9-1F3FB-200D-2642","image":"1f9d9-1f3fb-200d-2642-fe0f.png","sheet_x":44,"sheet_y":37,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F9D9-1F3FC-200D-2642-FE0F","non_qualified":"1F9D9-1F3FC-200D-2642","image":"1f9d9-1f3fc-200d-2642-fe0f.png","sheet_x":44,"sheet_y":38,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F9D9-1F3FD-200D-2642-FE0F","non_qualified":"1F9D9-1F3FD-200D-2642","image":"1f9d9-1f3fd-200d-2642-fe0f.png","sheet_x":44,"sheet_y":39,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F9D9-1F3FE-200D-2642-FE0F","non_qualified":"1F9D9-1F3FE-200D-2642","image":"1f9d9-1f3fe-200d-2642-fe0f.png","sheet_x":44,"sheet_y":40,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F9D9-1F3FF-200D-2642-FE0F","non_qualified":"1F9D9-1F3FF-200D-2642","image":"1f9d9-1f3ff-200d-2642-fe0f.png","sheet_x":44,"sheet_y":41,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Male Mage","b":"1F9D9-200D-2642-FE0F","c":"1F9D9-200D-2642","k":[44,36],"o":10},"cloud":{"a":"Cloud","b":"2601-FE0F","c":"2601","j":["weather","sky"],"k":[47,17],"o":1},"flag-nz":{"a":"New Zealand Flag","b":"1F1F3-1F1FF","k":[3,51]},"partly_sunny":{"a":"Sun Behind Cloud","b":"26C5","j":["weather","nature","cloudy","morning","fall","spring"],"k":[48,29],"o":5},"fairy":{"skin_variations":{"1F3FB":{"unified":"1F9DA-1F3FB","non_qualified":null,"image":"1f9da-1f3fb.png","sheet_x":45,"sheet_y":9,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DA-1F3FB-200D-2640-FE0F"},"1F3FC":{"unified":"1F9DA-1F3FC","non_qualified":null,"image":"1f9da-1f3fc.png","sheet_x":45,"sheet_y":10,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DA-1F3FC-200D-2640-FE0F"},"1F3FD":{"unified":"1F9DA-1F3FD","non_qualified":null,"image":"1f9da-1f3fd.png","sheet_x":45,"sheet_y":11,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DA-1F3FD-200D-2640-FE0F"},"1F3FE":{"unified":"1F9DA-1F3FE","non_qualified":null,"image":"1f9da-1f3fe.png","sheet_x":45,"sheet_y":12,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DA-1F3FE-200D-2640-FE0F"},"1F3FF":{"unified":"1F9DA-1F3FF","non_qualified":null,"image":"1f9da-1f3ff.png","sheet_x":45,"sheet_y":13,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DA-1F3FF-200D-2640-FE0F"}},"obsoleted_by":"1F9DA-200D-2640-FE0F","a":"Fairy","b":"1F9DA","k":[45,8],"o":10},"u6e80":{"a":"Squared Cjk Unified Ideograph-6e80","b":"1F235","j":["full","chinese","japanese","red-square","kanji"],"k":[5,36]},"black_small_square":{"a":"Black Small Square","b":"25AA-FE0F","c":"25AA","j":["shape","icon"],"k":[47,8],"o":1},"thunder_cloud_and_rain":{"a":"Thunder Cloud and Rain","b":"26C8-FE0F","c":"26C8","k":[48,30],"o":5},"female_fairy":{"skin_variations":{"1F3FB":{"unified":"1F9DA-1F3FB-200D-2640-FE0F","non_qualified":"1F9DA-1F3FB-200D-2640","image":"1f9da-1f3fb-200d-2640-fe0f.png","sheet_x":44,"sheet_y":49,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DA-1F3FB"},"1F3FC":{"unified":"1F9DA-1F3FC-200D-2640-FE0F","non_qualified":"1F9DA-1F3FC-200D-2640","image":"1f9da-1f3fc-200d-2640-fe0f.png","sheet_x":44,"sheet_y":50,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DA-1F3FC"},"1F3FD":{"unified":"1F9DA-1F3FD-200D-2640-FE0F","non_qualified":"1F9DA-1F3FD-200D-2640","image":"1f9da-1f3fd-200d-2640-fe0f.png","sheet_x":44,"sheet_y":51,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DA-1F3FD"},"1F3FE":{"unified":"1F9DA-1F3FE-200D-2640-FE0F","non_qualified":"1F9DA-1F3FE-200D-2640","image":"1f9da-1f3fe-200d-2640-fe0f.png","sheet_x":45,"sheet_y":0,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DA-1F3FE"},"1F3FF":{"unified":"1F9DA-1F3FF-200D-2640-FE0F","non_qualified":"1F9DA-1F3FF-200D-2640","image":"1f9da-1f3ff-200d-2640-fe0f.png","sheet_x":45,"sheet_y":1,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DA-1F3FF"}},"obsoletes":"1F9DA","a":"Female Fairy","b":"1F9DA-200D-2640-FE0F","c":"1F9DA-200D-2640","k":[44,48],"o":10},"flag-om":{"a":"Oman Flag","b":"1F1F4-1F1F2","k":[4,0]},"white_small_square":{"a":"White Small Square","b":"25AB-FE0F","c":"25AB","j":["shape","icon"],"k":[47,9],"o":1},"flag-pa":{"a":"Panama Flag","b":"1F1F5-1F1E6","k":[4,1]},"mostly_sunny":{"a":"Mostly Sunny","b":"1F324-FE0F","c":"1F324","k":[6,26],"n":["sun_small_cloud"],"o":7},"male_fairy":{"skin_variations":{"1F3FB":{"unified":"1F9DA-1F3FB-200D-2642-FE0F","non_qualified":"1F9DA-1F3FB-200D-2642","image":"1f9da-1f3fb-200d-2642-fe0f.png","sheet_x":45,"sheet_y":3,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F9DA-1F3FC-200D-2642-FE0F","non_qualified":"1F9DA-1F3FC-200D-2642","image":"1f9da-1f3fc-200d-2642-fe0f.png","sheet_x":45,"sheet_y":4,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F9DA-1F3FD-200D-2642-FE0F","non_qualified":"1F9DA-1F3FD-200D-2642","image":"1f9da-1f3fd-200d-2642-fe0f.png","sheet_x":45,"sheet_y":5,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F9DA-1F3FE-200D-2642-FE0F","non_qualified":"1F9DA-1F3FE-200D-2642","image":"1f9da-1f3fe-200d-2642-fe0f.png","sheet_x":45,"sheet_y":6,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F9DA-1F3FF-200D-2642-FE0F","non_qualified":"1F9DA-1F3FF-200D-2642","image":"1f9da-1f3ff-200d-2642-fe0f.png","sheet_x":45,"sheet_y":7,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Male Fairy","b":"1F9DA-200D-2642-FE0F","c":"1F9DA-200D-2642","k":[45,2],"o":10},"barely_sunny":{"a":"Barely Sunny","b":"1F325-FE0F","c":"1F325","k":[6,27],"n":["sun_behind_cloud"],"o":7},"white_medium_square":{"a":"White Medium Square","b":"25FB-FE0F","c":"25FB","j":["shape","stone","icon"],"k":[47,12],"o":3},"flag-pe":{"a":"Peru Flag","b":"1F1F5-1F1EA","k":[4,2]},"vampire":{"skin_variations":{"1F3FB":{"unified":"1F9DB-1F3FB","non_qualified":null,"image":"1f9db-1f3fb.png","sheet_x":45,"sheet_y":27,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DB-1F3FB-200D-2640-FE0F"},"1F3FC":{"unified":"1F9DB-1F3FC","non_qualified":null,"image":"1f9db-1f3fc.png","sheet_x":45,"sheet_y":28,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DB-1F3FC-200D-2640-FE0F"},"1F3FD":{"unified":"1F9DB-1F3FD","non_qualified":null,"image":"1f9db-1f3fd.png","sheet_x":45,"sheet_y":29,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DB-1F3FD-200D-2640-FE0F"},"1F3FE":{"unified":"1F9DB-1F3FE","non_qualified":null,"image":"1f9db-1f3fe.png","sheet_x":45,"sheet_y":30,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DB-1F3FE-200D-2640-FE0F"},"1F3FF":{"unified":"1F9DB-1F3FF","non_qualified":null,"image":"1f9db-1f3ff.png","sheet_x":45,"sheet_y":31,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoleted_by":"1F9DB-1F3FF-200D-2640-FE0F"}},"obsoleted_by":"1F9DB-200D-2640-FE0F","a":"Vampire","b":"1F9DB","k":[45,26],"o":10},"female_vampire":{"skin_variations":{"1F3FB":{"unified":"1F9DB-1F3FB-200D-2640-FE0F","non_qualified":"1F9DB-1F3FB-200D-2640","image":"1f9db-1f3fb-200d-2640-fe0f.png","sheet_x":45,"sheet_y":15,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DB-1F3FB"},"1F3FC":{"unified":"1F9DB-1F3FC-200D-2640-FE0F","non_qualified":"1F9DB-1F3FC-200D-2640","image":"1f9db-1f3fc-200d-2640-fe0f.png","sheet_x":45,"sheet_y":16,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DB-1F3FC"},"1F3FD":{"unified":"1F9DB-1F3FD-200D-2640-FE0F","non_qualified":"1F9DB-1F3FD-200D-2640","image":"1f9db-1f3fd-200d-2640-fe0f.png","sheet_x":45,"sheet_y":17,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DB-1F3FD"},"1F3FE":{"unified":"1F9DB-1F3FE-200D-2640-FE0F","non_qualified":"1F9DB-1F3FE-200D-2640","image":"1f9db-1f3fe-200d-2640-fe0f.png","sheet_x":45,"sheet_y":18,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DB-1F3FE"},"1F3FF":{"unified":"1F9DB-1F3FF-200D-2640-FE0F","non_qualified":"1F9DB-1F3FF-200D-2640","image":"1f9db-1f3ff-200d-2640-fe0f.png","sheet_x":45,"sheet_y":19,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DB-1F3FF"}},"obsoletes":"1F9DB","a":"Female Vampire","b":"1F9DB-200D-2640-FE0F","c":"1F9DB-200D-2640","k":[45,14],"o":10},"partly_sunny_rain":{"a":"Partly Sunny Rain","b":"1F326-FE0F","c":"1F326","k":[6,28],"n":["sun_behind_rain_cloud"],"o":7},"flag-pf":{"a":"French Polynesia Flag","b":"1F1F5-1F1EB","k":[4,3]},"black_medium_square":{"a":"Black Medium Square","b":"25FC-FE0F","c":"25FC","j":["shape","button","icon"],"k":[47,13],"o":3},"white_medium_small_square":{"a":"White Medium Small Square","b":"25FD","j":["shape","stone","icon","button"],"k":[47,14],"o":3},"rain_cloud":{"a":"Rain Cloud","b":"1F327-FE0F","c":"1F327","k":[6,29],"o":7},"flag-pg":{"a":"Papua New Guinea Flag","b":"1F1F5-1F1EC","k":[4,4]},"male_vampire":{"skin_variations":{"1F3FB":{"unified":"1F9DB-1F3FB-200D-2642-FE0F","non_qualified":"1F9DB-1F3FB-200D-2642","image":"1f9db-1f3fb-200d-2642-fe0f.png","sheet_x":45,"sheet_y":21,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F9DB-1F3FC-200D-2642-FE0F","non_qualified":"1F9DB-1F3FC-200D-2642","image":"1f9db-1f3fc-200d-2642-fe0f.png","sheet_x":45,"sheet_y":22,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F9DB-1F3FD-200D-2642-FE0F","non_qualified":"1F9DB-1F3FD-200D-2642","image":"1f9db-1f3fd-200d-2642-fe0f.png","sheet_x":45,"sheet_y":23,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F9DB-1F3FE-200D-2642-FE0F","non_qualified":"1F9DB-1F3FE-200D-2642","image":"1f9db-1f3fe-200d-2642-fe0f.png","sheet_x":45,"sheet_y":24,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F9DB-1F3FF-200D-2642-FE0F","non_qualified":"1F9DB-1F3FF-200D-2642","image":"1f9db-1f3ff-200d-2642-fe0f.png","sheet_x":45,"sheet_y":25,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Male Vampire","b":"1F9DB-200D-2642-FE0F","c":"1F9DB-200D-2642","k":[45,20],"o":10},"flag-ph":{"a":"Philippines Flag","b":"1F1F5-1F1ED","k":[4,5]},"merperson":{"skin_variations":{"1F3FB":{"unified":"1F9DC-1F3FB","non_qualified":null,"image":"1f9dc-1f3fb.png","sheet_x":45,"sheet_y":45,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DC-1F3FB-200D-2642-FE0F"},"1F3FC":{"unified":"1F9DC-1F3FC","non_qualified":null,"image":"1f9dc-1f3fc.png","sheet_x":45,"sheet_y":46,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DC-1F3FC-200D-2642-FE0F"},"1F3FD":{"unified":"1F9DC-1F3FD","non_qualified":null,"image":"1f9dc-1f3fd.png","sheet_x":45,"sheet_y":47,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DC-1F3FD-200D-2642-FE0F"},"1F3FE":{"unified":"1F9DC-1F3FE","non_qualified":null,"image":"1f9dc-1f3fe.png","sheet_x":45,"sheet_y":48,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DC-1F3FE-200D-2642-FE0F"},"1F3FF":{"unified":"1F9DC-1F3FF","non_qualified":null,"image":"1f9dc-1f3ff.png","sheet_x":45,"sheet_y":49,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DC-1F3FF-200D-2642-FE0F"}},"obsoleted_by":"1F9DC-200D-2642-FE0F","a":"Merperson","b":"1F9DC","k":[45,44],"o":10},"black_medium_small_square":{"a":"Black Medium Small Square","b":"25FE","j":["icon","shape","button"],"k":[47,15],"o":3},"snow_cloud":{"a":"Snow Cloud","b":"1F328-FE0F","c":"1F328","k":[6,30],"o":7},"lightning":{"a":"Lightning","b":"1F329-FE0F","c":"1F329","k":[6,31],"n":["lightning_cloud"],"o":7},"black_large_square":{"a":"Black Large Square","b":"2B1B","j":["shape","icon","button"],"k":[50,20],"o":5},"mermaid":{"skin_variations":{"1F3FB":{"unified":"1F9DC-1F3FB-200D-2640-FE0F","non_qualified":"1F9DC-1F3FB-200D-2640","image":"1f9dc-1f3fb-200d-2640-fe0f.png","sheet_x":45,"sheet_y":33,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F9DC-1F3FC-200D-2640-FE0F","non_qualified":"1F9DC-1F3FC-200D-2640","image":"1f9dc-1f3fc-200d-2640-fe0f.png","sheet_x":45,"sheet_y":34,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F9DC-1F3FD-200D-2640-FE0F","non_qualified":"1F9DC-1F3FD-200D-2640","image":"1f9dc-1f3fd-200d-2640-fe0f.png","sheet_x":45,"sheet_y":35,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F9DC-1F3FE-200D-2640-FE0F","non_qualified":"1F9DC-1F3FE-200D-2640","image":"1f9dc-1f3fe-200d-2640-fe0f.png","sheet_x":45,"sheet_y":36,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F9DC-1F3FF-200D-2640-FE0F","non_qualified":"1F9DC-1F3FF-200D-2640","image":"1f9dc-1f3ff-200d-2640-fe0f.png","sheet_x":45,"sheet_y":37,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Mermaid","b":"1F9DC-200D-2640-FE0F","c":"1F9DC-200D-2640","k":[45,32],"o":10},"flag-pk":{"a":"Pakistan Flag","b":"1F1F5-1F1F0","k":[4,6]},"merman":{"skin_variations":{"1F3FB":{"unified":"1F9DC-1F3FB-200D-2642-FE0F","non_qualified":"1F9DC-1F3FB-200D-2642","image":"1f9dc-1f3fb-200d-2642-fe0f.png","sheet_x":45,"sheet_y":39,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DC-1F3FB"},"1F3FC":{"unified":"1F9DC-1F3FC-200D-2642-FE0F","non_qualified":"1F9DC-1F3FC-200D-2642","image":"1f9dc-1f3fc-200d-2642-fe0f.png","sheet_x":45,"sheet_y":40,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DC-1F3FC"},"1F3FD":{"unified":"1F9DC-1F3FD-200D-2642-FE0F","non_qualified":"1F9DC-1F3FD-200D-2642","image":"1f9dc-1f3fd-200d-2642-fe0f.png","sheet_x":45,"sheet_y":41,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DC-1F3FD"},"1F3FE":{"unified":"1F9DC-1F3FE-200D-2642-FE0F","non_qualified":"1F9DC-1F3FE-200D-2642","image":"1f9dc-1f3fe-200d-2642-fe0f.png","sheet_x":45,"sheet_y":42,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DC-1F3FE"},"1F3FF":{"unified":"1F9DC-1F3FF-200D-2642-FE0F","non_qualified":"1F9DC-1F3FF-200D-2642","image":"1f9dc-1f3ff-200d-2642-fe0f.png","sheet_x":45,"sheet_y":43,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DC-1F3FF"}},"obsoletes":"1F9DC","a":"Merman","b":"1F9DC-200D-2642-FE0F","c":"1F9DC-200D-2642","k":[45,38],"o":10},"white_large_square":{"a":"White Large Square","b":"2B1C","j":["shape","icon","stone","button"],"k":[50,21],"o":5},"tornado":{"a":"Tornado","b":"1F32A-FE0F","c":"1F32A","j":["weather","cyclone","twister"],"k":[6,32],"n":["tornado_cloud"],"o":7},"flag-pl":{"a":"Poland Flag","b":"1F1F5-1F1F1","k":[4,7]},"elf":{"skin_variations":{"1F3FB":{"unified":"1F9DD-1F3FB","non_qualified":null,"image":"1f9dd-1f3fb.png","sheet_x":46,"sheet_y":11,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DD-1F3FB-200D-2642-FE0F"},"1F3FC":{"unified":"1F9DD-1F3FC","non_qualified":null,"image":"1f9dd-1f3fc.png","sheet_x":46,"sheet_y":12,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DD-1F3FC-200D-2642-FE0F"},"1F3FD":{"unified":"1F9DD-1F3FD","non_qualified":null,"image":"1f9dd-1f3fd.png","sheet_x":46,"sheet_y":13,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DD-1F3FD-200D-2642-FE0F"},"1F3FE":{"unified":"1F9DD-1F3FE","non_qualified":null,"image":"1f9dd-1f3fe.png","sheet_x":46,"sheet_y":14,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DD-1F3FE-200D-2642-FE0F"},"1F3FF":{"unified":"1F9DD-1F3FF","non_qualified":null,"image":"1f9dd-1f3ff.png","sheet_x":46,"sheet_y":15,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9DD-1F3FF-200D-2642-FE0F"}},"obsoleted_by":"1F9DD-200D-2642-FE0F","a":"Elf","b":"1F9DD","k":[46,10],"o":10},"fog":{"a":"Fog","b":"1F32B-FE0F","c":"1F32B","j":["weather"],"k":[6,33],"o":7},"large_orange_diamond":{"a":"Large Orange Diamond","b":"1F536","j":["shape","jewel","gem"],"k":[28,4]},"flag-pn":{"a":"Pitcairn Islands Flag","b":"1F1F5-1F1F3","k":[4,9]},"wind_blowing_face":{"a":"Wind Blowing Face","b":"1F32C-FE0F","c":"1F32C","k":[6,34],"o":7},"female_elf":{"skin_variations":{"1F3FB":{"unified":"1F9DD-1F3FB-200D-2640-FE0F","non_qualified":"1F9DD-1F3FB-200D-2640","image":"1f9dd-1f3fb-200d-2640-fe0f.png","sheet_x":45,"sheet_y":51,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F9DD-1F3FC-200D-2640-FE0F","non_qualified":"1F9DD-1F3FC-200D-2640","image":"1f9dd-1f3fc-200d-2640-fe0f.png","sheet_x":46,"sheet_y":0,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F9DD-1F3FD-200D-2640-FE0F","non_qualified":"1F9DD-1F3FD-200D-2640","image":"1f9dd-1f3fd-200d-2640-fe0f.png","sheet_x":46,"sheet_y":1,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F9DD-1F3FE-200D-2640-FE0F","non_qualified":"1F9DD-1F3FE-200D-2640","image":"1f9dd-1f3fe-200d-2640-fe0f.png","sheet_x":46,"sheet_y":2,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F9DD-1F3FF-200D-2640-FE0F","non_qualified":"1F9DD-1F3FF-200D-2640","image":"1f9dd-1f3ff-200d-2640-fe0f.png","sheet_x":46,"sheet_y":3,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Female Elf","b":"1F9DD-200D-2640-FE0F","c":"1F9DD-200D-2640","k":[45,50],"o":10},"large_blue_diamond":{"a":"Large Blue Diamond","b":"1F537","j":["shape","jewel","gem"],"k":[28,5]},"male_elf":{"skin_variations":{"1F3FB":{"unified":"1F9DD-1F3FB-200D-2642-FE0F","non_qualified":"1F9DD-1F3FB-200D-2642","image":"1f9dd-1f3fb-200d-2642-fe0f.png","sheet_x":46,"sheet_y":5,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DD-1F3FB"},"1F3FC":{"unified":"1F9DD-1F3FC-200D-2642-FE0F","non_qualified":"1F9DD-1F3FC-200D-2642","image":"1f9dd-1f3fc-200d-2642-fe0f.png","sheet_x":46,"sheet_y":6,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DD-1F3FC"},"1F3FD":{"unified":"1F9DD-1F3FD-200D-2642-FE0F","non_qualified":"1F9DD-1F3FD-200D-2642","image":"1f9dd-1f3fd-200d-2642-fe0f.png","sheet_x":46,"sheet_y":7,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DD-1F3FD"},"1F3FE":{"unified":"1F9DD-1F3FE-200D-2642-FE0F","non_qualified":"1F9DD-1F3FE-200D-2642","image":"1f9dd-1f3fe-200d-2642-fe0f.png","sheet_x":46,"sheet_y":8,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DD-1F3FE"},"1F3FF":{"unified":"1F9DD-1F3FF-200D-2642-FE0F","non_qualified":"1F9DD-1F3FF-200D-2642","image":"1f9dd-1f3ff-200d-2642-fe0f.png","sheet_x":46,"sheet_y":9,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9DD-1F3FF"}},"obsoletes":"1F9DD","a":"Male Elf","b":"1F9DD-200D-2642-FE0F","c":"1F9DD-200D-2642","k":[46,4],"o":10},"small_orange_diamond":{"a":"Small Orange Diamond","b":"1F538","j":["shape","jewel","gem"],"k":[28,6]},"flag-pr":{"a":"Puerto Rico Flag","b":"1F1F5-1F1F7","k":[4,10]},"cyclone":{"a":"Cyclone","b":"1F300","j":["weather","swirl","blue","cloud","vortex","spiral","whirlpool","spin","tornado","hurricane","typhoon"],"k":[5,44]},"rainbow":{"a":"Rainbow","b":"1F308","j":["nature","happy","unicorn_face","photo","sky","spring"],"k":[6,0]},"small_blue_diamond":{"a":"Small Blue Diamond","b":"1F539","j":["shape","jewel","gem"],"k":[28,7]},"genie":{"obsoleted_by":"1F9DE-200D-2642-FE0F","a":"Genie","b":"1F9DE","k":[46,18],"o":10},"flag-ps":{"a":"Palestinian Territories Flag","b":"1F1F5-1F1F8","k":[4,11]},"small_red_triangle":{"a":"Up-Pointing Red Triangle","b":"1F53A","j":["shape","direction","up","top"],"k":[28,8]},"closed_umbrella":{"a":"Closed Umbrella","b":"1F302","j":["weather","rain","drizzle"],"k":[5,46]},"female_genie":{"a":"Female Genie","b":"1F9DE-200D-2640-FE0F","c":"1F9DE-200D-2640","k":[46,16],"o":10},"flag-pt":{"a":"Portugal Flag","b":"1F1F5-1F1F9","k":[4,12]},"flag-pw":{"a":"Palau Flag","b":"1F1F5-1F1FC","k":[4,13]},"small_red_triangle_down":{"a":"Down-Pointing Red Triangle","b":"1F53B","j":["shape","direction","bottom"],"k":[28,9]},"umbrella":{"a":"Umbrella","b":"2602-FE0F","c":"2602","j":["rainy","weather","spring"],"k":[47,18],"o":1},"male_genie":{"obsoletes":"1F9DE","a":"Male Genie","b":"1F9DE-200D-2642-FE0F","c":"1F9DE-200D-2642","k":[46,17],"o":10},"zombie":{"obsoleted_by":"1F9DF-200D-2642-FE0F","a":"Zombie","b":"1F9DF","k":[46,21],"o":10},"flag-py":{"a":"Paraguay Flag","b":"1F1F5-1F1FE","k":[4,14]},"diamond_shape_with_a_dot_inside":{"a":"Diamond Shape with a Dot Inside","b":"1F4A0","j":["jewel","blue","gem","crystal","fancy"],"k":[25,6]},"umbrella_with_rain_drops":{"a":"Umbrella with Rain Drops","b":"2614","k":[47,23],"o":4},"radio_button":{"a":"Radio Button","b":"1F518","j":["input","old","music","circle"],"k":[27,26]},"female_zombie":{"a":"Female Zombie","b":"1F9DF-200D-2640-FE0F","c":"1F9DF-200D-2640","k":[46,19],"o":10},"flag-qa":{"a":"Qatar Flag","b":"1F1F6-1F1E6","k":[4,15]},"umbrella_on_ground":{"a":"Umbrella on Ground","b":"26F1-FE0F","c":"26F1","k":[48,39],"o":5},"black_square_button":{"a":"Black Square Button","b":"1F532","j":["shape","input","frame"],"k":[28,0]},"zap":{"a":"High Voltage Sign","b":"26A1","j":["thunder","weather","lightning bolt","fast"],"k":[48,21],"o":4},"male_zombie":{"obsoletes":"1F9DF","a":"Male Zombie","b":"1F9DF-200D-2642-FE0F","c":"1F9DF-200D-2642","k":[46,20],"o":10},"flag-ro":{"a":"Romania Flag","b":"1F1F7-1F1F4","k":[4,17]},"snowflake":{"a":"Snowflake","b":"2744-FE0F","c":"2744","j":["winter","season","cold","weather","christmas","xmas"],"k":[49,51],"o":1},"white_square_button":{"a":"White Square Button","b":"1F533","j":["shape","input"],"k":[28,1]},"person_frowning":{"skin_variations":{"1F3FB":{"unified":"1F64D-1F3FB","non_qualified":null,"image":"1f64d-1f3fb.png","sheet_x":33,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F64D-1F3FC","non_qualified":null,"image":"1f64d-1f3fc.png","sheet_x":33,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F64D-1F3FD","non_qualified":null,"image":"1f64d-1f3fd.png","sheet_x":33,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F64D-1F3FE","non_qualified":null,"image":"1f64d-1f3fe.png","sheet_x":33,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F64D-1F3FF","non_qualified":null,"image":"1f64d-1f3ff.png","sheet_x":33,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F64D-200D-2640-FE0F","a":"Person Frowning","b":"1F64D","k":[33,30]},"flag-rs":{"a":"Serbia Flag","b":"1F1F7-1F1F8","k":[4,18]},"man-frowning":{"skin_variations":{"1F3FB":{"unified":"1F64D-1F3FB-200D-2642-FE0F","non_qualified":"1F64D-1F3FB-200D-2642","image":"1f64d-1f3fb-200d-2642-fe0f.png","sheet_x":33,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F64D-1F3FC-200D-2642-FE0F","non_qualified":"1F64D-1F3FC-200D-2642","image":"1f64d-1f3fc-200d-2642-fe0f.png","sheet_x":33,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F64D-1F3FD-200D-2642-FE0F","non_qualified":"1F64D-1F3FD-200D-2642","image":"1f64d-1f3fd-200d-2642-fe0f.png","sheet_x":33,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F64D-1F3FE-200D-2642-FE0F","non_qualified":"1F64D-1F3FE-200D-2642","image":"1f64d-1f3fe-200d-2642-fe0f.png","sheet_x":33,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F64D-1F3FF-200D-2642-FE0F","non_qualified":"1F64D-1F3FF-200D-2642","image":"1f64d-1f3ff-200d-2642-fe0f.png","sheet_x":33,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Frowning","b":"1F64D-200D-2642-FE0F","c":"1F64D-200D-2642","k":[33,24]},"white_circle":{"a":"Medium White Circle","b":"26AA","j":["shape","round"],"k":[48,22],"o":4},"snowman":{"a":"Snowman","b":"2603-FE0F","c":"2603","j":["winter","season","cold","weather","christmas","xmas","frozen","without_snow"],"k":[47,19],"o":1},"snowman_without_snow":{"a":"Snowman Without Snow","b":"26C4","k":[48,28],"o":5},"ru":{"a":"Russia Flag","b":"1F1F7-1F1FA","j":["russian","federation","flag","nation","country","banner"],"k":[4,19],"n":["flag-ru"]},"black_circle":{"a":"Medium Black Circle","b":"26AB","j":["shape","button","round"],"k":[48,23],"o":4},"woman-frowning":{"skin_variations":{"1F3FB":{"unified":"1F64D-1F3FB-200D-2640-FE0F","non_qualified":"1F64D-1F3FB-200D-2640","image":"1f64d-1f3fb-200d-2640-fe0f.png","sheet_x":33,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F64D-1F3FC-200D-2640-FE0F","non_qualified":"1F64D-1F3FC-200D-2640","image":"1f64d-1f3fc-200d-2640-fe0f.png","sheet_x":33,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F64D-1F3FD-200D-2640-FE0F","non_qualified":"1F64D-1F3FD-200D-2640","image":"1f64d-1f3fd-200d-2640-fe0f.png","sheet_x":33,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F64D-1F3FE-200D-2640-FE0F","non_qualified":"1F64D-1F3FE-200D-2640","image":"1f64d-1f3fe-200d-2640-fe0f.png","sheet_x":33,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F64D-1F3FF-200D-2640-FE0F","non_qualified":"1F64D-1F3FF-200D-2640","image":"1f64d-1f3ff-200d-2640-fe0f.png","sheet_x":33,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F64D","a":"Woman Frowning","b":"1F64D-200D-2640-FE0F","c":"1F64D-200D-2640","k":[33,18]},"flag-rw":{"a":"Rwanda Flag","b":"1F1F7-1F1FC","k":[4,20]},"comet":{"a":"Comet","b":"2604-FE0F","c":"2604","j":["space"],"k":[47,20],"o":1},"person_with_pouting_face":{"skin_variations":{"1F3FB":{"unified":"1F64E-1F3FB","non_qualified":null,"image":"1f64e-1f3fb.png","sheet_x":33,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F64E-1F3FC","non_qualified":null,"image":"1f64e-1f3fc.png","sheet_x":33,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F64E-1F3FD","non_qualified":null,"image":"1f64e-1f3fd.png","sheet_x":33,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F64E-1F3FE","non_qualified":null,"image":"1f64e-1f3fe.png","sheet_x":34,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F64E-1F3FF","non_qualified":null,"image":"1f64e-1f3ff.png","sheet_x":34,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F64E-200D-2640-FE0F","a":"Person with Pouting Face","b":"1F64E","k":[33,48]},"red_circle":{"a":"Large Red Circle","b":"1F534","j":["shape","error","danger"],"k":[28,2]},"large_blue_circle":{"a":"Large Blue Circle","b":"1F535","j":["shape","icon","button"],"k":[28,3]},"man-pouting":{"skin_variations":{"1F3FB":{"unified":"1F64E-1F3FB-200D-2642-FE0F","non_qualified":"1F64E-1F3FB-200D-2642","image":"1f64e-1f3fb-200d-2642-fe0f.png","sheet_x":33,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F64E-1F3FC-200D-2642-FE0F","non_qualified":"1F64E-1F3FC-200D-2642","image":"1f64e-1f3fc-200d-2642-fe0f.png","sheet_x":33,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F64E-1F3FD-200D-2642-FE0F","non_qualified":"1F64E-1F3FD-200D-2642","image":"1f64e-1f3fd-200d-2642-fe0f.png","sheet_x":33,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F64E-1F3FE-200D-2642-FE0F","non_qualified":"1F64E-1F3FE-200D-2642","image":"1f64e-1f3fe-200d-2642-fe0f.png","sheet_x":33,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F64E-1F3FF-200D-2642-FE0F","non_qualified":"1F64E-1F3FF-200D-2642","image":"1f64e-1f3ff-200d-2642-fe0f.png","sheet_x":33,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Pouting","b":"1F64E-200D-2642-FE0F","c":"1F64E-200D-2642","k":[33,42]},"flag-sa":{"a":"Saudi Arabia Flag","b":"1F1F8-1F1E6","k":[4,21]},"fire":{"a":"Fire","b":"1F525","j":["hot","cook","flame"],"k":[27,39]},"woman-pouting":{"skin_variations":{"1F3FB":{"unified":"1F64E-1F3FB-200D-2640-FE0F","non_qualified":"1F64E-1F3FB-200D-2640","image":"1f64e-1f3fb-200d-2640-fe0f.png","sheet_x":33,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F64E-1F3FC-200D-2640-FE0F","non_qualified":"1F64E-1F3FC-200D-2640","image":"1f64e-1f3fc-200d-2640-fe0f.png","sheet_x":33,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F64E-1F3FD-200D-2640-FE0F","non_qualified":"1F64E-1F3FD-200D-2640","image":"1f64e-1f3fd-200d-2640-fe0f.png","sheet_x":33,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F64E-1F3FE-200D-2640-FE0F","non_qualified":"1F64E-1F3FE-200D-2640","image":"1f64e-1f3fe-200d-2640-fe0f.png","sheet_x":33,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F64E-1F3FF-200D-2640-FE0F","non_qualified":"1F64E-1F3FF-200D-2640","image":"1f64e-1f3ff-200d-2640-fe0f.png","sheet_x":33,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F64E","a":"Woman Pouting","b":"1F64E-200D-2640-FE0F","c":"1F64E-200D-2640","k":[33,36]},"flag-sb":{"a":"Solomon Islands Flag","b":"1F1F8-1F1E7","k":[4,22]},"droplet":{"a":"Droplet","b":"1F4A7","j":["water","drip","faucet","spring"],"k":[25,13]},"no_good":{"skin_variations":{"1F3FB":{"unified":"1F645-1F3FB","non_qualified":null,"image":"1f645-1f3fb.png","sheet_x":32,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F645-1F3FC","non_qualified":null,"image":"1f645-1f3fc.png","sheet_x":32,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F645-1F3FD","non_qualified":null,"image":"1f645-1f3fd.png","sheet_x":32,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F645-1F3FE","non_qualified":null,"image":"1f645-1f3fe.png","sheet_x":32,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F645-1F3FF","non_qualified":null,"image":"1f645-1f3ff.png","sheet_x":32,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F645-200D-2640-FE0F","a":"Face with No Good Gesture","b":"1F645","k":[32,1]},"flag-sc":{"a":"Seychelles Flag","b":"1F1F8-1F1E8","k":[4,23]},"ocean":{"a":"Water Wave","b":"1F30A","j":["sea","water","wave","nature","tsunami","disaster"],"k":[6,2]},"man-gesturing-no":{"skin_variations":{"1F3FB":{"unified":"1F645-1F3FB-200D-2642-FE0F","non_qualified":"1F645-1F3FB-200D-2642","image":"1f645-1f3fb-200d-2642-fe0f.png","sheet_x":31,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F645-1F3FC-200D-2642-FE0F","non_qualified":"1F645-1F3FC-200D-2642","image":"1f645-1f3fc-200d-2642-fe0f.png","sheet_x":31,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F645-1F3FD-200D-2642-FE0F","non_qualified":"1F645-1F3FD-200D-2642","image":"1f645-1f3fd-200d-2642-fe0f.png","sheet_x":31,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F645-1F3FE-200D-2642-FE0F","non_qualified":"1F645-1F3FE-200D-2642","image":"1f645-1f3fe-200d-2642-fe0f.png","sheet_x":31,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F645-1F3FF-200D-2642-FE0F","non_qualified":"1F645-1F3FF-200D-2642","image":"1f645-1f3ff-200d-2642-fe0f.png","sheet_x":32,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Gesturing No","b":"1F645-200D-2642-FE0F","c":"1F645-200D-2642","k":[31,47]},"flag-sd":{"a":"Sudan Flag","b":"1F1F8-1F1E9","k":[4,24]},"woman-gesturing-no":{"skin_variations":{"1F3FB":{"unified":"1F645-1F3FB-200D-2640-FE0F","non_qualified":"1F645-1F3FB-200D-2640","image":"1f645-1f3fb-200d-2640-fe0f.png","sheet_x":31,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F645-1F3FC-200D-2640-FE0F","non_qualified":"1F645-1F3FC-200D-2640","image":"1f645-1f3fc-200d-2640-fe0f.png","sheet_x":31,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F645-1F3FD-200D-2640-FE0F","non_qualified":"1F645-1F3FD-200D-2640","image":"1f645-1f3fd-200d-2640-fe0f.png","sheet_x":31,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F645-1F3FE-200D-2640-FE0F","non_qualified":"1F645-1F3FE-200D-2640","image":"1f645-1f3fe-200d-2640-fe0f.png","sheet_x":31,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F645-1F3FF-200D-2640-FE0F","non_qualified":"1F645-1F3FF-200D-2640","image":"1f645-1f3ff-200d-2640-fe0f.png","sheet_x":31,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F645","a":"Woman Gesturing No","b":"1F645-200D-2640-FE0F","c":"1F645-200D-2640","k":[31,41]},"flag-se":{"a":"Sweden Flag","b":"1F1F8-1F1EA","k":[4,25]},"flag-sg":{"a":"Singapore Flag","b":"1F1F8-1F1EC","k":[4,26]},"ok_woman":{"skin_variations":{"1F3FB":{"unified":"1F646-1F3FB","non_qualified":null,"image":"1f646-1f3fb.png","sheet_x":32,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F646-1F3FC","non_qualified":null,"image":"1f646-1f3fc.png","sheet_x":32,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F646-1F3FD","non_qualified":null,"image":"1f646-1f3fd.png","sheet_x":32,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F646-1F3FE","non_qualified":null,"image":"1f646-1f3fe.png","sheet_x":32,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F646-1F3FF","non_qualified":null,"image":"1f646-1f3ff.png","sheet_x":32,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F646-200D-2640-FE0F","a":"Face with Ok Gesture","b":"1F646","j":["women","girl","female","pink","human","woman"],"k":[32,19]},"flag-sh":{"a":"St. Helena Flag","b":"1F1F8-1F1ED","k":[4,27]},"man-gesturing-ok":{"skin_variations":{"1F3FB":{"unified":"1F646-1F3FB-200D-2642-FE0F","non_qualified":"1F646-1F3FB-200D-2642","image":"1f646-1f3fb-200d-2642-fe0f.png","sheet_x":32,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F646-1F3FC-200D-2642-FE0F","non_qualified":"1F646-1F3FC-200D-2642","image":"1f646-1f3fc-200d-2642-fe0f.png","sheet_x":32,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F646-1F3FD-200D-2642-FE0F","non_qualified":"1F646-1F3FD-200D-2642","image":"1f646-1f3fd-200d-2642-fe0f.png","sheet_x":32,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F646-1F3FE-200D-2642-FE0F","non_qualified":"1F646-1F3FE-200D-2642","image":"1f646-1f3fe-200d-2642-fe0f.png","sheet_x":32,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F646-1F3FF-200D-2642-FE0F","non_qualified":"1F646-1F3FF-200D-2642","image":"1f646-1f3ff-200d-2642-fe0f.png","sheet_x":32,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Gesturing Ok","b":"1F646-200D-2642-FE0F","c":"1F646-200D-2642","k":[32,13]},"flag-si":{"a":"Slovenia Flag","b":"1F1F8-1F1EE","k":[4,28]},"woman-gesturing-ok":{"skin_variations":{"1F3FB":{"unified":"1F646-1F3FB-200D-2640-FE0F","non_qualified":"1F646-1F3FB-200D-2640","image":"1f646-1f3fb-200d-2640-fe0f.png","sheet_x":32,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F646-1F3FC-200D-2640-FE0F","non_qualified":"1F646-1F3FC-200D-2640","image":"1f646-1f3fc-200d-2640-fe0f.png","sheet_x":32,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F646-1F3FD-200D-2640-FE0F","non_qualified":"1F646-1F3FD-200D-2640","image":"1f646-1f3fd-200d-2640-fe0f.png","sheet_x":32,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F646-1F3FE-200D-2640-FE0F","non_qualified":"1F646-1F3FE-200D-2640","image":"1f646-1f3fe-200d-2640-fe0f.png","sheet_x":32,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F646-1F3FF-200D-2640-FE0F","non_qualified":"1F646-1F3FF-200D-2640","image":"1f646-1f3ff-200d-2640-fe0f.png","sheet_x":32,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F646","a":"Woman Gesturing Ok","b":"1F646-200D-2640-FE0F","c":"1F646-200D-2640","k":[32,7]},"information_desk_person":{"skin_variations":{"1F3FB":{"unified":"1F481-1F3FB","non_qualified":null,"image":"1f481-1f3fb.png","sheet_x":23,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F481-1F3FC","non_qualified":null,"image":"1f481-1f3fc.png","sheet_x":23,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F481-1F3FD","non_qualified":null,"image":"1f481-1f3fd.png","sheet_x":23,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F481-1F3FE","non_qualified":null,"image":"1f481-1f3fe.png","sheet_x":23,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F481-1F3FF","non_qualified":null,"image":"1f481-1f3ff.png","sheet_x":23,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F481-200D-2640-FE0F","a":"Information Desk Person","b":"1F481","k":[23,13]},"flag-sj":{"a":"Svalbard & Jan Mayen Flag","b":"1F1F8-1F1EF","k":[4,29]},"man-tipping-hand":{"skin_variations":{"1F3FB":{"unified":"1F481-1F3FB-200D-2642-FE0F","non_qualified":"1F481-1F3FB-200D-2642","image":"1f481-1f3fb-200d-2642-fe0f.png","sheet_x":23,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F481-1F3FC-200D-2642-FE0F","non_qualified":"1F481-1F3FC-200D-2642","image":"1f481-1f3fc-200d-2642-fe0f.png","sheet_x":23,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F481-1F3FD-200D-2642-FE0F","non_qualified":"1F481-1F3FD-200D-2642","image":"1f481-1f3fd-200d-2642-fe0f.png","sheet_x":23,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F481-1F3FE-200D-2642-FE0F","non_qualified":"1F481-1F3FE-200D-2642","image":"1f481-1f3fe-200d-2642-fe0f.png","sheet_x":23,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F481-1F3FF-200D-2642-FE0F","non_qualified":"1F481-1F3FF-200D-2642","image":"1f481-1f3ff-200d-2642-fe0f.png","sheet_x":23,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Tipping Hand","b":"1F481-200D-2642-FE0F","c":"1F481-200D-2642","k":[23,7]},"flag-sk":{"a":"Slovakia Flag","b":"1F1F8-1F1F0","k":[4,30]},"flag-sl":{"a":"Sierra Leone Flag","b":"1F1F8-1F1F1","k":[4,31]},"woman-tipping-hand":{"skin_variations":{"1F3FB":{"unified":"1F481-1F3FB-200D-2640-FE0F","non_qualified":"1F481-1F3FB-200D-2640","image":"1f481-1f3fb-200d-2640-fe0f.png","sheet_x":23,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F481-1F3FC-200D-2640-FE0F","non_qualified":"1F481-1F3FC-200D-2640","image":"1f481-1f3fc-200d-2640-fe0f.png","sheet_x":23,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F481-1F3FD-200D-2640-FE0F","non_qualified":"1F481-1F3FD-200D-2640","image":"1f481-1f3fd-200d-2640-fe0f.png","sheet_x":23,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F481-1F3FE-200D-2640-FE0F","non_qualified":"1F481-1F3FE-200D-2640","image":"1f481-1f3fe-200d-2640-fe0f.png","sheet_x":23,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F481-1F3FF-200D-2640-FE0F","non_qualified":"1F481-1F3FF-200D-2640","image":"1f481-1f3ff-200d-2640-fe0f.png","sheet_x":23,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F481","a":"Woman Tipping Hand","b":"1F481-200D-2640-FE0F","c":"1F481-200D-2640","k":[23,1]},"flag-sm":{"a":"San Marino Flag","b":"1F1F8-1F1F2","k":[4,32]},"raising_hand":{"skin_variations":{"1F3FB":{"unified":"1F64B-1F3FB","non_qualified":null,"image":"1f64b-1f3fb.png","sheet_x":33,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F64B-1F3FC","non_qualified":null,"image":"1f64b-1f3fc.png","sheet_x":33,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F64B-1F3FD","non_qualified":null,"image":"1f64b-1f3fd.png","sheet_x":33,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F64B-1F3FE","non_qualified":null,"image":"1f64b-1f3fe.png","sheet_x":33,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F64B-1F3FF","non_qualified":null,"image":"1f64b-1f3ff.png","sheet_x":33,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F64B-200D-2640-FE0F","a":"Happy Person Raising One Hand","b":"1F64B","k":[33,6]},"flag-sn":{"a":"Senegal Flag","b":"1F1F8-1F1F3","k":[4,33]},"man-raising-hand":{"skin_variations":{"1F3FB":{"unified":"1F64B-1F3FB-200D-2642-FE0F","non_qualified":"1F64B-1F3FB-200D-2642","image":"1f64b-1f3fb-200d-2642-fe0f.png","sheet_x":33,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F64B-1F3FC-200D-2642-FE0F","non_qualified":"1F64B-1F3FC-200D-2642","image":"1f64b-1f3fc-200d-2642-fe0f.png","sheet_x":33,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F64B-1F3FD-200D-2642-FE0F","non_qualified":"1F64B-1F3FD-200D-2642","image":"1f64b-1f3fd-200d-2642-fe0f.png","sheet_x":33,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F64B-1F3FE-200D-2642-FE0F","non_qualified":"1F64B-1F3FE-200D-2642","image":"1f64b-1f3fe-200d-2642-fe0f.png","sheet_x":33,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F64B-1F3FF-200D-2642-FE0F","non_qualified":"1F64B-1F3FF-200D-2642","image":"1f64b-1f3ff-200d-2642-fe0f.png","sheet_x":33,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Raising Hand","b":"1F64B-200D-2642-FE0F","c":"1F64B-200D-2642","k":[33,0]},"flag-so":{"a":"Somalia Flag","b":"1F1F8-1F1F4","k":[4,34]},"woman-raising-hand":{"skin_variations":{"1F3FB":{"unified":"1F64B-1F3FB-200D-2640-FE0F","non_qualified":"1F64B-1F3FB-200D-2640","image":"1f64b-1f3fb-200d-2640-fe0f.png","sheet_x":32,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F64B-1F3FC-200D-2640-FE0F","non_qualified":"1F64B-1F3FC-200D-2640","image":"1f64b-1f3fc-200d-2640-fe0f.png","sheet_x":32,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F64B-1F3FD-200D-2640-FE0F","non_qualified":"1F64B-1F3FD-200D-2640","image":"1f64b-1f3fd-200d-2640-fe0f.png","sheet_x":32,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F64B-1F3FE-200D-2640-FE0F","non_qualified":"1F64B-1F3FE-200D-2640","image":"1f64b-1f3fe-200d-2640-fe0f.png","sheet_x":32,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F64B-1F3FF-200D-2640-FE0F","non_qualified":"1F64B-1F3FF-200D-2640","image":"1f64b-1f3ff-200d-2640-fe0f.png","sheet_x":32,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F64B","a":"Woman Raising Hand","b":"1F64B-200D-2640-FE0F","c":"1F64B-200D-2640","k":[32,46]},"flag-sr":{"a":"Suriname Flag","b":"1F1F8-1F1F7","k":[4,35]},"bow":{"skin_variations":{"1F3FB":{"unified":"1F647-1F3FB","non_qualified":null,"image":"1f647-1f3fb.png","sheet_x":32,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F647-1F3FC","non_qualified":null,"image":"1f647-1f3fc.png","sheet_x":32,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F647-1F3FD","non_qualified":null,"image":"1f647-1f3fd.png","sheet_x":32,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F647-1F3FE","non_qualified":null,"image":"1f647-1f3fe.png","sheet_x":32,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F647-1F3FF","non_qualified":null,"image":"1f647-1f3ff.png","sheet_x":32,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F647-200D-2642-FE0F","a":"Person Bowing Deeply","b":"1F647","k":[32,37]},"man-bowing":{"skin_variations":{"1F3FB":{"unified":"1F647-1F3FB-200D-2642-FE0F","non_qualified":"1F647-1F3FB-200D-2642","image":"1f647-1f3fb-200d-2642-fe0f.png","sheet_x":32,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F647-1F3FC-200D-2642-FE0F","non_qualified":"1F647-1F3FC-200D-2642","image":"1f647-1f3fc-200d-2642-fe0f.png","sheet_x":32,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F647-1F3FD-200D-2642-FE0F","non_qualified":"1F647-1F3FD-200D-2642","image":"1f647-1f3fd-200d-2642-fe0f.png","sheet_x":32,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F647-1F3FE-200D-2642-FE0F","non_qualified":"1F647-1F3FE-200D-2642","image":"1f647-1f3fe-200d-2642-fe0f.png","sheet_x":32,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F647-1F3FF-200D-2642-FE0F","non_qualified":"1F647-1F3FF-200D-2642","image":"1f647-1f3ff-200d-2642-fe0f.png","sheet_x":32,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F647","a":"Man Bowing","b":"1F647-200D-2642-FE0F","c":"1F647-200D-2642","k":[32,31]},"flag-ss":{"a":"South Sudan Flag","b":"1F1F8-1F1F8","k":[4,36]},"woman-bowing":{"skin_variations":{"1F3FB":{"unified":"1F647-1F3FB-200D-2640-FE0F","non_qualified":"1F647-1F3FB-200D-2640","image":"1f647-1f3fb-200d-2640-fe0f.png","sheet_x":32,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F647-1F3FC-200D-2640-FE0F","non_qualified":"1F647-1F3FC-200D-2640","image":"1f647-1f3fc-200d-2640-fe0f.png","sheet_x":32,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F647-1F3FD-200D-2640-FE0F","non_qualified":"1F647-1F3FD-200D-2640","image":"1f647-1f3fd-200d-2640-fe0f.png","sheet_x":32,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F647-1F3FE-200D-2640-FE0F","non_qualified":"1F647-1F3FE-200D-2640","image":"1f647-1f3fe-200d-2640-fe0f.png","sheet_x":32,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F647-1F3FF-200D-2640-FE0F","non_qualified":"1F647-1F3FF-200D-2640","image":"1f647-1f3ff-200d-2640-fe0f.png","sheet_x":32,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Bowing","b":"1F647-200D-2640-FE0F","c":"1F647-200D-2640","k":[32,25]},"flag-st":{"a":"São Tomé & Príncipe Flag","b":"1F1F8-1F1F9","k":[4,37]},"face_palm":{"skin_variations":{"1F3FB":{"unified":"1F926-1F3FB","non_qualified":null,"image":"1f926-1f3fb.png","sheet_x":38,"sheet_y":42,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F926-1F3FC","non_qualified":null,"image":"1f926-1f3fc.png","sheet_x":38,"sheet_y":43,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F926-1F3FD","non_qualified":null,"image":"1f926-1f3fd.png","sheet_x":38,"sheet_y":44,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F926-1F3FE","non_qualified":null,"image":"1f926-1f3fe.png","sheet_x":38,"sheet_y":45,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F926-1F3FF","non_qualified":null,"image":"1f926-1f3ff.png","sheet_x":38,"sheet_y":46,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Face Palm","b":"1F926","k":[38,41],"o":9},"flag-sv":{"a":"El Salvador Flag","b":"1F1F8-1F1FB","k":[4,38]},"man-facepalming":{"skin_variations":{"1F3FB":{"unified":"1F926-1F3FB-200D-2642-FE0F","non_qualified":"1F926-1F3FB-200D-2642","image":"1f926-1f3fb-200d-2642-fe0f.png","sheet_x":38,"sheet_y":36,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F926-1F3FC-200D-2642-FE0F","non_qualified":"1F926-1F3FC-200D-2642","image":"1f926-1f3fc-200d-2642-fe0f.png","sheet_x":38,"sheet_y":37,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F926-1F3FD-200D-2642-FE0F","non_qualified":"1F926-1F3FD-200D-2642","image":"1f926-1f3fd-200d-2642-fe0f.png","sheet_x":38,"sheet_y":38,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F926-1F3FE-200D-2642-FE0F","non_qualified":"1F926-1F3FE-200D-2642","image":"1f926-1f3fe-200d-2642-fe0f.png","sheet_x":38,"sheet_y":39,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F926-1F3FF-200D-2642-FE0F","non_qualified":"1F926-1F3FF-200D-2642","image":"1f926-1f3ff-200d-2642-fe0f.png","sheet_x":38,"sheet_y":40,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Facepalming","b":"1F926-200D-2642-FE0F","c":"1F926-200D-2642","k":[38,35],"o":9},"flag-sx":{"a":"Sint Maarten Flag","b":"1F1F8-1F1FD","k":[4,39]},"flag-sy":{"a":"Syria Flag","b":"1F1F8-1F1FE","k":[4,40]},"woman-facepalming":{"skin_variations":{"1F3FB":{"unified":"1F926-1F3FB-200D-2640-FE0F","non_qualified":"1F926-1F3FB-200D-2640","image":"1f926-1f3fb-200d-2640-fe0f.png","sheet_x":38,"sheet_y":30,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F926-1F3FC-200D-2640-FE0F","non_qualified":"1F926-1F3FC-200D-2640","image":"1f926-1f3fc-200d-2640-fe0f.png","sheet_x":38,"sheet_y":31,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F926-1F3FD-200D-2640-FE0F","non_qualified":"1F926-1F3FD-200D-2640","image":"1f926-1f3fd-200d-2640-fe0f.png","sheet_x":38,"sheet_y":32,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F926-1F3FE-200D-2640-FE0F","non_qualified":"1F926-1F3FE-200D-2640","image":"1f926-1f3fe-200d-2640-fe0f.png","sheet_x":38,"sheet_y":33,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F926-1F3FF-200D-2640-FE0F","non_qualified":"1F926-1F3FF-200D-2640","image":"1f926-1f3ff-200d-2640-fe0f.png","sheet_x":38,"sheet_y":34,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Facepalming","b":"1F926-200D-2640-FE0F","c":"1F926-200D-2640","k":[38,29],"o":9},"shrug":{"skin_variations":{"1F3FB":{"unified":"1F937-1F3FB","non_qualified":null,"image":"1f937-1f3fb.png","sheet_x":40,"sheet_y":7,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F937-1F3FC","non_qualified":null,"image":"1f937-1f3fc.png","sheet_x":40,"sheet_y":8,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F937-1F3FD","non_qualified":null,"image":"1f937-1f3fd.png","sheet_x":40,"sheet_y":9,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F937-1F3FE","non_qualified":null,"image":"1f937-1f3fe.png","sheet_x":40,"sheet_y":10,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F937-1F3FF","non_qualified":null,"image":"1f937-1f3ff.png","sheet_x":40,"sheet_y":11,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Shrug","b":"1F937","k":[40,6],"o":9},"flag-sz":{"a":"Swaziland Flag","b":"1F1F8-1F1FF","k":[4,41]},"flag-ta":{"a":"Tristan Da Cunha Flag","b":"1F1F9-1F1E6","k":[4,42]},"man-shrugging":{"skin_variations":{"1F3FB":{"unified":"1F937-1F3FB-200D-2642-FE0F","non_qualified":"1F937-1F3FB-200D-2642","image":"1f937-1f3fb-200d-2642-fe0f.png","sheet_x":40,"sheet_y":1,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F937-1F3FC-200D-2642-FE0F","non_qualified":"1F937-1F3FC-200D-2642","image":"1f937-1f3fc-200d-2642-fe0f.png","sheet_x":40,"sheet_y":2,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F937-1F3FD-200D-2642-FE0F","non_qualified":"1F937-1F3FD-200D-2642","image":"1f937-1f3fd-200d-2642-fe0f.png","sheet_x":40,"sheet_y":3,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F937-1F3FE-200D-2642-FE0F","non_qualified":"1F937-1F3FE-200D-2642","image":"1f937-1f3fe-200d-2642-fe0f.png","sheet_x":40,"sheet_y":4,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F937-1F3FF-200D-2642-FE0F","non_qualified":"1F937-1F3FF-200D-2642","image":"1f937-1f3ff-200d-2642-fe0f.png","sheet_x":40,"sheet_y":5,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Shrugging","b":"1F937-200D-2642-FE0F","c":"1F937-200D-2642","k":[40,0],"o":9},"woman-shrugging":{"skin_variations":{"1F3FB":{"unified":"1F937-1F3FB-200D-2640-FE0F","non_qualified":"1F937-1F3FB-200D-2640","image":"1f937-1f3fb-200d-2640-fe0f.png","sheet_x":39,"sheet_y":47,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F937-1F3FC-200D-2640-FE0F","non_qualified":"1F937-1F3FC-200D-2640","image":"1f937-1f3fc-200d-2640-fe0f.png","sheet_x":39,"sheet_y":48,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F937-1F3FD-200D-2640-FE0F","non_qualified":"1F937-1F3FD-200D-2640","image":"1f937-1f3fd-200d-2640-fe0f.png","sheet_x":39,"sheet_y":49,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F937-1F3FE-200D-2640-FE0F","non_qualified":"1F937-1F3FE-200D-2640","image":"1f937-1f3fe-200d-2640-fe0f.png","sheet_x":39,"sheet_y":50,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F937-1F3FF-200D-2640-FE0F","non_qualified":"1F937-1F3FF-200D-2640","image":"1f937-1f3ff-200d-2640-fe0f.png","sheet_x":39,"sheet_y":51,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Shrugging","b":"1F937-200D-2640-FE0F","c":"1F937-200D-2640","k":[39,46],"o":9},"flag-tc":{"a":"Turks & Caicos Islands Flag","b":"1F1F9-1F1E8","k":[4,43]},"massage":{"skin_variations":{"1F3FB":{"unified":"1F486-1F3FB","non_qualified":null,"image":"1f486-1f3fb.png","sheet_x":24,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F486-1F3FC","non_qualified":null,"image":"1f486-1f3fc.png","sheet_x":24,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F486-1F3FD","non_qualified":null,"image":"1f486-1f3fd.png","sheet_x":24,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F486-1F3FE","non_qualified":null,"image":"1f486-1f3fe.png","sheet_x":24,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F486-1F3FF","non_qualified":null,"image":"1f486-1f3ff.png","sheet_x":24,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F486-200D-2640-FE0F","a":"Face Massage","b":"1F486","k":[24,10]},"flag-td":{"a":"Chad Flag","b":"1F1F9-1F1E9","k":[4,44]},"man-getting-massage":{"skin_variations":{"1F3FB":{"unified":"1F486-1F3FB-200D-2642-FE0F","non_qualified":"1F486-1F3FB-200D-2642","image":"1f486-1f3fb-200d-2642-fe0f.png","sheet_x":24,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F486-1F3FC-200D-2642-FE0F","non_qualified":"1F486-1F3FC-200D-2642","image":"1f486-1f3fc-200d-2642-fe0f.png","sheet_x":24,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F486-1F3FD-200D-2642-FE0F","non_qualified":"1F486-1F3FD-200D-2642","image":"1f486-1f3fd-200d-2642-fe0f.png","sheet_x":24,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F486-1F3FE-200D-2642-FE0F","non_qualified":"1F486-1F3FE-200D-2642","image":"1f486-1f3fe-200d-2642-fe0f.png","sheet_x":24,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F486-1F3FF-200D-2642-FE0F","non_qualified":"1F486-1F3FF-200D-2642","image":"1f486-1f3ff-200d-2642-fe0f.png","sheet_x":24,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Getting Massage","b":"1F486-200D-2642-FE0F","c":"1F486-200D-2642","k":[24,4]},"woman-getting-massage":{"skin_variations":{"1F3FB":{"unified":"1F486-1F3FB-200D-2640-FE0F","non_qualified":"1F486-1F3FB-200D-2640","image":"1f486-1f3fb-200d-2640-fe0f.png","sheet_x":23,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F486-1F3FC-200D-2640-FE0F","non_qualified":"1F486-1F3FC-200D-2640","image":"1f486-1f3fc-200d-2640-fe0f.png","sheet_x":24,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F486-1F3FD-200D-2640-FE0F","non_qualified":"1F486-1F3FD-200D-2640","image":"1f486-1f3fd-200d-2640-fe0f.png","sheet_x":24,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F486-1F3FE-200D-2640-FE0F","non_qualified":"1F486-1F3FE-200D-2640","image":"1f486-1f3fe-200d-2640-fe0f.png","sheet_x":24,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F486-1F3FF-200D-2640-FE0F","non_qualified":"1F486-1F3FF-200D-2640","image":"1f486-1f3ff-200d-2640-fe0f.png","sheet_x":24,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F486","a":"Woman Getting Massage","b":"1F486-200D-2640-FE0F","c":"1F486-200D-2640","k":[23,50]},"flag-tg":{"a":"Togo Flag","b":"1F1F9-1F1EC","k":[4,46]},"haircut":{"skin_variations":{"1F3FB":{"unified":"1F487-1F3FB","non_qualified":null,"image":"1f487-1f3fb.png","sheet_x":24,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F487-1F3FC","non_qualified":null,"image":"1f487-1f3fc.png","sheet_x":24,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F487-1F3FD","non_qualified":null,"image":"1f487-1f3fd.png","sheet_x":24,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F487-1F3FE","non_qualified":null,"image":"1f487-1f3fe.png","sheet_x":24,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F487-1F3FF","non_qualified":null,"image":"1f487-1f3ff.png","sheet_x":24,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F487-200D-2640-FE0F","a":"Haircut","b":"1F487","k":[24,28]},"flag-th":{"a":"Thailand Flag","b":"1F1F9-1F1ED","k":[4,47]},"man-getting-haircut":{"skin_variations":{"1F3FB":{"unified":"1F487-1F3FB-200D-2642-FE0F","non_qualified":"1F487-1F3FB-200D-2642","image":"1f487-1f3fb-200d-2642-fe0f.png","sheet_x":24,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F487-1F3FC-200D-2642-FE0F","non_qualified":"1F487-1F3FC-200D-2642","image":"1f487-1f3fc-200d-2642-fe0f.png","sheet_x":24,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F487-1F3FD-200D-2642-FE0F","non_qualified":"1F487-1F3FD-200D-2642","image":"1f487-1f3fd-200d-2642-fe0f.png","sheet_x":24,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F487-1F3FE-200D-2642-FE0F","non_qualified":"1F487-1F3FE-200D-2642","image":"1f487-1f3fe-200d-2642-fe0f.png","sheet_x":24,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F487-1F3FF-200D-2642-FE0F","non_qualified":"1F487-1F3FF-200D-2642","image":"1f487-1f3ff-200d-2642-fe0f.png","sheet_x":24,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Getting Haircut","b":"1F487-200D-2642-FE0F","c":"1F487-200D-2642","k":[24,22]},"flag-tj":{"a":"Tajikistan Flag","b":"1F1F9-1F1EF","k":[4,48]},"flag-tk":{"a":"Tokelau Flag","b":"1F1F9-1F1F0","k":[4,49]},"woman-getting-haircut":{"skin_variations":{"1F3FB":{"unified":"1F487-1F3FB-200D-2640-FE0F","non_qualified":"1F487-1F3FB-200D-2640","image":"1f487-1f3fb-200d-2640-fe0f.png","sheet_x":24,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F487-1F3FC-200D-2640-FE0F","non_qualified":"1F487-1F3FC-200D-2640","image":"1f487-1f3fc-200d-2640-fe0f.png","sheet_x":24,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F487-1F3FD-200D-2640-FE0F","non_qualified":"1F487-1F3FD-200D-2640","image":"1f487-1f3fd-200d-2640-fe0f.png","sheet_x":24,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F487-1F3FE-200D-2640-FE0F","non_qualified":"1F487-1F3FE-200D-2640","image":"1f487-1f3fe-200d-2640-fe0f.png","sheet_x":24,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F487-1F3FF-200D-2640-FE0F","non_qualified":"1F487-1F3FF-200D-2640","image":"1f487-1f3ff-200d-2640-fe0f.png","sheet_x":24,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F487","a":"Woman Getting Haircut","b":"1F487-200D-2640-FE0F","c":"1F487-200D-2640","k":[24,16]},"walking":{"skin_variations":{"1F3FB":{"unified":"1F6B6-1F3FB","non_qualified":null,"image":"1f6b6-1f3fb.png","sheet_x":36,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F6B6-1F3FC","non_qualified":null,"image":"1f6b6-1f3fc.png","sheet_x":36,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F6B6-1F3FD","non_qualified":null,"image":"1f6b6-1f3fd.png","sheet_x":36,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F6B6-1F3FE","non_qualified":null,"image":"1f6b6-1f3fe.png","sheet_x":36,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F6B6-1F3FF","non_qualified":null,"image":"1f6b6-1f3ff.png","sheet_x":36,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F6B6-200D-2642-FE0F","a":"Pedestrian","b":"1F6B6","k":[36,21]},"flag-tl":{"a":"Timor-Leste Flag","b":"1F1F9-1F1F1","k":[4,50]},"man-walking":{"skin_variations":{"1F3FB":{"unified":"1F6B6-1F3FB-200D-2642-FE0F","non_qualified":"1F6B6-1F3FB-200D-2642","image":"1f6b6-1f3fb-200d-2642-fe0f.png","sheet_x":36,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6B6-1F3FC-200D-2642-FE0F","non_qualified":"1F6B6-1F3FC-200D-2642","image":"1f6b6-1f3fc-200d-2642-fe0f.png","sheet_x":36,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6B6-1F3FD-200D-2642-FE0F","non_qualified":"1F6B6-1F3FD-200D-2642","image":"1f6b6-1f3fd-200d-2642-fe0f.png","sheet_x":36,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6B6-1F3FE-200D-2642-FE0F","non_qualified":"1F6B6-1F3FE-200D-2642","image":"1f6b6-1f3fe-200d-2642-fe0f.png","sheet_x":36,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6B6-1F3FF-200D-2642-FE0F","non_qualified":"1F6B6-1F3FF-200D-2642","image":"1f6b6-1f3ff-200d-2642-fe0f.png","sheet_x":36,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F6B6","a":"Man Walking","b":"1F6B6-200D-2642-FE0F","c":"1F6B6-200D-2642","k":[36,15]},"flag-tm":{"a":"Turkmenistan Flag","b":"1F1F9-1F1F2","k":[4,51]},"woman-walking":{"skin_variations":{"1F3FB":{"unified":"1F6B6-1F3FB-200D-2640-FE0F","non_qualified":"1F6B6-1F3FB-200D-2640","image":"1f6b6-1f3fb-200d-2640-fe0f.png","sheet_x":36,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6B6-1F3FC-200D-2640-FE0F","non_qualified":"1F6B6-1F3FC-200D-2640","image":"1f6b6-1f3fc-200d-2640-fe0f.png","sheet_x":36,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6B6-1F3FD-200D-2640-FE0F","non_qualified":"1F6B6-1F3FD-200D-2640","image":"1f6b6-1f3fd-200d-2640-fe0f.png","sheet_x":36,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6B6-1F3FE-200D-2640-FE0F","non_qualified":"1F6B6-1F3FE-200D-2640","image":"1f6b6-1f3fe-200d-2640-fe0f.png","sheet_x":36,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6B6-1F3FF-200D-2640-FE0F","non_qualified":"1F6B6-1F3FF-200D-2640","image":"1f6b6-1f3ff-200d-2640-fe0f.png","sheet_x":36,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Walking","b":"1F6B6-200D-2640-FE0F","c":"1F6B6-200D-2640","k":[36,9]},"flag-tn":{"a":"Tunisia Flag","b":"1F1F9-1F1F3","k":[5,0]},"runner":{"skin_variations":{"1F3FB":{"unified":"1F3C3-1F3FB","non_qualified":null,"image":"1f3c3-1f3fb.png","sheet_x":9,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F3C3-1F3FC","non_qualified":null,"image":"1f3c3-1f3fc.png","sheet_x":9,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F3C3-1F3FD","non_qualified":null,"image":"1f3c3-1f3fd.png","sheet_x":9,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F3C3-1F3FE","non_qualified":null,"image":"1f3c3-1f3fe.png","sheet_x":9,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F3C3-1F3FF","non_qualified":null,"image":"1f3c3-1f3ff.png","sheet_x":9,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F3C3-200D-2642-FE0F","a":"Runner","b":"1F3C3","k":[9,46],"n":["running"]},"flag-to":{"a":"Tonga Flag","b":"1F1F9-1F1F4","k":[5,1]},"man-running":{"skin_variations":{"1F3FB":{"unified":"1F3C3-1F3FB-200D-2642-FE0F","non_qualified":"1F3C3-1F3FB-200D-2642","image":"1f3c3-1f3fb-200d-2642-fe0f.png","sheet_x":9,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3C3-1F3FC-200D-2642-FE0F","non_qualified":"1F3C3-1F3FC-200D-2642","image":"1f3c3-1f3fc-200d-2642-fe0f.png","sheet_x":9,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3C3-1F3FD-200D-2642-FE0F","non_qualified":"1F3C3-1F3FD-200D-2642","image":"1f3c3-1f3fd-200d-2642-fe0f.png","sheet_x":9,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3C3-1F3FE-200D-2642-FE0F","non_qualified":"1F3C3-1F3FE-200D-2642","image":"1f3c3-1f3fe-200d-2642-fe0f.png","sheet_x":9,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3C3-1F3FF-200D-2642-FE0F","non_qualified":"1F3C3-1F3FF-200D-2642","image":"1f3c3-1f3ff-200d-2642-fe0f.png","sheet_x":9,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F3C3","a":"Man Running","b":"1F3C3-200D-2642-FE0F","c":"1F3C3-200D-2642","k":[9,40]},"flag-tr":{"a":"Turkey Flag","b":"1F1F9-1F1F7","k":[5,2]},"flag-tt":{"a":"Trinidad & Tobago Flag","b":"1F1F9-1F1F9","k":[5,3]},"woman-running":{"skin_variations":{"1F3FB":{"unified":"1F3C3-1F3FB-200D-2640-FE0F","non_qualified":"1F3C3-1F3FB-200D-2640","image":"1f3c3-1f3fb-200d-2640-fe0f.png","sheet_x":9,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3C3-1F3FC-200D-2640-FE0F","non_qualified":"1F3C3-1F3FC-200D-2640","image":"1f3c3-1f3fc-200d-2640-fe0f.png","sheet_x":9,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3C3-1F3FD-200D-2640-FE0F","non_qualified":"1F3C3-1F3FD-200D-2640","image":"1f3c3-1f3fd-200d-2640-fe0f.png","sheet_x":9,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3C3-1F3FE-200D-2640-FE0F","non_qualified":"1F3C3-1F3FE-200D-2640","image":"1f3c3-1f3fe-200d-2640-fe0f.png","sheet_x":9,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3C3-1F3FF-200D-2640-FE0F","non_qualified":"1F3C3-1F3FF-200D-2640","image":"1f3c3-1f3ff-200d-2640-fe0f.png","sheet_x":9,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Running","b":"1F3C3-200D-2640-FE0F","c":"1F3C3-200D-2640","k":[9,34]},"flag-tv":{"a":"Tuvalu Flag","b":"1F1F9-1F1FB","k":[5,4]},"dancer":{"skin_variations":{"1F3FB":{"unified":"1F483-1F3FB","non_qualified":null,"image":"1f483-1f3fb.png","sheet_x":23,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F483-1F3FC","non_qualified":null,"image":"1f483-1f3fc.png","sheet_x":23,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F483-1F3FD","non_qualified":null,"image":"1f483-1f3fd.png","sheet_x":23,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F483-1F3FE","non_qualified":null,"image":"1f483-1f3fe.png","sheet_x":23,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F483-1F3FF","non_qualified":null,"image":"1f483-1f3ff.png","sheet_x":23,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Dancer","b":"1F483","j":["female","girl","woman","fun"],"k":[23,37]},"flag-tw":{"a":"Taiwan Flag","b":"1F1F9-1F1FC","k":[5,5]},"man_dancing":{"skin_variations":{"1F3FB":{"unified":"1F57A-1F3FB","non_qualified":null,"image":"1f57a-1f3fb.png","sheet_x":29,"sheet_y":22,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F57A-1F3FC","non_qualified":null,"image":"1f57a-1f3fc.png","sheet_x":29,"sheet_y":23,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F57A-1F3FD","non_qualified":null,"image":"1f57a-1f3fd.png","sheet_x":29,"sheet_y":24,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F57A-1F3FE","non_qualified":null,"image":"1f57a-1f3fe.png","sheet_x":29,"sheet_y":25,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F57A-1F3FF","non_qualified":null,"image":"1f57a-1f3ff.png","sheet_x":29,"sheet_y":26,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Man Dancing","b":"1F57A","j":["male","boy","fun","dancer"],"k":[29,21],"o":9},"dancers":{"obsoleted_by":"1F46F-200D-2640-FE0F","a":"Woman with Bunny Ears","b":"1F46F","k":[21,1]},"flag-tz":{"a":"Tanzania Flag","b":"1F1F9-1F1FF","k":[5,6]},"flag-ua":{"a":"Ukraine Flag","b":"1F1FA-1F1E6","k":[5,7]},"man-with-bunny-ears-partying":{"a":"Man with Bunny Ears Partying","b":"1F46F-200D-2642-FE0F","c":"1F46F-200D-2642","k":[21,0]},"woman-with-bunny-ears-partying":{"obsoletes":"1F46F","a":"Woman with Bunny Ears Partying","b":"1F46F-200D-2640-FE0F","c":"1F46F-200D-2640","k":[20,51]},"flag-ug":{"a":"Uganda Flag","b":"1F1FA-1F1EC","k":[5,8]},"flag-um":{"a":"U.s. Outlying Islands Flag","b":"1F1FA-1F1F2","k":[5,9]},"person_in_steamy_room":{"skin_variations":{"1F3FB":{"unified":"1F9D6-1F3FB","non_qualified":null,"image":"1f9d6-1f3fb.png","sheet_x":43,"sheet_y":41,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D6-1F3FB-200D-2642-FE0F"},"1F3FC":{"unified":"1F9D6-1F3FC","non_qualified":null,"image":"1f9d6-1f3fc.png","sheet_x":43,"sheet_y":42,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D6-1F3FC-200D-2642-FE0F"},"1F3FD":{"unified":"1F9D6-1F3FD","non_qualified":null,"image":"1f9d6-1f3fd.png","sheet_x":43,"sheet_y":43,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D6-1F3FD-200D-2642-FE0F"},"1F3FE":{"unified":"1F9D6-1F3FE","non_qualified":null,"image":"1f9d6-1f3fe.png","sheet_x":43,"sheet_y":44,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D6-1F3FE-200D-2642-FE0F"},"1F3FF":{"unified":"1F9D6-1F3FF","non_qualified":null,"image":"1f9d6-1f3ff.png","sheet_x":43,"sheet_y":45,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D6-1F3FF-200D-2642-FE0F"}},"obsoleted_by":"1F9D6-200D-2642-FE0F","a":"Person in Steamy Room","b":"1F9D6","k":[43,40],"o":10},"woman_in_steamy_room":{"skin_variations":{"1F3FB":{"unified":"1F9D6-1F3FB-200D-2640-FE0F","non_qualified":"1F9D6-1F3FB-200D-2640","image":"1f9d6-1f3fb-200d-2640-fe0f.png","sheet_x":43,"sheet_y":29,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F9D6-1F3FC-200D-2640-FE0F","non_qualified":"1F9D6-1F3FC-200D-2640","image":"1f9d6-1f3fc-200d-2640-fe0f.png","sheet_x":43,"sheet_y":30,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F9D6-1F3FD-200D-2640-FE0F","non_qualified":"1F9D6-1F3FD-200D-2640","image":"1f9d6-1f3fd-200d-2640-fe0f.png","sheet_x":43,"sheet_y":31,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F9D6-1F3FE-200D-2640-FE0F","non_qualified":"1F9D6-1F3FE-200D-2640","image":"1f9d6-1f3fe-200d-2640-fe0f.png","sheet_x":43,"sheet_y":32,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F9D6-1F3FF-200D-2640-FE0F","non_qualified":"1F9D6-1F3FF-200D-2640","image":"1f9d6-1f3ff-200d-2640-fe0f.png","sheet_x":43,"sheet_y":33,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman in Steamy Room","b":"1F9D6-200D-2640-FE0F","c":"1F9D6-200D-2640","k":[43,28],"o":10},"flag-un":{"a":"United Nations Flag","b":"1F1FA-1F1F3","k":[5,10]},"us":{"a":"United States Flag","b":"1F1FA-1F1F8","j":["united","states","america","flag","nation","country","banner"],"k":[5,11],"n":["flag-us"]},"man_in_steamy_room":{"skin_variations":{"1F3FB":{"unified":"1F9D6-1F3FB-200D-2642-FE0F","non_qualified":"1F9D6-1F3FB-200D-2642","image":"1f9d6-1f3fb-200d-2642-fe0f.png","sheet_x":43,"sheet_y":35,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D6-1F3FB"},"1F3FC":{"unified":"1F9D6-1F3FC-200D-2642-FE0F","non_qualified":"1F9D6-1F3FC-200D-2642","image":"1f9d6-1f3fc-200d-2642-fe0f.png","sheet_x":43,"sheet_y":36,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D6-1F3FC"},"1F3FD":{"unified":"1F9D6-1F3FD-200D-2642-FE0F","non_qualified":"1F9D6-1F3FD-200D-2642","image":"1f9d6-1f3fd-200d-2642-fe0f.png","sheet_x":43,"sheet_y":37,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D6-1F3FD"},"1F3FE":{"unified":"1F9D6-1F3FE-200D-2642-FE0F","non_qualified":"1F9D6-1F3FE-200D-2642","image":"1f9d6-1f3fe-200d-2642-fe0f.png","sheet_x":43,"sheet_y":38,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D6-1F3FE"},"1F3FF":{"unified":"1F9D6-1F3FF-200D-2642-FE0F","non_qualified":"1F9D6-1F3FF-200D-2642","image":"1f9d6-1f3ff-200d-2642-fe0f.png","sheet_x":43,"sheet_y":39,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D6-1F3FF"}},"obsoletes":"1F9D6","a":"Man in Steamy Room","b":"1F9D6-200D-2642-FE0F","c":"1F9D6-200D-2642","k":[43,34],"o":10},"person_climbing":{"skin_variations":{"1F3FB":{"unified":"1F9D7-1F3FB","non_qualified":null,"image":"1f9d7-1f3fb.png","sheet_x":44,"sheet_y":7,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D7-1F3FB-200D-2640-FE0F"},"1F3FC":{"unified":"1F9D7-1F3FC","non_qualified":null,"image":"1f9d7-1f3fc.png","sheet_x":44,"sheet_y":8,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D7-1F3FC-200D-2640-FE0F"},"1F3FD":{"unified":"1F9D7-1F3FD","non_qualified":null,"image":"1f9d7-1f3fd.png","sheet_x":44,"sheet_y":9,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D7-1F3FD-200D-2640-FE0F"},"1F3FE":{"unified":"1F9D7-1F3FE","non_qualified":null,"image":"1f9d7-1f3fe.png","sheet_x":44,"sheet_y":10,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D7-1F3FE-200D-2640-FE0F"},"1F3FF":{"unified":"1F9D7-1F3FF","non_qualified":null,"image":"1f9d7-1f3ff.png","sheet_x":44,"sheet_y":11,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D7-1F3FF-200D-2640-FE0F"}},"obsoleted_by":"1F9D7-200D-2640-FE0F","a":"Person Climbing","b":"1F9D7","k":[44,6],"o":10},"flag-uy":{"a":"Uruguay Flag","b":"1F1FA-1F1FE","k":[5,12]},"woman_climbing":{"skin_variations":{"1F3FB":{"unified":"1F9D7-1F3FB-200D-2640-FE0F","non_qualified":"1F9D7-1F3FB-200D-2640","image":"1f9d7-1f3fb-200d-2640-fe0f.png","sheet_x":43,"sheet_y":47,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D7-1F3FB"},"1F3FC":{"unified":"1F9D7-1F3FC-200D-2640-FE0F","non_qualified":"1F9D7-1F3FC-200D-2640","image":"1f9d7-1f3fc-200d-2640-fe0f.png","sheet_x":43,"sheet_y":48,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D7-1F3FC"},"1F3FD":{"unified":"1F9D7-1F3FD-200D-2640-FE0F","non_qualified":"1F9D7-1F3FD-200D-2640","image":"1f9d7-1f3fd-200d-2640-fe0f.png","sheet_x":43,"sheet_y":49,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D7-1F3FD"},"1F3FE":{"unified":"1F9D7-1F3FE-200D-2640-FE0F","non_qualified":"1F9D7-1F3FE-200D-2640","image":"1f9d7-1f3fe-200d-2640-fe0f.png","sheet_x":43,"sheet_y":50,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D7-1F3FE"},"1F3FF":{"unified":"1F9D7-1F3FF-200D-2640-FE0F","non_qualified":"1F9D7-1F3FF-200D-2640","image":"1f9d7-1f3ff-200d-2640-fe0f.png","sheet_x":43,"sheet_y":51,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D7-1F3FF"}},"obsoletes":"1F9D7","a":"Woman Climbing","b":"1F9D7-200D-2640-FE0F","c":"1F9D7-200D-2640","k":[43,46],"o":10},"flag-uz":{"a":"Uzbekistan Flag","b":"1F1FA-1F1FF","k":[5,13]},"man_climbing":{"skin_variations":{"1F3FB":{"unified":"1F9D7-1F3FB-200D-2642-FE0F","non_qualified":"1F9D7-1F3FB-200D-2642","image":"1f9d7-1f3fb-200d-2642-fe0f.png","sheet_x":44,"sheet_y":1,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F9D7-1F3FC-200D-2642-FE0F","non_qualified":"1F9D7-1F3FC-200D-2642","image":"1f9d7-1f3fc-200d-2642-fe0f.png","sheet_x":44,"sheet_y":2,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F9D7-1F3FD-200D-2642-FE0F","non_qualified":"1F9D7-1F3FD-200D-2642","image":"1f9d7-1f3fd-200d-2642-fe0f.png","sheet_x":44,"sheet_y":3,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F9D7-1F3FE-200D-2642-FE0F","non_qualified":"1F9D7-1F3FE-200D-2642","image":"1f9d7-1f3fe-200d-2642-fe0f.png","sheet_x":44,"sheet_y":4,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F9D7-1F3FF-200D-2642-FE0F","non_qualified":"1F9D7-1F3FF-200D-2642","image":"1f9d7-1f3ff-200d-2642-fe0f.png","sheet_x":44,"sheet_y":5,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Climbing","b":"1F9D7-200D-2642-FE0F","c":"1F9D7-200D-2642","k":[44,0],"o":10},"flag-va":{"a":"Vatican City Flag","b":"1F1FB-1F1E6","k":[5,14]},"person_in_lotus_position":{"skin_variations":{"1F3FB":{"unified":"1F9D8-1F3FB","non_qualified":null,"image":"1f9d8-1f3fb.png","sheet_x":44,"sheet_y":25,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D8-1F3FB-200D-2640-FE0F"},"1F3FC":{"unified":"1F9D8-1F3FC","non_qualified":null,"image":"1f9d8-1f3fc.png","sheet_x":44,"sheet_y":26,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D8-1F3FC-200D-2640-FE0F"},"1F3FD":{"unified":"1F9D8-1F3FD","non_qualified":null,"image":"1f9d8-1f3fd.png","sheet_x":44,"sheet_y":27,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D8-1F3FD-200D-2640-FE0F"},"1F3FE":{"unified":"1F9D8-1F3FE","non_qualified":null,"image":"1f9d8-1f3fe.png","sheet_x":44,"sheet_y":28,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D8-1F3FE-200D-2640-FE0F"},"1F3FF":{"unified":"1F9D8-1F3FF","non_qualified":null,"image":"1f9d8-1f3ff.png","sheet_x":44,"sheet_y":29,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false,"obsoleted_by":"1F9D8-1F3FF-200D-2640-FE0F"}},"obsoleted_by":"1F9D8-200D-2640-FE0F","a":"Person in Lotus Position","b":"1F9D8","k":[44,24],"o":10},"flag-vc":{"a":"St. Vincent & Grenadines Flag","b":"1F1FB-1F1E8","k":[5,15]},"flag-ve":{"a":"Venezuela Flag","b":"1F1FB-1F1EA","k":[5,16]},"woman_in_lotus_position":{"skin_variations":{"1F3FB":{"unified":"1F9D8-1F3FB-200D-2640-FE0F","non_qualified":"1F9D8-1F3FB-200D-2640","image":"1f9d8-1f3fb-200d-2640-fe0f.png","sheet_x":44,"sheet_y":13,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D8-1F3FB"},"1F3FC":{"unified":"1F9D8-1F3FC-200D-2640-FE0F","non_qualified":"1F9D8-1F3FC-200D-2640","image":"1f9d8-1f3fc-200d-2640-fe0f.png","sheet_x":44,"sheet_y":14,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D8-1F3FC"},"1F3FD":{"unified":"1F9D8-1F3FD-200D-2640-FE0F","non_qualified":"1F9D8-1F3FD-200D-2640","image":"1f9d8-1f3fd-200d-2640-fe0f.png","sheet_x":44,"sheet_y":15,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D8-1F3FD"},"1F3FE":{"unified":"1F9D8-1F3FE-200D-2640-FE0F","non_qualified":"1F9D8-1F3FE-200D-2640","image":"1f9d8-1f3fe-200d-2640-fe0f.png","sheet_x":44,"sheet_y":16,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D8-1F3FE"},"1F3FF":{"unified":"1F9D8-1F3FF-200D-2640-FE0F","non_qualified":"1F9D8-1F3FF-200D-2640","image":"1f9d8-1f3ff-200d-2640-fe0f.png","sheet_x":44,"sheet_y":17,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false,"obsoletes":"1F9D8-1F3FF"}},"obsoletes":"1F9D8","a":"Woman in Lotus Position","b":"1F9D8-200D-2640-FE0F","c":"1F9D8-200D-2640","k":[44,12],"o":10},"man_in_lotus_position":{"skin_variations":{"1F3FB":{"unified":"1F9D8-1F3FB-200D-2642-FE0F","non_qualified":"1F9D8-1F3FB-200D-2642","image":"1f9d8-1f3fb-200d-2642-fe0f.png","sheet_x":44,"sheet_y":19,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F9D8-1F3FC-200D-2642-FE0F","non_qualified":"1F9D8-1F3FC-200D-2642","image":"1f9d8-1f3fc-200d-2642-fe0f.png","sheet_x":44,"sheet_y":20,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F9D8-1F3FD-200D-2642-FE0F","non_qualified":"1F9D8-1F3FD-200D-2642","image":"1f9d8-1f3fd-200d-2642-fe0f.png","sheet_x":44,"sheet_y":21,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F9D8-1F3FE-200D-2642-FE0F","non_qualified":"1F9D8-1F3FE-200D-2642","image":"1f9d8-1f3fe-200d-2642-fe0f.png","sheet_x":44,"sheet_y":22,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F9D8-1F3FF-200D-2642-FE0F","non_qualified":"1F9D8-1F3FF-200D-2642","image":"1f9d8-1f3ff-200d-2642-fe0f.png","sheet_x":44,"sheet_y":23,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man in Lotus Position","b":"1F9D8-200D-2642-FE0F","c":"1F9D8-200D-2642","k":[44,18],"o":10},"flag-vg":{"a":"British Virgin Islands Flag","b":"1F1FB-1F1EC","k":[5,17]},"flag-vi":{"a":"U.s. Virgin Islands Flag","b":"1F1FB-1F1EE","k":[5,18]},"bath":{"skin_variations":{"1F3FB":{"unified":"1F6C0-1F3FB","non_qualified":null,"image":"1f6c0-1f3fb.png","sheet_x":36,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F6C0-1F3FC","non_qualified":null,"image":"1f6c0-1f3fc.png","sheet_x":36,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F6C0-1F3FD","non_qualified":null,"image":"1f6c0-1f3fd.png","sheet_x":36,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F6C0-1F3FE","non_qualified":null,"image":"1f6c0-1f3fe.png","sheet_x":36,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F6C0-1F3FF","non_qualified":null,"image":"1f6c0-1f3ff.png","sheet_x":36,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Bath","b":"1F6C0","j":["clean","shower","bathroom"],"k":[36,36]},"sleeping_accommodation":{"skin_variations":{"1F3FB":{"unified":"1F6CC-1F3FB","non_qualified":null,"image":"1f6cc-1f3fb.png","sheet_x":36,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F6CC-1F3FC","non_qualified":null,"image":"1f6cc-1f3fc.png","sheet_x":36,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F6CC-1F3FD","non_qualified":null,"image":"1f6cc-1f3fd.png","sheet_x":36,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F6CC-1F3FE","non_qualified":null,"image":"1f6cc-1f3fe.png","sheet_x":37,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F6CC-1F3FF","non_qualified":null,"image":"1f6cc-1f3ff.png","sheet_x":37,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Sleeping Accommodation","b":"1F6CC","k":[36,48],"o":7},"flag-vn":{"a":"Vietnam Flag","b":"1F1FB-1F1F3","k":[5,19]},"man_in_business_suit_levitating":{"skin_variations":{"1F3FB":{"unified":"1F574-1F3FB","non_qualified":null,"image":"1f574-1f3fb.png","sheet_x":28,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F574-1F3FC","non_qualified":null,"image":"1f574-1f3fc.png","sheet_x":28,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F574-1F3FD","non_qualified":null,"image":"1f574-1f3fd.png","sheet_x":28,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F574-1F3FE","non_qualified":null,"image":"1f574-1f3fe.png","sheet_x":28,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F574-1F3FF","non_qualified":null,"image":"1f574-1f3ff.png","sheet_x":28,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Man in Business Suit Levitating","b":"1F574-FE0F","c":"1F574","k":[28,45],"o":7},"flag-vu":{"a":"Vanuatu Flag","b":"1F1FB-1F1FA","k":[5,20]},"speaking_head_in_silhouette":{"a":"Speaking Head in Silhouette","b":"1F5E3-FE0F","c":"1F5E3","k":[30,14],"o":7},"bust_in_silhouette":{"a":"Bust in Silhouette","b":"1F464","j":["user","person","human"],"k":[15,40]},"flag-ws":{"a":"Samoa Flag","b":"1F1FC-1F1F8","k":[5,22]},"busts_in_silhouette":{"a":"Busts in Silhouette","b":"1F465","j":["user","person","human","group","team"],"k":[15,41]},"fencer":{"a":"Fencer","b":"1F93A","k":[40,48],"o":9},"flag-ye":{"a":"Yemen Flag","b":"1F1FE-1F1EA","k":[5,24]},"horse_racing":{"skin_variations":{"1F3FB":{"unified":"1F3C7-1F3FB","non_qualified":null,"image":"1f3c7-1f3fb.png","sheet_x":10,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F3C7-1F3FC","non_qualified":null,"image":"1f3c7-1f3fc.png","sheet_x":10,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F3C7-1F3FD","non_qualified":null,"image":"1f3c7-1f3fd.png","sheet_x":10,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F3C7-1F3FE","non_qualified":null,"image":"1f3c7-1f3fe.png","sheet_x":10,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F3C7-1F3FF","non_qualified":null,"image":"1f3c7-1f3ff.png","sheet_x":10,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Horse Racing","b":"1F3C7","j":["animal","betting","competition","gambling","luck"],"k":[10,20]},"flag-za":{"a":"South Africa Flag","b":"1F1FF-1F1E6","k":[5,26]},"skier":{"a":"Skier","b":"26F7-FE0F","c":"26F7","j":["sports","winter","snow"],"k":[48,44],"o":5},"flag-zm":{"a":"Zambia Flag","b":"1F1FF-1F1F2","k":[5,27]},"snowboarder":{"skin_variations":{"1F3FB":{"unified":"1F3C2-1F3FB","non_qualified":null,"image":"1f3c2-1f3fb.png","sheet_x":9,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F3C2-1F3FC","non_qualified":null,"image":"1f3c2-1f3fc.png","sheet_x":9,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F3C2-1F3FD","non_qualified":null,"image":"1f3c2-1f3fd.png","sheet_x":9,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F3C2-1F3FE","non_qualified":null,"image":"1f3c2-1f3fe.png","sheet_x":9,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F3C2-1F3FF","non_qualified":null,"image":"1f3c2-1f3ff.png","sheet_x":9,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Snowboarder","b":"1F3C2","j":["sports","winter"],"k":[9,28]},"golfer":{"skin_variations":{"1F3FB":{"unified":"1F3CC-1F3FB","non_qualified":null,"image":"1f3cc-1f3fb.png","sheet_x":11,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3CC-1F3FC","non_qualified":null,"image":"1f3cc-1f3fc.png","sheet_x":11,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3CC-1F3FD","non_qualified":null,"image":"1f3cc-1f3fd.png","sheet_x":11,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3CC-1F3FE","non_qualified":null,"image":"1f3cc-1f3fe.png","sheet_x":11,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3CC-1F3FF","non_qualified":null,"image":"1f3cc-1f3ff.png","sheet_x":11,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoleted_by":"1F3CC-FE0F-200D-2642-FE0F","a":"Golfer","b":"1F3CC-FE0F","c":"1F3CC","k":[11,24],"o":7},"flag-zw":{"a":"Zimbabwe Flag","b":"1F1FF-1F1FC","k":[5,28]},"man-golfing":{"skin_variations":{"1F3FB":{"unified":"1F3CC-1F3FB-200D-2642-FE0F","non_qualified":"1F3CC-1F3FB-200D-2642","image":"1f3cc-1f3fb-200d-2642-fe0f.png","sheet_x":11,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3CC-1F3FC-200D-2642-FE0F","non_qualified":"1F3CC-1F3FC-200D-2642","image":"1f3cc-1f3fc-200d-2642-fe0f.png","sheet_x":11,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3CC-1F3FD-200D-2642-FE0F","non_qualified":"1F3CC-1F3FD-200D-2642","image":"1f3cc-1f3fd-200d-2642-fe0f.png","sheet_x":11,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3CC-1F3FE-200D-2642-FE0F","non_qualified":"1F3CC-1F3FE-200D-2642","image":"1f3cc-1f3fe-200d-2642-fe0f.png","sheet_x":11,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3CC-1F3FF-200D-2642-FE0F","non_qualified":"1F3CC-1F3FF-200D-2642","image":"1f3cc-1f3ff-200d-2642-fe0f.png","sheet_x":11,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F3CC-FE0F","a":"Man Golfing","b":"1F3CC-FE0F-200D-2642-FE0F","k":[11,18],"o":7},"flag-england":{"a":"England Flag","b":"1F3F4-E0067-E0062-E0065-E006E-E0067-E007F","k":[12,16],"o":7},"woman-golfing":{"skin_variations":{"1F3FB":{"unified":"1F3CC-1F3FB-200D-2640-FE0F","non_qualified":"1F3CC-1F3FB-200D-2640","image":"1f3cc-1f3fb-200d-2640-fe0f.png","sheet_x":11,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3CC-1F3FC-200D-2640-FE0F","non_qualified":"1F3CC-1F3FC-200D-2640","image":"1f3cc-1f3fc-200d-2640-fe0f.png","sheet_x":11,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3CC-1F3FD-200D-2640-FE0F","non_qualified":"1F3CC-1F3FD-200D-2640","image":"1f3cc-1f3fd-200d-2640-fe0f.png","sheet_x":11,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3CC-1F3FE-200D-2640-FE0F","non_qualified":"1F3CC-1F3FE-200D-2640","image":"1f3cc-1f3fe-200d-2640-fe0f.png","sheet_x":11,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3CC-1F3FF-200D-2640-FE0F","non_qualified":"1F3CC-1F3FF-200D-2640","image":"1f3cc-1f3ff-200d-2640-fe0f.png","sheet_x":11,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Golfing","b":"1F3CC-FE0F-200D-2640-FE0F","k":[11,12],"o":7},"flag-scotland":{"a":"Scotland Flag","b":"1F3F4-E0067-E0062-E0073-E0063-E0074-E007F","k":[12,17],"o":7},"flag-wales":{"a":"Wales Flag","b":"1F3F4-E0067-E0062-E0077-E006C-E0073-E007F","k":[12,18],"o":7},"surfer":{"skin_variations":{"1F3FB":{"unified":"1F3C4-1F3FB","non_qualified":null,"image":"1f3c4-1f3fb.png","sheet_x":10,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F3C4-1F3FC","non_qualified":null,"image":"1f3c4-1f3fc.png","sheet_x":10,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F3C4-1F3FD","non_qualified":null,"image":"1f3c4-1f3fd.png","sheet_x":10,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F3C4-1F3FE","non_qualified":null,"image":"1f3c4-1f3fe.png","sheet_x":10,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F3C4-1F3FF","non_qualified":null,"image":"1f3c4-1f3ff.png","sheet_x":10,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F3C4-200D-2642-FE0F","a":"Surfer","b":"1F3C4","k":[10,12]},"man-surfing":{"skin_variations":{"1F3FB":{"unified":"1F3C4-1F3FB-200D-2642-FE0F","non_qualified":"1F3C4-1F3FB-200D-2642","image":"1f3c4-1f3fb-200d-2642-fe0f.png","sheet_x":10,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3C4-1F3FC-200D-2642-FE0F","non_qualified":"1F3C4-1F3FC-200D-2642","image":"1f3c4-1f3fc-200d-2642-fe0f.png","sheet_x":10,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3C4-1F3FD-200D-2642-FE0F","non_qualified":"1F3C4-1F3FD-200D-2642","image":"1f3c4-1f3fd-200d-2642-fe0f.png","sheet_x":10,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3C4-1F3FE-200D-2642-FE0F","non_qualified":"1F3C4-1F3FE-200D-2642","image":"1f3c4-1f3fe-200d-2642-fe0f.png","sheet_x":10,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3C4-1F3FF-200D-2642-FE0F","non_qualified":"1F3C4-1F3FF-200D-2642","image":"1f3c4-1f3ff-200d-2642-fe0f.png","sheet_x":10,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F3C4","a":"Man Surfing","b":"1F3C4-200D-2642-FE0F","c":"1F3C4-200D-2642","k":[10,6]},"woman-surfing":{"skin_variations":{"1F3FB":{"unified":"1F3C4-1F3FB-200D-2640-FE0F","non_qualified":"1F3C4-1F3FB-200D-2640","image":"1f3c4-1f3fb-200d-2640-fe0f.png","sheet_x":10,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3C4-1F3FC-200D-2640-FE0F","non_qualified":"1F3C4-1F3FC-200D-2640","image":"1f3c4-1f3fc-200d-2640-fe0f.png","sheet_x":10,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3C4-1F3FD-200D-2640-FE0F","non_qualified":"1F3C4-1F3FD-200D-2640","image":"1f3c4-1f3fd-200d-2640-fe0f.png","sheet_x":10,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3C4-1F3FE-200D-2640-FE0F","non_qualified":"1F3C4-1F3FE-200D-2640","image":"1f3c4-1f3fe-200d-2640-fe0f.png","sheet_x":10,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3C4-1F3FF-200D-2640-FE0F","non_qualified":"1F3C4-1F3FF-200D-2640","image":"1f3c4-1f3ff-200d-2640-fe0f.png","sheet_x":10,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Surfing","b":"1F3C4-200D-2640-FE0F","c":"1F3C4-200D-2640","k":[10,0]},"rowboat":{"skin_variations":{"1F3FB":{"unified":"1F6A3-1F3FB","non_qualified":null,"image":"1f6a3-1f3fb.png","sheet_x":35,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6A3-1F3FC","non_qualified":null,"image":"1f6a3-1f3fc.png","sheet_x":35,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6A3-1F3FD","non_qualified":null,"image":"1f6a3-1f3fd.png","sheet_x":35,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6A3-1F3FE","non_qualified":null,"image":"1f6a3-1f3fe.png","sheet_x":35,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6A3-1F3FF","non_qualified":null,"image":"1f6a3-1f3ff.png","sheet_x":35,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoleted_by":"1F6A3-200D-2642-FE0F","a":"Rowboat","b":"1F6A3","k":[35,3]},"man-rowing-boat":{"skin_variations":{"1F3FB":{"unified":"1F6A3-1F3FB-200D-2642-FE0F","non_qualified":"1F6A3-1F3FB-200D-2642","image":"1f6a3-1f3fb-200d-2642-fe0f.png","sheet_x":34,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6A3-1F3FC-200D-2642-FE0F","non_qualified":"1F6A3-1F3FC-200D-2642","image":"1f6a3-1f3fc-200d-2642-fe0f.png","sheet_x":34,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6A3-1F3FD-200D-2642-FE0F","non_qualified":"1F6A3-1F3FD-200D-2642","image":"1f6a3-1f3fd-200d-2642-fe0f.png","sheet_x":35,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6A3-1F3FE-200D-2642-FE0F","non_qualified":"1F6A3-1F3FE-200D-2642","image":"1f6a3-1f3fe-200d-2642-fe0f.png","sheet_x":35,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6A3-1F3FF-200D-2642-FE0F","non_qualified":"1F6A3-1F3FF-200D-2642","image":"1f6a3-1f3ff-200d-2642-fe0f.png","sheet_x":35,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F6A3","a":"Man Rowing Boat","b":"1F6A3-200D-2642-FE0F","c":"1F6A3-200D-2642","k":[34,49]},"woman-rowing-boat":{"skin_variations":{"1F3FB":{"unified":"1F6A3-1F3FB-200D-2640-FE0F","non_qualified":"1F6A3-1F3FB-200D-2640","image":"1f6a3-1f3fb-200d-2640-fe0f.png","sheet_x":34,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6A3-1F3FC-200D-2640-FE0F","non_qualified":"1F6A3-1F3FC-200D-2640","image":"1f6a3-1f3fc-200d-2640-fe0f.png","sheet_x":34,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6A3-1F3FD-200D-2640-FE0F","non_qualified":"1F6A3-1F3FD-200D-2640","image":"1f6a3-1f3fd-200d-2640-fe0f.png","sheet_x":34,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6A3-1F3FE-200D-2640-FE0F","non_qualified":"1F6A3-1F3FE-200D-2640","image":"1f6a3-1f3fe-200d-2640-fe0f.png","sheet_x":34,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6A3-1F3FF-200D-2640-FE0F","non_qualified":"1F6A3-1F3FF-200D-2640","image":"1f6a3-1f3ff-200d-2640-fe0f.png","sheet_x":34,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Rowing Boat","b":"1F6A3-200D-2640-FE0F","c":"1F6A3-200D-2640","k":[34,43]},"swimmer":{"skin_variations":{"1F3FB":{"unified":"1F3CA-1F3FB","non_qualified":null,"image":"1f3ca-1f3fb.png","sheet_x":10,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F3CA-1F3FC","non_qualified":null,"image":"1f3ca-1f3fc.png","sheet_x":10,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F3CA-1F3FD","non_qualified":null,"image":"1f3ca-1f3fd.png","sheet_x":10,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F3CA-1F3FE","non_qualified":null,"image":"1f3ca-1f3fe.png","sheet_x":10,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F3CA-1F3FF","non_qualified":null,"image":"1f3ca-1f3ff.png","sheet_x":10,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F3CA-200D-2642-FE0F","a":"Swimmer","b":"1F3CA","k":[10,40]},"man-swimming":{"skin_variations":{"1F3FB":{"unified":"1F3CA-1F3FB-200D-2642-FE0F","non_qualified":"1F3CA-1F3FB-200D-2642","image":"1f3ca-1f3fb-200d-2642-fe0f.png","sheet_x":10,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3CA-1F3FC-200D-2642-FE0F","non_qualified":"1F3CA-1F3FC-200D-2642","image":"1f3ca-1f3fc-200d-2642-fe0f.png","sheet_x":10,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3CA-1F3FD-200D-2642-FE0F","non_qualified":"1F3CA-1F3FD-200D-2642","image":"1f3ca-1f3fd-200d-2642-fe0f.png","sheet_x":10,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3CA-1F3FE-200D-2642-FE0F","non_qualified":"1F3CA-1F3FE-200D-2642","image":"1f3ca-1f3fe-200d-2642-fe0f.png","sheet_x":10,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3CA-1F3FF-200D-2642-FE0F","non_qualified":"1F3CA-1F3FF-200D-2642","image":"1f3ca-1f3ff-200d-2642-fe0f.png","sheet_x":10,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F3CA","a":"Man Swimming","b":"1F3CA-200D-2642-FE0F","c":"1F3CA-200D-2642","k":[10,34]},"woman-swimming":{"skin_variations":{"1F3FB":{"unified":"1F3CA-1F3FB-200D-2640-FE0F","non_qualified":"1F3CA-1F3FB-200D-2640","image":"1f3ca-1f3fb-200d-2640-fe0f.png","sheet_x":10,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3CA-1F3FC-200D-2640-FE0F","non_qualified":"1F3CA-1F3FC-200D-2640","image":"1f3ca-1f3fc-200d-2640-fe0f.png","sheet_x":10,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3CA-1F3FD-200D-2640-FE0F","non_qualified":"1F3CA-1F3FD-200D-2640","image":"1f3ca-1f3fd-200d-2640-fe0f.png","sheet_x":10,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3CA-1F3FE-200D-2640-FE0F","non_qualified":"1F3CA-1F3FE-200D-2640","image":"1f3ca-1f3fe-200d-2640-fe0f.png","sheet_x":10,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3CA-1F3FF-200D-2640-FE0F","non_qualified":"1F3CA-1F3FF-200D-2640","image":"1f3ca-1f3ff-200d-2640-fe0f.png","sheet_x":10,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Swimming","b":"1F3CA-200D-2640-FE0F","c":"1F3CA-200D-2640","k":[10,28]},"person_with_ball":{"skin_variations":{"1F3FB":{"unified":"26F9-1F3FB","non_qualified":null,"image":"26f9-1f3fb.png","sheet_x":49,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"26F9-1F3FC","non_qualified":null,"image":"26f9-1f3fc.png","sheet_x":49,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"26F9-1F3FD","non_qualified":null,"image":"26f9-1f3fd.png","sheet_x":49,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"26F9-1F3FE","non_qualified":null,"image":"26f9-1f3fe.png","sheet_x":49,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"26F9-1F3FF","non_qualified":null,"image":"26f9-1f3ff.png","sheet_x":49,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoleted_by":"26F9-FE0F-200D-2642-FE0F","a":"Person with Ball","b":"26F9-FE0F","c":"26F9","k":[49,6],"o":5},"man-bouncing-ball":{"skin_variations":{"1F3FB":{"unified":"26F9-1F3FB-200D-2642-FE0F","non_qualified":"26F9-1F3FB-200D-2642","image":"26f9-1f3fb-200d-2642-fe0f.png","sheet_x":49,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"26F9-1F3FC-200D-2642-FE0F","non_qualified":"26F9-1F3FC-200D-2642","image":"26f9-1f3fc-200d-2642-fe0f.png","sheet_x":49,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"26F9-1F3FD-200D-2642-FE0F","non_qualified":"26F9-1F3FD-200D-2642","image":"26f9-1f3fd-200d-2642-fe0f.png","sheet_x":49,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"26F9-1F3FE-200D-2642-FE0F","non_qualified":"26F9-1F3FE-200D-2642","image":"26f9-1f3fe-200d-2642-fe0f.png","sheet_x":49,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"26F9-1F3FF-200D-2642-FE0F","non_qualified":"26F9-1F3FF-200D-2642","image":"26f9-1f3ff-200d-2642-fe0f.png","sheet_x":49,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"26F9-FE0F","a":"Man Bouncing Ball","b":"26F9-FE0F-200D-2642-FE0F","k":[49,0],"o":5},"woman-bouncing-ball":{"skin_variations":{"1F3FB":{"unified":"26F9-1F3FB-200D-2640-FE0F","non_qualified":"26F9-1F3FB-200D-2640","image":"26f9-1f3fb-200d-2640-fe0f.png","sheet_x":48,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"26F9-1F3FC-200D-2640-FE0F","non_qualified":"26F9-1F3FC-200D-2640","image":"26f9-1f3fc-200d-2640-fe0f.png","sheet_x":48,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"26F9-1F3FD-200D-2640-FE0F","non_qualified":"26F9-1F3FD-200D-2640","image":"26f9-1f3fd-200d-2640-fe0f.png","sheet_x":48,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"26F9-1F3FE-200D-2640-FE0F","non_qualified":"26F9-1F3FE-200D-2640","image":"26f9-1f3fe-200d-2640-fe0f.png","sheet_x":48,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"26F9-1F3FF-200D-2640-FE0F","non_qualified":"26F9-1F3FF-200D-2640","image":"26f9-1f3ff-200d-2640-fe0f.png","sheet_x":48,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Bouncing Ball","b":"26F9-FE0F-200D-2640-FE0F","k":[48,46],"o":5},"weight_lifter":{"skin_variations":{"1F3FB":{"unified":"1F3CB-1F3FB","non_qualified":null,"image":"1f3cb-1f3fb.png","sheet_x":11,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3CB-1F3FC","non_qualified":null,"image":"1f3cb-1f3fc.png","sheet_x":11,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3CB-1F3FD","non_qualified":null,"image":"1f3cb-1f3fd.png","sheet_x":11,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3CB-1F3FE","non_qualified":null,"image":"1f3cb-1f3fe.png","sheet_x":11,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3CB-1F3FF","non_qualified":null,"image":"1f3cb-1f3ff.png","sheet_x":11,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoleted_by":"1F3CB-FE0F-200D-2642-FE0F","a":"Weight Lifter","b":"1F3CB-FE0F","c":"1F3CB","k":[11,6],"o":7},"man-lifting-weights":{"skin_variations":{"1F3FB":{"unified":"1F3CB-1F3FB-200D-2642-FE0F","non_qualified":"1F3CB-1F3FB-200D-2642","image":"1f3cb-1f3fb-200d-2642-fe0f.png","sheet_x":11,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3CB-1F3FC-200D-2642-FE0F","non_qualified":"1F3CB-1F3FC-200D-2642","image":"1f3cb-1f3fc-200d-2642-fe0f.png","sheet_x":11,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3CB-1F3FD-200D-2642-FE0F","non_qualified":"1F3CB-1F3FD-200D-2642","image":"1f3cb-1f3fd-200d-2642-fe0f.png","sheet_x":11,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3CB-1F3FE-200D-2642-FE0F","non_qualified":"1F3CB-1F3FE-200D-2642","image":"1f3cb-1f3fe-200d-2642-fe0f.png","sheet_x":11,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3CB-1F3FF-200D-2642-FE0F","non_qualified":"1F3CB-1F3FF-200D-2642","image":"1f3cb-1f3ff-200d-2642-fe0f.png","sheet_x":11,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F3CB-FE0F","a":"Man Lifting Weights","b":"1F3CB-FE0F-200D-2642-FE0F","k":[11,0],"o":7},"woman-lifting-weights":{"skin_variations":{"1F3FB":{"unified":"1F3CB-1F3FB-200D-2640-FE0F","non_qualified":"1F3CB-1F3FB-200D-2640","image":"1f3cb-1f3fb-200d-2640-fe0f.png","sheet_x":10,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F3CB-1F3FC-200D-2640-FE0F","non_qualified":"1F3CB-1F3FC-200D-2640","image":"1f3cb-1f3fc-200d-2640-fe0f.png","sheet_x":10,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F3CB-1F3FD-200D-2640-FE0F","non_qualified":"1F3CB-1F3FD-200D-2640","image":"1f3cb-1f3fd-200d-2640-fe0f.png","sheet_x":10,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F3CB-1F3FE-200D-2640-FE0F","non_qualified":"1F3CB-1F3FE-200D-2640","image":"1f3cb-1f3fe-200d-2640-fe0f.png","sheet_x":10,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F3CB-1F3FF-200D-2640-FE0F","non_qualified":"1F3CB-1F3FF-200D-2640","image":"1f3cb-1f3ff-200d-2640-fe0f.png","sheet_x":10,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Lifting Weights","b":"1F3CB-FE0F-200D-2640-FE0F","k":[10,46],"o":7},"bicyclist":{"skin_variations":{"1F3FB":{"unified":"1F6B4-1F3FB","non_qualified":null,"image":"1f6b4-1f3fb.png","sheet_x":35,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F6B4-1F3FC","non_qualified":null,"image":"1f6b4-1f3fc.png","sheet_x":35,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F6B4-1F3FD","non_qualified":null,"image":"1f6b4-1f3fd.png","sheet_x":35,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F6B4-1F3FE","non_qualified":null,"image":"1f6b4-1f3fe.png","sheet_x":35,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F6B4-1F3FF","non_qualified":null,"image":"1f6b4-1f3ff.png","sheet_x":35,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F6B4-200D-2642-FE0F","a":"Bicyclist","b":"1F6B4","k":[35,37]},"man-biking":{"skin_variations":{"1F3FB":{"unified":"1F6B4-1F3FB-200D-2642-FE0F","non_qualified":"1F6B4-1F3FB-200D-2642","image":"1f6b4-1f3fb-200d-2642-fe0f.png","sheet_x":35,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6B4-1F3FC-200D-2642-FE0F","non_qualified":"1F6B4-1F3FC-200D-2642","image":"1f6b4-1f3fc-200d-2642-fe0f.png","sheet_x":35,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6B4-1F3FD-200D-2642-FE0F","non_qualified":"1F6B4-1F3FD-200D-2642","image":"1f6b4-1f3fd-200d-2642-fe0f.png","sheet_x":35,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6B4-1F3FE-200D-2642-FE0F","non_qualified":"1F6B4-1F3FE-200D-2642","image":"1f6b4-1f3fe-200d-2642-fe0f.png","sheet_x":35,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6B4-1F3FF-200D-2642-FE0F","non_qualified":"1F6B4-1F3FF-200D-2642","image":"1f6b4-1f3ff-200d-2642-fe0f.png","sheet_x":35,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F6B4","a":"Man Biking","b":"1F6B4-200D-2642-FE0F","c":"1F6B4-200D-2642","k":[35,31]},"woman-biking":{"skin_variations":{"1F3FB":{"unified":"1F6B4-1F3FB-200D-2640-FE0F","non_qualified":"1F6B4-1F3FB-200D-2640","image":"1f6b4-1f3fb-200d-2640-fe0f.png","sheet_x":35,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6B4-1F3FC-200D-2640-FE0F","non_qualified":"1F6B4-1F3FC-200D-2640","image":"1f6b4-1f3fc-200d-2640-fe0f.png","sheet_x":35,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6B4-1F3FD-200D-2640-FE0F","non_qualified":"1F6B4-1F3FD-200D-2640","image":"1f6b4-1f3fd-200d-2640-fe0f.png","sheet_x":35,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6B4-1F3FE-200D-2640-FE0F","non_qualified":"1F6B4-1F3FE-200D-2640","image":"1f6b4-1f3fe-200d-2640-fe0f.png","sheet_x":35,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6B4-1F3FF-200D-2640-FE0F","non_qualified":"1F6B4-1F3FF-200D-2640","image":"1f6b4-1f3ff-200d-2640-fe0f.png","sheet_x":35,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Biking","b":"1F6B4-200D-2640-FE0F","c":"1F6B4-200D-2640","k":[35,25]},"mountain_bicyclist":{"skin_variations":{"1F3FB":{"unified":"1F6B5-1F3FB","non_qualified":null,"image":"1f6b5-1f3fb.png","sheet_x":36,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FC":{"unified":"1F6B5-1F3FC","non_qualified":null,"image":"1f6b5-1f3fc.png","sheet_x":36,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FD":{"unified":"1F6B5-1F3FD","non_qualified":null,"image":"1f6b5-1f3fd.png","sheet_x":36,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FE":{"unified":"1F6B5-1F3FE","non_qualified":null,"image":"1f6b5-1f3fe.png","sheet_x":36,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true},"1F3FF":{"unified":"1F6B5-1F3FF","non_qualified":null,"image":"1f6b5-1f3ff.png","sheet_x":36,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":true}},"obsoleted_by":"1F6B5-200D-2642-FE0F","a":"Mountain Bicyclist","b":"1F6B5","k":[36,3]},"man-mountain-biking":{"skin_variations":{"1F3FB":{"unified":"1F6B5-1F3FB-200D-2642-FE0F","non_qualified":"1F6B5-1F3FB-200D-2642","image":"1f6b5-1f3fb-200d-2642-fe0f.png","sheet_x":35,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6B5-1F3FC-200D-2642-FE0F","non_qualified":"1F6B5-1F3FC-200D-2642","image":"1f6b5-1f3fc-200d-2642-fe0f.png","sheet_x":35,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6B5-1F3FD-200D-2642-FE0F","non_qualified":"1F6B5-1F3FD-200D-2642","image":"1f6b5-1f3fd-200d-2642-fe0f.png","sheet_x":36,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6B5-1F3FE-200D-2642-FE0F","non_qualified":"1F6B5-1F3FE-200D-2642","image":"1f6b5-1f3fe-200d-2642-fe0f.png","sheet_x":36,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6B5-1F3FF-200D-2642-FE0F","non_qualified":"1F6B5-1F3FF-200D-2642","image":"1f6b5-1f3ff-200d-2642-fe0f.png","sheet_x":36,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"obsoletes":"1F6B5","a":"Man Mountain Biking","b":"1F6B5-200D-2642-FE0F","c":"1F6B5-200D-2642","k":[35,49]},"woman-mountain-biking":{"skin_variations":{"1F3FB":{"unified":"1F6B5-1F3FB-200D-2640-FE0F","non_qualified":"1F6B5-1F3FB-200D-2640","image":"1f6b5-1f3fb-200d-2640-fe0f.png","sheet_x":35,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F6B5-1F3FC-200D-2640-FE0F","non_qualified":"1F6B5-1F3FC-200D-2640","image":"1f6b5-1f3fc-200d-2640-fe0f.png","sheet_x":35,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F6B5-1F3FD-200D-2640-FE0F","non_qualified":"1F6B5-1F3FD-200D-2640","image":"1f6b5-1f3fd-200d-2640-fe0f.png","sheet_x":35,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F6B5-1F3FE-200D-2640-FE0F","non_qualified":"1F6B5-1F3FE-200D-2640","image":"1f6b5-1f3fe-200d-2640-fe0f.png","sheet_x":35,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F6B5-1F3FF-200D-2640-FE0F","non_qualified":"1F6B5-1F3FF-200D-2640","image":"1f6b5-1f3ff-200d-2640-fe0f.png","sheet_x":35,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Mountain Biking","b":"1F6B5-200D-2640-FE0F","c":"1F6B5-200D-2640","k":[35,43]},"racing_car":{"a":"Racing Car","b":"1F3CE-FE0F","c":"1F3CE","j":["sports","race","fast","formula","f1"],"k":[11,31],"o":7},"racing_motorcycle":{"a":"Racing Motorcycle","b":"1F3CD-FE0F","c":"1F3CD","k":[11,30],"o":7},"person_doing_cartwheel":{"skin_variations":{"1F3FB":{"unified":"1F938-1F3FB","non_qualified":null,"image":"1f938-1f3fb.png","sheet_x":40,"sheet_y":25,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F938-1F3FC","non_qualified":null,"image":"1f938-1f3fc.png","sheet_x":40,"sheet_y":26,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F938-1F3FD","non_qualified":null,"image":"1f938-1f3fd.png","sheet_x":40,"sheet_y":27,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F938-1F3FE","non_qualified":null,"image":"1f938-1f3fe.png","sheet_x":40,"sheet_y":28,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F938-1F3FF","non_qualified":null,"image":"1f938-1f3ff.png","sheet_x":40,"sheet_y":29,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Person Doing Cartwheel","b":"1F938","k":[40,24],"o":9},"man-cartwheeling":{"skin_variations":{"1F3FB":{"unified":"1F938-1F3FB-200D-2642-FE0F","non_qualified":"1F938-1F3FB-200D-2642","image":"1f938-1f3fb-200d-2642-fe0f.png","sheet_x":40,"sheet_y":19,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F938-1F3FC-200D-2642-FE0F","non_qualified":"1F938-1F3FC-200D-2642","image":"1f938-1f3fc-200d-2642-fe0f.png","sheet_x":40,"sheet_y":20,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F938-1F3FD-200D-2642-FE0F","non_qualified":"1F938-1F3FD-200D-2642","image":"1f938-1f3fd-200d-2642-fe0f.png","sheet_x":40,"sheet_y":21,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F938-1F3FE-200D-2642-FE0F","non_qualified":"1F938-1F3FE-200D-2642","image":"1f938-1f3fe-200d-2642-fe0f.png","sheet_x":40,"sheet_y":22,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F938-1F3FF-200D-2642-FE0F","non_qualified":"1F938-1F3FF-200D-2642","image":"1f938-1f3ff-200d-2642-fe0f.png","sheet_x":40,"sheet_y":23,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Cartwheeling","b":"1F938-200D-2642-FE0F","c":"1F938-200D-2642","k":[40,18],"o":9},"woman-cartwheeling":{"skin_variations":{"1F3FB":{"unified":"1F938-1F3FB-200D-2640-FE0F","non_qualified":"1F938-1F3FB-200D-2640","image":"1f938-1f3fb-200d-2640-fe0f.png","sheet_x":40,"sheet_y":13,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F938-1F3FC-200D-2640-FE0F","non_qualified":"1F938-1F3FC-200D-2640","image":"1f938-1f3fc-200d-2640-fe0f.png","sheet_x":40,"sheet_y":14,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F938-1F3FD-200D-2640-FE0F","non_qualified":"1F938-1F3FD-200D-2640","image":"1f938-1f3fd-200d-2640-fe0f.png","sheet_x":40,"sheet_y":15,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F938-1F3FE-200D-2640-FE0F","non_qualified":"1F938-1F3FE-200D-2640","image":"1f938-1f3fe-200d-2640-fe0f.png","sheet_x":40,"sheet_y":16,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F938-1F3FF-200D-2640-FE0F","non_qualified":"1F938-1F3FF-200D-2640","image":"1f938-1f3ff-200d-2640-fe0f.png","sheet_x":40,"sheet_y":17,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Cartwheeling","b":"1F938-200D-2640-FE0F","c":"1F938-200D-2640","k":[40,12],"o":9},"wrestlers":{"a":"Wrestlers","b":"1F93C","k":[40,51],"o":9},"man-wrestling":{"a":"Man Wrestling","b":"1F93C-200D-2642-FE0F","c":"1F93C-200D-2642","k":[40,50],"o":9},"woman-wrestling":{"a":"Woman Wrestling","b":"1F93C-200D-2640-FE0F","c":"1F93C-200D-2640","k":[40,49],"o":9},"water_polo":{"skin_variations":{"1F3FB":{"unified":"1F93D-1F3FB","non_qualified":null,"image":"1f93d-1f3fb.png","sheet_x":41,"sheet_y":13,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F93D-1F3FC","non_qualified":null,"image":"1f93d-1f3fc.png","sheet_x":41,"sheet_y":14,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F93D-1F3FD","non_qualified":null,"image":"1f93d-1f3fd.png","sheet_x":41,"sheet_y":15,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F93D-1F3FE","non_qualified":null,"image":"1f93d-1f3fe.png","sheet_x":41,"sheet_y":16,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F93D-1F3FF","non_qualified":null,"image":"1f93d-1f3ff.png","sheet_x":41,"sheet_y":17,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Water Polo","b":"1F93D","k":[41,12],"o":9},"man-playing-water-polo":{"skin_variations":{"1F3FB":{"unified":"1F93D-1F3FB-200D-2642-FE0F","non_qualified":"1F93D-1F3FB-200D-2642","image":"1f93d-1f3fb-200d-2642-fe0f.png","sheet_x":41,"sheet_y":7,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F93D-1F3FC-200D-2642-FE0F","non_qualified":"1F93D-1F3FC-200D-2642","image":"1f93d-1f3fc-200d-2642-fe0f.png","sheet_x":41,"sheet_y":8,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F93D-1F3FD-200D-2642-FE0F","non_qualified":"1F93D-1F3FD-200D-2642","image":"1f93d-1f3fd-200d-2642-fe0f.png","sheet_x":41,"sheet_y":9,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F93D-1F3FE-200D-2642-FE0F","non_qualified":"1F93D-1F3FE-200D-2642","image":"1f93d-1f3fe-200d-2642-fe0f.png","sheet_x":41,"sheet_y":10,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F93D-1F3FF-200D-2642-FE0F","non_qualified":"1F93D-1F3FF-200D-2642","image":"1f93d-1f3ff-200d-2642-fe0f.png","sheet_x":41,"sheet_y":11,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Playing Water Polo","b":"1F93D-200D-2642-FE0F","c":"1F93D-200D-2642","k":[41,6],"o":9},"woman-playing-water-polo":{"skin_variations":{"1F3FB":{"unified":"1F93D-1F3FB-200D-2640-FE0F","non_qualified":"1F93D-1F3FB-200D-2640","image":"1f93d-1f3fb-200d-2640-fe0f.png","sheet_x":41,"sheet_y":1,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F93D-1F3FC-200D-2640-FE0F","non_qualified":"1F93D-1F3FC-200D-2640","image":"1f93d-1f3fc-200d-2640-fe0f.png","sheet_x":41,"sheet_y":2,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F93D-1F3FD-200D-2640-FE0F","non_qualified":"1F93D-1F3FD-200D-2640","image":"1f93d-1f3fd-200d-2640-fe0f.png","sheet_x":41,"sheet_y":3,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F93D-1F3FE-200D-2640-FE0F","non_qualified":"1F93D-1F3FE-200D-2640","image":"1f93d-1f3fe-200d-2640-fe0f.png","sheet_x":41,"sheet_y":4,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F93D-1F3FF-200D-2640-FE0F","non_qualified":"1F93D-1F3FF-200D-2640","image":"1f93d-1f3ff-200d-2640-fe0f.png","sheet_x":41,"sheet_y":5,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Playing Water Polo","b":"1F93D-200D-2640-FE0F","c":"1F93D-200D-2640","k":[41,0],"o":9},"handball":{"skin_variations":{"1F3FB":{"unified":"1F93E-1F3FB","non_qualified":null,"image":"1f93e-1f3fb.png","sheet_x":41,"sheet_y":31,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F93E-1F3FC","non_qualified":null,"image":"1f93e-1f3fc.png","sheet_x":41,"sheet_y":32,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F93E-1F3FD","non_qualified":null,"image":"1f93e-1f3fd.png","sheet_x":41,"sheet_y":33,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F93E-1F3FE","non_qualified":null,"image":"1f93e-1f3fe.png","sheet_x":41,"sheet_y":34,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F93E-1F3FF","non_qualified":null,"image":"1f93e-1f3ff.png","sheet_x":41,"sheet_y":35,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Handball","b":"1F93E","k":[41,30],"o":9},"man-playing-handball":{"skin_variations":{"1F3FB":{"unified":"1F93E-1F3FB-200D-2642-FE0F","non_qualified":"1F93E-1F3FB-200D-2642","image":"1f93e-1f3fb-200d-2642-fe0f.png","sheet_x":41,"sheet_y":25,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F93E-1F3FC-200D-2642-FE0F","non_qualified":"1F93E-1F3FC-200D-2642","image":"1f93e-1f3fc-200d-2642-fe0f.png","sheet_x":41,"sheet_y":26,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F93E-1F3FD-200D-2642-FE0F","non_qualified":"1F93E-1F3FD-200D-2642","image":"1f93e-1f3fd-200d-2642-fe0f.png","sheet_x":41,"sheet_y":27,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F93E-1F3FE-200D-2642-FE0F","non_qualified":"1F93E-1F3FE-200D-2642","image":"1f93e-1f3fe-200d-2642-fe0f.png","sheet_x":41,"sheet_y":28,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F93E-1F3FF-200D-2642-FE0F","non_qualified":"1F93E-1F3FF-200D-2642","image":"1f93e-1f3ff-200d-2642-fe0f.png","sheet_x":41,"sheet_y":29,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Playing Handball","b":"1F93E-200D-2642-FE0F","c":"1F93E-200D-2642","k":[41,24],"o":9},"woman-playing-handball":{"skin_variations":{"1F3FB":{"unified":"1F93E-1F3FB-200D-2640-FE0F","non_qualified":"1F93E-1F3FB-200D-2640","image":"1f93e-1f3fb-200d-2640-fe0f.png","sheet_x":41,"sheet_y":19,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F93E-1F3FC-200D-2640-FE0F","non_qualified":"1F93E-1F3FC-200D-2640","image":"1f93e-1f3fc-200d-2640-fe0f.png","sheet_x":41,"sheet_y":20,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F93E-1F3FD-200D-2640-FE0F","non_qualified":"1F93E-1F3FD-200D-2640","image":"1f93e-1f3fd-200d-2640-fe0f.png","sheet_x":41,"sheet_y":21,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F93E-1F3FE-200D-2640-FE0F","non_qualified":"1F93E-1F3FE-200D-2640","image":"1f93e-1f3fe-200d-2640-fe0f.png","sheet_x":41,"sheet_y":22,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F93E-1F3FF-200D-2640-FE0F","non_qualified":"1F93E-1F3FF-200D-2640","image":"1f93e-1f3ff-200d-2640-fe0f.png","sheet_x":41,"sheet_y":23,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Playing Handball","b":"1F93E-200D-2640-FE0F","c":"1F93E-200D-2640","k":[41,18],"o":9},"juggling":{"skin_variations":{"1F3FB":{"unified":"1F939-1F3FB","non_qualified":null,"image":"1f939-1f3fb.png","sheet_x":40,"sheet_y":43,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F939-1F3FC","non_qualified":null,"image":"1f939-1f3fc.png","sheet_x":40,"sheet_y":44,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F939-1F3FD","non_qualified":null,"image":"1f939-1f3fd.png","sheet_x":40,"sheet_y":45,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F939-1F3FE","non_qualified":null,"image":"1f939-1f3fe.png","sheet_x":40,"sheet_y":46,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F939-1F3FF","non_qualified":null,"image":"1f939-1f3ff.png","sheet_x":40,"sheet_y":47,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Juggling","b":"1F939","k":[40,42],"o":9},"man-juggling":{"skin_variations":{"1F3FB":{"unified":"1F939-1F3FB-200D-2642-FE0F","non_qualified":"1F939-1F3FB-200D-2642","image":"1f939-1f3fb-200d-2642-fe0f.png","sheet_x":40,"sheet_y":37,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F939-1F3FC-200D-2642-FE0F","non_qualified":"1F939-1F3FC-200D-2642","image":"1f939-1f3fc-200d-2642-fe0f.png","sheet_x":40,"sheet_y":38,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F939-1F3FD-200D-2642-FE0F","non_qualified":"1F939-1F3FD-200D-2642","image":"1f939-1f3fd-200d-2642-fe0f.png","sheet_x":40,"sheet_y":39,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F939-1F3FE-200D-2642-FE0F","non_qualified":"1F939-1F3FE-200D-2642","image":"1f939-1f3fe-200d-2642-fe0f.png","sheet_x":40,"sheet_y":40,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F939-1F3FF-200D-2642-FE0F","non_qualified":"1F939-1F3FF-200D-2642","image":"1f939-1f3ff-200d-2642-fe0f.png","sheet_x":40,"sheet_y":41,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Man Juggling","b":"1F939-200D-2642-FE0F","c":"1F939-200D-2642","k":[40,36],"o":9},"woman-juggling":{"skin_variations":{"1F3FB":{"unified":"1F939-1F3FB-200D-2640-FE0F","non_qualified":"1F939-1F3FB-200D-2640","image":"1f939-1f3fb-200d-2640-fe0f.png","sheet_x":40,"sheet_y":31,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FC":{"unified":"1F939-1F3FC-200D-2640-FE0F","non_qualified":"1F939-1F3FC-200D-2640","image":"1f939-1f3fc-200d-2640-fe0f.png","sheet_x":40,"sheet_y":32,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FD":{"unified":"1F939-1F3FD-200D-2640-FE0F","non_qualified":"1F939-1F3FD-200D-2640","image":"1f939-1f3fd-200d-2640-fe0f.png","sheet_x":40,"sheet_y":33,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FE":{"unified":"1F939-1F3FE-200D-2640-FE0F","non_qualified":"1F939-1F3FE-200D-2640","image":"1f939-1f3fe-200d-2640-fe0f.png","sheet_x":40,"sheet_y":34,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false},"1F3FF":{"unified":"1F939-1F3FF-200D-2640-FE0F","non_qualified":"1F939-1F3FF-200D-2640","image":"1f939-1f3ff-200d-2640-fe0f.png","sheet_x":40,"sheet_y":35,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":false,"has_img_messenger":false}},"a":"Woman Juggling","b":"1F939-200D-2640-FE0F","c":"1F939-200D-2640","k":[40,30],"o":9},"couple":{"a":"Man and Woman Holding Hands","b":"1F46B","j":["pair","people","human","love","date","dating","like","affection","valentines","marriage"],"k":[20,30],"n":["man_and_woman_holding_hands"]},"two_men_holding_hands":{"a":"Two Men Holding Hands","b":"1F46C","j":["pair","couple","love","like","bromance","friendship","people","human"],"k":[20,31]},"two_women_holding_hands":{"a":"Two Women Holding Hands","b":"1F46D","j":["pair","friendship","couple","love","like","female","people","human"],"k":[20,32]},"couplekiss":{"obsoleted_by":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F468","a":"Kiss","b":"1F48F","k":[24,41]},"woman-kiss-man":{"obsoletes":"1F48F","a":"Woman Kiss Man","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F468","c":"1F469-200D-2764-200D-1F48B-200D-1F468","k":[20,21]},"man-kiss-man":{"a":"Man Kiss Man","b":"1F468-200D-2764-FE0F-200D-1F48B-200D-1F468","c":"1F468-200D-2764-200D-1F48B-200D-1F468","k":[18,10]},"woman-kiss-woman":{"a":"Woman Kiss Woman","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F469","c":"1F469-200D-2764-200D-1F48B-200D-1F469","k":[20,22]},"couple_with_heart":{"obsoleted_by":"1F469-200D-2764-FE0F-200D-1F468","a":"Couple with Heart","b":"1F491","k":[24,43]},"woman-heart-man":{"obsoletes":"1F491","a":"Woman Heart Man","b":"1F469-200D-2764-FE0F-200D-1F468","c":"1F469-200D-2764-200D-1F468","k":[20,19]},"man-heart-man":{"a":"Man Heart Man","b":"1F468-200D-2764-FE0F-200D-1F468","c":"1F468-200D-2764-200D-1F468","k":[18,9]},"woman-heart-woman":{"a":"Woman Heart Woman","b":"1F469-200D-2764-FE0F-200D-1F469","c":"1F469-200D-2764-200D-1F469","k":[20,20]},"family":{"obsoleted_by":"1F468-200D-1F469-200D-1F466","a":"Family","b":"1F46A","k":[20,29],"n":["man-woman-boy"]},"man-woman-boy":{"obsoletes":"1F46A","a":"Man Woman Boy","b":"1F468-200D-1F469-200D-1F466","k":[17,2],"n":["family"]},"man-woman-girl":{"a":"Man Woman Girl","b":"1F468-200D-1F469-200D-1F467","k":[17,4]},"man-woman-girl-boy":{"a":"Man Woman Girl Boy","b":"1F468-200D-1F469-200D-1F467-200D-1F466","k":[17,5]},"man-woman-boy-boy":{"a":"Man Woman Boy Boy","b":"1F468-200D-1F469-200D-1F466-200D-1F466","k":[17,3]},"man-woman-girl-girl":{"a":"Man Woman Girl Girl","b":"1F468-200D-1F469-200D-1F467-200D-1F467","k":[17,6]},"man-man-boy":{"a":"Man Man Boy","b":"1F468-200D-1F468-200D-1F466","k":[16,49]},"man-man-girl":{"a":"Man Man Girl","b":"1F468-200D-1F468-200D-1F467","k":[16,51]},"man-man-girl-boy":{"a":"Man Man Girl Boy","b":"1F468-200D-1F468-200D-1F467-200D-1F466","k":[17,0]},"man-man-boy-boy":{"a":"Man Man Boy Boy","b":"1F468-200D-1F468-200D-1F466-200D-1F466","k":[16,50]},"man-man-girl-girl":{"a":"Man Man Girl Girl","b":"1F468-200D-1F468-200D-1F467-200D-1F467","k":[17,1]},"woman-woman-boy":{"a":"Woman Woman Boy","b":"1F469-200D-1F469-200D-1F466","k":[19,12]},"woman-woman-girl":{"a":"Woman Woman Girl","b":"1F469-200D-1F469-200D-1F467","k":[19,14]},"woman-woman-girl-boy":{"a":"Woman Woman Girl Boy","b":"1F469-200D-1F469-200D-1F467-200D-1F466","k":[19,15]},"woman-woman-boy-boy":{"a":"Woman Woman Boy Boy","b":"1F469-200D-1F469-200D-1F466-200D-1F466","k":[19,13]},"woman-woman-girl-girl":{"a":"Woman Woman Girl Girl","b":"1F469-200D-1F469-200D-1F467-200D-1F467","k":[19,16]},"man-boy":{"a":"Man Boy","b":"1F468-200D-1F466","k":[16,45]},"man-boy-boy":{"a":"Man Boy Boy","b":"1F468-200D-1F466-200D-1F466","k":[16,44]},"man-girl":{"a":"Man Girl","b":"1F468-200D-1F467","k":[16,48]},"man-girl-boy":{"a":"Man Girl Boy","b":"1F468-200D-1F467-200D-1F466","k":[16,46]},"man-girl-girl":{"a":"Man Girl Girl","b":"1F468-200D-1F467-200D-1F467","k":[16,47]},"woman-boy":{"a":"Woman Boy","b":"1F469-200D-1F466","k":[19,8]},"woman-boy-boy":{"a":"Woman Boy Boy","b":"1F469-200D-1F466-200D-1F466","k":[19,7]},"woman-girl":{"a":"Woman Girl","b":"1F469-200D-1F467","k":[19,11]},"woman-girl-boy":{"a":"Woman Girl Boy","b":"1F469-200D-1F467-200D-1F466","k":[19,9]},"woman-girl-girl":{"a":"Woman Girl Girl","b":"1F469-200D-1F467-200D-1F467","k":[19,10]},"selfie":{"skin_variations":{"1F3FB":{"unified":"1F933-1F3FB","non_qualified":null,"image":"1f933-1f3fb.png","sheet_x":39,"sheet_y":23,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F933-1F3FC","non_qualified":null,"image":"1f933-1f3fc.png","sheet_x":39,"sheet_y":24,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F933-1F3FD","non_qualified":null,"image":"1f933-1f3fd.png","sheet_x":39,"sheet_y":25,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F933-1F3FE","non_qualified":null,"image":"1f933-1f3fe.png","sheet_x":39,"sheet_y":26,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F933-1F3FF","non_qualified":null,"image":"1f933-1f3ff.png","sheet_x":39,"sheet_y":27,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Selfie","b":"1F933","j":["camera","phone"],"k":[39,22],"o":9},"muscle":{"skin_variations":{"1F3FB":{"unified":"1F4AA-1F3FB","non_qualified":null,"image":"1f4aa-1f3fb.png","sheet_x":25,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F4AA-1F3FC","non_qualified":null,"image":"1f4aa-1f3fc.png","sheet_x":25,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F4AA-1F3FD","non_qualified":null,"image":"1f4aa-1f3fd.png","sheet_x":25,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F4AA-1F3FE","non_qualified":null,"image":"1f4aa-1f3fe.png","sheet_x":25,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F4AA-1F3FF","non_qualified":null,"image":"1f4aa-1f3ff.png","sheet_x":25,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Flexed Biceps","b":"1F4AA","j":["arm","flex","hand","summer","strong","biceps"],"k":[25,16]},"point_left":{"skin_variations":{"1F3FB":{"unified":"1F448-1F3FB","non_qualified":null,"image":"1f448-1f3fb.png","sheet_x":14,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F448-1F3FC","non_qualified":null,"image":"1f448-1f3fc.png","sheet_x":14,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F448-1F3FD","non_qualified":null,"image":"1f448-1f3fd.png","sheet_x":14,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F448-1F3FE","non_qualified":null,"image":"1f448-1f3fe.png","sheet_x":14,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F448-1F3FF","non_qualified":null,"image":"1f448-1f3ff.png","sheet_x":14,"sheet_y":24,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"White Left Pointing Backhand Index","b":"1F448","j":["direction","fingers","hand","left"],"k":[14,19]},"point_right":{"skin_variations":{"1F3FB":{"unified":"1F449-1F3FB","non_qualified":null,"image":"1f449-1f3fb.png","sheet_x":14,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F449-1F3FC","non_qualified":null,"image":"1f449-1f3fc.png","sheet_x":14,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F449-1F3FD","non_qualified":null,"image":"1f449-1f3fd.png","sheet_x":14,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F449-1F3FE","non_qualified":null,"image":"1f449-1f3fe.png","sheet_x":14,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F449-1F3FF","non_qualified":null,"image":"1f449-1f3ff.png","sheet_x":14,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"White Right Pointing Backhand Index","b":"1F449","j":["fingers","hand","direction","right"],"k":[14,25]},"point_up":{"skin_variations":{"1F3FB":{"unified":"261D-1F3FB","non_qualified":null,"image":"261d-1f3fb.png","sheet_x":47,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"261D-1F3FC","non_qualified":null,"image":"261d-1f3fc.png","sheet_x":47,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"261D-1F3FD","non_qualified":null,"image":"261d-1f3fd.png","sheet_x":47,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"261D-1F3FE","non_qualified":null,"image":"261d-1f3fe.png","sheet_x":47,"sheet_y":30,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"261D-1F3FF","non_qualified":null,"image":"261d-1f3ff.png","sheet_x":47,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"White Up Pointing Index","b":"261D-FE0F","c":"261D","j":["hand","fingers","direction","up"],"k":[47,26],"o":1},"point_up_2":{"skin_variations":{"1F3FB":{"unified":"1F446-1F3FB","non_qualified":null,"image":"1f446-1f3fb.png","sheet_x":14,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F446-1F3FC","non_qualified":null,"image":"1f446-1f3fc.png","sheet_x":14,"sheet_y":9,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F446-1F3FD","non_qualified":null,"image":"1f446-1f3fd.png","sheet_x":14,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F446-1F3FE","non_qualified":null,"image":"1f446-1f3fe.png","sheet_x":14,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F446-1F3FF","non_qualified":null,"image":"1f446-1f3ff.png","sheet_x":14,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"White Up Pointing Backhand Index","b":"1F446","j":["fingers","hand","direction","up"],"k":[14,7]},"middle_finger":{"skin_variations":{"1F3FB":{"unified":"1F595-1F3FB","non_qualified":null,"image":"1f595-1f3fb.png","sheet_x":29,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F595-1F3FC","non_qualified":null,"image":"1f595-1f3fc.png","sheet_x":29,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F595-1F3FD","non_qualified":null,"image":"1f595-1f3fd.png","sheet_x":29,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F595-1F3FE","non_qualified":null,"image":"1f595-1f3fe.png","sheet_x":29,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F595-1F3FF","non_qualified":null,"image":"1f595-1f3ff.png","sheet_x":29,"sheet_y":43,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Reversed Hand with Middle Finger Extended","b":"1F595","k":[29,38],"n":["reversed_hand_with_middle_finger_extended"],"o":7},"point_down":{"skin_variations":{"1F3FB":{"unified":"1F447-1F3FB","non_qualified":null,"image":"1f447-1f3fb.png","sheet_x":14,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F447-1F3FC","non_qualified":null,"image":"1f447-1f3fc.png","sheet_x":14,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F447-1F3FD","non_qualified":null,"image":"1f447-1f3fd.png","sheet_x":14,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F447-1F3FE","non_qualified":null,"image":"1f447-1f3fe.png","sheet_x":14,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F447-1F3FF","non_qualified":null,"image":"1f447-1f3ff.png","sheet_x":14,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"White Down Pointing Backhand Index","b":"1F447","j":["fingers","hand","direction","down"],"k":[14,13]},"v":{"skin_variations":{"1F3FB":{"unified":"270C-1F3FB","non_qualified":null,"image":"270c-1f3fb.png","sheet_x":49,"sheet_y":31,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"270C-1F3FC","non_qualified":null,"image":"270c-1f3fc.png","sheet_x":49,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"270C-1F3FD","non_qualified":null,"image":"270c-1f3fd.png","sheet_x":49,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"270C-1F3FE","non_qualified":null,"image":"270c-1f3fe.png","sheet_x":49,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"270C-1F3FF","non_qualified":null,"image":"270c-1f3ff.png","sheet_x":49,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Victory Hand","b":"270C-FE0F","c":"270C","j":["fingers","ohyeah","hand","peace","victory","two"],"k":[49,30],"o":1},"crossed_fingers":{"skin_variations":{"1F3FB":{"unified":"1F91E-1F3FB","non_qualified":null,"image":"1f91e-1f3fb.png","sheet_x":38,"sheet_y":12,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F91E-1F3FC","non_qualified":null,"image":"1f91e-1f3fc.png","sheet_x":38,"sheet_y":13,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F91E-1F3FD","non_qualified":null,"image":"1f91e-1f3fd.png","sheet_x":38,"sheet_y":14,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F91E-1F3FE","non_qualified":null,"image":"1f91e-1f3fe.png","sheet_x":38,"sheet_y":15,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F91E-1F3FF","non_qualified":null,"image":"1f91e-1f3ff.png","sheet_x":38,"sheet_y":16,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Hand with Index and Middle Fingers Crossed","b":"1F91E","j":["good","lucky"],"k":[38,11],"n":["hand_with_index_and_middle_fingers_crossed"],"o":9},"spock-hand":{"skin_variations":{"1F3FB":{"unified":"1F596-1F3FB","non_qualified":null,"image":"1f596-1f3fb.png","sheet_x":29,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F596-1F3FC","non_qualified":null,"image":"1f596-1f3fc.png","sheet_x":29,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F596-1F3FD","non_qualified":null,"image":"1f596-1f3fd.png","sheet_x":29,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F596-1F3FE","non_qualified":null,"image":"1f596-1f3fe.png","sheet_x":29,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F596-1F3FF","non_qualified":null,"image":"1f596-1f3ff.png","sheet_x":29,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Raised Hand with Part Between Middle and Ring Fingers","b":"1F596","k":[29,44],"o":7},"the_horns":{"skin_variations":{"1F3FB":{"unified":"1F918-1F3FB","non_qualified":null,"image":"1f918-1f3fb.png","sheet_x":37,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F918-1F3FC","non_qualified":null,"image":"1f918-1f3fc.png","sheet_x":37,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F918-1F3FD","non_qualified":null,"image":"1f918-1f3fd.png","sheet_x":37,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F918-1F3FE","non_qualified":null,"image":"1f918-1f3fe.png","sheet_x":37,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F918-1F3FF","non_qualified":null,"image":"1f918-1f3ff.png","sheet_x":37,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Sign of the Horns","b":"1F918","k":[37,32],"n":["sign_of_the_horns"],"o":8},"call_me_hand":{"skin_variations":{"1F3FB":{"unified":"1F919-1F3FB","non_qualified":null,"image":"1f919-1f3fb.png","sheet_x":37,"sheet_y":39,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F919-1F3FC","non_qualified":null,"image":"1f919-1f3fc.png","sheet_x":37,"sheet_y":40,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F919-1F3FD","non_qualified":null,"image":"1f919-1f3fd.png","sheet_x":37,"sheet_y":41,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F919-1F3FE","non_qualified":null,"image":"1f919-1f3fe.png","sheet_x":37,"sheet_y":42,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F919-1F3FF","non_qualified":null,"image":"1f919-1f3ff.png","sheet_x":37,"sheet_y":43,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Call Me Hand","b":"1F919","j":["hands","gesture"],"k":[37,38],"o":9},"raised_hand_with_fingers_splayed":{"skin_variations":{"1F3FB":{"unified":"1F590-1F3FB","non_qualified":null,"image":"1f590-1f3fb.png","sheet_x":29,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F590-1F3FC","non_qualified":null,"image":"1f590-1f3fc.png","sheet_x":29,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F590-1F3FD","non_qualified":null,"image":"1f590-1f3fd.png","sheet_x":29,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F590-1F3FE","non_qualified":null,"image":"1f590-1f3fe.png","sheet_x":29,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F590-1F3FF","non_qualified":null,"image":"1f590-1f3ff.png","sheet_x":29,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Raised Hand with Fingers Splayed","b":"1F590-FE0F","c":"1F590","j":["hand","fingers","palm"],"k":[29,32],"o":7},"hand":{"skin_variations":{"1F3FB":{"unified":"270B-1F3FB","non_qualified":null,"image":"270b-1f3fb.png","sheet_x":49,"sheet_y":25,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"270B-1F3FC","non_qualified":null,"image":"270b-1f3fc.png","sheet_x":49,"sheet_y":26,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"270B-1F3FD","non_qualified":null,"image":"270b-1f3fd.png","sheet_x":49,"sheet_y":27,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"270B-1F3FE","non_qualified":null,"image":"270b-1f3fe.png","sheet_x":49,"sheet_y":28,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"270B-1F3FF","non_qualified":null,"image":"270b-1f3ff.png","sheet_x":49,"sheet_y":29,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Raised Hand","b":"270B","k":[49,24],"n":["raised_hand"]},"ok_hand":{"skin_variations":{"1F3FB":{"unified":"1F44C-1F3FB","non_qualified":null,"image":"1f44c-1f3fb.png","sheet_x":14,"sheet_y":44,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F44C-1F3FC","non_qualified":null,"image":"1f44c-1f3fc.png","sheet_x":14,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F44C-1F3FD","non_qualified":null,"image":"1f44c-1f3fd.png","sheet_x":14,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F44C-1F3FE","non_qualified":null,"image":"1f44c-1f3fe.png","sheet_x":14,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F44C-1F3FF","non_qualified":null,"image":"1f44c-1f3ff.png","sheet_x":14,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Ok Hand Sign","b":"1F44C","j":["fingers","limbs","perfect","ok","okay"],"k":[14,43]},"+1":{"skin_variations":{"1F3FB":{"unified":"1F44D-1F3FB","non_qualified":null,"image":"1f44d-1f3fb.png","sheet_x":14,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F44D-1F3FC","non_qualified":null,"image":"1f44d-1f3fc.png","sheet_x":14,"sheet_y":51,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F44D-1F3FD","non_qualified":null,"image":"1f44d-1f3fd.png","sheet_x":15,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F44D-1F3FE","non_qualified":null,"image":"1f44d-1f3fe.png","sheet_x":15,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F44D-1F3FF","non_qualified":null,"image":"1f44d-1f3ff.png","sheet_x":15,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Thumbs Up Sign","b":"1F44D","j":["thumbsup","yes","awesome","good","agree","accept","cool","hand","like"],"k":[14,49],"n":["thumbsup"]},"-1":{"skin_variations":{"1F3FB":{"unified":"1F44E-1F3FB","non_qualified":null,"image":"1f44e-1f3fb.png","sheet_x":15,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F44E-1F3FC","non_qualified":null,"image":"1f44e-1f3fc.png","sheet_x":15,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F44E-1F3FD","non_qualified":null,"image":"1f44e-1f3fd.png","sheet_x":15,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F44E-1F3FE","non_qualified":null,"image":"1f44e-1f3fe.png","sheet_x":15,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F44E-1F3FF","non_qualified":null,"image":"1f44e-1f3ff.png","sheet_x":15,"sheet_y":8,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Thumbs Down Sign","b":"1F44E","j":["thumbsdown","no","dislike","hand"],"k":[15,3],"n":["thumbsdown"]},"fist":{"skin_variations":{"1F3FB":{"unified":"270A-1F3FB","non_qualified":null,"image":"270a-1f3fb.png","sheet_x":49,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"270A-1F3FC","non_qualified":null,"image":"270a-1f3fc.png","sheet_x":49,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"270A-1F3FD","non_qualified":null,"image":"270a-1f3fd.png","sheet_x":49,"sheet_y":21,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"270A-1F3FE","non_qualified":null,"image":"270a-1f3fe.png","sheet_x":49,"sheet_y":22,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"270A-1F3FF","non_qualified":null,"image":"270a-1f3ff.png","sheet_x":49,"sheet_y":23,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Raised Fist","b":"270A","j":["fingers","hand","grasp"],"k":[49,18]},"facepunch":{"skin_variations":{"1F3FB":{"unified":"1F44A-1F3FB","non_qualified":null,"image":"1f44a-1f3fb.png","sheet_x":14,"sheet_y":32,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F44A-1F3FC","non_qualified":null,"image":"1f44a-1f3fc.png","sheet_x":14,"sheet_y":33,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F44A-1F3FD","non_qualified":null,"image":"1f44a-1f3fd.png","sheet_x":14,"sheet_y":34,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F44A-1F3FE","non_qualified":null,"image":"1f44a-1f3fe.png","sheet_x":14,"sheet_y":35,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F44A-1F3FF","non_qualified":null,"image":"1f44a-1f3ff.png","sheet_x":14,"sheet_y":36,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Fisted Hand Sign","b":"1F44A","j":["angry","violence","fist","hit","attack","hand"],"k":[14,31],"n":["punch"]},"left-facing_fist":{"skin_variations":{"1F3FB":{"unified":"1F91B-1F3FB","non_qualified":null,"image":"1f91b-1f3fb.png","sheet_x":37,"sheet_y":51,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F91B-1F3FC","non_qualified":null,"image":"1f91b-1f3fc.png","sheet_x":38,"sheet_y":0,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F91B-1F3FD","non_qualified":null,"image":"1f91b-1f3fd.png","sheet_x":38,"sheet_y":1,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F91B-1F3FE","non_qualified":null,"image":"1f91b-1f3fe.png","sheet_x":38,"sheet_y":2,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F91B-1F3FF","non_qualified":null,"image":"1f91b-1f3ff.png","sheet_x":38,"sheet_y":3,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Left-Facing Fist","b":"1F91B","k":[37,50],"o":9},"right-facing_fist":{"skin_variations":{"1F3FB":{"unified":"1F91C-1F3FB","non_qualified":null,"image":"1f91c-1f3fb.png","sheet_x":38,"sheet_y":5,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F91C-1F3FC","non_qualified":null,"image":"1f91c-1f3fc.png","sheet_x":38,"sheet_y":6,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F91C-1F3FD","non_qualified":null,"image":"1f91c-1f3fd.png","sheet_x":38,"sheet_y":7,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F91C-1F3FE","non_qualified":null,"image":"1f91c-1f3fe.png","sheet_x":38,"sheet_y":8,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F91C-1F3FF","non_qualified":null,"image":"1f91c-1f3ff.png","sheet_x":38,"sheet_y":9,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Right-Facing Fist","b":"1F91C","k":[38,4],"o":9},"raised_back_of_hand":{"skin_variations":{"1F3FB":{"unified":"1F91A-1F3FB","non_qualified":null,"image":"1f91a-1f3fb.png","sheet_x":37,"sheet_y":45,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F91A-1F3FC","non_qualified":null,"image":"1f91a-1f3fc.png","sheet_x":37,"sheet_y":46,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F91A-1F3FD","non_qualified":null,"image":"1f91a-1f3fd.png","sheet_x":37,"sheet_y":47,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F91A-1F3FE","non_qualified":null,"image":"1f91a-1f3fe.png","sheet_x":37,"sheet_y":48,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F91A-1F3FF","non_qualified":null,"image":"1f91a-1f3ff.png","sheet_x":37,"sheet_y":49,"added_in":"9.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Raised Back of Hand","b":"1F91A","j":["fingers","raised","backhand"],"k":[37,44],"o":9},"wave":{"skin_variations":{"1F3FB":{"unified":"1F44B-1F3FB","non_qualified":null,"image":"1f44b-1f3fb.png","sheet_x":14,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F44B-1F3FC","non_qualified":null,"image":"1f44b-1f3fc.png","sheet_x":14,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F44B-1F3FD","non_qualified":null,"image":"1f44b-1f3fd.png","sheet_x":14,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F44B-1F3FE","non_qualified":null,"image":"1f44b-1f3fe.png","sheet_x":14,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F44B-1F3FF","non_qualified":null,"image":"1f44b-1f3ff.png","sheet_x":14,"sheet_y":42,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Waving Hand Sign","b":"1F44B","j":["hands","gesture","goodbye","solong","farewell","hello","hi","palm"],"k":[14,37]},"i_love_you_hand_sign":{"skin_variations":{"1F3FB":{"unified":"1F91F-1F3FB","non_qualified":null,"image":"1f91f-1f3fb.png","sheet_x":38,"sheet_y":18,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F91F-1F3FC","non_qualified":null,"image":"1f91f-1f3fc.png","sheet_x":38,"sheet_y":19,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F91F-1F3FD","non_qualified":null,"image":"1f91f-1f3fd.png","sheet_x":38,"sheet_y":20,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F91F-1F3FE","non_qualified":null,"image":"1f91f-1f3fe.png","sheet_x":38,"sheet_y":21,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F91F-1F3FF","non_qualified":null,"image":"1f91f-1f3ff.png","sheet_x":38,"sheet_y":22,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"I Love You Hand Sign","b":"1F91F","k":[38,17],"o":10},"writing_hand":{"skin_variations":{"1F3FB":{"unified":"270D-1F3FB","non_qualified":null,"image":"270d-1f3fb.png","sheet_x":49,"sheet_y":37,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"270D-1F3FC","non_qualified":null,"image":"270d-1f3fc.png","sheet_x":49,"sheet_y":38,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"270D-1F3FD","non_qualified":null,"image":"270d-1f3fd.png","sheet_x":49,"sheet_y":39,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"270D-1F3FE","non_qualified":null,"image":"270d-1f3fe.png","sheet_x":49,"sheet_y":40,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"270D-1F3FF","non_qualified":null,"image":"270d-1f3ff.png","sheet_x":49,"sheet_y":41,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Writing Hand","b":"270D-FE0F","c":"270D","j":["lower_left_ballpoint_pen","stationery","write","compose"],"k":[49,36],"o":1},"clap":{"skin_variations":{"1F3FB":{"unified":"1F44F-1F3FB","non_qualified":null,"image":"1f44f-1f3fb.png","sheet_x":15,"sheet_y":10,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F44F-1F3FC","non_qualified":null,"image":"1f44f-1f3fc.png","sheet_x":15,"sheet_y":11,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F44F-1F3FD","non_qualified":null,"image":"1f44f-1f3fd.png","sheet_x":15,"sheet_y":12,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F44F-1F3FE","non_qualified":null,"image":"1f44f-1f3fe.png","sheet_x":15,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F44F-1F3FF","non_qualified":null,"image":"1f44f-1f3ff.png","sheet_x":15,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Clapping Hands Sign","b":"1F44F","j":["hands","praise","applause","congrats","yay"],"k":[15,9]},"open_hands":{"skin_variations":{"1F3FB":{"unified":"1F450-1F3FB","non_qualified":null,"image":"1f450-1f3fb.png","sheet_x":15,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F450-1F3FC","non_qualified":null,"image":"1f450-1f3fc.png","sheet_x":15,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F450-1F3FD","non_qualified":null,"image":"1f450-1f3fd.png","sheet_x":15,"sheet_y":18,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F450-1F3FE","non_qualified":null,"image":"1f450-1f3fe.png","sheet_x":15,"sheet_y":19,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F450-1F3FF","non_qualified":null,"image":"1f450-1f3ff.png","sheet_x":15,"sheet_y":20,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Open Hands Sign","b":"1F450","j":["fingers","butterfly","hands","open"],"k":[15,15]},"raised_hands":{"skin_variations":{"1F3FB":{"unified":"1F64C-1F3FB","non_qualified":null,"image":"1f64c-1f3fb.png","sheet_x":33,"sheet_y":13,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F64C-1F3FC","non_qualified":null,"image":"1f64c-1f3fc.png","sheet_x":33,"sheet_y":14,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F64C-1F3FD","non_qualified":null,"image":"1f64c-1f3fd.png","sheet_x":33,"sheet_y":15,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F64C-1F3FE","non_qualified":null,"image":"1f64c-1f3fe.png","sheet_x":33,"sheet_y":16,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F64C-1F3FF","non_qualified":null,"image":"1f64c-1f3ff.png","sheet_x":33,"sheet_y":17,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Person Raising Both Hands in Celebration","b":"1F64C","j":["gesture","hooray","yea","celebration","hands"],"k":[33,12]},"palms_up_together":{"skin_variations":{"1F3FB":{"unified":"1F932-1F3FB","non_qualified":null,"image":"1f932-1f3fb.png","sheet_x":39,"sheet_y":17,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FC":{"unified":"1F932-1F3FC","non_qualified":null,"image":"1f932-1f3fc.png","sheet_x":39,"sheet_y":18,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FD":{"unified":"1F932-1F3FD","non_qualified":null,"image":"1f932-1f3fd.png","sheet_x":39,"sheet_y":19,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FE":{"unified":"1F932-1F3FE","non_qualified":null,"image":"1f932-1f3fe.png","sheet_x":39,"sheet_y":20,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false},"1F3FF":{"unified":"1F932-1F3FF","non_qualified":null,"image":"1f932-1f3ff.png","sheet_x":39,"sheet_y":21,"added_in":"10.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":false}},"a":"Palms Up Together","b":"1F932","k":[39,16],"o":10},"pray":{"skin_variations":{"1F3FB":{"unified":"1F64F-1F3FB","non_qualified":null,"image":"1f64f-1f3fb.png","sheet_x":34,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F64F-1F3FC","non_qualified":null,"image":"1f64f-1f3fc.png","sheet_x":34,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F64F-1F3FD","non_qualified":null,"image":"1f64f-1f3fd.png","sheet_x":34,"sheet_y":5,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F64F-1F3FE","non_qualified":null,"image":"1f64f-1f3fe.png","sheet_x":34,"sheet_y":6,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F64F-1F3FF","non_qualified":null,"image":"1f64f-1f3ff.png","sheet_x":34,"sheet_y":7,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Person with Folded Hands","b":"1F64F","j":["please","hope","wish","namaste","highfive"],"k":[34,2]},"handshake":{"a":"Handshake","b":"1F91D","j":["agreement","shake"],"k":[38,10],"o":9},"nail_care":{"skin_variations":{"1F3FB":{"unified":"1F485-1F3FB","non_qualified":null,"image":"1f485-1f3fb.png","sheet_x":23,"sheet_y":45,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F485-1F3FC","non_qualified":null,"image":"1f485-1f3fc.png","sheet_x":23,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F485-1F3FD","non_qualified":null,"image":"1f485-1f3fd.png","sheet_x":23,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F485-1F3FE","non_qualified":null,"image":"1f485-1f3fe.png","sheet_x":23,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F485-1F3FF","non_qualified":null,"image":"1f485-1f3ff.png","sheet_x":23,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Nail Polish","b":"1F485","j":["beauty","manicure","finger","fashion","nail"],"k":[23,44]},"ear":{"skin_variations":{"1F3FB":{"unified":"1F442-1F3FB","non_qualified":null,"image":"1f442-1f3fb.png","sheet_x":13,"sheet_y":46,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F442-1F3FC","non_qualified":null,"image":"1f442-1f3fc.png","sheet_x":13,"sheet_y":47,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F442-1F3FD","non_qualified":null,"image":"1f442-1f3fd.png","sheet_x":13,"sheet_y":48,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F442-1F3FE","non_qualified":null,"image":"1f442-1f3fe.png","sheet_x":13,"sheet_y":49,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F442-1F3FF","non_qualified":null,"image":"1f442-1f3ff.png","sheet_x":13,"sheet_y":50,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Ear","b":"1F442","j":["face","hear","sound","listen"],"k":[13,45]},"nose":{"skin_variations":{"1F3FB":{"unified":"1F443-1F3FB","non_qualified":null,"image":"1f443-1f3fb.png","sheet_x":14,"sheet_y":0,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FC":{"unified":"1F443-1F3FC","non_qualified":null,"image":"1f443-1f3fc.png","sheet_x":14,"sheet_y":1,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FD":{"unified":"1F443-1F3FD","non_qualified":null,"image":"1f443-1f3fd.png","sheet_x":14,"sheet_y":2,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FE":{"unified":"1F443-1F3FE","non_qualified":null,"image":"1f443-1f3fe.png","sheet_x":14,"sheet_y":3,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true},"1F3FF":{"unified":"1F443-1F3FF","non_qualified":null,"image":"1f443-1f3ff.png","sheet_x":14,"sheet_y":4,"added_in":"8.0","has_img_apple":true,"has_img_google":true,"has_img_twitter":true,"has_img_emojione":true,"has_img_facebook":true,"has_img_messenger":true}},"a":"Nose","b":"1F443","j":["smell","sniff"],"k":[13,51]},"footprints":{"a":"Footprints","b":"1F463","j":["feet","tracking","walking","beach"],"k":[15,39]},"eyes":{"a":"Eyes","b":"1F440","j":["look","watch","stalk","peek","see"],"k":[13,42]},"eye":{"a":"Eye","b":"1F441-FE0F","c":"1F441","j":["face","look","see","watch","stare"],"k":[13,44],"o":7},"eye-in-speech-bubble":{"a":"Eye in Speech Bubble","b":"1F441-FE0F-200D-1F5E8-FE0F","k":[13,43],"o":7},"brain":{"a":"Brain","b":"1F9E0","k":[46,22],"o":10},"tongue":{"a":"Tongue","b":"1F445","j":["mouth","playful"],"k":[14,6]},"lips":{"a":"Mouth","b":"1F444","j":["mouth","kiss"],"k":[14,5]},"kiss":{"a":"Kiss Mark","b":"1F48B","j":["face","lips","love","like","affection","valentines"],"k":[24,37]},"cupid":{"a":"Heart with Arrow","b":"1F498","j":["love","like","heart","affection","valentines"],"k":[24,50]},"heart":{"a":"Heavy Black Heart","b":"2764-FE0F","c":"2764","j":["love","like","valentines"],"k":[50,8],"l":["<3"],"m":"<3","o":1},"heartbeat":{"a":"Beating Heart","b":"1F493","j":["love","like","affection","valentines","pink","heart"],"k":[24,45]},"broken_heart":{"a":"Broken Heart","b":"1F494","j":["sad","sorry","break","heart","heartbreak"],"k":[24,46],"l":["</3"],"m":"</3"},"two_hearts":{"a":"Two Hearts","b":"1F495","j":["love","like","affection","valentines","heart"],"k":[24,47]},"sparkling_heart":{"a":"Sparkling Heart","b":"1F496","j":["love","like","affection","valentines"],"k":[24,48]},"heartpulse":{"a":"Growing Heart","b":"1F497","j":["like","love","affection","valentines","pink"],"k":[24,49]},"blue_heart":{"a":"Blue Heart","b":"1F499","j":["love","like","affection","valentines"],"k":[24,51],"m":"<3"},"green_heart":{"a":"Green Heart","b":"1F49A","j":["love","like","affection","valentines"],"k":[25,0],"m":"<3"},"yellow_heart":{"a":"Yellow Heart","b":"1F49B","j":["love","like","affection","valentines"],"k":[25,1],"m":"<3"},"orange_heart":{"a":"Orange Heart","b":"1F9E1","k":[46,23],"o":10},"purple_heart":{"a":"Purple Heart","b":"1F49C","j":["love","like","affection","valentines"],"k":[25,2],"m":"<3"},"black_heart":{"a":"Black Heart","b":"1F5A4","j":["evil"],"k":[29,50],"o":9},"gift_heart":{"a":"Heart with Ribbon","b":"1F49D","j":["love","valentines"],"k":[25,3]},"revolving_hearts":{"a":"Revolving Hearts","b":"1F49E","j":["love","like","affection","valentines"],"k":[25,4]},"heart_decoration":{"a":"Heart Decoration","b":"1F49F","j":["purple-square","love","like"],"k":[25,5]},"heavy_heart_exclamation_mark_ornament":{"a":"Heavy Heart Exclamation Mark Ornament","b":"2763-FE0F","c":"2763","k":[50,7],"o":1},"love_letter":{"a":"Love Letter","b":"1F48C","j":["email","like","affection","envelope","valentines"],"k":[24,38]},"zzz":{"a":"Sleeping Symbol","b":"1F4A4","j":["sleepy","tired","dream"],"k":[25,10]},"anger":{"a":"Anger Symbol","b":"1F4A2","j":["angry","mad"],"k":[25,8]},"bomb":{"a":"Bomb","b":"1F4A3","j":["boom","explode","explosion","terrorism"],"k":[25,9]},"boom":{"a":"Collision Symbol","b":"1F4A5","j":["bomb","explode","explosion","collision","blown"],"k":[25,11],"n":["collision"]},"sweat_drops":{"a":"Splashing Sweat Symbol","b":"1F4A6","j":["water","drip","oops"],"k":[25,12]},"dash":{"a":"Dash Symbol","b":"1F4A8","j":["wind","air","fast","shoo","fart","smoke","puff"],"k":[25,14]},"dizzy":{"a":"Dizzy Symbol","b":"1F4AB","j":["star","sparkle","shoot","magic"],"k":[25,22]},"speech_balloon":{"a":"Speech Balloon","b":"1F4AC","j":["bubble","words","message","talk","chatting"],"k":[25,23]},"left_speech_bubble":{"a":"Left Speech Bubble","b":"1F5E8-FE0F","c":"1F5E8","j":["words","message","talk","chatting"],"k":[30,15],"o":7},"right_anger_bubble":{"a":"Right Anger Bubble","b":"1F5EF-FE0F","c":"1F5EF","j":["caption","speech","thinking","mad"],"k":[30,16],"o":7},"thought_balloon":{"a":"Thought Balloon","b":"1F4AD","j":["bubble","cloud","speech","thinking","dream"],"k":[25,24]},"hole":{"a":"Hole","b":"1F573-FE0F","c":"1F573","j":["embarrassing"],"k":[28,44],"o":7},"eyeglasses":{"a":"Eyeglasses","b":"1F453","j":["fashion","accessories","eyesight","nerdy","dork","geek"],"k":[15,23]},"dark_sunglasses":{"a":"Dark Sunglasses","b":"1F576-FE0F","c":"1F576","j":["face","cool","accessories"],"k":[29,17],"o":7},"necktie":{"a":"Necktie","b":"1F454","j":["shirt","suitup","formal","fashion","cloth","business"],"k":[15,24]},"shirt":{"a":"T-Shirt","b":"1F455","k":[15,25],"n":["tshirt"]},"jeans":{"a":"Jeans","b":"1F456","j":["fashion","shopping"],"k":[15,26]},"scarf":{"a":"Scarf","b":"1F9E3","k":[46,25],"o":10},"gloves":{"a":"Gloves","b":"1F9E4","k":[46,26],"o":10},"coat":{"a":"Coat","b":"1F9E5","k":[46,27],"o":10},"socks":{"a":"Socks","b":"1F9E6","k":[46,28],"o":10},"dress":{"a":"Dress","b":"1F457","j":["clothes","fashion","shopping"],"k":[15,27]},"kimono":{"a":"Kimono","b":"1F458","j":["dress","fashion","women","female","japanese"],"k":[15,28]},"bikini":{"a":"Bikini","b":"1F459","j":["swimming","female","woman","girl","fashion","beach","summer"],"k":[15,29]},"womans_clothes":{"a":"Womans Clothes","b":"1F45A","j":["fashion","shopping_bags","female"],"k":[15,30]},"purse":{"a":"Purse","b":"1F45B","j":["fashion","accessories","money","sales","shopping"],"k":[15,31]},"handbag":{"a":"Handbag","b":"1F45C","j":["fashion","accessory","accessories","shopping"],"k":[15,32]},"pouch":{"a":"Pouch","b":"1F45D","j":["bag","accessories","shopping"],"k":[15,33]},"shopping_bags":{"a":"Shopping Bags","b":"1F6CD-FE0F","c":"1F6CD","k":[37,2],"o":7},"school_satchel":{"a":"School Satchel","b":"1F392","j":["student","education","bag","backpack"],"k":[8,37]},"mans_shoe":{"a":"Mans Shoe","b":"1F45E","j":["fashion","male"],"k":[15,34],"n":["shoe"]},"athletic_shoe":{"a":"Athletic Shoe","b":"1F45F","j":["shoes","sports","sneakers"],"k":[15,35]},"high_heel":{"a":"High-Heeled Shoe","b":"1F460","j":["fashion","shoes","female","pumps","stiletto"],"k":[15,36]},"sandal":{"a":"Womans Sandal","b":"1F461","j":["shoes","fashion","flip flops"],"k":[15,37]},"boot":{"a":"Womans Boots","b":"1F462","j":["shoes","fashion"],"k":[15,38]},"crown":{"a":"Crown","b":"1F451","j":["king","kod","leader","royalty","lord"],"k":[15,21]},"womans_hat":{"a":"Womans Hat","b":"1F452","j":["fashion","accessories","female","lady","spring"],"k":[15,22]},"tophat":{"a":"Top Hat","b":"1F3A9","j":["magic","gentleman","classy","circus"],"k":[9,3]},"mortar_board":{"a":"Graduation Cap","b":"1F393","j":["school","college","degree","university","graduation","cap","hat","legal","learn","education"],"k":[8,38]},"billed_cap":{"a":"Billed Cap","b":"1F9E2","k":[46,24],"o":10},"helmet_with_white_cross":{"a":"Helmet with White Cross","b":"26D1-FE0F","c":"26D1","k":[48,33],"o":5},"prayer_beads":{"a":"Prayer Beads","b":"1F4FF","j":["dhikr","religious"],"k":[27,1],"o":8},"lipstick":{"a":"Lipstick","b":"1F484","j":["female","girl","fashion","woman"],"k":[23,43]},"ring":{"a":"Ring","b":"1F48D","j":["wedding","propose","marriage","valentines","diamond","fashion","jewelry","gem","engagement"],"k":[24,39]},"gem":{"a":"Gem Stone","b":"1F48E","j":["blue","ruby","diamond","jewelry"],"k":[24,40]}},"aliases":{"satisfied":"laughing","grinning_face_with_star_eyes":"star-struck","face_with_one_eyebrow_raised":"face_with_raised_eyebrow","telephone":"phone","cooking":"fried_egg","paw_prints":"feet","flag-cn":"cn","lantern":"izakaya_lantern","shocked_face_with_exploding_head":"exploding_head","open_book":"book","flag-de":"de","grinning_face_with_one_large_and_one_small_eye":"zany_face","serious_face_with_symbols_covering_mouth":"face_with_symbols_on_mouth","flipper":"dolphin","face_with_open_mouth_vomiting":"face_vomiting","flag-es":"es","face_with_finger_covering_closed_lips":"shushing_face","smiling_face_with_smiling_eyes_and_hand_covering_mouth":"face_with_hand_over_mouth","flag-fr":"fr","honeybee":"bee","red_car":"car","envelope":"email","uk":"gb","flag-gb":"gb","poop":"hankey","shit":"hankey","staff_of_aesculapius":"medical_symbol","knife":"hocho","sailboat":"boat","pencil":"memo","flag-it":"it","flag-jp":"jp","heavy_exclamation_mark":"exclamation","flag-kr":"kr","waxing_gibbous_moon":"moon","mother_christmas":"mrs_claus","sun_small_cloud":"mostly_sunny","sun_behind_cloud":"barely_sunny","sun_behind_rain_cloud":"partly_sunny_rain","lightning_cloud":"lightning","tornado_cloud":"tornado","flag-ru":"ru","running":"runner","flag-us":"us","man_and_woman_holding_hands":"couple","man-woman-boy":"family","family":"man-woman-boy","reversed_hand_with_middle_finger_extended":"middle_finger","hand_with_index_and_middle_fingers_crossed":"crossed_fingers","sign_of_the_horns":"the_horns","raised_hand":"hand","thumbsup":"+1","thumbsdown":"-1","punch":"facepunch","collision":"boom","tshirt":"shirt","shoe":"mans_shoe"}}
\ No newline at end of file
+{"compressed": true, "categories": [{"id": "smileys_&_emotion", "name": "Smileys & Emotion", "emojis": ["grinning-face", "grinning-face-with-big-eyes", "grinning-face-with-smiling-eyes", "beaming-face-with-smiling-eyes", "grinning-squinting-face", "grinning-face-with-sweat", "rolling-on-the-floor-laughing", "face-with-tears-of-joy", "slightly-smiling-face", "upsidedown-face", "winking-face", "smiling-face-with-smiling-eyes", "smiling-face-with-halo", "smiling-face-with-hearts", "smiling-face-with-hearteyes", "starstruck", "face-blowing-a-kiss", "kissing-face", "smiling-face", "kissing-face-with-closed-eyes", "kissing-face-with-smiling-eyes", "smiling-face-with-tear", "face-savoring-food", "face-with-tongue", "winking-face-with-tongue", "zany-face", "squinting-face-with-tongue", "moneymouth-face", "hugging-face", "face-with-hand-over-mouth", "shushing-face", "thinking-face", "zippermouth-face", "face-with-raised-eyebrow", "neutral-face", "expressionless-face", "face-without-mouth", "face-in-clouds", "smirking-face", "unamused-face", "face-with-rolling-eyes", "grimacing-face", "face-exhaling", "lying-face", "relieved-face", "pensive-face", "sleepy-face", "drooling-face", "sleeping-face", "face-with-medical-mask", "face-with-thermometer", "face-with-headbandage", "nauseated-face", "face-vomiting", "sneezing-face", "hot-face", "cold-face", "woozy-face", "knockedout-face", "face-with-spiral-eyes", "exploding-head", "cowboy-hat-face", "partying-face", "disguised-face", "smiling-face-with-sunglasses", "nerd-face", "face-with-monocle", "confused-face", "worried-face", "slightly-frowning-face", "frowning-face", "face-with-open-mouth", "hushed-face", "astonished-face", "flushed-face", "pleading-face", "frowning-face-with-open-mouth", "anguished-face", "fearful-face", "anxious-face-with-sweat", "sad-but-relieved-face", "crying-face", "loudly-crying-face", "face-screaming-in-fear", "confounded-face", "persevering-face", "disappointed-face", "downcast-face-with-sweat", "weary-face", "tired-face", "yawning-face", "face-with-steam-from-nose", "pouting-face", "angry-face", "face-with-symbols-on-mouth", "smiling-face-with-horns", "angry-face-with-horns", "skull", "skull-and-crossbones", "pile-of-poo", "clown-face", "ogre", "goblin", "ghost", "alien", "alien-monster", "robot", "grinning-cat", "grinning-cat-with-smiling-eyes", "cat-with-tears-of-joy", "smiling-cat-with-hearteyes", "cat-with-wry-smile", "kissing-cat", "weary-cat", "crying-cat", "pouting-cat", "seenoevil-monkey", "hearnoevil-monkey", "speaknoevil-monkey", "kiss-mark", "love-letter", "heart-with-arrow", "heart-with-ribbon", "sparkling-heart", "growing-heart", "beating-heart", "revolving-hearts", "two-hearts", "heart-decoration", "heart-exclamation", "broken-heart", "heart-on-fire", "mending-heart", "red-heart", "orange-heart", "yellow-heart", "green-heart", "blue-heart", "purple-heart", "brown-heart", "black-heart", "white-heart", "hundred-points", "anger-symbol", "collision", "dizzy", "sweat-droplets", "dashing-away", "hole", "bomb", "speech-balloon", "eye-in-speech-bubble", "left-speech-bubble", "right-anger-bubble", "thought-balloon", "zzz"]}, {"id": "people_&_body", "name": "People & Body", "emojis": ["waving-hand", "raised-back-of-hand", "hand-with-fingers-splayed", "raised-hand", "vulcan-salute", "ok-hand", "pinched-fingers", "pinching-hand", "victory-hand", "crossed-fingers", "loveyou-gesture", "sign-of-the-horns", "call-me-hand", "backhand-index-pointing-left", "backhand-index-pointing-right", "backhand-index-pointing-up", "middle-finger", "backhand-index-pointing-down", "index-pointing-up", "thumbs-up", "thumbs-down", "raised-fist", "oncoming-fist", "leftfacing-fist", "rightfacing-fist", "clapping-hands", "raising-hands", "open-hands", "palms-up-together", "handshake", "folded-hands", "writing-hand", "nail-polish", "selfie", "flexed-biceps", "mechanical-arm", "mechanical-leg", "leg", "foot", "ear", "ear-with-hearing-aid", "nose", "brain", "anatomical-heart", "lungs", "tooth", "bone", "eyes", "eye", "tongue", "mouth", "baby", "child", "boy", "girl", "person", "person-blond-hair", "man", "person-beard", "man-beard", "woman-beard", "man-red-hair", "man-curly-hair", "man-white-hair", "man-bald", "woman", "woman-red-hair", "person-red-hair", "woman-curly-hair", "person-curly-hair", "woman-white-hair", "person-white-hair", "woman-bald", "person-bald", "woman-blond-hair", "man-blond-hair", "older-person", "old-man", "old-woman", "person-frowning", "man-frowning", "woman-frowning", "person-pouting", "man-pouting", "woman-pouting", "person-gesturing-no", "man-gesturing-no", "woman-gesturing-no", "person-gesturing-ok", "man-gesturing-ok", "woman-gesturing-ok", "person-tipping-hand", "man-tipping-hand", "woman-tipping-hand", "person-raising-hand", "man-raising-hand", "woman-raising-hand", "deaf-person", "deaf-man", "deaf-woman", "person-bowing", "man-bowing", "woman-bowing", "person-facepalming", "man-facepalming", "woman-facepalming", "person-shrugging", "man-shrugging", "woman-shrugging", "health-worker", "man-health-worker", "woman-health-worker", "student", "man-student", "woman-student", "teacher", "man-teacher", "woman-teacher", "judge", "man-judge", "woman-judge", "farmer", "man-farmer", "woman-farmer", "cook", "man-cook", "woman-cook", "mechanic", "man-mechanic", "woman-mechanic", "factory-worker", "man-factory-worker", "woman-factory-worker", "office-worker", "man-office-worker", "woman-office-worker", "scientist", "man-scientist", "woman-scientist", "technologist", "man-technologist", "woman-technologist", "singer", "man-singer", "woman-singer", "artist", "man-artist", "woman-artist", "pilot", "man-pilot", "woman-pilot", "astronaut", "man-astronaut", "woman-astronaut", "firefighter", "man-firefighter", "woman-firefighter", "police-officer", "man-police-officer", "woman-police-officer", "detective", "man-detective", "woman-detective", "guard", "man-guard", "woman-guard", "ninja", "construction-worker", "man-construction-worker", "woman-construction-worker", "prince", "princess", "person-wearing-turban", "man-wearing-turban", "woman-wearing-turban", "person-with-skullcap", "woman-with-headscarf", "person-in-tuxedo", "man-in-tuxedo", "woman-in-tuxedo", "person-with-veil", "man-with-veil", "woman-with-veil", "pregnant-woman", "breastfeeding", "woman-feeding-baby", "man-feeding-baby", "person-feeding-baby", "baby-angel", "santa-claus", "mrs-claus", "mx-claus", "superhero", "man-superhero", "woman-superhero", "supervillain", "man-supervillain", "woman-supervillain", "mage", "man-mage", "woman-mage", "fairy", "man-fairy", "woman-fairy", "vampire", "man-vampire", "woman-vampire", "merperson", "merman", "mermaid", "elf", "man-elf", "woman-elf", "genie", "man-genie", "woman-genie", "zombie", "man-zombie", "woman-zombie", "person-getting-massage", "man-getting-massage", "woman-getting-massage", "person-getting-haircut", "man-getting-haircut", "woman-getting-haircut", "person-walking", "man-walking", "woman-walking", "person-standing", "man-standing", "woman-standing", "person-kneeling", "man-kneeling", "woman-kneeling", "person-with-white-cane", "man-with-white-cane", "woman-with-white-cane", "person-in-motorized-wheelchair", "man-in-motorized-wheelchair", "woman-in-motorized-wheelchair", "person-in-manual-wheelchair", "man-in-manual-wheelchair", "woman-in-manual-wheelchair", "person-running", "man-running", "woman-running", "woman-dancing", "man-dancing", "person-in-suit-levitating", "people-with-bunny-ears", "men-with-bunny-ears", "women-with-bunny-ears", "person-in-steamy-room", "man-in-steamy-room", "woman-in-steamy-room", "person-climbing", "man-climbing", "woman-climbing", "person-fencing", "horse-racing", "skier", "snowboarder", "person-golfing", "man-golfing", "woman-golfing", "person-surfing", "man-surfing", "woman-surfing", "person-rowing-boat", "man-rowing-boat", "woman-rowing-boat", "person-swimming", "man-swimming", "woman-swimming", "person-bouncing-ball", "man-bouncing-ball", "woman-bouncing-ball", "person-lifting-weights", "man-lifting-weights", "woman-lifting-weights", "person-biking", "man-biking", "woman-biking", "person-mountain-biking", "man-mountain-biking", "woman-mountain-biking", "person-cartwheeling", "man-cartwheeling", "woman-cartwheeling", "people-wrestling", "men-wrestling", "women-wrestling", "person-playing-water-polo", "man-playing-water-polo", "woman-playing-water-polo", "person-playing-handball", "man-playing-handball", "woman-playing-handball", "person-juggling", "man-juggling", "woman-juggling", "person-in-lotus-position", "man-in-lotus-position", "woman-in-lotus-position", "person-taking-bath", "person-in-bed", "people-holding-hands", "women-holding-hands", "woman-and-man-holding-hands", "men-holding-hands", "kiss", "kiss-woman-man", "kiss-man-man", "kiss-woman-woman", "couple-with-heart", "couple-with-heart-woman-man", "couple-with-heart-man-man", "couple-with-heart-woman-woman", "family", "family-man-woman-boy", "family-man-woman-girl", "family-man-woman-girl-boy", "family-man-woman-boy-boy", "family-man-woman-girl-girl", "family-man-man-boy", "family-man-man-girl", "family-man-man-girl-boy", "family-man-man-boy-boy", "family-man-man-girl-girl", "family-woman-woman-boy", "family-woman-woman-girl", "family-woman-woman-girl-boy", "family-woman-woman-boy-boy", "family-woman-woman-girl-girl", "family-man-boy", "family-man-boy-boy", "family-man-girl", "family-man-girl-boy", "family-man-girl-girl", "family-woman-boy", "family-woman-boy-boy", "family-woman-girl", "family-woman-girl-boy", "family-woman-girl-girl", "speaking-head", "bust-in-silhouette", "busts-in-silhouette", "people-hugging", "footprints"]}, {"id": "animals_&_nature", "name": "Animals & Nature", "emojis": ["monkey-face", "monkey", "gorilla", "orangutan", "dog-face", "dog", "guide-dog", "service-dog", "poodle", "wolf", "fox", "raccoon", "cat-face", "cat", "black-cat", "lion", "tiger-face", "tiger", "leopard", "horse-face", "horse", "unicorn", "zebra", "deer", "bison", "cow-face", "ox", "water-buffalo", "cow", "pig-face", "pig", "boar", "pig-nose", "ram", "ewe", "goat", "camel", "twohump-camel", "llama", "giraffe", "elephant", "mammoth", "rhinoceros", "hippopotamus", "mouse-face", "mouse", "rat", "hamster", "rabbit-face", "rabbit", "chipmunk", "beaver", "hedgehog", "bat", "bear", "polar-bear", "koala", "panda", "sloth", "otter", "skunk", "kangaroo", "badger", "paw-prints", "turkey", "chicken", "rooster", "hatching-chick", "baby-chick", "frontfacing-baby-chick", "bird", "penguin", "dove", "eagle", "duck", "swan", "owl", "dodo", "feather", "flamingo", "peacock", "parrot", "frog", "crocodile", "turtle", "lizard", "snake", "dragon-face", "dragon", "sauropod", "trex", "spouting-whale", "whale", "dolphin", "seal", "fish", "tropical-fish", "blowfish", "shark", "octopus", "spiral-shell", "snail", "butterfly", "bug", "ant", "honeybee", "beetle", "lady-beetle", "cricket", "cockroach", "spider", "spider-web", "scorpion", "mosquito", "fly", "worm", "microbe", "bouquet", "cherry-blossom", "white-flower", "rosette", "rose", "wilted-flower", "hibiscus", "sunflower", "blossom", "tulip", "seedling", "potted-plant", "evergreen-tree", "deciduous-tree", "palm-tree", "cactus", "sheaf-of-rice", "herb", "shamrock", "four-leaf-clover", "maple-leaf", "fallen-leaf", "leaf-fluttering-in-wind"]}, {"id": "food_&_drink", "name": "Food & Drink", "emojis": ["grapes", "melon", "watermelon", "tangerine", "lemon", "banana", "pineapple", "mango", "red-apple", "green-apple", "pear", "peach", "cherries", "strawberry", "blueberries", "kiwi-fruit", "tomato", "olive", "coconut", "avocado", "eggplant", "potato", "carrot", "ear-of-corn", "hot-pepper", "bell-pepper", "cucumber", "leafy-green", "broccoli", "garlic", "onion", "mushroom", "peanuts", "chestnut", "bread", "croissant", "baguette-bread", "flatbread", "pretzel", "bagel", "pancakes", "waffle", "cheese-wedge", "meat-on-bone", "poultry-leg", "cut-of-meat", "bacon", "hamburger", "french-fries", "pizza", "hot-dog", "sandwich", "taco", "burrito", "tamale", "stuffed-flatbread", "falafel", "egg", "cooking", "shallow-pan-of-food", "pot-of-food", "fondue", "bowl-with-spoon", "green-salad", "popcorn", "butter", "salt", "canned-food", "bento-box", "rice-cracker", "rice-ball", "cooked-rice", "curry-rice", "steaming-bowl", "spaghetti", "roasted-sweet-potato", "oden", "sushi", "fried-shrimp", "fish-cake-with-swirl", "moon-cake", "dango", "dumpling", "fortune-cookie", "takeout-box", "crab", "lobster", "shrimp", "squid", "oyster", "soft-ice-cream", "shaved-ice", "ice-cream", "doughnut", "cookie", "birthday-cake", "shortcake", "cupcake", "pie", "chocolate-bar", "candy", "lollipop", "custard", "honey-pot", "baby-bottle", "glass-of-milk", "hot-beverage", "teapot", "teacup-without-handle", "sake", "bottle-with-popping-cork", "wine-glass", "cocktail-glass", "tropical-drink", "beer-mug", "clinking-beer-mugs", "clinking-glasses", "tumbler-glass", "cup-with-straw", "bubble-tea", "beverage-box", "mate", "ice", "chopsticks", "fork-and-knife-with-plate", "fork-and-knife", "spoon", "kitchen-knife", "amphora"]}, {"id": "travel_&_places", "name": "Travel & Places", "emojis": ["globe-showing-europeafrica", "globe-showing-americas", "globe-showing-asiaaustralia", "globe-with-meridians", "world-map", "map-of-japan", "compass", "snowcapped-mountain", "mountain", "volcano", "mount-fuji", "camping", "beach-with-umbrella", "desert", "desert-island", "national-park", "stadium", "classical-building", "building-construction", "brick", "rock", "wood", "hut", "houses", "derelict-house", "house", "house-with-garden", "office-building", "japanese-post-office", "post-office", "hospital", "bank", "hotel", "love-hotel", "convenience-store", "school", "department-store", "factory", "japanese-castle", "castle", "wedding", "tokyo-tower", "statue-of-liberty", "church", "mosque", "hindu-temple", "synagogue", "shinto-shrine", "kaaba", "fountain", "tent", "foggy", "night-with-stars", "cityscape", "sunrise-over-mountains", "sunrise", "cityscape-at-dusk", "sunset", "bridge-at-night", "hot-springs", "carousel-horse", "ferris-wheel", "roller-coaster", "barber-pole", "circus-tent", "locomotive", "railway-car", "highspeed-train", "bullet-train", "train", "metro", "light-rail", "station", "tram", "monorail", "mountain-railway", "tram-car", "bus", "oncoming-bus", "trolleybus", "minibus", "ambulance", "fire-engine", "police-car", "oncoming-police-car", "taxi", "oncoming-taxi", "automobile", "oncoming-automobile", "sport-utility-vehicle", "pickup-truck", "delivery-truck", "articulated-lorry", "tractor", "racing-car", "motorcycle", "motor-scooter", "manual-wheelchair", "motorized-wheelchair", "auto-rickshaw", "bicycle", "kick-scooter", "skateboard", "roller-skate", "bus-stop", "motorway", "railway-track", "oil-drum", "fuel-pump", "police-car-light", "horizontal-traffic-light", "vertical-traffic-light", "stop-sign", "construction", "anchor", "sailboat", "canoe", "speedboat", "passenger-ship", "ferry", "motor-boat", "ship", "airplane", "small-airplane", "airplane-departure", "airplane-arrival", "parachute", "seat", "helicopter", "suspension-railway", "mountain-cableway", "aerial-tramway", "satellite", "rocket", "flying-saucer", "bellhop-bell", "luggage", "hourglass-done", "hourglass-not-done", "watch", "alarm-clock", "stopwatch", "timer-clock", "mantelpiece-clock", "twelve-oclock", "twelvethirty", "one-oclock", "onethirty", "two-oclock", "twothirty", "three-oclock", "threethirty", "four-oclock", "fourthirty", "five-oclock", "fivethirty", "six-oclock", "sixthirty", "seven-oclock", "seventhirty", "eight-oclock", "eightthirty", "nine-oclock", "ninethirty", "ten-oclock", "tenthirty", "eleven-oclock", "eleventhirty", "new-moon", "waxing-crescent-moon", "first-quarter-moon", "waxing-gibbous-moon", "full-moon", "waning-gibbous-moon", "last-quarter-moon", "waning-crescent-moon", "crescent-moon", "new-moon-face", "first-quarter-moon-face", "last-quarter-moon-face", "thermometer", "sun", "full-moon-face", "sun-with-face", "ringed-planet", "star", "glowing-star", "shooting-star", "milky-way", "cloud", "sun-behind-cloud", "cloud-with-lightning-and-rain", "sun-behind-small-cloud", "sun-behind-large-cloud", "sun-behind-rain-cloud", "cloud-with-rain", "cloud-with-snow", "cloud-with-lightning", "tornado", "fog", "wind-face", "cyclone", "rainbow", "closed-umbrella", "umbrella", "umbrella-with-rain-drops", "umbrella-on-ground", "high-voltage", "snowflake", "snowman", "snowman-without-snow", "comet", "fire", "droplet", "water-wave"]}, {"id": "activities", "name": "Activities", "emojis": ["jackolantern", "christmas-tree", "fireworks", "sparkler", "firecracker", "sparkles", "balloon", "party-popper", "confetti-ball", "tanabata-tree", "pine-decoration", "japanese-dolls", "carp-streamer", "wind-chime", "moon-viewing-ceremony", "red-envelope", "ribbon", "wrapped-gift", "reminder-ribbon", "admission-tickets", "ticket", "military-medal", "trophy", "sports-medal", "1st-place-medal", "2nd-place-medal", "3rd-place-medal", "soccer-ball", "baseball", "softball", "basketball", "volleyball", "american-football", "rugby-football", "tennis", "flying-disc", "bowling", "cricket-game", "field-hockey", "ice-hockey", "lacrosse", "ping-pong", "badminton", "boxing-glove", "martial-arts-uniform", "goal-net", "flag-in-hole", "ice-skate", "fishing-pole", "diving-mask", "running-shirt", "skis", "sled", "curling-stone", "bullseye", "yoyo", "kite", "pool-8-ball", "crystal-ball", "magic-wand", "nazar-amulet", "video-game", "joystick", "slot-machine", "game-die", "puzzle-piece", "teddy-bear", "piata", "nesting-dolls", "spade-suit", "heart-suit", "diamond-suit", "club-suit", "chess-pawn", "joker", "mahjong-red-dragon", "flower-playing-cards", "performing-arts", "framed-picture", "artist-palette", "thread", "sewing-needle", "yarn", "knot"]}, {"id": "objects", "name": "Objects", "emojis": ["glasses", "sunglasses", "goggles", "lab-coat", "safety-vest", "necktie", "tshirt", "jeans", "scarf", "gloves", "coat", "socks", "dress", "kimono", "sari", "onepiece-swimsuit", "briefs", "shorts", "bikini", "womans-clothes", "purse", "handbag", "clutch-bag", "shopping-bags", "backpack", "thong-sandal", "mans-shoe", "running-shoe", "hiking-boot", "flat-shoe", "highheeled-shoe", "womans-sandal", "ballet-shoes", "womans-boot", "crown", "womans-hat", "top-hat", "graduation-cap", "billed-cap", "military-helmet", "rescue-workers-helmet", "prayer-beads", "lipstick", "ring", "gem-stone", "muted-speaker", "speaker-low-volume", "speaker-medium-volume", "speaker-high-volume", "loudspeaker", "megaphone", "postal-horn", "bell", "bell-with-slash", "musical-score", "musical-note", "musical-notes", "studio-microphone", "level-slider", "control-knobs", "microphone", "headphone", "radio", "saxophone", "accordion", "guitar", "musical-keyboard", "trumpet", "violin", "banjo", "drum", "long-drum", "mobile-phone", "mobile-phone-with-arrow", "telephone", "telephone-receiver", "pager", "fax-machine", "battery", "electric-plug", "laptop", "desktop-computer", "printer", "keyboard", "computer-mouse", "trackball", "computer-disk", "floppy-disk", "optical-disk", "dvd", "abacus", "movie-camera", "film-frames", "film-projector", "clapper-board", "television", "camera", "camera-with-flash", "video-camera", "videocassette", "magnifying-glass-tilted-left", "magnifying-glass-tilted-right", "candle", "light-bulb", "flashlight", "red-paper-lantern", "diya-lamp", "notebook-with-decorative-cover", "closed-book", "open-book", "green-book", "blue-book", "orange-book", "books", "notebook", "ledger", "page-with-curl", "scroll", "page-facing-up", "newspaper", "rolledup-newspaper", "bookmark-tabs", "bookmark", "label", "money-bag", "coin", "yen-banknote", "dollar-banknote", "euro-banknote", "pound-banknote", "money-with-wings", "credit-card", "receipt", "chart-increasing-with-yen", "envelope", "email", "incoming-envelope", "envelope-with-arrow", "outbox-tray", "inbox-tray", "package", "closed-mailbox-with-raised-flag", "closed-mailbox-with-lowered-flag", "open-mailbox-with-raised-flag", "open-mailbox-with-lowered-flag", "postbox", "ballot-box-with-ballot", "pencil", "black-nib", "fountain-pen", "pen", "paintbrush", "crayon", "memo", "briefcase", "file-folder", "open-file-folder", "card-index-dividers", "calendar", "tearoff-calendar", "spiral-notepad", "spiral-calendar", "card-index", "chart-increasing", "chart-decreasing", "bar-chart", "clipboard", "pushpin", "round-pushpin", "paperclip", "linked-paperclips", "straight-ruler", "triangular-ruler", "scissors", "card-file-box", "file-cabinet", "wastebasket", "locked", "unlocked", "locked-with-pen", "locked-with-key", "key", "old-key", "hammer", "axe", "pick", "hammer-and-pick", "hammer-and-wrench", "dagger", "crossed-swords", "water-pistol", "boomerang", "bow-and-arrow", "shield", "carpentry-saw", "wrench", "screwdriver", "nut-and-bolt", "gear", "clamp", "balance-scale", "white-cane", "link", "chains", "hook", "toolbox", "magnet", "ladder", "alembic", "test-tube", "petri-dish", "dna", "microscope", "telescope", "satellite-antenna", "syringe", "drop-of-blood", "pill", "adhesive-bandage", "stethoscope", "door", "elevator", "mirror", "window", "bed", "couch-and-lamp", "chair", "toilet", "plunger", "shower", "bathtub", "mouse-trap", "razor", "lotion-bottle", "safety-pin", "broom", "basket", "roll-of-paper", "bucket", "soap", "toothbrush", "sponge", "fire-extinguisher", "shopping-cart", "cigarette", "coffin", "headstone", "funeral-urn", "moai", "placard"]}, {"id": "symbols", "name": "Symbols", "emojis": ["atm-sign", "litter-in-bin-sign", "potable-water", "wheelchair-symbol", "mens-room", "womens-room", "restroom", "baby-symbol", "water-closet", "passport-control", "customs", "baggage-claim", "left-luggage", "warning", "children-crossing", "no-entry", "prohibited", "no-bicycles", "no-smoking", "no-littering", "nonpotable-water", "no-pedestrians", "no-mobile-phones", "no-one-under-eighteen", "radioactive", "biohazard", "up-arrow", "upright-arrow", "right-arrow", "downright-arrow", "down-arrow", "downleft-arrow", "left-arrow", "upleft-arrow", "updown-arrow", "leftright-arrow", "right-arrow-curving-left", "left-arrow-curving-right", "right-arrow-curving-up", "right-arrow-curving-down", "clockwise-vertical-arrows", "counterclockwise-arrows-button", "back-arrow", "end-arrow", "on-arrow", "soon-arrow", "top-arrow", "place-of-worship", "atom-symbol", "om", "star-of-david", "wheel-of-dharma", "yin-yang", "latin-cross", "orthodox-cross", "star-and-crescent", "peace-symbol", "menorah", "dotted-sixpointed-star", "aries", "taurus", "gemini", "cancer", "leo", "virgo", "libra", "scorpio", "sagittarius", "capricorn", "aquarius", "pisces", "ophiuchus", "shuffle-tracks-button", "repeat-button", "repeat-single-button", "play-button", "fastforward-button", "next-track-button", "play-or-pause-button", "reverse-button", "fast-reverse-button", "last-track-button", "upwards-button", "fast-up-button", "downwards-button", "fast-down-button", "pause-button", "stop-button", "record-button", "eject-button", "cinema", "dim-button", "bright-button", "antenna-bars", "vibration-mode", "mobile-phone-off", "female-sign", "male-sign", "transgender-symbol", "multiply", "plus", "minus", "divide", "infinity", "double-exclamation-mark", "exclamation-question-mark", "red-question-mark", "white-question-mark", "white-exclamation-mark", "red-exclamation-mark", "wavy-dash", "currency-exchange", "heavy-dollar-sign", "medical-symbol", "recycling-symbol", "fleurdelis", "trident-emblem", "name-badge", "japanese-symbol-for-beginner", "hollow-red-circle", "check-mark-button", "check-box-with-check", "check-mark", "cross-mark", "cross-mark-button", "curly-loop", "double-curly-loop", "part-alternation-mark", "eightspoked-asterisk", "eightpointed-star", "sparkle", "copyright", "registered", "trade-mark", "keycap", "keycap", "keycap-0", "keycap-1", "keycap-2", "keycap-3", "keycap-4", "keycap-5", "keycap-6", "keycap-7", "keycap-8", "keycap-9", "keycap-10", "input-latin-uppercase", "input-latin-lowercase", "input-numbers", "input-symbols", "input-latin-letters", "a-button-blood-type", "ab-button-blood-type", "b-button-blood-type", "cl-button", "cool-button", "free-button", "information", "id-button", "circled-m", "new-button", "ng-button", "o-button-blood-type", "ok-button", "p-button", "sos-button", "up-button", "vs-button", "japanese-here-button", "japanese-service-charge-button", "japanese-monthly-amount-button", "japanese-not-free-of-charge-button", "japanese-reserved-button", "japanese-bargain-button", "japanese-discount-button", "japanese-free-of-charge-button", "japanese-prohibited-button", "japanese-acceptable-button", "japanese-application-button", "japanese-passing-grade-button", "japanese-vacancy-button", "japanese-congratulations-button", "japanese-secret-button", "japanese-open-for-business-button", "japanese-no-vacancy-button", "red-circle", "orange-circle", "yellow-circle", "green-circle", "blue-circle", "purple-circle", "brown-circle", "black-circle", "white-circle", "red-square", "orange-square", "yellow-square", "green-square", "blue-square", "purple-square", "brown-square", "black-large-square", "white-large-square", "black-medium-square", "white-medium-square", "black-mediumsmall-square", "white-mediumsmall-square", "black-small-square", "white-small-square", "large-orange-diamond", "large-blue-diamond", "small-orange-diamond", "small-blue-diamond", "red-triangle-pointed-up", "red-triangle-pointed-down", "diamond-with-a-dot", "radio-button", "white-square-button", "black-square-button"]}, {"id": "flags", "name": "Flags", "emojis": ["chequered-flag", "triangular-flag", "crossed-flags", "black-flag", "white-flag", "rainbow-flag", "transgender-flag", "pirate-flag", "flag-ascension-island", "flag-andorra", "flag-united-arab-emirates", "flag-afghanistan", "flag-antigua--barbuda", "flag-anguilla", "flag-albania", "flag-armenia", "flag-angola", "flag-antarctica", "flag-argentina", "flag-american-samoa", "flag-austria", "flag-australia", "flag-aruba", "flag-land-islands", "flag-azerbaijan", "flag-bosnia--herzegovina", "flag-barbados", "flag-bangladesh", "flag-belgium", "flag-burkina-faso", "flag-bulgaria", "flag-bahrain", "flag-burundi", "flag-benin", "flag-st-barthlemy", "flag-bermuda", "flag-brunei", "flag-bolivia", "flag-caribbean-netherlands", "flag-brazil", "flag-bahamas", "flag-bhutan", "flag-bouvet-island", "flag-botswana", "flag-belarus", "flag-belize", "flag-canada", "flag-cocos-keeling-islands", "flag-congo--kinshasa", "flag-central-african-republic", "flag-congo--brazzaville", "flag-switzerland", "flag-cte-divoire", "flag-cook-islands", "flag-chile", "flag-cameroon", "flag-china", "flag-colombia", "flag-clipperton-island", "flag-costa-rica", "flag-cuba", "flag-cape-verde", "flag-curaao", "flag-christmas-island", "flag-cyprus", "flag-czechia", "flag-germany", "flag-diego-garcia", "flag-djibouti", "flag-denmark", "flag-dominica", "flag-dominican-republic", "flag-algeria", "flag-ceuta--melilla", "flag-ecuador", "flag-estonia", "flag-egypt", "flag-western-sahara", "flag-eritrea", "flag-spain", "flag-ethiopia", "flag-european-union", "flag-finland", "flag-fiji", "flag-falkland-islands", "flag-micronesia", "flag-faroe-islands", "flag-france", "flag-gabon", "flag-united-kingdom", "flag-grenada", "flag-georgia", "flag-french-guiana", "flag-guernsey", "flag-ghana", "flag-gibraltar", "flag-greenland", "flag-gambia", "flag-guinea", "flag-guadeloupe", "flag-equatorial-guinea", "flag-greece", "flag-south-georgia--south-sandwich-islands", "flag-guatemala", "flag-guam", "flag-guineabissau", "flag-guyana", "flag-hong-kong-sar-china", "flag-heard--mcdonald-islands", "flag-honduras", "flag-croatia", "flag-haiti", "flag-hungary", "flag-canary-islands", "flag-indonesia", "flag-ireland", "flag-israel", "flag-isle-of-man", "flag-india", "flag-british-indian-ocean-territory", "flag-iraq", "flag-iran", "flag-iceland", "flag-italy", "flag-jersey", "flag-jamaica", "flag-jordan", "flag-japan", "flag-kenya", "flag-kyrgyzstan", "flag-cambodia", "flag-kiribati", "flag-comoros", "flag-st-kitts--nevis", "flag-north-korea", "flag-south-korea", "flag-kuwait", "flag-cayman-islands", "flag-kazakhstan", "flag-laos", "flag-lebanon", "flag-st-lucia", "flag-liechtenstein", "flag-sri-lanka", "flag-liberia", "flag-lesotho", "flag-lithuania", "flag-luxembourg", "flag-latvia", "flag-libya", "flag-morocco", "flag-monaco", "flag-moldova", "flag-montenegro", "flag-st-martin", "flag-madagascar", "flag-marshall-islands", "flag-north-macedonia", "flag-mali", "flag-myanmar-burma", "flag-mongolia", "flag-macao-sar-china", "flag-northern-mariana-islands", "flag-martinique", "flag-mauritania", "flag-montserrat", "flag-malta", "flag-mauritius", "flag-maldives", "flag-malawi", "flag-mexico", "flag-malaysia", "flag-mozambique", "flag-namibia", "flag-new-caledonia", "flag-niger", "flag-norfolk-island", "flag-nigeria", "flag-nicaragua", "flag-netherlands", "flag-norway", "flag-nepal", "flag-nauru", "flag-niue", "flag-new-zealand", "flag-oman", "flag-panama", "flag-peru", "flag-french-polynesia", "flag-papua-new-guinea", "flag-philippines", "flag-pakistan", "flag-poland", "flag-st-pierre--miquelon", "flag-pitcairn-islands", "flag-puerto-rico", "flag-palestinian-territories", "flag-portugal", "flag-palau", "flag-paraguay", "flag-qatar", "flag-runion", "flag-romania", "flag-serbia", "flag-russia", "flag-rwanda", "flag-saudi-arabia", "flag-solomon-islands", "flag-seychelles", "flag-sudan", "flag-sweden", "flag-singapore", "flag-st-helena", "flag-slovenia", "flag-svalbard--jan-mayen", "flag-slovakia", "flag-sierra-leone", "flag-san-marino", "flag-senegal", "flag-somalia", "flag-suriname", "flag-south-sudan", "flag-so-tom--prncipe", "flag-el-salvador", "flag-sint-maarten", "flag-syria", "flag-eswatini", "flag-tristan-da-cunha", "flag-turks--caicos-islands", "flag-chad", "flag-french-southern-territories", "flag-togo", "flag-thailand", "flag-tajikistan", "flag-tokelau", "flag-timorleste", "flag-turkmenistan", "flag-tunisia", "flag-tonga", "flag-turkey", "flag-trinidad--tobago", "flag-tuvalu", "flag-taiwan", "flag-tanzania", "flag-ukraine", "flag-uganda", "flag-us-outlying-islands", "flag-united-nations", "flag-united-states", "flag-uruguay", "flag-uzbekistan", "flag-vatican-city", "flag-st-vincent--grenadines", "flag-venezuela", "flag-british-virgin-islands", "flag-us-virgin-islands", "flag-vietnam", "flag-vanuatu", "flag-wallis--futuna", "flag-samoa", "flag-kosovo", "flag-yemen", "flag-mayotte", "flag-south-africa", "flag-zambia", "flag-zimbabwe", "flag-england", "flag-scotland", "flag-wales"]}], "emojis": {"grinning-face": {"a": "grinning face", "b": "1F600", "j": ["face", "grin", "grinning face"]}, "grinning-face-with-big-eyes": {"a": "grinning face with big eyes", "b": "1F603", "j": ["face", "grinning face with big eyes", "mouth", "open", "smile"]}, "grinning-face-with-smiling-eyes": {"a": "grinning face with smiling eyes", "b": "1F604", "j": ["eye", "face", "grinning face with smiling eyes", "mouth", "open", "smile"]}, "beaming-face-with-smiling-eyes": {"a": "beaming face with smiling eyes", "b": "1F601", "j": ["beaming face with smiling eyes", "eye", "face", "grin", "smile"]}, "grinning-squinting-face": {"a": "grinning squinting face", "b": "1F606", "j": ["face", "grinning squinting face", "laugh", "mouth", "satisfied", "smile"]}, "grinning-face-with-sweat": {"a": "grinning face with sweat", "b": "1F605", "j": ["cold", "face", "grinning face with sweat", "open", "smile", "sweat"]}, "rolling-on-the-floor-laughing": {"a": "rolling on the floor laughing", "b": "1F923", "j": ["face", "floor", "laugh", "rofl", "rolling", "rolling on the floor laughing", "rotfl"]}, "face-with-tears-of-joy": {"a": "face with tears of joy", "b": "1F602", "j": ["face", "face with tears of joy", "joy", "laugh", "tear"]}, "slightly-smiling-face": {"a": "slightly smiling face", "b": "1F642", "j": ["face", "slightly smiling face", "smile"]}, "upsidedown-face": {"a": "upside-down face", "b": "1F643", "j": ["face", "upside-down"]}, "winking-face": {"a": "winking face", "b": "1F609", "j": ["face", "wink", "winking face"]}, "smiling-face-with-smiling-eyes": {"a": "smiling face with smiling eyes", "b": "1F60A", "j": ["blush", "eye", "face", "smile", "smiling face with smiling eyes"]}, "smiling-face-with-halo": {"a": "smiling face with halo", "b": "1F607", "j": ["angel", "face", "fantasy", "halo", "innocent", "smiling face with halo"]}, "smiling-face-with-hearts": {"a": "smiling face with hearts", "b": "1F970", "j": ["adore", "crush", "hearts", "in love", "smiling face with hearts"]}, "smiling-face-with-hearteyes": {"a": "smiling face with heart-eyes", "b": "1F60D", "j": ["eye", "face", "love", "smile", "smiling face with heart-eyes"]}, "starstruck": {"a": "star-struck", "b": "1F929", "j": ["eyes", "face", "grinning", "star", "star-struck", "starry-eyed"]}, "face-blowing-a-kiss": {"a": "face blowing a kiss", "b": "1F618", "j": ["face", "face blowing a kiss", "kiss"]}, "kissing-face": {"a": "kissing face", "b": "1F617", "j": ["face", "kiss", "kissing face"]}, "smiling-face": {"a": "smiling face", "b": "263A", "j": ["face", "outlined", "relaxed", "smile", "smiling face"]}, "kissing-face-with-closed-eyes": {"a": "kissing face with closed eyes", "b": "1F61A", "j": ["closed", "eye", "face", "kiss", "kissing face with closed eyes"]}, "kissing-face-with-smiling-eyes": {"a": "kissing face with smiling eyes", "b": "1F619", "j": ["eye", "face", "kiss", "kissing face with smiling eyes", "smile"]}, "smiling-face-with-tear": {"a": "smiling face with tear", "b": "1F972", "j": ["grateful", "proud", "relieved", "smiling", "smiling face with tear", "tear", "touched"]}, "face-savoring-food": {"a": "face savoring food", "b": "1F60B", "j": ["delicious", "face", "face savoring food", "savouring", "smile", "yum"]}, "face-with-tongue": {"a": "face with tongue", "b": "1F61B", "j": ["face", "face with tongue", "tongue"]}, "winking-face-with-tongue": {"a": "winking face with tongue", "b": "1F61C", "j": ["eye", "face", "joke", "tongue", "wink", "winking face with tongue"]}, "zany-face": {"a": "zany face", "b": "1F92A", "j": ["eye", "goofy", "large", "small", "zany face"]}, "squinting-face-with-tongue": {"a": "squinting face with tongue", "b": "1F61D", "j": ["eye", "face", "horrible", "squinting face with tongue", "taste", "tongue"]}, "moneymouth-face": {"a": "money-mouth face", "b": "1F911", "j": ["face", "money", "money-mouth face", "mouth"]}, "hugging-face": {"a": "hugging face", "b": "1F917", "j": ["face", "hug", "hugging"]}, "face-with-hand-over-mouth": {"a": "face with hand over mouth", "b": "1F92D", "j": ["face with hand over mouth", "whoops", "shock", "sudden realization", "surprise"]}, "shushing-face": {"a": "shushing face", "b": "1F92B", "j": ["quiet", "shush", "shushing face"]}, "thinking-face": {"a": "thinking face", "b": "1F914", "j": ["face", "thinking"]}, "zippermouth-face": {"a": "zipper-mouth face", "b": "1F910", "j": ["face", "mouth", "zipper", "zipper-mouth face"]}, "face-with-raised-eyebrow": {"a": "face with raised eyebrow", "b": "1F928", "j": ["distrust", "face with raised eyebrow", "skeptic", "disapproval", "disbelief", "mild surprise", "scepticism"]}, "neutral-face": {"a": "neutral face", "b": "1F610", "j": ["deadpan", "face", "meh", "neutral"]}, "expressionless-face": {"a": "expressionless face", "b": "1F611", "j": ["expressionless", "face", "inexpressive", "meh", "unexpressive"]}, "face-without-mouth": {"a": "face without mouth", "b": "1F636", "j": ["face", "face without mouth", "mouth", "quiet", "silent"]}, "face-in-clouds": {"a": "⊛ face in clouds", "b": "1F636-200D-1F32B-FE0F", "j": ["absentminded", "face in clouds", "face in the fog", "head in clouds"]}, "smirking-face": {"a": "smirking face", "b": "1F60F", "j": ["face", "smirk", "smirking face"]}, "unamused-face": {"a": "unamused face", "b": "1F612", "j": ["face", "unamused", "unhappy"]}, "face-with-rolling-eyes": {"a": "face with rolling eyes", "b": "1F644", "j": ["eyeroll", "eyes", "face", "face with rolling eyes", "rolling"]}, "grimacing-face": {"a": "grimacing face", "b": "1F62C", "j": ["face", "grimace", "grimacing face"]}, "face-exhaling": {"a": "⊛ face exhaling", "b": "1F62E-200D-1F4A8", "j": ["exhale", "face exhaling", "gasp", "groan", "relief", "whisper", "whistle"]}, "lying-face": {"a": "lying face", "b": "1F925", "j": ["face", "lie", "lying face", "pinocchio"]}, "relieved-face": {"a": "relieved face", "b": "1F60C", "j": ["face", "relieved"]}, "pensive-face": {"a": "pensive face", "b": "1F614", "j": ["dejected", "face", "pensive"]}, "sleepy-face": {"a": "sleepy face", "b": "1F62A", "j": ["face", "sleep", "sleepy face"]}, "drooling-face": {"a": "drooling face", "b": "1F924", "j": ["drooling", "face"]}, "sleeping-face": {"a": "sleeping face", "b": "1F634", "j": ["face", "sleep", "sleeping face", "zzz"]}, "face-with-medical-mask": {"a": "face with medical mask", "b": "1F637", "j": ["cold", "doctor", "face", "face with medical mask", "mask", "sick"]}, "face-with-thermometer": {"a": "face with thermometer", "b": "1F912", "j": ["face", "face with thermometer", "ill", "sick", "thermometer"]}, "face-with-headbandage": {"a": "face with head-bandage", "b": "1F915", "j": ["bandage", "face", "face with head-bandage", "hurt", "injury"]}, "nauseated-face": {"a": "nauseated face", "b": "1F922", "j": ["face", "nauseated", "vomit"]}, "face-vomiting": {"a": "face vomiting", "b": "1F92E", "j": ["face vomiting", "puke", "sick", "vomit"]}, "sneezing-face": {"a": "sneezing face", "b": "1F927", "j": ["face", "gesundheit", "sneeze", "sneezing face"]}, "hot-face": {"a": "hot face", "b": "1F975", "j": ["feverish", "heat stroke", "hot", "hot face", "red-faced", "sweating"]}, "cold-face": {"a": "cold face", "b": "1F976", "j": ["blue-faced", "cold", "cold face", "freezing", "frostbite", "icicles"]}, "woozy-face": {"a": "woozy face", "b": "1F974", "j": ["dizzy", "intoxicated", "tipsy", "uneven eyes", "wavy mouth", "woozy face"]}, "knockedout-face": {"a": "knocked-out face", "b": "1F635", "j": ["dead", "face", "knocked out", "knocked-out face"]}, "face-with-spiral-eyes": {"a": "⊛ face with spiral eyes", "b": "1F635-200D-1F4AB", "j": ["dizzy", "face with spiral eyes", "hypnotized", "spiral", "trouble", "whoa"]}, "exploding-head": {"a": "exploding head", "b": "1F92F", "j": ["exploding head", "mind blown", "shocked"]}, "cowboy-hat-face": {"a": "cowboy hat face", "b": "1F920", "j": ["cowboy", "cowgirl", "face", "hat"]}, "partying-face": {"a": "partying face", "b": "1F973", "j": ["celebration", "hat", "horn", "party", "partying face"]}, "disguised-face": {"a": "disguised face", "b": "1F978", "j": ["disguise", "disguised face", "face", "glasses", "incognito", "nose"]}, "smiling-face-with-sunglasses": {"a": "smiling face with sunglasses", "b": "1F60E", "j": ["bright", "cool", "face", "smiling face with sunglasses", "sun", "sunglasses"]}, "nerd-face": {"a": "nerd face", "b": "1F913", "j": ["face", "geek", "nerd"]}, "face-with-monocle": {"a": "face with monocle", "b": "1F9D0", "j": ["face with monocle", "stuffy", "wealthy"]}, "confused-face": {"a": "confused face", "b": "1F615", "j": ["confused", "face", "meh"]}, "worried-face": {"a": "worried face", "b": "1F61F", "j": ["face", "worried"]}, "slightly-frowning-face": {"a": "slightly frowning face", "b": "1F641", "j": ["face", "frown", "slightly frowning face"]}, "frowning-face": {"a": "frowning face", "b": "2639", "j": ["face", "frown", "frowning face"]}, "face-with-open-mouth": {"a": "face with open mouth", "b": "1F62E", "j": ["face", "face with open mouth", "mouth", "open", "sympathy"]}, "hushed-face": {"a": "hushed face", "b": "1F62F", "j": ["face", "hushed", "stunned", "surprised"]}, "astonished-face": {"a": "astonished face", "b": "1F632", "j": ["astonished", "face", "shocked", "totally"]}, "flushed-face": {"a": "flushed face", "b": "1F633", "j": ["dazed", "face", "flushed"]}, "pleading-face": {"a": "pleading face", "b": "1F97A", "j": ["begging", "mercy", "pleading face", "puppy eyes"]}, "frowning-face-with-open-mouth": {"a": "frowning face with open mouth", "b": "1F626", "j": ["face", "frown", "frowning face with open mouth", "mouth", "open"]}, "anguished-face": {"a": "anguished face", "b": "1F627", "j": ["anguished", "face"]}, "fearful-face": {"a": "fearful face", "b": "1F628", "j": ["face", "fear", "fearful", "scared"]}, "anxious-face-with-sweat": {"a": "anxious face with sweat", "b": "1F630", "j": ["anxious face with sweat", "blue", "cold", "face", "rushed", "sweat"]}, "sad-but-relieved-face": {"a": "sad but relieved face", "b": "1F625", "j": ["disappointed", "face", "relieved", "sad but relieved face", "whew"]}, "crying-face": {"a": "crying face", "b": "1F622", "j": ["cry", "crying face", "face", "sad", "tear"]}, "loudly-crying-face": {"a": "loudly crying face", "b": "1F62D", "j": ["cry", "face", "loudly crying face", "sad", "sob", "tear"]}, "face-screaming-in-fear": {"a": "face screaming in fear", "b": "1F631", "j": ["face", "face screaming in fear", "fear", "munch", "scared", "scream"]}, "confounded-face": {"a": "confounded face", "b": "1F616", "j": ["confounded", "face"]}, "persevering-face": {"a": "persevering face", "b": "1F623", "j": ["face", "persevere", "persevering face"]}, "disappointed-face": {"a": "disappointed face", "b": "1F61E", "j": ["disappointed", "face"]}, "downcast-face-with-sweat": {"a": "downcast face with sweat", "b": "1F613", "j": ["cold", "downcast face with sweat", "face", "sweat"]}, "weary-face": {"a": "weary face", "b": "1F629", "j": ["face", "tired", "weary"]}, "tired-face": {"a": "tired face", "b": "1F62B", "j": ["face", "tired"]}, "yawning-face": {"a": "yawning face", "b": "1F971", "j": ["bored", "tired", "yawn", "yawning face"]}, "face-with-steam-from-nose": {"a": "face with steam from nose", "b": "1F624", "j": ["face", "face with steam from nose", "triumph", "won"]}, "pouting-face": {"a": "pouting face", "b": "1F621", "j": ["angry", "face", "mad", "pouting", "rage", "red"]}, "angry-face": {"a": "angry face", "b": "1F620", "j": ["anger", "angry", "face", "mad"]}, "face-with-symbols-on-mouth": {"a": "face with symbols on mouth", "b": "1F92C", "j": ["face with symbols on mouth", "swearing", "cursing"]}, "smiling-face-with-horns": {"a": "smiling face with horns", "b": "1F608", "j": ["face", "fairy tale", "fantasy", "horns", "smile", "smiling face with horns"]}, "angry-face-with-horns": {"a": "angry face with horns", "b": "1F47F", "j": ["angry face with horns", "demon", "devil", "face", "fantasy", "imp"]}, "skull": {"a": "skull", "b": "1F480", "j": ["death", "face", "fairy tale", "monster", "skull"]}, "skull-and-crossbones": {"a": "skull and crossbones", "b": "2620", "j": ["crossbones", "death", "face", "monster", "skull", "skull and crossbones"]}, "pile-of-poo": {"a": "pile of poo", "b": "1F4A9", "j": ["dung", "face", "monster", "pile of poo", "poo", "poop"]}, "clown-face": {"a": "clown face", "b": "1F921", "j": ["clown", "face"]}, "ogre": {"a": "ogre", "b": "1F479", "j": ["creature", "face", "fairy tale", "fantasy", "monster", "ogre", "troll"]}, "goblin": {"a": "goblin", "b": "1F47A", "j": ["creature", "face", "fairy tale", "fantasy", "goblin", "monster"]}, "ghost": {"a": "ghost", "b": "1F47B", "j": ["creature", "face", "fairy tale", "fantasy", "ghost", "monster"]}, "alien": {"a": "alien", "b": "1F47D", "j": ["alien", "creature", "extraterrestrial", "face", "fantasy", "ufo"]}, "alien-monster": {"a": "alien monster", "b": "1F47E", "j": ["alien", "creature", "extraterrestrial", "face", "monster", "ufo"]}, "robot": {"a": "robot", "b": "1F916", "j": ["face", "monster", "robot"]}, "grinning-cat": {"a": "grinning cat", "b": "1F63A", "j": ["cat", "face", "grinning", "mouth", "open", "smile"]}, "grinning-cat-with-smiling-eyes": {"a": "grinning cat with smiling eyes", "b": "1F638", "j": ["cat", "eye", "face", "grin", "grinning cat with smiling eyes", "smile"]}, "cat-with-tears-of-joy": {"a": "cat with tears of joy", "b": "1F639", "j": ["cat", "cat with tears of joy", "face", "joy", "tear"]}, "smiling-cat-with-hearteyes": {"a": "smiling cat with heart-eyes", "b": "1F63B", "j": ["cat", "eye", "face", "heart", "love", "smile", "smiling cat with heart-eyes"]}, "cat-with-wry-smile": {"a": "cat with wry smile", "b": "1F63C", "j": ["cat", "cat with wry smile", "face", "ironic", "smile", "wry"]}, "kissing-cat": {"a": "kissing cat", "b": "1F63D", "j": ["cat", "eye", "face", "kiss", "kissing cat"]}, "weary-cat": {"a": "weary cat", "b": "1F640", "j": ["cat", "face", "oh", "surprised", "weary"]}, "crying-cat": {"a": "crying cat", "b": "1F63F", "j": ["cat", "cry", "crying cat", "face", "sad", "tear"]}, "pouting-cat": {"a": "pouting cat", "b": "1F63E", "j": ["cat", "face", "pouting"]}, "seenoevil-monkey": {"a": "see-no-evil monkey", "b": "1F648", "j": ["evil", "face", "forbidden", "monkey", "see", "see-no-evil monkey"]}, "hearnoevil-monkey": {"a": "hear-no-evil monkey", "b": "1F649", "j": ["evil", "face", "forbidden", "hear", "hear-no-evil monkey", "monkey"]}, "speaknoevil-monkey": {"a": "speak-no-evil monkey", "b": "1F64A", "j": ["evil", "face", "forbidden", "monkey", "speak", "speak-no-evil monkey"]}, "kiss-mark": {"a": "kiss mark", "b": "1F48B", "j": ["kiss", "kiss mark", "lips"]}, "love-letter": {"a": "love letter", "b": "1F48C", "j": ["heart", "letter", "love", "mail"]}, "heart-with-arrow": {"a": "heart with arrow", "b": "1F498", "j": ["arrow", "cupid", "heart with arrow"]}, "heart-with-ribbon": {"a": "heart with ribbon", "b": "1F49D", "j": ["heart with ribbon", "ribbon", "valentine"]}, "sparkling-heart": {"a": "sparkling heart", "b": "1F496", "j": ["excited", "sparkle", "sparkling heart"]}, "growing-heart": {"a": "growing heart", "b": "1F497", "j": ["excited", "growing", "growing heart", "nervous", "pulse"]}, "beating-heart": {"a": "beating heart", "b": "1F493", "j": ["beating", "beating heart", "heartbeat", "pulsating"]}, "revolving-hearts": {"a": "revolving hearts", "b": "1F49E", "j": ["revolving", "revolving hearts"]}, "two-hearts": {"a": "two hearts", "b": "1F495", "j": ["love", "two hearts"]}, "heart-decoration": {"a": "heart decoration", "b": "1F49F", "j": ["heart", "heart decoration"]}, "heart-exclamation": {"a": "heart exclamation", "b": "2763", "j": ["exclamation", "heart exclamation", "mark", "punctuation"]}, "broken-heart": {"a": "broken heart", "b": "1F494", "j": ["break", "broken", "broken heart"]}, "heart-on-fire": {"a": "⊛ heart on fire", "b": "2764-FE0F-200D-1F525", "j": ["burn", "heart", "heart on fire", "love", "lust", "sacred heart"]}, "mending-heart": {"a": "⊛ mending heart", "b": "2764-FE0F-200D-1FA79", "j": ["healthier", "improving", "mending", "mending heart", "recovering", "recuperating", "well"]}, "red-heart": {"a": "red heart", "b": "2764", "j": ["heart", "red heart"]}, "orange-heart": {"a": "orange heart", "b": "1F9E1", "j": ["orange", "orange heart"]}, "yellow-heart": {"a": "yellow heart", "b": "1F49B", "j": ["yellow", "yellow heart"]}, "green-heart": {"a": "green heart", "b": "1F49A", "j": ["green", "green heart"]}, "blue-heart": {"a": "blue heart", "b": "1F499", "j": ["blue", "blue heart"]}, "purple-heart": {"a": "purple heart", "b": "1F49C", "j": ["purple", "purple heart"]}, "brown-heart": {"a": "brown heart", "b": "1F90E", "j": ["brown", "heart"]}, "black-heart": {"a": "black heart", "b": "1F5A4", "j": ["black", "black heart", "evil", "wicked"]}, "white-heart": {"a": "white heart", "b": "1F90D", "j": ["heart", "white"]}, "hundred-points": {"a": "hundred points", "b": "1F4AF", "j": ["100", "full", "hundred", "hundred points", "score"]}, "anger-symbol": {"a": "anger symbol", "b": "1F4A2", "j": ["anger symbol", "angry", "comic", "mad"]}, "collision": {"a": "collision", "b": "1F4A5", "j": ["boom", "collision", "comic"]}, "dizzy": {"a": "dizzy", "b": "1F4AB", "j": ["comic", "dizzy", "star"]}, "sweat-droplets": {"a": "sweat droplets", "b": "1F4A6", "j": ["comic", "splashing", "sweat", "sweat droplets"]}, "dashing-away": {"a": "dashing away", "b": "1F4A8", "j": ["comic", "dash", "dashing away", "running"]}, "hole": {"a": "hole", "b": "1F573", "j": ["hole"]}, "bomb": {"a": "bomb", "b": "1F4A3", "j": ["bomb", "comic"]}, "speech-balloon": {"a": "speech balloon", "b": "1F4AC", "j": ["balloon", "bubble", "comic", "dialog", "speech"]}, "eye-in-speech-bubble": {"a": "eye in speech bubble", "b": "1F441-FE0F-200D-1F5E8-FE0F", "j": ["eye", "eye in speech bubble", "speech bubble", "witness"]}, "left-speech-bubble": {"a": "left speech bubble", "b": "1F5E8", "j": ["dialog", "left speech bubble", "speech"]}, "right-anger-bubble": {"a": "right anger bubble", "b": "1F5EF", "j": ["angry", "balloon", "bubble", "mad", "right anger bubble"]}, "thought-balloon": {"a": "thought balloon", "b": "1F4AD", "j": ["balloon", "bubble", "comic", "thought"]}, "zzz": {"a": "zzz", "b": "1F4A4", "j": ["comic", "sleep", "zzz"]}, "waving-hand": {"a": "waving hand", "b": "1F44B", "j": ["hand", "wave", "waving"]}, "raised-back-of-hand": {"a": "raised back of hand", "b": "1F91A", "j": ["backhand", "raised", "raised back of hand"]}, "hand-with-fingers-splayed": {"a": "hand with fingers splayed", "b": "1F590", "j": ["finger", "hand", "hand with fingers splayed", "splayed"]}, "raised-hand": {"a": "raised hand", "b": "270B", "j": ["hand", "high 5", "high five", "raised hand"]}, "vulcan-salute": {"a": "vulcan salute", "b": "1F596", "j": ["finger", "hand", "spock", "vulcan", "vulcan salute"]}, "ok-hand": {"a": "OK hand", "b": "1F44C", "j": ["hand", "OK"]}, "pinched-fingers": {"a": "pinched fingers", "b": "1F90C", "j": ["fingers", "hand gesture", "interrogation", "pinched", "sarcastic"]}, "pinching-hand": {"a": "pinching hand", "b": "1F90F", "j": ["pinching hand", "small amount"]}, "victory-hand": {"a": "victory hand", "b": "270C", "j": ["hand", "v", "victory"]}, "crossed-fingers": {"a": "crossed fingers", "b": "1F91E", "j": ["cross", "crossed fingers", "finger", "hand", "luck"]}, "loveyou-gesture": {"a": "love-you gesture", "b": "1F91F", "j": ["hand", "ILY", "love-you gesture"]}, "sign-of-the-horns": {"a": "sign of the horns", "b": "1F918", "j": ["finger", "hand", "horns", "rock-on", "sign of the horns"]}, "call-me-hand": {"a": "call me hand", "b": "1F919", "j": ["call", "call me hand", "hand"]}, "backhand-index-pointing-left": {"a": "backhand index pointing left", "b": "1F448", "j": ["backhand", "backhand index pointing left", "finger", "hand", "index", "point"]}, "backhand-index-pointing-right": {"a": "backhand index pointing right", "b": "1F449", "j": ["backhand", "backhand index pointing right", "finger", "hand", "index", "point"]}, "backhand-index-pointing-up": {"a": "backhand index pointing up", "b": "1F446", "j": ["backhand", "backhand index pointing up", "finger", "hand", "point", "up"]}, "middle-finger": {"a": "middle finger", "b": "1F595", "j": ["finger", "hand", "middle finger"]}, "backhand-index-pointing-down": {"a": "backhand index pointing down", "b": "1F447", "j": ["backhand", "backhand index pointing down", "down", "finger", "hand", "point"]}, "index-pointing-up": {"a": "index pointing up", "b": "261D", "j": ["finger", "hand", "index", "index pointing up", "point", "up"]}, "thumbs-up": {"a": "thumbs up", "b": "1F44D", "j": ["+1", "hand", "thumb", "thumbs up", "up"]}, "thumbs-down": {"a": "thumbs down", "b": "1F44E", "j": ["-1", "down", "hand", "thumb", "thumbs down"]}, "raised-fist": {"a": "raised fist", "b": "270A", "j": ["clenched", "fist", "hand", "punch", "raised fist"]}, "oncoming-fist": {"a": "oncoming fist", "b": "1F44A", "j": ["clenched", "fist", "hand", "oncoming fist", "punch"]}, "leftfacing-fist": {"a": "left-facing fist", "b": "1F91B", "j": ["fist", "left-facing fist", "leftwards"]}, "rightfacing-fist": {"a": "right-facing fist", "b": "1F91C", "j": ["fist", "right-facing fist", "rightwards"]}, "clapping-hands": {"a": "clapping hands", "b": "1F44F", "j": ["clap", "clapping hands", "hand"]}, "raising-hands": {"a": "raising hands", "b": "1F64C", "j": ["celebration", "gesture", "hand", "hooray", "raised", "raising hands"]}, "open-hands": {"a": "open hands", "b": "1F450", "j": ["hand", "open", "open hands"]}, "palms-up-together": {"a": "palms up together", "b": "1F932", "j": ["palms up together", "prayer", "cupped hands"]}, "handshake": {"a": "handshake", "b": "1F91D", "j": ["agreement", "hand", "handshake", "meeting", "shake"]}, "folded-hands": {"a": "folded hands", "b": "1F64F", "j": ["ask", "folded hands", "hand", "high 5", "high five", "please", "pray", "thanks"]}, "writing-hand": {"a": "writing hand", "b": "270D", "j": ["hand", "write", "writing hand"]}, "nail-polish": {"a": "nail polish", "b": "1F485", "j": ["care", "cosmetics", "manicure", "nail", "polish"]}, "selfie": {"a": "selfie", "b": "1F933", "j": ["camera", "phone", "selfie"]}, "flexed-biceps": {"a": "flexed biceps", "b": "1F4AA", "j": ["biceps", "comic", "flex", "flexed biceps", "muscle"]}, "mechanical-arm": {"a": "mechanical arm", "b": "1F9BE", "j": ["accessibility", "mechanical arm", "prosthetic"]}, "mechanical-leg": {"a": "mechanical leg", "b": "1F9BF", "j": ["accessibility", "mechanical leg", "prosthetic"]}, "leg": {"a": "leg", "b": "1F9B5", "j": ["kick", "leg", "limb"]}, "foot": {"a": "foot", "b": "1F9B6", "j": ["foot", "kick", "stomp"]}, "ear": {"a": "ear", "b": "1F442", "j": ["body", "ear"]}, "ear-with-hearing-aid": {"a": "ear with hearing aid", "b": "1F9BB", "j": ["accessibility", "ear with hearing aid", "hard of hearing"]}, "nose": {"a": "nose", "b": "1F443", "j": ["body", "nose"]}, "brain": {"a": "brain", "b": "1F9E0", "j": ["brain", "intelligent"]}, "anatomical-heart": {"a": "anatomical heart", "b": "1FAC0", "j": ["anatomical", "cardiology", "heart", "organ", "pulse"]}, "lungs": {"a": "lungs", "b": "1FAC1", "j": ["breath", "exhalation", "inhalation", "lungs", "organ", "respiration"]}, "tooth": {"a": "tooth", "b": "1F9B7", "j": ["dentist", "tooth"]}, "bone": {"a": "bone", "b": "1F9B4", "j": ["bone", "skeleton"]}, "eyes": {"a": "eyes", "b": "1F440", "j": ["eye", "eyes", "face"]}, "eye": {"a": "eye", "b": "1F441", "j": ["body", "eye"]}, "tongue": {"a": "tongue", "b": "1F445", "j": ["body", "tongue"]}, "mouth": {"a": "mouth", "b": "1F444", "j": ["lips", "mouth"]}, "baby": {"a": "baby", "b": "1F476", "j": ["baby", "young"]}, "child": {"a": "child", "b": "1F9D2", "j": ["child", "gender-neutral", "unspecified gender", "young"]}, "boy": {"a": "boy", "b": "1F466", "j": ["boy", "young"]}, "girl": {"a": "girl", "b": "1F467", "j": ["girl", "Virgo", "young", "zodiac"]}, "person": {"a": "person", "b": "1F9D1", "j": ["adult", "gender-neutral", "person", "unspecified gender"]}, "person-blond-hair": {"a": "person: blond hair", "b": "1F471", "j": ["blond", "blond-haired person", "hair", "person: blond hair"]}, "man": {"a": "man", "b": "1F468", "j": ["adult", "man"]}, "person-beard": {"a": "person: beard", "b": "1F9D4", "j": ["beard", "person", "person: beard", "bewhiskered"]}, "man-beard": {"a": "⊛ man: beard", "b": "1F9D4-200D-2642-FE0F", "j": ["beard", "man", "man: beard"]}, "woman-beard": {"a": "⊛ woman: beard", "b": "1F9D4-200D-2640-FE0F", "j": ["beard", "woman", "woman: beard"]}, "man-red-hair": {"a": "man: red hair", "b": "1F468-200D-1F9B0", "j": ["adult", "man", "red hair"]}, "man-curly-hair": {"a": "man: curly hair", "b": "1F468-200D-1F9B1", "j": ["adult", "curly hair", "man"]}, "man-white-hair": {"a": "man: white hair", "b": "1F468-200D-1F9B3", "j": ["adult", "man", "white hair"]}, "man-bald": {"a": "man: bald", "b": "1F468-200D-1F9B2", "j": ["adult", "bald", "man"]}, "woman": {"a": "woman", "b": "1F469", "j": ["adult", "woman"]}, "woman-red-hair": {"a": "woman: red hair", "b": "1F469-200D-1F9B0", "j": ["adult", "red hair", "woman"]}, "person-red-hair": {"a": "person: red hair", "b": "1F9D1-200D-1F9B0", "j": ["adult", "gender-neutral", "person", "red hair", "unspecified gender"]}, "woman-curly-hair": {"a": "woman: curly hair", "b": "1F469-200D-1F9B1", "j": ["adult", "curly hair", "woman"]}, "person-curly-hair": {"a": "person: curly hair", "b": "1F9D1-200D-1F9B1", "j": ["adult", "curly hair", "gender-neutral", "person", "unspecified gender"]}, "woman-white-hair": {"a": "woman: white hair", "b": "1F469-200D-1F9B3", "j": ["adult", "white hair", "woman"]}, "person-white-hair": {"a": "person: white hair", "b": "1F9D1-200D-1F9B3", "j": ["adult", "gender-neutral", "person", "unspecified gender", "white hair"]}, "woman-bald": {"a": "woman: bald", "b": "1F469-200D-1F9B2", "j": ["adult", "bald", "woman"]}, "person-bald": {"a": "person: bald", "b": "1F9D1-200D-1F9B2", "j": ["adult", "bald", "gender-neutral", "person", "unspecified gender"]}, "woman-blond-hair": {"a": "woman: blond hair", "b": "1F471-200D-2640-FE0F", "j": ["blond-haired woman", "blonde", "hair", "woman", "woman: blond hair"]}, "man-blond-hair": {"a": "man: blond hair", "b": "1F471-200D-2642-FE0F", "j": ["blond", "blond-haired man", "hair", "man", "man: blond hair"]}, "older-person": {"a": "older person", "b": "1F9D3", "j": ["adult", "gender-neutral", "old", "older person", "unspecified gender"]}, "old-man": {"a": "old man", "b": "1F474", "j": ["adult", "man", "old"]}, "old-woman": {"a": "old woman", "b": "1F475", "j": ["adult", "old", "woman"]}, "person-frowning": {"a": "person frowning", "b": "1F64D", "j": ["frown", "gesture", "person frowning"]}, "man-frowning": {"a": "man frowning", "b": "1F64D-200D-2642-FE0F", "j": ["frowning", "gesture", "man"]}, "woman-frowning": {"a": "woman frowning", "b": "1F64D-200D-2640-FE0F", "j": ["frowning", "gesture", "woman"]}, "person-pouting": {"a": "person pouting", "b": "1F64E", "j": ["gesture", "person pouting", "pouting"]}, "man-pouting": {"a": "man pouting", "b": "1F64E-200D-2642-FE0F", "j": ["gesture", "man", "pouting"]}, "woman-pouting": {"a": "woman pouting", "b": "1F64E-200D-2640-FE0F", "j": ["gesture", "pouting", "woman"]}, "person-gesturing-no": {"a": "person gesturing NO", "b": "1F645", "j": ["forbidden", "gesture", "hand", "person gesturing NO", "prohibited"]}, "man-gesturing-no": {"a": "man gesturing NO", "b": "1F645-200D-2642-FE0F", "j": ["forbidden", "gesture", "hand", "man", "man gesturing NO", "prohibited"]}, "woman-gesturing-no": {"a": "woman gesturing NO", "b": "1F645-200D-2640-FE0F", "j": ["forbidden", "gesture", "hand", "prohibited", "woman", "woman gesturing NO"]}, "person-gesturing-ok": {"a": "person gesturing OK", "b": "1F646", "j": ["gesture", "hand", "OK", "person gesturing OK"]}, "man-gesturing-ok": {"a": "man gesturing OK", "b": "1F646-200D-2642-FE0F", "j": ["gesture", "hand", "man", "man gesturing OK", "OK"]}, "woman-gesturing-ok": {"a": "woman gesturing OK", "b": "1F646-200D-2640-FE0F", "j": ["gesture", "hand", "OK", "woman", "woman gesturing OK"]}, "person-tipping-hand": {"a": "person tipping hand", "b": "1F481", "j": ["hand", "help", "information", "person tipping hand", "sassy", "tipping"]}, "man-tipping-hand": {"a": "man tipping hand", "b": "1F481-200D-2642-FE0F", "j": ["man", "man tipping hand", "sassy", "tipping hand"]}, "woman-tipping-hand": {"a": "woman tipping hand", "b": "1F481-200D-2640-FE0F", "j": ["sassy", "tipping hand", "woman", "woman tipping hand"]}, "person-raising-hand": {"a": "person raising hand", "b": "1F64B", "j": ["gesture", "hand", "happy", "person raising hand", "raised"]}, "man-raising-hand": {"a": "man raising hand", "b": "1F64B-200D-2642-FE0F", "j": ["gesture", "man", "man raising hand", "raising hand"]}, "woman-raising-hand": {"a": "woman raising hand", "b": "1F64B-200D-2640-FE0F", "j": ["gesture", "raising hand", "woman", "woman raising hand"]}, "deaf-person": {"a": "deaf person", "b": "1F9CF", "j": ["accessibility", "deaf", "deaf person", "ear", "hear"]}, "deaf-man": {"a": "deaf man", "b": "1F9CF-200D-2642-FE0F", "j": ["deaf", "man"]}, "deaf-woman": {"a": "deaf woman", "b": "1F9CF-200D-2640-FE0F", "j": ["deaf", "woman"]}, "person-bowing": {"a": "person bowing", "b": "1F647", "j": ["apology", "bow", "gesture", "person bowing", "sorry"]}, "man-bowing": {"a": "man bowing", "b": "1F647-200D-2642-FE0F", "j": ["apology", "bowing", "favor", "gesture", "man", "sorry"]}, "woman-bowing": {"a": "woman bowing", "b": "1F647-200D-2640-FE0F", "j": ["apology", "bowing", "favor", "gesture", "sorry", "woman"]}, "person-facepalming": {"a": "person facepalming", "b": "1F926", "j": ["disbelief", "exasperation", "face", "palm", "person facepalming"]}, "man-facepalming": {"a": "man facepalming", "b": "1F926-200D-2642-FE0F", "j": ["disbelief", "exasperation", "facepalm", "man", "man facepalming"]}, "woman-facepalming": {"a": "woman facepalming", "b": "1F926-200D-2640-FE0F", "j": ["disbelief", "exasperation", "facepalm", "woman", "woman facepalming"]}, "person-shrugging": {"a": "person shrugging", "b": "1F937", "j": ["doubt", "ignorance", "indifference", "person shrugging", "shrug"]}, "man-shrugging": {"a": "man shrugging", "b": "1F937-200D-2642-FE0F", "j": ["doubt", "ignorance", "indifference", "man", "man shrugging", "shrug"]}, "woman-shrugging": {"a": "woman shrugging", "b": "1F937-200D-2640-FE0F", "j": ["doubt", "ignorance", "indifference", "shrug", "woman", "woman shrugging"]}, "health-worker": {"a": "health worker", "b": "1F9D1-200D-2695-FE0F", "j": ["doctor", "health worker", "healthcare", "nurse", "therapist"]}, "man-health-worker": {"a": "man health worker", "b": "1F468-200D-2695-FE0F", "j": ["doctor", "healthcare", "man", "man health worker", "nurse", "therapist"]}, "woman-health-worker": {"a": "woman health worker", "b": "1F469-200D-2695-FE0F", "j": ["doctor", "healthcare", "nurse", "therapist", "woman", "woman health worker"]}, "student": {"a": "student", "b": "1F9D1-200D-1F393", "j": ["graduate", "student"]}, "man-student": {"a": "man student", "b": "1F468-200D-1F393", "j": ["graduate", "man", "student"]}, "woman-student": {"a": "woman student", "b": "1F469-200D-1F393", "j": ["graduate", "student", "woman"]}, "teacher": {"a": "teacher", "b": "1F9D1-200D-1F3EB", "j": ["instructor", "professor", "teacher"]}, "man-teacher": {"a": "man teacher", "b": "1F468-200D-1F3EB", "j": ["instructor", "man", "professor", "teacher"]}, "woman-teacher": {"a": "woman teacher", "b": "1F469-200D-1F3EB", "j": ["instructor", "professor", "teacher", "woman"]}, "judge": {"a": "judge", "b": "1F9D1-200D-2696-FE0F", "j": ["judge", "justice", "scales"]}, "man-judge": {"a": "man judge", "b": "1F468-200D-2696-FE0F", "j": ["judge", "justice", "man", "scales"]}, "woman-judge": {"a": "woman judge", "b": "1F469-200D-2696-FE0F", "j": ["judge", "justice", "scales", "woman"]}, "farmer": {"a": "farmer", "b": "1F9D1-200D-1F33E", "j": ["farmer", "gardener", "rancher"]}, "man-farmer": {"a": "man farmer", "b": "1F468-200D-1F33E", "j": ["farmer", "gardener", "man", "rancher"]}, "woman-farmer": {"a": "woman farmer", "b": "1F469-200D-1F33E", "j": ["farmer", "gardener", "rancher", "woman"]}, "cook": {"a": "cook", "b": "1F9D1-200D-1F373", "j": ["chef", "cook"]}, "man-cook": {"a": "man cook", "b": "1F468-200D-1F373", "j": ["chef", "cook", "man"]}, "woman-cook": {"a": "woman cook", "b": "1F469-200D-1F373", "j": ["chef", "cook", "woman"]}, "mechanic": {"a": "mechanic", "b": "1F9D1-200D-1F527", "j": ["electrician", "mechanic", "plumber", "tradesperson"]}, "man-mechanic": {"a": "man mechanic", "b": "1F468-200D-1F527", "j": ["electrician", "man", "mechanic", "plumber", "tradesperson"]}, "woman-mechanic": {"a": "woman mechanic", "b": "1F469-200D-1F527", "j": ["electrician", "mechanic", "plumber", "tradesperson", "woman"]}, "factory-worker": {"a": "factory worker", "b": "1F9D1-200D-1F3ED", "j": ["assembly", "factory", "industrial", "worker"]}, "man-factory-worker": {"a": "man factory worker", "b": "1F468-200D-1F3ED", "j": ["assembly", "factory", "industrial", "man", "worker"]}, "woman-factory-worker": {"a": "woman factory worker", "b": "1F469-200D-1F3ED", "j": ["assembly", "factory", "industrial", "woman", "worker"]}, "office-worker": {"a": "office worker", "b": "1F9D1-200D-1F4BC", "j": ["architect", "business", "manager", "office worker", "white-collar"]}, "man-office-worker": {"a": "man office worker", "b": "1F468-200D-1F4BC", "j": ["architect", "business", "man", "man office worker", "manager", "white-collar"]}, "woman-office-worker": {"a": "woman office worker", "b": "1F469-200D-1F4BC", "j": ["architect", "business", "manager", "white-collar", "woman", "woman office worker"]}, "scientist": {"a": "scientist", "b": "1F9D1-200D-1F52C", "j": ["biologist", "chemist", "engineer", "physicist", "scientist"]}, "man-scientist": {"a": "man scientist", "b": "1F468-200D-1F52C", "j": ["biologist", "chemist", "engineer", "man", "physicist", "scientist"]}, "woman-scientist": {"a": "woman scientist", "b": "1F469-200D-1F52C", "j": ["biologist", "chemist", "engineer", "physicist", "scientist", "woman"]}, "technologist": {"a": "technologist", "b": "1F9D1-200D-1F4BB", "j": ["coder", "developer", "inventor", "software", "technologist"]}, "man-technologist": {"a": "man technologist", "b": "1F468-200D-1F4BB", "j": ["coder", "developer", "inventor", "man", "software", "technologist"]}, "woman-technologist": {"a": "woman technologist", "b": "1F469-200D-1F4BB", "j": ["coder", "developer", "inventor", "software", "technologist", "woman"]}, "singer": {"a": "singer", "b": "1F9D1-200D-1F3A4", "j": ["actor", "entertainer", "rock", "singer", "star"]}, "man-singer": {"a": "man singer", "b": "1F468-200D-1F3A4", "j": ["actor", "entertainer", "man", "rock", "singer", "star"]}, "woman-singer": {"a": "woman singer", "b": "1F469-200D-1F3A4", "j": ["actor", "entertainer", "rock", "singer", "star", "woman"]}, "artist": {"a": "artist", "b": "1F9D1-200D-1F3A8", "j": ["artist", "palette"]}, "man-artist": {"a": "man artist", "b": "1F468-200D-1F3A8", "j": ["artist", "man", "palette"]}, "woman-artist": {"a": "woman artist", "b": "1F469-200D-1F3A8", "j": ["artist", "palette", "woman"]}, "pilot": {"a": "pilot", "b": "1F9D1-200D-2708-FE0F", "j": ["pilot", "plane"]}, "man-pilot": {"a": "man pilot", "b": "1F468-200D-2708-FE0F", "j": ["man", "pilot", "plane"]}, "woman-pilot": {"a": "woman pilot", "b": "1F469-200D-2708-FE0F", "j": ["pilot", "plane", "woman"]}, "astronaut": {"a": "astronaut", "b": "1F9D1-200D-1F680", "j": ["astronaut", "rocket"]}, "man-astronaut": {"a": "man astronaut", "b": "1F468-200D-1F680", "j": ["astronaut", "man", "rocket"]}, "woman-astronaut": {"a": "woman astronaut", "b": "1F469-200D-1F680", "j": ["astronaut", "rocket", "woman"]}, "firefighter": {"a": "firefighter", "b": "1F9D1-200D-1F692", "j": ["firefighter", "firetruck"]}, "man-firefighter": {"a": "man firefighter", "b": "1F468-200D-1F692", "j": ["firefighter", "firetruck", "man"]}, "woman-firefighter": {"a": "woman firefighter", "b": "1F469-200D-1F692", "j": ["firefighter", "firetruck", "woman"]}, "police-officer": {"a": "police officer", "b": "1F46E", "j": ["cop", "officer", "police"]}, "man-police-officer": {"a": "man police officer", "b": "1F46E-200D-2642-FE0F", "j": ["cop", "man", "officer", "police"]}, "woman-police-officer": {"a": "woman police officer", "b": "1F46E-200D-2640-FE0F", "j": ["cop", "officer", "police", "woman"]}, "detective": {"a": "detective", "b": "1F575", "j": ["detective", "sleuth", "spy"]}, "man-detective": {"a": "man detective", "b": "1F575-FE0F-200D-2642-FE0F", "j": ["detective", "man", "sleuth", "spy"]}, "woman-detective": {"a": "woman detective", "b": "1F575-FE0F-200D-2640-FE0F", "j": ["detective", "sleuth", "spy", "woman"]}, "guard": {"a": "guard", "b": "1F482", "j": ["guard"]}, "man-guard": {"a": "man guard", "b": "1F482-200D-2642-FE0F", "j": ["guard", "man"]}, "woman-guard": {"a": "woman guard", "b": "1F482-200D-2640-FE0F", "j": ["guard", "woman"]}, "ninja": {"a": "ninja", "b": "1F977", "j": ["fighter", "hidden", "ninja", "stealth"]}, "construction-worker": {"a": "construction worker", "b": "1F477", "j": ["construction", "hat", "worker"]}, "man-construction-worker": {"a": "man construction worker", "b": "1F477-200D-2642-FE0F", "j": ["construction", "man", "worker"]}, "woman-construction-worker": {"a": "woman construction worker", "b": "1F477-200D-2640-FE0F", "j": ["construction", "woman", "worker"]}, "prince": {"a": "prince", "b": "1F934", "j": ["prince"]}, "princess": {"a": "princess", "b": "1F478", "j": ["fairy tale", "fantasy", "princess"]}, "person-wearing-turban": {"a": "person wearing turban", "b": "1F473", "j": ["person wearing turban", "turban"]}, "man-wearing-turban": {"a": "man wearing turban", "b": "1F473-200D-2642-FE0F", "j": ["man", "man wearing turban", "turban"]}, "woman-wearing-turban": {"a": "woman wearing turban", "b": "1F473-200D-2640-FE0F", "j": ["turban", "woman", "woman wearing turban"]}, "person-with-skullcap": {"a": "person with skullcap", "b": "1F472", "j": ["cap", "gua pi mao", "hat", "person", "person with skullcap", "skullcap"]}, "woman-with-headscarf": {"a": "woman with headscarf", "b": "1F9D5", "j": ["headscarf", "hijab", "mantilla", "tichel", "woman with headscarf", "bandana", "head kerchief"]}, "person-in-tuxedo": {"a": "person in tuxedo", "b": "1F935", "j": ["groom", "person", "person in tuxedo", "tuxedo"]}, "man-in-tuxedo": {"a": "man in tuxedo", "b": "1F935-200D-2642-FE0F", "j": ["man", "man in tuxedo", "tuxedo"]}, "woman-in-tuxedo": {"a": "woman in tuxedo", "b": "1F935-200D-2640-FE0F", "j": ["tuxedo", "woman", "woman in tuxedo"]}, "person-with-veil": {"a": "person with veil", "b": "1F470", "j": ["bride", "person", "person with veil", "veil", "wedding"]}, "man-with-veil": {"a": "man with veil", "b": "1F470-200D-2642-FE0F", "j": ["man", "man with veil", "veil"]}, "woman-with-veil": {"a": "woman with veil", "b": "1F470-200D-2640-FE0F", "j": ["veil", "woman", "woman with veil"]}, "pregnant-woman": {"a": "pregnant woman", "b": "1F930", "j": ["pregnant", "woman"]}, "breastfeeding": {"a": "breast-feeding", "b": "1F931", "j": ["baby", "breast", "breast-feeding", "nursing"]}, "woman-feeding-baby": {"a": "woman feeding baby", "b": "1F469-200D-1F37C", "j": ["baby", "feeding", "nursing", "woman"]}, "man-feeding-baby": {"a": "man feeding baby", "b": "1F468-200D-1F37C", "j": ["baby", "feeding", "man", "nursing"]}, "person-feeding-baby": {"a": "person feeding baby", "b": "1F9D1-200D-1F37C", "j": ["baby", "feeding", "nursing", "person"]}, "baby-angel": {"a": "baby angel", "b": "1F47C", "j": ["angel", "baby", "face", "fairy tale", "fantasy"]}, "santa-claus": {"a": "Santa Claus", "b": "1F385", "j": ["celebration", "Christmas", "claus", "father", "santa", "Santa Claus"]}, "mrs-claus": {"a": "Mrs. Claus", "b": "1F936", "j": ["celebration", "Christmas", "claus", "mother", "Mrs.", "Mrs. Claus"]}, "mx-claus": {"a": "mx claus", "b": "1F9D1-200D-1F384", "j": ["Claus, christmas", "mx claus"]}, "superhero": {"a": "superhero", "b": "1F9B8", "j": ["good", "hero", "heroine", "superhero", "superpower"]}, "man-superhero": {"a": "man superhero", "b": "1F9B8-200D-2642-FE0F", "j": ["good", "hero", "man", "man superhero", "superpower"]}, "woman-superhero": {"a": "woman superhero", "b": "1F9B8-200D-2640-FE0F", "j": ["good", "hero", "heroine", "superpower", "woman", "woman superhero"]}, "supervillain": {"a": "supervillain", "b": "1F9B9", "j": ["criminal", "evil", "superpower", "supervillain", "villain"]}, "man-supervillain": {"a": "man supervillain", "b": "1F9B9-200D-2642-FE0F", "j": ["criminal", "evil", "man", "man supervillain", "superpower", "villain"]}, "woman-supervillain": {"a": "woman supervillain", "b": "1F9B9-200D-2640-FE0F", "j": ["criminal", "evil", "superpower", "villain", "woman", "woman supervillain"]}, "mage": {"a": "mage", "b": "1F9D9", "j": ["mage", "sorcerer", "sorceress", "witch", "wizard"]}, "man-mage": {"a": "man mage", "b": "1F9D9-200D-2642-FE0F", "j": ["man mage", "sorcerer", "wizard"]}, "woman-mage": {"a": "woman mage", "b": "1F9D9-200D-2640-FE0F", "j": ["sorceress", "witch", "woman mage"]}, "fairy": {"a": "fairy", "b": "1F9DA", "j": ["fairy", "Oberon", "Puck", "Titania"]}, "man-fairy": {"a": "man fairy", "b": "1F9DA-200D-2642-FE0F", "j": ["man fairy", "Oberon", "Puck"]}, "woman-fairy": {"a": "woman fairy", "b": "1F9DA-200D-2640-FE0F", "j": ["Titania", "woman fairy"]}, "vampire": {"a": "vampire", "b": "1F9DB", "j": ["Dracula", "undead", "vampire"]}, "man-vampire": {"a": "man vampire", "b": "1F9DB-200D-2642-FE0F", "j": ["Dracula", "man vampire", "undead"]}, "woman-vampire": {"a": "woman vampire", "b": "1F9DB-200D-2640-FE0F", "j": ["undead", "woman vampire"]}, "merperson": {"a": "merperson", "b": "1F9DC", "j": ["mermaid", "merman", "merperson", "merwoman"]}, "merman": {"a": "merman", "b": "1F9DC-200D-2642-FE0F", "j": ["merman", "Triton"]}, "mermaid": {"a": "mermaid", "b": "1F9DC-200D-2640-FE0F", "j": ["mermaid", "merwoman"]}, "elf": {"a": "elf", "b": "1F9DD", "j": ["elf", "magical", "LOTR style"]}, "man-elf": {"a": "man elf", "b": "1F9DD-200D-2642-FE0F", "j": ["magical", "man elf"]}, "woman-elf": {"a": "woman elf", "b": "1F9DD-200D-2640-FE0F", "j": ["magical", "woman elf"]}, "genie": {"a": "genie", "b": "1F9DE", "j": ["djinn", "genie", "(non-human color)"]}, "man-genie": {"a": "man genie", "b": "1F9DE-200D-2642-FE0F", "j": ["djinn", "man genie"]}, "woman-genie": {"a": "woman genie", "b": "1F9DE-200D-2640-FE0F", "j": ["djinn", "woman genie"]}, "zombie": {"a": "zombie", "b": "1F9DF", "j": ["undead", "walking dead", "zombie", "(non-human color)"]}, "man-zombie": {"a": "man zombie", "b": "1F9DF-200D-2642-FE0F", "j": ["man zombie", "undead", "walking dead"]}, "woman-zombie": {"a": "woman zombie", "b": "1F9DF-200D-2640-FE0F", "j": ["undead", "walking dead", "woman zombie"]}, "person-getting-massage": {"a": "person getting massage", "b": "1F486", "j": ["face", "massage", "person getting massage", "salon"]}, "man-getting-massage": {"a": "man getting massage", "b": "1F486-200D-2642-FE0F", "j": ["face", "man", "man getting massage", "massage"]}, "woman-getting-massage": {"a": "woman getting massage", "b": "1F486-200D-2640-FE0F", "j": ["face", "massage", "woman", "woman getting massage"]}, "person-getting-haircut": {"a": "person getting haircut", "b": "1F487", "j": ["barber", "beauty", "haircut", "parlor", "person getting haircut"]}, "man-getting-haircut": {"a": "man getting haircut", "b": "1F487-200D-2642-FE0F", "j": ["haircut", "man", "man getting haircut"]}, "woman-getting-haircut": {"a": "woman getting haircut", "b": "1F487-200D-2640-FE0F", "j": ["haircut", "woman", "woman getting haircut"]}, "person-walking": {"a": "person walking", "b": "1F6B6", "j": ["hike", "person walking", "walk", "walking"]}, "man-walking": {"a": "man walking", "b": "1F6B6-200D-2642-FE0F", "j": ["hike", "man", "man walking", "walk"]}, "woman-walking": {"a": "woman walking", "b": "1F6B6-200D-2640-FE0F", "j": ["hike", "walk", "woman", "woman walking"]}, "person-standing": {"a": "person standing", "b": "1F9CD", "j": ["person standing", "stand", "standing"]}, "man-standing": {"a": "man standing", "b": "1F9CD-200D-2642-FE0F", "j": ["man", "standing"]}, "woman-standing": {"a": "woman standing", "b": "1F9CD-200D-2640-FE0F", "j": ["standing", "woman"]}, "person-kneeling": {"a": "person kneeling", "b": "1F9CE", "j": ["kneel", "kneeling", "person kneeling"]}, "man-kneeling": {"a": "man kneeling", "b": "1F9CE-200D-2642-FE0F", "j": ["kneeling", "man"]}, "woman-kneeling": {"a": "woman kneeling", "b": "1F9CE-200D-2640-FE0F", "j": ["kneeling", "woman"]}, "person-with-white-cane": {"a": "person with white cane", "b": "1F9D1-200D-1F9AF", "j": ["accessibility", "blind", "person with white cane"]}, "man-with-white-cane": {"a": "man with white cane", "b": "1F468-200D-1F9AF", "j": ["accessibility", "blind", "man", "man with white cane"]}, "woman-with-white-cane": {"a": "woman with white cane", "b": "1F469-200D-1F9AF", "j": ["accessibility", "blind", "woman", "woman with white cane"]}, "person-in-motorized-wheelchair": {"a": "person in motorized wheelchair", "b": "1F9D1-200D-1F9BC", "j": ["accessibility", "person in motorized wheelchair", "wheelchair"]}, "man-in-motorized-wheelchair": {"a": "man in motorized wheelchair", "b": "1F468-200D-1F9BC", "j": ["accessibility", "man", "man in motorized wheelchair", "wheelchair"]}, "woman-in-motorized-wheelchair": {"a": "woman in motorized wheelchair", "b": "1F469-200D-1F9BC", "j": ["accessibility", "wheelchair", "woman", "woman in motorized wheelchair"]}, "person-in-manual-wheelchair": {"a": "person in manual wheelchair", "b": "1F9D1-200D-1F9BD", "j": ["accessibility", "person in manual wheelchair", "wheelchair"]}, "man-in-manual-wheelchair": {"a": "man in manual wheelchair", "b": "1F468-200D-1F9BD", "j": ["accessibility", "man", "man in manual wheelchair", "wheelchair"]}, "woman-in-manual-wheelchair": {"a": "woman in manual wheelchair", "b": "1F469-200D-1F9BD", "j": ["accessibility", "wheelchair", "woman", "woman in manual wheelchair"]}, "person-running": {"a": "person running", "b": "1F3C3", "j": ["marathon", "person running", "running"]}, "man-running": {"a": "man running", "b": "1F3C3-200D-2642-FE0F", "j": ["man", "marathon", "racing", "running"]}, "woman-running": {"a": "woman running", "b": "1F3C3-200D-2640-FE0F", "j": ["marathon", "racing", "running", "woman"]}, "woman-dancing": {"a": "woman dancing", "b": "1F483", "j": ["dance", "dancing", "woman"]}, "man-dancing": {"a": "man dancing", "b": "1F57A", "j": ["dance", "dancing", "man"]}, "person-in-suit-levitating": {"a": "person in suit levitating", "b": "1F574", "j": ["business", "person", "person in suit levitating", "suit"]}, "people-with-bunny-ears": {"a": "people with bunny ears", "b": "1F46F", "j": ["bunny ear", "dancer", "partying", "people with bunny ears"]}, "men-with-bunny-ears": {"a": "men with bunny ears", "b": "1F46F-200D-2642-FE0F", "j": ["bunny ear", "dancer", "men", "men with bunny ears", "partying"]}, "women-with-bunny-ears": {"a": "women with bunny ears", "b": "1F46F-200D-2640-FE0F", "j": ["bunny ear", "dancer", "partying", "women", "women with bunny ears"]}, "person-in-steamy-room": {"a": "person in steamy room", "b": "1F9D6", "j": ["person in steamy room", "sauna", "steam room", "hamam", "steambath"]}, "man-in-steamy-room": {"a": "man in steamy room", "b": "1F9D6-200D-2642-FE0F", "j": ["man in steamy room", "sauna", "steam room"]}, "woman-in-steamy-room": {"a": "woman in steamy room", "b": "1F9D6-200D-2640-FE0F", "j": ["sauna", "steam room", "woman in steamy room"]}, "person-climbing": {"a": "person climbing", "b": "1F9D7", "j": ["climber", "person climbing"]}, "man-climbing": {"a": "man climbing", "b": "1F9D7-200D-2642-FE0F", "j": ["climber", "man climbing"]}, "woman-climbing": {"a": "woman climbing", "b": "1F9D7-200D-2640-FE0F", "j": ["climber", "woman climbing"]}, "person-fencing": {"a": "person fencing", "b": "1F93A", "j": ["fencer", "fencing", "person fencing", "sword"]}, "horse-racing": {"a": "horse racing", "b": "1F3C7", "j": ["horse", "jockey", "racehorse", "racing"]}, "skier": {"a": "skier", "b": "26F7", "j": ["ski", "skier", "snow"]}, "snowboarder": {"a": "snowboarder", "b": "1F3C2", "j": ["ski", "snow", "snowboard", "snowboarder"]}, "person-golfing": {"a": "person golfing", "b": "1F3CC", "j": ["ball", "golf", "person golfing"]}, "man-golfing": {"a": "man golfing", "b": "1F3CC-FE0F-200D-2642-FE0F", "j": ["golf", "man", "man golfing"]}, "woman-golfing": {"a": "woman golfing", "b": "1F3CC-FE0F-200D-2640-FE0F", "j": ["golf", "woman", "woman golfing"]}, "person-surfing": {"a": "person surfing", "b": "1F3C4", "j": ["person surfing", "surfing"]}, "man-surfing": {"a": "man surfing", "b": "1F3C4-200D-2642-FE0F", "j": ["man", "surfing"]}, "woman-surfing": {"a": "woman surfing", "b": "1F3C4-200D-2640-FE0F", "j": ["surfing", "woman"]}, "person-rowing-boat": {"a": "person rowing boat", "b": "1F6A3", "j": ["boat", "person rowing boat", "rowboat"]}, "man-rowing-boat": {"a": "man rowing boat", "b": "1F6A3-200D-2642-FE0F", "j": ["boat", "man", "man rowing boat", "rowboat"]}, "woman-rowing-boat": {"a": "woman rowing boat", "b": "1F6A3-200D-2640-FE0F", "j": ["boat", "rowboat", "woman", "woman rowing boat"]}, "person-swimming": {"a": "person swimming", "b": "1F3CA", "j": ["person swimming", "swim"]}, "man-swimming": {"a": "man swimming", "b": "1F3CA-200D-2642-FE0F", "j": ["man", "man swimming", "swim"]}, "woman-swimming": {"a": "woman swimming", "b": "1F3CA-200D-2640-FE0F", "j": ["swim", "woman", "woman swimming"]}, "person-bouncing-ball": {"a": "person bouncing ball", "b": "26F9", "j": ["ball", "person bouncing ball"]}, "man-bouncing-ball": {"a": "man bouncing ball", "b": "26F9-FE0F-200D-2642-FE0F", "j": ["ball", "man", "man bouncing ball"]}, "woman-bouncing-ball": {"a": "woman bouncing ball", "b": "26F9-FE0F-200D-2640-FE0F", "j": ["ball", "woman", "woman bouncing ball"]}, "person-lifting-weights": {"a": "person lifting weights", "b": "1F3CB", "j": ["lifter", "person lifting weights", "weight"]}, "man-lifting-weights": {"a": "man lifting weights", "b": "1F3CB-FE0F-200D-2642-FE0F", "j": ["man", "man lifting weights", "weight lifter"]}, "woman-lifting-weights": {"a": "woman lifting weights", "b": "1F3CB-FE0F-200D-2640-FE0F", "j": ["weight lifter", "woman", "woman lifting weights"]}, "person-biking": {"a": "person biking", "b": "1F6B4", "j": ["bicycle", "biking", "cyclist", "person biking"]}, "man-biking": {"a": "man biking", "b": "1F6B4-200D-2642-FE0F", "j": ["bicycle", "biking", "cyclist", "man"]}, "woman-biking": {"a": "woman biking", "b": "1F6B4-200D-2640-FE0F", "j": ["bicycle", "biking", "cyclist", "woman"]}, "person-mountain-biking": {"a": "person mountain biking", "b": "1F6B5", "j": ["bicycle", "bicyclist", "bike", "cyclist", "mountain", "person mountain biking"]}, "man-mountain-biking": {"a": "man mountain biking", "b": "1F6B5-200D-2642-FE0F", "j": ["bicycle", "bike", "cyclist", "man", "man mountain biking", "mountain"]}, "woman-mountain-biking": {"a": "woman mountain biking", "b": "1F6B5-200D-2640-FE0F", "j": ["bicycle", "bike", "biking", "cyclist", "mountain", "woman"]}, "person-cartwheeling": {"a": "person cartwheeling", "b": "1F938", "j": ["cartwheel", "gymnastics", "person cartwheeling"]}, "man-cartwheeling": {"a": "man cartwheeling", "b": "1F938-200D-2642-FE0F", "j": ["cartwheel", "gymnastics", "man", "man cartwheeling"]}, "woman-cartwheeling": {"a": "woman cartwheeling", "b": "1F938-200D-2640-FE0F", "j": ["cartwheel", "gymnastics", "woman", "woman cartwheeling"]}, "people-wrestling": {"a": "people wrestling", "b": "1F93C", "j": ["people wrestling", "wrestle", "wrestler"]}, "men-wrestling": {"a": "men wrestling", "b": "1F93C-200D-2642-FE0F", "j": ["men", "men wrestling", "wrestle"]}, "women-wrestling": {"a": "women wrestling", "b": "1F93C-200D-2640-FE0F", "j": ["women", "women wrestling", "wrestle"]}, "person-playing-water-polo": {"a": "person playing water polo", "b": "1F93D", "j": ["person playing water polo", "polo", "water"]}, "man-playing-water-polo": {"a": "man playing water polo", "b": "1F93D-200D-2642-FE0F", "j": ["man", "man playing water polo", "water polo"]}, "woman-playing-water-polo": {"a": "woman playing water polo", "b": "1F93D-200D-2640-FE0F", "j": ["water polo", "woman", "woman playing water polo"]}, "person-playing-handball": {"a": "person playing handball", "b": "1F93E", "j": ["ball", "handball", "person playing handball"]}, "man-playing-handball": {"a": "man playing handball", "b": "1F93E-200D-2642-FE0F", "j": ["handball", "man", "man playing handball"]}, "woman-playing-handball": {"a": "woman playing handball", "b": "1F93E-200D-2640-FE0F", "j": ["handball", "woman", "woman playing handball"]}, "person-juggling": {"a": "person juggling", "b": "1F939", "j": ["balance", "juggle", "multitask", "person juggling", "skill"]}, "man-juggling": {"a": "man juggling", "b": "1F939-200D-2642-FE0F", "j": ["juggling", "man", "multitask"]}, "woman-juggling": {"a": "woman juggling", "b": "1F939-200D-2640-FE0F", "j": ["juggling", "multitask", "woman"]}, "person-in-lotus-position": {"a": "person in lotus position", "b": "1F9D8", "j": ["meditation", "person in lotus position", "yoga", "serenity"]}, "man-in-lotus-position": {"a": "man in lotus position", "b": "1F9D8-200D-2642-FE0F", "j": ["man in lotus position", "meditation", "yoga"]}, "woman-in-lotus-position": {"a": "woman in lotus position", "b": "1F9D8-200D-2640-FE0F", "j": ["meditation", "woman in lotus position", "yoga"]}, "person-taking-bath": {"a": "person taking bath", "b": "1F6C0", "j": ["bath", "bathtub", "person taking bath"]}, "person-in-bed": {"a": "person in bed", "b": "1F6CC", "j": ["hotel", "person in bed", "sleep"]}, "people-holding-hands": {"a": "people holding hands", "b": "1F9D1-200D-1F91D-200D-1F9D1", "j": ["couple", "hand", "hold", "holding hands", "people holding hands", "person"]}, "women-holding-hands": {"a": "women holding hands", "b": "1F46D", "j": ["couple", "hand", "holding hands", "women", "women holding hands"]}, "woman-and-man-holding-hands": {"a": "woman and man holding hands", "b": "1F46B", "j": ["couple", "hand", "hold", "holding hands", "man", "woman", "woman and man holding hands"]}, "men-holding-hands": {"a": "men holding hands", "b": "1F46C", "j": ["couple", "Gemini", "holding hands", "man", "men", "men holding hands", "twins", "zodiac"]}, "kiss": {"a": "kiss", "b": "1F48F", "j": ["couple", "kiss"]}, "kiss-woman-man": {"a": "kiss: woman, man", "b": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F468", "j": ["couple", "kiss", "man", "woman"]}, "kiss-man-man": {"a": "kiss: man, man", "b": "1F468-200D-2764-FE0F-200D-1F48B-200D-1F468", "j": ["couple", "kiss", "man"]}, "kiss-woman-woman": {"a": "kiss: woman, woman", "b": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F469", "j": ["couple", "kiss", "woman"]}, "couple-with-heart": {"a": "couple with heart", "b": "1F491", "j": ["couple", "couple with heart", "love"]}, "couple-with-heart-woman-man": {"a": "couple with heart: woman, man", "b": "1F469-200D-2764-FE0F-200D-1F468", "j": ["couple", "couple with heart", "love", "man", "woman"]}, "couple-with-heart-man-man": {"a": "couple with heart: man, man", "b": "1F468-200D-2764-FE0F-200D-1F468", "j": ["couple", "couple with heart", "love", "man"]}, "couple-with-heart-woman-woman": {"a": "couple with heart: woman, woman", "b": "1F469-200D-2764-FE0F-200D-1F469", "j": ["couple", "couple with heart", "love", "woman"]}, "family": {"a": "family", "b": "1F46A", "j": ["family"]}, "family-man-woman-boy": {"a": "family: man, woman, boy", "b": "1F468-200D-1F469-200D-1F466", "j": ["boy", "family", "man", "woman"]}, "family-man-woman-girl": {"a": "family: man, woman, girl", "b": "1F468-200D-1F469-200D-1F467", "j": ["family", "girl", "man", "woman"]}, "family-man-woman-girl-boy": {"a": "family: man, woman, girl, boy", "b": "1F468-200D-1F469-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "man", "woman"]}, "family-man-woman-boy-boy": {"a": "family: man, woman, boy, boy", "b": "1F468-200D-1F469-200D-1F466-200D-1F466", "j": ["boy", "family", "man", "woman"]}, "family-man-woman-girl-girl": {"a": "family: man, woman, girl, girl", "b": "1F468-200D-1F469-200D-1F467-200D-1F467", "j": ["family", "girl", "man", "woman"]}, "family-man-man-boy": {"a": "family: man, man, boy", "b": "1F468-200D-1F468-200D-1F466", "j": ["boy", "family", "man"]}, "family-man-man-girl": {"a": "family: man, man, girl", "b": "1F468-200D-1F468-200D-1F467", "j": ["family", "girl", "man"]}, "family-man-man-girl-boy": {"a": "family: man, man, girl, boy", "b": "1F468-200D-1F468-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "man"]}, "family-man-man-boy-boy": {"a": "family: man, man, boy, boy", "b": "1F468-200D-1F468-200D-1F466-200D-1F466", "j": ["boy", "family", "man"]}, "family-man-man-girl-girl": {"a": "family: man, man, girl, girl", "b": "1F468-200D-1F468-200D-1F467-200D-1F467", "j": ["family", "girl", "man"]}, "family-woman-woman-boy": {"a": "family: woman, woman, boy", "b": "1F469-200D-1F469-200D-1F466", "j": ["boy", "family", "woman"]}, "family-woman-woman-girl": {"a": "family: woman, woman, girl", "b": "1F469-200D-1F469-200D-1F467", "j": ["family", "girl", "woman"]}, "family-woman-woman-girl-boy": {"a": "family: woman, woman, girl, boy", "b": "1F469-200D-1F469-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "woman"]}, "family-woman-woman-boy-boy": {"a": "family: woman, woman, boy, boy", "b": "1F469-200D-1F469-200D-1F466-200D-1F466", "j": ["boy", "family", "woman"]}, "family-woman-woman-girl-girl": {"a": "family: woman, woman, girl, girl", "b": "1F469-200D-1F469-200D-1F467-200D-1F467", "j": ["family", "girl", "woman"]}, "family-man-boy": {"a": "family: man, boy", "b": "1F468-200D-1F466", "j": ["boy", "family", "man"]}, "family-man-boy-boy": {"a": "family: man, boy, boy", "b": "1F468-200D-1F466-200D-1F466", "j": ["boy", "family", "man"]}, "family-man-girl": {"a": "family: man, girl", "b": "1F468-200D-1F467", "j": ["family", "girl", "man"]}, "family-man-girl-boy": {"a": "family: man, girl, boy", "b": "1F468-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "man"]}, "family-man-girl-girl": {"a": "family: man, girl, girl", "b": "1F468-200D-1F467-200D-1F467", "j": ["family", "girl", "man"]}, "family-woman-boy": {"a": "family: woman, boy", "b": "1F469-200D-1F466", "j": ["boy", "family", "woman"]}, "family-woman-boy-boy": {"a": "family: woman, boy, boy", "b": "1F469-200D-1F466-200D-1F466", "j": ["boy", "family", "woman"]}, "family-woman-girl": {"a": "family: woman, girl", "b": "1F469-200D-1F467", "j": ["family", "girl", "woman"]}, "family-woman-girl-boy": {"a": "family: woman, girl, boy", "b": "1F469-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "woman"]}, "family-woman-girl-girl": {"a": "family: woman, girl, girl", "b": "1F469-200D-1F467-200D-1F467", "j": ["family", "girl", "woman"]}, "speaking-head": {"a": "speaking head", "b": "1F5E3", "j": ["face", "head", "silhouette", "speak", "speaking"]}, "bust-in-silhouette": {"a": "bust in silhouette", "b": "1F464", "j": ["bust", "bust in silhouette", "silhouette"]}, "busts-in-silhouette": {"a": "busts in silhouette", "b": "1F465", "j": ["bust", "busts in silhouette", "silhouette"]}, "people-hugging": {"a": "people hugging", "b": "1FAC2", "j": ["goodbye", "hello", "hug", "people hugging", "thanks"]}, "footprints": {"a": "footprints", "b": "1F463", "j": ["clothing", "footprint", "footprints", "print"]}, "red-hair": {"a": "red hair", "b": "1F9B0", "j": ["ginger", "red hair", "redhead"]}, "curly-hair": {"a": "curly hair", "b": "1F9B1", "j": ["afro", "curly", "curly hair", "ringlets"]}, "white-hair": {"a": "white hair", "b": "1F9B3", "j": ["gray", "hair", "old", "white"]}, "bald": {"a": "bald", "b": "1F9B2", "j": ["bald", "chemotherapy", "hairless", "no hair", "shaven"]}, "monkey-face": {"a": "monkey face", "b": "1F435", "j": ["face", "monkey"]}, "monkey": {"a": "monkey", "b": "1F412", "j": ["monkey"]}, "gorilla": {"a": "gorilla", "b": "1F98D", "j": ["gorilla"]}, "orangutan": {"a": "orangutan", "b": "1F9A7", "j": ["ape", "orangutan"]}, "dog-face": {"a": "dog face", "b": "1F436", "j": ["dog", "face", "pet"]}, "dog": {"a": "dog", "b": "1F415", "j": ["dog", "pet"]}, "guide-dog": {"a": "guide dog", "b": "1F9AE", "j": ["accessibility", "blind", "guide", "guide dog"]}, "service-dog": {"a": "service dog", "b": "1F415-200D-1F9BA", "j": ["accessibility", "assistance", "dog", "service"]}, "poodle": {"a": "poodle", "b": "1F429", "j": ["dog", "poodle"]}, "wolf": {"a": "wolf", "b": "1F43A", "j": ["face", "wolf"]}, "fox": {"a": "fox", "b": "1F98A", "j": ["face", "fox"]}, "raccoon": {"a": "raccoon", "b": "1F99D", "j": ["curious", "raccoon", "sly"]}, "cat-face": {"a": "cat face", "b": "1F431", "j": ["cat", "face", "pet"]}, "cat": {"a": "cat", "b": "1F408", "j": ["cat", "pet"]}, "black-cat": {"a": "black cat", "b": "1F408-200D-2B1B", "j": ["black", "cat", "unlucky"]}, "lion": {"a": "lion", "b": "1F981", "j": ["face", "Leo", "lion", "zodiac"]}, "tiger-face": {"a": "tiger face", "b": "1F42F", "j": ["face", "tiger"]}, "tiger": {"a": "tiger", "b": "1F405", "j": ["tiger"]}, "leopard": {"a": "leopard", "b": "1F406", "j": ["leopard"]}, "horse-face": {"a": "horse face", "b": "1F434", "j": ["face", "horse"]}, "horse": {"a": "horse", "b": "1F40E", "j": ["equestrian", "horse", "racehorse", "racing"]}, "unicorn": {"a": "unicorn", "b": "1F984", "j": ["face", "unicorn"]}, "zebra": {"a": "zebra", "b": "1F993", "j": ["stripe", "zebra"]}, "deer": {"a": "deer", "b": "1F98C", "j": ["deer"]}, "bison": {"a": "bison", "b": "1F9AC", "j": ["bison", "buffalo", "herd", "wisent"]}, "cow-face": {"a": "cow face", "b": "1F42E", "j": ["cow", "face"]}, "ox": {"a": "ox", "b": "1F402", "j": ["bull", "ox", "Taurus", "zodiac"]}, "water-buffalo": {"a": "water buffalo", "b": "1F403", "j": ["buffalo", "water"]}, "cow": {"a": "cow", "b": "1F404", "j": ["cow"]}, "pig-face": {"a": "pig face", "b": "1F437", "j": ["face", "pig"]}, "pig": {"a": "pig", "b": "1F416", "j": ["pig", "sow"]}, "boar": {"a": "boar", "b": "1F417", "j": ["boar", "pig"]}, "pig-nose": {"a": "pig nose", "b": "1F43D", "j": ["face", "nose", "pig"]}, "ram": {"a": "ram", "b": "1F40F", "j": ["Aries", "male", "ram", "sheep", "zodiac"]}, "ewe": {"a": "ewe", "b": "1F411", "j": ["ewe", "female", "sheep"]}, "goat": {"a": "goat", "b": "1F410", "j": ["Capricorn", "goat", "zodiac"]}, "camel": {"a": "camel", "b": "1F42A", "j": ["camel", "dromedary", "hump"]}, "twohump-camel": {"a": "two-hump camel", "b": "1F42B", "j": ["bactrian", "camel", "hump", "two-hump camel"]}, "llama": {"a": "llama", "b": "1F999", "j": ["alpaca", "guanaco", "llama", "vicuña", "wool"]}, "giraffe": {"a": "giraffe", "b": "1F992", "j": ["giraffe", "spots"]}, "elephant": {"a": "elephant", "b": "1F418", "j": ["elephant"]}, "mammoth": {"a": "mammoth", "b": "1F9A3", "j": ["extinction", "large", "mammoth", "tusk", "woolly"]}, "rhinoceros": {"a": "rhinoceros", "b": "1F98F", "j": ["rhinoceros"]}, "hippopotamus": {"a": "hippopotamus", "b": "1F99B", "j": ["hippo", "hippopotamus"]}, "mouse-face": {"a": "mouse face", "b": "1F42D", "j": ["face", "mouse"]}, "mouse": {"a": "mouse", "b": "1F401", "j": ["mouse"]}, "rat": {"a": "rat", "b": "1F400", "j": ["rat"]}, "hamster": {"a": "hamster", "b": "1F439", "j": ["face", "hamster", "pet"]}, "rabbit-face": {"a": "rabbit face", "b": "1F430", "j": ["bunny", "face", "pet", "rabbit"]}, "rabbit": {"a": "rabbit", "b": "1F407", "j": ["bunny", "pet", "rabbit"]}, "chipmunk": {"a": "chipmunk", "b": "1F43F", "j": ["chipmunk", "squirrel"]}, "beaver": {"a": "beaver", "b": "1F9AB", "j": ["beaver", "dam"]}, "hedgehog": {"a": "hedgehog", "b": "1F994", "j": ["hedgehog", "spiny"]}, "bat": {"a": "bat", "b": "1F987", "j": ["bat", "vampire"]}, "bear": {"a": "bear", "b": "1F43B", "j": ["bear", "face"]}, "polar-bear": {"a": "polar bear", "b": "1F43B-200D-2744-FE0F", "j": ["arctic", "bear", "polar bear", "white"]}, "koala": {"a": "koala", "b": "1F428", "j": ["bear", "koala"]}, "panda": {"a": "panda", "b": "1F43C", "j": ["face", "panda"]}, "sloth": {"a": "sloth", "b": "1F9A5", "j": ["lazy", "sloth", "slow"]}, "otter": {"a": "otter", "b": "1F9A6", "j": ["fishing", "otter", "playful"]}, "skunk": {"a": "skunk", "b": "1F9A8", "j": ["skunk", "stink"]}, "kangaroo": {"a": "kangaroo", "b": "1F998", "j": ["Australia", "joey", "jump", "kangaroo", "marsupial"]}, "badger": {"a": "badger", "b": "1F9A1", "j": ["badger", "honey badger", "pester"]}, "paw-prints": {"a": "paw prints", "b": "1F43E", "j": ["feet", "paw", "paw prints", "print"]}, "turkey": {"a": "turkey", "b": "1F983", "j": ["bird", "turkey"]}, "chicken": {"a": "chicken", "b": "1F414", "j": ["bird", "chicken"]}, "rooster": {"a": "rooster", "b": "1F413", "j": ["bird", "rooster"]}, "hatching-chick": {"a": "hatching chick", "b": "1F423", "j": ["baby", "bird", "chick", "hatching"]}, "baby-chick": {"a": "baby chick", "b": "1F424", "j": ["baby", "bird", "chick"]}, "frontfacing-baby-chick": {"a": "front-facing baby chick", "b": "1F425", "j": ["baby", "bird", "chick", "front-facing baby chick"]}, "bird": {"a": "bird", "b": "1F426", "j": ["bird"]}, "penguin": {"a": "penguin", "b": "1F427", "j": ["bird", "penguin"]}, "dove": {"a": "dove", "b": "1F54A", "j": ["bird", "dove", "fly", "peace"]}, "eagle": {"a": "eagle", "b": "1F985", "j": ["bird", "eagle"]}, "duck": {"a": "duck", "b": "1F986", "j": ["bird", "duck"]}, "swan": {"a": "swan", "b": "1F9A2", "j": ["bird", "cygnet", "swan", "ugly duckling"]}, "owl": {"a": "owl", "b": "1F989", "j": ["bird", "owl", "wise"]}, "dodo": {"a": "dodo", "b": "1F9A4", "j": ["dodo", "extinction", "large", "Mauritius"]}, "feather": {"a": "feather", "b": "1FAB6", "j": ["bird", "feather", "flight", "light", "plumage"]}, "flamingo": {"a": "flamingo", "b": "1F9A9", "j": ["flamboyant", "flamingo", "tropical"]}, "peacock": {"a": "peacock", "b": "1F99A", "j": ["bird", "ostentatious", "peacock", "peahen", "proud"]}, "parrot": {"a": "parrot", "b": "1F99C", "j": ["bird", "parrot", "pirate", "talk"]}, "frog": {"a": "frog", "b": "1F438", "j": ["face", "frog"]}, "crocodile": {"a": "crocodile", "b": "1F40A", "j": ["crocodile"]}, "turtle": {"a": "turtle", "b": "1F422", "j": ["terrapin", "tortoise", "turtle"]}, "lizard": {"a": "lizard", "b": "1F98E", "j": ["lizard", "reptile"]}, "snake": {"a": "snake", "b": "1F40D", "j": ["bearer", "Ophiuchus", "serpent", "snake", "zodiac"]}, "dragon-face": {"a": "dragon face", "b": "1F432", "j": ["dragon", "face", "fairy tale"]}, "dragon": {"a": "dragon", "b": "1F409", "j": ["dragon", "fairy tale"]}, "sauropod": {"a": "sauropod", "b": "1F995", "j": ["brachiosaurus", "brontosaurus", "diplodocus", "sauropod"]}, "trex": {"a": "T-Rex", "b": "1F996", "j": ["T-Rex", "Tyrannosaurus Rex"]}, "spouting-whale": {"a": "spouting whale", "b": "1F433", "j": ["face", "spouting", "whale"]}, "whale": {"a": "whale", "b": "1F40B", "j": ["whale"]}, "dolphin": {"a": "dolphin", "b": "1F42C", "j": ["dolphin", "flipper"]}, "seal": {"a": "seal", "b": "1F9AD", "j": ["sea Lion", "seal"]}, "fish": {"a": "fish", "b": "1F41F", "j": ["fish", "Pisces", "zodiac"]}, "tropical-fish": {"a": "tropical fish", "b": "1F420", "j": ["fish", "tropical"]}, "blowfish": {"a": "blowfish", "b": "1F421", "j": ["blowfish", "fish"]}, "shark": {"a": "shark", "b": "1F988", "j": ["fish", "shark"]}, "octopus": {"a": "octopus", "b": "1F419", "j": ["octopus"]}, "spiral-shell": {"a": "spiral shell", "b": "1F41A", "j": ["shell", "spiral"]}, "snail": {"a": "snail", "b": "1F40C", "j": ["snail"]}, "butterfly": {"a": "butterfly", "b": "1F98B", "j": ["butterfly", "insect", "pretty"]}, "bug": {"a": "bug", "b": "1F41B", "j": ["bug", "insect"]}, "ant": {"a": "ant", "b": "1F41C", "j": ["ant", "insect"]}, "honeybee": {"a": "honeybee", "b": "1F41D", "j": ["bee", "honeybee", "insect"]}, "beetle": {"a": "beetle", "b": "1FAB2", "j": ["beetle", "bug", "insect"]}, "lady-beetle": {"a": "lady beetle", "b": "1F41E", "j": ["beetle", "insect", "lady beetle", "ladybird", "ladybug"]}, "cricket": {"a": "cricket", "b": "1F997", "j": ["cricket", "grasshopper", "Orthoptera"]}, "cockroach": {"a": "cockroach", "b": "1FAB3", "j": ["cockroach", "insect", "pest", "roach"]}, "spider": {"a": "spider", "b": "1F577", "j": ["insect", "spider"]}, "spider-web": {"a": "spider web", "b": "1F578", "j": ["spider", "web"]}, "scorpion": {"a": "scorpion", "b": "1F982", "j": ["scorpio", "Scorpio", "scorpion", "zodiac"]}, "mosquito": {"a": "mosquito", "b": "1F99F", "j": ["disease", "fever", "malaria", "mosquito", "pest", "virus"]}, "fly": {"a": "fly", "b": "1FAB0", "j": ["disease", "fly", "maggot", "pest", "rotting"]}, "worm": {"a": "worm", "b": "1FAB1", "j": ["annelid", "earthworm", "parasite", "worm"]}, "microbe": {"a": "microbe", "b": "1F9A0", "j": ["amoeba", "bacteria", "microbe", "virus"]}, "bouquet": {"a": "bouquet", "b": "1F490", "j": ["bouquet", "flower"]}, "cherry-blossom": {"a": "cherry blossom", "b": "1F338", "j": ["blossom", "cherry", "flower"]}, "white-flower": {"a": "white flower", "b": "1F4AE", "j": ["flower", "white flower"]}, "rosette": {"a": "rosette", "b": "1F3F5", "j": ["plant", "rosette"]}, "rose": {"a": "rose", "b": "1F339", "j": ["flower", "rose"]}, "wilted-flower": {"a": "wilted flower", "b": "1F940", "j": ["flower", "wilted"]}, "hibiscus": {"a": "hibiscus", "b": "1F33A", "j": ["flower", "hibiscus"]}, "sunflower": {"a": "sunflower", "b": "1F33B", "j": ["flower", "sun", "sunflower"]}, "blossom": {"a": "blossom", "b": "1F33C", "j": ["blossom", "flower"]}, "tulip": {"a": "tulip", "b": "1F337", "j": ["flower", "tulip"]}, "seedling": {"a": "seedling", "b": "1F331", "j": ["seedling", "young"]}, "potted-plant": {"a": "potted plant", "b": "1FAB4", "j": ["boring", "grow", "house", "nurturing", "plant", "potted plant", "useless"]}, "evergreen-tree": {"a": "evergreen tree", "b": "1F332", "j": ["evergreen tree", "tree"]}, "deciduous-tree": {"a": "deciduous tree", "b": "1F333", "j": ["deciduous", "shedding", "tree"]}, "palm-tree": {"a": "palm tree", "b": "1F334", "j": ["palm", "tree"]}, "cactus": {"a": "cactus", "b": "1F335", "j": ["cactus", "plant"]}, "sheaf-of-rice": {"a": "sheaf of rice", "b": "1F33E", "j": ["ear", "grain", "rice", "sheaf of rice"]}, "herb": {"a": "herb", "b": "1F33F", "j": ["herb", "leaf"]}, "shamrock": {"a": "shamrock", "b": "2618", "j": ["plant", "shamrock"]}, "four-leaf-clover": {"a": "four leaf clover", "b": "1F340", "j": ["4", "clover", "four", "four-leaf clover", "leaf"]}, "maple-leaf": {"a": "maple leaf", "b": "1F341", "j": ["falling", "leaf", "maple"]}, "fallen-leaf": {"a": "fallen leaf", "b": "1F342", "j": ["fallen leaf", "falling", "leaf"]}, "leaf-fluttering-in-wind": {"a": "leaf fluttering in wind", "b": "1F343", "j": ["blow", "flutter", "leaf", "leaf fluttering in wind", "wind"]}, "grapes": {"a": "grapes", "b": "1F347", "j": ["fruit", "grape", "grapes"]}, "melon": {"a": "melon", "b": "1F348", "j": ["fruit", "melon"]}, "watermelon": {"a": "watermelon", "b": "1F349", "j": ["fruit", "watermelon"]}, "tangerine": {"a": "tangerine", "b": "1F34A", "j": ["fruit", "orange", "tangerine"]}, "lemon": {"a": "lemon", "b": "1F34B", "j": ["citrus", "fruit", "lemon"]}, "banana": {"a": "banana", "b": "1F34C", "j": ["banana", "fruit"]}, "pineapple": {"a": "pineapple", "b": "1F34D", "j": ["fruit", "pineapple"]}, "mango": {"a": "mango", "b": "1F96D", "j": ["fruit", "mango", "tropical"]}, "red-apple": {"a": "red apple", "b": "1F34E", "j": ["apple", "fruit", "red"]}, "green-apple": {"a": "green apple", "b": "1F34F", "j": ["apple", "fruit", "green"]}, "pear": {"a": "pear", "b": "1F350", "j": ["fruit", "pear"]}, "peach": {"a": "peach", "b": "1F351", "j": ["fruit", "peach"]}, "cherries": {"a": "cherries", "b": "1F352", "j": ["berries", "cherries", "cherry", "fruit", "red"]}, "strawberry": {"a": "strawberry", "b": "1F353", "j": ["berry", "fruit", "strawberry"]}, "blueberries": {"a": "blueberries", "b": "1FAD0", "j": ["berry", "bilberry", "blue", "blueberries", "blueberry"]}, "kiwi-fruit": {"a": "kiwi fruit", "b": "1F95D", "j": ["food", "fruit", "kiwi"]}, "tomato": {"a": "tomato", "b": "1F345", "j": ["fruit", "tomato", "vegetable"]}, "olive": {"a": "olive", "b": "1FAD2", "j": ["food", "olive"]}, "coconut": {"a": "coconut", "b": "1F965", "j": ["coconut", "palm", "piña colada"]}, "avocado": {"a": "avocado", "b": "1F951", "j": ["avocado", "food", "fruit"]}, "eggplant": {"a": "eggplant", "b": "1F346", "j": ["aubergine", "eggplant", "vegetable"]}, "potato": {"a": "potato", "b": "1F954", "j": ["food", "potato", "vegetable"]}, "carrot": {"a": "carrot", "b": "1F955", "j": ["carrot", "food", "vegetable"]}, "ear-of-corn": {"a": "ear of corn", "b": "1F33D", "j": ["corn", "ear", "ear of corn", "maize", "maze"]}, "hot-pepper": {"a": "hot pepper", "b": "1F336", "j": ["hot", "pepper"]}, "bell-pepper": {"a": "bell pepper", "b": "1FAD1", "j": ["bell pepper", "capsicum", "pepper", "vegetable"]}, "cucumber": {"a": "cucumber", "b": "1F952", "j": ["cucumber", "food", "pickle", "vegetable"]}, "leafy-green": {"a": "leafy green", "b": "1F96C", "j": ["bok choy", "cabbage", "kale", "leafy green", "lettuce"]}, "broccoli": {"a": "broccoli", "b": "1F966", "j": ["broccoli", "wild cabbage"]}, "garlic": {"a": "garlic", "b": "1F9C4", "j": ["flavoring", "garlic"]}, "onion": {"a": "onion", "b": "1F9C5", "j": ["flavoring", "onion"]}, "mushroom": {"a": "mushroom", "b": "1F344", "j": ["mushroom", "toadstool"]}, "peanuts": {"a": "peanuts", "b": "1F95C", "j": ["food", "nut", "peanut", "peanuts", "vegetable"]}, "chestnut": {"a": "chestnut", "b": "1F330", "j": ["chestnut", "plant"]}, "bread": {"a": "bread", "b": "1F35E", "j": ["bread", "loaf"]}, "croissant": {"a": "croissant", "b": "1F950", "j": ["bread", "breakfast", "croissant", "food", "french", "roll"]}, "baguette-bread": {"a": "baguette bread", "b": "1F956", "j": ["baguette", "bread", "food", "french"]}, "flatbread": {"a": "flatbread", "b": "1FAD3", "j": ["arepa", "flatbread", "lavash", "naan", "pita"]}, "pretzel": {"a": "pretzel", "b": "1F968", "j": ["pretzel", "twisted", "convoluted"]}, "bagel": {"a": "bagel", "b": "1F96F", "j": ["bagel", "bakery", "breakfast", "schmear"]}, "pancakes": {"a": "pancakes", "b": "1F95E", "j": ["breakfast", "crêpe", "food", "hotcake", "pancake", "pancakes"]}, "waffle": {"a": "waffle", "b": "1F9C7", "j": ["breakfast", "indecisive", "iron", "waffle"]}, "cheese-wedge": {"a": "cheese wedge", "b": "1F9C0", "j": ["cheese", "cheese wedge"]}, "meat-on-bone": {"a": "meat on bone", "b": "1F356", "j": ["bone", "meat", "meat on bone"]}, "poultry-leg": {"a": "poultry leg", "b": "1F357", "j": ["bone", "chicken", "drumstick", "leg", "poultry"]}, "cut-of-meat": {"a": "cut of meat", "b": "1F969", "j": ["chop", "cut of meat", "lambchop", "porkchop", "steak"]}, "bacon": {"a": "bacon", "b": "1F953", "j": ["bacon", "breakfast", "food", "meat"]}, "hamburger": {"a": "hamburger", "b": "1F354", "j": ["burger", "hamburger"]}, "french-fries": {"a": "french fries", "b": "1F35F", "j": ["french", "fries"]}, "pizza": {"a": "pizza", "b": "1F355", "j": ["cheese", "pizza", "slice"]}, "hot-dog": {"a": "hot dog", "b": "1F32D", "j": ["frankfurter", "hot dog", "hotdog", "sausage"]}, "sandwich": {"a": "sandwich", "b": "1F96A", "j": ["bread", "sandwich"]}, "taco": {"a": "taco", "b": "1F32E", "j": ["mexican", "taco"]}, "burrito": {"a": "burrito", "b": "1F32F", "j": ["burrito", "mexican", "wrap"]}, "tamale": {"a": "tamale", "b": "1FAD4", "j": ["mexican", "tamale", "wrapped"]}, "stuffed-flatbread": {"a": "stuffed flatbread", "b": "1F959", "j": ["falafel", "flatbread", "food", "gyro", "kebab", "stuffed"]}, "falafel": {"a": "falafel", "b": "1F9C6", "j": ["chickpea", "falafel", "meatball"]}, "egg": {"a": "egg", "b": "1F95A", "j": ["breakfast", "egg", "food"]}, "cooking": {"a": "cooking", "b": "1F373", "j": ["breakfast", "cooking", "egg", "frying", "pan"]}, "shallow-pan-of-food": {"a": "shallow pan of food", "b": "1F958", "j": ["casserole", "food", "paella", "pan", "shallow", "shallow pan of food"]}, "pot-of-food": {"a": "pot of food", "b": "1F372", "j": ["pot", "pot of food", "stew"]}, "fondue": {"a": "fondue", "b": "1FAD5", "j": ["cheese", "chocolate", "fondue", "melted", "pot", "Swiss"]}, "bowl-with-spoon": {"a": "bowl with spoon", "b": "1F963", "j": ["bowl with spoon", "breakfast", "cereal", "congee", "oatmeal", "porridge"]}, "green-salad": {"a": "green salad", "b": "1F957", "j": ["food", "green", "salad"]}, "popcorn": {"a": "popcorn", "b": "1F37F", "j": ["popcorn"]}, "butter": {"a": "butter", "b": "1F9C8", "j": ["butter", "dairy"]}, "salt": {"a": "salt", "b": "1F9C2", "j": ["condiment", "salt", "shaker"]}, "canned-food": {"a": "canned food", "b": "1F96B", "j": ["can", "canned food"]}, "bento-box": {"a": "bento box", "b": "1F371", "j": ["bento", "box"]}, "rice-cracker": {"a": "rice cracker", "b": "1F358", "j": ["cracker", "rice"]}, "rice-ball": {"a": "rice ball", "b": "1F359", "j": ["ball", "Japanese", "rice"]}, "cooked-rice": {"a": "cooked rice", "b": "1F35A", "j": ["cooked", "rice"]}, "curry-rice": {"a": "curry rice", "b": "1F35B", "j": ["curry", "rice"]}, "steaming-bowl": {"a": "steaming bowl", "b": "1F35C", "j": ["bowl", "noodle", "ramen", "steaming"]}, "spaghetti": {"a": "spaghetti", "b": "1F35D", "j": ["pasta", "spaghetti"]}, "roasted-sweet-potato": {"a": "roasted sweet potato", "b": "1F360", "j": ["potato", "roasted", "sweet"]}, "oden": {"a": "oden", "b": "1F362", "j": ["kebab", "oden", "seafood", "skewer", "stick"]}, "sushi": {"a": "sushi", "b": "1F363", "j": ["sushi"]}, "fried-shrimp": {"a": "fried shrimp", "b": "1F364", "j": ["fried", "prawn", "shrimp", "tempura"]}, "fish-cake-with-swirl": {"a": "fish cake with swirl", "b": "1F365", "j": ["cake", "fish", "fish cake with swirl", "pastry", "swirl"]}, "moon-cake": {"a": "moon cake", "b": "1F96E", "j": ["autumn", "festival", "moon cake", "yuèbǐng"]}, "dango": {"a": "dango", "b": "1F361", "j": ["dango", "dessert", "Japanese", "skewer", "stick", "sweet"]}, "dumpling": {"a": "dumpling", "b": "1F95F", "j": ["dumpling", "empanada", "gyōza", "jiaozi", "pierogi", "potsticker"]}, "fortune-cookie": {"a": "fortune cookie", "b": "1F960", "j": ["fortune cookie", "prophecy"]}, "takeout-box": {"a": "takeout box", "b": "1F961", "j": ["oyster pail", "takeout box"]}, "crab": {"a": "crab", "b": "1F980", "j": ["Cancer", "crab", "zodiac"]}, "lobster": {"a": "lobster", "b": "1F99E", "j": ["bisque", "claws", "lobster", "seafood"]}, "shrimp": {"a": "shrimp", "b": "1F990", "j": ["food", "shellfish", "shrimp", "small"]}, "squid": {"a": "squid", "b": "1F991", "j": ["food", "molusc", "squid"]}, "oyster": {"a": "oyster", "b": "1F9AA", "j": ["diving", "oyster", "pearl"]}, "soft-ice-cream": {"a": "soft ice cream", "b": "1F366", "j": ["cream", "dessert", "ice", "icecream", "soft", "sweet"]}, "shaved-ice": {"a": "shaved ice", "b": "1F367", "j": ["dessert", "ice", "shaved", "sweet"]}, "ice-cream": {"a": "ice cream", "b": "1F368", "j": ["cream", "dessert", "ice", "sweet"]}, "doughnut": {"a": "doughnut", "b": "1F369", "j": ["breakfast", "dessert", "donut", "doughnut", "sweet"]}, "cookie": {"a": "cookie", "b": "1F36A", "j": ["cookie", "dessert", "sweet"]}, "birthday-cake": {"a": "birthday cake", "b": "1F382", "j": ["birthday", "cake", "celebration", "dessert", "pastry", "sweet"]}, "shortcake": {"a": "shortcake", "b": "1F370", "j": ["cake", "dessert", "pastry", "shortcake", "slice", "sweet"]}, "cupcake": {"a": "cupcake", "b": "1F9C1", "j": ["bakery", "cupcake", "sweet"]}, "pie": {"a": "pie", "b": "1F967", "j": ["filling", "pastry", "pie", "fruit", "meat"]}, "chocolate-bar": {"a": "chocolate bar", "b": "1F36B", "j": ["bar", "chocolate", "dessert", "sweet"]}, "candy": {"a": "candy", "b": "1F36C", "j": ["candy", "dessert", "sweet"]}, "lollipop": {"a": "lollipop", "b": "1F36D", "j": ["candy", "dessert", "lollipop", "sweet"]}, "custard": {"a": "custard", "b": "1F36E", "j": ["custard", "dessert", "pudding", "sweet"]}, "honey-pot": {"a": "honey pot", "b": "1F36F", "j": ["honey", "honeypot", "pot", "sweet"]}, "baby-bottle": {"a": "baby bottle", "b": "1F37C", "j": ["baby", "bottle", "drink", "milk"]}, "glass-of-milk": {"a": "glass of milk", "b": "1F95B", "j": ["drink", "glass", "glass of milk", "milk"]}, "hot-beverage": {"a": "hot beverage", "b": "2615", "j": ["beverage", "coffee", "drink", "hot", "steaming", "tea"]}, "teapot": {"a": "teapot", "b": "1FAD6", "j": ["drink", "pot", "tea", "teapot"]}, "teacup-without-handle": {"a": "teacup without handle", "b": "1F375", "j": ["beverage", "cup", "drink", "tea", "teacup", "teacup without handle"]}, "sake": {"a": "sake", "b": "1F376", "j": ["bar", "beverage", "bottle", "cup", "drink", "sake"]}, "bottle-with-popping-cork": {"a": "bottle with popping cork", "b": "1F37E", "j": ["bar", "bottle", "bottle with popping cork", "cork", "drink", "popping"]}, "wine-glass": {"a": "wine glass", "b": "1F377", "j": ["bar", "beverage", "drink", "glass", "wine"]}, "cocktail-glass": {"a": "cocktail glass", "b": "1F378", "j": ["bar", "cocktail", "drink", "glass"]}, "tropical-drink": {"a": "tropical drink", "b": "1F379", "j": ["bar", "drink", "tropical"]}, "beer-mug": {"a": "beer mug", "b": "1F37A", "j": ["bar", "beer", "drink", "mug"]}, "clinking-beer-mugs": {"a": "clinking beer mugs", "b": "1F37B", "j": ["bar", "beer", "clink", "clinking beer mugs", "drink", "mug"]}, "clinking-glasses": {"a": "clinking glasses", "b": "1F942", "j": ["celebrate", "clink", "clinking glasses", "drink", "glass"]}, "tumbler-glass": {"a": "tumbler glass", "b": "1F943", "j": ["glass", "liquor", "shot", "tumbler", "whisky"]}, "cup-with-straw": {"a": "cup with straw", "b": "1F964", "j": ["cup with straw", "juice", "soda", "malt", "soft drink", "water"]}, "bubble-tea": {"a": "bubble tea", "b": "1F9CB", "j": ["bubble", "milk", "pearl", "tea"]}, "beverage-box": {"a": "beverage box", "b": "1F9C3", "j": ["beverage", "box", "juice", "straw", "sweet"]}, "mate": {"a": "mate", "b": "1F9C9", "j": ["drink", "mate"]}, "ice": {"a": "ice", "b": "1F9CA", "j": ["cold", "ice", "ice cube", "iceberg"]}, "chopsticks": {"a": "chopsticks", "b": "1F962", "j": ["chopsticks", "hashi", "jeotgarak", "kuaizi"]}, "fork-and-knife-with-plate": {"a": "fork and knife with plate", "b": "1F37D", "j": ["cooking", "fork", "fork and knife with plate", "knife", "plate"]}, "fork-and-knife": {"a": "fork and knife", "b": "1F374", "j": ["cooking", "cutlery", "fork", "fork and knife", "knife"]}, "spoon": {"a": "spoon", "b": "1F944", "j": ["spoon", "tableware"]}, "kitchen-knife": {"a": "kitchen knife", "b": "1F52A", "j": ["cooking", "hocho", "kitchen knife", "knife", "tool", "weapon"]}, "amphora": {"a": "amphora", "b": "1F3FA", "j": ["amphora", "Aquarius", "cooking", "drink", "jug", "zodiac"]}, "globe-showing-europeafrica": {"a": "globe showing Europe-Africa", "b": "1F30D", "j": ["Africa", "earth", "Europe", "globe", "globe showing Europe-Africa", "world"]}, "globe-showing-americas": {"a": "globe showing Americas", "b": "1F30E", "j": ["Americas", "earth", "globe", "globe showing Americas", "world"]}, "globe-showing-asiaaustralia": {"a": "globe showing Asia-Australia", "b": "1F30F", "j": ["Asia", "Australia", "earth", "globe", "globe showing Asia-Australia", "world"]}, "globe-with-meridians": {"a": "globe with meridians", "b": "1F310", "j": ["earth", "globe", "globe with meridians", "meridians", "world"]}, "world-map": {"a": "world map", "b": "1F5FA", "j": ["map", "world"]}, "map-of-japan": {"a": "map of Japan", "b": "1F5FE", "j": ["Japan", "map", "map of Japan"]}, "compass": {"a": "compass", "b": "1F9ED", "j": ["compass", "magnetic", "navigation", "orienteering"]}, "snowcapped-mountain": {"a": "snow-capped mountain", "b": "1F3D4", "j": ["cold", "mountain", "snow", "snow-capped mountain"]}, "mountain": {"a": "mountain", "b": "26F0", "j": ["mountain"]}, "volcano": {"a": "volcano", "b": "1F30B", "j": ["eruption", "mountain", "volcano"]}, "mount-fuji": {"a": "mount fuji", "b": "1F5FB", "j": ["fuji", "mount fuji", "mountain"]}, "camping": {"a": "camping", "b": "1F3D5", "j": ["camping"]}, "beach-with-umbrella": {"a": "beach with umbrella", "b": "1F3D6", "j": ["beach", "beach with umbrella", "umbrella"]}, "desert": {"a": "desert", "b": "1F3DC", "j": ["desert"]}, "desert-island": {"a": "desert island", "b": "1F3DD", "j": ["desert", "island"]}, "national-park": {"a": "national park", "b": "1F3DE", "j": ["national park", "park"]}, "stadium": {"a": "stadium", "b": "1F3DF", "j": ["stadium"]}, "classical-building": {"a": "classical building", "b": "1F3DB", "j": ["classical", "classical building"]}, "building-construction": {"a": "building construction", "b": "1F3D7", "j": ["building construction", "construction"]}, "brick": {"a": "brick", "b": "1F9F1", "j": ["brick", "bricks", "clay", "mortar", "wall"]}, "rock": {"a": "rock", "b": "1FAA8", "j": ["boulder", "heavy", "rock", "solid", "stone"]}, "wood": {"a": "wood", "b": "1FAB5", "j": ["log", "lumber", "timber", "wood"]}, "hut": {"a": "hut", "b": "1F6D6", "j": ["house", "hut", "roundhouse", "yurt"]}, "houses": {"a": "houses", "b": "1F3D8", "j": ["houses"]}, "derelict-house": {"a": "derelict house", "b": "1F3DA", "j": ["derelict", "house"]}, "house": {"a": "house", "b": "1F3E0", "j": ["home", "house"]}, "house-with-garden": {"a": "house with garden", "b": "1F3E1", "j": ["garden", "home", "house", "house with garden"]}, "office-building": {"a": "office building", "b": "1F3E2", "j": ["building", "office building"]}, "japanese-post-office": {"a": "Japanese post office", "b": "1F3E3", "j": ["Japanese", "Japanese post office", "post"]}, "post-office": {"a": "post office", "b": "1F3E4", "j": ["European", "post", "post office"]}, "hospital": {"a": "hospital", "b": "1F3E5", "j": ["doctor", "hospital", "medicine"]}, "bank": {"a": "bank", "b": "1F3E6", "j": ["bank", "building"]}, "hotel": {"a": "hotel", "b": "1F3E8", "j": ["building", "hotel"]}, "love-hotel": {"a": "love hotel", "b": "1F3E9", "j": ["hotel", "love"]}, "convenience-store": {"a": "convenience store", "b": "1F3EA", "j": ["convenience", "store"]}, "school": {"a": "school", "b": "1F3EB", "j": ["building", "school"]}, "department-store": {"a": "department store", "b": "1F3EC", "j": ["department", "store"]}, "factory": {"a": "factory", "b": "1F3ED", "j": ["building", "factory"]}, "japanese-castle": {"a": "Japanese castle", "b": "1F3EF", "j": ["castle", "Japanese"]}, "castle": {"a": "castle", "b": "1F3F0", "j": ["castle", "European"]}, "wedding": {"a": "wedding", "b": "1F492", "j": ["chapel", "romance", "wedding"]}, "tokyo-tower": {"a": "Tokyo tower", "b": "1F5FC", "j": ["Tokyo", "tower"]}, "statue-of-liberty": {"a": "Statue of Liberty", "b": "1F5FD", "j": ["liberty", "statue", "Statue of Liberty"]}, "church": {"a": "church", "b": "26EA", "j": ["Christian", "church", "cross", "religion"]}, "mosque": {"a": "mosque", "b": "1F54C", "j": ["islam", "mosque", "Muslim", "religion"]}, "hindu-temple": {"a": "hindu temple", "b": "1F6D5", "j": ["hindu", "temple"]}, "synagogue": {"a": "synagogue", "b": "1F54D", "j": ["Jew", "Jewish", "religion", "synagogue", "temple"]}, "shinto-shrine": {"a": "shinto shrine", "b": "26E9", "j": ["religion", "shinto", "shrine"]}, "kaaba": {"a": "kaaba", "b": "1F54B", "j": ["islam", "kaaba", "Muslim", "religion"]}, "fountain": {"a": "fountain", "b": "26F2", "j": ["fountain"]}, "tent": {"a": "tent", "b": "26FA", "j": ["camping", "tent"]}, "foggy": {"a": "foggy", "b": "1F301", "j": ["fog", "foggy"]}, "night-with-stars": {"a": "night with stars", "b": "1F303", "j": ["night", "night with stars", "star"]}, "cityscape": {"a": "cityscape", "b": "1F3D9", "j": ["city", "cityscape"]}, "sunrise-over-mountains": {"a": "sunrise over mountains", "b": "1F304", "j": ["morning", "mountain", "sun", "sunrise", "sunrise over mountains"]}, "sunrise": {"a": "sunrise", "b": "1F305", "j": ["morning", "sun", "sunrise"]}, "cityscape-at-dusk": {"a": "cityscape at dusk", "b": "1F306", "j": ["city", "cityscape at dusk", "dusk", "evening", "landscape", "sunset"]}, "sunset": {"a": "sunset", "b": "1F307", "j": ["dusk", "sun", "sunset"]}, "bridge-at-night": {"a": "bridge at night", "b": "1F309", "j": ["bridge", "bridge at night", "night"]}, "hot-springs": {"a": "hot springs", "b": "2668", "j": ["hot", "hotsprings", "springs", "steaming"]}, "carousel-horse": {"a": "carousel horse", "b": "1F3A0", "j": ["carousel", "horse"]}, "ferris-wheel": {"a": "ferris wheel", "b": "1F3A1", "j": ["amusement park", "ferris", "wheel"]}, "roller-coaster": {"a": "roller coaster", "b": "1F3A2", "j": ["amusement park", "coaster", "roller"]}, "barber-pole": {"a": "barber pole", "b": "1F488", "j": ["barber", "haircut", "pole"]}, "circus-tent": {"a": "circus tent", "b": "1F3AA", "j": ["circus", "tent"]}, "locomotive": {"a": "locomotive", "b": "1F682", "j": ["engine", "locomotive", "railway", "steam", "train"]}, "railway-car": {"a": "railway car", "b": "1F683", "j": ["car", "electric", "railway", "train", "tram", "trolleybus"]}, "highspeed-train": {"a": "high-speed train", "b": "1F684", "j": ["high-speed train", "railway", "shinkansen", "speed", "train"]}, "bullet-train": {"a": "bullet train", "b": "1F685", "j": ["bullet", "railway", "shinkansen", "speed", "train"]}, "train": {"a": "train", "b": "1F686", "j": ["railway", "train"]}, "metro": {"a": "metro", "b": "1F687", "j": ["metro", "subway"]}, "light-rail": {"a": "light rail", "b": "1F688", "j": ["light rail", "railway"]}, "station": {"a": "station", "b": "1F689", "j": ["railway", "station", "train"]}, "tram": {"a": "tram", "b": "1F68A", "j": ["tram", "trolleybus"]}, "monorail": {"a": "monorail", "b": "1F69D", "j": ["monorail", "vehicle"]}, "mountain-railway": {"a": "mountain railway", "b": "1F69E", "j": ["car", "mountain", "railway"]}, "tram-car": {"a": "tram car", "b": "1F68B", "j": ["car", "tram", "trolleybus"]}, "bus": {"a": "bus", "b": "1F68C", "j": ["bus", "vehicle"]}, "oncoming-bus": {"a": "oncoming bus", "b": "1F68D", "j": ["bus", "oncoming"]}, "trolleybus": {"a": "trolleybus", "b": "1F68E", "j": ["bus", "tram", "trolley", "trolleybus"]}, "minibus": {"a": "minibus", "b": "1F690", "j": ["bus", "minibus"]}, "ambulance": {"a": "ambulance", "b": "1F691", "j": ["ambulance", "vehicle"]}, "fire-engine": {"a": "fire engine", "b": "1F692", "j": ["engine", "fire", "truck"]}, "police-car": {"a": "police car", "b": "1F693", "j": ["car", "patrol", "police"]}, "oncoming-police-car": {"a": "oncoming police car", "b": "1F694", "j": ["car", "oncoming", "police"]}, "taxi": {"a": "taxi", "b": "1F695", "j": ["taxi", "vehicle"]}, "oncoming-taxi": {"a": "oncoming taxi", "b": "1F696", "j": ["oncoming", "taxi"]}, "automobile": {"a": "automobile", "b": "1F697", "j": ["automobile", "car"]}, "oncoming-automobile": {"a": "oncoming automobile", "b": "1F698", "j": ["automobile", "car", "oncoming"]}, "sport-utility-vehicle": {"a": "sport utility vehicle", "b": "1F699", "j": ["recreational", "sport utility", "sport utility vehicle"]}, "pickup-truck": {"a": "pickup truck", "b": "1F6FB", "j": ["pick-up", "pickup", "truck"]}, "delivery-truck": {"a": "delivery truck", "b": "1F69A", "j": ["delivery", "truck"]}, "articulated-lorry": {"a": "articulated lorry", "b": "1F69B", "j": ["articulated lorry", "lorry", "semi", "truck"]}, "tractor": {"a": "tractor", "b": "1F69C", "j": ["tractor", "vehicle"]}, "racing-car": {"a": "racing car", "b": "1F3CE", "j": ["car", "racing"]}, "motorcycle": {"a": "motorcycle", "b": "1F3CD", "j": ["motorcycle", "racing"]}, "motor-scooter": {"a": "motor scooter", "b": "1F6F5", "j": ["motor", "scooter"]}, "manual-wheelchair": {"a": "manual wheelchair", "b": "1F9BD", "j": ["accessibility", "manual wheelchair"]}, "motorized-wheelchair": {"a": "motorized wheelchair", "b": "1F9BC", "j": ["accessibility", "motorized wheelchair"]}, "auto-rickshaw": {"a": "auto rickshaw", "b": "1F6FA", "j": ["auto rickshaw", "tuk tuk"]}, "bicycle": {"a": "bicycle", "b": "1F6B2", "j": ["bicycle", "bike"]}, "kick-scooter": {"a": "kick scooter", "b": "1F6F4", "j": ["kick", "scooter"]}, "skateboard": {"a": "skateboard", "b": "1F6F9", "j": ["board", "skateboard"]}, "roller-skate": {"a": "roller skate", "b": "1F6FC", "j": ["roller", "skate"]}, "bus-stop": {"a": "bus stop", "b": "1F68F", "j": ["bus", "busstop", "stop"]}, "motorway": {"a": "motorway", "b": "1F6E3", "j": ["highway", "motorway", "road"]}, "railway-track": {"a": "railway track", "b": "1F6E4", "j": ["railway", "railway track", "train"]}, "oil-drum": {"a": "oil drum", "b": "1F6E2", "j": ["drum", "oil"]}, "fuel-pump": {"a": "fuel pump", "b": "26FD", "j": ["diesel", "fuel", "fuelpump", "gas", "pump", "station"]}, "police-car-light": {"a": "police car light", "b": "1F6A8", "j": ["beacon", "car", "light", "police", "revolving"]}, "horizontal-traffic-light": {"a": "horizontal traffic light", "b": "1F6A5", "j": ["horizontal traffic light", "light", "signal", "traffic"]}, "vertical-traffic-light": {"a": "vertical traffic light", "b": "1F6A6", "j": ["light", "signal", "traffic", "vertical traffic light"]}, "stop-sign": {"a": "stop sign", "b": "1F6D1", "j": ["octagonal", "sign", "stop"]}, "construction": {"a": "construction", "b": "1F6A7", "j": ["barrier", "construction"]}, "anchor": {"a": "anchor", "b": "2693", "j": ["anchor", "ship", "tool"]}, "sailboat": {"a": "sailboat", "b": "26F5", "j": ["boat", "resort", "sailboat", "sea", "yacht"]}, "canoe": {"a": "canoe", "b": "1F6F6", "j": ["boat", "canoe"]}, "speedboat": {"a": "speedboat", "b": "1F6A4", "j": ["boat", "speedboat"]}, "passenger-ship": {"a": "passenger ship", "b": "1F6F3", "j": ["passenger", "ship"]}, "ferry": {"a": "ferry", "b": "26F4", "j": ["boat", "ferry", "passenger"]}, "motor-boat": {"a": "motor boat", "b": "1F6E5", "j": ["boat", "motor boat", "motorboat"]}, "ship": {"a": "ship", "b": "1F6A2", "j": ["boat", "passenger", "ship"]}, "airplane": {"a": "airplane", "b": "2708", "j": ["aeroplane", "airplane"]}, "small-airplane": {"a": "small airplane", "b": "1F6E9", "j": ["aeroplane", "airplane", "small airplane"]}, "airplane-departure": {"a": "airplane departure", "b": "1F6EB", "j": ["aeroplane", "airplane", "check-in", "departure", "departures"]}, "airplane-arrival": {"a": "airplane arrival", "b": "1F6EC", "j": ["aeroplane", "airplane", "airplane arrival", "arrivals", "arriving", "landing"]}, "parachute": {"a": "parachute", "b": "1FA82", "j": ["hang-glide", "parachute", "parasail", "skydive"]}, "seat": {"a": "seat", "b": "1F4BA", "j": ["chair", "seat"]}, "helicopter": {"a": "helicopter", "b": "1F681", "j": ["helicopter", "vehicle"]}, "suspension-railway": {"a": "suspension railway", "b": "1F69F", "j": ["railway", "suspension"]}, "mountain-cableway": {"a": "mountain cableway", "b": "1F6A0", "j": ["cable", "gondola", "mountain", "mountain cableway"]}, "aerial-tramway": {"a": "aerial tramway", "b": "1F6A1", "j": ["aerial", "cable", "car", "gondola", "tramway"]}, "satellite": {"a": "satellite", "b": "1F6F0", "j": ["satellite", "space"]}, "rocket": {"a": "rocket", "b": "1F680", "j": ["rocket", "space"]}, "flying-saucer": {"a": "flying saucer", "b": "1F6F8", "j": ["flying saucer", "UFO"]}, "bellhop-bell": {"a": "bellhop bell", "b": "1F6CE", "j": ["bell", "bellhop", "hotel"]}, "luggage": {"a": "luggage", "b": "1F9F3", "j": ["luggage", "packing", "travel"]}, "hourglass-done": {"a": "hourglass done", "b": "231B", "j": ["hourglass done", "sand", "timer"]}, "hourglass-not-done": {"a": "hourglass not done", "b": "23F3", "j": ["hourglass", "hourglass not done", "sand", "timer"]}, "watch": {"a": "watch", "b": "231A", "j": ["clock", "watch"]}, "alarm-clock": {"a": "alarm clock", "b": "23F0", "j": ["alarm", "clock"]}, "stopwatch": {"a": "stopwatch", "b": "23F1", "j": ["clock", "stopwatch"]}, "timer-clock": {"a": "timer clock", "b": "23F2", "j": ["clock", "timer"]}, "mantelpiece-clock": {"a": "mantelpiece clock", "b": "1F570", "j": ["clock", "mantelpiece clock"]}, "twelve-oclock": {"a": "twelve o’clock", "b": "1F55B", "j": ["00", "12", "12:00", "clock", "o’clock", "twelve"]}, "twelvethirty": {"a": "twelve-thirty", "b": "1F567", "j": ["12", "12:30", "clock", "thirty", "twelve", "twelve-thirty"]}, "one-oclock": {"a": "one o’clock", "b": "1F550", "j": ["00", "1", "1:00", "clock", "o’clock", "one"]}, "onethirty": {"a": "one-thirty", "b": "1F55C", "j": ["1", "1:30", "clock", "one", "one-thirty", "thirty"]}, "two-oclock": {"a": "two o’clock", "b": "1F551", "j": ["00", "2", "2:00", "clock", "o’clock", "two"]}, "twothirty": {"a": "two-thirty", "b": "1F55D", "j": ["2", "2:30", "clock", "thirty", "two", "two-thirty"]}, "three-oclock": {"a": "three o’clock", "b": "1F552", "j": ["00", "3", "3:00", "clock", "o’clock", "three"]}, "threethirty": {"a": "three-thirty", "b": "1F55E", "j": ["3", "3:30", "clock", "thirty", "three", "three-thirty"]}, "four-oclock": {"a": "four o’clock", "b": "1F553", "j": ["00", "4", "4:00", "clock", "four", "o’clock"]}, "fourthirty": {"a": "four-thirty", "b": "1F55F", "j": ["4", "4:30", "clock", "four", "four-thirty", "thirty"]}, "five-oclock": {"a": "five o’clock", "b": "1F554", "j": ["00", "5", "5:00", "clock", "five", "o’clock"]}, "fivethirty": {"a": "five-thirty", "b": "1F560", "j": ["5", "5:30", "clock", "five", "five-thirty", "thirty"]}, "six-oclock": {"a": "six o’clock", "b": "1F555", "j": ["00", "6", "6:00", "clock", "o’clock", "six"]}, "sixthirty": {"a": "six-thirty", "b": "1F561", "j": ["6", "6:30", "clock", "six", "six-thirty", "thirty"]}, "seven-oclock": {"a": "seven o’clock", "b": "1F556", "j": ["00", "7", "7:00", "clock", "o’clock", "seven"]}, "seventhirty": {"a": "seven-thirty", "b": "1F562", "j": ["7", "7:30", "clock", "seven", "seven-thirty", "thirty"]}, "eight-oclock": {"a": "eight o’clock", "b": "1F557", "j": ["00", "8", "8:00", "clock", "eight", "o’clock"]}, "eightthirty": {"a": "eight-thirty", "b": "1F563", "j": ["8", "8:30", "clock", "eight", "eight-thirty", "thirty"]}, "nine-oclock": {"a": "nine o’clock", "b": "1F558", "j": ["00", "9", "9:00", "clock", "nine", "o’clock"]}, "ninethirty": {"a": "nine-thirty", "b": "1F564", "j": ["9", "9:30", "clock", "nine", "nine-thirty", "thirty"]}, "ten-oclock": {"a": "ten o’clock", "b": "1F559", "j": ["00", "10", "10:00", "clock", "o’clock", "ten"]}, "tenthirty": {"a": "ten-thirty", "b": "1F565", "j": ["10", "10:30", "clock", "ten", "ten-thirty", "thirty"]}, "eleven-oclock": {"a": "eleven o’clock", "b": "1F55A", "j": ["00", "11", "11:00", "clock", "eleven", "o’clock"]}, "eleventhirty": {"a": "eleven-thirty", "b": "1F566", "j": ["11", "11:30", "clock", "eleven", "eleven-thirty", "thirty"]}, "new-moon": {"a": "new moon", "b": "1F311", "j": ["dark", "moon", "new moon"]}, "waxing-crescent-moon": {"a": "waxing crescent moon", "b": "1F312", "j": ["crescent", "moon", "waxing"]}, "first-quarter-moon": {"a": "first quarter moon", "b": "1F313", "j": ["first quarter moon", "moon", "quarter"]}, "waxing-gibbous-moon": {"a": "waxing gibbous moon", "b": "1F314", "j": ["gibbous", "moon", "waxing"]}, "full-moon": {"a": "full moon", "b": "1F315", "j": ["full", "moon"]}, "waning-gibbous-moon": {"a": "waning gibbous moon", "b": "1F316", "j": ["gibbous", "moon", "waning"]}, "last-quarter-moon": {"a": "last quarter moon", "b": "1F317", "j": ["last quarter moon", "moon", "quarter"]}, "waning-crescent-moon": {"a": "waning crescent moon", "b": "1F318", "j": ["crescent", "moon", "waning"]}, "crescent-moon": {"a": "crescent moon", "b": "1F319", "j": ["crescent", "moon"]}, "new-moon-face": {"a": "new moon face", "b": "1F31A", "j": ["face", "moon", "new moon face"]}, "first-quarter-moon-face": {"a": "first quarter moon face", "b": "1F31B", "j": ["face", "first quarter moon face", "moon", "quarter"]}, "last-quarter-moon-face": {"a": "last quarter moon face", "b": "1F31C", "j": ["face", "last quarter moon face", "moon", "quarter"]}, "thermometer": {"a": "thermometer", "b": "1F321", "j": ["thermometer", "weather"]}, "sun": {"a": "sun", "b": "2600", "j": ["bright", "rays", "sun", "sunny"]}, "full-moon-face": {"a": "full moon face", "b": "1F31D", "j": ["bright", "face", "full", "moon"]}, "sun-with-face": {"a": "sun with face", "b": "1F31E", "j": ["bright", "face", "sun", "sun with face"]}, "ringed-planet": {"a": "ringed planet", "b": "1FA90", "j": ["ringed planet", "saturn", "saturnine"]}, "star": {"a": "star", "b": "2B50", "j": ["star"]}, "glowing-star": {"a": "glowing star", "b": "1F31F", "j": ["glittery", "glow", "glowing star", "shining", "sparkle", "star"]}, "shooting-star": {"a": "shooting star", "b": "1F320", "j": ["falling", "shooting", "star"]}, "milky-way": {"a": "milky way", "b": "1F30C", "j": ["milky way", "space"]}, "cloud": {"a": "cloud", "b": "2601", "j": ["cloud", "weather"]}, "sun-behind-cloud": {"a": "sun behind cloud", "b": "26C5", "j": ["cloud", "sun", "sun behind cloud"]}, "cloud-with-lightning-and-rain": {"a": "cloud with lightning and rain", "b": "26C8", "j": ["cloud", "cloud with lightning and rain", "rain", "thunder"]}, "sun-behind-small-cloud": {"a": "sun behind small cloud", "b": "1F324", "j": ["cloud", "sun", "sun behind small cloud"]}, "sun-behind-large-cloud": {"a": "sun behind large cloud", "b": "1F325", "j": ["cloud", "sun", "sun behind large cloud"]}, "sun-behind-rain-cloud": {"a": "sun behind rain cloud", "b": "1F326", "j": ["cloud", "rain", "sun", "sun behind rain cloud"]}, "cloud-with-rain": {"a": "cloud with rain", "b": "1F327", "j": ["cloud", "cloud with rain", "rain"]}, "cloud-with-snow": {"a": "cloud with snow", "b": "1F328", "j": ["cloud", "cloud with snow", "cold", "snow"]}, "cloud-with-lightning": {"a": "cloud with lightning", "b": "1F329", "j": ["cloud", "cloud with lightning", "lightning"]}, "tornado": {"a": "tornado", "b": "1F32A", "j": ["cloud", "tornado", "whirlwind"]}, "fog": {"a": "fog", "b": "1F32B", "j": ["cloud", "fog"]}, "wind-face": {"a": "wind face", "b": "1F32C", "j": ["blow", "cloud", "face", "wind"]}, "cyclone": {"a": "cyclone", "b": "1F300", "j": ["cyclone", "dizzy", "hurricane", "twister", "typhoon"]}, "rainbow": {"a": "rainbow", "b": "1F308", "j": ["rain", "rainbow"]}, "closed-umbrella": {"a": "closed umbrella", "b": "1F302", "j": ["closed umbrella", "clothing", "rain", "umbrella"]}, "umbrella": {"a": "umbrella", "b": "2602", "j": ["clothing", "rain", "umbrella"]}, "umbrella-with-rain-drops": {"a": "umbrella with rain drops", "b": "2614", "j": ["clothing", "drop", "rain", "umbrella", "umbrella with rain drops"]}, "umbrella-on-ground": {"a": "umbrella on ground", "b": "26F1", "j": ["rain", "sun", "umbrella", "umbrella on ground"]}, "high-voltage": {"a": "high voltage", "b": "26A1", "j": ["danger", "electric", "high voltage", "lightning", "voltage", "zap"]}, "snowflake": {"a": "snowflake", "b": "2744", "j": ["cold", "snow", "snowflake"]}, "snowman": {"a": "snowman", "b": "2603", "j": ["cold", "snow", "snowman"]}, "snowman-without-snow": {"a": "snowman without snow", "b": "26C4", "j": ["cold", "snow", "snowman", "snowman without snow"]}, "comet": {"a": "comet", "b": "2604", "j": ["comet", "space"]}, "fire": {"a": "fire", "b": "1F525", "j": ["fire", "flame", "tool"]}, "droplet": {"a": "droplet", "b": "1F4A7", "j": ["cold", "comic", "drop", "droplet", "sweat"]}, "water-wave": {"a": "water wave", "b": "1F30A", "j": ["ocean", "water", "wave"]}, "jackolantern": {"a": "jack-o-lantern", "b": "1F383", "j": ["celebration", "halloween", "jack", "jack-o-lantern", "lantern"]}, "christmas-tree": {"a": "Christmas tree", "b": "1F384", "j": ["celebration", "Christmas", "tree"]}, "fireworks": {"a": "fireworks", "b": "1F386", "j": ["celebration", "fireworks"]}, "sparkler": {"a": "sparkler", "b": "1F387", "j": ["celebration", "fireworks", "sparkle", "sparkler"]}, "firecracker": {"a": "firecracker", "b": "1F9E8", "j": ["dynamite", "explosive", "firecracker", "fireworks"]}, "sparkles": {"a": "sparkles", "b": "2728", "j": ["*", "sparkle", "sparkles", "star"]}, "balloon": {"a": "balloon", "b": "1F388", "j": ["balloon", "celebration"]}, "party-popper": {"a": "party popper", "b": "1F389", "j": ["celebration", "party", "popper", "tada"]}, "confetti-ball": {"a": "confetti ball", "b": "1F38A", "j": ["ball", "celebration", "confetti"]}, "tanabata-tree": {"a": "tanabata tree", "b": "1F38B", "j": ["banner", "celebration", "Japanese", "tanabata tree", "tree"]}, "pine-decoration": {"a": "pine decoration", "b": "1F38D", "j": ["bamboo", "celebration", "Japanese", "pine", "pine decoration"]}, "japanese-dolls": {"a": "Japanese dolls", "b": "1F38E", "j": ["celebration", "doll", "festival", "Japanese", "Japanese dolls"]}, "carp-streamer": {"a": "carp streamer", "b": "1F38F", "j": ["carp", "celebration", "streamer"]}, "wind-chime": {"a": "wind chime", "b": "1F390", "j": ["bell", "celebration", "chime", "wind"]}, "moon-viewing-ceremony": {"a": "moon viewing ceremony", "b": "1F391", "j": ["celebration", "ceremony", "moon", "moon viewing ceremony"]}, "red-envelope": {"a": "red envelope", "b": "1F9E7", "j": ["gift", "good luck", "hóngbāo", "lai see", "money", "red envelope"]}, "ribbon": {"a": "ribbon", "b": "1F380", "j": ["celebration", "ribbon"]}, "wrapped-gift": {"a": "wrapped gift", "b": "1F381", "j": ["box", "celebration", "gift", "present", "wrapped"]}, "reminder-ribbon": {"a": "reminder ribbon", "b": "1F397", "j": ["celebration", "reminder", "ribbon"]}, "admission-tickets": {"a": "admission tickets", "b": "1F39F", "j": ["admission", "admission tickets", "ticket"]}, "ticket": {"a": "ticket", "b": "1F3AB", "j": ["admission", "ticket"]}, "military-medal": {"a": "military medal", "b": "1F396", "j": ["celebration", "medal", "military"]}, "trophy": {"a": "trophy", "b": "1F3C6", "j": ["prize", "trophy"]}, "sports-medal": {"a": "sports medal", "b": "1F3C5", "j": ["medal", "sports medal"]}, "1st-place-medal": {"a": "1st place medal", "b": "1F947", "j": ["1st place medal", "first", "gold", "medal"]}, "2nd-place-medal": {"a": "2nd place medal", "b": "1F948", "j": ["2nd place medal", "medal", "second", "silver"]}, "3rd-place-medal": {"a": "3rd place medal", "b": "1F949", "j": ["3rd place medal", "bronze", "medal", "third"]}, "soccer-ball": {"a": "soccer ball", "b": "26BD", "j": ["ball", "football", "soccer"]}, "baseball": {"a": "baseball", "b": "26BE", "j": ["ball", "baseball"]}, "softball": {"a": "softball", "b": "1F94E", "j": ["ball", "glove", "softball", "underarm"]}, "basketball": {"a": "basketball", "b": "1F3C0", "j": ["ball", "basketball", "hoop"]}, "volleyball": {"a": "volleyball", "b": "1F3D0", "j": ["ball", "game", "volleyball"]}, "american-football": {"a": "american football", "b": "1F3C8", "j": ["american", "ball", "football"]}, "rugby-football": {"a": "rugby football", "b": "1F3C9", "j": ["ball", "football", "rugby"]}, "tennis": {"a": "tennis", "b": "1F3BE", "j": ["ball", "racquet", "tennis"]}, "flying-disc": {"a": "flying disc", "b": "1F94F", "j": ["flying disc", "ultimate"]}, "bowling": {"a": "bowling", "b": "1F3B3", "j": ["ball", "bowling", "game"]}, "cricket-game": {"a": "cricket game", "b": "1F3CF", "j": ["ball", "bat", "cricket game", "game"]}, "field-hockey": {"a": "field hockey", "b": "1F3D1", "j": ["ball", "field", "game", "hockey", "stick"]}, "ice-hockey": {"a": "ice hockey", "b": "1F3D2", "j": ["game", "hockey", "ice", "puck", "stick"]}, "lacrosse": {"a": "lacrosse", "b": "1F94D", "j": ["ball", "goal", "lacrosse", "stick"]}, "ping-pong": {"a": "ping pong", "b": "1F3D3", "j": ["ball", "bat", "game", "paddle", "ping pong", "table tennis"]}, "badminton": {"a": "badminton", "b": "1F3F8", "j": ["badminton", "birdie", "game", "racquet", "shuttlecock"]}, "boxing-glove": {"a": "boxing glove", "b": "1F94A", "j": ["boxing", "glove"]}, "martial-arts-uniform": {"a": "martial arts uniform", "b": "1F94B", "j": ["judo", "karate", "martial arts", "martial arts uniform", "taekwondo", "uniform"]}, "goal-net": {"a": "goal net", "b": "1F945", "j": ["goal", "net"]}, "flag-in-hole": {"a": "flag in hole", "b": "26F3", "j": ["flag in hole", "golf", "hole"]}, "ice-skate": {"a": "ice skate", "b": "26F8", "j": ["ice", "skate"]}, "fishing-pole": {"a": "fishing pole", "b": "1F3A3", "j": ["fish", "fishing pole", "pole"]}, "diving-mask": {"a": "diving mask", "b": "1F93F", "j": ["diving", "diving mask", "scuba", "snorkeling"]}, "running-shirt": {"a": "running shirt", "b": "1F3BD", "j": ["athletics", "running", "sash", "shirt"]}, "skis": {"a": "skis", "b": "1F3BF", "j": ["ski", "skis", "snow"]}, "sled": {"a": "sled", "b": "1F6F7", "j": ["sled", "sledge", "sleigh", "luge", "toboggan"]}, "curling-stone": {"a": "curling stone", "b": "1F94C", "j": ["curling stone", "game", "rock"]}, "bullseye": {"a": "bullseye", "b": "1F3AF", "j": ["bullseye", "dart", "direct hit", "game", "hit", "target"]}, "yoyo": {"a": "yo-yo", "b": "1FA80", "j": ["fluctuate", "toy", "yo-yo"]}, "kite": {"a": "kite", "b": "1FA81", "j": ["fly", "kite", "soar"]}, "pool-8-ball": {"a": "pool 8 ball", "b": "1F3B1", "j": ["8", "ball", "billiard", "eight", "game", "pool 8 ball"]}, "crystal-ball": {"a": "crystal ball", "b": "1F52E", "j": ["ball", "crystal", "fairy tale", "fantasy", "fortune", "tool"]}, "magic-wand": {"a": "magic wand", "b": "1FA84", "j": ["magic", "magic wand", "witch", "wizard"]}, "nazar-amulet": {"a": "nazar amulet", "b": "1F9FF", "j": ["bead", "charm", "evil-eye", "nazar", "nazar amulet", "talisman"]}, "video-game": {"a": "video game", "b": "1F3AE", "j": ["controller", "game", "video game"]}, "joystick": {"a": "joystick", "b": "1F579", "j": ["game", "joystick", "video game"]}, "slot-machine": {"a": "slot machine", "b": "1F3B0", "j": ["game", "slot", "slot machine"]}, "game-die": {"a": "game die", "b": "1F3B2", "j": ["dice", "die", "game"]}, "puzzle-piece": {"a": "puzzle piece", "b": "1F9E9", "j": ["clue", "interlocking", "jigsaw", "piece", "puzzle"]}, "teddy-bear": {"a": "teddy bear", "b": "1F9F8", "j": ["plaything", "plush", "stuffed", "teddy bear", "toy"]}, "piata": {"a": "piñata", "b": "1FA85", "j": ["celebration", "party", "piñata"]}, "nesting-dolls": {"a": "nesting dolls", "b": "1FA86", "j": ["doll", "nesting", "nesting dolls", "russia"]}, "spade-suit": {"a": "spade suit", "b": "2660", "j": ["card", "game", "spade suit"]}, "heart-suit": {"a": "heart suit", "b": "2665", "j": ["card", "game", "heart suit"]}, "diamond-suit": {"a": "diamond suit", "b": "2666", "j": ["card", "diamond suit", "game"]}, "club-suit": {"a": "club suit", "b": "2663", "j": ["card", "club suit", "game"]}, "chess-pawn": {"a": "chess pawn", "b": "265F", "j": ["chess", "chess pawn", "dupe", "expendable"]}, "joker": {"a": "joker", "b": "1F0CF", "j": ["card", "game", "joker", "wildcard"]}, "mahjong-red-dragon": {"a": "mahjong red dragon", "b": "1F004", "j": ["game", "mahjong", "mahjong red dragon", "red"]}, "flower-playing-cards": {"a": "flower playing cards", "b": "1F3B4", "j": ["card", "flower", "flower playing cards", "game", "Japanese", "playing"]}, "performing-arts": {"a": "performing arts", "b": "1F3AD", "j": ["art", "mask", "performing", "performing arts", "theater", "theatre"]}, "framed-picture": {"a": "framed picture", "b": "1F5BC", "j": ["art", "frame", "framed picture", "museum", "painting", "picture"]}, "artist-palette": {"a": "artist palette", "b": "1F3A8", "j": ["art", "artist palette", "museum", "painting", "palette"]}, "thread": {"a": "thread", "b": "1F9F5", "j": ["needle", "sewing", "spool", "string", "thread"]}, "sewing-needle": {"a": "sewing needle", "b": "1FAA1", "j": ["embroidery", "needle", "sewing", "stitches", "sutures", "tailoring"]}, "yarn": {"a": "yarn", "b": "1F9F6", "j": ["ball", "crochet", "knit", "yarn"]}, "knot": {"a": "knot", "b": "1FAA2", "j": ["knot", "rope", "tangled", "tie", "twine", "twist"]}, "glasses": {"a": "glasses", "b": "1F453", "j": ["clothing", "eye", "eyeglasses", "eyewear", "glasses"]}, "sunglasses": {"a": "sunglasses", "b": "1F576", "j": ["dark", "eye", "eyewear", "glasses", "sunglasses"]}, "goggles": {"a": "goggles", "b": "1F97D", "j": ["eye protection", "goggles", "swimming", "welding"]}, "lab-coat": {"a": "lab coat", "b": "1F97C", "j": ["doctor", "experiment", "lab coat", "scientist"]}, "safety-vest": {"a": "safety vest", "b": "1F9BA", "j": ["emergency", "safety", "vest"]}, "necktie": {"a": "necktie", "b": "1F454", "j": ["clothing", "necktie", "tie"]}, "tshirt": {"a": "t-shirt", "b": "1F455", "j": ["clothing", "shirt", "t-shirt", "tshirt"]}, "jeans": {"a": "jeans", "b": "1F456", "j": ["clothing", "jeans", "pants", "trousers"]}, "scarf": {"a": "scarf", "b": "1F9E3", "j": ["neck", "scarf"]}, "gloves": {"a": "gloves", "b": "1F9E4", "j": ["gloves", "hand"]}, "coat": {"a": "coat", "b": "1F9E5", "j": ["coat", "jacket"]}, "socks": {"a": "socks", "b": "1F9E6", "j": ["socks", "stocking"]}, "dress": {"a": "dress", "b": "1F457", "j": ["clothing", "dress"]}, "kimono": {"a": "kimono", "b": "1F458", "j": ["clothing", "kimono"]}, "sari": {"a": "sari", "b": "1F97B", "j": ["clothing", "dress", "sari"]}, "onepiece-swimsuit": {"a": "one-piece swimsuit", "b": "1FA71", "j": ["bathing suit", "one-piece swimsuit"]}, "briefs": {"a": "briefs", "b": "1FA72", "j": ["bathing suit", "briefs", "one-piece", "swimsuit", "underwear"]}, "shorts": {"a": "shorts", "b": "1FA73", "j": ["bathing suit", "pants", "shorts", "underwear"]}, "bikini": {"a": "bikini", "b": "1F459", "j": ["bikini", "clothing", "swim"]}, "womans-clothes": {"a": "woman’s clothes", "b": "1F45A", "j": ["clothing", "woman", "woman’s clothes"]}, "purse": {"a": "purse", "b": "1F45B", "j": ["clothing", "coin", "purse"]}, "handbag": {"a": "handbag", "b": "1F45C", "j": ["bag", "clothing", "handbag", "purse"]}, "clutch-bag": {"a": "clutch bag", "b": "1F45D", "j": ["bag", "clothing", "clutch bag", "pouch"]}, "shopping-bags": {"a": "shopping bags", "b": "1F6CD", "j": ["bag", "hotel", "shopping", "shopping bags"]}, "backpack": {"a": "backpack", "b": "1F392", "j": ["backpack", "bag", "rucksack", "satchel", "school"]}, "thong-sandal": {"a": "thong sandal", "b": "1FA74", "j": ["beach sandals", "sandals", "thong sandal", "thong sandals", "thongs", "zōri"]}, "mans-shoe": {"a": "man’s shoe", "b": "1F45E", "j": ["clothing", "man", "man’s shoe", "shoe"]}, "running-shoe": {"a": "running shoe", "b": "1F45F", "j": ["athletic", "clothing", "running shoe", "shoe", "sneaker"]}, "hiking-boot": {"a": "hiking boot", "b": "1F97E", "j": ["backpacking", "boot", "camping", "hiking"]}, "flat-shoe": {"a": "flat shoe", "b": "1F97F", "j": ["ballet flat", "flat shoe", "slip-on", "slipper"]}, "highheeled-shoe": {"a": "high-heeled shoe", "b": "1F460", "j": ["clothing", "heel", "high-heeled shoe", "shoe", "woman"]}, "womans-sandal": {"a": "woman’s sandal", "b": "1F461", "j": ["clothing", "sandal", "shoe", "woman", "woman’s sandal"]}, "ballet-shoes": {"a": "ballet shoes", "b": "1FA70", "j": ["ballet", "ballet shoes", "dance"]}, "womans-boot": {"a": "woman’s boot", "b": "1F462", "j": ["boot", "clothing", "shoe", "woman", "woman’s boot"]}, "crown": {"a": "crown", "b": "1F451", "j": ["clothing", "crown", "king", "queen"]}, "womans-hat": {"a": "woman’s hat", "b": "1F452", "j": ["clothing", "hat", "woman", "woman’s hat"]}, "top-hat": {"a": "top hat", "b": "1F3A9", "j": ["clothing", "hat", "top", "tophat"]}, "graduation-cap": {"a": "graduation cap", "b": "1F393", "j": ["cap", "celebration", "clothing", "graduation", "hat"]}, "billed-cap": {"a": "billed cap", "b": "1F9E2", "j": ["baseball cap", "billed cap"]}, "military-helmet": {"a": "military helmet", "b": "1FA96", "j": ["army", "helmet", "military", "soldier", "warrior"]}, "rescue-workers-helmet": {"a": "rescue worker’s helmet", "b": "26D1", "j": ["aid", "cross", "face", "hat", "helmet", "rescue worker’s helmet"]}, "prayer-beads": {"a": "prayer beads", "b": "1F4FF", "j": ["beads", "clothing", "necklace", "prayer", "religion"]}, "lipstick": {"a": "lipstick", "b": "1F484", "j": ["cosmetics", "lipstick", "makeup"]}, "ring": {"a": "ring", "b": "1F48D", "j": ["diamond", "ring"]}, "gem-stone": {"a": "gem stone", "b": "1F48E", "j": ["diamond", "gem", "gem stone", "jewel"]}, "muted-speaker": {"a": "muted speaker", "b": "1F507", "j": ["mute", "muted speaker", "quiet", "silent", "speaker"]}, "speaker-low-volume": {"a": "speaker low volume", "b": "1F508", "j": ["soft", "speaker low volume"]}, "speaker-medium-volume": {"a": "speaker medium volume", "b": "1F509", "j": ["medium", "speaker medium volume"]}, "speaker-high-volume": {"a": "speaker high volume", "b": "1F50A", "j": ["loud", "speaker high volume"]}, "loudspeaker": {"a": "loudspeaker", "b": "1F4E2", "j": ["loud", "loudspeaker", "public address"]}, "megaphone": {"a": "megaphone", "b": "1F4E3", "j": ["cheering", "megaphone"]}, "postal-horn": {"a": "postal horn", "b": "1F4EF", "j": ["horn", "post", "postal"]}, "bell": {"a": "bell", "b": "1F514", "j": ["bell"]}, "bell-with-slash": {"a": "bell with slash", "b": "1F515", "j": ["bell", "bell with slash", "forbidden", "mute", "quiet", "silent"]}, "musical-score": {"a": "musical score", "b": "1F3BC", "j": ["music", "musical score", "score"]}, "musical-note": {"a": "musical note", "b": "1F3B5", "j": ["music", "musical note", "note"]}, "musical-notes": {"a": "musical notes", "b": "1F3B6", "j": ["music", "musical notes", "note", "notes"]}, "studio-microphone": {"a": "studio microphone", "b": "1F399", "j": ["mic", "microphone", "music", "studio"]}, "level-slider": {"a": "level slider", "b": "1F39A", "j": ["level", "music", "slider"]}, "control-knobs": {"a": "control knobs", "b": "1F39B", "j": ["control", "knobs", "music"]}, "microphone": {"a": "microphone", "b": "1F3A4", "j": ["karaoke", "mic", "microphone"]}, "headphone": {"a": "headphone", "b": "1F3A7", "j": ["earbud", "headphone"]}, "radio": {"a": "radio", "b": "1F4FB", "j": ["radio", "video"]}, "saxophone": {"a": "saxophone", "b": "1F3B7", "j": ["instrument", "music", "sax", "saxophone"]}, "accordion": {"a": "accordion", "b": "1FA97", "j": ["accordian", "accordion", "concertina", "squeeze box"]}, "guitar": {"a": "guitar", "b": "1F3B8", "j": ["guitar", "instrument", "music"]}, "musical-keyboard": {"a": "musical keyboard", "b": "1F3B9", "j": ["instrument", "keyboard", "music", "musical keyboard", "piano"]}, "trumpet": {"a": "trumpet", "b": "1F3BA", "j": ["instrument", "music", "trumpet"]}, "violin": {"a": "violin", "b": "1F3BB", "j": ["instrument", "music", "violin"]}, "banjo": {"a": "banjo", "b": "1FA95", "j": ["banjo", "music", "stringed"]}, "drum": {"a": "drum", "b": "1F941", "j": ["drum", "drumsticks", "music"]}, "long-drum": {"a": "long drum", "b": "1FA98", "j": ["beat", "conga", "drum", "long drum", "rhythm"]}, "mobile-phone": {"a": "mobile phone", "b": "1F4F1", "j": ["cell", "mobile", "phone", "telephone"]}, "mobile-phone-with-arrow": {"a": "mobile phone with arrow", "b": "1F4F2", "j": ["arrow", "cell", "mobile", "mobile phone with arrow", "phone", "receive"]}, "telephone": {"a": "telephone", "b": "260E", "j": ["phone", "telephone"]}, "telephone-receiver": {"a": "telephone receiver", "b": "1F4DE", "j": ["phone", "receiver", "telephone"]}, "pager": {"a": "pager", "b": "1F4DF", "j": ["pager"]}, "fax-machine": {"a": "fax machine", "b": "1F4E0", "j": ["fax", "fax machine"]}, "battery": {"a": "battery", "b": "1F50B", "j": ["battery"]}, "electric-plug": {"a": "electric plug", "b": "1F50C", "j": ["electric", "electricity", "plug"]}, "laptop": {"a": "laptop", "b": "1F4BB", "j": ["computer", "laptop", "pc", "personal"]}, "desktop-computer": {"a": "desktop computer", "b": "1F5A5", "j": ["computer", "desktop"]}, "printer": {"a": "printer", "b": "1F5A8", "j": ["computer", "printer"]}, "keyboard": {"a": "keyboard", "b": "2328", "j": ["computer", "keyboard"]}, "computer-mouse": {"a": "computer mouse", "b": "1F5B1", "j": ["computer", "computer mouse"]}, "trackball": {"a": "trackball", "b": "1F5B2", "j": ["computer", "trackball"]}, "computer-disk": {"a": "computer disk", "b": "1F4BD", "j": ["computer", "disk", "minidisk", "optical"]}, "floppy-disk": {"a": "floppy disk", "b": "1F4BE", "j": ["computer", "disk", "floppy"]}, "optical-disk": {"a": "optical disk", "b": "1F4BF", "j": ["cd", "computer", "disk", "optical"]}, "dvd": {"a": "dvd", "b": "1F4C0", "j": ["blu-ray", "computer", "disk", "dvd", "optical"]}, "abacus": {"a": "abacus", "b": "1F9EE", "j": ["abacus", "calculation"]}, "movie-camera": {"a": "movie camera", "b": "1F3A5", "j": ["camera", "cinema", "movie"]}, "film-frames": {"a": "film frames", "b": "1F39E", "j": ["cinema", "film", "frames", "movie"]}, "film-projector": {"a": "film projector", "b": "1F4FD", "j": ["cinema", "film", "movie", "projector", "video"]}, "clapper-board": {"a": "clapper board", "b": "1F3AC", "j": ["clapper", "clapper board", "movie"]}, "television": {"a": "television", "b": "1F4FA", "j": ["television", "tv", "video"]}, "camera": {"a": "camera", "b": "1F4F7", "j": ["camera", "video"]}, "camera-with-flash": {"a": "camera with flash", "b": "1F4F8", "j": ["camera", "camera with flash", "flash", "video"]}, "video-camera": {"a": "video camera", "b": "1F4F9", "j": ["camera", "video"]}, "videocassette": {"a": "videocassette", "b": "1F4FC", "j": ["tape", "vhs", "video", "videocassette"]}, "magnifying-glass-tilted-left": {"a": "magnifying glass tilted left", "b": "1F50D", "j": ["glass", "magnifying", "magnifying glass tilted left", "search", "tool"]}, "magnifying-glass-tilted-right": {"a": "magnifying glass tilted right", "b": "1F50E", "j": ["glass", "magnifying", "magnifying glass tilted right", "search", "tool"]}, "candle": {"a": "candle", "b": "1F56F", "j": ["candle", "light"]}, "light-bulb": {"a": "light bulb", "b": "1F4A1", "j": ["bulb", "comic", "electric", "idea", "light"]}, "flashlight": {"a": "flashlight", "b": "1F526", "j": ["electric", "flashlight", "light", "tool", "torch"]}, "red-paper-lantern": {"a": "red paper lantern", "b": "1F3EE", "j": ["bar", "lantern", "light", "red", "red paper lantern"]}, "diya-lamp": {"a": "diya lamp", "b": "1FA94", "j": ["diya", "lamp", "oil"]}, "notebook-with-decorative-cover": {"a": "notebook with decorative cover", "b": "1F4D4", "j": ["book", "cover", "decorated", "notebook", "notebook with decorative cover"]}, "closed-book": {"a": "closed book", "b": "1F4D5", "j": ["book", "closed"]}, "open-book": {"a": "open book", "b": "1F4D6", "j": ["book", "open"]}, "green-book": {"a": "green book", "b": "1F4D7", "j": ["book", "green"]}, "blue-book": {"a": "blue book", "b": "1F4D8", "j": ["blue", "book"]}, "orange-book": {"a": "orange book", "b": "1F4D9", "j": ["book", "orange"]}, "books": {"a": "books", "b": "1F4DA", "j": ["book", "books"]}, "notebook": {"a": "notebook", "b": "1F4D3", "j": ["notebook"]}, "ledger": {"a": "ledger", "b": "1F4D2", "j": ["ledger", "notebook"]}, "page-with-curl": {"a": "page with curl", "b": "1F4C3", "j": ["curl", "document", "page", "page with curl"]}, "scroll": {"a": "scroll", "b": "1F4DC", "j": ["paper", "scroll"]}, "page-facing-up": {"a": "page facing up", "b": "1F4C4", "j": ["document", "page", "page facing up"]}, "newspaper": {"a": "newspaper", "b": "1F4F0", "j": ["news", "newspaper", "paper"]}, "rolledup-newspaper": {"a": "rolled-up newspaper", "b": "1F5DE", "j": ["news", "newspaper", "paper", "rolled", "rolled-up newspaper"]}, "bookmark-tabs": {"a": "bookmark tabs", "b": "1F4D1", "j": ["bookmark", "mark", "marker", "tabs"]}, "bookmark": {"a": "bookmark", "b": "1F516", "j": ["bookmark", "mark"]}, "label": {"a": "label", "b": "1F3F7", "j": ["label"]}, "money-bag": {"a": "money bag", "b": "1F4B0", "j": ["bag", "dollar", "money", "moneybag"]}, "coin": {"a": "coin", "b": "1FA99", "j": ["coin", "gold", "metal", "money", "silver", "treasure"]}, "yen-banknote": {"a": "yen banknote", "b": "1F4B4", "j": ["banknote", "bill", "currency", "money", "note", "yen"]}, "dollar-banknote": {"a": "dollar banknote", "b": "1F4B5", "j": ["banknote", "bill", "currency", "dollar", "money", "note"]}, "euro-banknote": {"a": "euro banknote", "b": "1F4B6", "j": ["banknote", "bill", "currency", "euro", "money", "note"]}, "pound-banknote": {"a": "pound banknote", "b": "1F4B7", "j": ["banknote", "bill", "currency", "money", "note", "pound"]}, "money-with-wings": {"a": "money with wings", "b": "1F4B8", "j": ["banknote", "bill", "fly", "money", "money with wings", "wings"]}, "credit-card": {"a": "credit card", "b": "1F4B3", "j": ["card", "credit", "money"]}, "receipt": {"a": "receipt", "b": "1F9FE", "j": ["accounting", "bookkeeping", "evidence", "proof", "receipt"]}, "chart-increasing-with-yen": {"a": "chart increasing with yen", "b": "1F4B9", "j": ["chart", "chart increasing with yen", "graph", "growth", "money", "yen"]}, "envelope": {"a": "envelope", "b": "2709", "j": ["email", "envelope", "letter"]}, "email": {"a": "e-mail", "b": "1F4E7", "j": ["e-mail", "email", "letter", "mail"]}, "incoming-envelope": {"a": "incoming envelope", "b": "1F4E8", "j": ["e-mail", "email", "envelope", "incoming", "letter", "receive"]}, "envelope-with-arrow": {"a": "envelope with arrow", "b": "1F4E9", "j": ["arrow", "e-mail", "email", "envelope", "envelope with arrow", "outgoing"]}, "outbox-tray": {"a": "outbox tray", "b": "1F4E4", "j": ["box", "letter", "mail", "outbox", "sent", "tray"]}, "inbox-tray": {"a": "inbox tray", "b": "1F4E5", "j": ["box", "inbox", "letter", "mail", "receive", "tray"]}, "package": {"a": "package", "b": "1F4E6", "j": ["box", "package", "parcel"]}, "closed-mailbox-with-raised-flag": {"a": "closed mailbox with raised flag", "b": "1F4EB", "j": ["closed", "closed mailbox with raised flag", "mail", "mailbox", "postbox"]}, "closed-mailbox-with-lowered-flag": {"a": "closed mailbox with lowered flag", "b": "1F4EA", "j": ["closed", "closed mailbox with lowered flag", "lowered", "mail", "mailbox", "postbox"]}, "open-mailbox-with-raised-flag": {"a": "open mailbox with raised flag", "b": "1F4EC", "j": ["mail", "mailbox", "open", "open mailbox with raised flag", "postbox"]}, "open-mailbox-with-lowered-flag": {"a": "open mailbox with lowered flag", "b": "1F4ED", "j": ["lowered", "mail", "mailbox", "open", "open mailbox with lowered flag", "postbox"]}, "postbox": {"a": "postbox", "b": "1F4EE", "j": ["mail", "mailbox", "postbox"]}, "ballot-box-with-ballot": {"a": "ballot box with ballot", "b": "1F5F3", "j": ["ballot", "ballot box with ballot", "box"]}, "pencil": {"a": "pencil", "b": "270F", "j": ["pencil"]}, "black-nib": {"a": "black nib", "b": "2712", "j": ["black nib", "nib", "pen"]}, "fountain-pen": {"a": "fountain pen", "b": "1F58B", "j": ["fountain", "pen"]}, "pen": {"a": "pen", "b": "1F58A", "j": ["ballpoint", "pen"]}, "paintbrush": {"a": "paintbrush", "b": "1F58C", "j": ["paintbrush", "painting"]}, "crayon": {"a": "crayon", "b": "1F58D", "j": ["crayon"]}, "memo": {"a": "memo", "b": "1F4DD", "j": ["memo", "pencil"]}, "briefcase": {"a": "briefcase", "b": "1F4BC", "j": ["briefcase"]}, "file-folder": {"a": "file folder", "b": "1F4C1", "j": ["file", "folder"]}, "open-file-folder": {"a": "open file folder", "b": "1F4C2", "j": ["file", "folder", "open"]}, "card-index-dividers": {"a": "card index dividers", "b": "1F5C2", "j": ["card", "dividers", "index"]}, "calendar": {"a": "calendar", "b": "1F4C5", "j": ["calendar", "date"]}, "tearoff-calendar": {"a": "tear-off calendar", "b": "1F4C6", "j": ["calendar", "tear-off calendar"]}, "spiral-notepad": {"a": "spiral notepad", "b": "1F5D2", "j": ["note", "pad", "spiral", "spiral notepad"]}, "spiral-calendar": {"a": "spiral calendar", "b": "1F5D3", "j": ["calendar", "pad", "spiral"]}, "card-index": {"a": "card index", "b": "1F4C7", "j": ["card", "index", "rolodex"]}, "chart-increasing": {"a": "chart increasing", "b": "1F4C8", "j": ["chart", "chart increasing", "graph", "growth", "trend", "upward"]}, "chart-decreasing": {"a": "chart decreasing", "b": "1F4C9", "j": ["chart", "chart decreasing", "down", "graph", "trend"]}, "bar-chart": {"a": "bar chart", "b": "1F4CA", "j": ["bar", "chart", "graph"]}, "clipboard": {"a": "clipboard", "b": "1F4CB", "j": ["clipboard"]}, "pushpin": {"a": "pushpin", "b": "1F4CC", "j": ["pin", "pushpin"]}, "round-pushpin": {"a": "round pushpin", "b": "1F4CD", "j": ["pin", "pushpin", "round pushpin"]}, "paperclip": {"a": "paperclip", "b": "1F4CE", "j": ["paperclip"]}, "linked-paperclips": {"a": "linked paperclips", "b": "1F587", "j": ["link", "linked paperclips", "paperclip"]}, "straight-ruler": {"a": "straight ruler", "b": "1F4CF", "j": ["ruler", "straight edge", "straight ruler"]}, "triangular-ruler": {"a": "triangular ruler", "b": "1F4D0", "j": ["ruler", "set", "triangle", "triangular ruler"]}, "scissors": {"a": "scissors", "b": "2702", "j": ["cutting", "scissors", "tool"]}, "card-file-box": {"a": "card file box", "b": "1F5C3", "j": ["box", "card", "file"]}, "file-cabinet": {"a": "file cabinet", "b": "1F5C4", "j": ["cabinet", "file", "filing"]}, "wastebasket": {"a": "wastebasket", "b": "1F5D1", "j": ["wastebasket"]}, "locked": {"a": "locked", "b": "1F512", "j": ["closed", "locked"]}, "unlocked": {"a": "unlocked", "b": "1F513", "j": ["lock", "open", "unlock", "unlocked"]}, "locked-with-pen": {"a": "locked with pen", "b": "1F50F", "j": ["ink", "lock", "locked with pen", "nib", "pen", "privacy"]}, "locked-with-key": {"a": "locked with key", "b": "1F510", "j": ["closed", "key", "lock", "locked with key", "secure"]}, "key": {"a": "key", "b": "1F511", "j": ["key", "lock", "password"]}, "old-key": {"a": "old key", "b": "1F5DD", "j": ["clue", "key", "lock", "old"]}, "hammer": {"a": "hammer", "b": "1F528", "j": ["hammer", "tool"]}, "axe": {"a": "axe", "b": "1FA93", "j": ["axe", "chop", "hatchet", "split", "wood"]}, "pick": {"a": "pick", "b": "26CF", "j": ["mining", "pick", "tool"]}, "hammer-and-pick": {"a": "hammer and pick", "b": "2692", "j": ["hammer", "hammer and pick", "pick", "tool"]}, "hammer-and-wrench": {"a": "hammer and wrench", "b": "1F6E0", "j": ["hammer", "hammer and wrench", "spanner", "tool", "wrench"]}, "dagger": {"a": "dagger", "b": "1F5E1", "j": ["dagger", "knife", "weapon"]}, "crossed-swords": {"a": "crossed swords", "b": "2694", "j": ["crossed", "swords", "weapon"]}, "water-pistol": {"a": "water pistol", "b": "1F52B", "j": ["gun", "handgun", "pistol", "revolver", "tool", "water", "weapon"]}, "boomerang": {"a": "boomerang", "b": "1FA83", "j": ["australia", "boomerang", "rebound", "repercussion"]}, "bow-and-arrow": {"a": "bow and arrow", "b": "1F3F9", "j": ["archer", "arrow", "bow", "bow and arrow", "Sagittarius", "zodiac"]}, "shield": {"a": "shield", "b": "1F6E1", "j": ["shield", "weapon"]}, "carpentry-saw": {"a": "carpentry saw", "b": "1FA9A", "j": ["carpenter", "carpentry saw", "lumber", "saw", "tool"]}, "wrench": {"a": "wrench", "b": "1F527", "j": ["spanner", "tool", "wrench"]}, "screwdriver": {"a": "screwdriver", "b": "1FA9B", "j": ["screw", "screwdriver", "tool"]}, "nut-and-bolt": {"a": "nut and bolt", "b": "1F529", "j": ["bolt", "nut", "nut and bolt", "tool"]}, "gear": {"a": "gear", "b": "2699", "j": ["cog", "cogwheel", "gear", "tool"]}, "clamp": {"a": "clamp", "b": "1F5DC", "j": ["clamp", "compress", "tool", "vice"]}, "balance-scale": {"a": "balance scale", "b": "2696", "j": ["balance", "justice", "Libra", "scale", "zodiac"]}, "white-cane": {"a": "white cane", "b": "1F9AF", "j": ["accessibility", "blind", "white cane"]}, "link": {"a": "link", "b": "1F517", "j": ["link"]}, "chains": {"a": "chains", "b": "26D3", "j": ["chain", "chains"]}, "hook": {"a": "hook", "b": "1FA9D", "j": ["catch", "crook", "curve", "ensnare", "hook", "selling point"]}, "toolbox": {"a": "toolbox", "b": "1F9F0", "j": ["chest", "mechanic", "tool", "toolbox"]}, "magnet": {"a": "magnet", "b": "1F9F2", "j": ["attraction", "horseshoe", "magnet", "magnetic"]}, "ladder": {"a": "ladder", "b": "1FA9C", "j": ["climb", "ladder", "rung", "step"]}, "alembic": {"a": "alembic", "b": "2697", "j": ["alembic", "chemistry", "tool"]}, "test-tube": {"a": "test tube", "b": "1F9EA", "j": ["chemist", "chemistry", "experiment", "lab", "science", "test tube"]}, "petri-dish": {"a": "petri dish", "b": "1F9EB", "j": ["bacteria", "biologist", "biology", "culture", "lab", "petri dish"]}, "dna": {"a": "dna", "b": "1F9EC", "j": ["biologist", "dna", "evolution", "gene", "genetics", "life"]}, "microscope": {"a": "microscope", "b": "1F52C", "j": ["microscope", "science", "tool"]}, "telescope": {"a": "telescope", "b": "1F52D", "j": ["science", "telescope", "tool"]}, "satellite-antenna": {"a": "satellite antenna", "b": "1F4E1", "j": ["antenna", "dish", "satellite"]}, "syringe": {"a": "syringe", "b": "1F489", "j": ["medicine", "needle", "shot", "sick", "syringe"]}, "drop-of-blood": {"a": "drop of blood", "b": "1FA78", "j": ["bleed", "blood donation", "drop of blood", "injury", "medicine", "menstruation"]}, "pill": {"a": "pill", "b": "1F48A", "j": ["doctor", "medicine", "pill", "sick"]}, "adhesive-bandage": {"a": "adhesive bandage", "b": "1FA79", "j": ["adhesive bandage", "bandage"]}, "stethoscope": {"a": "stethoscope", "b": "1FA7A", "j": ["doctor", "heart", "medicine", "stethoscope"]}, "door": {"a": "door", "b": "1F6AA", "j": ["door"]}, "elevator": {"a": "elevator", "b": "1F6D7", "j": ["accessibility", "elevator", "hoist", "lift"]}, "mirror": {"a": "mirror", "b": "1FA9E", "j": ["mirror", "reflection", "reflector", "speculum"]}, "window": {"a": "window", "b": "1FA9F", "j": ["frame", "fresh air", "opening", "transparent", "view", "window"]}, "bed": {"a": "bed", "b": "1F6CF", "j": ["bed", "hotel", "sleep"]}, "couch-and-lamp": {"a": "couch and lamp", "b": "1F6CB", "j": ["couch", "couch and lamp", "hotel", "lamp"]}, "chair": {"a": "chair", "b": "1FA91", "j": ["chair", "seat", "sit"]}, "toilet": {"a": "toilet", "b": "1F6BD", "j": ["toilet"]}, "plunger": {"a": "plunger", "b": "1FAA0", "j": ["force cup", "plumber", "plunger", "suction", "toilet"]}, "shower": {"a": "shower", "b": "1F6BF", "j": ["shower", "water"]}, "bathtub": {"a": "bathtub", "b": "1F6C1", "j": ["bath", "bathtub"]}, "mouse-trap": {"a": "mouse trap", "b": "1FAA4", "j": ["bait", "mouse trap", "mousetrap", "snare", "trap"]}, "razor": {"a": "razor", "b": "1FA92", "j": ["razor", "sharp", "shave"]}, "lotion-bottle": {"a": "lotion bottle", "b": "1F9F4", "j": ["lotion", "lotion bottle", "moisturizer", "shampoo", "sunscreen"]}, "safety-pin": {"a": "safety pin", "b": "1F9F7", "j": ["diaper", "punk rock", "safety pin"]}, "broom": {"a": "broom", "b": "1F9F9", "j": ["broom", "cleaning", "sweeping", "witch"]}, "basket": {"a": "basket", "b": "1F9FA", "j": ["basket", "farming", "laundry", "picnic"]}, "roll-of-paper": {"a": "roll of paper", "b": "1F9FB", "j": ["paper towels", "roll of paper", "toilet paper"]}, "bucket": {"a": "bucket", "b": "1FAA3", "j": ["bucket", "cask", "pail", "vat"]}, "soap": {"a": "soap", "b": "1F9FC", "j": ["bar", "bathing", "cleaning", "lather", "soap", "soapdish"]}, "toothbrush": {"a": "toothbrush", "b": "1FAA5", "j": ["bathroom", "brush", "clean", "dental", "hygiene", "teeth", "toothbrush"]}, "sponge": {"a": "sponge", "b": "1F9FD", "j": ["absorbing", "cleaning", "porous", "sponge"]}, "fire-extinguisher": {"a": "fire extinguisher", "b": "1F9EF", "j": ["extinguish", "fire", "fire extinguisher", "quench"]}, "shopping-cart": {"a": "shopping cart", "b": "1F6D2", "j": ["cart", "shopping", "trolley"]}, "cigarette": {"a": "cigarette", "b": "1F6AC", "j": ["cigarette", "smoking"]}, "coffin": {"a": "coffin", "b": "26B0", "j": ["coffin", "death"]}, "headstone": {"a": "headstone", "b": "1FAA6", "j": ["cemetery", "grave", "graveyard", "headstone", "tombstone"]}, "funeral-urn": {"a": "funeral urn", "b": "26B1", "j": ["ashes", "death", "funeral", "urn"]}, "moai": {"a": "moai", "b": "1F5FF", "j": ["face", "moai", "moyai", "statue"]}, "placard": {"a": "placard", "b": "1FAA7", "j": ["demonstration", "picket", "placard", "protest", "sign"]}, "atm-sign": {"a": "ATM sign", "b": "1F3E7", "j": ["atm", "ATM sign", "automated", "bank", "teller"]}, "litter-in-bin-sign": {"a": "litter in bin sign", "b": "1F6AE", "j": ["litter", "litter bin", "litter in bin sign"]}, "potable-water": {"a": "potable water", "b": "1F6B0", "j": ["drinking", "potable", "water"]}, "wheelchair-symbol": {"a": "wheelchair symbol", "b": "267F", "j": ["access", "wheelchair symbol"]}, "mens-room": {"a": "men’s room", "b": "1F6B9", "j": ["lavatory", "man", "men’s room", "restroom", "wc"]}, "womens-room": {"a": "women’s room", "b": "1F6BA", "j": ["lavatory", "restroom", "wc", "woman", "women’s room"]}, "restroom": {"a": "restroom", "b": "1F6BB", "j": ["lavatory", "restroom", "WC"]}, "baby-symbol": {"a": "baby symbol", "b": "1F6BC", "j": ["baby", "baby symbol", "changing"]}, "water-closet": {"a": "water closet", "b": "1F6BE", "j": ["closet", "lavatory", "restroom", "water", "wc"]}, "passport-control": {"a": "passport control", "b": "1F6C2", "j": ["control", "passport"]}, "customs": {"a": "customs", "b": "1F6C3", "j": ["customs"]}, "baggage-claim": {"a": "baggage claim", "b": "1F6C4", "j": ["baggage", "claim"]}, "left-luggage": {"a": "left luggage", "b": "1F6C5", "j": ["baggage", "left luggage", "locker", "luggage"]}, "warning": {"a": "warning", "b": "26A0", "j": ["warning"]}, "children-crossing": {"a": "children crossing", "b": "1F6B8", "j": ["child", "children crossing", "crossing", "pedestrian", "traffic"]}, "no-entry": {"a": "no entry", "b": "26D4", "j": ["entry", "forbidden", "no", "not", "prohibited", "traffic"]}, "prohibited": {"a": "prohibited", "b": "1F6AB", "j": ["entry", "forbidden", "no", "not", "prohibited"]}, "no-bicycles": {"a": "no bicycles", "b": "1F6B3", "j": ["bicycle", "bike", "forbidden", "no", "no bicycles", "prohibited"]}, "no-smoking": {"a": "no smoking", "b": "1F6AD", "j": ["forbidden", "no", "not", "prohibited", "smoking"]}, "no-littering": {"a": "no littering", "b": "1F6AF", "j": ["forbidden", "litter", "no", "no littering", "not", "prohibited"]}, "nonpotable-water": {"a": "non-potable water", "b": "1F6B1", "j": ["non-drinking", "non-potable", "water"]}, "no-pedestrians": {"a": "no pedestrians", "b": "1F6B7", "j": ["forbidden", "no", "no pedestrians", "not", "pedestrian", "prohibited"]}, "no-mobile-phones": {"a": "no mobile phones", "b": "1F4F5", "j": ["cell", "forbidden", "mobile", "no", "no mobile phones", "phone"]}, "no-one-under-eighteen": {"a": "no one under eighteen", "b": "1F51E", "j": ["18", "age restriction", "eighteen", "no one under eighteen", "prohibited", "underage"]}, "radioactive": {"a": "radioactive", "b": "2622", "j": ["radioactive", "sign"]}, "biohazard": {"a": "biohazard", "b": "2623", "j": ["biohazard", "sign"]}, "up-arrow": {"a": "up arrow", "b": "2B06", "j": ["arrow", "cardinal", "direction", "north", "up arrow"]}, "upright-arrow": {"a": "up-right arrow", "b": "2197", "j": ["arrow", "direction", "intercardinal", "northeast", "up-right arrow"]}, "right-arrow": {"a": "right arrow", "b": "27A1", "j": ["arrow", "cardinal", "direction", "east", "right arrow"]}, "downright-arrow": {"a": "down-right arrow", "b": "2198", "j": ["arrow", "direction", "down-right arrow", "intercardinal", "southeast"]}, "down-arrow": {"a": "down arrow", "b": "2B07", "j": ["arrow", "cardinal", "direction", "down", "south"]}, "downleft-arrow": {"a": "down-left arrow", "b": "2199", "j": ["arrow", "direction", "down-left arrow", "intercardinal", "southwest"]}, "left-arrow": {"a": "left arrow", "b": "2B05", "j": ["arrow", "cardinal", "direction", "left arrow", "west"]}, "upleft-arrow": {"a": "up-left arrow", "b": "2196", "j": ["arrow", "direction", "intercardinal", "northwest", "up-left arrow"]}, "updown-arrow": {"a": "up-down arrow", "b": "2195", "j": ["arrow", "up-down arrow"]}, "leftright-arrow": {"a": "left-right arrow", "b": "2194", "j": ["arrow", "left-right arrow"]}, "right-arrow-curving-left": {"a": "right arrow curving left", "b": "21A9", "j": ["arrow", "right arrow curving left"]}, "left-arrow-curving-right": {"a": "left arrow curving right", "b": "21AA", "j": ["arrow", "left arrow curving right"]}, "right-arrow-curving-up": {"a": "right arrow curving up", "b": "2934", "j": ["arrow", "right arrow curving up"]}, "right-arrow-curving-down": {"a": "right arrow curving down", "b": "2935", "j": ["arrow", "down", "right arrow curving down"]}, "clockwise-vertical-arrows": {"a": "clockwise vertical arrows", "b": "1F503", "j": ["arrow", "clockwise", "clockwise vertical arrows", "reload"]}, "counterclockwise-arrows-button": {"a": "counterclockwise arrows button", "b": "1F504", "j": ["anticlockwise", "arrow", "counterclockwise", "counterclockwise arrows button", "withershins"]}, "back-arrow": {"a": "BACK arrow", "b": "1F519", "j": ["arrow", "back", "BACK arrow"]}, "end-arrow": {"a": "END arrow", "b": "1F51A", "j": ["arrow", "end", "END arrow"]}, "on-arrow": {"a": "ON! arrow", "b": "1F51B", "j": ["arrow", "mark", "on", "ON! arrow"]}, "soon-arrow": {"a": "SOON arrow", "b": "1F51C", "j": ["arrow", "soon", "SOON arrow"]}, "top-arrow": {"a": "TOP arrow", "b": "1F51D", "j": ["arrow", "top", "TOP arrow", "up"]}, "place-of-worship": {"a": "place of worship", "b": "1F6D0", "j": ["place of worship", "religion", "worship"]}, "atom-symbol": {"a": "atom symbol", "b": "269B", "j": ["atheist", "atom", "atom symbol"]}, "om": {"a": "om", "b": "1F549", "j": ["Hindu", "om", "religion"]}, "star-of-david": {"a": "star of David", "b": "2721", "j": ["David", "Jew", "Jewish", "religion", "star", "star of David"]}, "wheel-of-dharma": {"a": "wheel of dharma", "b": "2638", "j": ["Buddhist", "dharma", "religion", "wheel", "wheel of dharma"]}, "yin-yang": {"a": "yin yang", "b": "262F", "j": ["religion", "tao", "taoist", "yang", "yin"]}, "latin-cross": {"a": "latin cross", "b": "271D", "j": ["Christian", "cross", "latin cross", "religion"]}, "orthodox-cross": {"a": "orthodox cross", "b": "2626", "j": ["Christian", "cross", "orthodox cross", "religion"]}, "star-and-crescent": {"a": "star and crescent", "b": "262A", "j": ["islam", "Muslim", "religion", "star and crescent"]}, "peace-symbol": {"a": "peace symbol", "b": "262E", "j": ["peace", "peace symbol"]}, "menorah": {"a": "menorah", "b": "1F54E", "j": ["candelabrum", "candlestick", "menorah", "religion"]}, "dotted-sixpointed-star": {"a": "dotted six-pointed star", "b": "1F52F", "j": ["dotted six-pointed star", "fortune", "star"]}, "aries": {"a": "Aries", "b": "2648", "j": ["Aries", "ram", "zodiac"]}, "taurus": {"a": "Taurus", "b": "2649", "j": ["bull", "ox", "Taurus", "zodiac"]}, "gemini": {"a": "Gemini", "b": "264A", "j": ["Gemini", "twins", "zodiac"]}, "cancer": {"a": "Cancer", "b": "264B", "j": ["Cancer", "crab", "zodiac"]}, "leo": {"a": "Leo", "b": "264C", "j": ["Leo", "lion", "zodiac"]}, "virgo": {"a": "Virgo", "b": "264D", "j": ["Virgo", "zodiac"]}, "libra": {"a": "Libra", "b": "264E", "j": ["balance", "justice", "Libra", "scales", "zodiac"]}, "scorpio": {"a": "Scorpio", "b": "264F", "j": ["Scorpio", "scorpion", "scorpius", "zodiac"]}, "sagittarius": {"a": "Sagittarius", "b": "2650", "j": ["archer", "Sagittarius", "zodiac"]}, "capricorn": {"a": "Capricorn", "b": "2651", "j": ["Capricorn", "goat", "zodiac"]}, "aquarius": {"a": "Aquarius", "b": "2652", "j": ["Aquarius", "bearer", "water", "zodiac"]}, "pisces": {"a": "Pisces", "b": "2653", "j": ["fish", "Pisces", "zodiac"]}, "ophiuchus": {"a": "Ophiuchus", "b": "26CE", "j": ["bearer", "Ophiuchus", "serpent", "snake", "zodiac"]}, "shuffle-tracks-button": {"a": "shuffle tracks button", "b": "1F500", "j": ["arrow", "crossed", "shuffle tracks button"]}, "repeat-button": {"a": "repeat button", "b": "1F501", "j": ["arrow", "clockwise", "repeat", "repeat button"]}, "repeat-single-button": {"a": "repeat single button", "b": "1F502", "j": ["arrow", "clockwise", "once", "repeat single button"]}, "play-button": {"a": "play button", "b": "25B6", "j": ["arrow", "play", "play button", "right", "triangle"]}, "fastforward-button": {"a": "fast-forward button", "b": "23E9", "j": ["arrow", "double", "fast", "fast-forward button", "forward"]}, "next-track-button": {"a": "next track button", "b": "23ED", "j": ["arrow", "next scene", "next track", "next track button", "triangle"]}, "play-or-pause-button": {"a": "play or pause button", "b": "23EF", "j": ["arrow", "pause", "play", "play or pause button", "right", "triangle"]}, "reverse-button": {"a": "reverse button", "b": "25C0", "j": ["arrow", "left", "reverse", "reverse button", "triangle"]}, "fast-reverse-button": {"a": "fast reverse button", "b": "23EA", "j": ["arrow", "double", "fast reverse button", "rewind"]}, "last-track-button": {"a": "last track button", "b": "23EE", "j": ["arrow", "last track button", "previous scene", "previous track", "triangle"]}, "upwards-button": {"a": "upwards button", "b": "1F53C", "j": ["arrow", "button", "red", "upwards button"]}, "fast-up-button": {"a": "fast up button", "b": "23EB", "j": ["arrow", "double", "fast up button"]}, "downwards-button": {"a": "downwards button", "b": "1F53D", "j": ["arrow", "button", "down", "downwards button", "red"]}, "fast-down-button": {"a": "fast down button", "b": "23EC", "j": ["arrow", "double", "down", "fast down button"]}, "pause-button": {"a": "pause button", "b": "23F8", "j": ["bar", "double", "pause", "pause button", "vertical"]}, "stop-button": {"a": "stop button", "b": "23F9", "j": ["square", "stop", "stop button"]}, "record-button": {"a": "record button", "b": "23FA", "j": ["circle", "record", "record button"]}, "eject-button": {"a": "eject button", "b": "23CF", "j": ["eject", "eject button"]}, "cinema": {"a": "cinema", "b": "1F3A6", "j": ["camera", "cinema", "film", "movie"]}, "dim-button": {"a": "dim button", "b": "1F505", "j": ["brightness", "dim", "dim button", "low"]}, "bright-button": {"a": "bright button", "b": "1F506", "j": ["bright", "bright button", "brightness"]}, "antenna-bars": {"a": "antenna bars", "b": "1F4F6", "j": ["antenna", "antenna bars", "bar", "cell", "mobile", "phone"]}, "vibration-mode": {"a": "vibration mode", "b": "1F4F3", "j": ["cell", "mobile", "mode", "phone", "telephone", "vibration"]}, "mobile-phone-off": {"a": "mobile phone off", "b": "1F4F4", "j": ["cell", "mobile", "off", "phone", "telephone"]}, "female-sign": {"a": "female sign", "b": "2640", "j": ["female sign", "woman"]}, "male-sign": {"a": "male sign", "b": "2642", "j": ["male sign", "man"]}, "transgender-symbol": {"a": "transgender symbol", "b": "26A7", "j": ["transgender", "transgender symbol"]}, "multiply": {"a": "multiply", "b": "2716", "j": ["×", "cancel", "multiplication", "multiply", "sign", "x"]}, "plus": {"a": "plus", "b": "2795", "j": ["+", "math", "plus", "sign"]}, "minus": {"a": "minus", "b": "2796", "j": ["-", "−", "math", "minus", "sign"]}, "divide": {"a": "divide", "b": "2797", "j": ["÷", "divide", "division", "math", "sign"]}, "infinity": {"a": "infinity", "b": "267E", "j": ["forever", "infinity", "unbounded", "universal"]}, "double-exclamation-mark": {"a": "double exclamation mark", "b": "203C", "j": ["!", "!!", "bangbang", "double exclamation mark", "exclamation", "mark"]}, "exclamation-question-mark": {"a": "exclamation question mark", "b": "2049", "j": ["!", "!?", "?", "exclamation", "interrobang", "mark", "punctuation", "question"]}, "red-question-mark": {"a": "red question mark", "b": "2753", "j": ["?", "mark", "punctuation", "question", "red question mark"]}, "white-question-mark": {"a": "white question mark", "b": "2754", "j": ["?", "mark", "outlined", "punctuation", "question", "white question mark"]}, "white-exclamation-mark": {"a": "white exclamation mark", "b": "2755", "j": ["!", "exclamation", "mark", "outlined", "punctuation", "white exclamation mark"]}, "red-exclamation-mark": {"a": "red exclamation mark", "b": "2757", "j": ["!", "exclamation", "mark", "punctuation", "red exclamation mark"]}, "wavy-dash": {"a": "wavy dash", "b": "3030", "j": ["dash", "punctuation", "wavy"]}, "currency-exchange": {"a": "currency exchange", "b": "1F4B1", "j": ["bank", "currency", "exchange", "money"]}, "heavy-dollar-sign": {"a": "heavy dollar sign", "b": "1F4B2", "j": ["currency", "dollar", "heavy dollar sign", "money"]}, "medical-symbol": {"a": "medical symbol", "b": "2695", "j": ["aesculapius", "medical symbol", "medicine", "staff"]}, "recycling-symbol": {"a": "recycling symbol", "b": "267B", "j": ["recycle", "recycling symbol"]}, "fleurdelis": {"a": "fleur-de-lis", "b": "269C", "j": ["fleur-de-lis"]}, "trident-emblem": {"a": "trident emblem", "b": "1F531", "j": ["anchor", "emblem", "ship", "tool", "trident"]}, "name-badge": {"a": "name badge", "b": "1F4DB", "j": ["badge", "name"]}, "japanese-symbol-for-beginner": {"a": "Japanese symbol for beginner", "b": "1F530", "j": ["beginner", "chevron", "Japanese", "Japanese symbol for beginner", "leaf"]}, "hollow-red-circle": {"a": "hollow red circle", "b": "2B55", "j": ["circle", "hollow red circle", "large", "o", "red"]}, "check-mark-button": {"a": "check mark button", "b": "2705", "j": ["✓", "button", "check", "mark"]}, "check-box-with-check": {"a": "check box with check", "b": "2611", "j": ["✓", "box", "check", "check box with check"]}, "check-mark": {"a": "check mark", "b": "2714", "j": ["✓", "check", "mark"]}, "cross-mark": {"a": "cross mark", "b": "274C", "j": ["×", "cancel", "cross", "mark", "multiplication", "multiply", "x"]}, "cross-mark-button": {"a": "cross mark button", "b": "274E", "j": ["×", "cross mark button", "mark", "square", "x"]}, "curly-loop": {"a": "curly loop", "b": "27B0", "j": ["curl", "curly loop", "loop"]}, "double-curly-loop": {"a": "double curly loop", "b": "27BF", "j": ["curl", "double", "double curly loop", "loop"]}, "part-alternation-mark": {"a": "part alternation mark", "b": "303D", "j": ["mark", "part", "part alternation mark"]}, "eightspoked-asterisk": {"a": "eight-spoked asterisk", "b": "2733", "j": ["*", "asterisk", "eight-spoked asterisk"]}, "eightpointed-star": {"a": "eight-pointed star", "b": "2734", "j": ["*", "eight-pointed star", "star"]}, "sparkle": {"a": "sparkle", "b": "2747", "j": ["*", "sparkle"]}, "copyright": {"a": "copyright", "b": "00A9", "j": ["c", "copyright"]}, "registered": {"a": "registered", "b": "00AE", "j": ["r", "registered"]}, "trade-mark": {"a": "trade mark", "b": "2122", "j": ["mark", "tm", "trade mark", "trademark"]}, "keycap": {"a": "keycap: *", "b": "002A-FE0F-20E3", "j": ["keycap"]}, "keycap-0": {"a": "keycap: 0", "b": "0030-FE0F-20E3", "j": ["keycap"]}, "keycap-1": {"a": "keycap: 1", "b": "0031-FE0F-20E3", "j": ["keycap"]}, "keycap-2": {"a": "keycap: 2", "b": "0032-FE0F-20E3", "j": ["keycap"]}, "keycap-3": {"a": "keycap: 3", "b": "0033-FE0F-20E3", "j": ["keycap"]}, "keycap-4": {"a": "keycap: 4", "b": "0034-FE0F-20E3", "j": ["keycap"]}, "keycap-5": {"a": "keycap: 5", "b": "0035-FE0F-20E3", "j": ["keycap"]}, "keycap-6": {"a": "keycap: 6", "b": "0036-FE0F-20E3", "j": ["keycap"]}, "keycap-7": {"a": "keycap: 7", "b": "0037-FE0F-20E3", "j": ["keycap"]}, "keycap-8": {"a": "keycap: 8", "b": "0038-FE0F-20E3", "j": ["keycap"]}, "keycap-9": {"a": "keycap: 9", "b": "0039-FE0F-20E3", "j": ["keycap"]}, "keycap-10": {"a": "keycap: 10", "b": "1F51F", "j": ["keycap"]}, "input-latin-uppercase": {"a": "input latin uppercase", "b": "1F520", "j": ["ABCD", "input", "latin", "letters", "uppercase"]}, "input-latin-lowercase": {"a": "input latin lowercase", "b": "1F521", "j": ["abcd", "input", "latin", "letters", "lowercase"]}, "input-numbers": {"a": "input numbers", "b": "1F522", "j": ["1234", "input", "numbers"]}, "input-symbols": {"a": "input symbols", "b": "1F523", "j": ["〒♪&%", "input", "input symbols"]}, "input-latin-letters": {"a": "input latin letters", "b": "1F524", "j": ["abc", "alphabet", "input", "latin", "letters"]}, "a-button-blood-type": {"a": "A button (blood type)", "b": "1F170", "j": ["a", "A button (blood type)", "blood type"]}, "ab-button-blood-type": {"a": "AB button (blood type)", "b": "1F18E", "j": ["ab", "AB button (blood type)", "blood type"]}, "b-button-blood-type": {"a": "B button (blood type)", "b": "1F171", "j": ["b", "B button (blood type)", "blood type"]}, "cl-button": {"a": "CL button", "b": "1F191", "j": ["cl", "CL button"]}, "cool-button": {"a": "COOL button", "b": "1F192", "j": ["cool", "COOL button"]}, "free-button": {"a": "FREE button", "b": "1F193", "j": ["free", "FREE button"]}, "information": {"a": "information", "b": "2139", "j": ["i", "information"]}, "id-button": {"a": "ID button", "b": "1F194", "j": ["id", "ID button", "identity"]}, "circled-m": {"a": "circled M", "b": "24C2", "j": ["circle", "circled M", "m"]}, "new-button": {"a": "NEW button", "b": "1F195", "j": ["new", "NEW button"]}, "ng-button": {"a": "NG button", "b": "1F196", "j": ["ng", "NG button"]}, "o-button-blood-type": {"a": "O button (blood type)", "b": "1F17E", "j": ["blood type", "o", "O button (blood type)"]}, "ok-button": {"a": "OK button", "b": "1F197", "j": ["OK", "OK button"]}, "p-button": {"a": "P button", "b": "1F17F", "j": ["P button", "parking"]}, "sos-button": {"a": "SOS button", "b": "1F198", "j": ["help", "sos", "SOS button"]}, "up-button": {"a": "UP! button", "b": "1F199", "j": ["mark", "up", "UP! button"]}, "vs-button": {"a": "VS button", "b": "1F19A", "j": ["versus", "vs", "VS button"]}, "japanese-here-button": {"a": "Japanese “here” button", "b": "1F201", "j": ["“here”", "Japanese", "Japanese “here” button", "katakana", "ココ"]}, "japanese-service-charge-button": {"a": "Japanese “service charge” button", "b": "1F202", "j": ["“service charge”", "Japanese", "Japanese “service charge” button", "katakana", "サ"]}, "japanese-monthly-amount-button": {"a": "Japanese “monthly amount” button", "b": "1F237", "j": ["“monthly amount”", "ideograph", "Japanese", "Japanese “monthly amount” button", "月"]}, "japanese-not-free-of-charge-button": {"a": "Japanese “not free of charge” button", "b": "1F236", "j": ["“not free of charge”", "ideograph", "Japanese", "Japanese “not free of charge” button", "有"]}, "japanese-reserved-button": {"a": "Japanese “reserved” button", "b": "1F22F", "j": ["“reserved”", "ideograph", "Japanese", "Japanese “reserved” button", "指"]}, "japanese-bargain-button": {"a": "Japanese “bargain” button", "b": "1F250", "j": ["“bargain”", "ideograph", "Japanese", "Japanese “bargain” button", "得"]}, "japanese-discount-button": {"a": "Japanese “discount” button", "b": "1F239", "j": ["“discount”", "ideograph", "Japanese", "Japanese “discount” button", "割"]}, "japanese-free-of-charge-button": {"a": "Japanese “free of charge” button", "b": "1F21A", "j": ["“free of charge”", "ideograph", "Japanese", "Japanese “free of charge” button", "無"]}, "japanese-prohibited-button": {"a": "Japanese “prohibited” button", "b": "1F232", "j": ["“prohibited”", "ideograph", "Japanese", "Japanese “prohibited” button", "禁"]}, "japanese-acceptable-button": {"a": "Japanese “acceptable” button", "b": "1F251", "j": ["“acceptable”", "ideograph", "Japanese", "Japanese “acceptable” button", "可"]}, "japanese-application-button": {"a": "Japanese “application” button", "b": "1F238", "j": ["“application”", "ideograph", "Japanese", "Japanese “application” button", "申"]}, "japanese-passing-grade-button": {"a": "Japanese “passing grade” button", "b": "1F234", "j": ["“passing grade”", "ideograph", "Japanese", "Japanese “passing grade” button", "合"]}, "japanese-vacancy-button": {"a": "Japanese “vacancy” button", "b": "1F233", "j": ["“vacancy”", "ideograph", "Japanese", "Japanese “vacancy” button", "空"]}, "japanese-congratulations-button": {"a": "Japanese “congratulations” button", "b": "3297", "j": ["“congratulations”", "ideograph", "Japanese", "Japanese “congratulations” button", "祝"]}, "japanese-secret-button": {"a": "Japanese “secret” button", "b": "3299", "j": ["“secret”", "ideograph", "Japanese", "Japanese “secret” button", "秘"]}, "japanese-open-for-business-button": {"a": "Japanese “open for business” button", "b": "1F23A", "j": ["“open for business”", "ideograph", "Japanese", "Japanese “open for business” button", "営"]}, "japanese-no-vacancy-button": {"a": "Japanese “no vacancy” button", "b": "1F235", "j": ["“no vacancy”", "ideograph", "Japanese", "Japanese “no vacancy” button", "満"]}, "red-circle": {"a": "red circle", "b": "1F534", "j": ["circle", "geometric", "red"]}, "orange-circle": {"a": "orange circle", "b": "1F7E0", "j": ["circle", "orange"]}, "yellow-circle": {"a": "yellow circle", "b": "1F7E1", "j": ["circle", "yellow"]}, "green-circle": {"a": "green circle", "b": "1F7E2", "j": ["circle", "green"]}, "blue-circle": {"a": "blue circle", "b": "1F535", "j": ["blue", "circle", "geometric"]}, "purple-circle": {"a": "purple circle", "b": "1F7E3", "j": ["circle", "purple"]}, "brown-circle": {"a": "brown circle", "b": "1F7E4", "j": ["brown", "circle"]}, "black-circle": {"a": "black circle", "b": "26AB", "j": ["black circle", "circle", "geometric"]}, "white-circle": {"a": "white circle", "b": "26AA", "j": ["circle", "geometric", "white circle"]}, "red-square": {"a": "red square", "b": "1F7E5", "j": ["red", "square"]}, "orange-square": {"a": "orange square", "b": "1F7E7", "j": ["orange", "square"]}, "yellow-square": {"a": "yellow square", "b": "1F7E8", "j": ["square", "yellow"]}, "green-square": {"a": "green square", "b": "1F7E9", "j": ["green", "square"]}, "blue-square": {"a": "blue square", "b": "1F7E6", "j": ["blue", "square"]}, "purple-square": {"a": "purple square", "b": "1F7EA", "j": ["purple", "square"]}, "brown-square": {"a": "brown square", "b": "1F7EB", "j": ["brown", "square"]}, "black-large-square": {"a": "black large square", "b": "2B1B", "j": ["black large square", "geometric", "square"]}, "white-large-square": {"a": "white large square", "b": "2B1C", "j": ["geometric", "square", "white large square"]}, "black-medium-square": {"a": "black medium square", "b": "25FC", "j": ["black medium square", "geometric", "square"]}, "white-medium-square": {"a": "white medium square", "b": "25FB", "j": ["geometric", "square", "white medium square"]}, "black-mediumsmall-square": {"a": "black medium-small square", "b": "25FE", "j": ["black medium-small square", "geometric", "square"]}, "white-mediumsmall-square": {"a": "white medium-small square", "b": "25FD", "j": ["geometric", "square", "white medium-small square"]}, "black-small-square": {"a": "black small square", "b": "25AA", "j": ["black small square", "geometric", "square"]}, "white-small-square": {"a": "white small square", "b": "25AB", "j": ["geometric", "square", "white small square"]}, "large-orange-diamond": {"a": "large orange diamond", "b": "1F536", "j": ["diamond", "geometric", "large orange diamond", "orange"]}, "large-blue-diamond": {"a": "large blue diamond", "b": "1F537", "j": ["blue", "diamond", "geometric", "large blue diamond"]}, "small-orange-diamond": {"a": "small orange diamond", "b": "1F538", "j": ["diamond", "geometric", "orange", "small orange diamond"]}, "small-blue-diamond": {"a": "small blue diamond", "b": "1F539", "j": ["blue", "diamond", "geometric", "small blue diamond"]}, "red-triangle-pointed-up": {"a": "red triangle pointed up", "b": "1F53A", "j": ["geometric", "red", "red triangle pointed up"]}, "red-triangle-pointed-down": {"a": "red triangle pointed down", "b": "1F53B", "j": ["down", "geometric", "red", "red triangle pointed down"]}, "diamond-with-a-dot": {"a": "diamond with a dot", "b": "1F4A0", "j": ["comic", "diamond", "diamond with a dot", "geometric", "inside"]}, "radio-button": {"a": "radio button", "b": "1F518", "j": ["button", "geometric", "radio"]}, "white-square-button": {"a": "white square button", "b": "1F533", "j": ["button", "geometric", "outlined", "square", "white square button"]}, "black-square-button": {"a": "black square button", "b": "1F532", "j": ["black square button", "button", "geometric", "square"]}, "chequered-flag": {"a": "chequered flag", "b": "1F3C1", "j": ["checkered", "chequered", "chequered flag", "racing"]}, "triangular-flag": {"a": "triangular flag", "b": "1F6A9", "j": ["post", "triangular flag"]}, "crossed-flags": {"a": "crossed flags", "b": "1F38C", "j": ["celebration", "cross", "crossed", "crossed flags", "Japanese"]}, "black-flag": {"a": "black flag", "b": "1F3F4", "j": ["black flag", "waving"]}, "white-flag": {"a": "white flag", "b": "1F3F3", "j": ["waving", "white flag"]}, "rainbow-flag": {"a": "rainbow flag", "b": "1F3F3-FE0F-200D-1F308", "j": ["pride", "rainbow", "rainbow flag"]}, "transgender-flag": {"a": "transgender flag", "b": "1F3F3-FE0F-200D-26A7-FE0F", "j": ["flag", "light blue", "pink", "transgender", "white"]}, "pirate-flag": {"a": "pirate flag", "b": "1F3F4-200D-2620-FE0F", "j": ["Jolly Roger", "pirate", "pirate flag", "plunder", "treasure"]}, "flag-ascension-island": {"a": "flag: Ascension Island", "b": "1F1E6-1F1E8", "j": ["flag"]}, "flag-andorra": {"a": "flag: Andorra", "b": "1F1E6-1F1E9", "j": ["flag"]}, "flag-united-arab-emirates": {"a": "flag: United Arab Emirates", "b": "1F1E6-1F1EA", "j": ["flag"]}, "flag-afghanistan": {"a": "flag: Afghanistan", "b": "1F1E6-1F1EB", "j": ["flag"]}, "flag-antigua--barbuda": {"a": "flag: Antigua & Barbuda", "b": "1F1E6-1F1EC", "j": ["flag"]}, "flag-anguilla": {"a": "flag: Anguilla", "b": "1F1E6-1F1EE", "j": ["flag"]}, "flag-albania": {"a": "flag: Albania", "b": "1F1E6-1F1F1", "j": ["flag"]}, "flag-armenia": {"a": "flag: Armenia", "b": "1F1E6-1F1F2", "j": ["flag"]}, "flag-angola": {"a": "flag: Angola", "b": "1F1E6-1F1F4", "j": ["flag"]}, "flag-antarctica": {"a": "flag: Antarctica", "b": "1F1E6-1F1F6", "j": ["flag"]}, "flag-argentina": {"a": "flag: Argentina", "b": "1F1E6-1F1F7", "j": ["flag"]}, "flag-american-samoa": {"a": "flag: American Samoa", "b": "1F1E6-1F1F8", "j": ["flag"]}, "flag-austria": {"a": "flag: Austria", "b": "1F1E6-1F1F9", "j": ["flag"]}, "flag-australia": {"a": "flag: Australia", "b": "1F1E6-1F1FA", "j": ["flag"]}, "flag-aruba": {"a": "flag: Aruba", "b": "1F1E6-1F1FC", "j": ["flag"]}, "flag-land-islands": {"a": "flag: Åland Islands", "b": "1F1E6-1F1FD", "j": ["flag"]}, "flag-azerbaijan": {"a": "flag: Azerbaijan", "b": "1F1E6-1F1FF", "j": ["flag"]}, "flag-bosnia--herzegovina": {"a": "flag: Bosnia & Herzegovina", "b": "1F1E7-1F1E6", "j": ["flag"]}, "flag-barbados": {"a": "flag: Barbados", "b": "1F1E7-1F1E7", "j": ["flag"]}, "flag-bangladesh": {"a": "flag: Bangladesh", "b": "1F1E7-1F1E9", "j": ["flag"]}, "flag-belgium": {"a": "flag: Belgium", "b": "1F1E7-1F1EA", "j": ["flag"]}, "flag-burkina-faso": {"a": "flag: Burkina Faso", "b": "1F1E7-1F1EB", "j": ["flag"]}, "flag-bulgaria": {"a": "flag: Bulgaria", "b": "1F1E7-1F1EC", "j": ["flag"]}, "flag-bahrain": {"a": "flag: Bahrain", "b": "1F1E7-1F1ED", "j": ["flag"]}, "flag-burundi": {"a": "flag: Burundi", "b": "1F1E7-1F1EE", "j": ["flag"]}, "flag-benin": {"a": "flag: Benin", "b": "1F1E7-1F1EF", "j": ["flag"]}, "flag-st-barthlemy": {"a": "flag: St. Barthélemy", "b": "1F1E7-1F1F1", "j": ["flag"]}, "flag-bermuda": {"a": "flag: Bermuda", "b": "1F1E7-1F1F2", "j": ["flag"]}, "flag-brunei": {"a": "flag: Brunei", "b": "1F1E7-1F1F3", "j": ["flag"]}, "flag-bolivia": {"a": "flag: Bolivia", "b": "1F1E7-1F1F4", "j": ["flag"]}, "flag-caribbean-netherlands": {"a": "flag: Caribbean Netherlands", "b": "1F1E7-1F1F6", "j": ["flag"]}, "flag-brazil": {"a": "flag: Brazil", "b": "1F1E7-1F1F7", "j": ["flag"]}, "flag-bahamas": {"a": "flag: Bahamas", "b": "1F1E7-1F1F8", "j": ["flag"]}, "flag-bhutan": {"a": "flag: Bhutan", "b": "1F1E7-1F1F9", "j": ["flag"]}, "flag-bouvet-island": {"a": "flag: Bouvet Island", "b": "1F1E7-1F1FB", "j": ["flag"]}, "flag-botswana": {"a": "flag: Botswana", "b": "1F1E7-1F1FC", "j": ["flag"]}, "flag-belarus": {"a": "flag: Belarus", "b": "1F1E7-1F1FE", "j": ["flag"]}, "flag-belize": {"a": "flag: Belize", "b": "1F1E7-1F1FF", "j": ["flag"]}, "flag-canada": {"a": "flag: Canada", "b": "1F1E8-1F1E6", "j": ["flag"]}, "flag-cocos-keeling-islands": {"a": "flag: Cocos (Keeling) Islands", "b": "1F1E8-1F1E8", "j": ["flag"]}, "flag-congo--kinshasa": {"a": "flag: Congo - Kinshasa", "b": "1F1E8-1F1E9", "j": ["flag"]}, "flag-central-african-republic": {"a": "flag: Central African Republic", "b": "1F1E8-1F1EB", "j": ["flag"]}, "flag-congo--brazzaville": {"a": "flag: Congo - Brazzaville", "b": "1F1E8-1F1EC", "j": ["flag"]}, "flag-switzerland": {"a": "flag: Switzerland", "b": "1F1E8-1F1ED", "j": ["flag"]}, "flag-cte-divoire": {"a": "flag: Côte d’Ivoire", "b": "1F1E8-1F1EE", "j": ["flag"]}, "flag-cook-islands": {"a": "flag: Cook Islands", "b": "1F1E8-1F1F0", "j": ["flag"]}, "flag-chile": {"a": "flag: Chile", "b": "1F1E8-1F1F1", "j": ["flag"]}, "flag-cameroon": {"a": "flag: Cameroon", "b": "1F1E8-1F1F2", "j": ["flag"]}, "flag-china": {"a": "flag: China", "b": "1F1E8-1F1F3", "j": ["flag"]}, "flag-colombia": {"a": "flag: Colombia", "b": "1F1E8-1F1F4", "j": ["flag"]}, "flag-clipperton-island": {"a": "flag: Clipperton Island", "b": "1F1E8-1F1F5", "j": ["flag"]}, "flag-costa-rica": {"a": "flag: Costa Rica", "b": "1F1E8-1F1F7", "j": ["flag"]}, "flag-cuba": {"a": "flag: Cuba", "b": "1F1E8-1F1FA", "j": ["flag"]}, "flag-cape-verde": {"a": "flag: Cape Verde", "b": "1F1E8-1F1FB", "j": ["flag"]}, "flag-curaao": {"a": "flag: Curaçao", "b": "1F1E8-1F1FC", "j": ["flag"]}, "flag-christmas-island": {"a": "flag: Christmas Island", "b": "1F1E8-1F1FD", "j": ["flag"]}, "flag-cyprus": {"a": "flag: Cyprus", "b": "1F1E8-1F1FE", "j": ["flag"]}, "flag-czechia": {"a": "flag: Czechia", "b": "1F1E8-1F1FF", "j": ["flag"]}, "flag-germany": {"a": "flag: Germany", "b": "1F1E9-1F1EA", "j": ["flag"]}, "flag-diego-garcia": {"a": "flag: Diego Garcia", "b": "1F1E9-1F1EC", "j": ["flag"]}, "flag-djibouti": {"a": "flag: Djibouti", "b": "1F1E9-1F1EF", "j": ["flag"]}, "flag-denmark": {"a": "flag: Denmark", "b": "1F1E9-1F1F0", "j": ["flag"]}, "flag-dominica": {"a": "flag: Dominica", "b": "1F1E9-1F1F2", "j": ["flag"]}, "flag-dominican-republic": {"a": "flag: Dominican Republic", "b": "1F1E9-1F1F4", "j": ["flag"]}, "flag-algeria": {"a": "flag: Algeria", "b": "1F1E9-1F1FF", "j": ["flag"]}, "flag-ceuta--melilla": {"a": "flag: Ceuta & Melilla", "b": "1F1EA-1F1E6", "j": ["flag"]}, "flag-ecuador": {"a": "flag: Ecuador", "b": "1F1EA-1F1E8", "j": ["flag"]}, "flag-estonia": {"a": "flag: Estonia", "b": "1F1EA-1F1EA", "j": ["flag"]}, "flag-egypt": {"a": "flag: Egypt", "b": "1F1EA-1F1EC", "j": ["flag"]}, "flag-western-sahara": {"a": "flag: Western Sahara", "b": "1F1EA-1F1ED", "j": ["flag"]}, "flag-eritrea": {"a": "flag: Eritrea", "b": "1F1EA-1F1F7", "j": ["flag"]}, "flag-spain": {"a": "flag: Spain", "b": "1F1EA-1F1F8", "j": ["flag"]}, "flag-ethiopia": {"a": "flag: Ethiopia", "b": "1F1EA-1F1F9", "j": ["flag"]}, "flag-european-union": {"a": "flag: European Union", "b": "1F1EA-1F1FA", "j": ["flag"]}, "flag-finland": {"a": "flag: Finland", "b": "1F1EB-1F1EE", "j": ["flag"]}, "flag-fiji": {"a": "flag: Fiji", "b": "1F1EB-1F1EF", "j": ["flag"]}, "flag-falkland-islands": {"a": "flag: Falkland Islands", "b": "1F1EB-1F1F0", "j": ["flag"]}, "flag-micronesia": {"a": "flag: Micronesia", "b": "1F1EB-1F1F2", "j": ["flag"]}, "flag-faroe-islands": {"a": "flag: Faroe Islands", "b": "1F1EB-1F1F4", "j": ["flag"]}, "flag-france": {"a": "flag: France", "b": "1F1EB-1F1F7", "j": ["flag"]}, "flag-gabon": {"a": "flag: Gabon", "b": "1F1EC-1F1E6", "j": ["flag"]}, "flag-united-kingdom": {"a": "flag: United Kingdom", "b": "1F1EC-1F1E7", "j": ["flag"]}, "flag-grenada": {"a": "flag: Grenada", "b": "1F1EC-1F1E9", "j": ["flag"]}, "flag-georgia": {"a": "flag: Georgia", "b": "1F1EC-1F1EA", "j": ["flag"]}, "flag-french-guiana": {"a": "flag: French Guiana", "b": "1F1EC-1F1EB", "j": ["flag"]}, "flag-guernsey": {"a": "flag: Guernsey", "b": "1F1EC-1F1EC", "j": ["flag"]}, "flag-ghana": {"a": "flag: Ghana", "b": "1F1EC-1F1ED", "j": ["flag"]}, "flag-gibraltar": {"a": "flag: Gibraltar", "b": "1F1EC-1F1EE", "j": ["flag"]}, "flag-greenland": {"a": "flag: Greenland", "b": "1F1EC-1F1F1", "j": ["flag"]}, "flag-gambia": {"a": "flag: Gambia", "b": "1F1EC-1F1F2", "j": ["flag"]}, "flag-guinea": {"a": "flag: Guinea", "b": "1F1EC-1F1F3", "j": ["flag"]}, "flag-guadeloupe": {"a": "flag: Guadeloupe", "b": "1F1EC-1F1F5", "j": ["flag"]}, "flag-equatorial-guinea": {"a": "flag: Equatorial Guinea", "b": "1F1EC-1F1F6", "j": ["flag"]}, "flag-greece": {"a": "flag: Greece", "b": "1F1EC-1F1F7", "j": ["flag"]}, "flag-south-georgia--south-sandwich-islands": {"a": "flag: South Georgia & South Sandwich Islands", "b": "1F1EC-1F1F8", "j": ["flag"]}, "flag-guatemala": {"a": "flag: Guatemala", "b": "1F1EC-1F1F9", "j": ["flag"]}, "flag-guam": {"a": "flag: Guam", "b": "1F1EC-1F1FA", "j": ["flag"]}, "flag-guineabissau": {"a": "flag: Guinea-Bissau", "b": "1F1EC-1F1FC", "j": ["flag"]}, "flag-guyana": {"a": "flag: Guyana", "b": "1F1EC-1F1FE", "j": ["flag"]}, "flag-hong-kong-sar-china": {"a": "flag: Hong Kong SAR China", "b": "1F1ED-1F1F0", "j": ["flag"]}, "flag-heard--mcdonald-islands": {"a": "flag: Heard & McDonald Islands", "b": "1F1ED-1F1F2", "j": ["flag"]}, "flag-honduras": {"a": "flag: Honduras", "b": "1F1ED-1F1F3", "j": ["flag"]}, "flag-croatia": {"a": "flag: Croatia", "b": "1F1ED-1F1F7", "j": ["flag"]}, "flag-haiti": {"a": "flag: Haiti", "b": "1F1ED-1F1F9", "j": ["flag"]}, "flag-hungary": {"a": "flag: Hungary", "b": "1F1ED-1F1FA", "j": ["flag"]}, "flag-canary-islands": {"a": "flag: Canary Islands", "b": "1F1EE-1F1E8", "j": ["flag"]}, "flag-indonesia": {"a": "flag: Indonesia", "b": "1F1EE-1F1E9", "j": ["flag"]}, "flag-ireland": {"a": "flag: Ireland", "b": "1F1EE-1F1EA", "j": ["flag"]}, "flag-israel": {"a": "flag: Israel", "b": "1F1EE-1F1F1", "j": ["flag"]}, "flag-isle-of-man": {"a": "flag: Isle of Man", "b": "1F1EE-1F1F2", "j": ["flag"]}, "flag-india": {"a": "flag: India", "b": "1F1EE-1F1F3", "j": ["flag"]}, "flag-british-indian-ocean-territory": {"a": "flag: British Indian Ocean Territory", "b": "1F1EE-1F1F4", "j": ["flag"]}, "flag-iraq": {"a": "flag: Iraq", "b": "1F1EE-1F1F6", "j": ["flag"]}, "flag-iran": {"a": "flag: Iran", "b": "1F1EE-1F1F7", "j": ["flag"]}, "flag-iceland": {"a": "flag: Iceland", "b": "1F1EE-1F1F8", "j": ["flag"]}, "flag-italy": {"a": "flag: Italy", "b": "1F1EE-1F1F9", "j": ["flag"]}, "flag-jersey": {"a": "flag: Jersey", "b": "1F1EF-1F1EA", "j": ["flag"]}, "flag-jamaica": {"a": "flag: Jamaica", "b": "1F1EF-1F1F2", "j": ["flag"]}, "flag-jordan": {"a": "flag: Jordan", "b": "1F1EF-1F1F4", "j": ["flag"]}, "flag-japan": {"a": "flag: Japan", "b": "1F1EF-1F1F5", "j": ["flag"]}, "flag-kenya": {"a": "flag: Kenya", "b": "1F1F0-1F1EA", "j": ["flag"]}, "flag-kyrgyzstan": {"a": "flag: Kyrgyzstan", "b": "1F1F0-1F1EC", "j": ["flag"]}, "flag-cambodia": {"a": "flag: Cambodia", "b": "1F1F0-1F1ED", "j": ["flag"]}, "flag-kiribati": {"a": "flag: Kiribati", "b": "1F1F0-1F1EE", "j": ["flag"]}, "flag-comoros": {"a": "flag: Comoros", "b": "1F1F0-1F1F2", "j": ["flag"]}, "flag-st-kitts--nevis": {"a": "flag: St. Kitts & Nevis", "b": "1F1F0-1F1F3", "j": ["flag"]}, "flag-north-korea": {"a": "flag: North Korea", "b": "1F1F0-1F1F5", "j": ["flag"]}, "flag-south-korea": {"a": "flag: South Korea", "b": "1F1F0-1F1F7", "j": ["flag"]}, "flag-kuwait": {"a": "flag: Kuwait", "b": "1F1F0-1F1FC", "j": ["flag"]}, "flag-cayman-islands": {"a": "flag: Cayman Islands", "b": "1F1F0-1F1FE", "j": ["flag"]}, "flag-kazakhstan": {"a": "flag: Kazakhstan", "b": "1F1F0-1F1FF", "j": ["flag"]}, "flag-laos": {"a": "flag: Laos", "b": "1F1F1-1F1E6", "j": ["flag"]}, "flag-lebanon": {"a": "flag: Lebanon", "b": "1F1F1-1F1E7", "j": ["flag"]}, "flag-st-lucia": {"a": "flag: St. Lucia", "b": "1F1F1-1F1E8", "j": ["flag"]}, "flag-liechtenstein": {"a": "flag: Liechtenstein", "b": "1F1F1-1F1EE", "j": ["flag"]}, "flag-sri-lanka": {"a": "flag: Sri Lanka", "b": "1F1F1-1F1F0", "j": ["flag"]}, "flag-liberia": {"a": "flag: Liberia", "b": "1F1F1-1F1F7", "j": ["flag"]}, "flag-lesotho": {"a": "flag: Lesotho", "b": "1F1F1-1F1F8", "j": ["flag"]}, "flag-lithuania": {"a": "flag: Lithuania", "b": "1F1F1-1F1F9", "j": ["flag"]}, "flag-luxembourg": {"a": "flag: Luxembourg", "b": "1F1F1-1F1FA", "j": ["flag"]}, "flag-latvia": {"a": "flag: Latvia", "b": "1F1F1-1F1FB", "j": ["flag"]}, "flag-libya": {"a": "flag: Libya", "b": "1F1F1-1F1FE", "j": ["flag"]}, "flag-morocco": {"a": "flag: Morocco", "b": "1F1F2-1F1E6", "j": ["flag"]}, "flag-monaco": {"a": "flag: Monaco", "b": "1F1F2-1F1E8", "j": ["flag"]}, "flag-moldova": {"a": "flag: Moldova", "b": "1F1F2-1F1E9", "j": ["flag"]}, "flag-montenegro": {"a": "flag: Montenegro", "b": "1F1F2-1F1EA", "j": ["flag"]}, "flag-st-martin": {"a": "flag: St. Martin", "b": "1F1F2-1F1EB", "j": ["flag"]}, "flag-madagascar": {"a": "flag: Madagascar", "b": "1F1F2-1F1EC", "j": ["flag"]}, "flag-marshall-islands": {"a": "flag: Marshall Islands", "b": "1F1F2-1F1ED", "j": ["flag"]}, "flag-north-macedonia": {"a": "flag: North Macedonia", "b": "1F1F2-1F1F0", "j": ["flag"]}, "flag-mali": {"a": "flag: Mali", "b": "1F1F2-1F1F1", "j": ["flag"]}, "flag-myanmar-burma": {"a": "flag: Myanmar (Burma)", "b": "1F1F2-1F1F2", "j": ["flag"]}, "flag-mongolia": {"a": "flag: Mongolia", "b": "1F1F2-1F1F3", "j": ["flag"]}, "flag-macao-sar-china": {"a": "flag: Macao SAR China", "b": "1F1F2-1F1F4", "j": ["flag"]}, "flag-northern-mariana-islands": {"a": "flag: Northern Mariana Islands", "b": "1F1F2-1F1F5", "j": ["flag"]}, "flag-martinique": {"a": "flag: Martinique", "b": "1F1F2-1F1F6", "j": ["flag"]}, "flag-mauritania": {"a": "flag: Mauritania", "b": "1F1F2-1F1F7", "j": ["flag"]}, "flag-montserrat": {"a": "flag: Montserrat", "b": "1F1F2-1F1F8", "j": ["flag"]}, "flag-malta": {"a": "flag: Malta", "b": "1F1F2-1F1F9", "j": ["flag"]}, "flag-mauritius": {"a": "flag: Mauritius", "b": "1F1F2-1F1FA", "j": ["flag"]}, "flag-maldives": {"a": "flag: Maldives", "b": "1F1F2-1F1FB", "j": ["flag"]}, "flag-malawi": {"a": "flag: Malawi", "b": "1F1F2-1F1FC", "j": ["flag"]}, "flag-mexico": {"a": "flag: Mexico", "b": "1F1F2-1F1FD", "j": ["flag"]}, "flag-malaysia": {"a": "flag: Malaysia", "b": "1F1F2-1F1FE", "j": ["flag"]}, "flag-mozambique": {"a": "flag: Mozambique", "b": "1F1F2-1F1FF", "j": ["flag"]}, "flag-namibia": {"a": "flag: Namibia", "b": "1F1F3-1F1E6", "j": ["flag"]}, "flag-new-caledonia": {"a": "flag: New Caledonia", "b": "1F1F3-1F1E8", "j": ["flag"]}, "flag-niger": {"a": "flag: Niger", "b": "1F1F3-1F1EA", "j": ["flag"]}, "flag-norfolk-island": {"a": "flag: Norfolk Island", "b": "1F1F3-1F1EB", "j": ["flag"]}, "flag-nigeria": {"a": "flag: Nigeria", "b": "1F1F3-1F1EC", "j": ["flag"]}, "flag-nicaragua": {"a": "flag: Nicaragua", "b": "1F1F3-1F1EE", "j": ["flag"]}, "flag-netherlands": {"a": "flag: Netherlands", "b": "1F1F3-1F1F1", "j": ["flag"]}, "flag-norway": {"a": "flag: Norway", "b": "1F1F3-1F1F4", "j": ["flag"]}, "flag-nepal": {"a": "flag: Nepal", "b": "1F1F3-1F1F5", "j": ["flag"]}, "flag-nauru": {"a": "flag: Nauru", "b": "1F1F3-1F1F7", "j": ["flag"]}, "flag-niue": {"a": "flag: Niue", "b": "1F1F3-1F1FA", "j": ["flag"]}, "flag-new-zealand": {"a": "flag: New Zealand", "b": "1F1F3-1F1FF", "j": ["flag"]}, "flag-oman": {"a": "flag: Oman", "b": "1F1F4-1F1F2", "j": ["flag"]}, "flag-panama": {"a": "flag: Panama", "b": "1F1F5-1F1E6", "j": ["flag"]}, "flag-peru": {"a": "flag: Peru", "b": "1F1F5-1F1EA", "j": ["flag"]}, "flag-french-polynesia": {"a": "flag: French Polynesia", "b": "1F1F5-1F1EB", "j": ["flag"]}, "flag-papua-new-guinea": {"a": "flag: Papua New Guinea", "b": "1F1F5-1F1EC", "j": ["flag"]}, "flag-philippines": {"a": "flag: Philippines", "b": "1F1F5-1F1ED", "j": ["flag"]}, "flag-pakistan": {"a": "flag: Pakistan", "b": "1F1F5-1F1F0", "j": ["flag"]}, "flag-poland": {"a": "flag: Poland", "b": "1F1F5-1F1F1", "j": ["flag"]}, "flag-st-pierre--miquelon": {"a": "flag: St. Pierre & Miquelon", "b": "1F1F5-1F1F2", "j": ["flag"]}, "flag-pitcairn-islands": {"a": "flag: Pitcairn Islands", "b": "1F1F5-1F1F3", "j": ["flag"]}, "flag-puerto-rico": {"a": "flag: Puerto Rico", "b": "1F1F5-1F1F7", "j": ["flag"]}, "flag-palestinian-territories": {"a": "flag: Palestinian Territories", "b": "1F1F5-1F1F8", "j": ["flag"]}, "flag-portugal": {"a": "flag: Portugal", "b": "1F1F5-1F1F9", "j": ["flag"]}, "flag-palau": {"a": "flag: Palau", "b": "1F1F5-1F1FC", "j": ["flag"]}, "flag-paraguay": {"a": "flag: Paraguay", "b": "1F1F5-1F1FE", "j": ["flag"]}, "flag-qatar": {"a": "flag: Qatar", "b": "1F1F6-1F1E6", "j": ["flag"]}, "flag-runion": {"a": "flag: Réunion", "b": "1F1F7-1F1EA", "j": ["flag"]}, "flag-romania": {"a": "flag: Romania", "b": "1F1F7-1F1F4", "j": ["flag"]}, "flag-serbia": {"a": "flag: Serbia", "b": "1F1F7-1F1F8", "j": ["flag"]}, "flag-russia": {"a": "flag: Russia", "b": "1F1F7-1F1FA", "j": ["flag"]}, "flag-rwanda": {"a": "flag: Rwanda", "b": "1F1F7-1F1FC", "j": ["flag"]}, "flag-saudi-arabia": {"a": "flag: Saudi Arabia", "b": "1F1F8-1F1E6", "j": ["flag"]}, "flag-solomon-islands": {"a": "flag: Solomon Islands", "b": "1F1F8-1F1E7", "j": ["flag"]}, "flag-seychelles": {"a": "flag: Seychelles", "b": "1F1F8-1F1E8", "j": ["flag"]}, "flag-sudan": {"a": "flag: Sudan", "b": "1F1F8-1F1E9", "j": ["flag"]}, "flag-sweden": {"a": "flag: Sweden", "b": "1F1F8-1F1EA", "j": ["flag"]}, "flag-singapore": {"a": "flag: Singapore", "b": "1F1F8-1F1EC", "j": ["flag"]}, "flag-st-helena": {"a": "flag: St. Helena", "b": "1F1F8-1F1ED", "j": ["flag"]}, "flag-slovenia": {"a": "flag: Slovenia", "b": "1F1F8-1F1EE", "j": ["flag"]}, "flag-svalbard--jan-mayen": {"a": "flag: Svalbard & Jan Mayen", "b": "1F1F8-1F1EF", "j": ["flag"]}, "flag-slovakia": {"a": "flag: Slovakia", "b": "1F1F8-1F1F0", "j": ["flag"]}, "flag-sierra-leone": {"a": "flag: Sierra Leone", "b": "1F1F8-1F1F1", "j": ["flag"]}, "flag-san-marino": {"a": "flag: San Marino", "b": "1F1F8-1F1F2", "j": ["flag"]}, "flag-senegal": {"a": "flag: Senegal", "b": "1F1F8-1F1F3", "j": ["flag"]}, "flag-somalia": {"a": "flag: Somalia", "b": "1F1F8-1F1F4", "j": ["flag"]}, "flag-suriname": {"a": "flag: Suriname", "b": "1F1F8-1F1F7", "j": ["flag"]}, "flag-south-sudan": {"a": "flag: South Sudan", "b": "1F1F8-1F1F8", "j": ["flag"]}, "flag-so-tom--prncipe": {"a": "flag: São Tomé & Príncipe", "b": "1F1F8-1F1F9", "j": ["flag"]}, "flag-el-salvador": {"a": "flag: El Salvador", "b": "1F1F8-1F1FB", "j": ["flag"]}, "flag-sint-maarten": {"a": "flag: Sint Maarten", "b": "1F1F8-1F1FD", "j": ["flag"]}, "flag-syria": {"a": "flag: Syria", "b": "1F1F8-1F1FE", "j": ["flag"]}, "flag-eswatini": {"a": "flag: Eswatini", "b": "1F1F8-1F1FF", "j": ["flag"]}, "flag-tristan-da-cunha": {"a": "flag: Tristan da Cunha", "b": "1F1F9-1F1E6", "j": ["flag"]}, "flag-turks--caicos-islands": {"a": "flag: Turks & Caicos Islands", "b": "1F1F9-1F1E8", "j": ["flag"]}, "flag-chad": {"a": "flag: Chad", "b": "1F1F9-1F1E9", "j": ["flag"]}, "flag-french-southern-territories": {"a": "flag: French Southern Territories", "b": "1F1F9-1F1EB", "j": ["flag"]}, "flag-togo": {"a": "flag: Togo", "b": "1F1F9-1F1EC", "j": ["flag"]}, "flag-thailand": {"a": "flag: Thailand", "b": "1F1F9-1F1ED", "j": ["flag"]}, "flag-tajikistan": {"a": "flag: Tajikistan", "b": "1F1F9-1F1EF", "j": ["flag"]}, "flag-tokelau": {"a": "flag: Tokelau", "b": "1F1F9-1F1F0", "j": ["flag"]}, "flag-timorleste": {"a": "flag: Timor-Leste", "b": "1F1F9-1F1F1", "j": ["flag"]}, "flag-turkmenistan": {"a": "flag: Turkmenistan", "b": "1F1F9-1F1F2", "j": ["flag"]}, "flag-tunisia": {"a": "flag: Tunisia", "b": "1F1F9-1F1F3", "j": ["flag"]}, "flag-tonga": {"a": "flag: Tonga", "b": "1F1F9-1F1F4", "j": ["flag"]}, "flag-turkey": {"a": "flag: Turkey", "b": "1F1F9-1F1F7", "j": ["flag"]}, "flag-trinidad--tobago": {"a": "flag: Trinidad & Tobago", "b": "1F1F9-1F1F9", "j": ["flag"]}, "flag-tuvalu": {"a": "flag: Tuvalu", "b": "1F1F9-1F1FB", "j": ["flag"]}, "flag-taiwan": {"a": "flag: Taiwan", "b": "1F1F9-1F1FC", "j": ["flag"]}, "flag-tanzania": {"a": "flag: Tanzania", "b": "1F1F9-1F1FF", "j": ["flag"]}, "flag-ukraine": {"a": "flag: Ukraine", "b": "1F1FA-1F1E6", "j": ["flag"]}, "flag-uganda": {"a": "flag: Uganda", "b": "1F1FA-1F1EC", "j": ["flag"]}, "flag-us-outlying-islands": {"a": "flag: U.S. Outlying Islands", "b": "1F1FA-1F1F2", "j": ["flag"]}, "flag-united-nations": {"a": "flag: United Nations", "b": "1F1FA-1F1F3", "j": ["flag"]}, "flag-united-states": {"a": "flag: United States", "b": "1F1FA-1F1F8", "j": ["flag"]}, "flag-uruguay": {"a": "flag: Uruguay", "b": "1F1FA-1F1FE", "j": ["flag"]}, "flag-uzbekistan": {"a": "flag: Uzbekistan", "b": "1F1FA-1F1FF", "j": ["flag"]}, "flag-vatican-city": {"a": "flag: Vatican City", "b": "1F1FB-1F1E6", "j": ["flag"]}, "flag-st-vincent--grenadines": {"a": "flag: St. Vincent & Grenadines", "b": "1F1FB-1F1E8", "j": ["flag"]}, "flag-venezuela": {"a": "flag: Venezuela", "b": "1F1FB-1F1EA", "j": ["flag"]}, "flag-british-virgin-islands": {"a": "flag: British Virgin Islands", "b": "1F1FB-1F1EC", "j": ["flag"]}, "flag-us-virgin-islands": {"a": "flag: U.S. Virgin Islands", "b": "1F1FB-1F1EE", "j": ["flag"]}, "flag-vietnam": {"a": "flag: Vietnam", "b": "1F1FB-1F1F3", "j": ["flag"]}, "flag-vanuatu": {"a": "flag: Vanuatu", "b": "1F1FB-1F1FA", "j": ["flag"]}, "flag-wallis--futuna": {"a": "flag: Wallis & Futuna", "b": "1F1FC-1F1EB", "j": ["flag"]}, "flag-samoa": {"a": "flag: Samoa", "b": "1F1FC-1F1F8", "j": ["flag"]}, "flag-kosovo": {"a": "flag: Kosovo", "b": "1F1FD-1F1F0", "j": ["flag"]}, "flag-yemen": {"a": "flag: Yemen", "b": "1F1FE-1F1EA", "j": ["flag"]}, "flag-mayotte": {"a": "flag: Mayotte", "b": "1F1FE-1F1F9", "j": ["flag"]}, "flag-south-africa": {"a": "flag: South Africa", "b": "1F1FF-1F1E6", "j": ["flag"]}, "flag-zambia": {"a": "flag: Zambia", "b": "1F1FF-1F1F2", "j": ["flag"]}, "flag-zimbabwe": {"a": "flag: Zimbabwe", "b": "1F1FF-1F1FC", "j": ["flag"]}, "flag-england": {"a": "flag: England", "b": "1F3F4-E0067-E0062-E0065-E006E-E0067-E007F", "j": ["flag"]}, "flag-scotland": {"a": "flag: Scotland", "b": "1F3F4-E0067-E0062-E0073-E0063-E0074-E007F", "j": ["flag"]}, "flag-wales": {"a": "flag: Wales", "b": "1F3F4-E0067-E0062-E0077-E006C-E0073-E007F", "j": ["flag"]}}, "aliases": {}}
\ No newline at end of file

From 863e199995717b6f2bb12333f2e5be93e54eb5b2 Mon Sep 17 00:00:00 2001
From: oogm <33765570+oogm@users.noreply.github.com>
Date: Mon, 15 Mar 2021 01:33:46 +0100
Subject: [PATCH 315/578] Update CHANGES.md to include the correct PR number

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c6f98124d1..36ea9f5cfd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -41,7 +41,7 @@ Improvements 🙌:
  - Sending is now queuing by room and not uniquely to the session
  - Improve Snackbar duration (#2929)
  - Improve sending message state (#2937)
- - Update reactions to Unicode 13.1 (#1481)
+ - Update reactions to Unicode 13.1 (#2998)
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)

From ed662d3adde15b5b8a3e06e3b5629748f3ea1e4e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Mar 2021 14:19:23 +0100
Subject: [PATCH 316/578] Fix double RR issue when optimizing init sync

---
 .../internal/session/room/timeline/DefaultTimeline.kt |  2 +-
 .../sdk/internal/session/sync/ReadReceiptHandler.kt   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 92877950eb..70d5f31042 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -199,7 +199,7 @@ internal class DefaultTimeline(
                 }
                 ?.let { readReceiptContent ->
                     realm.executeTransactionAsync {
-                        readReceiptHandler.handle(it, roomId, readReceiptContent, true)
+                        readReceiptHandler.handle(it, roomId, readReceiptContent, false)
                     }
                 }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index efa578f2b8..a4a48752bc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -56,9 +56,8 @@ internal class ReadReceiptHandler @Inject constructor(
     }
 
     fun handle(realm: Realm, roomId: String, content: ReadReceiptContent?, isInitialSync: Boolean) {
-        if (content == null) {
-            return
-        }
+        content ?: return
+
         try {
             handleReadReceiptContent(realm, roomId, content, isInitialSync)
         } catch (exception: Exception) {
@@ -94,9 +93,13 @@ internal class ReadReceiptHandler @Inject constructor(
         // First check if we have data from init sync to handle
         getContentFromInitSync(roomId)?.let {
             Timber.w("INIT_SYNC Insert during incremental sync RR for room $roomId")
-            initialSyncStrategy(realm, roomId, it)
+            doIncrementalSyncStrategy(realm, roomId, it)
         }
 
+        doIncrementalSyncStrategy(realm, roomId, content)
+    }
+
+    private fun doIncrementalSyncStrategy(realm: Realm, roomId: String, content: ReadReceiptContent) {
         for ((eventId, receiptDict) in content) {
             val userIdsDict = receiptDict[READ_KEY] ?: continue
             val readReceiptsSummary = ReadReceiptsSummaryEntity.where(realm, eventId).findFirst()

From c4aadfed337e37a920c69733fb8d107e4f00ec8a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Mar 2021 14:35:21 +0100
Subject: [PATCH 317/578] Better API and avoid copying Collection

---
 .../android/sdk/internal/crypto/MXOlmDevice.kt       |  2 +-
 .../crypto/algorithms/olm/MXOlmDecryption.kt         |  2 +-
 .../sdk/internal/crypto/store/IMXCryptoStore.kt      |  2 +-
 .../sdk/internal/crypto/store/db/RealmCryptoStore.kt | 12 ++++--------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index b1e91e8d50..b8f1a9abea 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -312,7 +312,7 @@ internal class MXOlmDevice @Inject constructor(
      * @param theirDeviceIdentityKey the Curve25519 identity key for the remote device.
      * @return a list of known session ids for the device.
      */
-    fun getSessionIds(theirDeviceIdentityKey: String): Set<String>? {
+    fun getSessionIds(theirDeviceIdentityKey: String): List<String>? {
         return store.getDeviceSessionIds(theirDeviceIdentityKey)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index 541f62de2c..082b86c9da 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -154,7 +154,7 @@ internal class MXOlmDecryption(
      * @return payload, if decrypted successfully.
      */
     private fun decryptMessage(message: JsonDict, theirDeviceIdentityKey: String): String? {
-        val sessionIds = olmDevice.getSessionIds(theirDeviceIdentityKey) ?: emptySet()
+        val sessionIds = olmDevice.getSessionIds(theirDeviceIdentityKey).orEmpty()
 
         val messageBody = message["body"] as? String ?: return null
         val messageType = when (val typeAsVoid = message["type"]) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
index 6f1487f80a..181bd94cc7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
@@ -259,7 +259,7 @@ internal interface IMXCryptoStore {
      * @param deviceKey the public key of the other device.
      * @return A set of sessionId, or null if device is not known
      */
-    fun getDeviceSessionIds(deviceKey: String): Set<String>?
+    fun getDeviceSessionIds(deviceKey: String): List<String>?
 
     /**
      * Retrieve an end-to-end session between the logged-in user and another
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index b9213ba758..9ae93d61eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -692,7 +692,7 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
-    override fun getDeviceSessionIds(deviceKey: String): MutableSet<String> {
+    override fun getDeviceSessionIds(deviceKey: String): List<String> {
         return doWithRealm(realmConfiguration) {
             it.where<OlmSessionEntity>()
                     .equalTo(OlmSessionEntityFields.DEVICE_KEY, deviceKey)
@@ -701,7 +701,6 @@ internal class RealmCryptoStore @Inject constructor(
                         sessionEntity.sessionId
                     }
         }
-                .toMutableSet()
     }
 
     override fun storeInboundGroupSessions(sessions: List<OlmInboundGroupSessionWrapper2>) {
@@ -801,7 +800,7 @@ internal class RealmCryptoStore @Inject constructor(
      * Note: the result will be only use to export all the keys and not to use the OlmInboundGroupSessionWrapper2,
      * so there is no need to use or update `inboundGroupSessionToRelease` for native memory management
      */
-    override fun getInboundGroupSessions(): MutableList<OlmInboundGroupSessionWrapper2> {
+    override fun getInboundGroupSessions(): List<OlmInboundGroupSessionWrapper2> {
         return doWithRealm(realmConfiguration) {
             it.where<OlmInboundGroupSessionEntity>()
                     .findAll()
@@ -809,7 +808,6 @@ internal class RealmCryptoStore @Inject constructor(
                         inboundGroupSessionEntity.getInboundGroupSession()
                     }
         }
-                .toMutableList()
     }
 
     override fun removeInboundGroupSession(sessionId: String, senderKey: String) {
@@ -964,7 +962,7 @@ internal class RealmCryptoStore @Inject constructor(
         }
     }
 
-    override fun getRoomsListBlacklistUnverifiedDevices(): MutableList<String> {
+    override fun getRoomsListBlacklistUnverifiedDevices(): List<String> {
         return doWithRealm(realmConfiguration) {
             it.where<CryptoRoomEntity>()
                     .equalTo(CryptoRoomEntityFields.BLACKLIST_UNVERIFIED_DEVICES, true)
@@ -973,10 +971,9 @@ internal class RealmCryptoStore @Inject constructor(
                         cryptoRoom.roomId
                     }
         }
-                .toMutableList()
     }
 
-    override fun getDeviceTrackingStatuses(): MutableMap<String, Int> {
+    override fun getDeviceTrackingStatuses(): Map<String, Int> {
         return doWithRealm(realmConfiguration) {
             it.where<UserEntity>()
                     .findAll()
@@ -987,7 +984,6 @@ internal class RealmCryptoStore @Inject constructor(
                         entry.value.deviceTrackingStatus
                     }
         }
-                .toMutableMap()
     }
 
     override fun saveDeviceTrackingStatuses(deviceTrackingStatuses: Map<String, Int>) {

From 71f2c507994bcf973a4dc1fa94da8d5c95d66bd4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Mar 2021 15:02:04 +0100
Subject: [PATCH 318/578] Do what the comment said

---
 .../android/sdk/internal/crypto/CryptoSessionInfoProvider.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
index e8a70615e1..5338e7e92f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoSessionInfoProvider.kt
@@ -38,7 +38,7 @@ internal class CryptoSessionInfoProvider @Inject constructor(
         val encryptionEvent = monarchy.fetchCopied { realm ->
             EventEntity.whereType(realm, roomId = roomId, type = EventType.STATE_ROOM_ENCRYPTION)
                     .contains(EventEntityFields.CONTENT, "\"algorithm\":\"$MXCRYPTO_ALGORITHM_MEGOLM\"")
-                    .isNotNull(EventEntityFields.STATE_KEY) // should be an empty key
+                    .isEmpty(EventEntityFields.STATE_KEY)
                     .findFirst()
         }
         return encryptionEvent != null

From 13cbfaf5e798e5d056b81a772cd64bb33cac9591 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Mar 2021 15:06:20 +0100
Subject: [PATCH 319/578] Do not load room members in e2e after init sync

---
 CHANGES.md                                    |  2 +-
 .../internal/crypto/DefaultCryptoService.kt   | 11 +----
 .../sdk/internal/crypto/DeviceListManager.kt  | 44 ++++++++++++-------
 .../room/membership/LoadRoomMembersTask.kt    |  8 ++++
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e4ff049550..1e72c8c38e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Do not load room members in e2e after init sync
 
 Bugfix 🐛:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 17d25736eb..2163b2a5e0 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -856,15 +856,8 @@ internal class DefaultCryptoService @Inject constructor(
             return
         }
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
-            val params = LoadRoomMembersTask.Params(roomId)
-            try {
-                loadRoomMembersTask.execute(params)
-            } catch (throwable: Throwable) {
-                Timber.e(throwable, "## CRYPTO | onRoomEncryptionEvent ERROR FAILED TO SETUP CRYPTO ")
-            } finally {
-                val userIds = getRoomUserIds(roomId)
-                setEncryptionInRoom(roomId, event.content?.get("algorithm")?.toString(), true, userIds)
-            }
+            val userIds = getRoomUserIds(roomId)
+            setEncryptionInRoom(roomId, event.content?.get("algorithm")?.toString(), true, userIds)
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index 42df6b354b..d9aa6d8db7 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.crypto
 
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
@@ -28,7 +29,6 @@ import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -39,8 +39,9 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
                                                      private val syncTokenStore: SyncTokenStore,
                                                      private val credentials: Credentials,
                                                      private val downloadKeysForUsersTask: DownloadKeysForUsersTask,
+                                                     private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
                                                      coroutineDispatchers: MatrixCoroutineDispatchers,
-                                                     taskExecutor: TaskExecutor) {
+                                                     private val taskExecutor: TaskExecutor) {
 
     interface UserDevicesUpdateListener {
         fun onUsersDeviceUpdate(userIds: List<String>)
@@ -75,8 +76,10 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
     // HS not ready for retry
     private val notReadyToRetryHS = mutableSetOf<String>()
 
+    private val cryptoCoroutineContext = coroutineDispatchers.crypto
+
     init {
-        taskExecutor.executorScope.launch(coroutineDispatchers.crypto) {
+        taskExecutor.executorScope.launch(cryptoCoroutineContext) {
             var isUpdated = false
             val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
             for ((userId, status) in deviceTrackingStatuses) {
@@ -123,28 +126,37 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
         }
     }
 
+    fun onRoomMembersLoadedFor(roomId: String) {
+        taskExecutor.executorScope.launch(cryptoCoroutineContext) {
+            if (cryptoSessionInfoProvider.isRoomEncrypted(roomId)) {
+                // It's OK to track also device for invited users
+                val userIds = cryptoSessionInfoProvider.getRoomUserIds(roomId, true)
+                startTrackingDeviceList(userIds)
+                refreshOutdatedDeviceLists()
+            }
+        }
+    }
+
     /**
      * Mark the cached device list for the given user outdated
      * flag the given user for device-list tracking, if they are not already.
      *
      * @param userIds the user ids list
      */
-    fun startTrackingDeviceList(userIds: List<String>?) {
-        if (null != userIds) {
-            var isUpdated = false
-            val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
+    fun startTrackingDeviceList(userIds: List<String>) {
+        var isUpdated = false
+        val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
 
-            for (userId in userIds) {
-                if (!deviceTrackingStatuses.containsKey(userId) || TRACKING_STATUS_NOT_TRACKED == deviceTrackingStatuses[userId]) {
-                    Timber.v("## CRYPTO | startTrackingDeviceList() : Now tracking device list for $userId")
-                    deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
-                    isUpdated = true
-                }
+        for (userId in userIds) {
+            if (!deviceTrackingStatuses.containsKey(userId) || TRACKING_STATUS_NOT_TRACKED == deviceTrackingStatuses[userId]) {
+                Timber.v("## CRYPTO | startTrackingDeviceList() : Now tracking device list for $userId")
+                deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
+                isUpdated = true
             }
+        }
 
-            if (isUpdated) {
-                cryptoStore.saveDeviceTrackingStatuses(deviceTrackingStatuses)
-            }
+        if (isUpdated) {
+            cryptoStore.saveDeviceTrackingStatuses(deviceTrackingStatuses)
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
index 97cfcdaa44..cc491d1cd9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
@@ -22,6 +22,8 @@ import io.realm.kotlin.createObject
 import kotlinx.coroutines.TimeoutCancellationException
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.internal.crypto.CryptoSessionInfoProvider
+import org.matrix.android.sdk.internal.crypto.DeviceListManager
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
 import org.matrix.android.sdk.internal.database.mapper.toEntity
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
@@ -57,6 +59,8 @@ internal class DefaultLoadRoomMembersTask @Inject constructor(
         private val syncTokenStore: SyncTokenStore,
         private val roomSummaryUpdater: RoomSummaryUpdater,
         private val roomMemberEventHandler: RoomMemberEventHandler,
+        private val cryptoSessionInfoProvider: CryptoSessionInfoProvider,
+        private val deviceListManager: DeviceListManager,
         private val globalErrorReceiver: GlobalErrorReceiver
 ) : LoadRoomMembersTask {
 
@@ -124,6 +128,10 @@ internal class DefaultLoadRoomMembersTask @Inject constructor(
             roomEntity.membersLoadStatus = RoomMembersLoadStatusType.LOADED
             roomSummaryUpdater.update(realm, roomId, updateMembers = true)
         }
+
+        if (cryptoSessionInfoProvider.isRoomEncrypted(roomId)) {
+            deviceListManager.onRoomMembersLoadedFor(roomId)
+        }
     }
 
     private fun getRoomMembersLoadStatus(roomId: String): RoomMembersLoadStatusType {

From 75ad6a640b015ed3f43dd3acafb96a17b35d05cd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Mar 2021 16:02:09 +0100
Subject: [PATCH 320/578] loglimit

---
 .../matrix/android/sdk/internal/crypto/DeviceListManager.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index d9aa6d8db7..01b4f5b0fc 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -29,6 +29,7 @@ import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.logLimit
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -319,7 +320,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
      * @param downloadUsers the user ids list
      */
     private suspend fun doKeyDownloadForUsers(downloadUsers: List<String>): MXUsersDevicesMap<CryptoDeviceInfo> {
-        Timber.v("## CRYPTO | doKeyDownloadForUsers() : doKeyDownloadForUsers $downloadUsers")
+        Timber.v("## CRYPTO | doKeyDownloadForUsers() : doKeyDownloadForUsers ${downloadUsers.logLimit()}")
         // get the user ids which did not already trigger a keys download
         val filteredUsers = downloadUsers.filter { MatrixPatterns.isUserId(it) }
         if (filteredUsers.isEmpty()) {

From 4302d50af93b9a11e48a30ca94a12bd8b5dd2651 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Mar 2021 16:09:08 +0100
Subject: [PATCH 321/578] We do not display shield in the room list anymore
 Room member are lazy loaded, so the shield may not be accurate anymore.

---
 .../app/features/home/room/list/RoomSummaryItemFactory.kt      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 988b3769c4..7d7ed1637f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -92,7 +92,8 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
         return RoomSummaryItem_()
                 .id(roomSummary.roomId)
                 .avatarRenderer(avatarRenderer)
-                .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
+                // We do not display shield in the room list anymore
+                // .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
                 .matrixItem(roomSummary.toMatrixItem())
                 .lastEventTime(latestEventTime)
                 .typingMessage(typingMessage)

From 4f3734f9328b0117e41487b4c690722ed305154e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Mar 2021 16:53:19 +0100
Subject: [PATCH 322/578] Ensure message are decrypted in the room list after a
 clear cache

---
 CHANGES.md                                                      | 2 +-
 .../sdk/internal/session/room/summary/RoomSummaryUpdater.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1e72c8c38e..8144e0a478 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  - Do not load room members in e2e after init sync
 
 Bugfix 🐛:
- -
+ - Ensure message are decrypted in the room list after a clear cache
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 4a89e1ccb4..cd1bb69612 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -131,8 +131,8 @@ internal class RoomSummaryUpdater @Inject constructor(
             // mmm i want to decrypt now or is it ok to do it async?
             tryOrNull {
                 eventDecryptor.decryptEvent(root.asDomain(), "")
-                // eventDecryptor.decryptEventAsync(root.asDomain(), "", NoOpMatrixCallback())
             }
+                    ?.let { root.setDecryptionResult(it) }
         }
 
         if (updateMembers) {

From e7c9fb987cbf8f23735d49c5e9b20848e157b5e3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 15 Mar 2021 18:08:33 +0100
Subject: [PATCH 323/578] Use AwaitTransaction (G's review)

---
 .../crypto/crosssigning/UpdateTrustWorker.kt     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
index a2a90c49cd..ad82c03913 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
@@ -33,6 +33,7 @@ import org.matrix.android.sdk.internal.crypto.store.db.model.CryptoMapper
 import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntity
 import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntity
 import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
+import org.matrix.android.sdk.internal.database.awaitTransaction
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
@@ -69,8 +70,10 @@ internal class UpdateTrustWorker(context: Context,
     // It breaks the crypto store contract, but we need to batch things :/
     @CryptoDatabase
     @Inject lateinit var cryptoRealmConfiguration: RealmConfiguration
+
     @SessionDatabase
     @Inject lateinit var sessionRealmConfiguration: RealmConfiguration
+
     @UserId
     @Inject lateinit var myUserId: String
     @Inject lateinit var crossSigningKeysMapper: CrossSigningKeysMapper
@@ -96,8 +99,8 @@ internal class UpdateTrustWorker(context: Context,
             Timber.d("## CrossSigning - Updating trust for users: ${userList.logLimit()}")
 
             Realm.getInstance(cryptoRealmConfiguration).use { cryptoRealm ->
-                Realm.getInstance(sessionRealmConfiguration).use { sessionRealm ->
-                    updateTrust(userList, cryptoRealm, sessionRealm)
+                Realm.getInstance(sessionRealmConfiguration).use {
+                    updateTrust(userList, cryptoRealm)
                 }
             }
         }
@@ -106,14 +109,13 @@ internal class UpdateTrustWorker(context: Context,
         return Result.success()
     }
 
-    private fun updateTrust(userListParam: List<String>,
-                            cRealm: Realm,
-                            sRealm: Realm) {
+    private suspend fun updateTrust(userListParam: List<String>,
+                                    cRealm: Realm) {
         var userList = userListParam
         var myCrossSigningInfo: MXCrossSigningInfo? = null
         // First we check that the users MSK are trusted by mine
         // After that we check the trust chain for each devices of each users
-        cRealm.executeTransaction { cryptoRealm ->
+        awaitTransaction(cryptoRealmConfiguration) { cryptoRealm ->
             // By mapping here to model, this object is not live
             // I should update it if needed
             myCrossSigningInfo = getCrossSigningInfo(cryptoRealm, myUserId)
@@ -203,7 +205,7 @@ internal class UpdateTrustWorker(context: Context,
         // We can now update room shields? in the session DB?
 
         Timber.d("## CrossSigning - Updating shields for impacted rooms...")
-        sRealm.executeTransaction { sessionRealm ->
+        awaitTransaction(sessionRealmConfiguration) { sessionRealm ->
             sessionRealm.where(RoomMemberSummaryEntity::class.java)
                     .`in`(RoomMemberSummaryEntityFields.USER_ID, userList.toTypedArray())
                     .distinct(RoomMemberSummaryEntityFields.ROOM_ID)

From dd2a7397a4620b791486596fcf6d8264826e2eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Mon, 15 Mar 2021 22:25:51 +0100
Subject: [PATCH 324/578] fix: make cross signing work with server names
 containing :

Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name
User ids on the other hand are not allowed to contain ':', even
historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids

Therefore we can use the first instance of ':' to split the user
localpart from the server name.
---
 CHANGES.md                                                      | 1 +
 .../org/matrix/android/sdk/internal/crypto/DeviceListManager.kt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index e4ff049550..d70e264cad 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -47,6 +47,7 @@ Bugfix 🐛:
  - Be robust if Event.type is missing (#2946)
  - Snappier message send status
  - Fix MainActivity display (#2927)
+ - Cross signing now works with servers with an explicit port in the servername
 
 Translations 🗣:
  - All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index 42df6b354b..92a08dfe60 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -104,7 +104,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
         if (':' in userId) {
             try {
                 synchronized(notReadyToRetryHS) {
-                    res = !notReadyToRetryHS.contains(userId.substringAfterLast(':'))
+                    res = !notReadyToRetryHS.contains(userId.substringAfter(':'))
                 }
             } catch (e: Exception) {
                 Timber.e(e, "## CRYPTO | canRetryKeysDownload() failed")

From e8bb3d81ed8f8b8f4b2bf73bf6c05c166b1303d3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 12:15:28 +0100
Subject: [PATCH 325/578] Ganfra's review: inject Moshi Moshi

---
 .../session/sync/RoomSyncEphemeralTemporaryStore.kt    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
index b9fd4e3d57..c6ff71cfcf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
@@ -17,9 +17,9 @@
 package org.matrix.android.sdk.internal.session.sync
 
 import com.squareup.moshi.JsonReader
+import com.squareup.moshi.Moshi
 import okio.buffer
 import okio.source
-import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.di.SessionFilesDirectory
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncEphemeral
 import org.matrix.android.sdk.internal.util.md5
@@ -35,12 +35,15 @@ internal interface RoomSyncEphemeralTemporaryStore {
 }
 
 internal class RoomSyncEphemeralTemporaryStoreFile @Inject constructor(
-        @SessionFilesDirectory fileDirectory: File
+        @SessionFilesDirectory fileDirectory: File,
+        moshi: Moshi
 ) : RoomSyncEphemeralTemporaryStore {
 
     private val workingDir = File(fileDirectory, "rr")
             .also { it.mkdirs() }
 
+    private val roomSyncEphemeralAdapter = moshi.adapter(RoomSyncEphemeral::class.java)
+
     /**
      * Write RoomSyncEphemeral to a file
      */
@@ -57,8 +60,7 @@ internal class RoomSyncEphemeralTemporaryStoreFile @Inject constructor(
                 .takeIf { it.exists() }
                 ?.inputStream()
                 ?.use { pos ->
-                    MoshiProvider.providesMoshi().adapter(RoomSyncEphemeral::class.java)
-                            .fromJson(JsonReader.of(pos.source().buffer()))
+                    roomSyncEphemeralAdapter.fromJson(JsonReader.of(pos.source().buffer()))
                 }
     }
 

From 5b94540f7656b698f54ef89877d18e695aef6f3d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Mar 2021 12:16:11 +0100
Subject: [PATCH 326/578] Quick Work around to remove stuck messages

---
 CHANGES.md                                    |  2 +-
 .../home/room/detail/RoomDetailAction.kt      |  2 +-
 .../home/room/detail/RoomDetailFragment.kt    | 20 +++++++------
 .../home/room/detail/RoomDetailViewModel.kt   |  4 +++
 .../timeline/action/EventSharedAction.kt      |  2 +-
 .../action/MessageActionsViewModel.kt         | 28 ++++++++++++++-----
 6 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e4ff049550..d123e3c732 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Bugfix 🐛:
- -
+ - Add option to cancel stuck messages at bottom of timeline see #516
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index ecbd0b0d30..72e614c18c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -58,7 +58,7 @@ sealed class RoomDetailAction : VectorViewModelAction {
 
     data class ResendMessage(val eventId: String) : RoomDetailAction()
     data class RemoveFailedEcho(val eventId: String) : RoomDetailAction()
-    data class CancelSend(val eventId: String) : RoomDetailAction()
+    data class CancelSend(val eventId: String, val force: Boolean) : RoomDetailAction()
 
     data class ReplyToOptions(val eventId: String, val optionIndex: Int, val optionValue: String) : RoomDetailAction()
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 1a487eb065..a80aeb65b0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1570,14 +1570,18 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun handleCancelSend(action: EventSharedAction.Cancel) {
-        AlertDialog.Builder(requireContext())
-                .setTitle(R.string.dialog_title_confirmation)
-                .setMessage(getString(R.string.event_status_cancel_sending_dialog_message))
-                .setNegativeButton(R.string.no, null)
-                .setPositiveButton(R.string.yes) { _, _ ->
-                    roomDetailViewModel.handle(RoomDetailAction.CancelSend(action.eventId))
-                }
-                .show()
+        if (action.force) {
+            roomDetailViewModel.handle(RoomDetailAction.CancelSend(action.eventId, true))
+        } else {
+            AlertDialog.Builder(requireContext())
+                    .setTitle(R.string.dialog_title_confirmation)
+                    .setMessage(getString(R.string.event_status_cancel_sending_dialog_message))
+                    .setNegativeButton(R.string.no, null)
+                    .setPositiveButton(R.string.yes) { _, _ ->
+                        roomDetailViewModel.handle(RoomDetailAction.CancelSend(action.eventId, false))
+                    }
+                    .show()
+        }
     }
 
     override fun onAvatarClicked(informationData: MessageInformationData) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 115b0b29dd..af3d5461ef 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -1208,6 +1208,10 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleCancel(action: RoomDetailAction.CancelSend) {
+        if (action.force) {
+            room.cancelSend(action.eventId)
+            return
+        }
         val targetEventId = action.eventId
         room.getTimeLineEvent(targetEventId)?.let {
             // State must be in one of the sending states
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
index c21d552409..d9ee7f3ccf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@@ -63,7 +63,7 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
     data class Redact(val eventId: String, val askForReason: Boolean) :
             EventSharedAction(R.string.message_action_item_redact, R.drawable.ic_delete, true)
 
-    data class Cancel(val eventId: String) :
+    data class Cancel(val eventId: String, val force: Boolean) :
             EventSharedAction(R.string.cancel, R.drawable.ic_close_round)
 
     data class ViewSource(val content: String) :
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index adf315a955..f748369061 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -250,6 +250,9 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                 timelineEvent.root.sendState == SendState.SYNCED -> {
                     addActionsForSyncedState(timelineEvent, actionPermissions, messageContent, msgType)
                 }
+                timelineEvent.root.sendState == SendState.SENT   -> {
+                    addActionsForSentNotSyncedState(timelineEvent, actionPermissions, messageContent, msgType)
+                }
             }
         }
     }
@@ -287,7 +290,24 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     private fun ArrayList<EventSharedAction>.addActionsForSendingState(timelineEvent: TimelineEvent) {
         // TODO is uploading attachment?
         if (canCancel(timelineEvent)) {
-            add(EventSharedAction.Cancel(timelineEvent.eventId))
+            add(EventSharedAction.Cancel(timelineEvent.eventId, false))
+        }
+    }
+
+    private fun ArrayList<EventSharedAction>.addActionsForSentNotSyncedState(timelineEvent: TimelineEvent,
+                                                                             actionPermissions: ActionPermissions,
+                                                                             messageContent: MessageContent?,
+                                                                             msgType: String?) {
+        if (timelineEvent.root.sendState == SendState.SENT) {
+            // If sent but not synced (synapse stuck at bottom bug)
+            // Still offer action to cancel (will only remove local echo)
+            timelineEvent.root.eventId?.let {
+                add(EventSharedAction.Cancel(it, true))
+            }
+
+            // TODO Can be redacted
+
+            // TODO sent by me or sufficient power level
         }
     }
 
@@ -337,12 +357,6 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
             if (canSave(msgType) && messageContent is MessageWithAttachmentContent) {
                 add(EventSharedAction.Save(timelineEvent.eventId, messageContent))
             }
-
-            if (timelineEvent.root.sendState == SendState.SENT) {
-                // TODO Can be redacted
-
-                // TODO sent by me or sufficient power level
-            }
         }
 
         if (vectorPreferences.developerMode()) {

From cb17fa60dcf916c460b2292af446e5c3c64d3426 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 13:28:36 +0100
Subject: [PATCH 327/578] Ganfra's review: delete files after the Realm
 transaction

---
 .../session/room/read/SetReadMarkersTask.kt   |  2 +-
 .../session/room/timeline/DefaultTimeline.kt  |  3 +-
 .../session/sync/ReadReceiptHandler.kt        | 44 +++++++++++++++----
 .../internal/session/sync/RoomSyncHandler.kt  | 33 +++++++++-----
 .../session/sync/RoomTypingUsersHandler.kt    |  1 +
 .../session/sync/SyncResponseHandler.kt       | 30 ++++++++-----
 .../SyncResponsePostTreatmentAggregator.kt    | 22 ++++++++++
 ...cResponsePostTreatmentAggregatorHandler.kt | 33 ++++++++++++++
 8 files changed, 133 insertions(+), 35 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index c7f962a699..54d2307dd4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -117,7 +117,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
             }
             if (readReceiptId != null) {
                 val readReceiptContent = ReadReceiptHandler.createContent(userId, readReceiptId)
-                readReceiptHandler.handle(realm, roomId, readReceiptContent, false)
+                readReceiptHandler.handle(realm, roomId, readReceiptContent, false, null)
             }
             if (shouldUpdateRoomSummary) {
                 val roomSummary = RoomSummaryEntity.where(realm, roomId).findFirst()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 70d5f31042..61f770b956 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -199,7 +199,8 @@ internal class DefaultTimeline(
                 }
                 ?.let { readReceiptContent ->
                     realm.executeTransactionAsync {
-                        readReceiptHandler.handle(it, roomId, readReceiptContent, false)
+                        readReceiptHandler.handle(it, roomId, readReceiptContent, false, null)
+                        readReceiptHandler.onContentFromInitSyncHandled(roomId)
                     }
                 }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index a4a48752bc..e5d9217db7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -55,21 +55,29 @@ internal class ReadReceiptHandler @Inject constructor(
         }
     }
 
-    fun handle(realm: Realm, roomId: String, content: ReadReceiptContent?, isInitialSync: Boolean) {
+    fun handle(realm: Realm,
+               roomId: String,
+               content: ReadReceiptContent?,
+               isInitialSync: Boolean,
+               aggregator: SyncResponsePostTreatmentAggregator?) {
         content ?: return
 
         try {
-            handleReadReceiptContent(realm, roomId, content, isInitialSync)
+            handleReadReceiptContent(realm, roomId, content, isInitialSync, aggregator)
         } catch (exception: Exception) {
             Timber.e("Fail to handle read receipt for room $roomId")
         }
     }
 
-    private fun handleReadReceiptContent(realm: Realm, roomId: String, content: ReadReceiptContent, isInitialSync: Boolean) {
+    private fun handleReadReceiptContent(realm: Realm,
+                                         roomId: String,
+                                         content: ReadReceiptContent,
+                                         isInitialSync: Boolean,
+                                         aggregator: SyncResponsePostTreatmentAggregator?) {
         if (isInitialSync) {
             initialSyncStrategy(realm, roomId, content)
         } else {
-            incrementalSyncStrategy(realm, roomId, content)
+            incrementalSyncStrategy(realm, roomId, content, aggregator)
         }
     }
 
@@ -89,11 +97,15 @@ internal class ReadReceiptHandler @Inject constructor(
         realm.insertOrUpdate(readReceiptSummaries)
     }
 
-    private fun incrementalSyncStrategy(realm: Realm, roomId: String, content: ReadReceiptContent) {
+    private fun incrementalSyncStrategy(realm: Realm,
+                                        roomId: String,
+                                        content: ReadReceiptContent,
+                                        aggregator: SyncResponsePostTreatmentAggregator?) {
         // First check if we have data from init sync to handle
         getContentFromInitSync(roomId)?.let {
             Timber.w("INIT_SYNC Insert during incremental sync RR for room $roomId")
             doIncrementalSyncStrategy(realm, roomId, it)
+            aggregator?.ephemeralFilesToDelete?.add(roomId)
         }
 
         doIncrementalSyncStrategy(realm, roomId, content)
@@ -124,11 +136,25 @@ internal class ReadReceiptHandler @Inject constructor(
     }
 
     fun getContentFromInitSync(roomId: String): ReadReceiptContent? {
+        val dataFromFile = roomSyncEphemeralTemporaryStore.read(roomId)
+
+        dataFromFile ?: return null
+
         @Suppress("UNCHECKED_CAST")
-        return roomSyncEphemeralTemporaryStore.read(roomId)
-                ?.also { roomSyncEphemeralTemporaryStore.delete(roomId) }
-                ?.events
-                ?.firstOrNull { it.type == EventType.RECEIPT }
+        val content = dataFromFile
+                .events
+                .firstOrNull { it.type == EventType.RECEIPT }
                 ?.content as? ReadReceiptContent
+
+        if (content == null) {
+            // We can delete the file now
+            roomSyncEphemeralTemporaryStore.delete(roomId)
+        }
+
+        return content
+    }
+
+    fun onContentFromInitSyncHandled(roomId: String) {
+        roomSyncEphemeralTemporaryStore.delete(roomId)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 99ffa80760..6c07d4d241 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -88,16 +88,21 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
     fun handle(realm: Realm,
                roomsSyncResponse: RoomsSyncResponse,
                isInitialSync: Boolean,
+               aggregator: SyncResponsePostTreatmentAggregator,
                reporter: ProgressReporter? = null) {
         Timber.v("Execute transaction from $this")
-        handleRoomSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), isInitialSync, reporter)
-        handleRoomSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), isInitialSync, reporter)
-        handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, reporter)
+        handleRoomSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), isInitialSync, aggregator, reporter)
+        handleRoomSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), isInitialSync, aggregator, reporter)
+        handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, aggregator,reporter)
     }
 
     // PRIVATE METHODS *****************************************************************************
 
-    private fun handleRoomSync(realm: Realm, handlingStrategy: HandlingStrategy, isInitialSync: Boolean, reporter: ProgressReporter?) {
+    private fun handleRoomSync(realm: Realm,
+                               handlingStrategy: HandlingStrategy,
+                               isInitialSync: Boolean,
+                               aggregator: SyncResponsePostTreatmentAggregator,
+                               reporter: ProgressReporter?) {
         val insertType = if (isInitialSync) {
             EventInsertType.INITIAL_SYNC
         } else {
@@ -107,12 +112,12 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         val rooms = when (handlingStrategy) {
             is HandlingStrategy.JOINED  -> {
                 if (isInitialSync && initialSyncStrategy is InitialSyncStrategy.Optimized) {
-                    insertJoinRoomsFromInitSync(realm, handlingStrategy, syncLocalTimeStampMillis, reporter)
+                    insertJoinRoomsFromInitSync(realm, handlingStrategy, syncLocalTimeStampMillis, aggregator, reporter)
                     // Rooms are already inserted, return an empty list
                     emptyList()
                 } else {
                     handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
-                        handleJoinedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis)
+                        handleJoinedRoom(realm, it.key, it.value, insertType, syncLocalTimeStampMillis, aggregator)
                     }
                 }
             }
@@ -133,6 +138,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
     private fun insertJoinRoomsFromInitSync(realm: Realm,
                                             handlingStrategy: HandlingStrategy.JOINED,
                                             syncLocalTimeStampMillis: Long,
+                                            aggregator: SyncResponsePostTreatmentAggregator,
                                             reporter: ProgressReporter?) {
         val maxSize = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
         val listSize = handlingStrategy.data.keys.size
@@ -154,7 +160,8 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                                 roomId = it,
                                                 roomSync = handlingStrategy.data[it] ?: error("Should not happen"),
                                                 insertType = EventInsertType.INITIAL_SYNC,
-                                                syncLocalTimestampMillis = syncLocalTimeStampMillis
+                                                syncLocalTimestampMillis = syncLocalTimeStampMillis,
+                                                aggregator
                                         )
                                     }
                             realm.insertOrUpdate(roomEntities)
@@ -164,7 +171,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         } else {
             // No need to split
             val rooms = handlingStrategy.data.mapWithProgress(reporter, InitSyncStep.ImportingAccountJoinedRooms, 0.6f) {
-                handleJoinedRoom(realm, it.key, it.value, EventInsertType.INITIAL_SYNC, syncLocalTimeStampMillis)
+                handleJoinedRoom(realm, it.key, it.value, EventInsertType.INITIAL_SYNC, syncLocalTimeStampMillis, aggregator)
             }
             realm.insertOrUpdate(rooms)
         }
@@ -174,14 +181,15 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                  roomId: String,
                                  roomSync: RoomSync,
                                  insertType: EventInsertType,
-                                 syncLocalTimestampMillis: Long): RoomEntity {
+                                 syncLocalTimestampMillis: Long,
+                                 aggregator: SyncResponsePostTreatmentAggregator): RoomEntity {
         Timber.v("Handle join sync for room $roomId")
 
         val ephemeralResult = (roomSync.ephemeral as? LazyRoomSyncEphemeral.Parsed)
                 ?._roomSyncEphemeral
                 ?.events
                 ?.takeIf { it.isNotEmpty() }
-                ?.let { handleEphemeral(realm, roomId, it, insertType == EventInsertType.INITIAL_SYNC) }
+                ?.let { handleEphemeral(realm, roomId, it, insertType == EventInsertType.INITIAL_SYNC, aggregator) }
 
         if (roomSync.accountData?.events?.isNotEmpty() == true) {
             handleRoomAccountDataEvents(realm, roomId, roomSync.accountData)
@@ -421,14 +429,15 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
     private fun handleEphemeral(realm: Realm,
                                 roomId: String,
                                 ephemeralEvents: List<Event>,
-                                isInitialSync: Boolean): EphemeralResult {
+                                isInitialSync: Boolean,
+                                aggregator: SyncResponsePostTreatmentAggregator): EphemeralResult {
         var result = EphemeralResult()
         for (event in ephemeralEvents) {
             when (event.type) {
                 EventType.RECEIPT -> {
                     @Suppress("UNCHECKED_CAST")
                     (event.content as? ReadReceiptContent)?.let { readReceiptContent ->
-                        readReceiptHandler.handle(realm, roomId, readReceiptContent, isInitialSync)
+                        readReceiptHandler.handle(realm, roomId, readReceiptContent, isInitialSync, aggregator)
                     }
                 }
                 EventType.TYPING  -> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
index f4f3e6ce43..b7851031ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
@@ -26,6 +26,7 @@ import javax.inject.Inject
 internal class RoomTypingUsersHandler @Inject constructor(@UserId private val userId: String,
                                                           private val typingUsersTracker: DefaultTypingUsersTracker) {
 
+    // TODO This could be handled outside of the Realm transaction. Use the new aggregator?
     fun handle(realm: Realm, roomId: String, ephemeralResult: RoomSyncHandler.EphemeralResult?) {
         val roomMemberHelper = RoomMemberHelper(realm, roomId)
         val typingIds = ephemeralResult?.typingUserIds?.filter { it != userId }.orEmpty()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index fab1369aff..98ef5290a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -41,17 +41,19 @@ import kotlin.system.measureTimeMillis
 
 private const val GET_GROUP_DATA_WORKER = "GET_GROUP_DATA_WORKER"
 
-internal class SyncResponseHandler @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
-                                                       @SessionId private val sessionId: String,
-                                                       private val workManagerProvider: WorkManagerProvider,
-                                                       private val roomSyncHandler: RoomSyncHandler,
-                                                       private val userAccountDataSyncHandler: UserAccountDataSyncHandler,
-                                                       private val groupSyncHandler: GroupSyncHandler,
-                                                       private val cryptoSyncHandler: CryptoSyncHandler,
-                                                       private val cryptoService: DefaultCryptoService,
-                                                       private val tokenStore: SyncTokenStore,
-                                                       private val processEventForPushTask: ProcessEventForPushTask,
-                                                       private val pushRuleService: PushRuleService) {
+internal class SyncResponseHandler @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        @SessionId private val sessionId: String,
+        private val workManagerProvider: WorkManagerProvider,
+        private val roomSyncHandler: RoomSyncHandler,
+        private val userAccountDataSyncHandler: UserAccountDataSyncHandler,
+        private val groupSyncHandler: GroupSyncHandler,
+        private val cryptoSyncHandler: CryptoSyncHandler,
+        private val aggregatorHandler: SyncResponsePostTreatmentAggregatorHandler,
+        private val cryptoService: DefaultCryptoService,
+        private val tokenStore: SyncTokenStore,
+        private val processEventForPushTask: ProcessEventForPushTask,
+        private val pushRuleService: PushRuleService) {
 
     suspend fun handleResponse(syncResponse: SyncResponse,
                                fromToken: String?,
@@ -81,13 +83,14 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
         }.also {
             Timber.v("Finish handling toDevice in $it ms")
         }
+        val aggregator = SyncResponsePostTreatmentAggregator()
         // Start one big transaction
         monarchy.awaitTransaction { realm ->
             measureTimeMillis {
                 Timber.v("Handle rooms")
                 reportSubtask(reporter, InitSyncStep.ImportingAccountRoom, 1, 0.7f) {
                     if (syncResponse.rooms != null) {
-                        roomSyncHandler.handle(realm, syncResponse.rooms, isInitialSync, reporter)
+                        roomSyncHandler.handle(realm, syncResponse.rooms, isInitialSync, aggregator,reporter)
                     }
                 }
             }.also {
@@ -115,7 +118,10 @@ internal class SyncResponseHandler @Inject constructor(@SessionDatabase private
             }
             tokenStore.saveToken(realm, syncResponse.nextBatch)
         }
+
         // Everything else we need to do outside the transaction
+        aggregatorHandler.handle(aggregator)
+
         syncResponse.rooms?.let {
             checkPushRules(it, isInitialSync)
             userAccountDataSyncHandler.synchronizeWithServerIfNeeded(it.invite)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
new file mode 100644
index 0000000000..ea10a32f3e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregator.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+internal class SyncResponsePostTreatmentAggregator {
+    // List of RoomId
+    val ephemeralFilesToDelete = mutableListOf<String>()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt
new file mode 100644
index 0000000000..8a3f115af5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+import javax.inject.Inject
+
+internal class SyncResponsePostTreatmentAggregatorHandler @Inject constructor(
+        private val ephemeralTemporaryStore: RoomSyncEphemeralTemporaryStore
+) {
+    fun handle(synResHaResponsePostTreatmentAggregator: SyncResponsePostTreatmentAggregator) {
+        cleanupEphemeralFiles(synResHaResponsePostTreatmentAggregator.ephemeralFilesToDelete)
+    }
+
+    private fun cleanupEphemeralFiles(ephemeralFilesToDelete: List<String>) {
+        ephemeralFilesToDelete.forEach {
+            ephemeralTemporaryStore.delete(it)
+        }
+    }
+}

From b93200f371990ee5f89b74a13643e11b26d60a70 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Mar 2021 14:31:37 +0100
Subject: [PATCH 328/578] unused params

---
 .../action/MessageActionsViewModel.kt         | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index f748369061..ac1c2258aa 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -251,7 +251,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                     addActionsForSyncedState(timelineEvent, actionPermissions, messageContent, msgType)
                 }
                 timelineEvent.root.sendState == SendState.SENT   -> {
-                    addActionsForSentNotSyncedState(timelineEvent, actionPermissions, messageContent, msgType)
+                    addActionsForSentNotSyncedState(timelineEvent)
                 }
             }
         }
@@ -294,21 +294,16 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
         }
     }
 
-    private fun ArrayList<EventSharedAction>.addActionsForSentNotSyncedState(timelineEvent: TimelineEvent,
-                                                                             actionPermissions: ActionPermissions,
-                                                                             messageContent: MessageContent?,
-                                                                             msgType: String?) {
-        if (timelineEvent.root.sendState == SendState.SENT) {
-            // If sent but not synced (synapse stuck at bottom bug)
-            // Still offer action to cancel (will only remove local echo)
-            timelineEvent.root.eventId?.let {
-                add(EventSharedAction.Cancel(it, true))
-            }
-
-            // TODO Can be redacted
-
-            // TODO sent by me or sufficient power level
+    private fun ArrayList<EventSharedAction>.addActionsForSentNotSyncedState(timelineEvent: TimelineEvent) {
+        // If sent but not synced (synapse stuck at bottom bug)
+        // Still offer action to cancel (will only remove local echo)
+        timelineEvent.root.eventId?.let {
+            add(EventSharedAction.Cancel(it, true))
         }
+
+        // TODO Can be redacted
+
+        // TODO sent by me or sufficient power level
     }
 
     private fun ArrayList<EventSharedAction>.addActionsForSyncedState(timelineEvent: TimelineEvent,

From a30660ed4389623bd2eb72f2342da21d2afad7ea Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 14:44:40 +0100
Subject: [PATCH 329/578] Cleanup

---
 .../matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt | 2 +-
 .../android/sdk/internal/session/sync/SyncResponseHandler.kt    | 2 +-
 .../session/sync/SyncResponsePostTreatmentAggregatorHandler.kt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 6c07d4d241..a96d55d028 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -93,7 +93,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         Timber.v("Execute transaction from $this")
         handleRoomSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), isInitialSync, aggregator, reporter)
         handleRoomSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), isInitialSync, aggregator, reporter)
-        handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, aggregator,reporter)
+        handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, aggregator, reporter)
     }
 
     // PRIVATE METHODS *****************************************************************************
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index 98ef5290a6..8e243c3443 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -90,7 +90,7 @@ internal class SyncResponseHandler @Inject constructor(
                 Timber.v("Handle rooms")
                 reportSubtask(reporter, InitSyncStep.ImportingAccountRoom, 1, 0.7f) {
                     if (syncResponse.rooms != null) {
-                        roomSyncHandler.handle(realm, syncResponse.rooms, isInitialSync, aggregator,reporter)
+                        roomSyncHandler.handle(realm, syncResponse.rooms, isInitialSync, aggregator, reporter)
                     }
                 }
             }.also {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt
index 8a3f115af5..12b77c706b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponsePostTreatmentAggregatorHandler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 641ce206c2b9e7cc324a1af37b300fbf3ac62a64 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 14:48:27 +0100
Subject: [PATCH 330/578] Move change to correct release version (#3001)

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0dc1a5d3c2..6799af2383 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Ensure message are decrypted in the room list after a clear cache
+ - Cross signing now works with servers with an explicit port in the servername
 
 Translations 🗣:
  -
@@ -48,7 +49,6 @@ Bugfix 🐛:
  - Be robust if Event.type is missing (#2946)
  - Snappier message send status
  - Fix MainActivity display (#2927)
- - Cross signing now works with servers with an explicit port in the servername
 
 Translations 🗣:
  - All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed.

From 9492887345ec1462cd8bcbdb09f655b532266e47 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 14:53:15 +0100
Subject: [PATCH 331/578] Restore call to clearUnavailableServersList() removed
 by mistake See
 https://github.com/vector-im/element-android/pull/3001#pullrequestreview-613195611

---
 .../android/sdk/internal/crypto/DeviceListManager.kt   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index b6e48322b7..e5f1c011f8 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -168,13 +168,17 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
      * @param left    the user ids list which left a room
      */
     fun handleDeviceListsChanges(changed: Collection<String>, left: Collection<String>) {
-        Timber.v("## CRYPTO: handleDeviceListsChanges changed:$changed / left:$left")
+        Timber.v("## CRYPTO: handleDeviceListsChanges changed: ${changed.logLimit()} / left: ${left.logLimit()}")
         var isUpdated = false
         val deviceTrackingStatuses = cryptoStore.getDeviceTrackingStatuses().toMutableMap()
 
+        if (changed.isNotEmpty() || left.isNotEmpty()) {
+            clearUnavailableServersList()
+        }
+
         for (userId in changed) {
             if (deviceTrackingStatuses.containsKey(userId)) {
-                Timber.v("## CRYPTO | invalidateUserDeviceList() : Marking device list outdated for $userId")
+                Timber.v("## CRYPTO | handleDeviceListsChanges() : Marking device list outdated for $userId")
                 deviceTrackingStatuses[userId] = TRACKING_STATUS_PENDING_DOWNLOAD
                 isUpdated = true
             }
@@ -182,7 +186,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
 
         for (userId in left) {
             if (deviceTrackingStatuses.containsKey(userId)) {
-                Timber.v("## CRYPTO | invalidateUserDeviceList() : No longer tracking device list for $userId")
+                Timber.v("## CRYPTO | handleDeviceListsChanges() : No longer tracking device list for $userId")
                 deviceTrackingStatuses[userId] = TRACKING_STATUS_NOT_TRACKED
                 isUpdated = true
             }

From a52d20eeff831170514e2311d3c00d9bfb0c4be8 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Mar 2021 15:26:06 +0100
Subject: [PATCH 332/578] Regression: Video will not play upon tap

---
 CHANGES.md                                                     | 1 +
 .../app/features/media/VectorAttachmentViewerActivity.kt       | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index aad7773511..8e70e8f78f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Add option to cancel stuck messages at bottom of timeline see #516
  - Ensure message are decrypted in the room list after a clear cache
+ - Regression: Video will not play upon tap, but only after swipe #2928
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index 158dbfdaae..c632a008ce 100644
--- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -29,7 +29,6 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
 import androidx.transition.Transition
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
@@ -132,7 +131,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
         if (savedInstanceState == null) {
             pager2.setCurrentItem(initialIndex, false)
             // The page change listener is not notified of the change...
-            lifecycleScope.launchWhenResumed {
+            pager2.post {
                 onSelectedPositionChanged(initialIndex)
             }
         }

From 51650fd8994d7ad9722153cf38a2004372237d49 Mon Sep 17 00:00:00 2001
From: oogm <ga84dom@mytum.de>
Date: Tue, 16 Mar 2021 16:23:06 +0100
Subject: [PATCH 333/578] Add script to pull emojis from Unicode.org as a file

---
 tools/import_emojis.py | 77 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 tools/import_emojis.py

diff --git a/tools/import_emojis.py b/tools/import_emojis.py
new file mode 100644
index 0000000000..bdbade0e2d
--- /dev/null
+++ b/tools/import_emojis.py
@@ -0,0 +1,77 @@
+import requests
+import json
+import re
+from bs4 import BeautifulSoup
+
+# Create skeleton of the final json file as a python dictionary:
+emoji_picker_datasource = {
+    "compressed": True,
+    "categories": [],
+    "emojis": {},
+    "aliases": {}
+}
+emoji_picker_datasource_categories = emoji_picker_datasource["categories"]
+emoji_picker_datasource_emojis = emoji_picker_datasource["emojis"]
+
+
+# Get official emoji list from unicode.org (Emoji List, v13.1 at time of writing)
+req = requests.get("https://unicode.org/emoji/charts/emoji-list.html")
+soup = BeautifulSoup(req.content, 'html.parser')
+
+# Navigate to table
+table = soup.body.table
+
+# Go over all rows
+for row in table.find_all('tr'):
+    # Add "bigheads"  rows to categories
+    if 'bighead' in next(row.children)['class']:
+        relevant_element = row.find('a')
+        category_id = relevant_element['name']
+        category_name = relevant_element.text
+        emoji_picker_datasource_categories.append({
+            "id": category_id,
+            "name": category_name,
+            "emojis": []
+        })
+
+    # Add information in "rchars" rows to the last encountered category and emojis
+    if row.find('td', class_='code'):
+        # Get columns
+        cols = row.find_all('td')
+        no_element = cols[0]
+        code_element = cols[1]
+        sample_element = cols[2]
+        cldr_element = cols[3]
+        keywords_element = cols[4]
+
+        # Extract information from columns
+        # Extract name and id
+        # => Remove spaces, colons and unicode-characters
+        emoji_name = cldr_element.text
+        emoji_id = cldr_element.text.lower()
+        emoji_id = re.sub(r'[^A-Za-z0-9 ]+', '', emoji_id, flags=re.UNICODE)  # Only keep alphanumeric, space characters
+        emoji_id = emoji_id.strip()  # Remove leading/trailing whitespaces
+        emoji_id = emoji_id.replace(' ', '-')
+
+        # Extract emoji unicode-codepoint
+        emoji_code_raw = code_element.text
+        emoji_code_list = emoji_code_raw.split(" ")
+        emoji_code_list = [e[2:] for e in emoji_code_list]
+        emoji_code = "-".join(emoji_code_list)
+
+        # Extract keywords
+        emoji_keywords = keywords_element.text.split(" | ")
+
+        # Add the emoji-id to the last entry in "categories"
+        emoji_picker_datasource_categories[-1]["emojis"].append(emoji_id)
+
+        # Add the emoji itself to the "emojis" dict
+        emoji_picker_datasource_emojis[emoji_id] = {
+                "a": emoji_name,
+                "b": emoji_code,
+                "j": emoji_keywords
+        }
+
+# Print result to file (overwrite previous), without escaping unicode characters
+with open("../vector/src/main/res/raw/emoji_picker_datasource.json", "w") as outfile:
+    json.dump(emoji_picker_datasource, outfile, ensure_ascii=False)

From 1bc431198eb97187a448b2d8ff8733204c78b14e Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 16 Mar 2021 20:09:42 +0100
Subject: [PATCH 334/578] Timeline: fix ripple on text item

---
 .../main/res/layout/item_timeline_event_text_message_stub.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
index 7bdd0dd1e3..42cf24d027 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:addStatesFromChildren="true"
     android:orientation="vertical">
 
     <TextView

From c9691b04ad864dc553249383f628c8d4b33be093 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 16 Mar 2021 16:44:55 +0100
Subject: [PATCH 335/578] Timeline: fix separators background

---
 .../main/res/layout/item_timeline_event_day_separator.xml | 8 +++-----
 vector/src/main/res/layout/item_timeline_read_marker.xml  | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index 74cc63e5be..ca9d84f698 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?riotx_background"
     android:padding="8dp">
 
     <View
@@ -12,16 +11,15 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:background="?riotx_header_panel_background" />
+        android:background="?riotx_list_bottom_sheet_divider_color" />
 
     <TextView
         android:id="@+id/itemDayTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="?riotx_background"
-        android:paddingStart="32dp"
-        android:paddingEnd="32dp"
+        android:background="?android:attr/windowBackground"
+        android:paddingHorizontal="24dp"
         android:textColor="?riotx_header_panel_text_secondary"
         android:textSize="15sp"
         tools:text="@tools:sample/date/day_of_week" />
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index e76ffa3d5c..e7471823f2 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -2,7 +2,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?riotx_background"
     android:padding="8dp">
 
     <View
@@ -17,10 +16,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="?riotx_background"
+        android:background="?android:attr/windowBackground"
         android:fontFamily="sans-serif-medium"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
+        android:paddingHorizontal="16dp"
         android:text="@string/timeline_unread_messages"
         android:textColor="@color/notification_accent_color"
         android:textSize="15sp" />

From 616a46294ce62c1896130a3898c36091cdf80db0 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 16 Mar 2021 20:14:20 +0100
Subject: [PATCH 336/578] Update CHANGES

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 98c7a0351a..1115f41142 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Bugfix 🐛:
  - Ensure message are decrypted in the room list after a clear cache
  - Regression: Video will not play upon tap, but only after swipe #2928
  - Cross signing now works with servers with an explicit port in the servername
+ - Timeline : Fix ripple effect on text item and fix background color of separators.
 
 Translations 🗣:
  -

From 2d64fe96c198cbab56df84c75387679336f31045 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 22:08:29 +0100
Subject: [PATCH 337/578] Prepare release 1.1.2

---
 CHANGES.md                                    | 28 ++-----------------
 .../android/en-US/changelogs/40101020.txt     |  2 ++
 2 files changed, 4 insertions(+), 26 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40101020.txt

diff --git a/CHANGES.md b/CHANGES.md
index 98c7a0351a..491b779582 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,6 @@
-Changes in Element 1.1.2 (2021-XX-XX)
+Changes in Element 1.1.2 (2021-03-16)
 ===================================================
 
-Features ✨:
- -
-
 Improvements 🙌:
  - Lazy storage of ReadReceipts
  - Do not load room members in e2e after init sync
@@ -14,27 +11,12 @@ Bugfix 🐛:
  - Regression: Video will not play upon tap, but only after swipe #2928
  - Cross signing now works with servers with an explicit port in the servername
 
-Translations 🗣:
- -
-
-SDK API changes ⚠️:
- -
-
-Build 🧱:
- -
-
-Test:
- -
-
 Other changes:
  - Change formatting on issue templates to proper headings.
 
-Changes in Element 1.1.1 (2021-XX-XX)
+Changes in Element 1.1.1 (2021-03-10)
 ===================================================
 
-Features ✨:
- -
-
 Improvements 🙌:
  - Allow non-HTTPS connections to homeservers on Tor (#2941)
  - Fetch homeserver type and version and display in a new setting screen and add info in rageshakes (#2831)
@@ -55,16 +37,10 @@ Bugfix 🐛:
 Translations 🗣:
  - All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed.
 
-SDK API changes ⚠️:
- -
-
 Build 🧱:
  - Update a lot of dependencies, with the help of dependabot.
  - Add a script to download and install APK from the CI
 
-Test:
- -
-
 Other changes:
  - Rework edition of event management
 
diff --git a/fastlane/metadata/android/en-US/changelogs/40101020.txt b/fastlane/metadata/android/en-US/changelogs/40101020.txt
new file mode 100644
index 0000000000..8146712593
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Main changes in this version: performance improvement and bug fixes!
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.2
\ No newline at end of file

From 5edf7ca5209e5baab6da717544cf883376912be0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 22:09:41 +0100
Subject: [PATCH 338/578] Version++

---
 CHANGES.md          | 27 +++++++++++++++++++++++++++
 vector/build.gradle |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 491b779582..69d793e479 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+Changes in Element 1.1.3 (2021-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ -
+
+Build 🧱:
+ -
+
+Test:
+ -
+
+Other changes:
+ -
+
 Changes in Element 1.1.2 (2021-03-16)
 ===================================================
 
diff --git a/vector/build.gradle b/vector/build.gradle
index deb3bdba26..0468c68614 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 1
-ext.versionPatch = 2
+ext.versionPatch = 3
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From f230830763a977a103c70a02e382ef51a6c797ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 07:07:15 +0000
Subject: [PATCH 339/578] Bump mockk-android from 1.10.6 to 1.11.0

Bumps [mockk-android](https://github.com/mockk/mockk) from 1.10.6 to 1.11.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.10.6...1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index c9918cceaf..8e0f1ff269 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -186,7 +186,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'org.amshove.kluent:kluent-android:1.61'
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
-    androidTestImplementation 'io.mockk:mockk-android:1.10.6'
+    androidTestImplementation 'io.mockk:mockk-android:1.11.0'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test

From 118ea4b0b2ff2f0d814943a1500b2e2cdecd7611 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 07:08:12 +0000
Subject: [PATCH 340/578] Bump mockk from 1.10.6 to 1.11.0

Bumps [mockk](https://github.com/mockk/mockk) from 1.10.6 to 1.11.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.10.6...1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index c9918cceaf..464dea8161 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -172,7 +172,7 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.5.1'
     //testImplementation 'org.robolectric:shadows-support-v4:3.0'
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
-    testImplementation 'io.mockk:mockk:1.10.6'
+    testImplementation 'io.mockk:mockk:1.11.0'
     testImplementation 'org.amshove.kluent:kluent-android:1.65'
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test

From 1d1f78a020fbdcaa775b521cf94c4bb6200a3741 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 17 Mar 2021 10:39:25 +0100
Subject: [PATCH 341/578] Timber.d instead of Timber.v

---
 .../internal/session/sync/InitialSyncStatusRepository.kt  | 2 +-
 .../android/sdk/internal/session/sync/RoomSyncHandler.kt  | 4 ++--
 .../matrix/android/sdk/internal/session/sync/SyncTask.kt  | 6 +++---
 .../parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt    | 4 ++--
 .../session/sync/parsing/InitialSyncResponseParser.kt     | 4 ++--
 .../java/org/matrix/android/sdk/internal/util/LogUtil.kt  | 8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
index 4b82ecc3e5..cf67bbd805 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStatusRepository.kt
@@ -65,7 +65,7 @@ internal class FileInitialSyncStatusRepository(directory: File) : InitialSyncSta
         val state = cache?.step ?: InitialSyncStatus.STEP_INIT
         return if (state >= InitialSyncStatus.STEP_DOWNLOADED
                 && System.currentTimeMillis() > (cache?.downloadedDate ?: 0) + INIT_SYNC_FILE_LIFETIME) {
-            Timber.v("INIT_SYNC downloaded file is outdated, download it again")
+            Timber.d("INIT_SYNC downloaded file is outdated, download it again")
             // The downloaded file is outdated
             setStep(InitialSyncStatus.STEP_INIT)
             InitialSyncStatus.STEP_INIT
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index a96d55d028..0f97d0cb39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -147,13 +147,13 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         if (numberOfChunks > 1) {
             reportSubtask(reporter, InitSyncStep.ImportingAccountJoinedRooms, numberOfChunks, 0.6f) {
                 val chunkSize = listSize / numberOfChunks
-                Timber.v("INIT_SYNC $listSize rooms to insert, split into $numberOfChunks sublists of $chunkSize items")
+                Timber.d("INIT_SYNC $listSize rooms to insert, split into $numberOfChunks sublists of $chunkSize items")
                 // I cannot find a better way to chunk a map, so chunk the keys and then create new maps
                 handlingStrategy.data.keys
                         .chunked(chunkSize)
                         .forEachIndexed { index, roomIds ->
                             val roomEntities = roomIds
-                                    .also { Timber.v("INIT_SYNC insert ${roomIds.size} rooms") }
+                                    .also { Timber.d("INIT_SYNC insert ${roomIds.size} rooms") }
                                     .map {
                                         handleJoinedRoom(
                                                 realm = realm,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index d47ca8fa68..8d8d69be1e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -101,7 +101,7 @@ internal class DefaultSyncTask @Inject constructor(
         val readTimeOut = (params.timeout + TIMEOUT_MARGIN).coerceAtLeast(TimeOutInterceptor.DEFAULT_LONG_TIMEOUT)
 
         if (isInitialSync) {
-            Timber.v("INIT_SYNC with filter: ${requestParams["filter"]}")
+            Timber.d("INIT_SYNC with filter: ${requestParams["filter"]}")
             val initSyncStrategy = initialSyncStrategy
             logDuration("INIT_SYNC strategy: $initSyncStrategy") {
                 if (initSyncStrategy is InitialSyncStrategy.Optimized) {
@@ -145,7 +145,7 @@ internal class DefaultSyncTask @Inject constructor(
         val workingFile = File(workingDir, "initSync.json")
         val status = initialSyncStatusRepository.getStep()
         if (workingFile.exists() && status >= InitialSyncStatus.STEP_DOWNLOADED) {
-            Timber.v("INIT_SYNC file is already here")
+            Timber.d("INIT_SYNC file is already here")
             reportSubtask(initialSyncProgressService, InitSyncStep.Downloading, 1, 0.3f) {
                 // Empty task
             }
@@ -204,7 +204,7 @@ internal class DefaultSyncTask @Inject constructor(
             // Log some stats
             val nbOfJoinedRooms = syncResponse.rooms?.join?.size ?: 0
             val nbOfJoinedRoomsInFile = syncResponse.rooms?.join?.values?.count { it.ephemeral is LazyRoomSyncEphemeral.Stored }
-            Timber.v("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile ephemeral stored into files")
+            Timber.d("INIT_SYNC $nbOfJoinedRooms rooms, $nbOfJoinedRoomsInFile ephemeral stored into files")
 
             logDuration("INIT_SYNC Database insertion") {
                 syncResponseHandler.handleResponse(syncResponse, null, initialSyncProgressService)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
index 22ac4f911d..940ea219fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/DefaultLazyRoomSyncEphemeralJsonAdapter.kt
@@ -57,12 +57,12 @@ internal class SplitLazyRoomSyncEphemeralJsonAdapter(
         }
         val limit = syncStrategy.minSizeToStoreInFile
         return if (json.length > limit) {
-            Timber.v("INIT_SYNC $path content length: ${json.length} copy to a file")
+            Timber.d("INIT_SYNC $path content length: ${json.length} copy to a file")
             // Copy the source to a file
             roomSyncEphemeralTemporaryStore.write(roomId, json)
             LazyRoomSyncEphemeral.Stored
         } else {
-            Timber.v("INIT_SYNC $path content length: ${json.length} parse it now")
+            Timber.d("INIT_SYNC $path content length: ${json.length} parse it now")
             val roomSync = delegate.fromJson(json) ?: return null
             LazyRoomSyncEphemeral.Parsed(roomSync)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
index bfa9974b77..0b44887aed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/parsing/InitialSyncResponseParser.kt
@@ -33,9 +33,9 @@ internal class InitialSyncResponseParser @Inject constructor(
 
     fun parse(syncStrategy: InitialSyncStrategy.Optimized, workingFile: File): SyncResponse {
         val syncResponseLength = workingFile.length().toInt()
-        Timber.v("INIT_SYNC Sync file size is $syncResponseLength bytes")
+        Timber.d("INIT_SYNC Sync file size is $syncResponseLength bytes")
         val shouldSplit = syncResponseLength >= syncStrategy.minSizeToSplit
-        Timber.v("INIT_SYNC should split in several files: $shouldSplit")
+        Timber.d("INIT_SYNC should split in several files: $shouldSplit")
         return getMoshi(syncStrategy, shouldSplit)
                 .adapter(SyncResponse::class.java)
                 .fromJson(workingFile.source().buffer())!!
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
index bfa723c160..4656856bf7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LogUtil.kt
@@ -33,13 +33,13 @@ internal fun <T> Collection<T>.logLimit(maxQuantity: Int = 5): String {
 
 internal suspend fun <T> logDuration(message: String,
                                      block: suspend () -> T): T {
-    Timber.v("$message -- BEGIN")
+    Timber.d("$message -- BEGIN")
     val start = System.currentTimeMillis()
     val result = logRamUsage(message) {
         block()
     }
     val duration = System.currentTimeMillis() - start
-    Timber.v("$message -- END duration: $duration ms")
+    Timber.d("$message -- END duration: $duration ms")
 
     return result
 }
@@ -50,12 +50,12 @@ internal suspend fun <T> logRamUsage(message: String, block: suspend () -> T): T
         runtime.gc()
         val freeMemoryInMb = runtime.freeMemory() / 1048576L
         val usedMemInMBStart = runtime.totalMemory() / 1048576L - freeMemoryInMb
-        Timber.v("$message -- BEGIN (free memory: $freeMemoryInMb MB)")
+        Timber.d("$message -- BEGIN (free memory: $freeMemoryInMb MB)")
         val result = block()
         runtime.gc()
         val usedMemInMBEnd = (runtime.totalMemory() - runtime.freeMemory()) / 1048576L
         val usedMemInMBDiff = usedMemInMBEnd - usedMemInMBStart
-        Timber.v("$message -- END RAM usage: $usedMemInMBDiff MB")
+        Timber.d("$message -- END RAM usage: $usedMemInMBDiff MB")
         result
     } else {
         block()

From e89e0724a092d99706f23f169004c776502896c9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 17 Mar 2021 11:04:17 +0100
Subject: [PATCH 342/578] limit log

---
 .../internal/crypto/crosssigning/DefaultCrossSigningService.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index 9b282f0a84..873c98bff7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -43,6 +43,7 @@ import org.matrix.android.sdk.internal.task.TaskThread
 import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.JsonCanonicalizer
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
+import org.matrix.android.sdk.internal.util.logLimit
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import org.matrix.olm.OlmPkSigning
 import org.matrix.olm.OlmUtility
@@ -750,7 +751,7 @@ internal class DefaultCrossSigningService @Inject constructor(
     }
 
     override fun onUsersDeviceUpdate(userIds: List<String>) {
-        Timber.d("## CrossSigning - onUsersDeviceUpdate for ${userIds.size} users: $userIds")
+        Timber.d("## CrossSigning - onUsersDeviceUpdate for users: ${userIds.logLimit()}")
         val workerParams = UpdateTrustWorker.Params(
                 sessionId = sessionId,
                 filename = updateTrustWorkerDataRepository.createParam(userIds)

From 174e938b5be404e25a68f1a748a67aa6c008f4e1 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 17 Mar 2021 11:44:22 +0100
Subject: [PATCH 343/578] Fix padding layout

---
 .../src/main/res/layout/item_timeline_event_day_separator.xml  | 3 ++-
 vector/src/main/res/layout/item_timeline_read_marker.xml       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/item_timeline_event_day_separator.xml b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
index ca9d84f698..a721864e5b 100644
--- a/vector/src/main/res/layout/item_timeline_event_day_separator.xml
+++ b/vector/src/main/res/layout/item_timeline_event_day_separator.xml
@@ -19,7 +19,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="?android:attr/windowBackground"
-        android:paddingHorizontal="24dp"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
         android:textColor="?riotx_header_panel_text_secondary"
         android:textSize="15sp"
         tools:text="@tools:sample/date/day_of_week" />
diff --git a/vector/src/main/res/layout/item_timeline_read_marker.xml b/vector/src/main/res/layout/item_timeline_read_marker.xml
index e7471823f2..5ce388c90b 100644
--- a/vector/src/main/res/layout/item_timeline_read_marker.xml
+++ b/vector/src/main/res/layout/item_timeline_read_marker.xml
@@ -18,7 +18,8 @@
         android:layout_gravity="center"
         android:background="?android:attr/windowBackground"
         android:fontFamily="sans-serif-medium"
-        android:paddingHorizontal="16dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:text="@string/timeline_unread_messages"
         android:textColor="@color/notification_accent_color"
         android:textSize="15sp" />

From 616d3c19883ef89d65b43f76ddf815a5919b7911 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 17 Mar 2021 12:42:28 +0100
Subject: [PATCH 344/578] Fix IllegalStateException in UpdateTrustWorker Also
 split into 2 methods

---
 .../crypto/crosssigning/UpdateTrustWorker.kt  | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
index ad82c03913..76b63b7798 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UpdateTrustWorker.kt
@@ -97,22 +97,17 @@ internal class UpdateTrustWorker(context: Context,
             // Unfortunately we don't have much info on what did exactly changed (is it the cross signing keys of that user,
             // or a new device?) So we check all again :/
             Timber.d("## CrossSigning - Updating trust for users: ${userList.logLimit()}")
-
-            Realm.getInstance(cryptoRealmConfiguration).use { cryptoRealm ->
-                Realm.getInstance(sessionRealmConfiguration).use {
-                    updateTrust(userList, cryptoRealm)
-                }
-            }
+            updateTrust(userList)
         }
 
         cleanup(params)
         return Result.success()
     }
 
-    private suspend fun updateTrust(userListParam: List<String>,
-                                    cRealm: Realm) {
+    private suspend fun updateTrust(userListParam: List<String>) {
         var userList = userListParam
         var myCrossSigningInfo: MXCrossSigningInfo? = null
+
         // First we check that the users MSK are trusted by mine
         // After that we check the trust chain for each devices of each users
         awaitTransaction(cryptoRealmConfiguration) { cryptoRealm ->
@@ -203,38 +198,43 @@ internal class UpdateTrustWorker(context: Context,
 
         // So Cross Signing keys trust is updated, device trust is updated
         // We can now update room shields? in the session DB?
+        updateTrustStep2(userList, myCrossSigningInfo)
+    }
 
+    private suspend fun updateTrustStep2(userList: List<String>, myCrossSigningInfo: MXCrossSigningInfo?) {
         Timber.d("## CrossSigning - Updating shields for impacted rooms...")
         awaitTransaction(sessionRealmConfiguration) { sessionRealm ->
-            sessionRealm.where(RoomMemberSummaryEntity::class.java)
-                    .`in`(RoomMemberSummaryEntityFields.USER_ID, userList.toTypedArray())
-                    .distinct(RoomMemberSummaryEntityFields.ROOM_ID)
-                    .findAll()
-                    .map { it.roomId }
-                    .also { Timber.d("## CrossSigning -  ... impacted rooms ${it.logLimit()}") }
-                    .forEach { roomId ->
-                        RoomSummaryEntity.where(sessionRealm, roomId)
-                                .equalTo(RoomSummaryEntityFields.IS_ENCRYPTED, true)
-                                .findFirst()
-                                ?.let { roomSummary ->
-                                    Timber.d("## CrossSigning - Check shield state for room $roomId")
-                                    val allActiveRoomMembers = RoomMemberHelper(sessionRealm, roomId).getActiveRoomMemberIds()
-                                    try {
-                                        val updatedTrust = computeRoomShield(
-                                                myCrossSigningInfo,
-                                                cRealm,
-                                                allActiveRoomMembers,
-                                                roomSummary
-                                        )
-                                        if (roomSummary.roomEncryptionTrustLevel != updatedTrust) {
-                                            Timber.d("## CrossSigning - Shield change detected for $roomId -> $updatedTrust")
-                                            roomSummary.roomEncryptionTrustLevel = updatedTrust
+            Realm.getInstance(cryptoRealmConfiguration).use { cryptoRealm ->
+                sessionRealm.where(RoomMemberSummaryEntity::class.java)
+                        .`in`(RoomMemberSummaryEntityFields.USER_ID, userList.toTypedArray())
+                        .distinct(RoomMemberSummaryEntityFields.ROOM_ID)
+                        .findAll()
+                        .map { it.roomId }
+                        .also { Timber.d("## CrossSigning -  ... impacted rooms ${it.logLimit()}") }
+                        .forEach { roomId ->
+                            RoomSummaryEntity.where(sessionRealm, roomId)
+                                    .equalTo(RoomSummaryEntityFields.IS_ENCRYPTED, true)
+                                    .findFirst()
+                                    ?.let { roomSummary ->
+                                        Timber.d("## CrossSigning - Check shield state for room $roomId")
+                                        val allActiveRoomMembers = RoomMemberHelper(sessionRealm, roomId).getActiveRoomMemberIds()
+                                        try {
+                                            val updatedTrust = computeRoomShield(
+                                                    myCrossSigningInfo,
+                                                    cryptoRealm,
+                                                    allActiveRoomMembers,
+                                                    roomSummary
+                                            )
+                                            if (roomSummary.roomEncryptionTrustLevel != updatedTrust) {
+                                                Timber.d("## CrossSigning - Shield change detected for $roomId -> $updatedTrust")
+                                                roomSummary.roomEncryptionTrustLevel = updatedTrust
+                                            }
+                                        } catch (failure: Throwable) {
+                                            Timber.e(failure)
                                         }
-                                    } catch (failure: Throwable) {
-                                        Timber.e(failure)
                                     }
-                                }
-                    }
+                        }
+            }
         }
     }
 

From a4f6fe0cd2115dc54e46cb26fbd30d21231c1454 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 17 Mar 2021 12:43:05 +0100
Subject: [PATCH 345/578] Cleanup

---
 .../internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
index 8e6143f301..9e73985592 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
@@ -45,7 +45,7 @@ internal class CrossSigningKeysMapper @Inject constructor(moshi: Moshi) {
         return CryptoCrossSigningKey(
                 userId = userId ?: "",
                 keys = mapOf("ed25519:$pubKey" to pubKey),
-                usages = keyInfo.usages.map { it },
+                usages = keyInfo.usages.toList(),
                 signatures = deserializeSignatures(keyInfo.signatures),
                 trustLevel = keyInfo.trustLevelEntity?.let {
                     DeviceTrustLevel(

From 192fc6fd9434ca695b05ede0fc6a273c9034ef96 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 17 Mar 2021 14:54:15 +0100
Subject: [PATCH 346/578] Use minimum delay accepted by the Work library. The
 current value is 10_000 and smaller value will be ignored. It will remove the
 warning "W/WM-WorkSpec: Backoff delay duration less than minimum value"

---
 .../android/sdk/internal/crypto/GossipingWorkManager.kt       | 2 +-
 .../crypto/crosssigning/DefaultCrossSigningService.kt         | 2 +-
 .../crypto/verification/VerificationTransportRoomMessage.kt   | 4 ++--
 .../org/matrix/android/sdk/internal/di/WorkManagerProvider.kt | 4 +++-
 .../sdk/internal/session/pushers/DefaultPushersService.kt     | 2 +-
 .../sdk/internal/session/room/send/DefaultSendService.kt      | 4 ++--
 .../session/room/timeline/TimelineSendEventWorkCommon.kt      | 3 +--
 .../android/sdk/internal/session/sync/job/SyncWorker.kt       | 4 ++--
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
index c9451aa002..0013c31eea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
@@ -39,7 +39,7 @@ internal class GossipingWorkManager @Inject constructor(
                 .setConstraints(WorkManagerProvider.workConstraints)
                 .startChain(startChain)
                 .setInputData(data)
-                .setBackoffCriteria(BackoffPolicy.LINEAR, 10_000L, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                 .build()
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index 873c98bff7..0289fadbd8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -760,7 +760,7 @@ internal class DefaultCrossSigningService @Inject constructor(
 
         val workRequest = workManagerProvider.matrixOneTimeWorkRequestBuilder<UpdateTrustWorker>()
                 .setInputData(workerData)
-                .setBackoffCriteria(BackoffPolicy.LINEAR, 2_000L, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                 .build()
 
         workManagerProvider.workManager
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index ad490bcd27..bcf3250ed2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -183,7 +183,7 @@ internal class VerificationTransportRoomMessage(
         val workRequest = workManagerProvider.matrixOneTimeWorkRequestBuilder<SendVerificationMessageWorker>()
                 .setConstraints(WorkManagerProvider.workConstraints)
                 .setInputData(workerParams)
-                .setBackoffCriteria(BackoffPolicy.LINEAR, 2_000L, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                 .build()
 
         workManagerProvider.workManager
@@ -280,7 +280,7 @@ internal class VerificationTransportRoomMessage(
         val workRequest = workManagerProvider.matrixOneTimeWorkRequestBuilder<SendVerificationMessageWorker>()
                 .setConstraints(WorkManagerProvider.workConstraints)
                 .setInputData(workerParams)
-                .setBackoffCriteria(BackoffPolicy.LINEAR, 2_000L, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                 .build()
         return workManagerProvider.workManager
                 .beginUniqueWork(uniqueQueueName(), ExistingWorkPolicy.APPEND_OR_REPLACE, workRequest)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
index 4c9d06f7a2..bafffdf852 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
@@ -23,6 +23,7 @@ import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
+import androidx.work.WorkRequest
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -69,6 +70,7 @@ internal class WorkManagerProvider @Inject constructor(
                 .setRequiredNetworkType(NetworkType.CONNECTED)
                 .build()
 
-        const val BACKOFF_DELAY = 10_000L
+        // Use min value, smaller value will be ignored
+        const val BACKOFF_DELAY_MILLIS = WorkRequest.MIN_BACKOFF_MILLIS
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index e239182b4a..d290bb1a03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -96,7 +96,7 @@ internal class DefaultPushersService @Inject constructor(
         val request = workManagerProvider.matrixOneTimeWorkRequestBuilder<AddHttpPusherWorker>()
                 .setConstraints(WorkManagerProvider.workConstraints)
                 .setInputData(WorkerParamsFactory.toData(params))
-                .setBackoffCriteria(BackoffPolicy.LINEAR, 10_000L, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                 .build()
         workManagerProvider.workManager.enqueue(request)
         return request.id
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index c5b8b42b3c..26a87557ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -318,7 +318,7 @@ internal class DefaultSendService @AssistedInject constructor(
                 .setConstraints(WorkManagerProvider.workConstraints)
                 .startChain(true)
                 .setInputData(uploadWorkData)
-                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                 .build()
     }
 
@@ -332,7 +332,7 @@ internal class DefaultSendService @AssistedInject constructor(
                 // .setConstraints(WorkManagerProvider.workConstraints)
                 .startChain(false)
                 .setInputData(workData)
-                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                 .build()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
index bfd4e22cc2..21b508d35a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
@@ -50,7 +50,7 @@ internal class TimelineSendEventWorkCommon @Inject constructor(
                 .setConstraints(WorkManagerProvider.workConstraints)
                 .startChain(startChain)
                 .setInputData(data)
-                .setBackoffCriteria(BackoffPolicy.LINEAR, BACKOFF_DELAY, TimeUnit.MILLISECONDS)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                 .build()
     }
 
@@ -60,6 +60,5 @@ internal class TimelineSendEventWorkCommon @Inject constructor(
 
     companion object {
         private const val SEND_WORK = "SEND_WORK"
-        private const val BACKOFF_DELAY = 10_000L
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index 211b643516..b81804feb5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -106,7 +106,7 @@ internal class SyncWorker(context: Context,
             val data = WorkerParamsFactory.toData(Params(sessionId, serverTimeout, 0L, false))
             val workRequest = workManagerProvider.matrixOneTimeWorkRequestBuilder<SyncWorker>()
                     .setConstraints(WorkManagerProvider.workConstraints)
-                    .setBackoffCriteria(BackoffPolicy.LINEAR, 1_000, TimeUnit.MILLISECONDS)
+                    .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                     .setInputData(data)
                     .build()
             workManagerProvider.workManager
@@ -118,7 +118,7 @@ internal class SyncWorker(context: Context,
             val workRequest = workManagerProvider.matrixOneTimeWorkRequestBuilder<SyncWorker>()
                     .setConstraints(WorkManagerProvider.workConstraints)
                     .setInputData(data)
-                    .setBackoffCriteria(BackoffPolicy.LINEAR, 1_000, TimeUnit.MILLISECONDS)
+                    .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY_MILLIS, TimeUnit.MILLISECONDS)
                     .setInitialDelay(delayInSeconds, TimeUnit.SECONDS)
                     .build()
 

From 67ff43cecc5293a5a83784c6f712eec4a725c004 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 17 Mar 2021 15:04:39 +0100
Subject: [PATCH 347/578] Changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 69d793e479..9006236088 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Bugfix 🐛:
- -
+ - Fix regression in UpdateTrustWorker (introduced in 1.1.2)
 
 Translations 🗣:
  -

From 8e85d5515d133f8ab6b147d06e9dcebaabfeed8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 07:18:33 +0000
Subject: [PATCH 348/578] Bump libphonenumber from 8.12.19 to 8.12.20

Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.19 to 8.12.20.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.19...v8.12.20)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index c9918cceaf..17d8fe59a0 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -166,7 +166,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.19'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.20'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.5.1'
diff --git a/vector/build.gradle b/vector/build.gradle
index 0468c68614..10fae97106 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -342,7 +342,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.5.1'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.19'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.20'
 
     // rx
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'

From 7731c4a3bba5dd54a48d9920fbb5663f314d1079 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Wed, 17 Mar 2021 19:30:30 +0000
Subject: [PATCH 349/578] Translated using Weblate (German)

Currently translated at 99.9% (2361 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 197 +++++++++++-----------
 1 file changed, 100 insertions(+), 97 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 51fe3937fd..034f83e40d 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -161,7 +161,7 @@
     <string name="notice_widget_modified">%1$s hat das %2$s Widget modifiziert</string>
     <string name="notice_widget_modified_by_you">Du hast das %1$s Widget modifiziert</string>
     <string name="power_level_admin">Administrator</string>
-    <string name="power_level_moderator">Moderator:in</string>
+    <string name="power_level_moderator">Moderator</string>
     <string name="power_level_default">Standard</string>
     <string name="power_level_custom">Benutzerdefiniert (%1$d)</string>
     <string name="power_level_custom_no_value">Benutzerdefiniert</string>
@@ -352,8 +352,8 @@
     <string name="no_room_placeholder">Keine Räume</string>
     <string name="no_public_room_placeholder">Keine öffentl. Räume verfügbar</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">%d Benutzer/in</item>
-        <item quantity="other">%d Benutzer/innen</item>
+        <item quantity="one">%d Benutzer</item>
+        <item quantity="other">%d Benutzer</item>
     </plurals>
     <string name="send_bug_report_include_logs">Logdateien übermitteln</string>
     <string name="send_bug_report_include_crash_logs">Absturzberichte übermitteln</string>
@@ -494,8 +494,8 @@
     <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} benötigt die Berechtigung, auf Kamera und Mikrofon zu zugreifen, um Video-Anrufe durchzuführen.
 \n
 \nBitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.</string>
-    <string name="template_permissions_rationale_msg_contacts">${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer:innen anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.</string>
-    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer:innen anhand ihrer E-Mail-Adresse und Telefonnummer zu finden.
+    <string name="template_permissions_rationale_msg_contacts">${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer E-Mail-Adresse und Telefonnummer zu finden.
 \n
 \nStimmst du der Nutzung deines Adressbuchs zu diesem Zweck zu\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Entschuldige. Die Aktion wurde aufgrund fehlender Berechtigungen nicht ausgeführt</string>
@@ -540,22 +540,22 @@
     <string name="room_participants_action_remove">Aus diesem Raum entfernen</string>
     <string name="room_participants_action_ban">Verbannen</string>
     <string name="room_participants_action_unban">Verbannung aufheben</string>
-    <string name="room_participants_action_set_default_power_level">Zum/r normalen Benutzer/in herabstufen</string>
-    <string name="room_participants_action_set_moderator">Zum/r Moderator:in machen</string>
+    <string name="room_participants_action_set_default_power_level">Zum normalen Benutzer herabstufen</string>
+    <string name="room_participants_action_set_moderator">Zum Moderator machen</string>
     <string name="room_participants_action_set_admin">Zum Admin machen</string>
-    <string name="room_participants_action_ignore">Alle Nachrichten dieses/r Nutzers/in verbergen</string>
-    <string name="room_participants_action_unignore">Alle Nachrichten dieses/r Nutzers/in anzeigen</string>
+    <string name="room_participants_action_ignore">Alle Nachrichten dieses Nutzers verbergen</string>
+    <string name="room_participants_action_unignore">Alle Nachrichten dieses Nutzers anzeigen</string>
     <string name="room_participants_invite_search_another_user">Nutzer-ID, Name oder E-Mail-Adresse</string>
     <string name="room_participants_action_mention">Erwähnen</string>
     <string name="room_participants_action_devices_list">Sitzungsliste anzeigen</string>
-    <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da der/die Benutzer!n dasselbe Berechtigungslevel wie du erhalten wirst.
+    <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da der Benutzer dieselbe Berechtigungsstufe wie du erhalten wirst.
 \nBist du sicher\?</string>
     <string name="room_participants_invite_prompt_msg">"Bist du sicher, dass du %s in diesen Chat einladen willst?"</string>
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Mit ID einladen</u></string>
     <string name="people_search_local_contacts">LOKALE KONTAKTE (%d)</string>
     <string name="people_search_filter_text">Nur Matrix-Benutzer</string>
-    <string name="people_search_invite_by_id_dialog_title">Benutzer:in per ID einladen</string>
+    <string name="people_search_invite_by_id_dialog_title">Benutzer per ID einladen</string>
     <string name="people_search_invite_by_id_dialog_description">Bitte gib eine oder mehrere E-Mail-Adressen oder eine Matrix-ID ein</string>
     <string name="people_search_invite_by_id_dialog_hint">E-Mail or Matrix-ID</string>
     <!--  Chat -->
@@ -582,10 +582,10 @@
     <string name="ssl_fingerprint_hash">Fingerabdruck (%s):</string>
     <string name="ssl_could_not_verify">Konnte Identität des Remote-Servers nicht verifizieren.</string>
     <string name="ssl_cert_not_trust">Dies kann bedeuten, dass jemand böswillig deinen Internetverkehr abfängt oder dass dein Telefon dem Zertifikat, dass der Remote-Server anbietet, nicht vertraut.</string>
-    <string name="ssl_cert_new_account_expl">Wenn der/die Server-Administrator:in dir mitgeteilt hat, dass dies zu erwarten sei, stelle sicher, dass der Fingerabdruck unten mit dem von deinem/r Administrator:in bereitgestellten übereinstimmt.</string>
+    <string name="ssl_cert_new_account_expl">Wenn der Server-Administrator dir mitgeteilt hat, dass dies zu erwarten sei, stelle sicher, dass der Fingerabdruck unten mit dem von deinem Administrator bereitgestellten übereinstimmt.</string>
     <string name="ssl_unexpected_existing_expl">Das Zertifikat unterscheidet sich von dem Zertifikat, dem dein Gerät ursprünglich vertraut hat. Dies ist SEHR UNGEWÖHNLICH. Es wird empfohlen, dass du dieses neue Zertifikat NICHT AKZEPTIERST.</string>
     <string name="ssl_expected_existing_expl">Das Zertifikat hat sich von einem ursprünglich vertrauenswürdigem Zertifikat in ein nicht vertrauenswürdiges Zertifikat geändert. Eventuell wurde das Zertifikat des Servers erneuert. Bitte erkundige dich beim Server-Administrator, welcher Fingerprint als vertrauenswürdig gilt.</string>
-    <string name="ssl_only_accept">Akzeptiere das Zertifikat nur dann, wenn der/die Server-Administrator:in einen Fingerprint veröffentlicht hat, der mit dem obigen übereinstimmt.</string>
+    <string name="ssl_only_accept">Akzeptiere das Zertifikat nur dann, wenn der Server-Administrator einen Fingerprint veröffentlicht hat, der mit dem obigen übereinstimmt.</string>
     <!-- Room Details -->
     <string name="room_details_title">Raum-Details</string>
     <string name="room_details_people">Personen</string>
@@ -596,7 +596,7 @@
     <string name="room_details_people_present_group_name">TEILNEHMER</string>
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Grund für das Melden dieses Inhalts</string>
-    <string name="room_event_action_report_prompt_ignore_user">Möchtest du alle Nachrichten dieses/r Nutzers/in verbergen\?
+    <string name="room_event_action_report_prompt_ignore_user">Möchtest du alle Nachrichten dieses Nutzers verbergen\?
 \n
 \nBeachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string>
     <string name="room_event_action_cancel_upload">Upload abbrechen</string>
@@ -822,7 +822,7 @@
     <string name="encryption_information_block">Sperren</string>
     <string name="encryption_information_unblock">Zulassen</string>
     <string name="encryption_information_verify_device">Sitzung verifizieren</string>
-    <string name="encryption_information_verify_device_warning">Vergleiche die folgenden Zeichen mit den Einstellungen in der Sitzung des/der anderen Nutzer!n und bestätige:</string>
+    <string name="encryption_information_verify_device_warning">Vergleiche die folgenden Zeichen mit den Einstellungen in der Sitzung des anderen Nutzers und bestätige:</string>
     <string name="encryption_information_verify_device_warning2">Falls sie nicht übereinstimmen, wurde die Kommunikation vielleicht kompromittiert.</string>
     <string name="encryption_information_verify_key_match">Ich bestätige, dass die Schlüssel übereinstimmen</string>
     <!-- unknown devices management -->
@@ -923,13 +923,13 @@
     <string name="start_voice_call_prompt_msg">Sicher, dass du einen Sprachanruf starten möchtest\?</string>
     <string name="start_video_call_prompt_msg">Sicher, dass du einen Videoanruf starten möchtest\?</string>
     <string name="groups_list">Gruppenliste</string>
-    <string name="room_participants_ban_prompt_msg">Ein Bann führt zu einem Ausschluss eines/r Nutzers/in von diesem Raum und verhindert einen erneuten Beitritt.</string>
+    <string name="room_participants_ban_prompt_msg">Ein Bann führt zu einem Ausschluss eines Nutzers von diesem Raum und verhindert einen erneuten Beitritt.</string>
     <string name="room_settings_all_messages_noisy">Alle Nachrichten (laut)</string>
     <string name="room_settings_all_messages">Alle Nachrichten</string>
     <string name="room_settings_mention_only">Nur Erwähnungen</string>
     <string name="room_settings_mute">Stumm</string>
     <string name="settings_inline_url_preview">URL-Vorschau im Chat</string>
-    <string name="settings_vibrate_on_mention">Vibriere beim Erwähnen eines/r Nutzers/in</string>
+    <string name="settings_vibrate_on_mention">Vibriere beim Erwähnen eines Nutzers</string>
     <string name="room_settings_room_notifications_title">Benachrichtigungen</string>
     <string name="room_settings_no_flair">Dieser Raum zeigt für keine Community Avatare an</string>
     <string name="room_settings_add_new_group">Neue Community-ID (z.B. +foo:matrix.org)</string>
@@ -951,14 +951,14 @@
     <string name="invited">Eingeladen</string>
     <string name="filter_group_members">Filter Gruppen-Mitglieder</string>
     <string name="filter_group_rooms">Filter Gruppen-Räume</string>
-    <string name="group_no_long_description">Die Community-Administration hat keine lange Beschreibung für diese Community zur Verfügung gestellt.</string>
+    <string name="group_no_long_description">Der Community-Administrator hat keine lange Beschreibung für diese Community zur Verfügung gestellt.</string>
     <string name="has_been_kicked">Du wurdest von %2$s aus %1$s gekickt</string>
     <string name="has_been_banned">Du wurdest von %2$s aus %1$s verbannt</string>
     <string name="reason_colon">Grund: %1$s</string>
     <string name="rejoin">Erneut beitreten</string>
     <string name="forget_room">Raum vergessen</string>
     <string name="room_settings_add_homescreen_shortcut">Zum Startbildschirm hinzufügen</string>
-    <string name="settings_flair">Community Avatare</string>
+    <string name="settings_flair">Community-Avatare</string>
     <string name="send_bug_report_rage_shake">Schütteln, um einen Fehler zu melden</string>
     <string name="actions">Aktionen</string>
     <string name="list_members">Mitglieder auflisten</string>
@@ -1042,8 +1042,8 @@
 \n
 \nDie Deaktivierung deines Konto wird standardmäßig <b>keine deiner gesendeten Nachrichten löschen</b>. Wenn du möchtest, dass auch deine Nachrichten gelöscht werden, wähle zusätzlich die Option unten.
 \n
-\nDie Sichtbarkeit deiner Nachrichten ist ähnlich wie bei E-Mails: Wenn deine Nachrichten gelöscht werden, bedeutet dies, dass von dir verschickte Nachrichten nicht mit neuen oder unregistrierten Nutzer:innen geteilt werden. Aber registrierte Nutzer:innen, die bereits Zugang zu diesen Nachrichten haben, behalten weiterhin Zugriff auf ihre Kopie.</string>
-    <string name="deactivate_account_delete_checkbox">Bitte alle Nachrichten, die ich gesendet habe, löschen, wenn mein Account deaktiviert wird (Warnung: Unterhaltungen werden für zukünftige Nutzer:innen unvollständig erscheinen)</string>
+\nDie Sichtbarkeit deiner Nachrichten ist ähnlich wie bei E-Mails: Wenn deine Nachrichten gelöscht werden, bedeutet dies, dass von dir verschickte Nachrichten nicht mit neuen oder unregistrierten Nutzer geteilt werden. Aber registrierte Nutzer, die bereits Zugang zu diesen Nachrichten haben, behalten weiterhin Zugriff auf ihre Kopie.</string>
+    <string name="deactivate_account_delete_checkbox">Bitte alle Nachrichten, die ich gesendet habe, löschen, wenn mein Konto deaktiviert wird (Warnung: Unterhaltungen werden für zukünftige Nutzer unvollständig erscheinen)</string>
     <string name="deactivate_account_prompt_password">Um fortzufahren, bitte Passwort eingeben:</string>
     <string name="deactivate_account_submit">Account deaktivieren</string>
     <string name="dialog_title_third_party_licences">Drittanbieter-Lizenzen</string>
@@ -1067,15 +1067,15 @@
     <string name="settings_without_flair">Du bist aktuell kein Mitglied einer Community.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Benutze die Enter-Taste der Tastatur zum Senden</string>
     <string name="command_description_emote">Zeigt Aktionen</string>
-    <string name="command_description_ban_user">Bannt Benutzer:in mit angegebener ID</string>
+    <string name="command_description_ban_user">Bannt Benutzer mit angegebener ID</string>
     <string name="command_description_unban_user">Hebt die Verbannung des Benutzers mit angegebener ID auf</string>
     <string name="command_description_op_user">Bestimmt das Berechtigungslevel des Benutzers</string>
     <string name="command_description_deop_user">Setzt Berechtigungen des Benutzers zurück</string>
-    <string name="command_description_invite_user">Lädt Benutzer:in mit angegebener Kennung in den aktuellen Raum ein</string>
+    <string name="command_description_invite_user">Lädt Benutzer mit angegebener Kennung in den aktuellen Raum ein</string>
     <string name="command_description_join_room">Tritt dem Raum mit angegebenen Alias bei</string>
     <string name="command_description_part_room">Verlasse Raum</string>
     <string name="command_description_topic">Setzt das Raum-Thema</string>
-    <string name="command_description_kick_user">Kickt Benutzer:in mit angegebener ID</string>
+    <string name="command_description_kick_user">Kickt Benutzer mit angegebener ID</string>
     <string name="command_description_nick">Ändert deinen Anzeigenamen</string>
     <string name="command_description_markdown">(De-)Aktiviert Markdown</string>
     <string name="command_description_clear_scalar_token">Um das Matrix-App-Management zu reparieren</string>
@@ -1121,10 +1121,10 @@
     <string name="resource_limit_exceeded_title">Ressourcen-Limit</string>
     <string name="resource_limit_contact_action">Kontaktiere Administrator</string>
     <string name="resource_limit_contact_admin">kontaktiere deinen Service-Administrator</string>
-    <string name="resource_limit_soft_default">Dieser Home-Server hat eine seiner Ressourcen-Grenzen erreicht, sodass <b>einige Nutzer:innen sich nicht anmelden können</b>.</string>
+    <string name="resource_limit_soft_default">Dieser Home-Server hat eine seiner Ressourcen-Grenzen erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.</string>
     <string name="resource_limit_hard_default">Dieser Home-Server hat einen seiner Ressourcen-Limits überschritten.</string>
-    <string name="resource_limit_soft_mau"> Dieser Home-Server hat seine Obergrenze an monatlich aktiven Nutzer:innen erreicht, sodass <b>einige Nutzer:innen sich nicht anmelden können</b>.</string>
-    <string name="resource_limit_hard_mau">Dieser Home-Server hat seine Obergrenze an monatlich aktiven Nutzer:innen erreicht.</string>
+    <string name="resource_limit_soft_mau"> Dieser Home-Server hat seine Obergrenze an monatlich aktiven Nutzer erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.</string>
+    <string name="resource_limit_hard_mau">Dieser Home-Server hat seine Obergrenze an monatlich aktiven Nutzer erreicht.</string>
     <string name="resource_limit_soft_contact">Bitte %s um dieses Limit anheben zu lassen.</string>
     <string name="resource_limit_hard_contact">Bitte %s um diesen Dienst weiter zu nutzen.</string>
     <string name="dialog_title_error">Fehler</string>
@@ -1151,7 +1151,7 @@
     <string name="reason_hint">Grund</string>
     <string name="settings_inline_url_preview_summary">Linkvorschau im Chat aktivieren, falls dein Home-Server diese Funktion unterstützt.</string>
     <string name="settings_send_typing_notifs">Sende Schreibbenachrichtigungen</string>
-    <string name="settings_send_typing_notifs_summary">Lasse andere Benutzer:innen wissen, dass du tippst.</string>
+    <string name="settings_send_typing_notifs_summary">Lasse andere Benutzer wissen, dass du tippst.</string>
     <string name="settings_send_markdown">Markdown-Formatierung</string>
     <string name="settings_send_markdown_summary">Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen, etwa Sternchen (*) um kursiven Text anzuzeigen.</string>
     <string name="settings_show_read_receipts">Zeige Lesebestätigungen</string>
@@ -1229,7 +1229,7 @@
     <string name="settings_troubleshoot_test_play_services_title">Prüfung der Play-Dienste</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play-Dienste-APK ist verfügbar und aktuell.</string>
     <string name="settings_troubleshoot_test_token_registration_title">Token-Registrierung</string>
-    <string name="settings_troubleshoot_test_battery_failed">Wenn ein:e Benutzer:in ein abgestecktes Gerät mit ausgeschaltetem Bildschirm eine Weile nicht bewegt, wechselt es in den Bereitschaftsmodus. Dies hindert Apps daran, auf das Netzwerk zuzugreifen und verzögert die Ausführung von Aufgaben, Synchronisierungen und Standard-Alarmen.</string>
+    <string name="settings_troubleshoot_test_battery_failed">Wenn ein Benutzer ein abgestecktes Gerät mit ausgeschaltetem Bildschirm eine Weile nicht bewegt, wechselt es in den Bereitschaftsmodus. Dies hindert Apps daran, auf das Netzwerk zuzugreifen und verzögert die Ausführung von Aufgaben, Synchronisierungen und Standard-Alarmen.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoriere Optimierungen</string>
     <string name="startup_notification_fdroid_battery_optim_title">Hintergrundverbindung</string>
     <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} muss eine Hintergrundverbindung (nur geringe Belastung) aufrechterhalten, um verlässliche Benachrichtigungen zu erhalten.
@@ -1283,14 +1283,14 @@
     <string name="keys_backup_settings_delete_confirm_title">Lösche Sicherung</string>
     <string name="settings_notification_by_event">Präferenz der Benachrichtigungen nach Ereignis</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nDieser Fehler ist außerhalb von ${app_name} passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den/die Durchschnittsnutzer:in nicht betreffen.</string>
+\nDieser Fehler ist außerhalb von ${app_name} passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den Durchschnittsnutzer nicht betreffen.</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
 \nDieser Fehler liegt nicht unter der Kontrolle von ${app_name}. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.</string>
     <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nDieser Fehler ist außerhalb von ${app_name} passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
     <string name="settings_cryptography_manage_keys">Verwaltung der Krypto-Schlüssel</string>
     <string name="encryption_settings_manage_message_recovery_summary">Schlüssel-Sicherung verwalten</string>
-    <string name="keys_backup_setup_step1_description">Nachrichten in verschlüsselten Räumen sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der/die Empfänger!nnen haben die Schlüssel um diese Nachrichten zu lesen. 
+    <string name="keys_backup_setup_step1_description">Nachrichten in verschlüsselten Räumen sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der Empfänger haben die Schlüssel um diese Nachrichten zu lesen.
 \n
 \nSichere deine Schlüssel, um sie nicht zu verlieren.</string>
     <string name="recovery_key_export_saved_as_warning">Der Wiederherstellungsschlüssel wurde nach \'%s\' gespeichert. 
@@ -1367,7 +1367,7 @@
     <string name="new_recovery_method_popup_title">Neue Schlüsselsicherung</string>
     <string name="new_recovery_method_popup_description">Eine neue Schlüsselsicherung wurde entdeckt.
 \n
-\nWenn du die neue Wiederherstellungsmethode nicht festgelegt hast, kann ein/e Angreifer!n versuchen auf dein Konto zuzugreifen. Ändere dein Passwort und richte sofort eine neue Wiederherstellungsmethode in den Einstellungen ein.</string>
+\nWenn du die neue Wiederherstellungsmethode nicht festgelegt hast, kann ein Angreifer versuchen auf dein Konto zuzugreifen. Ändere dein Passwort und richte sofort eine neue Wiederherstellungsmethode in den Einstellungen ein.</string>
     <string name="new_recovery_method_popup_was_me">Ich war es</string>
     <string name="keys_backup_banner_setup_line1">Verliere nie mehr verschlüsselte Nachrichten</string>
     <string name="keys_backup_banner_setup_line2">Richte die Schlüsselsicherung ein</string>
@@ -1448,10 +1448,10 @@
     <string name="sas_incoming_request_title">Eingehende Verifizierungsanfrage</string>
     <string name="sas_incoming_verification_request_dialog">Du hast eine eingehende Verifizierungsanfrage erhalten.</string>
     <string name="sas_view_request_action">Anfrage ansehen</string>
-    <string name="sas_waiting_for_partner">Warte auf Bestätigung des/r anderen Nutzer*in…</string>
+    <string name="sas_waiting_for_partner">Warte auf Bestätigung des Partners…</string>
     <string name="sas_verified">Verifiziert!</string>
     <string name="sas_verified_successful">Du hast diese Sitzung erfolgreich verifiziert.</string>
-    <string name="sas_verified_successful_description">Sichere Nachrichten mit diesem/r Benutzer:in sind Ende-zu-Ende verschlüsselt und können nicht von Dritten mitgelesen werden.</string>
+    <string name="sas_verified_successful_description">Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende verschlüsselt und können nicht von Dritten mitgelesen werden.</string>
     <string name="sas_got_it">Verstanden</string>
     <string name="sas_verification_request_notification_channel_title">Schlüssel-Verifizierung</string>
     <string name="sas_cancelled_dialog_title">Anfrage abgebrochen</string>
@@ -1460,7 +1460,7 @@
     <string name="sas_verification_request_notification_channel">Interaktive Sitzungs-Verifizierung</string>
     <string name="sas_incoming_request_notif_title">Verifizierungsanfrage</string>
     <string name="sas_incoming_request_notif_content">%s möchte deine Sitzung verifizieren</string>
-    <string name="sas_error_m_user">Der/die Benutzer:in hat die Verifizierung abgebrochen</string>
+    <string name="sas_error_m_user">Der Benutzer hat die Verifizierung abgebrochen</string>
     <string name="sas_error_m_timeout">Der Verifizierungsprozess ist abgelaufen</string>
     <string name="sas_error_m_unexpected_message">Die Sitzung hat eine unerwartete Nachricht erhalten</string>
     <string name="sas_error_m_invalid_message">Eine ungültige Nachricht wurde empfangen</string>
@@ -1483,7 +1483,7 @@
     <string name="message_add_reaction">Reaktion hinzufügen</string>
     <string name="message_view_reaction">Reaktionen ansehen</string>
     <string name="reactions">Reaktionen</string>
-    <string name="event_redacted_by_user_reason">Ereignis von Benutzer:in gelöscht</string>
+    <string name="event_redacted_by_user_reason">Ereignis von Benutzer gelöscht</string>
     <string name="event_redacted_by_admin_reason">Ereignis moderiert durch Raum-Administrator</string>
     <string name="last_edited_info_message">Zuletzt bearbeitet von %1$s am %2$s</string>
     <string name="create_new_room">Neuen Raum erstellen</string>
@@ -1508,7 +1508,7 @@
     <string name="key_share_request">Schlüsselaustausch anfragen</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Es sieht so aus, als hättest du bereits ein Setup-Schlüssel-Backup von einer anderen Sitzung. Möchtest du es durch das, was du gerade erstellt hast, ersetzen\?</string>
     <string name="sas_security_advise">Für maximale Sicherheit empfehlen wir, dies persönlich zu tun, oder ein anderes vertrautes Kommunikationsmedium zu nutzen.</string>
-    <string name="sas_incoming_request_description">Überprüfe diese Sitzung, um sie als vertrauenswürdig zu markieren. Sitzungen von anderen Nutzer:innen zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende verschlüsselten Nachrichten.</string>
+    <string name="sas_incoming_request_description">Überprüfe diese Sitzung, um sie als vertrauenswürdig zu markieren. Sitzungen von anderen Nutzern zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende verschlüsselten Nachrichten.</string>
     <string name="sas_incoming_request_description_2">Durch Verifizieren dieser Sitzung wird sie bei dir und deinem Gegenüber als vertrauenswürdig markiert.</string>
     <string name="sas_emoji_description">Verifiziere diese Sitzung, indem du bestätigst, dass das folgende Emoji auf dem Bildschirm deines Gegenübers angezeigt wird</string>
     <string name="sas_decimal_description">Verifiziere diese Sitzung, indem du bestätigst, dass die folgenden Zahlen auf dem Bildschirm deines Gegenübers angezeigt werden</string>
@@ -1618,8 +1618,8 @@
     <string name="settings_discovery_mail_pending">ausstehend</string>
     <string name="settings_discovery_enter_identity_server">Gib einen neuen Identitätsserver ein</string>
     <string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Home-Server herstellen</string>
-    <string name="call_failed_no_ice_description">Bitte frage den/die Administrator/in deines Home-Servers (%1$s) nach der Einrichtung eines TURN-Servers, damit Anrufe zuverlässig funktionieren.
-\n 
+    <string name="call_failed_no_ice_description">Bitte frage den Administrator deines Home-Servers (%1$s) nach der Einrichtung eines TURN-Servers, damit Anrufe zuverlässig funktionieren.
+\n
 \nAlternativ kann ein öffentlicher Server auf %2$s genutzt werden. Dies wird jedoch weniger zuverlässig sein und deine IP-Adresse wird gegenüber diesem Server preisgegeben. Du kannst den Server auch in den Einstellungen anpassen.</string>
     <string name="login_error_no_homeserver_found">Dies ist keine Adresse eines Matrixservers</string>
     <string name="login_error_homeserver_not_found">Kann Home-Server nicht bei dieser URL erreichen. Bitte überprüfen</string>
@@ -1668,7 +1668,7 @@
     <string name="settings_discovery_msisdn_title">Auffindbare Telefonnummern</string>
     <string name="settings_discovery_please_enter_server">Bitte gib die Adresse des Identitätsservers ein</string>
     <string name="settings_discovery_no_terms_title">Identitätsserver hat keine Nutzungsbedingungen</string>
-    <string name="settings_discovery_no_terms">Der Identitätsserver den du ausgewählt hast, hat keine Nutzungsbedingungen. Fahre nur fort, wenn du dem/r Besitzer!n des Dienstes vertraust</string>
+    <string name="settings_discovery_no_terms">Der Identitätsserver den du ausgewählt hast, hat keine Nutzungsbedingungen. Fahre nur fort, wenn du dem Besitzer des Dienstes vertraust</string>
     <string name="settings_text_message_sent">Eine Textnachricht wurde an %s gesendet. Bitte gib den Verifizierungscode ein, den sie enthält.</string>
     <string name="labs_allow_extended_logging">Aktiviere ausführliche Logs.</string>
     <string name="labs_allow_extended_logging_summary">Ausführliche Logs werden der Entwicklung der App dadurch helfen, dass mehr Informationen übertragen werden, wenn du einen Fehlerbericht sendest. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
@@ -1692,8 +1692,8 @@
     <string name="two_users_read">gelesen von %1$s und %2$s</string>
     <string name="one_user_read">gelesen von %s</string>
     <plurals name="fallback_users_read">
-        <item quantity="one">gelesen von einem Nutzer:in</item>
-        <item quantity="other">gelesen von %d Nutzer:innen</item>
+        <item quantity="one">gelesen von einem Nutzer</item>
+        <item quantity="other">gelesen von %d Nutzern</item>
     </plurals>
     <string name="error_file_too_big">Die Datei \'%1$s\' (%2$s) ist zu groß, um sie hochzuladen. Das Limit ist %3$s.</string>
     <string name="error_attachment">Beim Abrufen des Anhangs ist ein Fehler aufgetreten.</string>
@@ -1709,24 +1709,24 @@
     <string name="report_content_custom_title">Diesen Inhalt melden</string>
     <string name="report_content_custom_hint">Meldegrund</string>
     <string name="report_content_custom_submit">MELDEN</string>
-    <string name="block_user">NUTZER:IN IGNORIEREN</string>
+    <string name="block_user">NUTZER IGNORIEREN</string>
     <string name="content_reported_title">Inhalt gemeldet</string>
-    <string name="content_reported_content">Dieser Inhalt wurde gemeldet. 
-\n 
-\nWenn du keine weiteren Inhalte dieses/r Nutzers/in sehen möchtest, kannst sie/ihn ignorieren, um jene Nachrichten auszublenden.</string>
+    <string name="content_reported_content">Dieser Inhalt wurde gemeldet.
+\n
+\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
     <string name="content_reported_as_spam_title">Als Spam gemeldet</string>
     <string name="content_reported_as_spam_content">Dieser Inhalt wurde als Spam gemeldet.
-\n 
-\nWenn du keine weiteren Inhalte dieses/r Nutzers/in sehen möchtest, kannst sie/ihn ignorieren, um jene Nachrichten auszublenden.</string>
+\n
+\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
     <string name="content_reported_as_inappropriate_title">Als unangebracht gemeldet</string>
     <string name="content_reported_as_inappropriate_content">Dieser Inhalt wurde als unangebracht gemeldet.
-\n 
-\nWenn du keine weiteren Inhalte dieses/r Nutzers/in sehen möchtest, kannst sie/ihn ignorieren, um jene Nachrichten auszublenden.</string>
+\n
+\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
     <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} benötigt Berechtigungen, um deine E2E Schlüssel zu speichern.
 \n
 \nBitte erlaube den Zugriff im nächsten Pop-Up sodass du deine Schlüssel manuell exportieren kannst.</string>
     <string name="no_network_indicator">Aktuell besteht keine Netzwerkverbindung</string>
-    <string name="message_ignore_user">Nutzer:in ignorieren</string>
+    <string name="message_ignore_user">Nutzer ignorieren</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Alle Nachrichten (laut)</string>
     <string name="room_list_quick_actions_notifications_all">Alle Nachrichten</string>
     <string name="room_list_quick_actions_notifications_mentions">Nur Erwähnungen</string>
@@ -1735,7 +1735,7 @@
     <string name="room_list_quick_actions_leave">Raum verlassen</string>
     <string name="notice_member_no_changes">%1$s hat keine Änderungen gemacht</string>
     <string name="command_description_spoiler">Sendet die Nachricht als Spoiler</string>
-    <string name="no_ignored_users">Du ignorierst keine Nutzer:innen</string>
+    <string name="no_ignored_users">Du ignorierst keine Nutzer</string>
     <string name="help_long_click_on_room_for_more_options">Halte auf einem Raum um mehr Optionen anzuzeigen</string>
     <string name="room_join_rules_public">%1$s hat den Raum für jeden, der den Link hat, öffentlich gemacht.</string>
     <string name="timeline_unread_messages">Ungelesene Nachrichten</string>
@@ -1750,7 +1750,7 @@
     <string name="login_server_other_title">Andere</string>
     <string name="login_server_other_text">Benutzerdefinierte &amp; erweiterte Einstellungen</string>
     <string name="login_continue">Fortfahren</string>
-    <string name="settings_discovery_disconnect_identity_server_info">Eine Trennung von deinem Identitätsserver würde bedeuten, dass du weder von anderen Nutzer:innen gefunden werden, noch diese per E-Mail oder Telefonnummer einladen kannst.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Eine Trennung von deinem Identitätsserver würde bedeuten, dass du weder von anderen Nutzern gefunden werden, noch diese per E-Mail oder Telefonnummer einladen kannst.</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine Email Adressen oder Telefonnummern momentan auf dem Identitätsserver %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
     <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitätsservers (%s) zu, um zu erlauben per E-Mail oder Telefonnummer gefunden zu werden.</string>
     <string name="error_handling_incoming_share">Zu teilende Daten nicht verarbeitbar</string>
@@ -1837,7 +1837,7 @@
     <string name="login_signup_cancel_confirmation_title">Warnung</string>
     <string name="login_a11y_captcha_container">Bitte löse das Captcha</string>
     <string name="login_error_outdated_homeserver_title">Veralteter Home-Server</string>
-    <string name="login_error_outdated_homeserver_content">Auf diesem Home-Server läuft eine zu alte Version, um eine Verbindung herzustellen. Bitten deine Home-Server-Administration um ein Upgrade.</string>
+    <string name="login_error_outdated_homeserver_content">Auf diesem Home-Server läuft eine zu alte Version, um eine Verbindung herzustellen. Bitte deinen Home-Server-Administrator um ein Upgrade.</string>
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunde…</item>
         <item quantity="other">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunden…</item>
@@ -1850,11 +1850,11 @@
 \n
 \n• Du hast diese Sitzung aus einer anderen Sitzung heraus gelöscht.
 \n
-\n• Die Administration deines Servers hat deinen Zugriff aus Sicherheitsgründen ungültig gemacht.</string>
+\n• Der Administrator deines Servers hat deinen Zugriff aus Sicherheitsgründen ungültig gemacht.</string>
     <string name="signed_out_submit">Melde dich erneut an</string>
     <string name="soft_logout_title">Du bist abgemeldet</string>
     <string name="soft_logout_signin_title">Anmelden</string>
-    <string name="soft_logout_signin_notice">Deine Home-Server-Administration (%1$s) hat dich von deinem Konto %2$s (%3$s) abgemeldet.</string>
+    <string name="soft_logout_signin_notice">Dein Home-Server-Administrator (%1$s) hat dich von deinem Konto %2$s (%3$s) abgemeldet.</string>
     <string name="soft_logout_signin_e2e_warning_notice">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.</string>
     <string name="soft_logout_signin_submit">Anmelden</string>
     <string name="soft_logout_signin_password_hint">Passwort</string>
@@ -1868,7 +1868,7 @@
 \nMelde dich erneut an, um auf deine Kontodaten und Nachrichten zuzugreifen.</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Du verlierst den Zugriff auf verschlüsselte Nachrichten, außer, du meldest dich an, um den Verschlüsselungsschlüssel wiederherzustellen.</string>
     <string name="soft_logout_clear_data_dialog_submit">Daten löschen</string>
-    <string name="template_soft_logout_sso_not_same_user_error">Die aktuelle Sitzung gehört dem/der Benutzer!n%1$s. Die angegebenen Anmeldeinformationen sind von Benutzer!n %2$s. Dies wird nicht von ${app_name} unterstützt.
+    <string name="template_soft_logout_sso_not_same_user_error">Die aktuelle Sitzung gehört dem Benutzer %1$s. Die angegebenen Anmeldeinformationen sind vom Benutzer %2$s. Dies wird nicht von ${app_name} unterstützt.
 \nBitte zuerst die Daten löschen und dann erneut anmelden.</string>
     <string name="permalink_malformed">matrix.to-Link fehlerhaft</string>
     <string name="bug_report_error_too_short">Die Beschreibung ist zu kurz</string>
@@ -1876,7 +1876,7 @@
     <string name="settings_show_devices_list">Alle meine Sitzungen anzeigen</string>
     <string name="settings_advanced_settings">Erweiterte Einstellungen</string>
     <string name="settings_developer_mode">Entwicklungsmodus</string>
-    <string name="settings_developer_mode_summary">Der Entwicklungsmodus aktiviert versteckte Funktionen und kann die Anwendung weniger stabil machen. Nur für Entwickler!nnen!</string>
+    <string name="settings_developer_mode_summary">Der Entwicklungsmodus aktiviert versteckte Funktionen und kann die Anwendung weniger stabil machen. Nur für Entwickler!</string>
     <string name="settings_rageshake">Wutschütteln</string>
     <string name="settings_rageshake_detection_threshold">Erkennungsschwelle</string>
     <string name="settings_rageshake_detection_threshold_summary">Schüttel dein Telefon, um die Erkennungsschwelle zu testen</string>
@@ -1894,9 +1894,9 @@
     <string name="verification_conclusion_warning">Nicht vertrauenswürdige Anmeldung</string>
     <string name="verification_sas_match">Sie stimmen überein</string>
     <string name="verification_sas_do_not_match">Sie stimmen nicht überein</string>
-    <string name="verify_user_sas_emoji_help_text">Verifiziere diese/n Benutzer!n, indem du bestätigst, dass diese einzigartigen Emoji in derselben Reihenfolge auf dem Bildschirm deines Gegenübers angezeigt werden.</string>
+    <string name="verify_user_sas_emoji_help_text">Verifiziere diesen Benutzer, indem du bestätigst, dass diese einzigartigen Emoji in derselben Reihenfolge auf dem Bildschirm deines Gegenübers angezeigt werden.</string>
     <string name="verify_user_sas_emoji_security_tip">Für ultimative Sicherheit verwende ein anderes vertrauenswürdiges Kommunikationsmittel oder mache es persönlich.</string>
-    <string name="verification_green_shield">Suche nach dem grünen Schild, um sicherzustellen, dass ein/e Benutzer!n vertrauenswürdig ist. Vertraue allen Benutzer!nnen in einem Raum, um sicherzustellen, dass der Raum sicher ist.</string>
+    <string name="verification_green_shield">Suche nach dem grünen Schild, um sicherzustellen, dass ein Benutzer vertrauenswürdig ist. Vertraue alle Benutzer in einem Raum, um sicherzustellen, dass der Raum sicher ist.</string>
     <string name="verification_conclusion_not_secure">Nicht sicher</string>
     <string name="verification_conclusion_compromised">Eine der folgenden Möglichkeiten kann beeinträchtigt sein: 
 \n 
@@ -1919,7 +1919,7 @@
     <string name="verification_verify_device_manually">Manuelle Verifizierung</string>
     <string name="you">Ich</string>
     <string name="verification_scan_notice">Scanne den Code mit dem Gerät des Gegenüber für eine gegenseitige Überprüfung</string>
-    <string name="verification_scan_their_code">Scanne ihren/seinen Code</string>
+    <string name="verification_scan_their_code">Scanne Code des Anderen</string>
     <string name="verification_scan_emoji_title">Kann nicht scannen</string>
     <string name="verification_scan_emoji_subtitle">Wenn ihr nicht am selben Ort seid, vergleicht Emoji stattdessen</string>
     <string name="verification_no_scan_emoji_title">Verifizieren via Emoji-Vergleich</string>
@@ -1952,7 +1952,7 @@
     <string name="room_member_power_level_moderators">Moderierende</string>
     <string name="room_member_power_level_custom">benutzerdefiniert</string>
     <string name="room_member_power_level_invites">Eingeladen</string>
-    <string name="room_member_power_level_users">Nutzer:innen</string>
+    <string name="room_member_power_level_users">Nutzer</string>
     <string name="room_member_power_level_admin_in">Admin in %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderation in %1$s</string>
     <string name="room_member_jump_to_read_receipt">Springen &amp; als gelesen markieren</string>
@@ -1978,7 +1978,7 @@
     <string name="verification_emoji_notice">Vergleiche die einzigartigen Emoji und stell sicher, dass sie in derselben Reihenfolge angezeigt werden.</string>
     <string name="verification_code_notice">Vergleiche den Code mit dem Code auf dem Bildschirm deines Gegenübers.</string>
     <string name="verification_conclusion_ok_notice">Nachrichten mit diesem Gegenüber sind Ende-zu-Ende verschlüsselt und können nicht von Dritten gelesen werden.</string>
-    <string name="verification_conclusion_ok_self_notice">Deine neue Sitzung ist jetzt verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer!nnen sehen sie als vertrauenswürdig an.</string>
+    <string name="verification_conclusion_ok_self_notice">Deine neue Sitzung ist jetzt verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.</string>
     <string name="encryption_information_cross_signing_state">Cross-Signing</string>
     <string name="encryption_information_dg_xsigning_complete">Cross-Signing ist aktiviert
 \nPrivate Schlüssel auf dem Gerät.</string>
@@ -2000,7 +2000,7 @@
         <item quantity="other">%d aktive Sitzungen</item>
     </plurals>
     <string name="crosssigning_verify_this_session">Verifiziere diese Sitzung</string>
-    <string name="crosssigning_other_user_not_trust">Andere Benutzer!nnen vertrauen ihr möglicherweise nicht</string>
+    <string name="crosssigning_other_user_not_trust">Andere Benutzer vertrauen ihr möglicherweise nicht</string>
     <string name="complete_security">Vollständige Sicherheit</string>
     <string name="verification_open_other_to_verify">Nutze eine vorhandene Sitzung um diese Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren.</string>
     <string name="verification_profile_verify">Verifizieren</string>
@@ -2012,7 +2012,7 @@
     <string name="not_trusted">Nicht vertraut</string>
     <string name="verification_profile_device_verified_because">Diese Sitzung ist für sichere Nachrichtenübertragung vertrauenswürdig, weil %1$s (%2$s) sie verifiziert hat:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) hat sich in einer neuen Sitzung angemeldet:</string>
-    <string name="verification_profile_device_untrust_info">Bis diese/r Benutzer!n dieser Sitzung vertraut, werden an und von ihr/ihm gesendete Nachrichten mit Warnungen gekennzeichnet. Alternativ kannst du dies manuell überprüfen.</string>
+    <string name="verification_profile_device_untrust_info">Bis dieser Benutzer dieser Sitzung vertraut, werden an und von ihm gesendete Nachrichten mit Warnungen gekennzeichnet. Alternativ kannst du dies manuell überprüfen.</string>
     <string name="initialize_cross_signing">Initialisiere Cross-Signing</string>
     <string name="reset_cross_signing">Schlüssel zurücksetzen</string>
     <string name="a11y_qr_code_for_verification">QR-Code</string>
@@ -2049,8 +2049,8 @@
     <string name="delete_event_dialog_content">Möchtest du dieses Ereignis wirklich entfernen (löschen)\? Beachte, dass beim Löschen eines Raumnamens oder einer Themenänderung die Änderung rückgängig gemacht werden kann.</string>
     <string name="delete_event_dialog_reason_checkbox">Grund hinzufügen</string>
     <string name="delete_event_dialog_reason_hint">Grund für das Editieren</string>
-    <string name="event_redacted_by_user_reason_with_reason">Ereignis gelöscht von Benutzer!n, Grund: %1$s</string>
-    <string name="event_redacted_by_admin_reason_with_reason">Ereignis vom Raumadministration moderiert, Grund: %1$s</string>
+    <string name="event_redacted_by_user_reason_with_reason">Ereignis durch den Benutzer gelöscht, Grund: %1$s</string>
+    <string name="event_redacted_by_admin_reason_with_reason">Ereignis vom Raumadministrator moderiert, Grund: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Schlüssel sind bereits aktuell!</string>
     <string name="spoiler">Spoiler</string>
     <string name="room_member_power_level_custom_in">Benutzerdefiniert (%1$d) in %2$s</string>
@@ -2063,8 +2063,8 @@
     <string name="verify_new_session_notice">Benutze diese Sitzung um deine neue zu verfizieren, damit sie auf verschlüsselte Nachrichten zugreifen kann.</string>
     <string name="verify_new_session_was_not_me">Das war ich nicht</string>
     <string name="verify_new_session_compromized">Dein Account ist möglicherweise komprimittiert</string>
-    <string name="verify_cancel_self_verification_from_untrusted">Wenn du abbrichst, wirst du auf diesem Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer:innen werden ihm nicht vertrauen</string>
-    <string name="verify_cancel_self_verification_from_trusted">Wenn du abbrichst, wirst du auf deinem neuen Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer:innen werden ihm nicht vertrauen</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Wenn du abbrichst, wirst du auf diesem Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer werden ihm nicht vertrauen</string>
+    <string name="verify_cancel_self_verification_from_trusted">Wenn du abbrichst, wirst du auf deinem neuen Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer werden ihm nicht vertrauen</string>
     <string name="verify_cancel_other">Du wirst %1$s (%2$s) nicht verifizieren, wenn du jetzt abbrichst. Beginne in deren Nutzerprofil erneut.</string>
     <string name="verify_not_me_self_verification">Eines der folgenden könnte kom­pro­mit­tie­rt sein:
 \n
@@ -2115,7 +2115,7 @@
     <string name="auth_flow_not_supported">Dies kann nicht von einem mobilen Gerät erfolgen</string>
     <string name="settings_when_rooms_are_upgraded">Wenn Räume verbessert werden</string>
     <string name="encryption_enabled">Verschlüsselung aktiviert</string>
-    <string name="encryption_enabled_tile_description">Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt. Erfahre mehr &amp; verifiziere Benutzer:innen in deren Profil.</string>
+    <string name="encryption_enabled_tile_description">Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt. Erfahre mehr &amp; verifiziere Benutzer in deren Profil.</string>
     <string name="encryption_unknown_algorithm_tile_description">Die Verschlüsselung in diesem Raum wird nicht unterstützt</string>
     <string name="qr_code_scanned_verif_waiting">Warte auf %s…</string>
     <string name="set_recovery_passphrase">%s setzen</string>
@@ -2185,20 +2185,20 @@
     <string name="external_link_confirmation_message">Dieser Link %1$s bringt dich zu einer anderen Seite: %2$s.
 \n
 \nWillst du wirklich fortfahren\?</string>
-    <string name="create_room_dm_failure">Konnte Direktnachricht nicht erzeugen. Prüfe die Nutzer:in, die du einladen willst und versuche es erneut.</string>
+    <string name="create_room_dm_failure">Konnte Direktnachricht nicht erzeugen. Prüfe die Nutzer, die du einladen willst und versuche es erneut.</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-    <string name="add_members_to_room">Nutzer!n hinzufügen</string>
+    <string name="add_members_to_room">Mitglieder hinzufügen</string>
     <string name="invite_users_to_room_action_invite">EINLADEN</string>
-    <string name="inviting_users_to_room">Benutzer:innen werden eingeladen…</string>
-    <string name="invite_users_to_room_title">Benutzer:innen einladen</string>
+    <string name="inviting_users_to_room">Benutzer werden eingeladen…</string>
+    <string name="invite_users_to_room_title">Benutzer einladen</string>
     <string name="invitation_sent_to_one_user">Einladung gesendet an %1$s</string>
     <string name="invitations_sent_to_two_users">Einladungen gesendet an %1$s und %2$s</string>
     <plurals name="invitations_sent_to_one_and_more_users">
         <item quantity="one">Einladungen gesendet an %1$s und einen weiteren Benutzer</item>
         <item quantity="other">Einladungen gesendet an %1$s und %2$d weitere Benutzer</item>
     </plurals>
-    <string name="invite_users_to_room_failure">Wir konnten die Benutzer:innen nicht einladen. Bitte überprüfe die Benutzer:innen, welchen du einladen möchtest, und versuche es erneut.</string>
+    <string name="invite_users_to_room_failure">Wir konnten den Benutzer nicht einladen. Bitte überprüfe den Benutzernamen, welchen du einladen möchtest und versuche es erneut.</string>
     <string name="pause_video">Pause</string>
     <string name="action_copy">Kopieren</string>
     <string name="bottom_action_notification">Benachrichtigungen</string>
@@ -2207,7 +2207,7 @@
     <string name="dismiss">Ablehnen</string>
     <string name="dialog_title_success">Erfolg</string>
     <string name="call_failed_no_connection_description">Echtzeitverbindung konnte nicht hergestellt werden.
-\nBitte den/die Administrator/in deines Home-Servers, einen TURN-Server so zu konfigurieren, dass Anrufe zuverlässig funktionieren.</string>
+\nBitte den Administrator deines Home-Servers, einen TURN-Server so zu konfigurieren, dass Anrufe zuverlässig funktionieren.</string>
     <string name="call_select_sound_device">Wähle Audiogerät aus</string>
     <string name="sound_device_phone">Telefonie</string>
     <string name="sound_device_speaker">Lautsprecher</string>
@@ -2224,25 +2224,25 @@
     <string name="return_to_call">Zum Anruf zurückkehren</string>
     <string name="room_participants_action_cancel_invite">Einladung zurückziehen</string>
     <string name="room_participants_power_level_demote_warning_title">Möchtest du dich zurückstufen\?</string>
-    <string name="room_participants_power_level_demote_warning_prompt">Du kannst die Zurückstufung nicht rückgängig machen und du wirst die Rechte nur mit einem/r anderen berechtigten Benutzer:in im Raum zurückerlangen können.</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Du kannst die Zurückstufung nicht rückgängig machen und du wirst die Rechte nur mit einem anderen berechtigten Benutzer im Raum zurückerlangen können.</string>
     <string name="room_participants_power_level_demote">Zurückstufen</string>
-    <string name="room_participants_action_ignore_title">Benutzer:in ignorieren</string>
-    <string name="room_participants_action_ignore_prompt_msg">Durch das Ignorieren werden für dich alle Nachrichten des/r Nutzers/in ausgeblendet.
+    <string name="room_participants_action_ignore_title">Benutzer ignorieren</string>
+    <string name="room_participants_action_ignore_prompt_msg">Durch das Ignorieren werden für dich alle Nachrichten des Nutzers ausgeblendet.
 \n
 \nDu kannst die Aktion jederzeit in den allgemeinen Einstellungen rückgängig machen.</string>
     <string name="room_participants_action_unignore_title">Ignorieren des Benutzers rückgängig machen</string>
     <string name="room_participants_action_unignore_prompt_msg">Das Aufheben der Ignorierung wird alle Nachrichten des Benutzers wieder einblenden.</string>
     <string name="room_participants_action_cancel_invite_title">Einladung zurückziehen</string>
-    <string name="room_participants_action_cancel_invite_prompt_msg">Bist du dir sicher, dass du die Einladung für diese:n Benutzer:in zurückziehen möchtest\?</string>
-    <string name="room_participants_kick_title">Benutzer:in entfernen</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Bist du dir sicher, dass du die Einladung für diesen Benutzer zurückziehen möchtest\?</string>
+    <string name="room_participants_kick_title">Benutzer entfernen</string>
     <string name="room_participants_kick_reason">Grund für das Entfernen</string>
-    <string name="room_participants_kick_prompt_msg">Das Entfernen wird den/die Benutzer!n von diesem Raum ausschließen.
+    <string name="room_participants_kick_prompt_msg">Das Entfernen wird den Benutzer von diesem Raum ausschließen.
 \n
-\nUm einen erneuten Beitritt zu verhindern, solltest du ihn/sie stattdessen bannen.</string>
-    <string name="room_participants_ban_title">Benutzer:in bannen</string>
+\nUm einen erneuten Beitritt zu verhindern, solltest du ihn stattdessen bannen.</string>
+    <string name="room_participants_ban_title">Benutzer bannen</string>
     <string name="room_participants_ban_reason">Grund für den Bann</string>
     <string name="room_participants_unban_title">Bann des Benutzers aufheben</string>
-    <string name="room_participants_unban_prompt_msg">Das Aufheben des Bannes wird dem/r Benutzer:in erlauben dem Raum wieder beizutreten.</string>
+    <string name="room_participants_unban_prompt_msg">Das Aufheben des Bannes wird dem Benutzer erlauben dem Raum wieder beizutreten.</string>
     <string name="settings_secure_backup_section_title">Sicheres Backup</string>
     <string name="settings_secure_backup_manage">Verwalten</string>
     <string name="settings_secure_backup_setup">Backup einrichten</string>
@@ -2292,7 +2292,7 @@
     <string name="send_a_sticker">Sticker</string>
     <string name="room_profile_section_admin">Administrative Aktionen</string>
     <string name="room_member_power_level_default_in">Standard in %1$s</string>
-    <string name="settings_hs_admin_e2e_disabled">Dein:e Serveradministrator:in hat in privaten Räumen &amp; Direktnachrichten Ende-zu-Ende Verschlüsselung standardmäßig deaktiviert.</string>
+    <string name="settings_hs_admin_e2e_disabled">Dein Serveradministrator hat in privaten Räumen und Direktnachrichten Ende-zu-Ende Verschlüsselung standardmäßig deaktiviert.</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Flugzeugmodus ist aktiv</string>
     <string name="bootstrap_info_text_2">Gib eine Sicherheitsphrase ein, die nur du kennst. Diese wird benutzt um deine Daten auf dem Server geheim zu halten.</string>
     <string name="bootstrap_cancel_text">Wenn du jetzt abbrichst und den Zugriff zu deinen Sitzungen verlierst, kannst du verschlüsselte Nachrichten &amp; Daten verlieren.
@@ -2447,7 +2447,7 @@
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Die Applikation wartet auf den PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">Push testen</string>
     <string name="search_is_not_supported_in_e2e_room">Die Suche in verschlüsselten Räumen wird noch nicht unterstützt.</string>
-    <string name="search_banned_user_hint">Gebannte Nutzer:innen filtern</string>
+    <string name="search_banned_user_hint">Gebannte Nutzer filtern</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du bist nicht berechtigt einen Anruf zu starten</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du hast keine Berechtigung ein Konferenzgespräch zu starten</string>
     <string name="settings_security_pin_code_notifications_summary_on">Zeige Details wie Raumnamen und Nachrichteninhalt.</string>
@@ -2462,7 +2462,7 @@
         <item quantity="one">Zeigen das Gerät, mit dem du jetzt überprüfen kannst</item>
         <item quantity="other">Zeigen %d Geräte, mit denen du jetzt überprüfen kannst</item>
     </plurals>
-    <string name="secure_backup_reset_no_history">Du wirst ohne Nachrichtenverlauf, Nachrichten, vertraute Geräten und vertraute Nutzer!nnen neu starten</string>
+    <string name="secure_backup_reset_no_history">Du wirst ohne Nachrichtenverlauf, Nachrichten, vertraute Geräten und vertraute Nutzern neu starten</string>
     <string name="secure_backup_reset_if_you_reset_all">Wenn du alles zurücksetzt</string>
     <string name="secure_backup_reset_all_no_other_devices">Mache dies nur, wenn du kein anderes Gerät hast, mit dem du dieses verifizieren kannst.</string>
     <string name="secure_backup_reset_all">Alles zurücksetzen</string>
@@ -2474,9 +2474,9 @@
     <string name="direct_room_profile_section_more_settings">Einstellungen</string>
     <string name="direct_room_profile_encrypted_subtitle">Nachrichten hier sind Ende-zu-Ende verschlüsselt.
 \n
-\nDeine Nachrichten sind mit digitalen Schlüsseln gesichert. Nur du und der/die Empfänger!n haben die einzigen Schlüssel, um jene zu entsperren.</string>
+\nDeine Nachrichten sind mit digitalen Schlüsseln gesichert. Nur du und der Empfänger haben die einzigen Schlüssel, um jene zu entsperren.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Nachrichten hier sind nicht Ende-zu-Ende verschlüsselt.</string>
-    <string name="login_error_outdated_homeserver_warning_content">Dieser Homeserver läuft mit einer alten Version. Bitte deine Homeserver-Administration um ein Upgrade. Du kannst fortfahren, aber einige Funktionen funktionieren möglicherweise nicht richtig.</string>
+    <string name="login_error_outdated_homeserver_warning_content">Dieser Homeserver läuft mit einer alten Version. Bitte deinen Homeserver-Administrator um eine Aktualisierung. Du kannst fortfahren, aber einige Funktionen funktionieren möglicherweise nicht richtig.</string>
     <string name="direct_room_join_rules_invite_by_you">Du hast dies auf Einladungen beschränkt.</string>
     <string name="direct_room_join_rules_invite">%1$s hat dies auf Einladungen beschränkt.</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">Zeige vollständigen Verlauf in verschlüsselten Räumen an</string>
@@ -2519,7 +2519,7 @@
     <string name="settings_discovery_consent_title">E-Mails und Telefonnummern senden</string>
     <string name="direct_room_user_list_suggestions_title">Vorschläge</string>
     <string name="direct_room_user_list_contacts_title">Kontakte</string>
-    <string name="direct_room_user_list_known_title">Bekannte Nutzer:innen</string>
+    <string name="direct_room_user_list_known_title">Bekannte Nutzer</string>
     <string name="direct_room_user_list_recent_title">Kürzlich</string>
     <string name="qr_code">QR-Code</string>
     <string name="add_by_qr_code">Hinzufügen via QR-Code</string>
@@ -2586,7 +2586,7 @@
     <string name="room_alias_action_publish">Diese Adresse veröffentlichen</string>
     <string name="room_alias_local_address_add">Lokale Adresse hinzufügen</string>
     <string name="room_alias_local_address_empty">Dieser Raum hat keine lokalen Adressen</string>
-    <string name="room_alias_local_address_subtitle">Füge Adressen für diesen Raum hinzu, damit andere Nutzer:innen ihn auf %1$s finden können</string>
+    <string name="room_alias_local_address_subtitle">Füge Adressen für diesen Raum hinzu, damit andere Nutzer ihn auf %1$s finden können</string>
     <string name="room_alias_local_address_title">Lokale Adresse</string>
     <string name="room_alias_address_hint">Neue öffentliche Adresse (z.B. #alias:server)</string>
     <string name="room_alias_address_empty">Noch keine weiteren öffentlichen Adressen vorhanden.</string>
@@ -2603,12 +2603,12 @@
     <string name="room_permissions_change_main_address_for_the_room">Haupt-Adresse des Raums ändern</string>
     <string name="room_permissions_change_room_avatar">Raum-Bild ändern</string>
     <string name="room_permissions_modify_widgets">Widgets verändern</string>
-    <string name="room_permissions_notify_everyone">Jede/n benachrichtigen</string>
+    <string name="room_permissions_notify_everyone">Jeden benachrichtigen</string>
     <string name="room_permissions_remove_messages_sent_by_others">Von anderen gesendete Nachrichten entfernen</string>
-    <string name="room_permissions_ban_users">Nutzer:in verbannen</string>
-    <string name="room_permissions_kick_users">Nutzer:in entfernen</string>
+    <string name="room_permissions_ban_users">Nutzer verbannen</string>
+    <string name="room_permissions_kick_users">Nutzer entfernen</string>
     <string name="room_permissions_change_settings">Einstellungen ändern</string>
-    <string name="room_permissions_invite_users">Nutzer:in einladen</string>
+    <string name="room_permissions_invite_users">Nutzer einladen</string>
     <string name="room_permissions_send_messages">Nachrichten senden</string>
     <string name="room_permissions_default_role">Standard Rolle</string>
     <string name="room_permissions_title">Berechtigungen</string>
@@ -2641,7 +2641,7 @@
     <string name="re_authentication_activity_title">Erneute Authentifizierung erforderlich</string>
     <string name="failed_to_initialize_cross_signing">Cross Signing konnte nicht eingerichtet werden</string>
     <string name="error_unauthorized">Nicht autorisierte, fehlende gültige Authentifizierungsdaten</string>
-    <string name="call_transfer_users_tab_title">Nutzer:innen</string>
+    <string name="call_transfer_users_tab_title">Nutzer</string>
     <string name="call_transfer_failure">Beim Übertragen des Anrufs ist ein Fehler aufgetreten</string>
     <string name="call_transfer_title">Übertragen</string>
     <string name="call_transfer_connect_action">Verbinden</string>
@@ -2729,4 +2729,7 @@
     <string name="settings_room_directory_show_all_rooms">Zeige Räume mit anstößigen Inhalten</string>
     <string name="event_status_delete_all_failed_dialog_message">Bist du dir sicher, dass du alle nicht gesendete Nachrichten in diesem Raum löschen willst\?</string>
     <string name="event_status_delete_all_failed_dialog_title">Nicht gesendete Nachrichten löschen</string>
+    <string name="event_status_a11y_failed">Schlug fehl</string>
+    <string name="event_status_cancel_sending_dialog_message">Willst du zu sendende Nachrichten zurückziehen\?</string>
+    <string name="event_status_a11y_delete_all">Alle fehgeschlagene Nachrichten löschen</string>
 </resources>
\ No newline at end of file

From 214ef23c73217b653bff18cd7950a5814ab54696 Mon Sep 17 00:00:00 2001
From: tiptoptom <ichbintom@telegmail.com>
Date: Tue, 16 Mar 2021 14:41:29 +0000
Subject: [PATCH 350/578] Translated using Weblate (German)

Currently translated at 99.9% (2361 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 034f83e40d..5527262011 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2732,4 +2732,5 @@
     <string name="event_status_a11y_failed">Schlug fehl</string>
     <string name="event_status_cancel_sending_dialog_message">Willst du zu sendende Nachrichten zurückziehen\?</string>
     <string name="event_status_a11y_delete_all">Alle fehgeschlagene Nachrichten löschen</string>
+    <string name="event_status_failed_messages_warning">Senden der Nachricht gescheitert</string>
 </resources>
\ No newline at end of file

From 193db6a46c932345e99c9999aea00c40dc754f92 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Tue, 16 Mar 2021 14:40:10 +0000
Subject: [PATCH 351/578] Translated using Weblate (German)

Currently translated at 99.9% (2361 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 5527262011..6ad2fe92f7 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2733,4 +2733,5 @@
     <string name="event_status_cancel_sending_dialog_message">Willst du zu sendende Nachrichten zurückziehen\?</string>
     <string name="event_status_a11y_delete_all">Alle fehgeschlagene Nachrichten löschen</string>
     <string name="event_status_failed_messages_warning">Senden der Nachricht gescheitert</string>
+    <string name="event_status_a11y_sending">Wird gesendet</string>
 </resources>
\ No newline at end of file

From 327088d79f3f597757f91648af4b80af34ddfd63 Mon Sep 17 00:00:00 2001
From: Hivaa <hivaa@hivaa.im>
Date: Mon, 15 Mar 2021 11:00:33 +0000
Subject: [PATCH 352/578] Translated using Weblate (Persian)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
---
 vector/src/main/res/values-fa/strings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 0c7ab7a71c..7937f4f4b2 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -2661,4 +2661,15 @@
     <string name="notice_room_server_acl_set_allowed">تطبیق سرور %s اجازه داده شده‌است.</string>
     <string name="notice_room_server_acl_set_banned">تطبیق سرور %s ممنوع شده‌است.</string>
     <string name="notice_room_server_acl_set_title_by_you">شما ACL های سرور را برای این اتاق تنظیم کردید.</string>
+    <string name="event_status_delete_all_failed_dialog_message">آیا مطمئن هستید که می خواهید همه پیام های ارسال نشده در این اتاق را حذف کنید؟</string>
+    <string name="event_status_delete_all_failed_dialog_title">حذف پیام‌های ارسال نشده</string>
+    <string name="event_status_failed_messages_warning">پیام ارسال نشد</string>
+    <string name="event_status_cancel_sending_dialog_message">آیا می خواهید ارسال پیام را لغو کنید؟</string>
+    <string name="event_status_a11y_delete_all">حذف تمامی پیام‌های ناموفق</string>
+    <string name="event_status_a11y_failed">ناموفق</string>
+    <string name="event_status_a11y_sent">ارسال شد</string>
+    <string name="event_status_a11y_sending">در حال ارسال</string>
+    <string name="settings_room_directory_show_all_rooms_summary">نمایش همه‌ی اتاق‌های داخل فهرست.</string>
+    <string name="settings_room_directory_show_all_rooms">نمایش‌ها همه‌ی اتاق‌ها</string>
+    <string name="settings_category_room_directory">فهرست اتاق‌ها</string>
 </resources>
\ No newline at end of file

From fcb30f619564998d6e9309cf7d0eb8add4af0380 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Mon, 15 Mar 2021 19:38:07 +0000
Subject: [PATCH 353/578] Translated using Weblate (French)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 25 ++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 315e3fe978..57382fa9df 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -100,7 +100,7 @@
     </plurals>
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s a supprimé %2$s comme adresse pour ce salon.</item>
-        <item quantity="other">%1$s a supprimé %3$s comme adresses pour ce salon.</item>
+        <item quantity="other">%1$s a supprimé %2$s comme adresses pour ce salon.</item>
     </plurals>
     <string name="notice_room_aliases_added_and_removed">%1$s a ajouté %2$s et supprimé %3$s comme adresses pour ce salon.</string>
     <string name="notice_room_canonical_alias_set">%1$s a défini %2$s comme adresse principale pour ce salon.</string>
@@ -2526,8 +2526,8 @@
     <string name="call_transfer_connect_action">Rejoindre</string>
     <string name="call_transfer_consult_first">Consulter d’abord</string>
     <plurals name="call_one_active_and_other_paused">
-        <item quantity="one">1 appel en cours (%1$d) ⋅ 1 appel en attente</item>
-        <item quantity="other">1 appel en cours (%1$d) ⋅ %2$d appels en attente</item>
+        <item quantity="one">1 appel en cours (%1$s) ⋅ 1 appel en attente</item>
+        <item quantity="other">1 appel en cours (%1$s) ⋅ %2$d appels en attente</item>
     </plurals>
     <plurals name="call_only_paused">
         <item quantity="one">Appel en attente</item>
@@ -2643,16 +2643,16 @@
     <string name="notice_room_canonical_alias_alternative_changed_by_you">Vous avez modifié les adresses alternatives de ce salon.</string>
     <string name="notice_room_canonical_alias_alternative_changed">%1$s a modifié les adresses alternatives de ce salon.</string>
     <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">Vous avez supprimé l’adresse alternative %2$s de ce salon.</item>
-        <item quantity="other">Vous avez supprimé les adresses alternatives %2$s de ce salon.</item>
+        <item quantity="one">Vous avez supprimé l’adresse alternative %1$s de ce salon.</item>
+        <item quantity="other">Vous avez supprimé les adresses alternatives %1$s de ce salon.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_removed">
         <item quantity="one">%1$s a supprimé l’adresse alternative %2$s de ce salon.</item>
         <item quantity="other">%1$s a supprimé les adresses alternatives %2$s de ce salon.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">Vous avez ajouté %2$s comme adresse alternative pour ce salon.</item>
-        <item quantity="other">Vous avez ajouté %2$s comme adresses alternatives pour ce salon.</item>
+        <item quantity="one">Vous avez ajouté %1$s comme adresse alternative pour ce salon.</item>
+        <item quantity="other">Vous avez ajouté %1$s comme adresses alternatives pour ce salon.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added">
         <item quantity="one">%1$s a ajouté %2$s comme adresse alternative pour ce salon.</item>
@@ -2668,4 +2668,15 @@
     <string name="notice_widget_jitsi_removed">%1$s a mis fin à la téléconférence</string>
     <string name="notice_widget_jitsi_added_by_you">Vous avez démarré la téléconférence</string>
     <string name="notice_widget_jitsi_added">Téléconférence démarrée par %1$s</string>
+    <string name="event_status_delete_all_failed_dialog_message">Êtes-vous sûr de vouloir supprimer tous les messages non envoyés dans ce salon \?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Supprimer les messages non envoyés</string>
+    <string name="event_status_failed_messages_warning">Messages non envoyés</string>
+    <string name="event_status_cancel_sending_dialog_message">Voulez-vous annuler l’envoi du message \?</string>
+    <string name="event_status_a11y_delete_all">Supprimer tous les messages en échec</string>
+    <string name="event_status_a11y_failed">Échec</string>
+    <string name="event_status_a11y_sent">Envoyé</string>
+    <string name="event_status_a11y_sending">Envoi</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Afficher tous les salons dans le répertoire, y compris ceux au contenu choquant.</string>
+    <string name="settings_room_directory_show_all_rooms">Afficher les salons au contenu choquant</string>
+    <string name="settings_category_room_directory">Répertoire des salons</string>
 </resources>
\ No newline at end of file

From ece3941e1f0c96c9e6200b7ac814b59a0c17a8ef Mon Sep 17 00:00:00 2001
From: GokdenizK <gokdeniz_6167@hotmail.com>
Date: Wed, 17 Mar 2021 07:08:33 +0000
Subject: [PATCH 354/578] Translated using Weblate (Turkish)

Currently translated at 64.8% (1531 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
---
 vector/src/main/res/values-tr/strings.xml | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 13d4a7c313..e5773a99a1 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -1712,4 +1712,34 @@
     <string name="call_held_by_user">%s aramayı bekletti</string>
     <string name="call_hold_action">Beklet</string>
     <string name="call_resume_action">Devam et</string>
+    <string name="notice_avatar_url_changed_by_you">Avatarını değiştirdin</string>
+    <string name="notice_avatar_url_changed">%1$s avatarını değiştirdi</string>
+    <string name="notice_room_withdraw_by_you">%1$s kişisinin davetini geri çektin</string>
+    <string name="notice_room_withdraw">%1$s, %2$s kişisinin davetini geri çekti</string>
+    <string name="notice_room_ban_by_you">%1$s kişisini banladınız</string>
+    <string name="notice_room_ban">%1$s, %2$s kişisini banladı</string>
+    <string name="notice_room_reject_by_you">Daveti reddettin</string>
+    <string name="notice_room_reject">%1$s daveti reddetti</string>
+    <string name="notice_direct_room_leave_by_you">Odadan ayrıldın</string>
+    <string name="notice_direct_room_leave">%1$s odadan ayrıldı</string>
+    <string name="notice_room_leave_by_you">Odadan ayrıldın</string>
+    <string name="notice_room_leave">%1$s odadan ayrıldı</string>
+    <string name="notice_direct_room_join_by_you">Katıldın</string>
+    <string name="notice_direct_room_join">%1$s katıldı</string>
+    <string name="notice_room_join_by_you">Odaya katıldın</string>
+    <string name="notice_room_join">%1$s odaya katıldı</string>
+    <string name="notice_room_invite_you">%1$s kişisi seni davet etti</string>
+    <string name="notice_room_invite_by_you">%1$s kişisini davet ettin</string>
+    <string name="notice_room_invite">%1$s, %2$s kişisini davet etti</string>
+    <string name="notice_direct_room_created_by_you">Tartışmayı oluşturdun</string>
+    <string name="notice_direct_room_created">%1$s tartışmayı oluşturdu</string>
+    <string name="notice_room_created_by_you">Odayı oluşturdun</string>
+    <string name="notice_room_created">%1$s odayı oluşturdu</string>
+    <string name="notice_room_invite_no_invitee_by_you">Senin davetin</string>
+    <string name="notice_room_invite_no_invitee">%s\'nin daveti</string>
+    <string name="summary_you_sent_sticker">Bir çıkartma gönderdin.</string>
+    <string name="summary_user_sent_sticker">%1$s bir çıkartma gönderdi.</string>
+    <string name="summary_you_sent_image">Bir fotoğraf gönderdin.</string>
+    <string name="summary_user_sent_image">%1$s bir fotoğraf gönderdi.</string>
+    <string name="summary_message">%1$s%2$s</string>
 </resources>
\ No newline at end of file

From b2441b3e55659f33a84e6dee984d6fa637a20f5f Mon Sep 17 00:00:00 2001
From: TyIL TTY7 <CF84AE95D763@outlook.com>
Date: Wed, 17 Mar 2021 02:24:08 +0000
Subject: [PATCH 355/578] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.3% (2228 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 vector/src/main/res/values-zh-rCN/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index e40e95da82..004e95019b 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2471,4 +2471,9 @@
     <string name="error_unauthorized">未验证，缺少有效验证凭证</string>
     <string name="action_return">返回</string>
     <string name="system_theme">系统默认</string>
+    <string name="notice_room_server_acl_updated_banned">• 匹配 %s 的服务器已被屏蔽。</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• IP 地址匹配的服务器已被屏蔽。</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• IP 地址符合的服务器已被允许。</string>
+    <string name="notice_room_server_acl_set_banned">• 符合 %s 的服务器已被屏蔽。</string>
+    <string name="notice_room_server_acl_set_allowed">• 符合 %s 的服务器已被允许。</string>
 </resources>
\ No newline at end of file

From d31a4e1406dd16973f996cf3dcdb892c1feb10f2 Mon Sep 17 00:00:00 2001
From: KAHINA <kahinamessaoudi03@gmail.com>
Date: Sun, 14 Mar 2021 22:35:00 +0000
Subject: [PATCH 356/578] Translated using Weblate (Kabyle)

Currently translated at 92.2% (2179 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/kab/
---
 vector/src/main/res/values-kab/strings.xml | 74 +++++++++++++++++++++-
 1 file changed, 72 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 516ccc1caf..53b4ee9214 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -3,8 +3,8 @@
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s t.yuzen tugna.</string>
     <string name="summary_you_sent_image">Tuzneḍ tugna.</string>
-    <string name="notice_room_invite_no_invitee">Tinubga n %s</string>
-    <string name="notice_room_invite_no_invitee_by_you">Tinubga-k•m</string>
+    <string name="notice_room_invite_no_invitee">Tinnubga n %s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Tinnubga-k•m</string>
     <string name="notice_room_created">%1$s yesnulfa-d taxxamt</string>
     <string name="notice_room_created_by_you">Tesnulfaḍ-d taxxamt-a</string>
     <string name="notice_room_invite">%1$s inced-d %2$s</string>
@@ -2406,4 +2406,74 @@
         <item quantity="other">Sken %d ibenkani swayes i tzemreḍ ad tesneqdeḍ tura</item>
     </plurals>
     <string name="a11y_create_direct_message_by_mxid">Rnu adiwenni usrid amaynut s usulay n Matrix</string>
+    <string name="settings_show_emoji_keyboard">Sken anasiw n yimujiten</string>
+    <string name="room_permissions_change_topic">Beddel asentel</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Azen ineḍruyen m.room.server_acl</string>
+    <string name="room_permissions_change_permissions">Beddel tisirag</string>
+    <string name="room_permissions_change_room_name">Beddel isem n texxamt</string>
+    <string name="room_permissions_enable_room_encryption">Rmed awgelhen n texxamt</string>
+    <string name="room_permissions_change_main_address_for_the_room">Beddel tansa tagejdant n texxamt</string>
+    <string name="room_permissions_change_room_avatar">Beddel avaṭar n texxamt</string>
+    <string name="room_permissions_modify_widgets">Snifel iwiǧiten</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Kkes iznan n wiyaḍ</string>
+    <string name="room_permissions_ban_users">Gdel iseqdacen</string>
+    <string name="room_permissions_change_settings">Snifel iɣewwaren</string>
+    <string name="room_permissions_invite_users">Nced iseqdacen</string>
+    <string name="room_permissions_send_messages">Azen iznan</string>
+    <string name="room_permissions_title">Tisirag</string>
+    <string name="room_settings_permissions_title">Tisirag n texxamt</string>
+    <string name="room_participants_leave_private_warning">Taxxamt-a mačči d tazayezt. Ur tzemmreḍ ara ad tedduḍ ɣur-d war tinnubga.</string>
+    <string name="call_hold_action">Ṭṭef</string>
+    <string name="settings_category_room_directory">Akaram n texxamin</string>
+    <string name="dialog_edit_hint">Azal amaynut</string>
+    <string name="action_return">Uɣal</string>
+    <string name="action_switch">Beddel</string>
+    <string name="system_theme">Am unagraw</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Tugiḍ i yinebgawen ad d-asen ɣer da.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s yugi i yinebgawen ad d-asen ɣer da.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Tessirgeḍ inebgawen ad d-asen ɣer da.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s yessireg inebgawen ad d-asen ɣer da.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Tbeddleḍ tansiwin n texxamt-a.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s ibeddel tansiwin n texxamt-a.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Teffɣeḍ. Tamentilt: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s yeffeɣ. Tamentilt: %2$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s yedda. Tamentilt: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Teddiḍ. Tamentilt: %1$s</string>
+    <string name="initial_sync_start_downloading">Amtawi n tazwara:
+\nAsader n yisefka…</string>
+    <string name="initial_sync_start_server_computing">Amtawi n tazwara:
+\nAraju n tririt n uqeddac…</string>
+    <string name="room_displayname_empty_room_was">Taxxamt tilemt (tella %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s d %4$d-nniḍen</item>
+        <item quantity="other">%1$s, %2$s, %3$s d %4$d n wiyaḍ</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s d %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s d %3$s</string>
+    <string name="notice_widget_jitsi_modified_by_you">Tbeddleḍ asarag s tvidyut</string>
+    <string name="notice_widget_jitsi_modified">Asarag s tvidyut yettwabeddel sɣur %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Tesḥebseḍ asarag s tvidyut</string>
+    <string name="notice_widget_jitsi_removed">%1$s yesseḥbes asarag s tvidyut</string>
+    <string name="notice_widget_jitsi_added_by_you">Tebdiḍ asarag s tvidyut</string>
+    <string name="notice_widget_jitsi_added">Asarag s tvidyut yebda-d sɣur %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Tugiḍ tinnubga n %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s yugi tinnubga n %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Tnecdeḍ-d %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s t•yenced-d %2$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Iqeddcen akk ttwagedlen seg uttekki! Taxxamt-a dayen ur tettuseqdac ara.</string>
+    <string name="notice_room_server_acl_updated_no_change">Ulac abeddel.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Iqeddacen i yemsaḍan d %s ttwakksen seg tebdert n usireg.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Iqeddacen i yemsaḍan d %s ttusirgen tura.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Iqeddacen i yemsaḍan d %s ttwakksen seg tebdert n ugdal.</string>
+    <string name="notice_room_server_acl_updated_banned">• Iqeddacen i yemsaḍan d %s ttwagedlen tura.</string>
+    <string name="notice_room_server_acl_set_allowed">• Iqeddacen i yemsaḍan d %s ttusirgen.</string>
+    <string name="notice_room_server_acl_set_banned">• Iqeddacen i yemsaḍan d %s ttwagedlen.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Terriḍ iznan i d-itteddun ad d-ttbinen i %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s t•yerra iznan i d-itteddun ad d-ttbinen i %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Teffɣeḍ seg texxamt</string>
+    <string name="notice_direct_room_leave">%1$s t•yeffeɣ seg texxamt</string>
+    <string name="notice_direct_room_join_by_you">Teddiḍ-d ɣer texxamt</string>
+    <string name="notice_direct_room_join">%1$s t•yedda-d ɣer texxamt</string>
+    <string name="notice_direct_room_created_by_you">Tesnulfaḍ-d adiwenni</string>
+    <string name="notice_direct_room_created">%1$s t•yesnulfa-d adiwenni</string>
 </resources>
\ No newline at end of file

From a5b2083f1bd220ed19753b1fda0b4815c79e6062 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Tue, 16 Mar 2021 15:12:57 +0000
Subject: [PATCH 357/578] Translated using Weblate (German)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
---
 fastlane/metadata/android/de/changelogs/40100110.txt |  2 +-
 fastlane/metadata/android/de/changelogs/40101010.txt |  2 ++
 fastlane/metadata/android/de/full_description.txt    | 12 ++++++------
 fastlane/metadata/android/de/short_description.txt   |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 fastlane/metadata/android/de/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/de/changelogs/40100110.txt b/fastlane/metadata/android/de/changelogs/40100110.txt
index e70007b5d7..24bc6e518c 100644
--- a/fastlane/metadata/android/de/changelogs/40100110.txt
+++ b/fastlane/metadata/android/de/changelogs/40100110.txt
@@ -1,2 +1,2 @@
-Diese neue Version enthält hauptsächlich Verbesserungen der Benutzer*innenoberfläche und der Handhabung. Du kannst jetzt ganz schnell Freund*innen einladen und DMs erstellen, indem du schlicht einen QR-Code scannst.
+Diese neue Version enthält hauptsächlich Verbesserungen der Benutzeroberfläche und der Handhabung. Du kannst jetzt ganz schnell Freund*innen einladen und DMs erstellen, indem du schlicht einen QR-Code scannst.
 Vollständige Versionshinweise: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/de/changelogs/40101010.txt b/fastlane/metadata/android/de/changelogs/40101010.txt
new file mode 100644
index 0000000000..59758edcc9
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Leistungsverbesserungen und Fehlerbehebungen!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/de/full_description.txt b/fastlane/metadata/android/de/full_description.txt
index 133f5e10d4..568ae61875 100644
--- a/fastlane/metadata/android/de/full_description.txt
+++ b/fastlane/metadata/android/de/full_description.txt
@@ -3,7 +3,7 @@ Element ist eine neuartige Messaging- und Kollaborationsapp:
 1. Volle Kontrolle über deine Privatssphäre
 2. Kommuniziere mit jedem aus dem Matrix-Netzwerk und mit der Integration von z.B. Slack sogar über Matrix hinaus
 3. Schutz vor Werbung, Datamining und geschlossenen Platformen
-4. Absicherung durch Ende-zu-Ende-Verschlüsselung, und Cross Signing um andere zu verifizieren
+4. Absicherung durch Ende-zu-Ende-Verschlüsselung, und Cross-Signing um andere zu verifizieren
 
 Element unterscheidet sich durch Dezentralität und Open Source deutlich von anderen Messaging- und Kollaborationsapps.
 
@@ -11,11 +11,11 @@ Element ermöglicht es einen eigenen Server zu betreiben - oder einen beliebigen
 
 Element ist zu all diesem in der Lage, weil es Matrix nutzt - einen Standard für offene, dezentrale Kommunikation.
 
-Element gibt dir die Kontrolle, indem es dir die Wahl darüber lässt, wer deine Konversationen hostet. In der Element App kannst du zwischen verschiedenen Möglichkeiten auswählen:
+Element gibt dir die Kontrolle, indem es dir die Wahl darüber lässt, wer deine Konversationen hostet. In der Element-App kannst du zwischen verschiedenen Möglichkeiten auswählen:
 
 1. Kostenlos auf dem öffentlichen matrix.org Server registrieren, der von den Matrix-Entwicklern gehostet wird, oder wähle aus Tausenden von öffentlichen Servern, die von Freiwilligen gehostet werden
-2. Einen Account auf einem eigenen Server auf eigener Hardware betreiben
-3. Einen Account auf einem benutzerdefinierten Server erstellen, zum Beispiel durch ein Abonnment bei der Element Matrix Services Hosting-Platform
+2. Einen Konto auf einem eigenen Server auf eigener Hardware betreiben
+3. Einen Konto auf einem benutzerdefinierten Server erstellen, zum Beispiel durch ein Abonnement bei Element Matrix Services (kurz EMS)
 
 <b>Wieso Element nutzen?</b>
 
@@ -23,8 +23,8 @@ Element gibt dir die Kontrolle, indem es dir die Wahl darüber lässt, wer deine
 
 <b>OFFENE KOMMUNIKATION UND KOLLABORATION</b>: Du kannst mit jedem im Matrix-Netzwerk schreiben, ob sie nun Element oder eine andere Matrix-App nutzen, oder gar ein anderes Kommunikationssystem wie z.B. Slack, IRC oder XMPP.
 
-<b>SUPER SICHER</b>: Echte Ende-zu-Ende-Verschlüsselung (nur Personen in der Konversation können die Nachrichten entschlüsseln), und Cross Signing um die Geräte der anderen Personen zu verifizieren.
+<b>SUPER SICHER</b>: Echte Ende-zu-Ende-Verschlüsselung (nur Personen in der Konversation können die Nachrichten entschlüsseln), und Cross-Signing um die Geräte der anderen Personen zu verifizieren.
 
 <b>VOLLSTÄNDIGE KOMMUNIKATION</b>: Nachrichten, Telefonate und Videoanrufe, Teilen von Dateien oder dem eigenen Bildschirm und viele andere Integrationen, Bots und Widgets. Erstelle Räume, Communities, bleib in Kontakt und sei produktiv.
 
-<b>ÜBERALL WO DU BIST</b>: Bleib in Kontakt wo auch immer du bist - mit einem vollständig synchronisierten Nachrichtenverlauf über alle Geräte und im Web auf https://app.element.io.
+<b>ÜBERALL WO DU BIST</b>: Bleib in Kontakt wo auch immer du bist - mit einem vollständig synchronisierten Nachrichtenverlauf über alle Geräte und im Netz auf https://app.element.io.
diff --git a/fastlane/metadata/android/de/short_description.txt b/fastlane/metadata/android/de/short_description.txt
index 0ffacfd8d9..d2c30d4167 100644
--- a/fastlane/metadata/android/de/short_description.txt
+++ b/fastlane/metadata/android/de/short_description.txt
@@ -1 +1 @@
-Sicherer dezentraler Chat & Telefonie. Schütze deine Daten vor Dritten.
+Sicherer dezentraler Chat und Telefonie. Schütze deine Daten vor Dritten.

From 33306bf218565d12497875f74af7b17c0dd6deb7 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Mon, 15 Mar 2021 18:21:27 +0000
Subject: [PATCH 358/578] Translated using Weblate (French)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
---
 fastlane/metadata/android/fr/changelogs/40100130.txt | 2 +-
 fastlane/metadata/android/fr/changelogs/40100140.txt | 2 ++
 fastlane/metadata/android/fr/changelogs/40100150.txt | 2 ++
 fastlane/metadata/android/fr/changelogs/40100160.txt | 2 ++
 fastlane/metadata/android/fr/changelogs/40100170.txt | 2 ++
 fastlane/metadata/android/fr/changelogs/40101000.txt | 2 ++
 fastlane/metadata/android/fr/changelogs/40101010.txt | 2 ++
 7 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 fastlane/metadata/android/fr/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/40100150.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/40100160.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/40100170.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/fr/changelogs/40100130.txt b/fastlane/metadata/android/fr/changelogs/40100130.txt
index 412b2b9db2..a7e233616a 100644
--- a/fastlane/metadata/android/fr/changelogs/40100130.txt
+++ b/fastlane/metadata/android/fr/changelogs/40100130.txt
@@ -1,2 +1,2 @@
 Principaux changements apportés par cette version : aperçu des URL, nouveau clavier Emoji, nouvelles options de configuration pour le salon et neige pour Noël.
-Liste complète des changements : https://github.com/vector-im/element-android/releases/tag/v1.0.12
+Liste complète des changements : https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/fr/changelogs/40100140.txt b/fastlane/metadata/android/fr/changelogs/40100140.txt
new file mode 100644
index 0000000000..e823d7a89a
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : modification des permissions dans les salons, thème lumineux/sombre automatique, et plein de corrections de bugs.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/fr/changelogs/40100150.txt b/fastlane/metadata/android/fr/changelogs/40100150.txt
new file mode 100644
index 0000000000..cfc92299d4
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : prise en charge de l’authentification avec les réseaux sociaux.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/fr/changelogs/40100160.txt b/fastlane/metadata/android/fr/changelogs/40100160.txt
new file mode 100644
index 0000000000..b5bca83268
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : prise en charge de l’authentification avec les réseaux sociaux !
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.0.15 et https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/fr/changelogs/40100170.txt b/fastlane/metadata/android/fr/changelogs/40100170.txt
new file mode 100644
index 0000000000..5474f15417
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : corrections de bugs !
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1..017
diff --git a/fastlane/metadata/android/fr/changelogs/40101000.txt b/fastlane/metadata/android/fr/changelogs/40101000.txt
new file mode 100644
index 0000000000..e9330611ee
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : améliorations de la VoIP (appels audio et vidéo dans les conversations primées) et corrections de bugs !
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/fr/changelogs/40101010.txt b/fastlane/metadata/android/fr/changelogs/40101010.txt
new file mode 100644
index 0000000000..8e9de64423
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : amélioration des performances et corrections de bugs !
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.1

From ab12c641a84a6a713054c1631b72c90073360555 Mon Sep 17 00:00:00 2001
From: KAHINA <kahinamessaoudi03@gmail.com>
Date: Sun, 14 Mar 2021 22:23:36 +0000
Subject: [PATCH 359/578] Translated using Weblate (Kabyle)

Currently translated at 23.0% (3 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/kab/
---
 fastlane/metadata/android/kab/short_description.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/kab/short_description.txt b/fastlane/metadata/android/kab/short_description.txt
index bee72ea427..453d31fc2a 100644
--- a/fastlane/metadata/android/kab/short_description.txt
+++ b/fastlane/metadata/android/kab/short_description.txt
@@ -1 +1 @@
-Adiwenni aɣellsan ur nelli  aslammas & VoIP. Ḥrez isefra-k•m seg tama tis tlata.
+Adiwenni aɣellsan ur nelli d aslammas & VoIP. Ḥrez isefra-k•m seg wis tlata.

From 3ceee8302af93f2bce03e28ecf4d0566abf093b2 Mon Sep 17 00:00:00 2001
From: GokdenizK <gokdeniz_6167@hotmail.com>
Date: Wed, 17 Mar 2021 06:58:48 +0000
Subject: [PATCH 360/578] Translated using Weblate (Turkish)

Currently translated at 76.9% (10 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/tr/
---
 fastlane/metadata/android/tr/changelogs/40100140.txt | 2 ++
 fastlane/metadata/android/tr/changelogs/40100170.txt | 2 ++
 fastlane/metadata/android/tr/changelogs/40101000.txt | 2 ++
 fastlane/metadata/android/tr/changelogs/40101010.txt | 2 ++
 4 files changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/tr/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/40100170.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/tr/changelogs/40100140.txt b/fastlane/metadata/android/tr/changelogs/40100140.txt
new file mode 100644
index 0000000000..9a5cf6d5f0
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki başlıca değişiklikler: Oda izinlerini düzenleme, otomatik koyu/açık tema ve bir avuç hata düzeltmeleri.
+Değişim günlüğünün tamamı: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/tr/changelogs/40100170.txt b/fastlane/metadata/android/tr/changelogs/40100170.txt
new file mode 100644
index 0000000000..a93cbb4908
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki başlıca değişiklikler: Hata düzeltmeleri!
+değişim günlüğünün tamamı: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/tr/changelogs/40101000.txt b/fastlane/metadata/android/tr/changelogs/40101000.txt
new file mode 100644
index 0000000000..ce457ee0f4
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: VoIP (DM'de sesli ve görüntülü aramalar) geliştirmeleri ve hata düzeltmeleri!
+Değişim günlüğünün tamamı: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/tr/changelogs/40101010.txt b/fastlane/metadata/android/tr/changelogs/40101010.txt
new file mode 100644
index 0000000000..912d5bcd7c
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Bu sürümdeki ana değişiklikler: performans iyileştirme ve hata düzeltmeleri!
+Değişim günlüğünün tamamı: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 743a9cf358878687826109bb72912c30a5aa5f4d Mon Sep 17 00:00:00 2001
From: Graeme Power <gjpower@tcd.ie>
Date: Sun, 14 Mar 2021 16:51:44 +0000
Subject: [PATCH 361/578] Translated using Weblate (Irish)

Currently translated at 5.6% (133 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ga/
---
 vector/src/main/res/values-ga/strings.xml | 165 +++++++++++++++++++++-
 1 file changed, 164 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-ga/strings.xml b/vector/src/main/res/values-ga/strings.xml
index a6b3daec93..ee84da7b92 100644
--- a/vector/src/main/res/values-ga/strings.xml
+++ b/vector/src/main/res/values-ga/strings.xml
@@ -1,2 +1,165 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="room_details_people_invited_group_name">CUAIRTEOIRÍ</string>
+    <string name="room_details_settings">Socruithe</string>
+    <string name="room_details_files">Comhaid</string>
+    <string name="room_details_people">Daoine</string>
+    <string name="room_permissions_title">Ceadanna</string>
+    <string name="ssl_remain_offline">Tabhair neamhaird ar</string>
+    <string name="ssl_logout_account">Logáil amach</string>
+    <string name="ssl_trust">Cuir muinín i</string>
+    <string name="room_menu_search">Cuardaigh</string>
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="reason_hint">Cúis</string>
+    <string name="room_participants_action_unignore">Taispeáin na teachtaireachtaí an úsáideora seo</string>
+    <string name="room_participants_action_ignore">Tabhair neamhaird ar teachtaireachtaí an úsáideora seo</string>
+    <string name="room_participants_power_level_demote">Bain ceadanna</string>
+    <string name="room_participants_action_mention">Luaigh</string>
+    <string name="room_participants_action_kick">Caith amach</string>
+    <string name="room_participants_action_unban">Bain an coisc</string>
+    <string name="room_participants_action_ban">Coisc</string>
+    <string name="room_participants_action_invite">Tabhair cuireadh</string>
+    <string name="room_participants_header_devices">SEISIÚIN</string>
+    <string name="room_participants_header_call">GLAOIGH AR</string>
+    <string name="room_participants_idle">Díomhaoin</string>
+    <string name="room_participants_offline">As líne</string>
+    <string name="room_participants_online">Ar Líne</string>
+    <string name="room_participants_create">Cruthaigh</string>
+    <plurals name="format_time_d">
+        <item quantity="one">%dl</item>
+        <item quantity="two">%dl</item>
+        <item quantity="few">%dl</item>
+        <item quantity="many">%dl</item>
+        <item quantity="other">%dl</item>
+    </plurals>
+    <plurals name="format_time_h">
+        <item quantity="one">%du</item>
+        <item quantity="two"></item>
+        <item quantity="few">%du</item>
+        <item quantity="many">%du</item>
+        <item quantity="other">%du</item>
+    </plurals>
+    <plurals name="format_time_m">
+        <item quantity="one">%dn</item>
+        <item quantity="two"></item>
+        <item quantity="few"></item>
+        <item quantity="many">%dn</item>
+        <item quantity="other">%dn</item>
+    </plurals>
+    <plurals name="format_time_s">
+        <item quantity="one"></item>
+        <item quantity="two"></item>
+        <item quantity="few"></item>
+        <item quantity="many">%ds</item>
+        <item quantity="other"></item>
+    </plurals>
+    <string name="room_sync_in_progress">Ag sioncronú…</string>
+    <string name="reject">Diúltaigh</string>
+    <string name="preview">Réamhamharc</string>
+    <string name="join">Téigh isteach</string>
+    <string name="remove">Bain</string>
+    <string name="_continue">Lean ar aghaidh</string>
+    <string name="no">NÍL</string>
+    <string name="yes">TÁ</string>
+    <string name="media_slider_saved">Sábháilte</string>
+    <string name="permissions_rationale_popup_title">Eolas</string>
+    <string name="call_hold_action">Fan</string>
+    <string name="call_resume_action">Tosaigh arís</string>
+    <string name="call_ring">ag Glaoch ar…</string>
+    <string name="call">Glaoigh ar</string>
+    <string name="settings_call_category">Glaonna</string>
+    <string name="today">Inniu</string>
+    <string name="yesterday">Inné</string>
+    <string name="compression_opt_list_small">Beag</string>
+    <string name="compression_opt_list_medium">Meánach</string>
+    <string name="compression_opt_list_large">Mór</string>
+    <string name="compression_opt_list_original">Bunchóip</string>
+    <string name="auth_password_placeholder">Pasfhocal</string>
+    <string name="auth_skip">Léim</string>
+    <string name="auth_submit">Cuir isteach</string>
+    <string name="call_camera_back">Ar Ais</string>
+    <string name="call_camera_front">Tosaigh</string>
+    <string name="sound_device_headset">Gléas cinn</string>
+    <string name="sound_device_speaker">Callaire</string>
+    <string name="sound_device_phone">Guthán</string>
+    <string name="search">Cuardaigh</string>
+    <string name="username">Ainm úsáideora</string>
+    <string name="read_receipt">Léite</string>
+    <string name="groups_header">Pobail</string>
+    <string name="groups_invite_header">Tabhair cuireadh</string>
+    <string name="rooms_header">Seomraí</string>
+    <string name="direct_chats_header">Comhráite</string>
+    <string name="invitations_header">Cuirí</string>
+    <string name="bottom_action_groups">Pobail</string>
+    <string name="bottom_action_rooms">Seomraí</string>
+    <string name="bottom_action_people">Daoine</string>
+    <string name="bottom_action_favourites">Ceanáin</string>
+    <string name="bottom_action_notification">Fógraí</string>
+    <string name="bottom_action_home">Tús</string>
+    <string name="dialog_title_success">Rath</string>
+    <string name="dialog_title_error">Earráid</string>
+    <string name="dialog_title_warning">Rabhadh</string>
+    <string name="dialog_title_confirmation">Deimhniú</string>
+    <string name="action_return">Fill</string>
+    <string name="disable">Cuir as feidhm</string>
+    <string name="action_unpublish">Neamhfoilsigh</string>
+    <string name="action_switch">Athraigh</string>
+    <string name="action_add">Cuir</string>
+    <string name="action_copy">Cóipeáil</string>
+    <string name="action_close">Dún</string>
+    <string name="action_open">Oscail</string>
+    <string name="action_historical">Stairiúil</string>
+    <string name="actions">Gníomhartha</string>
+    <string name="action_exit">Fág</string>
+    <string name="call_notification_reject">Diúltaigh</string>
+    <string name="call_notification_answer">Glac</string>
+    <string name="decline">Diúltaigh</string>
+    <string name="review">Athbhreithnigh</string>
+    <string name="ignore">Déan neamhaird de</string>
+    <string name="abort">Tobscoir</string>
+    <string name="done">Críochnaithe</string>
+    <string name="skip">Léim</string>
+    <string name="accept">Glac</string>
+    <string name="offline">As líne</string>
+    <string name="invite">Tabhair cuireadh</string>
+    <string name="or">nó</string>
+    <string name="ongoing_conference_call_video">Fís</string>
+    <string name="ongoing_conference_call_voice">Guth</string>
+    <string name="reset">Athshocraigh</string>
+    <string name="dismiss">Cuir uait</string>
+    <string name="pause_video">Cuir ar sos</string>
+    <string name="play_video">Cuir ar siúl</string>
+    <string name="disconnect">Dícheangail</string>
+    <string name="revoke">Cúlghair</string>
+    <string name="none">Níl aon cheann</string>
+    <string name="rename">Athainmnigh</string>
+    <string name="delete">Bain amach</string>
+    <string name="permalink">Nasc buan</string>
+    <string name="forward">Seol ar aghaidh</string>
+    <string name="later">Níos deireanaí</string>
+    <string name="clear">Glan</string>
+    <string name="speak">Labhair</string>
+    <string name="share">Roinn le</string>
+    <string name="download">Íoslódáil</string>
+    <string name="quote">Luaigh</string>
+    <string name="redact">Bain</string>
+    <string name="resend">Athsheol</string>
+    <string name="send">Seol</string>
+    <string name="stay">Fan</string>
+    <string name="leave">Fág</string>
+    <string name="save">Sábháil</string>
+    <string name="cancel">Cealaigh</string>
+    <string name="ok">Ceart go leor</string>
+    <string name="loading">Ag lódáil…</string>
+    <string name="title_activity_historical">Stairiúil</string>
+    <string name="title_activity_settings">Socruithe</string>
+    <string name="title_activity_room">Seomra</string>
+    <string name="title_activity_home">Teachtaireachtaí</string>
+    <string name="notification_sync_in_progress">Ag sioncronú…</string>
+    <string name="power_level_custom_no_value">Saincheaptha</string>
+    <string name="power_level_default">Réamhshocrú</string>
+    <string name="power_level_moderator">Modhnóir</string>
+    <string name="power_level_admin">Riarthóir</string>
+    <string name="notice_room_visibility_world_readable">aon duine.</string>
+    <string name="summary_message">%1$s: %2$s</string>
+</resources>
\ No newline at end of file

From 64bdd894d6b83d94029ca2c14fbe21e8c01ffcb0 Mon Sep 17 00:00:00 2001
From: Graeme Power <gjpower@tcd.ie>
Date: Sun, 14 Mar 2021 16:53:48 +0000
Subject: [PATCH 362/578] Translated using Weblate (Irish)

Currently translated at 7.6% (1 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ga/
---
 fastlane/metadata/android/ga/title.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/ga/title.txt

diff --git a/fastlane/metadata/android/ga/title.txt b/fastlane/metadata/android/ga/title.txt
new file mode 100644
index 0000000000..85dd3fa07f
--- /dev/null
+++ b/fastlane/metadata/android/ga/title.txt
@@ -0,0 +1 @@
+Element (Riot.im roimhe sin)

From 1eda7fa5bb11cecb832d06cf238e407bb4b0648b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Mar 2021 10:35:03 +0100
Subject: [PATCH 363/578] Prepare release 1.1.3

---
 CHANGES.md                                    | 27 +++----------------
 .../android/en-US/changelogs/40101030.txt     |  2 ++
 2 files changed, 5 insertions(+), 24 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40101030.txt

diff --git a/CHANGES.md b/CHANGES.md
index aa94c67be7..d410a5033d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,32 +1,11 @@
-Changes in Element 1.1.3 (2021-XX-XX)
+Changes in Element 1.1.3 (2021-03-18)
 ===================================================
 
-Features ✨:
- -
-
-Improvements 🙌:
- -
-
 Bugfix 🐛:
  - Fix regression in UpdateTrustWorker (introduced in 1.1.2)
  - Timeline : Fix ripple effect on text item and fix background color of separators.
 
-Translations 🗣:
- -
-
-SDK API changes ⚠️:
- -
-
-Build 🧱:
- -
-
-Test:
- -
-
-Other changes:
- -
-
-Changes in Element 1.1.2 (2021-03-16)
+Changes in Element 1.1.2 (2021-03-16) (was not published tp GPlay prod)
 ===================================================
 
 Improvements 🙌:
@@ -42,7 +21,7 @@ Bugfix 🐛:
 Other changes:
  - Change formatting on issue templates to proper headings.
 
-Changes in Element 1.1.1 (2021-03-10)
+Changes in Element 1.1.1 (2021-03-10) (was not published tp GPlay prod)
 ===================================================
 
 Improvements 🙌:
diff --git a/fastlane/metadata/android/en-US/changelogs/40101030.txt b/fastlane/metadata/android/en-US/changelogs/40101030.txt
new file mode 100644
index 0000000000..22d116fbfe
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Main changes in this version: performance improvement and bug fixes!
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.3
\ No newline at end of file

From 3078adf0da4bca1a1484554851462a8747d2d661 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Mar 2021 10:40:33 +0100
Subject: [PATCH 364/578] Version++

---
 CHANGES.md          | 27 +++++++++++++++++++++++++++
 vector/build.gradle |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d410a5033d..cad62d0851 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+Changes in Element 1.1.4 (2021-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ -
+
+Build 🧱:
+ -
+
+Test:
+ -
+
+Other changes:
+ -
+
 Changes in Element 1.1.3 (2021-03-18)
 ===================================================
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 0468c68614..008a165aae 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 1
-ext.versionPatch = 3
+ext.versionPatch = 4
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 9946ba8aa4bdf4bd9b5f27041641fdd3c59667d6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 11:07:31 +0100
Subject: [PATCH 365/578] Split network request `/keys/query` into smaller
 requests (250 users max) (#2925)

---
 CHANGES.md                                    |  2 +-
 .../crypto/tasks/DownloadKeysForUsersTask.kt  | 63 ++++++++++++++++---
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cad62d0851..594ac8e84d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Split network request `/keys/query` into smaller requests (250 users max) (#2925)
 
 Bugfix 🐛:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
index 5eb24b116a..c78a5cb74c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
@@ -16,13 +16,21 @@
 
 package org.matrix.android.sdk.internal.crypto.tasks
 
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.joinAll
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import org.matrix.android.sdk.internal.crypto.api.CryptoApi
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceKeysWithUnsigned
 import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryBody
 import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryResponse
+import org.matrix.android.sdk.internal.crypto.model.rest.RestKeyInfo
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
+import kotlin.math.ceil
 
 internal interface DownloadKeysForUsersTask : Task<DownloadKeysForUsersTask.Params, KeysQueryResponse> {
     data class Params(
@@ -39,15 +47,56 @@ internal class DefaultDownloadKeysForUsers @Inject constructor(
 ) : DownloadKeysForUsersTask {
 
     override suspend fun execute(params: DownloadKeysForUsersTask.Params): KeysQueryResponse {
-        val downloadQuery = params.userIds.associateWith { emptyList<String>() }
+        val numberOfChunks = ceil(params.userIds.size / LIMIT.toDouble()).toInt().coerceAtLeast(1)
+        val chunkSize = params.userIds.size / numberOfChunks
 
-        val body = KeysQueryBody(
-                deviceKeys = downloadQuery,
-                token = params.token?.takeIf { it.isNotEmpty() }
-        )
+        // Store server results in these mutable maps
+        val deviceKeys = mutableMapOf<String, Map<String, DeviceKeysWithUnsigned>>()
+        val failures = mutableMapOf<String, Map<String, Any>>()
+        val masterKeys = mutableMapOf<String, RestKeyInfo?>()
+        val selfSigningKeys = mutableMapOf<String, RestKeyInfo?>()
+        val userSigningKeys = mutableMapOf<String, RestKeyInfo?>()
 
-        return executeRequest(globalErrorReceiver) {
-            apiCall = cryptoApi.downloadKeysForUsers(body)
+        val mutex = Mutex()
+
+        // Split network request into smaller request (#2925)
+        coroutineScope {
+            params.userIds
+                    .chunked(chunkSize)
+                    .map {
+                        KeysQueryBody(
+                                deviceKeys = it.associateWith { emptyList() },
+                                token = params.token?.takeIf { token -> token.isNotEmpty() }
+                        )
+                    }
+                    .map { body ->
+                        async {
+                            val result = executeRequest<KeysQueryResponse>(globalErrorReceiver) {
+                                apiCall = cryptoApi.downloadKeysForUsers(body)
+                            }
+
+                            mutex.withLock {
+                                deviceKeys.putAll(result.deviceKeys.orEmpty())
+                                failures.putAll(result.failures.orEmpty())
+                                masterKeys.putAll(result.masterKeys.orEmpty())
+                                selfSigningKeys.putAll(result.selfSigningKeys.orEmpty())
+                                userSigningKeys.putAll(result.userSigningKeys.orEmpty())
+                            }
+                        }
+                    }
+                    .joinAll()
         }
+
+        return KeysQueryResponse(
+                deviceKeys = deviceKeys,
+                failures = failures,
+                masterKeys = masterKeys,
+                selfSigningKeys = selfSigningKeys,
+                userSigningKeys = userSigningKeys
+        )
+    }
+
+    companion object {
+        const val LIMIT = 250
     }
 }

From 103ba463c38ec5532f8ebb28d09897db237d2f69 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 11:34:27 +0100
Subject: [PATCH 366/578] Create getBetsChunkSize to avoid code duplication

---
 .../crypto/tasks/DownloadKeysForUsersTask.kt  |  9 +--
 .../internal/session/sync/RoomSyncHandler.kt  | 18 ++---
 .../android/sdk/internal/util/MathUtils.kt    | 43 +++++++++++
 .../android/sdk/internal/util/MathUtilTest.kt | 73 +++++++++++++++++++
 4 files changed, 129 insertions(+), 14 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
 create mode 100644 matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
index c78a5cb74c..3f1f5299d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
@@ -29,12 +29,12 @@ import org.matrix.android.sdk.internal.crypto.model.rest.RestKeyInfo
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.getBetsChunkSize
 import javax.inject.Inject
-import kotlin.math.ceil
 
 internal interface DownloadKeysForUsersTask : Task<DownloadKeysForUsersTask.Params, KeysQueryResponse> {
     data class Params(
-            // the list of users to get keys for.
+            // the list of users to get keys for. The list MUST NOT be empty
             val userIds: List<String>,
             // the up-to token
             val token: String?
@@ -47,8 +47,7 @@ internal class DefaultDownloadKeysForUsers @Inject constructor(
 ) : DownloadKeysForUsersTask {
 
     override suspend fun execute(params: DownloadKeysForUsersTask.Params): KeysQueryResponse {
-        val numberOfChunks = ceil(params.userIds.size / LIMIT.toDouble()).toInt().coerceAtLeast(1)
-        val chunkSize = params.userIds.size / numberOfChunks
+        val bestChunkSize = getBetsChunkSize(params.userIds.size, LIMIT)
 
         // Store server results in these mutable maps
         val deviceKeys = mutableMapOf<String, Map<String, DeviceKeysWithUnsigned>>()
@@ -62,7 +61,7 @@ internal class DefaultDownloadKeysForUsers @Inject constructor(
         // Split network request into smaller request (#2925)
         coroutineScope {
             params.userIds
-                    .chunked(chunkSize)
+                    .chunked(bestChunkSize.chunkSize)
                     .map {
                         KeysQueryBody(
                                 deviceKeys = it.associateWith { emptyList() },
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 0f97d0cb39..4553ff90ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -64,9 +64,9 @@ import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral
 import org.matrix.android.sdk.internal.session.sync.model.RoomSync
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncAccountData
 import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
+import org.matrix.android.sdk.internal.util.getBetsChunkSize
 import timber.log.Timber
 import javax.inject.Inject
-import kotlin.math.ceil
 
 internal class RoomSyncHandler @Inject constructor(private val readReceiptHandler: ReadReceiptHandler,
                                                    private val roomSummaryUpdater: RoomSummaryUpdater,
@@ -140,17 +140,17 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                             syncLocalTimeStampMillis: Long,
                                             aggregator: SyncResponsePostTreatmentAggregator,
                                             reporter: ProgressReporter?) {
-        val maxSize = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
-        val listSize = handlingStrategy.data.keys.size
-        val numberOfChunks = ceil(listSize / maxSize.toDouble()).toInt()
+        val bestChunkSize = getBetsChunkSize(
+                listSize = handlingStrategy.data.keys.size,
+                limit = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
+        )
 
-        if (numberOfChunks > 1) {
-            reportSubtask(reporter, InitSyncStep.ImportingAccountJoinedRooms, numberOfChunks, 0.6f) {
-                val chunkSize = listSize / numberOfChunks
-                Timber.d("INIT_SYNC $listSize rooms to insert, split into $numberOfChunks sublists of $chunkSize items")
+        if (bestChunkSize.shouldSplit()) {
+            reportSubtask(reporter, InitSyncStep.ImportingAccountJoinedRooms, bestChunkSize.numberOfChunks, 0.6f) {
+                Timber.d("INIT_SYNC ${handlingStrategy.data.keys.size} rooms to insert, split with $bestChunkSize")
                 // I cannot find a better way to chunk a map, so chunk the keys and then create new maps
                 handlingStrategy.data.keys
-                        .chunked(chunkSize)
+                        .chunked(bestChunkSize.chunkSize)
                         .forEachIndexed { index, roomIds ->
                             val roomEntities = roomIds
                                     .also { Timber.d("INIT_SYNC insert ${roomIds.size} rooms") }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
new file mode 100644
index 0000000000..6abf917ab0
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util
+
+import kotlin.math.ceil
+
+internal data class BestChunkSize(
+        val numberOfChunks: Int,
+        val chunkSize: Int
+) {
+    fun shouldSplit() = numberOfChunks > 1
+}
+
+internal fun getBetsChunkSize(listSize: Int, limit: Int): BestChunkSize {
+    return if (listSize <= limit) {
+        BestChunkSize(
+                numberOfChunks = 1,
+                chunkSize = listSize
+        )
+    } else {
+        val numberOfChunks = ceil(listSize / limit.toDouble()).toInt()
+        val chunkSize = listSize / numberOfChunks
+
+        BestChunkSize(
+                numberOfChunks = numberOfChunks,
+                chunkSize = chunkSize
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
new file mode 100644
index 0000000000..7cb355a621
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util
+
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldHaveSize
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.MatrixTest
+
+@FixMethodOrder(MethodSorters.JVM)
+class MathUtilTest : MatrixTest {
+
+    @Test
+    fun testGetBestChunkSize0() = doTest(0, 100, 1, 0)
+
+    @Test
+    fun testGetBestChunkSize1() = doTest(1, 100, 1, 1)
+
+    @Test
+    fun testGetBestChunkSize5() = doTest(5, 100, 1, 5)
+
+    @Test
+    fun testGetBestChunkSize99() = doTest(99, 100, 1, 99)
+
+    @Test
+    fun testGetBestChunkSize100() = doTest(100, 100, 1, 100)
+
+    @Test
+    fun testGetBestChunkSize101() = doTest(101, 100, 2, 50)
+
+    @Test
+    fun testGetBestChunkSize199() = doTest(199, 100, 2, 99)
+
+    @Test
+    fun testGetBestChunkSize200() = doTest(200, 100, 2, 100)
+
+    @Test
+    fun testGetBestChunkSize201() = doTest(201, 100, 3, 67)
+
+    @Test
+    fun testGetBestChunkSize240() = doTest(240, 100, 3, 80)
+
+    private fun doTest(listSize: Int, limit: Int, expectedNumberOfChunks: Int, expectedChunkSize: Int) {
+        val result = getBetsChunkSize(listSize, limit)
+
+        result.numberOfChunks shouldBeEqualTo expectedNumberOfChunks
+        result.chunkSize shouldBeEqualTo expectedChunkSize
+
+        // Test that the result make sense, when we use chunked()
+        if (result.chunkSize > 0) {
+            generateSequence { "a" }
+                    .take(listSize)
+                    .chunked(result.chunkSize)
+                    .shouldHaveSize(result.numberOfChunks)
+        }
+    }
+}

From da9f0c66671d4c964dcc43833d68ade797aa690f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 12:03:01 +0100
Subject: [PATCH 367/578] Fix an issue discovered by unit test

---
 .../java/org/matrix/android/sdk/internal/util/MathUtils.kt    | 3 ++-
 .../java/org/matrix/android/sdk/internal/util/MathUtilTest.kt | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
index 6abf917ab0..0e18b62acd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
@@ -33,7 +33,8 @@ internal fun getBetsChunkSize(listSize: Int, limit: Int): BestChunkSize {
         )
     } else {
         val numberOfChunks = ceil(listSize / limit.toDouble()).toInt()
-        val chunkSize = listSize / numberOfChunks
+        // Round on next Int
+        val chunkSize = ceil(listSize / numberOfChunks.toDouble()).toInt()
 
         BestChunkSize(
                 numberOfChunks = numberOfChunks,
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
index 7cb355a621..f684d93310 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
@@ -42,10 +42,10 @@ class MathUtilTest : MatrixTest {
     fun testGetBestChunkSize100() = doTest(100, 100, 1, 100)
 
     @Test
-    fun testGetBestChunkSize101() = doTest(101, 100, 2, 50)
+    fun testGetBestChunkSize101() = doTest(101, 100, 2, 51)
 
     @Test
-    fun testGetBestChunkSize199() = doTest(199, 100, 2, 99)
+    fun testGetBestChunkSize199() = doTest(199, 100, 2, 100)
 
     @Test
     fun testGetBestChunkSize200() = doTest(200, 100, 2, 100)

From f6032da7885efca70074617d235ac5aade5d91e0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 16 Mar 2021 12:05:36 +0100
Subject: [PATCH 368/578] Add more test

---
 .../matrix/android/sdk/internal/util/MathUtilTest.kt | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
index f684d93310..3abb3db6ca 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
@@ -30,13 +30,11 @@ class MathUtilTest : MatrixTest {
     fun testGetBestChunkSize0() = doTest(0, 100, 1, 0)
 
     @Test
-    fun testGetBestChunkSize1() = doTest(1, 100, 1, 1)
-
-    @Test
-    fun testGetBestChunkSize5() = doTest(5, 100, 1, 5)
-
-    @Test
-    fun testGetBestChunkSize99() = doTest(99, 100, 1, 99)
+    fun testGetBestChunkSize1to99() {
+        for (i in 1..99) {
+            doTest(i, 100, 1, i)
+        }
+    }
 
     @Test
     fun testGetBestChunkSize100() = doTest(100, 100, 1, 100)

From 96b37a8206f8518924e059f428ee9202d4292dc6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Mar 2021 10:57:28 +0100
Subject: [PATCH 369/578] Fix typo

---
 .../crypto/tasks/DownloadKeysForUsersTask.kt   |  4 ++--
 .../internal/session/sync/RoomSyncHandler.kt   |  6 +++---
 .../android/sdk/internal/util/MathUtils.kt     |  4 ++--
 .../android/sdk/internal/util/MathUtilTest.kt  | 18 +++++++++---------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
index 3f1f5299d0..ccf374ad7c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
@@ -29,7 +29,7 @@ import org.matrix.android.sdk.internal.crypto.model.rest.RestKeyInfo
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
-import org.matrix.android.sdk.internal.util.getBetsChunkSize
+import org.matrix.android.sdk.internal.util.computeBestChunkSize
 import javax.inject.Inject
 
 internal interface DownloadKeysForUsersTask : Task<DownloadKeysForUsersTask.Params, KeysQueryResponse> {
@@ -47,7 +47,7 @@ internal class DefaultDownloadKeysForUsers @Inject constructor(
 ) : DownloadKeysForUsersTask {
 
     override suspend fun execute(params: DownloadKeysForUsersTask.Params): KeysQueryResponse {
-        val bestChunkSize = getBetsChunkSize(params.userIds.size, LIMIT)
+        val bestChunkSize = computeBestChunkSize(params.userIds.size, LIMIT)
 
         // Store server results in these mutable maps
         val deviceKeys = mutableMapOf<String, Map<String, DeviceKeysWithUnsigned>>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 4553ff90ed..e938d54903 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -64,7 +64,7 @@ import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral
 import org.matrix.android.sdk.internal.session.sync.model.RoomSync
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncAccountData
 import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
-import org.matrix.android.sdk.internal.util.getBetsChunkSize
+import org.matrix.android.sdk.internal.util.computeBestChunkSize
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -140,12 +140,12 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                                             syncLocalTimeStampMillis: Long,
                                             aggregator: SyncResponsePostTreatmentAggregator,
                                             reporter: ProgressReporter?) {
-        val bestChunkSize = getBetsChunkSize(
+        val bestChunkSize = computeBestChunkSize(
                 listSize = handlingStrategy.data.keys.size,
                 limit = (initialSyncStrategy as? InitialSyncStrategy.Optimized)?.maxRoomsToInsert ?: Int.MAX_VALUE
         )
 
-        if (bestChunkSize.shouldSplit()) {
+        if (bestChunkSize.shouldChunk()) {
             reportSubtask(reporter, InitSyncStep.ImportingAccountJoinedRooms, bestChunkSize.numberOfChunks, 0.6f) {
                 Timber.d("INIT_SYNC ${handlingStrategy.data.keys.size} rooms to insert, split with $bestChunkSize")
                 // I cannot find a better way to chunk a map, so chunk the keys and then create new maps
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
index 0e18b62acd..c9c597e93d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MathUtils.kt
@@ -22,10 +22,10 @@ internal data class BestChunkSize(
         val numberOfChunks: Int,
         val chunkSize: Int
 ) {
-    fun shouldSplit() = numberOfChunks > 1
+    fun shouldChunk() = numberOfChunks > 1
 }
 
-internal fun getBetsChunkSize(listSize: Int, limit: Int): BestChunkSize {
+internal fun computeBestChunkSize(listSize: Int, limit: Int): BestChunkSize {
     return if (listSize <= limit) {
         BestChunkSize(
                 numberOfChunks = 1,
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
index 3abb3db6ca..ade811f9b7 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/MathUtilTest.kt
@@ -27,35 +27,35 @@ import org.matrix.android.sdk.MatrixTest
 class MathUtilTest : MatrixTest {
 
     @Test
-    fun testGetBestChunkSize0() = doTest(0, 100, 1, 0)
+    fun testComputeBestChunkSize0() = doTest(0, 100, 1, 0)
 
     @Test
-    fun testGetBestChunkSize1to99() {
+    fun testComputeBestChunkSize1to99() {
         for (i in 1..99) {
             doTest(i, 100, 1, i)
         }
     }
 
     @Test
-    fun testGetBestChunkSize100() = doTest(100, 100, 1, 100)
+    fun testComputeBestChunkSize100() = doTest(100, 100, 1, 100)
 
     @Test
-    fun testGetBestChunkSize101() = doTest(101, 100, 2, 51)
+    fun testComputeBestChunkSize101() = doTest(101, 100, 2, 51)
 
     @Test
-    fun testGetBestChunkSize199() = doTest(199, 100, 2, 100)
+    fun testComputeBestChunkSize199() = doTest(199, 100, 2, 100)
 
     @Test
-    fun testGetBestChunkSize200() = doTest(200, 100, 2, 100)
+    fun testComputeBestChunkSize200() = doTest(200, 100, 2, 100)
 
     @Test
-    fun testGetBestChunkSize201() = doTest(201, 100, 3, 67)
+    fun testComputeBestChunkSize201() = doTest(201, 100, 3, 67)
 
     @Test
-    fun testGetBestChunkSize240() = doTest(240, 100, 3, 80)
+    fun testComputeBestChunkSize240() = doTest(240, 100, 3, 80)
 
     private fun doTest(listSize: Int, limit: Int, expectedNumberOfChunks: Int, expectedChunkSize: Int) {
-        val result = getBetsChunkSize(listSize, limit)
+        val result = computeBestChunkSize(listSize, limit)
 
         result.numberOfChunks shouldBeEqualTo expectedNumberOfChunks
         result.chunkSize shouldBeEqualTo expectedChunkSize

From dbff5015df3d4ce43627975f918c199dddb04215 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Mar 2021 11:56:19 +0100
Subject: [PATCH 370/578] Keep is simple if there is no need to chunk

---
 .../crypto/tasks/DownloadKeysForUsersTask.kt  | 89 +++++++++++--------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
index ccf374ad7c..0c17cbb43a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
@@ -48,51 +48,64 @@ internal class DefaultDownloadKeysForUsers @Inject constructor(
 
     override suspend fun execute(params: DownloadKeysForUsersTask.Params): KeysQueryResponse {
         val bestChunkSize = computeBestChunkSize(params.userIds.size, LIMIT)
+        val token = params.token?.takeIf { token -> token.isNotEmpty() }
 
-        // Store server results in these mutable maps
-        val deviceKeys = mutableMapOf<String, Map<String, DeviceKeysWithUnsigned>>()
-        val failures = mutableMapOf<String, Map<String, Any>>()
-        val masterKeys = mutableMapOf<String, RestKeyInfo?>()
-        val selfSigningKeys = mutableMapOf<String, RestKeyInfo?>()
-        val userSigningKeys = mutableMapOf<String, RestKeyInfo?>()
+        return if (bestChunkSize.shouldChunk()) {
+            // Store server results in these mutable maps
+            val deviceKeys = mutableMapOf<String, Map<String, DeviceKeysWithUnsigned>>()
+            val failures = mutableMapOf<String, Map<String, Any>>()
+            val masterKeys = mutableMapOf<String, RestKeyInfo?>()
+            val selfSigningKeys = mutableMapOf<String, RestKeyInfo?>()
+            val userSigningKeys = mutableMapOf<String, RestKeyInfo?>()
 
-        val mutex = Mutex()
+            val mutex = Mutex()
 
-        // Split network request into smaller request (#2925)
-        coroutineScope {
-            params.userIds
-                    .chunked(bestChunkSize.chunkSize)
-                    .map {
-                        KeysQueryBody(
-                                deviceKeys = it.associateWith { emptyList() },
-                                token = params.token?.takeIf { token -> token.isNotEmpty() }
-                        )
-                    }
-                    .map { body ->
-                        async {
-                            val result = executeRequest<KeysQueryResponse>(globalErrorReceiver) {
-                                apiCall = cryptoApi.downloadKeysForUsers(body)
-                            }
+            // Split network request into smaller request (#2925)
+            coroutineScope {
+                params.userIds
+                        .chunked(bestChunkSize.chunkSize)
+                        .map {
+                            KeysQueryBody(
+                                    deviceKeys = it.associateWith { emptyList() },
+                                    token = token
+                            )
+                        }
+                        .map { body ->
+                            async {
+                                val result = executeRequest<KeysQueryResponse>(globalErrorReceiver) {
+                                    apiCall = cryptoApi.downloadKeysForUsers(body)
+                                }
 
-                            mutex.withLock {
-                                deviceKeys.putAll(result.deviceKeys.orEmpty())
-                                failures.putAll(result.failures.orEmpty())
-                                masterKeys.putAll(result.masterKeys.orEmpty())
-                                selfSigningKeys.putAll(result.selfSigningKeys.orEmpty())
-                                userSigningKeys.putAll(result.userSigningKeys.orEmpty())
+                                mutex.withLock {
+                                    deviceKeys.putAll(result.deviceKeys.orEmpty())
+                                    failures.putAll(result.failures.orEmpty())
+                                    masterKeys.putAll(result.masterKeys.orEmpty())
+                                    selfSigningKeys.putAll(result.selfSigningKeys.orEmpty())
+                                    userSigningKeys.putAll(result.userSigningKeys.orEmpty())
+                                }
                             }
                         }
-                    }
-                    .joinAll()
-        }
+                        .joinAll()
+            }
 
-        return KeysQueryResponse(
-                deviceKeys = deviceKeys,
-                failures = failures,
-                masterKeys = masterKeys,
-                selfSigningKeys = selfSigningKeys,
-                userSigningKeys = userSigningKeys
-        )
+            KeysQueryResponse(
+                    deviceKeys = deviceKeys,
+                    failures = failures,
+                    masterKeys = masterKeys,
+                    selfSigningKeys = selfSigningKeys,
+                    userSigningKeys = userSigningKeys
+            )
+        } else {
+            // No need to chunk, direct request
+            executeRequest(globalErrorReceiver) {
+                apiCall = cryptoApi.downloadKeysForUsers(
+                        KeysQueryBody(
+                                deviceKeys = params.userIds.associateWith { emptyList() },
+                                token = token
+                        )
+                )
+            }
+        }
     }
 
     companion object {

From 973e111dad86144026a55ba3e69793f5d1c76471 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 12:12:17 +0000
Subject: [PATCH 371/578] Bump epoxy_version from 4.4.2 to 4.4.3

Bumps `epoxy_version` from 4.4.2 to 4.4.3.

Updates `epoxy` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-glide-preloading` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-processor` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Updates `epoxy-paging` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index ab3d2dc449..70538b100a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -290,7 +290,7 @@ android {
 
 dependencies {
 
-    def epoxy_version = '4.4.2'
+    def epoxy_version = '4.4.3'
     def fragment_version = '1.3.0'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'

From 35635c859d973aa55d0c18933ad03bae753388e7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 18 Mar 2021 15:08:56 +0100
Subject: [PATCH 372/578] Send several NO_OLM in one request

---
 CHANGES.md                                    |  2 +-
 .../algorithms/megolm/MXMegolmEncryption.kt   | 39 +++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cad62d0851..c7f214e1c0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Crypto improvement | Bulck send NO_OLM withheld code
 
 Bugfix 🐛:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 6b91c0b859..cf13f0e789 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -67,8 +67,9 @@ internal class MXMegolmEncryption(
 
     init {
         // restore existing outbound session if any
-       outboundSession = olmDevice.restoreOutboundGroupSessionForRoom(roomId)
+        outboundSession = olmDevice.restoreOutboundGroupSessionForRoom(roomId)
     }
+
     // Default rotation periods
     // TODO: Make it configurable via parameters
     // Session rotation periods
@@ -125,6 +126,7 @@ internal class MXMegolmEncryption(
 
         Timber.v("## CRYPTO | preshareKey ${System.currentTimeMillis() - ts} millis")
     }
+
     /**
      * Prepare a new session.
      *
@@ -240,6 +242,7 @@ internal class MXMegolmEncryption(
         val contentMap = MXUsersDevicesMap<Any>()
         var haveTargets = false
         val userIds = results.userIds
+        val noOlmToNotify = mutableListOf<UserDevice>()
         for (userId in userIds) {
             val devicesToShareWith = devicesByUser[userId]
             for ((deviceID) in devicesToShareWith!!) {
@@ -251,13 +254,7 @@ internal class MXMegolmEncryption(
                     // MSC 2399
                     // send withheld m.no_olm: an olm session could not be established.
                     // This may happen, for example, if the sender was unable to obtain a one-time key from the recipient.
-                    notifyKeyWithHeld(
-                            listOf(UserDevice(userId, deviceID)),
-                            session.sessionId,
-                            olmDevice.deviceCurve25519Key,
-                            WithHeldCode.NO_OLM
-                    )
-
+                    noOlmToNotify.add(UserDevice(userId, deviceID))
                     continue
                 }
                 Timber.i("## CRYPTO | shareUserDevicesKey() : Add to share keys contentMap for $userId:$deviceID")
@@ -277,14 +274,14 @@ internal class MXMegolmEncryption(
                 session.sharedWithHelper.markedSessionAsShared(userId, deviceId, chainIndex)
                 gossipingEventBuffer.add(
                         Event(
-                        type = EventType.ROOM_KEY,
-                        senderId = this.userId,
-                        content = submap.apply {
-                            this["session_key"] = ""
-                            // we add a fake key for trail
-                            this["_dest"] = "$userId|$deviceId"
-                        }
-                ))
+                                type = EventType.ROOM_KEY,
+                                senderId = this.userId,
+                                content = submap.apply {
+                                    this["session_key"] = ""
+                                    // we add a fake key for trail
+                                    this["_dest"] = "$userId|$deviceId"
+                                }
+                        ))
             }
         }
 
@@ -304,6 +301,16 @@ internal class MXMegolmEncryption(
         } else {
             Timber.i("## CRYPTO | shareUserDevicesKey() : no need to sharekey")
         }
+
+        if (noOlmToNotify.isNotEmpty()) {
+            //XXX offload?, as they won't read the message anyhow?
+            notifyKeyWithHeld(
+                    noOlmToNotify,
+                    session.sessionId,
+                    olmDevice.deviceCurve25519Key,
+                    WithHeldCode.NO_OLM
+            )
+        }
     }
 
     private suspend fun notifyKeyWithHeld(targets: List<UserDevice>,

From 9f475989509984e2cc84e9c88527456885249cd4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Mar 2021 18:01:21 +0100
Subject: [PATCH 373/578] Display the room shield in all room setting screens

---
 CHANGES.md                                               | 2 +-
 .../app/features/roomprofile/alias/RoomAliasFragment.kt  | 1 +
 .../roomprofile/banned/RoomBannedMemberListFragment.kt   | 1 +
 .../roomprofile/members/RoomMemberListFragment.kt        | 1 +
 .../roomprofile/permissions/RoomPermissionsFragment.kt   | 1 +
 .../roomprofile/settings/RoomSettingsFragment.kt         | 1 +
 .../main/res/layout/fragment_room_setting_generic.xml    | 9 +++++++++
 7 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index cad62d0851..e559879648 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Display the room shield in all room setting screens
 
 Bugfix 🐛:
  -
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
index 2fc1575341..1c5f8fe3af 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasFragment.kt
@@ -128,6 +128,7 @@ class RoomAliasFragment @Inject constructor(
         state.roomSummary()?.let {
             views.roomSettingsToolbarTitleView.text = it.displayName
             avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
+            views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
index 556d950230..620d65781c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
@@ -117,6 +117,7 @@ class RoomBannedMemberListFragment @Inject constructor(
         state.roomSummary()?.let {
             views.roomSettingsToolbarTitleView.text = it.displayName
             avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
+            views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 1db9200451..2ff89d6e54 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -140,6 +140,7 @@ class RoomMemberListFragment @Inject constructor(
         state.roomSummary()?.let {
             views.roomSettingGeneric.roomSettingsToolbarTitleView.text = it.displayName
             avatarRenderer.render(it.toMatrixItem(), views.roomSettingGeneric.roomSettingsToolbarAvatarImageView)
+            views.roomSettingGeneric.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt
index 61635c9b31..a538c9269b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsFragment.kt
@@ -91,6 +91,7 @@ class RoomPermissionsFragment @Inject constructor(
         state.roomSummary()?.let {
             views.roomSettingsToolbarTitleView.text = it.displayName
             avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
+            views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index e431dbfcd6..129888ee04 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -154,6 +154,7 @@ class RoomSettingsFragment @Inject constructor(
         state.roomSummary()?.let {
             views.roomSettingsToolbarTitleView.text = it.displayName
             avatarRenderer.render(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
+            views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
         }
 
         invalidateOptionsMenu()
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index c11ce07062..9c3827f919 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -34,6 +34,15 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:src="@tools:sample/avatars" />
 
+            <im.vector.app.core.ui.views.ShieldImageView
+                android:id="@+id/roomSettingsDecorationToolbarAvatarImageView"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                app:layout_constraintCircle="@+id/roomSettingsToolbarAvatarImageView"
+                app:layout_constraintCircleAngle="135"
+                app:layout_constraintCircleRadius="20dp"
+                tools:ignore="MissingConstraints" />
+
             <TextView
                 android:id="@+id/roomSettingsToolbarTitleView"
                 android:layout_width="0dp"

From a3c331019dd546316583066c291bbb4e579f740d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Mar 2021 19:18:12 +0100
Subject: [PATCH 374/578] Remove roomId from DevTools item (copy/paste error)

---
 .../im/vector/app/features/roomprofile/RoomProfileController.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index bb7d041199..10e6dceebe 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -222,7 +222,6 @@ class RoomProfileController @Inject constructor(
             buildProfileAction(
                     id = "devTools",
                     title = stringProvider.getString(R.string.dev_tools_menu_name),
-                    subtitle = roomSummary.roomId,
                     dividerColor = dividerColor,
                     divider = false,
                     editable = true,

From ec50f891a29e80d931af1664f3433197959c4295 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 18 Mar 2021 19:22:29 +0100
Subject: [PATCH 375/578] Improve description format

---
 .../IncomingVerificationRequestHandler.kt             | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index 48f3f0a460..fc526b5322 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -119,13 +119,18 @@ class IncomingVerificationRequestHandler @Inject constructor(
         Timber.v("## SAS verificationRequestCreated ${pr.transactionId}")
         // For incoming request we should prompt (if not in activity where this request apply)
         if (pr.isIncoming) {
-            val user = session?.getUser(pr.otherUserId)
+            val user = session?.getUser(pr.otherUserId)?.toMatrixItem()
             val name = user?.getBestName() ?: pr.otherUserId
+            val description = if (name == pr.otherUserId) {
+                name
+            } else {
+                "$name (${pr.otherUserId})"
+            }
 
             val alert = VerificationVectorAlert(
                     uniqueIdForVerificationRequest(pr),
                     context.getString(R.string.sas_incoming_request_notif_title),
-                    "$name(${pr.otherUserId})",
+                    description,
                     R.drawable.ic_shield_black,
                     shouldBeDisplayedIn = { activity ->
                         if (activity is RoomDetailActivity) {
@@ -136,7 +141,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
                     }
             )
                     .apply {
-                        viewBinder = VerificationVectorAlert.ViewBinder(user?.toMatrixItem(), avatarRenderer.get())
+                        viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer.get())
                         contentAction = Runnable {
                             (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let {
                                 val roomId = pr.roomId

From 92f1390407dac3fc78cbd51b9c00b858c057e298 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 07:11:14 +0000
Subject: [PATCH 376/578] Bump gradle from 4.1.2 to 4.1.3

Bumps gradle from 4.1.2 to 4.1.3.

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ec7ec8c1de..4e2c81a379 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.google.gms:google-services:4.3.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1'

From cfefde0c06f3b1baa354a81c0075a5bc032097ab Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 19 Mar 2021 10:23:23 +0100
Subject: [PATCH 377/578] Update CHANGES.md

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c7f214e1c0..8e302599ac 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- - Crypto improvement | Bulck send NO_OLM withheld code
+ - Crypto improvement | Bulk send NO_OLM withheld code
 
 Bugfix 🐛:
  -

From 2d75c67aa39a0267ac9886f3479efe76969074a1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 19 Mar 2021 10:24:40 +0100
Subject: [PATCH 378/578] ktlint

---
 .../sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index cf13f0e789..697711d051 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -303,7 +303,7 @@ internal class MXMegolmEncryption(
         }
 
         if (noOlmToNotify.isNotEmpty()) {
-            //XXX offload?, as they won't read the message anyhow?
+            // XXX offload?, as they won't read the message anyhow?
             notifyKeyWithHeld(
                     noOlmToNotify,
                     session.sessionId,

From 80db39a93449902f1d610f17014bac3e08063dd4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 13:15:13 +0100
Subject: [PATCH 379/578] No alert possible in SignedOutActivity

---
 .../main/java/im/vector/app/features/popup/PopupAlertManager.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 67ef0514f2..3228ffa6e1 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -26,6 +26,7 @@ import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.isAnimationDisabled
 import im.vector.app.features.pin.PinActivity
+import im.vector.app.features.signout.hard.SignedOutActivity
 import im.vector.app.features.themes.ThemeUtils
 import timber.log.Timber
 import java.lang.ref.WeakReference
@@ -294,6 +295,7 @@ class PopupAlertManager @Inject constructor() {
     private fun shouldBeDisplayedIn(alert: VectorAlert?, activity: Activity): Boolean {
         return alert != null
                 && activity !is PinActivity
+                && activity !is SignedOutActivity
                 && activity is VectorBaseActivity<*>
                 && alert.shouldBeDisplayedIn.invoke(activity)
     }

From 3b1635130843d8f64d65d0bc79af6ee8d31e17f9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 13:36:24 +0100
Subject: [PATCH 380/578] Fix bad theme change for the MainActivity

---
 CHANGES.md                                                   | 2 +-
 vector/src/main/java/im/vector/app/features/MainActivity.kt  | 3 +++
 .../im/vector/app/features/themes/ActivityOtherThemes.kt     | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index e559879648..c3fde19bc4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  - Display the room shield in all room setting screens
 
 Bugfix 🐛:
- -
+ - Fix bad theme change for the MainActivity
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index 143506d4df..e6c5abe20c 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -43,6 +43,7 @@ import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.signout.hard.SignedOutActivity
 import im.vector.app.features.signout.soft.SoftLogoutActivity
+import im.vector.app.features.themes.ActivityOtherThemes
 import im.vector.app.features.ui.UiStateRepository
 import kotlinx.parcelize.Parcelize
 import kotlinx.coroutines.Dispatchers
@@ -83,6 +84,8 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
 
     override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
 
+    override fun getOtherThemes() = ActivityOtherThemes.Launcher
+
     private lateinit var args: MainActivityArgs
 
     @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
diff --git a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
index 847caeab4c..a1065ed10b 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
@@ -31,6 +31,11 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int,
             R.style.AppTheme_Black
     )
 
+    object Launcher : ActivityOtherThemes(
+            R.style.AppTheme_Launcher,
+            R.style.AppTheme_Launcher
+    )
+
     object AttachmentsPreview : ActivityOtherThemes(
             R.style.AppTheme_AttachmentsPreview,
             R.style.AppTheme_AttachmentsPreview

From adca3de3b5d982136ee6012bcc2eff7425ee31d5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 13:48:49 +0100
Subject: [PATCH 381/578] Improve message with Emoji only detection (#3017)

---
 CHANGES.md                                             | 1 +
 vector/src/main/java/im/vector/app/core/utils/Emoji.kt | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index c3fde19bc4..f0a8c2bfe0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Features ✨:
 
 Improvements 🙌:
  - Display the room shield in all room setting screens
+ - Improve message with Emoji only detection (#3017)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
diff --git a/vector/src/main/java/im/vector/app/core/utils/Emoji.kt b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
index b3b9a39f30..b665236137 100644
--- a/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
@@ -16,8 +16,10 @@
 
 package im.vector.app.core.utils
 
+import com.vanniktech.emoji.EmojiUtils
 import java.util.regex.Pattern
 
+/*
 private val emojisPattern = Pattern.compile("((?:[\uD83C\uDF00-\uD83D\uDDFF]" +
         "|[\uD83E\uDD00-\uD83E\uDDFF]" +
         "|[\uD83D\uDE00-\uD83D\uDE4F]" +
@@ -41,6 +43,7 @@ private val emojisPattern = Pattern.compile("((?:[\uD83C\uDF00-\uD83D\uDDFF]" +
         "|\uD83C\uDC04\uFE0F?" +
         "|\uD83C\uDCCF\uFE0F?" +
         "|[\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA]\uFE0F?))")
+ */
 
 /*
 // A hashset from all supported emoji
@@ -82,6 +85,9 @@ fun isSingleEmoji(string: String): Boolean {
  * @return true if the body contains only emojis
  */
 fun containsOnlyEmojis(str: String?): Boolean {
+    // Now rely on vanniktech library
+    return EmojiUtils.isOnlyEmojis(str)
+    /*
     var res = false
 
     if (str != null && str.isNotEmpty()) {
@@ -112,6 +118,7 @@ fun containsOnlyEmojis(str: String?): Boolean {
     }
 
     return res
+     */
 }
 
 /**

From 0eea257a25a089131daa07c9a432f1ed44727cb6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 14:15:17 +0100
Subject: [PATCH 382/578] Improve layout for more clarity

---
 .../fragment_ssss_access_from_passphrase.xml  | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 6dd94d0d75..fc57d53ab3 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -8,7 +8,9 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingTop="32dp"
+        android:paddingBottom="32dp">
 
         <ImageView
             android:id="@+id/ssss_shield"
@@ -28,7 +30,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginTop="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/recovery_passphrase"
             android:textColor="?riotx_text_primary"
@@ -38,7 +39,6 @@
             app:layout_constraintStart_toEndOf="@id/ssss_shield"
             app:layout_constraintTop_toTopOf="parent" />
 
-
         <TextView
             android:id="@+id/ssss_restore_with_passphrase_warning_text"
             android:layout_width="0dp"
@@ -51,7 +51,6 @@
             app:layout_constraintTop_toBottomOf="@id/ssss_restore_with_passphrase"
             tools:text="@string/enter_secret_storage_passphrase_or_key" />
 
-
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/ssss_passphrase_enter_til"
             style="@style/VectorTextInputLayout"
@@ -82,61 +81,62 @@
             android:layout_width="@dimen/layout_touch_size"
             android:layout_height="@dimen/layout_touch_size"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til"
             app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til"
             app:tint="?colorAccent" />
 
-        <!--        -->
-
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/ssss_passphrase_use_key"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/use_recovery_key"
-            app:icon="@drawable/ic_security_key_24dp"
-            tools:ignore="MissingConstraints" />
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ssss_passphrase_submit"
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/_continue"
-            tools:ignore="MissingConstraints" />
-
-        <androidx.constraintlayout.helper.widget.Flow
-            android:id="@+id/ssss_passphrase_flow"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            app:constraint_referenced_ids="ssss_passphrase_use_key,ssss_passphrase_submit"
-            app:flow_horizontalStyle="spread_inside"
-            app:flow_wrapMode="chain"
+            android:text="@string/_continue"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_enter_til" />
+
+        <TextView
+            android:id="@+id/ssss_passphrase_or"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/or"
+            android:textColor="?riotx_text_primary"
+            android:textSize="18sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_submit" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/ssss_passphrase_use_key"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/use_recovery_key"
+            app:icon="@drawable/ic_security_key_24dp"
             app:layout_constraintBottom_toTopOf="@+id/ssss_passphrase_reset"
-            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_enter_til"
-            app:layout_goneMarginBottom="32dp" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_or" />
 
         <im.vector.app.core.ui.views.BottomSheetActionButton
             android:id="@+id/ssss_passphrase_reset"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginBottom="32dp"
             android:clickable="true"
             android:focusable="true"
             app:actionTitle="@string/bad_passphrase_key_reset_all_action"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_flow"
+            app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_use_key"
             app:leftIcon="@drawable/ic_alert_triangle"
             app:tint="@color/vector_error_color"
             app:titleTextColor="?riotx_text_secondary" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </ScrollView>
\ No newline at end of file

From fa1de6e6b0b8baa9a63a6a47bedab2a0f4c03a00 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 14:25:52 +0100
Subject: [PATCH 383/578] Disable color because there is no action behind.

---
 .../crypto/quads/SharedSecuredStoragePassphraseFragment.kt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
index 37d8bf9b46..ba2c923d8b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
@@ -30,10 +30,8 @@ import im.vector.app.R
 import im.vector.app.core.extensions.showPassword
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.databinding.FragmentSsssAccessFromPassphraseBinding
 import io.reactivex.android.schedulers.AndroidSchedulers
-
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -59,8 +57,9 @@ class SharedSecuredStoragePassphraseFragment @Inject constructor(
                 key
         )
                 .toSpannable()
-                .colorizeMatchingText(pass, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
-                .colorizeMatchingText(key, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
+        // TODO Restore coloration when we will have a FAQ to open with those terms
+        // .colorizeMatchingText(pass, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
+        // .colorizeMatchingText(key, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
 
         views.ssssPassphraseEnterEdittext.editorActionEvents()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)

From 485c44454b49760e66ce4e2c9a10299262cf3b89 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 15:27:56 +0100
Subject: [PATCH 384/578] Handle encrypted reactions (#2509)

---
 CHANGES.md                                                 | 1 +
 .../session/room/EventRelationsAggregationProcessor.kt     | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index f0a8c2bfe0..23252ac709 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
+ - Handle encrypted reactions (#2509)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 60440c6359..13aab36911 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -158,6 +158,13 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                                 }
                             }
                         }
+                    } else if (encryptedEventContent?.relatesTo?.type == RelationType.ANNOTATION) {
+                        // Reaction
+                        if (event.getClearType() == EventType.REACTION) {
+                            // we got a reaction!!
+                            Timber.v("###REACTION e2e in room $roomId , reaction eventID ${event.eventId}")
+                            handleReaction(event, roomId, realm, userId, isLocalEcho)
+                        }
                     }
                 }
                 EventType.REDACTION            -> {

From 294df236c560bfbb9fe0f0baa866aca8bf6b6fe3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 15:33:25 +0100
Subject: [PATCH 385/578] Hide encrypted reactions from the timeline (#2509)

---
 .../home/room/detail/timeline/factory/TimelineItemFactory.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index ccc8289e08..73f101d1f5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -64,7 +64,6 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.STATE_ROOM_SERVER_ACL,
                 EventType.STATE_ROOM_GUEST_ACCESS,
                 EventType.STATE_ROOM_POWER_LEVELS,
-                EventType.REACTION,
                 EventType.REDACTION             -> noticeItemFactory.create(event, highlight, callback)
                 EventType.STATE_ROOM_WIDGET_LEGACY,
                 EventType.STATE_ROOM_WIDGET     -> widgetItemFactory.create(event, highlight, callback)
@@ -91,6 +90,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.KEY_VERIFICATION_KEY,
                 EventType.KEY_VERIFICATION_READY,
                 EventType.KEY_VERIFICATION_MAC,
+                EventType.REACTION,
                 EventType.CALL_CANDIDATES,
                 EventType.CALL_REPLACES,
                 EventType.CALL_SELECT_ANSWER,

From 7e2a5e55f77764bf67ce5823ab9bde44e5d77baf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 15:38:14 +0100
Subject: [PATCH 386/578] Simplify signature, userId is a member of the class

---
 .../EventRelationsAggregationProcessor.kt     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 13aab36911..8913842074 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -53,8 +53,9 @@ import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class EventRelationsAggregationProcessor @Inject constructor(@UserId private val userId: String)
-    : EventInsertLiveProcessor {
+internal class EventRelationsAggregationProcessor @Inject constructor(
+        @UserId private val userId: String
+) : EventInsertLiveProcessor {
 
     private val allowedTypes = listOf(
             EventType.MESSAGE,
@@ -87,7 +88,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                 EventType.REACTION             -> {
                     // we got a reaction!!
                     Timber.v("###REACTION in room $roomId , reaction eventID ${event.eventId}")
-                    handleReaction(event, roomId, realm, userId, isLocalEcho)
+                    handleReaction(event, roomId, realm, isLocalEcho)
                 }
                 EventType.MESSAGE              -> {
                     if (event.unsignedData?.relations?.annotations != null) {
@@ -108,7 +109,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                         handleReplace(realm, event, content, roomId, isLocalEcho)
                     } else if (content?.relatesTo?.type == RelationType.RESPONSE) {
                         Timber.v("###RESPONSE in room $roomId for event ${event.eventId}")
-                        handleResponse(realm, userId, event, content, roomId, isLocalEcho)
+                        handleResponse(realm, event, content, roomId, isLocalEcho)
                     }
                 }
 
@@ -122,7 +123,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                     Timber.v("## SAS REF in room $roomId for event ${event.eventId}")
                     event.content.toModel<MessageRelationContent>()?.relatesTo?.let {
                         if (it.type == RelationType.REFERENCE && it.eventId != null) {
-                            handleVerification(realm, event, roomId, isLocalEcho, it.eventId, userId)
+                            handleVerification(realm, event, roomId, isLocalEcho, it.eventId)
                         }
                     }
                 }
@@ -140,7 +141,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                                 handleReplace(realm, event, it, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId)
                             } else if (encryptedEventContent.relatesTo.type == RelationType.RESPONSE) {
                                 Timber.v("###RESPONSE in room $roomId for event ${event.eventId}")
-                                handleResponse(realm, userId, event, it, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId)
+                                handleResponse(realm, event, it, roomId, isLocalEcho, encryptedEventContent.relatesTo.eventId)
                             }
                         }
                     } else if (encryptedEventContent?.relatesTo?.type == RelationType.REFERENCE) {
@@ -154,7 +155,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                             EventType.KEY_VERIFICATION_KEY -> {
                                 Timber.v("## SAS REF in room $roomId for event ${event.eventId}")
                                 encryptedEventContent.relatesTo.eventId?.let {
-                                    handleVerification(realm, event, roomId, isLocalEcho, it, userId)
+                                    handleVerification(realm, event, roomId, isLocalEcho, it)
                                 }
                             }
                         }
@@ -163,7 +164,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                         if (event.getClearType() == EventType.REACTION) {
                             // we got a reaction!!
                             Timber.v("###REACTION e2e in room $roomId , reaction eventID ${event.eventId}")
-                            handleReaction(event, roomId, realm, userId, isLocalEcho)
+                            handleReaction(event, roomId, realm, isLocalEcho)
                         }
                     }
                 }
@@ -183,7 +184,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
                             }
                         }
                         EventType.REACTION -> {
-                            handleReactionRedact(eventToPrune, realm, userId)
+                            handleReactionRedact(eventToPrune, realm)
                         }
                     }
                 }
@@ -274,7 +275,6 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
     }
 
     private fun handleResponse(realm: Realm,
-                               userId: String,
                                event: Event,
                                content: MessageContent,
                                roomId: String,
@@ -383,7 +383,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
         }
     }
 
-    private fun handleReaction(event: Event, roomId: String, realm: Realm, userId: String, isLocalEcho: Boolean) {
+    private fun handleReaction(event: Event, roomId: String, realm: Realm, isLocalEcho: Boolean) {
         val content = event.content.toModel<ReactionContent>()
         if (content == null) {
             Timber.e("Malformed reaction content ${event.content}")
@@ -464,7 +464,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
         sourceToDiscard.deleteFromRealm()
     }
 
-    private fun handleReactionRedact(eventToPrune: EventEntity, realm: Realm, userId: String) {
+    private fun handleReactionRedact(eventToPrune: EventEntity, realm: Realm) {
         Timber.v("REDACTION of reaction ${eventToPrune.eventId}")
         // delete a reaction, need to update the annotation summary if any
         val reactionContent: ReactionContent = EventMapper.map(eventToPrune).content.toModel() ?: return
@@ -501,7 +501,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
         }
     }
 
-    private fun handleVerification(realm: Realm, event: Event, roomId: String, isLocalEcho: Boolean, relatedEventId: String, userId: String) {
+    private fun handleVerification(realm: Realm, event: Event, roomId: String, isLocalEcho: Boolean, relatedEventId: String) {
         val eventSummary = EventAnnotationsSummaryEntity.getOrCreate(realm, roomId, relatedEventId)
 
         val verifSummary = eventSummary.referencesSummaryEntity

From c43479420aa43201b79b7f8f0741aee2c94e0302 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 15:42:42 +0100
Subject: [PATCH 387/578] Reorder signature for clarity

---
 .../EventRelationsAggregationProcessor.kt     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 8913842074..c7e09e5954 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -88,12 +88,12 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                 EventType.REACTION             -> {
                     // we got a reaction!!
                     Timber.v("###REACTION in room $roomId , reaction eventID ${event.eventId}")
-                    handleReaction(event, roomId, realm, isLocalEcho)
+                    handleReaction(realm, event, roomId, isLocalEcho)
                 }
                 EventType.MESSAGE              -> {
                     if (event.unsignedData?.relations?.annotations != null) {
-                        Timber.v("###REACTION Agreggation in room $roomId for event ${event.eventId}")
-                        handleInitialAggregatedRelations(event, roomId, event.unsignedData.relations.annotations, realm)
+                        Timber.v("###REACTION Aggregation in room $roomId for event ${event.eventId}")
+                        handleInitialAggregatedRelations(realm, event, roomId, event.unsignedData.relations.annotations)
 
                         EventAnnotationsSummaryEntity.where(realm, roomId, event.eventId ?: "").findFirst()
                                 ?.let {
@@ -164,7 +164,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                         if (event.getClearType() == EventType.REACTION) {
                             // we got a reaction!!
                             Timber.v("###REACTION e2e in room $roomId , reaction eventID ${event.eventId}")
-                            handleReaction(event, roomId, realm, isLocalEcho)
+                            handleReaction(realm, event, roomId, isLocalEcho)
                         }
                     }
                 }
@@ -180,11 +180,11 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
                             // was this event a m.replace
                             val contentModel = ContentMapper.map(eventToPrune.content)?.toModel<MessageContent>()
                             if (RelationType.REPLACE == contentModel?.relatesTo?.type && contentModel.relatesTo?.eventId != null) {
-                                handleRedactionOfReplace(eventToPrune, contentModel.relatesTo!!.eventId!!, realm)
+                                handleRedactionOfReplace(realm, eventToPrune, contentModel.relatesTo!!.eventId!!)
                             }
                         }
                         EventType.REACTION -> {
-                            handleReactionRedact(eventToPrune, realm)
+                            handleReactionRedact(realm, eventToPrune)
                         }
                     }
                 }
@@ -361,7 +361,10 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
         existingPollSummary.aggregatedContent = ContentMapper.map(sumModel.toContent())
     }
 
-    private fun handleInitialAggregatedRelations(event: Event, roomId: String, aggregation: AggregatedAnnotation, realm: Realm) {
+    private fun handleInitialAggregatedRelations(realm: Realm,
+                                                 event: Event,
+                                                 roomId: String,
+                                                 aggregation: AggregatedAnnotation) {
         if (SHOULD_HANDLE_SERVER_AGREGGATION) {
             aggregation.chunk?.forEach {
                 if (it.type == EventType.REACTION) {
@@ -383,7 +386,10 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
         }
     }
 
-    private fun handleReaction(event: Event, roomId: String, realm: Realm, isLocalEcho: Boolean) {
+    private fun handleReaction(realm: Realm,
+                               event: Event,
+                               roomId: String,
+                               isLocalEcho: Boolean) {
         val content = event.content.toModel<ReactionContent>()
         if (content == null) {
             Timber.e("Malformed reaction content ${event.content}")
@@ -448,7 +454,9 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
     /**
      * Called when an event is deleted
      */
-    private fun handleRedactionOfReplace(redacted: EventEntity, relatedEventId: String, realm: Realm) {
+    private fun handleRedactionOfReplace(realm: Realm,
+                                         redacted: EventEntity,
+                                         relatedEventId: String) {
         Timber.d("Handle redaction of m.replace")
         val eventSummary = EventAnnotationsSummaryEntity.where(realm, redacted.roomId, relatedEventId).findFirst()
         if (eventSummary == null) {
@@ -464,7 +472,8 @@ internal class EventRelationsAggregationProcessor @Inject constructor(
         sourceToDiscard.deleteFromRealm()
     }
 
-    private fun handleReactionRedact(eventToPrune: EventEntity, realm: Realm) {
+    private fun handleReactionRedact(realm: Realm,
+                                     eventToPrune: EventEntity) {
         Timber.v("REDACTION of reaction ${eventToPrune.eventId}")
         // delete a reaction, need to update the annotation summary if any
         val reactionContent: ReactionContent = EventMapper.map(eventToPrune).content.toModel() ?: return

From 2ffcc63de882e5759abc98932bb9b63f42183b83 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 16:00:49 +0100
Subject: [PATCH 388/578] Typo

---
 docs/notifications.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/notifications.md b/docs/notifications.md
index 63bf593d0d..a00fef8fae 100644
--- a/docs/notifications.md
+++ b/docs/notifications.md
@@ -2,7 +2,7 @@ This document aims to describe how Element android displays notifications to the
 
 # Table of Contents
 1. [Prerequisites Knowledge](#prerequisites-knowledge)
-    * [How does a matrix client gets a message from a Home Server?](#how-does-a-matrix-client-gets-a-message-from-a-home-server)
+    * [How does a matrix client get a message from a Home Server?](#how-does-a-matrix-client-get-a-message-from-a-home-server)
     * [How does a mobile app receives push notification?](#how-does-a-mobile-app-receives-push-notification)
     * [Push VS Notification](#push-vs-notification)
     * [Push in the matrix federated world](#push-in-the-matrix-federated-world)
@@ -22,7 +22,7 @@ First let's start with some prerequisite knowledge
 
 # Prerequisites Knowledge
 
-## How does a matrix client gets a message from a Home Server?
+## How does a matrix client get a message from a Home Server?
 
 In order to get messages from a home server, a matrix client need to perform a ``sync`` operation.
 

From 684c0332d578dad0dbcf1e3a5b655e8b661183cb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 16:27:31 +0100
Subject: [PATCH 389/578] Remove commented out code

---
 .../java/im/vector/app/core/utils/Emoji.kt    | 90 -------------------
 1 file changed, 90 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/Emoji.kt b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
index b665236137..66907ded10 100644
--- a/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt
@@ -17,64 +17,6 @@
 package im.vector.app.core.utils
 
 import com.vanniktech.emoji.EmojiUtils
-import java.util.regex.Pattern
-
-/*
-private val emojisPattern = Pattern.compile("((?:[\uD83C\uDF00-\uD83D\uDDFF]" +
-        "|[\uD83E\uDD00-\uD83E\uDDFF]" +
-        "|[\uD83D\uDE00-\uD83D\uDE4F]" +
-        "|[\uD83D\uDE80-\uD83D\uDEFF]" +
-        "|[\u2600-\u26FF]\uFE0F?" +
-        "|[\u2700-\u27BF]\uFE0F?" +
-        "|\u24C2\uFE0F?" +
-        "|[\uD83C\uDDE6-\uD83C\uDDFF]{1,2}" +
-        "|[\uD83C\uDD70\uD83C\uDD71\uD83C\uDD7E\uD83C\uDD7F\uD83C\uDD8E\uD83C\uDD91-\uD83C\uDD9A]\uFE0F?" +
-        "|[\u0023\u002A\u0030-\u0039]\uFE0F?\u20E3" +
-        "|[\u2194-\u2199\u21A9-\u21AA]\uFE0F?" +
-        "|[\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55]\uFE0F?" +
-        "|[\u2934\u2935]\uFE0F?" +
-        "|[\u3030\u303D]\uFE0F?" +
-        "|[\u3297\u3299]\uFE0F?" +
-        "|[\uD83C\uDE01\uD83C\uDE02\uD83C\uDE1A\uD83C\uDE2F\uD83C\uDE32-\uD83C\uDE3A\uD83C\uDE50\uD83C\uDE51]\uFE0F?" +
-        "|[\u203C\u2049]\uFE0F?" +
-        "|[\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE]\uFE0F?" +
-        "|[\u00A9\u00AE]\uFE0F?" +
-        "|[\u2122\u2139]\uFE0F?" +
-        "|\uD83C\uDC04\uFE0F?" +
-        "|\uD83C\uDCCF\uFE0F?" +
-        "|[\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA]\uFE0F?))")
- */
-
-/*
-// A hashset from all supported emoji
-private var knownEmojiSet: HashSet<String>? = null
-
-fun initKnownEmojiHashSet(context: Context, done: (() -> Unit)? = null) {
-    GlobalScope.launch {
-        context.resources.openRawResource(R.raw.emoji_picker_datasource).use { input ->
-            val moshi = Moshi.Builder().build()
-            val jsonAdapter = moshi.adapter(EmojiData::class.java)
-            val inputAsString = input.bufferedReader().use { it.readText() }
-            val source = jsonAdapter.fromJson(inputAsString)
-            knownEmojiSet = HashSet<String>().also {
-                source?.emojis?.mapTo(it) { (_, value) ->
-                    value.emojiString()
-                }
-            }
-            done?.invoke()
-        }
-    }
-}
-
-fun isSingleEmoji(string: String): Boolean {
-    if (knownEmojiSet == null) {
-        Timber.e("Known Emoji Hashset not initialized")
-        // use fallback regexp
-        return containsOnlyEmojis(string)
-    }
-    return knownEmojiSet?.contains(string) ?: false
-}
- */
 
 /**
  * Test if a string contains emojis.
@@ -87,38 +29,6 @@ fun isSingleEmoji(string: String): Boolean {
 fun containsOnlyEmojis(str: String?): Boolean {
     // Now rely on vanniktech library
     return EmojiUtils.isOnlyEmojis(str)
-    /*
-    var res = false
-
-    if (str != null && str.isNotEmpty()) {
-        val matcher = emojisPattern.matcher(str)
-
-        var start = -1
-        var end = -1
-
-        while (matcher.find()) {
-            val nextStart = matcher.start()
-
-            // first emoji position
-            if (start < 0) {
-                if (nextStart > 0) {
-                    return false
-                }
-            } else {
-                // must not have a character between
-                if (nextStart != end) {
-                    return false
-                }
-            }
-            start = nextStart
-            end = matcher.end()
-        }
-
-        res = -1 != start && end == str.length
-    }
-
-    return res
-     */
 }
 
 /**

From fa370708842f102de530c53bc6cab11e7f4075c9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 17 Mar 2021 17:05:32 +0100
Subject: [PATCH 390/578] Disable URL preview for some domains (#2995)

---
 CHANGES.md                                          |  1 +
 .../room/detail/timeline/url/PreviewUrlRetriever.kt | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d2ba5babec..55c7387379 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
  - Handle encrypted reactions (#2509)
+ - Disable URL preview for some domains (#2995)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
index df75c0094b..4c018c8a99 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
@@ -52,7 +52,7 @@ class PreviewUrlRetriever(session: Session,
                 // The event is not known or it has been edited
                 // Keep only the first URL for the moment
                 val url = mediaService.extractUrls(event)
-                        .firstOrNull()
+                        .firstOrNull { canShowUrlPreview(it) }
                         ?.takeIf { it !in blockedUrl }
                 if (url == null) {
                     updateState(eventId, latestEventId, PreviewUrlUiState.NoUrl)
@@ -98,6 +98,10 @@ class PreviewUrlRetriever(session: Session,
         }
     }
 
+    private fun canShowUrlPreview(url: String): Boolean {
+        return blockedDomains.all { !url.startsWith(it) }
+    }
+
     fun doNotShowPreviewUrlFor(eventId: String, url: String) {
         blockedUrl.add(url)
 
@@ -143,5 +147,12 @@ class PreviewUrlRetriever(session: Session,
     companion object {
         // One week in millis
         private const val CACHE_VALIDITY: Long = 7 * 24 * 3_600 * 1_000
+
+        private val blockedDomains = listOf(
+                "https://matrix.to",
+                "https://app.element.io",
+                "https://staging.element.io",
+                "https://develop.element.io"
+        )
     }
 }

From 7b8ede03bc9ffde664589ad03a7e596c2b4c42d6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 19 Mar 2021 20:09:53 +0100
Subject: [PATCH 391/578] Picture preview when replying. Also add the image
 preview in the message detail bottomsheet (#2916)

---
 CHANGES.md                                    |  1 +
 .../BottomSheetMessagePreviewItem.kt          | 13 ++++
 .../home/room/detail/RoomDetailFragment.kt    | 13 ++++
 .../action/MessageActionsEpoxyController.kt   |  7 +++
 .../image/ImageContentRendererFactory.kt      | 63 +++++++++++++++++++
 .../src/main/res/layout/composer_layout.xml   |  7 +++
 ...composer_layout_constraint_set_compact.xml |  9 +++
 ...omposer_layout_constraint_set_expanded.xml | 21 +++++--
 .../item_bottom_sheet_message_preview.xml     | 16 ++++-
 9 files changed, 145 insertions(+), 5 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/image/ImageContentRendererFactory.kt

diff --git a/CHANGES.md b/CHANGES.md
index d2ba5babec..9bfc5a59a4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
  - Crypto improvement | Bulk send NO_OLM withheld code
  - Display the room shield in all room setting screens
  - Improve message with Emoji only detection (#3017)
+ - Picture preview when replying. Also add the image preview in the message detail bottomsheet (#2916)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
index a323ce995b..2f7c22e4b4 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
@@ -19,6 +19,7 @@ package im.vector.app.core.epoxy.bottomsheet
 import android.text.method.MovementMethod
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -27,6 +28,7 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.tools.findPillsAndProcess
+import im.vector.app.features.media.ImageContentRenderer
 import org.matrix.android.sdk.api.util.MatrixItem
 
 /**
@@ -44,6 +46,12 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
     @EpoxyAttribute
     lateinit var body: CharSequence
 
+    @EpoxyAttribute
+    var imageContentRenderer: ImageContentRenderer? = null
+
+    @EpoxyAttribute
+    var data: ImageContentRenderer.Data? = null
+
     @EpoxyAttribute
     var time: CharSequence? = null
 
@@ -59,6 +67,10 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         holder.avatar.setOnClickListener { userClicked?.invoke() }
         holder.sender.setOnClickListener { userClicked?.invoke() }
         holder.sender.setTextOrHide(matrixItem.displayName)
+        data?.let {
+            imageContentRenderer?.render(it, ImageContentRenderer.Mode.THUMBNAIL, holder.imagePreview)
+        }
+        holder.imagePreview.isVisible = data != null
         holder.body.movementMethod = movementMethod
         holder.body.text = body
         body.findPillsAndProcess(coroutineScope) { it.bind(holder.body) }
@@ -70,5 +82,6 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         val sender by bind<TextView>(R.id.bottom_sheet_message_preview_sender)
         val body by bind<TextView>(R.id.bottom_sheet_message_preview_body)
         val timestamp by bind<TextView>(R.id.bottom_sheet_message_preview_timestamp)
+        val imagePreview by bind<ImageView>(R.id.bottom_sheet_message_preview_image)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index a80aeb65b0..64bffcb49c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -98,6 +98,7 @@ import im.vector.app.core.ui.views.FailedMessagesWarningView
 import im.vector.app.core.ui.views.JumpToReadMarkerView
 import im.vector.app.core.ui.views.NotificationAreaView
 import im.vector.app.core.utils.Debouncer
+import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.KeyboardStateUtils
 import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES
 import im.vector.app.core.utils.TextUtils
@@ -137,6 +138,7 @@ import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBot
 import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel
 import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
+import im.vector.app.features.home.room.detail.timeline.image.buildImageContentRendererData
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem
@@ -223,6 +225,7 @@ class RoomDetailFragment @Inject constructor(
         private val eventHtmlRenderer: EventHtmlRenderer,
         private val vectorPreferences: VectorPreferences,
         private val colorProvider: ColorProvider,
+        private val dimensionConverter: DimensionConverter,
         private val notificationUtils: NotificationUtils,
         private val matrixItemColorProvider: MatrixItemColorProvider,
         private val imageContentRenderer: ImageContentRenderer,
@@ -873,6 +876,15 @@ class RoomDetailFragment @Inject constructor(
         }
         views.composerLayout.views.composerRelatedMessageContent.text = (formattedBody ?: nonFormattedBody)
 
+        // Image Event
+        val data = event.buildImageContentRendererData(dimensionConverter.dpToPx(66))
+        val isImageVisible = if (data != null) {
+            imageContentRenderer.render(data, ImageContentRenderer.Mode.THUMBNAIL, views.composerLayout.views.composerRelatedMessageImage)
+            true
+        } else {
+            false
+        }
+
         updateComposerText(defaultContent)
 
         views.composerLayout.views.composerRelatedMessageActionIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), iconRes))
@@ -884,6 +896,7 @@ class RoomDetailFragment @Inject constructor(
             if (isAdded) {
                 // need to do it here also when not using quick reply
                 focusComposerAndShowKeyboard()
+                views.composerLayout.views.composerRelatedMessageImage.isVisible = isImageVisible
             }
         }
         focusComposerAndShowKeyboard()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index 4e1492aaba..30587e6659 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -29,11 +29,14 @@ import im.vector.app.core.epoxy.bottomsheet.bottomSheetQuickReactionsItem
 import im.vector.app.core.epoxy.bottomsheet.bottomSheetSendStateItem
 import im.vector.app.core.epoxy.dividerItem
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.image.buildImageContentRendererData
 import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
 import im.vector.app.features.home.room.detail.timeline.tools.linkify
+import im.vector.app.features.media.ImageContentRenderer
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.room.send.SendState
 import javax.inject.Inject
@@ -45,6 +48,8 @@ class MessageActionsEpoxyController @Inject constructor(
         private val stringProvider: StringProvider,
         private val avatarRenderer: AvatarRenderer,
         private val fontProvider: EmojiCompatFontProvider,
+        private val imageContentRenderer: ImageContentRenderer,
+        private val dimensionConverter: DimensionConverter,
         private val dateFormatter: VectorDateFormatter
 ) : TypedEpoxyController<MessageActionState>() {
 
@@ -59,6 +64,8 @@ class MessageActionsEpoxyController @Inject constructor(
             avatarRenderer(avatarRenderer)
             matrixItem(state.informationData.matrixItem)
             movementMethod(createLinkMovementMethod(listener))
+            imageContentRenderer(imageContentRenderer)
+            data(state.timelineEvent()?.buildImageContentRendererData(dimensionConverter.dpToPx(66)))
             userClicked { listener?.didSelectMenuAction(EventSharedAction.OpenUserProfile(state.informationData.senderId)) }
             body(state.messageBody.linkify(listener))
             time(formattedDate)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/image/ImageContentRendererFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/image/ImageContentRendererFactory.kt
new file mode 100644
index 0000000000..7ff184f664
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/image/ImageContentRendererFactory.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.image
+
+import im.vector.app.features.media.ImageContentRenderer
+import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
+
+fun TimelineEvent.buildImageContentRendererData(maxHeight: Int): ImageContentRenderer.Data? {
+    return when {
+        root.isImageMessage() -> root.getClearContent().toModel<MessageImageContent>()
+                ?.let { messageImageContent ->
+                    ImageContentRenderer.Data(
+                            eventId = eventId,
+                            filename = messageImageContent.body,
+                            mimeType = messageImageContent.mimeType,
+                            url = messageImageContent.getFileUrl(),
+                            elementToDecrypt = messageImageContent.encryptedFileInfo?.toElementToDecrypt(),
+                            height = messageImageContent.info?.height,
+                            maxHeight = maxHeight,
+                            width = messageImageContent.info?.width,
+                            maxWidth = maxHeight * 2,
+                            allowNonMxcUrls = false
+                    )
+                }
+        root.isVideoMessage() -> root.getClearContent().toModel<MessageVideoContent>()
+                ?.let { messageVideoContent ->
+                    ImageContentRenderer.Data(
+                            eventId = eventId,
+                            filename = messageVideoContent.body,
+                            mimeType = messageVideoContent.mimeType,
+                            url = messageVideoContent.getFileUrl(),
+                            elementToDecrypt = messageVideoContent.encryptedFileInfo?.toElementToDecrypt(),
+                            height = messageVideoContent.videoInfo?.height,
+                            maxHeight = maxHeight,
+                            width = messageVideoContent.videoInfo?.width,
+                            maxWidth = maxHeight * 2,
+                            allowNonMxcUrls = false
+                    )
+                }
+        else                  -> null
+    }
+}
diff --git a/vector/src/main/res/layout/composer_layout.xml b/vector/src/main/res/layout/composer_layout.xml
index 0db905d015..e837d2d80b 100644
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@@ -68,6 +68,13 @@
         app:tint="?riotx_text_primary"
         tools:ignore="MissingConstraints,MissingPrefix" />
 
+    <ImageView
+        android:id="@+id/composerRelatedMessageImage"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:importantForAccessibility="no"
+        tools:ignore="MissingPrefix" />
+
     <ImageButton
         android:id="@+id/composerRelatedMessageCloseButton"
         android:layout_width="22dp"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
index 13c43f23cf..f9ccd9e545 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@@ -83,6 +83,15 @@
         tools:ignore="MissingConstraints,MissingPrefix"
         tools:src="@drawable/ic_edit" />
 
+    <ImageView
+        android:id="@+id/composerRelatedMessageImage"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toTopOf="parent"
+        app:layout_constraintStart_toEndOf="parent"
+        tools:ignore="MissingPrefix"
+        tools:src="@tools:sample/backgrounds/scenic" />
 
     <ImageButton
         android:id="@+id/composerRelatedMessageCloseButton"
diff --git a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
index 76ade25e97..50fb5d27b0 100644
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@@ -60,6 +60,20 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/first_names" />
 
+    <ImageView
+        android:id="@+id/composerRelatedMessageImage"
+        android:layout_width="100dp"
+        android:layout_height="66dp"
+        android:layout_marginTop="6dp"
+        android:importantForAccessibility="no"
+        android:scaleType="centerCrop"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="@+id/composerRelatedMessageTitle"
+        app:layout_constraintTop_toBottomOf="@+id/composerRelatedMessageTitle"
+        tools:ignore="MissingPrefix"
+        tools:src="@tools:sample/backgrounds/scenic"
+        tools:visibility="visible" />
+
     <TextView
         android:id="@+id/composerRelatedMessageContent"
         android:layout_width="0dp"
@@ -70,7 +84,7 @@
         app:layout_constrainedHeight="true"
         app:layout_constraintEnd_toEndOf="@id/composerRelatedMessageTitle"
         app:layout_constraintStart_toStartOf="@id/composerRelatedMessageTitle"
-        app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageTitle"
+        app:layout_constraintTop_toBottomOf="@id/composerRelatedMessageImage"
         tools:text="@tools:sample/lorem/random" />
 
     <ImageView
@@ -89,7 +103,6 @@
         tools:ignore="MissingPrefix"
         tools:src="@drawable/ic_edit" />
 
-
     <ImageButton
         android:id="@+id/composerRelatedMessageCloseButton"
         android:layout_width="48dp"
@@ -97,9 +110,9 @@
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/cancel"
         android:src="@drawable/ic_close_round"
-        app:layout_constraintBottom_toBottomOf="@id/composerRelatedMessageContent"
+        app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/composerRelatedMessageContent"
+        app:layout_constraintTop_toTopOf="parent"
         app:tint="@color/riotx_notice"
         tools:ignore="MissingPrefix" />
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 5fbed68955..afd96d5690 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -50,6 +50,20 @@
         app:layout_constraintEnd_toEndOf="parent"
         tools:text="Friday 8pm" />
 
+    <ImageView
+        android:id="@+id/bottom_sheet_message_preview_image"
+        android:layout_width="100dp"
+        android:layout_height="66dp"
+        android:layout_marginTop="6dp"
+        android:importantForAccessibility="no"
+        android:scaleType="centerCrop"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="@+id/bottom_sheet_message_preview_sender"
+        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_sender"
+        tools:ignore="MissingPrefix"
+        tools:src="@tools:sample/backgrounds/scenic"
+        tools:visibility="visible" />
+
     <TextView
         android:id="@+id/bottom_sheet_message_preview_body"
         android:layout_width="0dp"
@@ -65,7 +79,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
-        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_sender"
+        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_image"
         tools:text="Quis harum id autem cumque consequatur laboriosam aliquam sed. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. " />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From 0fc102461c6b743368ebb4b416c150f84c18140d Mon Sep 17 00:00:00 2001
From: oogm <ga84dom@mytum.de>
Date: Fri, 19 Mar 2021 22:24:43 +0100
Subject: [PATCH 392/578] Update import_emojis.py to pull keywords from
 emojilib, update quick reactions

---
 tools/import_emojis.py                        | 39 ++++++++++++++++++-
 .../reactions/data/EmojiDataSource.kt         | 12 +++---
 .../main/res/raw/emoji_picker_datasource.json |  2 +-
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/tools/import_emojis.py b/tools/import_emojis.py
index bdbade0e2d..6f204c23f2 100644
--- a/tools/import_emojis.py
+++ b/tools/import_emojis.py
@@ -1,3 +1,5 @@
+from collections import OrderedDict
+
 import requests
 import json
 import re
@@ -72,6 +74,41 @@ for row in table.find_all('tr'):
                 "j": emoji_keywords
         }
 
-# Print result to file (overwrite previous), without escaping unicode characters
+# The keywords of unicode.org are usually quite sparse.
+# There is no official specification of keywords beyond that, but muan/emojilib maintains a well maintained and
+# established repository with additional keywords. We extend our list with the keywords from there.
+# At the time of writing it had additional keyword information for all emojis except a few from the newest unicode 13.1.
+req = requests.get("https://raw.githubusercontent.com/muan/emojilib/main/dist/emoji-en-US.json")
+emojilib_data = json.loads(req.content)
+
+# We just go over all the official emojis from unicode, and add the keywords there
+for emoji in emoji_picker_datasource_emojis:
+    emoji_name = emoji_picker_datasource_emojis[emoji]["a"]
+    emoji_code = emoji_picker_datasource_emojis[emoji]["b"]
+
+    # Convert back to actual unicode emoji
+    emoji_unicode = ''.join(map(lambda s: chr(int(s, 16)), emoji_code.split("-")))
+
+    # Search for emoji in emojilib
+    if emoji_unicode in emojilib_data:
+        emoji_additional_keywords = emojilib_data[emoji_unicode]
+    elif emoji_unicode+chr(0xfe0f)  in emojilib_data:
+        emoji_additional_keywords = emojilib_data[emoji_unicode+chr(0xfe0f)]
+    else:
+        print("No additional keywords for", emoji_unicode, emoji_picker_datasource_emojis[emoji])
+        continue
+
+    # If additional keywords exist, add them to emoji_picker_datasource_emojis
+    # Avoid duplicates and keep order. Put official unicode.com keywords first and extend up with emojilib ones.
+    new_keywords = OrderedDict.fromkeys(emoji_picker_datasource_emojis[emoji]["j"] + emoji_additional_keywords).keys()
+    # Remove the ones derived from the unicode name
+    new_keywords = new_keywords - {emoji.replace("-", "_")} - {emoji.replace("-", " ")} - {emoji_name}
+    # Write new keywords back
+    emoji_picker_datasource_emojis[emoji]["j"] = list(new_keywords)
+
+# Filter out components from unicode 13.1 (as they are not suitable for single-emoji reactions)
+emoji_picker_datasource['categories'] = [x for x in emoji_picker_datasource['categories'] if x['id'] != 'component']
+
+# Write result to file (overwrite previous), without escaping unicode characters
 with open("../vector/src/main/res/raw/emoji_picker_datasource.json", "w") as outfile:
     json.dump(emoji_picker_datasource, outfile, ensure_ascii=False)
diff --git a/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
index 97f85ea1f5..96eda22eb9 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt
@@ -100,12 +100,12 @@ class EmojiDataSource @Inject constructor(
     fun getQuickReactions(): List<EmojiItem> {
         if (quickReactions.isEmpty()) {
             listOf(
-                    "+1", // 👍
-                    "-1", // 👎
-                    "grinning", // 😄
-                    "tada", // 🎉
-                    "confused", // 😕
-                    "heart", // ❤️
+                    "thumbs-up", // 👍
+                    "thumbs-down", // 👎
+                    "grinning-face-with-smiling-eyes", // 😄
+                    "party-popper", // 🎉
+                    "confused-face", // 😕
+                    "red-heart", // ❤️
                     "rocket", // 🚀
                     "eyes" // 👀
             )
diff --git a/vector/src/main/res/raw/emoji_picker_datasource.json b/vector/src/main/res/raw/emoji_picker_datasource.json
index bf33808f2f..e0314e9a77 100644
--- a/vector/src/main/res/raw/emoji_picker_datasource.json
+++ b/vector/src/main/res/raw/emoji_picker_datasource.json
@@ -1 +1 @@
-{"compressed": true, "categories": [{"id": "smileys_&_emotion", "name": "Smileys & Emotion", "emojis": ["grinning-face", "grinning-face-with-big-eyes", "grinning-face-with-smiling-eyes", "beaming-face-with-smiling-eyes", "grinning-squinting-face", "grinning-face-with-sweat", "rolling-on-the-floor-laughing", "face-with-tears-of-joy", "slightly-smiling-face", "upsidedown-face", "winking-face", "smiling-face-with-smiling-eyes", "smiling-face-with-halo", "smiling-face-with-hearts", "smiling-face-with-hearteyes", "starstruck", "face-blowing-a-kiss", "kissing-face", "smiling-face", "kissing-face-with-closed-eyes", "kissing-face-with-smiling-eyes", "smiling-face-with-tear", "face-savoring-food", "face-with-tongue", "winking-face-with-tongue", "zany-face", "squinting-face-with-tongue", "moneymouth-face", "hugging-face", "face-with-hand-over-mouth", "shushing-face", "thinking-face", "zippermouth-face", "face-with-raised-eyebrow", "neutral-face", "expressionless-face", "face-without-mouth", "face-in-clouds", "smirking-face", "unamused-face", "face-with-rolling-eyes", "grimacing-face", "face-exhaling", "lying-face", "relieved-face", "pensive-face", "sleepy-face", "drooling-face", "sleeping-face", "face-with-medical-mask", "face-with-thermometer", "face-with-headbandage", "nauseated-face", "face-vomiting", "sneezing-face", "hot-face", "cold-face", "woozy-face", "knockedout-face", "face-with-spiral-eyes", "exploding-head", "cowboy-hat-face", "partying-face", "disguised-face", "smiling-face-with-sunglasses", "nerd-face", "face-with-monocle", "confused-face", "worried-face", "slightly-frowning-face", "frowning-face", "face-with-open-mouth", "hushed-face", "astonished-face", "flushed-face", "pleading-face", "frowning-face-with-open-mouth", "anguished-face", "fearful-face", "anxious-face-with-sweat", "sad-but-relieved-face", "crying-face", "loudly-crying-face", "face-screaming-in-fear", "confounded-face", "persevering-face", "disappointed-face", "downcast-face-with-sweat", "weary-face", "tired-face", "yawning-face", "face-with-steam-from-nose", "pouting-face", "angry-face", "face-with-symbols-on-mouth", "smiling-face-with-horns", "angry-face-with-horns", "skull", "skull-and-crossbones", "pile-of-poo", "clown-face", "ogre", "goblin", "ghost", "alien", "alien-monster", "robot", "grinning-cat", "grinning-cat-with-smiling-eyes", "cat-with-tears-of-joy", "smiling-cat-with-hearteyes", "cat-with-wry-smile", "kissing-cat", "weary-cat", "crying-cat", "pouting-cat", "seenoevil-monkey", "hearnoevil-monkey", "speaknoevil-monkey", "kiss-mark", "love-letter", "heart-with-arrow", "heart-with-ribbon", "sparkling-heart", "growing-heart", "beating-heart", "revolving-hearts", "two-hearts", "heart-decoration", "heart-exclamation", "broken-heart", "heart-on-fire", "mending-heart", "red-heart", "orange-heart", "yellow-heart", "green-heart", "blue-heart", "purple-heart", "brown-heart", "black-heart", "white-heart", "hundred-points", "anger-symbol", "collision", "dizzy", "sweat-droplets", "dashing-away", "hole", "bomb", "speech-balloon", "eye-in-speech-bubble", "left-speech-bubble", "right-anger-bubble", "thought-balloon", "zzz"]}, {"id": "people_&_body", "name": "People & Body", "emojis": ["waving-hand", "raised-back-of-hand", "hand-with-fingers-splayed", "raised-hand", "vulcan-salute", "ok-hand", "pinched-fingers", "pinching-hand", "victory-hand", "crossed-fingers", "loveyou-gesture", "sign-of-the-horns", "call-me-hand", "backhand-index-pointing-left", "backhand-index-pointing-right", "backhand-index-pointing-up", "middle-finger", "backhand-index-pointing-down", "index-pointing-up", "thumbs-up", "thumbs-down", "raised-fist", "oncoming-fist", "leftfacing-fist", "rightfacing-fist", "clapping-hands", "raising-hands", "open-hands", "palms-up-together", "handshake", "folded-hands", "writing-hand", "nail-polish", "selfie", "flexed-biceps", "mechanical-arm", "mechanical-leg", "leg", "foot", "ear", "ear-with-hearing-aid", "nose", "brain", "anatomical-heart", "lungs", "tooth", "bone", "eyes", "eye", "tongue", "mouth", "baby", "child", "boy", "girl", "person", "person-blond-hair", "man", "person-beard", "man-beard", "woman-beard", "man-red-hair", "man-curly-hair", "man-white-hair", "man-bald", "woman", "woman-red-hair", "person-red-hair", "woman-curly-hair", "person-curly-hair", "woman-white-hair", "person-white-hair", "woman-bald", "person-bald", "woman-blond-hair", "man-blond-hair", "older-person", "old-man", "old-woman", "person-frowning", "man-frowning", "woman-frowning", "person-pouting", "man-pouting", "woman-pouting", "person-gesturing-no", "man-gesturing-no", "woman-gesturing-no", "person-gesturing-ok", "man-gesturing-ok", "woman-gesturing-ok", "person-tipping-hand", "man-tipping-hand", "woman-tipping-hand", "person-raising-hand", "man-raising-hand", "woman-raising-hand", "deaf-person", "deaf-man", "deaf-woman", "person-bowing", "man-bowing", "woman-bowing", "person-facepalming", "man-facepalming", "woman-facepalming", "person-shrugging", "man-shrugging", "woman-shrugging", "health-worker", "man-health-worker", "woman-health-worker", "student", "man-student", "woman-student", "teacher", "man-teacher", "woman-teacher", "judge", "man-judge", "woman-judge", "farmer", "man-farmer", "woman-farmer", "cook", "man-cook", "woman-cook", "mechanic", "man-mechanic", "woman-mechanic", "factory-worker", "man-factory-worker", "woman-factory-worker", "office-worker", "man-office-worker", "woman-office-worker", "scientist", "man-scientist", "woman-scientist", "technologist", "man-technologist", "woman-technologist", "singer", "man-singer", "woman-singer", "artist", "man-artist", "woman-artist", "pilot", "man-pilot", "woman-pilot", "astronaut", "man-astronaut", "woman-astronaut", "firefighter", "man-firefighter", "woman-firefighter", "police-officer", "man-police-officer", "woman-police-officer", "detective", "man-detective", "woman-detective", "guard", "man-guard", "woman-guard", "ninja", "construction-worker", "man-construction-worker", "woman-construction-worker", "prince", "princess", "person-wearing-turban", "man-wearing-turban", "woman-wearing-turban", "person-with-skullcap", "woman-with-headscarf", "person-in-tuxedo", "man-in-tuxedo", "woman-in-tuxedo", "person-with-veil", "man-with-veil", "woman-with-veil", "pregnant-woman", "breastfeeding", "woman-feeding-baby", "man-feeding-baby", "person-feeding-baby", "baby-angel", "santa-claus", "mrs-claus", "mx-claus", "superhero", "man-superhero", "woman-superhero", "supervillain", "man-supervillain", "woman-supervillain", "mage", "man-mage", "woman-mage", "fairy", "man-fairy", "woman-fairy", "vampire", "man-vampire", "woman-vampire", "merperson", "merman", "mermaid", "elf", "man-elf", "woman-elf", "genie", "man-genie", "woman-genie", "zombie", "man-zombie", "woman-zombie", "person-getting-massage", "man-getting-massage", "woman-getting-massage", "person-getting-haircut", "man-getting-haircut", "woman-getting-haircut", "person-walking", "man-walking", "woman-walking", "person-standing", "man-standing", "woman-standing", "person-kneeling", "man-kneeling", "woman-kneeling", "person-with-white-cane", "man-with-white-cane", "woman-with-white-cane", "person-in-motorized-wheelchair", "man-in-motorized-wheelchair", "woman-in-motorized-wheelchair", "person-in-manual-wheelchair", "man-in-manual-wheelchair", "woman-in-manual-wheelchair", "person-running", "man-running", "woman-running", "woman-dancing", "man-dancing", "person-in-suit-levitating", "people-with-bunny-ears", "men-with-bunny-ears", "women-with-bunny-ears", "person-in-steamy-room", "man-in-steamy-room", "woman-in-steamy-room", "person-climbing", "man-climbing", "woman-climbing", "person-fencing", "horse-racing", "skier", "snowboarder", "person-golfing", "man-golfing", "woman-golfing", "person-surfing", "man-surfing", "woman-surfing", "person-rowing-boat", "man-rowing-boat", "woman-rowing-boat", "person-swimming", "man-swimming", "woman-swimming", "person-bouncing-ball", "man-bouncing-ball", "woman-bouncing-ball", "person-lifting-weights", "man-lifting-weights", "woman-lifting-weights", "person-biking", "man-biking", "woman-biking", "person-mountain-biking", "man-mountain-biking", "woman-mountain-biking", "person-cartwheeling", "man-cartwheeling", "woman-cartwheeling", "people-wrestling", "men-wrestling", "women-wrestling", "person-playing-water-polo", "man-playing-water-polo", "woman-playing-water-polo", "person-playing-handball", "man-playing-handball", "woman-playing-handball", "person-juggling", "man-juggling", "woman-juggling", "person-in-lotus-position", "man-in-lotus-position", "woman-in-lotus-position", "person-taking-bath", "person-in-bed", "people-holding-hands", "women-holding-hands", "woman-and-man-holding-hands", "men-holding-hands", "kiss", "kiss-woman-man", "kiss-man-man", "kiss-woman-woman", "couple-with-heart", "couple-with-heart-woman-man", "couple-with-heart-man-man", "couple-with-heart-woman-woman", "family", "family-man-woman-boy", "family-man-woman-girl", "family-man-woman-girl-boy", "family-man-woman-boy-boy", "family-man-woman-girl-girl", "family-man-man-boy", "family-man-man-girl", "family-man-man-girl-boy", "family-man-man-boy-boy", "family-man-man-girl-girl", "family-woman-woman-boy", "family-woman-woman-girl", "family-woman-woman-girl-boy", "family-woman-woman-boy-boy", "family-woman-woman-girl-girl", "family-man-boy", "family-man-boy-boy", "family-man-girl", "family-man-girl-boy", "family-man-girl-girl", "family-woman-boy", "family-woman-boy-boy", "family-woman-girl", "family-woman-girl-boy", "family-woman-girl-girl", "speaking-head", "bust-in-silhouette", "busts-in-silhouette", "people-hugging", "footprints"]}, {"id": "animals_&_nature", "name": "Animals & Nature", "emojis": ["monkey-face", "monkey", "gorilla", "orangutan", "dog-face", "dog", "guide-dog", "service-dog", "poodle", "wolf", "fox", "raccoon", "cat-face", "cat", "black-cat", "lion", "tiger-face", "tiger", "leopard", "horse-face", "horse", "unicorn", "zebra", "deer", "bison", "cow-face", "ox", "water-buffalo", "cow", "pig-face", "pig", "boar", "pig-nose", "ram", "ewe", "goat", "camel", "twohump-camel", "llama", "giraffe", "elephant", "mammoth", "rhinoceros", "hippopotamus", "mouse-face", "mouse", "rat", "hamster", "rabbit-face", "rabbit", "chipmunk", "beaver", "hedgehog", "bat", "bear", "polar-bear", "koala", "panda", "sloth", "otter", "skunk", "kangaroo", "badger", "paw-prints", "turkey", "chicken", "rooster", "hatching-chick", "baby-chick", "frontfacing-baby-chick", "bird", "penguin", "dove", "eagle", "duck", "swan", "owl", "dodo", "feather", "flamingo", "peacock", "parrot", "frog", "crocodile", "turtle", "lizard", "snake", "dragon-face", "dragon", "sauropod", "trex", "spouting-whale", "whale", "dolphin", "seal", "fish", "tropical-fish", "blowfish", "shark", "octopus", "spiral-shell", "snail", "butterfly", "bug", "ant", "honeybee", "beetle", "lady-beetle", "cricket", "cockroach", "spider", "spider-web", "scorpion", "mosquito", "fly", "worm", "microbe", "bouquet", "cherry-blossom", "white-flower", "rosette", "rose", "wilted-flower", "hibiscus", "sunflower", "blossom", "tulip", "seedling", "potted-plant", "evergreen-tree", "deciduous-tree", "palm-tree", "cactus", "sheaf-of-rice", "herb", "shamrock", "four-leaf-clover", "maple-leaf", "fallen-leaf", "leaf-fluttering-in-wind"]}, {"id": "food_&_drink", "name": "Food & Drink", "emojis": ["grapes", "melon", "watermelon", "tangerine", "lemon", "banana", "pineapple", "mango", "red-apple", "green-apple", "pear", "peach", "cherries", "strawberry", "blueberries", "kiwi-fruit", "tomato", "olive", "coconut", "avocado", "eggplant", "potato", "carrot", "ear-of-corn", "hot-pepper", "bell-pepper", "cucumber", "leafy-green", "broccoli", "garlic", "onion", "mushroom", "peanuts", "chestnut", "bread", "croissant", "baguette-bread", "flatbread", "pretzel", "bagel", "pancakes", "waffle", "cheese-wedge", "meat-on-bone", "poultry-leg", "cut-of-meat", "bacon", "hamburger", "french-fries", "pizza", "hot-dog", "sandwich", "taco", "burrito", "tamale", "stuffed-flatbread", "falafel", "egg", "cooking", "shallow-pan-of-food", "pot-of-food", "fondue", "bowl-with-spoon", "green-salad", "popcorn", "butter", "salt", "canned-food", "bento-box", "rice-cracker", "rice-ball", "cooked-rice", "curry-rice", "steaming-bowl", "spaghetti", "roasted-sweet-potato", "oden", "sushi", "fried-shrimp", "fish-cake-with-swirl", "moon-cake", "dango", "dumpling", "fortune-cookie", "takeout-box", "crab", "lobster", "shrimp", "squid", "oyster", "soft-ice-cream", "shaved-ice", "ice-cream", "doughnut", "cookie", "birthday-cake", "shortcake", "cupcake", "pie", "chocolate-bar", "candy", "lollipop", "custard", "honey-pot", "baby-bottle", "glass-of-milk", "hot-beverage", "teapot", "teacup-without-handle", "sake", "bottle-with-popping-cork", "wine-glass", "cocktail-glass", "tropical-drink", "beer-mug", "clinking-beer-mugs", "clinking-glasses", "tumbler-glass", "cup-with-straw", "bubble-tea", "beverage-box", "mate", "ice", "chopsticks", "fork-and-knife-with-plate", "fork-and-knife", "spoon", "kitchen-knife", "amphora"]}, {"id": "travel_&_places", "name": "Travel & Places", "emojis": ["globe-showing-europeafrica", "globe-showing-americas", "globe-showing-asiaaustralia", "globe-with-meridians", "world-map", "map-of-japan", "compass", "snowcapped-mountain", "mountain", "volcano", "mount-fuji", "camping", "beach-with-umbrella", "desert", "desert-island", "national-park", "stadium", "classical-building", "building-construction", "brick", "rock", "wood", "hut", "houses", "derelict-house", "house", "house-with-garden", "office-building", "japanese-post-office", "post-office", "hospital", "bank", "hotel", "love-hotel", "convenience-store", "school", "department-store", "factory", "japanese-castle", "castle", "wedding", "tokyo-tower", "statue-of-liberty", "church", "mosque", "hindu-temple", "synagogue", "shinto-shrine", "kaaba", "fountain", "tent", "foggy", "night-with-stars", "cityscape", "sunrise-over-mountains", "sunrise", "cityscape-at-dusk", "sunset", "bridge-at-night", "hot-springs", "carousel-horse", "ferris-wheel", "roller-coaster", "barber-pole", "circus-tent", "locomotive", "railway-car", "highspeed-train", "bullet-train", "train", "metro", "light-rail", "station", "tram", "monorail", "mountain-railway", "tram-car", "bus", "oncoming-bus", "trolleybus", "minibus", "ambulance", "fire-engine", "police-car", "oncoming-police-car", "taxi", "oncoming-taxi", "automobile", "oncoming-automobile", "sport-utility-vehicle", "pickup-truck", "delivery-truck", "articulated-lorry", "tractor", "racing-car", "motorcycle", "motor-scooter", "manual-wheelchair", "motorized-wheelchair", "auto-rickshaw", "bicycle", "kick-scooter", "skateboard", "roller-skate", "bus-stop", "motorway", "railway-track", "oil-drum", "fuel-pump", "police-car-light", "horizontal-traffic-light", "vertical-traffic-light", "stop-sign", "construction", "anchor", "sailboat", "canoe", "speedboat", "passenger-ship", "ferry", "motor-boat", "ship", "airplane", "small-airplane", "airplane-departure", "airplane-arrival", "parachute", "seat", "helicopter", "suspension-railway", "mountain-cableway", "aerial-tramway", "satellite", "rocket", "flying-saucer", "bellhop-bell", "luggage", "hourglass-done", "hourglass-not-done", "watch", "alarm-clock", "stopwatch", "timer-clock", "mantelpiece-clock", "twelve-oclock", "twelvethirty", "one-oclock", "onethirty", "two-oclock", "twothirty", "three-oclock", "threethirty", "four-oclock", "fourthirty", "five-oclock", "fivethirty", "six-oclock", "sixthirty", "seven-oclock", "seventhirty", "eight-oclock", "eightthirty", "nine-oclock", "ninethirty", "ten-oclock", "tenthirty", "eleven-oclock", "eleventhirty", "new-moon", "waxing-crescent-moon", "first-quarter-moon", "waxing-gibbous-moon", "full-moon", "waning-gibbous-moon", "last-quarter-moon", "waning-crescent-moon", "crescent-moon", "new-moon-face", "first-quarter-moon-face", "last-quarter-moon-face", "thermometer", "sun", "full-moon-face", "sun-with-face", "ringed-planet", "star", "glowing-star", "shooting-star", "milky-way", "cloud", "sun-behind-cloud", "cloud-with-lightning-and-rain", "sun-behind-small-cloud", "sun-behind-large-cloud", "sun-behind-rain-cloud", "cloud-with-rain", "cloud-with-snow", "cloud-with-lightning", "tornado", "fog", "wind-face", "cyclone", "rainbow", "closed-umbrella", "umbrella", "umbrella-with-rain-drops", "umbrella-on-ground", "high-voltage", "snowflake", "snowman", "snowman-without-snow", "comet", "fire", "droplet", "water-wave"]}, {"id": "activities", "name": "Activities", "emojis": ["jackolantern", "christmas-tree", "fireworks", "sparkler", "firecracker", "sparkles", "balloon", "party-popper", "confetti-ball", "tanabata-tree", "pine-decoration", "japanese-dolls", "carp-streamer", "wind-chime", "moon-viewing-ceremony", "red-envelope", "ribbon", "wrapped-gift", "reminder-ribbon", "admission-tickets", "ticket", "military-medal", "trophy", "sports-medal", "1st-place-medal", "2nd-place-medal", "3rd-place-medal", "soccer-ball", "baseball", "softball", "basketball", "volleyball", "american-football", "rugby-football", "tennis", "flying-disc", "bowling", "cricket-game", "field-hockey", "ice-hockey", "lacrosse", "ping-pong", "badminton", "boxing-glove", "martial-arts-uniform", "goal-net", "flag-in-hole", "ice-skate", "fishing-pole", "diving-mask", "running-shirt", "skis", "sled", "curling-stone", "bullseye", "yoyo", "kite", "pool-8-ball", "crystal-ball", "magic-wand", "nazar-amulet", "video-game", "joystick", "slot-machine", "game-die", "puzzle-piece", "teddy-bear", "piata", "nesting-dolls", "spade-suit", "heart-suit", "diamond-suit", "club-suit", "chess-pawn", "joker", "mahjong-red-dragon", "flower-playing-cards", "performing-arts", "framed-picture", "artist-palette", "thread", "sewing-needle", "yarn", "knot"]}, {"id": "objects", "name": "Objects", "emojis": ["glasses", "sunglasses", "goggles", "lab-coat", "safety-vest", "necktie", "tshirt", "jeans", "scarf", "gloves", "coat", "socks", "dress", "kimono", "sari", "onepiece-swimsuit", "briefs", "shorts", "bikini", "womans-clothes", "purse", "handbag", "clutch-bag", "shopping-bags", "backpack", "thong-sandal", "mans-shoe", "running-shoe", "hiking-boot", "flat-shoe", "highheeled-shoe", "womans-sandal", "ballet-shoes", "womans-boot", "crown", "womans-hat", "top-hat", "graduation-cap", "billed-cap", "military-helmet", "rescue-workers-helmet", "prayer-beads", "lipstick", "ring", "gem-stone", "muted-speaker", "speaker-low-volume", "speaker-medium-volume", "speaker-high-volume", "loudspeaker", "megaphone", "postal-horn", "bell", "bell-with-slash", "musical-score", "musical-note", "musical-notes", "studio-microphone", "level-slider", "control-knobs", "microphone", "headphone", "radio", "saxophone", "accordion", "guitar", "musical-keyboard", "trumpet", "violin", "banjo", "drum", "long-drum", "mobile-phone", "mobile-phone-with-arrow", "telephone", "telephone-receiver", "pager", "fax-machine", "battery", "electric-plug", "laptop", "desktop-computer", "printer", "keyboard", "computer-mouse", "trackball", "computer-disk", "floppy-disk", "optical-disk", "dvd", "abacus", "movie-camera", "film-frames", "film-projector", "clapper-board", "television", "camera", "camera-with-flash", "video-camera", "videocassette", "magnifying-glass-tilted-left", "magnifying-glass-tilted-right", "candle", "light-bulb", "flashlight", "red-paper-lantern", "diya-lamp", "notebook-with-decorative-cover", "closed-book", "open-book", "green-book", "blue-book", "orange-book", "books", "notebook", "ledger", "page-with-curl", "scroll", "page-facing-up", "newspaper", "rolledup-newspaper", "bookmark-tabs", "bookmark", "label", "money-bag", "coin", "yen-banknote", "dollar-banknote", "euro-banknote", "pound-banknote", "money-with-wings", "credit-card", "receipt", "chart-increasing-with-yen", "envelope", "email", "incoming-envelope", "envelope-with-arrow", "outbox-tray", "inbox-tray", "package", "closed-mailbox-with-raised-flag", "closed-mailbox-with-lowered-flag", "open-mailbox-with-raised-flag", "open-mailbox-with-lowered-flag", "postbox", "ballot-box-with-ballot", "pencil", "black-nib", "fountain-pen", "pen", "paintbrush", "crayon", "memo", "briefcase", "file-folder", "open-file-folder", "card-index-dividers", "calendar", "tearoff-calendar", "spiral-notepad", "spiral-calendar", "card-index", "chart-increasing", "chart-decreasing", "bar-chart", "clipboard", "pushpin", "round-pushpin", "paperclip", "linked-paperclips", "straight-ruler", "triangular-ruler", "scissors", "card-file-box", "file-cabinet", "wastebasket", "locked", "unlocked", "locked-with-pen", "locked-with-key", "key", "old-key", "hammer", "axe", "pick", "hammer-and-pick", "hammer-and-wrench", "dagger", "crossed-swords", "water-pistol", "boomerang", "bow-and-arrow", "shield", "carpentry-saw", "wrench", "screwdriver", "nut-and-bolt", "gear", "clamp", "balance-scale", "white-cane", "link", "chains", "hook", "toolbox", "magnet", "ladder", "alembic", "test-tube", "petri-dish", "dna", "microscope", "telescope", "satellite-antenna", "syringe", "drop-of-blood", "pill", "adhesive-bandage", "stethoscope", "door", "elevator", "mirror", "window", "bed", "couch-and-lamp", "chair", "toilet", "plunger", "shower", "bathtub", "mouse-trap", "razor", "lotion-bottle", "safety-pin", "broom", "basket", "roll-of-paper", "bucket", "soap", "toothbrush", "sponge", "fire-extinguisher", "shopping-cart", "cigarette", "coffin", "headstone", "funeral-urn", "moai", "placard"]}, {"id": "symbols", "name": "Symbols", "emojis": ["atm-sign", "litter-in-bin-sign", "potable-water", "wheelchair-symbol", "mens-room", "womens-room", "restroom", "baby-symbol", "water-closet", "passport-control", "customs", "baggage-claim", "left-luggage", "warning", "children-crossing", "no-entry", "prohibited", "no-bicycles", "no-smoking", "no-littering", "nonpotable-water", "no-pedestrians", "no-mobile-phones", "no-one-under-eighteen", "radioactive", "biohazard", "up-arrow", "upright-arrow", "right-arrow", "downright-arrow", "down-arrow", "downleft-arrow", "left-arrow", "upleft-arrow", "updown-arrow", "leftright-arrow", "right-arrow-curving-left", "left-arrow-curving-right", "right-arrow-curving-up", "right-arrow-curving-down", "clockwise-vertical-arrows", "counterclockwise-arrows-button", "back-arrow", "end-arrow", "on-arrow", "soon-arrow", "top-arrow", "place-of-worship", "atom-symbol", "om", "star-of-david", "wheel-of-dharma", "yin-yang", "latin-cross", "orthodox-cross", "star-and-crescent", "peace-symbol", "menorah", "dotted-sixpointed-star", "aries", "taurus", "gemini", "cancer", "leo", "virgo", "libra", "scorpio", "sagittarius", "capricorn", "aquarius", "pisces", "ophiuchus", "shuffle-tracks-button", "repeat-button", "repeat-single-button", "play-button", "fastforward-button", "next-track-button", "play-or-pause-button", "reverse-button", "fast-reverse-button", "last-track-button", "upwards-button", "fast-up-button", "downwards-button", "fast-down-button", "pause-button", "stop-button", "record-button", "eject-button", "cinema", "dim-button", "bright-button", "antenna-bars", "vibration-mode", "mobile-phone-off", "female-sign", "male-sign", "transgender-symbol", "multiply", "plus", "minus", "divide", "infinity", "double-exclamation-mark", "exclamation-question-mark", "red-question-mark", "white-question-mark", "white-exclamation-mark", "red-exclamation-mark", "wavy-dash", "currency-exchange", "heavy-dollar-sign", "medical-symbol", "recycling-symbol", "fleurdelis", "trident-emblem", "name-badge", "japanese-symbol-for-beginner", "hollow-red-circle", "check-mark-button", "check-box-with-check", "check-mark", "cross-mark", "cross-mark-button", "curly-loop", "double-curly-loop", "part-alternation-mark", "eightspoked-asterisk", "eightpointed-star", "sparkle", "copyright", "registered", "trade-mark", "keycap", "keycap", "keycap-0", "keycap-1", "keycap-2", "keycap-3", "keycap-4", "keycap-5", "keycap-6", "keycap-7", "keycap-8", "keycap-9", "keycap-10", "input-latin-uppercase", "input-latin-lowercase", "input-numbers", "input-symbols", "input-latin-letters", "a-button-blood-type", "ab-button-blood-type", "b-button-blood-type", "cl-button", "cool-button", "free-button", "information", "id-button", "circled-m", "new-button", "ng-button", "o-button-blood-type", "ok-button", "p-button", "sos-button", "up-button", "vs-button", "japanese-here-button", "japanese-service-charge-button", "japanese-monthly-amount-button", "japanese-not-free-of-charge-button", "japanese-reserved-button", "japanese-bargain-button", "japanese-discount-button", "japanese-free-of-charge-button", "japanese-prohibited-button", "japanese-acceptable-button", "japanese-application-button", "japanese-passing-grade-button", "japanese-vacancy-button", "japanese-congratulations-button", "japanese-secret-button", "japanese-open-for-business-button", "japanese-no-vacancy-button", "red-circle", "orange-circle", "yellow-circle", "green-circle", "blue-circle", "purple-circle", "brown-circle", "black-circle", "white-circle", "red-square", "orange-square", "yellow-square", "green-square", "blue-square", "purple-square", "brown-square", "black-large-square", "white-large-square", "black-medium-square", "white-medium-square", "black-mediumsmall-square", "white-mediumsmall-square", "black-small-square", "white-small-square", "large-orange-diamond", "large-blue-diamond", "small-orange-diamond", "small-blue-diamond", "red-triangle-pointed-up", "red-triangle-pointed-down", "diamond-with-a-dot", "radio-button", "white-square-button", "black-square-button"]}, {"id": "flags", "name": "Flags", "emojis": ["chequered-flag", "triangular-flag", "crossed-flags", "black-flag", "white-flag", "rainbow-flag", "transgender-flag", "pirate-flag", "flag-ascension-island", "flag-andorra", "flag-united-arab-emirates", "flag-afghanistan", "flag-antigua--barbuda", "flag-anguilla", "flag-albania", "flag-armenia", "flag-angola", "flag-antarctica", "flag-argentina", "flag-american-samoa", "flag-austria", "flag-australia", "flag-aruba", "flag-land-islands", "flag-azerbaijan", "flag-bosnia--herzegovina", "flag-barbados", "flag-bangladesh", "flag-belgium", "flag-burkina-faso", "flag-bulgaria", "flag-bahrain", "flag-burundi", "flag-benin", "flag-st-barthlemy", "flag-bermuda", "flag-brunei", "flag-bolivia", "flag-caribbean-netherlands", "flag-brazil", "flag-bahamas", "flag-bhutan", "flag-bouvet-island", "flag-botswana", "flag-belarus", "flag-belize", "flag-canada", "flag-cocos-keeling-islands", "flag-congo--kinshasa", "flag-central-african-republic", "flag-congo--brazzaville", "flag-switzerland", "flag-cte-divoire", "flag-cook-islands", "flag-chile", "flag-cameroon", "flag-china", "flag-colombia", "flag-clipperton-island", "flag-costa-rica", "flag-cuba", "flag-cape-verde", "flag-curaao", "flag-christmas-island", "flag-cyprus", "flag-czechia", "flag-germany", "flag-diego-garcia", "flag-djibouti", "flag-denmark", "flag-dominica", "flag-dominican-republic", "flag-algeria", "flag-ceuta--melilla", "flag-ecuador", "flag-estonia", "flag-egypt", "flag-western-sahara", "flag-eritrea", "flag-spain", "flag-ethiopia", "flag-european-union", "flag-finland", "flag-fiji", "flag-falkland-islands", "flag-micronesia", "flag-faroe-islands", "flag-france", "flag-gabon", "flag-united-kingdom", "flag-grenada", "flag-georgia", "flag-french-guiana", "flag-guernsey", "flag-ghana", "flag-gibraltar", "flag-greenland", "flag-gambia", "flag-guinea", "flag-guadeloupe", "flag-equatorial-guinea", "flag-greece", "flag-south-georgia--south-sandwich-islands", "flag-guatemala", "flag-guam", "flag-guineabissau", "flag-guyana", "flag-hong-kong-sar-china", "flag-heard--mcdonald-islands", "flag-honduras", "flag-croatia", "flag-haiti", "flag-hungary", "flag-canary-islands", "flag-indonesia", "flag-ireland", "flag-israel", "flag-isle-of-man", "flag-india", "flag-british-indian-ocean-territory", "flag-iraq", "flag-iran", "flag-iceland", "flag-italy", "flag-jersey", "flag-jamaica", "flag-jordan", "flag-japan", "flag-kenya", "flag-kyrgyzstan", "flag-cambodia", "flag-kiribati", "flag-comoros", "flag-st-kitts--nevis", "flag-north-korea", "flag-south-korea", "flag-kuwait", "flag-cayman-islands", "flag-kazakhstan", "flag-laos", "flag-lebanon", "flag-st-lucia", "flag-liechtenstein", "flag-sri-lanka", "flag-liberia", "flag-lesotho", "flag-lithuania", "flag-luxembourg", "flag-latvia", "flag-libya", "flag-morocco", "flag-monaco", "flag-moldova", "flag-montenegro", "flag-st-martin", "flag-madagascar", "flag-marshall-islands", "flag-north-macedonia", "flag-mali", "flag-myanmar-burma", "flag-mongolia", "flag-macao-sar-china", "flag-northern-mariana-islands", "flag-martinique", "flag-mauritania", "flag-montserrat", "flag-malta", "flag-mauritius", "flag-maldives", "flag-malawi", "flag-mexico", "flag-malaysia", "flag-mozambique", "flag-namibia", "flag-new-caledonia", "flag-niger", "flag-norfolk-island", "flag-nigeria", "flag-nicaragua", "flag-netherlands", "flag-norway", "flag-nepal", "flag-nauru", "flag-niue", "flag-new-zealand", "flag-oman", "flag-panama", "flag-peru", "flag-french-polynesia", "flag-papua-new-guinea", "flag-philippines", "flag-pakistan", "flag-poland", "flag-st-pierre--miquelon", "flag-pitcairn-islands", "flag-puerto-rico", "flag-palestinian-territories", "flag-portugal", "flag-palau", "flag-paraguay", "flag-qatar", "flag-runion", "flag-romania", "flag-serbia", "flag-russia", "flag-rwanda", "flag-saudi-arabia", "flag-solomon-islands", "flag-seychelles", "flag-sudan", "flag-sweden", "flag-singapore", "flag-st-helena", "flag-slovenia", "flag-svalbard--jan-mayen", "flag-slovakia", "flag-sierra-leone", "flag-san-marino", "flag-senegal", "flag-somalia", "flag-suriname", "flag-south-sudan", "flag-so-tom--prncipe", "flag-el-salvador", "flag-sint-maarten", "flag-syria", "flag-eswatini", "flag-tristan-da-cunha", "flag-turks--caicos-islands", "flag-chad", "flag-french-southern-territories", "flag-togo", "flag-thailand", "flag-tajikistan", "flag-tokelau", "flag-timorleste", "flag-turkmenistan", "flag-tunisia", "flag-tonga", "flag-turkey", "flag-trinidad--tobago", "flag-tuvalu", "flag-taiwan", "flag-tanzania", "flag-ukraine", "flag-uganda", "flag-us-outlying-islands", "flag-united-nations", "flag-united-states", "flag-uruguay", "flag-uzbekistan", "flag-vatican-city", "flag-st-vincent--grenadines", "flag-venezuela", "flag-british-virgin-islands", "flag-us-virgin-islands", "flag-vietnam", "flag-vanuatu", "flag-wallis--futuna", "flag-samoa", "flag-kosovo", "flag-yemen", "flag-mayotte", "flag-south-africa", "flag-zambia", "flag-zimbabwe", "flag-england", "flag-scotland", "flag-wales"]}], "emojis": {"grinning-face": {"a": "grinning face", "b": "1F600", "j": ["face", "grin", "grinning face"]}, "grinning-face-with-big-eyes": {"a": "grinning face with big eyes", "b": "1F603", "j": ["face", "grinning face with big eyes", "mouth", "open", "smile"]}, "grinning-face-with-smiling-eyes": {"a": "grinning face with smiling eyes", "b": "1F604", "j": ["eye", "face", "grinning face with smiling eyes", "mouth", "open", "smile"]}, "beaming-face-with-smiling-eyes": {"a": "beaming face with smiling eyes", "b": "1F601", "j": ["beaming face with smiling eyes", "eye", "face", "grin", "smile"]}, "grinning-squinting-face": {"a": "grinning squinting face", "b": "1F606", "j": ["face", "grinning squinting face", "laugh", "mouth", "satisfied", "smile"]}, "grinning-face-with-sweat": {"a": "grinning face with sweat", "b": "1F605", "j": ["cold", "face", "grinning face with sweat", "open", "smile", "sweat"]}, "rolling-on-the-floor-laughing": {"a": "rolling on the floor laughing", "b": "1F923", "j": ["face", "floor", "laugh", "rofl", "rolling", "rolling on the floor laughing", "rotfl"]}, "face-with-tears-of-joy": {"a": "face with tears of joy", "b": "1F602", "j": ["face", "face with tears of joy", "joy", "laugh", "tear"]}, "slightly-smiling-face": {"a": "slightly smiling face", "b": "1F642", "j": ["face", "slightly smiling face", "smile"]}, "upsidedown-face": {"a": "upside-down face", "b": "1F643", "j": ["face", "upside-down"]}, "winking-face": {"a": "winking face", "b": "1F609", "j": ["face", "wink", "winking face"]}, "smiling-face-with-smiling-eyes": {"a": "smiling face with smiling eyes", "b": "1F60A", "j": ["blush", "eye", "face", "smile", "smiling face with smiling eyes"]}, "smiling-face-with-halo": {"a": "smiling face with halo", "b": "1F607", "j": ["angel", "face", "fantasy", "halo", "innocent", "smiling face with halo"]}, "smiling-face-with-hearts": {"a": "smiling face with hearts", "b": "1F970", "j": ["adore", "crush", "hearts", "in love", "smiling face with hearts"]}, "smiling-face-with-hearteyes": {"a": "smiling face with heart-eyes", "b": "1F60D", "j": ["eye", "face", "love", "smile", "smiling face with heart-eyes"]}, "starstruck": {"a": "star-struck", "b": "1F929", "j": ["eyes", "face", "grinning", "star", "star-struck", "starry-eyed"]}, "face-blowing-a-kiss": {"a": "face blowing a kiss", "b": "1F618", "j": ["face", "face blowing a kiss", "kiss"]}, "kissing-face": {"a": "kissing face", "b": "1F617", "j": ["face", "kiss", "kissing face"]}, "smiling-face": {"a": "smiling face", "b": "263A", "j": ["face", "outlined", "relaxed", "smile", "smiling face"]}, "kissing-face-with-closed-eyes": {"a": "kissing face with closed eyes", "b": "1F61A", "j": ["closed", "eye", "face", "kiss", "kissing face with closed eyes"]}, "kissing-face-with-smiling-eyes": {"a": "kissing face with smiling eyes", "b": "1F619", "j": ["eye", "face", "kiss", "kissing face with smiling eyes", "smile"]}, "smiling-face-with-tear": {"a": "smiling face with tear", "b": "1F972", "j": ["grateful", "proud", "relieved", "smiling", "smiling face with tear", "tear", "touched"]}, "face-savoring-food": {"a": "face savoring food", "b": "1F60B", "j": ["delicious", "face", "face savoring food", "savouring", "smile", "yum"]}, "face-with-tongue": {"a": "face with tongue", "b": "1F61B", "j": ["face", "face with tongue", "tongue"]}, "winking-face-with-tongue": {"a": "winking face with tongue", "b": "1F61C", "j": ["eye", "face", "joke", "tongue", "wink", "winking face with tongue"]}, "zany-face": {"a": "zany face", "b": "1F92A", "j": ["eye", "goofy", "large", "small", "zany face"]}, "squinting-face-with-tongue": {"a": "squinting face with tongue", "b": "1F61D", "j": ["eye", "face", "horrible", "squinting face with tongue", "taste", "tongue"]}, "moneymouth-face": {"a": "money-mouth face", "b": "1F911", "j": ["face", "money", "money-mouth face", "mouth"]}, "hugging-face": {"a": "hugging face", "b": "1F917", "j": ["face", "hug", "hugging"]}, "face-with-hand-over-mouth": {"a": "face with hand over mouth", "b": "1F92D", "j": ["face with hand over mouth", "whoops", "shock", "sudden realization", "surprise"]}, "shushing-face": {"a": "shushing face", "b": "1F92B", "j": ["quiet", "shush", "shushing face"]}, "thinking-face": {"a": "thinking face", "b": "1F914", "j": ["face", "thinking"]}, "zippermouth-face": {"a": "zipper-mouth face", "b": "1F910", "j": ["face", "mouth", "zipper", "zipper-mouth face"]}, "face-with-raised-eyebrow": {"a": "face with raised eyebrow", "b": "1F928", "j": ["distrust", "face with raised eyebrow", "skeptic", "disapproval", "disbelief", "mild surprise", "scepticism"]}, "neutral-face": {"a": "neutral face", "b": "1F610", "j": ["deadpan", "face", "meh", "neutral"]}, "expressionless-face": {"a": "expressionless face", "b": "1F611", "j": ["expressionless", "face", "inexpressive", "meh", "unexpressive"]}, "face-without-mouth": {"a": "face without mouth", "b": "1F636", "j": ["face", "face without mouth", "mouth", "quiet", "silent"]}, "face-in-clouds": {"a": "⊛ face in clouds", "b": "1F636-200D-1F32B-FE0F", "j": ["absentminded", "face in clouds", "face in the fog", "head in clouds"]}, "smirking-face": {"a": "smirking face", "b": "1F60F", "j": ["face", "smirk", "smirking face"]}, "unamused-face": {"a": "unamused face", "b": "1F612", "j": ["face", "unamused", "unhappy"]}, "face-with-rolling-eyes": {"a": "face with rolling eyes", "b": "1F644", "j": ["eyeroll", "eyes", "face", "face with rolling eyes", "rolling"]}, "grimacing-face": {"a": "grimacing face", "b": "1F62C", "j": ["face", "grimace", "grimacing face"]}, "face-exhaling": {"a": "⊛ face exhaling", "b": "1F62E-200D-1F4A8", "j": ["exhale", "face exhaling", "gasp", "groan", "relief", "whisper", "whistle"]}, "lying-face": {"a": "lying face", "b": "1F925", "j": ["face", "lie", "lying face", "pinocchio"]}, "relieved-face": {"a": "relieved face", "b": "1F60C", "j": ["face", "relieved"]}, "pensive-face": {"a": "pensive face", "b": "1F614", "j": ["dejected", "face", "pensive"]}, "sleepy-face": {"a": "sleepy face", "b": "1F62A", "j": ["face", "sleep", "sleepy face"]}, "drooling-face": {"a": "drooling face", "b": "1F924", "j": ["drooling", "face"]}, "sleeping-face": {"a": "sleeping face", "b": "1F634", "j": ["face", "sleep", "sleeping face", "zzz"]}, "face-with-medical-mask": {"a": "face with medical mask", "b": "1F637", "j": ["cold", "doctor", "face", "face with medical mask", "mask", "sick"]}, "face-with-thermometer": {"a": "face with thermometer", "b": "1F912", "j": ["face", "face with thermometer", "ill", "sick", "thermometer"]}, "face-with-headbandage": {"a": "face with head-bandage", "b": "1F915", "j": ["bandage", "face", "face with head-bandage", "hurt", "injury"]}, "nauseated-face": {"a": "nauseated face", "b": "1F922", "j": ["face", "nauseated", "vomit"]}, "face-vomiting": {"a": "face vomiting", "b": "1F92E", "j": ["face vomiting", "puke", "sick", "vomit"]}, "sneezing-face": {"a": "sneezing face", "b": "1F927", "j": ["face", "gesundheit", "sneeze", "sneezing face"]}, "hot-face": {"a": "hot face", "b": "1F975", "j": ["feverish", "heat stroke", "hot", "hot face", "red-faced", "sweating"]}, "cold-face": {"a": "cold face", "b": "1F976", "j": ["blue-faced", "cold", "cold face", "freezing", "frostbite", "icicles"]}, "woozy-face": {"a": "woozy face", "b": "1F974", "j": ["dizzy", "intoxicated", "tipsy", "uneven eyes", "wavy mouth", "woozy face"]}, "knockedout-face": {"a": "knocked-out face", "b": "1F635", "j": ["dead", "face", "knocked out", "knocked-out face"]}, "face-with-spiral-eyes": {"a": "⊛ face with spiral eyes", "b": "1F635-200D-1F4AB", "j": ["dizzy", "face with spiral eyes", "hypnotized", "spiral", "trouble", "whoa"]}, "exploding-head": {"a": "exploding head", "b": "1F92F", "j": ["exploding head", "mind blown", "shocked"]}, "cowboy-hat-face": {"a": "cowboy hat face", "b": "1F920", "j": ["cowboy", "cowgirl", "face", "hat"]}, "partying-face": {"a": "partying face", "b": "1F973", "j": ["celebration", "hat", "horn", "party", "partying face"]}, "disguised-face": {"a": "disguised face", "b": "1F978", "j": ["disguise", "disguised face", "face", "glasses", "incognito", "nose"]}, "smiling-face-with-sunglasses": {"a": "smiling face with sunglasses", "b": "1F60E", "j": ["bright", "cool", "face", "smiling face with sunglasses", "sun", "sunglasses"]}, "nerd-face": {"a": "nerd face", "b": "1F913", "j": ["face", "geek", "nerd"]}, "face-with-monocle": {"a": "face with monocle", "b": "1F9D0", "j": ["face with monocle", "stuffy", "wealthy"]}, "confused-face": {"a": "confused face", "b": "1F615", "j": ["confused", "face", "meh"]}, "worried-face": {"a": "worried face", "b": "1F61F", "j": ["face", "worried"]}, "slightly-frowning-face": {"a": "slightly frowning face", "b": "1F641", "j": ["face", "frown", "slightly frowning face"]}, "frowning-face": {"a": "frowning face", "b": "2639", "j": ["face", "frown", "frowning face"]}, "face-with-open-mouth": {"a": "face with open mouth", "b": "1F62E", "j": ["face", "face with open mouth", "mouth", "open", "sympathy"]}, "hushed-face": {"a": "hushed face", "b": "1F62F", "j": ["face", "hushed", "stunned", "surprised"]}, "astonished-face": {"a": "astonished face", "b": "1F632", "j": ["astonished", "face", "shocked", "totally"]}, "flushed-face": {"a": "flushed face", "b": "1F633", "j": ["dazed", "face", "flushed"]}, "pleading-face": {"a": "pleading face", "b": "1F97A", "j": ["begging", "mercy", "pleading face", "puppy eyes"]}, "frowning-face-with-open-mouth": {"a": "frowning face with open mouth", "b": "1F626", "j": ["face", "frown", "frowning face with open mouth", "mouth", "open"]}, "anguished-face": {"a": "anguished face", "b": "1F627", "j": ["anguished", "face"]}, "fearful-face": {"a": "fearful face", "b": "1F628", "j": ["face", "fear", "fearful", "scared"]}, "anxious-face-with-sweat": {"a": "anxious face with sweat", "b": "1F630", "j": ["anxious face with sweat", "blue", "cold", "face", "rushed", "sweat"]}, "sad-but-relieved-face": {"a": "sad but relieved face", "b": "1F625", "j": ["disappointed", "face", "relieved", "sad but relieved face", "whew"]}, "crying-face": {"a": "crying face", "b": "1F622", "j": ["cry", "crying face", "face", "sad", "tear"]}, "loudly-crying-face": {"a": "loudly crying face", "b": "1F62D", "j": ["cry", "face", "loudly crying face", "sad", "sob", "tear"]}, "face-screaming-in-fear": {"a": "face screaming in fear", "b": "1F631", "j": ["face", "face screaming in fear", "fear", "munch", "scared", "scream"]}, "confounded-face": {"a": "confounded face", "b": "1F616", "j": ["confounded", "face"]}, "persevering-face": {"a": "persevering face", "b": "1F623", "j": ["face", "persevere", "persevering face"]}, "disappointed-face": {"a": "disappointed face", "b": "1F61E", "j": ["disappointed", "face"]}, "downcast-face-with-sweat": {"a": "downcast face with sweat", "b": "1F613", "j": ["cold", "downcast face with sweat", "face", "sweat"]}, "weary-face": {"a": "weary face", "b": "1F629", "j": ["face", "tired", "weary"]}, "tired-face": {"a": "tired face", "b": "1F62B", "j": ["face", "tired"]}, "yawning-face": {"a": "yawning face", "b": "1F971", "j": ["bored", "tired", "yawn", "yawning face"]}, "face-with-steam-from-nose": {"a": "face with steam from nose", "b": "1F624", "j": ["face", "face with steam from nose", "triumph", "won"]}, "pouting-face": {"a": "pouting face", "b": "1F621", "j": ["angry", "face", "mad", "pouting", "rage", "red"]}, "angry-face": {"a": "angry face", "b": "1F620", "j": ["anger", "angry", "face", "mad"]}, "face-with-symbols-on-mouth": {"a": "face with symbols on mouth", "b": "1F92C", "j": ["face with symbols on mouth", "swearing", "cursing"]}, "smiling-face-with-horns": {"a": "smiling face with horns", "b": "1F608", "j": ["face", "fairy tale", "fantasy", "horns", "smile", "smiling face with horns"]}, "angry-face-with-horns": {"a": "angry face with horns", "b": "1F47F", "j": ["angry face with horns", "demon", "devil", "face", "fantasy", "imp"]}, "skull": {"a": "skull", "b": "1F480", "j": ["death", "face", "fairy tale", "monster", "skull"]}, "skull-and-crossbones": {"a": "skull and crossbones", "b": "2620", "j": ["crossbones", "death", "face", "monster", "skull", "skull and crossbones"]}, "pile-of-poo": {"a": "pile of poo", "b": "1F4A9", "j": ["dung", "face", "monster", "pile of poo", "poo", "poop"]}, "clown-face": {"a": "clown face", "b": "1F921", "j": ["clown", "face"]}, "ogre": {"a": "ogre", "b": "1F479", "j": ["creature", "face", "fairy tale", "fantasy", "monster", "ogre", "troll"]}, "goblin": {"a": "goblin", "b": "1F47A", "j": ["creature", "face", "fairy tale", "fantasy", "goblin", "monster"]}, "ghost": {"a": "ghost", "b": "1F47B", "j": ["creature", "face", "fairy tale", "fantasy", "ghost", "monster"]}, "alien": {"a": "alien", "b": "1F47D", "j": ["alien", "creature", "extraterrestrial", "face", "fantasy", "ufo"]}, "alien-monster": {"a": "alien monster", "b": "1F47E", "j": ["alien", "creature", "extraterrestrial", "face", "monster", "ufo"]}, "robot": {"a": "robot", "b": "1F916", "j": ["face", "monster", "robot"]}, "grinning-cat": {"a": "grinning cat", "b": "1F63A", "j": ["cat", "face", "grinning", "mouth", "open", "smile"]}, "grinning-cat-with-smiling-eyes": {"a": "grinning cat with smiling eyes", "b": "1F638", "j": ["cat", "eye", "face", "grin", "grinning cat with smiling eyes", "smile"]}, "cat-with-tears-of-joy": {"a": "cat with tears of joy", "b": "1F639", "j": ["cat", "cat with tears of joy", "face", "joy", "tear"]}, "smiling-cat-with-hearteyes": {"a": "smiling cat with heart-eyes", "b": "1F63B", "j": ["cat", "eye", "face", "heart", "love", "smile", "smiling cat with heart-eyes"]}, "cat-with-wry-smile": {"a": "cat with wry smile", "b": "1F63C", "j": ["cat", "cat with wry smile", "face", "ironic", "smile", "wry"]}, "kissing-cat": {"a": "kissing cat", "b": "1F63D", "j": ["cat", "eye", "face", "kiss", "kissing cat"]}, "weary-cat": {"a": "weary cat", "b": "1F640", "j": ["cat", "face", "oh", "surprised", "weary"]}, "crying-cat": {"a": "crying cat", "b": "1F63F", "j": ["cat", "cry", "crying cat", "face", "sad", "tear"]}, "pouting-cat": {"a": "pouting cat", "b": "1F63E", "j": ["cat", "face", "pouting"]}, "seenoevil-monkey": {"a": "see-no-evil monkey", "b": "1F648", "j": ["evil", "face", "forbidden", "monkey", "see", "see-no-evil monkey"]}, "hearnoevil-monkey": {"a": "hear-no-evil monkey", "b": "1F649", "j": ["evil", "face", "forbidden", "hear", "hear-no-evil monkey", "monkey"]}, "speaknoevil-monkey": {"a": "speak-no-evil monkey", "b": "1F64A", "j": ["evil", "face", "forbidden", "monkey", "speak", "speak-no-evil monkey"]}, "kiss-mark": {"a": "kiss mark", "b": "1F48B", "j": ["kiss", "kiss mark", "lips"]}, "love-letter": {"a": "love letter", "b": "1F48C", "j": ["heart", "letter", "love", "mail"]}, "heart-with-arrow": {"a": "heart with arrow", "b": "1F498", "j": ["arrow", "cupid", "heart with arrow"]}, "heart-with-ribbon": {"a": "heart with ribbon", "b": "1F49D", "j": ["heart with ribbon", "ribbon", "valentine"]}, "sparkling-heart": {"a": "sparkling heart", "b": "1F496", "j": ["excited", "sparkle", "sparkling heart"]}, "growing-heart": {"a": "growing heart", "b": "1F497", "j": ["excited", "growing", "growing heart", "nervous", "pulse"]}, "beating-heart": {"a": "beating heart", "b": "1F493", "j": ["beating", "beating heart", "heartbeat", "pulsating"]}, "revolving-hearts": {"a": "revolving hearts", "b": "1F49E", "j": ["revolving", "revolving hearts"]}, "two-hearts": {"a": "two hearts", "b": "1F495", "j": ["love", "two hearts"]}, "heart-decoration": {"a": "heart decoration", "b": "1F49F", "j": ["heart", "heart decoration"]}, "heart-exclamation": {"a": "heart exclamation", "b": "2763", "j": ["exclamation", "heart exclamation", "mark", "punctuation"]}, "broken-heart": {"a": "broken heart", "b": "1F494", "j": ["break", "broken", "broken heart"]}, "heart-on-fire": {"a": "⊛ heart on fire", "b": "2764-FE0F-200D-1F525", "j": ["burn", "heart", "heart on fire", "love", "lust", "sacred heart"]}, "mending-heart": {"a": "⊛ mending heart", "b": "2764-FE0F-200D-1FA79", "j": ["healthier", "improving", "mending", "mending heart", "recovering", "recuperating", "well"]}, "red-heart": {"a": "red heart", "b": "2764", "j": ["heart", "red heart"]}, "orange-heart": {"a": "orange heart", "b": "1F9E1", "j": ["orange", "orange heart"]}, "yellow-heart": {"a": "yellow heart", "b": "1F49B", "j": ["yellow", "yellow heart"]}, "green-heart": {"a": "green heart", "b": "1F49A", "j": ["green", "green heart"]}, "blue-heart": {"a": "blue heart", "b": "1F499", "j": ["blue", "blue heart"]}, "purple-heart": {"a": "purple heart", "b": "1F49C", "j": ["purple", "purple heart"]}, "brown-heart": {"a": "brown heart", "b": "1F90E", "j": ["brown", "heart"]}, "black-heart": {"a": "black heart", "b": "1F5A4", "j": ["black", "black heart", "evil", "wicked"]}, "white-heart": {"a": "white heart", "b": "1F90D", "j": ["heart", "white"]}, "hundred-points": {"a": "hundred points", "b": "1F4AF", "j": ["100", "full", "hundred", "hundred points", "score"]}, "anger-symbol": {"a": "anger symbol", "b": "1F4A2", "j": ["anger symbol", "angry", "comic", "mad"]}, "collision": {"a": "collision", "b": "1F4A5", "j": ["boom", "collision", "comic"]}, "dizzy": {"a": "dizzy", "b": "1F4AB", "j": ["comic", "dizzy", "star"]}, "sweat-droplets": {"a": "sweat droplets", "b": "1F4A6", "j": ["comic", "splashing", "sweat", "sweat droplets"]}, "dashing-away": {"a": "dashing away", "b": "1F4A8", "j": ["comic", "dash", "dashing away", "running"]}, "hole": {"a": "hole", "b": "1F573", "j": ["hole"]}, "bomb": {"a": "bomb", "b": "1F4A3", "j": ["bomb", "comic"]}, "speech-balloon": {"a": "speech balloon", "b": "1F4AC", "j": ["balloon", "bubble", "comic", "dialog", "speech"]}, "eye-in-speech-bubble": {"a": "eye in speech bubble", "b": "1F441-FE0F-200D-1F5E8-FE0F", "j": ["eye", "eye in speech bubble", "speech bubble", "witness"]}, "left-speech-bubble": {"a": "left speech bubble", "b": "1F5E8", "j": ["dialog", "left speech bubble", "speech"]}, "right-anger-bubble": {"a": "right anger bubble", "b": "1F5EF", "j": ["angry", "balloon", "bubble", "mad", "right anger bubble"]}, "thought-balloon": {"a": "thought balloon", "b": "1F4AD", "j": ["balloon", "bubble", "comic", "thought"]}, "zzz": {"a": "zzz", "b": "1F4A4", "j": ["comic", "sleep", "zzz"]}, "waving-hand": {"a": "waving hand", "b": "1F44B", "j": ["hand", "wave", "waving"]}, "raised-back-of-hand": {"a": "raised back of hand", "b": "1F91A", "j": ["backhand", "raised", "raised back of hand"]}, "hand-with-fingers-splayed": {"a": "hand with fingers splayed", "b": "1F590", "j": ["finger", "hand", "hand with fingers splayed", "splayed"]}, "raised-hand": {"a": "raised hand", "b": "270B", "j": ["hand", "high 5", "high five", "raised hand"]}, "vulcan-salute": {"a": "vulcan salute", "b": "1F596", "j": ["finger", "hand", "spock", "vulcan", "vulcan salute"]}, "ok-hand": {"a": "OK hand", "b": "1F44C", "j": ["hand", "OK"]}, "pinched-fingers": {"a": "pinched fingers", "b": "1F90C", "j": ["fingers", "hand gesture", "interrogation", "pinched", "sarcastic"]}, "pinching-hand": {"a": "pinching hand", "b": "1F90F", "j": ["pinching hand", "small amount"]}, "victory-hand": {"a": "victory hand", "b": "270C", "j": ["hand", "v", "victory"]}, "crossed-fingers": {"a": "crossed fingers", "b": "1F91E", "j": ["cross", "crossed fingers", "finger", "hand", "luck"]}, "loveyou-gesture": {"a": "love-you gesture", "b": "1F91F", "j": ["hand", "ILY", "love-you gesture"]}, "sign-of-the-horns": {"a": "sign of the horns", "b": "1F918", "j": ["finger", "hand", "horns", "rock-on", "sign of the horns"]}, "call-me-hand": {"a": "call me hand", "b": "1F919", "j": ["call", "call me hand", "hand"]}, "backhand-index-pointing-left": {"a": "backhand index pointing left", "b": "1F448", "j": ["backhand", "backhand index pointing left", "finger", "hand", "index", "point"]}, "backhand-index-pointing-right": {"a": "backhand index pointing right", "b": "1F449", "j": ["backhand", "backhand index pointing right", "finger", "hand", "index", "point"]}, "backhand-index-pointing-up": {"a": "backhand index pointing up", "b": "1F446", "j": ["backhand", "backhand index pointing up", "finger", "hand", "point", "up"]}, "middle-finger": {"a": "middle finger", "b": "1F595", "j": ["finger", "hand", "middle finger"]}, "backhand-index-pointing-down": {"a": "backhand index pointing down", "b": "1F447", "j": ["backhand", "backhand index pointing down", "down", "finger", "hand", "point"]}, "index-pointing-up": {"a": "index pointing up", "b": "261D", "j": ["finger", "hand", "index", "index pointing up", "point", "up"]}, "thumbs-up": {"a": "thumbs up", "b": "1F44D", "j": ["+1", "hand", "thumb", "thumbs up", "up"]}, "thumbs-down": {"a": "thumbs down", "b": "1F44E", "j": ["-1", "down", "hand", "thumb", "thumbs down"]}, "raised-fist": {"a": "raised fist", "b": "270A", "j": ["clenched", "fist", "hand", "punch", "raised fist"]}, "oncoming-fist": {"a": "oncoming fist", "b": "1F44A", "j": ["clenched", "fist", "hand", "oncoming fist", "punch"]}, "leftfacing-fist": {"a": "left-facing fist", "b": "1F91B", "j": ["fist", "left-facing fist", "leftwards"]}, "rightfacing-fist": {"a": "right-facing fist", "b": "1F91C", "j": ["fist", "right-facing fist", "rightwards"]}, "clapping-hands": {"a": "clapping hands", "b": "1F44F", "j": ["clap", "clapping hands", "hand"]}, "raising-hands": {"a": "raising hands", "b": "1F64C", "j": ["celebration", "gesture", "hand", "hooray", "raised", "raising hands"]}, "open-hands": {"a": "open hands", "b": "1F450", "j": ["hand", "open", "open hands"]}, "palms-up-together": {"a": "palms up together", "b": "1F932", "j": ["palms up together", "prayer", "cupped hands"]}, "handshake": {"a": "handshake", "b": "1F91D", "j": ["agreement", "hand", "handshake", "meeting", "shake"]}, "folded-hands": {"a": "folded hands", "b": "1F64F", "j": ["ask", "folded hands", "hand", "high 5", "high five", "please", "pray", "thanks"]}, "writing-hand": {"a": "writing hand", "b": "270D", "j": ["hand", "write", "writing hand"]}, "nail-polish": {"a": "nail polish", "b": "1F485", "j": ["care", "cosmetics", "manicure", "nail", "polish"]}, "selfie": {"a": "selfie", "b": "1F933", "j": ["camera", "phone", "selfie"]}, "flexed-biceps": {"a": "flexed biceps", "b": "1F4AA", "j": ["biceps", "comic", "flex", "flexed biceps", "muscle"]}, "mechanical-arm": {"a": "mechanical arm", "b": "1F9BE", "j": ["accessibility", "mechanical arm", "prosthetic"]}, "mechanical-leg": {"a": "mechanical leg", "b": "1F9BF", "j": ["accessibility", "mechanical leg", "prosthetic"]}, "leg": {"a": "leg", "b": "1F9B5", "j": ["kick", "leg", "limb"]}, "foot": {"a": "foot", "b": "1F9B6", "j": ["foot", "kick", "stomp"]}, "ear": {"a": "ear", "b": "1F442", "j": ["body", "ear"]}, "ear-with-hearing-aid": {"a": "ear with hearing aid", "b": "1F9BB", "j": ["accessibility", "ear with hearing aid", "hard of hearing"]}, "nose": {"a": "nose", "b": "1F443", "j": ["body", "nose"]}, "brain": {"a": "brain", "b": "1F9E0", "j": ["brain", "intelligent"]}, "anatomical-heart": {"a": "anatomical heart", "b": "1FAC0", "j": ["anatomical", "cardiology", "heart", "organ", "pulse"]}, "lungs": {"a": "lungs", "b": "1FAC1", "j": ["breath", "exhalation", "inhalation", "lungs", "organ", "respiration"]}, "tooth": {"a": "tooth", "b": "1F9B7", "j": ["dentist", "tooth"]}, "bone": {"a": "bone", "b": "1F9B4", "j": ["bone", "skeleton"]}, "eyes": {"a": "eyes", "b": "1F440", "j": ["eye", "eyes", "face"]}, "eye": {"a": "eye", "b": "1F441", "j": ["body", "eye"]}, "tongue": {"a": "tongue", "b": "1F445", "j": ["body", "tongue"]}, "mouth": {"a": "mouth", "b": "1F444", "j": ["lips", "mouth"]}, "baby": {"a": "baby", "b": "1F476", "j": ["baby", "young"]}, "child": {"a": "child", "b": "1F9D2", "j": ["child", "gender-neutral", "unspecified gender", "young"]}, "boy": {"a": "boy", "b": "1F466", "j": ["boy", "young"]}, "girl": {"a": "girl", "b": "1F467", "j": ["girl", "Virgo", "young", "zodiac"]}, "person": {"a": "person", "b": "1F9D1", "j": ["adult", "gender-neutral", "person", "unspecified gender"]}, "person-blond-hair": {"a": "person: blond hair", "b": "1F471", "j": ["blond", "blond-haired person", "hair", "person: blond hair"]}, "man": {"a": "man", "b": "1F468", "j": ["adult", "man"]}, "person-beard": {"a": "person: beard", "b": "1F9D4", "j": ["beard", "person", "person: beard", "bewhiskered"]}, "man-beard": {"a": "⊛ man: beard", "b": "1F9D4-200D-2642-FE0F", "j": ["beard", "man", "man: beard"]}, "woman-beard": {"a": "⊛ woman: beard", "b": "1F9D4-200D-2640-FE0F", "j": ["beard", "woman", "woman: beard"]}, "man-red-hair": {"a": "man: red hair", "b": "1F468-200D-1F9B0", "j": ["adult", "man", "red hair"]}, "man-curly-hair": {"a": "man: curly hair", "b": "1F468-200D-1F9B1", "j": ["adult", "curly hair", "man"]}, "man-white-hair": {"a": "man: white hair", "b": "1F468-200D-1F9B3", "j": ["adult", "man", "white hair"]}, "man-bald": {"a": "man: bald", "b": "1F468-200D-1F9B2", "j": ["adult", "bald", "man"]}, "woman": {"a": "woman", "b": "1F469", "j": ["adult", "woman"]}, "woman-red-hair": {"a": "woman: red hair", "b": "1F469-200D-1F9B0", "j": ["adult", "red hair", "woman"]}, "person-red-hair": {"a": "person: red hair", "b": "1F9D1-200D-1F9B0", "j": ["adult", "gender-neutral", "person", "red hair", "unspecified gender"]}, "woman-curly-hair": {"a": "woman: curly hair", "b": "1F469-200D-1F9B1", "j": ["adult", "curly hair", "woman"]}, "person-curly-hair": {"a": "person: curly hair", "b": "1F9D1-200D-1F9B1", "j": ["adult", "curly hair", "gender-neutral", "person", "unspecified gender"]}, "woman-white-hair": {"a": "woman: white hair", "b": "1F469-200D-1F9B3", "j": ["adult", "white hair", "woman"]}, "person-white-hair": {"a": "person: white hair", "b": "1F9D1-200D-1F9B3", "j": ["adult", "gender-neutral", "person", "unspecified gender", "white hair"]}, "woman-bald": {"a": "woman: bald", "b": "1F469-200D-1F9B2", "j": ["adult", "bald", "woman"]}, "person-bald": {"a": "person: bald", "b": "1F9D1-200D-1F9B2", "j": ["adult", "bald", "gender-neutral", "person", "unspecified gender"]}, "woman-blond-hair": {"a": "woman: blond hair", "b": "1F471-200D-2640-FE0F", "j": ["blond-haired woman", "blonde", "hair", "woman", "woman: blond hair"]}, "man-blond-hair": {"a": "man: blond hair", "b": "1F471-200D-2642-FE0F", "j": ["blond", "blond-haired man", "hair", "man", "man: blond hair"]}, "older-person": {"a": "older person", "b": "1F9D3", "j": ["adult", "gender-neutral", "old", "older person", "unspecified gender"]}, "old-man": {"a": "old man", "b": "1F474", "j": ["adult", "man", "old"]}, "old-woman": {"a": "old woman", "b": "1F475", "j": ["adult", "old", "woman"]}, "person-frowning": {"a": "person frowning", "b": "1F64D", "j": ["frown", "gesture", "person frowning"]}, "man-frowning": {"a": "man frowning", "b": "1F64D-200D-2642-FE0F", "j": ["frowning", "gesture", "man"]}, "woman-frowning": {"a": "woman frowning", "b": "1F64D-200D-2640-FE0F", "j": ["frowning", "gesture", "woman"]}, "person-pouting": {"a": "person pouting", "b": "1F64E", "j": ["gesture", "person pouting", "pouting"]}, "man-pouting": {"a": "man pouting", "b": "1F64E-200D-2642-FE0F", "j": ["gesture", "man", "pouting"]}, "woman-pouting": {"a": "woman pouting", "b": "1F64E-200D-2640-FE0F", "j": ["gesture", "pouting", "woman"]}, "person-gesturing-no": {"a": "person gesturing NO", "b": "1F645", "j": ["forbidden", "gesture", "hand", "person gesturing NO", "prohibited"]}, "man-gesturing-no": {"a": "man gesturing NO", "b": "1F645-200D-2642-FE0F", "j": ["forbidden", "gesture", "hand", "man", "man gesturing NO", "prohibited"]}, "woman-gesturing-no": {"a": "woman gesturing NO", "b": "1F645-200D-2640-FE0F", "j": ["forbidden", "gesture", "hand", "prohibited", "woman", "woman gesturing NO"]}, "person-gesturing-ok": {"a": "person gesturing OK", "b": "1F646", "j": ["gesture", "hand", "OK", "person gesturing OK"]}, "man-gesturing-ok": {"a": "man gesturing OK", "b": "1F646-200D-2642-FE0F", "j": ["gesture", "hand", "man", "man gesturing OK", "OK"]}, "woman-gesturing-ok": {"a": "woman gesturing OK", "b": "1F646-200D-2640-FE0F", "j": ["gesture", "hand", "OK", "woman", "woman gesturing OK"]}, "person-tipping-hand": {"a": "person tipping hand", "b": "1F481", "j": ["hand", "help", "information", "person tipping hand", "sassy", "tipping"]}, "man-tipping-hand": {"a": "man tipping hand", "b": "1F481-200D-2642-FE0F", "j": ["man", "man tipping hand", "sassy", "tipping hand"]}, "woman-tipping-hand": {"a": "woman tipping hand", "b": "1F481-200D-2640-FE0F", "j": ["sassy", "tipping hand", "woman", "woman tipping hand"]}, "person-raising-hand": {"a": "person raising hand", "b": "1F64B", "j": ["gesture", "hand", "happy", "person raising hand", "raised"]}, "man-raising-hand": {"a": "man raising hand", "b": "1F64B-200D-2642-FE0F", "j": ["gesture", "man", "man raising hand", "raising hand"]}, "woman-raising-hand": {"a": "woman raising hand", "b": "1F64B-200D-2640-FE0F", "j": ["gesture", "raising hand", "woman", "woman raising hand"]}, "deaf-person": {"a": "deaf person", "b": "1F9CF", "j": ["accessibility", "deaf", "deaf person", "ear", "hear"]}, "deaf-man": {"a": "deaf man", "b": "1F9CF-200D-2642-FE0F", "j": ["deaf", "man"]}, "deaf-woman": {"a": "deaf woman", "b": "1F9CF-200D-2640-FE0F", "j": ["deaf", "woman"]}, "person-bowing": {"a": "person bowing", "b": "1F647", "j": ["apology", "bow", "gesture", "person bowing", "sorry"]}, "man-bowing": {"a": "man bowing", "b": "1F647-200D-2642-FE0F", "j": ["apology", "bowing", "favor", "gesture", "man", "sorry"]}, "woman-bowing": {"a": "woman bowing", "b": "1F647-200D-2640-FE0F", "j": ["apology", "bowing", "favor", "gesture", "sorry", "woman"]}, "person-facepalming": {"a": "person facepalming", "b": "1F926", "j": ["disbelief", "exasperation", "face", "palm", "person facepalming"]}, "man-facepalming": {"a": "man facepalming", "b": "1F926-200D-2642-FE0F", "j": ["disbelief", "exasperation", "facepalm", "man", "man facepalming"]}, "woman-facepalming": {"a": "woman facepalming", "b": "1F926-200D-2640-FE0F", "j": ["disbelief", "exasperation", "facepalm", "woman", "woman facepalming"]}, "person-shrugging": {"a": "person shrugging", "b": "1F937", "j": ["doubt", "ignorance", "indifference", "person shrugging", "shrug"]}, "man-shrugging": {"a": "man shrugging", "b": "1F937-200D-2642-FE0F", "j": ["doubt", "ignorance", "indifference", "man", "man shrugging", "shrug"]}, "woman-shrugging": {"a": "woman shrugging", "b": "1F937-200D-2640-FE0F", "j": ["doubt", "ignorance", "indifference", "shrug", "woman", "woman shrugging"]}, "health-worker": {"a": "health worker", "b": "1F9D1-200D-2695-FE0F", "j": ["doctor", "health worker", "healthcare", "nurse", "therapist"]}, "man-health-worker": {"a": "man health worker", "b": "1F468-200D-2695-FE0F", "j": ["doctor", "healthcare", "man", "man health worker", "nurse", "therapist"]}, "woman-health-worker": {"a": "woman health worker", "b": "1F469-200D-2695-FE0F", "j": ["doctor", "healthcare", "nurse", "therapist", "woman", "woman health worker"]}, "student": {"a": "student", "b": "1F9D1-200D-1F393", "j": ["graduate", "student"]}, "man-student": {"a": "man student", "b": "1F468-200D-1F393", "j": ["graduate", "man", "student"]}, "woman-student": {"a": "woman student", "b": "1F469-200D-1F393", "j": ["graduate", "student", "woman"]}, "teacher": {"a": "teacher", "b": "1F9D1-200D-1F3EB", "j": ["instructor", "professor", "teacher"]}, "man-teacher": {"a": "man teacher", "b": "1F468-200D-1F3EB", "j": ["instructor", "man", "professor", "teacher"]}, "woman-teacher": {"a": "woman teacher", "b": "1F469-200D-1F3EB", "j": ["instructor", "professor", "teacher", "woman"]}, "judge": {"a": "judge", "b": "1F9D1-200D-2696-FE0F", "j": ["judge", "justice", "scales"]}, "man-judge": {"a": "man judge", "b": "1F468-200D-2696-FE0F", "j": ["judge", "justice", "man", "scales"]}, "woman-judge": {"a": "woman judge", "b": "1F469-200D-2696-FE0F", "j": ["judge", "justice", "scales", "woman"]}, "farmer": {"a": "farmer", "b": "1F9D1-200D-1F33E", "j": ["farmer", "gardener", "rancher"]}, "man-farmer": {"a": "man farmer", "b": "1F468-200D-1F33E", "j": ["farmer", "gardener", "man", "rancher"]}, "woman-farmer": {"a": "woman farmer", "b": "1F469-200D-1F33E", "j": ["farmer", "gardener", "rancher", "woman"]}, "cook": {"a": "cook", "b": "1F9D1-200D-1F373", "j": ["chef", "cook"]}, "man-cook": {"a": "man cook", "b": "1F468-200D-1F373", "j": ["chef", "cook", "man"]}, "woman-cook": {"a": "woman cook", "b": "1F469-200D-1F373", "j": ["chef", "cook", "woman"]}, "mechanic": {"a": "mechanic", "b": "1F9D1-200D-1F527", "j": ["electrician", "mechanic", "plumber", "tradesperson"]}, "man-mechanic": {"a": "man mechanic", "b": "1F468-200D-1F527", "j": ["electrician", "man", "mechanic", "plumber", "tradesperson"]}, "woman-mechanic": {"a": "woman mechanic", "b": "1F469-200D-1F527", "j": ["electrician", "mechanic", "plumber", "tradesperson", "woman"]}, "factory-worker": {"a": "factory worker", "b": "1F9D1-200D-1F3ED", "j": ["assembly", "factory", "industrial", "worker"]}, "man-factory-worker": {"a": "man factory worker", "b": "1F468-200D-1F3ED", "j": ["assembly", "factory", "industrial", "man", "worker"]}, "woman-factory-worker": {"a": "woman factory worker", "b": "1F469-200D-1F3ED", "j": ["assembly", "factory", "industrial", "woman", "worker"]}, "office-worker": {"a": "office worker", "b": "1F9D1-200D-1F4BC", "j": ["architect", "business", "manager", "office worker", "white-collar"]}, "man-office-worker": {"a": "man office worker", "b": "1F468-200D-1F4BC", "j": ["architect", "business", "man", "man office worker", "manager", "white-collar"]}, "woman-office-worker": {"a": "woman office worker", "b": "1F469-200D-1F4BC", "j": ["architect", "business", "manager", "white-collar", "woman", "woman office worker"]}, "scientist": {"a": "scientist", "b": "1F9D1-200D-1F52C", "j": ["biologist", "chemist", "engineer", "physicist", "scientist"]}, "man-scientist": {"a": "man scientist", "b": "1F468-200D-1F52C", "j": ["biologist", "chemist", "engineer", "man", "physicist", "scientist"]}, "woman-scientist": {"a": "woman scientist", "b": "1F469-200D-1F52C", "j": ["biologist", "chemist", "engineer", "physicist", "scientist", "woman"]}, "technologist": {"a": "technologist", "b": "1F9D1-200D-1F4BB", "j": ["coder", "developer", "inventor", "software", "technologist"]}, "man-technologist": {"a": "man technologist", "b": "1F468-200D-1F4BB", "j": ["coder", "developer", "inventor", "man", "software", "technologist"]}, "woman-technologist": {"a": "woman technologist", "b": "1F469-200D-1F4BB", "j": ["coder", "developer", "inventor", "software", "technologist", "woman"]}, "singer": {"a": "singer", "b": "1F9D1-200D-1F3A4", "j": ["actor", "entertainer", "rock", "singer", "star"]}, "man-singer": {"a": "man singer", "b": "1F468-200D-1F3A4", "j": ["actor", "entertainer", "man", "rock", "singer", "star"]}, "woman-singer": {"a": "woman singer", "b": "1F469-200D-1F3A4", "j": ["actor", "entertainer", "rock", "singer", "star", "woman"]}, "artist": {"a": "artist", "b": "1F9D1-200D-1F3A8", "j": ["artist", "palette"]}, "man-artist": {"a": "man artist", "b": "1F468-200D-1F3A8", "j": ["artist", "man", "palette"]}, "woman-artist": {"a": "woman artist", "b": "1F469-200D-1F3A8", "j": ["artist", "palette", "woman"]}, "pilot": {"a": "pilot", "b": "1F9D1-200D-2708-FE0F", "j": ["pilot", "plane"]}, "man-pilot": {"a": "man pilot", "b": "1F468-200D-2708-FE0F", "j": ["man", "pilot", "plane"]}, "woman-pilot": {"a": "woman pilot", "b": "1F469-200D-2708-FE0F", "j": ["pilot", "plane", "woman"]}, "astronaut": {"a": "astronaut", "b": "1F9D1-200D-1F680", "j": ["astronaut", "rocket"]}, "man-astronaut": {"a": "man astronaut", "b": "1F468-200D-1F680", "j": ["astronaut", "man", "rocket"]}, "woman-astronaut": {"a": "woman astronaut", "b": "1F469-200D-1F680", "j": ["astronaut", "rocket", "woman"]}, "firefighter": {"a": "firefighter", "b": "1F9D1-200D-1F692", "j": ["firefighter", "firetruck"]}, "man-firefighter": {"a": "man firefighter", "b": "1F468-200D-1F692", "j": ["firefighter", "firetruck", "man"]}, "woman-firefighter": {"a": "woman firefighter", "b": "1F469-200D-1F692", "j": ["firefighter", "firetruck", "woman"]}, "police-officer": {"a": "police officer", "b": "1F46E", "j": ["cop", "officer", "police"]}, "man-police-officer": {"a": "man police officer", "b": "1F46E-200D-2642-FE0F", "j": ["cop", "man", "officer", "police"]}, "woman-police-officer": {"a": "woman police officer", "b": "1F46E-200D-2640-FE0F", "j": ["cop", "officer", "police", "woman"]}, "detective": {"a": "detective", "b": "1F575", "j": ["detective", "sleuth", "spy"]}, "man-detective": {"a": "man detective", "b": "1F575-FE0F-200D-2642-FE0F", "j": ["detective", "man", "sleuth", "spy"]}, "woman-detective": {"a": "woman detective", "b": "1F575-FE0F-200D-2640-FE0F", "j": ["detective", "sleuth", "spy", "woman"]}, "guard": {"a": "guard", "b": "1F482", "j": ["guard"]}, "man-guard": {"a": "man guard", "b": "1F482-200D-2642-FE0F", "j": ["guard", "man"]}, "woman-guard": {"a": "woman guard", "b": "1F482-200D-2640-FE0F", "j": ["guard", "woman"]}, "ninja": {"a": "ninja", "b": "1F977", "j": ["fighter", "hidden", "ninja", "stealth"]}, "construction-worker": {"a": "construction worker", "b": "1F477", "j": ["construction", "hat", "worker"]}, "man-construction-worker": {"a": "man construction worker", "b": "1F477-200D-2642-FE0F", "j": ["construction", "man", "worker"]}, "woman-construction-worker": {"a": "woman construction worker", "b": "1F477-200D-2640-FE0F", "j": ["construction", "woman", "worker"]}, "prince": {"a": "prince", "b": "1F934", "j": ["prince"]}, "princess": {"a": "princess", "b": "1F478", "j": ["fairy tale", "fantasy", "princess"]}, "person-wearing-turban": {"a": "person wearing turban", "b": "1F473", "j": ["person wearing turban", "turban"]}, "man-wearing-turban": {"a": "man wearing turban", "b": "1F473-200D-2642-FE0F", "j": ["man", "man wearing turban", "turban"]}, "woman-wearing-turban": {"a": "woman wearing turban", "b": "1F473-200D-2640-FE0F", "j": ["turban", "woman", "woman wearing turban"]}, "person-with-skullcap": {"a": "person with skullcap", "b": "1F472", "j": ["cap", "gua pi mao", "hat", "person", "person with skullcap", "skullcap"]}, "woman-with-headscarf": {"a": "woman with headscarf", "b": "1F9D5", "j": ["headscarf", "hijab", "mantilla", "tichel", "woman with headscarf", "bandana", "head kerchief"]}, "person-in-tuxedo": {"a": "person in tuxedo", "b": "1F935", "j": ["groom", "person", "person in tuxedo", "tuxedo"]}, "man-in-tuxedo": {"a": "man in tuxedo", "b": "1F935-200D-2642-FE0F", "j": ["man", "man in tuxedo", "tuxedo"]}, "woman-in-tuxedo": {"a": "woman in tuxedo", "b": "1F935-200D-2640-FE0F", "j": ["tuxedo", "woman", "woman in tuxedo"]}, "person-with-veil": {"a": "person with veil", "b": "1F470", "j": ["bride", "person", "person with veil", "veil", "wedding"]}, "man-with-veil": {"a": "man with veil", "b": "1F470-200D-2642-FE0F", "j": ["man", "man with veil", "veil"]}, "woman-with-veil": {"a": "woman with veil", "b": "1F470-200D-2640-FE0F", "j": ["veil", "woman", "woman with veil"]}, "pregnant-woman": {"a": "pregnant woman", "b": "1F930", "j": ["pregnant", "woman"]}, "breastfeeding": {"a": "breast-feeding", "b": "1F931", "j": ["baby", "breast", "breast-feeding", "nursing"]}, "woman-feeding-baby": {"a": "woman feeding baby", "b": "1F469-200D-1F37C", "j": ["baby", "feeding", "nursing", "woman"]}, "man-feeding-baby": {"a": "man feeding baby", "b": "1F468-200D-1F37C", "j": ["baby", "feeding", "man", "nursing"]}, "person-feeding-baby": {"a": "person feeding baby", "b": "1F9D1-200D-1F37C", "j": ["baby", "feeding", "nursing", "person"]}, "baby-angel": {"a": "baby angel", "b": "1F47C", "j": ["angel", "baby", "face", "fairy tale", "fantasy"]}, "santa-claus": {"a": "Santa Claus", "b": "1F385", "j": ["celebration", "Christmas", "claus", "father", "santa", "Santa Claus"]}, "mrs-claus": {"a": "Mrs. Claus", "b": "1F936", "j": ["celebration", "Christmas", "claus", "mother", "Mrs.", "Mrs. Claus"]}, "mx-claus": {"a": "mx claus", "b": "1F9D1-200D-1F384", "j": ["Claus, christmas", "mx claus"]}, "superhero": {"a": "superhero", "b": "1F9B8", "j": ["good", "hero", "heroine", "superhero", "superpower"]}, "man-superhero": {"a": "man superhero", "b": "1F9B8-200D-2642-FE0F", "j": ["good", "hero", "man", "man superhero", "superpower"]}, "woman-superhero": {"a": "woman superhero", "b": "1F9B8-200D-2640-FE0F", "j": ["good", "hero", "heroine", "superpower", "woman", "woman superhero"]}, "supervillain": {"a": "supervillain", "b": "1F9B9", "j": ["criminal", "evil", "superpower", "supervillain", "villain"]}, "man-supervillain": {"a": "man supervillain", "b": "1F9B9-200D-2642-FE0F", "j": ["criminal", "evil", "man", "man supervillain", "superpower", "villain"]}, "woman-supervillain": {"a": "woman supervillain", "b": "1F9B9-200D-2640-FE0F", "j": ["criminal", "evil", "superpower", "villain", "woman", "woman supervillain"]}, "mage": {"a": "mage", "b": "1F9D9", "j": ["mage", "sorcerer", "sorceress", "witch", "wizard"]}, "man-mage": {"a": "man mage", "b": "1F9D9-200D-2642-FE0F", "j": ["man mage", "sorcerer", "wizard"]}, "woman-mage": {"a": "woman mage", "b": "1F9D9-200D-2640-FE0F", "j": ["sorceress", "witch", "woman mage"]}, "fairy": {"a": "fairy", "b": "1F9DA", "j": ["fairy", "Oberon", "Puck", "Titania"]}, "man-fairy": {"a": "man fairy", "b": "1F9DA-200D-2642-FE0F", "j": ["man fairy", "Oberon", "Puck"]}, "woman-fairy": {"a": "woman fairy", "b": "1F9DA-200D-2640-FE0F", "j": ["Titania", "woman fairy"]}, "vampire": {"a": "vampire", "b": "1F9DB", "j": ["Dracula", "undead", "vampire"]}, "man-vampire": {"a": "man vampire", "b": "1F9DB-200D-2642-FE0F", "j": ["Dracula", "man vampire", "undead"]}, "woman-vampire": {"a": "woman vampire", "b": "1F9DB-200D-2640-FE0F", "j": ["undead", "woman vampire"]}, "merperson": {"a": "merperson", "b": "1F9DC", "j": ["mermaid", "merman", "merperson", "merwoman"]}, "merman": {"a": "merman", "b": "1F9DC-200D-2642-FE0F", "j": ["merman", "Triton"]}, "mermaid": {"a": "mermaid", "b": "1F9DC-200D-2640-FE0F", "j": ["mermaid", "merwoman"]}, "elf": {"a": "elf", "b": "1F9DD", "j": ["elf", "magical", "LOTR style"]}, "man-elf": {"a": "man elf", "b": "1F9DD-200D-2642-FE0F", "j": ["magical", "man elf"]}, "woman-elf": {"a": "woman elf", "b": "1F9DD-200D-2640-FE0F", "j": ["magical", "woman elf"]}, "genie": {"a": "genie", "b": "1F9DE", "j": ["djinn", "genie", "(non-human color)"]}, "man-genie": {"a": "man genie", "b": "1F9DE-200D-2642-FE0F", "j": ["djinn", "man genie"]}, "woman-genie": {"a": "woman genie", "b": "1F9DE-200D-2640-FE0F", "j": ["djinn", "woman genie"]}, "zombie": {"a": "zombie", "b": "1F9DF", "j": ["undead", "walking dead", "zombie", "(non-human color)"]}, "man-zombie": {"a": "man zombie", "b": "1F9DF-200D-2642-FE0F", "j": ["man zombie", "undead", "walking dead"]}, "woman-zombie": {"a": "woman zombie", "b": "1F9DF-200D-2640-FE0F", "j": ["undead", "walking dead", "woman zombie"]}, "person-getting-massage": {"a": "person getting massage", "b": "1F486", "j": ["face", "massage", "person getting massage", "salon"]}, "man-getting-massage": {"a": "man getting massage", "b": "1F486-200D-2642-FE0F", "j": ["face", "man", "man getting massage", "massage"]}, "woman-getting-massage": {"a": "woman getting massage", "b": "1F486-200D-2640-FE0F", "j": ["face", "massage", "woman", "woman getting massage"]}, "person-getting-haircut": {"a": "person getting haircut", "b": "1F487", "j": ["barber", "beauty", "haircut", "parlor", "person getting haircut"]}, "man-getting-haircut": {"a": "man getting haircut", "b": "1F487-200D-2642-FE0F", "j": ["haircut", "man", "man getting haircut"]}, "woman-getting-haircut": {"a": "woman getting haircut", "b": "1F487-200D-2640-FE0F", "j": ["haircut", "woman", "woman getting haircut"]}, "person-walking": {"a": "person walking", "b": "1F6B6", "j": ["hike", "person walking", "walk", "walking"]}, "man-walking": {"a": "man walking", "b": "1F6B6-200D-2642-FE0F", "j": ["hike", "man", "man walking", "walk"]}, "woman-walking": {"a": "woman walking", "b": "1F6B6-200D-2640-FE0F", "j": ["hike", "walk", "woman", "woman walking"]}, "person-standing": {"a": "person standing", "b": "1F9CD", "j": ["person standing", "stand", "standing"]}, "man-standing": {"a": "man standing", "b": "1F9CD-200D-2642-FE0F", "j": ["man", "standing"]}, "woman-standing": {"a": "woman standing", "b": "1F9CD-200D-2640-FE0F", "j": ["standing", "woman"]}, "person-kneeling": {"a": "person kneeling", "b": "1F9CE", "j": ["kneel", "kneeling", "person kneeling"]}, "man-kneeling": {"a": "man kneeling", "b": "1F9CE-200D-2642-FE0F", "j": ["kneeling", "man"]}, "woman-kneeling": {"a": "woman kneeling", "b": "1F9CE-200D-2640-FE0F", "j": ["kneeling", "woman"]}, "person-with-white-cane": {"a": "person with white cane", "b": "1F9D1-200D-1F9AF", "j": ["accessibility", "blind", "person with white cane"]}, "man-with-white-cane": {"a": "man with white cane", "b": "1F468-200D-1F9AF", "j": ["accessibility", "blind", "man", "man with white cane"]}, "woman-with-white-cane": {"a": "woman with white cane", "b": "1F469-200D-1F9AF", "j": ["accessibility", "blind", "woman", "woman with white cane"]}, "person-in-motorized-wheelchair": {"a": "person in motorized wheelchair", "b": "1F9D1-200D-1F9BC", "j": ["accessibility", "person in motorized wheelchair", "wheelchair"]}, "man-in-motorized-wheelchair": {"a": "man in motorized wheelchair", "b": "1F468-200D-1F9BC", "j": ["accessibility", "man", "man in motorized wheelchair", "wheelchair"]}, "woman-in-motorized-wheelchair": {"a": "woman in motorized wheelchair", "b": "1F469-200D-1F9BC", "j": ["accessibility", "wheelchair", "woman", "woman in motorized wheelchair"]}, "person-in-manual-wheelchair": {"a": "person in manual wheelchair", "b": "1F9D1-200D-1F9BD", "j": ["accessibility", "person in manual wheelchair", "wheelchair"]}, "man-in-manual-wheelchair": {"a": "man in manual wheelchair", "b": "1F468-200D-1F9BD", "j": ["accessibility", "man", "man in manual wheelchair", "wheelchair"]}, "woman-in-manual-wheelchair": {"a": "woman in manual wheelchair", "b": "1F469-200D-1F9BD", "j": ["accessibility", "wheelchair", "woman", "woman in manual wheelchair"]}, "person-running": {"a": "person running", "b": "1F3C3", "j": ["marathon", "person running", "running"]}, "man-running": {"a": "man running", "b": "1F3C3-200D-2642-FE0F", "j": ["man", "marathon", "racing", "running"]}, "woman-running": {"a": "woman running", "b": "1F3C3-200D-2640-FE0F", "j": ["marathon", "racing", "running", "woman"]}, "woman-dancing": {"a": "woman dancing", "b": "1F483", "j": ["dance", "dancing", "woman"]}, "man-dancing": {"a": "man dancing", "b": "1F57A", "j": ["dance", "dancing", "man"]}, "person-in-suit-levitating": {"a": "person in suit levitating", "b": "1F574", "j": ["business", "person", "person in suit levitating", "suit"]}, "people-with-bunny-ears": {"a": "people with bunny ears", "b": "1F46F", "j": ["bunny ear", "dancer", "partying", "people with bunny ears"]}, "men-with-bunny-ears": {"a": "men with bunny ears", "b": "1F46F-200D-2642-FE0F", "j": ["bunny ear", "dancer", "men", "men with bunny ears", "partying"]}, "women-with-bunny-ears": {"a": "women with bunny ears", "b": "1F46F-200D-2640-FE0F", "j": ["bunny ear", "dancer", "partying", "women", "women with bunny ears"]}, "person-in-steamy-room": {"a": "person in steamy room", "b": "1F9D6", "j": ["person in steamy room", "sauna", "steam room", "hamam", "steambath"]}, "man-in-steamy-room": {"a": "man in steamy room", "b": "1F9D6-200D-2642-FE0F", "j": ["man in steamy room", "sauna", "steam room"]}, "woman-in-steamy-room": {"a": "woman in steamy room", "b": "1F9D6-200D-2640-FE0F", "j": ["sauna", "steam room", "woman in steamy room"]}, "person-climbing": {"a": "person climbing", "b": "1F9D7", "j": ["climber", "person climbing"]}, "man-climbing": {"a": "man climbing", "b": "1F9D7-200D-2642-FE0F", "j": ["climber", "man climbing"]}, "woman-climbing": {"a": "woman climbing", "b": "1F9D7-200D-2640-FE0F", "j": ["climber", "woman climbing"]}, "person-fencing": {"a": "person fencing", "b": "1F93A", "j": ["fencer", "fencing", "person fencing", "sword"]}, "horse-racing": {"a": "horse racing", "b": "1F3C7", "j": ["horse", "jockey", "racehorse", "racing"]}, "skier": {"a": "skier", "b": "26F7", "j": ["ski", "skier", "snow"]}, "snowboarder": {"a": "snowboarder", "b": "1F3C2", "j": ["ski", "snow", "snowboard", "snowboarder"]}, "person-golfing": {"a": "person golfing", "b": "1F3CC", "j": ["ball", "golf", "person golfing"]}, "man-golfing": {"a": "man golfing", "b": "1F3CC-FE0F-200D-2642-FE0F", "j": ["golf", "man", "man golfing"]}, "woman-golfing": {"a": "woman golfing", "b": "1F3CC-FE0F-200D-2640-FE0F", "j": ["golf", "woman", "woman golfing"]}, "person-surfing": {"a": "person surfing", "b": "1F3C4", "j": ["person surfing", "surfing"]}, "man-surfing": {"a": "man surfing", "b": "1F3C4-200D-2642-FE0F", "j": ["man", "surfing"]}, "woman-surfing": {"a": "woman surfing", "b": "1F3C4-200D-2640-FE0F", "j": ["surfing", "woman"]}, "person-rowing-boat": {"a": "person rowing boat", "b": "1F6A3", "j": ["boat", "person rowing boat", "rowboat"]}, "man-rowing-boat": {"a": "man rowing boat", "b": "1F6A3-200D-2642-FE0F", "j": ["boat", "man", "man rowing boat", "rowboat"]}, "woman-rowing-boat": {"a": "woman rowing boat", "b": "1F6A3-200D-2640-FE0F", "j": ["boat", "rowboat", "woman", "woman rowing boat"]}, "person-swimming": {"a": "person swimming", "b": "1F3CA", "j": ["person swimming", "swim"]}, "man-swimming": {"a": "man swimming", "b": "1F3CA-200D-2642-FE0F", "j": ["man", "man swimming", "swim"]}, "woman-swimming": {"a": "woman swimming", "b": "1F3CA-200D-2640-FE0F", "j": ["swim", "woman", "woman swimming"]}, "person-bouncing-ball": {"a": "person bouncing ball", "b": "26F9", "j": ["ball", "person bouncing ball"]}, "man-bouncing-ball": {"a": "man bouncing ball", "b": "26F9-FE0F-200D-2642-FE0F", "j": ["ball", "man", "man bouncing ball"]}, "woman-bouncing-ball": {"a": "woman bouncing ball", "b": "26F9-FE0F-200D-2640-FE0F", "j": ["ball", "woman", "woman bouncing ball"]}, "person-lifting-weights": {"a": "person lifting weights", "b": "1F3CB", "j": ["lifter", "person lifting weights", "weight"]}, "man-lifting-weights": {"a": "man lifting weights", "b": "1F3CB-FE0F-200D-2642-FE0F", "j": ["man", "man lifting weights", "weight lifter"]}, "woman-lifting-weights": {"a": "woman lifting weights", "b": "1F3CB-FE0F-200D-2640-FE0F", "j": ["weight lifter", "woman", "woman lifting weights"]}, "person-biking": {"a": "person biking", "b": "1F6B4", "j": ["bicycle", "biking", "cyclist", "person biking"]}, "man-biking": {"a": "man biking", "b": "1F6B4-200D-2642-FE0F", "j": ["bicycle", "biking", "cyclist", "man"]}, "woman-biking": {"a": "woman biking", "b": "1F6B4-200D-2640-FE0F", "j": ["bicycle", "biking", "cyclist", "woman"]}, "person-mountain-biking": {"a": "person mountain biking", "b": "1F6B5", "j": ["bicycle", "bicyclist", "bike", "cyclist", "mountain", "person mountain biking"]}, "man-mountain-biking": {"a": "man mountain biking", "b": "1F6B5-200D-2642-FE0F", "j": ["bicycle", "bike", "cyclist", "man", "man mountain biking", "mountain"]}, "woman-mountain-biking": {"a": "woman mountain biking", "b": "1F6B5-200D-2640-FE0F", "j": ["bicycle", "bike", "biking", "cyclist", "mountain", "woman"]}, "person-cartwheeling": {"a": "person cartwheeling", "b": "1F938", "j": ["cartwheel", "gymnastics", "person cartwheeling"]}, "man-cartwheeling": {"a": "man cartwheeling", "b": "1F938-200D-2642-FE0F", "j": ["cartwheel", "gymnastics", "man", "man cartwheeling"]}, "woman-cartwheeling": {"a": "woman cartwheeling", "b": "1F938-200D-2640-FE0F", "j": ["cartwheel", "gymnastics", "woman", "woman cartwheeling"]}, "people-wrestling": {"a": "people wrestling", "b": "1F93C", "j": ["people wrestling", "wrestle", "wrestler"]}, "men-wrestling": {"a": "men wrestling", "b": "1F93C-200D-2642-FE0F", "j": ["men", "men wrestling", "wrestle"]}, "women-wrestling": {"a": "women wrestling", "b": "1F93C-200D-2640-FE0F", "j": ["women", "women wrestling", "wrestle"]}, "person-playing-water-polo": {"a": "person playing water polo", "b": "1F93D", "j": ["person playing water polo", "polo", "water"]}, "man-playing-water-polo": {"a": "man playing water polo", "b": "1F93D-200D-2642-FE0F", "j": ["man", "man playing water polo", "water polo"]}, "woman-playing-water-polo": {"a": "woman playing water polo", "b": "1F93D-200D-2640-FE0F", "j": ["water polo", "woman", "woman playing water polo"]}, "person-playing-handball": {"a": "person playing handball", "b": "1F93E", "j": ["ball", "handball", "person playing handball"]}, "man-playing-handball": {"a": "man playing handball", "b": "1F93E-200D-2642-FE0F", "j": ["handball", "man", "man playing handball"]}, "woman-playing-handball": {"a": "woman playing handball", "b": "1F93E-200D-2640-FE0F", "j": ["handball", "woman", "woman playing handball"]}, "person-juggling": {"a": "person juggling", "b": "1F939", "j": ["balance", "juggle", "multitask", "person juggling", "skill"]}, "man-juggling": {"a": "man juggling", "b": "1F939-200D-2642-FE0F", "j": ["juggling", "man", "multitask"]}, "woman-juggling": {"a": "woman juggling", "b": "1F939-200D-2640-FE0F", "j": ["juggling", "multitask", "woman"]}, "person-in-lotus-position": {"a": "person in lotus position", "b": "1F9D8", "j": ["meditation", "person in lotus position", "yoga", "serenity"]}, "man-in-lotus-position": {"a": "man in lotus position", "b": "1F9D8-200D-2642-FE0F", "j": ["man in lotus position", "meditation", "yoga"]}, "woman-in-lotus-position": {"a": "woman in lotus position", "b": "1F9D8-200D-2640-FE0F", "j": ["meditation", "woman in lotus position", "yoga"]}, "person-taking-bath": {"a": "person taking bath", "b": "1F6C0", "j": ["bath", "bathtub", "person taking bath"]}, "person-in-bed": {"a": "person in bed", "b": "1F6CC", "j": ["hotel", "person in bed", "sleep"]}, "people-holding-hands": {"a": "people holding hands", "b": "1F9D1-200D-1F91D-200D-1F9D1", "j": ["couple", "hand", "hold", "holding hands", "people holding hands", "person"]}, "women-holding-hands": {"a": "women holding hands", "b": "1F46D", "j": ["couple", "hand", "holding hands", "women", "women holding hands"]}, "woman-and-man-holding-hands": {"a": "woman and man holding hands", "b": "1F46B", "j": ["couple", "hand", "hold", "holding hands", "man", "woman", "woman and man holding hands"]}, "men-holding-hands": {"a": "men holding hands", "b": "1F46C", "j": ["couple", "Gemini", "holding hands", "man", "men", "men holding hands", "twins", "zodiac"]}, "kiss": {"a": "kiss", "b": "1F48F", "j": ["couple", "kiss"]}, "kiss-woman-man": {"a": "kiss: woman, man", "b": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F468", "j": ["couple", "kiss", "man", "woman"]}, "kiss-man-man": {"a": "kiss: man, man", "b": "1F468-200D-2764-FE0F-200D-1F48B-200D-1F468", "j": ["couple", "kiss", "man"]}, "kiss-woman-woman": {"a": "kiss: woman, woman", "b": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F469", "j": ["couple", "kiss", "woman"]}, "couple-with-heart": {"a": "couple with heart", "b": "1F491", "j": ["couple", "couple with heart", "love"]}, "couple-with-heart-woman-man": {"a": "couple with heart: woman, man", "b": "1F469-200D-2764-FE0F-200D-1F468", "j": ["couple", "couple with heart", "love", "man", "woman"]}, "couple-with-heart-man-man": {"a": "couple with heart: man, man", "b": "1F468-200D-2764-FE0F-200D-1F468", "j": ["couple", "couple with heart", "love", "man"]}, "couple-with-heart-woman-woman": {"a": "couple with heart: woman, woman", "b": "1F469-200D-2764-FE0F-200D-1F469", "j": ["couple", "couple with heart", "love", "woman"]}, "family": {"a": "family", "b": "1F46A", "j": ["family"]}, "family-man-woman-boy": {"a": "family: man, woman, boy", "b": "1F468-200D-1F469-200D-1F466", "j": ["boy", "family", "man", "woman"]}, "family-man-woman-girl": {"a": "family: man, woman, girl", "b": "1F468-200D-1F469-200D-1F467", "j": ["family", "girl", "man", "woman"]}, "family-man-woman-girl-boy": {"a": "family: man, woman, girl, boy", "b": "1F468-200D-1F469-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "man", "woman"]}, "family-man-woman-boy-boy": {"a": "family: man, woman, boy, boy", "b": "1F468-200D-1F469-200D-1F466-200D-1F466", "j": ["boy", "family", "man", "woman"]}, "family-man-woman-girl-girl": {"a": "family: man, woman, girl, girl", "b": "1F468-200D-1F469-200D-1F467-200D-1F467", "j": ["family", "girl", "man", "woman"]}, "family-man-man-boy": {"a": "family: man, man, boy", "b": "1F468-200D-1F468-200D-1F466", "j": ["boy", "family", "man"]}, "family-man-man-girl": {"a": "family: man, man, girl", "b": "1F468-200D-1F468-200D-1F467", "j": ["family", "girl", "man"]}, "family-man-man-girl-boy": {"a": "family: man, man, girl, boy", "b": "1F468-200D-1F468-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "man"]}, "family-man-man-boy-boy": {"a": "family: man, man, boy, boy", "b": "1F468-200D-1F468-200D-1F466-200D-1F466", "j": ["boy", "family", "man"]}, "family-man-man-girl-girl": {"a": "family: man, man, girl, girl", "b": "1F468-200D-1F468-200D-1F467-200D-1F467", "j": ["family", "girl", "man"]}, "family-woman-woman-boy": {"a": "family: woman, woman, boy", "b": "1F469-200D-1F469-200D-1F466", "j": ["boy", "family", "woman"]}, "family-woman-woman-girl": {"a": "family: woman, woman, girl", "b": "1F469-200D-1F469-200D-1F467", "j": ["family", "girl", "woman"]}, "family-woman-woman-girl-boy": {"a": "family: woman, woman, girl, boy", "b": "1F469-200D-1F469-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "woman"]}, "family-woman-woman-boy-boy": {"a": "family: woman, woman, boy, boy", "b": "1F469-200D-1F469-200D-1F466-200D-1F466", "j": ["boy", "family", "woman"]}, "family-woman-woman-girl-girl": {"a": "family: woman, woman, girl, girl", "b": "1F469-200D-1F469-200D-1F467-200D-1F467", "j": ["family", "girl", "woman"]}, "family-man-boy": {"a": "family: man, boy", "b": "1F468-200D-1F466", "j": ["boy", "family", "man"]}, "family-man-boy-boy": {"a": "family: man, boy, boy", "b": "1F468-200D-1F466-200D-1F466", "j": ["boy", "family", "man"]}, "family-man-girl": {"a": "family: man, girl", "b": "1F468-200D-1F467", "j": ["family", "girl", "man"]}, "family-man-girl-boy": {"a": "family: man, girl, boy", "b": "1F468-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "man"]}, "family-man-girl-girl": {"a": "family: man, girl, girl", "b": "1F468-200D-1F467-200D-1F467", "j": ["family", "girl", "man"]}, "family-woman-boy": {"a": "family: woman, boy", "b": "1F469-200D-1F466", "j": ["boy", "family", "woman"]}, "family-woman-boy-boy": {"a": "family: woman, boy, boy", "b": "1F469-200D-1F466-200D-1F466", "j": ["boy", "family", "woman"]}, "family-woman-girl": {"a": "family: woman, girl", "b": "1F469-200D-1F467", "j": ["family", "girl", "woman"]}, "family-woman-girl-boy": {"a": "family: woman, girl, boy", "b": "1F469-200D-1F467-200D-1F466", "j": ["boy", "family", "girl", "woman"]}, "family-woman-girl-girl": {"a": "family: woman, girl, girl", "b": "1F469-200D-1F467-200D-1F467", "j": ["family", "girl", "woman"]}, "speaking-head": {"a": "speaking head", "b": "1F5E3", "j": ["face", "head", "silhouette", "speak", "speaking"]}, "bust-in-silhouette": {"a": "bust in silhouette", "b": "1F464", "j": ["bust", "bust in silhouette", "silhouette"]}, "busts-in-silhouette": {"a": "busts in silhouette", "b": "1F465", "j": ["bust", "busts in silhouette", "silhouette"]}, "people-hugging": {"a": "people hugging", "b": "1FAC2", "j": ["goodbye", "hello", "hug", "people hugging", "thanks"]}, "footprints": {"a": "footprints", "b": "1F463", "j": ["clothing", "footprint", "footprints", "print"]}, "red-hair": {"a": "red hair", "b": "1F9B0", "j": ["ginger", "red hair", "redhead"]}, "curly-hair": {"a": "curly hair", "b": "1F9B1", "j": ["afro", "curly", "curly hair", "ringlets"]}, "white-hair": {"a": "white hair", "b": "1F9B3", "j": ["gray", "hair", "old", "white"]}, "bald": {"a": "bald", "b": "1F9B2", "j": ["bald", "chemotherapy", "hairless", "no hair", "shaven"]}, "monkey-face": {"a": "monkey face", "b": "1F435", "j": ["face", "monkey"]}, "monkey": {"a": "monkey", "b": "1F412", "j": ["monkey"]}, "gorilla": {"a": "gorilla", "b": "1F98D", "j": ["gorilla"]}, "orangutan": {"a": "orangutan", "b": "1F9A7", "j": ["ape", "orangutan"]}, "dog-face": {"a": "dog face", "b": "1F436", "j": ["dog", "face", "pet"]}, "dog": {"a": "dog", "b": "1F415", "j": ["dog", "pet"]}, "guide-dog": {"a": "guide dog", "b": "1F9AE", "j": ["accessibility", "blind", "guide", "guide dog"]}, "service-dog": {"a": "service dog", "b": "1F415-200D-1F9BA", "j": ["accessibility", "assistance", "dog", "service"]}, "poodle": {"a": "poodle", "b": "1F429", "j": ["dog", "poodle"]}, "wolf": {"a": "wolf", "b": "1F43A", "j": ["face", "wolf"]}, "fox": {"a": "fox", "b": "1F98A", "j": ["face", "fox"]}, "raccoon": {"a": "raccoon", "b": "1F99D", "j": ["curious", "raccoon", "sly"]}, "cat-face": {"a": "cat face", "b": "1F431", "j": ["cat", "face", "pet"]}, "cat": {"a": "cat", "b": "1F408", "j": ["cat", "pet"]}, "black-cat": {"a": "black cat", "b": "1F408-200D-2B1B", "j": ["black", "cat", "unlucky"]}, "lion": {"a": "lion", "b": "1F981", "j": ["face", "Leo", "lion", "zodiac"]}, "tiger-face": {"a": "tiger face", "b": "1F42F", "j": ["face", "tiger"]}, "tiger": {"a": "tiger", "b": "1F405", "j": ["tiger"]}, "leopard": {"a": "leopard", "b": "1F406", "j": ["leopard"]}, "horse-face": {"a": "horse face", "b": "1F434", "j": ["face", "horse"]}, "horse": {"a": "horse", "b": "1F40E", "j": ["equestrian", "horse", "racehorse", "racing"]}, "unicorn": {"a": "unicorn", "b": "1F984", "j": ["face", "unicorn"]}, "zebra": {"a": "zebra", "b": "1F993", "j": ["stripe", "zebra"]}, "deer": {"a": "deer", "b": "1F98C", "j": ["deer"]}, "bison": {"a": "bison", "b": "1F9AC", "j": ["bison", "buffalo", "herd", "wisent"]}, "cow-face": {"a": "cow face", "b": "1F42E", "j": ["cow", "face"]}, "ox": {"a": "ox", "b": "1F402", "j": ["bull", "ox", "Taurus", "zodiac"]}, "water-buffalo": {"a": "water buffalo", "b": "1F403", "j": ["buffalo", "water"]}, "cow": {"a": "cow", "b": "1F404", "j": ["cow"]}, "pig-face": {"a": "pig face", "b": "1F437", "j": ["face", "pig"]}, "pig": {"a": "pig", "b": "1F416", "j": ["pig", "sow"]}, "boar": {"a": "boar", "b": "1F417", "j": ["boar", "pig"]}, "pig-nose": {"a": "pig nose", "b": "1F43D", "j": ["face", "nose", "pig"]}, "ram": {"a": "ram", "b": "1F40F", "j": ["Aries", "male", "ram", "sheep", "zodiac"]}, "ewe": {"a": "ewe", "b": "1F411", "j": ["ewe", "female", "sheep"]}, "goat": {"a": "goat", "b": "1F410", "j": ["Capricorn", "goat", "zodiac"]}, "camel": {"a": "camel", "b": "1F42A", "j": ["camel", "dromedary", "hump"]}, "twohump-camel": {"a": "two-hump camel", "b": "1F42B", "j": ["bactrian", "camel", "hump", "two-hump camel"]}, "llama": {"a": "llama", "b": "1F999", "j": ["alpaca", "guanaco", "llama", "vicuña", "wool"]}, "giraffe": {"a": "giraffe", "b": "1F992", "j": ["giraffe", "spots"]}, "elephant": {"a": "elephant", "b": "1F418", "j": ["elephant"]}, "mammoth": {"a": "mammoth", "b": "1F9A3", "j": ["extinction", "large", "mammoth", "tusk", "woolly"]}, "rhinoceros": {"a": "rhinoceros", "b": "1F98F", "j": ["rhinoceros"]}, "hippopotamus": {"a": "hippopotamus", "b": "1F99B", "j": ["hippo", "hippopotamus"]}, "mouse-face": {"a": "mouse face", "b": "1F42D", "j": ["face", "mouse"]}, "mouse": {"a": "mouse", "b": "1F401", "j": ["mouse"]}, "rat": {"a": "rat", "b": "1F400", "j": ["rat"]}, "hamster": {"a": "hamster", "b": "1F439", "j": ["face", "hamster", "pet"]}, "rabbit-face": {"a": "rabbit face", "b": "1F430", "j": ["bunny", "face", "pet", "rabbit"]}, "rabbit": {"a": "rabbit", "b": "1F407", "j": ["bunny", "pet", "rabbit"]}, "chipmunk": {"a": "chipmunk", "b": "1F43F", "j": ["chipmunk", "squirrel"]}, "beaver": {"a": "beaver", "b": "1F9AB", "j": ["beaver", "dam"]}, "hedgehog": {"a": "hedgehog", "b": "1F994", "j": ["hedgehog", "spiny"]}, "bat": {"a": "bat", "b": "1F987", "j": ["bat", "vampire"]}, "bear": {"a": "bear", "b": "1F43B", "j": ["bear", "face"]}, "polar-bear": {"a": "polar bear", "b": "1F43B-200D-2744-FE0F", "j": ["arctic", "bear", "polar bear", "white"]}, "koala": {"a": "koala", "b": "1F428", "j": ["bear", "koala"]}, "panda": {"a": "panda", "b": "1F43C", "j": ["face", "panda"]}, "sloth": {"a": "sloth", "b": "1F9A5", "j": ["lazy", "sloth", "slow"]}, "otter": {"a": "otter", "b": "1F9A6", "j": ["fishing", "otter", "playful"]}, "skunk": {"a": "skunk", "b": "1F9A8", "j": ["skunk", "stink"]}, "kangaroo": {"a": "kangaroo", "b": "1F998", "j": ["Australia", "joey", "jump", "kangaroo", "marsupial"]}, "badger": {"a": "badger", "b": "1F9A1", "j": ["badger", "honey badger", "pester"]}, "paw-prints": {"a": "paw prints", "b": "1F43E", "j": ["feet", "paw", "paw prints", "print"]}, "turkey": {"a": "turkey", "b": "1F983", "j": ["bird", "turkey"]}, "chicken": {"a": "chicken", "b": "1F414", "j": ["bird", "chicken"]}, "rooster": {"a": "rooster", "b": "1F413", "j": ["bird", "rooster"]}, "hatching-chick": {"a": "hatching chick", "b": "1F423", "j": ["baby", "bird", "chick", "hatching"]}, "baby-chick": {"a": "baby chick", "b": "1F424", "j": ["baby", "bird", "chick"]}, "frontfacing-baby-chick": {"a": "front-facing baby chick", "b": "1F425", "j": ["baby", "bird", "chick", "front-facing baby chick"]}, "bird": {"a": "bird", "b": "1F426", "j": ["bird"]}, "penguin": {"a": "penguin", "b": "1F427", "j": ["bird", "penguin"]}, "dove": {"a": "dove", "b": "1F54A", "j": ["bird", "dove", "fly", "peace"]}, "eagle": {"a": "eagle", "b": "1F985", "j": ["bird", "eagle"]}, "duck": {"a": "duck", "b": "1F986", "j": ["bird", "duck"]}, "swan": {"a": "swan", "b": "1F9A2", "j": ["bird", "cygnet", "swan", "ugly duckling"]}, "owl": {"a": "owl", "b": "1F989", "j": ["bird", "owl", "wise"]}, "dodo": {"a": "dodo", "b": "1F9A4", "j": ["dodo", "extinction", "large", "Mauritius"]}, "feather": {"a": "feather", "b": "1FAB6", "j": ["bird", "feather", "flight", "light", "plumage"]}, "flamingo": {"a": "flamingo", "b": "1F9A9", "j": ["flamboyant", "flamingo", "tropical"]}, "peacock": {"a": "peacock", "b": "1F99A", "j": ["bird", "ostentatious", "peacock", "peahen", "proud"]}, "parrot": {"a": "parrot", "b": "1F99C", "j": ["bird", "parrot", "pirate", "talk"]}, "frog": {"a": "frog", "b": "1F438", "j": ["face", "frog"]}, "crocodile": {"a": "crocodile", "b": "1F40A", "j": ["crocodile"]}, "turtle": {"a": "turtle", "b": "1F422", "j": ["terrapin", "tortoise", "turtle"]}, "lizard": {"a": "lizard", "b": "1F98E", "j": ["lizard", "reptile"]}, "snake": {"a": "snake", "b": "1F40D", "j": ["bearer", "Ophiuchus", "serpent", "snake", "zodiac"]}, "dragon-face": {"a": "dragon face", "b": "1F432", "j": ["dragon", "face", "fairy tale"]}, "dragon": {"a": "dragon", "b": "1F409", "j": ["dragon", "fairy tale"]}, "sauropod": {"a": "sauropod", "b": "1F995", "j": ["brachiosaurus", "brontosaurus", "diplodocus", "sauropod"]}, "trex": {"a": "T-Rex", "b": "1F996", "j": ["T-Rex", "Tyrannosaurus Rex"]}, "spouting-whale": {"a": "spouting whale", "b": "1F433", "j": ["face", "spouting", "whale"]}, "whale": {"a": "whale", "b": "1F40B", "j": ["whale"]}, "dolphin": {"a": "dolphin", "b": "1F42C", "j": ["dolphin", "flipper"]}, "seal": {"a": "seal", "b": "1F9AD", "j": ["sea Lion", "seal"]}, "fish": {"a": "fish", "b": "1F41F", "j": ["fish", "Pisces", "zodiac"]}, "tropical-fish": {"a": "tropical fish", "b": "1F420", "j": ["fish", "tropical"]}, "blowfish": {"a": "blowfish", "b": "1F421", "j": ["blowfish", "fish"]}, "shark": {"a": "shark", "b": "1F988", "j": ["fish", "shark"]}, "octopus": {"a": "octopus", "b": "1F419", "j": ["octopus"]}, "spiral-shell": {"a": "spiral shell", "b": "1F41A", "j": ["shell", "spiral"]}, "snail": {"a": "snail", "b": "1F40C", "j": ["snail"]}, "butterfly": {"a": "butterfly", "b": "1F98B", "j": ["butterfly", "insect", "pretty"]}, "bug": {"a": "bug", "b": "1F41B", "j": ["bug", "insect"]}, "ant": {"a": "ant", "b": "1F41C", "j": ["ant", "insect"]}, "honeybee": {"a": "honeybee", "b": "1F41D", "j": ["bee", "honeybee", "insect"]}, "beetle": {"a": "beetle", "b": "1FAB2", "j": ["beetle", "bug", "insect"]}, "lady-beetle": {"a": "lady beetle", "b": "1F41E", "j": ["beetle", "insect", "lady beetle", "ladybird", "ladybug"]}, "cricket": {"a": "cricket", "b": "1F997", "j": ["cricket", "grasshopper", "Orthoptera"]}, "cockroach": {"a": "cockroach", "b": "1FAB3", "j": ["cockroach", "insect", "pest", "roach"]}, "spider": {"a": "spider", "b": "1F577", "j": ["insect", "spider"]}, "spider-web": {"a": "spider web", "b": "1F578", "j": ["spider", "web"]}, "scorpion": {"a": "scorpion", "b": "1F982", "j": ["scorpio", "Scorpio", "scorpion", "zodiac"]}, "mosquito": {"a": "mosquito", "b": "1F99F", "j": ["disease", "fever", "malaria", "mosquito", "pest", "virus"]}, "fly": {"a": "fly", "b": "1FAB0", "j": ["disease", "fly", "maggot", "pest", "rotting"]}, "worm": {"a": "worm", "b": "1FAB1", "j": ["annelid", "earthworm", "parasite", "worm"]}, "microbe": {"a": "microbe", "b": "1F9A0", "j": ["amoeba", "bacteria", "microbe", "virus"]}, "bouquet": {"a": "bouquet", "b": "1F490", "j": ["bouquet", "flower"]}, "cherry-blossom": {"a": "cherry blossom", "b": "1F338", "j": ["blossom", "cherry", "flower"]}, "white-flower": {"a": "white flower", "b": "1F4AE", "j": ["flower", "white flower"]}, "rosette": {"a": "rosette", "b": "1F3F5", "j": ["plant", "rosette"]}, "rose": {"a": "rose", "b": "1F339", "j": ["flower", "rose"]}, "wilted-flower": {"a": "wilted flower", "b": "1F940", "j": ["flower", "wilted"]}, "hibiscus": {"a": "hibiscus", "b": "1F33A", "j": ["flower", "hibiscus"]}, "sunflower": {"a": "sunflower", "b": "1F33B", "j": ["flower", "sun", "sunflower"]}, "blossom": {"a": "blossom", "b": "1F33C", "j": ["blossom", "flower"]}, "tulip": {"a": "tulip", "b": "1F337", "j": ["flower", "tulip"]}, "seedling": {"a": "seedling", "b": "1F331", "j": ["seedling", "young"]}, "potted-plant": {"a": "potted plant", "b": "1FAB4", "j": ["boring", "grow", "house", "nurturing", "plant", "potted plant", "useless"]}, "evergreen-tree": {"a": "evergreen tree", "b": "1F332", "j": ["evergreen tree", "tree"]}, "deciduous-tree": {"a": "deciduous tree", "b": "1F333", "j": ["deciduous", "shedding", "tree"]}, "palm-tree": {"a": "palm tree", "b": "1F334", "j": ["palm", "tree"]}, "cactus": {"a": "cactus", "b": "1F335", "j": ["cactus", "plant"]}, "sheaf-of-rice": {"a": "sheaf of rice", "b": "1F33E", "j": ["ear", "grain", "rice", "sheaf of rice"]}, "herb": {"a": "herb", "b": "1F33F", "j": ["herb", "leaf"]}, "shamrock": {"a": "shamrock", "b": "2618", "j": ["plant", "shamrock"]}, "four-leaf-clover": {"a": "four leaf clover", "b": "1F340", "j": ["4", "clover", "four", "four-leaf clover", "leaf"]}, "maple-leaf": {"a": "maple leaf", "b": "1F341", "j": ["falling", "leaf", "maple"]}, "fallen-leaf": {"a": "fallen leaf", "b": "1F342", "j": ["fallen leaf", "falling", "leaf"]}, "leaf-fluttering-in-wind": {"a": "leaf fluttering in wind", "b": "1F343", "j": ["blow", "flutter", "leaf", "leaf fluttering in wind", "wind"]}, "grapes": {"a": "grapes", "b": "1F347", "j": ["fruit", "grape", "grapes"]}, "melon": {"a": "melon", "b": "1F348", "j": ["fruit", "melon"]}, "watermelon": {"a": "watermelon", "b": "1F349", "j": ["fruit", "watermelon"]}, "tangerine": {"a": "tangerine", "b": "1F34A", "j": ["fruit", "orange", "tangerine"]}, "lemon": {"a": "lemon", "b": "1F34B", "j": ["citrus", "fruit", "lemon"]}, "banana": {"a": "banana", "b": "1F34C", "j": ["banana", "fruit"]}, "pineapple": {"a": "pineapple", "b": "1F34D", "j": ["fruit", "pineapple"]}, "mango": {"a": "mango", "b": "1F96D", "j": ["fruit", "mango", "tropical"]}, "red-apple": {"a": "red apple", "b": "1F34E", "j": ["apple", "fruit", "red"]}, "green-apple": {"a": "green apple", "b": "1F34F", "j": ["apple", "fruit", "green"]}, "pear": {"a": "pear", "b": "1F350", "j": ["fruit", "pear"]}, "peach": {"a": "peach", "b": "1F351", "j": ["fruit", "peach"]}, "cherries": {"a": "cherries", "b": "1F352", "j": ["berries", "cherries", "cherry", "fruit", "red"]}, "strawberry": {"a": "strawberry", "b": "1F353", "j": ["berry", "fruit", "strawberry"]}, "blueberries": {"a": "blueberries", "b": "1FAD0", "j": ["berry", "bilberry", "blue", "blueberries", "blueberry"]}, "kiwi-fruit": {"a": "kiwi fruit", "b": "1F95D", "j": ["food", "fruit", "kiwi"]}, "tomato": {"a": "tomato", "b": "1F345", "j": ["fruit", "tomato", "vegetable"]}, "olive": {"a": "olive", "b": "1FAD2", "j": ["food", "olive"]}, "coconut": {"a": "coconut", "b": "1F965", "j": ["coconut", "palm", "piña colada"]}, "avocado": {"a": "avocado", "b": "1F951", "j": ["avocado", "food", "fruit"]}, "eggplant": {"a": "eggplant", "b": "1F346", "j": ["aubergine", "eggplant", "vegetable"]}, "potato": {"a": "potato", "b": "1F954", "j": ["food", "potato", "vegetable"]}, "carrot": {"a": "carrot", "b": "1F955", "j": ["carrot", "food", "vegetable"]}, "ear-of-corn": {"a": "ear of corn", "b": "1F33D", "j": ["corn", "ear", "ear of corn", "maize", "maze"]}, "hot-pepper": {"a": "hot pepper", "b": "1F336", "j": ["hot", "pepper"]}, "bell-pepper": {"a": "bell pepper", "b": "1FAD1", "j": ["bell pepper", "capsicum", "pepper", "vegetable"]}, "cucumber": {"a": "cucumber", "b": "1F952", "j": ["cucumber", "food", "pickle", "vegetable"]}, "leafy-green": {"a": "leafy green", "b": "1F96C", "j": ["bok choy", "cabbage", "kale", "leafy green", "lettuce"]}, "broccoli": {"a": "broccoli", "b": "1F966", "j": ["broccoli", "wild cabbage"]}, "garlic": {"a": "garlic", "b": "1F9C4", "j": ["flavoring", "garlic"]}, "onion": {"a": "onion", "b": "1F9C5", "j": ["flavoring", "onion"]}, "mushroom": {"a": "mushroom", "b": "1F344", "j": ["mushroom", "toadstool"]}, "peanuts": {"a": "peanuts", "b": "1F95C", "j": ["food", "nut", "peanut", "peanuts", "vegetable"]}, "chestnut": {"a": "chestnut", "b": "1F330", "j": ["chestnut", "plant"]}, "bread": {"a": "bread", "b": "1F35E", "j": ["bread", "loaf"]}, "croissant": {"a": "croissant", "b": "1F950", "j": ["bread", "breakfast", "croissant", "food", "french", "roll"]}, "baguette-bread": {"a": "baguette bread", "b": "1F956", "j": ["baguette", "bread", "food", "french"]}, "flatbread": {"a": "flatbread", "b": "1FAD3", "j": ["arepa", "flatbread", "lavash", "naan", "pita"]}, "pretzel": {"a": "pretzel", "b": "1F968", "j": ["pretzel", "twisted", "convoluted"]}, "bagel": {"a": "bagel", "b": "1F96F", "j": ["bagel", "bakery", "breakfast", "schmear"]}, "pancakes": {"a": "pancakes", "b": "1F95E", "j": ["breakfast", "crêpe", "food", "hotcake", "pancake", "pancakes"]}, "waffle": {"a": "waffle", "b": "1F9C7", "j": ["breakfast", "indecisive", "iron", "waffle"]}, "cheese-wedge": {"a": "cheese wedge", "b": "1F9C0", "j": ["cheese", "cheese wedge"]}, "meat-on-bone": {"a": "meat on bone", "b": "1F356", "j": ["bone", "meat", "meat on bone"]}, "poultry-leg": {"a": "poultry leg", "b": "1F357", "j": ["bone", "chicken", "drumstick", "leg", "poultry"]}, "cut-of-meat": {"a": "cut of meat", "b": "1F969", "j": ["chop", "cut of meat", "lambchop", "porkchop", "steak"]}, "bacon": {"a": "bacon", "b": "1F953", "j": ["bacon", "breakfast", "food", "meat"]}, "hamburger": {"a": "hamburger", "b": "1F354", "j": ["burger", "hamburger"]}, "french-fries": {"a": "french fries", "b": "1F35F", "j": ["french", "fries"]}, "pizza": {"a": "pizza", "b": "1F355", "j": ["cheese", "pizza", "slice"]}, "hot-dog": {"a": "hot dog", "b": "1F32D", "j": ["frankfurter", "hot dog", "hotdog", "sausage"]}, "sandwich": {"a": "sandwich", "b": "1F96A", "j": ["bread", "sandwich"]}, "taco": {"a": "taco", "b": "1F32E", "j": ["mexican", "taco"]}, "burrito": {"a": "burrito", "b": "1F32F", "j": ["burrito", "mexican", "wrap"]}, "tamale": {"a": "tamale", "b": "1FAD4", "j": ["mexican", "tamale", "wrapped"]}, "stuffed-flatbread": {"a": "stuffed flatbread", "b": "1F959", "j": ["falafel", "flatbread", "food", "gyro", "kebab", "stuffed"]}, "falafel": {"a": "falafel", "b": "1F9C6", "j": ["chickpea", "falafel", "meatball"]}, "egg": {"a": "egg", "b": "1F95A", "j": ["breakfast", "egg", "food"]}, "cooking": {"a": "cooking", "b": "1F373", "j": ["breakfast", "cooking", "egg", "frying", "pan"]}, "shallow-pan-of-food": {"a": "shallow pan of food", "b": "1F958", "j": ["casserole", "food", "paella", "pan", "shallow", "shallow pan of food"]}, "pot-of-food": {"a": "pot of food", "b": "1F372", "j": ["pot", "pot of food", "stew"]}, "fondue": {"a": "fondue", "b": "1FAD5", "j": ["cheese", "chocolate", "fondue", "melted", "pot", "Swiss"]}, "bowl-with-spoon": {"a": "bowl with spoon", "b": "1F963", "j": ["bowl with spoon", "breakfast", "cereal", "congee", "oatmeal", "porridge"]}, "green-salad": {"a": "green salad", "b": "1F957", "j": ["food", "green", "salad"]}, "popcorn": {"a": "popcorn", "b": "1F37F", "j": ["popcorn"]}, "butter": {"a": "butter", "b": "1F9C8", "j": ["butter", "dairy"]}, "salt": {"a": "salt", "b": "1F9C2", "j": ["condiment", "salt", "shaker"]}, "canned-food": {"a": "canned food", "b": "1F96B", "j": ["can", "canned food"]}, "bento-box": {"a": "bento box", "b": "1F371", "j": ["bento", "box"]}, "rice-cracker": {"a": "rice cracker", "b": "1F358", "j": ["cracker", "rice"]}, "rice-ball": {"a": "rice ball", "b": "1F359", "j": ["ball", "Japanese", "rice"]}, "cooked-rice": {"a": "cooked rice", "b": "1F35A", "j": ["cooked", "rice"]}, "curry-rice": {"a": "curry rice", "b": "1F35B", "j": ["curry", "rice"]}, "steaming-bowl": {"a": "steaming bowl", "b": "1F35C", "j": ["bowl", "noodle", "ramen", "steaming"]}, "spaghetti": {"a": "spaghetti", "b": "1F35D", "j": ["pasta", "spaghetti"]}, "roasted-sweet-potato": {"a": "roasted sweet potato", "b": "1F360", "j": ["potato", "roasted", "sweet"]}, "oden": {"a": "oden", "b": "1F362", "j": ["kebab", "oden", "seafood", "skewer", "stick"]}, "sushi": {"a": "sushi", "b": "1F363", "j": ["sushi"]}, "fried-shrimp": {"a": "fried shrimp", "b": "1F364", "j": ["fried", "prawn", "shrimp", "tempura"]}, "fish-cake-with-swirl": {"a": "fish cake with swirl", "b": "1F365", "j": ["cake", "fish", "fish cake with swirl", "pastry", "swirl"]}, "moon-cake": {"a": "moon cake", "b": "1F96E", "j": ["autumn", "festival", "moon cake", "yuèbǐng"]}, "dango": {"a": "dango", "b": "1F361", "j": ["dango", "dessert", "Japanese", "skewer", "stick", "sweet"]}, "dumpling": {"a": "dumpling", "b": "1F95F", "j": ["dumpling", "empanada", "gyōza", "jiaozi", "pierogi", "potsticker"]}, "fortune-cookie": {"a": "fortune cookie", "b": "1F960", "j": ["fortune cookie", "prophecy"]}, "takeout-box": {"a": "takeout box", "b": "1F961", "j": ["oyster pail", "takeout box"]}, "crab": {"a": "crab", "b": "1F980", "j": ["Cancer", "crab", "zodiac"]}, "lobster": {"a": "lobster", "b": "1F99E", "j": ["bisque", "claws", "lobster", "seafood"]}, "shrimp": {"a": "shrimp", "b": "1F990", "j": ["food", "shellfish", "shrimp", "small"]}, "squid": {"a": "squid", "b": "1F991", "j": ["food", "molusc", "squid"]}, "oyster": {"a": "oyster", "b": "1F9AA", "j": ["diving", "oyster", "pearl"]}, "soft-ice-cream": {"a": "soft ice cream", "b": "1F366", "j": ["cream", "dessert", "ice", "icecream", "soft", "sweet"]}, "shaved-ice": {"a": "shaved ice", "b": "1F367", "j": ["dessert", "ice", "shaved", "sweet"]}, "ice-cream": {"a": "ice cream", "b": "1F368", "j": ["cream", "dessert", "ice", "sweet"]}, "doughnut": {"a": "doughnut", "b": "1F369", "j": ["breakfast", "dessert", "donut", "doughnut", "sweet"]}, "cookie": {"a": "cookie", "b": "1F36A", "j": ["cookie", "dessert", "sweet"]}, "birthday-cake": {"a": "birthday cake", "b": "1F382", "j": ["birthday", "cake", "celebration", "dessert", "pastry", "sweet"]}, "shortcake": {"a": "shortcake", "b": "1F370", "j": ["cake", "dessert", "pastry", "shortcake", "slice", "sweet"]}, "cupcake": {"a": "cupcake", "b": "1F9C1", "j": ["bakery", "cupcake", "sweet"]}, "pie": {"a": "pie", "b": "1F967", "j": ["filling", "pastry", "pie", "fruit", "meat"]}, "chocolate-bar": {"a": "chocolate bar", "b": "1F36B", "j": ["bar", "chocolate", "dessert", "sweet"]}, "candy": {"a": "candy", "b": "1F36C", "j": ["candy", "dessert", "sweet"]}, "lollipop": {"a": "lollipop", "b": "1F36D", "j": ["candy", "dessert", "lollipop", "sweet"]}, "custard": {"a": "custard", "b": "1F36E", "j": ["custard", "dessert", "pudding", "sweet"]}, "honey-pot": {"a": "honey pot", "b": "1F36F", "j": ["honey", "honeypot", "pot", "sweet"]}, "baby-bottle": {"a": "baby bottle", "b": "1F37C", "j": ["baby", "bottle", "drink", "milk"]}, "glass-of-milk": {"a": "glass of milk", "b": "1F95B", "j": ["drink", "glass", "glass of milk", "milk"]}, "hot-beverage": {"a": "hot beverage", "b": "2615", "j": ["beverage", "coffee", "drink", "hot", "steaming", "tea"]}, "teapot": {"a": "teapot", "b": "1FAD6", "j": ["drink", "pot", "tea", "teapot"]}, "teacup-without-handle": {"a": "teacup without handle", "b": "1F375", "j": ["beverage", "cup", "drink", "tea", "teacup", "teacup without handle"]}, "sake": {"a": "sake", "b": "1F376", "j": ["bar", "beverage", "bottle", "cup", "drink", "sake"]}, "bottle-with-popping-cork": {"a": "bottle with popping cork", "b": "1F37E", "j": ["bar", "bottle", "bottle with popping cork", "cork", "drink", "popping"]}, "wine-glass": {"a": "wine glass", "b": "1F377", "j": ["bar", "beverage", "drink", "glass", "wine"]}, "cocktail-glass": {"a": "cocktail glass", "b": "1F378", "j": ["bar", "cocktail", "drink", "glass"]}, "tropical-drink": {"a": "tropical drink", "b": "1F379", "j": ["bar", "drink", "tropical"]}, "beer-mug": {"a": "beer mug", "b": "1F37A", "j": ["bar", "beer", "drink", "mug"]}, "clinking-beer-mugs": {"a": "clinking beer mugs", "b": "1F37B", "j": ["bar", "beer", "clink", "clinking beer mugs", "drink", "mug"]}, "clinking-glasses": {"a": "clinking glasses", "b": "1F942", "j": ["celebrate", "clink", "clinking glasses", "drink", "glass"]}, "tumbler-glass": {"a": "tumbler glass", "b": "1F943", "j": ["glass", "liquor", "shot", "tumbler", "whisky"]}, "cup-with-straw": {"a": "cup with straw", "b": "1F964", "j": ["cup with straw", "juice", "soda", "malt", "soft drink", "water"]}, "bubble-tea": {"a": "bubble tea", "b": "1F9CB", "j": ["bubble", "milk", "pearl", "tea"]}, "beverage-box": {"a": "beverage box", "b": "1F9C3", "j": ["beverage", "box", "juice", "straw", "sweet"]}, "mate": {"a": "mate", "b": "1F9C9", "j": ["drink", "mate"]}, "ice": {"a": "ice", "b": "1F9CA", "j": ["cold", "ice", "ice cube", "iceberg"]}, "chopsticks": {"a": "chopsticks", "b": "1F962", "j": ["chopsticks", "hashi", "jeotgarak", "kuaizi"]}, "fork-and-knife-with-plate": {"a": "fork and knife with plate", "b": "1F37D", "j": ["cooking", "fork", "fork and knife with plate", "knife", "plate"]}, "fork-and-knife": {"a": "fork and knife", "b": "1F374", "j": ["cooking", "cutlery", "fork", "fork and knife", "knife"]}, "spoon": {"a": "spoon", "b": "1F944", "j": ["spoon", "tableware"]}, "kitchen-knife": {"a": "kitchen knife", "b": "1F52A", "j": ["cooking", "hocho", "kitchen knife", "knife", "tool", "weapon"]}, "amphora": {"a": "amphora", "b": "1F3FA", "j": ["amphora", "Aquarius", "cooking", "drink", "jug", "zodiac"]}, "globe-showing-europeafrica": {"a": "globe showing Europe-Africa", "b": "1F30D", "j": ["Africa", "earth", "Europe", "globe", "globe showing Europe-Africa", "world"]}, "globe-showing-americas": {"a": "globe showing Americas", "b": "1F30E", "j": ["Americas", "earth", "globe", "globe showing Americas", "world"]}, "globe-showing-asiaaustralia": {"a": "globe showing Asia-Australia", "b": "1F30F", "j": ["Asia", "Australia", "earth", "globe", "globe showing Asia-Australia", "world"]}, "globe-with-meridians": {"a": "globe with meridians", "b": "1F310", "j": ["earth", "globe", "globe with meridians", "meridians", "world"]}, "world-map": {"a": "world map", "b": "1F5FA", "j": ["map", "world"]}, "map-of-japan": {"a": "map of Japan", "b": "1F5FE", "j": ["Japan", "map", "map of Japan"]}, "compass": {"a": "compass", "b": "1F9ED", "j": ["compass", "magnetic", "navigation", "orienteering"]}, "snowcapped-mountain": {"a": "snow-capped mountain", "b": "1F3D4", "j": ["cold", "mountain", "snow", "snow-capped mountain"]}, "mountain": {"a": "mountain", "b": "26F0", "j": ["mountain"]}, "volcano": {"a": "volcano", "b": "1F30B", "j": ["eruption", "mountain", "volcano"]}, "mount-fuji": {"a": "mount fuji", "b": "1F5FB", "j": ["fuji", "mount fuji", "mountain"]}, "camping": {"a": "camping", "b": "1F3D5", "j": ["camping"]}, "beach-with-umbrella": {"a": "beach with umbrella", "b": "1F3D6", "j": ["beach", "beach with umbrella", "umbrella"]}, "desert": {"a": "desert", "b": "1F3DC", "j": ["desert"]}, "desert-island": {"a": "desert island", "b": "1F3DD", "j": ["desert", "island"]}, "national-park": {"a": "national park", "b": "1F3DE", "j": ["national park", "park"]}, "stadium": {"a": "stadium", "b": "1F3DF", "j": ["stadium"]}, "classical-building": {"a": "classical building", "b": "1F3DB", "j": ["classical", "classical building"]}, "building-construction": {"a": "building construction", "b": "1F3D7", "j": ["building construction", "construction"]}, "brick": {"a": "brick", "b": "1F9F1", "j": ["brick", "bricks", "clay", "mortar", "wall"]}, "rock": {"a": "rock", "b": "1FAA8", "j": ["boulder", "heavy", "rock", "solid", "stone"]}, "wood": {"a": "wood", "b": "1FAB5", "j": ["log", "lumber", "timber", "wood"]}, "hut": {"a": "hut", "b": "1F6D6", "j": ["house", "hut", "roundhouse", "yurt"]}, "houses": {"a": "houses", "b": "1F3D8", "j": ["houses"]}, "derelict-house": {"a": "derelict house", "b": "1F3DA", "j": ["derelict", "house"]}, "house": {"a": "house", "b": "1F3E0", "j": ["home", "house"]}, "house-with-garden": {"a": "house with garden", "b": "1F3E1", "j": ["garden", "home", "house", "house with garden"]}, "office-building": {"a": "office building", "b": "1F3E2", "j": ["building", "office building"]}, "japanese-post-office": {"a": "Japanese post office", "b": "1F3E3", "j": ["Japanese", "Japanese post office", "post"]}, "post-office": {"a": "post office", "b": "1F3E4", "j": ["European", "post", "post office"]}, "hospital": {"a": "hospital", "b": "1F3E5", "j": ["doctor", "hospital", "medicine"]}, "bank": {"a": "bank", "b": "1F3E6", "j": ["bank", "building"]}, "hotel": {"a": "hotel", "b": "1F3E8", "j": ["building", "hotel"]}, "love-hotel": {"a": "love hotel", "b": "1F3E9", "j": ["hotel", "love"]}, "convenience-store": {"a": "convenience store", "b": "1F3EA", "j": ["convenience", "store"]}, "school": {"a": "school", "b": "1F3EB", "j": ["building", "school"]}, "department-store": {"a": "department store", "b": "1F3EC", "j": ["department", "store"]}, "factory": {"a": "factory", "b": "1F3ED", "j": ["building", "factory"]}, "japanese-castle": {"a": "Japanese castle", "b": "1F3EF", "j": ["castle", "Japanese"]}, "castle": {"a": "castle", "b": "1F3F0", "j": ["castle", "European"]}, "wedding": {"a": "wedding", "b": "1F492", "j": ["chapel", "romance", "wedding"]}, "tokyo-tower": {"a": "Tokyo tower", "b": "1F5FC", "j": ["Tokyo", "tower"]}, "statue-of-liberty": {"a": "Statue of Liberty", "b": "1F5FD", "j": ["liberty", "statue", "Statue of Liberty"]}, "church": {"a": "church", "b": "26EA", "j": ["Christian", "church", "cross", "religion"]}, "mosque": {"a": "mosque", "b": "1F54C", "j": ["islam", "mosque", "Muslim", "religion"]}, "hindu-temple": {"a": "hindu temple", "b": "1F6D5", "j": ["hindu", "temple"]}, "synagogue": {"a": "synagogue", "b": "1F54D", "j": ["Jew", "Jewish", "religion", "synagogue", "temple"]}, "shinto-shrine": {"a": "shinto shrine", "b": "26E9", "j": ["religion", "shinto", "shrine"]}, "kaaba": {"a": "kaaba", "b": "1F54B", "j": ["islam", "kaaba", "Muslim", "religion"]}, "fountain": {"a": "fountain", "b": "26F2", "j": ["fountain"]}, "tent": {"a": "tent", "b": "26FA", "j": ["camping", "tent"]}, "foggy": {"a": "foggy", "b": "1F301", "j": ["fog", "foggy"]}, "night-with-stars": {"a": "night with stars", "b": "1F303", "j": ["night", "night with stars", "star"]}, "cityscape": {"a": "cityscape", "b": "1F3D9", "j": ["city", "cityscape"]}, "sunrise-over-mountains": {"a": "sunrise over mountains", "b": "1F304", "j": ["morning", "mountain", "sun", "sunrise", "sunrise over mountains"]}, "sunrise": {"a": "sunrise", "b": "1F305", "j": ["morning", "sun", "sunrise"]}, "cityscape-at-dusk": {"a": "cityscape at dusk", "b": "1F306", "j": ["city", "cityscape at dusk", "dusk", "evening", "landscape", "sunset"]}, "sunset": {"a": "sunset", "b": "1F307", "j": ["dusk", "sun", "sunset"]}, "bridge-at-night": {"a": "bridge at night", "b": "1F309", "j": ["bridge", "bridge at night", "night"]}, "hot-springs": {"a": "hot springs", "b": "2668", "j": ["hot", "hotsprings", "springs", "steaming"]}, "carousel-horse": {"a": "carousel horse", "b": "1F3A0", "j": ["carousel", "horse"]}, "ferris-wheel": {"a": "ferris wheel", "b": "1F3A1", "j": ["amusement park", "ferris", "wheel"]}, "roller-coaster": {"a": "roller coaster", "b": "1F3A2", "j": ["amusement park", "coaster", "roller"]}, "barber-pole": {"a": "barber pole", "b": "1F488", "j": ["barber", "haircut", "pole"]}, "circus-tent": {"a": "circus tent", "b": "1F3AA", "j": ["circus", "tent"]}, "locomotive": {"a": "locomotive", "b": "1F682", "j": ["engine", "locomotive", "railway", "steam", "train"]}, "railway-car": {"a": "railway car", "b": "1F683", "j": ["car", "electric", "railway", "train", "tram", "trolleybus"]}, "highspeed-train": {"a": "high-speed train", "b": "1F684", "j": ["high-speed train", "railway", "shinkansen", "speed", "train"]}, "bullet-train": {"a": "bullet train", "b": "1F685", "j": ["bullet", "railway", "shinkansen", "speed", "train"]}, "train": {"a": "train", "b": "1F686", "j": ["railway", "train"]}, "metro": {"a": "metro", "b": "1F687", "j": ["metro", "subway"]}, "light-rail": {"a": "light rail", "b": "1F688", "j": ["light rail", "railway"]}, "station": {"a": "station", "b": "1F689", "j": ["railway", "station", "train"]}, "tram": {"a": "tram", "b": "1F68A", "j": ["tram", "trolleybus"]}, "monorail": {"a": "monorail", "b": "1F69D", "j": ["monorail", "vehicle"]}, "mountain-railway": {"a": "mountain railway", "b": "1F69E", "j": ["car", "mountain", "railway"]}, "tram-car": {"a": "tram car", "b": "1F68B", "j": ["car", "tram", "trolleybus"]}, "bus": {"a": "bus", "b": "1F68C", "j": ["bus", "vehicle"]}, "oncoming-bus": {"a": "oncoming bus", "b": "1F68D", "j": ["bus", "oncoming"]}, "trolleybus": {"a": "trolleybus", "b": "1F68E", "j": ["bus", "tram", "trolley", "trolleybus"]}, "minibus": {"a": "minibus", "b": "1F690", "j": ["bus", "minibus"]}, "ambulance": {"a": "ambulance", "b": "1F691", "j": ["ambulance", "vehicle"]}, "fire-engine": {"a": "fire engine", "b": "1F692", "j": ["engine", "fire", "truck"]}, "police-car": {"a": "police car", "b": "1F693", "j": ["car", "patrol", "police"]}, "oncoming-police-car": {"a": "oncoming police car", "b": "1F694", "j": ["car", "oncoming", "police"]}, "taxi": {"a": "taxi", "b": "1F695", "j": ["taxi", "vehicle"]}, "oncoming-taxi": {"a": "oncoming taxi", "b": "1F696", "j": ["oncoming", "taxi"]}, "automobile": {"a": "automobile", "b": "1F697", "j": ["automobile", "car"]}, "oncoming-automobile": {"a": "oncoming automobile", "b": "1F698", "j": ["automobile", "car", "oncoming"]}, "sport-utility-vehicle": {"a": "sport utility vehicle", "b": "1F699", "j": ["recreational", "sport utility", "sport utility vehicle"]}, "pickup-truck": {"a": "pickup truck", "b": "1F6FB", "j": ["pick-up", "pickup", "truck"]}, "delivery-truck": {"a": "delivery truck", "b": "1F69A", "j": ["delivery", "truck"]}, "articulated-lorry": {"a": "articulated lorry", "b": "1F69B", "j": ["articulated lorry", "lorry", "semi", "truck"]}, "tractor": {"a": "tractor", "b": "1F69C", "j": ["tractor", "vehicle"]}, "racing-car": {"a": "racing car", "b": "1F3CE", "j": ["car", "racing"]}, "motorcycle": {"a": "motorcycle", "b": "1F3CD", "j": ["motorcycle", "racing"]}, "motor-scooter": {"a": "motor scooter", "b": "1F6F5", "j": ["motor", "scooter"]}, "manual-wheelchair": {"a": "manual wheelchair", "b": "1F9BD", "j": ["accessibility", "manual wheelchair"]}, "motorized-wheelchair": {"a": "motorized wheelchair", "b": "1F9BC", "j": ["accessibility", "motorized wheelchair"]}, "auto-rickshaw": {"a": "auto rickshaw", "b": "1F6FA", "j": ["auto rickshaw", "tuk tuk"]}, "bicycle": {"a": "bicycle", "b": "1F6B2", "j": ["bicycle", "bike"]}, "kick-scooter": {"a": "kick scooter", "b": "1F6F4", "j": ["kick", "scooter"]}, "skateboard": {"a": "skateboard", "b": "1F6F9", "j": ["board", "skateboard"]}, "roller-skate": {"a": "roller skate", "b": "1F6FC", "j": ["roller", "skate"]}, "bus-stop": {"a": "bus stop", "b": "1F68F", "j": ["bus", "busstop", "stop"]}, "motorway": {"a": "motorway", "b": "1F6E3", "j": ["highway", "motorway", "road"]}, "railway-track": {"a": "railway track", "b": "1F6E4", "j": ["railway", "railway track", "train"]}, "oil-drum": {"a": "oil drum", "b": "1F6E2", "j": ["drum", "oil"]}, "fuel-pump": {"a": "fuel pump", "b": "26FD", "j": ["diesel", "fuel", "fuelpump", "gas", "pump", "station"]}, "police-car-light": {"a": "police car light", "b": "1F6A8", "j": ["beacon", "car", "light", "police", "revolving"]}, "horizontal-traffic-light": {"a": "horizontal traffic light", "b": "1F6A5", "j": ["horizontal traffic light", "light", "signal", "traffic"]}, "vertical-traffic-light": {"a": "vertical traffic light", "b": "1F6A6", "j": ["light", "signal", "traffic", "vertical traffic light"]}, "stop-sign": {"a": "stop sign", "b": "1F6D1", "j": ["octagonal", "sign", "stop"]}, "construction": {"a": "construction", "b": "1F6A7", "j": ["barrier", "construction"]}, "anchor": {"a": "anchor", "b": "2693", "j": ["anchor", "ship", "tool"]}, "sailboat": {"a": "sailboat", "b": "26F5", "j": ["boat", "resort", "sailboat", "sea", "yacht"]}, "canoe": {"a": "canoe", "b": "1F6F6", "j": ["boat", "canoe"]}, "speedboat": {"a": "speedboat", "b": "1F6A4", "j": ["boat", "speedboat"]}, "passenger-ship": {"a": "passenger ship", "b": "1F6F3", "j": ["passenger", "ship"]}, "ferry": {"a": "ferry", "b": "26F4", "j": ["boat", "ferry", "passenger"]}, "motor-boat": {"a": "motor boat", "b": "1F6E5", "j": ["boat", "motor boat", "motorboat"]}, "ship": {"a": "ship", "b": "1F6A2", "j": ["boat", "passenger", "ship"]}, "airplane": {"a": "airplane", "b": "2708", "j": ["aeroplane", "airplane"]}, "small-airplane": {"a": "small airplane", "b": "1F6E9", "j": ["aeroplane", "airplane", "small airplane"]}, "airplane-departure": {"a": "airplane departure", "b": "1F6EB", "j": ["aeroplane", "airplane", "check-in", "departure", "departures"]}, "airplane-arrival": {"a": "airplane arrival", "b": "1F6EC", "j": ["aeroplane", "airplane", "airplane arrival", "arrivals", "arriving", "landing"]}, "parachute": {"a": "parachute", "b": "1FA82", "j": ["hang-glide", "parachute", "parasail", "skydive"]}, "seat": {"a": "seat", "b": "1F4BA", "j": ["chair", "seat"]}, "helicopter": {"a": "helicopter", "b": "1F681", "j": ["helicopter", "vehicle"]}, "suspension-railway": {"a": "suspension railway", "b": "1F69F", "j": ["railway", "suspension"]}, "mountain-cableway": {"a": "mountain cableway", "b": "1F6A0", "j": ["cable", "gondola", "mountain", "mountain cableway"]}, "aerial-tramway": {"a": "aerial tramway", "b": "1F6A1", "j": ["aerial", "cable", "car", "gondola", "tramway"]}, "satellite": {"a": "satellite", "b": "1F6F0", "j": ["satellite", "space"]}, "rocket": {"a": "rocket", "b": "1F680", "j": ["rocket", "space"]}, "flying-saucer": {"a": "flying saucer", "b": "1F6F8", "j": ["flying saucer", "UFO"]}, "bellhop-bell": {"a": "bellhop bell", "b": "1F6CE", "j": ["bell", "bellhop", "hotel"]}, "luggage": {"a": "luggage", "b": "1F9F3", "j": ["luggage", "packing", "travel"]}, "hourglass-done": {"a": "hourglass done", "b": "231B", "j": ["hourglass done", "sand", "timer"]}, "hourglass-not-done": {"a": "hourglass not done", "b": "23F3", "j": ["hourglass", "hourglass not done", "sand", "timer"]}, "watch": {"a": "watch", "b": "231A", "j": ["clock", "watch"]}, "alarm-clock": {"a": "alarm clock", "b": "23F0", "j": ["alarm", "clock"]}, "stopwatch": {"a": "stopwatch", "b": "23F1", "j": ["clock", "stopwatch"]}, "timer-clock": {"a": "timer clock", "b": "23F2", "j": ["clock", "timer"]}, "mantelpiece-clock": {"a": "mantelpiece clock", "b": "1F570", "j": ["clock", "mantelpiece clock"]}, "twelve-oclock": {"a": "twelve o’clock", "b": "1F55B", "j": ["00", "12", "12:00", "clock", "o’clock", "twelve"]}, "twelvethirty": {"a": "twelve-thirty", "b": "1F567", "j": ["12", "12:30", "clock", "thirty", "twelve", "twelve-thirty"]}, "one-oclock": {"a": "one o’clock", "b": "1F550", "j": ["00", "1", "1:00", "clock", "o’clock", "one"]}, "onethirty": {"a": "one-thirty", "b": "1F55C", "j": ["1", "1:30", "clock", "one", "one-thirty", "thirty"]}, "two-oclock": {"a": "two o’clock", "b": "1F551", "j": ["00", "2", "2:00", "clock", "o’clock", "two"]}, "twothirty": {"a": "two-thirty", "b": "1F55D", "j": ["2", "2:30", "clock", "thirty", "two", "two-thirty"]}, "three-oclock": {"a": "three o’clock", "b": "1F552", "j": ["00", "3", "3:00", "clock", "o’clock", "three"]}, "threethirty": {"a": "three-thirty", "b": "1F55E", "j": ["3", "3:30", "clock", "thirty", "three", "three-thirty"]}, "four-oclock": {"a": "four o’clock", "b": "1F553", "j": ["00", "4", "4:00", "clock", "four", "o’clock"]}, "fourthirty": {"a": "four-thirty", "b": "1F55F", "j": ["4", "4:30", "clock", "four", "four-thirty", "thirty"]}, "five-oclock": {"a": "five o’clock", "b": "1F554", "j": ["00", "5", "5:00", "clock", "five", "o’clock"]}, "fivethirty": {"a": "five-thirty", "b": "1F560", "j": ["5", "5:30", "clock", "five", "five-thirty", "thirty"]}, "six-oclock": {"a": "six o’clock", "b": "1F555", "j": ["00", "6", "6:00", "clock", "o’clock", "six"]}, "sixthirty": {"a": "six-thirty", "b": "1F561", "j": ["6", "6:30", "clock", "six", "six-thirty", "thirty"]}, "seven-oclock": {"a": "seven o’clock", "b": "1F556", "j": ["00", "7", "7:00", "clock", "o’clock", "seven"]}, "seventhirty": {"a": "seven-thirty", "b": "1F562", "j": ["7", "7:30", "clock", "seven", "seven-thirty", "thirty"]}, "eight-oclock": {"a": "eight o’clock", "b": "1F557", "j": ["00", "8", "8:00", "clock", "eight", "o’clock"]}, "eightthirty": {"a": "eight-thirty", "b": "1F563", "j": ["8", "8:30", "clock", "eight", "eight-thirty", "thirty"]}, "nine-oclock": {"a": "nine o’clock", "b": "1F558", "j": ["00", "9", "9:00", "clock", "nine", "o’clock"]}, "ninethirty": {"a": "nine-thirty", "b": "1F564", "j": ["9", "9:30", "clock", "nine", "nine-thirty", "thirty"]}, "ten-oclock": {"a": "ten o’clock", "b": "1F559", "j": ["00", "10", "10:00", "clock", "o’clock", "ten"]}, "tenthirty": {"a": "ten-thirty", "b": "1F565", "j": ["10", "10:30", "clock", "ten", "ten-thirty", "thirty"]}, "eleven-oclock": {"a": "eleven o’clock", "b": "1F55A", "j": ["00", "11", "11:00", "clock", "eleven", "o’clock"]}, "eleventhirty": {"a": "eleven-thirty", "b": "1F566", "j": ["11", "11:30", "clock", "eleven", "eleven-thirty", "thirty"]}, "new-moon": {"a": "new moon", "b": "1F311", "j": ["dark", "moon", "new moon"]}, "waxing-crescent-moon": {"a": "waxing crescent moon", "b": "1F312", "j": ["crescent", "moon", "waxing"]}, "first-quarter-moon": {"a": "first quarter moon", "b": "1F313", "j": ["first quarter moon", "moon", "quarter"]}, "waxing-gibbous-moon": {"a": "waxing gibbous moon", "b": "1F314", "j": ["gibbous", "moon", "waxing"]}, "full-moon": {"a": "full moon", "b": "1F315", "j": ["full", "moon"]}, "waning-gibbous-moon": {"a": "waning gibbous moon", "b": "1F316", "j": ["gibbous", "moon", "waning"]}, "last-quarter-moon": {"a": "last quarter moon", "b": "1F317", "j": ["last quarter moon", "moon", "quarter"]}, "waning-crescent-moon": {"a": "waning crescent moon", "b": "1F318", "j": ["crescent", "moon", "waning"]}, "crescent-moon": {"a": "crescent moon", "b": "1F319", "j": ["crescent", "moon"]}, "new-moon-face": {"a": "new moon face", "b": "1F31A", "j": ["face", "moon", "new moon face"]}, "first-quarter-moon-face": {"a": "first quarter moon face", "b": "1F31B", "j": ["face", "first quarter moon face", "moon", "quarter"]}, "last-quarter-moon-face": {"a": "last quarter moon face", "b": "1F31C", "j": ["face", "last quarter moon face", "moon", "quarter"]}, "thermometer": {"a": "thermometer", "b": "1F321", "j": ["thermometer", "weather"]}, "sun": {"a": "sun", "b": "2600", "j": ["bright", "rays", "sun", "sunny"]}, "full-moon-face": {"a": "full moon face", "b": "1F31D", "j": ["bright", "face", "full", "moon"]}, "sun-with-face": {"a": "sun with face", "b": "1F31E", "j": ["bright", "face", "sun", "sun with face"]}, "ringed-planet": {"a": "ringed planet", "b": "1FA90", "j": ["ringed planet", "saturn", "saturnine"]}, "star": {"a": "star", "b": "2B50", "j": ["star"]}, "glowing-star": {"a": "glowing star", "b": "1F31F", "j": ["glittery", "glow", "glowing star", "shining", "sparkle", "star"]}, "shooting-star": {"a": "shooting star", "b": "1F320", "j": ["falling", "shooting", "star"]}, "milky-way": {"a": "milky way", "b": "1F30C", "j": ["milky way", "space"]}, "cloud": {"a": "cloud", "b": "2601", "j": ["cloud", "weather"]}, "sun-behind-cloud": {"a": "sun behind cloud", "b": "26C5", "j": ["cloud", "sun", "sun behind cloud"]}, "cloud-with-lightning-and-rain": {"a": "cloud with lightning and rain", "b": "26C8", "j": ["cloud", "cloud with lightning and rain", "rain", "thunder"]}, "sun-behind-small-cloud": {"a": "sun behind small cloud", "b": "1F324", "j": ["cloud", "sun", "sun behind small cloud"]}, "sun-behind-large-cloud": {"a": "sun behind large cloud", "b": "1F325", "j": ["cloud", "sun", "sun behind large cloud"]}, "sun-behind-rain-cloud": {"a": "sun behind rain cloud", "b": "1F326", "j": ["cloud", "rain", "sun", "sun behind rain cloud"]}, "cloud-with-rain": {"a": "cloud with rain", "b": "1F327", "j": ["cloud", "cloud with rain", "rain"]}, "cloud-with-snow": {"a": "cloud with snow", "b": "1F328", "j": ["cloud", "cloud with snow", "cold", "snow"]}, "cloud-with-lightning": {"a": "cloud with lightning", "b": "1F329", "j": ["cloud", "cloud with lightning", "lightning"]}, "tornado": {"a": "tornado", "b": "1F32A", "j": ["cloud", "tornado", "whirlwind"]}, "fog": {"a": "fog", "b": "1F32B", "j": ["cloud", "fog"]}, "wind-face": {"a": "wind face", "b": "1F32C", "j": ["blow", "cloud", "face", "wind"]}, "cyclone": {"a": "cyclone", "b": "1F300", "j": ["cyclone", "dizzy", "hurricane", "twister", "typhoon"]}, "rainbow": {"a": "rainbow", "b": "1F308", "j": ["rain", "rainbow"]}, "closed-umbrella": {"a": "closed umbrella", "b": "1F302", "j": ["closed umbrella", "clothing", "rain", "umbrella"]}, "umbrella": {"a": "umbrella", "b": "2602", "j": ["clothing", "rain", "umbrella"]}, "umbrella-with-rain-drops": {"a": "umbrella with rain drops", "b": "2614", "j": ["clothing", "drop", "rain", "umbrella", "umbrella with rain drops"]}, "umbrella-on-ground": {"a": "umbrella on ground", "b": "26F1", "j": ["rain", "sun", "umbrella", "umbrella on ground"]}, "high-voltage": {"a": "high voltage", "b": "26A1", "j": ["danger", "electric", "high voltage", "lightning", "voltage", "zap"]}, "snowflake": {"a": "snowflake", "b": "2744", "j": ["cold", "snow", "snowflake"]}, "snowman": {"a": "snowman", "b": "2603", "j": ["cold", "snow", "snowman"]}, "snowman-without-snow": {"a": "snowman without snow", "b": "26C4", "j": ["cold", "snow", "snowman", "snowman without snow"]}, "comet": {"a": "comet", "b": "2604", "j": ["comet", "space"]}, "fire": {"a": "fire", "b": "1F525", "j": ["fire", "flame", "tool"]}, "droplet": {"a": "droplet", "b": "1F4A7", "j": ["cold", "comic", "drop", "droplet", "sweat"]}, "water-wave": {"a": "water wave", "b": "1F30A", "j": ["ocean", "water", "wave"]}, "jackolantern": {"a": "jack-o-lantern", "b": "1F383", "j": ["celebration", "halloween", "jack", "jack-o-lantern", "lantern"]}, "christmas-tree": {"a": "Christmas tree", "b": "1F384", "j": ["celebration", "Christmas", "tree"]}, "fireworks": {"a": "fireworks", "b": "1F386", "j": ["celebration", "fireworks"]}, "sparkler": {"a": "sparkler", "b": "1F387", "j": ["celebration", "fireworks", "sparkle", "sparkler"]}, "firecracker": {"a": "firecracker", "b": "1F9E8", "j": ["dynamite", "explosive", "firecracker", "fireworks"]}, "sparkles": {"a": "sparkles", "b": "2728", "j": ["*", "sparkle", "sparkles", "star"]}, "balloon": {"a": "balloon", "b": "1F388", "j": ["balloon", "celebration"]}, "party-popper": {"a": "party popper", "b": "1F389", "j": ["celebration", "party", "popper", "tada"]}, "confetti-ball": {"a": "confetti ball", "b": "1F38A", "j": ["ball", "celebration", "confetti"]}, "tanabata-tree": {"a": "tanabata tree", "b": "1F38B", "j": ["banner", "celebration", "Japanese", "tanabata tree", "tree"]}, "pine-decoration": {"a": "pine decoration", "b": "1F38D", "j": ["bamboo", "celebration", "Japanese", "pine", "pine decoration"]}, "japanese-dolls": {"a": "Japanese dolls", "b": "1F38E", "j": ["celebration", "doll", "festival", "Japanese", "Japanese dolls"]}, "carp-streamer": {"a": "carp streamer", "b": "1F38F", "j": ["carp", "celebration", "streamer"]}, "wind-chime": {"a": "wind chime", "b": "1F390", "j": ["bell", "celebration", "chime", "wind"]}, "moon-viewing-ceremony": {"a": "moon viewing ceremony", "b": "1F391", "j": ["celebration", "ceremony", "moon", "moon viewing ceremony"]}, "red-envelope": {"a": "red envelope", "b": "1F9E7", "j": ["gift", "good luck", "hóngbāo", "lai see", "money", "red envelope"]}, "ribbon": {"a": "ribbon", "b": "1F380", "j": ["celebration", "ribbon"]}, "wrapped-gift": {"a": "wrapped gift", "b": "1F381", "j": ["box", "celebration", "gift", "present", "wrapped"]}, "reminder-ribbon": {"a": "reminder ribbon", "b": "1F397", "j": ["celebration", "reminder", "ribbon"]}, "admission-tickets": {"a": "admission tickets", "b": "1F39F", "j": ["admission", "admission tickets", "ticket"]}, "ticket": {"a": "ticket", "b": "1F3AB", "j": ["admission", "ticket"]}, "military-medal": {"a": "military medal", "b": "1F396", "j": ["celebration", "medal", "military"]}, "trophy": {"a": "trophy", "b": "1F3C6", "j": ["prize", "trophy"]}, "sports-medal": {"a": "sports medal", "b": "1F3C5", "j": ["medal", "sports medal"]}, "1st-place-medal": {"a": "1st place medal", "b": "1F947", "j": ["1st place medal", "first", "gold", "medal"]}, "2nd-place-medal": {"a": "2nd place medal", "b": "1F948", "j": ["2nd place medal", "medal", "second", "silver"]}, "3rd-place-medal": {"a": "3rd place medal", "b": "1F949", "j": ["3rd place medal", "bronze", "medal", "third"]}, "soccer-ball": {"a": "soccer ball", "b": "26BD", "j": ["ball", "football", "soccer"]}, "baseball": {"a": "baseball", "b": "26BE", "j": ["ball", "baseball"]}, "softball": {"a": "softball", "b": "1F94E", "j": ["ball", "glove", "softball", "underarm"]}, "basketball": {"a": "basketball", "b": "1F3C0", "j": ["ball", "basketball", "hoop"]}, "volleyball": {"a": "volleyball", "b": "1F3D0", "j": ["ball", "game", "volleyball"]}, "american-football": {"a": "american football", "b": "1F3C8", "j": ["american", "ball", "football"]}, "rugby-football": {"a": "rugby football", "b": "1F3C9", "j": ["ball", "football", "rugby"]}, "tennis": {"a": "tennis", "b": "1F3BE", "j": ["ball", "racquet", "tennis"]}, "flying-disc": {"a": "flying disc", "b": "1F94F", "j": ["flying disc", "ultimate"]}, "bowling": {"a": "bowling", "b": "1F3B3", "j": ["ball", "bowling", "game"]}, "cricket-game": {"a": "cricket game", "b": "1F3CF", "j": ["ball", "bat", "cricket game", "game"]}, "field-hockey": {"a": "field hockey", "b": "1F3D1", "j": ["ball", "field", "game", "hockey", "stick"]}, "ice-hockey": {"a": "ice hockey", "b": "1F3D2", "j": ["game", "hockey", "ice", "puck", "stick"]}, "lacrosse": {"a": "lacrosse", "b": "1F94D", "j": ["ball", "goal", "lacrosse", "stick"]}, "ping-pong": {"a": "ping pong", "b": "1F3D3", "j": ["ball", "bat", "game", "paddle", "ping pong", "table tennis"]}, "badminton": {"a": "badminton", "b": "1F3F8", "j": ["badminton", "birdie", "game", "racquet", "shuttlecock"]}, "boxing-glove": {"a": "boxing glove", "b": "1F94A", "j": ["boxing", "glove"]}, "martial-arts-uniform": {"a": "martial arts uniform", "b": "1F94B", "j": ["judo", "karate", "martial arts", "martial arts uniform", "taekwondo", "uniform"]}, "goal-net": {"a": "goal net", "b": "1F945", "j": ["goal", "net"]}, "flag-in-hole": {"a": "flag in hole", "b": "26F3", "j": ["flag in hole", "golf", "hole"]}, "ice-skate": {"a": "ice skate", "b": "26F8", "j": ["ice", "skate"]}, "fishing-pole": {"a": "fishing pole", "b": "1F3A3", "j": ["fish", "fishing pole", "pole"]}, "diving-mask": {"a": "diving mask", "b": "1F93F", "j": ["diving", "diving mask", "scuba", "snorkeling"]}, "running-shirt": {"a": "running shirt", "b": "1F3BD", "j": ["athletics", "running", "sash", "shirt"]}, "skis": {"a": "skis", "b": "1F3BF", "j": ["ski", "skis", "snow"]}, "sled": {"a": "sled", "b": "1F6F7", "j": ["sled", "sledge", "sleigh", "luge", "toboggan"]}, "curling-stone": {"a": "curling stone", "b": "1F94C", "j": ["curling stone", "game", "rock"]}, "bullseye": {"a": "bullseye", "b": "1F3AF", "j": ["bullseye", "dart", "direct hit", "game", "hit", "target"]}, "yoyo": {"a": "yo-yo", "b": "1FA80", "j": ["fluctuate", "toy", "yo-yo"]}, "kite": {"a": "kite", "b": "1FA81", "j": ["fly", "kite", "soar"]}, "pool-8-ball": {"a": "pool 8 ball", "b": "1F3B1", "j": ["8", "ball", "billiard", "eight", "game", "pool 8 ball"]}, "crystal-ball": {"a": "crystal ball", "b": "1F52E", "j": ["ball", "crystal", "fairy tale", "fantasy", "fortune", "tool"]}, "magic-wand": {"a": "magic wand", "b": "1FA84", "j": ["magic", "magic wand", "witch", "wizard"]}, "nazar-amulet": {"a": "nazar amulet", "b": "1F9FF", "j": ["bead", "charm", "evil-eye", "nazar", "nazar amulet", "talisman"]}, "video-game": {"a": "video game", "b": "1F3AE", "j": ["controller", "game", "video game"]}, "joystick": {"a": "joystick", "b": "1F579", "j": ["game", "joystick", "video game"]}, "slot-machine": {"a": "slot machine", "b": "1F3B0", "j": ["game", "slot", "slot machine"]}, "game-die": {"a": "game die", "b": "1F3B2", "j": ["dice", "die", "game"]}, "puzzle-piece": {"a": "puzzle piece", "b": "1F9E9", "j": ["clue", "interlocking", "jigsaw", "piece", "puzzle"]}, "teddy-bear": {"a": "teddy bear", "b": "1F9F8", "j": ["plaything", "plush", "stuffed", "teddy bear", "toy"]}, "piata": {"a": "piñata", "b": "1FA85", "j": ["celebration", "party", "piñata"]}, "nesting-dolls": {"a": "nesting dolls", "b": "1FA86", "j": ["doll", "nesting", "nesting dolls", "russia"]}, "spade-suit": {"a": "spade suit", "b": "2660", "j": ["card", "game", "spade suit"]}, "heart-suit": {"a": "heart suit", "b": "2665", "j": ["card", "game", "heart suit"]}, "diamond-suit": {"a": "diamond suit", "b": "2666", "j": ["card", "diamond suit", "game"]}, "club-suit": {"a": "club suit", "b": "2663", "j": ["card", "club suit", "game"]}, "chess-pawn": {"a": "chess pawn", "b": "265F", "j": ["chess", "chess pawn", "dupe", "expendable"]}, "joker": {"a": "joker", "b": "1F0CF", "j": ["card", "game", "joker", "wildcard"]}, "mahjong-red-dragon": {"a": "mahjong red dragon", "b": "1F004", "j": ["game", "mahjong", "mahjong red dragon", "red"]}, "flower-playing-cards": {"a": "flower playing cards", "b": "1F3B4", "j": ["card", "flower", "flower playing cards", "game", "Japanese", "playing"]}, "performing-arts": {"a": "performing arts", "b": "1F3AD", "j": ["art", "mask", "performing", "performing arts", "theater", "theatre"]}, "framed-picture": {"a": "framed picture", "b": "1F5BC", "j": ["art", "frame", "framed picture", "museum", "painting", "picture"]}, "artist-palette": {"a": "artist palette", "b": "1F3A8", "j": ["art", "artist palette", "museum", "painting", "palette"]}, "thread": {"a": "thread", "b": "1F9F5", "j": ["needle", "sewing", "spool", "string", "thread"]}, "sewing-needle": {"a": "sewing needle", "b": "1FAA1", "j": ["embroidery", "needle", "sewing", "stitches", "sutures", "tailoring"]}, "yarn": {"a": "yarn", "b": "1F9F6", "j": ["ball", "crochet", "knit", "yarn"]}, "knot": {"a": "knot", "b": "1FAA2", "j": ["knot", "rope", "tangled", "tie", "twine", "twist"]}, "glasses": {"a": "glasses", "b": "1F453", "j": ["clothing", "eye", "eyeglasses", "eyewear", "glasses"]}, "sunglasses": {"a": "sunglasses", "b": "1F576", "j": ["dark", "eye", "eyewear", "glasses", "sunglasses"]}, "goggles": {"a": "goggles", "b": "1F97D", "j": ["eye protection", "goggles", "swimming", "welding"]}, "lab-coat": {"a": "lab coat", "b": "1F97C", "j": ["doctor", "experiment", "lab coat", "scientist"]}, "safety-vest": {"a": "safety vest", "b": "1F9BA", "j": ["emergency", "safety", "vest"]}, "necktie": {"a": "necktie", "b": "1F454", "j": ["clothing", "necktie", "tie"]}, "tshirt": {"a": "t-shirt", "b": "1F455", "j": ["clothing", "shirt", "t-shirt", "tshirt"]}, "jeans": {"a": "jeans", "b": "1F456", "j": ["clothing", "jeans", "pants", "trousers"]}, "scarf": {"a": "scarf", "b": "1F9E3", "j": ["neck", "scarf"]}, "gloves": {"a": "gloves", "b": "1F9E4", "j": ["gloves", "hand"]}, "coat": {"a": "coat", "b": "1F9E5", "j": ["coat", "jacket"]}, "socks": {"a": "socks", "b": "1F9E6", "j": ["socks", "stocking"]}, "dress": {"a": "dress", "b": "1F457", "j": ["clothing", "dress"]}, "kimono": {"a": "kimono", "b": "1F458", "j": ["clothing", "kimono"]}, "sari": {"a": "sari", "b": "1F97B", "j": ["clothing", "dress", "sari"]}, "onepiece-swimsuit": {"a": "one-piece swimsuit", "b": "1FA71", "j": ["bathing suit", "one-piece swimsuit"]}, "briefs": {"a": "briefs", "b": "1FA72", "j": ["bathing suit", "briefs", "one-piece", "swimsuit", "underwear"]}, "shorts": {"a": "shorts", "b": "1FA73", "j": ["bathing suit", "pants", "shorts", "underwear"]}, "bikini": {"a": "bikini", "b": "1F459", "j": ["bikini", "clothing", "swim"]}, "womans-clothes": {"a": "woman’s clothes", "b": "1F45A", "j": ["clothing", "woman", "woman’s clothes"]}, "purse": {"a": "purse", "b": "1F45B", "j": ["clothing", "coin", "purse"]}, "handbag": {"a": "handbag", "b": "1F45C", "j": ["bag", "clothing", "handbag", "purse"]}, "clutch-bag": {"a": "clutch bag", "b": "1F45D", "j": ["bag", "clothing", "clutch bag", "pouch"]}, "shopping-bags": {"a": "shopping bags", "b": "1F6CD", "j": ["bag", "hotel", "shopping", "shopping bags"]}, "backpack": {"a": "backpack", "b": "1F392", "j": ["backpack", "bag", "rucksack", "satchel", "school"]}, "thong-sandal": {"a": "thong sandal", "b": "1FA74", "j": ["beach sandals", "sandals", "thong sandal", "thong sandals", "thongs", "zōri"]}, "mans-shoe": {"a": "man’s shoe", "b": "1F45E", "j": ["clothing", "man", "man’s shoe", "shoe"]}, "running-shoe": {"a": "running shoe", "b": "1F45F", "j": ["athletic", "clothing", "running shoe", "shoe", "sneaker"]}, "hiking-boot": {"a": "hiking boot", "b": "1F97E", "j": ["backpacking", "boot", "camping", "hiking"]}, "flat-shoe": {"a": "flat shoe", "b": "1F97F", "j": ["ballet flat", "flat shoe", "slip-on", "slipper"]}, "highheeled-shoe": {"a": "high-heeled shoe", "b": "1F460", "j": ["clothing", "heel", "high-heeled shoe", "shoe", "woman"]}, "womans-sandal": {"a": "woman’s sandal", "b": "1F461", "j": ["clothing", "sandal", "shoe", "woman", "woman’s sandal"]}, "ballet-shoes": {"a": "ballet shoes", "b": "1FA70", "j": ["ballet", "ballet shoes", "dance"]}, "womans-boot": {"a": "woman’s boot", "b": "1F462", "j": ["boot", "clothing", "shoe", "woman", "woman’s boot"]}, "crown": {"a": "crown", "b": "1F451", "j": ["clothing", "crown", "king", "queen"]}, "womans-hat": {"a": "woman’s hat", "b": "1F452", "j": ["clothing", "hat", "woman", "woman’s hat"]}, "top-hat": {"a": "top hat", "b": "1F3A9", "j": ["clothing", "hat", "top", "tophat"]}, "graduation-cap": {"a": "graduation cap", "b": "1F393", "j": ["cap", "celebration", "clothing", "graduation", "hat"]}, "billed-cap": {"a": "billed cap", "b": "1F9E2", "j": ["baseball cap", "billed cap"]}, "military-helmet": {"a": "military helmet", "b": "1FA96", "j": ["army", "helmet", "military", "soldier", "warrior"]}, "rescue-workers-helmet": {"a": "rescue worker’s helmet", "b": "26D1", "j": ["aid", "cross", "face", "hat", "helmet", "rescue worker’s helmet"]}, "prayer-beads": {"a": "prayer beads", "b": "1F4FF", "j": ["beads", "clothing", "necklace", "prayer", "religion"]}, "lipstick": {"a": "lipstick", "b": "1F484", "j": ["cosmetics", "lipstick", "makeup"]}, "ring": {"a": "ring", "b": "1F48D", "j": ["diamond", "ring"]}, "gem-stone": {"a": "gem stone", "b": "1F48E", "j": ["diamond", "gem", "gem stone", "jewel"]}, "muted-speaker": {"a": "muted speaker", "b": "1F507", "j": ["mute", "muted speaker", "quiet", "silent", "speaker"]}, "speaker-low-volume": {"a": "speaker low volume", "b": "1F508", "j": ["soft", "speaker low volume"]}, "speaker-medium-volume": {"a": "speaker medium volume", "b": "1F509", "j": ["medium", "speaker medium volume"]}, "speaker-high-volume": {"a": "speaker high volume", "b": "1F50A", "j": ["loud", "speaker high volume"]}, "loudspeaker": {"a": "loudspeaker", "b": "1F4E2", "j": ["loud", "loudspeaker", "public address"]}, "megaphone": {"a": "megaphone", "b": "1F4E3", "j": ["cheering", "megaphone"]}, "postal-horn": {"a": "postal horn", "b": "1F4EF", "j": ["horn", "post", "postal"]}, "bell": {"a": "bell", "b": "1F514", "j": ["bell"]}, "bell-with-slash": {"a": "bell with slash", "b": "1F515", "j": ["bell", "bell with slash", "forbidden", "mute", "quiet", "silent"]}, "musical-score": {"a": "musical score", "b": "1F3BC", "j": ["music", "musical score", "score"]}, "musical-note": {"a": "musical note", "b": "1F3B5", "j": ["music", "musical note", "note"]}, "musical-notes": {"a": "musical notes", "b": "1F3B6", "j": ["music", "musical notes", "note", "notes"]}, "studio-microphone": {"a": "studio microphone", "b": "1F399", "j": ["mic", "microphone", "music", "studio"]}, "level-slider": {"a": "level slider", "b": "1F39A", "j": ["level", "music", "slider"]}, "control-knobs": {"a": "control knobs", "b": "1F39B", "j": ["control", "knobs", "music"]}, "microphone": {"a": "microphone", "b": "1F3A4", "j": ["karaoke", "mic", "microphone"]}, "headphone": {"a": "headphone", "b": "1F3A7", "j": ["earbud", "headphone"]}, "radio": {"a": "radio", "b": "1F4FB", "j": ["radio", "video"]}, "saxophone": {"a": "saxophone", "b": "1F3B7", "j": ["instrument", "music", "sax", "saxophone"]}, "accordion": {"a": "accordion", "b": "1FA97", "j": ["accordian", "accordion", "concertina", "squeeze box"]}, "guitar": {"a": "guitar", "b": "1F3B8", "j": ["guitar", "instrument", "music"]}, "musical-keyboard": {"a": "musical keyboard", "b": "1F3B9", "j": ["instrument", "keyboard", "music", "musical keyboard", "piano"]}, "trumpet": {"a": "trumpet", "b": "1F3BA", "j": ["instrument", "music", "trumpet"]}, "violin": {"a": "violin", "b": "1F3BB", "j": ["instrument", "music", "violin"]}, "banjo": {"a": "banjo", "b": "1FA95", "j": ["banjo", "music", "stringed"]}, "drum": {"a": "drum", "b": "1F941", "j": ["drum", "drumsticks", "music"]}, "long-drum": {"a": "long drum", "b": "1FA98", "j": ["beat", "conga", "drum", "long drum", "rhythm"]}, "mobile-phone": {"a": "mobile phone", "b": "1F4F1", "j": ["cell", "mobile", "phone", "telephone"]}, "mobile-phone-with-arrow": {"a": "mobile phone with arrow", "b": "1F4F2", "j": ["arrow", "cell", "mobile", "mobile phone with arrow", "phone", "receive"]}, "telephone": {"a": "telephone", "b": "260E", "j": ["phone", "telephone"]}, "telephone-receiver": {"a": "telephone receiver", "b": "1F4DE", "j": ["phone", "receiver", "telephone"]}, "pager": {"a": "pager", "b": "1F4DF", "j": ["pager"]}, "fax-machine": {"a": "fax machine", "b": "1F4E0", "j": ["fax", "fax machine"]}, "battery": {"a": "battery", "b": "1F50B", "j": ["battery"]}, "electric-plug": {"a": "electric plug", "b": "1F50C", "j": ["electric", "electricity", "plug"]}, "laptop": {"a": "laptop", "b": "1F4BB", "j": ["computer", "laptop", "pc", "personal"]}, "desktop-computer": {"a": "desktop computer", "b": "1F5A5", "j": ["computer", "desktop"]}, "printer": {"a": "printer", "b": "1F5A8", "j": ["computer", "printer"]}, "keyboard": {"a": "keyboard", "b": "2328", "j": ["computer", "keyboard"]}, "computer-mouse": {"a": "computer mouse", "b": "1F5B1", "j": ["computer", "computer mouse"]}, "trackball": {"a": "trackball", "b": "1F5B2", "j": ["computer", "trackball"]}, "computer-disk": {"a": "computer disk", "b": "1F4BD", "j": ["computer", "disk", "minidisk", "optical"]}, "floppy-disk": {"a": "floppy disk", "b": "1F4BE", "j": ["computer", "disk", "floppy"]}, "optical-disk": {"a": "optical disk", "b": "1F4BF", "j": ["cd", "computer", "disk", "optical"]}, "dvd": {"a": "dvd", "b": "1F4C0", "j": ["blu-ray", "computer", "disk", "dvd", "optical"]}, "abacus": {"a": "abacus", "b": "1F9EE", "j": ["abacus", "calculation"]}, "movie-camera": {"a": "movie camera", "b": "1F3A5", "j": ["camera", "cinema", "movie"]}, "film-frames": {"a": "film frames", "b": "1F39E", "j": ["cinema", "film", "frames", "movie"]}, "film-projector": {"a": "film projector", "b": "1F4FD", "j": ["cinema", "film", "movie", "projector", "video"]}, "clapper-board": {"a": "clapper board", "b": "1F3AC", "j": ["clapper", "clapper board", "movie"]}, "television": {"a": "television", "b": "1F4FA", "j": ["television", "tv", "video"]}, "camera": {"a": "camera", "b": "1F4F7", "j": ["camera", "video"]}, "camera-with-flash": {"a": "camera with flash", "b": "1F4F8", "j": ["camera", "camera with flash", "flash", "video"]}, "video-camera": {"a": "video camera", "b": "1F4F9", "j": ["camera", "video"]}, "videocassette": {"a": "videocassette", "b": "1F4FC", "j": ["tape", "vhs", "video", "videocassette"]}, "magnifying-glass-tilted-left": {"a": "magnifying glass tilted left", "b": "1F50D", "j": ["glass", "magnifying", "magnifying glass tilted left", "search", "tool"]}, "magnifying-glass-tilted-right": {"a": "magnifying glass tilted right", "b": "1F50E", "j": ["glass", "magnifying", "magnifying glass tilted right", "search", "tool"]}, "candle": {"a": "candle", "b": "1F56F", "j": ["candle", "light"]}, "light-bulb": {"a": "light bulb", "b": "1F4A1", "j": ["bulb", "comic", "electric", "idea", "light"]}, "flashlight": {"a": "flashlight", "b": "1F526", "j": ["electric", "flashlight", "light", "tool", "torch"]}, "red-paper-lantern": {"a": "red paper lantern", "b": "1F3EE", "j": ["bar", "lantern", "light", "red", "red paper lantern"]}, "diya-lamp": {"a": "diya lamp", "b": "1FA94", "j": ["diya", "lamp", "oil"]}, "notebook-with-decorative-cover": {"a": "notebook with decorative cover", "b": "1F4D4", "j": ["book", "cover", "decorated", "notebook", "notebook with decorative cover"]}, "closed-book": {"a": "closed book", "b": "1F4D5", "j": ["book", "closed"]}, "open-book": {"a": "open book", "b": "1F4D6", "j": ["book", "open"]}, "green-book": {"a": "green book", "b": "1F4D7", "j": ["book", "green"]}, "blue-book": {"a": "blue book", "b": "1F4D8", "j": ["blue", "book"]}, "orange-book": {"a": "orange book", "b": "1F4D9", "j": ["book", "orange"]}, "books": {"a": "books", "b": "1F4DA", "j": ["book", "books"]}, "notebook": {"a": "notebook", "b": "1F4D3", "j": ["notebook"]}, "ledger": {"a": "ledger", "b": "1F4D2", "j": ["ledger", "notebook"]}, "page-with-curl": {"a": "page with curl", "b": "1F4C3", "j": ["curl", "document", "page", "page with curl"]}, "scroll": {"a": "scroll", "b": "1F4DC", "j": ["paper", "scroll"]}, "page-facing-up": {"a": "page facing up", "b": "1F4C4", "j": ["document", "page", "page facing up"]}, "newspaper": {"a": "newspaper", "b": "1F4F0", "j": ["news", "newspaper", "paper"]}, "rolledup-newspaper": {"a": "rolled-up newspaper", "b": "1F5DE", "j": ["news", "newspaper", "paper", "rolled", "rolled-up newspaper"]}, "bookmark-tabs": {"a": "bookmark tabs", "b": "1F4D1", "j": ["bookmark", "mark", "marker", "tabs"]}, "bookmark": {"a": "bookmark", "b": "1F516", "j": ["bookmark", "mark"]}, "label": {"a": "label", "b": "1F3F7", "j": ["label"]}, "money-bag": {"a": "money bag", "b": "1F4B0", "j": ["bag", "dollar", "money", "moneybag"]}, "coin": {"a": "coin", "b": "1FA99", "j": ["coin", "gold", "metal", "money", "silver", "treasure"]}, "yen-banknote": {"a": "yen banknote", "b": "1F4B4", "j": ["banknote", "bill", "currency", "money", "note", "yen"]}, "dollar-banknote": {"a": "dollar banknote", "b": "1F4B5", "j": ["banknote", "bill", "currency", "dollar", "money", "note"]}, "euro-banknote": {"a": "euro banknote", "b": "1F4B6", "j": ["banknote", "bill", "currency", "euro", "money", "note"]}, "pound-banknote": {"a": "pound banknote", "b": "1F4B7", "j": ["banknote", "bill", "currency", "money", "note", "pound"]}, "money-with-wings": {"a": "money with wings", "b": "1F4B8", "j": ["banknote", "bill", "fly", "money", "money with wings", "wings"]}, "credit-card": {"a": "credit card", "b": "1F4B3", "j": ["card", "credit", "money"]}, "receipt": {"a": "receipt", "b": "1F9FE", "j": ["accounting", "bookkeeping", "evidence", "proof", "receipt"]}, "chart-increasing-with-yen": {"a": "chart increasing with yen", "b": "1F4B9", "j": ["chart", "chart increasing with yen", "graph", "growth", "money", "yen"]}, "envelope": {"a": "envelope", "b": "2709", "j": ["email", "envelope", "letter"]}, "email": {"a": "e-mail", "b": "1F4E7", "j": ["e-mail", "email", "letter", "mail"]}, "incoming-envelope": {"a": "incoming envelope", "b": "1F4E8", "j": ["e-mail", "email", "envelope", "incoming", "letter", "receive"]}, "envelope-with-arrow": {"a": "envelope with arrow", "b": "1F4E9", "j": ["arrow", "e-mail", "email", "envelope", "envelope with arrow", "outgoing"]}, "outbox-tray": {"a": "outbox tray", "b": "1F4E4", "j": ["box", "letter", "mail", "outbox", "sent", "tray"]}, "inbox-tray": {"a": "inbox tray", "b": "1F4E5", "j": ["box", "inbox", "letter", "mail", "receive", "tray"]}, "package": {"a": "package", "b": "1F4E6", "j": ["box", "package", "parcel"]}, "closed-mailbox-with-raised-flag": {"a": "closed mailbox with raised flag", "b": "1F4EB", "j": ["closed", "closed mailbox with raised flag", "mail", "mailbox", "postbox"]}, "closed-mailbox-with-lowered-flag": {"a": "closed mailbox with lowered flag", "b": "1F4EA", "j": ["closed", "closed mailbox with lowered flag", "lowered", "mail", "mailbox", "postbox"]}, "open-mailbox-with-raised-flag": {"a": "open mailbox with raised flag", "b": "1F4EC", "j": ["mail", "mailbox", "open", "open mailbox with raised flag", "postbox"]}, "open-mailbox-with-lowered-flag": {"a": "open mailbox with lowered flag", "b": "1F4ED", "j": ["lowered", "mail", "mailbox", "open", "open mailbox with lowered flag", "postbox"]}, "postbox": {"a": "postbox", "b": "1F4EE", "j": ["mail", "mailbox", "postbox"]}, "ballot-box-with-ballot": {"a": "ballot box with ballot", "b": "1F5F3", "j": ["ballot", "ballot box with ballot", "box"]}, "pencil": {"a": "pencil", "b": "270F", "j": ["pencil"]}, "black-nib": {"a": "black nib", "b": "2712", "j": ["black nib", "nib", "pen"]}, "fountain-pen": {"a": "fountain pen", "b": "1F58B", "j": ["fountain", "pen"]}, "pen": {"a": "pen", "b": "1F58A", "j": ["ballpoint", "pen"]}, "paintbrush": {"a": "paintbrush", "b": "1F58C", "j": ["paintbrush", "painting"]}, "crayon": {"a": "crayon", "b": "1F58D", "j": ["crayon"]}, "memo": {"a": "memo", "b": "1F4DD", "j": ["memo", "pencil"]}, "briefcase": {"a": "briefcase", "b": "1F4BC", "j": ["briefcase"]}, "file-folder": {"a": "file folder", "b": "1F4C1", "j": ["file", "folder"]}, "open-file-folder": {"a": "open file folder", "b": "1F4C2", "j": ["file", "folder", "open"]}, "card-index-dividers": {"a": "card index dividers", "b": "1F5C2", "j": ["card", "dividers", "index"]}, "calendar": {"a": "calendar", "b": "1F4C5", "j": ["calendar", "date"]}, "tearoff-calendar": {"a": "tear-off calendar", "b": "1F4C6", "j": ["calendar", "tear-off calendar"]}, "spiral-notepad": {"a": "spiral notepad", "b": "1F5D2", "j": ["note", "pad", "spiral", "spiral notepad"]}, "spiral-calendar": {"a": "spiral calendar", "b": "1F5D3", "j": ["calendar", "pad", "spiral"]}, "card-index": {"a": "card index", "b": "1F4C7", "j": ["card", "index", "rolodex"]}, "chart-increasing": {"a": "chart increasing", "b": "1F4C8", "j": ["chart", "chart increasing", "graph", "growth", "trend", "upward"]}, "chart-decreasing": {"a": "chart decreasing", "b": "1F4C9", "j": ["chart", "chart decreasing", "down", "graph", "trend"]}, "bar-chart": {"a": "bar chart", "b": "1F4CA", "j": ["bar", "chart", "graph"]}, "clipboard": {"a": "clipboard", "b": "1F4CB", "j": ["clipboard"]}, "pushpin": {"a": "pushpin", "b": "1F4CC", "j": ["pin", "pushpin"]}, "round-pushpin": {"a": "round pushpin", "b": "1F4CD", "j": ["pin", "pushpin", "round pushpin"]}, "paperclip": {"a": "paperclip", "b": "1F4CE", "j": ["paperclip"]}, "linked-paperclips": {"a": "linked paperclips", "b": "1F587", "j": ["link", "linked paperclips", "paperclip"]}, "straight-ruler": {"a": "straight ruler", "b": "1F4CF", "j": ["ruler", "straight edge", "straight ruler"]}, "triangular-ruler": {"a": "triangular ruler", "b": "1F4D0", "j": ["ruler", "set", "triangle", "triangular ruler"]}, "scissors": {"a": "scissors", "b": "2702", "j": ["cutting", "scissors", "tool"]}, "card-file-box": {"a": "card file box", "b": "1F5C3", "j": ["box", "card", "file"]}, "file-cabinet": {"a": "file cabinet", "b": "1F5C4", "j": ["cabinet", "file", "filing"]}, "wastebasket": {"a": "wastebasket", "b": "1F5D1", "j": ["wastebasket"]}, "locked": {"a": "locked", "b": "1F512", "j": ["closed", "locked"]}, "unlocked": {"a": "unlocked", "b": "1F513", "j": ["lock", "open", "unlock", "unlocked"]}, "locked-with-pen": {"a": "locked with pen", "b": "1F50F", "j": ["ink", "lock", "locked with pen", "nib", "pen", "privacy"]}, "locked-with-key": {"a": "locked with key", "b": "1F510", "j": ["closed", "key", "lock", "locked with key", "secure"]}, "key": {"a": "key", "b": "1F511", "j": ["key", "lock", "password"]}, "old-key": {"a": "old key", "b": "1F5DD", "j": ["clue", "key", "lock", "old"]}, "hammer": {"a": "hammer", "b": "1F528", "j": ["hammer", "tool"]}, "axe": {"a": "axe", "b": "1FA93", "j": ["axe", "chop", "hatchet", "split", "wood"]}, "pick": {"a": "pick", "b": "26CF", "j": ["mining", "pick", "tool"]}, "hammer-and-pick": {"a": "hammer and pick", "b": "2692", "j": ["hammer", "hammer and pick", "pick", "tool"]}, "hammer-and-wrench": {"a": "hammer and wrench", "b": "1F6E0", "j": ["hammer", "hammer and wrench", "spanner", "tool", "wrench"]}, "dagger": {"a": "dagger", "b": "1F5E1", "j": ["dagger", "knife", "weapon"]}, "crossed-swords": {"a": "crossed swords", "b": "2694", "j": ["crossed", "swords", "weapon"]}, "water-pistol": {"a": "water pistol", "b": "1F52B", "j": ["gun", "handgun", "pistol", "revolver", "tool", "water", "weapon"]}, "boomerang": {"a": "boomerang", "b": "1FA83", "j": ["australia", "boomerang", "rebound", "repercussion"]}, "bow-and-arrow": {"a": "bow and arrow", "b": "1F3F9", "j": ["archer", "arrow", "bow", "bow and arrow", "Sagittarius", "zodiac"]}, "shield": {"a": "shield", "b": "1F6E1", "j": ["shield", "weapon"]}, "carpentry-saw": {"a": "carpentry saw", "b": "1FA9A", "j": ["carpenter", "carpentry saw", "lumber", "saw", "tool"]}, "wrench": {"a": "wrench", "b": "1F527", "j": ["spanner", "tool", "wrench"]}, "screwdriver": {"a": "screwdriver", "b": "1FA9B", "j": ["screw", "screwdriver", "tool"]}, "nut-and-bolt": {"a": "nut and bolt", "b": "1F529", "j": ["bolt", "nut", "nut and bolt", "tool"]}, "gear": {"a": "gear", "b": "2699", "j": ["cog", "cogwheel", "gear", "tool"]}, "clamp": {"a": "clamp", "b": "1F5DC", "j": ["clamp", "compress", "tool", "vice"]}, "balance-scale": {"a": "balance scale", "b": "2696", "j": ["balance", "justice", "Libra", "scale", "zodiac"]}, "white-cane": {"a": "white cane", "b": "1F9AF", "j": ["accessibility", "blind", "white cane"]}, "link": {"a": "link", "b": "1F517", "j": ["link"]}, "chains": {"a": "chains", "b": "26D3", "j": ["chain", "chains"]}, "hook": {"a": "hook", "b": "1FA9D", "j": ["catch", "crook", "curve", "ensnare", "hook", "selling point"]}, "toolbox": {"a": "toolbox", "b": "1F9F0", "j": ["chest", "mechanic", "tool", "toolbox"]}, "magnet": {"a": "magnet", "b": "1F9F2", "j": ["attraction", "horseshoe", "magnet", "magnetic"]}, "ladder": {"a": "ladder", "b": "1FA9C", "j": ["climb", "ladder", "rung", "step"]}, "alembic": {"a": "alembic", "b": "2697", "j": ["alembic", "chemistry", "tool"]}, "test-tube": {"a": "test tube", "b": "1F9EA", "j": ["chemist", "chemistry", "experiment", "lab", "science", "test tube"]}, "petri-dish": {"a": "petri dish", "b": "1F9EB", "j": ["bacteria", "biologist", "biology", "culture", "lab", "petri dish"]}, "dna": {"a": "dna", "b": "1F9EC", "j": ["biologist", "dna", "evolution", "gene", "genetics", "life"]}, "microscope": {"a": "microscope", "b": "1F52C", "j": ["microscope", "science", "tool"]}, "telescope": {"a": "telescope", "b": "1F52D", "j": ["science", "telescope", "tool"]}, "satellite-antenna": {"a": "satellite antenna", "b": "1F4E1", "j": ["antenna", "dish", "satellite"]}, "syringe": {"a": "syringe", "b": "1F489", "j": ["medicine", "needle", "shot", "sick", "syringe"]}, "drop-of-blood": {"a": "drop of blood", "b": "1FA78", "j": ["bleed", "blood donation", "drop of blood", "injury", "medicine", "menstruation"]}, "pill": {"a": "pill", "b": "1F48A", "j": ["doctor", "medicine", "pill", "sick"]}, "adhesive-bandage": {"a": "adhesive bandage", "b": "1FA79", "j": ["adhesive bandage", "bandage"]}, "stethoscope": {"a": "stethoscope", "b": "1FA7A", "j": ["doctor", "heart", "medicine", "stethoscope"]}, "door": {"a": "door", "b": "1F6AA", "j": ["door"]}, "elevator": {"a": "elevator", "b": "1F6D7", "j": ["accessibility", "elevator", "hoist", "lift"]}, "mirror": {"a": "mirror", "b": "1FA9E", "j": ["mirror", "reflection", "reflector", "speculum"]}, "window": {"a": "window", "b": "1FA9F", "j": ["frame", "fresh air", "opening", "transparent", "view", "window"]}, "bed": {"a": "bed", "b": "1F6CF", "j": ["bed", "hotel", "sleep"]}, "couch-and-lamp": {"a": "couch and lamp", "b": "1F6CB", "j": ["couch", "couch and lamp", "hotel", "lamp"]}, "chair": {"a": "chair", "b": "1FA91", "j": ["chair", "seat", "sit"]}, "toilet": {"a": "toilet", "b": "1F6BD", "j": ["toilet"]}, "plunger": {"a": "plunger", "b": "1FAA0", "j": ["force cup", "plumber", "plunger", "suction", "toilet"]}, "shower": {"a": "shower", "b": "1F6BF", "j": ["shower", "water"]}, "bathtub": {"a": "bathtub", "b": "1F6C1", "j": ["bath", "bathtub"]}, "mouse-trap": {"a": "mouse trap", "b": "1FAA4", "j": ["bait", "mouse trap", "mousetrap", "snare", "trap"]}, "razor": {"a": "razor", "b": "1FA92", "j": ["razor", "sharp", "shave"]}, "lotion-bottle": {"a": "lotion bottle", "b": "1F9F4", "j": ["lotion", "lotion bottle", "moisturizer", "shampoo", "sunscreen"]}, "safety-pin": {"a": "safety pin", "b": "1F9F7", "j": ["diaper", "punk rock", "safety pin"]}, "broom": {"a": "broom", "b": "1F9F9", "j": ["broom", "cleaning", "sweeping", "witch"]}, "basket": {"a": "basket", "b": "1F9FA", "j": ["basket", "farming", "laundry", "picnic"]}, "roll-of-paper": {"a": "roll of paper", "b": "1F9FB", "j": ["paper towels", "roll of paper", "toilet paper"]}, "bucket": {"a": "bucket", "b": "1FAA3", "j": ["bucket", "cask", "pail", "vat"]}, "soap": {"a": "soap", "b": "1F9FC", "j": ["bar", "bathing", "cleaning", "lather", "soap", "soapdish"]}, "toothbrush": {"a": "toothbrush", "b": "1FAA5", "j": ["bathroom", "brush", "clean", "dental", "hygiene", "teeth", "toothbrush"]}, "sponge": {"a": "sponge", "b": "1F9FD", "j": ["absorbing", "cleaning", "porous", "sponge"]}, "fire-extinguisher": {"a": "fire extinguisher", "b": "1F9EF", "j": ["extinguish", "fire", "fire extinguisher", "quench"]}, "shopping-cart": {"a": "shopping cart", "b": "1F6D2", "j": ["cart", "shopping", "trolley"]}, "cigarette": {"a": "cigarette", "b": "1F6AC", "j": ["cigarette", "smoking"]}, "coffin": {"a": "coffin", "b": "26B0", "j": ["coffin", "death"]}, "headstone": {"a": "headstone", "b": "1FAA6", "j": ["cemetery", "grave", "graveyard", "headstone", "tombstone"]}, "funeral-urn": {"a": "funeral urn", "b": "26B1", "j": ["ashes", "death", "funeral", "urn"]}, "moai": {"a": "moai", "b": "1F5FF", "j": ["face", "moai", "moyai", "statue"]}, "placard": {"a": "placard", "b": "1FAA7", "j": ["demonstration", "picket", "placard", "protest", "sign"]}, "atm-sign": {"a": "ATM sign", "b": "1F3E7", "j": ["atm", "ATM sign", "automated", "bank", "teller"]}, "litter-in-bin-sign": {"a": "litter in bin sign", "b": "1F6AE", "j": ["litter", "litter bin", "litter in bin sign"]}, "potable-water": {"a": "potable water", "b": "1F6B0", "j": ["drinking", "potable", "water"]}, "wheelchair-symbol": {"a": "wheelchair symbol", "b": "267F", "j": ["access", "wheelchair symbol"]}, "mens-room": {"a": "men’s room", "b": "1F6B9", "j": ["lavatory", "man", "men’s room", "restroom", "wc"]}, "womens-room": {"a": "women’s room", "b": "1F6BA", "j": ["lavatory", "restroom", "wc", "woman", "women’s room"]}, "restroom": {"a": "restroom", "b": "1F6BB", "j": ["lavatory", "restroom", "WC"]}, "baby-symbol": {"a": "baby symbol", "b": "1F6BC", "j": ["baby", "baby symbol", "changing"]}, "water-closet": {"a": "water closet", "b": "1F6BE", "j": ["closet", "lavatory", "restroom", "water", "wc"]}, "passport-control": {"a": "passport control", "b": "1F6C2", "j": ["control", "passport"]}, "customs": {"a": "customs", "b": "1F6C3", "j": ["customs"]}, "baggage-claim": {"a": "baggage claim", "b": "1F6C4", "j": ["baggage", "claim"]}, "left-luggage": {"a": "left luggage", "b": "1F6C5", "j": ["baggage", "left luggage", "locker", "luggage"]}, "warning": {"a": "warning", "b": "26A0", "j": ["warning"]}, "children-crossing": {"a": "children crossing", "b": "1F6B8", "j": ["child", "children crossing", "crossing", "pedestrian", "traffic"]}, "no-entry": {"a": "no entry", "b": "26D4", "j": ["entry", "forbidden", "no", "not", "prohibited", "traffic"]}, "prohibited": {"a": "prohibited", "b": "1F6AB", "j": ["entry", "forbidden", "no", "not", "prohibited"]}, "no-bicycles": {"a": "no bicycles", "b": "1F6B3", "j": ["bicycle", "bike", "forbidden", "no", "no bicycles", "prohibited"]}, "no-smoking": {"a": "no smoking", "b": "1F6AD", "j": ["forbidden", "no", "not", "prohibited", "smoking"]}, "no-littering": {"a": "no littering", "b": "1F6AF", "j": ["forbidden", "litter", "no", "no littering", "not", "prohibited"]}, "nonpotable-water": {"a": "non-potable water", "b": "1F6B1", "j": ["non-drinking", "non-potable", "water"]}, "no-pedestrians": {"a": "no pedestrians", "b": "1F6B7", "j": ["forbidden", "no", "no pedestrians", "not", "pedestrian", "prohibited"]}, "no-mobile-phones": {"a": "no mobile phones", "b": "1F4F5", "j": ["cell", "forbidden", "mobile", "no", "no mobile phones", "phone"]}, "no-one-under-eighteen": {"a": "no one under eighteen", "b": "1F51E", "j": ["18", "age restriction", "eighteen", "no one under eighteen", "prohibited", "underage"]}, "radioactive": {"a": "radioactive", "b": "2622", "j": ["radioactive", "sign"]}, "biohazard": {"a": "biohazard", "b": "2623", "j": ["biohazard", "sign"]}, "up-arrow": {"a": "up arrow", "b": "2B06", "j": ["arrow", "cardinal", "direction", "north", "up arrow"]}, "upright-arrow": {"a": "up-right arrow", "b": "2197", "j": ["arrow", "direction", "intercardinal", "northeast", "up-right arrow"]}, "right-arrow": {"a": "right arrow", "b": "27A1", "j": ["arrow", "cardinal", "direction", "east", "right arrow"]}, "downright-arrow": {"a": "down-right arrow", "b": "2198", "j": ["arrow", "direction", "down-right arrow", "intercardinal", "southeast"]}, "down-arrow": {"a": "down arrow", "b": "2B07", "j": ["arrow", "cardinal", "direction", "down", "south"]}, "downleft-arrow": {"a": "down-left arrow", "b": "2199", "j": ["arrow", "direction", "down-left arrow", "intercardinal", "southwest"]}, "left-arrow": {"a": "left arrow", "b": "2B05", "j": ["arrow", "cardinal", "direction", "left arrow", "west"]}, "upleft-arrow": {"a": "up-left arrow", "b": "2196", "j": ["arrow", "direction", "intercardinal", "northwest", "up-left arrow"]}, "updown-arrow": {"a": "up-down arrow", "b": "2195", "j": ["arrow", "up-down arrow"]}, "leftright-arrow": {"a": "left-right arrow", "b": "2194", "j": ["arrow", "left-right arrow"]}, "right-arrow-curving-left": {"a": "right arrow curving left", "b": "21A9", "j": ["arrow", "right arrow curving left"]}, "left-arrow-curving-right": {"a": "left arrow curving right", "b": "21AA", "j": ["arrow", "left arrow curving right"]}, "right-arrow-curving-up": {"a": "right arrow curving up", "b": "2934", "j": ["arrow", "right arrow curving up"]}, "right-arrow-curving-down": {"a": "right arrow curving down", "b": "2935", "j": ["arrow", "down", "right arrow curving down"]}, "clockwise-vertical-arrows": {"a": "clockwise vertical arrows", "b": "1F503", "j": ["arrow", "clockwise", "clockwise vertical arrows", "reload"]}, "counterclockwise-arrows-button": {"a": "counterclockwise arrows button", "b": "1F504", "j": ["anticlockwise", "arrow", "counterclockwise", "counterclockwise arrows button", "withershins"]}, "back-arrow": {"a": "BACK arrow", "b": "1F519", "j": ["arrow", "back", "BACK arrow"]}, "end-arrow": {"a": "END arrow", "b": "1F51A", "j": ["arrow", "end", "END arrow"]}, "on-arrow": {"a": "ON! arrow", "b": "1F51B", "j": ["arrow", "mark", "on", "ON! arrow"]}, "soon-arrow": {"a": "SOON arrow", "b": "1F51C", "j": ["arrow", "soon", "SOON arrow"]}, "top-arrow": {"a": "TOP arrow", "b": "1F51D", "j": ["arrow", "top", "TOP arrow", "up"]}, "place-of-worship": {"a": "place of worship", "b": "1F6D0", "j": ["place of worship", "religion", "worship"]}, "atom-symbol": {"a": "atom symbol", "b": "269B", "j": ["atheist", "atom", "atom symbol"]}, "om": {"a": "om", "b": "1F549", "j": ["Hindu", "om", "religion"]}, "star-of-david": {"a": "star of David", "b": "2721", "j": ["David", "Jew", "Jewish", "religion", "star", "star of David"]}, "wheel-of-dharma": {"a": "wheel of dharma", "b": "2638", "j": ["Buddhist", "dharma", "religion", "wheel", "wheel of dharma"]}, "yin-yang": {"a": "yin yang", "b": "262F", "j": ["religion", "tao", "taoist", "yang", "yin"]}, "latin-cross": {"a": "latin cross", "b": "271D", "j": ["Christian", "cross", "latin cross", "religion"]}, "orthodox-cross": {"a": "orthodox cross", "b": "2626", "j": ["Christian", "cross", "orthodox cross", "religion"]}, "star-and-crescent": {"a": "star and crescent", "b": "262A", "j": ["islam", "Muslim", "religion", "star and crescent"]}, "peace-symbol": {"a": "peace symbol", "b": "262E", "j": ["peace", "peace symbol"]}, "menorah": {"a": "menorah", "b": "1F54E", "j": ["candelabrum", "candlestick", "menorah", "religion"]}, "dotted-sixpointed-star": {"a": "dotted six-pointed star", "b": "1F52F", "j": ["dotted six-pointed star", "fortune", "star"]}, "aries": {"a": "Aries", "b": "2648", "j": ["Aries", "ram", "zodiac"]}, "taurus": {"a": "Taurus", "b": "2649", "j": ["bull", "ox", "Taurus", "zodiac"]}, "gemini": {"a": "Gemini", "b": "264A", "j": ["Gemini", "twins", "zodiac"]}, "cancer": {"a": "Cancer", "b": "264B", "j": ["Cancer", "crab", "zodiac"]}, "leo": {"a": "Leo", "b": "264C", "j": ["Leo", "lion", "zodiac"]}, "virgo": {"a": "Virgo", "b": "264D", "j": ["Virgo", "zodiac"]}, "libra": {"a": "Libra", "b": "264E", "j": ["balance", "justice", "Libra", "scales", "zodiac"]}, "scorpio": {"a": "Scorpio", "b": "264F", "j": ["Scorpio", "scorpion", "scorpius", "zodiac"]}, "sagittarius": {"a": "Sagittarius", "b": "2650", "j": ["archer", "Sagittarius", "zodiac"]}, "capricorn": {"a": "Capricorn", "b": "2651", "j": ["Capricorn", "goat", "zodiac"]}, "aquarius": {"a": "Aquarius", "b": "2652", "j": ["Aquarius", "bearer", "water", "zodiac"]}, "pisces": {"a": "Pisces", "b": "2653", "j": ["fish", "Pisces", "zodiac"]}, "ophiuchus": {"a": "Ophiuchus", "b": "26CE", "j": ["bearer", "Ophiuchus", "serpent", "snake", "zodiac"]}, "shuffle-tracks-button": {"a": "shuffle tracks button", "b": "1F500", "j": ["arrow", "crossed", "shuffle tracks button"]}, "repeat-button": {"a": "repeat button", "b": "1F501", "j": ["arrow", "clockwise", "repeat", "repeat button"]}, "repeat-single-button": {"a": "repeat single button", "b": "1F502", "j": ["arrow", "clockwise", "once", "repeat single button"]}, "play-button": {"a": "play button", "b": "25B6", "j": ["arrow", "play", "play button", "right", "triangle"]}, "fastforward-button": {"a": "fast-forward button", "b": "23E9", "j": ["arrow", "double", "fast", "fast-forward button", "forward"]}, "next-track-button": {"a": "next track button", "b": "23ED", "j": ["arrow", "next scene", "next track", "next track button", "triangle"]}, "play-or-pause-button": {"a": "play or pause button", "b": "23EF", "j": ["arrow", "pause", "play", "play or pause button", "right", "triangle"]}, "reverse-button": {"a": "reverse button", "b": "25C0", "j": ["arrow", "left", "reverse", "reverse button", "triangle"]}, "fast-reverse-button": {"a": "fast reverse button", "b": "23EA", "j": ["arrow", "double", "fast reverse button", "rewind"]}, "last-track-button": {"a": "last track button", "b": "23EE", "j": ["arrow", "last track button", "previous scene", "previous track", "triangle"]}, "upwards-button": {"a": "upwards button", "b": "1F53C", "j": ["arrow", "button", "red", "upwards button"]}, "fast-up-button": {"a": "fast up button", "b": "23EB", "j": ["arrow", "double", "fast up button"]}, "downwards-button": {"a": "downwards button", "b": "1F53D", "j": ["arrow", "button", "down", "downwards button", "red"]}, "fast-down-button": {"a": "fast down button", "b": "23EC", "j": ["arrow", "double", "down", "fast down button"]}, "pause-button": {"a": "pause button", "b": "23F8", "j": ["bar", "double", "pause", "pause button", "vertical"]}, "stop-button": {"a": "stop button", "b": "23F9", "j": ["square", "stop", "stop button"]}, "record-button": {"a": "record button", "b": "23FA", "j": ["circle", "record", "record button"]}, "eject-button": {"a": "eject button", "b": "23CF", "j": ["eject", "eject button"]}, "cinema": {"a": "cinema", "b": "1F3A6", "j": ["camera", "cinema", "film", "movie"]}, "dim-button": {"a": "dim button", "b": "1F505", "j": ["brightness", "dim", "dim button", "low"]}, "bright-button": {"a": "bright button", "b": "1F506", "j": ["bright", "bright button", "brightness"]}, "antenna-bars": {"a": "antenna bars", "b": "1F4F6", "j": ["antenna", "antenna bars", "bar", "cell", "mobile", "phone"]}, "vibration-mode": {"a": "vibration mode", "b": "1F4F3", "j": ["cell", "mobile", "mode", "phone", "telephone", "vibration"]}, "mobile-phone-off": {"a": "mobile phone off", "b": "1F4F4", "j": ["cell", "mobile", "off", "phone", "telephone"]}, "female-sign": {"a": "female sign", "b": "2640", "j": ["female sign", "woman"]}, "male-sign": {"a": "male sign", "b": "2642", "j": ["male sign", "man"]}, "transgender-symbol": {"a": "transgender symbol", "b": "26A7", "j": ["transgender", "transgender symbol"]}, "multiply": {"a": "multiply", "b": "2716", "j": ["×", "cancel", "multiplication", "multiply", "sign", "x"]}, "plus": {"a": "plus", "b": "2795", "j": ["+", "math", "plus", "sign"]}, "minus": {"a": "minus", "b": "2796", "j": ["-", "−", "math", "minus", "sign"]}, "divide": {"a": "divide", "b": "2797", "j": ["÷", "divide", "division", "math", "sign"]}, "infinity": {"a": "infinity", "b": "267E", "j": ["forever", "infinity", "unbounded", "universal"]}, "double-exclamation-mark": {"a": "double exclamation mark", "b": "203C", "j": ["!", "!!", "bangbang", "double exclamation mark", "exclamation", "mark"]}, "exclamation-question-mark": {"a": "exclamation question mark", "b": "2049", "j": ["!", "!?", "?", "exclamation", "interrobang", "mark", "punctuation", "question"]}, "red-question-mark": {"a": "red question mark", "b": "2753", "j": ["?", "mark", "punctuation", "question", "red question mark"]}, "white-question-mark": {"a": "white question mark", "b": "2754", "j": ["?", "mark", "outlined", "punctuation", "question", "white question mark"]}, "white-exclamation-mark": {"a": "white exclamation mark", "b": "2755", "j": ["!", "exclamation", "mark", "outlined", "punctuation", "white exclamation mark"]}, "red-exclamation-mark": {"a": "red exclamation mark", "b": "2757", "j": ["!", "exclamation", "mark", "punctuation", "red exclamation mark"]}, "wavy-dash": {"a": "wavy dash", "b": "3030", "j": ["dash", "punctuation", "wavy"]}, "currency-exchange": {"a": "currency exchange", "b": "1F4B1", "j": ["bank", "currency", "exchange", "money"]}, "heavy-dollar-sign": {"a": "heavy dollar sign", "b": "1F4B2", "j": ["currency", "dollar", "heavy dollar sign", "money"]}, "medical-symbol": {"a": "medical symbol", "b": "2695", "j": ["aesculapius", "medical symbol", "medicine", "staff"]}, "recycling-symbol": {"a": "recycling symbol", "b": "267B", "j": ["recycle", "recycling symbol"]}, "fleurdelis": {"a": "fleur-de-lis", "b": "269C", "j": ["fleur-de-lis"]}, "trident-emblem": {"a": "trident emblem", "b": "1F531", "j": ["anchor", "emblem", "ship", "tool", "trident"]}, "name-badge": {"a": "name badge", "b": "1F4DB", "j": ["badge", "name"]}, "japanese-symbol-for-beginner": {"a": "Japanese symbol for beginner", "b": "1F530", "j": ["beginner", "chevron", "Japanese", "Japanese symbol for beginner", "leaf"]}, "hollow-red-circle": {"a": "hollow red circle", "b": "2B55", "j": ["circle", "hollow red circle", "large", "o", "red"]}, "check-mark-button": {"a": "check mark button", "b": "2705", "j": ["✓", "button", "check", "mark"]}, "check-box-with-check": {"a": "check box with check", "b": "2611", "j": ["✓", "box", "check", "check box with check"]}, "check-mark": {"a": "check mark", "b": "2714", "j": ["✓", "check", "mark"]}, "cross-mark": {"a": "cross mark", "b": "274C", "j": ["×", "cancel", "cross", "mark", "multiplication", "multiply", "x"]}, "cross-mark-button": {"a": "cross mark button", "b": "274E", "j": ["×", "cross mark button", "mark", "square", "x"]}, "curly-loop": {"a": "curly loop", "b": "27B0", "j": ["curl", "curly loop", "loop"]}, "double-curly-loop": {"a": "double curly loop", "b": "27BF", "j": ["curl", "double", "double curly loop", "loop"]}, "part-alternation-mark": {"a": "part alternation mark", "b": "303D", "j": ["mark", "part", "part alternation mark"]}, "eightspoked-asterisk": {"a": "eight-spoked asterisk", "b": "2733", "j": ["*", "asterisk", "eight-spoked asterisk"]}, "eightpointed-star": {"a": "eight-pointed star", "b": "2734", "j": ["*", "eight-pointed star", "star"]}, "sparkle": {"a": "sparkle", "b": "2747", "j": ["*", "sparkle"]}, "copyright": {"a": "copyright", "b": "00A9", "j": ["c", "copyright"]}, "registered": {"a": "registered", "b": "00AE", "j": ["r", "registered"]}, "trade-mark": {"a": "trade mark", "b": "2122", "j": ["mark", "tm", "trade mark", "trademark"]}, "keycap": {"a": "keycap: *", "b": "002A-FE0F-20E3", "j": ["keycap"]}, "keycap-0": {"a": "keycap: 0", "b": "0030-FE0F-20E3", "j": ["keycap"]}, "keycap-1": {"a": "keycap: 1", "b": "0031-FE0F-20E3", "j": ["keycap"]}, "keycap-2": {"a": "keycap: 2", "b": "0032-FE0F-20E3", "j": ["keycap"]}, "keycap-3": {"a": "keycap: 3", "b": "0033-FE0F-20E3", "j": ["keycap"]}, "keycap-4": {"a": "keycap: 4", "b": "0034-FE0F-20E3", "j": ["keycap"]}, "keycap-5": {"a": "keycap: 5", "b": "0035-FE0F-20E3", "j": ["keycap"]}, "keycap-6": {"a": "keycap: 6", "b": "0036-FE0F-20E3", "j": ["keycap"]}, "keycap-7": {"a": "keycap: 7", "b": "0037-FE0F-20E3", "j": ["keycap"]}, "keycap-8": {"a": "keycap: 8", "b": "0038-FE0F-20E3", "j": ["keycap"]}, "keycap-9": {"a": "keycap: 9", "b": "0039-FE0F-20E3", "j": ["keycap"]}, "keycap-10": {"a": "keycap: 10", "b": "1F51F", "j": ["keycap"]}, "input-latin-uppercase": {"a": "input latin uppercase", "b": "1F520", "j": ["ABCD", "input", "latin", "letters", "uppercase"]}, "input-latin-lowercase": {"a": "input latin lowercase", "b": "1F521", "j": ["abcd", "input", "latin", "letters", "lowercase"]}, "input-numbers": {"a": "input numbers", "b": "1F522", "j": ["1234", "input", "numbers"]}, "input-symbols": {"a": "input symbols", "b": "1F523", "j": ["〒♪&%", "input", "input symbols"]}, "input-latin-letters": {"a": "input latin letters", "b": "1F524", "j": ["abc", "alphabet", "input", "latin", "letters"]}, "a-button-blood-type": {"a": "A button (blood type)", "b": "1F170", "j": ["a", "A button (blood type)", "blood type"]}, "ab-button-blood-type": {"a": "AB button (blood type)", "b": "1F18E", "j": ["ab", "AB button (blood type)", "blood type"]}, "b-button-blood-type": {"a": "B button (blood type)", "b": "1F171", "j": ["b", "B button (blood type)", "blood type"]}, "cl-button": {"a": "CL button", "b": "1F191", "j": ["cl", "CL button"]}, "cool-button": {"a": "COOL button", "b": "1F192", "j": ["cool", "COOL button"]}, "free-button": {"a": "FREE button", "b": "1F193", "j": ["free", "FREE button"]}, "information": {"a": "information", "b": "2139", "j": ["i", "information"]}, "id-button": {"a": "ID button", "b": "1F194", "j": ["id", "ID button", "identity"]}, "circled-m": {"a": "circled M", "b": "24C2", "j": ["circle", "circled M", "m"]}, "new-button": {"a": "NEW button", "b": "1F195", "j": ["new", "NEW button"]}, "ng-button": {"a": "NG button", "b": "1F196", "j": ["ng", "NG button"]}, "o-button-blood-type": {"a": "O button (blood type)", "b": "1F17E", "j": ["blood type", "o", "O button (blood type)"]}, "ok-button": {"a": "OK button", "b": "1F197", "j": ["OK", "OK button"]}, "p-button": {"a": "P button", "b": "1F17F", "j": ["P button", "parking"]}, "sos-button": {"a": "SOS button", "b": "1F198", "j": ["help", "sos", "SOS button"]}, "up-button": {"a": "UP! button", "b": "1F199", "j": ["mark", "up", "UP! button"]}, "vs-button": {"a": "VS button", "b": "1F19A", "j": ["versus", "vs", "VS button"]}, "japanese-here-button": {"a": "Japanese “here” button", "b": "1F201", "j": ["“here”", "Japanese", "Japanese “here” button", "katakana", "ココ"]}, "japanese-service-charge-button": {"a": "Japanese “service charge” button", "b": "1F202", "j": ["“service charge”", "Japanese", "Japanese “service charge” button", "katakana", "サ"]}, "japanese-monthly-amount-button": {"a": "Japanese “monthly amount” button", "b": "1F237", "j": ["“monthly amount”", "ideograph", "Japanese", "Japanese “monthly amount” button", "月"]}, "japanese-not-free-of-charge-button": {"a": "Japanese “not free of charge” button", "b": "1F236", "j": ["“not free of charge”", "ideograph", "Japanese", "Japanese “not free of charge” button", "有"]}, "japanese-reserved-button": {"a": "Japanese “reserved” button", "b": "1F22F", "j": ["“reserved”", "ideograph", "Japanese", "Japanese “reserved” button", "指"]}, "japanese-bargain-button": {"a": "Japanese “bargain” button", "b": "1F250", "j": ["“bargain”", "ideograph", "Japanese", "Japanese “bargain” button", "得"]}, "japanese-discount-button": {"a": "Japanese “discount” button", "b": "1F239", "j": ["“discount”", "ideograph", "Japanese", "Japanese “discount” button", "割"]}, "japanese-free-of-charge-button": {"a": "Japanese “free of charge” button", "b": "1F21A", "j": ["“free of charge”", "ideograph", "Japanese", "Japanese “free of charge” button", "無"]}, "japanese-prohibited-button": {"a": "Japanese “prohibited” button", "b": "1F232", "j": ["“prohibited”", "ideograph", "Japanese", "Japanese “prohibited” button", "禁"]}, "japanese-acceptable-button": {"a": "Japanese “acceptable” button", "b": "1F251", "j": ["“acceptable”", "ideograph", "Japanese", "Japanese “acceptable” button", "可"]}, "japanese-application-button": {"a": "Japanese “application” button", "b": "1F238", "j": ["“application”", "ideograph", "Japanese", "Japanese “application” button", "申"]}, "japanese-passing-grade-button": {"a": "Japanese “passing grade” button", "b": "1F234", "j": ["“passing grade”", "ideograph", "Japanese", "Japanese “passing grade” button", "合"]}, "japanese-vacancy-button": {"a": "Japanese “vacancy” button", "b": "1F233", "j": ["“vacancy”", "ideograph", "Japanese", "Japanese “vacancy” button", "空"]}, "japanese-congratulations-button": {"a": "Japanese “congratulations” button", "b": "3297", "j": ["“congratulations”", "ideograph", "Japanese", "Japanese “congratulations” button", "祝"]}, "japanese-secret-button": {"a": "Japanese “secret” button", "b": "3299", "j": ["“secret”", "ideograph", "Japanese", "Japanese “secret” button", "秘"]}, "japanese-open-for-business-button": {"a": "Japanese “open for business” button", "b": "1F23A", "j": ["“open for business”", "ideograph", "Japanese", "Japanese “open for business” button", "営"]}, "japanese-no-vacancy-button": {"a": "Japanese “no vacancy” button", "b": "1F235", "j": ["“no vacancy”", "ideograph", "Japanese", "Japanese “no vacancy” button", "満"]}, "red-circle": {"a": "red circle", "b": "1F534", "j": ["circle", "geometric", "red"]}, "orange-circle": {"a": "orange circle", "b": "1F7E0", "j": ["circle", "orange"]}, "yellow-circle": {"a": "yellow circle", "b": "1F7E1", "j": ["circle", "yellow"]}, "green-circle": {"a": "green circle", "b": "1F7E2", "j": ["circle", "green"]}, "blue-circle": {"a": "blue circle", "b": "1F535", "j": ["blue", "circle", "geometric"]}, "purple-circle": {"a": "purple circle", "b": "1F7E3", "j": ["circle", "purple"]}, "brown-circle": {"a": "brown circle", "b": "1F7E4", "j": ["brown", "circle"]}, "black-circle": {"a": "black circle", "b": "26AB", "j": ["black circle", "circle", "geometric"]}, "white-circle": {"a": "white circle", "b": "26AA", "j": ["circle", "geometric", "white circle"]}, "red-square": {"a": "red square", "b": "1F7E5", "j": ["red", "square"]}, "orange-square": {"a": "orange square", "b": "1F7E7", "j": ["orange", "square"]}, "yellow-square": {"a": "yellow square", "b": "1F7E8", "j": ["square", "yellow"]}, "green-square": {"a": "green square", "b": "1F7E9", "j": ["green", "square"]}, "blue-square": {"a": "blue square", "b": "1F7E6", "j": ["blue", "square"]}, "purple-square": {"a": "purple square", "b": "1F7EA", "j": ["purple", "square"]}, "brown-square": {"a": "brown square", "b": "1F7EB", "j": ["brown", "square"]}, "black-large-square": {"a": "black large square", "b": "2B1B", "j": ["black large square", "geometric", "square"]}, "white-large-square": {"a": "white large square", "b": "2B1C", "j": ["geometric", "square", "white large square"]}, "black-medium-square": {"a": "black medium square", "b": "25FC", "j": ["black medium square", "geometric", "square"]}, "white-medium-square": {"a": "white medium square", "b": "25FB", "j": ["geometric", "square", "white medium square"]}, "black-mediumsmall-square": {"a": "black medium-small square", "b": "25FE", "j": ["black medium-small square", "geometric", "square"]}, "white-mediumsmall-square": {"a": "white medium-small square", "b": "25FD", "j": ["geometric", "square", "white medium-small square"]}, "black-small-square": {"a": "black small square", "b": "25AA", "j": ["black small square", "geometric", "square"]}, "white-small-square": {"a": "white small square", "b": "25AB", "j": ["geometric", "square", "white small square"]}, "large-orange-diamond": {"a": "large orange diamond", "b": "1F536", "j": ["diamond", "geometric", "large orange diamond", "orange"]}, "large-blue-diamond": {"a": "large blue diamond", "b": "1F537", "j": ["blue", "diamond", "geometric", "large blue diamond"]}, "small-orange-diamond": {"a": "small orange diamond", "b": "1F538", "j": ["diamond", "geometric", "orange", "small orange diamond"]}, "small-blue-diamond": {"a": "small blue diamond", "b": "1F539", "j": ["blue", "diamond", "geometric", "small blue diamond"]}, "red-triangle-pointed-up": {"a": "red triangle pointed up", "b": "1F53A", "j": ["geometric", "red", "red triangle pointed up"]}, "red-triangle-pointed-down": {"a": "red triangle pointed down", "b": "1F53B", "j": ["down", "geometric", "red", "red triangle pointed down"]}, "diamond-with-a-dot": {"a": "diamond with a dot", "b": "1F4A0", "j": ["comic", "diamond", "diamond with a dot", "geometric", "inside"]}, "radio-button": {"a": "radio button", "b": "1F518", "j": ["button", "geometric", "radio"]}, "white-square-button": {"a": "white square button", "b": "1F533", "j": ["button", "geometric", "outlined", "square", "white square button"]}, "black-square-button": {"a": "black square button", "b": "1F532", "j": ["black square button", "button", "geometric", "square"]}, "chequered-flag": {"a": "chequered flag", "b": "1F3C1", "j": ["checkered", "chequered", "chequered flag", "racing"]}, "triangular-flag": {"a": "triangular flag", "b": "1F6A9", "j": ["post", "triangular flag"]}, "crossed-flags": {"a": "crossed flags", "b": "1F38C", "j": ["celebration", "cross", "crossed", "crossed flags", "Japanese"]}, "black-flag": {"a": "black flag", "b": "1F3F4", "j": ["black flag", "waving"]}, "white-flag": {"a": "white flag", "b": "1F3F3", "j": ["waving", "white flag"]}, "rainbow-flag": {"a": "rainbow flag", "b": "1F3F3-FE0F-200D-1F308", "j": ["pride", "rainbow", "rainbow flag"]}, "transgender-flag": {"a": "transgender flag", "b": "1F3F3-FE0F-200D-26A7-FE0F", "j": ["flag", "light blue", "pink", "transgender", "white"]}, "pirate-flag": {"a": "pirate flag", "b": "1F3F4-200D-2620-FE0F", "j": ["Jolly Roger", "pirate", "pirate flag", "plunder", "treasure"]}, "flag-ascension-island": {"a": "flag: Ascension Island", "b": "1F1E6-1F1E8", "j": ["flag"]}, "flag-andorra": {"a": "flag: Andorra", "b": "1F1E6-1F1E9", "j": ["flag"]}, "flag-united-arab-emirates": {"a": "flag: United Arab Emirates", "b": "1F1E6-1F1EA", "j": ["flag"]}, "flag-afghanistan": {"a": "flag: Afghanistan", "b": "1F1E6-1F1EB", "j": ["flag"]}, "flag-antigua--barbuda": {"a": "flag: Antigua & Barbuda", "b": "1F1E6-1F1EC", "j": ["flag"]}, "flag-anguilla": {"a": "flag: Anguilla", "b": "1F1E6-1F1EE", "j": ["flag"]}, "flag-albania": {"a": "flag: Albania", "b": "1F1E6-1F1F1", "j": ["flag"]}, "flag-armenia": {"a": "flag: Armenia", "b": "1F1E6-1F1F2", "j": ["flag"]}, "flag-angola": {"a": "flag: Angola", "b": "1F1E6-1F1F4", "j": ["flag"]}, "flag-antarctica": {"a": "flag: Antarctica", "b": "1F1E6-1F1F6", "j": ["flag"]}, "flag-argentina": {"a": "flag: Argentina", "b": "1F1E6-1F1F7", "j": ["flag"]}, "flag-american-samoa": {"a": "flag: American Samoa", "b": "1F1E6-1F1F8", "j": ["flag"]}, "flag-austria": {"a": "flag: Austria", "b": "1F1E6-1F1F9", "j": ["flag"]}, "flag-australia": {"a": "flag: Australia", "b": "1F1E6-1F1FA", "j": ["flag"]}, "flag-aruba": {"a": "flag: Aruba", "b": "1F1E6-1F1FC", "j": ["flag"]}, "flag-land-islands": {"a": "flag: Åland Islands", "b": "1F1E6-1F1FD", "j": ["flag"]}, "flag-azerbaijan": {"a": "flag: Azerbaijan", "b": "1F1E6-1F1FF", "j": ["flag"]}, "flag-bosnia--herzegovina": {"a": "flag: Bosnia & Herzegovina", "b": "1F1E7-1F1E6", "j": ["flag"]}, "flag-barbados": {"a": "flag: Barbados", "b": "1F1E7-1F1E7", "j": ["flag"]}, "flag-bangladesh": {"a": "flag: Bangladesh", "b": "1F1E7-1F1E9", "j": ["flag"]}, "flag-belgium": {"a": "flag: Belgium", "b": "1F1E7-1F1EA", "j": ["flag"]}, "flag-burkina-faso": {"a": "flag: Burkina Faso", "b": "1F1E7-1F1EB", "j": ["flag"]}, "flag-bulgaria": {"a": "flag: Bulgaria", "b": "1F1E7-1F1EC", "j": ["flag"]}, "flag-bahrain": {"a": "flag: Bahrain", "b": "1F1E7-1F1ED", "j": ["flag"]}, "flag-burundi": {"a": "flag: Burundi", "b": "1F1E7-1F1EE", "j": ["flag"]}, "flag-benin": {"a": "flag: Benin", "b": "1F1E7-1F1EF", "j": ["flag"]}, "flag-st-barthlemy": {"a": "flag: St. Barthélemy", "b": "1F1E7-1F1F1", "j": ["flag"]}, "flag-bermuda": {"a": "flag: Bermuda", "b": "1F1E7-1F1F2", "j": ["flag"]}, "flag-brunei": {"a": "flag: Brunei", "b": "1F1E7-1F1F3", "j": ["flag"]}, "flag-bolivia": {"a": "flag: Bolivia", "b": "1F1E7-1F1F4", "j": ["flag"]}, "flag-caribbean-netherlands": {"a": "flag: Caribbean Netherlands", "b": "1F1E7-1F1F6", "j": ["flag"]}, "flag-brazil": {"a": "flag: Brazil", "b": "1F1E7-1F1F7", "j": ["flag"]}, "flag-bahamas": {"a": "flag: Bahamas", "b": "1F1E7-1F1F8", "j": ["flag"]}, "flag-bhutan": {"a": "flag: Bhutan", "b": "1F1E7-1F1F9", "j": ["flag"]}, "flag-bouvet-island": {"a": "flag: Bouvet Island", "b": "1F1E7-1F1FB", "j": ["flag"]}, "flag-botswana": {"a": "flag: Botswana", "b": "1F1E7-1F1FC", "j": ["flag"]}, "flag-belarus": {"a": "flag: Belarus", "b": "1F1E7-1F1FE", "j": ["flag"]}, "flag-belize": {"a": "flag: Belize", "b": "1F1E7-1F1FF", "j": ["flag"]}, "flag-canada": {"a": "flag: Canada", "b": "1F1E8-1F1E6", "j": ["flag"]}, "flag-cocos-keeling-islands": {"a": "flag: Cocos (Keeling) Islands", "b": "1F1E8-1F1E8", "j": ["flag"]}, "flag-congo--kinshasa": {"a": "flag: Congo - Kinshasa", "b": "1F1E8-1F1E9", "j": ["flag"]}, "flag-central-african-republic": {"a": "flag: Central African Republic", "b": "1F1E8-1F1EB", "j": ["flag"]}, "flag-congo--brazzaville": {"a": "flag: Congo - Brazzaville", "b": "1F1E8-1F1EC", "j": ["flag"]}, "flag-switzerland": {"a": "flag: Switzerland", "b": "1F1E8-1F1ED", "j": ["flag"]}, "flag-cte-divoire": {"a": "flag: Côte d’Ivoire", "b": "1F1E8-1F1EE", "j": ["flag"]}, "flag-cook-islands": {"a": "flag: Cook Islands", "b": "1F1E8-1F1F0", "j": ["flag"]}, "flag-chile": {"a": "flag: Chile", "b": "1F1E8-1F1F1", "j": ["flag"]}, "flag-cameroon": {"a": "flag: Cameroon", "b": "1F1E8-1F1F2", "j": ["flag"]}, "flag-china": {"a": "flag: China", "b": "1F1E8-1F1F3", "j": ["flag"]}, "flag-colombia": {"a": "flag: Colombia", "b": "1F1E8-1F1F4", "j": ["flag"]}, "flag-clipperton-island": {"a": "flag: Clipperton Island", "b": "1F1E8-1F1F5", "j": ["flag"]}, "flag-costa-rica": {"a": "flag: Costa Rica", "b": "1F1E8-1F1F7", "j": ["flag"]}, "flag-cuba": {"a": "flag: Cuba", "b": "1F1E8-1F1FA", "j": ["flag"]}, "flag-cape-verde": {"a": "flag: Cape Verde", "b": "1F1E8-1F1FB", "j": ["flag"]}, "flag-curaao": {"a": "flag: Curaçao", "b": "1F1E8-1F1FC", "j": ["flag"]}, "flag-christmas-island": {"a": "flag: Christmas Island", "b": "1F1E8-1F1FD", "j": ["flag"]}, "flag-cyprus": {"a": "flag: Cyprus", "b": "1F1E8-1F1FE", "j": ["flag"]}, "flag-czechia": {"a": "flag: Czechia", "b": "1F1E8-1F1FF", "j": ["flag"]}, "flag-germany": {"a": "flag: Germany", "b": "1F1E9-1F1EA", "j": ["flag"]}, "flag-diego-garcia": {"a": "flag: Diego Garcia", "b": "1F1E9-1F1EC", "j": ["flag"]}, "flag-djibouti": {"a": "flag: Djibouti", "b": "1F1E9-1F1EF", "j": ["flag"]}, "flag-denmark": {"a": "flag: Denmark", "b": "1F1E9-1F1F0", "j": ["flag"]}, "flag-dominica": {"a": "flag: Dominica", "b": "1F1E9-1F1F2", "j": ["flag"]}, "flag-dominican-republic": {"a": "flag: Dominican Republic", "b": "1F1E9-1F1F4", "j": ["flag"]}, "flag-algeria": {"a": "flag: Algeria", "b": "1F1E9-1F1FF", "j": ["flag"]}, "flag-ceuta--melilla": {"a": "flag: Ceuta & Melilla", "b": "1F1EA-1F1E6", "j": ["flag"]}, "flag-ecuador": {"a": "flag: Ecuador", "b": "1F1EA-1F1E8", "j": ["flag"]}, "flag-estonia": {"a": "flag: Estonia", "b": "1F1EA-1F1EA", "j": ["flag"]}, "flag-egypt": {"a": "flag: Egypt", "b": "1F1EA-1F1EC", "j": ["flag"]}, "flag-western-sahara": {"a": "flag: Western Sahara", "b": "1F1EA-1F1ED", "j": ["flag"]}, "flag-eritrea": {"a": "flag: Eritrea", "b": "1F1EA-1F1F7", "j": ["flag"]}, "flag-spain": {"a": "flag: Spain", "b": "1F1EA-1F1F8", "j": ["flag"]}, "flag-ethiopia": {"a": "flag: Ethiopia", "b": "1F1EA-1F1F9", "j": ["flag"]}, "flag-european-union": {"a": "flag: European Union", "b": "1F1EA-1F1FA", "j": ["flag"]}, "flag-finland": {"a": "flag: Finland", "b": "1F1EB-1F1EE", "j": ["flag"]}, "flag-fiji": {"a": "flag: Fiji", "b": "1F1EB-1F1EF", "j": ["flag"]}, "flag-falkland-islands": {"a": "flag: Falkland Islands", "b": "1F1EB-1F1F0", "j": ["flag"]}, "flag-micronesia": {"a": "flag: Micronesia", "b": "1F1EB-1F1F2", "j": ["flag"]}, "flag-faroe-islands": {"a": "flag: Faroe Islands", "b": "1F1EB-1F1F4", "j": ["flag"]}, "flag-france": {"a": "flag: France", "b": "1F1EB-1F1F7", "j": ["flag"]}, "flag-gabon": {"a": "flag: Gabon", "b": "1F1EC-1F1E6", "j": ["flag"]}, "flag-united-kingdom": {"a": "flag: United Kingdom", "b": "1F1EC-1F1E7", "j": ["flag"]}, "flag-grenada": {"a": "flag: Grenada", "b": "1F1EC-1F1E9", "j": ["flag"]}, "flag-georgia": {"a": "flag: Georgia", "b": "1F1EC-1F1EA", "j": ["flag"]}, "flag-french-guiana": {"a": "flag: French Guiana", "b": "1F1EC-1F1EB", "j": ["flag"]}, "flag-guernsey": {"a": "flag: Guernsey", "b": "1F1EC-1F1EC", "j": ["flag"]}, "flag-ghana": {"a": "flag: Ghana", "b": "1F1EC-1F1ED", "j": ["flag"]}, "flag-gibraltar": {"a": "flag: Gibraltar", "b": "1F1EC-1F1EE", "j": ["flag"]}, "flag-greenland": {"a": "flag: Greenland", "b": "1F1EC-1F1F1", "j": ["flag"]}, "flag-gambia": {"a": "flag: Gambia", "b": "1F1EC-1F1F2", "j": ["flag"]}, "flag-guinea": {"a": "flag: Guinea", "b": "1F1EC-1F1F3", "j": ["flag"]}, "flag-guadeloupe": {"a": "flag: Guadeloupe", "b": "1F1EC-1F1F5", "j": ["flag"]}, "flag-equatorial-guinea": {"a": "flag: Equatorial Guinea", "b": "1F1EC-1F1F6", "j": ["flag"]}, "flag-greece": {"a": "flag: Greece", "b": "1F1EC-1F1F7", "j": ["flag"]}, "flag-south-georgia--south-sandwich-islands": {"a": "flag: South Georgia & South Sandwich Islands", "b": "1F1EC-1F1F8", "j": ["flag"]}, "flag-guatemala": {"a": "flag: Guatemala", "b": "1F1EC-1F1F9", "j": ["flag"]}, "flag-guam": {"a": "flag: Guam", "b": "1F1EC-1F1FA", "j": ["flag"]}, "flag-guineabissau": {"a": "flag: Guinea-Bissau", "b": "1F1EC-1F1FC", "j": ["flag"]}, "flag-guyana": {"a": "flag: Guyana", "b": "1F1EC-1F1FE", "j": ["flag"]}, "flag-hong-kong-sar-china": {"a": "flag: Hong Kong SAR China", "b": "1F1ED-1F1F0", "j": ["flag"]}, "flag-heard--mcdonald-islands": {"a": "flag: Heard & McDonald Islands", "b": "1F1ED-1F1F2", "j": ["flag"]}, "flag-honduras": {"a": "flag: Honduras", "b": "1F1ED-1F1F3", "j": ["flag"]}, "flag-croatia": {"a": "flag: Croatia", "b": "1F1ED-1F1F7", "j": ["flag"]}, "flag-haiti": {"a": "flag: Haiti", "b": "1F1ED-1F1F9", "j": ["flag"]}, "flag-hungary": {"a": "flag: Hungary", "b": "1F1ED-1F1FA", "j": ["flag"]}, "flag-canary-islands": {"a": "flag: Canary Islands", "b": "1F1EE-1F1E8", "j": ["flag"]}, "flag-indonesia": {"a": "flag: Indonesia", "b": "1F1EE-1F1E9", "j": ["flag"]}, "flag-ireland": {"a": "flag: Ireland", "b": "1F1EE-1F1EA", "j": ["flag"]}, "flag-israel": {"a": "flag: Israel", "b": "1F1EE-1F1F1", "j": ["flag"]}, "flag-isle-of-man": {"a": "flag: Isle of Man", "b": "1F1EE-1F1F2", "j": ["flag"]}, "flag-india": {"a": "flag: India", "b": "1F1EE-1F1F3", "j": ["flag"]}, "flag-british-indian-ocean-territory": {"a": "flag: British Indian Ocean Territory", "b": "1F1EE-1F1F4", "j": ["flag"]}, "flag-iraq": {"a": "flag: Iraq", "b": "1F1EE-1F1F6", "j": ["flag"]}, "flag-iran": {"a": "flag: Iran", "b": "1F1EE-1F1F7", "j": ["flag"]}, "flag-iceland": {"a": "flag: Iceland", "b": "1F1EE-1F1F8", "j": ["flag"]}, "flag-italy": {"a": "flag: Italy", "b": "1F1EE-1F1F9", "j": ["flag"]}, "flag-jersey": {"a": "flag: Jersey", "b": "1F1EF-1F1EA", "j": ["flag"]}, "flag-jamaica": {"a": "flag: Jamaica", "b": "1F1EF-1F1F2", "j": ["flag"]}, "flag-jordan": {"a": "flag: Jordan", "b": "1F1EF-1F1F4", "j": ["flag"]}, "flag-japan": {"a": "flag: Japan", "b": "1F1EF-1F1F5", "j": ["flag"]}, "flag-kenya": {"a": "flag: Kenya", "b": "1F1F0-1F1EA", "j": ["flag"]}, "flag-kyrgyzstan": {"a": "flag: Kyrgyzstan", "b": "1F1F0-1F1EC", "j": ["flag"]}, "flag-cambodia": {"a": "flag: Cambodia", "b": "1F1F0-1F1ED", "j": ["flag"]}, "flag-kiribati": {"a": "flag: Kiribati", "b": "1F1F0-1F1EE", "j": ["flag"]}, "flag-comoros": {"a": "flag: Comoros", "b": "1F1F0-1F1F2", "j": ["flag"]}, "flag-st-kitts--nevis": {"a": "flag: St. Kitts & Nevis", "b": "1F1F0-1F1F3", "j": ["flag"]}, "flag-north-korea": {"a": "flag: North Korea", "b": "1F1F0-1F1F5", "j": ["flag"]}, "flag-south-korea": {"a": "flag: South Korea", "b": "1F1F0-1F1F7", "j": ["flag"]}, "flag-kuwait": {"a": "flag: Kuwait", "b": "1F1F0-1F1FC", "j": ["flag"]}, "flag-cayman-islands": {"a": "flag: Cayman Islands", "b": "1F1F0-1F1FE", "j": ["flag"]}, "flag-kazakhstan": {"a": "flag: Kazakhstan", "b": "1F1F0-1F1FF", "j": ["flag"]}, "flag-laos": {"a": "flag: Laos", "b": "1F1F1-1F1E6", "j": ["flag"]}, "flag-lebanon": {"a": "flag: Lebanon", "b": "1F1F1-1F1E7", "j": ["flag"]}, "flag-st-lucia": {"a": "flag: St. Lucia", "b": "1F1F1-1F1E8", "j": ["flag"]}, "flag-liechtenstein": {"a": "flag: Liechtenstein", "b": "1F1F1-1F1EE", "j": ["flag"]}, "flag-sri-lanka": {"a": "flag: Sri Lanka", "b": "1F1F1-1F1F0", "j": ["flag"]}, "flag-liberia": {"a": "flag: Liberia", "b": "1F1F1-1F1F7", "j": ["flag"]}, "flag-lesotho": {"a": "flag: Lesotho", "b": "1F1F1-1F1F8", "j": ["flag"]}, "flag-lithuania": {"a": "flag: Lithuania", "b": "1F1F1-1F1F9", "j": ["flag"]}, "flag-luxembourg": {"a": "flag: Luxembourg", "b": "1F1F1-1F1FA", "j": ["flag"]}, "flag-latvia": {"a": "flag: Latvia", "b": "1F1F1-1F1FB", "j": ["flag"]}, "flag-libya": {"a": "flag: Libya", "b": "1F1F1-1F1FE", "j": ["flag"]}, "flag-morocco": {"a": "flag: Morocco", "b": "1F1F2-1F1E6", "j": ["flag"]}, "flag-monaco": {"a": "flag: Monaco", "b": "1F1F2-1F1E8", "j": ["flag"]}, "flag-moldova": {"a": "flag: Moldova", "b": "1F1F2-1F1E9", "j": ["flag"]}, "flag-montenegro": {"a": "flag: Montenegro", "b": "1F1F2-1F1EA", "j": ["flag"]}, "flag-st-martin": {"a": "flag: St. Martin", "b": "1F1F2-1F1EB", "j": ["flag"]}, "flag-madagascar": {"a": "flag: Madagascar", "b": "1F1F2-1F1EC", "j": ["flag"]}, "flag-marshall-islands": {"a": "flag: Marshall Islands", "b": "1F1F2-1F1ED", "j": ["flag"]}, "flag-north-macedonia": {"a": "flag: North Macedonia", "b": "1F1F2-1F1F0", "j": ["flag"]}, "flag-mali": {"a": "flag: Mali", "b": "1F1F2-1F1F1", "j": ["flag"]}, "flag-myanmar-burma": {"a": "flag: Myanmar (Burma)", "b": "1F1F2-1F1F2", "j": ["flag"]}, "flag-mongolia": {"a": "flag: Mongolia", "b": "1F1F2-1F1F3", "j": ["flag"]}, "flag-macao-sar-china": {"a": "flag: Macao SAR China", "b": "1F1F2-1F1F4", "j": ["flag"]}, "flag-northern-mariana-islands": {"a": "flag: Northern Mariana Islands", "b": "1F1F2-1F1F5", "j": ["flag"]}, "flag-martinique": {"a": "flag: Martinique", "b": "1F1F2-1F1F6", "j": ["flag"]}, "flag-mauritania": {"a": "flag: Mauritania", "b": "1F1F2-1F1F7", "j": ["flag"]}, "flag-montserrat": {"a": "flag: Montserrat", "b": "1F1F2-1F1F8", "j": ["flag"]}, "flag-malta": {"a": "flag: Malta", "b": "1F1F2-1F1F9", "j": ["flag"]}, "flag-mauritius": {"a": "flag: Mauritius", "b": "1F1F2-1F1FA", "j": ["flag"]}, "flag-maldives": {"a": "flag: Maldives", "b": "1F1F2-1F1FB", "j": ["flag"]}, "flag-malawi": {"a": "flag: Malawi", "b": "1F1F2-1F1FC", "j": ["flag"]}, "flag-mexico": {"a": "flag: Mexico", "b": "1F1F2-1F1FD", "j": ["flag"]}, "flag-malaysia": {"a": "flag: Malaysia", "b": "1F1F2-1F1FE", "j": ["flag"]}, "flag-mozambique": {"a": "flag: Mozambique", "b": "1F1F2-1F1FF", "j": ["flag"]}, "flag-namibia": {"a": "flag: Namibia", "b": "1F1F3-1F1E6", "j": ["flag"]}, "flag-new-caledonia": {"a": "flag: New Caledonia", "b": "1F1F3-1F1E8", "j": ["flag"]}, "flag-niger": {"a": "flag: Niger", "b": "1F1F3-1F1EA", "j": ["flag"]}, "flag-norfolk-island": {"a": "flag: Norfolk Island", "b": "1F1F3-1F1EB", "j": ["flag"]}, "flag-nigeria": {"a": "flag: Nigeria", "b": "1F1F3-1F1EC", "j": ["flag"]}, "flag-nicaragua": {"a": "flag: Nicaragua", "b": "1F1F3-1F1EE", "j": ["flag"]}, "flag-netherlands": {"a": "flag: Netherlands", "b": "1F1F3-1F1F1", "j": ["flag"]}, "flag-norway": {"a": "flag: Norway", "b": "1F1F3-1F1F4", "j": ["flag"]}, "flag-nepal": {"a": "flag: Nepal", "b": "1F1F3-1F1F5", "j": ["flag"]}, "flag-nauru": {"a": "flag: Nauru", "b": "1F1F3-1F1F7", "j": ["flag"]}, "flag-niue": {"a": "flag: Niue", "b": "1F1F3-1F1FA", "j": ["flag"]}, "flag-new-zealand": {"a": "flag: New Zealand", "b": "1F1F3-1F1FF", "j": ["flag"]}, "flag-oman": {"a": "flag: Oman", "b": "1F1F4-1F1F2", "j": ["flag"]}, "flag-panama": {"a": "flag: Panama", "b": "1F1F5-1F1E6", "j": ["flag"]}, "flag-peru": {"a": "flag: Peru", "b": "1F1F5-1F1EA", "j": ["flag"]}, "flag-french-polynesia": {"a": "flag: French Polynesia", "b": "1F1F5-1F1EB", "j": ["flag"]}, "flag-papua-new-guinea": {"a": "flag: Papua New Guinea", "b": "1F1F5-1F1EC", "j": ["flag"]}, "flag-philippines": {"a": "flag: Philippines", "b": "1F1F5-1F1ED", "j": ["flag"]}, "flag-pakistan": {"a": "flag: Pakistan", "b": "1F1F5-1F1F0", "j": ["flag"]}, "flag-poland": {"a": "flag: Poland", "b": "1F1F5-1F1F1", "j": ["flag"]}, "flag-st-pierre--miquelon": {"a": "flag: St. Pierre & Miquelon", "b": "1F1F5-1F1F2", "j": ["flag"]}, "flag-pitcairn-islands": {"a": "flag: Pitcairn Islands", "b": "1F1F5-1F1F3", "j": ["flag"]}, "flag-puerto-rico": {"a": "flag: Puerto Rico", "b": "1F1F5-1F1F7", "j": ["flag"]}, "flag-palestinian-territories": {"a": "flag: Palestinian Territories", "b": "1F1F5-1F1F8", "j": ["flag"]}, "flag-portugal": {"a": "flag: Portugal", "b": "1F1F5-1F1F9", "j": ["flag"]}, "flag-palau": {"a": "flag: Palau", "b": "1F1F5-1F1FC", "j": ["flag"]}, "flag-paraguay": {"a": "flag: Paraguay", "b": "1F1F5-1F1FE", "j": ["flag"]}, "flag-qatar": {"a": "flag: Qatar", "b": "1F1F6-1F1E6", "j": ["flag"]}, "flag-runion": {"a": "flag: Réunion", "b": "1F1F7-1F1EA", "j": ["flag"]}, "flag-romania": {"a": "flag: Romania", "b": "1F1F7-1F1F4", "j": ["flag"]}, "flag-serbia": {"a": "flag: Serbia", "b": "1F1F7-1F1F8", "j": ["flag"]}, "flag-russia": {"a": "flag: Russia", "b": "1F1F7-1F1FA", "j": ["flag"]}, "flag-rwanda": {"a": "flag: Rwanda", "b": "1F1F7-1F1FC", "j": ["flag"]}, "flag-saudi-arabia": {"a": "flag: Saudi Arabia", "b": "1F1F8-1F1E6", "j": ["flag"]}, "flag-solomon-islands": {"a": "flag: Solomon Islands", "b": "1F1F8-1F1E7", "j": ["flag"]}, "flag-seychelles": {"a": "flag: Seychelles", "b": "1F1F8-1F1E8", "j": ["flag"]}, "flag-sudan": {"a": "flag: Sudan", "b": "1F1F8-1F1E9", "j": ["flag"]}, "flag-sweden": {"a": "flag: Sweden", "b": "1F1F8-1F1EA", "j": ["flag"]}, "flag-singapore": {"a": "flag: Singapore", "b": "1F1F8-1F1EC", "j": ["flag"]}, "flag-st-helena": {"a": "flag: St. Helena", "b": "1F1F8-1F1ED", "j": ["flag"]}, "flag-slovenia": {"a": "flag: Slovenia", "b": "1F1F8-1F1EE", "j": ["flag"]}, "flag-svalbard--jan-mayen": {"a": "flag: Svalbard & Jan Mayen", "b": "1F1F8-1F1EF", "j": ["flag"]}, "flag-slovakia": {"a": "flag: Slovakia", "b": "1F1F8-1F1F0", "j": ["flag"]}, "flag-sierra-leone": {"a": "flag: Sierra Leone", "b": "1F1F8-1F1F1", "j": ["flag"]}, "flag-san-marino": {"a": "flag: San Marino", "b": "1F1F8-1F1F2", "j": ["flag"]}, "flag-senegal": {"a": "flag: Senegal", "b": "1F1F8-1F1F3", "j": ["flag"]}, "flag-somalia": {"a": "flag: Somalia", "b": "1F1F8-1F1F4", "j": ["flag"]}, "flag-suriname": {"a": "flag: Suriname", "b": "1F1F8-1F1F7", "j": ["flag"]}, "flag-south-sudan": {"a": "flag: South Sudan", "b": "1F1F8-1F1F8", "j": ["flag"]}, "flag-so-tom--prncipe": {"a": "flag: São Tomé & Príncipe", "b": "1F1F8-1F1F9", "j": ["flag"]}, "flag-el-salvador": {"a": "flag: El Salvador", "b": "1F1F8-1F1FB", "j": ["flag"]}, "flag-sint-maarten": {"a": "flag: Sint Maarten", "b": "1F1F8-1F1FD", "j": ["flag"]}, "flag-syria": {"a": "flag: Syria", "b": "1F1F8-1F1FE", "j": ["flag"]}, "flag-eswatini": {"a": "flag: Eswatini", "b": "1F1F8-1F1FF", "j": ["flag"]}, "flag-tristan-da-cunha": {"a": "flag: Tristan da Cunha", "b": "1F1F9-1F1E6", "j": ["flag"]}, "flag-turks--caicos-islands": {"a": "flag: Turks & Caicos Islands", "b": "1F1F9-1F1E8", "j": ["flag"]}, "flag-chad": {"a": "flag: Chad", "b": "1F1F9-1F1E9", "j": ["flag"]}, "flag-french-southern-territories": {"a": "flag: French Southern Territories", "b": "1F1F9-1F1EB", "j": ["flag"]}, "flag-togo": {"a": "flag: Togo", "b": "1F1F9-1F1EC", "j": ["flag"]}, "flag-thailand": {"a": "flag: Thailand", "b": "1F1F9-1F1ED", "j": ["flag"]}, "flag-tajikistan": {"a": "flag: Tajikistan", "b": "1F1F9-1F1EF", "j": ["flag"]}, "flag-tokelau": {"a": "flag: Tokelau", "b": "1F1F9-1F1F0", "j": ["flag"]}, "flag-timorleste": {"a": "flag: Timor-Leste", "b": "1F1F9-1F1F1", "j": ["flag"]}, "flag-turkmenistan": {"a": "flag: Turkmenistan", "b": "1F1F9-1F1F2", "j": ["flag"]}, "flag-tunisia": {"a": "flag: Tunisia", "b": "1F1F9-1F1F3", "j": ["flag"]}, "flag-tonga": {"a": "flag: Tonga", "b": "1F1F9-1F1F4", "j": ["flag"]}, "flag-turkey": {"a": "flag: Turkey", "b": "1F1F9-1F1F7", "j": ["flag"]}, "flag-trinidad--tobago": {"a": "flag: Trinidad & Tobago", "b": "1F1F9-1F1F9", "j": ["flag"]}, "flag-tuvalu": {"a": "flag: Tuvalu", "b": "1F1F9-1F1FB", "j": ["flag"]}, "flag-taiwan": {"a": "flag: Taiwan", "b": "1F1F9-1F1FC", "j": ["flag"]}, "flag-tanzania": {"a": "flag: Tanzania", "b": "1F1F9-1F1FF", "j": ["flag"]}, "flag-ukraine": {"a": "flag: Ukraine", "b": "1F1FA-1F1E6", "j": ["flag"]}, "flag-uganda": {"a": "flag: Uganda", "b": "1F1FA-1F1EC", "j": ["flag"]}, "flag-us-outlying-islands": {"a": "flag: U.S. Outlying Islands", "b": "1F1FA-1F1F2", "j": ["flag"]}, "flag-united-nations": {"a": "flag: United Nations", "b": "1F1FA-1F1F3", "j": ["flag"]}, "flag-united-states": {"a": "flag: United States", "b": "1F1FA-1F1F8", "j": ["flag"]}, "flag-uruguay": {"a": "flag: Uruguay", "b": "1F1FA-1F1FE", "j": ["flag"]}, "flag-uzbekistan": {"a": "flag: Uzbekistan", "b": "1F1FA-1F1FF", "j": ["flag"]}, "flag-vatican-city": {"a": "flag: Vatican City", "b": "1F1FB-1F1E6", "j": ["flag"]}, "flag-st-vincent--grenadines": {"a": "flag: St. Vincent & Grenadines", "b": "1F1FB-1F1E8", "j": ["flag"]}, "flag-venezuela": {"a": "flag: Venezuela", "b": "1F1FB-1F1EA", "j": ["flag"]}, "flag-british-virgin-islands": {"a": "flag: British Virgin Islands", "b": "1F1FB-1F1EC", "j": ["flag"]}, "flag-us-virgin-islands": {"a": "flag: U.S. Virgin Islands", "b": "1F1FB-1F1EE", "j": ["flag"]}, "flag-vietnam": {"a": "flag: Vietnam", "b": "1F1FB-1F1F3", "j": ["flag"]}, "flag-vanuatu": {"a": "flag: Vanuatu", "b": "1F1FB-1F1FA", "j": ["flag"]}, "flag-wallis--futuna": {"a": "flag: Wallis & Futuna", "b": "1F1FC-1F1EB", "j": ["flag"]}, "flag-samoa": {"a": "flag: Samoa", "b": "1F1FC-1F1F8", "j": ["flag"]}, "flag-kosovo": {"a": "flag: Kosovo", "b": "1F1FD-1F1F0", "j": ["flag"]}, "flag-yemen": {"a": "flag: Yemen", "b": "1F1FE-1F1EA", "j": ["flag"]}, "flag-mayotte": {"a": "flag: Mayotte", "b": "1F1FE-1F1F9", "j": ["flag"]}, "flag-south-africa": {"a": "flag: South Africa", "b": "1F1FF-1F1E6", "j": ["flag"]}, "flag-zambia": {"a": "flag: Zambia", "b": "1F1FF-1F1F2", "j": ["flag"]}, "flag-zimbabwe": {"a": "flag: Zimbabwe", "b": "1F1FF-1F1FC", "j": ["flag"]}, "flag-england": {"a": "flag: England", "b": "1F3F4-E0067-E0062-E0065-E006E-E0067-E007F", "j": ["flag"]}, "flag-scotland": {"a": "flag: Scotland", "b": "1F3F4-E0067-E0062-E0073-E0063-E0074-E007F", "j": ["flag"]}, "flag-wales": {"a": "flag: Wales", "b": "1F3F4-E0067-E0062-E0077-E006C-E0073-E007F", "j": ["flag"]}}, "aliases": {}}
\ No newline at end of file
+{"compressed": true, "categories": [{"id": "smileys_&_emotion", "name": "Smileys & Emotion", "emojis": ["grinning-face", "grinning-face-with-big-eyes", "grinning-face-with-smiling-eyes", "beaming-face-with-smiling-eyes", "grinning-squinting-face", "grinning-face-with-sweat", "rolling-on-the-floor-laughing", "face-with-tears-of-joy", "slightly-smiling-face", "upsidedown-face", "winking-face", "smiling-face-with-smiling-eyes", "smiling-face-with-halo", "smiling-face-with-hearts", "smiling-face-with-hearteyes", "starstruck", "face-blowing-a-kiss", "kissing-face", "smiling-face", "kissing-face-with-closed-eyes", "kissing-face-with-smiling-eyes", "smiling-face-with-tear", "face-savoring-food", "face-with-tongue", "winking-face-with-tongue", "zany-face", "squinting-face-with-tongue", "moneymouth-face", "hugging-face", "face-with-hand-over-mouth", "shushing-face", "thinking-face", "zippermouth-face", "face-with-raised-eyebrow", "neutral-face", "expressionless-face", "face-without-mouth", "face-in-clouds", "smirking-face", "unamused-face", "face-with-rolling-eyes", "grimacing-face", "face-exhaling", "lying-face", "relieved-face", "pensive-face", "sleepy-face", "drooling-face", "sleeping-face", "face-with-medical-mask", "face-with-thermometer", "face-with-headbandage", "nauseated-face", "face-vomiting", "sneezing-face", "hot-face", "cold-face", "woozy-face", "knockedout-face", "face-with-spiral-eyes", "exploding-head", "cowboy-hat-face", "partying-face", "disguised-face", "smiling-face-with-sunglasses", "nerd-face", "face-with-monocle", "confused-face", "worried-face", "slightly-frowning-face", "frowning-face", "face-with-open-mouth", "hushed-face", "astonished-face", "flushed-face", "pleading-face", "frowning-face-with-open-mouth", "anguished-face", "fearful-face", "anxious-face-with-sweat", "sad-but-relieved-face", "crying-face", "loudly-crying-face", "face-screaming-in-fear", "confounded-face", "persevering-face", "disappointed-face", "downcast-face-with-sweat", "weary-face", "tired-face", "yawning-face", "face-with-steam-from-nose", "pouting-face", "angry-face", "face-with-symbols-on-mouth", "smiling-face-with-horns", "angry-face-with-horns", "skull", "skull-and-crossbones", "pile-of-poo", "clown-face", "ogre", "goblin", "ghost", "alien", "alien-monster", "robot", "grinning-cat", "grinning-cat-with-smiling-eyes", "cat-with-tears-of-joy", "smiling-cat-with-hearteyes", "cat-with-wry-smile", "kissing-cat", "weary-cat", "crying-cat", "pouting-cat", "seenoevil-monkey", "hearnoevil-monkey", "speaknoevil-monkey", "kiss-mark", "love-letter", "heart-with-arrow", "heart-with-ribbon", "sparkling-heart", "growing-heart", "beating-heart", "revolving-hearts", "two-hearts", "heart-decoration", "heart-exclamation", "broken-heart", "heart-on-fire", "mending-heart", "red-heart", "orange-heart", "yellow-heart", "green-heart", "blue-heart", "purple-heart", "brown-heart", "black-heart", "white-heart", "hundred-points", "anger-symbol", "collision", "dizzy", "sweat-droplets", "dashing-away", "hole", "bomb", "speech-balloon", "eye-in-speech-bubble", "left-speech-bubble", "right-anger-bubble", "thought-balloon", "zzz"]}, {"id": "people_&_body", "name": "People & Body", "emojis": ["waving-hand", "raised-back-of-hand", "hand-with-fingers-splayed", "raised-hand", "vulcan-salute", "ok-hand", "pinched-fingers", "pinching-hand", "victory-hand", "crossed-fingers", "loveyou-gesture", "sign-of-the-horns", "call-me-hand", "backhand-index-pointing-left", "backhand-index-pointing-right", "backhand-index-pointing-up", "middle-finger", "backhand-index-pointing-down", "index-pointing-up", "thumbs-up", "thumbs-down", "raised-fist", "oncoming-fist", "leftfacing-fist", "rightfacing-fist", "clapping-hands", "raising-hands", "open-hands", "palms-up-together", "handshake", "folded-hands", "writing-hand", "nail-polish", "selfie", "flexed-biceps", "mechanical-arm", "mechanical-leg", "leg", "foot", "ear", "ear-with-hearing-aid", "nose", "brain", "anatomical-heart", "lungs", "tooth", "bone", "eyes", "eye", "tongue", "mouth", "baby", "child", "boy", "girl", "person", "person-blond-hair", "man", "person-beard", "man-beard", "woman-beard", "man-red-hair", "man-curly-hair", "man-white-hair", "man-bald", "woman", "woman-red-hair", "person-red-hair", "woman-curly-hair", "person-curly-hair", "woman-white-hair", "person-white-hair", "woman-bald", "person-bald", "woman-blond-hair", "man-blond-hair", "older-person", "old-man", "old-woman", "person-frowning", "man-frowning", "woman-frowning", "person-pouting", "man-pouting", "woman-pouting", "person-gesturing-no", "man-gesturing-no", "woman-gesturing-no", "person-gesturing-ok", "man-gesturing-ok", "woman-gesturing-ok", "person-tipping-hand", "man-tipping-hand", "woman-tipping-hand", "person-raising-hand", "man-raising-hand", "woman-raising-hand", "deaf-person", "deaf-man", "deaf-woman", "person-bowing", "man-bowing", "woman-bowing", "person-facepalming", "man-facepalming", "woman-facepalming", "person-shrugging", "man-shrugging", "woman-shrugging", "health-worker", "man-health-worker", "woman-health-worker", "student", "man-student", "woman-student", "teacher", "man-teacher", "woman-teacher", "judge", "man-judge", "woman-judge", "farmer", "man-farmer", "woman-farmer", "cook", "man-cook", "woman-cook", "mechanic", "man-mechanic", "woman-mechanic", "factory-worker", "man-factory-worker", "woman-factory-worker", "office-worker", "man-office-worker", "woman-office-worker", "scientist", "man-scientist", "woman-scientist", "technologist", "man-technologist", "woman-technologist", "singer", "man-singer", "woman-singer", "artist", "man-artist", "woman-artist", "pilot", "man-pilot", "woman-pilot", "astronaut", "man-astronaut", "woman-astronaut", "firefighter", "man-firefighter", "woman-firefighter", "police-officer", "man-police-officer", "woman-police-officer", "detective", "man-detective", "woman-detective", "guard", "man-guard", "woman-guard", "ninja", "construction-worker", "man-construction-worker", "woman-construction-worker", "prince", "princess", "person-wearing-turban", "man-wearing-turban", "woman-wearing-turban", "person-with-skullcap", "woman-with-headscarf", "person-in-tuxedo", "man-in-tuxedo", "woman-in-tuxedo", "person-with-veil", "man-with-veil", "woman-with-veil", "pregnant-woman", "breastfeeding", "woman-feeding-baby", "man-feeding-baby", "person-feeding-baby", "baby-angel", "santa-claus", "mrs-claus", "mx-claus", "superhero", "man-superhero", "woman-superhero", "supervillain", "man-supervillain", "woman-supervillain", "mage", "man-mage", "woman-mage", "fairy", "man-fairy", "woman-fairy", "vampire", "man-vampire", "woman-vampire", "merperson", "merman", "mermaid", "elf", "man-elf", "woman-elf", "genie", "man-genie", "woman-genie", "zombie", "man-zombie", "woman-zombie", "person-getting-massage", "man-getting-massage", "woman-getting-massage", "person-getting-haircut", "man-getting-haircut", "woman-getting-haircut", "person-walking", "man-walking", "woman-walking", "person-standing", "man-standing", "woman-standing", "person-kneeling", "man-kneeling", "woman-kneeling", "person-with-white-cane", "man-with-white-cane", "woman-with-white-cane", "person-in-motorized-wheelchair", "man-in-motorized-wheelchair", "woman-in-motorized-wheelchair", "person-in-manual-wheelchair", "man-in-manual-wheelchair", "woman-in-manual-wheelchair", "person-running", "man-running", "woman-running", "woman-dancing", "man-dancing", "person-in-suit-levitating", "people-with-bunny-ears", "men-with-bunny-ears", "women-with-bunny-ears", "person-in-steamy-room", "man-in-steamy-room", "woman-in-steamy-room", "person-climbing", "man-climbing", "woman-climbing", "person-fencing", "horse-racing", "skier", "snowboarder", "person-golfing", "man-golfing", "woman-golfing", "person-surfing", "man-surfing", "woman-surfing", "person-rowing-boat", "man-rowing-boat", "woman-rowing-boat", "person-swimming", "man-swimming", "woman-swimming", "person-bouncing-ball", "man-bouncing-ball", "woman-bouncing-ball", "person-lifting-weights", "man-lifting-weights", "woman-lifting-weights", "person-biking", "man-biking", "woman-biking", "person-mountain-biking", "man-mountain-biking", "woman-mountain-biking", "person-cartwheeling", "man-cartwheeling", "woman-cartwheeling", "people-wrestling", "men-wrestling", "women-wrestling", "person-playing-water-polo", "man-playing-water-polo", "woman-playing-water-polo", "person-playing-handball", "man-playing-handball", "woman-playing-handball", "person-juggling", "man-juggling", "woman-juggling", "person-in-lotus-position", "man-in-lotus-position", "woman-in-lotus-position", "person-taking-bath", "person-in-bed", "people-holding-hands", "women-holding-hands", "woman-and-man-holding-hands", "men-holding-hands", "kiss", "kiss-woman-man", "kiss-man-man", "kiss-woman-woman", "couple-with-heart", "couple-with-heart-woman-man", "couple-with-heart-man-man", "couple-with-heart-woman-woman", "family", "family-man-woman-boy", "family-man-woman-girl", "family-man-woman-girl-boy", "family-man-woman-boy-boy", "family-man-woman-girl-girl", "family-man-man-boy", "family-man-man-girl", "family-man-man-girl-boy", "family-man-man-boy-boy", "family-man-man-girl-girl", "family-woman-woman-boy", "family-woman-woman-girl", "family-woman-woman-girl-boy", "family-woman-woman-boy-boy", "family-woman-woman-girl-girl", "family-man-boy", "family-man-boy-boy", "family-man-girl", "family-man-girl-boy", "family-man-girl-girl", "family-woman-boy", "family-woman-boy-boy", "family-woman-girl", "family-woman-girl-boy", "family-woman-girl-girl", "speaking-head", "bust-in-silhouette", "busts-in-silhouette", "people-hugging", "footprints"]}, {"id": "animals_&_nature", "name": "Animals & Nature", "emojis": ["monkey-face", "monkey", "gorilla", "orangutan", "dog-face", "dog", "guide-dog", "service-dog", "poodle", "wolf", "fox", "raccoon", "cat-face", "cat", "black-cat", "lion", "tiger-face", "tiger", "leopard", "horse-face", "horse", "unicorn", "zebra", "deer", "bison", "cow-face", "ox", "water-buffalo", "cow", "pig-face", "pig", "boar", "pig-nose", "ram", "ewe", "goat", "camel", "twohump-camel", "llama", "giraffe", "elephant", "mammoth", "rhinoceros", "hippopotamus", "mouse-face", "mouse", "rat", "hamster", "rabbit-face", "rabbit", "chipmunk", "beaver", "hedgehog", "bat", "bear", "polar-bear", "koala", "panda", "sloth", "otter", "skunk", "kangaroo", "badger", "paw-prints", "turkey", "chicken", "rooster", "hatching-chick", "baby-chick", "frontfacing-baby-chick", "bird", "penguin", "dove", "eagle", "duck", "swan", "owl", "dodo", "feather", "flamingo", "peacock", "parrot", "frog", "crocodile", "turtle", "lizard", "snake", "dragon-face", "dragon", "sauropod", "trex", "spouting-whale", "whale", "dolphin", "seal", "fish", "tropical-fish", "blowfish", "shark", "octopus", "spiral-shell", "snail", "butterfly", "bug", "ant", "honeybee", "beetle", "lady-beetle", "cricket", "cockroach", "spider", "spider-web", "scorpion", "mosquito", "fly", "worm", "microbe", "bouquet", "cherry-blossom", "white-flower", "rosette", "rose", "wilted-flower", "hibiscus", "sunflower", "blossom", "tulip", "seedling", "potted-plant", "evergreen-tree", "deciduous-tree", "palm-tree", "cactus", "sheaf-of-rice", "herb", "shamrock", "four-leaf-clover", "maple-leaf", "fallen-leaf", "leaf-fluttering-in-wind"]}, {"id": "food_&_drink", "name": "Food & Drink", "emojis": ["grapes", "melon", "watermelon", "tangerine", "lemon", "banana", "pineapple", "mango", "red-apple", "green-apple", "pear", "peach", "cherries", "strawberry", "blueberries", "kiwi-fruit", "tomato", "olive", "coconut", "avocado", "eggplant", "potato", "carrot", "ear-of-corn", "hot-pepper", "bell-pepper", "cucumber", "leafy-green", "broccoli", "garlic", "onion", "mushroom", "peanuts", "chestnut", "bread", "croissant", "baguette-bread", "flatbread", "pretzel", "bagel", "pancakes", "waffle", "cheese-wedge", "meat-on-bone", "poultry-leg", "cut-of-meat", "bacon", "hamburger", "french-fries", "pizza", "hot-dog", "sandwich", "taco", "burrito", "tamale", "stuffed-flatbread", "falafel", "egg", "cooking", "shallow-pan-of-food", "pot-of-food", "fondue", "bowl-with-spoon", "green-salad", "popcorn", "butter", "salt", "canned-food", "bento-box", "rice-cracker", "rice-ball", "cooked-rice", "curry-rice", "steaming-bowl", "spaghetti", "roasted-sweet-potato", "oden", "sushi", "fried-shrimp", "fish-cake-with-swirl", "moon-cake", "dango", "dumpling", "fortune-cookie", "takeout-box", "crab", "lobster", "shrimp", "squid", "oyster", "soft-ice-cream", "shaved-ice", "ice-cream", "doughnut", "cookie", "birthday-cake", "shortcake", "cupcake", "pie", "chocolate-bar", "candy", "lollipop", "custard", "honey-pot", "baby-bottle", "glass-of-milk", "hot-beverage", "teapot", "teacup-without-handle", "sake", "bottle-with-popping-cork", "wine-glass", "cocktail-glass", "tropical-drink", "beer-mug", "clinking-beer-mugs", "clinking-glasses", "tumbler-glass", "cup-with-straw", "bubble-tea", "beverage-box", "mate", "ice", "chopsticks", "fork-and-knife-with-plate", "fork-and-knife", "spoon", "kitchen-knife", "amphora"]}, {"id": "travel_&_places", "name": "Travel & Places", "emojis": ["globe-showing-europeafrica", "globe-showing-americas", "globe-showing-asiaaustralia", "globe-with-meridians", "world-map", "map-of-japan", "compass", "snowcapped-mountain", "mountain", "volcano", "mount-fuji", "camping", "beach-with-umbrella", "desert", "desert-island", "national-park", "stadium", "classical-building", "building-construction", "brick", "rock", "wood", "hut", "houses", "derelict-house", "house", "house-with-garden", "office-building", "japanese-post-office", "post-office", "hospital", "bank", "hotel", "love-hotel", "convenience-store", "school", "department-store", "factory", "japanese-castle", "castle", "wedding", "tokyo-tower", "statue-of-liberty", "church", "mosque", "hindu-temple", "synagogue", "shinto-shrine", "kaaba", "fountain", "tent", "foggy", "night-with-stars", "cityscape", "sunrise-over-mountains", "sunrise", "cityscape-at-dusk", "sunset", "bridge-at-night", "hot-springs", "carousel-horse", "ferris-wheel", "roller-coaster", "barber-pole", "circus-tent", "locomotive", "railway-car", "highspeed-train", "bullet-train", "train", "metro", "light-rail", "station", "tram", "monorail", "mountain-railway", "tram-car", "bus", "oncoming-bus", "trolleybus", "minibus", "ambulance", "fire-engine", "police-car", "oncoming-police-car", "taxi", "oncoming-taxi", "automobile", "oncoming-automobile", "sport-utility-vehicle", "pickup-truck", "delivery-truck", "articulated-lorry", "tractor", "racing-car", "motorcycle", "motor-scooter", "manual-wheelchair", "motorized-wheelchair", "auto-rickshaw", "bicycle", "kick-scooter", "skateboard", "roller-skate", "bus-stop", "motorway", "railway-track", "oil-drum", "fuel-pump", "police-car-light", "horizontal-traffic-light", "vertical-traffic-light", "stop-sign", "construction", "anchor", "sailboat", "canoe", "speedboat", "passenger-ship", "ferry", "motor-boat", "ship", "airplane", "small-airplane", "airplane-departure", "airplane-arrival", "parachute", "seat", "helicopter", "suspension-railway", "mountain-cableway", "aerial-tramway", "satellite", "rocket", "flying-saucer", "bellhop-bell", "luggage", "hourglass-done", "hourglass-not-done", "watch", "alarm-clock", "stopwatch", "timer-clock", "mantelpiece-clock", "twelve-oclock", "twelvethirty", "one-oclock", "onethirty", "two-oclock", "twothirty", "three-oclock", "threethirty", "four-oclock", "fourthirty", "five-oclock", "fivethirty", "six-oclock", "sixthirty", "seven-oclock", "seventhirty", "eight-oclock", "eightthirty", "nine-oclock", "ninethirty", "ten-oclock", "tenthirty", "eleven-oclock", "eleventhirty", "new-moon", "waxing-crescent-moon", "first-quarter-moon", "waxing-gibbous-moon", "full-moon", "waning-gibbous-moon", "last-quarter-moon", "waning-crescent-moon", "crescent-moon", "new-moon-face", "first-quarter-moon-face", "last-quarter-moon-face", "thermometer", "sun", "full-moon-face", "sun-with-face", "ringed-planet", "star", "glowing-star", "shooting-star", "milky-way", "cloud", "sun-behind-cloud", "cloud-with-lightning-and-rain", "sun-behind-small-cloud", "sun-behind-large-cloud", "sun-behind-rain-cloud", "cloud-with-rain", "cloud-with-snow", "cloud-with-lightning", "tornado", "fog", "wind-face", "cyclone", "rainbow", "closed-umbrella", "umbrella", "umbrella-with-rain-drops", "umbrella-on-ground", "high-voltage", "snowflake", "snowman", "snowman-without-snow", "comet", "fire", "droplet", "water-wave"]}, {"id": "activities", "name": "Activities", "emojis": ["jackolantern", "christmas-tree", "fireworks", "sparkler", "firecracker", "sparkles", "balloon", "party-popper", "confetti-ball", "tanabata-tree", "pine-decoration", "japanese-dolls", "carp-streamer", "wind-chime", "moon-viewing-ceremony", "red-envelope", "ribbon", "wrapped-gift", "reminder-ribbon", "admission-tickets", "ticket", "military-medal", "trophy", "sports-medal", "1st-place-medal", "2nd-place-medal", "3rd-place-medal", "soccer-ball", "baseball", "softball", "basketball", "volleyball", "american-football", "rugby-football", "tennis", "flying-disc", "bowling", "cricket-game", "field-hockey", "ice-hockey", "lacrosse", "ping-pong", "badminton", "boxing-glove", "martial-arts-uniform", "goal-net", "flag-in-hole", "ice-skate", "fishing-pole", "diving-mask", "running-shirt", "skis", "sled", "curling-stone", "bullseye", "yoyo", "kite", "pool-8-ball", "crystal-ball", "magic-wand", "nazar-amulet", "video-game", "joystick", "slot-machine", "game-die", "puzzle-piece", "teddy-bear", "piata", "nesting-dolls", "spade-suit", "heart-suit", "diamond-suit", "club-suit", "chess-pawn", "joker", "mahjong-red-dragon", "flower-playing-cards", "performing-arts", "framed-picture", "artist-palette", "thread", "sewing-needle", "yarn", "knot"]}, {"id": "objects", "name": "Objects", "emojis": ["glasses", "sunglasses", "goggles", "lab-coat", "safety-vest", "necktie", "tshirt", "jeans", "scarf", "gloves", "coat", "socks", "dress", "kimono", "sari", "onepiece-swimsuit", "briefs", "shorts", "bikini", "womans-clothes", "purse", "handbag", "clutch-bag", "shopping-bags", "backpack", "thong-sandal", "mans-shoe", "running-shoe", "hiking-boot", "flat-shoe", "highheeled-shoe", "womans-sandal", "ballet-shoes", "womans-boot", "crown", "womans-hat", "top-hat", "graduation-cap", "billed-cap", "military-helmet", "rescue-workers-helmet", "prayer-beads", "lipstick", "ring", "gem-stone", "muted-speaker", "speaker-low-volume", "speaker-medium-volume", "speaker-high-volume", "loudspeaker", "megaphone", "postal-horn", "bell", "bell-with-slash", "musical-score", "musical-note", "musical-notes", "studio-microphone", "level-slider", "control-knobs", "microphone", "headphone", "radio", "saxophone", "accordion", "guitar", "musical-keyboard", "trumpet", "violin", "banjo", "drum", "long-drum", "mobile-phone", "mobile-phone-with-arrow", "telephone", "telephone-receiver", "pager", "fax-machine", "battery", "electric-plug", "laptop", "desktop-computer", "printer", "keyboard", "computer-mouse", "trackball", "computer-disk", "floppy-disk", "optical-disk", "dvd", "abacus", "movie-camera", "film-frames", "film-projector", "clapper-board", "television", "camera", "camera-with-flash", "video-camera", "videocassette", "magnifying-glass-tilted-left", "magnifying-glass-tilted-right", "candle", "light-bulb", "flashlight", "red-paper-lantern", "diya-lamp", "notebook-with-decorative-cover", "closed-book", "open-book", "green-book", "blue-book", "orange-book", "books", "notebook", "ledger", "page-with-curl", "scroll", "page-facing-up", "newspaper", "rolledup-newspaper", "bookmark-tabs", "bookmark", "label", "money-bag", "coin", "yen-banknote", "dollar-banknote", "euro-banknote", "pound-banknote", "money-with-wings", "credit-card", "receipt", "chart-increasing-with-yen", "envelope", "email", "incoming-envelope", "envelope-with-arrow", "outbox-tray", "inbox-tray", "package", "closed-mailbox-with-raised-flag", "closed-mailbox-with-lowered-flag", "open-mailbox-with-raised-flag", "open-mailbox-with-lowered-flag", "postbox", "ballot-box-with-ballot", "pencil", "black-nib", "fountain-pen", "pen", "paintbrush", "crayon", "memo", "briefcase", "file-folder", "open-file-folder", "card-index-dividers", "calendar", "tearoff-calendar", "spiral-notepad", "spiral-calendar", "card-index", "chart-increasing", "chart-decreasing", "bar-chart", "clipboard", "pushpin", "round-pushpin", "paperclip", "linked-paperclips", "straight-ruler", "triangular-ruler", "scissors", "card-file-box", "file-cabinet", "wastebasket", "locked", "unlocked", "locked-with-pen", "locked-with-key", "key", "old-key", "hammer", "axe", "pick", "hammer-and-pick", "hammer-and-wrench", "dagger", "crossed-swords", "water-pistol", "boomerang", "bow-and-arrow", "shield", "carpentry-saw", "wrench", "screwdriver", "nut-and-bolt", "gear", "clamp", "balance-scale", "white-cane", "link", "chains", "hook", "toolbox", "magnet", "ladder", "alembic", "test-tube", "petri-dish", "dna", "microscope", "telescope", "satellite-antenna", "syringe", "drop-of-blood", "pill", "adhesive-bandage", "stethoscope", "door", "elevator", "mirror", "window", "bed", "couch-and-lamp", "chair", "toilet", "plunger", "shower", "bathtub", "mouse-trap", "razor", "lotion-bottle", "safety-pin", "broom", "basket", "roll-of-paper", "bucket", "soap", "toothbrush", "sponge", "fire-extinguisher", "shopping-cart", "cigarette", "coffin", "headstone", "funeral-urn", "moai", "placard"]}, {"id": "symbols", "name": "Symbols", "emojis": ["atm-sign", "litter-in-bin-sign", "potable-water", "wheelchair-symbol", "mens-room", "womens-room", "restroom", "baby-symbol", "water-closet", "passport-control", "customs", "baggage-claim", "left-luggage", "warning", "children-crossing", "no-entry", "prohibited", "no-bicycles", "no-smoking", "no-littering", "nonpotable-water", "no-pedestrians", "no-mobile-phones", "no-one-under-eighteen", "radioactive", "biohazard", "up-arrow", "upright-arrow", "right-arrow", "downright-arrow", "down-arrow", "downleft-arrow", "left-arrow", "upleft-arrow", "updown-arrow", "leftright-arrow", "right-arrow-curving-left", "left-arrow-curving-right", "right-arrow-curving-up", "right-arrow-curving-down", "clockwise-vertical-arrows", "counterclockwise-arrows-button", "back-arrow", "end-arrow", "on-arrow", "soon-arrow", "top-arrow", "place-of-worship", "atom-symbol", "om", "star-of-david", "wheel-of-dharma", "yin-yang", "latin-cross", "orthodox-cross", "star-and-crescent", "peace-symbol", "menorah", "dotted-sixpointed-star", "aries", "taurus", "gemini", "cancer", "leo", "virgo", "libra", "scorpio", "sagittarius", "capricorn", "aquarius", "pisces", "ophiuchus", "shuffle-tracks-button", "repeat-button", "repeat-single-button", "play-button", "fastforward-button", "next-track-button", "play-or-pause-button", "reverse-button", "fast-reverse-button", "last-track-button", "upwards-button", "fast-up-button", "downwards-button", "fast-down-button", "pause-button", "stop-button", "record-button", "eject-button", "cinema", "dim-button", "bright-button", "antenna-bars", "vibration-mode", "mobile-phone-off", "female-sign", "male-sign", "transgender-symbol", "multiply", "plus", "minus", "divide", "infinity", "double-exclamation-mark", "exclamation-question-mark", "red-question-mark", "white-question-mark", "white-exclamation-mark", "red-exclamation-mark", "wavy-dash", "currency-exchange", "heavy-dollar-sign", "medical-symbol", "recycling-symbol", "fleurdelis", "trident-emblem", "name-badge", "japanese-symbol-for-beginner", "hollow-red-circle", "check-mark-button", "check-box-with-check", "check-mark", "cross-mark", "cross-mark-button", "curly-loop", "double-curly-loop", "part-alternation-mark", "eightspoked-asterisk", "eightpointed-star", "sparkle", "copyright", "registered", "trade-mark", "keycap", "keycap", "keycap-0", "keycap-1", "keycap-2", "keycap-3", "keycap-4", "keycap-5", "keycap-6", "keycap-7", "keycap-8", "keycap-9", "keycap-10", "input-latin-uppercase", "input-latin-lowercase", "input-numbers", "input-symbols", "input-latin-letters", "a-button-blood-type", "ab-button-blood-type", "b-button-blood-type", "cl-button", "cool-button", "free-button", "information", "id-button", "circled-m", "new-button", "ng-button", "o-button-blood-type", "ok-button", "p-button", "sos-button", "up-button", "vs-button", "japanese-here-button", "japanese-service-charge-button", "japanese-monthly-amount-button", "japanese-not-free-of-charge-button", "japanese-reserved-button", "japanese-bargain-button", "japanese-discount-button", "japanese-free-of-charge-button", "japanese-prohibited-button", "japanese-acceptable-button", "japanese-application-button", "japanese-passing-grade-button", "japanese-vacancy-button", "japanese-congratulations-button", "japanese-secret-button", "japanese-open-for-business-button", "japanese-no-vacancy-button", "red-circle", "orange-circle", "yellow-circle", "green-circle", "blue-circle", "purple-circle", "brown-circle", "black-circle", "white-circle", "red-square", "orange-square", "yellow-square", "green-square", "blue-square", "purple-square", "brown-square", "black-large-square", "white-large-square", "black-medium-square", "white-medium-square", "black-mediumsmall-square", "white-mediumsmall-square", "black-small-square", "white-small-square", "large-orange-diamond", "large-blue-diamond", "small-orange-diamond", "small-blue-diamond", "red-triangle-pointed-up", "red-triangle-pointed-down", "diamond-with-a-dot", "radio-button", "white-square-button", "black-square-button"]}, {"id": "flags", "name": "Flags", "emojis": ["chequered-flag", "triangular-flag", "crossed-flags", "black-flag", "white-flag", "rainbow-flag", "transgender-flag", "pirate-flag", "flag-ascension-island", "flag-andorra", "flag-united-arab-emirates", "flag-afghanistan", "flag-antigua--barbuda", "flag-anguilla", "flag-albania", "flag-armenia", "flag-angola", "flag-antarctica", "flag-argentina", "flag-american-samoa", "flag-austria", "flag-australia", "flag-aruba", "flag-land-islands", "flag-azerbaijan", "flag-bosnia--herzegovina", "flag-barbados", "flag-bangladesh", "flag-belgium", "flag-burkina-faso", "flag-bulgaria", "flag-bahrain", "flag-burundi", "flag-benin", "flag-st-barthlemy", "flag-bermuda", "flag-brunei", "flag-bolivia", "flag-caribbean-netherlands", "flag-brazil", "flag-bahamas", "flag-bhutan", "flag-bouvet-island", "flag-botswana", "flag-belarus", "flag-belize", "flag-canada", "flag-cocos-keeling-islands", "flag-congo--kinshasa", "flag-central-african-republic", "flag-congo--brazzaville", "flag-switzerland", "flag-cte-divoire", "flag-cook-islands", "flag-chile", "flag-cameroon", "flag-china", "flag-colombia", "flag-clipperton-island", "flag-costa-rica", "flag-cuba", "flag-cape-verde", "flag-curaao", "flag-christmas-island", "flag-cyprus", "flag-czechia", "flag-germany", "flag-diego-garcia", "flag-djibouti", "flag-denmark", "flag-dominica", "flag-dominican-republic", "flag-algeria", "flag-ceuta--melilla", "flag-ecuador", "flag-estonia", "flag-egypt", "flag-western-sahara", "flag-eritrea", "flag-spain", "flag-ethiopia", "flag-european-union", "flag-finland", "flag-fiji", "flag-falkland-islands", "flag-micronesia", "flag-faroe-islands", "flag-france", "flag-gabon", "flag-united-kingdom", "flag-grenada", "flag-georgia", "flag-french-guiana", "flag-guernsey", "flag-ghana", "flag-gibraltar", "flag-greenland", "flag-gambia", "flag-guinea", "flag-guadeloupe", "flag-equatorial-guinea", "flag-greece", "flag-south-georgia--south-sandwich-islands", "flag-guatemala", "flag-guam", "flag-guineabissau", "flag-guyana", "flag-hong-kong-sar-china", "flag-heard--mcdonald-islands", "flag-honduras", "flag-croatia", "flag-haiti", "flag-hungary", "flag-canary-islands", "flag-indonesia", "flag-ireland", "flag-israel", "flag-isle-of-man", "flag-india", "flag-british-indian-ocean-territory", "flag-iraq", "flag-iran", "flag-iceland", "flag-italy", "flag-jersey", "flag-jamaica", "flag-jordan", "flag-japan", "flag-kenya", "flag-kyrgyzstan", "flag-cambodia", "flag-kiribati", "flag-comoros", "flag-st-kitts--nevis", "flag-north-korea", "flag-south-korea", "flag-kuwait", "flag-cayman-islands", "flag-kazakhstan", "flag-laos", "flag-lebanon", "flag-st-lucia", "flag-liechtenstein", "flag-sri-lanka", "flag-liberia", "flag-lesotho", "flag-lithuania", "flag-luxembourg", "flag-latvia", "flag-libya", "flag-morocco", "flag-monaco", "flag-moldova", "flag-montenegro", "flag-st-martin", "flag-madagascar", "flag-marshall-islands", "flag-north-macedonia", "flag-mali", "flag-myanmar-burma", "flag-mongolia", "flag-macao-sar-china", "flag-northern-mariana-islands", "flag-martinique", "flag-mauritania", "flag-montserrat", "flag-malta", "flag-mauritius", "flag-maldives", "flag-malawi", "flag-mexico", "flag-malaysia", "flag-mozambique", "flag-namibia", "flag-new-caledonia", "flag-niger", "flag-norfolk-island", "flag-nigeria", "flag-nicaragua", "flag-netherlands", "flag-norway", "flag-nepal", "flag-nauru", "flag-niue", "flag-new-zealand", "flag-oman", "flag-panama", "flag-peru", "flag-french-polynesia", "flag-papua-new-guinea", "flag-philippines", "flag-pakistan", "flag-poland", "flag-st-pierre--miquelon", "flag-pitcairn-islands", "flag-puerto-rico", "flag-palestinian-territories", "flag-portugal", "flag-palau", "flag-paraguay", "flag-qatar", "flag-runion", "flag-romania", "flag-serbia", "flag-russia", "flag-rwanda", "flag-saudi-arabia", "flag-solomon-islands", "flag-seychelles", "flag-sudan", "flag-sweden", "flag-singapore", "flag-st-helena", "flag-slovenia", "flag-svalbard--jan-mayen", "flag-slovakia", "flag-sierra-leone", "flag-san-marino", "flag-senegal", "flag-somalia", "flag-suriname", "flag-south-sudan", "flag-so-tom--prncipe", "flag-el-salvador", "flag-sint-maarten", "flag-syria", "flag-eswatini", "flag-tristan-da-cunha", "flag-turks--caicos-islands", "flag-chad", "flag-french-southern-territories", "flag-togo", "flag-thailand", "flag-tajikistan", "flag-tokelau", "flag-timorleste", "flag-turkmenistan", "flag-tunisia", "flag-tonga", "flag-turkey", "flag-trinidad--tobago", "flag-tuvalu", "flag-taiwan", "flag-tanzania", "flag-ukraine", "flag-uganda", "flag-us-outlying-islands", "flag-united-nations", "flag-united-states", "flag-uruguay", "flag-uzbekistan", "flag-vatican-city", "flag-st-vincent--grenadines", "flag-venezuela", "flag-british-virgin-islands", "flag-us-virgin-islands", "flag-vietnam", "flag-vanuatu", "flag-wallis--futuna", "flag-samoa", "flag-kosovo", "flag-yemen", "flag-mayotte", "flag-south-africa", "flag-zambia", "flag-zimbabwe", "flag-england", "flag-scotland", "flag-wales"]}], "emojis": {"grinning-face": {"a": "grinning face", "b": "1F600", "j": ["grin", "joy", ":D", "face", "smile", "happy"]}, "grinning-face-with-big-eyes": {"a": "grinning face with big eyes", "b": "1F603", "j": ["joy", ":)", ":D", "open", "face", "smile", "mouth", "haha", "happy", "funny"]}, "grinning-face-with-smiling-eyes": {"a": "grinning face with smiling eyes", "b": "1F604", "j": ["like", "joy", ":)", ":D", "open", "face", "smile", "eye", "mouth", "haha", "laugh", "happy", "funny"]}, "beaming-face-with-smiling-eyes": {"a": "beaming face with smiling eyes", "b": "1F601", "j": ["grin", "joy", "face", "smile", "eye", "kawaii", "happy"]}, "grinning-squinting-face": {"a": "grinning squinting face", "b": "1F606", "j": ["joy", "XD", "face", "smile", "satisfied", "mouth", "laugh", "haha", "happy", "lol", "glad"]}, "grinning-face-with-sweat": {"a": "grinning face with sweat", "b": "1F605", "j": ["sweat", "relief", "hot", "cold", "open", "face", "smile", "laugh", "happy"]}, "rolling-on-the-floor-laughing": {"a": "rolling on the floor laughing", "b": "1F923", "j": ["lol", "rolling", "rotfl", "laughing", "face", "laugh", "haha", "floor", "rofl"]}, "face-with-tears-of-joy": {"a": "face with tears of joy", "b": "1F602", "j": ["cry", "tears", "joy", "weep", "face", "laugh", "haha", "happy", "happytears", "tear"]}, "slightly-smiling-face": {"a": "slightly smiling face", "b": "1F642", "j": ["smile", "face"]}, "upsidedown-face": {"a": "upside-down face", "b": "1F643", "j": ["face", "smile", "upside_down_face", "silly", "upside-down", "flipped"]}, "winking-face": {"a": "winking face", "b": "1F609", "j": [";)", "secret", "mischievous", "face", "smile", "eye", "happy", "wink"]}, "smiling-face-with-smiling-eyes": {"a": "smiling face with smiling eyes", "b": "1F60A", "j": ["embarrassed", "joy", "flushed", "blush", "face", "smile", "eye", "happy", "shy", "crush"]}, "smiling-face-with-halo": {"a": "smiling face with halo", "b": "1F607", "j": ["heaven", "innocent", "face", "fantasy", "angel", "halo"]}, "smiling-face-with-hearts": {"a": "smiling face with hearts", "b": "1F970", "j": ["love", "like", "infatuation", "face", "valentines", "hearts", "in love", "adore", "affection", "crush"]}, "smiling-face-with-hearteyes": {"a": "smiling face with heart-eyes", "b": "1F60D", "j": ["love", "like", "heart", "infatuation", "face", "smile", "eye", "valentines", "affection", "smiling_face_with_heart_eyes", "crush"]}, "starstruck": {"a": "star-struck", "b": "1F929", "j": ["grinning", "star", "face", "star_struck", "starry", "smile", "starry-eyed", "eyes"]}, "face-blowing-a-kiss": {"a": "face blowing a kiss", "b": "1F618", "j": ["love", "like", "infatuation", "face", "valentines", "affection", "kiss"]}, "kissing-face": {"a": "kissing face", "b": "1F617", "j": ["love", "like", "infatuation", "3", "face", "valentines", "kiss"]}, "smiling-face": {"a": "smiling face", "b": "263A", "j": ["relaxed", "happiness", "massage", "blush", "face", "outlined", "smile"]}, "kissing-face-with-closed-eyes": {"a": "kissing face with closed eyes", "b": "1F61A", "j": ["love", "like", "infatuation", "face", "eye", "valentines", "closed", "affection", "kiss"]}, "kissing-face-with-smiling-eyes": {"a": "kissing face with smiling eyes", "b": "1F619", "j": ["infatuation", "face", "smile", "valentines", "eye", "affection", "kiss"]}, "smiling-face-with-tear": {"a": "smiling face with tear", "b": "1F972", "j": ["grateful", "relieved", "proud", "pretend", "touched", "smiling", "cry", "sad", "tear"]}, "face-savoring-food": {"a": "face savoring food", "b": "1F60B", "j": ["tongue", "joy", "yummy", "silly", "face", "savouring", "smile", "happy", "nom", "delicious", "yum"]}, "face-with-tongue": {"a": "face with tongue", "b": "1F61B", "j": ["tongue", "mischievous", "playful", "face", "smile", "prank", "childish"]}, "winking-face-with-tongue": {"a": "winking face with tongue", "b": "1F61C", "j": ["tongue", "playful", "mischievous", "face", "smile", "eye", "joke", "wink", "prank", "childish"]}, "zany-face": {"a": "zany face", "b": "1F92A", "j": ["large", "crazy", "face", "goofy", "eye", "small"]}, "squinting-face-with-tongue": {"a": "squinting face with tongue", "b": "1F61D", "j": ["tongue", "playful", "mischievous", "taste", "face", "horrible", "eye", "smile", "prank"]}, "moneymouth-face": {"a": "money-mouth face", "b": "1F911", "j": ["rich", "face", "dollar", "mouth", "money_mouth_face", "money"]}, "hugging-face": {"a": "hugging face", "b": "1F917", "j": ["smile", "hugging", "face", "hug"]}, "face-with-hand-over-mouth": {"a": "face with hand over mouth", "b": "1F92D", "j": ["whoops", "face", "sudden realization", "shock", "surprise"]}, "shushing-face": {"a": "shushing face", "b": "1F92B", "j": ["quiet", "shush", "face", "shhh"]}, "thinking-face": {"a": "thinking face", "b": "1F914", "j": ["think", "consider", "hmmm", "thinking", "face"]}, "zippermouth-face": {"a": "zipper-mouth face", "b": "1F910", "j": ["secret", "zipper_mouth_face", "face", "sealed", "mouth", "zipper"]}, "face-with-raised-eyebrow": {"a": "face with raised eyebrow", "b": "1F928", "j": ["disbelief", "skeptic", "disapproval", "face", "mild surprise", "scepticism", "distrust", "surprise"]}, "neutral-face": {"a": "neutral face", "b": "1F610", "j": ["deadpan", "neutral", "face", "meh", "indifference", ":|"]}, "expressionless-face": {"a": "expressionless face", "b": "1F611", "j": ["inexpressive", "indifferent", "deadpan", "-_-", "face", "meh", "expressionless", "unexpressive"]}, "face-without-mouth": {"a": "face without mouth", "b": "1F636", "j": ["hellokitty", "face", "quiet", "mouth", "silent"]}, "face-in-clouds": {"a": "⊛ face in clouds", "b": "1F636-200D-1F32B-FE0F", "j": ["absentminded", "face in clouds", "face in the fog", "head in clouds"]}, "smirking-face": {"a": "smirking face", "b": "1F60F", "j": ["smug", "face", "smile", "sarcasm", "mean", "prank", "smirk"]}, "unamused-face": {"a": "unamused face", "b": "1F612", "j": ["side_eye", "bored", "unamused", "unhappy", "straight face", "face", "skeptical", "dubious", "sarcasm", "indifference", "serious", "unimpressed"]}, "face-with-rolling-eyes": {"a": "face with rolling eyes", "b": "1F644", "j": ["rolling", "frustrated", "face", "eyeroll", "eyes"]}, "grimacing-face": {"a": "grimacing face", "b": "1F62C", "j": ["grimace", "teeth", "face"]}, "face-exhaling": {"a": "⊛ face exhaling", "b": "1F62E-200D-1F4A8", "j": ["exhale", "face exhaling", "gasp", "groan", "relief", "whisper", "whistle"]}, "lying-face": {"a": "lying face", "b": "1F925", "j": ["pinocchio", "face", "lie"]}, "relieved-face": {"a": "relieved face", "b": "1F60C", "j": ["relaxed", "massage", "happiness", "relieved", "phew", "face"]}, "pensive-face": {"a": "pensive face", "b": "1F614", "j": ["depressed", "upset", "pensive", "face", "sad", "dejected"]}, "sleepy-face": {"a": "sleepy face", "b": "1F62A", "j": ["sleep", "tired", "face", "nap", "rest"]}, "drooling-face": {"a": "drooling face", "b": "1F924", "j": ["face", "drooling"]}, "sleeping-face": {"a": "sleeping face", "b": "1F634", "j": ["night", "sleep", "tired", "zzz", "face", "sleepy"]}, "face-with-medical-mask": {"a": "face with medical mask", "b": "1F637", "j": ["ill", "mask", "cold", "face", "doctor", "disease", "sick"]}, "face-with-thermometer": {"a": "face with thermometer", "b": "1F912", "j": ["ill", "thermometer", "fever", "cold", "face", "temperature", "sick"]}, "face-with-headbandage": {"a": "face with head-bandage", "b": "1F915", "j": ["face_with_head_bandage", "face", "injury", "clumsy", "hurt", "injured", "bandage"]}, "nauseated-face": {"a": "nauseated face", "b": "1F922", "j": ["ill", "throw up", "gross", "face", "green", "sick", "vomit", "nauseated"]}, "face-vomiting": {"a": "face vomiting", "b": "1F92E", "j": ["sick", "vomit", "face", "puke"]}, "sneezing-face": {"a": "sneezing face", "b": "1F927", "j": ["gesundheit", "face", "sick", "sneeze", "allergy"]}, "hot-face": {"a": "hot face", "b": "1F975", "j": ["sweating", "heat", "hot", "red-faced", "feverish", "face", "red", "heat stroke"]}, "cold-face": {"a": "cold face", "b": "1F976", "j": ["blue", "blue-faced", "frostbite", "freezing", "cold", "face", "icicles", "frozen"]}, "woozy-face": {"a": "woozy face", "b": "1F974", "j": ["face", "intoxicated", "dizzy", "wavy mouth", "tipsy", "uneven eyes", "wavy"]}, "knockedout-face": {"a": "knocked-out face", "b": "1F635", "j": ["knocked out", "dizzy_face", "unconscious", "face", "spent", "dizzy", "dead", "xox"]}, "face-with-spiral-eyes": {"a": "⊛ face with spiral eyes", "b": "1F635-200D-1F4AB", "j": ["dizzy", "face with spiral eyes", "hypnotized", "spiral", "trouble", "whoa"]}, "exploding-head": {"a": "exploding head", "b": "1F92F", "j": ["face", "shocked", "mind blown", "blown", "mind"]}, "cowboy-hat-face": {"a": "cowboy hat face", "b": "1F920", "j": ["hat", "cowboy", "face", "cowgirl"]}, "partying-face": {"a": "partying face", "b": "1F973", "j": ["face", "hat", "celebration", "horn", "party", "woohoo"]}, "disguised-face": {"a": "disguised face", "b": "1F978", "j": ["moustache", "glasses", "face", "brows", "disguise", "pretent", "nose", "incognito"]}, "smiling-face-with-sunglasses": {"a": "smiling face with sunglasses", "b": "1F60E", "j": ["sun", "cool", "sunglasses", "bright", "face", "sunglass", "smile", "summer", "beach"]}, "nerd-face": {"a": "nerd face", "b": "1F913", "j": ["nerdy", "geek", "nerd", "face", "dork"]}, "face-with-monocle": {"a": "face with monocle", "b": "1F9D0", "j": ["wealthy", "face", "stuffy"]}, "confused-face": {"a": "confused face", "b": "1F615", "j": ["hmmm", "face", "huh", "meh", "weird", "indifference", "confused", ":/"]}, "worried-face": {"a": "worried face", "b": "1F61F", "j": ["nervous", ":(", "face", "concern", "worried"]}, "slightly-frowning-face": {"a": "slightly frowning face", "b": "1F641", "j": ["frowning", "upset", "disappointed", "frown", "face", "sad"]}, "frowning-face": {"a": "frowning face", "b": "2639", "j": ["frown", "upset", "sad", "face"]}, "face-with-open-mouth": {"a": "face with open mouth", "b": "1F62E", "j": [":O", "open", "face", "wow", "impressed", "mouth", "whoa", "sympathy", "surprise"]}, "hushed-face": {"a": "hushed face", "b": "1F62F", "j": ["shh", "stunned", "face", "hushed", "surprised", "woo"]}, "astonished-face": {"a": "astonished face", "b": "1F632", "j": ["face", "shocked", "surprised", "astonished", "totally", "poisoned", "xox"]}, "flushed-face": {"a": "flushed face", "b": "1F633", "j": ["flattered", "blush", "face", "dazed", "flushed", "shy"]}, "pleading-face": {"a": "pleading face", "b": "1F97A", "j": ["puppy eyes", "begging", "face", "mercy"]}, "frowning-face-with-open-mouth": {"a": "frowning face with open mouth", "b": "1F626", "j": ["frown", "open", "face", "mouth", "what", "aw"]}, "anguished-face": {"a": "anguished face", "b": "1F627", "j": ["stunned", "nervous", "face", "anguished"]}, "fearful-face": {"a": "fearful face", "b": "1F628", "j": ["oops", "nervous", "face", "scared", "huh", "fear", "terrified", "fearful"]}, "anxious-face-with-sweat": {"a": "anxious face with sweat", "b": "1F630", "j": ["blue", "sweat", "nervous", "cold", "face", "rushed"]}, "sad-but-relieved-face": {"a": "sad but relieved face", "b": "1F625", "j": ["disappointed", "nervous", "sweat", "relieved", "whew", "phew", "face"]}, "crying-face": {"a": "crying face", "b": "1F622", "j": ["depressed", "upset", "tears", "face", ":'(", "cry", "sad", "tear"]}, "loudly-crying-face": {"a": "loudly crying face", "b": "1F62D", "j": ["depressed", "upset", "tears", "face", "cry", "sad", "tear", "sob"]}, "face-screaming-in-fear": {"a": "face screaming in fear", "b": "1F631", "j": ["munch", "face", "omg", "scared", "scream", "fear"]}, "confounded-face": {"a": "confounded face", "b": "1F616", "j": ["confounded", "oops", ":S", "sick", "unwell", "face", "confused"]}, "persevering-face": {"a": "persevering face", "b": "1F623", "j": ["oops", "upset", "persevere", "no", "face", "sick"]}, "disappointed-face": {"a": "disappointed face", "b": "1F61E", "j": ["depressed", "upset", "disappointed", ":(", "face", "sad"]}, "downcast-face-with-sweat": {"a": "downcast face with sweat", "b": "1F613", "j": ["sweat", "tired", "hot", "cold", "face", "exercise", "sad"]}, "weary-face": {"a": "weary face", "b": "1F629", "j": ["upset", "tired", "frustrated", "face", "sleepy", "sad", "weary"]}, "tired-face": {"a": "tired face", "b": "1F62B", "j": ["upset", "whine", "tired", "frustrated", "face", "sick"]}, "yawning-face": {"a": "yawning face", "b": "1F971", "j": ["", "bored", "tired", "yawn", "sleepy"]}, "face-with-steam-from-nose": {"a": "face with steam from nose", "b": "1F624", "j": ["triumph", "gas", "pride", "phew", "face", "proud", "won"]}, "pouting-face": {"a": "pouting face", "b": "1F621", "j": ["pouting", "rage", "despise", "hate", "face", "red", "angry", "mad"]}, "angry-face": {"a": "angry face", "b": "1F620", "j": ["annoyed", "anger", "frustrated", "face", "angry", "mad"]}, "face-with-symbols-on-mouth": {"a": "face with symbols on mouth", "b": "1F92C", "j": ["cursing", "swearing", "face", "expletive", "cussing", "profanity"]}, "smiling-face-with-horns": {"a": "smiling face with horns", "b": "1F608", "j": ["face", "fairy tale", "smile", "fantasy", "devil", "horns"]}, "angry-face-with-horns": {"a": "angry face with horns", "b": "1F47F", "j": ["face", "devil", "fantasy", "demon", "imp", "horns", "angry"]}, "skull": {"a": "skull", "b": "1F480", "j": ["death", "skeleton", "face", "creepy", "fairy tale", "dead", "monster"]}, "skull-and-crossbones": {"a": "skull and crossbones", "b": "2620", "j": ["danger", "death", "pirate", "skull", "scary", "face", "poison", "evil", "crossbones", "deadly", "monster"]}, "pile-of-poo": {"a": "pile of poo", "b": "1F4A9", "j": ["dung", "poop", "hankey", "face", "shitface", "fail", "turd", "shit", "poo", "monster"]}, "clown-face": {"a": "clown face", "b": "1F921", "j": ["clown", "face"]}, "ogre": {"a": "ogre", "b": "1F479", "j": ["mask", "scary", "japanese", "face", "creepy", "fairy tale", "halloween", "red", "fantasy", "creature", "troll", "devil", "demon", "monster"]}, "goblin": {"a": "goblin", "b": "1F47A", "j": ["mask", "scary", "japanese", "face", "creepy", "fairy tale", "red", "fantasy", "creature", "evil", "monster"]}, "ghost": {"a": "ghost", "b": "1F47B", "j": ["scary", "face", "fairy tale", "halloween", "spooky", "fantasy", "creature", "monster"]}, "alien": {"a": "alien", "b": "1F47D", "j": ["extraterrestrial", "paul", "face", "fantasy", "creature", "ufo", "weird", "outer_space", "UFO"]}, "alien-monster": {"a": "alien monster", "b": "1F47E", "j": ["extraterrestrial", "play", "face", "alien", "game", "creature", "ufo", "arcade", "monster"]}, "robot": {"a": "robot", "b": "1F916", "j": ["computer", "face", "bot", "machine", "monster"]}, "grinning-cat": {"a": "grinning cat", "b": "1F63A", "j": ["grinning", "cats", "open", "face", "smile", "mouth", "happy", "cat", "animal"]}, "grinning-cat-with-smiling-eyes": {"a": "grinning cat with smiling eyes", "b": "1F638", "j": ["animal", "cats", "grin", "face", "smile", "eye", "cat"]}, "cat-with-tears-of-joy": {"a": "cat with tears of joy", "b": "1F639", "j": ["animal", "tears", "cats", "joy", "face", "haha", "happy", "cat", "tear"]}, "smiling-cat-with-hearteyes": {"a": "smiling cat with heart-eyes", "b": "1F63B", "j": ["animal", "love", "like", "cats", "heart", "face", "smile", "eye", "smiling_cat_with_heart_eyes", "valentines", "affection", "cat"]}, "cat-with-wry-smile": {"a": "cat with wry smile", "b": "1F63C", "j": ["animal", "ironic", "cats", "face", "smile", "wry", "cat", "smirk"]}, "kissing-cat": {"a": "kissing cat", "b": "1F63D", "j": ["animal", "cats", "face", "eye", "kiss", "cat"]}, "weary-cat": {"a": "weary cat", "b": "1F640", "j": ["cats", "weary", "munch", "face", "oh", "surprised", "scared", "scream", "cat", "animal"]}, "crying-cat": {"a": "crying cat", "b": "1F63F", "j": ["upset", "animal", "tears", "cats", "weep", "face", "cry", "sad", "cat", "tear"]}, "pouting-cat": {"a": "pouting cat", "b": "1F63E", "j": ["pouting", "cats", "face", "cat", "animal"]}, "seenoevil-monkey": {"a": "see-no-evil monkey", "b": "1F648", "j": ["monkey", "forbidden", "face", "nature", "haha", "evil", "see", "animal", "see_no_evil_monkey"]}, "hearnoevil-monkey": {"a": "hear-no-evil monkey", "b": "1F649", "j": ["monkey", "forbidden", "animal", "hear_no_evil_monkey", "face", "nature", "evil", "hear"]}, "speaknoevil-monkey": {"a": "speak-no-evil monkey", "b": "1F64A", "j": ["monkey", "forbidden", "face", "speak_no_evil_monkey", "nature", "speak", "omg", "evil", "animal"]}, "kiss-mark": {"a": "kiss mark", "b": "1F48B", "j": ["love", "like", "face", "lips", "valentines", "affection", "kiss"]}, "love-letter": {"a": "love letter", "b": "1F48C", "j": ["envelope", "love", "like", "letter", "heart", "email", "valentines", "mail", "affection"]}, "heart-with-arrow": {"a": "heart with arrow", "b": "1F498", "j": ["arrow", "love", "like", "heart", "cupid", "valentines", "affection"]}, "heart-with-ribbon": {"a": "heart with ribbon", "b": "1F49D", "j": ["valentines", "valentine", "love", "ribbon"]}, "sparkling-heart": {"a": "sparkling heart", "b": "1F496", "j": ["love", "like", "excited", "valentines", "sparkle", "affection"]}, "growing-heart": {"a": "growing heart", "b": "1F497", "j": ["pulse", "nervous", "like", "love", "excited", "pink", "valentines", "growing", "affection"]}, "beating-heart": {"a": "beating heart", "b": "1F493", "j": ["love", "like", "heart", "beating", "pink", "heartbeat", "valentines", "pulsating", "affection"]}, "revolving-hearts": {"a": "revolving hearts", "b": "1F49E", "j": ["revolving", "like", "love", "valentines", "affection"]}, "two-hearts": {"a": "two hearts", "b": "1F495", "j": ["love", "like", "heart", "valentines", "affection"]}, "heart-decoration": {"a": "heart decoration", "b": "1F49F", "j": ["heart", "love", "like", "purple-square"]}, "heart-exclamation": {"a": "heart exclamation", "b": "2763", "j": ["punctuation", "love", "mark", "decoration", "exclamation"]}, "broken-heart": {"a": "broken heart", "b": "1F494", "j": ["heartbreak", "heart", "broken", "sorry", "break", "sad"]}, "heart-on-fire": {"a": "⊛ heart on fire", "b": "2764-FE0F-200D-1F525", "j": ["burn", "heart", "heart on fire", "love", "lust", "sacred heart"]}, "mending-heart": {"a": "⊛ mending heart", "b": "2764-FE0F-200D-1FA79", "j": ["healthier", "improving", "mending", "mending heart", "recovering", "recuperating", "well"]}, "red-heart": {"a": "red heart", "b": "2764", "j": ["heart", "valentines", "love", "like"]}, "orange-heart": {"a": "orange heart", "b": "1F9E1", "j": ["like", "love", "orange", "valentines", "affection"]}, "yellow-heart": {"a": "yellow heart", "b": "1F49B", "j": ["love", "like", "valentines", "yellow", "affection"]}, "green-heart": {"a": "green heart", "b": "1F49A", "j": ["love", "like", "valentines", "green", "affection"]}, "blue-heart": {"a": "blue heart", "b": "1F499", "j": ["blue", "like", "love", "valentines", "affection"]}, "purple-heart": {"a": "purple heart", "b": "1F49C", "j": ["love", "like", "valentines", "affection", "purple"]}, "brown-heart": {"a": "brown heart", "b": "1F90E", "j": ["heart", "brown", "coffee"]}, "black-heart": {"a": "black heart", "b": "1F5A4", "j": ["wicked", "black", "evil"]}, "white-heart": {"a": "white heart", "b": "1F90D", "j": ["heart", "white", "pure"]}, "hundred-points": {"a": "hundred points", "b": "1F4AF", "j": ["test", "full", "score", "quiz", "numbers", "hundred", "100", "perfect", "pass", "century", "exam"]}, "anger-symbol": {"a": "anger symbol", "b": "1F4A2", "j": ["comic", "mad", "angry"]}, "collision": {"a": "collision", "b": "1F4A5", "j": ["boom", "explode", "explosion", "comic", "bomb", "blown"]}, "dizzy": {"a": "dizzy", "b": "1F4AB", "j": ["magic", "star", "comic", "sparkle", "shoot"]}, "sweat-droplets": {"a": "sweat droplets", "b": "1F4A6", "j": ["oops", "sweat", "drip", "water", "comic", "splashing"]}, "dashing-away": {"a": "dashing away", "b": "1F4A8", "j": ["smoke", "fart", "dash", "puff", "air", "fast", "comic", "running", "shoo", "wind"]}, "hole": {"a": "hole", "b": "1F573", "j": ["embarrassing"]}, "bomb": {"a": "bomb", "b": "1F4A3", "j": ["boom", "explode", "explosion", "comic", "terrorism"]}, "speech-balloon": {"a": "speech balloon", "b": "1F4AC", "j": ["bubble", "balloon", "words", "message", "talk", "chatting", "comic", "speech", "dialog"]}, "eye-in-speech-bubble": {"a": "eye in speech bubble", "b": "1F441-FE0F-200D-1F5E8-FE0F", "j": ["info", "witness", "speech bubble", "eye"]}, "left-speech-bubble": {"a": "left speech bubble", "b": "1F5E8", "j": ["message", "talk", "words", "chatting", "speech", "dialog"]}, "right-anger-bubble": {"a": "right anger bubble", "b": "1F5EF", "j": ["bubble", "balloon", "thinking", "caption", "speech", "angry", "mad"]}, "thought-balloon": {"a": "thought balloon", "b": "1F4AD", "j": ["bubble", "dream", "balloon", "thinking", "comic", "cloud", "speech", "thought"]}, "zzz": {"a": "zzz", "b": "1F4A4", "j": ["sleep", "dream", "tired", "comic", "sleepy"]}, "waving-hand": {"a": "waving hand", "b": "1F44B", "j": ["waving", "wave", "farewell", "solong", "gesture", "hand", "hands", "hello", "goodbye", "hi", "palm"]}, "raised-back-of-hand": {"a": "raised back of hand", "b": "1F91A", "j": ["backhand", "fingers", "raised"]}, "hand-with-fingers-splayed": {"a": "hand with fingers splayed", "b": "1F590", "j": ["finger", "fingers", "hand", "splayed", "palm"]}, "raised-hand": {"a": "raised hand", "b": "270B", "j": ["fingers", "stop", "hand", "high 5", "high five", "ban", "palm", "highfive"]}, "vulcan-salute": {"a": "vulcan salute", "b": "1F596", "j": ["finger", "fingers", "hand", "vulcan", "star trek", "spock"]}, "ok-hand": {"a": "OK hand", "b": "1F44C", "j": ["OK", "limbs", "fingers", "hand", "okay", "perfect", "ok"]}, "pinched-fingers": {"a": "pinched fingers", "b": "1F90C", "j": ["pinched", "fingers", "hand gesture", "size", "tiny", "sarcastic", "small", "interrogation"]}, "pinching-hand": {"a": "pinching hand", "b": "1F90F", "j": ["small amount", "size", "small", "tiny"]}, "victory-hand": {"a": "victory hand", "b": "270C", "j": ["victory", "fingers", "hand", "ohyeah", "two", "v", "peace"]}, "crossed-fingers": {"a": "crossed fingers", "b": "1F91E", "j": ["cross", "finger", "lucky", "good", "hand", "luck"]}, "loveyou-gesture": {"a": "love-you gesture", "b": "1F91F", "j": ["ILY", "fingers", "gesture", "hand", "love_you_gesture"]}, "sign-of-the-horns": {"a": "sign of the horns", "b": "1F918", "j": ["finger", "rock_on", "fingers", "rock-on", "hand", "sign_of_horns", "horns", "evil_eye"]}, "call-me-hand": {"a": "call me hand", "b": "1F919", "j": ["gesture", "hand", "call", "hands"]}, "backhand-index-pointing-left": {"a": "backhand index pointing left", "b": "1F448", "j": ["finger", "fingers", "point", "hand", "left", "backhand", "direction", "index"]}, "backhand-index-pointing-right": {"a": "backhand index pointing right", "b": "1F449", "j": ["finger", "right", "fingers", "point", "hand", "backhand", "direction", "index"]}, "backhand-index-pointing-up": {"a": "backhand index pointing up", "b": "1F446", "j": ["finger", "fingers", "point", "hand", "backhand", "direction", "up"]}, "middle-finger": {"a": "middle finger", "b": "1F595", "j": ["flipping", "finger", "middle", "fingers", "hand", "rude"]}, "backhand-index-pointing-down": {"a": "backhand index pointing down", "b": "1F447", "j": ["finger", "fingers", "point", "down", "hand", "backhand", "direction"]}, "index-pointing-up": {"a": "index pointing up", "b": "261D", "j": ["finger", "fingers", "point", "hand", "direction", "up", "index"]}, "thumbs-up": {"a": "thumbs up", "b": "1F44D", "j": ["+1", "yes", "awesome", "like", "cool", "thumb", "thumbsup", "hand", "good", "agree", "accept", "up"]}, "thumbs-down": {"a": "thumbs down", "b": "1F44E", "j": ["-1", "no", "thumb", "down", "hand", "dislike", "thumbsdown"]}, "raised-fist": {"a": "raised fist", "b": "270A", "j": ["fingers", "clenched", "fist", "hand", "grasp", "punch"]}, "oncoming-fist": {"a": "oncoming fist", "b": "1F44A", "j": ["violence", "clenched", "fist", "hit", "hand", "attack", "punch", "angry"]}, "leftfacing-fist": {"a": "left-facing fist", "b": "1F91B", "j": ["left_facing_fist", "leftwards", "fist", "hand", "fistbump"]}, "rightfacing-fist": {"a": "right-facing fist", "b": "1F91C", "j": ["fist", "hand", "right_facing_fist", "rightwards", "fistbump"]}, "clapping-hands": {"a": "clapping hands", "b": "1F44F", "j": ["applause", "hand", "yay", "hands", "clap", "congrats", "praise"]}, "raising-hands": {"a": "raising hands", "b": "1F64C", "j": ["gesture", "hand", "hands", "celebration", "raised", "hooray", "yea"]}, "open-hands": {"a": "open hands", "b": "1F450", "j": ["fingers", "hand", "open", "hands", "butterfly"]}, "palms-up-together": {"a": "palms up together", "b": "1F932", "j": ["gesture", "cupped", "hands", "cupped hands", "prayer"]}, "handshake": {"a": "handshake", "b": "1F91D", "j": ["shake", "meeting", "hand", "agreement"]}, "folded-hands": {"a": "folded hands", "b": "1F64F", "j": ["hand", "high 5", "please", "high five", "thanks", "wish", "pray", "ask", "namaste", "hope", "highfive"]}, "writing-hand": {"a": "writing hand", "b": "270D", "j": ["lower_left_ballpoint_pen", "compose", "hand", "stationery", "write"]}, "nail-polish": {"a": "nail polish", "b": "1F485", "j": ["care", "finger", "manicure", "fashion", "polish", "beauty", "nail", "cosmetics"]}, "selfie": {"a": "selfie", "b": "1F933", "j": ["camera", "phone"]}, "flexed-biceps": {"a": "flexed biceps", "b": "1F4AA", "j": ["strong", "hand", "arm", "comic", "flex", "biceps", "summer", "muscle"]}, "mechanical-arm": {"a": "mechanical arm", "b": "1F9BE", "j": ["prosthetic", "accessibility"]}, "mechanical-leg": {"a": "mechanical leg", "b": "1F9BF", "j": ["prosthetic", "accessibility"]}, "leg": {"a": "leg", "b": "1F9B5", "j": ["limb", "kick"]}, "foot": {"a": "foot", "b": "1F9B6", "j": ["kick", "stomp"]}, "ear": {"a": "ear", "b": "1F442", "j": ["sound", "face", "body", "hear", "listen"]}, "ear-with-hearing-aid": {"a": "ear with hearing aid", "b": "1F9BB", "j": ["hard of hearing", "accessibility"]}, "nose": {"a": "nose", "b": "1F443", "j": ["smell", "sniff", "body"]}, "brain": {"a": "brain", "b": "1F9E0", "j": ["smart", "intelligent"]}, "anatomical-heart": {"a": "anatomical heart", "b": "1FAC0", "j": ["pulse", "heart", "cardiology", "organ", "heartbeat", "health", "anatomical"]}, "lungs": {"a": "lungs", "b": "1FAC1", "j": ["inhalation", "breath", "exhalation", "organ", "respiration", "breathe"]}, "tooth": {"a": "tooth", "b": "1F9B7", "j": ["dentist", "teeth"]}, "bone": {"a": "bone", "b": "1F9B4", "j": ["skeleton"]}, "eyes": {"a": "eyes", "b": "1F440", "j": ["stalk", "peek", "face", "eye", "watch", "see", "look"]}, "eye": {"a": "eye", "b": "1F441", "j": ["stare", "face", "watch", "body", "see", "look"]}, "tongue": {"a": "tongue", "b": "1F445", "j": ["playful", "mouth", "body"]}, "mouth": {"a": "mouth", "b": "1F444", "j": ["lips", "kiss"]}, "baby": {"a": "baby", "b": "1F476", "j": ["toddler", "young", "boy", "girl", "child"]}, "child": {"a": "child", "b": "1F9D2", "j": ["young", "gender-neutral", "unspecified gender"]}, "boy": {"a": "boy", "b": "1F466", "j": ["guy", "man", "male", "young", "teenager"]}, "girl": {"a": "girl", "b": "1F467", "j": ["woman", "young", "zodiac", "Virgo", "teenager", "female"]}, "person": {"a": "person", "b": "1F9D1", "j": ["adult", "gender-neutral", "unspecified gender"]}, "person-blond-hair": {"a": "person: blond hair", "b": "1F471", "j": ["hairstyle", "blond-haired person", "blond", "hair"]}, "man": {"a": "man", "b": "1F468", "j": ["guy", "classy", "moustache", "father", "sir", "dad", "mustache", "adult"]}, "person-beard": {"a": "person: beard", "b": "1F9D4", "j": ["person", "bewhiskered", "man_beard", "beard"]}, "man-beard": {"a": "⊛ man: beard", "b": "1F9D4-200D-2642-FE0F", "j": ["beard", "man", "man: beard"]}, "woman-beard": {"a": "⊛ woman: beard", "b": "1F9D4-200D-2640-FE0F", "j": ["beard", "woman", "woman: beard"]}, "man-red-hair": {"a": "man: red hair", "b": "1F468-200D-1F9B0", "j": ["adult", "red hair", "man", "hairstyle"]}, "man-curly-hair": {"a": "man: curly hair", "b": "1F468-200D-1F9B1", "j": ["curly hair", "adult", "man", "hairstyle"]}, "man-white-hair": {"a": "man: white hair", "b": "1F468-200D-1F9B3", "j": ["man", "elder", "old", "adult", "white hair"]}, "man-bald": {"a": "man: bald", "b": "1F468-200D-1F9B2", "j": ["hairless", "adult", "man", "bald"]}, "woman": {"a": "woman", "b": "1F469", "j": ["girls", "lady", "adult", "female"]}, "woman-red-hair": {"a": "woman: red hair", "b": "1F469-200D-1F9B0", "j": ["woman", "adult", "red hair", "hairstyle"]}, "person-red-hair": {"a": "person: red hair", "b": "1F9D1-200D-1F9B0", "j": ["person", "unspecified gender", "hairstyle", "red hair", "adult", "gender-neutral"]}, "woman-curly-hair": {"a": "woman: curly hair", "b": "1F469-200D-1F9B1", "j": ["woman", "curly hair", "adult", "hairstyle"]}, "person-curly-hair": {"a": "person: curly hair", "b": "1F9D1-200D-1F9B1", "j": ["person", "unspecified gender", "hairstyle", "curly hair", "adult", "gender-neutral"]}, "woman-white-hair": {"a": "woman: white hair", "b": "1F469-200D-1F9B3", "j": ["woman", "elder", "old", "adult", "white hair"]}, "person-white-hair": {"a": "person: white hair", "b": "1F9D1-200D-1F9B3", "j": ["person", "unspecified gender", "elder", "white hair", "old", "adult", "gender-neutral"]}, "woman-bald": {"a": "woman: bald", "b": "1F469-200D-1F9B2", "j": ["hairless", "adult", "bald", "woman"]}, "person-bald": {"a": "person: bald", "b": "1F9D1-200D-1F9B2", "j": ["hairless", "person", "unspecified gender", "bald", "adult", "gender-neutral"]}, "woman-blond-hair": {"a": "woman: blond hair", "b": "1F471-200D-2640-FE0F", "j": ["person", "woman", "hair", "girl", "blond-haired woman", "blonde", "female"]}, "man-blond-hair": {"a": "man: blond hair", "b": "1F471-200D-2642-FE0F", "j": ["guy", "person", "man", "hair", "male", "boy", "blond-haired man", "blond", "blonde"]}, "older-person": {"a": "older person", "b": "1F9D3", "j": ["unspecified gender", "elder", "senior", "human", "old", "adult", "gender-neutral"]}, "old-man": {"a": "old man", "b": "1F474", "j": ["man", "male", "elder", "human", "senior", "old", "men", "adult"]}, "old-woman": {"a": "old woman", "b": "1F475", "j": ["woman", "elder", "human", "lady", "senior", "old", "adult", "women", "female"]}, "person-frowning": {"a": "person frowning", "b": "1F64D", "j": ["frown", "gesture", "worried"]}, "man-frowning": {"a": "man frowning", "b": "1F64D-200D-2642-FE0F", "j": ["frowning", "depressed", "man", "male", "gesture", "boy", "unhappy", "sad", "discouraged"]}, "woman-frowning": {"a": "woman frowning", "b": "1F64D-200D-2640-FE0F", "j": ["frowning", "depressed", "woman", "gesture", "girl", "unhappy", "sad", "discouraged", "female"]}, "person-pouting": {"a": "person pouting", "b": "1F64E", "j": ["pouting", "upset", "gesture"]}, "man-pouting": {"a": "man pouting", "b": "1F64E-200D-2642-FE0F", "j": ["pouting", "man", "male", "gesture", "boy"]}, "woman-pouting": {"a": "woman pouting", "b": "1F64E-200D-2640-FE0F", "j": ["pouting", "woman", "gesture", "girl", "female"]}, "person-gesturing-no": {"a": "person gesturing NO", "b": "1F645", "j": ["decline", "forbidden", "gesture", "prohibited", "hand"]}, "man-gesturing-no": {"a": "man gesturing NO", "b": "1F645-200D-2642-FE0F", "j": ["forbidden", "man", "male", "gesture", "prohibited", "hand", "boy", "nope"]}, "woman-gesturing-no": {"a": "woman gesturing NO", "b": "1F645-200D-2640-FE0F", "j": ["forbidden", "woman", "gesture", "prohibited", "hand", "girl", "female", "nope"]}, "person-gesturing-ok": {"a": "person gesturing OK", "b": "1F646", "j": ["OK", "hand", "gesture", "agree"]}, "man-gesturing-ok": {"a": "man gesturing OK", "b": "1F646-200D-2642-FE0F", "j": ["blue", "OK", "man", "male", "human", "gesture", "boy", "hand", "men"]}, "woman-gesturing-ok": {"a": "woman gesturing OK", "b": "1F646-200D-2640-FE0F", "j": ["OK", "woman", "human", "gesture", "girl", "hand", "pink", "women", "female"]}, "person-tipping-hand": {"a": "person tipping hand", "b": "1F481", "j": ["tipping", "hand", "sassy", "help", "information"]}, "man-tipping-hand": {"a": "man tipping hand", "b": "1F481-200D-2642-FE0F", "j": ["man", "male", "human", "boy", "sassy", "tipping hand", "information"]}, "woman-tipping-hand": {"a": "woman tipping hand", "b": "1F481-200D-2640-FE0F", "j": ["woman", "human", "girl", "sassy", "tipping hand", "information", "female"]}, "person-raising-hand": {"a": "person raising hand", "b": "1F64B", "j": ["gesture", "hand", "raised", "happy", "question"]}, "man-raising-hand": {"a": "man raising hand", "b": "1F64B-200D-2642-FE0F", "j": ["raising hand", "man", "male", "gesture", "boy"]}, "woman-raising-hand": {"a": "woman raising hand", "b": "1F64B-200D-2640-FE0F", "j": ["raising hand", "woman", "gesture", "girl", "female"]}, "deaf-person": {"a": "deaf person", "b": "1F9CF", "j": ["ear", "deaf", "accessibility", "hear"]}, "deaf-man": {"a": "deaf man", "b": "1F9CF-200D-2642-FE0F", "j": ["accessibility", "deaf", "man"]}, "deaf-woman": {"a": "deaf woman", "b": "1F9CF-200D-2640-FE0F", "j": ["deaf", "accessibility", "woman"]}, "person-bowing": {"a": "person bowing", "b": "1F647", "j": ["gesture", "sorry", "apology", "respectiful", "bow"]}, "man-bowing": {"a": "man bowing", "b": "1F647-200D-2642-FE0F", "j": ["man", "male", "gesture", "boy", "bowing", "sorry", "favor", "apology"]}, "woman-bowing": {"a": "woman bowing", "b": "1F647-200D-2640-FE0F", "j": ["woman", "gesture", "girl", "bowing", "sorry", "favor", "apology", "female"]}, "person-facepalming": {"a": "person facepalming", "b": "1F926", "j": ["disappointed", "disbelief", "face", "exasperation", "palm"]}, "man-facepalming": {"a": "man facepalming", "b": "1F926-200D-2642-FE0F", "j": ["disbelief", "facepalm", "man", "male", "boy", "exasperation"]}, "woman-facepalming": {"a": "woman facepalming", "b": "1F926-200D-2640-FE0F", "j": ["disbelief", "facepalm", "woman", "girl", "exasperation", "female"]}, "person-shrugging": {"a": "person shrugging", "b": "1F937", "j": ["regardless", "indifference", "doubt", "shrug", "ignorance"]}, "man-shrugging": {"a": "man shrugging", "b": "1F937-200D-2642-FE0F", "j": ["indifferent", "man", "male", "boy", "doubt", "indifference", "confused", "shrug", "ignorance"]}, "woman-shrugging": {"a": "woman shrugging", "b": "1F937-200D-2640-FE0F", "j": ["indifferent", "woman", "girl", "doubt", "indifference", "confused", "female", "shrug", "ignorance"]}, "health-worker": {"a": "health worker", "b": "1F9D1-200D-2695-FE0F", "j": ["nurse", "doctor", "healthcare", "hospital", "therapist"]}, "man-health-worker": {"a": "man health worker", "b": "1F468-200D-2695-FE0F", "j": ["nurse", "man", "human", "doctor", "healthcare", "therapist"]}, "woman-health-worker": {"a": "woman health worker", "b": "1F469-200D-2695-FE0F", "j": ["nurse", "woman", "human", "doctor", "healthcare", "therapist"]}, "student": {"a": "student", "b": "1F9D1-200D-1F393", "j": ["learn", "graduate"]}, "man-student": {"a": "man student", "b": "1F468-200D-1F393", "j": ["human", "graduate", "student", "man"]}, "woman-student": {"a": "woman student", "b": "1F469-200D-1F393", "j": ["human", "graduate", "student", "woman"]}, "teacher": {"a": "teacher", "b": "1F9D1-200D-1F3EB", "j": ["professor", "instructor"]}, "man-teacher": {"a": "man teacher", "b": "1F468-200D-1F3EB", "j": ["instructor", "man", "teacher", "human", "professor"]}, "woman-teacher": {"a": "woman teacher", "b": "1F469-200D-1F3EB", "j": ["instructor", "woman", "teacher", "human", "professor"]}, "judge": {"a": "judge", "b": "1F9D1-200D-2696-FE0F", "j": ["scales", "justice", "law"]}, "man-judge": {"a": "man judge", "b": "1F468-200D-2696-FE0F", "j": ["court", "man", "human", "scales", "judge", "justice"]}, "woman-judge": {"a": "woman judge", "b": "1F469-200D-2696-FE0F", "j": ["court", "woman", "human", "scales", "judge", "justice"]}, "farmer": {"a": "farmer", "b": "1F9D1-200D-1F33E", "j": ["rancher", "crops", "gardener"]}, "man-farmer": {"a": "man farmer", "b": "1F468-200D-1F33E", "j": ["farmer", "man", "human", "rancher", "gardener"]}, "woman-farmer": {"a": "woman farmer", "b": "1F469-200D-1F33E", "j": ["farmer", "woman", "human", "rancher", "gardener"]}, "cook": {"a": "cook", "b": "1F9D1-200D-1F373", "j": ["chef", "food", "culinary", "kitchen"]}, "man-cook": {"a": "man cook", "b": "1F468-200D-1F373", "j": ["human", "cook", "chef", "man"]}, "woman-cook": {"a": "woman cook", "b": "1F469-200D-1F373", "j": ["human", "cook", "chef", "woman"]}, "mechanic": {"a": "mechanic", "b": "1F9D1-200D-1F527", "j": ["worker", "electrician", "plumber", "technician", "tradesperson"]}, "man-mechanic": {"a": "man mechanic", "b": "1F468-200D-1F527", "j": ["man", "human", "electrician", "plumber", "tradesperson", "mechanic", "wrench"]}, "woman-mechanic": {"a": "woman mechanic", "b": "1F469-200D-1F527", "j": ["woman", "human", "electrician", "plumber", "tradesperson", "mechanic", "wrench"]}, "factory-worker": {"a": "factory worker", "b": "1F9D1-200D-1F3ED", "j": ["worker", "factory", "labor", "industrial", "assembly"]}, "man-factory-worker": {"a": "man factory worker", "b": "1F468-200D-1F3ED", "j": ["man", "worker", "human", "factory", "industrial", "assembly"]}, "woman-factory-worker": {"a": "woman factory worker", "b": "1F469-200D-1F3ED", "j": ["worker", "woman", "human", "factory", "industrial", "assembly"]}, "office-worker": {"a": "office worker", "b": "1F9D1-200D-1F4BC", "j": ["white-collar", "architect", "manager", "business"]}, "man-office-worker": {"a": "man office worker", "b": "1F468-200D-1F4BC", "j": ["white-collar", "architect", "man", "business", "manager", "human"]}, "woman-office-worker": {"a": "woman office worker", "b": "1F469-200D-1F4BC", "j": ["white-collar", "architect", "manager", "business", "woman", "human"]}, "scientist": {"a": "scientist", "b": "1F9D1-200D-1F52C", "j": ["chemistry", "biologist", "physicist", "engineer", "chemist"]}, "man-scientist": {"a": "man scientist", "b": "1F468-200D-1F52C", "j": ["man", "biologist", "human", "physicist", "scientist", "engineer", "chemist"]}, "woman-scientist": {"a": "woman scientist", "b": "1F469-200D-1F52C", "j": ["biologist", "woman", "human", "physicist", "scientist", "engineer", "chemist"]}, "technologist": {"a": "technologist", "b": "1F9D1-200D-1F4BB", "j": ["computer", "software", "coder", "developer", "inventor"]}, "man-technologist": {"a": "man technologist", "b": "1F468-200D-1F4BB", "j": ["programmer", "laptop", "software", "computer", "coder", "man", "human", "developer", "inventor", "engineer", "technologist"]}, "woman-technologist": {"a": "woman technologist", "b": "1F469-200D-1F4BB", "j": ["programmer", "laptop", "software", "computer", "coder", "woman", "human", "developer", "inventor", "engineer", "technologist"]}, "singer": {"a": "singer", "b": "1F9D1-200D-1F3A4", "j": ["song", "artist", "star", "rock", "actor", "entertainer", "performer"]}, "man-singer": {"a": "man singer", "b": "1F468-200D-1F3A4", "j": ["man", "human", "star", "rockstar", "rock", "singer", "actor", "entertainer"]}, "woman-singer": {"a": "woman singer", "b": "1F469-200D-1F3A4", "j": ["woman", "human", "star", "rockstar", "rock", "singer", "actor", "entertainer"]}, "artist": {"a": "artist", "b": "1F9D1-200D-1F3A8", "j": ["painting", "creativity", "palette", "draw"]}, "man-artist": {"a": "man artist", "b": "1F468-200D-1F3A8", "j": ["man", "artist", "human", "painter", "palette"]}, "woman-artist": {"a": "woman artist", "b": "1F469-200D-1F3A8", "j": ["woman", "artist", "human", "painter", "palette"]}, "pilot": {"a": "pilot", "b": "1F9D1-200D-2708-FE0F", "j": ["airplane", "plane", "fly"]}, "man-pilot": {"a": "man pilot", "b": "1F468-200D-2708-FE0F", "j": ["man", "human", "plane", "pilot", "aviator"]}, "woman-pilot": {"a": "woman pilot", "b": "1F469-200D-2708-FE0F", "j": ["woman", "human", "plane", "pilot", "aviator"]}, "astronaut": {"a": "astronaut", "b": "1F9D1-200D-1F680", "j": ["outerspace", "rocket"]}, "man-astronaut": {"a": "man astronaut", "b": "1F468-200D-1F680", "j": ["man", "rocket", "human", "astronaut", "space"]}, "woman-astronaut": {"a": "woman astronaut", "b": "1F469-200D-1F680", "j": ["rocket", "woman", "human", "astronaut", "space"]}, "firefighter": {"a": "firefighter", "b": "1F9D1-200D-1F692", "j": ["firetruck", "fire"]}, "man-firefighter": {"a": "man firefighter", "b": "1F468-200D-1F692", "j": ["firetruck", "man", "human", "fireman", "firefighter"]}, "woman-firefighter": {"a": "woman firefighter", "b": "1F469-200D-1F692", "j": ["firetruck", "woman", "human", "fireman", "firefighter"]}, "police-officer": {"a": "police officer", "b": "1F46E", "j": ["cop", "police", "officer"]}, "man-police-officer": {"a": "man police officer", "b": "1F46E-200D-2642-FE0F", "j": ["police", "man", "officer", "law", "enforcement", "911", "legal", "cop", "arrest"]}, "woman-police-officer": {"a": "woman police officer", "b": "1F46E-200D-2640-FE0F", "j": ["police", "woman", "officer", "law", "enforcement", "arrest", "911", "legal", "cop", "female"]}, "detective": {"a": "detective", "b": "1F575", "j": ["sleuth", "human", "spy"]}, "man-detective": {"a": "man detective", "b": "1F575-FE0F-200D-2642-FE0F", "j": ["spy", "man", "crime", "sleuth", "detective"]}, "woman-detective": {"a": "woman detective", "b": "1F575-FE0F-200D-2640-FE0F", "j": ["spy", "woman", "human", "sleuth", "female", "detective"]}, "guard": {"a": "guard", "b": "1F482", "j": ["protect"]}, "man-guard": {"a": "man guard", "b": "1F482-200D-2642-FE0F", "j": ["guy", "royal", "man", "british", "male", "uk", "gb", "guard"]}, "woman-guard": {"a": "woman guard", "b": "1F482-200D-2640-FE0F", "j": ["royal", "woman", "british", "uk", "gb", "guard", "female"]}, "ninja": {"a": "ninja", "b": "1F977", "j": ["ninjutsu", "japanese", "fighter", "hidden", "stealth", "skills"]}, "construction-worker": {"a": "construction worker", "b": "1F477", "j": ["build", "construction", "worker", "hat", "labor"]}, "man-construction-worker": {"a": "man construction worker", "b": "1F477-200D-2642-FE0F", "j": ["guy", "man", "construction", "male", "worker", "human", "wip", "build", "labor"]}, "woman-construction-worker": {"a": "woman construction worker", "b": "1F477-200D-2640-FE0F", "j": ["build", "construction", "worker", "woman", "human", "wip", "labor", "female"]}, "prince": {"a": "prince", "b": "1F934", "j": ["royal", "man", "male", "crown", "king", "boy"]}, "princess": {"a": "princess", "b": "1F478", "j": ["royal", "woman", "crown", "girl", "fairy tale", "fantasy", "blond", "queen", "female"]}, "person-wearing-turban": {"a": "person wearing turban", "b": "1F473", "j": ["turban", "headdress"]}, "man-wearing-turban": {"a": "man wearing turban", "b": "1F473-200D-2642-FE0F", "j": ["man", "male", "hinduism", "turban", "indian", "arabs"]}, "woman-wearing-turban": {"a": "woman wearing turban", "b": "1F473-200D-2640-FE0F", "j": ["woman", "hinduism", "turban", "indian", "arabs", "female"]}, "person-with-skullcap": {"a": "person with skullcap", "b": "1F472", "j": ["person", "man_with_skullcap", "male", "boy", "hat", "skullcap", "cap", "gua pi mao", "chinese"]}, "woman-with-headscarf": {"a": "woman with headscarf", "b": "1F9D5", "j": ["tichel", "mantilla", "bandana", "head kerchief", "headscarf", "female", "hijab"]}, "person-in-tuxedo": {"a": "person in tuxedo", "b": "1F935", "j": ["person", "wedding", "marriage", "tuxedo", "groom", "man_in_tuxedo", "couple"]}, "man-in-tuxedo": {"a": "man in tuxedo", "b": "1F935-200D-2642-FE0F", "j": ["formal", "fashion", "man", "tuxedo"]}, "woman-in-tuxedo": {"a": "woman in tuxedo", "b": "1F935-200D-2640-FE0F", "j": ["formal", "fashion", "tuxedo", "woman"]}, "person-with-veil": {"a": "person with veil", "b": "1F470", "j": ["person", "wedding", "marriage", "woman", "bride", "veil", "bride_with_veil", "couple"]}, "man-with-veil": {"a": "man with veil", "b": "1F470-200D-2642-FE0F", "j": ["veil", "wedding", "man", "marriage"]}, "woman-with-veil": {"a": "woman with veil", "b": "1F470-200D-2640-FE0F", "j": ["veil", "wedding", "marriage", "woman"]}, "pregnant-woman": {"a": "pregnant woman", "b": "1F930", "j": ["pregnant", "baby", "woman"]}, "breastfeeding": {"a": "breast-feeding", "b": "1F931", "j": ["nursing", "breast", "baby", "breast_feeding"]}, "woman-feeding-baby": {"a": "woman feeding baby", "b": "1F469-200D-1F37C", "j": ["nursing", "birth", "woman", "baby", "feeding", "food"]}, "man-feeding-baby": {"a": "man feeding baby", "b": "1F468-200D-1F37C", "j": ["nursing", "birth", "man", "baby", "feeding", "food"]}, "person-feeding-baby": {"a": "person feeding baby", "b": "1F9D1-200D-1F37C", "j": ["nursing", "person", "birth", "baby", "feeding", "food"]}, "baby-angel": {"a": "baby angel", "b": "1F47C", "j": ["heaven", "baby", "face", "fairy tale", "fantasy", "wings", "angel", "halo"]}, "santa-claus": {"a": "Santa Claus", "b": "1F385", "j": ["claus", "man", "male", "father", "santa", "festival", "xmas", "celebration", "Christmas", "father christmas"]}, "mrs-claus": {"a": "Mrs. Claus", "b": "1F936", "j": ["claus", "Mrs.", "woman", "xmas", "celebration", "Christmas", "mother christmas", "mother", "female"]}, "mx-claus": {"a": "mx claus", "b": "1F9D1-200D-1F384", "j": ["Claus, christmas", "christmas"]}, "superhero": {"a": "superhero", "b": "1F9B8", "j": ["marvel", "superpower", "good", "heroine", "hero"]}, "man-superhero": {"a": "man superhero", "b": "1F9B8-200D-2642-FE0F", "j": ["man", "male", "superpowers", "superpower", "good", "hero"]}, "woman-superhero": {"a": "woman superhero", "b": "1F9B8-200D-2640-FE0F", "j": ["woman", "superpowers", "good", "superpower", "heroine", "hero", "female"]}, "supervillain": {"a": "supervillain", "b": "1F9B9", "j": ["marvel", "superpower", "criminal", "villain", "evil"]}, "man-supervillain": {"a": "man supervillain", "b": "1F9B9-200D-2642-FE0F", "j": ["man", "male", "superpowers", "superpower", "criminal", "bad", "villain", "evil", "hero"]}, "woman-supervillain": {"a": "woman supervillain", "b": "1F9B9-200D-2640-FE0F", "j": ["woman", "superpowers", "superpower", "criminal", "bad", "heroine", "villain", "evil", "female"]}, "mage": {"a": "mage", "b": "1F9D9", "j": ["magic", "wizard", "sorcerer", "sorceress", "witch"]}, "man-mage": {"a": "man mage", "b": "1F9D9-200D-2642-FE0F", "j": ["man", "male", "wizard", "sorcerer", "mage"]}, "woman-mage": {"a": "woman mage", "b": "1F9D9-200D-2640-FE0F", "j": ["woman", "mage", "sorceress", "witch", "female"]}, "fairy": {"a": "fairy", "b": "1F9DA", "j": ["magical", "Puck", "Titania", "Oberon", "wings"]}, "man-fairy": {"a": "man fairy", "b": "1F9DA-200D-2642-FE0F", "j": ["Puck", "Oberon", "man", "male"]}, "woman-fairy": {"a": "woman fairy", "b": "1F9DA-200D-2640-FE0F", "j": ["Titania", "woman", "female"]}, "vampire": {"a": "vampire", "b": "1F9DB", "j": ["undead", "blood", "twilight", "Dracula"]}, "man-vampire": {"a": "man vampire", "b": "1F9DB-200D-2642-FE0F", "j": ["dracula", "man", "male", "undead", "Dracula"]}, "woman-vampire": {"a": "woman vampire", "b": "1F9DB-200D-2640-FE0F", "j": ["woman", "undead", "female"]}, "merperson": {"a": "merperson", "b": "1F9DC", "j": ["mermaid", "merwoman", "sea", "merman"]}, "merman": {"a": "merman", "b": "1F9DC-200D-2642-FE0F", "j": ["triton", "Triton", "man", "male"]}, "mermaid": {"a": "mermaid", "b": "1F9DC-200D-2640-FE0F", "j": ["woman", "merwoman", "ariel", "female"]}, "elf": {"a": "elf", "b": "1F9DD", "j": ["magical", "LOTR style"]}, "man-elf": {"a": "man elf", "b": "1F9DD-200D-2642-FE0F", "j": ["magical", "man", "male"]}, "woman-elf": {"a": "woman elf", "b": "1F9DD-200D-2640-FE0F", "j": ["woman", "magical", "female"]}, "genie": {"a": "genie", "b": "1F9DE", "j": ["(non-human color)", "magical", "wishes", "djinn"]}, "man-genie": {"a": "man genie", "b": "1F9DE-200D-2642-FE0F", "j": ["male", "man", "djinn"]}, "woman-genie": {"a": "woman genie", "b": "1F9DE-200D-2640-FE0F", "j": ["female", "djinn", "woman"]}, "zombie": {"a": "zombie", "b": "1F9DF", "j": ["undead", "dead", "walking dead", "(non-human color)"]}, "man-zombie": {"a": "man zombie", "b": "1F9DF-200D-2642-FE0F", "j": ["dracula", "man", "male", "undead", "walking dead"]}, "woman-zombie": {"a": "woman zombie", "b": "1F9DF-200D-2640-FE0F", "j": ["woman", "undead", "walking dead", "female"]}, "person-getting-massage": {"a": "person getting massage", "b": "1F486", "j": ["relax", "salon", "massage", "face"]}, "man-getting-massage": {"a": "man getting massage", "b": "1F486-200D-2642-FE0F", "j": ["man", "massage", "male", "boy", "face", "head"]}, "woman-getting-massage": {"a": "woman getting massage", "b": "1F486-200D-2640-FE0F", "j": ["massage", "woman", "girl", "face", "head", "female"]}, "person-getting-haircut": {"a": "person getting haircut", "b": "1F487", "j": ["barber", "haircut", "hairstyle", "beauty", "parlor"]}, "man-getting-haircut": {"a": "man getting haircut", "b": "1F487-200D-2642-FE0F", "j": ["boy", "male", "man", "haircut"]}, "woman-getting-haircut": {"a": "woman getting haircut", "b": "1F487-200D-2640-FE0F", "j": ["woman", "girl", "haircut", "female"]}, "person-walking": {"a": "person walking", "b": "1F6B6", "j": ["move", "walking", "walk", "hike"]}, "man-walking": {"a": "man walking", "b": "1F6B6-200D-2642-FE0F", "j": ["man", "human", "steps", "feet", "hike", "walk"]}, "woman-walking": {"a": "woman walking", "b": "1F6B6-200D-2640-FE0F", "j": ["woman", "human", "steps", "feet", "hike", "walk", "female"]}, "person-standing": {"a": "person standing", "b": "1F9CD", "j": ["stand", "standing", "still"]}, "man-standing": {"a": "man standing", "b": "1F9CD-200D-2642-FE0F", "j": ["standing", "man", "still"]}, "woman-standing": {"a": "woman standing", "b": "1F9CD-200D-2640-FE0F", "j": ["standing", "still", "woman"]}, "person-kneeling": {"a": "person kneeling", "b": "1F9CE", "j": ["respectful", "pray", "kneeling", "kneel"]}, "man-kneeling": {"a": "man kneeling", "b": "1F9CE-200D-2642-FE0F", "j": ["respectful", "pray", "man", "kneeling"]}, "woman-kneeling": {"a": "woman kneeling", "b": "1F9CE-200D-2640-FE0F", "j": ["respectful", "pray", "kneeling", "woman"]}, "person-with-white-cane": {"a": "person with white cane", "b": "1F9D1-200D-1F9AF", "j": ["person_with_probing_cane", "blind", "accessibility"]}, "man-with-white-cane": {"a": "man with white cane", "b": "1F468-200D-1F9AF", "j": ["man", "blind", "accessibility", "man_with_probing_cane"]}, "woman-with-white-cane": {"a": "woman with white cane", "b": "1F469-200D-1F9AF", "j": ["woman_with_probing_cane", "blind", "accessibility", "woman"]}, "person-in-motorized-wheelchair": {"a": "person in motorized wheelchair", "b": "1F9D1-200D-1F9BC", "j": ["wheelchair", "disability", "accessibility"]}, "man-in-motorized-wheelchair": {"a": "man in motorized wheelchair", "b": "1F468-200D-1F9BC", "j": ["wheelchair", "disability", "man", "accessibility"]}, "woman-in-motorized-wheelchair": {"a": "woman in motorized wheelchair", "b": "1F469-200D-1F9BC", "j": ["wheelchair", "disability", "accessibility", "woman"]}, "person-in-manual-wheelchair": {"a": "person in manual wheelchair", "b": "1F9D1-200D-1F9BD", "j": ["wheelchair", "disability", "accessibility"]}, "man-in-manual-wheelchair": {"a": "man in manual wheelchair", "b": "1F468-200D-1F9BD", "j": ["wheelchair", "disability", "man", "accessibility"]}, "woman-in-manual-wheelchair": {"a": "woman in manual wheelchair", "b": "1F469-200D-1F9BD", "j": ["wheelchair", "disability", "accessibility", "woman"]}, "person-running": {"a": "person running", "b": "1F3C3", "j": ["running", "marathon", "move"]}, "man-running": {"a": "man running", "b": "1F3C3-200D-2642-FE0F", "j": ["man", "walking", "racing", "race", "running", "exercise", "marathon"]}, "woman-running": {"a": "woman running", "b": "1F3C3-200D-2640-FE0F", "j": ["woman", "walking", "racing", "race", "running", "exercise", "marathon", "female"]}, "woman-dancing": {"a": "woman dancing", "b": "1F483", "j": ["woman", "girl", "dance", "dancing", "fun", "female"]}, "man-dancing": {"a": "man dancing", "b": "1F57A", "j": ["man", "male", "boy", "dance", "dancing", "fun", "dancer"]}, "person-in-suit-levitating": {"a": "person in suit levitating", "b": "1F574", "j": ["person", "business", "jump", "man_in_suit_levitating", "suit", "hover", "levitate"]}, "people-with-bunny-ears": {"a": "people with bunny ears", "b": "1F46F", "j": ["costume", "partying", "perform", "bunny ear", "dancer"]}, "men-with-bunny-ears": {"a": "men with bunny ears", "b": "1F46F-200D-2642-FE0F", "j": ["boys", "male", "partying", "men", "bunny", "bunny ear", "dancer"]}, "women-with-bunny-ears": {"a": "women with bunny ears", "b": "1F46F-200D-2640-FE0F", "j": ["girls", "dancer", "partying", "bunny", "bunny ear", "women", "female"]}, "person-in-steamy-room": {"a": "person in steamy room", "b": "1F9D6", "j": ["spa", "relax", "hamam", "steambath", "sauna", "steam room"]}, "man-in-steamy-room": {"a": "man in steamy room", "b": "1F9D6-200D-2642-FE0F", "j": ["man", "male", "steamroom", "spa", "sauna", "steam room"]}, "woman-in-steamy-room": {"a": "woman in steamy room", "b": "1F9D6-200D-2640-FE0F", "j": ["woman", "steamroom", "spa", "sauna", "steam room", "female"]}, "person-climbing": {"a": "person climbing", "b": "1F9D7", "j": ["sport", "climber"]}, "man-climbing": {"a": "man climbing", "b": "1F9D7-200D-2642-FE0F", "j": ["man", "hobby", "male", "rock", "sports", "climber"]}, "woman-climbing": {"a": "woman climbing", "b": "1F9D7-200D-2640-FE0F", "j": ["hobby", "woman", "rock", "sports", "climber", "female"]}, "person-fencing": {"a": "person fencing", "b": "1F93A", "j": ["sword", "fencer", "fencing", "sports"]}, "horse-racing": {"a": "horse racing", "b": "1F3C7", "j": ["competition", "racehorse", "jockey", "racing", "gambling", "luck", "horse", "betting", "animal"]}, "skier": {"a": "skier", "b": "26F7", "j": ["sports", "snow", "winter", "ski"]}, "snowboarder": {"a": "snowboarder", "b": "1F3C2", "j": ["snow", "winter", "sports", "ski", "snowboard"]}, "person-golfing": {"a": "person golfing", "b": "1F3CC", "j": ["golf", "sports", "business", "ball"]}, "man-golfing": {"a": "man golfing", "b": "1F3CC-FE0F-200D-2642-FE0F", "j": ["golf", "sport", "man"]}, "woman-golfing": {"a": "woman golfing", "b": "1F3CC-FE0F-200D-2640-FE0F", "j": ["business", "woman", "golf", "sports", "female"]}, "person-surfing": {"a": "person surfing", "b": "1F3C4", "j": ["surfing", "sport", "sea"]}, "man-surfing": {"a": "man surfing", "b": "1F3C4-200D-2642-FE0F", "j": ["man", "surfing", "sea", "sports", "ocean", "summer", "beach"]}, "woman-surfing": {"a": "woman surfing", "b": "1F3C4-200D-2640-FE0F", "j": ["woman", "surfing", "sea", "sports", "ocean", "summer", "beach", "female"]}, "person-rowing-boat": {"a": "person rowing boat", "b": "1F6A3", "j": ["sport", "rowboat", "move", "boat"]}, "man-rowing-boat": {"a": "man rowing boat", "b": "1F6A3-200D-2642-FE0F", "j": ["man", "hobby", "boat", "water", "sports", "ship", "rowboat"]}, "woman-rowing-boat": {"a": "woman rowing boat", "b": "1F6A3-200D-2640-FE0F", "j": ["hobby", "woman", "boat", "water", "sports", "ship", "rowboat", "female"]}, "person-swimming": {"a": "person swimming", "b": "1F3CA", "j": ["sport", "pool", "swim"]}, "man-swimming": {"a": "man swimming", "b": "1F3CA-200D-2642-FE0F", "j": ["swim", "man", "human", "athlete", "water", "sports", "exercise", "summer"]}, "woman-swimming": {"a": "woman swimming", "b": "1F3CA-200D-2640-FE0F", "j": ["swim", "woman", "human", "athlete", "water", "sports", "exercise", "summer", "female"]}, "person-bouncing-ball": {"a": "person bouncing ball", "b": "26F9", "j": ["human", "sports", "ball"]}, "man-bouncing-ball": {"a": "man bouncing ball", "b": "26F9-FE0F-200D-2642-FE0F", "j": ["sport", "man", "ball"]}, "woman-bouncing-ball": {"a": "woman bouncing ball", "b": "26F9-FE0F-200D-2640-FE0F", "j": ["woman", "human", "ball", "sports", "female"]}, "person-lifting-weights": {"a": "person lifting weights", "b": "1F3CB", "j": ["sports", "training", "exercise", "weight", "lifter"]}, "man-lifting-weights": {"a": "man lifting weights", "b": "1F3CB-FE0F-200D-2642-FE0F", "j": ["sport", "weight lifter", "man"]}, "woman-lifting-weights": {"a": "woman lifting weights", "b": "1F3CB-FE0F-200D-2640-FE0F", "j": ["woman", "sports", "exercise", "weight lifter", "training", "female"]}, "person-biking": {"a": "person biking", "b": "1F6B4", "j": ["biking", "sport", "bicycle", "move", "cyclist"]}, "man-biking": {"a": "man biking", "b": "1F6B4-200D-2642-FE0F", "j": ["biking", "man", "hipster", "sports", "exercise", "bicycle", "bike", "cyclist"]}, "woman-biking": {"a": "woman biking", "b": "1F6B4-200D-2640-FE0F", "j": ["biking", "woman", "cyclist", "hipster", "sports", "exercise", "bicycle", "bike", "female"]}, "person-mountain-biking": {"a": "person mountain biking", "b": "1F6B5", "j": ["mountain", "bicyclist", "sport", "bicycle", "bike", "move", "cyclist"]}, "man-mountain-biking": {"a": "man mountain biking", "b": "1F6B5-200D-2642-FE0F", "j": ["mountain", "man", "human", "transportation", "sports", "race", "bicycle", "bike", "cyclist"]}, "woman-mountain-biking": {"a": "woman mountain biking", "b": "1F6B5-200D-2640-FE0F", "j": ["biking", "mountain", "woman", "human", "cyclist", "transportation", "sports", "race", "bicycle", "bike", "female"]}, "person-cartwheeling": {"a": "person cartwheeling", "b": "1F938", "j": ["sport", "cartwheel", "gymnastic", "gymnastics"]}, "man-cartwheeling": {"a": "man cartwheeling", "b": "1F938-200D-2642-FE0F", "j": ["cartwheel", "man", "gymnastics"]}, "woman-cartwheeling": {"a": "woman cartwheeling", "b": "1F938-200D-2640-FE0F", "j": ["cartwheel", "gymnastics", "woman"]}, "people-wrestling": {"a": "people wrestling", "b": "1F93C", "j": ["wrestle", "sport", "wrestler"]}, "men-wrestling": {"a": "men wrestling", "b": "1F93C-200D-2642-FE0F", "j": ["wrestle", "wrestlers", "sports", "men"]}, "women-wrestling": {"a": "women wrestling", "b": "1F93C-200D-2640-FE0F", "j": ["wrestle", "women", "sports", "wrestlers"]}, "person-playing-water-polo": {"a": "person playing water polo", "b": "1F93D", "j": ["sport", "polo", "water"]}, "man-playing-water-polo": {"a": "man playing water polo", "b": "1F93D-200D-2642-FE0F", "j": ["pool", "water polo", "man", "sports"]}, "woman-playing-water-polo": {"a": "woman playing water polo", "b": "1F93D-200D-2640-FE0F", "j": ["woman", "pool", "water polo", "sports"]}, "person-playing-handball": {"a": "person playing handball", "b": "1F93E", "j": ["sport", "handball", "ball"]}, "man-playing-handball": {"a": "man playing handball", "b": "1F93E-200D-2642-FE0F", "j": ["handball", "man", "sports"]}, "woman-playing-handball": {"a": "woman playing handball", "b": "1F93E-200D-2640-FE0F", "j": ["woman", "handball", "sports"]}, "person-juggling": {"a": "person juggling", "b": "1F939", "j": ["performance", "balance", "skill", "multitask", "juggle"]}, "man-juggling": {"a": "man juggling", "b": "1F939-200D-2642-FE0F", "j": ["juggling", "balance", "man", "skill", "multitask", "juggle"]}, "woman-juggling": {"a": "woman juggling", "b": "1F939-200D-2640-FE0F", "j": ["juggling", "balance", "skill", "woman", "multitask", "juggle"]}, "person-in-lotus-position": {"a": "person in lotus position", "b": "1F9D8", "j": ["meditation", "meditate", "serenity", "yoga"]}, "man-in-lotus-position": {"a": "man in lotus position", "b": "1F9D8-200D-2642-FE0F", "j": ["man", "male", "meditation", "mindfulness", "yoga", "zen", "serenity"]}, "woman-in-lotus-position": {"a": "woman in lotus position", "b": "1F9D8-200D-2640-FE0F", "j": ["woman", "meditation", "mindfulness", "yoga", "zen", "serenity", "female"]}, "person-taking-bath": {"a": "person taking bath", "b": "1F6C0", "j": ["bathroom", "bath", "clean", "shower", "bathtub"]}, "person-in-bed": {"a": "person in bed", "b": "1F6CC", "j": ["sleep", "rest", "hotel", "bed"]}, "people-holding-hands": {"a": "people holding hands", "b": "1F9D1-200D-1F91D-200D-1F9D1", "j": ["person", "friendship", "hold", "hand", "holding hands", "couple"]}, "women-holding-hands": {"a": "women holding hands", "b": "1F46D", "j": ["friendship", "people", "love", "like", "human", "hand", "holding hands", "women", "couple", "pair", "female"]}, "woman-and-man-holding-hands": {"a": "woman and man holding hands", "b": "1F46B", "j": ["love", "dating", "like", "woman", "marriage", "human", "hand", "valentines", "affection", "couple", "pair", "date", "people", "man", "hold", "holding hands"]}, "men-holding-hands": {"a": "men holding hands", "b": "1F46C", "j": ["friendship", "people", "love", "man", "twins", "like", "human", "bromance", "holding hands", "zodiac", "Gemini", "men", "couple", "pair"]}, "kiss": {"a": "kiss", "b": "1F48F", "j": ["love", "dating", "like", "marriage", "valentines", "couple", "pair"]}, "kiss-woman-man": {"a": "kiss: woman, man", "b": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F468", "j": ["love", "man", "woman", "kiss", "couple"]}, "kiss-man-man": {"a": "kiss: man, man", "b": "1F468-200D-2764-FE0F-200D-1F48B-200D-1F468", "j": ["love", "man", "like", "dating", "marriage", "valentines", "kiss", "couple", "pair"]}, "kiss-woman-woman": {"a": "kiss: woman, woman", "b": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F469", "j": ["love", "like", "dating", "woman", "marriage", "valentines", "kiss", "couple", "pair"]}, "couple-with-heart": {"a": "couple with heart", "b": "1F491", "j": ["love", "like", "dating", "marriage", "human", "valentines", "affection", "couple", "pair"]}, "couple-with-heart-woman-man": {"a": "couple with heart: woman, man", "b": "1F469-200D-2764-FE0F-200D-1F468", "j": ["love", "man", "woman", "couple with heart", "couple"]}, "couple-with-heart-man-man": {"a": "couple with heart: man, man", "b": "1F468-200D-2764-FE0F-200D-1F468", "j": ["love", "man", "like", "dating", "marriage", "human", "couple with heart", "valentines", "affection", "couple", "pair"]}, "couple-with-heart-woman-woman": {"a": "couple with heart: woman, woman", "b": "1F469-200D-2764-FE0F-200D-1F469", "j": ["love", "like", "dating", "woman", "marriage", "human", "couple with heart", "valentines", "affection", "couple", "pair"]}, "family": {"a": "family", "b": "1F46A", "j": ["people", "mom", "father", "human", "parents", "dad", "home", "child", "mother"]}, "family-man-woman-boy": {"a": "family: man, woman, boy", "b": "1F468-200D-1F469-200D-1F466", "j": ["love", "man", "woman", "boy", "family"]}, "family-man-woman-girl": {"a": "family: man, woman, girl", "b": "1F468-200D-1F469-200D-1F467", "j": ["people", "man", "woman", "human", "girl", "parents", "family", "home", "child"]}, "family-man-woman-girl-boy": {"a": "family: man, woman, girl, boy", "b": "1F468-200D-1F469-200D-1F467-200D-1F466", "j": ["people", "man", "woman", "human", "boy", "girl", "parents", "family", "home", "children"]}, "family-man-woman-boy-boy": {"a": "family: man, woman, boy, boy", "b": "1F468-200D-1F469-200D-1F466-200D-1F466", "j": ["people", "man", "woman", "human", "boy", "parents", "family", "home", "children"]}, "family-man-woman-girl-girl": {"a": "family: man, woman, girl, girl", "b": "1F468-200D-1F469-200D-1F467-200D-1F467", "j": ["people", "man", "woman", "human", "girl", "parents", "family", "home", "children"]}, "family-man-man-boy": {"a": "family: man, man, boy", "b": "1F468-200D-1F468-200D-1F466", "j": ["people", "man", "human", "boy", "parents", "family", "home", "children"]}, "family-man-man-girl": {"a": "family: man, man, girl", "b": "1F468-200D-1F468-200D-1F467", "j": ["people", "man", "human", "girl", "parents", "family", "home", "children"]}, "family-man-man-girl-boy": {"a": "family: man, man, girl, boy", "b": "1F468-200D-1F468-200D-1F467-200D-1F466", "j": ["people", "man", "human", "boy", "girl", "parents", "family", "home", "children"]}, "family-man-man-boy-boy": {"a": "family: man, man, boy, boy", "b": "1F468-200D-1F468-200D-1F466-200D-1F466", "j": ["people", "man", "human", "boy", "parents", "family", "home", "children"]}, "family-man-man-girl-girl": {"a": "family: man, man, girl, girl", "b": "1F468-200D-1F468-200D-1F467-200D-1F467", "j": ["people", "man", "human", "girl", "parents", "family", "home", "children"]}, "family-woman-woman-boy": {"a": "family: woman, woman, boy", "b": "1F469-200D-1F469-200D-1F466", "j": ["people", "woman", "human", "boy", "parents", "family", "home", "children"]}, "family-woman-woman-girl": {"a": "family: woman, woman, girl", "b": "1F469-200D-1F469-200D-1F467", "j": ["people", "woman", "human", "girl", "parents", "family", "home", "children"]}, "family-woman-woman-girl-boy": {"a": "family: woman, woman, girl, boy", "b": "1F469-200D-1F469-200D-1F467-200D-1F466", "j": ["people", "woman", "human", "boy", "girl", "parents", "family", "home", "children"]}, "family-woman-woman-boy-boy": {"a": "family: woman, woman, boy, boy", "b": "1F469-200D-1F469-200D-1F466-200D-1F466", "j": ["people", "woman", "human", "boy", "parents", "family", "home", "children"]}, "family-woman-woman-girl-girl": {"a": "family: woman, woman, girl, girl", "b": "1F469-200D-1F469-200D-1F467-200D-1F467", "j": ["people", "woman", "human", "girl", "parents", "family", "home", "children"]}, "family-man-boy": {"a": "family: man, boy", "b": "1F468-200D-1F466", "j": ["people", "man", "human", "boy", "parent", "family", "home", "child"]}, "family-man-boy-boy": {"a": "family: man, boy, boy", "b": "1F468-200D-1F466-200D-1F466", "j": ["people", "man", "human", "boy", "parent", "family", "home", "children"]}, "family-man-girl": {"a": "family: man, girl", "b": "1F468-200D-1F467", "j": ["people", "man", "human", "girl", "parent", "family", "home", "child"]}, "family-man-girl-boy": {"a": "family: man, girl, boy", "b": "1F468-200D-1F467-200D-1F466", "j": ["people", "man", "human", "boy", "girl", "parent", "family", "home", "children"]}, "family-man-girl-girl": {"a": "family: man, girl, girl", "b": "1F468-200D-1F467-200D-1F467", "j": ["people", "man", "human", "girl", "parent", "family", "home", "children"]}, "family-woman-boy": {"a": "family: woman, boy", "b": "1F469-200D-1F466", "j": ["people", "woman", "human", "boy", "parent", "family", "home", "child"]}, "family-woman-boy-boy": {"a": "family: woman, boy, boy", "b": "1F469-200D-1F466-200D-1F466", "j": ["people", "woman", "human", "boy", "parent", "family", "home", "children"]}, "family-woman-girl": {"a": "family: woman, girl", "b": "1F469-200D-1F467", "j": ["people", "woman", "human", "girl", "parent", "family", "home", "child"]}, "family-woman-girl-boy": {"a": "family: woman, girl, boy", "b": "1F469-200D-1F467-200D-1F466", "j": ["people", "woman", "human", "boy", "girl", "parent", "family", "home", "children"]}, "family-woman-girl-girl": {"a": "family: woman, girl, girl", "b": "1F469-200D-1F467-200D-1F467", "j": ["people", "woman", "human", "girl", "parent", "family", "home", "children"]}, "speaking-head": {"a": "speaking head", "b": "1F5E3", "j": ["person", "talk", "human", "sing", "face", "silhouette", "speak", "say", "speaking", "user", "head"]}, "bust-in-silhouette": {"a": "bust in silhouette", "b": "1F464", "j": ["person", "bust", "human", "silhouette", "user"]}, "busts-in-silhouette": {"a": "busts in silhouette", "b": "1F465", "j": ["team", "bust", "person", "group", "human", "silhouette", "user"]}, "people-hugging": {"a": "people hugging", "b": "1FAC2", "j": ["hug", "hello", "thanks", "goodbye", "care"]}, "footprints": {"a": "footprints", "b": "1F463", "j": ["tracking", "footprint", "walking", "clothing", "feet", "print", "beach"]}, "red-hair": {"a": "red hair", "b": "1F9B0", "j": ["ginger", "red hair", "redhead"]}, "curly-hair": {"a": "curly hair", "b": "1F9B1", "j": ["afro", "curly", "curly hair", "ringlets"]}, "white-hair": {"a": "white hair", "b": "1F9B3", "j": ["gray", "hair", "old", "white"]}, "bald": {"a": "bald", "b": "1F9B2", "j": ["bald", "chemotherapy", "hairless", "no hair", "shaven"]}, "monkey-face": {"a": "monkey face", "b": "1F435", "j": ["monkey", "face", "nature", "circus", "animal"]}, "monkey": {"a": "monkey", "b": "1F412", "j": ["banana", "circus", "animal", "nature"]}, "gorilla": {"a": "gorilla", "b": "1F98D", "j": ["circus", "animal", "nature"]}, "orangutan": {"a": "orangutan", "b": "1F9A7", "j": ["animal", "ape"]}, "dog-face": {"a": "dog face", "b": "1F436", "j": ["puppy", "pet", "dog", "face", "nature", "woof", "faithful", "friend", "animal"]}, "dog": {"a": "dog", "b": "1F415", "j": ["pet", "nature", "faithful", "friend", "doge", "animal"]}, "guide-dog": {"a": "guide dog", "b": "1F9AE", "j": ["guide", "animal", "blind", "accessibility"]}, "service-dog": {"a": "service dog", "b": "1F415-200D-1F9BA", "j": ["animal", "accessibility", "dog", "assistance", "service", "blind"]}, "poodle": {"a": "poodle", "b": "1F429", "j": ["pet", "dog", "nature", "101", "animal"]}, "wolf": {"a": "wolf", "b": "1F43A", "j": ["animal", "wild", "face", "nature"]}, "fox": {"a": "fox", "b": "1F98A", "j": ["animal", "face", "nature"]}, "raccoon": {"a": "raccoon", "b": "1F99D", "j": ["curious", "sly", "animal", "nature"]}, "cat-face": {"a": "cat face", "b": "1F431", "j": ["pet", "meow", "kitten", "face", "nature", "cat", "animal"]}, "cat": {"a": "cat", "b": "1F408", "j": ["meow", "pet", "animal", "cats"]}, "black-cat": {"a": "black cat", "b": "1F408-200D-2B1B", "j": ["unlucky", "superstition", "luck", "cat", "black"]}, "lion": {"a": "lion", "b": "1F981", "j": ["zodiac", "Leo", "face", "nature", "animal"]}, "tiger-face": {"a": "tiger face", "b": "1F42F", "j": ["danger", "tiger", "face", "nature", "wild", "cat", "animal", "roar"]}, "tiger": {"a": "tiger", "b": "1F405", "j": ["roar", "animal", "nature"]}, "leopard": {"a": "leopard", "b": "1F406", "j": ["animal", "nature"]}, "horse-face": {"a": "horse face", "b": "1F434", "j": ["brown", "face", "nature", "horse", "animal"]}, "horse": {"a": "horse", "b": "1F40E", "j": ["equestrian", "gamble", "racing", "luck", "racehorse", "animal"]}, "unicorn": {"a": "unicorn", "b": "1F984", "j": ["mystical", "animal", "face", "nature"]}, "zebra": {"a": "zebra", "b": "1F993", "j": ["nature", "safari", "stripe", "stripes", "animal"]}, "deer": {"a": "deer", "b": "1F98C", "j": ["venison", "animal", "horns", "nature"]}, "bison": {"a": "bison", "b": "1F9AC", "j": ["wisent", "buffalo", "herd", "ox"]}, "cow-face": {"a": "cow face", "b": "1F42E", "j": ["cow", "milk", "beef", "ox", "face", "nature", "moo", "animal"]}, "ox": {"a": "ox", "b": "1F402", "j": ["cow", "Taurus", "beef", "zodiac", "bull", "animal"]}, "water-buffalo": {"a": "water buffalo", "b": "1F403", "j": ["cow", "buffalo", "water", "ox", "nature", "animal"]}, "cow": {"a": "cow", "b": "1F404", "j": ["milk", "beef", "ox", "nature", "moo", "animal"]}, "pig-face": {"a": "pig face", "b": "1F437", "j": ["pig", "face", "nature", "oink", "animal"]}, "pig": {"a": "pig", "b": "1F416", "j": ["nature", "animal", "sow"]}, "boar": {"a": "boar", "b": "1F417", "j": ["animal", "pig", "nature"]}, "pig-nose": {"a": "pig nose", "b": "1F43D", "j": ["pig", "face", "oink", "nose", "animal"]}, "ram": {"a": "ram", "b": "1F40F", "j": ["male", "zodiac", "nature", "sheep", "Aries", "animal"]}, "ewe": {"a": "ewe", "b": "1F411", "j": ["nature", "sheep", "shipit", "wool", "animal", "female"]}, "goat": {"a": "goat", "b": "1F410", "j": ["animal", "Capricorn", "zodiac", "nature"]}, "camel": {"a": "camel", "b": "1F42A", "j": ["hump", "dromedary", "hot", "desert", "animal"]}, "twohump-camel": {"a": "two-hump camel", "b": "1F42B", "j": ["animal", "hump", "bactrian", "hot", "desert", "nature", "camel", "two_hump_camel"]}, "llama": {"a": "llama", "b": "1F999", "j": ["guanaco", "vicuña", "alpaca", "nature", "wool", "animal"]}, "giraffe": {"a": "giraffe", "b": "1F992", "j": ["spots", "animal", "safari", "nature"]}, "elephant": {"a": "elephant", "b": "1F418", "j": ["nature", "nose", "circus", "animal", "th"]}, "mammoth": {"a": "mammoth", "b": "1F9A3", "j": ["large", "woolly", "elephant", "extinction", "tusks", "tusk"]}, "rhinoceros": {"a": "rhinoceros", "b": "1F98F", "j": ["nature", "animal", "horn"]}, "hippopotamus": {"a": "hippopotamus", "b": "1F99B", "j": ["nature", "animal", "hippo"]}, "mouse-face": {"a": "mouse face", "b": "1F42D", "j": ["mouse", "face", "nature", "animal", "cheese_wedge", "rodent"]}, "mouse": {"a": "mouse", "b": "1F401", "j": ["rodent", "animal", "nature"]}, "rat": {"a": "rat", "b": "1F400", "j": ["mouse", "animal", "rodent"]}, "hamster": {"a": "hamster", "b": "1F439", "j": ["pet", "animal", "face", "nature"]}, "rabbit-face": {"a": "rabbit face", "b": "1F430", "j": ["pet", "spring", "face", "nature", "rabbit", "bunny", "animal", "magic"]}, "rabbit": {"a": "rabbit", "b": "1F407", "j": ["pet", "spring", "nature", "bunny", "animal", "magic"]}, "chipmunk": {"a": "chipmunk", "b": "1F43F", "j": ["nature", "animal", "squirrel", "rodent"]}, "beaver": {"a": "beaver", "b": "1F9AB", "j": ["animal", "dam", "rodent"]}, "hedgehog": {"a": "hedgehog", "b": "1F994", "j": ["spiny", "animal", "nature"]}, "bat": {"a": "bat", "b": "1F987", "j": ["blind", "animal", "vampire", "nature"]}, "bear": {"a": "bear", "b": "1F43B", "j": ["animal", "wild", "face", "nature"]}, "polar-bear": {"a": "polar bear", "b": "1F43B-200D-2744-FE0F", "j": ["animal", "white", "arctic", "bear"]}, "koala": {"a": "koala", "b": "1F428", "j": ["bear", "animal", "nature"]}, "panda": {"a": "panda", "b": "1F43C", "j": ["animal", "face", "nature"]}, "sloth": {"a": "sloth", "b": "1F9A5", "j": ["slow", "animal", "lazy"]}, "otter": {"a": "otter", "b": "1F9A6", "j": ["playful", "animal", "fishing"]}, "skunk": {"a": "skunk", "b": "1F9A8", "j": ["stink", "animal"]}, "kangaroo": {"a": "kangaroo", "b": "1F998", "j": ["Australia", "australia", "hop", "joey", "nature", "marsupial", "animal", "jump"]}, "badger": {"a": "badger", "b": "1F9A1", "j": ["nature", "pester", "honey badger", "honey", "animal"]}, "paw-prints": {"a": "paw prints", "b": "1F43E", "j": ["pet", "tracking", "dog", "feet", "paw", "cat", "print", "animal", "footprints"]}, "turkey": {"a": "turkey", "b": "1F983", "j": ["animal", "bird"]}, "chicken": {"a": "chicken", "b": "1F414", "j": ["cluck", "animal", "bird", "nature"]}, "rooster": {"a": "rooster", "b": "1F413", "j": ["chicken", "animal", "bird", "nature"]}, "hatching-chick": {"a": "hatching chick", "b": "1F423", "j": ["born", "hatching", "baby", "bird", "chicken", "chick", "egg", "animal"]}, "baby-chick": {"a": "baby chick", "b": "1F424", "j": ["baby", "bird", "chicken", "chick", "animal"]}, "frontfacing-baby-chick": {"a": "front-facing baby chick", "b": "1F425", "j": ["baby", "bird", "chicken", "front_facing_baby_chick", "chick", "animal"]}, "bird": {"a": "bird", "b": "1F426", "j": ["tweet", "spring", "nature", "fly", "animal"]}, "penguin": {"a": "penguin", "b": "1F427", "j": ["animal", "bird", "nature"]}, "dove": {"a": "dove", "b": "1F54A", "j": ["fly", "animal", "bird", "peace"]}, "eagle": {"a": "eagle", "b": "1F985", "j": ["animal", "bird", "nature"]}, "duck": {"a": "duck", "b": "1F986", "j": ["animal", "bird", "mallard", "nature"]}, "swan": {"a": "swan", "b": "1F9A2", "j": ["ugly duckling", "cygnet", "bird", "nature", "animal"]}, "owl": {"a": "owl", "b": "1F989", "j": ["bird", "wise", "nature", "hoot", "animal"]}, "dodo": {"a": "dodo", "b": "1F9A4", "j": ["large", "bird", "Mauritius", "extinction", "animal"]}, "feather": {"a": "feather", "b": "1FAB6", "j": ["flight", "bird", "plumage", "light", "fly"]}, "flamingo": {"a": "flamingo", "b": "1F9A9", "j": ["tropical", "flamboyant", "animal"]}, "peacock": {"a": "peacock", "b": "1F99A", "j": ["peahen", "bird", "proud", "nature", "ostentatious", "animal"]}, "parrot": {"a": "parrot", "b": "1F99C", "j": ["talk", "pirate", "bird", "nature", "animal"]}, "frog": {"a": "frog", "b": "1F438", "j": ["croak", "face", "toad", "nature", "animal"]}, "crocodile": {"a": "crocodile", "b": "1F40A", "j": ["reptile", "alligator", "nature", "animal", "lizard"]}, "turtle": {"a": "turtle", "b": "1F422", "j": ["slow", "nature", "tortoise", "terrapin", "animal"]}, "lizard": {"a": "lizard", "b": "1F98E", "j": ["reptile", "animal", "nature"]}, "snake": {"a": "snake", "b": "1F40D", "j": ["serpent", "Ophiuchus", "zodiac", "nature", "hiss", "bearer", "evil", "animal", "python"]}, "dragon-face": {"a": "dragon face", "b": "1F432", "j": ["face", "myth", "fairy tale", "nature", "dragon", "chinese", "green", "animal"]}, "dragon": {"a": "dragon", "b": "1F409", "j": ["myth", "nature", "fairy tale", "chinese", "green", "animal"]}, "sauropod": {"a": "sauropod", "b": "1F995", "j": ["diplodocus", "brontosaurus", "nature", "dinosaur", "extinct", "animal", "brachiosaurus"]}, "trex": {"a": "T-Rex", "b": "1F996", "j": ["nature", "Tyrannosaurus Rex", "dinosaur", "t_rex", "tyrannosaurus", "extinct", "animal"]}, "spouting-whale": {"a": "spouting whale", "b": "1F433", "j": ["spouting", "whale", "sea", "face", "nature", "ocean", "animal"]}, "whale": {"a": "whale", "b": "1F40B", "j": ["ocean", "animal", "sea", "nature"]}, "dolphin": {"a": "dolphin", "b": "1F42C", "j": ["sea", "fish", "nature", "flipper", "ocean", "animal", "fins", "beach"]}, "seal": {"a": "seal", "b": "1F9AD", "j": ["sea", "sea lion", "animal", "creature"]}, "fish": {"a": "fish", "b": "1F41F", "j": ["zodiac", "nature", "Pisces", "food", "animal"]}, "tropical-fish": {"a": "tropical fish", "b": "1F420", "j": ["swim", "fish", "ocean", "nemo", "tropical", "animal", "beach"]}, "blowfish": {"a": "blowfish", "b": "1F421", "j": ["sea", "fish", "nature", "ocean", "food", "animal"]}, "shark": {"a": "shark", "b": "1F988", "j": ["jaws", "sea", "fish", "nature", "ocean", "animal", "fins", "beach"]}, "octopus": {"a": "octopus", "b": "1F419", "j": ["sea", "nature", "ocean", "creature", "animal", "beach"]}, "spiral-shell": {"a": "spiral shell", "b": "1F41A", "j": ["sea", "shell", "nature", "spiral", "beach"]}, "snail": {"a": "snail", "b": "1F40C", "j": ["slow", "animal", "shell"]}, "butterfly": {"a": "butterfly", "b": "1F98B", "j": ["caterpillar", "nature", "pretty", "insect", "animal"]}, "bug": {"a": "bug", "b": "1F41B", "j": ["worm", "insect", "animal", "nature"]}, "ant": {"a": "ant", "b": "1F41C", "j": ["bug", "insect", "animal", "nature"]}, "honeybee": {"a": "honeybee", "b": "1F41D", "j": ["spring", "nature", "bug", "bee", "honey", "insect", "animal"]}, "beetle": {"a": "beetle", "b": "1FAB2", "j": ["insect", "bug"]}, "lady-beetle": {"a": "lady beetle", "b": "1F41E", "j": ["beetle", "nature", "ladybird", "ladybug", "insect", "animal"]}, "cricket": {"a": "cricket", "b": "1F997", "j": ["chirp", "animal", "Orthoptera", "grasshopper"]}, "cockroach": {"a": "cockroach", "b": "1FAB3", "j": ["pest", "pests", "insect", "roach"]}, "spider": {"a": "spider", "b": "1F577", "j": ["arachnid", "animal", "insect"]}, "spider-web": {"a": "spider web", "b": "1F578", "j": ["silk", "spider", "arachnid", "insect", "animal", "web"]}, "scorpion": {"a": "scorpion", "b": "1F982", "j": ["Scorpio", "zodiac", "scorpio", "arachnid", "animal"]}, "mosquito": {"a": "mosquito", "b": "1F99F", "j": ["malaria", "pest", "nature", "disease", "fever", "insect", "animal", "virus"]}, "fly": {"a": "fly", "b": "1FAB0", "j": ["pest", "rotting", "disease", "maggot", "insect"]}, "worm": {"a": "worm", "b": "1FAB1", "j": ["earthworm", "animal", "annelid", "parasite"]}, "microbe": {"a": "microbe", "b": "1F9A0", "j": ["bacteria", "germs", "amoeba", "virus"]}, "bouquet": {"a": "bouquet", "b": "1F490", "j": ["flowers", "flower", "spring", "nature"]}, "cherry-blossom": {"a": "cherry blossom", "b": "1F338", "j": ["flower", "spring", "nature", "plant", "cherry", "blossom"]}, "white-flower": {"a": "white flower", "b": "1F4AE", "j": ["flower", "japanese", "spring"]}, "rosette": {"a": "rosette", "b": "1F3F5", "j": ["military", "plant", "decoration", "flower"]}, "rose": {"a": "rose", "b": "1F339", "j": ["flower", "love", "spring", "valentines", "flowers"]}, "wilted-flower": {"a": "wilted flower", "b": "1F940", "j": ["flower", "plant", "wilted", "nature"]}, "hibiscus": {"a": "hibiscus", "b": "1F33A", "j": ["flower", "plant", "flowers", "vegetable", "beach"]}, "sunflower": {"a": "sunflower", "b": "1F33B", "j": ["sun", "flower", "nature", "fall", "plant"]}, "blossom": {"a": "blossom", "b": "1F33C", "j": ["flowers", "flower", "yellow", "nature"]}, "tulip": {"a": "tulip", "b": "1F337", "j": ["flower", "spring", "nature", "plant", "summer", "flowers"]}, "seedling": {"a": "seedling", "b": "1F331", "j": ["spring", "young", "lawn", "nature", "plant", "grass"]}, "potted-plant": {"a": "potted plant", "b": "1FAB4", "j": ["house", "nurturing", "greenery", "grow", "plant", "useless", "boring"]}, "evergreen-tree": {"a": "evergreen tree", "b": "1F332", "j": ["tree", "plant", "nature"]}, "deciduous-tree": {"a": "deciduous tree", "b": "1F333", "j": ["shedding", "deciduous", "nature", "plant", "tree"]}, "palm-tree": {"a": "palm tree", "b": "1F334", "j": ["nature", "plant", "tree", "mojito", "summer", "tropical", "vegetable", "palm", "beach"]}, "cactus": {"a": "cactus", "b": "1F335", "j": ["plant", "vegetable", "nature"]}, "sheaf-of-rice": {"a": "sheaf of rice", "b": "1F33E", "j": ["rice", "grain", "nature", "ear", "plant"]}, "herb": {"a": "herb", "b": "1F33F", "j": ["weed", "leaf", "lawn", "medicine", "plant", "vegetable", "grass"]}, "shamrock": {"a": "shamrock", "b": "2618", "j": ["clover", "nature", "plant", "irish", "vegetable"]}, "four-leaf-clover": {"a": "four leaf clover", "b": "1F340", "j": ["four-leaf clover", "leaf", "lucky", "four", "clover", "nature", "plant", "4", "irish", "vegetable"]}, "maple-leaf": {"a": "maple leaf", "b": "1F341", "j": ["leaf", "maple", "ca", "nature", "fall", "plant", "falling", "vegetable"]}, "fallen-leaf": {"a": "fallen leaf", "b": "1F342", "j": ["leaf", "nature", "plant", "falling", "leaves", "vegetable"]}, "leaf-fluttering-in-wind": {"a": "leaf fluttering in wind", "b": "1F343", "j": ["flutter", "leaf", "spring", "lawn", "blow", "nature", "plant", "tree", "vegetable", "wind", "grass"]}, "grapes": {"a": "grapes", "b": "1F347", "j": ["wine", "grape", "food", "fruit"]}, "melon": {"a": "melon", "b": "1F348", "j": ["nature", "food", "fruit"]}, "watermelon": {"a": "watermelon", "b": "1F349", "j": ["fruit", "food", "picnic", "summer"]}, "tangerine": {"a": "tangerine", "b": "1F34A", "j": ["fruit", "food", "orange", "nature"]}, "lemon": {"a": "lemon", "b": "1F34B", "j": ["citrus", "nature", "fruit"]}, "banana": {"a": "banana", "b": "1F34C", "j": ["monkey", "food", "fruit"]}, "pineapple": {"a": "pineapple", "b": "1F34D", "j": ["nature", "food", "fruit"]}, "mango": {"a": "mango", "b": "1F96D", "j": ["tropical", "food", "fruit"]}, "red-apple": {"a": "red apple", "b": "1F34E", "j": ["apple", "fruit", "school", "mac", "red"]}, "green-apple": {"a": "green apple", "b": "1F34F", "j": ["fruit", "apple", "green", "nature"]}, "pear": {"a": "pear", "b": "1F350", "j": ["nature", "food", "fruit"]}, "peach": {"a": "peach", "b": "1F351", "j": ["nature", "food", "fruit"]}, "cherries": {"a": "cherries", "b": "1F352", "j": ["fruit", "red", "cherry", "food", "berries"]}, "strawberry": {"a": "strawberry", "b": "1F353", "j": ["fruit", "food", "berry", "nature"]}, "blueberries": {"a": "blueberries", "b": "1FAD0", "j": ["blue", "blueberry", "berry", "bilberry", "fruit"]}, "kiwi-fruit": {"a": "kiwi fruit", "b": "1F95D", "j": ["kiwi", "food", "fruit"]}, "tomato": {"a": "tomato", "b": "1F345", "j": ["fruit", "food", "vegetable", "nature"]}, "olive": {"a": "olive", "b": "1FAD2", "j": ["food", "fruit"]}, "coconut": {"a": "coconut", "b": "1F965", "j": ["fruit", "piña colada", "nature", "food", "palm"]}, "avocado": {"a": "avocado", "b": "1F951", "j": ["food", "fruit"]}, "eggplant": {"a": "eggplant", "b": "1F346", "j": ["aubergine", "food", "vegetable", "nature"]}, "potato": {"a": "potato", "b": "1F954", "j": ["tuber", "starch", "vegatable", "food", "vegetable"]}, "carrot": {"a": "carrot", "b": "1F955", "j": ["food", "vegetable", "orange"]}, "ear-of-corn": {"a": "ear of corn", "b": "1F33D", "j": ["corn", "maze", "ear", "food", "plant", "maize", "vegetable"]}, "hot-pepper": {"a": "hot pepper", "b": "1F336", "j": ["chili", "hot", "spicy", "pepper", "food", "chilli"]}, "bell-pepper": {"a": "bell pepper", "b": "1FAD1", "j": ["fruit", "pepper", "capsicum", "plant", "vegetable"]}, "cucumber": {"a": "cucumber", "b": "1F952", "j": ["pickle", "food", "vegetable", "fruit"]}, "leafy-green": {"a": "leafy green", "b": "1F96C", "j": ["cabbage", "kale", "bok choy", "plant", "food", "lettuce", "vegetable"]}, "broccoli": {"a": "broccoli", "b": "1F966", "j": ["wild cabbage", "food", "vegetable", "fruit"]}, "garlic": {"a": "garlic", "b": "1F9C4", "j": ["cook", "food", "flavoring", "spice"]}, "onion": {"a": "onion", "b": "1F9C5", "j": ["cook", "food", "flavoring", "spice"]}, "mushroom": {"a": "mushroom", "b": "1F344", "j": ["plant", "vegetable", "toadstool"]}, "peanuts": {"a": "peanuts", "b": "1F95C", "j": ["nut", "food", "vegetable", "peanut"]}, "chestnut": {"a": "chestnut", "b": "1F330", "j": ["plant", "food", "squirrel"]}, "bread": {"a": "bread", "b": "1F35E", "j": ["loaf", "toast", "breakfast", "food", "wheat"]}, "croissant": {"a": "croissant", "b": "1F950", "j": ["french", "bread", "breakfast", "food", "roll"]}, "baguette-bread": {"a": "baguette bread", "b": "1F956", "j": ["french", "baguette", "food", "bread"]}, "flatbread": {"a": "flatbread", "b": "1FAD3", "j": ["arepa", "lavash", "naan", "pita", "food", "flour"]}, "pretzel": {"a": "pretzel", "b": "1F968", "j": ["convoluted", "food", "bread", "twisted"]}, "bagel": {"a": "bagel", "b": "1F96F", "j": ["bread", "bakery", "breakfast", "food", "schmear"]}, "pancakes": {"a": "pancakes", "b": "1F95E", "j": ["hotcakes", "hotcake", "pancake", "flapjacks", "breakfast", "food", "crêpe"]}, "waffle": {"a": "waffle", "b": "1F9C7", "j": ["iron", "food", "breakfast", "indecisive"]}, "cheese-wedge": {"a": "cheese wedge", "b": "1F9C0", "j": ["chadder", "food", "cheese"]}, "meat-on-bone": {"a": "meat on bone", "b": "1F356", "j": ["drumstick", "bone", "good", "meat", "food"]}, "poultry-leg": {"a": "poultry leg", "b": "1F357", "j": ["leg", "drumstick", "bone", "poultry", "bird", "meat", "chicken", "food", "turkey"]}, "cut-of-meat": {"a": "cut of meat", "b": "1F969", "j": ["cow", "steak", "meat", "food", "lambchop", "chop", "porkchop", "cut"]}, "bacon": {"a": "bacon", "b": "1F953", "j": ["pig", "meat", "breakfast", "food", "pork"]}, "hamburger": {"a": "hamburger", "b": "1F354", "j": ["burger king", "fast food", "beef", "meat", "burger", "mcdonalds", "cheeseburger"]}, "french-fries": {"a": "french fries", "b": "1F35F", "j": ["fries", "fast food", "french", "chips", "snack"]}, "pizza": {"a": "pizza", "b": "1F355", "j": ["food", "cheese", "party", "slice"]}, "hot-dog": {"a": "hot dog", "b": "1F32D", "j": ["food", "hotdog", "sausage", "frankfurter"]}, "sandwich": {"a": "sandwich", "b": "1F96A", "j": ["lunch", "food", "bread"]}, "taco": {"a": "taco", "b": "1F32E", "j": ["food", "mexican"]}, "burrito": {"a": "burrito", "b": "1F32F", "j": ["food", "mexican", "wrap"]}, "tamale": {"a": "tamale", "b": "1FAD4", "j": ["masa", "food", "wrapped", "mexican"]}, "stuffed-flatbread": {"a": "stuffed flatbread", "b": "1F959", "j": ["kebab", "flatbread", "food", "stuffed", "gyro", "falafel"]}, "falafel": {"a": "falafel", "b": "1F9C6", "j": ["chickpea", "food", "meatball"]}, "egg": {"a": "egg", "b": "1F95A", "j": ["breakfast", "food", "chicken"]}, "cooking": {"a": "cooking", "b": "1F373", "j": ["breakfast", "food", "frying", "kitchen", "egg", "pan"]}, "shallow-pan-of-food": {"a": "shallow pan of food", "b": "1F958", "j": ["cooking", "shallow", "paella", "food", "pan", "casserole"]}, "pot-of-food": {"a": "pot of food", "b": "1F372", "j": ["pot", "stew", "soup", "meat", "food"]}, "fondue": {"a": "fondue", "b": "1FAD5", "j": ["pot", "melted", "cheese", "chocolate", "food", "Swiss"]}, "bowl-with-spoon": {"a": "bowl with spoon", "b": "1F963", "j": ["porridge", "breakfast", "food", "cereal", "congee", "oatmeal"]}, "green-salad": {"a": "green salad", "b": "1F957", "j": ["salad", "healthy", "food", "green", "lettuce"]}, "popcorn": {"a": "popcorn", "b": "1F37F", "j": ["snack", "food", "films", "movie theater"]}, "butter": {"a": "butter", "b": "1F9C8", "j": ["cook", "food", "dairy"]}, "salt": {"a": "salt", "b": "1F9C2", "j": ["shaker", "condiment"]}, "canned-food": {"a": "canned food", "b": "1F96B", "j": ["soup", "food", "can"]}, "bento-box": {"a": "bento box", "b": "1F371", "j": ["food", "box", "japanese", "bento"]}, "rice-cracker": {"a": "rice cracker", "b": "1F358", "j": ["rice", "food", "japanese", "cracker"]}, "rice-ball": {"a": "rice ball", "b": "1F359", "j": ["rice", "Japanese", "japanese", "ball", "food"]}, "cooked-rice": {"a": "cooked rice", "b": "1F35A", "j": ["china", "rice", "asian", "food", "cooked"]}, "curry-rice": {"a": "curry rice", "b": "1F35B", "j": ["curry", "rice", "hot", "spicy", "food", "indian"]}, "steaming-bowl": {"a": "steaming bowl", "b": "1F35C", "j": ["bowl", "japanese", "steaming", "food", "noodle", "ramen", "chopsticks"]}, "spaghetti": {"a": "spaghetti", "b": "1F35D", "j": ["italian", "food", "noodle", "pasta"]}, "roasted-sweet-potato": {"a": "roasted sweet potato", "b": "1F360", "j": ["roasted", "potato", "nature", "sweet", "food"]}, "oden": {"a": "oden", "b": "1F362", "j": ["stick", "kebab", "skewer", "japanese", "food", "seafood"]}, "sushi": {"a": "sushi", "b": "1F363", "j": ["rice", "food", "japanese", "fish"]}, "fried-shrimp": {"a": "fried shrimp", "b": "1F364", "j": ["prawn", "shrimp", "appetizer", "fried", "tempura", "food", "summer", "animal"]}, "fish-cake-with-swirl": {"a": "fish cake with swirl", "b": "1F365", "j": ["beach", "pink", "narutomaki", "sea", "fish", "surimi", "pastry", "cake", "food", "ramen", "swirl", "kamaboko", "japan"]}, "moon-cake": {"a": "moon cake", "b": "1F96E", "j": ["food", "yuèbǐng", "festival", "autumn"]}, "dango": {"a": "dango", "b": "1F361", "j": ["stick", "dessert", "Japanese", "japanese", "meat", "sweet", "barbecue", "food", "skewer"]}, "dumpling": {"a": "dumpling", "b": "1F95F", "j": ["jiaozi", "food", "pierogi", "empanada", "gyōza", "potsticker"]}, "fortune-cookie": {"a": "fortune cookie", "b": "1F960", "j": ["food", "prophecy"]}, "takeout-box": {"a": "takeout box", "b": "1F961", "j": ["oyster pail", "leftovers", "food"]}, "crab": {"a": "crab", "b": "1F980", "j": ["crustacean", "animal", "zodiac", "Cancer"]}, "lobster": {"a": "lobster", "b": "1F99E", "j": ["claws", "bisque", "nature", "animal", "seafood"]}, "shrimp": {"a": "shrimp", "b": "1F990", "j": ["shellfish", "nature", "ocean", "food", "small", "animal", "seafood"]}, "squid": {"a": "squid", "b": "1F991", "j": ["sea", "nature", "ocean", "food", "animal", "molusc"]}, "oyster": {"a": "oyster", "b": "1F9AA", "j": ["food", "pearl", "diving"]}, "soft-ice-cream": {"a": "soft ice cream", "b": "1F366", "j": ["hot", "dessert", "ice", "soft", "icecream", "sweet", "food", "summer", "cream"]}, "shaved-ice": {"a": "shaved ice", "b": "1F367", "j": ["hot", "dessert", "ice", "sweet", "summer", "shaved"]}, "ice-cream": {"a": "ice cream", "b": "1F368", "j": ["hot", "dessert", "ice", "sweet", "food", "cream"]}, "doughnut": {"a": "doughnut", "b": "1F369", "j": ["dessert", "sweet", "breakfast", "food", "snack", "donut"]}, "cookie": {"a": "cookie", "b": "1F36A", "j": ["dessert", "sweet", "chocolate", "food", "snack", "oreo"]}, "birthday-cake": {"a": "birthday cake", "b": "1F382", "j": ["birthday", "dessert", "pastry", "celebration", "sweet", "cake", "food"]}, "shortcake": {"a": "shortcake", "b": "1F370", "j": ["dessert", "pastry", "sweet", "cake", "food", "slice"]}, "cupcake": {"a": "cupcake", "b": "1F9C1", "j": ["sweet", "bakery", "dessert", "food"]}, "pie": {"a": "pie", "b": "1F967", "j": ["fruit", "dessert", "meat", "filling", "pastry", "food"]}, "chocolate-bar": {"a": "chocolate bar", "b": "1F36B", "j": ["dessert", "bar", "sweet", "chocolate", "food", "snack"]}, "candy": {"a": "candy", "b": "1F36C", "j": ["sweet", "snack", "dessert", "lolly"]}, "lollipop": {"a": "lollipop", "b": "1F36D", "j": ["dessert", "sweet", "candy", "food", "snack"]}, "custard": {"a": "custard", "b": "1F36E", "j": ["sweet", "dessert", "food", "pudding"]}, "honey-pot": {"a": "honey pot", "b": "1F36F", "j": ["pot", "kitchen", "bees", "sweet", "honeypot", "honey"]}, "baby-bottle": {"a": "baby bottle", "b": "1F37C", "j": ["milk", "drink", "bottle", "baby", "food", "container"]}, "glass-of-milk": {"a": "glass of milk", "b": "1F95B", "j": ["cow", "milk", "drink", "beverage", "glass"]}, "hot-beverage": {"a": "hot beverage", "b": "2615", "j": ["hot", "beverage", "drink", "steaming", "coffee", "caffeine", "tea", "latte", "espresso"]}, "teapot": {"a": "teapot", "b": "1FAD6", "j": ["hot", "pot", "drink", "tea"]}, "teacup-without-handle": {"a": "teacup without handle", "b": "1F375", "j": ["bowl", "cup", "british", "beverage", "teacup", "drink", "breakfast", "tea", "green"]}, "sake": {"a": "sake", "b": "1F376", "j": ["cup", "wine", "beverage", "drink", "drunk", "bottle", "bar", "japanese", "alcohol", "booze"]}, "bottle-with-popping-cork": {"a": "bottle with popping cork", "b": "1F37E", "j": ["wine", "drink", "bottle", "bar", "celebration", "popping", "cork"]}, "wine-glass": {"a": "wine glass", "b": "1F377", "j": ["wine", "beverage", "drink", "drunk", "alcohol", "bar", "booze", "glass"]}, "cocktail-glass": {"a": "cocktail glass", "b": "1F378", "j": ["drink", "alcohol", "drunk", "beverage", "bar", "cocktail", "mojito", "booze", "glass"]}, "tropical-drink": {"a": "tropical drink", "b": "1F379", "j": ["drink", "beverage", "alcohol", "bar", "cocktail", "mojito", "summer", "tropical", "booze", "beach"]}, "beer-mug": {"a": "beer mug", "b": "1F37A", "j": ["pub", "drink", "beverage", "drunk", "alcohol", "bar", "relax", "mug", "party", "summer", "booze", "beer"]}, "clinking-beer-mugs": {"a": "clinking beer mugs", "b": "1F37B", "j": ["pub", "drink", "beverage", "drunk", "alcohol", "clink", "bar", "relax", "mug", "party", "summer", "booze", "beer"]}, "clinking-glasses": {"a": "clinking glasses", "b": "1F942", "j": ["cheers", "toast", "champagne", "wine", "drink", "beverage", "alcohol", "clink", "party", "glass", "celebrate"]}, "tumbler-glass": {"a": "tumbler glass", "b": "1F943", "j": ["bourbon", "shot", "drink", "beverage", "drunk", "alcohol", "scotch", "liquor", "tumbler", "whisky", "booze", "glass"]}, "cup-with-straw": {"a": "cup with straw", "b": "1F964", "j": ["malt", "drink", "water", "soft drink", "soda", "juice"]}, "bubble-tea": {"a": "bubble tea", "b": "1F9CB", "j": ["bubble", "boba", "tea", "milk", "pearl", "straw", "milk tea", "taiwan"]}, "beverage-box": {"a": "beverage box", "b": "1F9C3", "j": ["beverage", "drink", "sweet", "straw", "juice", "box"]}, "mate": {"a": "mate", "b": "1F9C9", "j": ["drink", "beverage", "tea"]}, "ice": {"a": "ice", "b": "1F9CA", "j": ["iceberg", "cold", "ice cube", "water"]}, "chopsticks": {"a": "chopsticks", "b": "1F962", "j": ["food", "jeotgarak", "kuaizi", "hashi"]}, "fork-and-knife-with-plate": {"a": "fork and knife with plate", "b": "1F37D", "j": ["meal", "plate", "dinner", "knife", "eat", "lunch", "cooking", "food", "restaurant", "fork"]}, "fork-and-knife": {"a": "fork and knife", "b": "1F374", "j": ["knife", "cutlery", "cooking", "kitchen", "fork"]}, "spoon": {"a": "spoon", "b": "1F944", "j": ["kitchen", "tableware", "cutlery"]}, "kitchen-knife": {"a": "kitchen knife", "b": "1F52A", "j": ["hocho", "knife", "cutlery", "cooking", "weapon", "blade", "kitchen", "tool"]}, "amphora": {"a": "amphora", "b": "1F3FA", "j": ["Aquarius", "jar", "drink", "cooking", "zodiac", "vase", "jug"]}, "globe-showing-europeafrica": {"a": "globe showing Europe-Africa", "b": "1F30D", "j": ["Africa", "globe", "earth", "international", "Europe", "globe_showing_europe_africa", "world"]}, "globe-showing-americas": {"a": "globe showing Americas", "b": "1F30E", "j": ["globe", "earth", "international", "USA", "Americas", "world"]}, "globe-showing-asiaaustralia": {"a": "globe showing Asia-Australia", "b": "1F30F", "j": ["Asia", "globe", "earth", "globe_showing_asia_australia", "east", "Australia", "international", "world"]}, "globe-with-meridians": {"a": "globe with meridians", "b": "1F310", "j": ["meridians", "globe", "earth", "i18n", "international", "world", "internet", "interweb"]}, "world-map": {"a": "world map", "b": "1F5FA", "j": ["map", "location", "world", "direction"]}, "map-of-japan": {"a": "map of Japan", "b": "1F5FE", "j": ["asia", "map", "japanese", "country", "nation", "Japan"]}, "compass": {"a": "compass", "b": "1F9ED", "j": ["orienteering", "navigation", "magnetic"]}, "snowcapped-mountain": {"a": "snow-capped mountain", "b": "1F3D4", "j": ["snow", "mountain", "environment", "cold", "winter", "nature", "photo", "snow_capped_mountain"]}, "mountain": {"a": "mountain", "b": "26F0", "j": ["environment", "photo", "nature"]}, "volcano": {"a": "volcano", "b": "1F30B", "j": ["mountain", "eruption", "disaster", "nature", "photo"]}, "mount-fuji": {"a": "mount fuji", "b": "1F5FB", "j": ["fuji", "mountain", "japanese", "nature", "photo"]}, "camping": {"a": "camping", "b": "1F3D5", "j": ["outdoors", "photo", "tent"]}, "beach-with-umbrella": {"a": "beach with umbrella", "b": "1F3D6", "j": ["sand", "weather", "umbrella", "mojito", "summer", "sunny", "beach"]}, "desert": {"a": "desert", "b": "1F3DC", "j": ["warm", "saharah", "photo"]}, "desert-island": {"a": "desert island", "b": "1F3DD", "j": ["desert", "photo", "mojito", "tropical", "island"]}, "national-park": {"a": "national park", "b": "1F3DE", "j": ["environment", "park", "photo", "nature"]}, "stadium": {"a": "stadium", "b": "1F3DF", "j": ["venue", "sports", "place", "photo", "concert"]}, "classical-building": {"a": "classical building", "b": "1F3DB", "j": ["classical", "history", "culture", "art"]}, "building-construction": {"a": "building construction", "b": "1F3D7", "j": ["progress", "working", "wip", "construction"]}, "brick": {"a": "brick", "b": "1F9F1", "j": ["bricks", "wall", "clay", "mortar"]}, "rock": {"a": "rock", "b": "1FAA8", "j": ["stone", "heavy", "boulder", "solid"]}, "wood": {"a": "wood", "b": "1FAB5", "j": ["timber", "trunk", "log", "lumber", "nature"]}, "hut": {"a": "hut", "b": "1F6D6", "j": ["house", "structure", "yurt", "roundhouse"]}, "houses": {"a": "houses", "b": "1F3D8", "j": ["photo", "buildings"]}, "derelict-house": {"a": "derelict house", "b": "1F3DA", "j": ["abandon", "house", "broken", "building", "derelict", "evict"]}, "house": {"a": "house", "b": "1F3E0", "j": ["building", "home"]}, "house-with-garden": {"a": "house with garden", "b": "1F3E1", "j": ["garden", "house", "nature", "plant", "home"]}, "office-building": {"a": "office building", "b": "1F3E2", "j": ["bureau", "work", "building"]}, "japanese-post-office": {"a": "Japanese post office", "b": "1F3E3", "j": ["envelope", "communication", "Japanese", "building", "post"]}, "post-office": {"a": "post office", "b": "1F3E4", "j": ["email", "post", "European", "building"]}, "hospital": {"a": "hospital", "b": "1F3E5", "j": ["surgery", "building", "doctor", "medicine", "health"]}, "bank": {"a": "bank", "b": "1F3E6", "j": ["cash", "business", "building", "enterprise", "money", "sales"]}, "hotel": {"a": "hotel", "b": "1F3E8", "j": ["checkin", "accomodation", "building"]}, "love-hotel": {"a": "love hotel", "b": "1F3E9", "j": ["like", "dating", "love", "affection", "hotel"]}, "convenience-store": {"a": "convenience store", "b": "1F3EA", "j": ["shopping", "groceries", "building", "store", "convenience"]}, "school": {"a": "school", "b": "1F3EB", "j": ["learn", "building", "education", "student", "teach"]}, "department-store": {"a": "department store", "b": "1F3EC", "j": ["shopping", "department", "mall", "building", "store"]}, "factory": {"a": "factory", "b": "1F3ED", "j": ["smoke", "pollution", "building", "industry"]}, "japanese-castle": {"a": "Japanese castle", "b": "1F3EF", "j": ["castle", "Japanese", "photo", "building"]}, "castle": {"a": "castle", "b": "1F3F0", "j": ["history", "royalty", "European", "building"]}, "wedding": {"a": "wedding", "b": "1F492", "j": ["love", "like", "marriage", "bride", "groom", "romance", "chapel", "affection", "couple"]}, "tokyo-tower": {"a": "Tokyo tower", "b": "1F5FC", "j": ["japanese", "photo", "Tokyo", "tower"]}, "statue-of-liberty": {"a": "Statue of Liberty", "b": "1F5FD", "j": ["newyork", "liberty", "statue", "american"]}, "church": {"a": "church", "b": "26EA", "j": ["cross", "Christian", "building", "christ", "religion"]}, "mosque": {"a": "mosque", "b": "1F54C", "j": ["minaret", "worship", "islam", "Muslim", "religion"]}, "hindu-temple": {"a": "hindu temple", "b": "1F6D5", "j": ["hindu", "temple", "religion"]}, "synagogue": {"a": "synagogue", "b": "1F54D", "j": ["jewish", "Jew", "worship", "Jewish", "judaism", "temple", "religion"]}, "shinto-shrine": {"a": "shinto shrine", "b": "26E9", "j": ["kyoto", "shinto", "temple", "religion", "shrine", "japan"]}, "kaaba": {"a": "kaaba", "b": "1F54B", "j": ["mecca", "mosque", "islam", "Muslim", "religion"]}, "fountain": {"a": "fountain", "b": "26F2", "j": ["fresh", "photo", "summer", "water"]}, "tent": {"a": "tent", "b": "26FA", "j": ["photo", "outdoors", "camping"]}, "foggy": {"a": "foggy", "b": "1F301", "j": ["fog", "mountain", "photo"]}, "night-with-stars": {"a": "night with stars", "b": "1F303", "j": ["night", "downtown", "evening", "star", "city"]}, "cityscape": {"a": "cityscape", "b": "1F3D9", "j": ["night life", "urban", "city", "photo"]}, "sunrise-over-mountains": {"a": "sunrise over mountains", "b": "1F304", "j": ["sun", "sunrise", "mountain", "vacation", "morning", "view", "photo"]}, "sunrise": {"a": "sunrise", "b": "1F305", "j": ["sun", "vacation", "morning", "photo", "view"]}, "cityscape-at-dusk": {"a": "cityscape at dusk", "b": "1F306", "j": ["evening", "sunset", "city", "landscape", "sky", "dusk", "photo", "buildings"]}, "sunset": {"a": "sunset", "b": "1F307", "j": ["sun", "good morning", "dawn", "dusk", "photo"]}, "bridge-at-night": {"a": "bridge at night", "b": "1F309", "j": ["night", "sanfrancisco", "photo", "bridge"]}, "hot-springs": {"a": "hot springs", "b": "2668", "j": ["bath", "springs", "hot", "steaming", "relax", "warm", "hotsprings"]}, "carousel-horse": {"a": "carousel horse", "b": "1F3A0", "j": ["carnival", "carousel", "photo", "horse"]}, "ferris-wheel": {"a": "ferris wheel", "b": "1F3A1", "j": ["wheel", "carnival", "photo", "londoneye", "ferris", "amusement park"]}, "roller-coaster": {"a": "roller coaster", "b": "1F3A2", "j": ["coaster", "playground", "carnival", "photo", "fun", "roller", "amusement park"]}, "barber-pole": {"a": "barber pole", "b": "1F488", "j": ["salon", "hair", "style", "barber", "pole", "haircut"]}, "circus-tent": {"a": "circus tent", "b": "1F3AA", "j": ["festival", "carnival", "tent", "party", "circus"]}, "locomotive": {"a": "locomotive", "b": "1F682", "j": ["railway", "vehicle", "transportation", "engine", "train", "steam"]}, "railway-car": {"a": "railway car", "b": "1F683", "j": ["railway", "vehicle", "electric", "transportation", "tram", "trolleybus", "train", "car"]}, "highspeed-train": {"a": "high-speed train", "b": "1F684", "j": ["railway", "vehicle", "transportation", "speed", "high_speed_train", "train", "shinkansen"]}, "bullet-train": {"a": "bullet train", "b": "1F685", "j": ["railway", "vehicle", "bullet", "transportation", "fast", "speed", "travel", "shinkansen", "train", "public"]}, "train": {"a": "train", "b": "1F686", "j": ["railway", "vehicle", "transportation"]}, "metro": {"a": "metro", "b": "1F687", "j": ["subway", "transportation", "mrt", "blue-square", "underground", "tube"]}, "light-rail": {"a": "light rail", "b": "1F688", "j": ["railway", "vehicle", "transportation"]}, "station": {"a": "station", "b": "1F689", "j": ["railway", "vehicle", "transportation", "train", "public"]}, "tram": {"a": "tram", "b": "1F68A", "j": ["vehicle", "transportation", "trolleybus"]}, "monorail": {"a": "monorail", "b": "1F69D", "j": ["vehicle", "transportation"]}, "mountain-railway": {"a": "mountain railway", "b": "1F69E", "j": ["railway", "vehicle", "mountain", "transportation", "car"]}, "tram-car": {"a": "tram car", "b": "1F68B", "j": ["vehicle", "car", "transportation", "carriage", "trolleybus", "tram", "travel", "public"]}, "bus": {"a": "bus", "b": "1F68C", "j": ["vehicle", "transportation", "car"]}, "oncoming-bus": {"a": "oncoming bus", "b": "1F68D", "j": ["transportation", "vehicle", "oncoming", "bus"]}, "trolleybus": {"a": "trolleybus", "b": "1F68E", "j": ["vehicle", "bus", "transportation", "tram", "trolley", "bart"]}, "minibus": {"a": "minibus", "b": "1F690", "j": ["bus", "vehicle", "transportation", "car"]}, "ambulance": {"a": "ambulance", "b": "1F691", "j": ["hospital", "vehicle", "911", "health"]}, "fire-engine": {"a": "fire engine", "b": "1F692", "j": ["vehicle", "truck", "transportation", "engine", "cars", "fire"]}, "police-car": {"a": "police car", "b": "1F693", "j": ["vehicle", "police", "law", "transportation", "enforcement", "cars", "legal", "patrol", "car"]}, "oncoming-police-car": {"a": "oncoming police car", "b": "1F694", "j": ["vehicle", "police", "law", "oncoming", "enforcement", "911", "legal", "car"]}, "taxi": {"a": "taxi", "b": "1F695", "j": ["vehicle", "transportation", "cars", "uber"]}, "oncoming-taxi": {"a": "oncoming taxi", "b": "1F696", "j": ["vehicle", "oncoming", "cars", "uber", "taxi"]}, "automobile": {"a": "automobile", "b": "1F697", "j": ["vehicle", "transportation", "car", "red"]}, "oncoming-automobile": {"a": "oncoming automobile", "b": "1F698", "j": ["vehicle", "oncoming", "transportation", "automobile", "car"]}, "sport-utility-vehicle": {"a": "sport utility vehicle", "b": "1F699", "j": ["recreational", "vehicle", "sport utility", "transportation"]}, "pickup-truck": {"a": "pickup truck", "b": "1F6FB", "j": ["truck", "transportation", "pick-up", "pickup", "car"]}, "delivery-truck": {"a": "delivery truck", "b": "1F69A", "j": ["delivery", "transportation", "truck", "cars"]}, "articulated-lorry": {"a": "articulated lorry", "b": "1F69B", "j": ["vehicle", "truck", "lorry", "transportation", "express", "semi", "cars"]}, "tractor": {"a": "tractor", "b": "1F69C", "j": ["vehicle", "agriculture", "farming", "car"]}, "racing-car": {"a": "racing car", "b": "1F3CE", "j": ["formula", "f1", "fast", "sports", "race", "racing", "car"]}, "motorcycle": {"a": "motorcycle", "b": "1F3CD", "j": ["fast", "race", "sports", "racing"]}, "motor-scooter": {"a": "motor scooter", "b": "1F6F5", "j": ["vehicle", "scooter", "vespa", "sasha", "motor"]}, "manual-wheelchair": {"a": "manual wheelchair", "b": "1F9BD", "j": ["accessibility"]}, "motorized-wheelchair": {"a": "motorized wheelchair", "b": "1F9BC", "j": ["accessibility"]}, "auto-rickshaw": {"a": "auto rickshaw", "b": "1F6FA", "j": ["tuk tuk", "transportation", "move"]}, "bicycle": {"a": "bicycle", "b": "1F6B2", "j": ["bike", "hipster", "exercise", "sports"]}, "kick-scooter": {"a": "kick scooter", "b": "1F6F4", "j": ["scooter", "razor", "vehicle", "kick"]}, "skateboard": {"a": "skateboard", "b": "1F6F9", "j": ["board"]}, "roller-skate": {"a": "roller skate", "b": "1F6FC", "j": ["roller", "skate", "footwear", "sports"]}, "bus-stop": {"a": "bus stop", "b": "1F68F", "j": ["bus", "stop", "transportation", "busstop", "wait"]}, "motorway": {"a": "motorway", "b": "1F6E3", "j": ["highway", "road", "cupertino", "interstate"]}, "railway-track": {"a": "railway track", "b": "1F6E4", "j": ["railway", "train", "transportation"]}, "oil-drum": {"a": "oil drum", "b": "1F6E2", "j": ["barrell", "drum", "oil"]}, "fuel-pump": {"a": "fuel pump", "b": "26FD", "j": ["petroleum", "gas", "fuel", "pump", "fuelpump", "station", "gas station", "diesel"]}, "police-car-light": {"a": "police car light", "b": "1F6A8", "j": ["revolving", "beacon", "police", "alert", "law", "pinged", "emergency", "light", "ambulance", "911", "legal", "error", "car"]}, "horizontal-traffic-light": {"a": "horizontal traffic light", "b": "1F6A5", "j": ["transportation", "traffic", "light", "signal"]}, "vertical-traffic-light": {"a": "vertical traffic light", "b": "1F6A6", "j": ["traffic", "transportation", "light", "driving", "signal"]}, "stop-sign": {"a": "stop sign", "b": "1F6D1", "j": ["octagonal", "sign", "stop"]}, "construction": {"a": "construction", "b": "1F6A7", "j": ["warning", "wip", "barrier", "progress", "caution"]}, "anchor": {"a": "anchor", "b": "2693", "j": ["boat", "sea", "ferry", "ship", "tool"]}, "sailboat": {"a": "sailboat", "b": "26F5", "j": ["yacht", "resort", "boat", "sailing", "sea", "transportation", "water", "ship", "summer"]}, "canoe": {"a": "canoe", "b": "1F6F6", "j": ["paddle", "ship", "water", "boat"]}, "speedboat": {"a": "speedboat", "b": "1F6A4", "j": ["vehicle", "boat", "transportation", "ship", "summer"]}, "passenger-ship": {"a": "passenger ship", "b": "1F6F3", "j": ["yacht", "passenger", "cruise", "ferry", "ship"]}, "ferry": {"a": "ferry", "b": "26F4", "j": ["yacht", "ship", "passenger", "boat"]}, "motor-boat": {"a": "motor boat", "b": "1F6E5", "j": ["ship", "motorboat", "boat"]}, "ship": {"a": "ship", "b": "1F6A2", "j": ["titanic", "passenger", "boat", "transportation", "deploy"]}, "airplane": {"a": "airplane", "b": "2708", "j": ["vehicle", "flight", "transportation", "fly", "aeroplane"]}, "small-airplane": {"a": "small airplane", "b": "1F6E9", "j": ["vehicle", "flight", "transportation", "fly", "airplane", "aeroplane"]}, "airplane-departure": {"a": "airplane departure", "b": "1F6EB", "j": ["departure", "flight", "check-in", "airport", "airplane", "departures", "aeroplane", "landing"]}, "airplane-arrival": {"a": "airplane arrival", "b": "1F6EC", "j": ["arrivals", "arriving", "flight", "boarding", "airport", "airplane", "aeroplane", "landing"]}, "parachute": {"a": "parachute", "b": "1FA82", "j": ["skydive", "hang-glide", "fly", "parasail", "glide"]}, "seat": {"a": "seat", "b": "1F4BA", "j": ["bus", "transport", "flight", "chair", "sit", "fly", "airplane"]}, "helicopter": {"a": "helicopter", "b": "1F681", "j": ["vehicle", "transportation", "fly"]}, "suspension-railway": {"a": "suspension railway", "b": "1F69F", "j": ["railway", "vehicle", "transportation", "suspension"]}, "mountain-cableway": {"a": "mountain cableway", "b": "1F6A0", "j": ["vehicle", "mountain", "transportation", "ski", "gondola", "cable"]}, "aerial-tramway": {"a": "aerial tramway", "b": "1F6A1", "j": ["vehicle", "aerial", "transportation", "ski", "gondola", "cable", "tramway", "car"]}, "satellite": {"a": "satellite", "b": "1F6F0", "j": ["communication", "gps", "ISS", "space", "NASA", "orbit", "spaceflight"]}, "rocket": {"a": "rocket", "b": "1F680", "j": ["outer space", "launch", "NASA", "ship", "space", "staffmode", "fly", "outer_space"]}, "flying-saucer": {"a": "flying saucer", "b": "1F6F8", "j": ["transportation", "vehicle", "ufo", "UFO"]}, "bellhop-bell": {"a": "bellhop bell", "b": "1F6CE", "j": ["service", "bellhop", "hotel", "bell"]}, "luggage": {"a": "luggage", "b": "1F9F3", "j": ["packing", "travel"]}, "hourglass-done": {"a": "hourglass done", "b": "231B", "j": ["test", "quiz", "timer", "sand", "limit", "oldschool", "exam", "clock", "time"]}, "hourglass-not-done": {"a": "hourglass not done", "b": "23F3", "j": ["hourglass", "timer", "sand", "oldschool", "countdown", "time"]}, "watch": {"a": "watch", "b": "231A", "j": ["accessories", "clock", "time"]}, "alarm-clock": {"a": "alarm clock", "b": "23F0", "j": ["alarm", "clock", "wake", "time"]}, "stopwatch": {"a": "stopwatch", "b": "23F1", "j": ["clock", "time", "deadline"]}, "timer-clock": {"a": "timer clock", "b": "23F2", "j": ["clock", "alarm", "timer"]}, "mantelpiece-clock": {"a": "mantelpiece clock", "b": "1F570", "j": ["clock", "time"]}, "twelve-oclock": {"a": "twelve o’clock", "b": "1F55B", "j": ["midnight", "12", "12:00", "twelve", "midday", "noon", "late", "o’clock", "early", "twelve_o_clock", "schedule", "00", "clock", "time"]}, "twelvethirty": {"a": "twelve-thirty", "b": "1F567", "j": ["12", "twelve_thirty", "thirty", "twelve", "late", "early", "schedule", "12:30", "clock", "time"]}, "one-oclock": {"a": "one o’clock", "b": "1F550", "j": ["1:00", "1", "late", "time", "early", "o’clock", "schedule", "00", "one_o_clock", "clock", "one"]}, "onethirty": {"a": "one-thirty", "b": "1F55C", "j": ["1", "1:30", "thirty", "late", "time", "early", "schedule", "one_thirty", "clock", "one"]}, "two-oclock": {"a": "two o’clock", "b": "1F551", "j": ["two_o_clock", "2", "2:00", "late", "early", "schedule", "o’clock", "00", "clock", "two", "time"]}, "twothirty": {"a": "two-thirty", "b": "1F55D", "j": ["two_thirty", "2", "thirty", "late", "2:30", "early", "schedule", "clock", "two", "time"]}, "three-oclock": {"a": "three o’clock", "b": "1F552", "j": ["3:00", "three_o_clock", "late", "3", "early", "o’clock", "three", "schedule", "00", "clock", "time"]}, "threethirty": {"a": "three-thirty", "b": "1F55E", "j": ["thirty", "late", "3", "3:30", "three", "three_thirty", "early", "schedule", "clock", "time"]}, "four-oclock": {"a": "four o’clock", "b": "1F553", "j": ["four", "late", "early", "schedule", "o’clock", "4", "00", "four_o_clock", "clock", "4:00", "time"]}, "fourthirty": {"a": "four-thirty", "b": "1F55F", "j": ["thirty", "four", "late", "4:30", "early", "schedule", "four_thirty", "4", "clock", "time"]}, "five-oclock": {"a": "five o’clock", "b": "1F554", "j": ["five_o_clock", "late", "early", "schedule", "o’clock", "five", "00", "5:00", "5", "clock", "time"]}, "fivethirty": {"a": "five-thirty", "b": "1F560", "j": ["five_thirty", "thirty", "late", "early", "schedule", "five", "5", "clock", "5:30", "time"]}, "six-oclock": {"a": "six o’clock", "b": "1F555", "j": ["late", "early", "schedule", "o’clock", "six_o_clock", "6", "dawn", "00", "dusk", "6:00", "clock", "six", "time"]}, "sixthirty": {"a": "six-thirty", "b": "1F561", "j": ["thirty", "6:30", "late", "early", "schedule", "6", "six_thirty", "clock", "six", "time"]}, "seven-oclock": {"a": "seven o’clock", "b": "1F556", "j": ["7:00", "7", "seven_o_clock", "late", "early", "schedule", "o’clock", "seven", "00", "clock", "time"]}, "seventhirty": {"a": "seven-thirty", "b": "1F562", "j": ["seven_thirty", "7", "thirty", "7:30", "late", "early", "schedule", "seven", "clock", "time"]}, "eight-oclock": {"a": "eight o’clock", "b": "1F557", "j": ["8:00", "eight", "late", "o’clock", "early", "schedule", "00", "eight_o_clock", "clock", "8", "time"]}, "eightthirty": {"a": "eight-thirty", "b": "1F563", "j": ["8:30", "thirty", "eight_thirty", "eight", "late", "early", "schedule", "clock", "8", "time"]}, "nine-oclock": {"a": "nine o’clock", "b": "1F558", "j": ["nine", "9:00", "9", "nine_o_clock", "late", "early", "schedule", "o’clock", "00", "clock", "time"]}, "ninethirty": {"a": "nine-thirty", "b": "1F564", "j": ["nine", "9", "thirty", "late", "nine_thirty", "early", "schedule", "9:30", "clock", "time"]}, "ten-oclock": {"a": "ten o’clock", "b": "1F559", "j": ["ten", "late", "early", "schedule", "o’clock", "10:00", "00", "10", "ten_o_clock", "clock", "time"]}, "tenthirty": {"a": "ten-thirty", "b": "1F565", "j": ["10:30", "thirty", "ten", "late", "early", "schedule", "ten_thirty", "10", "clock", "time"]}, "eleven-oclock": {"a": "eleven o’clock", "b": "1F55A", "j": ["eleven_o_clock", "eleven", "late", "early", "schedule", "o’clock", "00", "11", "clock", "11:00", "time"]}, "eleventhirty": {"a": "eleven-thirty", "b": "1F566", "j": ["thirty", "eleven", "eleven_thirty", "late", "early", "schedule", "11:30", "11", "clock", "time"]}, "new-moon": {"a": "new moon", "b": "1F311", "j": ["night", "sleep", "evening", "moon", "nature", "space", "planet", "dark", "twilight"]}, "waxing-crescent-moon": {"a": "waxing crescent moon", "b": "1F312", "j": ["night", "sleep", "evening", "crescent", "moon", "nature", "space", "planet", "waxing", "twilight"]}, "first-quarter-moon": {"a": "first quarter moon", "b": "1F313", "j": ["night", "sleep", "evening", "moon", "nature", "space", "planet", "quarter", "twilight"]}, "waxing-gibbous-moon": {"a": "waxing gibbous moon", "b": "1F314", "j": ["night", "sleep", "evening", "moon", "nature", "sky", "space", "planet", "gibbous", "gray", "waxing", "twilight"]}, "full-moon": {"a": "full moon", "b": "1F315", "j": ["night", "full", "sleep", "evening", "moon", "nature", "space", "yellow", "planet", "twilight"]}, "waning-gibbous-moon": {"a": "waning gibbous moon", "b": "1F316", "j": ["night", "sleep", "waning", "evening", "moon", "nature", "waxing_gibbous_moon", "space", "planet", "gibbous", "twilight"]}, "last-quarter-moon": {"a": "last quarter moon", "b": "1F317", "j": ["night", "sleep", "evening", "moon", "nature", "space", "planet", "quarter", "twilight"]}, "waning-crescent-moon": {"a": "waning crescent moon", "b": "1F318", "j": ["night", "sleep", "waning", "evening", "crescent", "moon", "nature", "space", "planet", "twilight"]}, "crescent-moon": {"a": "crescent moon", "b": "1F319", "j": ["night", "sleep", "evening", "crescent", "moon", "sky", "magic"]}, "new-moon-face": {"a": "new moon face", "b": "1F31A", "j": ["night", "sleep", "evening", "moon", "face", "nature", "space", "planet", "twilight"]}, "first-quarter-moon-face": {"a": "first quarter moon face", "b": "1F31B", "j": ["night", "sleep", "evening", "moon", "face", "nature", "space", "planet", "quarter", "twilight"]}, "last-quarter-moon-face": {"a": "last quarter moon face", "b": "1F31C", "j": ["night", "sleep", "evening", "moon", "face", "nature", "space", "planet", "quarter", "twilight"]}, "thermometer": {"a": "thermometer", "b": "1F321", "j": ["weather", "hot", "cold", "temperature"]}, "sun": {"a": "sun", "b": "2600", "j": ["brightness", "rays", "spring", "bright", "nature", "weather", "summer", "sunny", "beach"]}, "full-moon-face": {"a": "full moon face", "b": "1F31D", "j": ["night", "full", "sleep", "evening", "moon", "bright", "face", "nature", "space", "planet", "twilight"]}, "sun-with-face": {"a": "sun with face", "b": "1F31E", "j": ["sun", "bright", "face", "nature", "sky", "morning"]}, "ringed-planet": {"a": "ringed planet", "b": "1FA90", "j": ["outerspace", "saturnine", "saturn"]}, "star": {"a": "star", "b": "2B50", "j": ["night", "yellow"]}, "glowing-star": {"a": "glowing star", "b": "1F31F", "j": ["awesome", "night", "shining", "star", "good", "glittery", "glow", "sparkle", "magic"]}, "shooting-star": {"a": "shooting star", "b": "1F320", "j": ["shooting", "night", "star", "falling", "photo"]}, "milky-way": {"a": "milky way", "b": "1F30C", "j": ["stars", "space", "photo"]}, "cloud": {"a": "cloud", "b": "2601", "j": ["weather", "sky"]}, "sun-behind-cloud": {"a": "sun behind cloud", "b": "26C5", "j": ["sun", "spring", "cloud", "nature", "weather", "morning", "fall", "cloudy"]}, "cloud-with-lightning-and-rain": {"a": "cloud with lightning and rain", "b": "26C8", "j": ["lightning", "rain", "cloud", "weather", "thunder"]}, "sun-behind-small-cloud": {"a": "sun behind small cloud", "b": "1F324", "j": ["sun", "weather", "cloud"]}, "sun-behind-large-cloud": {"a": "sun behind large cloud", "b": "1F325", "j": ["sun", "weather", "cloud"]}, "sun-behind-rain-cloud": {"a": "sun behind rain cloud", "b": "1F326", "j": ["sun", "weather", "rain", "cloud"]}, "cloud-with-rain": {"a": "cloud with rain", "b": "1F327", "j": ["weather", "rain", "cloud"]}, "cloud-with-snow": {"a": "cloud with snow", "b": "1F328", "j": ["weather", "snow", "cold", "cloud"]}, "cloud-with-lightning": {"a": "cloud with lightning", "b": "1F329", "j": ["weather", "lightning", "thunder", "cloud"]}, "tornado": {"a": "tornado", "b": "1F32A", "j": ["cyclone", "cloud", "weather", "twister", "whirlwind"]}, "fog": {"a": "fog", "b": "1F32B", "j": ["weather", "cloud"]}, "wind-face": {"a": "wind face", "b": "1F32C", "j": ["air", "blow", "face", "cloud", "gust", "wind"]}, "cyclone": {"a": "cyclone", "b": "1F300", "j": ["blue", "spin", "whirlpool", "typhoon", "cloud", "weather", "twister", "spiral", "dizzy", "hurricane", "vortex", "swirl", "tornado"]}, "rainbow": {"a": "rainbow", "b": "1F308", "j": ["rain", "spring", "nature", "sky", "photo", "unicorn_face", "happy"]}, "closed-umbrella": {"a": "closed umbrella", "b": "1F302", "j": ["rain", "umbrella", "weather", "clothing", "drizzle"]}, "umbrella": {"a": "umbrella", "b": "2602", "j": ["weather", "clothing", "rain", "spring"]}, "umbrella-with-rain-drops": {"a": "umbrella with rain drops", "b": "2614", "j": ["drop", "rain", "spring", "rainy", "umbrella", "clothing", "weather"]}, "umbrella-on-ground": {"a": "umbrella on ground", "b": "26F1", "j": ["sun", "rain", "umbrella", "weather", "summer"]}, "high-voltage": {"a": "high voltage", "b": "26A1", "j": ["danger", "lightning", "electric", "lightning bolt", "zap", "fast", "weather", "thunder", "voltage"]}, "snowflake": {"a": "snowflake", "b": "2744", "j": ["snow", "cold", "xmas", "winter", "season", "weather", "christmas"]}, "snowman": {"a": "snowman", "b": "2603", "j": ["snow", "cold", "winter", "xmas", "season", "weather", "frozen", "christmas"]}, "snowman-without-snow": {"a": "snowman without snow", "b": "26C4", "j": ["snow", "snowman", "cold", "winter", "xmas", "season", "weather", "frozen", "without_snow", "christmas"]}, "comet": {"a": "comet", "b": "2604", "j": ["space"]}, "fire": {"a": "fire", "b": "1F525", "j": ["flame", "cook", "tool", "hot"]}, "droplet": {"a": "droplet", "b": "1F4A7", "j": ["drop", "sweat", "drip", "spring", "cold", "water", "comic", "faucet"]}, "water-wave": {"a": "water wave", "b": "1F30A", "j": ["wave", "tsunami", "disaster", "sea", "water", "nature", "ocean"]}, "jackolantern": {"a": "jack-o-lantern", "b": "1F383", "j": ["jack_o_lantern", "creepy", "celebration", "halloween", "pumpkin", "light", "fall", "jack", "lantern"]}, "christmas-tree": {"a": "Christmas tree", "b": "1F384", "j": ["vacation", "festival", "xmas", "celebration", "Christmas", "december", "tree"]}, "fireworks": {"a": "fireworks", "b": "1F386", "j": ["congratulations", "festival", "celebration", "carnival", "photo"]}, "sparkler": {"a": "sparkler", "b": "1F387", "j": ["night", "fireworks", "shine", "stars", "celebration", "sparkle"]}, "firecracker": {"a": "firecracker", "b": "1F9E8", "j": ["boom", "fireworks", "explode", "explosion", "explosive", "dynamite"]}, "sparkles": {"a": "sparkles", "b": "2728", "j": ["awesome", "shiny", "cool", "shine", "star", "stars", "*", "good", "sparkle", "magic"]}, "balloon": {"a": "balloon", "b": "1F388", "j": ["birthday", "circus", "celebration", "party"]}, "party-popper": {"a": "party popper", "b": "1F389", "j": ["birthday", "tada", "congratulations", "popper", "celebration", "party", "circus", "magic"]}, "confetti-ball": {"a": "confetti ball", "b": "1F38A", "j": ["birthday", "festival", "ball", "celebration", "party", "confetti", "circus"]}, "tanabata-tree": {"a": "tanabata tree", "b": "1F38B", "j": ["banner", "Japanese", "nature", "celebration", "plant", "summer", "tree", "branch"]}, "pine-decoration": {"a": "pine decoration", "b": "1F38D", "j": ["bamboo", "panda", "pine", "Japanese", "nature", "celebration", "plant", "vegetable"]}, "japanese-dolls": {"a": "Japanese dolls", "b": "1F38E", "j": ["toy", "Japanese", "festival", "japanese", "celebration", "kimono", "doll"]}, "carp-streamer": {"a": "carp streamer", "b": "1F38F", "j": ["carp", "banner", "japanese", "fish", "celebration", "streamer", "koinobori"]}, "wind-chime": {"a": "wind chime", "b": "1F390", "j": ["ding", "spring", "chime", "bell", "celebration", "nature", "wind"]}, "moon-viewing-ceremony": {"a": "moon viewing ceremony", "b": "1F391", "j": ["tsukimi", "asia", "moon", "celebration", "ceremony", "photo", "japan"]}, "red-envelope": {"a": "red envelope", "b": "1F9E7", "j": ["hóngbāo", "lai see", "gift", "money", "good luck"]}, "ribbon": {"a": "ribbon", "b": "1F380", "j": ["bowtie", "pink", "girl", "decoration", "celebration"]}, "wrapped-gift": {"a": "wrapped gift", "b": "1F381", "j": ["birthday", "xmas", "celebration", "gift", "present", "wrapped", "box", "christmas"]}, "reminder-ribbon": {"a": "reminder ribbon", "b": "1F397", "j": ["cause", "support", "sports", "celebration", "reminder", "awareness", "ribbon"]}, "admission-tickets": {"a": "admission tickets", "b": "1F39F", "j": ["admission", "sports", "ticket", "entrance", "concert"]}, "ticket": {"a": "ticket", "b": "1F3AB", "j": ["admission", "event", "pass", "concert"]}, "military-medal": {"a": "military medal", "b": "1F396", "j": ["medal", "military", "award", "celebration", "army", "winning"]}, "trophy": {"a": "trophy", "b": "1F3C6", "j": ["ftw", "award", "contest", "place", "ceremony", "win", "prize"]}, "sports-medal": {"a": "sports medal", "b": "1F3C5", "j": ["medal", "winning", "award"]}, "1st-place-medal": {"a": "1st place medal", "b": "1F947", "j": ["medal", "award", "first", "gold", "winning"]}, "2nd-place-medal": {"a": "2nd place medal", "b": "1F948", "j": ["second", "medal", "award", "silver"]}, "3rd-place-medal": {"a": "3rd place medal", "b": "1F949", "j": ["medal", "award", "third", "bronze"]}, "soccer-ball": {"a": "soccer ball", "b": "26BD", "j": ["sports", "soccer", "football", "ball"]}, "baseball": {"a": "baseball", "b": "26BE", "j": ["balls", "sports", "ball"]}, "softball": {"a": "softball", "b": "1F94E", "j": ["underarm", "sports", "ball", "balls", "glove"]}, "basketball": {"a": "basketball", "b": "1F3C0", "j": ["hoop", "sports", "ball", "balls", "NBA"]}, "volleyball": {"a": "volleyball", "b": "1F3D0", "j": ["game", "balls", "sports", "ball"]}, "american-football": {"a": "american football", "b": "1F3C8", "j": ["sports", "NFL", "ball", "balls", "american", "football"]}, "rugby-football": {"a": "rugby football", "b": "1F3C9", "j": ["team", "sports", "ball", "rugby", "football"]}, "tennis": {"a": "tennis", "b": "1F3BE", "j": ["racquet", "sports", "ball", "balls", "green"]}, "flying-disc": {"a": "flying disc", "b": "1F94F", "j": ["frisbee", "ultimate", "sports"]}, "bowling": {"a": "bowling", "b": "1F3B3", "j": ["play", "sports", "ball", "game", "fun"]}, "cricket-game": {"a": "cricket game", "b": "1F3CF", "j": ["ball", "game", "bat", "sports"]}, "field-hockey": {"a": "field hockey", "b": "1F3D1", "j": ["stick", "ball", "sports", "field", "game", "hockey"]}, "ice-hockey": {"a": "ice hockey", "b": "1F3D2", "j": ["stick", "hockey", "ice", "sports", "game", "puck"]}, "lacrosse": {"a": "lacrosse", "b": "1F94D", "j": ["stick", "goal", "sports", "ball"]}, "ping-pong": {"a": "ping pong", "b": "1F3D3", "j": ["pingpong", "bat", "sports", "paddle", "ball", "game", "table tennis"]}, "badminton": {"a": "badminton", "b": "1F3F8", "j": ["shuttlecock", "racquet", "sports", "game", "birdie"]}, "boxing-glove": {"a": "boxing glove", "b": "1F94A", "j": ["boxing", "fighting", "sports", "glove"]}, "martial-arts-uniform": {"a": "martial arts uniform", "b": "1F94B", "j": ["judo", "martial arts", "taekwondo", "uniform", "karate"]}, "goal-net": {"a": "goal net", "b": "1F945", "j": ["goal", "net", "sports"]}, "flag-in-hole": {"a": "flag in hole", "b": "26F3", "j": ["business", "flag", "golf", "sports", "summer", "hole"]}, "ice-skate": {"a": "ice skate", "b": "26F8", "j": ["ice", "skate", "sports"]}, "fishing-pole": {"a": "fishing pole", "b": "1F3A3", "j": ["hobby", "fish", "food", "pole", "summer"]}, "diving-mask": {"a": "diving mask", "b": "1F93F", "j": ["scuba", "diving", "sport", "ocean", "snorkeling"]}, "running-shirt": {"a": "running shirt", "b": "1F3BD", "j": ["sash", "shirt", "athletics", "play", "pageant", "running"]}, "skis": {"a": "skis", "b": "1F3BF", "j": ["snow", "cold", "winter", "sports", "ski"]}, "sled": {"a": "sled", "b": "1F6F7", "j": ["luge", "toboggan", "sledge", "sleigh"]}, "curling-stone": {"a": "curling stone", "b": "1F94C", "j": ["game", "rock", "sports"]}, "bullseye": {"a": "bullseye", "b": "1F3AF", "j": ["target", "direct hit", "play", "dart", "hit", "bar", "game", "direct_hit"]}, "yoyo": {"a": "yo-yo", "b": "1FA80", "j": ["fluctuate", "toy", "yo_yo"]}, "kite": {"a": "kite", "b": "1FA81", "j": ["soar", "wind", "fly"]}, "pool-8-ball": {"a": "pool 8 ball", "b": "1F3B1", "j": ["pool", "hobby", "billiard", "eight", "ball", "game", "luck", "8", "magic"]}, "crystal-ball": {"a": "crystal ball", "b": "1F52E", "j": ["disco", "tool", "crystal", "ball", "fairy tale", "fantasy", "party", "fortune_teller", "circus", "fortune", "magic"]}, "magic-wand": {"a": "magic wand", "b": "1FA84", "j": ["witch", "power", "supernature", "wizard", "magic"]}, "nazar-amulet": {"a": "nazar amulet", "b": "1F9FF", "j": ["talisman", "charm", "bead", "nazar", "evil-eye"]}, "video-game": {"a": "video game", "b": "1F3AE", "j": ["controller", "play", "game", "PS4", "console"]}, "joystick": {"a": "joystick", "b": "1F579", "j": ["play", "game", "video game"]}, "slot-machine": {"a": "slot machine", "b": "1F3B0", "j": ["slot", "gamble", "casino", "game", "luck", "fruit machine", "bet", "vegas"]}, "game-die": {"a": "game die", "b": "1F3B2", "j": ["random", "play", "dice", "game", "luck", "die", "tabletop"]}, "puzzle-piece": {"a": "puzzle piece", "b": "1F9E9", "j": ["puzzle", "interlocking", "clue", "piece", "jigsaw"]}, "teddy-bear": {"a": "teddy bear", "b": "1F9F8", "j": ["plush", "toy", "plaything", "stuffed"]}, "piata": {"a": "piñata", "b": "1FA85", "j": ["mexico", "celebration", "candy", "pinata", "party"]}, "nesting-dolls": {"a": "nesting dolls", "b": "1FA86", "j": ["nesting", "toy", "russia", "matryoshka", "doll"]}, "spade-suit": {"a": "spade suit", "b": "2660", "j": ["card", "cards", "suits", "game", "poker", "magic"]}, "heart-suit": {"a": "heart suit", "b": "2665", "j": ["card", "cards", "suits", "game", "poker", "magic"]}, "diamond-suit": {"a": "diamond suit", "b": "2666", "j": ["card", "cards", "suits", "game", "poker", "magic"]}, "club-suit": {"a": "club suit", "b": "2663", "j": ["card", "cards", "suits", "game", "poker", "magic"]}, "chess-pawn": {"a": "chess pawn", "b": "265F", "j": ["chess", "expendable", "dupe"]}, "joker": {"a": "joker", "b": "1F0CF", "j": ["play", "magic", "card", "game", "poker", "wildcard", "cards"]}, "mahjong-red-dragon": {"a": "mahjong red dragon", "b": "1F004", "j": ["play", "mahjong", "kanji", "game", "red", "chinese"]}, "flower-playing-cards": {"a": "flower playing cards", "b": "1F3B4", "j": ["flower", "sunset", "card", "Japanese", "playing", "game", "red"]}, "performing-arts": {"a": "performing arts", "b": "1F3AD", "j": ["theater", "acting", "mask", "performing", "drama", "art", "theatre"]}, "framed-picture": {"a": "framed picture", "b": "1F5BC", "j": ["picture", "photography", "painting", "frame", "museum", "art"]}, "artist-palette": {"a": "artist palette", "b": "1F3A8", "j": ["draw", "design", "colors", "paint", "palette", "painting", "museum", "art"]}, "thread": {"a": "thread", "b": "1F9F5", "j": ["string", "needle", "spool", "sewing"]}, "sewing-needle": {"a": "sewing needle", "b": "1FAA1", "j": ["sutures", "stitches", "embroidery", "tailoring", "sewing", "needle"]}, "yarn": {"a": "yarn", "b": "1F9F6", "j": ["crochet", "knit", "ball"]}, "knot": {"a": "knot", "b": "1FAA2", "j": ["tangled", "twist", "rope", "tie", "twine", "scout"]}, "glasses": {"a": "glasses", "b": "1F453", "j": ["accessories", "nerdy", "geek", "eyeglasses", "eyesight", "clothing", "eye", "fashion", "eyewear", "dork"]}, "sunglasses": {"a": "sunglasses", "b": "1F576", "j": ["accessories", "glasses", "cool", "face", "eye", "eyewear", "dark"]}, "goggles": {"a": "goggles", "b": "1F97D", "j": ["welding", "swimming", "protection", "safety", "eye protection", "eyes"]}, "lab-coat": {"a": "lab coat", "b": "1F97C", "j": ["scientist", "chemist", "doctor", "experiment"]}, "safety-vest": {"a": "safety vest", "b": "1F9BA", "j": ["protection", "safety", "emergency", "vest"]}, "necktie": {"a": "necktie", "b": "1F454", "j": ["shirt", "business", "cloth", "formal", "tie", "clothing", "suitup", "fashion"]}, "tshirt": {"a": "t-shirt", "b": "1F455", "j": ["t_shirt", "shirt", "cloth", "clothing", "fashion", "tee", "casual"]}, "jeans": {"a": "jeans", "b": "1F456", "j": ["shopping", "trousers", "clothing", "fashion", "pants"]}, "scarf": {"a": "scarf", "b": "1F9E3", "j": ["neck", "winter", "clothes"]}, "gloves": {"a": "gloves", "b": "1F9E4", "j": ["hands", "hand", "winter", "clothes"]}, "coat": {"a": "coat", "b": "1F9E5", "j": ["jacket"]}, "socks": {"a": "socks", "b": "1F9E6", "j": ["stockings", "stocking", "clothes"]}, "dress": {"a": "dress", "b": "1F457", "j": ["shopping", "clothing", "fashion", "clothes"]}, "kimono": {"a": "kimono", "b": "1F458", "j": ["dress", "japanese", "clothing", "fashion", "women", "female"]}, "sari": {"a": "sari", "b": "1F97B", "j": ["dress", "clothing"]}, "onepiece-swimsuit": {"a": "one-piece swimsuit", "b": "1FA71", "j": ["one_piece_swimsuit", "fashion", "bathing suit"]}, "briefs": {"a": "briefs", "b": "1FA72", "j": ["swimsuit", "one-piece", "clothing", "underwear", "bathing suit"]}, "shorts": {"a": "shorts", "b": "1FA73", "j": ["clothing", "underwear", "pants", "bathing suit"]}, "bikini": {"a": "bikini", "b": "1F459", "j": ["swim", "woman", "girl", "swimming", "clothing", "fashion", "summer", "beach", "female"]}, "womans-clothes": {"a": "woman’s clothes", "b": "1F45A", "j": ["woman_s_clothes", "woman", "shopping_bags", "clothing", "fashion", "female"]}, "purse": {"a": "purse", "b": "1F45B", "j": ["accessories", "shopping", "clothing", "fashion", "money", "coin", "sales"]}, "handbag": {"a": "handbag", "b": "1F45C", "j": ["accessories", "shopping", "accessory", "clothing", "bag", "fashion", "purse"]}, "clutch-bag": {"a": "clutch bag", "b": "1F45D", "j": ["accessories", "shopping", "pouch", "clothing", "bag"]}, "shopping-bags": {"a": "shopping bags", "b": "1F6CD", "j": ["shopping", "mall", "buy", "bag", "purchase", "hotel"]}, "backpack": {"a": "backpack", "b": "1F392", "j": ["satchel", "school", "education", "student", "bag", "rucksack"]}, "thong-sandal": {"a": "thong sandal", "b": "1FA74", "j": ["beach sandals", "thong sandals", "zōri", "thongs", "sandals", "summer", "footwear"]}, "mans-shoe": {"a": "man’s shoe", "b": "1F45E", "j": ["man", "male", "man_s_shoe", "clothing", "fashion", "shoe"]}, "running-shoe": {"a": "running shoe", "b": "1F45F", "j": ["sneakers", "sneaker", "athletic", "shoes", "sports", "clothing", "shoe"]}, "hiking-boot": {"a": "hiking boot", "b": "1F97E", "j": ["backpacking", "boot", "camping", "hiking"]}, "flat-shoe": {"a": "flat shoe", "b": "1F97F", "j": ["ballet flat", "slip-on", "slipper", "ballet"]}, "highheeled-shoe": {"a": "high-heeled shoe", "b": "1F460", "j": ["woman", "pumps", "shoes", "heel", "high_heeled_shoe", "clothing", "fashion", "stiletto", "shoe", "female"]}, "womans-sandal": {"a": "woman’s sandal", "b": "1F461", "j": ["sandal", "woman", "shoes", "flip flops", "clothing", "woman_s_sandal", "fashion", "shoe"]}, "ballet-shoes": {"a": "ballet shoes", "b": "1FA70", "j": ["ballet", "dance"]}, "womans-boot": {"a": "woman’s boot", "b": "1F462", "j": ["woman", "shoes", "clothing", "fashion", "shoe", "boot", "woman_s_boot"]}, "crown": {"a": "crown", "b": "1F451", "j": ["royalty", "kod", "leader", "king", "clothing", "lord", "queen"]}, "womans-hat": {"a": "woman’s hat", "b": "1F452", "j": ["accessories", "spring", "woman", "lady", "woman_s_hat", "hat", "clothing", "fashion", "female"]}, "top-hat": {"a": "top hat", "b": "1F3A9", "j": ["classy", "top", "magic", "hat", "clothing", "tophat", "circus", "gentleman"]}, "graduation-cap": {"a": "graduation cap", "b": "1F393", "j": ["learn", "school", "hat", "college", "cap", "celebration", "clothing", "degree", "education", "legal", "university", "graduation"]}, "billed-cap": {"a": "billed cap", "b": "1F9E2", "j": ["cap", "baseball cap", "baseball"]}, "military-helmet": {"a": "military helmet", "b": "1FA96", "j": ["military", "warrior", "army", "helmet", "protection", "soldier"]}, "rescue-workers-helmet": {"a": "rescue worker’s helmet", "b": "26D1", "j": ["cross", "aid", "build", "construction", "face", "hat", "helmet", "rescue_worker_s_helmet"]}, "prayer-beads": {"a": "prayer beads", "b": "1F4FF", "j": ["dhikr", "religious", "beads", "clothing", "prayer", "necklace", "religion"]}, "lipstick": {"a": "lipstick", "b": "1F484", "j": ["woman", "girl", "makeup", "fashion", "cosmetics", "female"]}, "ring": {"a": "ring", "b": "1F48D", "j": ["wedding", "diamond", "marriage", "valentines", "propose", "fashion", "gem", "engagement", "jewelry"]}, "gem-stone": {"a": "gem stone", "b": "1F48E", "j": ["blue", "diamond", "gem", "ruby", "jewelry", "jewel"]}, "muted-speaker": {"a": "muted speaker", "b": "1F507", "j": ["silence", "speaker", "sound", "mute", "quiet", "silent", "volume"]}, "speaker-low-volume": {"a": "speaker low volume", "b": "1F508", "j": ["silence", "sound", "soft", "broadcast", "volume"]}, "speaker-medium-volume": {"a": "speaker medium volume", "b": "1F509", "j": ["speaker", "broadcast", "medium", "volume"]}, "speaker-high-volume": {"a": "speaker high volume", "b": "1F50A", "j": ["noisy", "noise", "speaker", "broadcast", "volume", "loud"]}, "loudspeaker": {"a": "loudspeaker", "b": "1F4E2", "j": ["public address", "volume", "sound", "loud"]}, "megaphone": {"a": "megaphone", "b": "1F4E3", "j": ["volume", "sound", "cheering", "speaker"]}, "postal-horn": {"a": "postal horn", "b": "1F4EF", "j": ["instrument", "horn", "post", "postal", "music"]}, "bell": {"a": "bell", "b": "1F514", "j": ["sound", "xmas", "chime", "notification", "christmas"]}, "bell-with-slash": {"a": "bell with slash", "b": "1F515", "j": ["forbidden", "sound", "mute", "bell", "quiet", "silent", "volume"]}, "musical-score": {"a": "musical score", "b": "1F3BC", "j": ["clef", "score", "treble", "compose", "music"]}, "musical-note": {"a": "musical note", "b": "1F3B5", "j": ["tone", "score", "sound", "note", "music"]}, "musical-notes": {"a": "musical notes", "b": "1F3B6", "j": ["notes", "note", "score", "music"]}, "studio-microphone": {"a": "studio microphone", "b": "1F399", "j": ["studio", "sing", "artist", "recording", "talkshow", "microphone", "mic", "music"]}, "level-slider": {"a": "level slider", "b": "1F39A", "j": ["slider", "music", "scale", "level"]}, "control-knobs": {"a": "control knobs", "b": "1F39B", "j": ["control", "dial", "music", "knobs"]}, "microphone": {"a": "microphone", "b": "1F3A4", "j": ["PA", "sing", "sound", "talkshow", "mic", "karaoke", "music"]}, "headphone": {"a": "headphone", "b": "1F3A7", "j": ["gadgets", "score", "earbud", "music"]}, "radio": {"a": "radio", "b": "1F4FB", "j": ["communication", "video", "program", "podcast", "music"]}, "saxophone": {"a": "saxophone", "b": "1F3B7", "j": ["sax", "instrument", "jazz", "blues", "music"]}, "accordion": {"a": "accordion", "b": "1FA97", "j": ["squeeze box", "music", "concertina"]}, "guitar": {"a": "guitar", "b": "1F3B8", "j": ["music", "instrument"]}, "musical-keyboard": {"a": "musical keyboard", "b": "1F3B9", "j": ["keyboard", "piano", "compose", "instrument", "music"]}, "trumpet": {"a": "trumpet", "b": "1F3BA", "j": ["brass", "music", "instrument"]}, "violin": {"a": "violin", "b": "1F3BB", "j": ["symphony", "orchestra", "music", "instrument"]}, "banjo": {"a": "banjo", "b": "1FA95", "j": ["instructment", "stringed", "music"]}, "drum": {"a": "drum", "b": "1F941", "j": ["drumsticks", "snare", "music", "instrument"]}, "long-drum": {"a": "long drum", "b": "1FA98", "j": ["drum", "beat", "conga", "music", "rhythm"]}, "mobile-phone": {"a": "mobile phone", "b": "1F4F1", "j": ["apple", "phone", "telephone", "mobile", "gadgets", "dial", "cell", "technology"]}, "mobile-phone-with-arrow": {"a": "mobile phone with arrow", "b": "1F4F2", "j": ["arrow", "incoming", "iphone", "phone", "mobile", "receive", "cell"]}, "telephone": {"a": "telephone", "b": "260E", "j": ["dial", "technology", "communication", "phone"]}, "telephone-receiver": {"a": "telephone receiver", "b": "1F4DE", "j": ["communication", "phone", "telephone", "dial", "receiver", "technology"]}, "pager": {"a": "pager", "b": "1F4DF", "j": ["90s", "bbcall", "oldschool"]}, "fax-machine": {"a": "fax machine", "b": "1F4E0", "j": ["fax", "technology", "communication"]}, "battery": {"a": "battery", "b": "1F50B", "j": ["energy", "power", "sustain"]}, "electric-plug": {"a": "electric plug", "b": "1F50C", "j": ["electric", "power", "charger", "electricity", "plug"]}, "laptop": {"a": "laptop", "b": "1F4BB", "j": ["computer", "display", "monitor", "pc", "screen", "technology", "personal"]}, "desktop-computer": {"a": "desktop computer", "b": "1F5A5", "j": ["computer", "desktop", "computing", "screen", "technology"]}, "printer": {"a": "printer", "b": "1F5A8", "j": ["ink", "computer", "paper"]}, "keyboard": {"a": "keyboard", "b": "2328", "j": ["computer", "text", "input", "type", "technology"]}, "computer-mouse": {"a": "computer mouse", "b": "1F5B1", "j": ["computer", "click"]}, "trackball": {"a": "trackball", "b": "1F5B2", "j": ["trackpad", "computer", "technology"]}, "computer-disk": {"a": "computer disk", "b": "1F4BD", "j": ["minidisk", "computer", "disk", "optical", "record", "90s", "technology", "data"]}, "floppy-disk": {"a": "floppy disk", "b": "1F4BE", "j": ["floppy", "computer", "disk", "80s", "save", "oldschool", "90s", "technology"]}, "optical-disk": {"a": "optical disk", "b": "1F4BF", "j": ["cd", "computer", "disk", "dvd", "optical", "90s", "technology", "disc"]}, "dvd": {"a": "dvd", "b": "1F4C0", "j": ["cd", "computer", "disk", "optical", "blu-ray", "disc"]}, "abacus": {"a": "abacus", "b": "1F9EE", "j": ["calculation"]}, "movie-camera": {"a": "movie camera", "b": "1F3A5", "j": ["cinema", "camera", "record", "film", "movie"]}, "film-frames": {"a": "film frames", "b": "1F39E", "j": ["frames", "movie", "cinema", "film"]}, "film-projector": {"a": "film projector", "b": "1F4FD", "j": ["cinema", "video", "record", "projector", "film", "tape", "movie"]}, "clapper-board": {"a": "clapper board", "b": "1F3AC", "j": ["movie", "clapper", "record", "film"]}, "television": {"a": "television", "b": "1F4FA", "j": ["video", "program", "oldschool", "show", "technology", "tv"]}, "camera": {"a": "camera", "b": "1F4F7", "j": ["gadgets", "photography", "video"]}, "camera-with-flash": {"a": "camera with flash", "b": "1F4F8", "j": ["video", "camera", "gadgets", "photography", "flash"]}, "video-camera": {"a": "video camera", "b": "1F4F9", "j": ["camera", "video", "record", "film"]}, "videocassette": {"a": "videocassette", "b": "1F4FC", "j": ["video", "80s", "record", "tape", "vhs", "oldschool", "90s"]}, "magnifying-glass-tilted-left": {"a": "magnifying glass tilted left", "b": "1F50D", "j": ["magnifying", "find", "search", "tool", "glass", "zoom", "detective"]}, "magnifying-glass-tilted-right": {"a": "magnifying glass tilted right", "b": "1F50E", "j": ["magnifying", "find", "search", "tool", "glass", "zoom", "detective"]}, "candle": {"a": "candle", "b": "1F56F", "j": ["wax", "light", "fire"]}, "light-bulb": {"a": "light bulb", "b": "1F4A1", "j": ["electric", "bulb", "comic", "light", "electricity", "idea"]}, "flashlight": {"a": "flashlight", "b": "1F526", "j": ["night", "electric", "sight", "torch", "light", "camping", "dark", "tool"]}, "red-paper-lantern": {"a": "red paper lantern", "b": "1F3EE", "j": ["paper", "bar", "halloween", "red", "light", "spooky", "lantern"]}, "diya-lamp": {"a": "diya lamp", "b": "1FA94", "j": ["lighting", "lamp", "diya", "oil"]}, "notebook-with-decorative-cover": {"a": "notebook with decorative cover", "b": "1F4D4", "j": ["book", "paper", "decorated", "record", "study", "cover", "classroom", "notes", "notebook"]}, "closed-book": {"a": "closed book", "b": "1F4D5", "j": ["learn", "book", "library", "read", "closed", "textbook", "knowledge"]}, "open-book": {"a": "open book", "b": "1F4D6", "j": ["learn", "book", "literature", "library", "study", "open", "read", "knowledge"]}, "green-book": {"a": "green book", "b": "1F4D7", "j": ["book", "library", "study", "read", "green", "knowledge"]}, "blue-book": {"a": "blue book", "b": "1F4D8", "j": ["blue", "learn", "book", "library", "study", "read", "knowledge"]}, "orange-book": {"a": "orange book", "b": "1F4D9", "j": ["book", "library", "orange", "study", "read", "textbook", "knowledge"]}, "books": {"a": "books", "b": "1F4DA", "j": ["book", "study", "library", "literature"]}, "notebook": {"a": "notebook", "b": "1F4D3", "j": ["paper", "record", "study", "stationery", "notes"]}, "ledger": {"a": "ledger", "b": "1F4D2", "j": ["notebook", "paper", "notes"]}, "page-with-curl": {"a": "page with curl", "b": "1F4C3", "j": ["document", "page", "curl", "paper", "documents", "office"]}, "scroll": {"a": "scroll", "b": "1F4DC", "j": ["paper", "history", "documents", "ancient"]}, "page-facing-up": {"a": "page facing up", "b": "1F4C4", "j": ["document", "page", "paper", "documents", "office", "information"]}, "newspaper": {"a": "newspaper", "b": "1F4F0", "j": ["headline", "paper", "press", "news"]}, "rolledup-newspaper": {"a": "rolled-up newspaper", "b": "1F5DE", "j": ["rolled_up_newspaper", "paper", "press", "news", "headline", "rolled", "newspaper"]}, "bookmark-tabs": {"a": "bookmark tabs", "b": "1F4D1", "j": ["order", "mark", "bookmark", "save", "favorite", "marker", "tidy", "tabs"]}, "bookmark": {"a": "bookmark", "b": "1F516", "j": ["save", "label", "favorite", "mark"]}, "label": {"a": "label", "b": "1F3F7", "j": ["tag", "sale"]}, "money-bag": {"a": "money bag", "b": "1F4B0", "j": ["moneybag", "dollar", "payment", "bag", "money", "coins", "sale"]}, "coin": {"a": "coin", "b": "1FA99", "j": ["metal", "currency", "silver", "treasure", "money", "gold"]}, "yen-banknote": {"a": "yen banknote", "b": "1F4B4", "j": ["bill", "currency", "japanese", "banknote", "dollar", "note", "yen", "money", "sales"]}, "dollar-banknote": {"a": "dollar banknote", "b": "1F4B5", "j": ["bill", "currency", "banknote", "dollar", "note", "money", "sales"]}, "euro-banknote": {"a": "euro banknote", "b": "1F4B6", "j": ["bill", "currency", "euro", "banknote", "dollar", "note", "money", "sales"]}, "pound-banknote": {"a": "pound banknote", "b": "1F4B7", "j": ["bill", "england", "currency", "british", "banknote", "uk", "note", "sterling", "sales", "money", "pound", "bills"]}, "money-with-wings": {"a": "money with wings", "b": "1F4B8", "j": ["bill", "banknote", "dollar", "payment", "money", "fly", "wings", "bills", "sale"]}, "credit-card": {"a": "credit card", "b": "1F4B3", "j": ["shopping", "bill", "card", "dollar", "credit", "payment", "money", "sales"]}, "receipt": {"a": "receipt", "b": "1F9FE", "j": ["bookkeeping", "accounting", "expenses", "evidence", "proof"]}, "chart-increasing-with-yen": {"a": "chart increasing with yen", "b": "1F4B9", "j": ["stats", "graph", "growth", "chart", "yen", "money", "presentation", "green-square"]}, "envelope": {"a": "envelope", "b": "2709", "j": ["letter", "communication", "email", "inbox", "postal"]}, "email": {"a": "e-mail", "b": "1F4E7", "j": ["e_mail", "letter", "communication", "mail", "inbox"]}, "incoming-envelope": {"a": "incoming envelope", "b": "1F4E8", "j": ["envelope", "incoming", "letter", "email", "receive", "e-mail", "inbox"]}, "envelope-with-arrow": {"a": "envelope with arrow", "b": "1F4E9", "j": ["arrow", "envelope", "communication", "email", "outgoing", "e-mail"]}, "outbox-tray": {"a": "outbox tray", "b": "1F4E4", "j": ["letter", "email", "outbox", "mail", "inbox", "box", "sent", "tray"]}, "inbox-tray": {"a": "inbox tray", "b": "1F4E5", "j": ["letter", "email", "documents", "mail", "receive", "inbox", "box", "tray"]}, "package": {"a": "package", "b": "1F4E6", "j": ["moving", "gift", "mail", "cardboard", "box", "parcel"]}, "closed-mailbox-with-raised-flag": {"a": "closed mailbox with raised flag", "b": "1F4EB", "j": ["postbox", "communication", "email", "mailbox", "closed", "mail", "inbox"]}, "closed-mailbox-with-lowered-flag": {"a": "closed mailbox with lowered flag", "b": "1F4EA", "j": ["postbox", "communication", "email", "lowered", "mailbox", "closed", "mail", "inbox"]}, "open-mailbox-with-raised-flag": {"a": "open mailbox with raised flag", "b": "1F4EC", "j": ["postbox", "communication", "email", "open", "mailbox", "mail", "inbox"]}, "open-mailbox-with-lowered-flag": {"a": "open mailbox with lowered flag", "b": "1F4ED", "j": ["postbox", "email", "lowered", "open", "mailbox", "mail", "inbox"]}, "postbox": {"a": "postbox", "b": "1F4EE", "j": ["envelope", "letter", "email", "mailbox", "mail"]}, "ballot-box-with-ballot": {"a": "ballot box with ballot", "b": "1F5F3", "j": ["election", "ballot", "box", "vote"]}, "pencil": {"a": "pencil", "b": "270F", "j": ["paper", "study", "school", "stationery", "writing", "write"]}, "black-nib": {"a": "black nib", "b": "2712", "j": ["stationery", "writing", "write", "nib", "pen"]}, "fountain-pen": {"a": "fountain pen", "b": "1F58B", "j": ["fountain", "stationery", "writing", "write", "pen"]}, "pen": {"a": "pen", "b": "1F58A", "j": ["ballpoint", "write", "stationery", "writing"]}, "paintbrush": {"a": "paintbrush", "b": "1F58C", "j": ["painting", "drawing", "art", "creativity"]}, "crayon": {"a": "crayon", "b": "1F58D", "j": ["creativity", "drawing"]}, "memo": {"a": "memo", "b": "1F4DD", "j": ["test", "pencil", "quiz", "compose", "paper", "documents", "study", "stationery", "writing", "write", "legal", "exam"]}, "briefcase": {"a": "briefcase", "b": "1F4BC", "j": ["job", "work", "business", "law", "documents", "career", "legal"]}, "file-folder": {"a": "file folder", "b": "1F4C1", "j": ["file", "business", "folder", "documents", "office"]}, "open-file-folder": {"a": "open file folder", "b": "1F4C2", "j": ["file", "folder", "documents", "open", "load"]}, "card-index-dividers": {"a": "card index dividers", "b": "1F5C2", "j": ["organizing", "business", "card", "stationery", "dividers", "index"]}, "calendar": {"a": "calendar", "b": "1F4C5", "j": ["date", "schedule"]}, "tearoff-calendar": {"a": "tear-off calendar", "b": "1F4C6", "j": ["date", "schedule", "calendar", "planning", "tear_off_calendar"]}, "spiral-notepad": {"a": "spiral notepad", "b": "1F5D2", "j": ["pad", "memo", "stationery", "note", "spiral"]}, "spiral-calendar": {"a": "spiral calendar", "b": "1F5D3", "j": ["pad", "date", "calendar", "schedule", "planning", "spiral"]}, "card-index": {"a": "card index", "b": "1F4C7", "j": ["business", "card", "stationery", "rolodex", "index"]}, "chart-increasing": {"a": "chart increasing", "b": "1F4C8", "j": ["stats", "upward", "business", "graph", "growth", "good", "trend", "chart", "success", "recovery", "money", "economics", "presentation", "sales"]}, "chart-decreasing": {"a": "chart decreasing", "b": "1F4C9", "j": ["stats", "business", "failure", "recession", "graph", "down", "bad", "trend", "chart", "money", "economics", "presentation", "sales"]}, "bar-chart": {"a": "bar chart", "b": "1F4CA", "j": ["stats", "graph", "bar", "chart", "presentation"]}, "clipboard": {"a": "clipboard", "b": "1F4CB", "j": ["documents", "stationery"]}, "pushpin": {"a": "pushpin", "b": "1F4CC", "j": ["here", "pin", "stationery", "mark"]}, "round-pushpin": {"a": "round pushpin", "b": "1F4CD", "j": ["pin", "map", "pushpin", "location", "stationery", "here"]}, "paperclip": {"a": "paperclip", "b": "1F4CE", "j": ["documents", "stationery"]}, "linked-paperclips": {"a": "linked paperclips", "b": "1F587", "j": ["link", "paperclip", "documents", "stationery"]}, "straight-ruler": {"a": "straight ruler", "b": "1F4CF", "j": ["architect", "math", "school", "stationery", "length", "drawing", "sketch", "calculate", "straight edge", "ruler"]}, "triangular-ruler": {"a": "triangular ruler", "b": "1F4D0", "j": ["architect", "math", "triangle", "stationery", "set", "sketch", "ruler"]}, "scissors": {"a": "scissors", "b": "2702", "j": ["cutting", "tool", "stationery", "cut"]}, "card-file-box": {"a": "card file box", "b": "1F5C3", "j": ["business", "file", "card", "stationery", "box"]}, "file-cabinet": {"a": "file cabinet", "b": "1F5C4", "j": ["file", "cabinet", "organizing", "filing"]}, "wastebasket": {"a": "wastebasket", "b": "1F5D1", "j": ["rubbish", "toss", "garbage", "trash", "bin"]}, "locked": {"a": "locked", "b": "1F512", "j": ["password", "padlock", "closed", "security"]}, "unlocked": {"a": "unlocked", "b": "1F513", "j": ["privacy", "open", "unlock", "lock", "security"]}, "locked-with-pen": {"a": "locked with pen", "b": "1F50F", "j": ["secret", "privacy", "lock", "nib", "security", "ink", "pen"]}, "locked-with-key": {"a": "locked with key", "b": "1F510", "j": ["privacy", "lock", "key", "closed", "security", "secure"]}, "key": {"a": "key", "b": "1F511", "j": ["password", "door", "lock"]}, "old-key": {"a": "old key", "b": "1F5DD", "j": ["door", "clue", "lock", "key", "old", "password"]}, "hammer": {"a": "hammer", "b": "1F528", "j": ["tool", "tools", "build", "create"]}, "axe": {"a": "axe", "b": "1FA93", "j": ["wood", "split", "chop", "tool", "hatchet", "cut"]}, "pick": {"a": "pick", "b": "26CF", "j": ["tool", "dig", "mining", "tools"]}, "hammer-and-pick": {"a": "hammer and pick", "b": "2692", "j": ["hammer", "build", "pick", "tools", "tool", "create"]}, "hammer-and-wrench": {"a": "hammer and wrench", "b": "1F6E0", "j": ["hammer", "build", "spanner", "tools", "tool", "wrench", "create"]}, "dagger": {"a": "dagger", "b": "1F5E1", "j": ["weapon", "knife"]}, "crossed-swords": {"a": "crossed swords", "b": "2694", "j": ["weapon", "crossed", "swords"]}, "water-pistol": {"a": "water pistol", "b": "1F52B", "j": ["violence", "tool", "water", "revolver", "weapon", "gun", "pistol", "handgun"]}, "boomerang": {"a": "boomerang", "b": "1FA83", "j": ["rebound", "australia", "repercussion", "weapon"]}, "bow-and-arrow": {"a": "bow and arrow", "b": "1F3F9", "j": ["arrow", "archer", "zodiac", "sports", "Sagittarius", "bow"]}, "shield": {"a": "shield", "b": "1F6E1", "j": ["weapon", "protection", "security"]}, "carpentry-saw": {"a": "carpentry saw", "b": "1FA9A", "j": ["carpenter", "lumber", "saw", "chop", "tool", "cut"]}, "wrench": {"a": "wrench", "b": "1F527", "j": ["diy", "ikea", "spanner", "tools", "fix", "maintainer", "tool"]}, "screwdriver": {"a": "screwdriver", "b": "1FA9B", "j": ["tool", "screw", "tools"]}, "nut-and-bolt": {"a": "nut and bolt", "b": "1F529", "j": ["handy", "tools", "fix", "nut", "tool", "bolt"]}, "gear": {"a": "gear", "b": "2699", "j": ["cog", "cogwheel", "tool"]}, "clamp": {"a": "clamp", "b": "1F5DC", "j": ["vice", "tool", "compress"]}, "balance-scale": {"a": "balance scale", "b": "2696", "j": ["balance", "Libra", "law", "zodiac", "fairness", "justice", "scale", "weight"]}, "white-cane": {"a": "white cane", "b": "1F9AF", "j": ["blind", "probing_cane", "accessibility"]}, "link": {"a": "link", "b": "1F517", "j": ["url", "rings"]}, "chains": {"a": "chains", "b": "26D3", "j": ["arrest", "lock", "chain"]}, "hook": {"a": "hook", "b": "1FA9D", "j": ["crook", "curve", "catch", "selling point", "tools", "ensnare"]}, "toolbox": {"a": "toolbox", "b": "1F9F0", "j": ["chest", "diy", "tools", "fix", "maintainer", "mechanic", "tool"]}, "magnet": {"a": "magnet", "b": "1F9F2", "j": ["attraction", "magnetic", "horseshoe"]}, "ladder": {"a": "ladder", "b": "1FA9C", "j": ["rung", "step", "tools", "climb"]}, "alembic": {"a": "alembic", "b": "2697", "j": ["chemistry", "distilling", "experiment", "science", "tool"]}, "test-tube": {"a": "test tube", "b": "1F9EA", "j": ["chemistry", "experiment", "lab", "science", "chemist"]}, "petri-dish": {"a": "petri dish", "b": "1F9EB", "j": ["biologist", "culture", "biology", "lab", "bacteria"]}, "dna": {"a": "dna", "b": "1F9EC", "j": ["biologist", "life", "gene", "evolution", "genetics"]}, "microscope": {"a": "microscope", "b": "1F52C", "j": ["study", "experiment", "laboratory", "science", "tool", "zoomin"]}, "telescope": {"a": "telescope", "b": "1F52D", "j": ["stars", "astronomy", "space", "science", "tool", "zoom"]}, "satellite-antenna": {"a": "satellite antenna", "b": "1F4E1", "j": ["communication", "satellite", "space", "antenna", "dish", "future", "radio"]}, "syringe": {"a": "syringe", "b": "1F489", "j": ["nurse", "shot", "doctor", "medicine", "hospital", "health", "sick", "needle", "drugs", "blood"]}, "drop-of-blood": {"a": "drop of blood", "b": "1FA78", "j": ["bleed", "menstruation", "harm", "medicine", "wound", "period", "blood donation", "injury", "hurt"]}, "pill": {"a": "pill", "b": "1F48A", "j": ["drug", "doctor", "medicine", "health", "sick", "pharmacy"]}, "adhesive-bandage": {"a": "adhesive bandage", "b": "1FA79", "j": ["heal", "bandage"]}, "stethoscope": {"a": "stethoscope", "b": "1FA7A", "j": ["heart", "medicine", "doctor", "health"]}, "door": {"a": "door", "b": "1F6AA", "j": ["house", "entry", "exit"]}, "elevator": {"a": "elevator", "b": "1F6D7", "j": ["lift", "hoist", "accessibility"]}, "mirror": {"a": "mirror", "b": "1FA9E", "j": ["reflection", "reflector", "speculum"]}, "window": {"a": "window", "b": "1FA9F", "j": ["transparent", "fresh air", "opening", "view", "scenery", "frame"]}, "bed": {"a": "bed", "b": "1F6CF", "j": ["sleep", "hotel", "rest"]}, "couch-and-lamp": {"a": "couch and lamp", "b": "1F6CB", "j": ["lamp", "chill", "couch", "read", "hotel"]}, "chair": {"a": "chair", "b": "1FA91", "j": ["sit", "furniture", "seat"]}, "toilet": {"a": "toilet", "b": "1F6BD", "j": ["potty", "bathroom", "washroom", "restroom", "wc"]}, "plunger": {"a": "plunger", "b": "1FAA0", "j": ["suction", "plumber", "force cup", "toilet"]}, "shower": {"a": "shower", "b": "1F6BF", "j": ["bathroom", "water", "clean"]}, "bathtub": {"a": "bathtub", "b": "1F6C1", "j": ["shower", "bathroom", "bath", "clean"]}, "mouse-trap": {"a": "mouse trap", "b": "1FAA4", "j": ["trap", "cheese", "bait", "mousetrap", "snare"]}, "razor": {"a": "razor", "b": "1FA92", "j": ["shave", "sharp", "cut"]}, "lotion-bottle": {"a": "lotion bottle", "b": "1F9F4", "j": ["sunscreen", "shampoo", "lotion", "moisturizer"]}, "safety-pin": {"a": "safety pin", "b": "1F9F7", "j": ["punk rock", "diaper"]}, "broom": {"a": "broom", "b": "1F9F9", "j": ["cleaning", "sweeping", "witch"]}, "basket": {"a": "basket", "b": "1F9FA", "j": ["farming", "laundry", "picnic"]}, "roll-of-paper": {"a": "roll of paper", "b": "1F9FB", "j": ["toilet paper", "roll", "paper towels"]}, "bucket": {"a": "bucket", "b": "1FAA3", "j": ["cask", "water", "pail", "vat", "container"]}, "soap": {"a": "soap", "b": "1F9FC", "j": ["soapdish", "bar", "lather", "bathing", "cleaning"]}, "toothbrush": {"a": "toothbrush", "b": "1FAA5", "j": ["brush", "bathroom", "hygiene", "teeth", "clean", "dental"]}, "sponge": {"a": "sponge", "b": "1F9FD", "j": ["absorbing", "cleaning", "porous"]}, "fire-extinguisher": {"a": "fire extinguisher", "b": "1F9EF", "j": ["quench", "extinguish", "fire"]}, "shopping-cart": {"a": "shopping cart", "b": "1F6D2", "j": ["shopping", "cart", "trolley"]}, "cigarette": {"a": "cigarette", "b": "1F6AC", "j": ["smoke", "smoking", "kills", "tobacco", "joint"]}, "coffin": {"a": "coffin", "b": "26B0", "j": ["death", "vampire", "rip", "casket", "funeral", "die", "dead", "box", "cemetery", "graveyard"]}, "headstone": {"a": "headstone", "b": "1FAA6", "j": ["death", "rip", "tombstone", "grave", "cemetery", "graveyard"]}, "funeral-urn": {"a": "funeral urn", "b": "26B1", "j": ["death", "rip", "funeral", "ashes", "die", "dead", "urn"]}, "moai": {"a": "moai", "b": "1F5FF", "j": ["rock", "moyai", "face", "statue", "easter island"]}, "placard": {"a": "placard", "b": "1FAA7", "j": ["sign", "announcement", "picket", "protest", "demonstration"]}, "atm-sign": {"a": "ATM sign", "b": "1F3E7", "j": ["cash", "bank", "teller", "automated", "atm", "blue-square", "payment", "money", "sales"]}, "litter-in-bin-sign": {"a": "litter in bin sign", "b": "1F6AE", "j": ["info", "sign", "litter", "human", "blue-square", "litter bin"]}, "potable-water": {"a": "potable water", "b": "1F6B0", "j": ["restroom", "water", "drinking", "blue-square", "liquid", "potable", "faucet", "cleaning"]}, "wheelchair-symbol": {"a": "wheelchair symbol", "b": "267F", "j": ["blue-square", "access", "disabled", "accessibility"]}, "mens-room": {"a": "men’s room", "b": "1F6B9", "j": ["gender", "man", "male", "restroom", "blue-square", "lavatory", "toilet", "men_s_room", "wc"]}, "womens-room": {"a": "women’s room", "b": "1F6BA", "j": ["gender", "woman", "restroom", "purple-square", "loo", "lavatory", "women_s_room", "toilet", "wc", "female"]}, "restroom": {"a": "restroom", "b": "1F6BB", "j": ["gender", "WC", "blue-square", "lavatory", "toilet", "refresh", "wc"]}, "baby-symbol": {"a": "baby symbol", "b": "1F6BC", "j": ["changing", "orange-square", "baby", "child"]}, "water-closet": {"a": "water closet", "b": "1F6BE", "j": ["restroom", "water", "blue-square", "lavatory", "closet", "toilet", "wc"]}, "passport-control": {"a": "passport control", "b": "1F6C2", "j": ["custom", "blue-square", "control", "passport"]}, "customs": {"a": "customs", "b": "1F6C3", "j": ["blue-square", "border", "passport"]}, "baggage-claim": {"a": "baggage claim", "b": "1F6C4", "j": ["transport", "claim", "baggage", "blue-square", "airport"]}, "left-luggage": {"a": "left luggage", "b": "1F6C5", "j": ["locker", "luggage", "baggage", "blue-square", "travel"]}, "warning": {"a": "warning", "b": "26A0", "j": ["alert", "wip", "problem", "error", "issue", "exclamation"]}, "children-crossing": {"a": "children crossing", "b": "1F6B8", "j": ["danger", "warning", "sign", "crossing", "yellow-diamond", "traffic", "pedestrian", "school", "child", "driving"]}, "no-entry": {"a": "no entry", "b": "26D4", "j": ["forbidden", "circle", "denied", "privacy", "stop", "no", "entry", "prohibited", "traffic", "bad", "not", "limit", "security"]}, "prohibited": {"a": "prohibited", "b": "1F6AB", "j": ["forbidden", "circle", "denied", "stop", "no", "entry", "disallow", "not", "limit", "forbid"]}, "no-bicycles": {"a": "no bicycles", "b": "1F6B3", "j": ["forbidden", "circle", "no", "prohibited", "bicycle", "bike", "cyclist"]}, "no-smoking": {"a": "no smoking", "b": "1F6AD", "j": ["smoke", "forbidden", "smoking", "smell", "no", "prohibited", "cigarette", "blue-square", "not"]}, "no-littering": {"a": "no littering", "b": "1F6AF", "j": ["forbidden", "circle", "litter", "no", "prohibited", "garbage", "not", "trash", "bin"]}, "nonpotable-water": {"a": "non-potable water", "b": "1F6B1", "j": ["non_potable_water", "circle", "non-drinking", "drink", "water", "faucet", "tap", "non-potable"]}, "no-pedestrians": {"a": "no pedestrians", "b": "1F6B7", "j": ["forbidden", "circle", "crossing", "no", "prohibited", "pedestrian", "walking", "not", "rules"]}, "no-mobile-phones": {"a": "no mobile phones", "b": "1F4F5", "j": ["forbidden", "circle", "iphone", "phone", "no", "mute", "mobile", "cell"]}, "no-one-under-eighteen": {"a": "no one under eighteen", "b": "1F51E", "j": ["pub", "underage", "night", "circle", "prohibited", "drink", "18", "eighteen", "age restriction", "minor"]}, "radioactive": {"a": "radioactive", "b": "2622", "j": ["danger", "sign", "nuclear"]}, "biohazard": {"a": "biohazard", "b": "2623", "j": ["danger", "sign"]}, "up-arrow": {"a": "up arrow", "b": "2B06", "j": ["arrow", "top", "blue-square", "continue", "direction", "north", "cardinal"]}, "upright-arrow": {"a": "up-right arrow", "b": "2197", "j": ["arrow", "up_right_arrow", "point", "diagonal", "blue-square", "direction", "northeast", "intercardinal"]}, "right-arrow": {"a": "right arrow", "b": "27A1", "j": ["arrow", "east", "blue-square", "direction", "next", "cardinal"]}, "downright-arrow": {"a": "down-right arrow", "b": "2198", "j": ["arrow", "diagonal", "blue-square", "down_right_arrow", "direction", "intercardinal", "southeast"]}, "down-arrow": {"a": "down arrow", "b": "2B07", "j": ["arrow", "down", "blue-square", "cardinal", "direction", "bottom", "south"]}, "downleft-arrow": {"a": "down-left arrow", "b": "2199", "j": ["arrow", "southwest", "diagonal", "blue-square", "down_left_arrow", "direction", "intercardinal"]}, "left-arrow": {"a": "left arrow", "b": "2B05", "j": ["arrow", "west", "blue-square", "previous", "back", "direction", "cardinal"]}, "upleft-arrow": {"a": "up-left arrow", "b": "2196", "j": ["arrow", "point", "northwest", "up_left_arrow", "diagonal", "blue-square", "direction", "intercardinal"]}, "updown-arrow": {"a": "up-down arrow", "b": "2195", "j": ["arrow", "blue-square", "vertical", "direction", "up_down_arrow", "way"]}, "leftright-arrow": {"a": "left-right arrow", "b": "2194", "j": ["left_right_arrow", "arrow", "sideways", "shape", "direction", "horizontal"]}, "right-arrow-curving-left": {"a": "right arrow curving left", "b": "21A9", "j": ["arrow", "undo", "back", "return", "blue-square", "enter"]}, "left-arrow-curving-right": {"a": "left arrow curving right", "b": "21AA", "j": ["arrow", "blue-square", "return", "direction", "rotate"]}, "right-arrow-curving-up": {"a": "right arrow curving up", "b": "2934", "j": ["blue-square", "arrow", "direction", "top"]}, "right-arrow-curving-down": {"a": "right arrow curving down", "b": "2935", "j": ["arrow", "down", "blue-square", "direction", "bottom"]}, "clockwise-vertical-arrows": {"a": "clockwise vertical arrows", "b": "1F503", "j": ["arrow", "sync", "round", "cycle", "repeat", "reload", "clockwise"]}, "counterclockwise-arrows-button": {"a": "counterclockwise arrows button", "b": "1F504", "j": ["arrow", "sync", "blue-square", "cycle", "anticlockwise", "withershins", "counterclockwise"]}, "back-arrow": {"a": "BACK arrow", "b": "1F519", "j": ["back", "arrow", "return", "words"]}, "end-arrow": {"a": "END arrow", "b": "1F51A", "j": ["end", "arrow", "words"]}, "on-arrow": {"a": "ON! arrow", "b": "1F51B", "j": ["arrow", "words", "on", "mark"]}, "soon-arrow": {"a": "SOON arrow", "b": "1F51C", "j": ["arrow", "soon", "words"]}, "top-arrow": {"a": "TOP arrow", "b": "1F51D", "j": ["arrow", "top", "words", "blue-square", "up"]}, "place-of-worship": {"a": "place of worship", "b": "1F6D0", "j": ["church", "worship", "prayer", "temple", "religion"]}, "atom-symbol": {"a": "atom symbol", "b": "269B", "j": ["chemistry", "atom", "atheist", "science", "physics"]}, "om": {"a": "om", "b": "1F549", "j": ["sikhism", "Hindu", "hinduism", "buddhism", "jainism", "religion"]}, "star-of-david": {"a": "star of David", "b": "2721", "j": ["star", "Jew", "David", "Jewish", "judaism", "religion"]}, "wheel-of-dharma": {"a": "wheel of dharma", "b": "2638", "j": ["dharma", "sikhism", "wheel", "hinduism", "buddhism", "jainism", "Buddhist", "religion"]}, "yin-yang": {"a": "yin yang", "b": "262F", "j": ["balance", "yang", "tao", "taoist", "yin", "religion"]}, "latin-cross": {"a": "latin cross", "b": "271D", "j": ["religion", "cross", "christianity", "Christian"]}, "orthodox-cross": {"a": "orthodox cross", "b": "2626", "j": ["cross", "religion", "suppedaneum", "Christian"]}, "star-and-crescent": {"a": "star and crescent", "b": "262A", "j": ["islam", "Muslim", "religion"]}, "peace-symbol": {"a": "peace symbol", "b": "262E", "j": ["hippie", "peace"]}, "menorah": {"a": "menorah", "b": "1F54E", "j": ["candlestick", "hanukkah", "jewish", "candelabrum", "candles", "religion"]}, "dotted-sixpointed-star": {"a": "dotted six-pointed star", "b": "1F52F", "j": ["jewish", "star", "purple-square", "dotted_six_pointed_star", "fortune", "religion", "hexagram"]}, "aries": {"a": "Aries", "b": "2648", "j": ["astrology", "sign", "ram", "purple-square", "zodiac"]}, "taurus": {"a": "Taurus", "b": "2649", "j": ["astrology", "sign", "purple-square", "ox", "zodiac", "bull"]}, "gemini": {"a": "Gemini", "b": "264A", "j": ["astrology", "sign", "twins", "purple-square", "zodiac"]}, "cancer": {"a": "Cancer", "b": "264B", "j": ["astrology", "sign", "purple-square", "zodiac", "crab"]}, "leo": {"a": "Leo", "b": "264C", "j": ["astrology", "sign", "lion", "purple-square", "zodiac"]}, "virgo": {"a": "Virgo", "b": "264D", "j": ["astrology", "sign", "purple-square", "zodiac"]}, "libra": {"a": "Libra", "b": "264E", "j": ["astrology", "sign", "balance", "purple-square", "zodiac", "scales", "justice"]}, "scorpio": {"a": "Scorpio", "b": "264F", "j": ["astrology", "sign", "scorpion", "purple-square", "zodiac", "scorpius"]}, "sagittarius": {"a": "Sagittarius", "b": "2650", "j": ["astrology", "sign", "archer", "purple-square", "zodiac"]}, "capricorn": {"a": "Capricorn", "b": "2651", "j": ["astrology", "sign", "purple-square", "zodiac", "goat"]}, "aquarius": {"a": "Aquarius", "b": "2652", "j": ["astrology", "sign", "purple-square", "water", "zodiac", "bearer"]}, "pisces": {"a": "Pisces", "b": "2653", "j": ["astrology", "sign", "purple-square", "fish", "zodiac"]}, "ophiuchus": {"a": "Ophiuchus", "b": "26CE", "j": ["astrology", "sign", "serpent", "snake", "purple-square", "zodiac", "constellation", "bearer"]}, "shuffle-tracks-button": {"a": "shuffle tracks button", "b": "1F500", "j": ["arrow", "random", "crossed", "blue-square", "shuffle", "music"]}, "repeat-button": {"a": "repeat button", "b": "1F501", "j": ["arrow", "record", "loop", "repeat", "clockwise"]}, "repeat-single-button": {"a": "repeat single button", "b": "1F502", "j": ["arrow", "once", "blue-square", "loop", "clockwise"]}, "play-button": {"a": "play button", "b": "25B6", "j": ["arrow", "play", "triangle", "blue-square", "direction", "right"]}, "fastforward-button": {"a": "fast-forward button", "b": "23E9", "j": ["arrow", "play", "fast", "fast_forward_button", "blue-square", "speed", "continue", "double", "forward"]}, "next-track-button": {"a": "next track button", "b": "23ED", "j": ["arrow", "next track", "next scene", "triangle", "blue-square", "next", "forward"]}, "play-or-pause-button": {"a": "play or pause button", "b": "23EF", "j": ["arrow", "play", "triangle", "blue-square", "pause", "right"]}, "reverse-button": {"a": "reverse button", "b": "25C0", "j": ["arrow", "reverse", "triangle", "left", "blue-square", "direction"]}, "fast-reverse-button": {"a": "fast reverse button", "b": "23EA", "j": ["arrow", "play", "blue-square", "double", "rewind"]}, "last-track-button": {"a": "last track button", "b": "23EE", "j": ["previous track", "arrow", "previous scene", "triangle", "backward"]}, "upwards-button": {"a": "upwards button", "b": "1F53C", "j": ["arrow", "top", "point", "triangle", "blue-square", "red", "direction", "button", "forward"]}, "fast-up-button": {"a": "fast up button", "b": "23EB", "j": ["arrow", "top", "blue-square", "direction", "double"]}, "downwards-button": {"a": "downwards button", "b": "1F53D", "j": ["arrow", "down", "blue-square", "red", "direction", "button", "bottom"]}, "fast-down-button": {"a": "fast down button", "b": "23EC", "j": ["arrow", "down", "blue-square", "direction", "double", "bottom"]}, "pause-button": {"a": "pause button", "b": "23F8", "j": ["bar", "blue-square", "vertical", "double", "pause"]}, "stop-button": {"a": "stop button", "b": "23F9", "j": ["blue-square", "square", "stop"]}, "record-button": {"a": "record button", "b": "23FA", "j": ["blue-square", "circle", "record"]}, "eject-button": {"a": "eject button", "b": "23CF", "j": ["blue-square", "eject"]}, "cinema": {"a": "cinema", "b": "1F3A6", "j": ["theater", "stage", "camera", "record", "curtain", "film", "blue-square", "movie"]}, "dim-button": {"a": "dim button", "b": "1F505", "j": ["sun", "brightness", "low", "warm", "afternoon", "dim", "summer"]}, "bright-button": {"a": "bright button", "b": "1F506", "j": ["sun", "brightness", "light", "bright"]}, "antenna-bars": {"a": "antenna bars", "b": "1F4F6", "j": ["phone", "bars", "bluetooth", "bar", "mobile", "blue-square", "internet", "antenna", "connection", "wifi", "cell", "reception"]}, "vibration-mode": {"a": "vibration mode", "b": "1F4F3", "j": ["phone", "orange-square", "telephone", "mobile", "vibration", "mode", "cell"]}, "mobile-phone-off": {"a": "mobile phone off", "b": "1F4F4", "j": ["silence", "phone", "orange-square", "telephone", "mute", "mobile", "quiet", "cell", "off"]}, "female-sign": {"a": "female sign", "b": "2640", "j": ["lady", "women", "girl", "woman"]}, "male-sign": {"a": "male sign", "b": "2642", "j": ["boy", "man", "men"]}, "transgender-symbol": {"a": "transgender symbol", "b": "26A7", "j": ["transgender", "lgbtq"]}, "multiply": {"a": "multiply", "b": "2716", "j": ["sign", "multiplication_sign", "math", "cancel", "multiplication", "calculation", "x", "×"]}, "plus": {"a": "plus", "b": "2795", "j": ["sign", "+", "increase", "math", "more", "calculation", "plus_sign", "addition"]}, "minus": {"a": "minus", "b": "2796", "j": ["minus_sign", "sign", "math", "−", "calculation", "-", "less", "subtract"]}, "divide": {"a": "divide", "b": "2797", "j": ["sign", "division_sign", "math", "÷", "division", "calculation"]}, "infinity": {"a": "infinity", "b": "267E", "j": ["unbounded", "universal", "forever"]}, "double-exclamation-mark": {"a": "double exclamation mark", "b": "203C", "j": ["!!", "mark", "bangbang", "exclamation", "!", "surprise"]}, "exclamation-question-mark": {"a": "exclamation question mark", "b": "2049", "j": ["punctuation", "interrobang", "mark", "exclamation", "?", "wat", "!?", "question", "!", "surprise"]}, "red-question-mark": {"a": "red question mark", "b": "2753", "j": ["punctuation", "question_mark", "mark", "?", "question", "confused", "doubt"]}, "white-question-mark": {"a": "white question mark", "b": "2754", "j": ["confused", "punctuation", "mark", "?", "outlined", "huh", "doubts", "question", "gray"]}, "white-exclamation-mark": {"a": "white exclamation mark", "b": "2755", "j": ["warning", "punctuation", "mark", "wow", "outlined", "exclamation", "!", "surprise", "gray"]}, "red-exclamation-mark": {"a": "red exclamation mark", "b": "2757", "j": ["danger", "warning", "punctuation", "heavy_exclamation_mark", "mark", "exclamation_mark", "wow", "exclamation", "!", "surprise"]}, "wavy-dash": {"a": "wavy dash", "b": "3030", "j": ["moustache", "punctuation", "draw", "dash", "squiggle", "scribble", "mustache", "line", "wavy"]}, "currency-exchange": {"a": "currency exchange", "b": "1F4B1", "j": ["currency", "bank", "dollar", "travel", "exchange", "money", "sales"]}, "heavy-dollar-sign": {"a": "heavy dollar sign", "b": "1F4B2", "j": ["currency", "dollar", "payment", "money", "sales", "buck"]}, "medical-symbol": {"a": "medical symbol", "b": "2695", "j": ["staff", "aesculapius", "hospital", "medicine", "health"]}, "recycling-symbol": {"a": "recycling symbol", "b": "267B", "j": ["arrow", "recycle", "environment", "garbage", "trash"]}, "fleurdelis": {"a": "fleur-de-lis", "b": "269C", "j": ["fleur_de_lis", "decorative", "scout"]}, "trident-emblem": {"a": "trident emblem", "b": "1F531", "j": ["emblem", "anchor", "weapon", "ship", "tool", "spear", "trident"]}, "name-badge": {"a": "name badge", "b": "1F4DB", "j": ["name", "forbid", "fire", "badge"]}, "japanese-symbol-for-beginner": {"a": "Japanese symbol for beginner", "b": "1F530", "j": ["chevron", "badge", "leaf", "shield", "Japanese", "beginner"]}, "hollow-red-circle": {"a": "hollow red circle", "b": "2B55", "j": ["large", "circle", "o", "red", "round"]}, "check-mark-button": {"a": "check mark button", "b": "2705", "j": ["election", "check", "✓", "green-square", "mark", "vote", "agree", "answer", "tick", "button", "ok"]}, "check-box-with-check": {"a": "check box with check", "b": "2611", "j": ["election", "yes", "check", "✓", "black-square", "vote", "confirm", "agree", "tick", "box", "ok"]}, "check-mark": {"a": "check mark", "b": "2714", "j": ["yes", "check", "✓", "nike", "mark", "answer", "tick", "ok"]}, "cross-mark": {"a": "cross mark", "b": "274C", "j": ["cross", "mark", "no", "delete", "cancel", "multiply", "remove", "multiplication", "red", "x", "×"]}, "cross-mark-button": {"a": "cross mark button", "b": "274E", "j": ["mark", "no", "square", "deny", "x", "green-square", "×"]}, "curly-loop": {"a": "curly loop", "b": "27B0", "j": ["draw", "curl", "shape", "squiggle", "scribble", "loop"]}, "double-curly-loop": {"a": "double curly loop", "b": "27BF", "j": ["curl", "tape", "cassette", "double", "loop"]}, "part-alternation-mark": {"a": "part alternation mark", "b": "303D", "j": ["stats", "business", "mark", "graph", "bad", "part", "economics", "presentation"]}, "eightspoked-asterisk": {"a": "eight-spoked asterisk", "b": "2733", "j": ["eight_spoked_asterisk", "star", "*", "sparkle", "asterisk", "green-square"]}, "eightpointed-star": {"a": "eight-pointed star", "b": "2734", "j": ["polygon", "orange-square", "star", "*", "shape", "eight_pointed_star"]}, "sparkle": {"a": "sparkle", "b": "2747", "j": ["awesome", "fireworks", "good", "stars", "*", "green-square"]}, "copyright": {"a": "copyright", "b": "00A9", "j": ["ip", "circle", "license", "law", "legal", "c"]}, "registered": {"a": "registered", "b": "00AE", "j": ["alphabet", "circle", "r"]}, "trade-mark": {"a": "trade mark", "b": "2122", "j": ["mark", "tm", "law", "brand", "legal", "trademark"]}, "keycap": {"a": "keycap: *", "b": "002A-FE0F-20E3", "j": ["star", "keycap_"]}, "keycap-0": {"a": "keycap: 0", "b": "0030-FE0F-20E3", "j": ["0", "keycap", "numbers", "blue-square", "null"]}, "keycap-1": {"a": "keycap: 1", "b": "0031-FE0F-20E3", "j": ["numbers", "blue-square", "1", "keycap"]}, "keycap-2": {"a": "keycap: 2", "b": "0032-FE0F-20E3", "j": ["keycap", "numbers", "2", "blue-square", "prime"]}, "keycap-3": {"a": "keycap: 3", "b": "0033-FE0F-20E3", "j": ["keycap", "numbers", "3", "blue-square", "prime"]}, "keycap-4": {"a": "keycap: 4", "b": "0034-FE0F-20E3", "j": ["numbers", "blue-square", "4", "keycap"]}, "keycap-5": {"a": "keycap: 5", "b": "0035-FE0F-20E3", "j": ["keycap", "numbers", "blue-square", "prime", "5"]}, "keycap-6": {"a": "keycap: 6", "b": "0036-FE0F-20E3", "j": ["numbers", "6", "keycap", "blue-square"]}, "keycap-7": {"a": "keycap: 7", "b": "0037-FE0F-20E3", "j": ["7", "keycap", "numbers", "blue-square", "prime"]}, "keycap-8": {"a": "keycap: 8", "b": "0038-FE0F-20E3", "j": ["numbers", "blue-square", "8", "keycap"]}, "keycap-9": {"a": "keycap: 9", "b": "0039-FE0F-20E3", "j": ["numbers", "blue-square", "9", "keycap"]}, "keycap-10": {"a": "keycap: 10", "b": "1F51F", "j": ["numbers", "blue-square", "10", "keycap"]}, "input-latin-uppercase": {"a": "input latin uppercase", "b": "1F520", "j": ["latin", "words", "alphabet", "input", "ABCD", "uppercase", "blue-square", "letters"]}, "input-latin-lowercase": {"a": "input latin lowercase", "b": "1F521", "j": ["latin", "alphabet", "abcd", "input", "blue-square", "letters", "lowercase"]}, "input-numbers": {"a": "input numbers", "b": "1F522", "j": ["numbers", "blue-square", "1234", "input"]}, "input-symbols": {"a": "input symbols", "b": "1F523", "j": ["percent", "〒♪&%", "ampersand", "input", "blue-square", "note", "glyphs", "characters", "music"]}, "input-latin-letters": {"a": "input latin letters", "b": "1F524", "j": ["latin", "alphabet", "input", "blue-square", "abc", "letters"]}, "a-button-blood-type": {"a": "A button (blood type)", "b": "1F170", "j": ["a_button", "letter", "alphabet", "a", "red-square", "blood type"]}, "ab-button-blood-type": {"a": "AB button (blood type)", "b": "1F18E", "j": ["ab_button", "alphabet", "red-square", "ab", "blood type"]}, "b-button-blood-type": {"a": "B button (blood type)", "b": "1F171", "j": ["letter", "alphabet", "b", "red-square", "b_button", "blood type"]}, "cl-button": {"a": "CL button", "b": "1F191", "j": ["alphabet", "red-square", "words", "cl"]}, "cool-button": {"a": "COOL button", "b": "1F192", "j": ["blue-square", "words", "cool"]}, "free-button": {"a": "FREE button", "b": "1F193", "j": ["blue-square", "free", "words"]}, "information": {"a": "information", "b": "2139", "j": ["i", "alphabet", "blue-square", "letter"]}, "id-button": {"a": "ID button", "b": "1F194", "j": ["id", "identity", "purple-square", "words"]}, "circled-m": {"a": "circled M", "b": "24C2", "j": ["circle", "blue-circle", "letter", "alphabet", "m"]}, "new-button": {"a": "NEW button", "b": "1F195", "j": ["blue-square", "start", "new", "words"]}, "ng-button": {"a": "NG button", "b": "1F196", "j": ["icon", "words", "blue-square", "ng", "shape"]}, "o-button-blood-type": {"a": "O button (blood type)", "b": "1F17E", "j": ["letter", "alphabet", "o", "o_button", "red-square", "blood type"]}, "ok-button": {"a": "OK button", "b": "1F197", "j": ["yes", "OK", "good", "agree", "blue-square"]}, "p-button": {"a": "P button", "b": "1F17F", "j": ["letter", "alphabet", "blue-square", "parking", "cars"]}, "sos-button": {"a": "SOS button", "b": "1F198", "j": ["words", "sos", "emergency", "red-square", "911", "help"]}, "up-button": {"a": "UP! button", "b": "1F199", "j": ["mark", "high", "above", "blue-square", "up"]}, "vs-button": {"a": "VS button", "b": "1F19A", "j": ["orange-square", "vs", "words", "versus"]}, "japanese-here-button": {"a": "Japanese “here” button", "b": "1F201", "j": ["destination", "ココ", "katakana", "Japanese", "japanese", "“here”", "blue-square", "here"]}, "japanese-service-charge-button": {"a": "Japanese “service charge” button", "b": "1F202", "j": ["katakana", "Japanese", "japanese", "blue-square", "“service charge”", "サ"]}, "japanese-monthly-amount-button": {"a": "Japanese “monthly amount” button", "b": "1F237", "j": ["orange-square", "moon", "Japanese", "japanese", "kanji", "ideograph", "月", "chinese", "“monthly amount”", "month"]}, "japanese-not-free-of-charge-button": {"a": "Japanese “not free of charge” button", "b": "1F236", "j": ["有", "orange-square", "Japanese", "have", "kanji", "ideograph", "chinese", "“not free of charge”"]}, "japanese-reserved-button": {"a": "Japanese “reserved” button", "b": "1F22F", "j": ["point", "“reserved”", "Japanese", "kanji", "ideograph", "chinese", "green-square", "指"]}, "japanese-bargain-button": {"a": "Japanese “bargain” button", "b": "1F250", "j": ["circle", "得", "obtain", "Japanese", "get", "“bargain”", "kanji", "ideograph", "chinese"]}, "japanese-discount-button": {"a": "Japanese “discount” button", "b": "1F239", "j": ["pink-square", "Japanese", "“discount”", "kanji", "ideograph", "割", "chinese", "divide", "cut"]}, "japanese-free-of-charge-button": {"a": "Japanese “free of charge” button", "b": "1F21A", "j": ["“free of charge”", "orange-square", "Japanese", "japanese", "nothing", "kanji", "ideograph", "chinese", "無"]}, "japanese-prohibited-button": {"a": "Japanese “prohibited” button", "b": "1F232", "j": ["“prohibited”", "forbidden", "禁", "Japanese", "japanese", "red-square", "kanji", "ideograph", "limit", "chinese", "restricted"]}, "japanese-acceptable-button": {"a": "Japanese “acceptable” button", "b": "1F251", "j": ["yes", "good", "orange-circle", "可", "Japanese", "agree", "kanji", "ideograph", "chinese", "ok", "“acceptable”"]}, "japanese-application-button": {"a": "Japanese “application” button", "b": "1F238", "j": ["orange-square", "Japanese", "japanese", "kanji", "ideograph", "“application”", "chinese", "申"]}, "japanese-passing-grade-button": {"a": "Japanese “passing grade” button", "b": "1F234", "j": ["join", "Japanese", "japanese", "“passing grade”", "red-square", "kanji", "ideograph", "chinese", "合"]}, "japanese-vacancy-button": {"a": "Japanese “vacancy” button", "b": "1F233", "j": ["“vacancy”", "空", "Japanese", "japanese", "blue-square", "sky", "kanji", "ideograph", "empty", "chinese"]}, "japanese-congratulations-button": {"a": "Japanese “congratulations” button", "b": "3297", "j": ["Japanese", "japanese", "kanji", "ideograph", "chinese", "red-circle", "“congratulations”", "祝"]}, "japanese-secret-button": {"a": "Japanese “secret” button", "b": "3299", "j": ["privacy", "“secret”", "Japanese", "sshh", "kanji", "ideograph", "秘", "red-circle", "chinese"]}, "japanese-open-for-business-button": {"a": "Japanese “open for business” button", "b": "1F23A", "j": ["orange-square", "Japanese", "営", "japanese", "opening hours", "“open for business”", "ideograph"]}, "japanese-no-vacancy-button": {"a": "Japanese “no vacancy” button", "b": "1F235", "j": ["満", "full", "Japanese", "japanese", "red-square", "kanji", "ideograph", "chinese", "“no vacancy”"]}, "red-circle": {"a": "red circle", "b": "1F534", "j": ["danger", "circle", "shape", "red", "geometric", "error"]}, "orange-circle": {"a": "orange circle", "b": "1F7E0", "j": ["circle", "orange", "round"]}, "yellow-circle": {"a": "yellow circle", "b": "1F7E1", "j": ["circle", "round", "yellow"]}, "green-circle": {"a": "green circle", "b": "1F7E2", "j": ["circle", "round", "green"]}, "blue-circle": {"a": "blue circle", "b": "1F535", "j": ["blue", "circle", "icon", "geometric", "shape", "button"]}, "purple-circle": {"a": "purple circle", "b": "1F7E3", "j": ["circle", "purple", "round"]}, "brown-circle": {"a": "brown circle", "b": "1F7E4", "j": ["circle", "brown", "round"]}, "black-circle": {"a": "black circle", "b": "26AB", "j": ["circle", "shape", "geometric", "button", "round"]}, "white-circle": {"a": "white circle", "b": "26AA", "j": ["circle", "shape", "round", "geometric"]}, "red-square": {"a": "red square", "b": "1F7E5", "j": ["red", "square"]}, "orange-square": {"a": "orange square", "b": "1F7E7", "j": ["square", "orange"]}, "yellow-square": {"a": "yellow square", "b": "1F7E8", "j": ["square", "yellow"]}, "green-square": {"a": "green square", "b": "1F7E9", "j": ["square", "green"]}, "blue-square": {"a": "blue square", "b": "1F7E6", "j": ["blue", "square"]}, "purple-square": {"a": "purple square", "b": "1F7EA", "j": ["square", "purple"]}, "brown-square": {"a": "brown square", "b": "1F7EB", "j": ["square", "brown"]}, "black-large-square": {"a": "black large square", "b": "2B1B", "j": ["icon", "geometric", "shape", "square", "button"]}, "white-large-square": {"a": "white large square", "b": "2B1C", "j": ["icon", "stone", "shape", "geometric", "square", "button"]}, "black-medium-square": {"a": "black medium square", "b": "25FC", "j": ["icon", "geometric", "shape", "square", "button"]}, "white-medium-square": {"a": "white medium square", "b": "25FB", "j": ["icon", "stone", "shape", "geometric", "square"]}, "black-mediumsmall-square": {"a": "black medium-small square", "b": "25FE", "j": ["icon", "geometric", "shape", "square", "black_medium_small_square", "button"]}, "white-mediumsmall-square": {"a": "white medium-small square", "b": "25FD", "j": ["icon", "stone", "geometric", "shape", "square", "white_medium_small_square", "button"]}, "black-small-square": {"a": "black small square", "b": "25AA", "j": ["geometric", "shape", "icon", "square"]}, "white-small-square": {"a": "white small square", "b": "25AB", "j": ["geometric", "shape", "icon", "square"]}, "large-orange-diamond": {"a": "large orange diamond", "b": "1F536", "j": ["diamond", "orange", "gem", "shape", "geometric", "jewel"]}, "large-blue-diamond": {"a": "large blue diamond", "b": "1F537", "j": ["blue", "diamond", "geometric", "shape", "gem", "jewel"]}, "small-orange-diamond": {"a": "small orange diamond", "b": "1F538", "j": ["diamond", "orange", "gem", "shape", "geometric", "jewel"]}, "small-blue-diamond": {"a": "small blue diamond", "b": "1F539", "j": ["blue", "diamond", "geometric", "shape", "gem", "jewel"]}, "red-triangle-pointed-up": {"a": "red triangle pointed up", "b": "1F53A", "j": ["top", "geometric", "shape", "red", "direction", "up"]}, "red-triangle-pointed-down": {"a": "red triangle pointed down", "b": "1F53B", "j": ["down", "shape", "red", "geometric", "direction", "bottom"]}, "diamond-with-a-dot": {"a": "diamond with a dot", "b": "1F4A0", "j": ["blue", "diamond", "fancy", "inside", "crystal", "comic", "geometric", "gem", "jewel"]}, "radio-button": {"a": "radio button", "b": "1F518", "j": ["circle", "input", "geometric", "old", "button", "music", "radio"]}, "white-square-button": {"a": "white square button", "b": "1F533", "j": ["input", "outlined", "geometric", "shape", "square", "button"]}, "black-square-button": {"a": "black square button", "b": "1F532", "j": ["input", "geometric", "shape", "square", "button", "frame"]}, "chequered-flag": {"a": "chequered flag", "b": "1F3C1", "j": ["checkered", "contest", "finishline", "race", "racing", "gokart", "chequered"]}, "triangular-flag": {"a": "triangular flag", "b": "1F6A9", "j": ["place", "post", "milestone", "mark"]}, "crossed-flags": {"a": "crossed flags", "b": "1F38C", "j": ["cross", "Japanese", "crossed", "japanese", "celebration", "nation", "country", "border"]}, "black-flag": {"a": "black flag", "b": "1F3F4", "j": ["waving", "pirate"]}, "white-flag": {"a": "white flag", "b": "1F3F3", "j": ["waving", "give up", "loser", "losing", "fail", "lost", "surrender"]}, "rainbow-flag": {"a": "rainbow flag", "b": "1F3F3-FE0F-200D-1F308", "j": ["homosexual", "glbt", "flag", "pride", "bisexual", "gay", "queer", "lesbian", "lgbt", "rainbow", "transgender"]}, "transgender-flag": {"a": "transgender flag", "b": "1F3F3-FE0F-200D-26A7-FE0F", "j": ["flag", "lgbtq", "light blue", "pink", "white", "transgender"]}, "pirate-flag": {"a": "pirate flag", "b": "1F3F4-200D-2620-FE0F", "j": ["banner", "pirate", "skull", "flag", "Jolly Roger", "treasure", "plunder", "crossbones"]}, "flag-ascension-island": {"a": "flag: Ascension Island", "b": "1F1E6-1F1E8", "j": ["flag"]}, "flag-andorra": {"a": "flag: Andorra", "b": "1F1E6-1F1E9", "j": ["banner", "ad", "flag", "country", "nation"]}, "flag-united-arab-emirates": {"a": "flag: United Arab Emirates", "b": "1F1E6-1F1EA", "j": ["united", "banner", "flag", "arab", "nation", "country", "emirates"]}, "flag-afghanistan": {"a": "flag: Afghanistan", "b": "1F1E6-1F1EB", "j": ["banner", "af", "flag", "country", "nation"]}, "flag-antigua--barbuda": {"a": "flag: Antigua & Barbuda", "b": "1F1E6-1F1EC", "j": ["banner", "antigua", "flag", "flag_antigua_barbuda", "nation", "country", "barbuda"]}, "flag-anguilla": {"a": "flag: Anguilla", "b": "1F1E6-1F1EE", "j": ["banner", "flag", "ai", "country", "nation"]}, "flag-albania": {"a": "flag: Albania", "b": "1F1E6-1F1F1", "j": ["banner", "flag", "nation", "country", "al"]}, "flag-armenia": {"a": "flag: Armenia", "b": "1F1E6-1F1F2", "j": ["banner", "am", "flag", "nation", "country"]}, "flag-angola": {"a": "flag: Angola", "b": "1F1E6-1F1F4", "j": ["banner", "flag", "ao", "country", "nation"]}, "flag-antarctica": {"a": "flag: Antarctica", "b": "1F1E6-1F1F6", "j": ["banner", "flag", "nation", "country", "aq"]}, "flag-argentina": {"a": "flag: Argentina", "b": "1F1E6-1F1F7", "j": ["banner", "flag", "ar", "nation", "country"]}, "flag-american-samoa": {"a": "flag: American Samoa", "b": "1F1E6-1F1F8", "j": ["banner", "flag", "ws", "nation", "country", "american"]}, "flag-austria": {"a": "flag: Austria", "b": "1F1E6-1F1F9", "j": ["banner", "at", "flag", "nation", "country"]}, "flag-australia": {"a": "flag: Australia", "b": "1F1E6-1F1FA", "j": ["banner", "flag", "au", "nation", "country"]}, "flag-aruba": {"a": "flag: Aruba", "b": "1F1E6-1F1FC", "j": ["banner", "flag", "nation", "country", "aw"]}, "flag-land-islands": {"a": "flag: Åland Islands", "b": "1F1E6-1F1FD", "j": ["banner", "Åland", "flag_aland_islands", "flag", "islands", "nation", "country"]}, "flag-azerbaijan": {"a": "flag: Azerbaijan", "b": "1F1E6-1F1FF", "j": ["banner", "az", "flag", "country", "nation"]}, "flag-bosnia--herzegovina": {"a": "flag: Bosnia & Herzegovina", "b": "1F1E7-1F1E6", "j": ["banner", "flag", "flag_bosnia_herzegovina", "herzegovina", "bosnia", "nation", "country"]}, "flag-barbados": {"a": "flag: Barbados", "b": "1F1E7-1F1E7", "j": ["banner", "bb", "flag", "country", "nation"]}, "flag-bangladesh": {"a": "flag: Bangladesh", "b": "1F1E7-1F1E9", "j": ["banner", "flag", "country", "nation", "bd"]}, "flag-belgium": {"a": "flag: Belgium", "b": "1F1E7-1F1EA", "j": ["banner", "flag", "country", "nation", "be"]}, "flag-burkina-faso": {"a": "flag: Burkina Faso", "b": "1F1E7-1F1EB", "j": ["banner", "flag", "faso", "nation", "country", "burkina"]}, "flag-bulgaria": {"a": "flag: Bulgaria", "b": "1F1E7-1F1EC", "j": ["banner", "flag", "bg", "country", "nation"]}, "flag-bahrain": {"a": "flag: Bahrain", "b": "1F1E7-1F1ED", "j": ["banner", "flag", "bh", "country", "nation"]}, "flag-burundi": {"a": "flag: Burundi", "b": "1F1E7-1F1EE", "j": ["banner", "flag", "bi", "country", "nation"]}, "flag-benin": {"a": "flag: Benin", "b": "1F1E7-1F1EF", "j": ["banner", "flag", "bj", "country", "nation"]}, "flag-st-barthlemy": {"a": "flag: St. Barthélemy", "b": "1F1E7-1F1F1", "j": ["banner", "flag", "flag_st_barthelemy", "nation", "country", "barthélemy", "saint"]}, "flag-bermuda": {"a": "flag: Bermuda", "b": "1F1E7-1F1F2", "j": ["banner", "bm", "flag", "country", "nation"]}, "flag-brunei": {"a": "flag: Brunei", "b": "1F1E7-1F1F3", "j": ["banner", "darussalam", "flag", "nation", "bn", "country"]}, "flag-bolivia": {"a": "flag: Bolivia", "b": "1F1E7-1F1F4", "j": ["banner", "flag", "country", "nation", "bo"]}, "flag-caribbean-netherlands": {"a": "flag: Caribbean Netherlands", "b": "1F1E7-1F1F6", "j": ["banner", "flag", "bonaire", "nation", "country"]}, "flag-brazil": {"a": "flag: Brazil", "b": "1F1E7-1F1F7", "j": ["banner", "flag", "br", "country", "nation"]}, "flag-bahamas": {"a": "flag: Bahamas", "b": "1F1E7-1F1F8", "j": ["banner", "flag", "country", "nation", "bs"]}, "flag-bhutan": {"a": "flag: Bhutan", "b": "1F1E7-1F1F9", "j": ["bt", "banner", "flag", "country", "nation"]}, "flag-bouvet-island": {"a": "flag: Bouvet Island", "b": "1F1E7-1F1FB", "j": ["norway", "flag"]}, "flag-botswana": {"a": "flag: Botswana", "b": "1F1E7-1F1FC", "j": ["banner", "flag", "bw", "country", "nation"]}, "flag-belarus": {"a": "flag: Belarus", "b": "1F1E7-1F1FE", "j": ["banner", "flag", "nation", "country", "by"]}, "flag-belize": {"a": "flag: Belize", "b": "1F1E7-1F1FF", "j": ["banner", "flag", "country", "bz", "nation"]}, "flag-canada": {"a": "flag: Canada", "b": "1F1E8-1F1E6", "j": ["banner", "flag", "ca", "country", "nation"]}, "flag-cocos-keeling-islands": {"a": "flag: Cocos (Keeling) Islands", "b": "1F1E8-1F1E8", "j": ["keeling", "banner", "flag", "cocos", "islands", "nation", "country", "flag_cocos_islands"]}, "flag-congo--kinshasa": {"a": "flag: Congo - Kinshasa", "b": "1F1E8-1F1E9", "j": ["banner", "flag_congo_kinshasa", "republic", "democratic", "flag", "congo", "nation", "country"]}, "flag-central-african-republic": {"a": "flag: Central African Republic", "b": "1F1E8-1F1EB", "j": ["banner", "republic", "flag", "nation", "african", "country", "central"]}, "flag-congo--brazzaville": {"a": "flag: Congo - Brazzaville", "b": "1F1E8-1F1EC", "j": ["banner", "flag", "congo", "flag_congo_brazzaville", "country", "nation"]}, "flag-switzerland": {"a": "flag: Switzerland", "b": "1F1E8-1F1ED", "j": ["banner", "ch", "flag", "country", "nation"]}, "flag-cte-divoire": {"a": "flag: Côte d’Ivoire", "b": "1F1E8-1F1EE", "j": ["banner", "coast", "flag", "country", "nation", "flag_cote_d_ivoire", "ivory"]}, "flag-cook-islands": {"a": "flag: Cook Islands", "b": "1F1E8-1F1F0", "j": ["banner", "flag", "islands", "nation", "country", "cook"]}, "flag-chile": {"a": "flag: Chile", "b": "1F1E8-1F1F1", "j": ["flag", "banner", "nation", "country"]}, "flag-cameroon": {"a": "flag: Cameroon", "b": "1F1E8-1F1F2", "j": ["banner", "flag", "cm", "nation", "country"]}, "flag-china": {"a": "flag: China", "b": "1F1E8-1F1F3", "j": ["china", "banner", "flag", "prc", "country", "chinese", "nation"]}, "flag-colombia": {"a": "flag: Colombia", "b": "1F1E8-1F1F4", "j": ["banner", "co", "flag", "nation", "country"]}, "flag-clipperton-island": {"a": "flag: Clipperton Island", "b": "1F1E8-1F1F5", "j": ["flag"]}, "flag-costa-rica": {"a": "flag: Costa Rica", "b": "1F1E8-1F1F7", "j": ["banner", "flag", "nation", "rica", "costa", "country"]}, "flag-cuba": {"a": "flag: Cuba", "b": "1F1E8-1F1FA", "j": ["banner", "cu", "flag", "nation", "country"]}, "flag-cape-verde": {"a": "flag: Cape Verde", "b": "1F1E8-1F1FB", "j": ["banner", "flag", "cabo", "verde", "nation", "country"]}, "flag-curaao": {"a": "flag: Curaçao", "b": "1F1E8-1F1FC", "j": ["banner", "flag", "curaçao", "country", "flag_curacao", "nation"]}, "flag-christmas-island": {"a": "flag: Christmas Island", "b": "1F1E8-1F1FD", "j": ["banner", "flag", "nation", "country", "island", "christmas"]}, "flag-cyprus": {"a": "flag: Cyprus", "b": "1F1E8-1F1FE", "j": ["banner", "cy", "flag", "country", "nation"]}, "flag-czechia": {"a": "flag: Czechia", "b": "1F1E8-1F1FF", "j": ["cz", "banner", "flag", "nation", "country"]}, "flag-germany": {"a": "flag: Germany", "b": "1F1E9-1F1EA", "j": ["banner", "flag", "german", "country", "nation"]}, "flag-diego-garcia": {"a": "flag: Diego Garcia", "b": "1F1E9-1F1EC", "j": ["flag"]}, "flag-djibouti": {"a": "flag: Djibouti", "b": "1F1E9-1F1EF", "j": ["banner", "flag", "dj", "country", "nation"]}, "flag-denmark": {"a": "flag: Denmark", "b": "1F1E9-1F1F0", "j": ["banner", "flag", "dk", "country", "nation"]}, "flag-dominica": {"a": "flag: Dominica", "b": "1F1E9-1F1F2", "j": ["banner", "dm", "flag", "country", "nation"]}, "flag-dominican-republic": {"a": "flag: Dominican Republic", "b": "1F1E9-1F1F4", "j": ["banner", "republic", "flag", "dominican", "nation", "country"]}, "flag-algeria": {"a": "flag: Algeria", "b": "1F1E9-1F1FF", "j": ["banner", "flag", "dz", "country", "nation"]}, "flag-ceuta--melilla": {"a": "flag: Ceuta & Melilla", "b": "1F1EA-1F1E6", "j": ["flag_ceuta_melilla", "flag"]}, "flag-ecuador": {"a": "flag: Ecuador", "b": "1F1EA-1F1E8", "j": ["banner", "flag", "ec", "country", "nation"]}, "flag-estonia": {"a": "flag: Estonia", "b": "1F1EA-1F1EA", "j": ["ee", "banner", "flag", "nation", "country"]}, "flag-egypt": {"a": "flag: Egypt", "b": "1F1EA-1F1EC", "j": ["banner", "flag", "eg", "country", "nation"]}, "flag-western-sahara": {"a": "flag: Western Sahara", "b": "1F1EA-1F1ED", "j": ["banner", "flag", "sahara", "nation", "country", "western"]}, "flag-eritrea": {"a": "flag: Eritrea", "b": "1F1EA-1F1F7", "j": ["banner", "flag", "er", "country", "nation"]}, "flag-spain": {"a": "flag: Spain", "b": "1F1EA-1F1F8", "j": ["spain", "banner", "flag", "country", "nation"]}, "flag-ethiopia": {"a": "flag: Ethiopia", "b": "1F1EA-1F1F9", "j": ["banner", "flag", "et", "nation", "country"]}, "flag-european-union": {"a": "flag: European Union", "b": "1F1EA-1F1FA", "j": ["banner", "european", "flag", "union"]}, "flag-finland": {"a": "flag: Finland", "b": "1F1EB-1F1EE", "j": ["banner", "fi", "flag", "nation", "country"]}, "flag-fiji": {"a": "flag: Fiji", "b": "1F1EB-1F1EF", "j": ["banner", "fj", "flag", "country", "nation"]}, "flag-falkland-islands": {"a": "flag: Falkland Islands", "b": "1F1EB-1F1F0", "j": ["banner", "flag", "malvinas", "falkland", "islands", "nation", "country"]}, "flag-micronesia": {"a": "flag: Micronesia", "b": "1F1EB-1F1F2", "j": ["banner", "flag", "federated", "micronesia", "nation", "country", "states"]}, "flag-faroe-islands": {"a": "flag: Faroe Islands", "b": "1F1EB-1F1F4", "j": ["banner", "flag", "islands", "nation", "country", "faroe"]}, "flag-france": {"a": "flag: France", "b": "1F1EB-1F1F7", "j": ["banner", "flag", "french", "france", "nation", "country"]}, "flag-gabon": {"a": "flag: Gabon", "b": "1F1EC-1F1E6", "j": ["banner", "flag", "ga", "country", "nation"]}, "flag-united-kingdom": {"a": "flag: United Kingdom", "b": "1F1EC-1F1E7", "j": ["united", "banner", "UK", "england", "ireland", "flag", "british", "britain", "english", "northern", "great", "kingdom", "nation", "country", "union jack"]}, "flag-grenada": {"a": "flag: Grenada", "b": "1F1EC-1F1E9", "j": ["banner", "flag", "gd", "country", "nation"]}, "flag-georgia": {"a": "flag: Georgia", "b": "1F1EC-1F1EA", "j": ["banner", "flag", "ge", "country", "nation"]}, "flag-french-guiana": {"a": "flag: French Guiana", "b": "1F1EC-1F1EB", "j": ["banner", "flag", "french", "guiana", "nation", "country"]}, "flag-guernsey": {"a": "flag: Guernsey", "b": "1F1EC-1F1EC", "j": ["banner", "gg", "flag", "country", "nation"]}, "flag-ghana": {"a": "flag: Ghana", "b": "1F1EC-1F1ED", "j": ["banner", "flag", "country", "nation", "gh"]}, "flag-gibraltar": {"a": "flag: Gibraltar", "b": "1F1EC-1F1EE", "j": ["banner", "flag", "nation", "country", "gi"]}, "flag-greenland": {"a": "flag: Greenland", "b": "1F1EC-1F1F1", "j": ["banner", "flag", "country", "nation", "gl"]}, "flag-gambia": {"a": "flag: Gambia", "b": "1F1EC-1F1F2", "j": ["banner", "gm", "flag", "country", "nation"]}, "flag-guinea": {"a": "flag: Guinea", "b": "1F1EC-1F1F3", "j": ["banner", "flag", "gn", "country", "nation"]}, "flag-guadeloupe": {"a": "flag: Guadeloupe", "b": "1F1EC-1F1F5", "j": ["banner", "flag", "country", "gp", "nation"]}, "flag-equatorial-guinea": {"a": "flag: Equatorial Guinea", "b": "1F1EC-1F1F6", "j": ["banner", "flag", "gn", "equatorial", "nation", "country"]}, "flag-greece": {"a": "flag: Greece", "b": "1F1EC-1F1F7", "j": ["banner", "flag", "gr", "nation", "country"]}, "flag-south-georgia--south-sandwich-islands": {"a": "flag: South Georgia & South Sandwich Islands", "b": "1F1EC-1F1F8", "j": ["banner", "flag", "flag_south_georgia_south_sandwich_islands", "islands", "georgia", "nation", "country", "sandwich", "south"]}, "flag-guatemala": {"a": "flag: Guatemala", "b": "1F1EC-1F1F9", "j": ["banner", "flag", "gt", "country", "nation"]}, "flag-guam": {"a": "flag: Guam", "b": "1F1EC-1F1FA", "j": ["banner", "flag", "nation", "country", "gu"]}, "flag-guineabissau": {"a": "flag: Guinea-Bissau", "b": "1F1EC-1F1FC", "j": ["banner", "flag_guinea_bissau", "flag", "nation", "country", "bissau", "gw"]}, "flag-guyana": {"a": "flag: Guyana", "b": "1F1EC-1F1FE", "j": ["banner", "flag", "gy", "country", "nation"]}, "flag-hong-kong-sar-china": {"a": "flag: Hong Kong SAR China", "b": "1F1ED-1F1F0", "j": ["banner", "kong", "flag", "hong", "nation", "country"]}, "flag-heard--mcdonald-islands": {"a": "flag: Heard & McDonald Islands", "b": "1F1ED-1F1F2", "j": ["flag_heard_mcdonald_islands", "flag"]}, "flag-honduras": {"a": "flag: Honduras", "b": "1F1ED-1F1F3", "j": ["banner", "flag", "hn", "nation", "country"]}, "flag-croatia": {"a": "flag: Croatia", "b": "1F1ED-1F1F7", "j": ["banner", "flag", "country", "nation", "hr"]}, "flag-haiti": {"a": "flag: Haiti", "b": "1F1ED-1F1F9", "j": ["banner", "flag", "country", "nation", "ht"]}, "flag-hungary": {"a": "flag: Hungary", "b": "1F1ED-1F1FA", "j": ["banner", "flag", "hu", "country", "nation"]}, "flag-canary-islands": {"a": "flag: Canary Islands", "b": "1F1EE-1F1E8", "j": ["banner", "flag", "canary", "islands", "nation", "country"]}, "flag-indonesia": {"a": "flag: Indonesia", "b": "1F1EE-1F1E9", "j": ["flag", "banner", "nation", "country"]}, "flag-ireland": {"a": "flag: Ireland", "b": "1F1EE-1F1EA", "j": ["banner", "flag", "ie", "nation", "country"]}, "flag-israel": {"a": "flag: Israel", "b": "1F1EE-1F1F1", "j": ["banner", "flag", "il", "country", "nation"]}, "flag-isle-of-man": {"a": "flag: Isle of Man", "b": "1F1EE-1F1F2", "j": ["isle", "banner", "man", "flag", "nation", "country"]}, "flag-india": {"a": "flag: India", "b": "1F1EE-1F1F3", "j": ["banner", "flag", "in", "country", "nation"]}, "flag-british-indian-ocean-territory": {"a": "flag: British Indian Ocean Territory", "b": "1F1EE-1F1F4", "j": ["banner", "flag", "british", "ocean", "nation", "territory", "country", "indian"]}, "flag-iraq": {"a": "flag: Iraq", "b": "1F1EE-1F1F6", "j": ["banner", "iq", "flag", "nation", "country"]}, "flag-iran": {"a": "flag: Iran", "b": "1F1EE-1F1F7", "j": ["banner", "republic", "flag", "iran", "islamic", "nation", "country"]}, "flag-iceland": {"a": "flag: Iceland", "b": "1F1EE-1F1F8", "j": ["banner", "flag", "is", "country", "nation"]}, "flag-italy": {"a": "flag: Italy", "b": "1F1EE-1F1F9", "j": ["banner", "flag", "italy", "country", "nation"]}, "flag-jersey": {"a": "flag: Jersey", "b": "1F1EF-1F1EA", "j": ["je", "banner", "flag", "nation", "country"]}, "flag-jamaica": {"a": "flag: Jamaica", "b": "1F1EF-1F1F2", "j": ["banner", "flag", "nation", "country", "jm"]}, "flag-jordan": {"a": "flag: Jordan", "b": "1F1EF-1F1F4", "j": ["jo", "banner", "flag", "nation", "country"]}, "flag-japan": {"a": "flag: Japan", "b": "1F1EF-1F1F5", "j": ["banner", "flag", "japanese", "nation", "country"]}, "flag-kenya": {"a": "flag: Kenya", "b": "1F1F0-1F1EA", "j": ["banner", "flag", "country", "nation", "ke"]}, "flag-kyrgyzstan": {"a": "flag: Kyrgyzstan", "b": "1F1F0-1F1EC", "j": ["kg", "banner", "flag", "nation", "country"]}, "flag-cambodia": {"a": "flag: Cambodia", "b": "1F1F0-1F1ED", "j": ["banner", "flag", "kh", "nation", "country"]}, "flag-kiribati": {"a": "flag: Kiribati", "b": "1F1F0-1F1EE", "j": ["banner", "flag", "nation", "country", "ki"]}, "flag-comoros": {"a": "flag: Comoros", "b": "1F1F0-1F1F2", "j": ["banner", "flag", "km", "country", "nation"]}, "flag-st-kitts--nevis": {"a": "flag: St. Kitts & Nevis", "b": "1F1F0-1F1F3", "j": ["nevis", "banner", "kitts", "flag", "flag_st_kitts_nevis", "nation", "country", "saint"]}, "flag-north-korea": {"a": "flag: North Korea", "b": "1F1F0-1F1F5", "j": ["banner", "flag", "korea", "country", "nation", "north"]}, "flag-south-korea": {"a": "flag: South Korea", "b": "1F1F0-1F1F7", "j": ["banner", "flag", "korea", "nation", "country", "south"]}, "flag-kuwait": {"a": "flag: Kuwait", "b": "1F1F0-1F1FC", "j": ["banner", "flag", "kw", "nation", "country"]}, "flag-cayman-islands": {"a": "flag: Cayman Islands", "b": "1F1F0-1F1FE", "j": ["banner", "flag", "cayman", "islands", "nation", "country"]}, "flag-kazakhstan": {"a": "flag: Kazakhstan", "b": "1F1F0-1F1FF", "j": ["kz", "banner", "flag", "nation", "country"]}, "flag-laos": {"a": "flag: Laos", "b": "1F1F1-1F1E6", "j": ["banner", "republic", "flag", "democratic", "nation", "country", "lao"]}, "flag-lebanon": {"a": "flag: Lebanon", "b": "1F1F1-1F1E7", "j": ["banner", "flag", "lb", "country", "nation"]}, "flag-st-lucia": {"a": "flag: St. Lucia", "b": "1F1F1-1F1E8", "j": ["banner", "flag", "lucia", "nation", "country", "saint"]}, "flag-liechtenstein": {"a": "flag: Liechtenstein", "b": "1F1F1-1F1EE", "j": ["banner", "flag", "country", "nation", "li"]}, "flag-sri-lanka": {"a": "flag: Sri Lanka", "b": "1F1F1-1F1F0", "j": ["lanka", "banner", "flag", "nation", "country", "sri"]}, "flag-liberia": {"a": "flag: Liberia", "b": "1F1F1-1F1F7", "j": ["banner", "flag", "lr", "country", "nation"]}, "flag-lesotho": {"a": "flag: Lesotho", "b": "1F1F1-1F1F8", "j": ["banner", "flag", "country", "nation", "ls"]}, "flag-lithuania": {"a": "flag: Lithuania", "b": "1F1F1-1F1F9", "j": ["banner", "flag", "lt", "country", "nation"]}, "flag-luxembourg": {"a": "flag: Luxembourg", "b": "1F1F1-1F1FA", "j": ["banner", "flag", "country", "nation", "lu"]}, "flag-latvia": {"a": "flag: Latvia", "b": "1F1F1-1F1FB", "j": ["lv", "banner", "flag", "nation", "country"]}, "flag-libya": {"a": "flag: Libya", "b": "1F1F1-1F1FE", "j": ["banner", "ly", "flag", "country", "nation"]}, "flag-morocco": {"a": "flag: Morocco", "b": "1F1F2-1F1E6", "j": ["banner", "ma", "flag", "country", "nation"]}, "flag-monaco": {"a": "flag: Monaco", "b": "1F1F2-1F1E8", "j": ["banner", "flag", "mc", "nation", "country"]}, "flag-moldova": {"a": "flag: Moldova", "b": "1F1F2-1F1E9", "j": ["banner", "republic", "flag", "country", "nation", "moldova"]}, "flag-montenegro": {"a": "flag: Montenegro", "b": "1F1F2-1F1EA", "j": ["banner", "flag", "me", "country", "nation"]}, "flag-st-martin": {"a": "flag: St. Martin", "b": "1F1F2-1F1EB", "j": ["flag"]}, "flag-madagascar": {"a": "flag: Madagascar", "b": "1F1F2-1F1EC", "j": ["banner", "flag", "country", "nation", "mg"]}, "flag-marshall-islands": {"a": "flag: Marshall Islands", "b": "1F1F2-1F1ED", "j": ["banner", "flag", "islands", "nation", "country", "marshall"]}, "flag-north-macedonia": {"a": "flag: North Macedonia", "b": "1F1F2-1F1F0", "j": ["banner", "flag", "macedonia", "country", "nation"]}, "flag-mali": {"a": "flag: Mali", "b": "1F1F2-1F1F1", "j": ["banner", "flag", "country", "ml", "nation"]}, "flag-myanmar-burma": {"a": "flag: Myanmar (Burma)", "b": "1F1F2-1F1F2", "j": ["banner", "flag", "flag_myanmar", "mm", "country", "nation"]}, "flag-mongolia": {"a": "flag: Mongolia", "b": "1F1F2-1F1F3", "j": ["banner", "flag", "mn", "country", "nation"]}, "flag-macao-sar-china": {"a": "flag: Macao SAR China", "b": "1F1F2-1F1F4", "j": ["banner", "flag", "country", "macao", "nation"]}, "flag-northern-mariana-islands": {"a": "flag: Northern Mariana Islands", "b": "1F1F2-1F1F5", "j": ["banner", "flag", "northern", "islands", "nation", "country", "mariana"]}, "flag-martinique": {"a": "flag: Martinique", "b": "1F1F2-1F1F6", "j": ["banner", "flag", "country", "nation", "mq"]}, "flag-mauritania": {"a": "flag: Mauritania", "b": "1F1F2-1F1F7", "j": ["banner", "mr", "flag", "country", "nation"]}, "flag-montserrat": {"a": "flag: Montserrat", "b": "1F1F2-1F1F8", "j": ["banner", "flag", "ms", "country", "nation"]}, "flag-malta": {"a": "flag: Malta", "b": "1F1F2-1F1F9", "j": ["banner", "mt", "flag", "country", "nation"]}, "flag-mauritius": {"a": "flag: Mauritius", "b": "1F1F2-1F1FA", "j": ["banner", "flag", "country", "nation", "mu"]}, "flag-maldives": {"a": "flag: Maldives", "b": "1F1F2-1F1FB", "j": ["banner", "mv", "flag", "country", "nation"]}, "flag-malawi": {"a": "flag: Malawi", "b": "1F1F2-1F1FC", "j": ["banner", "flag", "country", "nation", "mw"]}, "flag-mexico": {"a": "flag: Mexico", "b": "1F1F2-1F1FD", "j": ["banner", "flag", "mx", "nation", "country"]}, "flag-malaysia": {"a": "flag: Malaysia", "b": "1F1F2-1F1FE", "j": ["banner", "flag", "my", "country", "nation"]}, "flag-mozambique": {"a": "flag: Mozambique", "b": "1F1F2-1F1FF", "j": ["banner", "flag", "country", "nation", "mz"]}, "flag-namibia": {"a": "flag: Namibia", "b": "1F1F3-1F1E6", "j": ["banner", "flag", "nation", "country", "na"]}, "flag-new-caledonia": {"a": "flag: New Caledonia", "b": "1F1F3-1F1E8", "j": ["banner", "flag", "new", "nation", "country", "caledonia"]}, "flag-niger": {"a": "flag: Niger", "b": "1F1F3-1F1EA", "j": ["banner", "flag", "ne", "nation", "country"]}, "flag-norfolk-island": {"a": "flag: Norfolk Island", "b": "1F1F3-1F1EB", "j": ["banner", "flag", "nation", "country", "norfolk", "island"]}, "flag-nigeria": {"a": "flag: Nigeria", "b": "1F1F3-1F1EC", "j": ["flag", "banner", "nation", "country"]}, "flag-nicaragua": {"a": "flag: Nicaragua", "b": "1F1F3-1F1EE", "j": ["banner", "flag", "ni", "country", "nation"]}, "flag-netherlands": {"a": "flag: Netherlands", "b": "1F1F3-1F1F1", "j": ["banner", "flag", "nl", "country", "nation"]}, "flag-norway": {"a": "flag: Norway", "b": "1F1F3-1F1F4", "j": ["banner", "flag", "no", "country", "nation"]}, "flag-nepal": {"a": "flag: Nepal", "b": "1F1F3-1F1F5", "j": ["banner", "flag", "country", "nation", "np"]}, "flag-nauru": {"a": "flag: Nauru", "b": "1F1F3-1F1F7", "j": ["banner", "nr", "flag", "nation", "country"]}, "flag-niue": {"a": "flag: Niue", "b": "1F1F3-1F1FA", "j": ["banner", "flag", "nu", "country", "nation"]}, "flag-new-zealand": {"a": "flag: New Zealand", "b": "1F1F3-1F1FF", "j": ["banner", "flag", "zealand", "nation", "country", "new"]}, "flag-oman": {"a": "flag: Oman", "b": "1F1F4-1F1F2", "j": ["banner", "flag", "nation", "country", "om_symbol"]}, "flag-panama": {"a": "flag: Panama", "b": "1F1F5-1F1E6", "j": ["banner", "flag", "pa", "country", "nation"]}, "flag-peru": {"a": "flag: Peru", "b": "1F1F5-1F1EA", "j": ["banner", "flag", "country", "nation", "pe"]}, "flag-french-polynesia": {"a": "flag: French Polynesia", "b": "1F1F5-1F1EB", "j": ["banner", "flag", "french", "polynesia", "nation", "country"]}, "flag-papua-new-guinea": {"a": "flag: Papua New Guinea", "b": "1F1F5-1F1EC", "j": ["banner", "flag", "papua", "nation", "country", "new", "guinea"]}, "flag-philippines": {"a": "flag: Philippines", "b": "1F1F5-1F1ED", "j": ["banner", "flag", "ph", "country", "nation"]}, "flag-pakistan": {"a": "flag: Pakistan", "b": "1F1F5-1F1F0", "j": ["banner", "flag", "pk", "country", "nation"]}, "flag-poland": {"a": "flag: Poland", "b": "1F1F5-1F1F1", "j": ["banner", "pl", "flag", "country", "nation"]}, "flag-st-pierre--miquelon": {"a": "flag: St. Pierre & Miquelon", "b": "1F1F5-1F1F2", "j": ["banner", "flag", "flag_st_pierre_miquelon", "miquelon", "nation", "country", "saint", "pierre"]}, "flag-pitcairn-islands": {"a": "flag: Pitcairn Islands", "b": "1F1F5-1F1F3", "j": ["banner", "flag", "nation", "country", "pitcairn"]}, "flag-puerto-rico": {"a": "flag: Puerto Rico", "b": "1F1F5-1F1F7", "j": ["banner", "puerto", "flag", "nation", "country", "rico"]}, "flag-palestinian-territories": {"a": "flag: Palestinian Territories", "b": "1F1F5-1F1F8", "j": ["banner", "flag", "palestinian", "territories", "nation", "country", "palestine"]}, "flag-portugal": {"a": "flag: Portugal", "b": "1F1F5-1F1F9", "j": ["banner", "flag", "country", "nation", "pt"]}, "flag-palau": {"a": "flag: Palau", "b": "1F1F5-1F1FC", "j": ["banner", "flag", "country", "nation", "pw"]}, "flag-paraguay": {"a": "flag: Paraguay", "b": "1F1F5-1F1FE", "j": ["banner", "flag", "py", "nation", "country"]}, "flag-qatar": {"a": "flag: Qatar", "b": "1F1F6-1F1E6", "j": ["banner", "flag", "country", "nation", "qa"]}, "flag-runion": {"a": "flag: Réunion", "b": "1F1F7-1F1EA", "j": ["banner", "flag", "réunion", "country", "nation", "flag_reunion"]}, "flag-romania": {"a": "flag: Romania", "b": "1F1F7-1F1F4", "j": ["banner", "flag", "nation", "country", "ro"]}, "flag-serbia": {"a": "flag: Serbia", "b": "1F1F7-1F1F8", "j": ["banner", "flag", "rs", "country", "nation"]}, "flag-russia": {"a": "flag: Russia", "b": "1F1F7-1F1FA", "j": ["banner", "russian", "flag", "federation", "nation", "country"]}, "flag-rwanda": {"a": "flag: Rwanda", "b": "1F1F7-1F1FC", "j": ["banner", "flag", "country", "nation", "rw"]}, "flag-saudi-arabia": {"a": "flag: Saudi Arabia", "b": "1F1F8-1F1E6", "j": ["flag", "banner", "nation", "country"]}, "flag-solomon-islands": {"a": "flag: Solomon Islands", "b": "1F1F8-1F1E7", "j": ["banner", "flag", "islands", "nation", "country", "solomon"]}, "flag-seychelles": {"a": "flag: Seychelles", "b": "1F1F8-1F1E8", "j": ["banner", "flag", "sc", "nation", "country"]}, "flag-sudan": {"a": "flag: Sudan", "b": "1F1F8-1F1E9", "j": ["banner", "sd", "flag", "country", "nation"]}, "flag-sweden": {"a": "flag: Sweden", "b": "1F1F8-1F1EA", "j": ["banner", "flag", "se", "country", "nation"]}, "flag-singapore": {"a": "flag: Singapore", "b": "1F1F8-1F1EC", "j": ["banner", "flag", "country", "nation", "sg"]}, "flag-st-helena": {"a": "flag: St. Helena", "b": "1F1F8-1F1ED", "j": ["banner", "flag", "cunha", "ascension", "helena", "nation", "country", "saint", "tristan"]}, "flag-slovenia": {"a": "flag: Slovenia", "b": "1F1F8-1F1EE", "j": ["banner", "flag", "nation", "si", "country"]}, "flag-svalbard--jan-mayen": {"a": "flag: Svalbard & Jan Mayen", "b": "1F1F8-1F1EF", "j": ["flag_svalbard_jan_mayen", "flag"]}, "flag-slovakia": {"a": "flag: Slovakia", "b": "1F1F8-1F1F0", "j": ["sk", "banner", "flag", "nation", "country"]}, "flag-sierra-leone": {"a": "flag: Sierra Leone", "b": "1F1F8-1F1F1", "j": ["banner", "flag", "sierra", "leone", "nation", "country"]}, "flag-san-marino": {"a": "flag: San Marino", "b": "1F1F8-1F1F2", "j": ["banner", "flag", "san", "nation", "country", "marino"]}, "flag-senegal": {"a": "flag: Senegal", "b": "1F1F8-1F1F3", "j": ["banner", "flag", "nation", "sn", "country"]}, "flag-somalia": {"a": "flag: Somalia", "b": "1F1F8-1F1F4", "j": ["banner", "so", "flag", "country", "nation"]}, "flag-suriname": {"a": "flag: Suriname", "b": "1F1F8-1F1F7", "j": ["banner", "flag", "sr", "country", "nation"]}, "flag-south-sudan": {"a": "flag: South Sudan", "b": "1F1F8-1F1F8", "j": ["banner", "sd", "flag", "nation", "country", "south"]}, "flag-so-tom--prncipe": {"a": "flag: São Tomé & Príncipe", "b": "1F1F8-1F1F9", "j": ["tome", "sao", "banner", "flag", "principe", "nation", "flag_sao_tome_principe", "country"]}, "flag-el-salvador": {"a": "flag: El Salvador", "b": "1F1F8-1F1FB", "j": ["banner", "flag", "nation", "country", "salvador", "el"]}, "flag-sint-maarten": {"a": "flag: Sint Maarten", "b": "1F1F8-1F1FD", "j": ["banner", "flag", "maarten", "dutch", "sint", "nation", "country"]}, "flag-syria": {"a": "flag: Syria", "b": "1F1F8-1F1FE", "j": ["banner", "republic", "flag", "syrian", "arab", "nation", "country"]}, "flag-eswatini": {"a": "flag: Eswatini", "b": "1F1F8-1F1FF", "j": ["banner", "flag", "sz", "country", "nation"]}, "flag-tristan-da-cunha": {"a": "flag: Tristan da Cunha", "b": "1F1F9-1F1E6", "j": ["flag"]}, "flag-turks--caicos-islands": {"a": "flag: Turks & Caicos Islands", "b": "1F1F9-1F1E8", "j": ["banner", "caicos", "flag", "islands", "nation", "country", "turks", "flag_turks_caicos_islands"]}, "flag-chad": {"a": "flag: Chad", "b": "1F1F9-1F1E9", "j": ["banner", "td", "flag", "country", "nation"]}, "flag-french-southern-territories": {"a": "flag: French Southern Territories", "b": "1F1F9-1F1EB", "j": ["banner", "flag", "french", "southern", "territories", "nation", "country"]}, "flag-togo": {"a": "flag: Togo", "b": "1F1F9-1F1EC", "j": ["banner", "flag", "tg", "country", "nation"]}, "flag-thailand": {"a": "flag: Thailand", "b": "1F1F9-1F1ED", "j": ["banner", "flag", "country", "nation", "th"]}, "flag-tajikistan": {"a": "flag: Tajikistan", "b": "1F1F9-1F1EF", "j": ["banner", "flag", "tj", "country", "nation"]}, "flag-tokelau": {"a": "flag: Tokelau", "b": "1F1F9-1F1F0", "j": ["tk", "banner", "flag", "country", "nation"]}, "flag-timorleste": {"a": "flag: Timor-Leste", "b": "1F1F9-1F1F1", "j": ["leste", "banner", "timor", "flag", "nation", "country", "flag_timor_leste"]}, "flag-turkmenistan": {"a": "flag: Turkmenistan", "b": "1F1F9-1F1F2", "j": ["flag", "banner", "country", "nation"]}, "flag-tunisia": {"a": "flag: Tunisia", "b": "1F1F9-1F1F3", "j": ["banner", "flag", "country", "nation", "tn"]}, "flag-tonga": {"a": "flag: Tonga", "b": "1F1F9-1F1F4", "j": ["banner", "flag", "country", "nation", "to"]}, "flag-turkey": {"a": "flag: Turkey", "b": "1F1F9-1F1F7", "j": ["banner", "flag", "nation", "turkey", "country"]}, "flag-trinidad--tobago": {"a": "flag: Trinidad & Tobago", "b": "1F1F9-1F1F9", "j": ["banner", "flag_trinidad_tobago", "flag", "trinidad", "nation", "country", "tobago"]}, "flag-tuvalu": {"a": "flag: Tuvalu", "b": "1F1F9-1F1FB", "j": ["flag", "banner", "nation", "country"]}, "flag-taiwan": {"a": "flag: Taiwan", "b": "1F1F9-1F1FC", "j": ["banner", "flag", "country", "nation", "tw"]}, "flag-tanzania": {"a": "flag: Tanzania", "b": "1F1F9-1F1FF", "j": ["united", "banner", "republic", "flag", "nation", "country", "tanzania"]}, "flag-ukraine": {"a": "flag: Ukraine", "b": "1F1FA-1F1E6", "j": ["banner", "flag", "ua", "country", "nation"]}, "flag-uganda": {"a": "flag: Uganda", "b": "1F1FA-1F1EC", "j": ["banner", "flag", "ug", "country", "nation"]}, "flag-us-outlying-islands": {"a": "flag: U.S. Outlying Islands", "b": "1F1FA-1F1F2", "j": ["flag_u_s_outlying_islands", "flag"]}, "flag-united-nations": {"a": "flag: United Nations", "b": "1F1FA-1F1F3", "j": ["banner", "un", "flag"]}, "flag-united-states": {"a": "flag: United States", "b": "1F1FA-1F1F8", "j": ["united", "banner", "flag", "america", "nation", "country", "states"]}, "flag-uruguay": {"a": "flag: Uruguay", "b": "1F1FA-1F1FE", "j": ["banner", "flag", "uy", "country", "nation"]}, "flag-uzbekistan": {"a": "flag: Uzbekistan", "b": "1F1FA-1F1FF", "j": ["banner", "uz", "flag", "country", "nation"]}, "flag-vatican-city": {"a": "flag: Vatican City", "b": "1F1FB-1F1E6", "j": ["banner", "flag", "vatican", "city", "nation", "country"]}, "flag-st-vincent--grenadines": {"a": "flag: St. Vincent & Grenadines", "b": "1F1FB-1F1E8", "j": ["banner", "flag", "flag_st_vincent_grenadines", "grenadines", "nation", "country", "vincent", "saint"]}, "flag-venezuela": {"a": "flag: Venezuela", "b": "1F1FB-1F1EA", "j": ["banner", "republic", "flag", "bolivarian", "ve", "nation", "country"]}, "flag-british-virgin-islands": {"a": "flag: British Virgin Islands", "b": "1F1FB-1F1EC", "j": ["banner", "virgin", "bvi", "flag", "british", "islands", "nation", "country"]}, "flag-us-virgin-islands": {"a": "flag: U.S. Virgin Islands", "b": "1F1FB-1F1EE", "j": ["banner", "virgin", "flag", "us", "islands", "nation", "country", "flag_u_s_virgin_islands"]}, "flag-vietnam": {"a": "flag: Vietnam", "b": "1F1FB-1F1F3", "j": ["banner", "flag", "nation", "nam", "country", "viet"]}, "flag-vanuatu": {"a": "flag: Vanuatu", "b": "1F1FB-1F1FA", "j": ["banner", "flag", "vu", "country", "nation"]}, "flag-wallis--futuna": {"a": "flag: Wallis & Futuna", "b": "1F1FC-1F1EB", "j": ["banner", "flag_wallis_futuna", "flag", "wallis", "nation", "country", "futuna"]}, "flag-samoa": {"a": "flag: Samoa", "b": "1F1FC-1F1F8", "j": ["banner", "flag", "ws", "nation", "country"]}, "flag-kosovo": {"a": "flag: Kosovo", "b": "1F1FD-1F1F0", "j": ["banner", "flag", "country", "nation", "xk"]}, "flag-yemen": {"a": "flag: Yemen", "b": "1F1FE-1F1EA", "j": ["banner", "flag", "nation", "ye", "country"]}, "flag-mayotte": {"a": "flag: Mayotte", "b": "1F1FE-1F1F9", "j": ["banner", "flag", "yt", "country", "nation"]}, "flag-south-africa": {"a": "flag: South Africa", "b": "1F1FF-1F1E6", "j": ["banner", "africa", "flag", "nation", "country", "south"]}, "flag-zambia": {"a": "flag: Zambia", "b": "1F1FF-1F1F2", "j": ["banner", "flag", "zm", "country", "nation"]}, "flag-zimbabwe": {"a": "flag: Zimbabwe", "b": "1F1FF-1F1FC", "j": ["banner", "flag", "zw", "country", "nation"]}, "flag-england": {"a": "flag: England", "b": "1F3F4-E0067-E0062-E0065-E006E-E0067-E007F", "j": ["english", "flag"]}, "flag-scotland": {"a": "flag: Scotland", "b": "1F3F4-E0067-E0062-E0073-E0063-E0074-E007F", "j": ["scottish", "flag"]}, "flag-wales": {"a": "flag: Wales", "b": "1F3F4-E0067-E0062-E0077-E006C-E0073-E007F", "j": ["welsh", "flag"]}}, "aliases": {}}
\ No newline at end of file

From 2bdb67cd4d460be54d0f1091ac08724887859879 Mon Sep 17 00:00:00 2001
From: ozzii <ozzii.translate@gmail.com>
Date: Sat, 20 Mar 2021 14:57:17 +0000
Subject: [PATCH 393/578] Translated using Weblate (Serbian)

Currently translated at 23.0% (545 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sr/
---
 vector/src/main/res/values-sr/strings.xml | 157 ++++++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 2ce03e4a54..b44a7f78c5 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -450,4 +450,161 @@
     <string name="reset">Ресет</string>
     <string name="dismiss">Одбаци</string>
     <string name="pause_video">Паузирај</string>
+    <string name="call_error_camera_init_failed">Неуспешно иницијализовање камере</string>
+    <string name="call_error_ice_failed">Веза није успела</string>
+    <string name="call_error_user_not_responding">Дописник није одговорио.</string>
+    <string name="call_held_by_you">Поставили сте позив на чекање</string>
+    <string name="call_held_by_user">%s је ставио позив на чекање</string>
+    <string name="call_hold_action">Стави на чекање</string>
+    <string name="call_resume_action">Резиме</string>
+    <string name="return_to_call">Врати се на позив</string>
+    <string name="active_call_with_duration">Активни позив (%s)</string>
+    <string name="video_call_in_progress">Видео позив у току…</string>
+    <string name="call_in_progress">Позив у току…</string>
+    <string name="incoming_voice_call">Улазни гласовни позив</string>
+    <string name="incoming_video_call">Улазни видео позив</string>
+    <string name="incoming_call">Улазни позив</string>
+    <string name="call_ring">Позив…</string>
+    <string name="call_ended">Позив завршен</string>
+    <string name="call_connecting">Прикључивање позива…</string>
+    <string name="call_connected">Позив прикључен</string>
+    <string name="call">Позив</string>
+    <string name="settings_call_ringtone_dialog_title">Одабери мелодију за позиве:</string>
+    <string name="settings_call_ringtone_title">Мелодија долазног позива</string>
+    <string name="settings_call_ringtone_use_default_stun">Дозволи сервер за повратни позив</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Користити звоно од ${app_name} за долазне позиве</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Затражити потврду пре него што се започнете позив</string>
+    <string name="settings_call_show_confirmation_dialog_title">Спречити случајни позив</string>
+    <string name="settings_call_category">Позиви</string>
+    <string name="room_info_room_topic">Тема собе</string>
+    <string name="room_info_room_name">Име собе</string>
+    <string name="today">Данас</string>
+    <string name="yesterday">Јуче</string>
+    <string name="attachment_remaining_time_minutes">%1$dм %2$dс</string>
+    <string name="attachment_remaining_time_seconds">%d с</string>
+    <string name="attachment_cancel_upload">Поништи отпремање\?</string>
+    <string name="attachment_cancel_download">Поништи преузимање\?</string>
+    <string name="compression_opt_list_small">Мало</string>
+    <string name="compression_opt_list_medium">Средње</string>
+    <string name="compression_opt_list_large">Велико</string>
+    <string name="compression_opt_list_original">Оригинално</string>
+    <string name="login_error_forbidden">Погрешно корисничко име/лозинка</string>
+    <string name="login_error_ssl_other">SSL грешка.</string>
+    <string name="login_error_ssl_peer_unverified">SSL грешка: Вршњачки идентитет није верификован.</string>
+    <string name="login_error_no_homeserver_found">Ово није валидна адреса Matrix сервера</string>
+    <string name="login_error_unknown_host">Ова УРЛ адреса није доступна, молимо вас да проверите</string>
+    <string name="login_error_invalid_home_server">Унети важећи URL</string>
+    <string name="login_error_unable_register_mail_ownership">Немогућа регистрација: погрешна провера власништва имејла</string>
+    <string name="login_error_unable_register">Немогућност регистрације</string>
+    <string name="login_error_registration_network_error">Немогућност регистрације: мрежна грешка</string>
+    <string name="login_error_unable_login">Немогућност пријављивања</string>
+    <string name="login_error_network_error">Није могуће пријавити се: мрежна грешка</string>
+    <string name="login_error_must_start_http">URL треба да почне са http[s]://</string>
+    <string name="auth_accept_policies">Прегледајте и прихватите политику овог сервера:</string>
+    <string name="auth_reset_password_success_message">Ваша лозинка је ресетована.
+\n
+\nОдјављени сте од свих сесија и више нећете примати пуш обавештења. Да бисте поново омогућили обавештења, поново се пријавите на сваки уређај.</string>
+    <string name="auth_reset_password_email_validation_message">Послат је имејл на %s. Једном када кликнете на везу из поруке, кликните доле.</string>
+    <string name="auth_threepid_warning_message">Регистрација са имејлом и телефонски број одједном није подржана док АПИ не постоји. Биће узети у обзир само телефонски број.
+\n
+\nМожете да додате свој имејл на свој профил у подешавањима.</string>
+    <string name="auth_add_email_and_phone_message_2">Подесите е-пошту за опоравак рачуна. После користите имејл или телефон како би вас открити људи који вас познају.</string>
+    <string name="auth_add_email_phone_message_2">Подесите е-пошту за опоравак рачуна. После користите имејл или телефон како би вас открити људи који вас познају.</string>
+    <string name="auth_add_email_message_2">Подесите имејл за опоравак рачуна, а касније како би вас открити људи који вас познају.</string>
+    <string name="auth_add_phone_message_2">Попуните телефонски број како би вас открити људи који вас познају.</string>
+    <string name="no_sticker_application_dialog_content">Тренутно немате ни један пакет стикера.
+\n
+\nДодати сада неки\?</string>
+    <string name="call_failed_no_connection_description">Није успело успостављање везе у реалном времену.
+\nЗамолите администратора вашег домаћег сервера да конфигурише TURN сервер како би позиви поуздано радили.</string>
+    <string name="send_bug_report_description">Опишите грешку. Шта сте урадили\? Шта сте очекивали да се догоди\? Шта се заправо догодило\?</string>
+    <string name="send_bug_report_include_key_share_history">Укључите историју размене кључева</string>
+    <string name="audio_video_meeting_description">Састанци користе Jitsi безбедносне и допунске политике. Сви људи тренутно у соби видеће позив да се придруже састанку.</string>
+    <string name="auth_reset_password_error_unauthorized">Није успело верификовати имејл адресу: обавезно кликните на линк из примљеног имејла</string>
+    <string name="auth_reset_password_missing_password">Мора се унети нова лозинка.</string>
+    <string name="auth_reset_password_missing_email">Мора се унети имејл адреса коришћена са вашим налогом.</string>
+    <string name="auth_reset_password_message">Да бисте ресетовали лозинку, унесите имејл адресу коришћену са налогом:</string>
+    <string name="auth_reset_password_next_step_button">Проверио сам своју имејл адресу</string>
+    <string name="auth_identity_server">Сервер идентитета:</string>
+    <string name="auth_home_server">Кућни сервер:</string>
+    <string name="auth_username_in_use">Корисничко име већ употребљено</string>
+    <string name="auth_recaptcha_message">Овај кућни сервер жели да се увери да нисте робот</string>
+    <string name="auth_email_validation_message">Проверити Ваш имејл да би наставили регистрацију</string>
+    <string name="auth_use_server_options">Користите друге опције сервера (напредно)</string>
+    <string name="auth_forgot_password">Заборавили сте лозинку\?</string>
+    <string name="auth_password_dont_match">Лозинке нису исте</string>
+    <string name="auth_invalid_token">Неважећи жетон</string>
+    <string name="auth_missing_email_or_phone">Недостаје имејл адреса или број телефона</string>
+    <string name="auth_missing_phone">Недостаје број телефона</string>
+    <string name="auth_missing_email">Недостаје имејл адреса</string>
+    <string name="auth_msisdn_already_defined">Овај број телефона је већ коришћен.</string>
+    <string name="auth_email_already_defined">Ова имејл адреса је већ коришћена.</string>
+    <string name="auth_invalid_phone">Ово не изгледа као важећи број телефона</string>
+    <string name="auth_invalid_email">Ово не изгледа као важећа имејл адреса</string>
+    <string name="auth_missing_password">Недостаје лозинка</string>
+    <string name="auth_invalid_password">Лозинка премала (6 минимум)</string>
+    <string name="auth_invalid_user_name">Корисничка имена могу садржати само слова, бројеве, тачке, цртице и подвлаке</string>
+    <string name="auth_invalid_login_param">Нетачно корисничко име и/или лозинка</string>
+    <string name="auth_repeat_new_password_placeholder">Потврдите нову лозинку</string>
+    <string name="auth_repeat_password_placeholder">Поновити лозинку</string>
+    <string name="auth_opt_phone_number_placeholder">Број трелефона (опционо)</string>
+    <string name="auth_phone_number_placeholder">Број телефона</string>
+    <string name="auth_opt_email_placeholder">Имејл адреса (опционо)</string>
+    <string name="auth_email_placeholder">Имејл адреса</string>
+    <string name="error_no_external_application_found">Нажалост, ни једна спољна апликација није нађена да би испунила ову акцију.</string>
+    <string name="go_on_with">наставити са…</string>
+    <string name="option_send_files">Послати датотеке</string>
+    <string name="call_format_turn_hd_on">Упали HD</string>
+    <string name="call_format_turn_hd_off">Угаси HD</string>
+    <string name="call_camera_back">Позади</string>
+    <string name="call_camera_front">Испред</string>
+    <string name="call_switch_camera">Пребаците камеру</string>
+    <string name="sound_device_wireless_headset">Бежичне слушалице</string>
+    <string name="sound_device_headset">Слушалице</string>
+    <string name="sound_device_speaker">Звучници</string>
+    <string name="sound_device_phone">Телефон</string>
+    <string name="call_select_sound_device">Изаберите звучни уређај</string>
+    <string name="template_call_failed_no_connection">${app_name} Позив није успео</string>
+    <string name="call_failed_dont_ask_again">Не питај ме више</string>
+    <string name="call_failed_no_ice_use_alt">Пробајте да користите %s</string>
+    <string name="call_failed_no_ice_title">Позив није успео због погрешне конфигурације сервера</string>
+    <string name="start_video_call_prompt_msg">Да ли сте сигурни да желите да започнете видео позив\?</string>
+    <string name="start_voice_call_prompt_msg">Да ли сте сигурни да желите да започнете гласовни позив\?</string>
+    <string name="start_new_chat_prompt_msg">Да ли сте сигурни да желите да започнете ћаскање са %s\?</string>
+    <string name="option_send_voice">Пошаљи гласовну поруку</string>
+    <string name="send_bug_report_failed">Извештај о грешци није успео да се пошаље (%s)</string>
+    <string name="send_bug_report_sent">Извештај о грешци је успешно послан</string>
+    <string name="send_bug_report_app_crashed">Апликација се последњи пут срушила. Да ли желите да отворите екран за пријаву грешке\?</string>
+    <string name="send_bug_report_alert_message">Изгледа да мрдате телефон из фрустрације. Да ли желите да отворите екран за извештавање о грешкама\?</string>
+    <string name="send_bug_report_description_in_english">Ако је могуће, молим вас напишите опис на енглеском језику.</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Прикажи све собе у директорију собе, укључујући собе са експлицитним садржајем.</string>
+    <string name="settings_room_directory_show_all_rooms">Прикажи собе са експлицитним садржајем</string>
+    <string name="settings_category_room_directory">Директоријум собе</string>
+    <string name="home_filter_placeholder_groups">Филтрирајте имена заједнице</string>
+    <string name="home_filter_placeholder_rooms">Филтрирати имена собе</string>
+    <string name="home_filter_placeholder_people">Филтрирати особе</string>
+    <string name="home_filter_placeholder_favorites">Филтрирати фаворите</string>
+    <string name="home_filter_placeholder_home">Филтрирати имена собе</string>
+    <string name="dialog_edit_hint">Нова вредност</string>
+    <string name="action_return">Вратити се</string>
+    <string name="action_switch">Променити</string>
+    <string name="cannot_call_yourself_with_invite">Не можете да поставите позив са собом, причекајте да учесници прихвате позивницу</string>
+    <string name="cannot_call_yourself">Не можете да поставите позив са собом</string>
+    <string name="missing_permissions_title_to_start_conf_call">Не може да се започне позив</string>
+    <string name="conference_call_in_progress">Конференција је већ у току!</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Немате дозволу за започињање позива</string>
+    <string name="no_permissions_to_start_webrtc_call">Немате дозволу за започињање позива у овој соби</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Немате дозволу за започињање конференцијског позива</string>
+    <string name="no_permissions_to_start_conf_call">Немате дозволу за започињање конференцијског позива у овој соби</string>
+    <string name="missing_permissions_to_start_conf_call">Потребна вам је дозвола за позивање да започнете конференцију у овој соби</string>
+    <string name="missing_permissions_error">Због недостајућих дозвола, ова акција није могућа.</string>
+    <string name="missing_permissions_warning">Због недостајућих дозвола, неке функције могу недостајати…</string>
+    <string name="cannot_start_call">Не може се покренути позив, покушајте касније</string>
+    <string name="ongoing_conference_call">Конференцијски позив у току.
+\nПридружи се као %1$s или %2$s</string>
+    <string name="permalink">Permalink</string>
+    <string name="initial_sync_start_downloading">Почетна синхронизација:
+\nПреузимање података…</string>
+    <string name="initial_sync_start_server_computing">Почетна синхронизација:
+\nЧека се одговор сервера…</string>
 </resources>
\ No newline at end of file

From beb552db3144f905dc96aedf7e153d103c2a620b Mon Sep 17 00:00:00 2001
From: GokdenizK <gokdeniz_6167@hotmail.com>
Date: Fri, 19 Mar 2021 12:12:01 +0000
Subject: [PATCH 394/578] Translated using Weblate (Turkish)

Currently translated at 66.2% (1564 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
---
 vector/src/main/res/values-tr/strings.xml | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index e5773a99a1..6a065d06e8 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -1742,4 +1742,39 @@
     <string name="summary_you_sent_image">Bir fotoğraf gönderdin.</string>
     <string name="summary_user_sent_image">%1$s bir fotoğraf gönderdi.</string>
     <string name="summary_message">%1$s%2$s</string>
+    <string name="notice_display_name_removed">%1$s kullanıcısı görünen ismini kaldırdı (önceden şuydu: %2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">%1$s görünen adınızı şuna değiştiniz: %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s , %2$s görünen adını şununla değişti: %3$s</string>
+    <string name="notice_display_name_set_by_you">Görünen adınızı şuna değiştiniz: %1$s</string>
+    <string name="notice_display_name_set">%1$s görünen adını şuna değişti: %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">%1$s kişisini davet ettiniz</string>
+    <string name="notice_direct_room_third_party_invite">%1$s, %2$s kişisini davet etti</string>
+    <string name="notice_event_redacted_by">Mesaj %1$s tarafından silindi</string>
+    <string name="notice_event_redacted">Mesaj silindi</string>
+    <string name="notice_room_avatar_removed_by_you">Oda avatarını kaldırdınız</string>
+    <string name="notice_room_avatar_removed">%1$s oda avatarını kaldırdı</string>
+    <string name="notice_room_topic_removed_by_you">Oda konusunu kaldırdınız</string>
+    <string name="notice_room_topic_removed">%1$s oda konusunu kaldırdı</string>
+    <string name="notice_room_name_removed_by_you">Oda ismini kaldırdınız</string>
+    <string name="notice_room_visibility_shared">tüm oda üyeleri.</string>
+    <string name="notice_ended_call_by_you">Aramayı sonlandırdınız.</string>
+    <string name="notice_ended_call">%s aramayı sonlandırdı.</string>
+    <string name="notice_answered_call_by_you">Aramayı cevapladınız.</string>
+    <string name="notice_answered_call">%s aramayı cevapladı.</string>
+    <string name="notice_call_candidates">"
+\n"</string>
+    <string name="notice_placed_voice_call_by_you">Bir sesli arama başlattınız.</string>
+    <string name="notice_placed_voice_call">%s bir sesli arama başlattı.</string>
+    <string name="notice_placed_video_call_by_you">Görüntülü arama başlattınız.</string>
+    <string name="notice_placed_video_call">%s bir görüntülü arama başlattı.</string>
+    <string name="notice_room_name_changed_by_you">Oda ismini şuna değiştirdiniz: %1$s</string>
+    <string name="notice_room_name_changed">%1$s oda ismini şuna değiştirdi: %2$s</string>
+    <string name="notice_room_avatar_changed_by_you">Oda avatarını değiştirdiniz</string>
+    <string name="notice_room_avatar_changed">%1$s oda avatarını değiştirdi</string>
+    <string name="notice_room_topic_changed_by_you">Konuyu şuna değiştirdiniz: %1$s</string>
+    <string name="notice_room_topic_changed">%1$s konuyu şuna değiştirdi: %2$s</string>
+    <string name="notice_room_unban_by_you">%1$s adlı kişinin banını kaldırdı</string>
+    <string name="notice_room_unban">%1$s, %2$s adlı kişinin banını kaldırdı</string>
+    <string name="notice_room_kick_by_you">%1$s adlı kullanıcıyı attı</string>
+    <string name="notice_room_kick">%1$s, %2$s adlı kullanıcıyı attı</string>
 </resources>
\ No newline at end of file

From b117c30e4422cac2cffe5180c7ffa7aa8175c618 Mon Sep 17 00:00:00 2001
From: vachan-maker <revsamtp@hotmail.com>
Date: Sat, 20 Mar 2021 04:27:22 +0000
Subject: [PATCH 395/578] Translated using Weblate (Malayalam)

Currently translated at 16.7% (396 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 867f5661c2..7be6c5865e 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -412,4 +412,8 @@
     <string name="ssl_logout_account">പുറത്തിറങ്ങുക</string>
     <string name="logout">പുറത്തിറങ്ങുക</string>
     <string name="title_activity_keys_backup_restore">കീ ബാക്കപ്പ് ഉപയൊഗിക്കൂ</string>
+    <string name="summary_user_sent_sticker">%1$s ഒരു സ്റ്റിക്കർ അയച്ചു.</string>
+    <string name="summary_you_sent_image">നിങ്ങൾ ഒരു ചിത്രം അയച്ചു.</string>
+    <string name="summary_user_sent_image">%1$s ഒരു ചിത്രം അയച്ചു.</string>
+    <string name="summary_message">%1$s: %2$s</string>
 </resources>
\ No newline at end of file

From 9e7d4c901e040943c81ed12ea9260eb3ba760abb Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 11 Mar 2021 16:47:21 +0300
Subject: [PATCH 396/578] Api interceptor implementation to allow app
 developers to peek responses.

---
 .../java/org/matrix/android/sdk/api/Matrix.kt |   7 +
 .../android/sdk/api/network/ApiInterceptor.kt |  90 +++++++++
 .../matrix/android/sdk/api/network/ApiPath.kt | 183 ++++++++++++++++++
 .../android/sdk/internal/di/NetworkModule.kt  |  12 +-
 4 files changed, 291 insertions(+), 1 deletion(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptor.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index a5d457222f..90bfbe3de6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -25,6 +25,8 @@ import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import org.matrix.android.sdk.api.network.ApiInterceptor
+import org.matrix.android.sdk.api.network.ApiPath
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.internal.SessionManager
 import org.matrix.android.sdk.internal.di.DaggerMatrixComponent
@@ -49,6 +51,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
     @Inject internal lateinit var olmManager: OlmManager
     @Inject internal lateinit var sessionManager: SessionManager
     @Inject internal lateinit var homeServerHistoryService: HomeServerHistoryService
+    @Inject internal lateinit var apiInterceptor: ApiInterceptor
 
     init {
         Monarchy.init(context)
@@ -73,6 +76,10 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         return legacySessionImporter
     }
 
+    fun registerApiInterceptorListener(path: ApiPath, listener: ApiInterceptor.Listener) {
+        apiInterceptor.addListener(path, listener)
+    }
+
     companion object {
 
         private lateinit var instance: Matrix
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptor.kt
new file mode 100644
index 0000000000..2b259a9797
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptor.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.network
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Interceptor class for provided api paths.
+ */
+@Singleton
+class ApiInterceptor @Inject constructor() : Interceptor {
+
+    interface Listener {
+        fun onApiResponse(path: ApiPath, response: String)
+    }
+
+    init {
+        Timber.d("ApiInterceptor.init")
+    }
+
+    private val apiResponseListenersMap = mutableMapOf<ApiPath, MutableList<Listener>>()
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request()
+        val path = request.url.encodedPath.replaceFirst("/", "")
+        val method = request.method
+
+        val response = chain.proceed(request)
+
+        findApiPath(path, method)?.let { apiPath ->
+            response.peekBody(Long.MAX_VALUE).string().let {
+                apiResponseListenersMap[apiPath]?.forEach { listener ->
+                    listener.onApiResponse(apiPath, it)
+                }
+            }
+        }
+
+        return response
+    }
+
+    private fun findApiPath(path: String, method: String): ApiPath? {
+        return apiResponseListenersMap
+                .keys
+                .find { apiPath ->
+                    apiPath.method === method && isTheSamePath(apiPath.path, path)
+                }
+    }
+
+    private fun isTheSamePath(pattern: String, path: String): Boolean {
+        val patternSegments = pattern.split("/")
+        val pathSegments = path.split("/")
+
+        if (patternSegments.size != pathSegments.size) return false
+
+        for (i in patternSegments.indices) {
+            if (patternSegments[i] != pathSegments[i] && !patternSegments[i].startsWith("{")) {
+                return false
+            }
+        }
+        return true
+    }
+
+    /**
+     * Adds listener to send intercepted api responses through.
+     */
+    fun addListener(path: ApiPath, listener: Listener) {
+        if (!apiResponseListenersMap.contains(path)) {
+            apiResponseListenersMap[path] = mutableListOf()
+        }
+        apiResponseListenersMap[path]?.add(listener)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt
new file mode 100644
index 0000000000..4de8d49cf4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.network
+
+import org.matrix.android.sdk.internal.network.NetworkConstants
+
+enum class ApiPath(val path: String, val method: String) {
+    // AuthApi
+    VERSIONS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "versions", "GET"),
+    REGISTER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register", "POST"),
+    ADD_3PID(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register/{threePid}/requestToken", "POST"),
+    LOGIN_FLOWS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "login", "GET"),
+    LOGIN(NetworkConstants.URI_API_PREFIX_PATH_R0 + "login", "POST"),
+    RESET_PASSWORD(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/password/email/requestToken", "POST"),
+    RESET_PASSWORD_MAIL_CONFIRMED(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/password", "POST"),
+
+    // DirectoryApi
+    ROOM_ID_BY_ALIAS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}", "GET"),
+    ROOM_DIRECTORY_VISIBILITY(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/list/room/{roomId}", "GET"),
+    SET_ROOM_DIRECTORY_VISIBILITY(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/list/room/{roomId}", "PUT"),
+    ADD_ROOM_ALIAS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}", "PUT"),
+    DELETE_ROOM_ALIAS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}", "DELETE"),
+
+    // CryptoApi
+    GET_DEVICES(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices", "GET"),
+    GET_DEVICE_INFO(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{deviceId}", "GET"),
+    UPLOAD_KEYS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/upload", "POST"),
+    DOWNLOAD_KEYS_FOR_USERS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/query", "POST"),
+    UPLOAD_SIGNING_KEYS(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "keys/device_signing/upload", "POST"),
+    UPLOAD_SIGNATURES(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "keys/signatures/upload", "POST"),
+    CLAIM_ONE_TIME_KEYS_FOR_USERS_DEVICES(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/claim", "POST"),
+    SEND_TO_DEVICE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sendToDevice/{eventType}/{txnId}", "PUT"),
+    DELETE_DEVICE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{device_id}", "DELETE"),
+    UPDATE_DEVICE_INFO(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{device_id}", "PUT"),
+    GET_KEY_CHANGES(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/changes", "GET"),
+
+    // RoomKeysApi
+    CREATE_KEYS_BACKUP_VERSION(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version", "POST"),
+    GET_KEYS_BACKUP_LAST_VERSION(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version", "GET"),
+    GET_KEYS_BACKUP_VERSION(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version/{version}", "GET"),
+    UPDATE_KEYS_BACKUP_VERSION(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version/{version}", "PUT"),
+    STORE_ROOM_SESSION_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}", "PUT"),
+    STORE_ROOM_SESSIONS_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}", "PUT"),
+    STORE_SESSIONS_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys", "PUT"),
+    GET_ROOM_SESSION_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}", "GET"),
+    GET_ROOM_SESSIONS_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}", "GET"),
+    GET_SESSIONS_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys", "GET"),
+    DELETE_ROOM_SESSION_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}", "DELETE"),
+    DELETE_ROOM_SESSIONS_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}", "DELETE"),
+    DELETE_SESSIONS_DATA(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys", "DELETE"),
+    DELETE_BACKUP(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version/{version}", "DELETE"),
+
+    // AccountApi
+    CHANGE_PASSWORD(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/password", "POST"),
+    DEACTIVATE_ACCOUNT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/deactivate", "POST"),
+
+    // SearchApi
+    SEARCH(NetworkConstants.URI_API_PREFIX_PATH_R0 + "search", "POST"),
+
+    // FederationApi
+    GET_FEDERATION_VERSION(NetworkConstants.URI_FEDERATION_PATH + "version", "GET"),
+
+    // VoipApi
+    GET_TURN_SERVER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "voip/turnServer", "GET"),
+
+    // PushGatewayApi
+    NOTIFY_PUSH_GATEWAY(NetworkConstants.URI_PUSH_GATEWAY_PREFIX_PATH + "notify", "POST"),
+
+    // GroupApi
+    GET_GROUP_SUMMARY(NetworkConstants.URI_API_PREFIX_PATH_R0 + "groups/{groupId}/summary", "GET"),
+    GET_GROUP_ROOMS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "groups/{groupId}/rooms", "GET"),
+    GET_GROUP_USERS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "groups/{groupId}/users", "GET"),
+
+    // CapabilitiesApi
+    GET_CAPABILITIES(NetworkConstants.URI_API_PREFIX_PATH_R0 + "capabilities", "GET"),
+    GET_VERSIONS(NetworkConstants.URI_API_PREFIX_PATH_ + "versions", "GET"),
+    PING(NetworkConstants.URI_API_PREFIX_PATH_ + "versions", "GET"),
+
+    // IdentityApi
+    GET_ACCOUNT(NetworkConstants.URI_IDENTITY_PATH_V2 + "account", "GET"),
+    LOGOUT(NetworkConstants.URI_IDENTITY_PATH_V2 + "account/logout", "POST"),
+    IDENTITY_HAS_DETAILS(NetworkConstants.URI_IDENTITY_PATH_V2 + "hash_details", "GET"),
+    LOOKUP(NetworkConstants.URI_IDENTITY_PATH_V2 + "lookup", "POST"),
+    REQUEST_TOKEN_TO_BIND_EMAIL(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/email/requestToken", "POST"),
+    REQUEST_TOKEN_TO_BIND_MSISDN(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/msisdn/requestToken", "POST"),
+    SUBMIT_TOKEN(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/{medium}/submitToken", "POST"),
+
+    // FilterApi
+    UPLOAD_FILTER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/filter", "POST"),
+    GET_FILTER_BY_ID(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/filter/{filterId}", "GET"),
+
+    // IndentityAuthApi
+    IDENTITY_REGISTER(NetworkConstants.URI_IDENTITY_PATH_V2 + "account/register", "POST"),
+
+    // MediaApi
+    GET_MEDIA_CONFIG(NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "config", "GET"),
+    GET_PREVIEW_URL_DATA(NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "preview_url", "GET"),
+
+    // OpenIdApi
+    OPEN_ID_TOKEN(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/openid/request_token", "POST"),
+
+    // ProfileApi
+    GET_PROFILE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}", "GET"),
+    GET_THREE_PIDS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid", "GET"),
+    SET_DISPLAY_NAME(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/displayname", "PUT"),
+    SET_AVATAR_URL(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/avatar_url", "PUT"),
+    BIND_THREE_PID(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "account/3pid/bind", "POST"),
+    UNBIND_THREE_PID(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "account/3pid/unbind", "POST"),
+    ADD_EMAIL(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/email/requestToken", "POST"),
+    ADD_MSISDN(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/msisdn/requestToken", "POST"),
+    FINALIZE_ADD_THREE_PID(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/add", "POST"),
+    DELETE_THREE_PID(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/delete", "POST"),
+
+    // PusherRulesApi
+    GET_ALL_PUSHER_RULES(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/", "GET"),
+    UPDATE_ENABLE_PUSH_RULE_STATUS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}/enabled", "PUT"),
+    UPDATE_PUSH_RULE_ACTIONS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}/actions", "PUT"),
+    DELETE_PUSH_RULE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}", "DELETE"),
+    ADD_PUSH_RULE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}", "PUT"),
+
+    // PusherApi
+    GET_PUSHERS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushers", "GET"),
+    SET_PUSHER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushers/set", "POST"),
+
+    // SignOutApi
+    LOGIN_AGAIN(NetworkConstants.URI_API_PREFIX_PATH_R0 + "login", "POST"),
+    SIGN_OUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "logout", "POST"),
+
+    // RoomApi
+    GET_PUBLIC_ROOMS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "publicRooms", "POST"),
+    CREATE_ROOM(NetworkConstants.URI_API_PREFIX_PATH_R0 + "createRoom", "POST"),
+    GET_ROOM_MESSAGES_FROM(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/messages", "GET"),
+    GET_MEMBERS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/members", "GET"),
+    SEND_EVENT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/send/{eventType}/{txId}", "PUT"),
+    GET_CONTEXT_OF_EVENT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/context/{eventId}", "GET"),
+    GET_EVENT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/event/{eventId}", "GET"),
+    SEND_READ_MARKER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/read_markers", "POST"),
+    INVITE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/invite", "POST"),
+    INVITE_USING_THREE_PID(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/invite", "POST"),
+    SEND_STATE_EVENT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state/{state_event_type}", "PUT"),
+    SEND_STATE_EVENT_WITH_STATE_KEY(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state/{state_event_type}/{state_key}", "PUT"),
+    GET_ROOM_STATE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state", "GET"),
+    SEND_RELATION(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/send_relation/{parent_id}/{relation_type}/{event_type}", "POST"),
+    GET_RELATIONS(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "rooms/{roomId}/relations/{eventId}/{relationType}/{eventType}", "GET"),
+    JOIN_ROOM(NetworkConstants.URI_API_PREFIX_PATH_R0 + "join/{roomIdOrAlias}", "POST"),
+    LEAVE_ROOM(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/leave", "POST"),
+    BAN_USER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/ban", "POST"),
+    UNBAN_USER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/unban", "POST"),
+    KICK_USER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/kick", "POST"),
+    REDACT_EVENT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/redact/{eventId}/{txnId}", "PUT"),
+    REPORT_CONTENT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/report/{eventId}", "POST"),
+    GET_ALIASES(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc2432/rooms/{roomId}/aliases", "GET"),
+    SEND_TYPING_STATE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/typing/{userId}", "PUT"),
+    PUT_TAG(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/rooms/{roomId}/tags/{tag}", "PUT"),
+    DELETE_TAG(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/rooms/{roomId}/tags/{tag}", "DELETE"),
+
+    // SyncApi
+    SYNC(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sync", "GET"),
+
+    // ThirdPartyApi
+    THIRD_PARTY_PROTOCOLS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "thirdparty/protocols", "GET"),
+    THIRD_PARTY_USER(NetworkConstants.URI_API_PREFIX_PATH_R0 + "thirdparty/protocols/user/{protocol}", "GET"),
+
+    // SearchUserApi
+    SEARCH_USERS(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user_directory/search", "POST"),
+
+    // AccountDataApi
+    SET_ACCOUNT_DATA(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/account_data/{type}", "PUT")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
index f4688411ff..da50709de0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.internal.network.interceptors.CurlLoggingIntercept
 import org.matrix.android.sdk.internal.network.interceptors.FormattedJsonHttpLogger
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
+import org.matrix.android.sdk.api.network.ApiInterceptor
 import java.util.concurrent.TimeUnit
 
 @Module
@@ -54,6 +55,13 @@ internal object NetworkModule {
         return CurlLoggingInterceptor()
     }
 
+    @MatrixScope
+    @Provides
+    @JvmStatic
+    fun providesApiInterceptor(): ApiInterceptor {
+        return ApiInterceptor()
+    }
+
     @MatrixScope
     @Provides
     @JvmStatic
@@ -63,7 +71,8 @@ internal object NetworkModule {
                              timeoutInterceptor: TimeOutInterceptor,
                              userAgentInterceptor: UserAgentInterceptor,
                              httpLoggingInterceptor: HttpLoggingInterceptor,
-                             curlLoggingInterceptor: CurlLoggingInterceptor): OkHttpClient {
+                             curlLoggingInterceptor: CurlLoggingInterceptor,
+                             apiInterceptor: ApiInterceptor): OkHttpClient {
         return OkHttpClient.Builder()
                 .connectTimeout(30, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
@@ -76,6 +85,7 @@ internal object NetworkModule {
                 .addInterceptor(timeoutInterceptor)
                 .addInterceptor(userAgentInterceptor)
                 .addInterceptor(httpLoggingInterceptor)
+                .addInterceptor(apiInterceptor)
                 .apply {
                     if (BuildConfig.LOG_PRIVATE_DATA) {
                         addInterceptor(curlLoggingInterceptor)

From 7db1d81eb697a4602922e09800767715e9967019 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 11 Mar 2021 16:51:17 +0300
Subject: [PATCH 397/578] Changelog added.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 55c7387379..ce3281d987 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
  - Crypto improvement | Bulk send NO_OLM withheld code
  - Display the room shield in all room setting screens
  - Improve message with Emoji only detection (#3017)
+ - Api interceptor to allow app developers peek responses (#2986)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity

From 21cff9a7493070cc68701111f878cc4bea1ac0e0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Mar 2021 16:36:44 +0100
Subject: [PATCH 398/578] Update after Ganfra's review, and kotlinification

---
 .../java/org/matrix/android/sdk/api/Matrix.kt |  5 ++-
 .../sdk/api/network/ApiInterceptorListener.kt | 21 ++++++++++
 .../matrix/android/sdk/api/network/ApiPath.kt |  2 +-
 .../android/sdk/internal/di/NetworkModule.kt  |  9 +----
 .../network/ApiInterceptor.kt                 | 40 +++++++++----------
 5 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptorListener.kt
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{api => internal}/network/ApiInterceptor.kt (66%)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index 90bfbe3de6..8a27f364d2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -25,11 +25,12 @@ import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
-import org.matrix.android.sdk.api.network.ApiInterceptor
+import org.matrix.android.sdk.api.network.ApiInterceptorListener
 import org.matrix.android.sdk.api.network.ApiPath
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.internal.SessionManager
 import org.matrix.android.sdk.internal.di.DaggerMatrixComponent
+import org.matrix.android.sdk.internal.network.ApiInterceptor
 import org.matrix.android.sdk.internal.network.UserAgentHolder
 import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
 import org.matrix.olm.OlmManager
@@ -76,7 +77,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         return legacySessionImporter
     }
 
-    fun registerApiInterceptorListener(path: ApiPath, listener: ApiInterceptor.Listener) {
+    fun registerApiInterceptorListener(path: ApiPath, listener: ApiInterceptorListener) {
         apiInterceptor.addListener(path, listener)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptorListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptorListener.kt
new file mode 100644
index 0000000000..ad21da8fdf
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptorListener.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.network
+
+interface ApiInterceptorListener {
+    fun onApiResponse(path: ApiPath, response: String)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt
index 4de8d49cf4..db112a30b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiPath.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
index da50709de0..0d0892b608 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
@@ -28,7 +28,7 @@ import org.matrix.android.sdk.internal.network.interceptors.CurlLoggingIntercept
 import org.matrix.android.sdk.internal.network.interceptors.FormattedJsonHttpLogger
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
-import org.matrix.android.sdk.api.network.ApiInterceptor
+import org.matrix.android.sdk.internal.network.ApiInterceptor
 import java.util.concurrent.TimeUnit
 
 @Module
@@ -55,13 +55,6 @@ internal object NetworkModule {
         return CurlLoggingInterceptor()
     }
 
-    @MatrixScope
-    @Provides
-    @JvmStatic
-    fun providesApiInterceptor(): ApiInterceptor {
-        return ApiInterceptor()
-    }
-
     @MatrixScope
     @Provides
     @JvmStatic
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
similarity index 66%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptor.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
index 2b259a9797..8b188910a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/network/ApiInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,29 +14,28 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.network
+package org.matrix.android.sdk.internal.network
 
 import okhttp3.Interceptor
 import okhttp3.Response
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.network.ApiInterceptorListener
+import org.matrix.android.sdk.api.network.ApiPath
+import org.matrix.android.sdk.internal.di.MatrixScope
 import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Singleton
 
 /**
  * Interceptor class for provided api paths.
  */
-@Singleton
-class ApiInterceptor @Inject constructor() : Interceptor {
-
-    interface Listener {
-        fun onApiResponse(path: ApiPath, response: String)
-    }
+@MatrixScope
+internal class ApiInterceptor @Inject constructor() : Interceptor {
 
     init {
         Timber.d("ApiInterceptor.init")
     }
 
-    private val apiResponseListenersMap = mutableMapOf<ApiPath, MutableList<Listener>>()
+    private val apiResponseListenersMap = mutableMapOf<ApiPath, MutableList<ApiInterceptorListener>>()
 
     override fun intercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
@@ -46,9 +45,11 @@ class ApiInterceptor @Inject constructor() : Interceptor {
         val response = chain.proceed(request)
 
         findApiPath(path, method)?.let { apiPath ->
-            response.peekBody(Long.MAX_VALUE).string().let {
+            response.peekBody(Long.MAX_VALUE).string().let { networkResponse ->
                 apiResponseListenersMap[apiPath]?.forEach { listener ->
-                    listener.onApiResponse(apiPath, it)
+                    tryOrNull("Error in the implementation") {
+                        listener.onApiResponse(apiPath, networkResponse)
+                    }
                 }
             }
         }
@@ -70,21 +71,16 @@ class ApiInterceptor @Inject constructor() : Interceptor {
 
         if (patternSegments.size != pathSegments.size) return false
 
-        for (i in patternSegments.indices) {
-            if (patternSegments[i] != pathSegments[i] && !patternSegments[i].startsWith("{")) {
-                return false
-            }
+        return patternSegments.indices.all { i ->
+            patternSegments[i] == pathSegments[i] || patternSegments[i].startsWith("{")
         }
-        return true
     }
 
     /**
      * Adds listener to send intercepted api responses through.
      */
-    fun addListener(path: ApiPath, listener: Listener) {
-        if (!apiResponseListenersMap.contains(path)) {
-            apiResponseListenersMap[path] = mutableListOf()
-        }
-        apiResponseListenersMap[path]?.add(listener)
+    fun addListener(path: ApiPath, listener: ApiInterceptorListener) {
+        apiResponseListenersMap.getOrPut(path) { mutableListOf() }
+                .add(listener)
     }
 }

From f6e43a5305b9b2476025d136400d94a1e9d4a7cc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Mar 2021 17:13:16 +0100
Subject: [PATCH 399/578] Add Android test on ApiInterceptor

---
 matrix-sdk-android/build.gradle               |  1 -
 .../java/org/matrix/android/sdk/api/Matrix.kt |  8 +++
 .../sdk/api/network/ApiInterceptorTest.kt     | 53 +++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 5ca5ce1e05..7fb626ab46 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -185,7 +185,6 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'org.amshove.kluent:kluent-android:1.61'
-    // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     androidTestImplementation 'io.mockk:mockk-android:1.11.0'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
index 03943cea14..11251b8a5d 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
@@ -27,9 +27,12 @@ import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.legacy.LegacySessionImporter
+import org.matrix.android.sdk.api.network.ApiInterceptorListener
+import org.matrix.android.sdk.api.network.ApiPath
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.common.DaggerTestMatrixComponent
 import org.matrix.android.sdk.internal.SessionManager
+import org.matrix.android.sdk.internal.network.ApiInterceptor
 import org.matrix.android.sdk.internal.network.UserAgentHolder
 import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
 import org.matrix.olm.OlmManager
@@ -51,6 +54,7 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
     @Inject internal lateinit var olmManager: OlmManager
     @Inject internal lateinit var sessionManager: SessionManager
     @Inject internal lateinit var homeServerHistoryService: HomeServerHistoryService
+    @Inject internal lateinit var apiInterceptor: ApiInterceptor
 
     private val uiHandler = Handler(Looper.getMainLooper())
 
@@ -79,6 +83,10 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         return legacySessionImporter
     }
 
+    fun registerApiInterceptorListener(path: ApiPath, listener: ApiInterceptorListener) {
+        apiInterceptor.addListener(path, listener)
+    }
+
     companion object {
 
         private lateinit var instance: Matrix
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
new file mode 100644
index 0000000000..93fdccfd48
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.network
+
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.common.TestConstants
+import timber.log.Timber
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class ApiInterceptorTest : InstrumentedTest {
+
+    private val commonTestHelper = CommonTestHelper(context())
+
+    @Test
+    fun createAccountTest() {
+        var counter = 0
+        commonTestHelper.matrix.registerApiInterceptorListener(ApiPath.REGISTER, object : ApiInterceptorListener {
+            override fun onApiResponse(path: ApiPath, response: String) {
+                Timber.w("onApiResponse($path): $response")
+                counter++
+            }
+        })
+
+        val session = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
+
+        commonTestHelper.signOutAndClose(session)
+
+        counter shouldBeEqualTo 2
+    }
+}

From d85d44bf4b2f44c05b21f827686ed10da61f1d63 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Mar 2021 18:09:42 +0100
Subject: [PATCH 400/578] Add ApiInterceptor.removeListener()

---
 .../org/matrix/android/sdk/InstrumentedTest.kt |  5 -----
 .../java/org/matrix/android/sdk/api/Matrix.kt  |  4 ++++
 .../sdk/api/network/ApiInterceptorTest.kt      | 17 +++++++++++------
 .../java/org/matrix/android/sdk/api/Matrix.kt  |  4 ++++
 .../sdk/internal/network/ApiInterceptor.kt     | 18 ++++++++++++++++--
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
index b784884363..583406346e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
@@ -20,7 +20,6 @@ import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import org.matrix.android.sdk.test.shared.createTimberTestRule
 import org.junit.Rule
-import java.io.File
 
 interface InstrumentedTest {
 
@@ -30,8 +29,4 @@ interface InstrumentedTest {
     fun context(): Context {
         return ApplicationProvider.getApplicationContext()
     }
-
-    fun cacheDir(): File {
-        return context().cacheDir
-    }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
index 11251b8a5d..c439da8407 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
@@ -87,6 +87,10 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         apiInterceptor.addListener(path, listener)
     }
 
+    fun unregisterApiInterceptorListener(path: ApiPath, listener: ApiInterceptorListener) {
+        apiInterceptor.removeListener(path, listener)
+    }
+
     companion object {
 
         private lateinit var instance: Matrix
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
index 93fdccfd48..149acbc18a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
@@ -35,19 +35,24 @@ class ApiInterceptorTest : InstrumentedTest {
     private val commonTestHelper = CommonTestHelper(context())
 
     @Test
-    fun createAccountTest() {
-        var counter = 0
-        commonTestHelper.matrix.registerApiInterceptorListener(ApiPath.REGISTER, object : ApiInterceptorListener {
+    fun apiInterceptorTest() {
+        val responses = mutableListOf<String>()
+
+        val listener = object : ApiInterceptorListener {
             override fun onApiResponse(path: ApiPath, response: String) {
                 Timber.w("onApiResponse($path): $response")
-                counter++
+                responses.add(response)
             }
-        })
+        }
+
+        commonTestHelper.matrix.registerApiInterceptorListener(ApiPath.REGISTER, listener)
 
         val session = commonTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(withInitialSync = true))
 
         commonTestHelper.signOutAndClose(session)
 
-        counter shouldBeEqualTo 2
+        commonTestHelper.matrix.unregisterApiInterceptorListener(ApiPath.REGISTER, listener)
+
+        responses.size shouldBeEqualTo 2
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index 8a27f364d2..9980259266 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -81,6 +81,10 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
         apiInterceptor.addListener(path, listener)
     }
 
+    fun unregisterApiInterceptorListener(path: ApiPath, listener: ApiInterceptorListener) {
+        apiInterceptor.removeListener(path, listener)
+    }
+
     companion object {
 
         private lateinit var instance: Matrix
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
index 8b188910a1..5d73264d11 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
@@ -80,7 +80,21 @@ internal class ApiInterceptor @Inject constructor() : Interceptor {
      * Adds listener to send intercepted api responses through.
      */
     fun addListener(path: ApiPath, listener: ApiInterceptorListener) {
-        apiResponseListenersMap.getOrPut(path) { mutableListOf() }
-                .add(listener)
+        synchronized(apiResponseListenersMap) {
+            apiResponseListenersMap.getOrPut(path) { mutableListOf() }
+                    .add(listener)
+        }
+    }
+
+    /**
+     * Remove listener to send intercepted api responses through.
+     */
+    fun removeListener(path: ApiPath, listener: ApiInterceptorListener) {
+        synchronized(apiResponseListenersMap) {
+            apiResponseListenersMap[path]?.remove(listener)
+            if (apiResponseListenersMap[path]?.isEmpty() == true) {
+                apiResponseListenersMap.remove(path)
+            }
+        }
     }
 }

From f106176752e54d806b6abdcf18f9346c61f982f0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Mar 2021 18:26:29 +0100
Subject: [PATCH 401/578] Add missing synchronized

---
 .../android/sdk/internal/network/ApiInterceptor.kt   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
index 5d73264d11..afd3347283 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
@@ -44,11 +44,13 @@ internal class ApiInterceptor @Inject constructor() : Interceptor {
 
         val response = chain.proceed(request)
 
-        findApiPath(path, method)?.let { apiPath ->
-            response.peekBody(Long.MAX_VALUE).string().let { networkResponse ->
-                apiResponseListenersMap[apiPath]?.forEach { listener ->
-                    tryOrNull("Error in the implementation") {
-                        listener.onApiResponse(apiPath, networkResponse)
+        synchronized(apiResponseListenersMap) {
+            findApiPath(path, method)?.let { apiPath ->
+                response.peekBody(Long.MAX_VALUE).string().let { networkResponse ->
+                    apiResponseListenersMap[apiPath]?.forEach { listener ->
+                        tryOrNull("Error in the implementation") {
+                            listener.onApiResponse(apiPath, networkResponse)
+                        }
                     }
                 }
             }

From 5cd86c685d42d8311a5409483085d5d45d321a4d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Mar 2021 18:29:06 +0100
Subject: [PATCH 402/578] Copyright

---
 .../org/matrix/android/sdk/api/network/ApiInterceptorTest.kt    | 2 +-
 .../org/matrix/android/sdk/internal/network/ApiInterceptor.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
index 149acbc18a..9371154aaf 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/network/ApiInterceptorTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
index afd3347283..1dd6e75ea5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ApiInterceptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From 5136979352ef32f4c22c600fb09cfed036477024 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 22 Mar 2021 18:33:06 +0100
Subject: [PATCH 403/578] Cleanup on unbinding

Valere's review
---
 .../core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
index 2f7c22e4b4..5ff7a07e3c 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
@@ -77,6 +77,11 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         holder.timestamp.setTextOrHide(time)
     }
 
+    override fun unbind(holder: Holder) {
+        imageContentRenderer?.clear(holder.imagePreview)
+        super.unbind(holder)
+    }
+
     class Holder : VectorEpoxyHolder() {
         val avatar by bind<ImageView>(R.id.bottom_sheet_message_preview_avatar)
         val sender by bind<TextView>(R.id.bottom_sheet_message_preview_sender)

From 274aef8f248f3079934de1d52e74b3f4c2b54000 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 22 Mar 2021 19:15:06 +0100
Subject: [PATCH 404/578] Code qual

---
 tools/check/forbidden_strings_in_code.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 468fe717c0..7b7c44b9fd 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===92
+enum class===93
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From 024dcf1f6ce9c953fc3a243e7dc56eb1e371b042 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 23 Mar 2021 21:09:52 +0100
Subject: [PATCH 405/578] Be robust to Exception.

And display details about it in the bottom sheet
---
 .../action/MessageActionsViewModel.kt         | 72 ++++++++++---------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index ac1c2258aa..b5d3102f46 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -24,6 +24,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.R
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.canReact
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
@@ -65,6 +66,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                                                           private val htmlCompressor: VectorHtmlCompressor,
                                                           private val session: Session,
                                                           private val noticeEventFormatter: NoticeEventFormatter,
+                                                          private val errorFormatter: ErrorFormatter,
                                                           private val stringProvider: StringProvider,
                                                           private val pillsPostProcessorFactory: PillsPostProcessor.Factory,
                                                           private val vectorPreferences: VectorPreferences
@@ -171,42 +173,46 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun computeMessageBody(timelineEvent: TimelineEvent): CharSequence {
-        if (timelineEvent.root.isRedacted()) {
-            return noticeEventFormatter.formatRedactedEvent(timelineEvent.root)
-        }
+        return try {
+            if (timelineEvent.root.isRedacted()) {
+                noticeEventFormatter.formatRedactedEvent(timelineEvent.root)
+            } else {
+                when (timelineEvent.root.getClearType()) {
+                    EventType.MESSAGE,
+                    EventType.STICKER     -> {
+                        val messageContent: MessageContent? = timelineEvent.getLastMessageContent()
+                        if (messageContent is MessageTextContent && messageContent.format == MessageFormat.FORMAT_MATRIX_HTML) {
+                            val html = messageContent.formattedBody
+                                    ?.takeIf { it.isNotBlank() }
+                                    ?.let { htmlCompressor.compress(it) }
+                                    ?: messageContent.body
 
-        return when (timelineEvent.root.getClearType()) {
-            EventType.MESSAGE,
-            EventType.STICKER -> {
-                val messageContent: MessageContent? = timelineEvent.getLastMessageContent()
-                if (messageContent is MessageTextContent && messageContent.format == MessageFormat.FORMAT_MATRIX_HTML) {
-                    val html = messageContent.formattedBody
-                            ?.takeIf { it.isNotBlank() }
-                            ?.let { htmlCompressor.compress(it) }
-                            ?: messageContent.body
-
-                    eventHtmlRenderer.get().render(html, pillsPostProcessor)
-                } else if (messageContent is MessageVerificationRequestContent) {
-                    stringProvider.getString(R.string.verification_request)
-                } else {
-                    messageContent?.body
+                            eventHtmlRenderer.get().render(html, pillsPostProcessor)
+                        } else if (messageContent is MessageVerificationRequestContent) {
+                            stringProvider.getString(R.string.verification_request)
+                        } else {
+                            messageContent?.body
+                        }
+                    }
+                    EventType.STATE_ROOM_NAME,
+                    EventType.STATE_ROOM_TOPIC,
+                    EventType.STATE_ROOM_AVATAR,
+                    EventType.STATE_ROOM_MEMBER,
+                    EventType.STATE_ROOM_ALIASES,
+                    EventType.STATE_ROOM_CANONICAL_ALIAS,
+                    EventType.STATE_ROOM_HISTORY_VISIBILITY,
+                    EventType.STATE_ROOM_SERVER_ACL,
+                    EventType.CALL_INVITE,
+                    EventType.CALL_CANDIDATES,
+                    EventType.CALL_HANGUP,
+                    EventType.CALL_ANSWER -> {
+                        noticeEventFormatter.format(timelineEvent)
+                    }
+                    else                  -> null
                 }
             }
-            EventType.STATE_ROOM_NAME,
-            EventType.STATE_ROOM_TOPIC,
-            EventType.STATE_ROOM_AVATAR,
-            EventType.STATE_ROOM_MEMBER,
-            EventType.STATE_ROOM_ALIASES,
-            EventType.STATE_ROOM_CANONICAL_ALIAS,
-            EventType.STATE_ROOM_HISTORY_VISIBILITY,
-            EventType.STATE_ROOM_SERVER_ACL,
-            EventType.CALL_INVITE,
-            EventType.CALL_CANDIDATES,
-            EventType.CALL_HANGUP,
-            EventType.CALL_ANSWER -> {
-                noticeEventFormatter.format(timelineEvent)
-            }
-            else                  -> null
+        } catch (failure: Throwable) {
+            errorFormatter.toHumanReadable(failure)
         } ?: ""
     }
 

From 276677295fd8d04099d3110cebf7a4ca1cdfb082 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Wed, 24 Mar 2021 08:49:57 +0000
Subject: [PATCH 406/578] =?UTF-8?q?Deleted=20translation=20using=20Weblate?=
 =?UTF-8?q?=20(Norwegian=20Bokm=C3=A5l=20(nb))?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vector/src/main/res/values-nb/strings.xml | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 vector/src/main/res/values-nb/strings.xml

diff --git a/vector/src/main/res/values-nb/strings.xml b/vector/src/main/res/values-nb/strings.xml
deleted file mode 100644
index 3a7caefc55..0000000000
--- a/vector/src/main/res/values-nb/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="notice_direct_room_created_by_you">Du opprettet diskusjonen</string>
-    <string name="notice_room_created_by_you">Du opprettet rommet</string>
-    <string name="notice_room_invite_no_invitee_by_you">Invitasjonen din</string>
-    <string name="summary_you_sent_sticker">Du sendte et klistremerke.</string>
-    <string name="summary_user_sent_sticker">%1$s sendte et klistremerke.</string>
-    <string name="summary_you_sent_image">Du sendte et bilde.</string>
-    <string name="summary_user_sent_image">%1$s sendte et bilde.</string>
-    <string name="summary_message">%1$s: %2$s</string>
-    <string name="notice_room_created">%1$s skapte rommet</string>
-</resources>
\ No newline at end of file

From 30515492ca447a9229ddfe86d3f0881bbd5c8af8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 06:31:57 +0000
Subject: [PATCH 407/578] Bump recyclerview from 1.2.0-beta02 to 1.2.0-rc01

Bumps recyclerview from 1.2.0-beta02 to 1.2.0-rc01.

Signed-off-by: dependabot[bot] <support@github.com>
---
 attachment-viewer/build.gradle | 2 +-
 vector/build.gradle            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 7725bf23db..5a8cce92e8 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.recyclerview:recyclerview:1.2.0-beta02"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-rc01"
 
     implementation 'com.google.android.material:material:1.3.0'
 }
\ No newline at end of file
diff --git a/vector/build.gradle b/vector/build.gradle
index 70538b100a..7a87822849 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -320,7 +320,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0-beta02"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-rc01"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

From ee1059f1dbc36b8a6e97c4e4d072dc925d008ffe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 06:33:50 +0000
Subject: [PATCH 408/578] Bump fragment-ktx from 1.3.0 to 1.3.2

Bumps fragment-ktx from 1.3.0 to 1.3.2.

Signed-off-by: dependabot[bot] <support@github.com>
---
 multipicker/build.gradle | 2 +-
 vector/build.gradle      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 89a692a782..26afd5fb77 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -43,7 +43,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.fragment:fragment-ktx:1.3.0"
+    implementation "androidx.fragment:fragment-ktx:1.3.2"
     implementation 'androidx.exifinterface:exifinterface:1.3.2'
 
     // Log
diff --git a/vector/build.gradle b/vector/build.gradle
index 70538b100a..6ce769d35c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -291,7 +291,7 @@ android {
 dependencies {
 
     def epoxy_version = '4.4.3'
-    def fragment_version = '1.3.0'
+    def fragment_version = '1.3.2'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.7.1'

From 627e9a95437eaa9ea71040a33cc74bb90d657176 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 25 Mar 2021 11:18:26 +0100
Subject: [PATCH 409/578] Add version details on the login screen, in debug or
 developer mode

---
 CHANGES.md                                       |  2 +-
 .../app/features/login/LoginSplashFragment.kt    | 16 +++++++++++++++-
 .../main/res/layout/fragment_login_splash.xml    | 11 +++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index fdf65b9f1c..68b6194734 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,7 +30,7 @@ Test:
  -
 
 Other changes:
- -
+ - Add version details on the login screen, in debug or developer mode
 
 Changes in Element 1.1.3 (2021-03-18)
 ===================================================
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
index 03c87c5eec..956cf1615d 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
@@ -16,18 +16,24 @@
 
 package im.vector.app.features.login
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
+import im.vector.app.BuildConfig
 import im.vector.app.databinding.FragmentLoginSplashBinding
+import im.vector.app.features.settings.VectorPreferences
 
 import javax.inject.Inject
 
 /**
  * In this screen, the user is viewing an introduction to what he can do with this application
  */
-class LoginSplashFragment @Inject constructor() : AbstractLoginFragment<FragmentLoginSplashBinding>() {
+class LoginSplashFragment @Inject constructor(
+        private val vectorPreferences: VectorPreferences
+) : AbstractLoginFragment<FragmentLoginSplashBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSplashBinding {
         return FragmentLoginSplashBinding.inflate(inflater, container, false)
@@ -41,6 +47,14 @@ class LoginSplashFragment @Inject constructor() : AbstractLoginFragment<Fragment
 
     private fun setupViews() {
         views.loginSplashSubmit.setOnClickListener { getStarted() }
+
+        if (BuildConfig.DEBUG || vectorPreferences.developerMode()) {
+            views.loginSplashVersion.isVisible = true
+            @SuppressLint("SetTextI18n")
+            views.loginSplashVersion.text = "Version : ${BuildConfig.VERSION_NAME}\n" +
+                    "Branch: ${BuildConfig.GIT_BRANCH_NAME}\n" +
+                    "Build: ${BuildConfig.BUILD_NUMBER}"
+        }
     }
 
     private fun getStarted() {
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 7edaa99016..92655c87b6 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -193,4 +193,15 @@
         app:layout_constraintTop_toBottomOf="@+id/loginSplashSubmit"
         app:layout_constraintVertical_weight="4" />
 
+    <TextView
+        android:id="@+id/loginSplashVersion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?riotx_text_secondary"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="@string/settings_version"
+        tools:visibility="visible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

From 081a904f8a60b6254f6f3f39b7affc207922a797 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 12:57:42 +0000
Subject: [PATCH 410/578] Bump kotlin_version from 1.4.31 to 1.4.32

Bumps `kotlin_version` from 1.4.31 to 1.4.32.

Updates `kotlin-gradle-plugin` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Updates `kotlin-stdlib-jdk7` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Updates `kotlin-stdlib` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4e2c81a379..637b1de7cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     // Ref: https://kotlinlang.org/releases.html
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.4.32'
     ext.kotlin_coroutines_version = "1.4.2"
     repositories {
         google()

From edee97142faefd7e0019f12b19ba7790a1c63a11 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Thu, 25 Mar 2021 07:33:18 +0000
Subject: [PATCH 411/578] Translated using Weblate (Czech)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
---
 vector/src/main/res/values-cs/strings.xml | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 341300cbf9..6d6574a87e 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
-    <string name="summary_user_sent_image">Uživatel %1$s poslal obrázek.</string>
-    <string name="summary_user_sent_sticker">Uživatel %1$s poslal nálepku.</string>
+    <string name="summary_user_sent_image">%1$s poslal(a) obrázek.</string>
+    <string name="summary_user_sent_sticker">%1$s poslal(a) nálepku.</string>
     <string name="notice_room_invite_no_invitee">Pozvání od uživatele %s</string>
-    <string name="notice_room_invite">Uživatel %1$s pozval uživatele %2$s</string>
-    <string name="notice_room_invite_you">Uživatel %1$s vás pozval</string>
-    <string name="notice_room_join">%1$s vstoupil do místnosti</string>
-    <string name="notice_room_leave">Uživatel %1$s odešel</string>
+    <string name="notice_room_invite">%1$s pozval(a) %2$s</string>
+    <string name="notice_room_invite_you">%1$s vás pozval(a)</string>
+    <string name="notice_room_join">%1$s vstoupil(a) do místnosti</string>
+    <string name="notice_room_leave">Uživatel %1$s odešel z místnosti</string>
     <string name="notice_room_reject">%1$s odmítli pozvání</string>
     <string name="notice_room_kick">%1$s vykopli %2$s</string>
     <string name="notice_room_unban">%1$s zrušil vykázání %2$s</string>
     <string name="notice_room_ban">%1$s vykázali %2$s</string>
     <string name="notice_room_withdraw">%1$s zrušili pozvání pro %2$s</string>
-    <string name="notice_avatar_url_changed">%1$s změnili svůj profilový obrázek</string>
+    <string name="notice_avatar_url_changed">%1$s změnil(a) svůj profilový obrázek</string>
     <string name="notice_display_name_set">%1$s nastavili své veřejné jméno na %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s změnili své veřejné jméno z %2$s na %3$s</string>
+    <string name="notice_display_name_changed_from">%1$s změnil(a) své veřejné jméno z %2$s na %3$s</string>
     <string name="notice_display_name_removed">%1$s odstranili své veřejné jméno (%2$s)</string>
     <string name="notice_room_topic_changed">%1$s změnili téma na: %2$s</string>
-    <string name="notice_room_name_changed">%1$s změnili název místnosti na: %2$s</string>
+    <string name="notice_room_name_changed">%1$s změnil(a) název místnosti na: %2$s</string>
     <string name="notice_placed_video_call">%s uskutečnili videohovor.</string>
     <string name="notice_placed_voice_call">%s uskutečnili hlasový hovor.</string>
     <string name="notice_answered_call">%s přijali hovor.</string>
@@ -103,7 +103,7 @@
     <string name="notice_display_name_changed_from_by_you">Změnili jste své veřejné jméno z %1$s na %2$s</string>
     <string name="notice_display_name_removed_by_you">Odstranili jste své veřejné jméno (%1$s)</string>
     <string name="notice_room_topic_changed_by_you">Změnili jste téma na: %1$s</string>
-    <string name="notice_room_avatar_changed">%1$s změnili obrázek místnosti</string>
+    <string name="notice_room_avatar_changed">%1$s změnil(a) obrázek místnosti</string>
     <string name="notice_room_avatar_changed_by_you">Změnili jste obrázek místnosti</string>
     <string name="notice_room_name_changed_by_you">Změnili jste jméno místnosti na: %1$s</string>
     <string name="notice_placed_video_call_by_you">Zahájili jste video hovor.</string>
@@ -136,7 +136,7 @@
     <string name="power_level_custom">Vlastní (%1$d)</string>
     <string name="power_level_custom_no_value">Vlastní</string>
     <string name="notice_power_level_changed_by_you">Změnili jste %1$s stupeň oprávnění.</string>
-    <string name="notice_power_level_changed">%1$s změnili %2$s stupeň oprávnění.</string>
+    <string name="notice_power_level_changed">%1$s změnil(a) %2$s stupeň oprávnění.</string>
     <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
     <string name="notice_room_invite_no_invitee_with_reason">Pozvání od %1$s. Důvod: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Vaše pozvání. Důvod: %1$s</string>
@@ -211,7 +211,7 @@
     <string name="notice_made_future_direct_room_visibility_by_you">Učinili jste budoucí zprávy viditelné pro %1$s</string>
     <string name="notice_made_future_direct_room_visibility">%1$s učinili budoucí zprávy viditelné pro %2$s</string>
     <string name="notice_direct_room_leave_by_you">Odešli jste z místnosti</string>
-    <string name="notice_direct_room_leave">%1$s odešli z místnosti</string>
+    <string name="notice_direct_room_leave">Uživatel %1$s odešel z místnosti</string>
     <string name="notice_direct_room_join_by_you">Vstoupili jste</string>
     <string name="notice_direct_room_join">%1$s vstoupili</string>
     <string name="notice_direct_room_created_by_you">Založili jste diskusi</string>
@@ -233,7 +233,7 @@
     <string name="notice_room_server_acl_updated_was_banned">• Servery shodující se s %s byly odstraněny ze seznamu zakázaných.</string>
     <string name="notice_room_server_acl_updated_banned">• Servery shodující se s %s jsou nyní zakázány.</string>
     <string name="notice_room_server_acl_updated_title_by_you">Změnili jste ACL serveru pro tuto místnost.</string>
-    <string name="notice_room_server_acl_updated_title">%s změnili ACL serveru pro tuto místnost.</string>
+    <string name="notice_room_server_acl_updated_title">%s změnil(a) ACL serveru pro tuto místnost.</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">• Server shodující se doslovně s IP je povolen.</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Server shodující se doslovně s IP je zakázán.</string>
     <string name="notice_room_server_acl_set_allowed">• Server shodující se s %s je povolen.</string>
@@ -241,11 +241,11 @@
     <string name="notice_room_server_acl_set_title_by_you">Nastavili jste ACL serveru pro tuto místnost.</string>
     <string name="notice_room_server_acl_set_title">%s nastavili ACL serveru pro tuto místnost.</string>
     <string name="notice_room_canonical_alias_no_change_by_you">Změnili jste adresy pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_no_change">%1$s změnili adresy pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s změnil(a) adresy pro tuto místnost.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Změnili jste hlavní a alternativní adresu pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s změnili hlavní a alternativní adresu pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s změnil(a) hlavní a alternativní adresu pro tuto místnost.</string>
     <string name="notice_room_canonical_alias_alternative_changed_by_you">Změnili jste alternativní adresu pro tuto místnost.</string>
-    <string name="notice_room_canonical_alias_alternative_changed">%1$s změnili alternativní adresu pro tuto místnost.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s změnil(a) alternativní adresu pro tuto místnost.</string>
     <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
         <item quantity="one">Odstranili jste alternativní adresu %1$s pro tuto místnost.</item>
         <item quantity="few">Odstranili jste alternativní adresy %1$s pro tuto místnost.</item>
@@ -1984,7 +1984,7 @@
     <string name="trusted">Důvěryhodné</string>
     <string name="not_trusted">Nedůvěryhodné</string>
     <string name="verification_profile_device_verified_because">Tato relace je důvěryhodná pro bezpečnou komunikaci, protože %1$s (%2$s) ji ověřil:</string>
-    <string name="verification_profile_device_new_signing">%1$s (%2$s) se přihlásil skrze novou relaci:</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) se přihlásil novou relací:</string>
     <string name="verification_profile_device_untrust_info">Dokud tento uživatel nezačne důvěřovat této relaci, zprávy z ní odeslané a v ní přijaté budou označeny varováním. Volitelně ji můžete manuálně ověřit.</string>
     <string name="initialize_cross_signing">Spustit křížové podepsání</string>
     <string name="reset_cross_signing">Resetovat klíče</string>
@@ -2417,7 +2417,7 @@
     <string name="settings_show_room_member_state_events_summary">Zahrnuje události pozvat/vstoupit/opustit/vykopnout/vykázat a změny avatara/veřejného jména.</string>
     <string name="sent_a_poll">Průzkum</string>
     <string name="sent_a_bot_buttons">Tlačítka botů</string>
-    <string name="sent_a_reaction">Reagovali skrze: %s</string>
+    <string name="sent_a_reaction">Reagoval(a): %s</string>
     <string name="sent_verification_conclusion">Výsledek ověření</string>
     <string name="universal_link_malformed">Odkaz byl chybně zformován</string>
     <string name="no_permissions_to_start_webrtc_call">K zahájení hovoru v této místnosti nemáte oprávnění</string>

From da16160d282201d040ff3a84f1fc0ff0f8ef7c34 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Tue, 23 Mar 2021 19:45:00 +0000
Subject: [PATCH 412/578] Translated using Weblate (French)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 57382fa9df..7c1496a73e 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2182,7 +2182,7 @@
     <string name="return_to_call">Retour à l’appel</string>
     <string name="room_participants_action_cancel_invite">Annuler l’invitation</string>
     <string name="room_participants_action_ignore_title">Ignorer l’utilisateur</string>
-    <string name="room_participants_action_ignore_prompt_msg">Ignorer cet utilisateur aura pour effet de supprimer ses messages des espaces que vous partagez.
+    <string name="room_participants_action_ignore_prompt_msg">Ignorer cet utilisateur aura pour effet de supprimer ses messages des salons que vous partagez.
 \n
 \nVous pouvez annuler cette action à tout moment dans les paramètres généraux.</string>
     <string name="room_participants_action_cancel_invite_title">Annuler l’invitation</string>
@@ -2372,10 +2372,10 @@
     <string name="settings_emails_empty">Aucune adresse e-mail n’a été ajoutée à votre compte</string>
     <string name="settings_emails">Adresses e-mail</string>
     <string name="settings_phone_number_empty">Aucun numéro de téléphone n’a été ajouté à votre compte</string>
-    <string name="search_is_not_supported_in_e2e_room">La recherche dans les espaces chiffrés n\'est pas encore prise en charge.</string>
+    <string name="search_is_not_supported_in_e2e_room">La recherche dans les salons chiffrés n\'est pas encore prise en charge.</string>
     <string name="search_banned_user_hint">Filtrer les utilisateurs exclus</string>
     <string name="room_participants_action_unignore_prompt_msg">Ne plus ignorer cet utilisateur aura pour effet de ré-afficher ses messages.</string>
-    <string name="room_participants_kick_prompt_msg">expulser un utilisateur le supprimera de cet espace.
+    <string name="room_participants_kick_prompt_msg">expulser un utilisateur le supprimera de ce salon.
 \n
 \nPour l’empêcher de revenir, vous devez plutôt le bannir.</string>
     <string name="room_participants_kick_reason">Motif d’expulsion</string>

From 00c051d4ff73f54b42bbd18e88935bec2117e8be Mon Sep 17 00:00:00 2001
From: Thor Arne Johansen <tajcon@gmail.com>
Date: Tue, 23 Mar 2021 12:15:03 +0000
Subject: [PATCH 413/578] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 61.9% (1463 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index a4fd61011d..fc16bd5ca0 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1296,8 +1296,8 @@
 \nKlikk på lenken den inneholder for å fortsette opprettelsen av kontoen.</string>
     <string name="login_validation_code_is_not_correct">Den angitte koden er ikke riktig. Vennligst sjekk.</string>
     <plurals name="login_error_limit_exceeded_retry_after">
-        <item quantity="one">Det er sendt for mange forespørsler. Du kan prøve på nytt %1$d sekund…</item>
-        <item quantity="other">Det er sendt for mange forespørsler. Du kan prøve på nytt %1$d sekunder…</item>
+        <item quantity="one">Det er sendt for mange forespørsler. Du kan prøve på nytt om %1$d sekund…</item>
+        <item quantity="other">Det er sendt for mange forespørsler. Du kan prøve på nytt om %1$d sekunder…</item>
     </plurals>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Dette er ikke en gyldig brukeridentifikator. Forventet format: \'@bruker:homeserver.org\'</string>
     <string name="soft_logout_signin_e2e_warning_notice">Logg på for å gjenopprette krypteringsnøkler som er lagret eksklusivt på denne enheten. Du trenger dem for å lese alle dine sikre meldinger på hvilken som helst enhet.</string>

From f502b323e72340d9661098c2a16cce9920603ea6 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Tue, 23 Mar 2021 18:27:52 +0000
Subject: [PATCH 414/578] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
---
 vector/src/main/res/values-pt-rBR/strings.xml | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index a2f930a272..b46bacebca 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2701,4 +2701,44 @@
 \nBaixando dados…</string>
     <string name="initial_sync_start_server_computing">Sincronização inicial:
 \nAguardando resposta do servidor…</string>
+    <string name="a11y_trust_level_trusted">Nível de confiança: confiável</string>
+    <string name="a11y_trust_level_warning">Nível de confiança: alerta</string>
+    <string name="event_status_delete_all_failed_dialog_message">Deseja mesmo excluir todas as mensagens não enviadas nesta sala\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Excluir as mensagens não enviadas</string>
+    <string name="event_status_failed_messages_warning">Falha ao enviar as mensagens</string>
+    <string name="event_status_cancel_sending_dialog_message">Quer cancelar o envio da mensagem\?</string>
+    <string name="event_status_a11y_delete_all">Excluir todas as mensagens com falha</string>
+    <string name="event_status_a11y_failed">Falhou</string>
+    <string name="event_status_a11y_sent">Enviado</string>
+    <string name="event_status_a11y_sending">Enviando</string>
+    <string name="dev_tools_event_content_hint">Conteúdo do evento</string>
+    <string name="dev_tools_success_state_event">Evento do estado enviado!</string>
+    <string name="dev_tools_success_event">Evento enviado!</string>
+    <string name="dev_tools_error_malformed_event">Evento malformado</string>
+    <string name="dev_tools_error_no_message_type">Tipo de mensagem ausente</string>
+    <string name="dev_tools_error_no_content">Nenhum conteúdo</string>
+    <string name="dev_tools_form_hint_event_content">Conteúdo do evento</string>
+    <string name="dev_tools_form_hint_state_key">Chave do estado</string>
+    <string name="dev_tools_form_hint_type">Tipo</string>
+    <string name="dev_tools_send_custom_state_event">Enviar evento de estado personalizado</string>
+    <string name="dev_tools_edit_content">Editar conteúdo</string>
+    <string name="dev_tools_state_event">Eventos do estado</string>
+    <string name="dev_tools_send_state_event">Enviar evento do estado</string>
+    <string name="dev_tools_send_custom_event">Enviar evento personalizado</string>
+    <string name="dev_tools_explore_room_state">Explorar o estado da sala</string>
+    <string name="dev_tools_menu_name">Ferramentas de desenvolvimento</string>
+    <string name="a11y_view_read_receipts">Ver confirmações de leitura</string>
+    <string name="a11y_rule_notify_off">Não notificar</string>
+    <string name="a11y_rule_notify_silent">Notificar sem som</string>
+    <string name="a11y_rule_notify_noisy">Notificar com som</string>
+    <string name="a11y_error_message_not_sent">Mensagem não enviada devido a um erro</string>
+    <string name="a11y_checked">Verificado</string>
+    <string name="a11y_close_emoji_picker">Fechar o selecionador de emojis</string>
+    <string name="a11y_open_emoji_picker">Abrir o selecionador de emojis</string>
+    <string name="a11y_unsent_draft">Esta sala tem rascunho não enviado</string>
+    <plurals name="entries">
+        <item quantity="one">%d entrada</item>
+        <item quantity="other">%d entradas</item>
+    </plurals>
+    <string name="settings_server_upload_size_title">Limite do envio de arquivo do servidor</string>
 </resources>
\ No newline at end of file

From 98839e79ad7e10195eeefac9a5f8a9165ebcdbd7 Mon Sep 17 00:00:00 2001
From: ozzii <ozzii.translate@gmail.com>
Date: Mon, 22 Mar 2021 17:35:42 +0000
Subject: [PATCH 415/578] Translated using Weblate (Serbian)

Currently translated at 26.3% (623 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sr/
---
 vector/src/main/res/values-sr/strings.xml | 108 +++++++++++++++++++++-
 1 file changed, 106 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index b44a7f78c5..5e56ffcad5 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -15,7 +15,7 @@
     <string name="room_displayname_empty_room_was">Празна соба (била је %s)</string>
     <string name="room_displayname_empty_room">Празна соба</string>
     <plurals name="room_displayname_three_and_more_members">
-        <item quantity="one">%1$s и још %2$d</item>
+        <item quantity="one">%1$s и још 1</item>
         <item quantity="few">%1$s и још %2$d</item>
         <item quantity="other">%1$s и још %2$d</item>
     </plurals>
@@ -602,9 +602,113 @@
     <string name="cannot_start_call">Не може се покренути позив, покушајте касније</string>
     <string name="ongoing_conference_call">Конференцијски позив у току.
 \nПридружи се као %1$s или %2$s</string>
-    <string name="permalink">Permalink</string>
+    <string name="permalink">ТрајнаВеза</string>
     <string name="initial_sync_start_downloading">Почетна синхронизација:
 \nПреузимање података…</string>
     <string name="initial_sync_start_server_computing">Почетна синхронизација:
 \nЧека се одговор сервера…</string>
+    <string name="room_permissions_change_permissions">Променити дозволе</string>
+    <string name="room_permissions_change_room_name">Променити име собе</string>
+    <string name="room_permissions_change_history_visibility">Променити видљивост историје</string>
+    <string name="room_permissions_enable_room_encryption">Активирати шифровање собе</string>
+    <string name="room_permissions_change_main_address_for_the_room">Променити главну адресу собе</string>
+    <string name="room_permissions_change_room_avatar">Променити аватар собе</string>
+    <string name="room_permissions_modify_widgets">Променити widget-е</string>
+    <string name="room_permissions_notify_everyone">Обавестити све</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Уклонити поруке које су други послали</string>
+    <string name="room_permissions_ban_users">Забранити кориснике</string>
+    <string name="room_permissions_kick_users">Протерати кориснике</string>
+    <string name="room_permissions_change_settings">Променити подешавања</string>
+    <string name="room_permissions_invite_users">Позвати чланове</string>
+    <string name="room_permissions_send_messages">Слати поруке</string>
+    <string name="room_permissions_default_role">Подразумевана улога</string>
+    <string name="room_permissions_title">Дозволе</string>
+    <string name="room_settings_permissions_title">Дозволе собе</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Сигурно уклонити позив овој корисника\?</string>
+    <string name="room_participants_action_cancel_invite_title">Откажи позив</string>
+    <string name="room_participants_action_unignore">Покажи све поруке овог корисника</string>
+    <string name="room_participants_action_unignore_prompt_msg">Не игнорисањем овог корисника ће поново приказати све његове поруке.</string>
+    <string name="room_participants_action_unignore_title">Не игнориши више корисника</string>
+    <string name="room_participants_action_ignore">Игнорисај</string>
+    <string name="room_participants_action_ignore_prompt_msg">Игнорирање овог корисника уклониће своје поруке из соба које делите.
+\n
+\nОву акцију можете поништити у било које време у општим подешавањима.</string>
+    <string name="room_participants_action_ignore_title">Игнорирај корисника</string>
+    <string name="room_participants_power_level_demote">Снизити права</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Нећете моћи да поништите ову промену пошто снизујете ваша права, ако сте последњи привилеговани корисник у соби, неће бити могуће повратити привилегије.</string>
+    <string name="room_participants_power_level_demote_warning_title">Ауто снизити права\?</string>
+    <string name="room_participants_action_devices_list">Покажи списак сесије</string>
+    <string name="room_participants_action_mention">Спомени</string>
+    <string name="room_participants_invite_search_another_user">Идентификатор, име или имејл</string>
+    <string name="room_participants_action_set_admin">Постави као администратор</string>
+    <string name="room_participants_action_set_moderator">Постави као модератор</string>
+    <string name="room_participants_action_set_default_power_level">Рисетуј на нормалан корисник</string>
+    <string name="room_participants_action_kick">Изтерај</string>
+    <string name="room_participants_action_unban">Уклони забрану</string>
+    <string name="room_participants_action_ban">Забрани</string>
+    <string name="room_participants_action_remove">Уклони из ове собе</string>
+    <string name="room_participants_action_leave">Напусти ову собу</string>
+    <string name="room_participants_action_cancel_invite">Поништи позив</string>
+    <string name="room_participants_action_invite">Позови</string>
+    <string name="room_participants_header_devices">СЕСИЈЕ</string>
+    <string name="room_participants_header_direct_chats">Приватни разговори</string>
+    <string name="room_participants_header_call">ПОЗИВ</string>
+    <string name="room_participants_header_admin_tools">АДМИНИСТРАТОРСКЕ АЛАТКЕ</string>
+    <string name="room_participants_ago">%1$s пре %2$s</string>
+    <string name="room_participants_now">Сада %1$s</string>
+    <string name="room_participants_idle">Неактиван</string>
+    <string name="room_participants_offline">Ван везе</string>
+    <string name="room_participants_online">На вези</string>
+    <string name="room_participants_create">Креирај</string>
+    <string name="room_participants_remove_prompt_msg">Сигурно уклонити %s из овог ћаскања\?</string>
+    <string name="room_participants_leave_private_warning">Ова соба није јавна. Нећете моћи поново да се придружите без позива.</string>
+    <string name="room_participants_leave_prompt_msg">Стварно напустити ову собу\?</string>
+    <string name="room_participants_leave_prompt_title">Напусти собу</string>
+    <plurals name="format_time_d">
+        <item quantity="one">%dд</item>
+        <item quantity="few">%dд</item>
+        <item quantity="other">%dд</item>
+    </plurals>
+    <plurals name="format_time_h">
+        <item quantity="one">%dх</item>
+        <item quantity="few">%dх</item>
+        <item quantity="other">%dх</item>
+    </plurals>
+    <plurals name="format_time_m">
+        <item quantity="one">%dм</item>
+        <item quantity="few">%dм</item>
+        <item quantity="other">%dм</item>
+    </plurals>
+    <plurals name="format_time_s">
+        <item quantity="one">%dс</item>
+        <item quantity="few">%dс</item>
+        <item quantity="other">%dс</item>
+    </plurals>
+    <string name="room_title_one_member">1 члан</string>
+    <plurals name="room_title_members">
+        <item quantity="one">%d члан</item>
+        <item quantity="few">%d члана</item>
+        <item quantity="other">%d чланова</item>
+    </plurals>
+    <plurals name="room_header_active_members_count">
+        <item quantity="one">%d активан члан</item>
+        <item quantity="few">%d активна члана</item>
+        <item quantity="other">%d активних чланова</item>
+    </plurals>
+    <string name="room_creation_add_member">Додај члана</string>
+    <string name="room_creation_title">Ново ћаскање</string>
+    <string name="invite_no_identity_server_error">Додајте сервер идентитета у своја подешавања да бисте извршили ову акцију.</string>
+    <string name="room_preview_room_interactions_disabled">Ово је преглед ове собе. Интеракције собе су онемогућене.</string>
+    <string name="room_preview_try_join_an_unknown_room_default">једна соба</string>
+    <string name="room_preview_try_join_an_unknown_room">Покушавате да приступите %s. Да ли желите да се придружите да бисте учествовали у дискусији\?</string>
+    <string name="room_preview_invitation_format">%s Вас је позвао да се придружите овој соби</string>
+    <string name="room_jump_to_first_unread">Ићи на прву непрочитану поруку.</string>
+    <string name="room_sync_in_progress">Синхронизација…</string>
+    <string name="open_chat_header">Отвори заглавље</string>
+    <string name="list_members">Листа чланова</string>
+    <string name="reject">Одбаци</string>
+    <string name="preview">Преглед</string>
+    <string name="join">Придружи се</string>
+    <string name="remove">Избриши</string>
+    <string name="_continue">Настави</string>
 </resources>
\ No newline at end of file

From f3996e8634d87a4faed737862d451c0ea167e9b0 Mon Sep 17 00:00:00 2001
From: GokdenizK <gokdeniz_6167@hotmail.com>
Date: Wed, 24 Mar 2021 07:31:02 +0000
Subject: [PATCH 416/578] Translated using Weblate (Turkish)

Currently translated at 67.9% (1605 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
---
 vector/src/main/res/values-tr/strings.xml | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 6a065d06e8..aa234ac78c 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -1777,4 +1777,50 @@
     <string name="notice_room_unban">%1$s, %2$s adlı kişinin banını kaldırdı</string>
     <string name="notice_room_kick_by_you">%1$s adlı kullanıcıyı attı</string>
     <string name="notice_room_kick">%1$s, %2$s adlı kullanıcıyı attı</string>
+    <string name="room_list_quick_actions_room_settings">Oda ayarları</string>
+    <string name="a11y_show_password">Şifreyi göster</string>
+    <string name="read_at">Şu zamanda okundu:</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Mevcut konferanstan ayrıl ve bir diğerine git\?</string>
+    <string name="room_settings_room_version_title">Oda sürümü</string>
+    <string name="event_status_sending_message">Mesaj gönderiliyor…</string>
+    <string name="room_displayname_empty_room">Boş oda</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one"></item>
+        <item quantity="other"></item>
+    </plurals>
+    <string name="room_displayname_3_members">%1$s, %2$s ve</string>
+    <string name="power_level_custom_no_value">Özel</string>
+    <string name="notice_widget_removed_by_you">%1$s widgetını kaldırdınız</string>
+    <string name="notice_widget_added_by_you">%1$s widgetını eklediniz</string>
+    <string name="notice_profile_change_redacted_by_you">Profilinizi güncellediniz</string>
+    <string name="room_displayname_room_invite">Oda daveti</string>
+    <string name="medium_phone_number">Telefon numarası</string>
+    <string name="medium_email">E-posta adresi</string>
+    <string name="matrix_error">Matrix hatası</string>
+    <string name="network_error">Ağ hatası</string>
+    <string name="message_failed_to_upload">Görüntü yüklenemedi</string>
+    <string name="unable_to_send_message">Mesaj gönderilemedi</string>
+    <string name="power_level_default">Varsayılan</string>
+    <string name="power_level_admin"></string>
+    <string name="notice_widget_jitsi_modified_by_you">Video konferansı düzenlediniz</string>
+    <string name="notice_widget_jitsi_modified">Video konferans %1$s tarafından düzenlendi</string>
+    <string name="notice_widget_jitsi_removed_by_you">Video konferansı sonlandırdınız</string>
+    <string name="notice_widget_jitsi_removed">Video konferans %1$s tarafından sonlandırıldı</string>
+    <string name="notice_widget_jitsi_added_by_you">Video konferansı başlattınız</string>
+    <string name="notice_room_third_party_registered_invite_by_you">%1$s kişisinin davetini kabul ettiniz</string>
+    <string name="notice_room_third_party_registered_invite">%1$s, %2$s kişisinin davetini kabul etti</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">%1$s kişisinin davetini geri aldınız</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s, %2$s kişisinin davetini geri aldı</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">%1$s Kişisinin odaya katılma davetini geri aldınız</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s, %2$s kişisinin odaya katılma davetini geri aldı</string>
+    <string name="notice_room_third_party_invite_by_you">Odaya katılması için %1$s kişisine davet gönderdiniz</string>
+    <string name="notice_room_third_party_invite">%1$s, odaya katılması için %2$s kişisine davet gönderdi</string>
+    <string name="notice_event_redacted_by_with_reason">Mesaj %1$s tarafından kaldırıldı [sebep:%2$s]</string>
+    <string name="notice_event_redacted_with_reason">Mesaj kaldırıldı [sebep: %1$s]</string>
+    <string name="notice_room_name_removed">%1$s oda ismini kaldırdı</string>
+    <string name="notice_avatar_changed_too">(avatar da değiştirildi)</string>
+    <string name="notice_room_server_acl_updated_no_change">Değişiklik yok.</string>
+    <string name="notice_room_update_by_you">Bu odayı geliştirdiniz.</string>
+    <string name="notice_room_update">%s bu odayı geliştirdi.</string>
+    <string name="notice_end_to_end_by_you">Uçtan uca şifrelemeyi açtınız (%1$s)</string>
 </resources>
\ No newline at end of file

From a1757c54083960a111c1f1fc90c3bde93e1fecd5 Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Thu, 25 Mar 2021 16:34:06 +0000
Subject: [PATCH 417/578] Translated using Weblate (Chinese (Simplified))

Currently translated at 97.3% (2300 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 vector/src/main/res/values-zh-rCN/strings.xml | 535 ++++++++++--------
 1 file changed, 310 insertions(+), 225 deletions(-)

diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 004e95019b..365b6827a9 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -25,8 +25,8 @@
     <string name="notice_room_visibility_shared">所有聊天室成员。</string>
     <string name="notice_room_visibility_world_readable">任何人。</string>
     <string name="notice_room_visibility_unknown">未知（%s）。</string>
-    <string name="notice_end_to_end">%1$s 开启了端到端加密（%2$s）</string>
-    <string name="notice_requested_voip_conference">%1$s 请求了一次 VoIP 会议</string>
+    <string name="notice_end_to_end">%1$s 开启了端对端加密（%2$s）</string>
+    <string name="notice_requested_voip_conference">%1$s 请求了 VoIP 会议</string>
     <string name="notice_voip_started">VoIP 会议已开始</string>
     <string name="notice_voip_finished">VoIP 会议已结束</string>
     <string name="notice_avatar_changed_too">（头像也被更改）</string>
@@ -43,7 +43,7 @@
     <string name="medium_phone_number">手机号码</string>
     <string name="notice_room_withdraw">%1$s 撤回了对 %2$s 的邀请</string>
     <string name="notice_made_future_room_visibility">%1$s 让未来的聊天室历史记录对 %2$s 可见</string>
-    <string name="notice_profile_change_redacted">%1$s 更新了他的个人档案 %2$s</string>
+    <string name="notice_profile_change_redacted">%1$s 更新了他的资料 %2$s</string>
     <string name="notice_room_third_party_invite">%1$s 向 %2$s 发送了加入聊天室的邀请</string>
     <string name="notice_room_third_party_registered_invite">%1$s 接受了 %2$s 的邀请</string>
     <string name="could_not_redact">无法撤回</string>
@@ -104,8 +104,8 @@
     <string name="notice_room_canonical_alias_unset">%1$s 为此聊天室移除了主地址。</string>
     <string name="notice_room_guest_access_can_join">%1$s 已允许访客加入聊天室。</string>
     <string name="notice_room_guest_access_forbidden">%1$s 已禁止访客加入聊天室。</string>
-    <string name="notice_end_to_end_ok">%1$s 已开启端到端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端到端加密（无法识别的演算法 %2$s）。</string>
+    <string name="notice_end_to_end_ok">%1$s 已开启端对端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端对端加密（无法识别的演算法 %2$s）。</string>
     <string name="notice_room_created">%1$s 创建了这个聊天室</string>
     <string name="summary_you_sent_image">您发送了一张图片。</string>
     <string name="summary_you_sent_sticker">您发送了一张贴纸。</string>
@@ -134,14 +134,14 @@
     <string name="notice_answered_call_by_you">您接听了通话。</string>
     <string name="notice_ended_call_by_you">您结束了通话。</string>
     <string name="notice_made_future_room_visibility_by_you">您已让未来的聊天室记录对 %1$s 可见</string>
-    <string name="notice_end_to_end_by_you">您开启了端到端加密（%1$s）</string>
+    <string name="notice_end_to_end_by_you">您开启了端对端加密（%1$s）</string>
     <string name="notice_room_update_by_you">您升级了此聊天室。</string>
     <string name="notice_requested_voip_conference_by_you">您请求了 VoIP 会议</string>
     <string name="notice_room_name_removed_by_you">您移除了聊天室名称</string>
     <string name="notice_room_topic_removed_by_you">您移除了聊天室主题</string>
     <string name="notice_room_avatar_removed">%1$s 移除了聊天室头像</string>
     <string name="notice_room_avatar_removed_by_you">您移除了聊天室头像</string>
-    <string name="notice_profile_change_redacted_by_you">您更新了您的个人档案 %1$s</string>
+    <string name="notice_profile_change_redacted_by_you">您更新了您的资料 %1$s</string>
     <string name="notice_room_third_party_invite_by_you">您向 %1$s 发送了加入聊天室的邀请</string>
     <string name="notice_room_third_party_revoked_invite_by_you">您已撤回了对 %1$s 加入聊天室的邀请</string>
     <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀请</string>
@@ -182,8 +182,8 @@
     <string name="notice_room_canonical_alias_unset_by_you">您移除了此聊天室的主地址。</string>
     <string name="notice_room_guest_access_can_join_by_you">您已允许访客加入聊天室。</string>
     <string name="notice_room_guest_access_forbidden_by_you">您已禁止访客加入聊天室。</string>
-    <string name="notice_end_to_end_ok_by_you">您已开启端到端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">您已开启端到端加密（无法识别的算法 %1$s）。</string>
+    <string name="notice_end_to_end_ok_by_you">您已开启端对端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">您已开启端对端加密（无法识别的算法 %1$s）。</string>
     <string name="notice_direct_room_leave_with_reason_by_you">您已离开。理由：%1$s</string>
     <string name="notice_direct_room_leave_with_reason">%1$s 已离开。理由：%2$s</string>
     <string name="notice_direct_room_join_with_reason_by_you">您已加入。理由：%1$s</string>
@@ -268,7 +268,7 @@
     <string name="send_bug_report_progress">进度（%s%%）</string>
     <string name="hs_url">主服务器 URL</string>
     <string name="identity_url">身份服务器 URL</string>
-    <string name="auth_login">登入</string>
+    <string name="auth_login">登录</string>
     <string name="auth_register">注册</string>
     <string name="auth_submit">提交</string>
     <string name="auth_skip">跳过</string>
@@ -298,7 +298,7 @@
     <string name="auth_home_server">主服务器：</string>
     <string name="auth_identity_server">身份服务器：</string>
     <string name="auth_reset_password_next_step_button">我已验证了我的电子邮箱地址</string>
-    <string name="auth_reset_password_message">要重置您的密码，请输入与您的帐号关联的电子邮箱地址：</string>
+    <string name="auth_reset_password_message">要重置您的密码，请输入与您的账号关联的电子邮箱地址：</string>
     <string name="auth_reset_password_missing_email">必须输入与您账号关联的电子邮箱地址。</string>
     <string name="auth_reset_password_missing_password">必须输入新密码。</string>
     <string name="login_error_must_start_http">URL 必须以 http[s]:// 开头</string>
@@ -421,8 +421,8 @@
     <string name="people_search_local_contacts">本地联系人（%d 个）</string>
     <string name="room_two_users_are_typing">%1$s 和 %2$s 正在输入…</string>
     <string name="room_many_users_are_typing">%1$s 和 %2$s 及其他人正在输入…</string>
-    <string name="room_message_placeholder_encrypted">发送一条加密消息…</string>
-    <string name="room_message_placeholder_not_encrypted">发送一条消息（未加密）…</string>
+    <string name="room_message_placeholder_encrypted">发送加密消息…</string>
+    <string name="room_message_placeholder_not_encrypted">发送消息（未加密）…</string>
     <string name="room_offline_notification">与服务器的连接已断开。</string>
     <string name="room_unsent_messages_notification">消息未发送。现在 %1$s 还是 %2$s？</string>
     <string name="room_unknown_devices_messages_notification">因为未知设备的存在，消息未发送。现在 %1$s 还是 %2$s？</string>
@@ -455,7 +455,7 @@
     <string name="room_sliding_menu_privacy_policy">隐私政策</string>
     <string name="settings_phone_number">手机号码</string>
     <string name="settings_app_info_link_title">应用信息</string>
-    <string name="settings_enable_all_notif">启用这个账户的通知</string>
+    <string name="settings_enable_all_notif">启用这个账号的通知</string>
     <string name="settings_enable_this_device">启用这个设备的通知</string>
     <string name="settings_messages_in_one_to_one">来自私聊的消息</string>
     <string name="settings_messages_in_group_chat">来自群聊的消息</string>
@@ -497,7 +497,7 @@
     <string name="room_settings_read_history_entry_members_only_invited">只有成员（从他们被邀请开始）</string>
     <string name="room_settings_read_history_entry_members_only_joined">只有成员（从他们加入开始）</string>
     <string name="room_settings_room_access_entry_only_invited">只有被邀请的人</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">除游客之外任何知道这个聊天室链接的人</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">任何知道这个聊天室链接的人，游客除外</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">任何知道这个聊天室链接的人，包括游客</string>
     <string name="room_settings_banned_users_title">被封禁的用户</string>
     <string name="room_settings_category_advanced_title">高级</string>
@@ -505,30 +505,30 @@
     <string name="room_settings_addresses_pref_title">地址</string>
     <string name="room_settings_labs_warning_message">这些是实验性功能，可能会出现不可预料的错误。请谨慎使用。</string>
     <string name="room_settings_labs_end_to_end">端对端加密</string>
-    <string name="room_settings_labs_end_to_end_warnings">您需要注销来启用加密。</string>
-    <string name="room_settings_never_send_to_unverified_devices_summary">在此聊天室中、使用本设备时，从不向未验证的设备发送加密消息。</string>
+    <string name="room_settings_labs_end_to_end_warnings">您需要注销以启用加密。</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">对于当前会话，从在不此聊天室中向未验证的设备发送加密消息。</string>
     <string name="room_settings_addresses_no_local_addresses">这个聊天室没有本地地址</string>
-    <string name="room_settings_addresses_add_new_address">新地址（如 #foo:matrix.org）</string>
+    <string name="room_settings_addresses_add_new_address">新地址（例如 #foo:matrix.org）</string>
     <string name="room_settings_addresses_invalid_format_dialog_title">别名格式无效</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">“%s” 不是有效的别名格式</string>
     <string name="room_settings_addresses_e2e_enabled">这个聊天室已启用加密。</string>
     <string name="room_settings_addresses_e2e_disabled">这个聊天室已禁用加密。</string>
-    <string name="room_settings_addresses_e2e_encryption_warning">启用加密 
-\n（警告：无法再禁用！）</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">启用加密
+\n（警告：启用后无法禁用！）</string>
     <string name="directory_title">目录</string>
     <string name="encryption_information_title">端对端加密信息</string>
     <string name="encryption_information_device_info">事件信息</string>
     <string name="encryption_information_user_id">用户 ID</string>
-    <string name="encryption_export_e2e_room_keys">导出端到端聊天室密钥</string>
+    <string name="encryption_export_e2e_room_keys">导出端对端聊天室密钥</string>
     <string name="encryption_export_room_keys">导出聊天室密钥</string>
     <string name="encryption_export_room_keys_summary">导出密钥到本地文件</string>
     <string name="encryption_export_export">导出</string>
-    <string name="passphrase_enter_passphrase">输入密码</string>
-    <string name="passphrase_confirm_passphrase">确认密码</string>
-    <string name="encryption_export_saved_as">端到端聊天室密钥已经被保存到“%s”。
+    <string name="passphrase_enter_passphrase">输入密语</string>
+    <string name="passphrase_confirm_passphrase">确认密语</string>
+    <string name="encryption_export_saved_as">端对端聊天室密钥已经被保存到“%s”。
 \n
 \n注意：如果应用被卸载，此文件可能将会被移除。</string>
-    <string name="encryption_import_e2e_room_keys">导入端到端聊天室密钥</string>
+    <string name="encryption_import_e2e_room_keys">导入端对端聊天室密钥</string>
     <string name="encryption_import_room_keys">导入聊天室密钥</string>
     <string name="encryption_import_room_keys_summary">从本地文件导入密钥</string>
     <string name="encryption_never_send_to_unverified_devices_title">仅向已验证的设备发送加密消息</string>
@@ -557,9 +557,9 @@
     <string name="send_bug_report_failed">问题反馈发送失败（%s）</string>
     <string name="read_receipt">阅读</string>
     <string name="auth_invalid_token">无效令牌</string>
-    <string name="auth_threepid_warning_message">api存在之前，不支持同时通过电子邮件和电话号码进行注册。我们只考虑电话号码。
+    <string name="auth_threepid_warning_message">在新的 API 出现之前，尚不支持同时使用电子邮件和电话号码注册，所以只有电话号码会被记录。
 \n
-\n您可以在设置中添加您的电子邮件到您的个人资料。</string>
+\n在设置中，您可以在个人资料里添加您的电子邮件。</string>
     <string name="auth_username_in_use">用户名已被使用</string>
     <string name="login_error_unable_register_mail_ownership">无法注册：电子邮箱所有权验证失败</string>
     <string name="login_error_unknown_token">无法识别指定的访问令牌</string>
@@ -588,8 +588,8 @@
     <string name="permissions_action_not_performed_missing_permissions">对不起。因为权限不足，操作已取消</string>
     <string name="media_slider_saved_message">保存至下载？</string>
     <string name="remove">移除</string>
-    <string name="room_preview_unlinked_email_warning">此邀请已发送至未与此账户关联的 %s。
-\n您可能希望用一个不同的账户登录，或者把这个电子邮箱加入到你的账户。</string>
+    <string name="room_preview_unlinked_email_warning">此邀请已发送至未与此账号关联的 %s。
+\n您可能希望用一个不同的账号登录，或者把这个电子邮箱加入到你的账号。</string>
     <string name="room_preview_room_interactions_disabled">这是此聊天室的预览。与聊天室的交互已禁用。</string>
     <string name="room_participants_header_call">通话</string>
     <string name="room_participants_power_level_prompt">您将不能撤销这个修改，因为您正在让这个用户和您拥有相同的特权级别。 
@@ -652,8 +652,8 @@
 \n你同意为此目的分享你的通讯录吗\?</string>
     <string name="room_participants_idle">空闲</string>
     <string name="people_search_filter_text">仅 Matrix 用户</string>
-    <string name="ssl_unexpected_existing_expl">您的手机信任的证书已被更改。这<b>非常反常</b>。建议您<b>不要接受</b>此新证书。</string>
-    <string name="ssl_expected_existing_expl">证书已从以前受信任的更改为不受信任的证书。服务器可能已更新其证书。请联系管理员并核对服务器的指纹。</string>
+    <string name="ssl_unexpected_existing_expl">证书已从某个您的手机所信任的证书更改为另一个。这<b>非常反常</b>。建议您<b>不要接受</b>此新证书。</string>
+    <string name="ssl_expected_existing_expl">证书已从曾受信任的证书更改为不受信任的证书。服务器可能已更新其证书，请联系管理员并核对服务器的指纹。</string>
     <string name="ssl_only_accept">请仅在服务器管理员已经发布了与上述指纹相匹配的指纹的情况下接受该证书。</string>
     <string name="room_details_people">成员</string>
     <string name="malformed_id">ID 的格式不正确。应该是一个电子邮箱地址或 Matrix ID，如 “@localpart:domain”</string>
@@ -671,13 +671,13 @@
     <string name="account_email_validation_title">正在等待验证</string>
     <string name="settings_phone_number_code">代码</string>
     <string name="room_settings_category_access_visibility_title">访问和可见性</string>
-    <string name="room_settings_room_access_rules_pref_title">聊天室访问</string>
+    <string name="room_settings_room_access_rules_pref_title">聊天室访问权限</string>
     <string name="room_settings_labs_pref_title">实验室</string>
     <string name="room_settings_labs_end_to_end_is_active">端对端加密已激活</string>
     <string name="failed_to_load_timeline_position">%s 已尝试在这个聊天室的时间线上加载一个特定的时间点，但无法找到它。</string>
     <string name="encryption_information_name">公开名称</string>
     <string name="encryption_information_verify_device_warning">为验证此设备是否可信，请通过其他方式（例如面对面交换或拨打电话）与其拥有者联系，并询问他们该设备的用户设置中的密钥是否与以下密钥匹配：</string>
-    <string name="encryption_information_verify_device_warning2">如果它们不匹配，您通信的安全性可能会受到影响。</string>
+    <string name="encryption_information_verify_device_warning2">如果它们不匹配，您通讯的安全性可能会受到影响。</string>
     <string name="unknown_devices_alert_message">这个聊天室包含未经验证的未知设备。
 \n这意味着无法保证该设备属于其声称的用户。
 \n我们建议您在继续操作之前，先验证每个设备，但如果您愿意也可以不验证而重新发送消息。
@@ -841,8 +841,8 @@
     <plurals name="room_title_members">
         <item quantity="other">%d 位成员</item>
     </plurals>
-    <string name="room_settings_invalid_group_format_dialog_title">无效的社区 ID</string>
-    <string name="room_settings_invalid_group_format_dialog_body">“%s” 不是一个有效的社区 ID</string>
+    <string name="room_settings_invalid_group_format_dialog_title">社区 ID 无效</string>
+    <string name="room_settings_invalid_group_format_dialog_body">“%s” 不是有效的社区 ID</string>
     <plurals name="notification_unread_notified_messages">
         <item quantity="other">%d 条未读消息</item>
     </plurals>
@@ -893,29 +893,33 @@
     <string name="settings_notification_privacy_fcm">• 通知通过 Firebase Cloud Messaging 发送</string>
     <string name="settings_notification_privacy_metadata">• 通知只含有元数据</string>
     <string name="settings_notification_privacy_message_content_not_shown">• 通知<b>不会显示消息内容</b></string>
-    <string name="room_settings_add_new_group">新的社区ID（如 +foo:matrix.org）</string>
+    <string name="room_settings_add_new_group">新的社区 ID（如 +foo:matrix.org）</string>
     <string name="group_no_long_description">社区管理员没有提供这个社区的具体描述。</string>
     <string name="settings_notification_privacy_normal">标准</string>
     <string name="settings_notification_privacy_reduced">低隐私模式</string>
-    <string name="settings_deactivate_account_section">停用账户</string>
-    <string name="settings_deactivate_my_account">停用我的账户</string>
+    <string name="settings_deactivate_account_section">停用账号</string>
+    <string name="settings_deactivate_my_account">停用我的账号</string>
     <string name="settings_opt_in_of_analytics">发送统计分析数据</string>
     <string name="template_settings_opt_in_of_analytics_summary">${app_name} 会收集匿名统计数据来帮助我们改进程序。</string>
     <string name="template_settings_opt_in_of_analytics_prompt">请允许资料分析以帮助我们改进 ${app_name}。</string>
     <string name="settings_opt_in_of_analytics_ok">是的，我愿意帮助！</string>
-    <string name="deactivate_account_title">停用账户</string>
-    <string name="deactivate_account_content">这将使您的账户永远不再可用。您将不能登录，或使用相同的用户 ID 重新注册。您的账户将退出所有已加入的聊天室，身份服务器上的账户信息也会被删除。<b>此操作是不可逆的。</b> 停用您的账户<b>不会默认忘记您发送的消息</b>。如果您希望我们忘记您发送的消息，请勾选下面的选择框。 Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意味着您发送的消息不会被发给新注册或未注册的用户，但是已收到您的消息的注册用户依旧可以看到他们的副本。</string>
-    <string name="deactivate_account_delete_checkbox">请在我停用账户的同时忘记我发送的所有消息（警告：这将导致未来的用户看到残缺的对话）</string>
+    <string name="deactivate_account_title">停用账号</string>
+    <string name="deactivate_account_content">这将使您的账号永远不再可用。您将无法登录，也不能使用相同的用户 ID 重新注册。您的账号将退出所有已加入的聊天室，您在身份服务器上的账号信息也会被删除。<b>此操作是不可逆的。</b>
+\n
+\n停用您的账号<b>不会默认忘记您已发送的消息</b>。如果您希望我们忘记您发送的消息，请勾选下面的选择框。
+\n
+\nMatrix 中的消息可见性类似于电子邮件。我们忘记您的消息意味着您发送的消息不会被发给新注册或未注册的用户，但是已收到您的消息的注册用户依旧可以看到这些消息的副本。</string>
+    <string name="deactivate_account_delete_checkbox">请在我停用账号的同时忘记我发送的所有消息（警告：这将导致未来的用户看到残缺的对话）</string>
     <string name="deactivate_account_prompt_password">请输入您的密码以继续：</string>
-    <string name="deactivate_account_submit">停用账户</string>
+    <string name="deactivate_account_submit">停用账号</string>
     <string name="title_activity_choose_sticker">发送贴纸</string>
     <string name="option_send_sticker">发送贴纸</string>
     <string name="no_sticker_application_dialog_content">您目前没有启用任何贴纸包。
 \n
 \n要添加一些吗？</string>
-    <string name="settings_notification_privacy_secure_message_content">• 通知中的消息内容<b>从 Matrix 主服务器直接安全的获取</b></string>
+    <string name="settings_notification_privacy_secure_message_content">• 通知中的消息内容<b>直接从 Matrix 主服务器安全地获取</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• 通知含有<b>消息与元数据</b></string>
-    <string name="room_settings_no_flair">这个聊天室不会显示任何社区的徽章</string>
+    <string name="room_settings_no_flair">此聊天室不会显示任何社区徽章</string>
     <string name="widget_integration_missing_parameter">缺少所需的参数。</string>
     <string name="widget_integration_invalid_parameter">无效参数。</string>
     <string name="community_id_hint">样例 ID</string>
@@ -936,20 +940,20 @@
     <string name="error_empty_field_your_password">请输入您的密码。</string>
     <string name="speak">发言</string>
     <string name="send_bug_report_description_in_english">如果可能的话，请使用英文撰写问题描述。</string>
-    <string name="room_message_placeholder_reply_to_encrypted">发送加密的回复…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">发送加密回复…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">发送回复（未加密）…</string>
     <string name="settings_preview_media_before_sending">发送前预览媒体文件</string>
     <string name="settings_labs_keyboard_options_to_send_message">使用回车键发送消息</string>
     <string name="command_description_emote">显示动作</string>
-    <string name="command_description_ban_user">依照 ID 封禁用户</string>
-    <string name="command_description_unban_user">依照 ID 解禁用户</string>
+    <string name="command_description_ban_user">按照 ID 封禁用户</string>
+    <string name="command_description_unban_user">按照 ID 解禁用户</string>
     <string name="command_description_op_user">设置用户的权限等级</string>
-    <string name="command_description_deop_user">依照 ID 取消用户管理员权限</string>
-    <string name="command_description_invite_user">依照 ID 邀请用户进入当前聊天室</string>
-    <string name="command_description_join_room">依照别名加入聊天室</string>
+    <string name="command_description_deop_user">按照 ID 取消用户管理员权限</string>
+    <string name="command_description_invite_user">按照 ID 邀请用户进入当前聊天室</string>
+    <string name="command_description_join_room">按照别名加入聊天室</string>
     <string name="command_description_part_room">离开聊天室</string>
     <string name="command_description_topic">设置聊天室主题</string>
-    <string name="command_description_kick_user">依照 ID 踢出用户</string>
+    <string name="command_description_kick_user">按照 ID 踢出用户</string>
     <string name="command_description_nick">更改您显示的昵称</string>
     <string name="command_description_markdown">打开/关闭 markdown</string>
     <string name="command_description_clear_scalar_token">修复 Matrix Apps 管理</string>
@@ -1021,10 +1025,10 @@
     <string name="settings_troubleshoot_test_system_settings_failed">通知已在系统设置中禁用。
 \n请检查系统设置。</string>
     <string name="open_settings">打开设置</string>
-    <string name="settings_troubleshoot_test_account_settings_title">帐号设置。</string>
-    <string name="settings_troubleshoot_test_account_settings_success">您的帐号已启用通知。</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">您的账户已禁用通知。 
-\n请检查账户设置。</string>
+    <string name="settings_troubleshoot_test_account_settings_title">账号设置。</string>
+    <string name="settings_troubleshoot_test_account_settings_success">您的账号已启用通知。</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">您的账号已禁用通知。
+\n请检查账号设置。</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">启用</string>
     <string name="settings_troubleshoot_test_device_settings_title">设备设置。</string>
     <string name="settings_troubleshoot_test_device_settings_success">已为此设备启用通知。</string>
@@ -1056,7 +1060,7 @@
     <string name="settings_troubleshoot_test_service_boot_quickfix">启用开机时启动</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">检查后台限制</string>
     <string name="settings_troubleshoot_test_battery_title">电池优化</string>
-    <string name="settings_inline_url_preview_summary">若主服务器支持本功能，在聊天时预览链接内容。</string>
+    <string name="settings_inline_url_preview_summary">若主服务器支持此功能，在聊天中预览链接内容。</string>
     <string name="settings_send_typing_notifs">发送正在输入通知</string>
     <string name="settings_send_typing_notifs_summary">让聊天室中的其他用户知道您正在输入。</string>
     <string name="settings_send_markdown">Markdown 格式化</string>
@@ -1065,10 +1069,10 @@
     <string name="settings_show_read_receipts_summary">点击已阅回执以显示所有已经阅读过某条消息的用户。</string>
     <string name="settings_show_join_leave_messages">显示加入与离开事件</string>
     <string name="settings_show_join_leave_messages_summary">邀请、移除与封禁事件不受影响。</string>
-    <string name="settings_show_avatar_display_name_changes_messages">显示账户变动事件</string>
+    <string name="settings_show_avatar_display_name_changes_messages">显示账号变动事件</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">包括头像与显示名称的变动。</string>
     <string name="startup_notification_fdroid_battery_optim_title">后台连接</string>
-    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name}需要保持低影响的后台连接，以便获得可靠的通知。
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} 需要保持低影响的后台连接，以便获得可靠的通知。
 \n下一个屏幕中，系统将提示您允许 ${app_name} 始终在后台运行，请点击“允许“。</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">授予权限</string>
     <string name="account_email_error">在验证您的电子邮件地址时发生了一个错误。</string>
@@ -1089,8 +1093,8 @@
     <string name="error_lazy_loading_not_supported_by_home_server">您的主服务器尚未支持延迟加载聊天室成员，请稍候再试。</string>
     <string name="settings_lazy_loading_description">通过仅载入最近聊天中出现的聊天室成员来提升性能。</string>
     <string name="settings_lazy_loading_title">延迟加载聊天室成员</string>
-    <string name="markdown_has_been_disabled">已停用 Markdown。</string>
-    <string name="markdown_has_been_enabled">已启用 Markdown。</string>
+    <string name="markdown_has_been_disabled">Markdown 已禁用。</string>
+    <string name="markdown_has_been_enabled">Markdown 已启用。</string>
     <string name="video_call_in_progress">视频通话中…</string>
     <string name="settings_troubleshoot_test_service_restart_title">自动重启通知服务</string>
     <string name="settings_troubleshoot_test_service_restart_success">服务被停止，并已自动重启。</string>
@@ -1106,23 +1110,23 @@
     <string name="template_settings_troubleshoot_test_battery_success">${app_name} 未被电池优化影响。</string>
     <string name="settings_troubleshoot_test_battery_failed">如果设备在未充电的情况下关屏静置一段时间，其将进入打盹模式（Doze）。这将阻止应用访问网络并延后其运行、同步、与响铃。</string>
     <string name="settings_troubleshoot_test_battery_quickfix">忽略电池优化</string>
-    <string name="encryption_export_notice">请输入用于加密密钥备份的密码。您在恢复此备份时需要使用此密码。</string>
-    <string name="passphrase_create_passphrase">创建密码</string>
-    <string name="passphrase_passphrase_does_not_match">密码必须对应</string>
+    <string name="encryption_export_notice">请输入用于加密被导出密钥的密语。恢复此备份时，必须输入相同的密语才能导入密钥。</string>
+    <string name="passphrase_create_passphrase">创建密语</string>
+    <string name="passphrase_passphrase_does_not_match">密语必须对应</string>
     <string name="command_problem_with_parameters">指令 %s 需要更多参数，或者有些参数不正确。</string>
     <string name="no_valid_google_play_services_apk">没有可用的 Google Play Services APK。消息通知可能不能正常工作。</string>
     <string name="title_activity_keys_backup_setup">密钥备份</string>
     <string name="title_activity_keys_backup_restore">使用备份密钥</string>
     <string name="keys_backup_is_not_finished_please_wait">密钥备份尚未完成，请等待…</string>
-    <string name="sign_out_bottom_sheet_warning_no_backup">如果您此时登出账号，您将会失去您的已加密信息</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">密钥备份进行中。如果您此时登出账号将无法再访问您的已加密信息。</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">您的所有设备都应当启用安全密钥备份以确保您不会失去您的已加密信息的访问权。</string>
-    <string name="sign_out_bottom_sheet_dont_want_secure_messages">我不想要我的已加密信息</string>
-    <string name="sign_out_bottom_sheet_backing_up_keys">密钥备份中…</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">如果您此时登出账号，您将会失去您的已加密消息</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">密钥备份进行中。如果您此时登出账号将无法再访问您的已加密消息。</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">您的所有设备都应当启用安全密钥备份以确保您不会失去您的已加密消息的访问权。</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">我不想要我的已加密消息</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">正在备份密钥…</string>
     <string name="keys_backup_activate">使用备份密钥</string>
     <string name="are_you_sure">确定吗？</string>
     <string name="backup">备份</string>
-    <string name="sign_out_bottom_sheet_will_lose_secure_messages">如果您在登出账号之前不备份密钥，您将失去您的已加密信息的访问权。</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">如果您在登出账号之前不备份密钥，您将失去您的已加密消息的访问权。</string>
     <string name="stay">留下</string>
     <string name="skip">跳过</string>
     <string name="done">完成</string>
@@ -1148,34 +1152,34 @@
     <string name="settings_system_preferences_summary">选择指示灯颜色，震动，铃声…</string>
     <string name="settings_cryptography_manage_keys">加密密钥管理</string>
     <string name="settings_data_save_mode_summary">省流量模式使用了特定的过滤器，所以状态更新和输入状态通知将会被过滤掉。</string>
-    <string name="encryption_message_recovery">已加密信息恢复</string>
+    <string name="encryption_message_recovery">恢复已加密消息</string>
     <string name="encryption_settings_manage_message_recovery_summary">管理密钥备份</string>
     <string name="notification_silent">静音</string>
     <string name="error_empty_field_enter_user_name">请输入一个用户名。</string>
-    <string name="passphrase_empty_error_message">请输入密码</string>
-    <string name="passphrase_passphrase_too_weak">密码太弱</string>
-    <string name="template_keys_backup_passphrase_not_empty_error_message">如果您想要 ${app_name} 生成一个恢复密钥，请删除密码。</string>
+    <string name="passphrase_empty_error_message">请输入密语</string>
+    <string name="passphrase_passphrase_too_weak">密语太弱了</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">如果您想要 ${app_name} 生成一个恢复密钥，请删除密语。</string>
     <string name="keys_backup_no_session_error">没有可用的 Matrix 会话</string>
-    <string name="keys_backup_setup_step1_title">已加密信息永不丢失</string>
+    <string name="keys_backup_setup_step1_title">永不丢失已加密消息</string>
     <string name="keys_backup_setup_step1_description">加密聊天室中的信息会被端对端加密以确保安全。只有您和拥有密钥的接收方可以读取这些信息。
 \n
 \n安全地备份您的密钥以免丢失信息。</string>
     <string name="keys_backup_setup">开始使用备份密钥</string>
     <string name="keys_backup_setup_step1_advanced">（高级）</string>
     <string name="keys_backup_setup_step1_manual_export">手动导出密钥</string>
-    <string name="keys_backup_setup_step2_text_title">使用密码以保护您的备份。</string>
-    <string name="keys_backup_setup_step2_text_description">我们将会在主服务器上保存一份您的密钥的加密拷贝。设置一个密码来保护您的备份的安全。
+    <string name="keys_backup_setup_step2_text_title">使用密语保护您的备份。</string>
+    <string name="keys_backup_setup_step2_text_description">我们将会在主服务器上为您的密钥保存一份加密拷贝。设置一个密语来保护您的备份的安全。
 \n
-\n为了最大的安全性，这个密码应当与您的账号密码不同。</string>
-    <string name="keys_backup_setup_step2_button_title">设置密码</string>
-    <string name="keys_backup_setup_creating_backup">备份创建中</string>
+\n为了最大的安全性，此密语应当与您的账号密码不同。</string>
+    <string name="keys_backup_setup_step2_button_title">设置密语</string>
+    <string name="keys_backup_setup_creating_backup">正在创建备份</string>
     <string name="keys_backup_setup_step1_recovery_key_alternative">或者用一个恢复密钥来保护您的备份，将其保存到另一个安全的地方。</string>
     <string name="keys_backup_setup_step2_skip_button_title">（高级）设置一个恢复密钥</string>
     <string name="keys_backup_setup_step3_success_title">成功！</string>
     <string name="keys_backup_setup_step3_text_line1">正在备份您的密钥。</string>
-    <string name="keys_backup_setup_step3_text_line2">您的恢复密钥是一张安全网 - 如果您忘记了密码您可以利用它重获您的已加密信息的访问权。
-\n请将您的恢复密钥保存在一个非常安全的地方，比如密码管理器中 （或保险箱里）</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">将您的恢复密钥保存在一个非常安全的地方，比如密码管理器中 （或保险箱里）</string>
+    <string name="keys_backup_setup_step3_text_line2">您的恢复密钥是一张安全网——如果您忘记了密语，您可以利用它重获您的已加密消息的访问权。
+\n请将您的恢复密钥保存在一个非常安全的地方，比如密码管理器中（或保险箱里）</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">将您的恢复密钥保存在一个非常安全的地方，比如密码管理器中（或保险箱里）</string>
     <string name="keys_backup_setup_step3_button_title">完成</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">我已经制作了一份拷贝</string>
     <string name="keys_backup_setup_step3_copy_button_title">保存恢复密钥</string>
@@ -1185,8 +1189,8 @@
 \n
 \n警告：如果应用被卸载，此文件可能会被删除。</string>
     <string name="keys_backup_setup_step3_please_make_copy">请制作一份拷贝</string>
-    <string name="keys_backup_setup_step3_share_intent_chooser_title">分享恢复密钥 …</string>
-    <string name="keys_backup_setup_step3_generating_key_status">用密码来生成恢复密钥，此过程可能会花费几秒钟。</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">分享恢复密钥…</string>
+    <string name="keys_backup_setup_step3_generating_key_status">正在使用密语来生成恢复密钥，此过程可能会花费几秒钟。</string>
     <string name="recovery_key">恢复密钥</string>
     <string name="unexpected_error">意外错误</string>
     <string name="keys_backup_setup_backup_started_title">备份开始</string>
@@ -1194,19 +1198,19 @@
     <string name="keys_backup_setup_skip_title">您确定吗？</string>
     <string name="keys_backup_setup_skip_msg">如果您登出账号或者丢失此设备，您可能再也无法访问您的信息。</string>
     <string name="keys_backup_restore_is_getting_backup_version">正在获取备份的版本 …</string>
-    <string name="keys_backup_restore_with_passphrase">使用恢复密码解锁您的已加密历史消息</string>
+    <string name="keys_backup_restore_with_passphrase">使用恢复密语解锁您的已加密历史消息</string>
     <string name="keys_backup_restore_use_recovery_key">使用您的恢复密钥</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">不知道您的恢复密码，您可以 %s 。</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">如果不知道您的恢复密语，您可以 %s。</string>
     <string name="keys_backup_restore_with_recovery_key">使用恢复密钥解锁您的已加密历史消息</string>
     <string name="keys_backup_restore_key_enter_hint">输入恢复密钥</string>
-    <string name="keys_backup_restore_setup_recovery_key">信息恢复</string>
+    <string name="keys_backup_restore_setup_recovery_key">消息恢复</string>
     <string name="keys_backup_restore_with_key_helper">丢失了恢复密钥？您可以在设置中新建一个。</string>
-    <string name="keys_backup_passphrase_error_decrypt">无法使用此密码解密备份：请检查您输入的恢复密码是否正确。</string>
+    <string name="keys_backup_passphrase_error_decrypt">无法使用此密语解密备份：请检查您输入的恢复密语是否正确。</string>
     <string name="network_error_please_check_and_retry">网络错误：请检查您的网络连接并重试。</string>
-    <string name="keys_backup_restoring_waiting_message">备份恢复中：</string>
-    <string name="keys_backup_restoring_computing_key_waiting_message">恢复密钥计算中 …</string>
-    <string name="keys_backup_restoring_downloading_backup_waiting_message">密钥下载中 …</string>
-    <string name="keys_backup_restoring_importing_keys_waiting_message">密钥导入中 …</string>
+    <string name="keys_backup_restoring_waiting_message">正在恢复备份：</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">正在计算恢复密钥…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">正在下载密钥…</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">正在导入密钥…</string>
     <string name="keys_backup_unlock_button">解锁历史</string>
     <string name="keys_backup_recovery_code_empty_error_message">请输入恢复密钥</string>
     <string name="keys_backup_recovery_code_error_decrypt">无法使用此恢复密钥解密备份：请检查您输入的恢复密钥是否正确。</string>
@@ -1231,8 +1235,8 @@
     <string name="keys_backup_settings_invalid_signature_from_verified_device">备份具有已验证设备 %s 的无效签名</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">备份具有未验证设备 %s 的无效签名</string>
     <string name="keys_backup_get_trust_error">无法获得备份 （%s）的信任信息。</string>
-    <string name="keys_backup_settings_untrusted_backup">要在此设备上使用密钥备份，请立即使用密码或恢复密钥进行恢复。</string>
-    <string name="keys_backup_settings_deleting_backup">备份删除中 …</string>
+    <string name="keys_backup_settings_untrusted_backup">要在此会话中使用密钥备份，请立即使用密语或恢复密钥进行恢复。</string>
+    <string name="keys_backup_settings_deleting_backup">正在删除备份…</string>
     <string name="keys_backup_settings_delete_backup_error">备份（%s）删除失败</string>
     <string name="keys_backup_settings_delete_confirm_title">删除备份</string>
     <string name="keys_backup_settings_delete_confirm_message">要从此服务器中删除您备份的加密密钥吗？您将无法再使用恢复密钥来读取加密的历史消息。</string>
@@ -1241,22 +1245,22 @@
 \n
 \n如果您并未设置新的恢复方法，可能是有攻击者试图侵入您的账号。请立即更改您的账号密码并在设置中设定一个新的恢复方法。</string>
     <string name="new_recovery_method_popup_was_me">那是我</string>
-    <string name="keys_backup_banner_setup_line1">永不丢失已加密信息</string>
+    <string name="keys_backup_banner_setup_line1">永不丢失已加密消息</string>
     <string name="keys_backup_banner_setup_line2">开始使用备份密钥</string>
-    <string name="keys_backup_banner_recover_line1">永不丢失已加密信息</string>
+    <string name="keys_backup_banner_recover_line1">永不丢失已加密消息</string>
     <string name="keys_backup_banner_recover_line2">使用备份密钥</string>
     <string name="keys_backup_banner_update_line1">新加密信息密钥</string>
     <string name="keys_backup_banner_update_line2">管理密钥备份</string>
-    <string name="keys_backup_banner_in_progress">密钥备份中 …</string>
+    <string name="keys_backup_banner_in_progress">正在备份密钥…</string>
     <string name="keys_backup_info_keys_all_backup_up">所有密钥都已备份</string>
     <plurals name="keys_backup_info_keys_backing_up">
-        <item quantity="other">%d 个密钥备份中 …</item>
+        <item quantity="other">正在备份 %d 个密钥…</item>
     </plurals>
     <string name="keys_backup_info_title_version">版本</string>
     <string name="keys_backup_info_title_algorithm">算法</string>
     <string name="keys_backup_info_title_signature">签名</string>
     <string name="ignore">忽略</string>
-    <string name="auth_login_sso">以单点登录方式登入</string>
+    <string name="auth_login_sso">以单点登录方式登录</string>
     <string name="login_error_unknown_host">无法连接到此 URL，请检查</string>
     <string name="login_error_ssl_handshake">您的设备使用了过时的 TLS 安全协议，容易受到攻击，为保证安全，您将无法进行连接</string>
     <string name="settings_send_message_with_enter">按回车发送消息</string>
@@ -1374,17 +1378,17 @@
     <string name="decline">拒绝</string>
     <string name="people_no_identity_server">没有设置身份服务器。</string>
     <string name="call_failed_no_ice_title">服务器的错误配置导致通话失败</string>
-    <string name="call_failed_no_ice_description">请要求您的家庭服务器 (%1$s) 的管理员配置 TURN 服务器，以使通话可靠地工作。
+    <string name="call_failed_no_ice_description">请要求您的主服务器 (%1$s) 的管理员配置 TURN 服务器，以使通话可靠地工作。
 \n
 \n或者，您可以尝试使用 %2$s 的公共服务器，但这将不那么可靠，并且它将与该服务器共享您的 IP 地址。您也可以在“设置”中进行管理。</string>
     <string name="call_failed_no_ice_use_alt">尝试使用 %s</string>
     <string name="call_failed_dont_ask_again">不要再问我</string>
-    <string name="auth_add_email_message_2">设置用于帐户恢复的电子邮件，然后就可以让认识您的人选择性探索到您。</string>
+    <string name="auth_add_email_message_2">设置用于恢复账号的电子邮件，然后就可以让认识您的人选择性探索到您。</string>
     <string name="auth_add_phone_message_2">设定电话，然后就可以让认识您的人选择性探索到您。</string>
-    <string name="auth_add_email_phone_message_2">设定电子邮件以供帐号复原。 然后就可以让认识您的人用电子邮件或电话选择性探索到您。</string>
-    <string name="auth_add_email_and_phone_message_2">设定电子邮件以供帐号复原。 然后就可以让认识您的人用电子邮件或电话选择性探索到您。</string>
+    <string name="auth_add_email_phone_message_2">设定电子邮件以供恢复账号。然后就可以让认识您的人用电子邮件或电话选择性探索到您。</string>
+    <string name="auth_add_email_and_phone_message_2">设定电子邮件以供恢复账号。然后就可以让认识您的人用电子邮件或电话选择性探索到您。</string>
     <string name="login_error_no_homeserver_found">這不是有效的 Matrix 服务器位置</string>
-    <string name="login_error_homeserver_not_found">无法在此 URL 找到家庭服务器，请检查</string>
+    <string name="login_error_homeserver_not_found">无法在此 URL 找到主服务器，请检查</string>
     <string name="settings_call_ringtone_use_default_stun">允许后备呼叫协助服务器</string>
     <string name="play_video">播放</string>
     <string name="pause_video">暂停</string>
@@ -1394,7 +1398,7 @@
     <string name="bottom_action_notification">通知</string>
     <string name="template_call_failed_no_connection">${app_name} 呼叫失败</string>
     <string name="call_failed_no_connection_description">无法建立实时连接。
-\n请要求您的家庭服务器管理员配置 TURN 服务器以使通话可靠工作。</string>
+\n请要求您的主服务器管理员配置 TURN 服务器以使通话可靠工作。</string>
     <string name="call_select_sound_device">选择声音设备</string>
     <string name="sound_device_phone">电话</string>
     <string name="sound_device_speaker">扬声器</string>
@@ -1407,7 +1411,7 @@
     <string name="call_format_turn_hd_on">打开 HD</string>
     <string name="login_error_ssl_peer_unverified">SSL 错误：尚未验证对等端身份。</string>
     <string name="login_error_ssl_other">SSL 错误。</string>
-    <string name="settings_call_ringtone_use_default_stun_sum">当您的家庭服务器未提供时将使用 %s 作为辅助（在通话时将分享您的 IP 地址）</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">当您的主服务器未提供时将使用 %s 作为辅助（在通话时将分享您的 IP 地址）</string>
     <string name="active_call_with_duration">活动通话 (%s)</string>
     <string name="return_to_call">返回通话</string>
     <string name="invite_no_identity_server_error">在您的设置中添加身份服务器以执行此操作。</string>
@@ -1456,7 +1460,7 @@
     <string name="settings_secure_backup_setup">设置安全备份</string>
     <string name="settings_secure_backup_reset">重置安全备份</string>
     <string name="settings_secure_backup_enter_to_setup">在此设备上设置</string>
-    <string name="settings_secure_backup_section_info">通过在您的服务器上备份加密密钥保障加密消息和数据的访问权。</string>
+    <string name="settings_secure_backup_section_info">通过在您的服务器上备份加密密钥，防止失去对加密信息和数据的访问。</string>
     <string name="reset_secure_backup_title">为您已有的备份生成新的安全密钥或设置新的安全口令。</string>
     <string name="reset_secure_backup_warning">这将替换您的当前密钥或短语。</string>
     <string name="settings_discovery_category">发现</string>
@@ -1468,8 +1472,8 @@
     <plurals name="room_settings_banned_users_count">
         <item quantity="other">%d 个封禁用户</item>
     </plurals>
-    <string name="encryption_information_device_name_with_warning">公开名称（对通信参与者可见）</string>
-    <string name="device_name_warning">会话的公开名称对通信的参与者可见</string>
+    <string name="encryption_information_device_name_with_warning">公开名称（对与您通讯的人可见）</string>
+    <string name="device_name_warning">会话的公开名称对与您通讯的人可见</string>
     <string name="encryption_exported_successfully">成功导出密钥</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
@@ -1500,18 +1504,18 @@
     <string name="integration_manager_not_configured">未配置集成管理器。</string>
     <string name="widget_integration_review_terms">若要继续请接受服务条款。</string>
     <string name="recovery_key_export_saved">恢复密钥已保存。</string>
-    <string name="keys_backup_setup_override_backup_prompt_tile">您的家庭服务器上已存在备份</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">您的主服务器上已存在备份</string>
     <string name="keys_backup_setup_override_backup_prompt_description">您似乎已在另一个会话中设置密钥备份。您想要将其替换为正在创建的吗？</string>
     <string name="secure_backup_banner_setup_line1">安全备份</string>
     <string name="secure_backup_banner_setup_line2">保护加密信息及数据的访问权</string>
     <string name="secure_backup_setup">设置安全备份</string>
     <string name="invalid_or_expired_credentials">由于无效或过期的凭据您已登出。</string>
-    <string name="sas_incoming_request_description">验证会话已将其标记为可信。当使用端到端加密消息时信任参与者的会话将给您额外的内心平静。</string>
-    <string name="sas_incoming_request_description_2">验证会话将标记其为可信，同时将您的会话对对方标记为可信。</string>
+    <string name="sas_incoming_request_description">验证此会话以将其标记为可信任。当使用端对端加密消息时，信任参与者的会话可以使您更加安心。</string>
+    <string name="sas_incoming_request_description_2">验证会话将标记其为可信任，同时将您的会话对对方标记为可信任。</string>
     <string name="sas_emoji_description">通过确认以下表情符号出现在对方的屏幕上来验证此会话</string>
     <string name="sas_decimal_description">通过确认屏幕上对方显示以下数字来验证此会话</string>
     <string name="sas_incoming_verification_request_dialog">您收到传入验证请求。</string>
-    <string name="sas_verified_successful_description">与此用户的安全消息端到端加密，无法被第三方读取。</string>
+    <string name="sas_verified_successful_description">与此用户的安全消息端对端加密，无法被第三方读取。</string>
     <string name="sas_cancelled_by_other">对方取消了验证。
 \n%s</string>
     <string name="sas_cancelled_by_me">验证已取消。
@@ -1528,7 +1532,7 @@
     <string name="sas_error_m_user_error">用户不匹配</string>
     <string name="identity_server_not_defined">您未使用身份服务器</string>
     <string name="identity_server_not_defined_for_password_reset">未配置身份服务器，需要重置您的密码。</string>
-    <string name="error_user_already_logged_in">您似乎正在试图连接到另一个家庭服务器。您想要登出吗？</string>
+    <string name="error_user_already_logged_in">您似乎正在试图连接到另一个主服务器。您想要登出吗？</string>
     <string name="room_list_empty">加入一个聊天室开始使用应用。</string>
     <string name="room_list_catchup_empty_title">您已经跟上了！</string>
     <string name="room_list_catchup_empty_body">您没有未读消息</string>
@@ -1551,7 +1555,7 @@
     <string name="create_room_directory_description">将此聊天室发布到聊天室目录</string>
     <string name="keys_backup_unable_to_get_trust_info">获取信任信息时发生错误</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">获取密钥备份数据时发生错误</string>
-    <string name="import_e2e_keys_from_file">从文件 \"%1$s\" 导入端到端密钥。</string>
+    <string name="import_e2e_keys_from_file">从文件 \"%1$s\" 导入端对端密钥。</string>
     <string name="settings_other_third_party_notices">其他第三方通知</string>
     <string name="navigate_to_room_when_already_in_the_room">您已经在查看此聊天室！</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">注册令牌</string>
@@ -1577,7 +1581,7 @@
     <string name="room_filtering_footer_create_new_direct_message">发送新私聊消息</string>
     <string name="room_filtering_footer_open_room_directory">查看聊天室目录</string>
     <string name="room_directory_search_hint">名称或 ID (#example:matrix.org)</string>
-    <string name="labs_swipe_to_reply_in_timeline">在时间线中启用滑动回复</string>
+    <string name="labs_swipe_to_reply_in_timeline">启用在时间线中滑动回复</string>
     <string name="labs_show_unread_notifications_as_tab">在主屏幕上添加未读通知选项卡。</string>
     <string name="link_copied_to_clipboard">链接已复制到剪贴板</string>
     <string name="add_by_matrix_id">通过 matrix ID 添加</string>
@@ -1617,7 +1621,7 @@
     <string name="settings_agree_to_terms">同意身份服务器 (%s) 服务条款使您可以通过电子邮件地址或电话号码被发现。</string>
     <string name="labs_allow_extended_logging">启用详细日志。</string>
     <string name="labs_allow_extended_logging_summary">当您发送 RageShake 时详细日志将帮助开发者提供更多日志。即使启用，应用也不会记录消息内容或任何其他私有数据。</string>
-    <string name="error_terms_not_accepted">接收您的家庭服务器条款和条件后请重试。</string>
+    <string name="error_terms_not_accepted">接收您的主服务器条款和条件后请重试。</string>
     <string name="error_network_timeout">服务器似乎响应时间太长，这可能是由于连接不良或服务器错误引起的。 请稍后再试。</string>
     <string name="send_attachment">发送附件</string>
     <string name="a11y_open_drawer">打开导航菜单</string>
@@ -1645,10 +1649,10 @@
     <string name="attachment_type_sticker">贴纸</string>
     <string name="error_handling_incoming_share">无法处理共享数据</string>
     <string name="uploads_media_title">媒体</string>
-    <string name="uploads_media_no_result">此聊天室中无媒体</string>
+    <string name="uploads_media_no_result">此聊天室中暂无媒体</string>
     <string name="uploads_files_title">文件</string>
     <string name="uploads_files_subtitle">%1$s 于 %2$s</string>
-    <string name="uploads_files_no_result">此聊天室中无文件</string>
+    <string name="uploads_files_no_result">此聊天室中暂无文件</string>
     <string name="report_content_spam">垃圾信息</string>
     <string name="report_content_inappropriate">不合适的内容</string>
     <string name="report_content_custom">自定义报告……</string>
@@ -1668,7 +1672,7 @@
     <string name="content_reported_as_inappropriate_content">此内容已报告为不合适。 
 \n 
 \n如果您不希望再看到此用户的更多内容，您可以忽略他们以隐藏他们的消息。</string>
-    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} 需要权限在磁盘上保存您的端到端密钥。
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} 需要权限在磁盘上保存您的端对端密钥。
 \n
 \n请在下个弹窗中允许访问以便手动导出密钥。</string>
     <string name="no_network_indicator">目前没有网络连接</string>
@@ -1696,7 +1700,7 @@
     <string name="login_splash_text3">扩展 &amp; 自定义您的体验</string>
     <string name="login_splash_submit">开始吧</string>
     <string name="login_server_title">选择服务器</string>
-    <string name="login_server_text">就像电子邮件，账户有一个家，尽管您可以与任何人聊天</string>
+    <string name="login_server_text">就像电子邮件，账号有一个家，尽管您可以与任何人聊天</string>
     <string name="login_server_matrix_org_text">在最大的公共服务器上免费加入数百万用户</string>
     <string name="login_server_modular_text">面向组织的高级托管</string>
     <string name="login_server_modular_learn_more">了解更多</string>
@@ -1706,9 +1710,9 @@
     <string name="login_connect_to">连接到 %1$s</string>
     <string name="login_connect_to_modular">连接到 Element Matrix 服务</string>
     <string name="login_connect_to_a_custom_server">连接到自定义服务器</string>
-    <string name="login_signin_to">登入 %1$s</string>
+    <string name="login_signin_to">登录 %1$s</string>
     <string name="login_signup">注册</string>
-    <string name="login_signin">登入</string>
+    <string name="login_signin">登录</string>
     <string name="login_signin_sso">使用单点登录继续</string>
     <string name="login_server_url_form_modular_hint">Element Matrix 服务地址</string>
     <string name="login_server_url_form_other_hint">地址</string>
@@ -1716,23 +1720,23 @@
     <string name="login_server_url_form_modular_notice">输入 Modular Element 或您想使用的服务器地址</string>
     <string name="login_server_url_form_common_notice">输入您想使用的服务器的地址</string>
     <string name="login_sso_error_message">载入页面时出错：%1$s (%2$d)</string>
-    <string name="login_mode_not_supported">应用无法登录到此家庭服务器。家庭服务器支持以下登录类型：%1$s。
+    <string name="login_mode_not_supported">应用无法登录到此主服务器。主服务器支持以下登录类型：%1$s。
 \n
 \n您想要通过网页客户端登录吗？</string>
-    <string name="login_registration_disabled">抱歉，此服务器不接受新账户。</string>
-    <string name="login_registration_not_supported">应用无法在此服务器上创建账户。 
-\n 
+    <string name="login_registration_disabled">抱歉，此服务器不接受新账号。</string>
+    <string name="login_registration_not_supported">应用无法在此服务器上创建账号。
+\n
 \n您想要通过网页客户端注册吗？</string>
-    <string name="login_login_with_email_error">电子邮件未关联到任何账户。</string>
+    <string name="login_login_with_email_error">电子邮件未关联到任何账号。</string>
     <string name="login_reset_password_on">在 %1$s 上重置密码</string>
     <string name="login_reset_password_notice">验证邮件将发送到您的收件箱以确认设置您的新密码。</string>
     <string name="login_reset_password_submit">下一个</string>
     <string name="login_reset_password_email_hint">电子邮件</string>
     <string name="login_reset_password_password_hint">新密码</string>
     <string name="login_reset_password_warning_title">注意！</string>
-    <string name="login_reset_password_warning_content">更改您的密码将重置所有会话上的端到端加密密钥，从而使加密聊天记录无法读取。在重设密码之前，请设置“密钥备份”或从另一个会话中导出聊天室密钥。</string>
+    <string name="login_reset_password_warning_content">更改您的密码将重置所有会话上的端对端加密密钥，从而使加密聊天记录无法读取。在重设密码之前，请设置“密钥备份”或从另一个会话中导出聊天室密钥。</string>
     <string name="login_reset_password_warning_submit">继续</string>
-    <string name="login_reset_password_error_not_found">电子邮件未链接到任何账户</string>
+    <string name="login_reset_password_error_not_found">电子邮件未链接到任何账号</string>
     <string name="login_reset_password_mail_confirmation_title">检查您的收件箱</string>
     <string name="login_reset_password_mail_confirmation_notice">验证电子邮件已发送到 %1$s。</string>
     <string name="login_reset_password_mail_confirmation_notice_2">点击链接以确认您的新密码。跟随包含的链接验证后，请点击下方。</string>
@@ -1746,7 +1750,7 @@
 \n
 \n是否中止密码更改过程？</string>
     <string name="login_set_email_title">设置电子邮件地址</string>
-    <string name="login_set_email_notice">设置电子邮件用于恢复您的帐户。之后，您可以选择允许您认识的人通过电子邮件发现您。</string>
+    <string name="login_set_email_notice">设置电子邮件用于恢复您的账号。之后，您可以选择允许您认识的人通过电子邮件发现您。</string>
     <string name="login_set_email_mandatory_hint">电子邮件</string>
     <string name="login_set_email_optional_hint">电子邮件（可选）</string>
     <string name="login_set_email_submit">下一个</string>
@@ -1770,31 +1774,31 @@
     <string name="login_signup_submit">下一个</string>
     <string name="login_signup_error_user_in_use">用户名已占用</string>
     <string name="login_signup_cancel_confirmation_title">注意</string>
-    <string name="login_signup_cancel_confirmation_content">您的帐户尚未创建。
+    <string name="login_signup_cancel_confirmation_content">您的账号尚未创建。
 \n
 \n是否中止注册过程？</string>
     <string name="login_a11y_choose_matrix_org">选择 matrix.org</string>
     <string name="login_a11y_choose_modular">选择 Element Matrix Services</string>
-    <string name="login_a11y_choose_other">选择自定义家庭服务器</string>
+    <string name="login_a11y_choose_other">选择自定义主服务器</string>
     <string name="login_a11y_captcha_container">请进行人机验证</string>
     <string name="login_terms_title">接受条款以继续</string>
     <string name="login_wait_for_email_title">请检查您的电子邮件</string>
     <string name="login_wait_for_email_notice">我们向 %1$s 发送了电子邮件。
-\n请点击其中包含的链接继续账户创建。</string>
+\n请点击其中包含的链接继续账号创建。</string>
     <string name="login_validation_code_is_not_correct">输入的验证码不正确。请检查。</string>
-    <string name="login_error_outdated_homeserver_title">过时的家庭服务器</string>
-    <string name="login_error_outdated_homeserver_content">此家庭服务器运行的版本过旧以至于无法连接。要求您的家庭服务器管理员升级。</string>
+    <string name="login_error_outdated_homeserver_title">过时的主服务器</string>
+    <string name="login_error_outdated_homeserver_content">此主服务器运行的版本过旧以至于无法连接。要求您的主服务器管理员升级。</string>
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="other">发送了太多请求。您可以在 %1$d 秒后重试…</item>
     </plurals>
-    <string name="login_connect_using_matrix_id_notice">或者，如果您已经拥有账户并知道您的 Matrix 标识符和密码，您可以使用这种方式：</string>
+    <string name="login_connect_using_matrix_id_notice">或者，如果您已经拥有账号并知道您的 Matrix 标识符和密码，您可以使用这种方式：</string>
     <string name="login_connect_using_matrix_id_submit">使用 Matrix ID 登录</string>
     <string name="login_signin_matrix_id_title">使用 Matrix ID 登录</string>
-    <string name="login_signin_matrix_id_notice">如果您在家庭服务器上设置了账户，在下方使用您的 Matrix ID（例 @user:domain.com）和密码。</string>
+    <string name="login_signin_matrix_id_notice">如果您在主服务器上设置了账号，在下方使用您的 Matrix ID（例 @user:domain.com）和密码。</string>
     <string name="login_signin_matrix_id_hint">Matrix ID</string>
     <string name="login_signin_matrix_id_password_notice">如果您不知道您的密码，返回并重置。</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">这不是一个有效的用户标识符。期望的格式：\'@user:homeserver.org\'</string>
-    <string name="autodiscover_well_known_error">无法找到有效的家庭服务器。请检查您的标识符</string>
+    <string name="autodiscover_well_known_error">无法找到有效的主服务器。请检查您的标识符</string>
     <string name="signed_out_title">您已登出</string>
     <string name="signed_out_notice">这可能由于多种原因：
 \n
@@ -1803,25 +1807,25 @@
 \n• 您已从其他会话删除了此会话。
 \n
 \n• 您的服务器管理员出于安全原因已取消您的访问权限。</string>
-    <string name="signed_out_submit">重新登入</string>
+    <string name="signed_out_submit">重新登录</string>
     <string name="soft_logout_title">您已登出</string>
-    <string name="soft_logout_signin_title">登入</string>
-    <string name="soft_logout_signin_notice">您的家庭服务器 (%1$s) 管理员将您从您的账户 %2$s (%3$s) 登出。</string>
+    <string name="soft_logout_signin_title">登录</string>
+    <string name="soft_logout_signin_notice">您的主服务器 (%1$s) 管理员将您从您的账号 %2$s (%3$s) 登出。</string>
     <string name="soft_logout_signin_e2e_warning_notice">登录以恢复仅存储在此设备上的加密密钥。 您需要使用它们在任何设备上阅读所有安全消息。</string>
-    <string name="soft_logout_signin_submit">登入</string>
+    <string name="soft_logout_signin_submit">登录</string>
     <string name="soft_logout_signin_password_hint">密码</string>
     <string name="soft_logout_clear_data_title">清除个人数据</string>
     <string name="soft_logout_clear_data_notice">注意：您的个人数据（包括加密密钥）仍存储在此设备上。
 \n
-\n如果您不再使用此设备，或想登入另一个帐户，请清除它。</string>
+\n如果您不再使用此设备，或想登录另一个账号，请清除它。</string>
     <string name="soft_logout_clear_data_submit">清除全部数据</string>
     <string name="soft_logout_clear_data_dialog_title">清除数据</string>
     <string name="soft_logout_clear_data_dialog_content">是否清除当前存储在此设备上的全部数据？
-\n再次登入以访问您的帐户数据和消息。</string>
-    <string name="soft_logout_clear_data_dialog_e2e_warning_content">除非您登入以恢复加密密钥，否则您将无法访问安全消息。</string>
+\n再次登录以访问您的账号数据和消息。</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">除非您登录以恢复加密密钥，否则您将无法访问安全消息。</string>
     <string name="soft_logout_clear_data_dialog_submit">清除数据</string>
     <string name="template_soft_logout_sso_not_same_user_error">当前会话用于用户 %1$s 而您提供了用户 %2$s 的凭证。${app_name} 不支持此功能。
-\n请先清除数据，然后重新登入另一个账户。</string>
+\n请先清除数据，然后重新登录另一个账号。</string>
     <string name="permalink_malformed">您的 matrix.to 链接更是不正确</string>
     <string name="bug_report_error_too_short">描述太短</string>
     <string name="notification_initial_sync">初始同步…</string>
@@ -1841,19 +1845,19 @@
     <string name="template_settings_developer_mode_fail_fast_summary">发生意外错误时，${app_name} 可能更经常崩溃</string>
     <string name="command_description_shrug">在明文消息前添加 ¯\\_(ツ)_/¯</string>
     <string name="create_room_encryption_title">启用加密</string>
-    <string name="create_room_encryption_description">一旦启用，加密无法禁用。</string>
+    <string name="create_room_encryption_description">加密一经启用，便无法禁用。</string>
     <string name="login_error_threepid_denied">您的电子邮件域无权注册此服务器</string>
-    <string name="verification_conclusion_warning">不可信登入</string>
+    <string name="verification_conclusion_warning">未信任的登录</string>
     <string name="verification_sas_match">匹配</string>
     <string name="verification_sas_do_not_match">不匹配</string>
     <string name="verify_user_sas_emoji_help_text">确认下方独特表情以相同顺序出现在他们的屏幕上，以验证此用户。</string>
-    <string name="verify_user_sas_emoji_security_tip">为了获得最高的安全性，请使用其他可信通信方式或亲自确认。</string>
-    <string name="verification_green_shield">寻找绿色盾牌以确保用户可信。信任聊天室中的所有用户以确保聊天室的安全。</string>
+    <string name="verify_user_sas_emoji_security_tip">为了获得最高的安全性，请使用其他可信任的通讯方式，或者当面确认。</string>
+    <string name="verification_green_shield">寻找绿色盾牌以确保用户可信任。信任聊天室中的所有用户以确保聊天室的安全。</string>
     <string name="verification_conclusion_not_secure">不安全</string>
     <string name="verification_conclusion_compromised">以下其中一项可能会受到威胁：
 \n
-\n - 您的家庭服务器
-\n - 您验证的用户连接到的家庭服务器
+\n - 您的主服务器
+\n - 您验证的用户连接到的主服务器
 \n - 您或其它用户的网络连接
 \n - 您或其他用户的设备</string>
     <string name="sent_a_video">视频。</string>
@@ -1885,10 +1889,10 @@
     <string name="verification_request_alert_description">为了提高安全性，请通过检查两个设备上的一次性代码来验证 %s。
 \n
 \n为了获得最大的安全性，请亲自进行。</string>
-    <string name="room_profile_not_encrypted_subtitle">此聊天室的消息不是端到端加密。</string>
-    <string name="room_profile_encrypted_subtitle">该聊天室的消息端到端加密。
+    <string name="room_profile_not_encrypted_subtitle">此聊天室的消息未经端对端加密。</string>
+    <string name="room_profile_encrypted_subtitle">该聊天室的消息已被端对端加密。
 \n
-\n您的消息使用锁进行保护，只有您和接收者才能使用唯一的密钥解锁。</string>
+\n您的消息受加密保护，并且只有您和消息接收者拥有唯一解密密钥。</string>
     <string name="room_profile_section_security">安全</string>
     <string name="room_profile_section_security_learn_more">了解更多</string>
     <string name="room_profile_section_more">更多</string>
@@ -1902,16 +1906,16 @@
     <string name="room_profile_section_more_leave">离开聊天室</string>
     <string name="room_profile_leaving_room">正在离开聊天室…</string>
     <string name="room_member_power_level_admins">管理员</string>
-    <string name="room_member_power_level_moderators">审查员</string>
+    <string name="room_member_power_level_moderators">协管员</string>
     <string name="room_member_power_level_custom">自定义</string>
     <string name="room_member_power_level_invites">邀请</string>
     <string name="room_member_power_level_users">用户</string>
     <string name="room_member_power_level_admin_in">%1$s 管理员</string>
-    <string name="room_member_power_level_moderator_in">%1$s 审查员</string>
+    <string name="room_member_power_level_moderator_in">%1$s 的协管员</string>
     <string name="room_member_power_level_default_in">%1$s 默认权限</string>
     <string name="room_member_power_level_custom_in">%2$s 自定义权限 (%1$d)</string>
-    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} 无法处理 \'%1$s\' 类型事件</string>
-    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} 无法处理 \'%1$s\' 类型消息</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} 无法处理类型为 \'%1$s\' 的事件</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} 无法处理类型为 \'%1$s\' 的消息</string>
     <string name="template_rendering_event_error_exception">${app_name} 在渲染 id 为 \'%1$s\' 的事件内容时遇到了一个问题</string>
     <string name="unignore">取消忽略</string>
     <string name="verify_cannot_cross_sign">该会话无法与您的其他会话共享此验证。
@@ -1922,34 +1926,34 @@
     <string name="command_description_rainbow_emote">发送彩虹色给定表情</string>
     <string name="settings_category_timeline">时间线</string>
     <string name="settings_category_composer">消息编辑器</string>
-    <string name="room_settings_enable_encryption">启用端到端加密…</string>
-    <string name="room_settings_enable_encryption_warning">一旦启用，加密无法禁用。</string>
+    <string name="room_settings_enable_encryption">启用端对端加密…</string>
+    <string name="room_settings_enable_encryption_warning">加密一经启用，便无法禁用。</string>
     <string name="room_settings_enable_encryption_dialog_title">是否启用加密？</string>
-    <string name="room_settings_enable_encryption_dialog_content">启用后，将无法禁用聊天室加密。服务器无法看到加密聊天室中发送的消息，只有聊天室的参与者才能看到。启用加密可能会阻止许多机器人和桥接正常工作。</string>
+    <string name="room_settings_enable_encryption_dialog_content">聊天室加密一经启用，便无法禁用。在加密聊天室中，发送的消息无法被服务器看到，只能被聊天室的参与者看到。启用加密可能会使许多机器人和桥接无法正常运作。</string>
     <string name="room_settings_enable_encryption_dialog_submit">启用加密</string>
-    <string name="verification_request_notice">为保证安全，通过检查一次性代码验证 %s。</string>
-    <string name="verification_request_start_notice">为保证安全，亲自或使用其他通信方式验证。</string>
+    <string name="verification_request_notice">为保证安全，请核对一次性代码以验证 %s。</string>
+    <string name="verification_request_start_notice">为保证安全，请当面验证，或者使用其他通讯方式验证。</string>
     <string name="verification_emoji_notice">比较独特表情，确保它们以相同顺序出现。</string>
     <string name="verification_code_notice">与其他用户设备上显示的代码比较。</string>
-    <string name="verification_conclusion_ok_notice">与此用户的消息端到端加密，无法被第三方读取。</string>
-    <string name="verification_conclusion_ok_self_notice">您的新会话已验证。它可以访问您的加密消息，其他用户会将其视为可信。</string>
+    <string name="verification_conclusion_ok_notice">与此用户的消息端对端加密，无法被第三方读取。</string>
+    <string name="verification_conclusion_ok_self_notice">您的新会话已验证。它可以访问您的加密消息，其他用户会将其视为可信任。</string>
     <string name="encryption_information_cross_signing_state">交叉签名</string>
     <string name="encryption_information_dg_xsigning_complete">交叉签名已启用
 \n设备上的私钥。</string>
     <string name="encryption_information_dg_xsigning_trusted">交叉签名已启用
-\n密钥可信。
+\n密钥可信任。
 \n私钥未知</string>
     <string name="encryption_information_dg_xsigning_not_trusted">交叉签名已启用。
-\n密钥不可信</string>
+\n密钥未信任</string>
     <string name="encryption_information_dg_xsigning_disabled">交叉签名未启用</string>
-    <string name="settings_hs_admin_e2e_disabled">您的服务器管理员已默认禁用私有聊天室和私聊消息端到端加密。</string>
+    <string name="settings_hs_admin_e2e_disabled">您的服务器管理员已默认禁用私有聊天室和私聊消息端对端加密。</string>
     <string name="settings_active_sessions_list">激活会话</string>
     <string name="settings_active_sessions_show_all">显示全部会话</string>
     <string name="settings_active_sessions_manage">管理会话</string>
     <string name="settings_active_sessions_signout_device">登出此会话</string>
     <string name="settings_failed_to_get_crypto_device_info">加密信息不可用</string>
     <string name="settings_active_sessions_verified_device_desc">此会话对安全消息可信因为您已验证它：</string>
-    <string name="settings_active_sessions_unverified_device_desc">验证此会话以将其标记为可信，并授予其访问加密消息的权限。如果您未登录此会话，则您的帐户可能已被盗：</string>
+    <string name="settings_active_sessions_unverified_device_desc">验证此会话以将其标记为可信，并授予其访问加密消息的权限。如果您未登录此会话，则您的账号可能已被盗：</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="other">%d 个活动会话</item>
     </plurals>
@@ -1962,10 +1966,10 @@
     <string name="verification_profile_warning">注意</string>
     <string name="room_member_profile_failed_to_get_devices">无法获取会话</string>
     <string name="room_member_profile_sessions_section_title">会话</string>
-    <string name="trusted">可信</string>
-    <string name="not_trusted">不可信</string>
-    <string name="verification_profile_device_verified_because">此会话对加密消息可信，%1$s (%2$s) 已验证它：</string>
-    <string name="verification_profile_device_new_signing">%1$s (%2$s) 使用新会话登入：</string>
+    <string name="trusted">可信任</string>
+    <string name="not_trusted">未信任</string>
+    <string name="verification_profile_device_verified_because">此会话可信任，可以用于收发加密消息，因为 %1$s（%2$s）已验证了它：</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) 使用新会话登录：</string>
     <string name="verification_profile_device_untrust_info">在此用户信任此会话之前，发送到该会话和从该会话发送的消息均标有警告。或者，您可以手动进行验证。</string>
     <string name="initialize_cross_signing">初始化交叉签名</string>
     <string name="reset_cross_signing">重置密钥</string>
@@ -1976,7 +1980,7 @@
     <string name="no_connectivity_to_the_server_indicator">到服务器的连接已丢失</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">飞行模式已打开</string>
     <string name="settings_dev_tools">开发工具</string>
-    <string name="settings_account_data">账户数据</string>
+    <string name="settings_account_data">账号数据</string>
     <plurals name="poll_info">
         <item quantity="other">%d 票</item>
     </plurals>
@@ -1985,13 +1989,13 @@
     </plurals>
     <string name="poll_item_selected_aria">已选选项</string>
     <string name="command_description_poll">创建简单调查</string>
-    <string name="verification_cannot_access_other_session">使用恢复短语或密钥</string>
+    <string name="verification_cannot_access_other_session">使用恢复密语或密钥</string>
     <string name="verification_use_passphrase">如果您无法访问已有会话</string>
-    <string name="new_signin">新登入</string>
+    <string name="new_signin">新登录</string>
     <string name="enter_secret_storage_invalid">无法在存储中找到秘密</string>
-    <string name="enter_secret_storage_passphrase">输入秘密存储密码</string>
-    <string name="enter_secret_storage_passphrase_warning">注意：</string>
-    <string name="enter_secret_storage_passphrase_warning_text">您应仅在可信设备上访问秘密存储</string>
+    <string name="enter_secret_storage_passphrase">输入秘密存储密语</string>
+    <string name="enter_secret_storage_passphrase_warning">警告：</string>
+    <string name="enter_secret_storage_passphrase_warning_text">您应仅在可信任的设备上访问秘密存储</string>
     <string name="message_action_item_redact">移除…</string>
     <string name="share_confirm_room">您想要发送此附件到 %1$s 吗？</string>
     <plurals name="send_images_with_original_size">
@@ -2010,29 +2014,29 @@
     <string name="new_session_review">轻按以审核和验证</string>
     <string name="verify_new_session_notice">使用此会话验证新的会话，授权访问加密消息。</string>
     <string name="verify_new_session_was_not_me">这不是我</string>
-    <string name="verify_new_session_compromized">您的账户可能已被盗用</string>
+    <string name="verify_new_session_compromized">您的账号可能已被盗用</string>
     <string name="verify_cancel_self_verification_from_untrusted">如果您取消，您将无法在此设备上读取加密消息，其他用户不会信任它</string>
     <string name="verify_cancel_self_verification_from_trusted">如果您取消，您将无法在新设备上读取加密消息，其他用户不会信任它</string>
     <string name="verify_cancel_other">如果您现在取消将不会验证 %1$s (%2$s)。在他们的用户个人档案中重新开始。</string>
     <string name="verify_not_me_self_verification">以下其中一项可能有风险：
 \n
 \n- 您的密码
-\n- 您的家庭服务器
+\n- 您的主服务器
 \n- 此设备或其它设备
 \n- 设备使用的网络连接
 \n
 \n我们推荐您在设置中立即更换您的密码和恢复密钥。</string>
     <string name="verify_cancelled_notice">通过设置验证您的设备。</string>
     <string name="verification_cancelled">验证已取消</string>
-    <string name="recovery_passphrase">恢复密码</string>
+    <string name="recovery_passphrase">恢复密语</string>
     <string name="message_key">消息密钥</string>
-    <string name="account_password">账户密码</string>
-    <string name="set_recovery_passphrase">设置一个 %s</string>
+    <string name="account_password">账号密码</string>
+    <string name="set_recovery_passphrase">设置 %s</string>
     <string name="generate_message_key">生成消息密钥</string>
     <string name="confirm_recovery_passphrase">确认 %s</string>
     <string name="enter_account_password">输入您的 %s 以继续。</string>
     <string name="bootstrap_info_confirm_text">再次输入您的 %s 确认。</string>
-    <string name="bootstrap_dont_reuse_pwd">不要使用您的账户密码。</string>
+    <string name="bootstrap_dont_reuse_pwd">不要使用您的账号密码。</string>
     <string name="bootstrap_info_text_2">输入只有你知道的安全口令，用于保护服务器上的秘密。</string>
     <string name="bootstrap_loading_text">这可能会花费数秒，请耐心等待。</string>
     <string name="bootstrap_loading_title">设置恢复。</string>
@@ -2042,7 +2046,7 @@
     <string name="finish">完成</string>
     <string name="bootstrap_save_key_description">使用此 %1$s 作为安全网以防您忘记您的 %2$s。</string>
     <string name="bootstrap_crosssigning_progress_initializing">发布创建的身份密钥</string>
-    <string name="bootstrap_crosssigning_progress_pbkdf2">从密码生成安全密钥</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">从密语生成安全密钥</string>
     <string name="bootstrap_crosssigning_progress_default_key">正在定义 SSSS 默认密钥</string>
     <string name="bootstrap_crosssigning_progress_save_msk">正在同步主密钥</string>
     <string name="bootstrap_crosssigning_progress_save_usk">正在同步用户密钥</string>
@@ -2059,14 +2063,14 @@
     <string name="room_member_jump_to_read_receipt">跳至已读回执</string>
     <string name="event_redacted_by_admin_reason_with_reason">事件被聊天室管理员调整，理由：%1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">密钥已是最新！</string>
-    <string name="bootstrap_info_text">保护与解锁已加密信息并信任%s。</string>
+    <string name="bootstrap_info_text">保护与解锁已加密消息并信任 %s。</string>
     <string name="bootstrap_crosssigning_save_usb">保存到优盘或者备份盘</string>
     <string name="bootstrap_crosssigning_save_cloud">复制到您的个人云存储</string>
     <string name="auth_flow_not_supported">您无法在移动设备上执行此操作</string>
-    <string name="bootstrap_skip_text">设置恢复密码让您能够保护和解锁加密信息并信任设备。
+    <string name="bootstrap_skip_text">设置恢复密语让您能够保护和解锁加密信息并信任设备。
 \n
 \n如果您不希望设置文本密码，那么生成密钥亦可。</string>
-    <string name="bootstrap_skip_text_no_gen_key">设置恢复密码让您能够保护和解锁加密信息并信任设备。</string>
+    <string name="bootstrap_skip_text_no_gen_key">设置恢复密语让您能够保护和解锁加密信息并信任设备。</string>
     <string name="bootstrap_cancel_text">如果您现在取消，那么当您失去登录权限时也会丢失加密的信息和数据。
 \n
 \n您也可以通过设置菜单来建立保护备份以及管理您的密钥。</string>
@@ -2089,7 +2093,7 @@
     <string name="settings_notification_advanced_summary">按事件设置通知重要性</string>
     <string name="command_description_plain">以纯文本形式发送消息，而不将其解释为 markdown</string>
     <string name="auth_invalid_login_param_space_in_password">用户名和/或密码不正确。输入的密码以空格开头或结尾，请检查。</string>
-    <string name="auth_invalid_login_deactivated_account">此帐户已停用。</string>
+    <string name="auth_invalid_login_deactivated_account">此账号已停用。</string>
     <string name="room_message_placeholder">消息…</string>
     <string name="upgrade_security">加密升级可用</string>
     <string name="setup_cross_signing">启用交叉签名</string>
@@ -2097,27 +2101,27 @@
     <string name="bootstrap_enter_recovery">输入您的 %s 以继续</string>
     <string name="use_file">使用文件</string>
     <string name="enter_backup_passphrase">输入 %s</string>
-    <string name="backup_recovery_passphrase">恢复密码</string>
+    <string name="backup_recovery_passphrase">恢复密语</string>
     <string name="bootstrap_invalid_recovery_key">无效的恢复密钥</string>
     <string name="recovery_key_empty_error_message">请输入恢复密钥</string>
     <string name="bootstrap_progress_checking_backup">检查备份密钥</string>
     <string name="bootstrap_progress_checking_backup_with_info">检查备份密钥 (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">获取曲线密钥</string>
-    <string name="bootstrap_progress_generating_ssss">从密码生成 SSSS 密钥</string>
-    <string name="bootstrap_progress_generating_ssss_with_info">从密码生成 SSSS 密钥 (%s)</string>
+    <string name="bootstrap_progress_generating_ssss">从密语生成 SSSS 密钥</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">从密语生成 SSSS 密钥（%s）</string>
     <string name="bootstrap_progress_generating_ssss_recovery">从恢复密钥生成 SSSS 密钥</string>
     <string name="bootstrap_progress_storing_in_sss">正在在 SSSS 中保存密钥备份秘密</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-    <string name="bootstrap_migration_enter_backup_password">输入您的密钥备份密码以继续。</string>
+    <string name="bootstrap_migration_enter_backup_password">输入您的密钥备份密语以继续。</string>
     <string name="bootstrap_migration_use_recovery_key">使用您的密钥备份恢复密钥</string>
-    <string name="bootstrap_migration_with_passphrase_helper_with_link">不知道您的密钥备份密码，您可以 %s。</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">不知道您的密钥备份密语，您可以 %s。</string>
     <string name="bootstrap_migration_backup_recovery_key">密钥备份恢复密钥</string>
     <string name="settings_security_prevent_screenshots_title">阻止应用内屏幕截图</string>
     <string name="settings_security_prevent_screenshots_summary">启用此设置添加 FLAG_SECURE 到所有活动。重启应用使更改生效。</string>
     <string name="media_file_added_to_gallery">媒体文件已添加到相册</string>
     <string name="error_adding_media_file_to_gallery">无法添加媒体文件到相册</string>
     <string name="error_saving_media_file">无法保存媒体文件</string>
-    <string name="change_password_summary">选择新的账户密码…</string>
+    <string name="change_password_summary">选择新的账号密码…</string>
     <string name="template_use_other_session_content_description">在你的其他设备上使用最新的${app_name} 网页版、${app_name} 桌面版、${app_name} iOS 版、${app_name} 安卓版，或其他能够交叉签名的 Matrix 客户端</string>
     <string name="template_app_desktop_web">${app_name} Web
 \n${app_name} Desktop</string>
@@ -2134,14 +2138,14 @@
     <string name="failed_to_access_secure_storage">访问安全存储失败</string>
     <string name="unencrypted">未加密</string>
     <string name="encrypted_unverified">由未验证设备加密</string>
-    <string name="review_logins">查看您的登入位置</string>
-    <string name="verify_other_sessions">验证您的全部会话确保您的账户和消息安全</string>
-    <string name="verify_this_session">验证访问您的账户的新登录：%1$s</string>
+    <string name="review_logins">查看您的登录位置</string>
+    <string name="verify_other_sessions">验证您的全部会话确保您的账号和消息安全</string>
+    <string name="verify_this_session">验证访问您的账号的新登录：%1$s</string>
     <string name="cross_signing_verify_by_text">使用文本手动验证</string>
     <string name="crosssigning_verify_session">验证登录</string>
     <string name="cross_signing_verify_by_emoji">使用表情交互式验证</string>
     <string name="confirm_your_identity">通过从您的其他会话验证此登录确认您的身份，授权它访问您的加密消息。</string>
-    <string name="mark_as_verified">标记为可信</string>
+    <string name="mark_as_verified">标记为信任</string>
     <string name="error_empty_field_choose_user_name">请选择用户名。</string>
     <string name="error_empty_field_choose_password">请选择密码。</string>
     <string name="external_link_confirmation_title">仔细检查此链接</string>
@@ -2165,13 +2169,13 @@
     <string name="open_terms_of">打开 %s 条款</string>
     <string name="disconnect_identity_server_dialog_content">是否从身份服务器 %s 断开？</string>
     <string name="template_identity_server_error_outdated_identity_server">身份服务器已过期。${app_name} 仅支持 API V2。</string>
-    <string name="identity_server_error_outdated_home_server">无法执行此操作。家庭服务器已过期。</string>
+    <string name="identity_server_error_outdated_home_server">无法执行此操作。主服务器已过期。</string>
     <string name="identity_server_error_no_identity_server_configured">请先配置身份服务器。</string>
     <string name="identity_server_error_terms_not_signed">请先在设置中接受身份服务器的条款。</string>
     <string name="template_identity_server_error_bulk_sha256_not_supported">为了您的隐私，${app_name} 仅支持发送用户电子邮件和电话号码的哈希值。</string>
     <string name="identity_server_error_binding_error">关联失败。</string>
     <string name="identity_server_error_no_current_binding_error">此标识符无当前关联。</string>
-    <string name="identity_server_set_default_notice">您的家庭服务器 (%1$s) 建议使用 %2$s 作为您的身份服务器</string>
+    <string name="identity_server_set_default_notice">您的主服务器 (%1$s) 建议使用 %2$s 作为您的身份服务器</string>
     <string name="identity_server_set_default_submit">使用 %1$s</string>
     <string name="identity_server_set_alternative_notice">或者，您可以输入任何其他身份服务器 URL</string>
     <string name="identity_server_set_alternative_notice_no_default">输入身份服务器 URL</string>
@@ -2185,14 +2189,14 @@
     <string name="a11y_start_camera">启动相机</string>
     <string name="settings_setup_secure_backup">设置安全备份</string>
     <string name="bottom_sheet_setup_secure_backup_title">安全备份</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">通过在您的服务器上备份加密密钥防止丢失对加密消息和数据的访问。</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">通过在您的服务器上备份加密密钥，防止失去对加密信息和数据的访问。</string>
     <string name="bottom_sheet_setup_secure_backup_submit">设置</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">使用安全密钥</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全密钥存储在安全的地方如密码管理器或保险箱。</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全口令</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">输入仅有您知道的安全口令，生成备份用的密钥。</string>
     <string name="bottom_sheet_save_your_recovery_key_title">保存您的安全密钥</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">将您的安全密钥存储在安全的地方如密码管理器或保险箱。</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">将您的安全密钥存储在安全的地方，例如密码管理器或保险箱。</string>
     <string name="set_a_security_phrase_title">设置安全口令</string>
     <string name="set_a_security_phrase_notice">输入只有您知道的安全口令，用于保护您的服务器上的秘密。</string>
     <string name="set_a_security_phrase_hint">安全口令</string>
@@ -2205,13 +2209,13 @@
     <string name="notice_crypto_unable_to_decrypt_final">您无法访问此消息</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">正在等待此消息，可能会花费一些时间</string>
     <string name="crypto_utd">无法解密</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">由于端到端加密，您可能需要等待某人的消息到达因为加密密钥未正确发送给您。</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">由于端对端加密，您可能需要等待某人的消息到达因为加密密钥未正确发送给您。</string>
     <string name="crypto_error_withheld_blacklisted">您无法访问此消息因为您已屏蔽此发送者</string>
-    <string name="crypto_error_withheld_unverified">您无法访问此消息因为您的会话不被发送者信任</string>
+    <string name="crypto_error_withheld_unverified">您无法访问此消息，因为您的会话不被发送者信任</string>
     <string name="crypto_error_withheld_generic">您无法访问此消息因为发送者有意不发送密钥</string>
     <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密历史</string>
     <string name="disclaimer_title">Riot 现在是 Element！</string>
-    <string name="disclaimer_content">我们兴奋地宣布我们改名了！您的应用已经是最新的并且您已登入您的帐户。</string>
+    <string name="disclaimer_content">我们兴奋地宣布我们改名了！您的应用已经是最新的并且您已登录您的账号。</string>
     <string name="disclaimer_negative_button">明白了</string>
     <string name="disclaimer_positive_button">了解更多</string>
     <string name="save_recovery_key_chooser_hint">将恢复密钥保存到</string>
@@ -2247,7 +2251,7 @@
     <string name="audio_meeting">发起音频会议</string>
     <string name="audio_video_meeting_description">会议使用 Jitsi 安全与许可政策。您的会议进行期间当前聊天室内的所有人将看到加入邀请。</string>
     <string name="cannot_call_yourself">您无法呼叫您自己</string>
-    <string name="cannot_call_yourself_with_invite">您无法呼叫您自己，请等待参与者接受邀请</string>
+    <string name="cannot_call_yourself_with_invite">您无法与自己通话，请等待参与者接受邀请</string>
     <string name="failed_to_add_widget">添加小部件失败</string>
     <string name="failed_to_remove_widget">移除小部件失败</string>
     <plurals name="encryption_import_room_keys_success">
@@ -2267,14 +2271,14 @@
     <string name="wrong_pin_message_last_remaining_attempt">注意！登出前最后一次尝试！</string>
     <string name="too_many_pin_failures">错误次数过多，您已被登出</string>
     <string name="auth_msisdn_already_defined">此电话号码已定义。</string>
-    <string name="settings_phone_number_empty">您的帐户尚未添加电话号码</string>
+    <string name="settings_phone_number_empty">您的账号尚未添加电话号码</string>
     <string name="settings_emails">电子邮件地址</string>
-    <string name="settings_emails_empty">您的账户尚未添加电子邮件</string>
+    <string name="settings_emails_empty">您的账号尚未添加电子邮件</string>
     <string name="settings_phone_numbers">电话号码</string>
     <string name="settings_remove_three_pid_confirmation_content">移除 %s？</string>
     <string name="error_threepid_auth_failed">请确认您已点击我们向您发送的电子邮件中的链接。</string>
     <string name="settings_emails_and_phone_numbers_title">电子邮件和电话号码</string>
-    <string name="settings_emails_and_phone_numbers_summary">管理链接到您的 Matrix 账户的电子邮件和电话号码</string>
+    <string name="settings_emails_and_phone_numbers_summary">管理链接到您的 Matrix 账号的电子邮件和电话号码</string>
     <string name="settings_text_message_sent_hint">代码</string>
     <string name="login_msisdn_notice">请使用国际格式（电话号码必须以 ‘+’ 开始）</string>
     <string name="confirm_your_identity_quad_s">通过验证此登录确认您的身份，授权它访问加密信息。</string>
@@ -2290,7 +2294,7 @@
     <string name="sent_a_bot_buttons">机器人按钮</string>
     <string name="sent_a_reaction">回应：%s</string>
     <string name="sent_verification_conclusion">验证结果</string>
-    <string name="delete_account_data_warning">是否删除类型 %1$s 的账户数据？
+    <string name="delete_account_data_warning">是否删除类型 %1$s 的账号数据？
 \n
 \n小心使用，它可能导致意外行为。</string>
     <string name="universal_link_malformed">链接格式不正确</string>
@@ -2313,17 +2317,17 @@
     <string name="secure_backup_reset_if_you_reset_all">如果您重置一切</string>
     <string name="secure_backup_reset_all_no_other_devices">仅当没有其他设备可用来验证此设备时，才执行此操作。</string>
     <string name="secure_backup_reset_all">重置一切</string>
-    <string name="bad_passphrase_key_reset_all_action">忘记或丢失了所有的回复选项？重置一切</string>
+    <string name="bad_passphrase_key_reset_all_action">忘记或丢失了所有的恢复选项？重置一切</string>
     <string name="direct_room_created_summary_item_by_you">您已加入。</string>
     <string name="direct_room_created_summary_item">%s 已加入。</string>
-    <string name="direct_room_encryption_enabled_tile_description">此聊天室的消息是端到端加密的。</string>
+    <string name="direct_room_encryption_enabled_tile_description">此聊天室的消息是端对端加密的。</string>
     <string name="direct_room_profile_section_more_leave">离开</string>
     <string name="direct_room_profile_section_more_settings">设置</string>
-    <string name="direct_room_profile_encrypted_subtitle">此处的消息是端到端加密的，
+    <string name="direct_room_profile_encrypted_subtitle">此处的消息已被端对端加密。
 \n
-\n您的消息已用锁保护并且只有您和收件人拥有唯一的钥匙解锁它们。</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">此处的消息不是端到端加密。</string>
-    <string name="login_error_outdated_homeserver_warning_content">此家庭服务器正在运行较旧版本。要求您的家庭服务器管理员升级。您可以继续，但一些功能可能无法正确工作。</string>
+\n您的消息受加密保护，并且只有您和消息接收者拥有唯一解密密钥。</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">此处的消息未经端对端加密。</string>
+    <string name="login_error_outdated_homeserver_warning_content">此主服务器正在运行较旧版本。要求您的主服务器管理员升级。您可以继续，但一些功能可能无法正确工作。</string>
     <string name="direct_room_join_rules_invite_by_you">您仅发出此邀请。</string>
     <string name="direct_room_join_rules_invite">%1$s 仅发出此邀请。</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">在加密聊天室显示完整历史</string>
@@ -2361,7 +2365,7 @@
     <string name="room_alias_title">聊天室地址</string>
     <string name="room_settings_alias_subtitle">查看和管理此聊天室的地址，以及它在聊天室目录中的可见性。</string>
     <string name="room_settings_alias_title">聊天室地址</string>
-    <string name="room_settings_room_access_title">聊天室访问</string>
+    <string name="room_settings_room_access_title">聊天室访问权限</string>
     <string name="room_settings_room_read_history_dialog_subtitle">改成谁都可以阅读历史只会应用于此聊天室未来的消息。已经存在的历史消息的可见性将不会改变。</string>
     <string name="send_bug_report_include_key_share_history">发送密钥共享请求历史记录</string>
     <string name="action_unpublish">取消发布</string>
@@ -2423,7 +2427,8 @@
     <string name="create_room_topic_section">聊天室话题（可选）</string>
     <string name="create_room_name_section">聊天室名称</string>
     <string name="room_preview_no_preview_join">此聊天室无法预览。您想加入吗？</string>
-    <string name="room_preview_not_found">此聊天室当前不可访问。请稍候重试，或向聊天室管理员询问以检查您是否拥有访问权限。</string>
+    <string name="room_preview_not_found">目前无法访问此聊天室。
+\n请稍候重试，或询问聊天室管理员以确认您是否拥有访问权限。</string>
     <string name="room_alias_publish_to_directory_error">无法获取当前聊天室目录可见性（%1$s）。</string>
     <string name="room_alias_publish_to_directory">是否将此聊天室发布至 %1$s 的聊天室目录中？</string>
     <string name="room_alias_action_unpublish">取消发布此地址</string>
@@ -2473,7 +2478,87 @@
     <string name="system_theme">系统默认</string>
     <string name="notice_room_server_acl_updated_banned">• 匹配 %s 的服务器已被屏蔽。</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• IP 地址匹配的服务器已被屏蔽。</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• IP 地址符合的服务器已被允许。</string>
-    <string name="notice_room_server_acl_set_banned">• 符合 %s 的服务器已被屏蔽。</string>
-    <string name="notice_room_server_acl_set_allowed">• 符合 %s 的服务器已被允许。</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• IP 地址匹配的服务器已被允许。</string>
+    <string name="notice_room_server_acl_set_banned">• 匹配 %s 的服务器已被屏蔽。</string>
+    <string name="notice_room_server_acl_set_allowed">• 匹配 %s 的服务器已被允许。</string>
+    <string name="a11y_checked">已勾选</string>
+    <string name="a11y_selected">已选中</string>
+    <string name="call_only_active">活跃通话（%1$s）</string>
+    <plurals name="call_only_paused">
+        <item quantity="other">%1$d 暂停了通话</item>
+    </plurals>
+    <string name="re_authentication_activity_title">需要重新验证</string>
+    <string name="event_status_a11y_delete_all">删除失败的消息</string>
+    <string name="event_status_cancel_sending_dialog_message">您确定要取消发送消息吗？</string>
+    <string name="event_status_failed_messages_warning">消息发送失败</string>
+    <string name="event_status_delete_all_failed_dialog_title">删除未发送的消息</string>
+    <string name="event_status_delete_all_failed_dialog_message">您确定要删除此聊天室中所有未发送的消息吗？</string>
+    <string name="event_status_a11y_failed">失败</string>
+    <string name="dev_tools_success_state_event">状态事件已发送！</string>
+    <string name="dev_tools_success_event">事件已发送！</string>
+    <string name="dev_tools_error_malformed_event">事件格式错误</string>
+    <string name="event_status_a11y_sent">已发送</string>
+    <string name="event_status_a11y_sending">正在发送</string>
+    <string name="dev_tools_event_content_hint">事件内容</string>
+    <string name="dev_tools_error_no_content">无内容</string>
+    <string name="dev_tools_form_hint_event_content">事件内容</string>
+    <string name="dev_tools_form_hint_type">类型</string>
+    <string name="dev_tools_send_custom_state_event">发送自定义状态事件</string>
+    <string name="dev_tools_edit_content">编辑内容</string>
+    <string name="dev_tools_state_event">状态事件</string>
+    <string name="dev_tools_send_state_event">发送状态事件</string>
+    <string name="dev_tools_send_custom_event">发送自定义事件</string>
+    <string name="dev_tools_menu_name">开发工具</string>
+    <string name="a11y_video">视频</string>
+    <string name="authentication_error">验证失败</string>
+    <string name="call_transfer_users_tab_title">用户</string>
+    <string name="call_tile_call_back">回拨</string>
+    <string name="call_tile_other_started_call">%1$s 发起了通话</string>
+    <string name="call_tile_you_started_call">您发起了通话</string>
+    <plurals name="entries">
+        <item quantity="other">%d 个条目</item>
+    </plurals>
+    <string name="not_a_valid_qr_code">不是有效的 Matrix 二维码</string>
+    <string name="user_code_scan">扫描二维码</string>
+    <string name="add_people">添加人员</string>
+    <string name="invite_friends">邀请朋友</string>
+    <string name="settings_server_version">服务器版本</string>
+    <string name="settings_server_name">服务器名称</string>
+    <string name="action_switch">切换</string>
+    <string name="initial_sync_start_downloading">初始化同步：
+\n正在下载数据…</string>
+    <string name="initial_sync_start_server_computing">初始化同步：
+\n正在等待服务器响应…</string>
+    <string name="room_displayname_empty_room_was">空聊天室（曾为 %s）</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="other">%1$s，%2$s，%3$s 和 %4$d 位其他成员</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s，%2$s，%3$s 和 %4$s</string>
+    <string name="room_displayname_3_members">%1$s，%2$s 和 %3$s</string>
+    <string name="notice_widget_jitsi_added">%1$s 发起了视频会议</string>
+    <string name="notice_widget_jitsi_added_by_you">您发起了视频会议</string>
+    <string name="notice_widget_jitsi_removed">%1$s 启用了视频会议</string>
+    <string name="notice_widget_jitsi_removed_by_you">您启用了视频会议</string>
+    <string name="notice_widget_jitsi_modified">%1$s 修改了视频会议</string>
+    <string name="notice_widget_jitsi_modified_by_you">您修改了视频会议</string>
+    <string name="room_settings_set_avatar">设置头像</string>
+    <string name="room_list_quick_actions_room_settings">聊天室设置</string>
+    <string name="room_settings_room_version_title">聊天室版本</string>
+    <string name="warning_unsaved_change_discard">放弃修改</string>
+    <string name="call_dial_pad_title">拨号键盘</string>
+    <string name="matrix_to_card_title">Matrix 链接</string>
+    <string name="call_transfer_title">转移</string>
+    <string name="call_transfer_connect_action">连接</string>
+    <string name="a11y_delete_avatar">删除头像</string>
+    <string name="a11y_change_avatar">修改头像</string>
+    <string name="a11y_image">图片</string>
+    <string name="a11y_close_emoji_picker">关闭 Emoji 选择器</string>
+    <string name="a11y_open_emoji_picker">打开 Emoji 选择器</string>
+    <string name="a11y_trust_level_trusted">可信信任等级</string>
+    <string name="a11y_trust_level_warning">警告信任等级</string>
+    <string name="a11y_trust_level_default">默认信任等级</string>
+    <string name="notice_room_server_acl_updated_title_by_you">你修改了此聊天室的服务器访问控制列表。</string>
+    <string name="notice_room_server_acl_updated_title">%s 修改了此聊天室的服务器访问控制列表。</string>
+    <string name="notice_room_server_acl_set_title">%s 为此聊天室设置了服务器访问控制列表。</string>
+    <string name="notice_room_server_acl_set_title_by_you">您为此聊天室设置了服务器访问控制列表。</string>
 </resources>
\ No newline at end of file

From fa3ccda3f414ca83a8f2006ee69ed01c7d7fafb9 Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Thu, 25 Mar 2021 06:12:36 +0000
Subject: [PATCH 418/578] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hans/
---
 .../android/zh-Hans/changelogs/40100100.txt   |  2 +-
 .../android/zh-Hans/changelogs/40100120.txt   |  2 ++
 .../android/zh-Hans/changelogs/40100130.txt   |  2 ++
 .../android/zh-Hans/changelogs/40100140.txt   |  2 ++
 .../android/zh-Hans/changelogs/40100150.txt   |  2 ++
 .../android/zh-Hans/changelogs/40100160.txt   |  2 ++
 .../android/zh-Hans/changelogs/40100170.txt   |  2 ++
 .../android/zh-Hans/changelogs/40101000.txt   |  2 ++
 .../android/zh-Hans/changelogs/40101010.txt   |  2 ++
 .../android/zh-Hans/full_description.txt      | 32 +++++++++----------
 .../android/zh-Hans/short_description.txt     |  2 +-
 11 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/40100120.txt
 create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/40100130.txt
 create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/40100150.txt
 create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/40100160.txt
 create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/40100170.txt
 create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/zh-Hans/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100100.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100100.txt
index 0dc493cf40..0c226c1c8f 100644
--- a/fastlane/metadata/android/zh-Hans/changelogs/40100100.txt
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40100100.txt
@@ -1,2 +1,2 @@
-此新版本主要包含错误修复和改进。现在，发送消息要快得多。
+此新版本主要包含错误修复和改进。现在，发送消息比以前快多了。
 完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.0.10
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100120.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100120.txt
new file mode 100644
index 0000000000..67d69a3834
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40100120.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：链接预览，全新 Emoji 键盘，全新聊天室设置功能，以及圣诞节雪花！
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100130.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100130.txt
new file mode 100644
index 0000000000..5a2ba4256f
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40100130.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：链接预览，全新 Emoji 键盘，全新聊天室设置功能，以及圣诞节雪花！
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100140.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100140.txt
new file mode 100644
index 0000000000..dc25b5094b
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：支持编辑聊天室权限，自动切换浅色/深色主题，修复大量错误。
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100150.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100150.txt
new file mode 100644
index 0000000000..d5f37ff3a6
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：支持通过社交网络登录。
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100160.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100160.txt
new file mode 100644
index 0000000000..c0658e1881
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：支持通过社交网络登录。
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.0.15 和 https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40100170.txt b/fastlane/metadata/android/zh-Hans/changelogs/40100170.txt
new file mode 100644
index 0000000000..55cbadb37f
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：修复错误！
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40101000.txt b/fastlane/metadata/android/zh-Hans/changelogs/40101000.txt
new file mode 100644
index 0000000000..95bd9c55c0
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：改进 VoIP（私聊中的音频与视频通话）以及修复错误！
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/zh-Hans/changelogs/40101010.txt b/fastlane/metadata/android/zh-Hans/changelogs/40101010.txt
new file mode 100644
index 0000000000..9a4e611cf9
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hans/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+此版本的主要变化：改进性能以及修复错误！
+完整更新日志：https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/zh-Hans/full_description.txt b/fastlane/metadata/android/zh-Hans/full_description.txt
index 12664f7c9b..4791c9652b 100644
--- a/fastlane/metadata/android/zh-Hans/full_description.txt
+++ b/fastlane/metadata/android/zh-Hans/full_description.txt
@@ -1,30 +1,30 @@
-Element 是一种新型消息和协作应用：
+Element 是一种新型的通讯与协作应用：
 
 1. 使您可以掌控您的隐私
-2. 使您与 Matrix 网络中的任何人交流，甚至可以通过与其他应用如 Slack 集成
-3. 保护您远离广告，数据挖掘和围墙花园
-4. 通过端到端加密保护您，通过交叉签名验证其他人
+2. 使您与 Matrix 网络中的任何人交流，甚至可以通过集成功能与如 Slack 之类的其他应用通讯
+3. 保护您免受广告，大数据挖掘和封闭服务的侵害
+4. 通过端到端加密保证安全，通过交叉签名验证其他人
 
-Element 与其他消息和协作应用完全不同，因为它是去中心化且开源的。
+Element 与其他通讯与协作应用完全不同，因为它是去中心化且开源的。
 
-Element 使您可以自托管 - 或选择托管商 - 因此您拥有您的数据和会话的隐私权，所有权和控制权。它使您可以访问开放网络；因此您可以不仅仅与其他 Element 用户交流。并且它非常安全。
+Element 允许您自托管——或者选择托管商——因此，您能拥有数据和会话的隐私权，所有权和控制权。它允许您访问开放网络；因此，您可以与 Element 用户以外的人交流。并且它非常安全。
 
-Element 可以做到这些因为它在 Matrix 上运行 - 开放，去中心化通信标准。
+Element 之所以可以做到这些，是因为它在 Matrix 上运行——开放，去中心化通讯的标准。
 
-Element 通过让您选择谁来托管您的会话使您掌控一切。在 Element 应用中，您可以选择不同的托管方式：
+通过让您选择由谁来托管您的会话，Element 让您掌控一切。在 Element 应用中，您可以选择不同的托管方式：
 
-1. 在由 Matrix 开发者托管的 matrix.org 公共服务器上获取免费帐户，或从志愿者托管的几千个公共服务器中选择
-2. 在您自己的硬件上运行服务器自托管您的会话
-3. 通过简单地订阅 Element Matrix Services 托管平台在自定义服务器上注册账户
+1. 在由 Matrix 开发者托管的 matrix.org 公共服务器上获取免费帐户，或从志愿者托管的上千个公共服务器中选择
+2. 在您自己的硬件上运行服务器，自托管您的会话
+3. 通过订阅 Element Matrix Services 托管平台，简单地在自定义服务器上注册账户
 
 <b>为什么选择 Element？</b>
 
-<b>拥有您的数据</b>：您来决定存放您的数据和消息的位置。拥有并控制它的是您，而不是挖掘您的数据或与第三方分享的巨型企业。
+<b>掌控您的数据</b>：您来决定存放您的数据和消息的位置。拥有并控制它的是您，而不是挖掘您的数据或与第三方分享的巨型企业。
 
-<b>开放消息与协作</b>：您可以与 Matrix 网络中的任何人聊天，不论他们使用 Element 还是其他 Matrix 应用，甚至即使他们在使用不同的消息系统例如 Slack，IRC 或 XMPP。
+<b>开放通讯与协作</b>：您可以与 Matrix 网络中的任何人聊天，不论他们使用 Element 还是其他 Matrix 应用，甚至/即使他们在使用不同的通讯系统，例如 Slack，IRC 或 XMPP。
 
-<b>超级安全</b>：真正的端到端加密（仅有会话中的人可以解密消息），及用于验证会话参与方的设备的交叉签名。
+<b>超级安全</b>：支持真正的端到端加密（仅有会话中的人可以解密消息），还有能够验证会话参与方的设备的交叉签名。
 
-<b>丰富的通信方式</b>：消息，语音和视频通话，文件分享，屏幕分享和大量集成，机器人和小部件。建立房间，社区，保持联系并做好工作。
+<b>完善的通讯方式</b>：消息，语音和视频通话，文件共享，屏幕共享和大量集成功能，机器人和小挂件。建立房间与社区，保持联系并完成工作。
 
-<b>随时随地</b>：通过在您的全部设备和 https://app.element.io 网页上完全同步的消息历史，无论您在哪里都可以保持联系。
+<b>随时随地</b>：消息历史可在您的全部设备和 https://app.element.io 网页端之间完全同步，无论您在哪里，都可以保持联系。
diff --git a/fastlane/metadata/android/zh-Hans/short_description.txt b/fastlane/metadata/android/zh-Hans/short_description.txt
index 87d127335b..53d7d33403 100644
--- a/fastlane/metadata/android/zh-Hans/short_description.txt
+++ b/fastlane/metadata/android/zh-Hans/short_description.txt
@@ -1 +1 @@
-安全去中心化的聊天和 VoIP。保护您的数据不受第三方的影响。
+安全、去中心化的聊天与 VoIP 通话。保护您的数据不被第三方窃取。

From 837948938588797e4f34510b5a3b43ef396c2853 Mon Sep 17 00:00:00 2001
From: vachan-maker <revsamtp@hotmail.com>
Date: Thu, 25 Mar 2021 08:15:03 +0000
Subject: [PATCH 419/578] Translated using Weblate (Malayalam)

Currently translated at 17.3% (410 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 7be6c5865e..17e8c5cf7b 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -416,4 +416,18 @@
     <string name="summary_you_sent_image">നിങ്ങൾ ഒരു ചിത്രം അയച്ചു.</string>
     <string name="summary_user_sent_image">%1$s ഒരു ചിത്രം അയച്ചു.</string>
     <string name="summary_message">%1$s: %2$s</string>
+    <string name="notice_room_kick_by_you">നിങ്ങൾ %1$s-നെ(യെ) പുറത്താക്കി</string>
+    <string name="notice_room_kick">%1$s %2$s-നെ(യെ) പുറത്താക്കി</string>
+    <string name="notice_direct_room_join_by_you">നിങ്ങൾ ചേർന്നു</string>
+    <string name="notice_direct_room_join">%1$s ചേർന്നു</string>
+    <string name="notice_room_join_by_you">നിങ്ങൾ മുറിയിൽ ചേർന്നു</string>
+    <string name="notice_room_join">%1$s മുറിയിൽ ചേർന്നു</string>
+    <string name="notice_room_invite_you">%1$s നിങ്ങളെ ക്ഷണിച്ചു</string>
+    <string name="notice_room_invite_by_you">നിങ്ങൾ %1$s-നെ(യെ) ക്ഷണിച്ചു</string>
+    <string name="notice_room_invite">%1$s %2$s-നെ(യെ) ക്ഷണിച്ചു</string>
+    <string name="notice_room_created_by_you">നിങ്ങൾ മുറി സൃഷ്ടിച്ചു</string>
+    <string name="notice_room_created">%1$s മുറി സൃഷ്ടിച്ചു</string>
+    <string name="notice_room_invite_no_invitee_by_you">നിങ്ങളുടെ ക്ഷണം</string>
+    <string name="notice_room_invite_no_invitee">%s-ന്റെ ക്ഷണം</string>
+    <string name="summary_you_sent_sticker">നിങ്ങൾ ഒരു സ്റ്റിക്കർ അയച്ചു.</string>
 </resources>
\ No newline at end of file

From a7539d0f9508cfe40347cdccd73147ffee3cdda3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 26 Mar 2021 12:15:06 +0100
Subject: [PATCH 420/578] Be more robust when parsing some enums

---
 CHANGES.md                                       |  1 +
 .../room/model/RoomHistoryVisibilityContent.kt   | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 68b6194734..53383c14de 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
  - Improve message with Emoji only detection (#3017)
  - Picture preview when replying. Also add the image preview in the message detail bottomsheet (#2916)
  - Api interceptor to allow app developers peek responses (#2986)
+ - Be more robust when parsing some enums
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
index 31493be7ea..b16d81dbaa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
@@ -18,8 +18,20 @@ package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import timber.log.Timber
 
 @JsonClass(generateAdapter = true)
 data class RoomHistoryVisibilityContent(
-        @Json(name = "history_visibility") val historyVisibility: RoomHistoryVisibility? = null
-)
+        @Json(name = "history_visibility") private val _historyVisibility: String? = null
+) {
+    val historyVisibility: RoomHistoryVisibility? = when (_historyVisibility) {
+        "world_readable" -> RoomHistoryVisibility.WORLD_READABLE
+        "shared"         -> RoomHistoryVisibility.SHARED
+        "invited"        -> RoomHistoryVisibility.INVITED
+        "joined"         -> RoomHistoryVisibility.JOINED
+        else             -> {
+            Timber.w("Invalid value for RoomHistoryVisibility: `$_historyVisibility`")
+            null
+        }
+    }
+}

From 5364d7fd03d1252785eb89c80afa9c2dee623b32 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 26 Mar 2021 12:18:36 +0100
Subject: [PATCH 421/578] Be more robust when parsing some enums - Guest Access

---
 .../session/room/model/RoomGuestAccessContent.kt   | 14 ++++++++++++--
 .../session/room/state/DefaultStateService.kt      |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
index 99b035d30e..8eea0d3d06 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import timber.log.Timber
 
 /**
  * Class representing the EventType.STATE_ROOM_GUEST_ACCESS state event content
@@ -26,8 +27,17 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class RoomGuestAccessContent(
         // Required. Whether guests can join the room. One of: ["can_join", "forbidden"]
-        @Json(name = "guest_access") val guestAccess: GuestAccess? = null
-)
+        @Json(name = "guest_access") private val _guestAccess: String? = null
+) {
+    val guestAccess: GuestAccess? = when (_guestAccess) {
+        "can_join"  -> GuestAccess.CanJoin
+        "forbidden" -> GuestAccess.Forbidden
+        else        -> {
+            Timber.w("Invalid value for GuestAccess: `$_guestAccess`")
+            null
+        }
+    }
+}
 
 @JsonClass(generateAdapter = false)
 enum class GuestAccess(val value: String) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index f2640fd1e7..3c42b77ae8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -138,7 +138,7 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
         if (guestAccess != null) {
             sendStateEvent(
                     eventType = EventType.STATE_ROOM_GUEST_ACCESS,
-                    body = RoomGuestAccessContent(guestAccess).toContent(),
+                    body = mapOf("guest_access" to guestAccess),
                     stateKey = null
             )
         }

From ee265f71e68b6acec22935c6d9663e754aa6b892 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 26 Mar 2021 12:22:11 +0100
Subject: [PATCH 422/578] Be more robust when parsing some enums -
 RoomJoinRules

---
 .../session/room/model/RoomJoinRulesContent.kt | 18 +++++++++++++++---
 .../session/room/state/DefaultStateService.kt  |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index 3be2d38be7..8078951ad0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -19,11 +19,23 @@ package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import timber.log.Timber
 
 /**
  * Class representing the EventType.STATE_ROOM_JOIN_RULES state event content
  */
 @JsonClass(generateAdapter = true)
-data class RoomJoinRulesContent(
-        @Json(name = "join_rule") val joinRules: RoomJoinRules? = null
-)
+data class RoomJoinRulesContent constructor(
+        @Json(name = "join_rule") private val _joinRules: String? = null
+) {
+    val joinRules: RoomJoinRules? = when (_joinRules) {
+        "public"  -> RoomJoinRules.PUBLIC
+        "invite"  -> RoomJoinRules.INVITE
+        "knock"   -> RoomJoinRules.KNOCK
+        "private" -> RoomJoinRules.PRIVATE
+        else      -> {
+            Timber.w("Invalid value for RoomJoinRules: `$_joinRules`")
+            null
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 3c42b77ae8..ebccd84f39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -131,7 +131,7 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
         if (joinRules != null) {
             sendStateEvent(
                     eventType = EventType.STATE_ROOM_JOIN_RULES,
-                    body = RoomJoinRulesContent(joinRules).toContent(),
+                    body = mapOf("join_rule" to joinRules),
                     stateKey = null
             )
         }

From 2e23fec82baf3d1ec85f6ef458031a53b574cb5d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 26 Mar 2021 12:36:33 +0100
Subject: [PATCH 423/578] Sadly fields cannot be private

---
 .../sdk/api/session/room/model/RoomGuestAccessContent.kt      | 2 +-
 .../api/session/room/model/RoomHistoryVisibilityContent.kt    | 2 +-
 .../sdk/api/session/room/model/RoomJoinRulesContent.kt        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
index 8eea0d3d06..24a56b6b56 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
@@ -27,7 +27,7 @@ import timber.log.Timber
 @JsonClass(generateAdapter = true)
 data class RoomGuestAccessContent(
         // Required. Whether guests can join the room. One of: ["can_join", "forbidden"]
-        @Json(name = "guest_access") private val _guestAccess: String? = null
+        @Json(name = "guest_access") val _guestAccess: String? = null
 ) {
     val guestAccess: GuestAccess? = when (_guestAccess) {
         "can_join"  -> GuestAccess.CanJoin
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
index b16d81dbaa..3ac14e48de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
@@ -22,7 +22,7 @@ import timber.log.Timber
 
 @JsonClass(generateAdapter = true)
 data class RoomHistoryVisibilityContent(
-        @Json(name = "history_visibility") private val _historyVisibility: String? = null
+        @Json(name = "history_visibility") val _historyVisibility: String? = null
 ) {
     val historyVisibility: RoomHistoryVisibility? = when (_historyVisibility) {
         "world_readable" -> RoomHistoryVisibility.WORLD_READABLE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index 8078951ad0..8082486b22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -25,8 +25,8 @@ import timber.log.Timber
  * Class representing the EventType.STATE_ROOM_JOIN_RULES state event content
  */
 @JsonClass(generateAdapter = true)
-data class RoomJoinRulesContent constructor(
-        @Json(name = "join_rule") private val _joinRules: String? = null
+data class RoomJoinRulesContent(
+        @Json(name = "join_rule") val _joinRules: String? = null
 ) {
     val joinRules: RoomJoinRules? = when (_joinRules) {
         "public"  -> RoomJoinRules.PUBLIC

From 297fff1394b201596c2d76dcc40209cf82e2aead Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 26 Mar 2021 13:41:10 +0100
Subject: [PATCH 424/578] Cleanup some Enums

---
 .../sdk/api/session/room/model/Membership.kt  | 25 ++++++-------------
 .../room/model/RoomGuestAccessContent.kt      |  9 +++----
 .../api/session/room/model/RoomJoinRules.kt   | 18 ++++---------
 .../sdk/internal/session/room/RoomAPI.kt      |  5 ++--
 .../room/membership/LoadRoomMembersTask.kt    |  2 +-
 5 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
index 5844aead8d..a5d0f63722 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
@@ -23,24 +23,13 @@ import com.squareup.moshi.JsonClass
  * Represents the membership of a user on a room
  */
 @JsonClass(generateAdapter = false)
-enum class Membership(val value: String) {
-
-    NONE("none"),
-
-    @Json(name = "invite")
-    INVITE("invite"),
-
-    @Json(name = "join")
-    JOIN("join"),
-
-    @Json(name = "knock")
-    KNOCK("knock"),
-
-    @Json(name = "leave")
-    LEAVE("leave"),
-
-    @Json(name = "ban")
-    BAN("ban");
+enum class Membership {
+    NONE,
+    @Json(name = "invite") INVITE,
+    @Json(name = "join") JOIN,
+    @Json(name = "knock") KNOCK,
+    @Json(name = "leave") LEAVE,
+    @Json(name = "ban") BAN;
 
     fun isLeft(): Boolean {
         return this == KNOCK || this == LEAVE || this == BAN
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
index 24a56b6b56..0760c6f1b4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
@@ -40,10 +40,7 @@ data class RoomGuestAccessContent(
 }
 
 @JsonClass(generateAdapter = false)
-enum class GuestAccess(val value: String) {
-    @Json(name = "can_join")
-    CanJoin("can_join"),
-
-    @Json(name = "forbidden")
-    Forbidden("forbidden")
+enum class GuestAccess {
+    @Json(name = "can_join") CanJoin,
+    @Json(name = "forbidden") Forbidden
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
index 09aacfabbe..f3e8d357f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
@@ -24,17 +24,9 @@ import com.squareup.moshi.JsonClass
  * Enum for [RoomJoinRulesContent] : https://matrix.org/docs/spec/client_server/r0.4.0#m-room-join-rules
  */
 @JsonClass(generateAdapter = false)
-enum class RoomJoinRules(val value: String) {
-
-    @Json(name = "public")
-    PUBLIC("public"),
-
-    @Json(name = "invite")
-    INVITE("invite"),
-
-    @Json(name = "knock")
-    KNOCK("knock"),
-
-    @Json(name = "private")
-    PRIVATE("private")
+enum class RoomJoinRules {
+    @Json(name = "public") PUBLIC,
+    @Json(name = "invite") INVITE,
+    @Json(name = "knock") KNOCK,
+    @Json(name = "private") PRIVATE
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 20cb49ee8a..b065a30fc9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.session.room
 
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
 import org.matrix.android.sdk.api.util.JsonDict
@@ -100,8 +101,8 @@ internal interface RoomAPI {
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/members")
     fun getMembers(@Path("roomId") roomId: String,
                    @Query("at") syncToken: String?,
-                   @Query("membership") membership: String?,
-                   @Query("not_membership") notMembership: String?
+                   @Query("membership") membership: Membership?,
+                   @Query("not_membership") notMembership: Membership?
     ): Call<RoomMembersResponse>
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
index cc491d1cd9..6adf3c59d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
@@ -91,7 +91,7 @@ internal class DefaultLoadRoomMembersTask @Inject constructor(
         val lastToken = syncTokenStore.getLastToken()
         val response = try {
             executeRequest<RoomMembersResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.getMembers(params.roomId, lastToken, null, params.excludeMembership?.value)
+                apiCall = roomAPI.getMembers(params.roomId, lastToken, null, params.excludeMembership)
             }
         } catch (throwable: Throwable) {
             // Revert status to NONE

From d75b7434cf8c200609dd24dea41ab35fee5068e4 Mon Sep 17 00:00:00 2001
From: TR-SLimey <37966924+TR-SLimey@users.noreply.github.com>
Date: Fri, 26 Mar 2021 12:45:22 +0000
Subject: [PATCH 425/578] Replace dangerous characters in the filename with
 underscores

---
 .../im/vector/app/core/utils/ExternalApplicationsUtil.kt     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index fa1c50f419..859df7d714 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -514,7 +514,7 @@ fun selectTxtFileToWrite(
 @Suppress("DEPRECATION")
 fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: String?): File? {
     // defines another name for the external media
-    val dstFileName: String
+    var dstFileName: String
 
     // build a filename is not provided
     if (null == outputFilename) {
@@ -529,6 +529,9 @@ fun saveFileIntoLegacy(sourceFile: File, dstDirPath: File, outputFilename: Strin
         dstFileName = outputFilename
     }
 
+    // remove dangerous characters from the filename
+    dstFileName = dstFileName.replace(Regex("""[/\\]"""), "_")
+
     var dstFile = File(dstDirPath, dstFileName)
 
     // if the file already exists, append a marker

From 94220a24d147ce1d6cea3b873d94f64a8b72d527 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 26 Mar 2021 13:58:34 +0100
Subject: [PATCH 426/578] cleanup

---
 .../sdk/internal/session/room/state/DefaultStateService.kt      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index ebccd84f39..615bc99096 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -27,10 +27,8 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
-import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
-import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
 import org.matrix.android.sdk.api.session.room.state.StateService
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.MimeTypes

From a40adb903af21802abbf2e47877c44e886847be0 Mon Sep 17 00:00:00 2001
From: oogm <ga84dom@mytum.de>
Date: Fri, 26 Mar 2021 17:21:02 +0100
Subject: [PATCH 427/578] Update emoji import script to ease execution, output
 smaller .json files and capitalize emoji names

---
 tools/import_emojis.py                        | 25 ++++++++++++++++---
 .../main/res/raw/emoji_picker_datasource.json |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 tools/import_emojis.py

diff --git a/tools/import_emojis.py b/tools/import_emojis.py
old mode 100644
new mode 100755
index 6f204c23f2..f5638175a9
--- a/tools/import_emojis.py
+++ b/tools/import_emojis.py
@@ -1,10 +1,15 @@
+#!/usr/bin/env python3
 from collections import OrderedDict
 
 import requests
 import json
 import re
+import os
 from bs4 import BeautifulSoup
 
+# A list of words to not capitalize in emoji-names
+capitalization_exclude = {'with', 'a', 'at', 'of', 'for', 'and', 'over', 'the', 'off', 'on', 'out', 'in', 'but', 'or'}
+
 # Create skeleton of the final json file as a python dictionary:
 emoji_picker_datasource = {
     "compressed": True,
@@ -17,6 +22,7 @@ emoji_picker_datasource_emojis = emoji_picker_datasource["emojis"]
 
 
 # Get official emoji list from unicode.org (Emoji List, v13.1 at time of writing)
+print("Fetching emoji list from Unicode.org...",)
 req = requests.get("https://unicode.org/emoji/charts/emoji-list.html")
 soup = BeautifulSoup(req.content, 'html.parser')
 
@@ -24,6 +30,7 @@ soup = BeautifulSoup(req.content, 'html.parser')
 table = soup.body.table
 
 # Go over all rows
+print("Extracting emojis...")
 for row in table.find_all('tr'):
     # Add "bigheads"  rows to categories
     if 'bighead' in next(row.children)['class']:
@@ -55,6 +62,11 @@ for row in table.find_all('tr'):
         emoji_id = emoji_id.strip()  # Remove leading/trailing whitespaces
         emoji_id = emoji_id.replace(' ', '-')
 
+        # Capitalize name according to the same rules as the previous emoji_picker_datasource.json
+        # - Words are separated by any non-word character (\W), e.g. space, comma, parentheses, dots, etc.
+        # - Words are capitalized if they are either at the beginning of the name OR not in capitalization_exclude (extracted from the previous datasource, too)
+        emoji_name_cap = "".join([w.capitalize() if i == 0 or w not in capitalization_exclude else w for i, w in enumerate(re.split('(\W)', emoji_name))])
+
         # Extract emoji unicode-codepoint
         emoji_code_raw = code_element.text
         emoji_code_list = emoji_code_raw.split(" ")
@@ -69,7 +81,7 @@ for row in table.find_all('tr'):
 
         # Add the emoji itself to the "emojis" dict
         emoji_picker_datasource_emojis[emoji_id] = {
-                "a": emoji_name,
+                "a": emoji_name_cap,
                 "b": emoji_code,
                 "j": emoji_keywords
         }
@@ -78,10 +90,12 @@ for row in table.find_all('tr'):
 # There is no official specification of keywords beyond that, but muan/emojilib maintains a well maintained and
 # established repository with additional keywords. We extend our list with the keywords from there.
 # At the time of writing it had additional keyword information for all emojis except a few from the newest unicode 13.1.
+print("Fetching additional keywords from Emojilib...")
 req = requests.get("https://raw.githubusercontent.com/muan/emojilib/main/dist/emoji-en-US.json")
 emojilib_data = json.loads(req.content)
 
 # We just go over all the official emojis from unicode, and add the keywords there
+print("Adding keywords to emojis...")
 for emoji in emoji_picker_datasource_emojis:
     emoji_name = emoji_picker_datasource_emojis[emoji]["a"]
     emoji_code = emoji_picker_datasource_emojis[emoji]["b"]
@@ -95,7 +109,7 @@ for emoji in emoji_picker_datasource_emojis:
     elif emoji_unicode+chr(0xfe0f)  in emojilib_data:
         emoji_additional_keywords = emojilib_data[emoji_unicode+chr(0xfe0f)]
     else:
-        print("No additional keywords for", emoji_unicode, emoji_picker_datasource_emojis[emoji])
+        print("* No additional keywords for", emoji_unicode, emoji_picker_datasource_emojis[emoji])
         continue
 
     # If additional keywords exist, add them to emoji_picker_datasource_emojis
@@ -110,5 +124,8 @@ for emoji in emoji_picker_datasource_emojis:
 emoji_picker_datasource['categories'] = [x for x in emoji_picker_datasource['categories'] if x['id'] != 'component']
 
 # Write result to file (overwrite previous), without escaping unicode characters
-with open("../vector/src/main/res/raw/emoji_picker_datasource.json", "w") as outfile:
-    json.dump(emoji_picker_datasource, outfile, ensure_ascii=False)
+print("Writing emoji_picker_datasource.json...")
+scripts_dir = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(scripts_dir, "../vector/src/main/res/raw/emoji_picker_datasource.json"), "w") as outfile:
+    json.dump(emoji_picker_datasource, outfile, ensure_ascii=False, separators=(',', ':'))
+print("Done.")
diff --git a/vector/src/main/res/raw/emoji_picker_datasource.json b/vector/src/main/res/raw/emoji_picker_datasource.json
index e0314e9a77..cc676a4dd0 100644
--- a/vector/src/main/res/raw/emoji_picker_datasource.json
+++ b/vector/src/main/res/raw/emoji_picker_datasource.json
@@ -1 +1 @@
-{"compressed": true, "categories": [{"id": "smileys_&_emotion", "name": "Smileys & Emotion", "emojis": ["grinning-face", "grinning-face-with-big-eyes", "grinning-face-with-smiling-eyes", "beaming-face-with-smiling-eyes", "grinning-squinting-face", "grinning-face-with-sweat", "rolling-on-the-floor-laughing", "face-with-tears-of-joy", "slightly-smiling-face", "upsidedown-face", "winking-face", "smiling-face-with-smiling-eyes", "smiling-face-with-halo", "smiling-face-with-hearts", "smiling-face-with-hearteyes", "starstruck", "face-blowing-a-kiss", "kissing-face", "smiling-face", "kissing-face-with-closed-eyes", "kissing-face-with-smiling-eyes", "smiling-face-with-tear", "face-savoring-food", "face-with-tongue", "winking-face-with-tongue", "zany-face", "squinting-face-with-tongue", "moneymouth-face", "hugging-face", "face-with-hand-over-mouth", "shushing-face", "thinking-face", "zippermouth-face", "face-with-raised-eyebrow", "neutral-face", "expressionless-face", "face-without-mouth", "face-in-clouds", "smirking-face", "unamused-face", "face-with-rolling-eyes", "grimacing-face", "face-exhaling", "lying-face", "relieved-face", "pensive-face", "sleepy-face", "drooling-face", "sleeping-face", "face-with-medical-mask", "face-with-thermometer", "face-with-headbandage", "nauseated-face", "face-vomiting", "sneezing-face", "hot-face", "cold-face", "woozy-face", "knockedout-face", "face-with-spiral-eyes", "exploding-head", "cowboy-hat-face", "partying-face", "disguised-face", "smiling-face-with-sunglasses", "nerd-face", "face-with-monocle", "confused-face", "worried-face", "slightly-frowning-face", "frowning-face", "face-with-open-mouth", "hushed-face", "astonished-face", "flushed-face", "pleading-face", "frowning-face-with-open-mouth", "anguished-face", "fearful-face", "anxious-face-with-sweat", "sad-but-relieved-face", "crying-face", "loudly-crying-face", "face-screaming-in-fear", "confounded-face", "persevering-face", "disappointed-face", "downcast-face-with-sweat", "weary-face", "tired-face", "yawning-face", "face-with-steam-from-nose", "pouting-face", "angry-face", "face-with-symbols-on-mouth", "smiling-face-with-horns", "angry-face-with-horns", "skull", "skull-and-crossbones", "pile-of-poo", "clown-face", "ogre", "goblin", "ghost", "alien", "alien-monster", "robot", "grinning-cat", "grinning-cat-with-smiling-eyes", "cat-with-tears-of-joy", "smiling-cat-with-hearteyes", "cat-with-wry-smile", "kissing-cat", "weary-cat", "crying-cat", "pouting-cat", "seenoevil-monkey", "hearnoevil-monkey", "speaknoevil-monkey", "kiss-mark", "love-letter", "heart-with-arrow", "heart-with-ribbon", "sparkling-heart", "growing-heart", "beating-heart", "revolving-hearts", "two-hearts", "heart-decoration", "heart-exclamation", "broken-heart", "heart-on-fire", "mending-heart", "red-heart", "orange-heart", "yellow-heart", "green-heart", "blue-heart", "purple-heart", "brown-heart", "black-heart", "white-heart", "hundred-points", "anger-symbol", "collision", "dizzy", "sweat-droplets", "dashing-away", "hole", "bomb", "speech-balloon", "eye-in-speech-bubble", "left-speech-bubble", "right-anger-bubble", "thought-balloon", "zzz"]}, {"id": "people_&_body", "name": "People & Body", "emojis": ["waving-hand", "raised-back-of-hand", "hand-with-fingers-splayed", "raised-hand", "vulcan-salute", "ok-hand", "pinched-fingers", "pinching-hand", "victory-hand", "crossed-fingers", "loveyou-gesture", "sign-of-the-horns", "call-me-hand", "backhand-index-pointing-left", "backhand-index-pointing-right", "backhand-index-pointing-up", "middle-finger", "backhand-index-pointing-down", "index-pointing-up", "thumbs-up", "thumbs-down", "raised-fist", "oncoming-fist", "leftfacing-fist", "rightfacing-fist", "clapping-hands", "raising-hands", "open-hands", "palms-up-together", "handshake", "folded-hands", "writing-hand", "nail-polish", "selfie", "flexed-biceps", "mechanical-arm", "mechanical-leg", "leg", "foot", "ear", "ear-with-hearing-aid", "nose", "brain", "anatomical-heart", "lungs", "tooth", "bone", "eyes", "eye", "tongue", "mouth", "baby", "child", "boy", "girl", "person", "person-blond-hair", "man", "person-beard", "man-beard", "woman-beard", "man-red-hair", "man-curly-hair", "man-white-hair", "man-bald", "woman", "woman-red-hair", "person-red-hair", "woman-curly-hair", "person-curly-hair", "woman-white-hair", "person-white-hair", "woman-bald", "person-bald", "woman-blond-hair", "man-blond-hair", "older-person", "old-man", "old-woman", "person-frowning", "man-frowning", "woman-frowning", "person-pouting", "man-pouting", "woman-pouting", "person-gesturing-no", "man-gesturing-no", "woman-gesturing-no", "person-gesturing-ok", "man-gesturing-ok", "woman-gesturing-ok", "person-tipping-hand", "man-tipping-hand", "woman-tipping-hand", "person-raising-hand", "man-raising-hand", "woman-raising-hand", "deaf-person", "deaf-man", "deaf-woman", "person-bowing", "man-bowing", "woman-bowing", "person-facepalming", "man-facepalming", "woman-facepalming", "person-shrugging", "man-shrugging", "woman-shrugging", "health-worker", "man-health-worker", "woman-health-worker", "student", "man-student", "woman-student", "teacher", "man-teacher", "woman-teacher", "judge", "man-judge", "woman-judge", "farmer", "man-farmer", "woman-farmer", "cook", "man-cook", "woman-cook", "mechanic", "man-mechanic", "woman-mechanic", "factory-worker", "man-factory-worker", "woman-factory-worker", "office-worker", "man-office-worker", "woman-office-worker", "scientist", "man-scientist", "woman-scientist", "technologist", "man-technologist", "woman-technologist", "singer", "man-singer", "woman-singer", "artist", "man-artist", "woman-artist", "pilot", "man-pilot", "woman-pilot", "astronaut", "man-astronaut", "woman-astronaut", "firefighter", "man-firefighter", "woman-firefighter", "police-officer", "man-police-officer", "woman-police-officer", "detective", "man-detective", "woman-detective", "guard", "man-guard", "woman-guard", "ninja", "construction-worker", "man-construction-worker", "woman-construction-worker", "prince", "princess", "person-wearing-turban", "man-wearing-turban", "woman-wearing-turban", "person-with-skullcap", "woman-with-headscarf", "person-in-tuxedo", "man-in-tuxedo", "woman-in-tuxedo", "person-with-veil", "man-with-veil", "woman-with-veil", "pregnant-woman", "breastfeeding", "woman-feeding-baby", "man-feeding-baby", "person-feeding-baby", "baby-angel", "santa-claus", "mrs-claus", "mx-claus", "superhero", "man-superhero", "woman-superhero", "supervillain", "man-supervillain", "woman-supervillain", "mage", "man-mage", "woman-mage", "fairy", "man-fairy", "woman-fairy", "vampire", "man-vampire", "woman-vampire", "merperson", "merman", "mermaid", "elf", "man-elf", "woman-elf", "genie", "man-genie", "woman-genie", "zombie", "man-zombie", "woman-zombie", "person-getting-massage", "man-getting-massage", "woman-getting-massage", "person-getting-haircut", "man-getting-haircut", "woman-getting-haircut", "person-walking", "man-walking", "woman-walking", "person-standing", "man-standing", "woman-standing", "person-kneeling", "man-kneeling", "woman-kneeling", "person-with-white-cane", "man-with-white-cane", "woman-with-white-cane", "person-in-motorized-wheelchair", "man-in-motorized-wheelchair", "woman-in-motorized-wheelchair", "person-in-manual-wheelchair", "man-in-manual-wheelchair", "woman-in-manual-wheelchair", "person-running", "man-running", "woman-running", "woman-dancing", "man-dancing", "person-in-suit-levitating", "people-with-bunny-ears", "men-with-bunny-ears", "women-with-bunny-ears", "person-in-steamy-room", "man-in-steamy-room", "woman-in-steamy-room", "person-climbing", "man-climbing", "woman-climbing", "person-fencing", "horse-racing", "skier", "snowboarder", "person-golfing", "man-golfing", "woman-golfing", "person-surfing", "man-surfing", "woman-surfing", "person-rowing-boat", "man-rowing-boat", "woman-rowing-boat", "person-swimming", "man-swimming", "woman-swimming", "person-bouncing-ball", "man-bouncing-ball", "woman-bouncing-ball", "person-lifting-weights", "man-lifting-weights", "woman-lifting-weights", "person-biking", "man-biking", "woman-biking", "person-mountain-biking", "man-mountain-biking", "woman-mountain-biking", "person-cartwheeling", "man-cartwheeling", "woman-cartwheeling", "people-wrestling", "men-wrestling", "women-wrestling", "person-playing-water-polo", "man-playing-water-polo", "woman-playing-water-polo", "person-playing-handball", "man-playing-handball", "woman-playing-handball", "person-juggling", "man-juggling", "woman-juggling", "person-in-lotus-position", "man-in-lotus-position", "woman-in-lotus-position", "person-taking-bath", "person-in-bed", "people-holding-hands", "women-holding-hands", "woman-and-man-holding-hands", "men-holding-hands", "kiss", "kiss-woman-man", "kiss-man-man", "kiss-woman-woman", "couple-with-heart", "couple-with-heart-woman-man", "couple-with-heart-man-man", "couple-with-heart-woman-woman", "family", "family-man-woman-boy", "family-man-woman-girl", "family-man-woman-girl-boy", "family-man-woman-boy-boy", "family-man-woman-girl-girl", "family-man-man-boy", "family-man-man-girl", "family-man-man-girl-boy", "family-man-man-boy-boy", "family-man-man-girl-girl", "family-woman-woman-boy", "family-woman-woman-girl", "family-woman-woman-girl-boy", "family-woman-woman-boy-boy", "family-woman-woman-girl-girl", "family-man-boy", "family-man-boy-boy", "family-man-girl", "family-man-girl-boy", "family-man-girl-girl", "family-woman-boy", "family-woman-boy-boy", "family-woman-girl", "family-woman-girl-boy", "family-woman-girl-girl", "speaking-head", "bust-in-silhouette", "busts-in-silhouette", "people-hugging", "footprints"]}, {"id": "animals_&_nature", "name": "Animals & Nature", "emojis": ["monkey-face", "monkey", "gorilla", "orangutan", "dog-face", "dog", "guide-dog", "service-dog", "poodle", "wolf", "fox", "raccoon", "cat-face", "cat", "black-cat", "lion", "tiger-face", "tiger", "leopard", "horse-face", "horse", "unicorn", "zebra", "deer", "bison", "cow-face", "ox", "water-buffalo", "cow", "pig-face", "pig", "boar", "pig-nose", "ram", "ewe", "goat", "camel", "twohump-camel", "llama", "giraffe", "elephant", "mammoth", "rhinoceros", "hippopotamus", "mouse-face", "mouse", "rat", "hamster", "rabbit-face", "rabbit", "chipmunk", "beaver", "hedgehog", "bat", "bear", "polar-bear", "koala", "panda", "sloth", "otter", "skunk", "kangaroo", "badger", "paw-prints", "turkey", "chicken", "rooster", "hatching-chick", "baby-chick", "frontfacing-baby-chick", "bird", "penguin", "dove", "eagle", "duck", "swan", "owl", "dodo", "feather", "flamingo", "peacock", "parrot", "frog", "crocodile", "turtle", "lizard", "snake", "dragon-face", "dragon", "sauropod", "trex", "spouting-whale", "whale", "dolphin", "seal", "fish", "tropical-fish", "blowfish", "shark", "octopus", "spiral-shell", "snail", "butterfly", "bug", "ant", "honeybee", "beetle", "lady-beetle", "cricket", "cockroach", "spider", "spider-web", "scorpion", "mosquito", "fly", "worm", "microbe", "bouquet", "cherry-blossom", "white-flower", "rosette", "rose", "wilted-flower", "hibiscus", "sunflower", "blossom", "tulip", "seedling", "potted-plant", "evergreen-tree", "deciduous-tree", "palm-tree", "cactus", "sheaf-of-rice", "herb", "shamrock", "four-leaf-clover", "maple-leaf", "fallen-leaf", "leaf-fluttering-in-wind"]}, {"id": "food_&_drink", "name": "Food & Drink", "emojis": ["grapes", "melon", "watermelon", "tangerine", "lemon", "banana", "pineapple", "mango", "red-apple", "green-apple", "pear", "peach", "cherries", "strawberry", "blueberries", "kiwi-fruit", "tomato", "olive", "coconut", "avocado", "eggplant", "potato", "carrot", "ear-of-corn", "hot-pepper", "bell-pepper", "cucumber", "leafy-green", "broccoli", "garlic", "onion", "mushroom", "peanuts", "chestnut", "bread", "croissant", "baguette-bread", "flatbread", "pretzel", "bagel", "pancakes", "waffle", "cheese-wedge", "meat-on-bone", "poultry-leg", "cut-of-meat", "bacon", "hamburger", "french-fries", "pizza", "hot-dog", "sandwich", "taco", "burrito", "tamale", "stuffed-flatbread", "falafel", "egg", "cooking", "shallow-pan-of-food", "pot-of-food", "fondue", "bowl-with-spoon", "green-salad", "popcorn", "butter", "salt", "canned-food", "bento-box", "rice-cracker", "rice-ball", "cooked-rice", "curry-rice", "steaming-bowl", "spaghetti", "roasted-sweet-potato", "oden", "sushi", "fried-shrimp", "fish-cake-with-swirl", "moon-cake", "dango", "dumpling", "fortune-cookie", "takeout-box", "crab", "lobster", "shrimp", "squid", "oyster", "soft-ice-cream", "shaved-ice", "ice-cream", "doughnut", "cookie", "birthday-cake", "shortcake", "cupcake", "pie", "chocolate-bar", "candy", "lollipop", "custard", "honey-pot", "baby-bottle", "glass-of-milk", "hot-beverage", "teapot", "teacup-without-handle", "sake", "bottle-with-popping-cork", "wine-glass", "cocktail-glass", "tropical-drink", "beer-mug", "clinking-beer-mugs", "clinking-glasses", "tumbler-glass", "cup-with-straw", "bubble-tea", "beverage-box", "mate", "ice", "chopsticks", "fork-and-knife-with-plate", "fork-and-knife", "spoon", "kitchen-knife", "amphora"]}, {"id": "travel_&_places", "name": "Travel & Places", "emojis": ["globe-showing-europeafrica", "globe-showing-americas", "globe-showing-asiaaustralia", "globe-with-meridians", "world-map", "map-of-japan", "compass", "snowcapped-mountain", "mountain", "volcano", "mount-fuji", "camping", "beach-with-umbrella", "desert", "desert-island", "national-park", "stadium", "classical-building", "building-construction", "brick", "rock", "wood", "hut", "houses", "derelict-house", "house", "house-with-garden", "office-building", "japanese-post-office", "post-office", "hospital", "bank", "hotel", "love-hotel", "convenience-store", "school", "department-store", "factory", "japanese-castle", "castle", "wedding", "tokyo-tower", "statue-of-liberty", "church", "mosque", "hindu-temple", "synagogue", "shinto-shrine", "kaaba", "fountain", "tent", "foggy", "night-with-stars", "cityscape", "sunrise-over-mountains", "sunrise", "cityscape-at-dusk", "sunset", "bridge-at-night", "hot-springs", "carousel-horse", "ferris-wheel", "roller-coaster", "barber-pole", "circus-tent", "locomotive", "railway-car", "highspeed-train", "bullet-train", "train", "metro", "light-rail", "station", "tram", "monorail", "mountain-railway", "tram-car", "bus", "oncoming-bus", "trolleybus", "minibus", "ambulance", "fire-engine", "police-car", "oncoming-police-car", "taxi", "oncoming-taxi", "automobile", "oncoming-automobile", "sport-utility-vehicle", "pickup-truck", "delivery-truck", "articulated-lorry", "tractor", "racing-car", "motorcycle", "motor-scooter", "manual-wheelchair", "motorized-wheelchair", "auto-rickshaw", "bicycle", "kick-scooter", "skateboard", "roller-skate", "bus-stop", "motorway", "railway-track", "oil-drum", "fuel-pump", "police-car-light", "horizontal-traffic-light", "vertical-traffic-light", "stop-sign", "construction", "anchor", "sailboat", "canoe", "speedboat", "passenger-ship", "ferry", "motor-boat", "ship", "airplane", "small-airplane", "airplane-departure", "airplane-arrival", "parachute", "seat", "helicopter", "suspension-railway", "mountain-cableway", "aerial-tramway", "satellite", "rocket", "flying-saucer", "bellhop-bell", "luggage", "hourglass-done", "hourglass-not-done", "watch", "alarm-clock", "stopwatch", "timer-clock", "mantelpiece-clock", "twelve-oclock", "twelvethirty", "one-oclock", "onethirty", "two-oclock", "twothirty", "three-oclock", "threethirty", "four-oclock", "fourthirty", "five-oclock", "fivethirty", "six-oclock", "sixthirty", "seven-oclock", "seventhirty", "eight-oclock", "eightthirty", "nine-oclock", "ninethirty", "ten-oclock", "tenthirty", "eleven-oclock", "eleventhirty", "new-moon", "waxing-crescent-moon", "first-quarter-moon", "waxing-gibbous-moon", "full-moon", "waning-gibbous-moon", "last-quarter-moon", "waning-crescent-moon", "crescent-moon", "new-moon-face", "first-quarter-moon-face", "last-quarter-moon-face", "thermometer", "sun", "full-moon-face", "sun-with-face", "ringed-planet", "star", "glowing-star", "shooting-star", "milky-way", "cloud", "sun-behind-cloud", "cloud-with-lightning-and-rain", "sun-behind-small-cloud", "sun-behind-large-cloud", "sun-behind-rain-cloud", "cloud-with-rain", "cloud-with-snow", "cloud-with-lightning", "tornado", "fog", "wind-face", "cyclone", "rainbow", "closed-umbrella", "umbrella", "umbrella-with-rain-drops", "umbrella-on-ground", "high-voltage", "snowflake", "snowman", "snowman-without-snow", "comet", "fire", "droplet", "water-wave"]}, {"id": "activities", "name": "Activities", "emojis": ["jackolantern", "christmas-tree", "fireworks", "sparkler", "firecracker", "sparkles", "balloon", "party-popper", "confetti-ball", "tanabata-tree", "pine-decoration", "japanese-dolls", "carp-streamer", "wind-chime", "moon-viewing-ceremony", "red-envelope", "ribbon", "wrapped-gift", "reminder-ribbon", "admission-tickets", "ticket", "military-medal", "trophy", "sports-medal", "1st-place-medal", "2nd-place-medal", "3rd-place-medal", "soccer-ball", "baseball", "softball", "basketball", "volleyball", "american-football", "rugby-football", "tennis", "flying-disc", "bowling", "cricket-game", "field-hockey", "ice-hockey", "lacrosse", "ping-pong", "badminton", "boxing-glove", "martial-arts-uniform", "goal-net", "flag-in-hole", "ice-skate", "fishing-pole", "diving-mask", "running-shirt", "skis", "sled", "curling-stone", "bullseye", "yoyo", "kite", "pool-8-ball", "crystal-ball", "magic-wand", "nazar-amulet", "video-game", "joystick", "slot-machine", "game-die", "puzzle-piece", "teddy-bear", "piata", "nesting-dolls", "spade-suit", "heart-suit", "diamond-suit", "club-suit", "chess-pawn", "joker", "mahjong-red-dragon", "flower-playing-cards", "performing-arts", "framed-picture", "artist-palette", "thread", "sewing-needle", "yarn", "knot"]}, {"id": "objects", "name": "Objects", "emojis": ["glasses", "sunglasses", "goggles", "lab-coat", "safety-vest", "necktie", "tshirt", "jeans", "scarf", "gloves", "coat", "socks", "dress", "kimono", "sari", "onepiece-swimsuit", "briefs", "shorts", "bikini", "womans-clothes", "purse", "handbag", "clutch-bag", "shopping-bags", "backpack", "thong-sandal", "mans-shoe", "running-shoe", "hiking-boot", "flat-shoe", "highheeled-shoe", "womans-sandal", "ballet-shoes", "womans-boot", "crown", "womans-hat", "top-hat", "graduation-cap", "billed-cap", "military-helmet", "rescue-workers-helmet", "prayer-beads", "lipstick", "ring", "gem-stone", "muted-speaker", "speaker-low-volume", "speaker-medium-volume", "speaker-high-volume", "loudspeaker", "megaphone", "postal-horn", "bell", "bell-with-slash", "musical-score", "musical-note", "musical-notes", "studio-microphone", "level-slider", "control-knobs", "microphone", "headphone", "radio", "saxophone", "accordion", "guitar", "musical-keyboard", "trumpet", "violin", "banjo", "drum", "long-drum", "mobile-phone", "mobile-phone-with-arrow", "telephone", "telephone-receiver", "pager", "fax-machine", "battery", "electric-plug", "laptop", "desktop-computer", "printer", "keyboard", "computer-mouse", "trackball", "computer-disk", "floppy-disk", "optical-disk", "dvd", "abacus", "movie-camera", "film-frames", "film-projector", "clapper-board", "television", "camera", "camera-with-flash", "video-camera", "videocassette", "magnifying-glass-tilted-left", "magnifying-glass-tilted-right", "candle", "light-bulb", "flashlight", "red-paper-lantern", "diya-lamp", "notebook-with-decorative-cover", "closed-book", "open-book", "green-book", "blue-book", "orange-book", "books", "notebook", "ledger", "page-with-curl", "scroll", "page-facing-up", "newspaper", "rolledup-newspaper", "bookmark-tabs", "bookmark", "label", "money-bag", "coin", "yen-banknote", "dollar-banknote", "euro-banknote", "pound-banknote", "money-with-wings", "credit-card", "receipt", "chart-increasing-with-yen", "envelope", "email", "incoming-envelope", "envelope-with-arrow", "outbox-tray", "inbox-tray", "package", "closed-mailbox-with-raised-flag", "closed-mailbox-with-lowered-flag", "open-mailbox-with-raised-flag", "open-mailbox-with-lowered-flag", "postbox", "ballot-box-with-ballot", "pencil", "black-nib", "fountain-pen", "pen", "paintbrush", "crayon", "memo", "briefcase", "file-folder", "open-file-folder", "card-index-dividers", "calendar", "tearoff-calendar", "spiral-notepad", "spiral-calendar", "card-index", "chart-increasing", "chart-decreasing", "bar-chart", "clipboard", "pushpin", "round-pushpin", "paperclip", "linked-paperclips", "straight-ruler", "triangular-ruler", "scissors", "card-file-box", "file-cabinet", "wastebasket", "locked", "unlocked", "locked-with-pen", "locked-with-key", "key", "old-key", "hammer", "axe", "pick", "hammer-and-pick", "hammer-and-wrench", "dagger", "crossed-swords", "water-pistol", "boomerang", "bow-and-arrow", "shield", "carpentry-saw", "wrench", "screwdriver", "nut-and-bolt", "gear", "clamp", "balance-scale", "white-cane", "link", "chains", "hook", "toolbox", "magnet", "ladder", "alembic", "test-tube", "petri-dish", "dna", "microscope", "telescope", "satellite-antenna", "syringe", "drop-of-blood", "pill", "adhesive-bandage", "stethoscope", "door", "elevator", "mirror", "window", "bed", "couch-and-lamp", "chair", "toilet", "plunger", "shower", "bathtub", "mouse-trap", "razor", "lotion-bottle", "safety-pin", "broom", "basket", "roll-of-paper", "bucket", "soap", "toothbrush", "sponge", "fire-extinguisher", "shopping-cart", "cigarette", "coffin", "headstone", "funeral-urn", "moai", "placard"]}, {"id": "symbols", "name": "Symbols", "emojis": ["atm-sign", "litter-in-bin-sign", "potable-water", "wheelchair-symbol", "mens-room", "womens-room", "restroom", "baby-symbol", "water-closet", "passport-control", "customs", "baggage-claim", "left-luggage", "warning", "children-crossing", "no-entry", "prohibited", "no-bicycles", "no-smoking", "no-littering", "nonpotable-water", "no-pedestrians", "no-mobile-phones", "no-one-under-eighteen", "radioactive", "biohazard", "up-arrow", "upright-arrow", "right-arrow", "downright-arrow", "down-arrow", "downleft-arrow", "left-arrow", "upleft-arrow", "updown-arrow", "leftright-arrow", "right-arrow-curving-left", "left-arrow-curving-right", "right-arrow-curving-up", "right-arrow-curving-down", "clockwise-vertical-arrows", "counterclockwise-arrows-button", "back-arrow", "end-arrow", "on-arrow", "soon-arrow", "top-arrow", "place-of-worship", "atom-symbol", "om", "star-of-david", "wheel-of-dharma", "yin-yang", "latin-cross", "orthodox-cross", "star-and-crescent", "peace-symbol", "menorah", "dotted-sixpointed-star", "aries", "taurus", "gemini", "cancer", "leo", "virgo", "libra", "scorpio", "sagittarius", "capricorn", "aquarius", "pisces", "ophiuchus", "shuffle-tracks-button", "repeat-button", "repeat-single-button", "play-button", "fastforward-button", "next-track-button", "play-or-pause-button", "reverse-button", "fast-reverse-button", "last-track-button", "upwards-button", "fast-up-button", "downwards-button", "fast-down-button", "pause-button", "stop-button", "record-button", "eject-button", "cinema", "dim-button", "bright-button", "antenna-bars", "vibration-mode", "mobile-phone-off", "female-sign", "male-sign", "transgender-symbol", "multiply", "plus", "minus", "divide", "infinity", "double-exclamation-mark", "exclamation-question-mark", "red-question-mark", "white-question-mark", "white-exclamation-mark", "red-exclamation-mark", "wavy-dash", "currency-exchange", "heavy-dollar-sign", "medical-symbol", "recycling-symbol", "fleurdelis", "trident-emblem", "name-badge", "japanese-symbol-for-beginner", "hollow-red-circle", "check-mark-button", "check-box-with-check", "check-mark", "cross-mark", "cross-mark-button", "curly-loop", "double-curly-loop", "part-alternation-mark", "eightspoked-asterisk", "eightpointed-star", "sparkle", "copyright", "registered", "trade-mark", "keycap", "keycap", "keycap-0", "keycap-1", "keycap-2", "keycap-3", "keycap-4", "keycap-5", "keycap-6", "keycap-7", "keycap-8", "keycap-9", "keycap-10", "input-latin-uppercase", "input-latin-lowercase", "input-numbers", "input-symbols", "input-latin-letters", "a-button-blood-type", "ab-button-blood-type", "b-button-blood-type", "cl-button", "cool-button", "free-button", "information", "id-button", "circled-m", "new-button", "ng-button", "o-button-blood-type", "ok-button", "p-button", "sos-button", "up-button", "vs-button", "japanese-here-button", "japanese-service-charge-button", "japanese-monthly-amount-button", "japanese-not-free-of-charge-button", "japanese-reserved-button", "japanese-bargain-button", "japanese-discount-button", "japanese-free-of-charge-button", "japanese-prohibited-button", "japanese-acceptable-button", "japanese-application-button", "japanese-passing-grade-button", "japanese-vacancy-button", "japanese-congratulations-button", "japanese-secret-button", "japanese-open-for-business-button", "japanese-no-vacancy-button", "red-circle", "orange-circle", "yellow-circle", "green-circle", "blue-circle", "purple-circle", "brown-circle", "black-circle", "white-circle", "red-square", "orange-square", "yellow-square", "green-square", "blue-square", "purple-square", "brown-square", "black-large-square", "white-large-square", "black-medium-square", "white-medium-square", "black-mediumsmall-square", "white-mediumsmall-square", "black-small-square", "white-small-square", "large-orange-diamond", "large-blue-diamond", "small-orange-diamond", "small-blue-diamond", "red-triangle-pointed-up", "red-triangle-pointed-down", "diamond-with-a-dot", "radio-button", "white-square-button", "black-square-button"]}, {"id": "flags", "name": "Flags", "emojis": ["chequered-flag", "triangular-flag", "crossed-flags", "black-flag", "white-flag", "rainbow-flag", "transgender-flag", "pirate-flag", "flag-ascension-island", "flag-andorra", "flag-united-arab-emirates", "flag-afghanistan", "flag-antigua--barbuda", "flag-anguilla", "flag-albania", "flag-armenia", "flag-angola", "flag-antarctica", "flag-argentina", "flag-american-samoa", "flag-austria", "flag-australia", "flag-aruba", "flag-land-islands", "flag-azerbaijan", "flag-bosnia--herzegovina", "flag-barbados", "flag-bangladesh", "flag-belgium", "flag-burkina-faso", "flag-bulgaria", "flag-bahrain", "flag-burundi", "flag-benin", "flag-st-barthlemy", "flag-bermuda", "flag-brunei", "flag-bolivia", "flag-caribbean-netherlands", "flag-brazil", "flag-bahamas", "flag-bhutan", "flag-bouvet-island", "flag-botswana", "flag-belarus", "flag-belize", "flag-canada", "flag-cocos-keeling-islands", "flag-congo--kinshasa", "flag-central-african-republic", "flag-congo--brazzaville", "flag-switzerland", "flag-cte-divoire", "flag-cook-islands", "flag-chile", "flag-cameroon", "flag-china", "flag-colombia", "flag-clipperton-island", "flag-costa-rica", "flag-cuba", "flag-cape-verde", "flag-curaao", "flag-christmas-island", "flag-cyprus", "flag-czechia", "flag-germany", "flag-diego-garcia", "flag-djibouti", "flag-denmark", "flag-dominica", "flag-dominican-republic", "flag-algeria", "flag-ceuta--melilla", "flag-ecuador", "flag-estonia", "flag-egypt", "flag-western-sahara", "flag-eritrea", "flag-spain", "flag-ethiopia", "flag-european-union", "flag-finland", "flag-fiji", "flag-falkland-islands", "flag-micronesia", "flag-faroe-islands", "flag-france", "flag-gabon", "flag-united-kingdom", "flag-grenada", "flag-georgia", "flag-french-guiana", "flag-guernsey", "flag-ghana", "flag-gibraltar", "flag-greenland", "flag-gambia", "flag-guinea", "flag-guadeloupe", "flag-equatorial-guinea", "flag-greece", "flag-south-georgia--south-sandwich-islands", "flag-guatemala", "flag-guam", "flag-guineabissau", "flag-guyana", "flag-hong-kong-sar-china", "flag-heard--mcdonald-islands", "flag-honduras", "flag-croatia", "flag-haiti", "flag-hungary", "flag-canary-islands", "flag-indonesia", "flag-ireland", "flag-israel", "flag-isle-of-man", "flag-india", "flag-british-indian-ocean-territory", "flag-iraq", "flag-iran", "flag-iceland", "flag-italy", "flag-jersey", "flag-jamaica", "flag-jordan", "flag-japan", "flag-kenya", "flag-kyrgyzstan", "flag-cambodia", "flag-kiribati", "flag-comoros", "flag-st-kitts--nevis", "flag-north-korea", "flag-south-korea", "flag-kuwait", "flag-cayman-islands", "flag-kazakhstan", "flag-laos", "flag-lebanon", "flag-st-lucia", "flag-liechtenstein", "flag-sri-lanka", "flag-liberia", "flag-lesotho", "flag-lithuania", "flag-luxembourg", "flag-latvia", "flag-libya", "flag-morocco", "flag-monaco", "flag-moldova", "flag-montenegro", "flag-st-martin", "flag-madagascar", "flag-marshall-islands", "flag-north-macedonia", "flag-mali", "flag-myanmar-burma", "flag-mongolia", "flag-macao-sar-china", "flag-northern-mariana-islands", "flag-martinique", "flag-mauritania", "flag-montserrat", "flag-malta", "flag-mauritius", "flag-maldives", "flag-malawi", "flag-mexico", "flag-malaysia", "flag-mozambique", "flag-namibia", "flag-new-caledonia", "flag-niger", "flag-norfolk-island", "flag-nigeria", "flag-nicaragua", "flag-netherlands", "flag-norway", "flag-nepal", "flag-nauru", "flag-niue", "flag-new-zealand", "flag-oman", "flag-panama", "flag-peru", "flag-french-polynesia", "flag-papua-new-guinea", "flag-philippines", "flag-pakistan", "flag-poland", "flag-st-pierre--miquelon", "flag-pitcairn-islands", "flag-puerto-rico", "flag-palestinian-territories", "flag-portugal", "flag-palau", "flag-paraguay", "flag-qatar", "flag-runion", "flag-romania", "flag-serbia", "flag-russia", "flag-rwanda", "flag-saudi-arabia", "flag-solomon-islands", "flag-seychelles", "flag-sudan", "flag-sweden", "flag-singapore", "flag-st-helena", "flag-slovenia", "flag-svalbard--jan-mayen", "flag-slovakia", "flag-sierra-leone", "flag-san-marino", "flag-senegal", "flag-somalia", "flag-suriname", "flag-south-sudan", "flag-so-tom--prncipe", "flag-el-salvador", "flag-sint-maarten", "flag-syria", "flag-eswatini", "flag-tristan-da-cunha", "flag-turks--caicos-islands", "flag-chad", "flag-french-southern-territories", "flag-togo", "flag-thailand", "flag-tajikistan", "flag-tokelau", "flag-timorleste", "flag-turkmenistan", "flag-tunisia", "flag-tonga", "flag-turkey", "flag-trinidad--tobago", "flag-tuvalu", "flag-taiwan", "flag-tanzania", "flag-ukraine", "flag-uganda", "flag-us-outlying-islands", "flag-united-nations", "flag-united-states", "flag-uruguay", "flag-uzbekistan", "flag-vatican-city", "flag-st-vincent--grenadines", "flag-venezuela", "flag-british-virgin-islands", "flag-us-virgin-islands", "flag-vietnam", "flag-vanuatu", "flag-wallis--futuna", "flag-samoa", "flag-kosovo", "flag-yemen", "flag-mayotte", "flag-south-africa", "flag-zambia", "flag-zimbabwe", "flag-england", "flag-scotland", "flag-wales"]}], "emojis": {"grinning-face": {"a": "grinning face", "b": "1F600", "j": ["grin", "joy", ":D", "face", "smile", "happy"]}, "grinning-face-with-big-eyes": {"a": "grinning face with big eyes", "b": "1F603", "j": ["joy", ":)", ":D", "open", "face", "smile", "mouth", "haha", "happy", "funny"]}, "grinning-face-with-smiling-eyes": {"a": "grinning face with smiling eyes", "b": "1F604", "j": ["like", "joy", ":)", ":D", "open", "face", "smile", "eye", "mouth", "haha", "laugh", "happy", "funny"]}, "beaming-face-with-smiling-eyes": {"a": "beaming face with smiling eyes", "b": "1F601", "j": ["grin", "joy", "face", "smile", "eye", "kawaii", "happy"]}, "grinning-squinting-face": {"a": "grinning squinting face", "b": "1F606", "j": ["joy", "XD", "face", "smile", "satisfied", "mouth", "laugh", "haha", "happy", "lol", "glad"]}, "grinning-face-with-sweat": {"a": "grinning face with sweat", "b": "1F605", "j": ["sweat", "relief", "hot", "cold", "open", "face", "smile", "laugh", "happy"]}, "rolling-on-the-floor-laughing": {"a": "rolling on the floor laughing", "b": "1F923", "j": ["lol", "rolling", "rotfl", "laughing", "face", "laugh", "haha", "floor", "rofl"]}, "face-with-tears-of-joy": {"a": "face with tears of joy", "b": "1F602", "j": ["cry", "tears", "joy", "weep", "face", "laugh", "haha", "happy", "happytears", "tear"]}, "slightly-smiling-face": {"a": "slightly smiling face", "b": "1F642", "j": ["smile", "face"]}, "upsidedown-face": {"a": "upside-down face", "b": "1F643", "j": ["face", "smile", "upside_down_face", "silly", "upside-down", "flipped"]}, "winking-face": {"a": "winking face", "b": "1F609", "j": [";)", "secret", "mischievous", "face", "smile", "eye", "happy", "wink"]}, "smiling-face-with-smiling-eyes": {"a": "smiling face with smiling eyes", "b": "1F60A", "j": ["embarrassed", "joy", "flushed", "blush", "face", "smile", "eye", "happy", "shy", "crush"]}, "smiling-face-with-halo": {"a": "smiling face with halo", "b": "1F607", "j": ["heaven", "innocent", "face", "fantasy", "angel", "halo"]}, "smiling-face-with-hearts": {"a": "smiling face with hearts", "b": "1F970", "j": ["love", "like", "infatuation", "face", "valentines", "hearts", "in love", "adore", "affection", "crush"]}, "smiling-face-with-hearteyes": {"a": "smiling face with heart-eyes", "b": "1F60D", "j": ["love", "like", "heart", "infatuation", "face", "smile", "eye", "valentines", "affection", "smiling_face_with_heart_eyes", "crush"]}, "starstruck": {"a": "star-struck", "b": "1F929", "j": ["grinning", "star", "face", "star_struck", "starry", "smile", "starry-eyed", "eyes"]}, "face-blowing-a-kiss": {"a": "face blowing a kiss", "b": "1F618", "j": ["love", "like", "infatuation", "face", "valentines", "affection", "kiss"]}, "kissing-face": {"a": "kissing face", "b": "1F617", "j": ["love", "like", "infatuation", "3", "face", "valentines", "kiss"]}, "smiling-face": {"a": "smiling face", "b": "263A", "j": ["relaxed", "happiness", "massage", "blush", "face", "outlined", "smile"]}, "kissing-face-with-closed-eyes": {"a": "kissing face with closed eyes", "b": "1F61A", "j": ["love", "like", "infatuation", "face", "eye", "valentines", "closed", "affection", "kiss"]}, "kissing-face-with-smiling-eyes": {"a": "kissing face with smiling eyes", "b": "1F619", "j": ["infatuation", "face", "smile", "valentines", "eye", "affection", "kiss"]}, "smiling-face-with-tear": {"a": "smiling face with tear", "b": "1F972", "j": ["grateful", "relieved", "proud", "pretend", "touched", "smiling", "cry", "sad", "tear"]}, "face-savoring-food": {"a": "face savoring food", "b": "1F60B", "j": ["tongue", "joy", "yummy", "silly", "face", "savouring", "smile", "happy", "nom", "delicious", "yum"]}, "face-with-tongue": {"a": "face with tongue", "b": "1F61B", "j": ["tongue", "mischievous", "playful", "face", "smile", "prank", "childish"]}, "winking-face-with-tongue": {"a": "winking face with tongue", "b": "1F61C", "j": ["tongue", "playful", "mischievous", "face", "smile", "eye", "joke", "wink", "prank", "childish"]}, "zany-face": {"a": "zany face", "b": "1F92A", "j": ["large", "crazy", "face", "goofy", "eye", "small"]}, "squinting-face-with-tongue": {"a": "squinting face with tongue", "b": "1F61D", "j": ["tongue", "playful", "mischievous", "taste", "face", "horrible", "eye", "smile", "prank"]}, "moneymouth-face": {"a": "money-mouth face", "b": "1F911", "j": ["rich", "face", "dollar", "mouth", "money_mouth_face", "money"]}, "hugging-face": {"a": "hugging face", "b": "1F917", "j": ["smile", "hugging", "face", "hug"]}, "face-with-hand-over-mouth": {"a": "face with hand over mouth", "b": "1F92D", "j": ["whoops", "face", "sudden realization", "shock", "surprise"]}, "shushing-face": {"a": "shushing face", "b": "1F92B", "j": ["quiet", "shush", "face", "shhh"]}, "thinking-face": {"a": "thinking face", "b": "1F914", "j": ["think", "consider", "hmmm", "thinking", "face"]}, "zippermouth-face": {"a": "zipper-mouth face", "b": "1F910", "j": ["secret", "zipper_mouth_face", "face", "sealed", "mouth", "zipper"]}, "face-with-raised-eyebrow": {"a": "face with raised eyebrow", "b": "1F928", "j": ["disbelief", "skeptic", "disapproval", "face", "mild surprise", "scepticism", "distrust", "surprise"]}, "neutral-face": {"a": "neutral face", "b": "1F610", "j": ["deadpan", "neutral", "face", "meh", "indifference", ":|"]}, "expressionless-face": {"a": "expressionless face", "b": "1F611", "j": ["inexpressive", "indifferent", "deadpan", "-_-", "face", "meh", "expressionless", "unexpressive"]}, "face-without-mouth": {"a": "face without mouth", "b": "1F636", "j": ["hellokitty", "face", "quiet", "mouth", "silent"]}, "face-in-clouds": {"a": "⊛ face in clouds", "b": "1F636-200D-1F32B-FE0F", "j": ["absentminded", "face in clouds", "face in the fog", "head in clouds"]}, "smirking-face": {"a": "smirking face", "b": "1F60F", "j": ["smug", "face", "smile", "sarcasm", "mean", "prank", "smirk"]}, "unamused-face": {"a": "unamused face", "b": "1F612", "j": ["side_eye", "bored", "unamused", "unhappy", "straight face", "face", "skeptical", "dubious", "sarcasm", "indifference", "serious", "unimpressed"]}, "face-with-rolling-eyes": {"a": "face with rolling eyes", "b": "1F644", "j": ["rolling", "frustrated", "face", "eyeroll", "eyes"]}, "grimacing-face": {"a": "grimacing face", "b": "1F62C", "j": ["grimace", "teeth", "face"]}, "face-exhaling": {"a": "⊛ face exhaling", "b": "1F62E-200D-1F4A8", "j": ["exhale", "face exhaling", "gasp", "groan", "relief", "whisper", "whistle"]}, "lying-face": {"a": "lying face", "b": "1F925", "j": ["pinocchio", "face", "lie"]}, "relieved-face": {"a": "relieved face", "b": "1F60C", "j": ["relaxed", "massage", "happiness", "relieved", "phew", "face"]}, "pensive-face": {"a": "pensive face", "b": "1F614", "j": ["depressed", "upset", "pensive", "face", "sad", "dejected"]}, "sleepy-face": {"a": "sleepy face", "b": "1F62A", "j": ["sleep", "tired", "face", "nap", "rest"]}, "drooling-face": {"a": "drooling face", "b": "1F924", "j": ["face", "drooling"]}, "sleeping-face": {"a": "sleeping face", "b": "1F634", "j": ["night", "sleep", "tired", "zzz", "face", "sleepy"]}, "face-with-medical-mask": {"a": "face with medical mask", "b": "1F637", "j": ["ill", "mask", "cold", "face", "doctor", "disease", "sick"]}, "face-with-thermometer": {"a": "face with thermometer", "b": "1F912", "j": ["ill", "thermometer", "fever", "cold", "face", "temperature", "sick"]}, "face-with-headbandage": {"a": "face with head-bandage", "b": "1F915", "j": ["face_with_head_bandage", "face", "injury", "clumsy", "hurt", "injured", "bandage"]}, "nauseated-face": {"a": "nauseated face", "b": "1F922", "j": ["ill", "throw up", "gross", "face", "green", "sick", "vomit", "nauseated"]}, "face-vomiting": {"a": "face vomiting", "b": "1F92E", "j": ["sick", "vomit", "face", "puke"]}, "sneezing-face": {"a": "sneezing face", "b": "1F927", "j": ["gesundheit", "face", "sick", "sneeze", "allergy"]}, "hot-face": {"a": "hot face", "b": "1F975", "j": ["sweating", "heat", "hot", "red-faced", "feverish", "face", "red", "heat stroke"]}, "cold-face": {"a": "cold face", "b": "1F976", "j": ["blue", "blue-faced", "frostbite", "freezing", "cold", "face", "icicles", "frozen"]}, "woozy-face": {"a": "woozy face", "b": "1F974", "j": ["face", "intoxicated", "dizzy", "wavy mouth", "tipsy", "uneven eyes", "wavy"]}, "knockedout-face": {"a": "knocked-out face", "b": "1F635", "j": ["knocked out", "dizzy_face", "unconscious", "face", "spent", "dizzy", "dead", "xox"]}, "face-with-spiral-eyes": {"a": "⊛ face with spiral eyes", "b": "1F635-200D-1F4AB", "j": ["dizzy", "face with spiral eyes", "hypnotized", "spiral", "trouble", "whoa"]}, "exploding-head": {"a": "exploding head", "b": "1F92F", "j": ["face", "shocked", "mind blown", "blown", "mind"]}, "cowboy-hat-face": {"a": "cowboy hat face", "b": "1F920", "j": ["hat", "cowboy", "face", "cowgirl"]}, "partying-face": {"a": "partying face", "b": "1F973", "j": ["face", "hat", "celebration", "horn", "party", "woohoo"]}, "disguised-face": {"a": "disguised face", "b": "1F978", "j": ["moustache", "glasses", "face", "brows", "disguise", "pretent", "nose", "incognito"]}, "smiling-face-with-sunglasses": {"a": "smiling face with sunglasses", "b": "1F60E", "j": ["sun", "cool", "sunglasses", "bright", "face", "sunglass", "smile", "summer", "beach"]}, "nerd-face": {"a": "nerd face", "b": "1F913", "j": ["nerdy", "geek", "nerd", "face", "dork"]}, "face-with-monocle": {"a": "face with monocle", "b": "1F9D0", "j": ["wealthy", "face", "stuffy"]}, "confused-face": {"a": "confused face", "b": "1F615", "j": ["hmmm", "face", "huh", "meh", "weird", "indifference", "confused", ":/"]}, "worried-face": {"a": "worried face", "b": "1F61F", "j": ["nervous", ":(", "face", "concern", "worried"]}, "slightly-frowning-face": {"a": "slightly frowning face", "b": "1F641", "j": ["frowning", "upset", "disappointed", "frown", "face", "sad"]}, "frowning-face": {"a": "frowning face", "b": "2639", "j": ["frown", "upset", "sad", "face"]}, "face-with-open-mouth": {"a": "face with open mouth", "b": "1F62E", "j": [":O", "open", "face", "wow", "impressed", "mouth", "whoa", "sympathy", "surprise"]}, "hushed-face": {"a": "hushed face", "b": "1F62F", "j": ["shh", "stunned", "face", "hushed", "surprised", "woo"]}, "astonished-face": {"a": "astonished face", "b": "1F632", "j": ["face", "shocked", "surprised", "astonished", "totally", "poisoned", "xox"]}, "flushed-face": {"a": "flushed face", "b": "1F633", "j": ["flattered", "blush", "face", "dazed", "flushed", "shy"]}, "pleading-face": {"a": "pleading face", "b": "1F97A", "j": ["puppy eyes", "begging", "face", "mercy"]}, "frowning-face-with-open-mouth": {"a": "frowning face with open mouth", "b": "1F626", "j": ["frown", "open", "face", "mouth", "what", "aw"]}, "anguished-face": {"a": "anguished face", "b": "1F627", "j": ["stunned", "nervous", "face", "anguished"]}, "fearful-face": {"a": "fearful face", "b": "1F628", "j": ["oops", "nervous", "face", "scared", "huh", "fear", "terrified", "fearful"]}, "anxious-face-with-sweat": {"a": "anxious face with sweat", "b": "1F630", "j": ["blue", "sweat", "nervous", "cold", "face", "rushed"]}, "sad-but-relieved-face": {"a": "sad but relieved face", "b": "1F625", "j": ["disappointed", "nervous", "sweat", "relieved", "whew", "phew", "face"]}, "crying-face": {"a": "crying face", "b": "1F622", "j": ["depressed", "upset", "tears", "face", ":'(", "cry", "sad", "tear"]}, "loudly-crying-face": {"a": "loudly crying face", "b": "1F62D", "j": ["depressed", "upset", "tears", "face", "cry", "sad", "tear", "sob"]}, "face-screaming-in-fear": {"a": "face screaming in fear", "b": "1F631", "j": ["munch", "face", "omg", "scared", "scream", "fear"]}, "confounded-face": {"a": "confounded face", "b": "1F616", "j": ["confounded", "oops", ":S", "sick", "unwell", "face", "confused"]}, "persevering-face": {"a": "persevering face", "b": "1F623", "j": ["oops", "upset", "persevere", "no", "face", "sick"]}, "disappointed-face": {"a": "disappointed face", "b": "1F61E", "j": ["depressed", "upset", "disappointed", ":(", "face", "sad"]}, "downcast-face-with-sweat": {"a": "downcast face with sweat", "b": "1F613", "j": ["sweat", "tired", "hot", "cold", "face", "exercise", "sad"]}, "weary-face": {"a": "weary face", "b": "1F629", "j": ["upset", "tired", "frustrated", "face", "sleepy", "sad", "weary"]}, "tired-face": {"a": "tired face", "b": "1F62B", "j": ["upset", "whine", "tired", "frustrated", "face", "sick"]}, "yawning-face": {"a": "yawning face", "b": "1F971", "j": ["", "bored", "tired", "yawn", "sleepy"]}, "face-with-steam-from-nose": {"a": "face with steam from nose", "b": "1F624", "j": ["triumph", "gas", "pride", "phew", "face", "proud", "won"]}, "pouting-face": {"a": "pouting face", "b": "1F621", "j": ["pouting", "rage", "despise", "hate", "face", "red", "angry", "mad"]}, "angry-face": {"a": "angry face", "b": "1F620", "j": ["annoyed", "anger", "frustrated", "face", "angry", "mad"]}, "face-with-symbols-on-mouth": {"a": "face with symbols on mouth", "b": "1F92C", "j": ["cursing", "swearing", "face", "expletive", "cussing", "profanity"]}, "smiling-face-with-horns": {"a": "smiling face with horns", "b": "1F608", "j": ["face", "fairy tale", "smile", "fantasy", "devil", "horns"]}, "angry-face-with-horns": {"a": "angry face with horns", "b": "1F47F", "j": ["face", "devil", "fantasy", "demon", "imp", "horns", "angry"]}, "skull": {"a": "skull", "b": "1F480", "j": ["death", "skeleton", "face", "creepy", "fairy tale", "dead", "monster"]}, "skull-and-crossbones": {"a": "skull and crossbones", "b": "2620", "j": ["danger", "death", "pirate", "skull", "scary", "face", "poison", "evil", "crossbones", "deadly", "monster"]}, "pile-of-poo": {"a": "pile of poo", "b": "1F4A9", "j": ["dung", "poop", "hankey", "face", "shitface", "fail", "turd", "shit", "poo", "monster"]}, "clown-face": {"a": "clown face", "b": "1F921", "j": ["clown", "face"]}, "ogre": {"a": "ogre", "b": "1F479", "j": ["mask", "scary", "japanese", "face", "creepy", "fairy tale", "halloween", "red", "fantasy", "creature", "troll", "devil", "demon", "monster"]}, "goblin": {"a": "goblin", "b": "1F47A", "j": ["mask", "scary", "japanese", "face", "creepy", "fairy tale", "red", "fantasy", "creature", "evil", "monster"]}, "ghost": {"a": "ghost", "b": "1F47B", "j": ["scary", "face", "fairy tale", "halloween", "spooky", "fantasy", "creature", "monster"]}, "alien": {"a": "alien", "b": "1F47D", "j": ["extraterrestrial", "paul", "face", "fantasy", "creature", "ufo", "weird", "outer_space", "UFO"]}, "alien-monster": {"a": "alien monster", "b": "1F47E", "j": ["extraterrestrial", "play", "face", "alien", "game", "creature", "ufo", "arcade", "monster"]}, "robot": {"a": "robot", "b": "1F916", "j": ["computer", "face", "bot", "machine", "monster"]}, "grinning-cat": {"a": "grinning cat", "b": "1F63A", "j": ["grinning", "cats", "open", "face", "smile", "mouth", "happy", "cat", "animal"]}, "grinning-cat-with-smiling-eyes": {"a": "grinning cat with smiling eyes", "b": "1F638", "j": ["animal", "cats", "grin", "face", "smile", "eye", "cat"]}, "cat-with-tears-of-joy": {"a": "cat with tears of joy", "b": "1F639", "j": ["animal", "tears", "cats", "joy", "face", "haha", "happy", "cat", "tear"]}, "smiling-cat-with-hearteyes": {"a": "smiling cat with heart-eyes", "b": "1F63B", "j": ["animal", "love", "like", "cats", "heart", "face", "smile", "eye", "smiling_cat_with_heart_eyes", "valentines", "affection", "cat"]}, "cat-with-wry-smile": {"a": "cat with wry smile", "b": "1F63C", "j": ["animal", "ironic", "cats", "face", "smile", "wry", "cat", "smirk"]}, "kissing-cat": {"a": "kissing cat", "b": "1F63D", "j": ["animal", "cats", "face", "eye", "kiss", "cat"]}, "weary-cat": {"a": "weary cat", "b": "1F640", "j": ["cats", "weary", "munch", "face", "oh", "surprised", "scared", "scream", "cat", "animal"]}, "crying-cat": {"a": "crying cat", "b": "1F63F", "j": ["upset", "animal", "tears", "cats", "weep", "face", "cry", "sad", "cat", "tear"]}, "pouting-cat": {"a": "pouting cat", "b": "1F63E", "j": ["pouting", "cats", "face", "cat", "animal"]}, "seenoevil-monkey": {"a": "see-no-evil monkey", "b": "1F648", "j": ["monkey", "forbidden", "face", "nature", "haha", "evil", "see", "animal", "see_no_evil_monkey"]}, "hearnoevil-monkey": {"a": "hear-no-evil monkey", "b": "1F649", "j": ["monkey", "forbidden", "animal", "hear_no_evil_monkey", "face", "nature", "evil", "hear"]}, "speaknoevil-monkey": {"a": "speak-no-evil monkey", "b": "1F64A", "j": ["monkey", "forbidden", "face", "speak_no_evil_monkey", "nature", "speak", "omg", "evil", "animal"]}, "kiss-mark": {"a": "kiss mark", "b": "1F48B", "j": ["love", "like", "face", "lips", "valentines", "affection", "kiss"]}, "love-letter": {"a": "love letter", "b": "1F48C", "j": ["envelope", "love", "like", "letter", "heart", "email", "valentines", "mail", "affection"]}, "heart-with-arrow": {"a": "heart with arrow", "b": "1F498", "j": ["arrow", "love", "like", "heart", "cupid", "valentines", "affection"]}, "heart-with-ribbon": {"a": "heart with ribbon", "b": "1F49D", "j": ["valentines", "valentine", "love", "ribbon"]}, "sparkling-heart": {"a": "sparkling heart", "b": "1F496", "j": ["love", "like", "excited", "valentines", "sparkle", "affection"]}, "growing-heart": {"a": "growing heart", "b": "1F497", "j": ["pulse", "nervous", "like", "love", "excited", "pink", "valentines", "growing", "affection"]}, "beating-heart": {"a": "beating heart", "b": "1F493", "j": ["love", "like", "heart", "beating", "pink", "heartbeat", "valentines", "pulsating", "affection"]}, "revolving-hearts": {"a": "revolving hearts", "b": "1F49E", "j": ["revolving", "like", "love", "valentines", "affection"]}, "two-hearts": {"a": "two hearts", "b": "1F495", "j": ["love", "like", "heart", "valentines", "affection"]}, "heart-decoration": {"a": "heart decoration", "b": "1F49F", "j": ["heart", "love", "like", "purple-square"]}, "heart-exclamation": {"a": "heart exclamation", "b": "2763", "j": ["punctuation", "love", "mark", "decoration", "exclamation"]}, "broken-heart": {"a": "broken heart", "b": "1F494", "j": ["heartbreak", "heart", "broken", "sorry", "break", "sad"]}, "heart-on-fire": {"a": "⊛ heart on fire", "b": "2764-FE0F-200D-1F525", "j": ["burn", "heart", "heart on fire", "love", "lust", "sacred heart"]}, "mending-heart": {"a": "⊛ mending heart", "b": "2764-FE0F-200D-1FA79", "j": ["healthier", "improving", "mending", "mending heart", "recovering", "recuperating", "well"]}, "red-heart": {"a": "red heart", "b": "2764", "j": ["heart", "valentines", "love", "like"]}, "orange-heart": {"a": "orange heart", "b": "1F9E1", "j": ["like", "love", "orange", "valentines", "affection"]}, "yellow-heart": {"a": "yellow heart", "b": "1F49B", "j": ["love", "like", "valentines", "yellow", "affection"]}, "green-heart": {"a": "green heart", "b": "1F49A", "j": ["love", "like", "valentines", "green", "affection"]}, "blue-heart": {"a": "blue heart", "b": "1F499", "j": ["blue", "like", "love", "valentines", "affection"]}, "purple-heart": {"a": "purple heart", "b": "1F49C", "j": ["love", "like", "valentines", "affection", "purple"]}, "brown-heart": {"a": "brown heart", "b": "1F90E", "j": ["heart", "brown", "coffee"]}, "black-heart": {"a": "black heart", "b": "1F5A4", "j": ["wicked", "black", "evil"]}, "white-heart": {"a": "white heart", "b": "1F90D", "j": ["heart", "white", "pure"]}, "hundred-points": {"a": "hundred points", "b": "1F4AF", "j": ["test", "full", "score", "quiz", "numbers", "hundred", "100", "perfect", "pass", "century", "exam"]}, "anger-symbol": {"a": "anger symbol", "b": "1F4A2", "j": ["comic", "mad", "angry"]}, "collision": {"a": "collision", "b": "1F4A5", "j": ["boom", "explode", "explosion", "comic", "bomb", "blown"]}, "dizzy": {"a": "dizzy", "b": "1F4AB", "j": ["magic", "star", "comic", "sparkle", "shoot"]}, "sweat-droplets": {"a": "sweat droplets", "b": "1F4A6", "j": ["oops", "sweat", "drip", "water", "comic", "splashing"]}, "dashing-away": {"a": "dashing away", "b": "1F4A8", "j": ["smoke", "fart", "dash", "puff", "air", "fast", "comic", "running", "shoo", "wind"]}, "hole": {"a": "hole", "b": "1F573", "j": ["embarrassing"]}, "bomb": {"a": "bomb", "b": "1F4A3", "j": ["boom", "explode", "explosion", "comic", "terrorism"]}, "speech-balloon": {"a": "speech balloon", "b": "1F4AC", "j": ["bubble", "balloon", "words", "message", "talk", "chatting", "comic", "speech", "dialog"]}, "eye-in-speech-bubble": {"a": "eye in speech bubble", "b": "1F441-FE0F-200D-1F5E8-FE0F", "j": ["info", "witness", "speech bubble", "eye"]}, "left-speech-bubble": {"a": "left speech bubble", "b": "1F5E8", "j": ["message", "talk", "words", "chatting", "speech", "dialog"]}, "right-anger-bubble": {"a": "right anger bubble", "b": "1F5EF", "j": ["bubble", "balloon", "thinking", "caption", "speech", "angry", "mad"]}, "thought-balloon": {"a": "thought balloon", "b": "1F4AD", "j": ["bubble", "dream", "balloon", "thinking", "comic", "cloud", "speech", "thought"]}, "zzz": {"a": "zzz", "b": "1F4A4", "j": ["sleep", "dream", "tired", "comic", "sleepy"]}, "waving-hand": {"a": "waving hand", "b": "1F44B", "j": ["waving", "wave", "farewell", "solong", "gesture", "hand", "hands", "hello", "goodbye", "hi", "palm"]}, "raised-back-of-hand": {"a": "raised back of hand", "b": "1F91A", "j": ["backhand", "fingers", "raised"]}, "hand-with-fingers-splayed": {"a": "hand with fingers splayed", "b": "1F590", "j": ["finger", "fingers", "hand", "splayed", "palm"]}, "raised-hand": {"a": "raised hand", "b": "270B", "j": ["fingers", "stop", "hand", "high 5", "high five", "ban", "palm", "highfive"]}, "vulcan-salute": {"a": "vulcan salute", "b": "1F596", "j": ["finger", "fingers", "hand", "vulcan", "star trek", "spock"]}, "ok-hand": {"a": "OK hand", "b": "1F44C", "j": ["OK", "limbs", "fingers", "hand", "okay", "perfect", "ok"]}, "pinched-fingers": {"a": "pinched fingers", "b": "1F90C", "j": ["pinched", "fingers", "hand gesture", "size", "tiny", "sarcastic", "small", "interrogation"]}, "pinching-hand": {"a": "pinching hand", "b": "1F90F", "j": ["small amount", "size", "small", "tiny"]}, "victory-hand": {"a": "victory hand", "b": "270C", "j": ["victory", "fingers", "hand", "ohyeah", "two", "v", "peace"]}, "crossed-fingers": {"a": "crossed fingers", "b": "1F91E", "j": ["cross", "finger", "lucky", "good", "hand", "luck"]}, "loveyou-gesture": {"a": "love-you gesture", "b": "1F91F", "j": ["ILY", "fingers", "gesture", "hand", "love_you_gesture"]}, "sign-of-the-horns": {"a": "sign of the horns", "b": "1F918", "j": ["finger", "rock_on", "fingers", "rock-on", "hand", "sign_of_horns", "horns", "evil_eye"]}, "call-me-hand": {"a": "call me hand", "b": "1F919", "j": ["gesture", "hand", "call", "hands"]}, "backhand-index-pointing-left": {"a": "backhand index pointing left", "b": "1F448", "j": ["finger", "fingers", "point", "hand", "left", "backhand", "direction", "index"]}, "backhand-index-pointing-right": {"a": "backhand index pointing right", "b": "1F449", "j": ["finger", "right", "fingers", "point", "hand", "backhand", "direction", "index"]}, "backhand-index-pointing-up": {"a": "backhand index pointing up", "b": "1F446", "j": ["finger", "fingers", "point", "hand", "backhand", "direction", "up"]}, "middle-finger": {"a": "middle finger", "b": "1F595", "j": ["flipping", "finger", "middle", "fingers", "hand", "rude"]}, "backhand-index-pointing-down": {"a": "backhand index pointing down", "b": "1F447", "j": ["finger", "fingers", "point", "down", "hand", "backhand", "direction"]}, "index-pointing-up": {"a": "index pointing up", "b": "261D", "j": ["finger", "fingers", "point", "hand", "direction", "up", "index"]}, "thumbs-up": {"a": "thumbs up", "b": "1F44D", "j": ["+1", "yes", "awesome", "like", "cool", "thumb", "thumbsup", "hand", "good", "agree", "accept", "up"]}, "thumbs-down": {"a": "thumbs down", "b": "1F44E", "j": ["-1", "no", "thumb", "down", "hand", "dislike", "thumbsdown"]}, "raised-fist": {"a": "raised fist", "b": "270A", "j": ["fingers", "clenched", "fist", "hand", "grasp", "punch"]}, "oncoming-fist": {"a": "oncoming fist", "b": "1F44A", "j": ["violence", "clenched", "fist", "hit", "hand", "attack", "punch", "angry"]}, "leftfacing-fist": {"a": "left-facing fist", "b": "1F91B", "j": ["left_facing_fist", "leftwards", "fist", "hand", "fistbump"]}, "rightfacing-fist": {"a": "right-facing fist", "b": "1F91C", "j": ["fist", "hand", "right_facing_fist", "rightwards", "fistbump"]}, "clapping-hands": {"a": "clapping hands", "b": "1F44F", "j": ["applause", "hand", "yay", "hands", "clap", "congrats", "praise"]}, "raising-hands": {"a": "raising hands", "b": "1F64C", "j": ["gesture", "hand", "hands", "celebration", "raised", "hooray", "yea"]}, "open-hands": {"a": "open hands", "b": "1F450", "j": ["fingers", "hand", "open", "hands", "butterfly"]}, "palms-up-together": {"a": "palms up together", "b": "1F932", "j": ["gesture", "cupped", "hands", "cupped hands", "prayer"]}, "handshake": {"a": "handshake", "b": "1F91D", "j": ["shake", "meeting", "hand", "agreement"]}, "folded-hands": {"a": "folded hands", "b": "1F64F", "j": ["hand", "high 5", "please", "high five", "thanks", "wish", "pray", "ask", "namaste", "hope", "highfive"]}, "writing-hand": {"a": "writing hand", "b": "270D", "j": ["lower_left_ballpoint_pen", "compose", "hand", "stationery", "write"]}, "nail-polish": {"a": "nail polish", "b": "1F485", "j": ["care", "finger", "manicure", "fashion", "polish", "beauty", "nail", "cosmetics"]}, "selfie": {"a": "selfie", "b": "1F933", "j": ["camera", "phone"]}, "flexed-biceps": {"a": "flexed biceps", "b": "1F4AA", "j": ["strong", "hand", "arm", "comic", "flex", "biceps", "summer", "muscle"]}, "mechanical-arm": {"a": "mechanical arm", "b": "1F9BE", "j": ["prosthetic", "accessibility"]}, "mechanical-leg": {"a": "mechanical leg", "b": "1F9BF", "j": ["prosthetic", "accessibility"]}, "leg": {"a": "leg", "b": "1F9B5", "j": ["limb", "kick"]}, "foot": {"a": "foot", "b": "1F9B6", "j": ["kick", "stomp"]}, "ear": {"a": "ear", "b": "1F442", "j": ["sound", "face", "body", "hear", "listen"]}, "ear-with-hearing-aid": {"a": "ear with hearing aid", "b": "1F9BB", "j": ["hard of hearing", "accessibility"]}, "nose": {"a": "nose", "b": "1F443", "j": ["smell", "sniff", "body"]}, "brain": {"a": "brain", "b": "1F9E0", "j": ["smart", "intelligent"]}, "anatomical-heart": {"a": "anatomical heart", "b": "1FAC0", "j": ["pulse", "heart", "cardiology", "organ", "heartbeat", "health", "anatomical"]}, "lungs": {"a": "lungs", "b": "1FAC1", "j": ["inhalation", "breath", "exhalation", "organ", "respiration", "breathe"]}, "tooth": {"a": "tooth", "b": "1F9B7", "j": ["dentist", "teeth"]}, "bone": {"a": "bone", "b": "1F9B4", "j": ["skeleton"]}, "eyes": {"a": "eyes", "b": "1F440", "j": ["stalk", "peek", "face", "eye", "watch", "see", "look"]}, "eye": {"a": "eye", "b": "1F441", "j": ["stare", "face", "watch", "body", "see", "look"]}, "tongue": {"a": "tongue", "b": "1F445", "j": ["playful", "mouth", "body"]}, "mouth": {"a": "mouth", "b": "1F444", "j": ["lips", "kiss"]}, "baby": {"a": "baby", "b": "1F476", "j": ["toddler", "young", "boy", "girl", "child"]}, "child": {"a": "child", "b": "1F9D2", "j": ["young", "gender-neutral", "unspecified gender"]}, "boy": {"a": "boy", "b": "1F466", "j": ["guy", "man", "male", "young", "teenager"]}, "girl": {"a": "girl", "b": "1F467", "j": ["woman", "young", "zodiac", "Virgo", "teenager", "female"]}, "person": {"a": "person", "b": "1F9D1", "j": ["adult", "gender-neutral", "unspecified gender"]}, "person-blond-hair": {"a": "person: blond hair", "b": "1F471", "j": ["hairstyle", "blond-haired person", "blond", "hair"]}, "man": {"a": "man", "b": "1F468", "j": ["guy", "classy", "moustache", "father", "sir", "dad", "mustache", "adult"]}, "person-beard": {"a": "person: beard", "b": "1F9D4", "j": ["person", "bewhiskered", "man_beard", "beard"]}, "man-beard": {"a": "⊛ man: beard", "b": "1F9D4-200D-2642-FE0F", "j": ["beard", "man", "man: beard"]}, "woman-beard": {"a": "⊛ woman: beard", "b": "1F9D4-200D-2640-FE0F", "j": ["beard", "woman", "woman: beard"]}, "man-red-hair": {"a": "man: red hair", "b": "1F468-200D-1F9B0", "j": ["adult", "red hair", "man", "hairstyle"]}, "man-curly-hair": {"a": "man: curly hair", "b": "1F468-200D-1F9B1", "j": ["curly hair", "adult", "man", "hairstyle"]}, "man-white-hair": {"a": "man: white hair", "b": "1F468-200D-1F9B3", "j": ["man", "elder", "old", "adult", "white hair"]}, "man-bald": {"a": "man: bald", "b": "1F468-200D-1F9B2", "j": ["hairless", "adult", "man", "bald"]}, "woman": {"a": "woman", "b": "1F469", "j": ["girls", "lady", "adult", "female"]}, "woman-red-hair": {"a": "woman: red hair", "b": "1F469-200D-1F9B0", "j": ["woman", "adult", "red hair", "hairstyle"]}, "person-red-hair": {"a": "person: red hair", "b": "1F9D1-200D-1F9B0", "j": ["person", "unspecified gender", "hairstyle", "red hair", "adult", "gender-neutral"]}, "woman-curly-hair": {"a": "woman: curly hair", "b": "1F469-200D-1F9B1", "j": ["woman", "curly hair", "adult", "hairstyle"]}, "person-curly-hair": {"a": "person: curly hair", "b": "1F9D1-200D-1F9B1", "j": ["person", "unspecified gender", "hairstyle", "curly hair", "adult", "gender-neutral"]}, "woman-white-hair": {"a": "woman: white hair", "b": "1F469-200D-1F9B3", "j": ["woman", "elder", "old", "adult", "white hair"]}, "person-white-hair": {"a": "person: white hair", "b": "1F9D1-200D-1F9B3", "j": ["person", "unspecified gender", "elder", "white hair", "old", "adult", "gender-neutral"]}, "woman-bald": {"a": "woman: bald", "b": "1F469-200D-1F9B2", "j": ["hairless", "adult", "bald", "woman"]}, "person-bald": {"a": "person: bald", "b": "1F9D1-200D-1F9B2", "j": ["hairless", "person", "unspecified gender", "bald", "adult", "gender-neutral"]}, "woman-blond-hair": {"a": "woman: blond hair", "b": "1F471-200D-2640-FE0F", "j": ["person", "woman", "hair", "girl", "blond-haired woman", "blonde", "female"]}, "man-blond-hair": {"a": "man: blond hair", "b": "1F471-200D-2642-FE0F", "j": ["guy", "person", "man", "hair", "male", "boy", "blond-haired man", "blond", "blonde"]}, "older-person": {"a": "older person", "b": "1F9D3", "j": ["unspecified gender", "elder", "senior", "human", "old", "adult", "gender-neutral"]}, "old-man": {"a": "old man", "b": "1F474", "j": ["man", "male", "elder", "human", "senior", "old", "men", "adult"]}, "old-woman": {"a": "old woman", "b": "1F475", "j": ["woman", "elder", "human", "lady", "senior", "old", "adult", "women", "female"]}, "person-frowning": {"a": "person frowning", "b": "1F64D", "j": ["frown", "gesture", "worried"]}, "man-frowning": {"a": "man frowning", "b": "1F64D-200D-2642-FE0F", "j": ["frowning", "depressed", "man", "male", "gesture", "boy", "unhappy", "sad", "discouraged"]}, "woman-frowning": {"a": "woman frowning", "b": "1F64D-200D-2640-FE0F", "j": ["frowning", "depressed", "woman", "gesture", "girl", "unhappy", "sad", "discouraged", "female"]}, "person-pouting": {"a": "person pouting", "b": "1F64E", "j": ["pouting", "upset", "gesture"]}, "man-pouting": {"a": "man pouting", "b": "1F64E-200D-2642-FE0F", "j": ["pouting", "man", "male", "gesture", "boy"]}, "woman-pouting": {"a": "woman pouting", "b": "1F64E-200D-2640-FE0F", "j": ["pouting", "woman", "gesture", "girl", "female"]}, "person-gesturing-no": {"a": "person gesturing NO", "b": "1F645", "j": ["decline", "forbidden", "gesture", "prohibited", "hand"]}, "man-gesturing-no": {"a": "man gesturing NO", "b": "1F645-200D-2642-FE0F", "j": ["forbidden", "man", "male", "gesture", "prohibited", "hand", "boy", "nope"]}, "woman-gesturing-no": {"a": "woman gesturing NO", "b": "1F645-200D-2640-FE0F", "j": ["forbidden", "woman", "gesture", "prohibited", "hand", "girl", "female", "nope"]}, "person-gesturing-ok": {"a": "person gesturing OK", "b": "1F646", "j": ["OK", "hand", "gesture", "agree"]}, "man-gesturing-ok": {"a": "man gesturing OK", "b": "1F646-200D-2642-FE0F", "j": ["blue", "OK", "man", "male", "human", "gesture", "boy", "hand", "men"]}, "woman-gesturing-ok": {"a": "woman gesturing OK", "b": "1F646-200D-2640-FE0F", "j": ["OK", "woman", "human", "gesture", "girl", "hand", "pink", "women", "female"]}, "person-tipping-hand": {"a": "person tipping hand", "b": "1F481", "j": ["tipping", "hand", "sassy", "help", "information"]}, "man-tipping-hand": {"a": "man tipping hand", "b": "1F481-200D-2642-FE0F", "j": ["man", "male", "human", "boy", "sassy", "tipping hand", "information"]}, "woman-tipping-hand": {"a": "woman tipping hand", "b": "1F481-200D-2640-FE0F", "j": ["woman", "human", "girl", "sassy", "tipping hand", "information", "female"]}, "person-raising-hand": {"a": "person raising hand", "b": "1F64B", "j": ["gesture", "hand", "raised", "happy", "question"]}, "man-raising-hand": {"a": "man raising hand", "b": "1F64B-200D-2642-FE0F", "j": ["raising hand", "man", "male", "gesture", "boy"]}, "woman-raising-hand": {"a": "woman raising hand", "b": "1F64B-200D-2640-FE0F", "j": ["raising hand", "woman", "gesture", "girl", "female"]}, "deaf-person": {"a": "deaf person", "b": "1F9CF", "j": ["ear", "deaf", "accessibility", "hear"]}, "deaf-man": {"a": "deaf man", "b": "1F9CF-200D-2642-FE0F", "j": ["accessibility", "deaf", "man"]}, "deaf-woman": {"a": "deaf woman", "b": "1F9CF-200D-2640-FE0F", "j": ["deaf", "accessibility", "woman"]}, "person-bowing": {"a": "person bowing", "b": "1F647", "j": ["gesture", "sorry", "apology", "respectiful", "bow"]}, "man-bowing": {"a": "man bowing", "b": "1F647-200D-2642-FE0F", "j": ["man", "male", "gesture", "boy", "bowing", "sorry", "favor", "apology"]}, "woman-bowing": {"a": "woman bowing", "b": "1F647-200D-2640-FE0F", "j": ["woman", "gesture", "girl", "bowing", "sorry", "favor", "apology", "female"]}, "person-facepalming": {"a": "person facepalming", "b": "1F926", "j": ["disappointed", "disbelief", "face", "exasperation", "palm"]}, "man-facepalming": {"a": "man facepalming", "b": "1F926-200D-2642-FE0F", "j": ["disbelief", "facepalm", "man", "male", "boy", "exasperation"]}, "woman-facepalming": {"a": "woman facepalming", "b": "1F926-200D-2640-FE0F", "j": ["disbelief", "facepalm", "woman", "girl", "exasperation", "female"]}, "person-shrugging": {"a": "person shrugging", "b": "1F937", "j": ["regardless", "indifference", "doubt", "shrug", "ignorance"]}, "man-shrugging": {"a": "man shrugging", "b": "1F937-200D-2642-FE0F", "j": ["indifferent", "man", "male", "boy", "doubt", "indifference", "confused", "shrug", "ignorance"]}, "woman-shrugging": {"a": "woman shrugging", "b": "1F937-200D-2640-FE0F", "j": ["indifferent", "woman", "girl", "doubt", "indifference", "confused", "female", "shrug", "ignorance"]}, "health-worker": {"a": "health worker", "b": "1F9D1-200D-2695-FE0F", "j": ["nurse", "doctor", "healthcare", "hospital", "therapist"]}, "man-health-worker": {"a": "man health worker", "b": "1F468-200D-2695-FE0F", "j": ["nurse", "man", "human", "doctor", "healthcare", "therapist"]}, "woman-health-worker": {"a": "woman health worker", "b": "1F469-200D-2695-FE0F", "j": ["nurse", "woman", "human", "doctor", "healthcare", "therapist"]}, "student": {"a": "student", "b": "1F9D1-200D-1F393", "j": ["learn", "graduate"]}, "man-student": {"a": "man student", "b": "1F468-200D-1F393", "j": ["human", "graduate", "student", "man"]}, "woman-student": {"a": "woman student", "b": "1F469-200D-1F393", "j": ["human", "graduate", "student", "woman"]}, "teacher": {"a": "teacher", "b": "1F9D1-200D-1F3EB", "j": ["professor", "instructor"]}, "man-teacher": {"a": "man teacher", "b": "1F468-200D-1F3EB", "j": ["instructor", "man", "teacher", "human", "professor"]}, "woman-teacher": {"a": "woman teacher", "b": "1F469-200D-1F3EB", "j": ["instructor", "woman", "teacher", "human", "professor"]}, "judge": {"a": "judge", "b": "1F9D1-200D-2696-FE0F", "j": ["scales", "justice", "law"]}, "man-judge": {"a": "man judge", "b": "1F468-200D-2696-FE0F", "j": ["court", "man", "human", "scales", "judge", "justice"]}, "woman-judge": {"a": "woman judge", "b": "1F469-200D-2696-FE0F", "j": ["court", "woman", "human", "scales", "judge", "justice"]}, "farmer": {"a": "farmer", "b": "1F9D1-200D-1F33E", "j": ["rancher", "crops", "gardener"]}, "man-farmer": {"a": "man farmer", "b": "1F468-200D-1F33E", "j": ["farmer", "man", "human", "rancher", "gardener"]}, "woman-farmer": {"a": "woman farmer", "b": "1F469-200D-1F33E", "j": ["farmer", "woman", "human", "rancher", "gardener"]}, "cook": {"a": "cook", "b": "1F9D1-200D-1F373", "j": ["chef", "food", "culinary", "kitchen"]}, "man-cook": {"a": "man cook", "b": "1F468-200D-1F373", "j": ["human", "cook", "chef", "man"]}, "woman-cook": {"a": "woman cook", "b": "1F469-200D-1F373", "j": ["human", "cook", "chef", "woman"]}, "mechanic": {"a": "mechanic", "b": "1F9D1-200D-1F527", "j": ["worker", "electrician", "plumber", "technician", "tradesperson"]}, "man-mechanic": {"a": "man mechanic", "b": "1F468-200D-1F527", "j": ["man", "human", "electrician", "plumber", "tradesperson", "mechanic", "wrench"]}, "woman-mechanic": {"a": "woman mechanic", "b": "1F469-200D-1F527", "j": ["woman", "human", "electrician", "plumber", "tradesperson", "mechanic", "wrench"]}, "factory-worker": {"a": "factory worker", "b": "1F9D1-200D-1F3ED", "j": ["worker", "factory", "labor", "industrial", "assembly"]}, "man-factory-worker": {"a": "man factory worker", "b": "1F468-200D-1F3ED", "j": ["man", "worker", "human", "factory", "industrial", "assembly"]}, "woman-factory-worker": {"a": "woman factory worker", "b": "1F469-200D-1F3ED", "j": ["worker", "woman", "human", "factory", "industrial", "assembly"]}, "office-worker": {"a": "office worker", "b": "1F9D1-200D-1F4BC", "j": ["white-collar", "architect", "manager", "business"]}, "man-office-worker": {"a": "man office worker", "b": "1F468-200D-1F4BC", "j": ["white-collar", "architect", "man", "business", "manager", "human"]}, "woman-office-worker": {"a": "woman office worker", "b": "1F469-200D-1F4BC", "j": ["white-collar", "architect", "manager", "business", "woman", "human"]}, "scientist": {"a": "scientist", "b": "1F9D1-200D-1F52C", "j": ["chemistry", "biologist", "physicist", "engineer", "chemist"]}, "man-scientist": {"a": "man scientist", "b": "1F468-200D-1F52C", "j": ["man", "biologist", "human", "physicist", "scientist", "engineer", "chemist"]}, "woman-scientist": {"a": "woman scientist", "b": "1F469-200D-1F52C", "j": ["biologist", "woman", "human", "physicist", "scientist", "engineer", "chemist"]}, "technologist": {"a": "technologist", "b": "1F9D1-200D-1F4BB", "j": ["computer", "software", "coder", "developer", "inventor"]}, "man-technologist": {"a": "man technologist", "b": "1F468-200D-1F4BB", "j": ["programmer", "laptop", "software", "computer", "coder", "man", "human", "developer", "inventor", "engineer", "technologist"]}, "woman-technologist": {"a": "woman technologist", "b": "1F469-200D-1F4BB", "j": ["programmer", "laptop", "software", "computer", "coder", "woman", "human", "developer", "inventor", "engineer", "technologist"]}, "singer": {"a": "singer", "b": "1F9D1-200D-1F3A4", "j": ["song", "artist", "star", "rock", "actor", "entertainer", "performer"]}, "man-singer": {"a": "man singer", "b": "1F468-200D-1F3A4", "j": ["man", "human", "star", "rockstar", "rock", "singer", "actor", "entertainer"]}, "woman-singer": {"a": "woman singer", "b": "1F469-200D-1F3A4", "j": ["woman", "human", "star", "rockstar", "rock", "singer", "actor", "entertainer"]}, "artist": {"a": "artist", "b": "1F9D1-200D-1F3A8", "j": ["painting", "creativity", "palette", "draw"]}, "man-artist": {"a": "man artist", "b": "1F468-200D-1F3A8", "j": ["man", "artist", "human", "painter", "palette"]}, "woman-artist": {"a": "woman artist", "b": "1F469-200D-1F3A8", "j": ["woman", "artist", "human", "painter", "palette"]}, "pilot": {"a": "pilot", "b": "1F9D1-200D-2708-FE0F", "j": ["airplane", "plane", "fly"]}, "man-pilot": {"a": "man pilot", "b": "1F468-200D-2708-FE0F", "j": ["man", "human", "plane", "pilot", "aviator"]}, "woman-pilot": {"a": "woman pilot", "b": "1F469-200D-2708-FE0F", "j": ["woman", "human", "plane", "pilot", "aviator"]}, "astronaut": {"a": "astronaut", "b": "1F9D1-200D-1F680", "j": ["outerspace", "rocket"]}, "man-astronaut": {"a": "man astronaut", "b": "1F468-200D-1F680", "j": ["man", "rocket", "human", "astronaut", "space"]}, "woman-astronaut": {"a": "woman astronaut", "b": "1F469-200D-1F680", "j": ["rocket", "woman", "human", "astronaut", "space"]}, "firefighter": {"a": "firefighter", "b": "1F9D1-200D-1F692", "j": ["firetruck", "fire"]}, "man-firefighter": {"a": "man firefighter", "b": "1F468-200D-1F692", "j": ["firetruck", "man", "human", "fireman", "firefighter"]}, "woman-firefighter": {"a": "woman firefighter", "b": "1F469-200D-1F692", "j": ["firetruck", "woman", "human", "fireman", "firefighter"]}, "police-officer": {"a": "police officer", "b": "1F46E", "j": ["cop", "police", "officer"]}, "man-police-officer": {"a": "man police officer", "b": "1F46E-200D-2642-FE0F", "j": ["police", "man", "officer", "law", "enforcement", "911", "legal", "cop", "arrest"]}, "woman-police-officer": {"a": "woman police officer", "b": "1F46E-200D-2640-FE0F", "j": ["police", "woman", "officer", "law", "enforcement", "arrest", "911", "legal", "cop", "female"]}, "detective": {"a": "detective", "b": "1F575", "j": ["sleuth", "human", "spy"]}, "man-detective": {"a": "man detective", "b": "1F575-FE0F-200D-2642-FE0F", "j": ["spy", "man", "crime", "sleuth", "detective"]}, "woman-detective": {"a": "woman detective", "b": "1F575-FE0F-200D-2640-FE0F", "j": ["spy", "woman", "human", "sleuth", "female", "detective"]}, "guard": {"a": "guard", "b": "1F482", "j": ["protect"]}, "man-guard": {"a": "man guard", "b": "1F482-200D-2642-FE0F", "j": ["guy", "royal", "man", "british", "male", "uk", "gb", "guard"]}, "woman-guard": {"a": "woman guard", "b": "1F482-200D-2640-FE0F", "j": ["royal", "woman", "british", "uk", "gb", "guard", "female"]}, "ninja": {"a": "ninja", "b": "1F977", "j": ["ninjutsu", "japanese", "fighter", "hidden", "stealth", "skills"]}, "construction-worker": {"a": "construction worker", "b": "1F477", "j": ["build", "construction", "worker", "hat", "labor"]}, "man-construction-worker": {"a": "man construction worker", "b": "1F477-200D-2642-FE0F", "j": ["guy", "man", "construction", "male", "worker", "human", "wip", "build", "labor"]}, "woman-construction-worker": {"a": "woman construction worker", "b": "1F477-200D-2640-FE0F", "j": ["build", "construction", "worker", "woman", "human", "wip", "labor", "female"]}, "prince": {"a": "prince", "b": "1F934", "j": ["royal", "man", "male", "crown", "king", "boy"]}, "princess": {"a": "princess", "b": "1F478", "j": ["royal", "woman", "crown", "girl", "fairy tale", "fantasy", "blond", "queen", "female"]}, "person-wearing-turban": {"a": "person wearing turban", "b": "1F473", "j": ["turban", "headdress"]}, "man-wearing-turban": {"a": "man wearing turban", "b": "1F473-200D-2642-FE0F", "j": ["man", "male", "hinduism", "turban", "indian", "arabs"]}, "woman-wearing-turban": {"a": "woman wearing turban", "b": "1F473-200D-2640-FE0F", "j": ["woman", "hinduism", "turban", "indian", "arabs", "female"]}, "person-with-skullcap": {"a": "person with skullcap", "b": "1F472", "j": ["person", "man_with_skullcap", "male", "boy", "hat", "skullcap", "cap", "gua pi mao", "chinese"]}, "woman-with-headscarf": {"a": "woman with headscarf", "b": "1F9D5", "j": ["tichel", "mantilla", "bandana", "head kerchief", "headscarf", "female", "hijab"]}, "person-in-tuxedo": {"a": "person in tuxedo", "b": "1F935", "j": ["person", "wedding", "marriage", "tuxedo", "groom", "man_in_tuxedo", "couple"]}, "man-in-tuxedo": {"a": "man in tuxedo", "b": "1F935-200D-2642-FE0F", "j": ["formal", "fashion", "man", "tuxedo"]}, "woman-in-tuxedo": {"a": "woman in tuxedo", "b": "1F935-200D-2640-FE0F", "j": ["formal", "fashion", "tuxedo", "woman"]}, "person-with-veil": {"a": "person with veil", "b": "1F470", "j": ["person", "wedding", "marriage", "woman", "bride", "veil", "bride_with_veil", "couple"]}, "man-with-veil": {"a": "man with veil", "b": "1F470-200D-2642-FE0F", "j": ["veil", "wedding", "man", "marriage"]}, "woman-with-veil": {"a": "woman with veil", "b": "1F470-200D-2640-FE0F", "j": ["veil", "wedding", "marriage", "woman"]}, "pregnant-woman": {"a": "pregnant woman", "b": "1F930", "j": ["pregnant", "baby", "woman"]}, "breastfeeding": {"a": "breast-feeding", "b": "1F931", "j": ["nursing", "breast", "baby", "breast_feeding"]}, "woman-feeding-baby": {"a": "woman feeding baby", "b": "1F469-200D-1F37C", "j": ["nursing", "birth", "woman", "baby", "feeding", "food"]}, "man-feeding-baby": {"a": "man feeding baby", "b": "1F468-200D-1F37C", "j": ["nursing", "birth", "man", "baby", "feeding", "food"]}, "person-feeding-baby": {"a": "person feeding baby", "b": "1F9D1-200D-1F37C", "j": ["nursing", "person", "birth", "baby", "feeding", "food"]}, "baby-angel": {"a": "baby angel", "b": "1F47C", "j": ["heaven", "baby", "face", "fairy tale", "fantasy", "wings", "angel", "halo"]}, "santa-claus": {"a": "Santa Claus", "b": "1F385", "j": ["claus", "man", "male", "father", "santa", "festival", "xmas", "celebration", "Christmas", "father christmas"]}, "mrs-claus": {"a": "Mrs. Claus", "b": "1F936", "j": ["claus", "Mrs.", "woman", "xmas", "celebration", "Christmas", "mother christmas", "mother", "female"]}, "mx-claus": {"a": "mx claus", "b": "1F9D1-200D-1F384", "j": ["Claus, christmas", "christmas"]}, "superhero": {"a": "superhero", "b": "1F9B8", "j": ["marvel", "superpower", "good", "heroine", "hero"]}, "man-superhero": {"a": "man superhero", "b": "1F9B8-200D-2642-FE0F", "j": ["man", "male", "superpowers", "superpower", "good", "hero"]}, "woman-superhero": {"a": "woman superhero", "b": "1F9B8-200D-2640-FE0F", "j": ["woman", "superpowers", "good", "superpower", "heroine", "hero", "female"]}, "supervillain": {"a": "supervillain", "b": "1F9B9", "j": ["marvel", "superpower", "criminal", "villain", "evil"]}, "man-supervillain": {"a": "man supervillain", "b": "1F9B9-200D-2642-FE0F", "j": ["man", "male", "superpowers", "superpower", "criminal", "bad", "villain", "evil", "hero"]}, "woman-supervillain": {"a": "woman supervillain", "b": "1F9B9-200D-2640-FE0F", "j": ["woman", "superpowers", "superpower", "criminal", "bad", "heroine", "villain", "evil", "female"]}, "mage": {"a": "mage", "b": "1F9D9", "j": ["magic", "wizard", "sorcerer", "sorceress", "witch"]}, "man-mage": {"a": "man mage", "b": "1F9D9-200D-2642-FE0F", "j": ["man", "male", "wizard", "sorcerer", "mage"]}, "woman-mage": {"a": "woman mage", "b": "1F9D9-200D-2640-FE0F", "j": ["woman", "mage", "sorceress", "witch", "female"]}, "fairy": {"a": "fairy", "b": "1F9DA", "j": ["magical", "Puck", "Titania", "Oberon", "wings"]}, "man-fairy": {"a": "man fairy", "b": "1F9DA-200D-2642-FE0F", "j": ["Puck", "Oberon", "man", "male"]}, "woman-fairy": {"a": "woman fairy", "b": "1F9DA-200D-2640-FE0F", "j": ["Titania", "woman", "female"]}, "vampire": {"a": "vampire", "b": "1F9DB", "j": ["undead", "blood", "twilight", "Dracula"]}, "man-vampire": {"a": "man vampire", "b": "1F9DB-200D-2642-FE0F", "j": ["dracula", "man", "male", "undead", "Dracula"]}, "woman-vampire": {"a": "woman vampire", "b": "1F9DB-200D-2640-FE0F", "j": ["woman", "undead", "female"]}, "merperson": {"a": "merperson", "b": "1F9DC", "j": ["mermaid", "merwoman", "sea", "merman"]}, "merman": {"a": "merman", "b": "1F9DC-200D-2642-FE0F", "j": ["triton", "Triton", "man", "male"]}, "mermaid": {"a": "mermaid", "b": "1F9DC-200D-2640-FE0F", "j": ["woman", "merwoman", "ariel", "female"]}, "elf": {"a": "elf", "b": "1F9DD", "j": ["magical", "LOTR style"]}, "man-elf": {"a": "man elf", "b": "1F9DD-200D-2642-FE0F", "j": ["magical", "man", "male"]}, "woman-elf": {"a": "woman elf", "b": "1F9DD-200D-2640-FE0F", "j": ["woman", "magical", "female"]}, "genie": {"a": "genie", "b": "1F9DE", "j": ["(non-human color)", "magical", "wishes", "djinn"]}, "man-genie": {"a": "man genie", "b": "1F9DE-200D-2642-FE0F", "j": ["male", "man", "djinn"]}, "woman-genie": {"a": "woman genie", "b": "1F9DE-200D-2640-FE0F", "j": ["female", "djinn", "woman"]}, "zombie": {"a": "zombie", "b": "1F9DF", "j": ["undead", "dead", "walking dead", "(non-human color)"]}, "man-zombie": {"a": "man zombie", "b": "1F9DF-200D-2642-FE0F", "j": ["dracula", "man", "male", "undead", "walking dead"]}, "woman-zombie": {"a": "woman zombie", "b": "1F9DF-200D-2640-FE0F", "j": ["woman", "undead", "walking dead", "female"]}, "person-getting-massage": {"a": "person getting massage", "b": "1F486", "j": ["relax", "salon", "massage", "face"]}, "man-getting-massage": {"a": "man getting massage", "b": "1F486-200D-2642-FE0F", "j": ["man", "massage", "male", "boy", "face", "head"]}, "woman-getting-massage": {"a": "woman getting massage", "b": "1F486-200D-2640-FE0F", "j": ["massage", "woman", "girl", "face", "head", "female"]}, "person-getting-haircut": {"a": "person getting haircut", "b": "1F487", "j": ["barber", "haircut", "hairstyle", "beauty", "parlor"]}, "man-getting-haircut": {"a": "man getting haircut", "b": "1F487-200D-2642-FE0F", "j": ["boy", "male", "man", "haircut"]}, "woman-getting-haircut": {"a": "woman getting haircut", "b": "1F487-200D-2640-FE0F", "j": ["woman", "girl", "haircut", "female"]}, "person-walking": {"a": "person walking", "b": "1F6B6", "j": ["move", "walking", "walk", "hike"]}, "man-walking": {"a": "man walking", "b": "1F6B6-200D-2642-FE0F", "j": ["man", "human", "steps", "feet", "hike", "walk"]}, "woman-walking": {"a": "woman walking", "b": "1F6B6-200D-2640-FE0F", "j": ["woman", "human", "steps", "feet", "hike", "walk", "female"]}, "person-standing": {"a": "person standing", "b": "1F9CD", "j": ["stand", "standing", "still"]}, "man-standing": {"a": "man standing", "b": "1F9CD-200D-2642-FE0F", "j": ["standing", "man", "still"]}, "woman-standing": {"a": "woman standing", "b": "1F9CD-200D-2640-FE0F", "j": ["standing", "still", "woman"]}, "person-kneeling": {"a": "person kneeling", "b": "1F9CE", "j": ["respectful", "pray", "kneeling", "kneel"]}, "man-kneeling": {"a": "man kneeling", "b": "1F9CE-200D-2642-FE0F", "j": ["respectful", "pray", "man", "kneeling"]}, "woman-kneeling": {"a": "woman kneeling", "b": "1F9CE-200D-2640-FE0F", "j": ["respectful", "pray", "kneeling", "woman"]}, "person-with-white-cane": {"a": "person with white cane", "b": "1F9D1-200D-1F9AF", "j": ["person_with_probing_cane", "blind", "accessibility"]}, "man-with-white-cane": {"a": "man with white cane", "b": "1F468-200D-1F9AF", "j": ["man", "blind", "accessibility", "man_with_probing_cane"]}, "woman-with-white-cane": {"a": "woman with white cane", "b": "1F469-200D-1F9AF", "j": ["woman_with_probing_cane", "blind", "accessibility", "woman"]}, "person-in-motorized-wheelchair": {"a": "person in motorized wheelchair", "b": "1F9D1-200D-1F9BC", "j": ["wheelchair", "disability", "accessibility"]}, "man-in-motorized-wheelchair": {"a": "man in motorized wheelchair", "b": "1F468-200D-1F9BC", "j": ["wheelchair", "disability", "man", "accessibility"]}, "woman-in-motorized-wheelchair": {"a": "woman in motorized wheelchair", "b": "1F469-200D-1F9BC", "j": ["wheelchair", "disability", "accessibility", "woman"]}, "person-in-manual-wheelchair": {"a": "person in manual wheelchair", "b": "1F9D1-200D-1F9BD", "j": ["wheelchair", "disability", "accessibility"]}, "man-in-manual-wheelchair": {"a": "man in manual wheelchair", "b": "1F468-200D-1F9BD", "j": ["wheelchair", "disability", "man", "accessibility"]}, "woman-in-manual-wheelchair": {"a": "woman in manual wheelchair", "b": "1F469-200D-1F9BD", "j": ["wheelchair", "disability", "accessibility", "woman"]}, "person-running": {"a": "person running", "b": "1F3C3", "j": ["running", "marathon", "move"]}, "man-running": {"a": "man running", "b": "1F3C3-200D-2642-FE0F", "j": ["man", "walking", "racing", "race", "running", "exercise", "marathon"]}, "woman-running": {"a": "woman running", "b": "1F3C3-200D-2640-FE0F", "j": ["woman", "walking", "racing", "race", "running", "exercise", "marathon", "female"]}, "woman-dancing": {"a": "woman dancing", "b": "1F483", "j": ["woman", "girl", "dance", "dancing", "fun", "female"]}, "man-dancing": {"a": "man dancing", "b": "1F57A", "j": ["man", "male", "boy", "dance", "dancing", "fun", "dancer"]}, "person-in-suit-levitating": {"a": "person in suit levitating", "b": "1F574", "j": ["person", "business", "jump", "man_in_suit_levitating", "suit", "hover", "levitate"]}, "people-with-bunny-ears": {"a": "people with bunny ears", "b": "1F46F", "j": ["costume", "partying", "perform", "bunny ear", "dancer"]}, "men-with-bunny-ears": {"a": "men with bunny ears", "b": "1F46F-200D-2642-FE0F", "j": ["boys", "male", "partying", "men", "bunny", "bunny ear", "dancer"]}, "women-with-bunny-ears": {"a": "women with bunny ears", "b": "1F46F-200D-2640-FE0F", "j": ["girls", "dancer", "partying", "bunny", "bunny ear", "women", "female"]}, "person-in-steamy-room": {"a": "person in steamy room", "b": "1F9D6", "j": ["spa", "relax", "hamam", "steambath", "sauna", "steam room"]}, "man-in-steamy-room": {"a": "man in steamy room", "b": "1F9D6-200D-2642-FE0F", "j": ["man", "male", "steamroom", "spa", "sauna", "steam room"]}, "woman-in-steamy-room": {"a": "woman in steamy room", "b": "1F9D6-200D-2640-FE0F", "j": ["woman", "steamroom", "spa", "sauna", "steam room", "female"]}, "person-climbing": {"a": "person climbing", "b": "1F9D7", "j": ["sport", "climber"]}, "man-climbing": {"a": "man climbing", "b": "1F9D7-200D-2642-FE0F", "j": ["man", "hobby", "male", "rock", "sports", "climber"]}, "woman-climbing": {"a": "woman climbing", "b": "1F9D7-200D-2640-FE0F", "j": ["hobby", "woman", "rock", "sports", "climber", "female"]}, "person-fencing": {"a": "person fencing", "b": "1F93A", "j": ["sword", "fencer", "fencing", "sports"]}, "horse-racing": {"a": "horse racing", "b": "1F3C7", "j": ["competition", "racehorse", "jockey", "racing", "gambling", "luck", "horse", "betting", "animal"]}, "skier": {"a": "skier", "b": "26F7", "j": ["sports", "snow", "winter", "ski"]}, "snowboarder": {"a": "snowboarder", "b": "1F3C2", "j": ["snow", "winter", "sports", "ski", "snowboard"]}, "person-golfing": {"a": "person golfing", "b": "1F3CC", "j": ["golf", "sports", "business", "ball"]}, "man-golfing": {"a": "man golfing", "b": "1F3CC-FE0F-200D-2642-FE0F", "j": ["golf", "sport", "man"]}, "woman-golfing": {"a": "woman golfing", "b": "1F3CC-FE0F-200D-2640-FE0F", "j": ["business", "woman", "golf", "sports", "female"]}, "person-surfing": {"a": "person surfing", "b": "1F3C4", "j": ["surfing", "sport", "sea"]}, "man-surfing": {"a": "man surfing", "b": "1F3C4-200D-2642-FE0F", "j": ["man", "surfing", "sea", "sports", "ocean", "summer", "beach"]}, "woman-surfing": {"a": "woman surfing", "b": "1F3C4-200D-2640-FE0F", "j": ["woman", "surfing", "sea", "sports", "ocean", "summer", "beach", "female"]}, "person-rowing-boat": {"a": "person rowing boat", "b": "1F6A3", "j": ["sport", "rowboat", "move", "boat"]}, "man-rowing-boat": {"a": "man rowing boat", "b": "1F6A3-200D-2642-FE0F", "j": ["man", "hobby", "boat", "water", "sports", "ship", "rowboat"]}, "woman-rowing-boat": {"a": "woman rowing boat", "b": "1F6A3-200D-2640-FE0F", "j": ["hobby", "woman", "boat", "water", "sports", "ship", "rowboat", "female"]}, "person-swimming": {"a": "person swimming", "b": "1F3CA", "j": ["sport", "pool", "swim"]}, "man-swimming": {"a": "man swimming", "b": "1F3CA-200D-2642-FE0F", "j": ["swim", "man", "human", "athlete", "water", "sports", "exercise", "summer"]}, "woman-swimming": {"a": "woman swimming", "b": "1F3CA-200D-2640-FE0F", "j": ["swim", "woman", "human", "athlete", "water", "sports", "exercise", "summer", "female"]}, "person-bouncing-ball": {"a": "person bouncing ball", "b": "26F9", "j": ["human", "sports", "ball"]}, "man-bouncing-ball": {"a": "man bouncing ball", "b": "26F9-FE0F-200D-2642-FE0F", "j": ["sport", "man", "ball"]}, "woman-bouncing-ball": {"a": "woman bouncing ball", "b": "26F9-FE0F-200D-2640-FE0F", "j": ["woman", "human", "ball", "sports", "female"]}, "person-lifting-weights": {"a": "person lifting weights", "b": "1F3CB", "j": ["sports", "training", "exercise", "weight", "lifter"]}, "man-lifting-weights": {"a": "man lifting weights", "b": "1F3CB-FE0F-200D-2642-FE0F", "j": ["sport", "weight lifter", "man"]}, "woman-lifting-weights": {"a": "woman lifting weights", "b": "1F3CB-FE0F-200D-2640-FE0F", "j": ["woman", "sports", "exercise", "weight lifter", "training", "female"]}, "person-biking": {"a": "person biking", "b": "1F6B4", "j": ["biking", "sport", "bicycle", "move", "cyclist"]}, "man-biking": {"a": "man biking", "b": "1F6B4-200D-2642-FE0F", "j": ["biking", "man", "hipster", "sports", "exercise", "bicycle", "bike", "cyclist"]}, "woman-biking": {"a": "woman biking", "b": "1F6B4-200D-2640-FE0F", "j": ["biking", "woman", "cyclist", "hipster", "sports", "exercise", "bicycle", "bike", "female"]}, "person-mountain-biking": {"a": "person mountain biking", "b": "1F6B5", "j": ["mountain", "bicyclist", "sport", "bicycle", "bike", "move", "cyclist"]}, "man-mountain-biking": {"a": "man mountain biking", "b": "1F6B5-200D-2642-FE0F", "j": ["mountain", "man", "human", "transportation", "sports", "race", "bicycle", "bike", "cyclist"]}, "woman-mountain-biking": {"a": "woman mountain biking", "b": "1F6B5-200D-2640-FE0F", "j": ["biking", "mountain", "woman", "human", "cyclist", "transportation", "sports", "race", "bicycle", "bike", "female"]}, "person-cartwheeling": {"a": "person cartwheeling", "b": "1F938", "j": ["sport", "cartwheel", "gymnastic", "gymnastics"]}, "man-cartwheeling": {"a": "man cartwheeling", "b": "1F938-200D-2642-FE0F", "j": ["cartwheel", "man", "gymnastics"]}, "woman-cartwheeling": {"a": "woman cartwheeling", "b": "1F938-200D-2640-FE0F", "j": ["cartwheel", "gymnastics", "woman"]}, "people-wrestling": {"a": "people wrestling", "b": "1F93C", "j": ["wrestle", "sport", "wrestler"]}, "men-wrestling": {"a": "men wrestling", "b": "1F93C-200D-2642-FE0F", "j": ["wrestle", "wrestlers", "sports", "men"]}, "women-wrestling": {"a": "women wrestling", "b": "1F93C-200D-2640-FE0F", "j": ["wrestle", "women", "sports", "wrestlers"]}, "person-playing-water-polo": {"a": "person playing water polo", "b": "1F93D", "j": ["sport", "polo", "water"]}, "man-playing-water-polo": {"a": "man playing water polo", "b": "1F93D-200D-2642-FE0F", "j": ["pool", "water polo", "man", "sports"]}, "woman-playing-water-polo": {"a": "woman playing water polo", "b": "1F93D-200D-2640-FE0F", "j": ["woman", "pool", "water polo", "sports"]}, "person-playing-handball": {"a": "person playing handball", "b": "1F93E", "j": ["sport", "handball", "ball"]}, "man-playing-handball": {"a": "man playing handball", "b": "1F93E-200D-2642-FE0F", "j": ["handball", "man", "sports"]}, "woman-playing-handball": {"a": "woman playing handball", "b": "1F93E-200D-2640-FE0F", "j": ["woman", "handball", "sports"]}, "person-juggling": {"a": "person juggling", "b": "1F939", "j": ["performance", "balance", "skill", "multitask", "juggle"]}, "man-juggling": {"a": "man juggling", "b": "1F939-200D-2642-FE0F", "j": ["juggling", "balance", "man", "skill", "multitask", "juggle"]}, "woman-juggling": {"a": "woman juggling", "b": "1F939-200D-2640-FE0F", "j": ["juggling", "balance", "skill", "woman", "multitask", "juggle"]}, "person-in-lotus-position": {"a": "person in lotus position", "b": "1F9D8", "j": ["meditation", "meditate", "serenity", "yoga"]}, "man-in-lotus-position": {"a": "man in lotus position", "b": "1F9D8-200D-2642-FE0F", "j": ["man", "male", "meditation", "mindfulness", "yoga", "zen", "serenity"]}, "woman-in-lotus-position": {"a": "woman in lotus position", "b": "1F9D8-200D-2640-FE0F", "j": ["woman", "meditation", "mindfulness", "yoga", "zen", "serenity", "female"]}, "person-taking-bath": {"a": "person taking bath", "b": "1F6C0", "j": ["bathroom", "bath", "clean", "shower", "bathtub"]}, "person-in-bed": {"a": "person in bed", "b": "1F6CC", "j": ["sleep", "rest", "hotel", "bed"]}, "people-holding-hands": {"a": "people holding hands", "b": "1F9D1-200D-1F91D-200D-1F9D1", "j": ["person", "friendship", "hold", "hand", "holding hands", "couple"]}, "women-holding-hands": {"a": "women holding hands", "b": "1F46D", "j": ["friendship", "people", "love", "like", "human", "hand", "holding hands", "women", "couple", "pair", "female"]}, "woman-and-man-holding-hands": {"a": "woman and man holding hands", "b": "1F46B", "j": ["love", "dating", "like", "woman", "marriage", "human", "hand", "valentines", "affection", "couple", "pair", "date", "people", "man", "hold", "holding hands"]}, "men-holding-hands": {"a": "men holding hands", "b": "1F46C", "j": ["friendship", "people", "love", "man", "twins", "like", "human", "bromance", "holding hands", "zodiac", "Gemini", "men", "couple", "pair"]}, "kiss": {"a": "kiss", "b": "1F48F", "j": ["love", "dating", "like", "marriage", "valentines", "couple", "pair"]}, "kiss-woman-man": {"a": "kiss: woman, man", "b": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F468", "j": ["love", "man", "woman", "kiss", "couple"]}, "kiss-man-man": {"a": "kiss: man, man", "b": "1F468-200D-2764-FE0F-200D-1F48B-200D-1F468", "j": ["love", "man", "like", "dating", "marriage", "valentines", "kiss", "couple", "pair"]}, "kiss-woman-woman": {"a": "kiss: woman, woman", "b": "1F469-200D-2764-FE0F-200D-1F48B-200D-1F469", "j": ["love", "like", "dating", "woman", "marriage", "valentines", "kiss", "couple", "pair"]}, "couple-with-heart": {"a": "couple with heart", "b": "1F491", "j": ["love", "like", "dating", "marriage", "human", "valentines", "affection", "couple", "pair"]}, "couple-with-heart-woman-man": {"a": "couple with heart: woman, man", "b": "1F469-200D-2764-FE0F-200D-1F468", "j": ["love", "man", "woman", "couple with heart", "couple"]}, "couple-with-heart-man-man": {"a": "couple with heart: man, man", "b": "1F468-200D-2764-FE0F-200D-1F468", "j": ["love", "man", "like", "dating", "marriage", "human", "couple with heart", "valentines", "affection", "couple", "pair"]}, "couple-with-heart-woman-woman": {"a": "couple with heart: woman, woman", "b": "1F469-200D-2764-FE0F-200D-1F469", "j": ["love", "like", "dating", "woman", "marriage", "human", "couple with heart", "valentines", "affection", "couple", "pair"]}, "family": {"a": "family", "b": "1F46A", "j": ["people", "mom", "father", "human", "parents", "dad", "home", "child", "mother"]}, "family-man-woman-boy": {"a": "family: man, woman, boy", "b": "1F468-200D-1F469-200D-1F466", "j": ["love", "man", "woman", "boy", "family"]}, "family-man-woman-girl": {"a": "family: man, woman, girl", "b": "1F468-200D-1F469-200D-1F467", "j": ["people", "man", "woman", "human", "girl", "parents", "family", "home", "child"]}, "family-man-woman-girl-boy": {"a": "family: man, woman, girl, boy", "b": "1F468-200D-1F469-200D-1F467-200D-1F466", "j": ["people", "man", "woman", "human", "boy", "girl", "parents", "family", "home", "children"]}, "family-man-woman-boy-boy": {"a": "family: man, woman, boy, boy", "b": "1F468-200D-1F469-200D-1F466-200D-1F466", "j": ["people", "man", "woman", "human", "boy", "parents", "family", "home", "children"]}, "family-man-woman-girl-girl": {"a": "family: man, woman, girl, girl", "b": "1F468-200D-1F469-200D-1F467-200D-1F467", "j": ["people", "man", "woman", "human", "girl", "parents", "family", "home", "children"]}, "family-man-man-boy": {"a": "family: man, man, boy", "b": "1F468-200D-1F468-200D-1F466", "j": ["people", "man", "human", "boy", "parents", "family", "home", "children"]}, "family-man-man-girl": {"a": "family: man, man, girl", "b": "1F468-200D-1F468-200D-1F467", "j": ["people", "man", "human", "girl", "parents", "family", "home", "children"]}, "family-man-man-girl-boy": {"a": "family: man, man, girl, boy", "b": "1F468-200D-1F468-200D-1F467-200D-1F466", "j": ["people", "man", "human", "boy", "girl", "parents", "family", "home", "children"]}, "family-man-man-boy-boy": {"a": "family: man, man, boy, boy", "b": "1F468-200D-1F468-200D-1F466-200D-1F466", "j": ["people", "man", "human", "boy", "parents", "family", "home", "children"]}, "family-man-man-girl-girl": {"a": "family: man, man, girl, girl", "b": "1F468-200D-1F468-200D-1F467-200D-1F467", "j": ["people", "man", "human", "girl", "parents", "family", "home", "children"]}, "family-woman-woman-boy": {"a": "family: woman, woman, boy", "b": "1F469-200D-1F469-200D-1F466", "j": ["people", "woman", "human", "boy", "parents", "family", "home", "children"]}, "family-woman-woman-girl": {"a": "family: woman, woman, girl", "b": "1F469-200D-1F469-200D-1F467", "j": ["people", "woman", "human", "girl", "parents", "family", "home", "children"]}, "family-woman-woman-girl-boy": {"a": "family: woman, woman, girl, boy", "b": "1F469-200D-1F469-200D-1F467-200D-1F466", "j": ["people", "woman", "human", "boy", "girl", "parents", "family", "home", "children"]}, "family-woman-woman-boy-boy": {"a": "family: woman, woman, boy, boy", "b": "1F469-200D-1F469-200D-1F466-200D-1F466", "j": ["people", "woman", "human", "boy", "parents", "family", "home", "children"]}, "family-woman-woman-girl-girl": {"a": "family: woman, woman, girl, girl", "b": "1F469-200D-1F469-200D-1F467-200D-1F467", "j": ["people", "woman", "human", "girl", "parents", "family", "home", "children"]}, "family-man-boy": {"a": "family: man, boy", "b": "1F468-200D-1F466", "j": ["people", "man", "human", "boy", "parent", "family", "home", "child"]}, "family-man-boy-boy": {"a": "family: man, boy, boy", "b": "1F468-200D-1F466-200D-1F466", "j": ["people", "man", "human", "boy", "parent", "family", "home", "children"]}, "family-man-girl": {"a": "family: man, girl", "b": "1F468-200D-1F467", "j": ["people", "man", "human", "girl", "parent", "family", "home", "child"]}, "family-man-girl-boy": {"a": "family: man, girl, boy", "b": "1F468-200D-1F467-200D-1F466", "j": ["people", "man", "human", "boy", "girl", "parent", "family", "home", "children"]}, "family-man-girl-girl": {"a": "family: man, girl, girl", "b": "1F468-200D-1F467-200D-1F467", "j": ["people", "man", "human", "girl", "parent", "family", "home", "children"]}, "family-woman-boy": {"a": "family: woman, boy", "b": "1F469-200D-1F466", "j": ["people", "woman", "human", "boy", "parent", "family", "home", "child"]}, "family-woman-boy-boy": {"a": "family: woman, boy, boy", "b": "1F469-200D-1F466-200D-1F466", "j": ["people", "woman", "human", "boy", "parent", "family", "home", "children"]}, "family-woman-girl": {"a": "family: woman, girl", "b": "1F469-200D-1F467", "j": ["people", "woman", "human", "girl", "parent", "family", "home", "child"]}, "family-woman-girl-boy": {"a": "family: woman, girl, boy", "b": "1F469-200D-1F467-200D-1F466", "j": ["people", "woman", "human", "boy", "girl", "parent", "family", "home", "children"]}, "family-woman-girl-girl": {"a": "family: woman, girl, girl", "b": "1F469-200D-1F467-200D-1F467", "j": ["people", "woman", "human", "girl", "parent", "family", "home", "children"]}, "speaking-head": {"a": "speaking head", "b": "1F5E3", "j": ["person", "talk", "human", "sing", "face", "silhouette", "speak", "say", "speaking", "user", "head"]}, "bust-in-silhouette": {"a": "bust in silhouette", "b": "1F464", "j": ["person", "bust", "human", "silhouette", "user"]}, "busts-in-silhouette": {"a": "busts in silhouette", "b": "1F465", "j": ["team", "bust", "person", "group", "human", "silhouette", "user"]}, "people-hugging": {"a": "people hugging", "b": "1FAC2", "j": ["hug", "hello", "thanks", "goodbye", "care"]}, "footprints": {"a": "footprints", "b": "1F463", "j": ["tracking", "footprint", "walking", "clothing", "feet", "print", "beach"]}, "red-hair": {"a": "red hair", "b": "1F9B0", "j": ["ginger", "red hair", "redhead"]}, "curly-hair": {"a": "curly hair", "b": "1F9B1", "j": ["afro", "curly", "curly hair", "ringlets"]}, "white-hair": {"a": "white hair", "b": "1F9B3", "j": ["gray", "hair", "old", "white"]}, "bald": {"a": "bald", "b": "1F9B2", "j": ["bald", "chemotherapy", "hairless", "no hair", "shaven"]}, "monkey-face": {"a": "monkey face", "b": "1F435", "j": ["monkey", "face", "nature", "circus", "animal"]}, "monkey": {"a": "monkey", "b": "1F412", "j": ["banana", "circus", "animal", "nature"]}, "gorilla": {"a": "gorilla", "b": "1F98D", "j": ["circus", "animal", "nature"]}, "orangutan": {"a": "orangutan", "b": "1F9A7", "j": ["animal", "ape"]}, "dog-face": {"a": "dog face", "b": "1F436", "j": ["puppy", "pet", "dog", "face", "nature", "woof", "faithful", "friend", "animal"]}, "dog": {"a": "dog", "b": "1F415", "j": ["pet", "nature", "faithful", "friend", "doge", "animal"]}, "guide-dog": {"a": "guide dog", "b": "1F9AE", "j": ["guide", "animal", "blind", "accessibility"]}, "service-dog": {"a": "service dog", "b": "1F415-200D-1F9BA", "j": ["animal", "accessibility", "dog", "assistance", "service", "blind"]}, "poodle": {"a": "poodle", "b": "1F429", "j": ["pet", "dog", "nature", "101", "animal"]}, "wolf": {"a": "wolf", "b": "1F43A", "j": ["animal", "wild", "face", "nature"]}, "fox": {"a": "fox", "b": "1F98A", "j": ["animal", "face", "nature"]}, "raccoon": {"a": "raccoon", "b": "1F99D", "j": ["curious", "sly", "animal", "nature"]}, "cat-face": {"a": "cat face", "b": "1F431", "j": ["pet", "meow", "kitten", "face", "nature", "cat", "animal"]}, "cat": {"a": "cat", "b": "1F408", "j": ["meow", "pet", "animal", "cats"]}, "black-cat": {"a": "black cat", "b": "1F408-200D-2B1B", "j": ["unlucky", "superstition", "luck", "cat", "black"]}, "lion": {"a": "lion", "b": "1F981", "j": ["zodiac", "Leo", "face", "nature", "animal"]}, "tiger-face": {"a": "tiger face", "b": "1F42F", "j": ["danger", "tiger", "face", "nature", "wild", "cat", "animal", "roar"]}, "tiger": {"a": "tiger", "b": "1F405", "j": ["roar", "animal", "nature"]}, "leopard": {"a": "leopard", "b": "1F406", "j": ["animal", "nature"]}, "horse-face": {"a": "horse face", "b": "1F434", "j": ["brown", "face", "nature", "horse", "animal"]}, "horse": {"a": "horse", "b": "1F40E", "j": ["equestrian", "gamble", "racing", "luck", "racehorse", "animal"]}, "unicorn": {"a": "unicorn", "b": "1F984", "j": ["mystical", "animal", "face", "nature"]}, "zebra": {"a": "zebra", "b": "1F993", "j": ["nature", "safari", "stripe", "stripes", "animal"]}, "deer": {"a": "deer", "b": "1F98C", "j": ["venison", "animal", "horns", "nature"]}, "bison": {"a": "bison", "b": "1F9AC", "j": ["wisent", "buffalo", "herd", "ox"]}, "cow-face": {"a": "cow face", "b": "1F42E", "j": ["cow", "milk", "beef", "ox", "face", "nature", "moo", "animal"]}, "ox": {"a": "ox", "b": "1F402", "j": ["cow", "Taurus", "beef", "zodiac", "bull", "animal"]}, "water-buffalo": {"a": "water buffalo", "b": "1F403", "j": ["cow", "buffalo", "water", "ox", "nature", "animal"]}, "cow": {"a": "cow", "b": "1F404", "j": ["milk", "beef", "ox", "nature", "moo", "animal"]}, "pig-face": {"a": "pig face", "b": "1F437", "j": ["pig", "face", "nature", "oink", "animal"]}, "pig": {"a": "pig", "b": "1F416", "j": ["nature", "animal", "sow"]}, "boar": {"a": "boar", "b": "1F417", "j": ["animal", "pig", "nature"]}, "pig-nose": {"a": "pig nose", "b": "1F43D", "j": ["pig", "face", "oink", "nose", "animal"]}, "ram": {"a": "ram", "b": "1F40F", "j": ["male", "zodiac", "nature", "sheep", "Aries", "animal"]}, "ewe": {"a": "ewe", "b": "1F411", "j": ["nature", "sheep", "shipit", "wool", "animal", "female"]}, "goat": {"a": "goat", "b": "1F410", "j": ["animal", "Capricorn", "zodiac", "nature"]}, "camel": {"a": "camel", "b": "1F42A", "j": ["hump", "dromedary", "hot", "desert", "animal"]}, "twohump-camel": {"a": "two-hump camel", "b": "1F42B", "j": ["animal", "hump", "bactrian", "hot", "desert", "nature", "camel", "two_hump_camel"]}, "llama": {"a": "llama", "b": "1F999", "j": ["guanaco", "vicuña", "alpaca", "nature", "wool", "animal"]}, "giraffe": {"a": "giraffe", "b": "1F992", "j": ["spots", "animal", "safari", "nature"]}, "elephant": {"a": "elephant", "b": "1F418", "j": ["nature", "nose", "circus", "animal", "th"]}, "mammoth": {"a": "mammoth", "b": "1F9A3", "j": ["large", "woolly", "elephant", "extinction", "tusks", "tusk"]}, "rhinoceros": {"a": "rhinoceros", "b": "1F98F", "j": ["nature", "animal", "horn"]}, "hippopotamus": {"a": "hippopotamus", "b": "1F99B", "j": ["nature", "animal", "hippo"]}, "mouse-face": {"a": "mouse face", "b": "1F42D", "j": ["mouse", "face", "nature", "animal", "cheese_wedge", "rodent"]}, "mouse": {"a": "mouse", "b": "1F401", "j": ["rodent", "animal", "nature"]}, "rat": {"a": "rat", "b": "1F400", "j": ["mouse", "animal", "rodent"]}, "hamster": {"a": "hamster", "b": "1F439", "j": ["pet", "animal", "face", "nature"]}, "rabbit-face": {"a": "rabbit face", "b": "1F430", "j": ["pet", "spring", "face", "nature", "rabbit", "bunny", "animal", "magic"]}, "rabbit": {"a": "rabbit", "b": "1F407", "j": ["pet", "spring", "nature", "bunny", "animal", "magic"]}, "chipmunk": {"a": "chipmunk", "b": "1F43F", "j": ["nature", "animal", "squirrel", "rodent"]}, "beaver": {"a": "beaver", "b": "1F9AB", "j": ["animal", "dam", "rodent"]}, "hedgehog": {"a": "hedgehog", "b": "1F994", "j": ["spiny", "animal", "nature"]}, "bat": {"a": "bat", "b": "1F987", "j": ["blind", "animal", "vampire", "nature"]}, "bear": {"a": "bear", "b": "1F43B", "j": ["animal", "wild", "face", "nature"]}, "polar-bear": {"a": "polar bear", "b": "1F43B-200D-2744-FE0F", "j": ["animal", "white", "arctic", "bear"]}, "koala": {"a": "koala", "b": "1F428", "j": ["bear", "animal", "nature"]}, "panda": {"a": "panda", "b": "1F43C", "j": ["animal", "face", "nature"]}, "sloth": {"a": "sloth", "b": "1F9A5", "j": ["slow", "animal", "lazy"]}, "otter": {"a": "otter", "b": "1F9A6", "j": ["playful", "animal", "fishing"]}, "skunk": {"a": "skunk", "b": "1F9A8", "j": ["stink", "animal"]}, "kangaroo": {"a": "kangaroo", "b": "1F998", "j": ["Australia", "australia", "hop", "joey", "nature", "marsupial", "animal", "jump"]}, "badger": {"a": "badger", "b": "1F9A1", "j": ["nature", "pester", "honey badger", "honey", "animal"]}, "paw-prints": {"a": "paw prints", "b": "1F43E", "j": ["pet", "tracking", "dog", "feet", "paw", "cat", "print", "animal", "footprints"]}, "turkey": {"a": "turkey", "b": "1F983", "j": ["animal", "bird"]}, "chicken": {"a": "chicken", "b": "1F414", "j": ["cluck", "animal", "bird", "nature"]}, "rooster": {"a": "rooster", "b": "1F413", "j": ["chicken", "animal", "bird", "nature"]}, "hatching-chick": {"a": "hatching chick", "b": "1F423", "j": ["born", "hatching", "baby", "bird", "chicken", "chick", "egg", "animal"]}, "baby-chick": {"a": "baby chick", "b": "1F424", "j": ["baby", "bird", "chicken", "chick", "animal"]}, "frontfacing-baby-chick": {"a": "front-facing baby chick", "b": "1F425", "j": ["baby", "bird", "chicken", "front_facing_baby_chick", "chick", "animal"]}, "bird": {"a": "bird", "b": "1F426", "j": ["tweet", "spring", "nature", "fly", "animal"]}, "penguin": {"a": "penguin", "b": "1F427", "j": ["animal", "bird", "nature"]}, "dove": {"a": "dove", "b": "1F54A", "j": ["fly", "animal", "bird", "peace"]}, "eagle": {"a": "eagle", "b": "1F985", "j": ["animal", "bird", "nature"]}, "duck": {"a": "duck", "b": "1F986", "j": ["animal", "bird", "mallard", "nature"]}, "swan": {"a": "swan", "b": "1F9A2", "j": ["ugly duckling", "cygnet", "bird", "nature", "animal"]}, "owl": {"a": "owl", "b": "1F989", "j": ["bird", "wise", "nature", "hoot", "animal"]}, "dodo": {"a": "dodo", "b": "1F9A4", "j": ["large", "bird", "Mauritius", "extinction", "animal"]}, "feather": {"a": "feather", "b": "1FAB6", "j": ["flight", "bird", "plumage", "light", "fly"]}, "flamingo": {"a": "flamingo", "b": "1F9A9", "j": ["tropical", "flamboyant", "animal"]}, "peacock": {"a": "peacock", "b": "1F99A", "j": ["peahen", "bird", "proud", "nature", "ostentatious", "animal"]}, "parrot": {"a": "parrot", "b": "1F99C", "j": ["talk", "pirate", "bird", "nature", "animal"]}, "frog": {"a": "frog", "b": "1F438", "j": ["croak", "face", "toad", "nature", "animal"]}, "crocodile": {"a": "crocodile", "b": "1F40A", "j": ["reptile", "alligator", "nature", "animal", "lizard"]}, "turtle": {"a": "turtle", "b": "1F422", "j": ["slow", "nature", "tortoise", "terrapin", "animal"]}, "lizard": {"a": "lizard", "b": "1F98E", "j": ["reptile", "animal", "nature"]}, "snake": {"a": "snake", "b": "1F40D", "j": ["serpent", "Ophiuchus", "zodiac", "nature", "hiss", "bearer", "evil", "animal", "python"]}, "dragon-face": {"a": "dragon face", "b": "1F432", "j": ["face", "myth", "fairy tale", "nature", "dragon", "chinese", "green", "animal"]}, "dragon": {"a": "dragon", "b": "1F409", "j": ["myth", "nature", "fairy tale", "chinese", "green", "animal"]}, "sauropod": {"a": "sauropod", "b": "1F995", "j": ["diplodocus", "brontosaurus", "nature", "dinosaur", "extinct", "animal", "brachiosaurus"]}, "trex": {"a": "T-Rex", "b": "1F996", "j": ["nature", "Tyrannosaurus Rex", "dinosaur", "t_rex", "tyrannosaurus", "extinct", "animal"]}, "spouting-whale": {"a": "spouting whale", "b": "1F433", "j": ["spouting", "whale", "sea", "face", "nature", "ocean", "animal"]}, "whale": {"a": "whale", "b": "1F40B", "j": ["ocean", "animal", "sea", "nature"]}, "dolphin": {"a": "dolphin", "b": "1F42C", "j": ["sea", "fish", "nature", "flipper", "ocean", "animal", "fins", "beach"]}, "seal": {"a": "seal", "b": "1F9AD", "j": ["sea", "sea lion", "animal", "creature"]}, "fish": {"a": "fish", "b": "1F41F", "j": ["zodiac", "nature", "Pisces", "food", "animal"]}, "tropical-fish": {"a": "tropical fish", "b": "1F420", "j": ["swim", "fish", "ocean", "nemo", "tropical", "animal", "beach"]}, "blowfish": {"a": "blowfish", "b": "1F421", "j": ["sea", "fish", "nature", "ocean", "food", "animal"]}, "shark": {"a": "shark", "b": "1F988", "j": ["jaws", "sea", "fish", "nature", "ocean", "animal", "fins", "beach"]}, "octopus": {"a": "octopus", "b": "1F419", "j": ["sea", "nature", "ocean", "creature", "animal", "beach"]}, "spiral-shell": {"a": "spiral shell", "b": "1F41A", "j": ["sea", "shell", "nature", "spiral", "beach"]}, "snail": {"a": "snail", "b": "1F40C", "j": ["slow", "animal", "shell"]}, "butterfly": {"a": "butterfly", "b": "1F98B", "j": ["caterpillar", "nature", "pretty", "insect", "animal"]}, "bug": {"a": "bug", "b": "1F41B", "j": ["worm", "insect", "animal", "nature"]}, "ant": {"a": "ant", "b": "1F41C", "j": ["bug", "insect", "animal", "nature"]}, "honeybee": {"a": "honeybee", "b": "1F41D", "j": ["spring", "nature", "bug", "bee", "honey", "insect", "animal"]}, "beetle": {"a": "beetle", "b": "1FAB2", "j": ["insect", "bug"]}, "lady-beetle": {"a": "lady beetle", "b": "1F41E", "j": ["beetle", "nature", "ladybird", "ladybug", "insect", "animal"]}, "cricket": {"a": "cricket", "b": "1F997", "j": ["chirp", "animal", "Orthoptera", "grasshopper"]}, "cockroach": {"a": "cockroach", "b": "1FAB3", "j": ["pest", "pests", "insect", "roach"]}, "spider": {"a": "spider", "b": "1F577", "j": ["arachnid", "animal", "insect"]}, "spider-web": {"a": "spider web", "b": "1F578", "j": ["silk", "spider", "arachnid", "insect", "animal", "web"]}, "scorpion": {"a": "scorpion", "b": "1F982", "j": ["Scorpio", "zodiac", "scorpio", "arachnid", "animal"]}, "mosquito": {"a": "mosquito", "b": "1F99F", "j": ["malaria", "pest", "nature", "disease", "fever", "insect", "animal", "virus"]}, "fly": {"a": "fly", "b": "1FAB0", "j": ["pest", "rotting", "disease", "maggot", "insect"]}, "worm": {"a": "worm", "b": "1FAB1", "j": ["earthworm", "animal", "annelid", "parasite"]}, "microbe": {"a": "microbe", "b": "1F9A0", "j": ["bacteria", "germs", "amoeba", "virus"]}, "bouquet": {"a": "bouquet", "b": "1F490", "j": ["flowers", "flower", "spring", "nature"]}, "cherry-blossom": {"a": "cherry blossom", "b": "1F338", "j": ["flower", "spring", "nature", "plant", "cherry", "blossom"]}, "white-flower": {"a": "white flower", "b": "1F4AE", "j": ["flower", "japanese", "spring"]}, "rosette": {"a": "rosette", "b": "1F3F5", "j": ["military", "plant", "decoration", "flower"]}, "rose": {"a": "rose", "b": "1F339", "j": ["flower", "love", "spring", "valentines", "flowers"]}, "wilted-flower": {"a": "wilted flower", "b": "1F940", "j": ["flower", "plant", "wilted", "nature"]}, "hibiscus": {"a": "hibiscus", "b": "1F33A", "j": ["flower", "plant", "flowers", "vegetable", "beach"]}, "sunflower": {"a": "sunflower", "b": "1F33B", "j": ["sun", "flower", "nature", "fall", "plant"]}, "blossom": {"a": "blossom", "b": "1F33C", "j": ["flowers", "flower", "yellow", "nature"]}, "tulip": {"a": "tulip", "b": "1F337", "j": ["flower", "spring", "nature", "plant", "summer", "flowers"]}, "seedling": {"a": "seedling", "b": "1F331", "j": ["spring", "young", "lawn", "nature", "plant", "grass"]}, "potted-plant": {"a": "potted plant", "b": "1FAB4", "j": ["house", "nurturing", "greenery", "grow", "plant", "useless", "boring"]}, "evergreen-tree": {"a": "evergreen tree", "b": "1F332", "j": ["tree", "plant", "nature"]}, "deciduous-tree": {"a": "deciduous tree", "b": "1F333", "j": ["shedding", "deciduous", "nature", "plant", "tree"]}, "palm-tree": {"a": "palm tree", "b": "1F334", "j": ["nature", "plant", "tree", "mojito", "summer", "tropical", "vegetable", "palm", "beach"]}, "cactus": {"a": "cactus", "b": "1F335", "j": ["plant", "vegetable", "nature"]}, "sheaf-of-rice": {"a": "sheaf of rice", "b": "1F33E", "j": ["rice", "grain", "nature", "ear", "plant"]}, "herb": {"a": "herb", "b": "1F33F", "j": ["weed", "leaf", "lawn", "medicine", "plant", "vegetable", "grass"]}, "shamrock": {"a": "shamrock", "b": "2618", "j": ["clover", "nature", "plant", "irish", "vegetable"]}, "four-leaf-clover": {"a": "four leaf clover", "b": "1F340", "j": ["four-leaf clover", "leaf", "lucky", "four", "clover", "nature", "plant", "4", "irish", "vegetable"]}, "maple-leaf": {"a": "maple leaf", "b": "1F341", "j": ["leaf", "maple", "ca", "nature", "fall", "plant", "falling", "vegetable"]}, "fallen-leaf": {"a": "fallen leaf", "b": "1F342", "j": ["leaf", "nature", "plant", "falling", "leaves", "vegetable"]}, "leaf-fluttering-in-wind": {"a": "leaf fluttering in wind", "b": "1F343", "j": ["flutter", "leaf", "spring", "lawn", "blow", "nature", "plant", "tree", "vegetable", "wind", "grass"]}, "grapes": {"a": "grapes", "b": "1F347", "j": ["wine", "grape", "food", "fruit"]}, "melon": {"a": "melon", "b": "1F348", "j": ["nature", "food", "fruit"]}, "watermelon": {"a": "watermelon", "b": "1F349", "j": ["fruit", "food", "picnic", "summer"]}, "tangerine": {"a": "tangerine", "b": "1F34A", "j": ["fruit", "food", "orange", "nature"]}, "lemon": {"a": "lemon", "b": "1F34B", "j": ["citrus", "nature", "fruit"]}, "banana": {"a": "banana", "b": "1F34C", "j": ["monkey", "food", "fruit"]}, "pineapple": {"a": "pineapple", "b": "1F34D", "j": ["nature", "food", "fruit"]}, "mango": {"a": "mango", "b": "1F96D", "j": ["tropical", "food", "fruit"]}, "red-apple": {"a": "red apple", "b": "1F34E", "j": ["apple", "fruit", "school", "mac", "red"]}, "green-apple": {"a": "green apple", "b": "1F34F", "j": ["fruit", "apple", "green", "nature"]}, "pear": {"a": "pear", "b": "1F350", "j": ["nature", "food", "fruit"]}, "peach": {"a": "peach", "b": "1F351", "j": ["nature", "food", "fruit"]}, "cherries": {"a": "cherries", "b": "1F352", "j": ["fruit", "red", "cherry", "food", "berries"]}, "strawberry": {"a": "strawberry", "b": "1F353", "j": ["fruit", "food", "berry", "nature"]}, "blueberries": {"a": "blueberries", "b": "1FAD0", "j": ["blue", "blueberry", "berry", "bilberry", "fruit"]}, "kiwi-fruit": {"a": "kiwi fruit", "b": "1F95D", "j": ["kiwi", "food", "fruit"]}, "tomato": {"a": "tomato", "b": "1F345", "j": ["fruit", "food", "vegetable", "nature"]}, "olive": {"a": "olive", "b": "1FAD2", "j": ["food", "fruit"]}, "coconut": {"a": "coconut", "b": "1F965", "j": ["fruit", "piña colada", "nature", "food", "palm"]}, "avocado": {"a": "avocado", "b": "1F951", "j": ["food", "fruit"]}, "eggplant": {"a": "eggplant", "b": "1F346", "j": ["aubergine", "food", "vegetable", "nature"]}, "potato": {"a": "potato", "b": "1F954", "j": ["tuber", "starch", "vegatable", "food", "vegetable"]}, "carrot": {"a": "carrot", "b": "1F955", "j": ["food", "vegetable", "orange"]}, "ear-of-corn": {"a": "ear of corn", "b": "1F33D", "j": ["corn", "maze", "ear", "food", "plant", "maize", "vegetable"]}, "hot-pepper": {"a": "hot pepper", "b": "1F336", "j": ["chili", "hot", "spicy", "pepper", "food", "chilli"]}, "bell-pepper": {"a": "bell pepper", "b": "1FAD1", "j": ["fruit", "pepper", "capsicum", "plant", "vegetable"]}, "cucumber": {"a": "cucumber", "b": "1F952", "j": ["pickle", "food", "vegetable", "fruit"]}, "leafy-green": {"a": "leafy green", "b": "1F96C", "j": ["cabbage", "kale", "bok choy", "plant", "food", "lettuce", "vegetable"]}, "broccoli": {"a": "broccoli", "b": "1F966", "j": ["wild cabbage", "food", "vegetable", "fruit"]}, "garlic": {"a": "garlic", "b": "1F9C4", "j": ["cook", "food", "flavoring", "spice"]}, "onion": {"a": "onion", "b": "1F9C5", "j": ["cook", "food", "flavoring", "spice"]}, "mushroom": {"a": "mushroom", "b": "1F344", "j": ["plant", "vegetable", "toadstool"]}, "peanuts": {"a": "peanuts", "b": "1F95C", "j": ["nut", "food", "vegetable", "peanut"]}, "chestnut": {"a": "chestnut", "b": "1F330", "j": ["plant", "food", "squirrel"]}, "bread": {"a": "bread", "b": "1F35E", "j": ["loaf", "toast", "breakfast", "food", "wheat"]}, "croissant": {"a": "croissant", "b": "1F950", "j": ["french", "bread", "breakfast", "food", "roll"]}, "baguette-bread": {"a": "baguette bread", "b": "1F956", "j": ["french", "baguette", "food", "bread"]}, "flatbread": {"a": "flatbread", "b": "1FAD3", "j": ["arepa", "lavash", "naan", "pita", "food", "flour"]}, "pretzel": {"a": "pretzel", "b": "1F968", "j": ["convoluted", "food", "bread", "twisted"]}, "bagel": {"a": "bagel", "b": "1F96F", "j": ["bread", "bakery", "breakfast", "food", "schmear"]}, "pancakes": {"a": "pancakes", "b": "1F95E", "j": ["hotcakes", "hotcake", "pancake", "flapjacks", "breakfast", "food", "crêpe"]}, "waffle": {"a": "waffle", "b": "1F9C7", "j": ["iron", "food", "breakfast", "indecisive"]}, "cheese-wedge": {"a": "cheese wedge", "b": "1F9C0", "j": ["chadder", "food", "cheese"]}, "meat-on-bone": {"a": "meat on bone", "b": "1F356", "j": ["drumstick", "bone", "good", "meat", "food"]}, "poultry-leg": {"a": "poultry leg", "b": "1F357", "j": ["leg", "drumstick", "bone", "poultry", "bird", "meat", "chicken", "food", "turkey"]}, "cut-of-meat": {"a": "cut of meat", "b": "1F969", "j": ["cow", "steak", "meat", "food", "lambchop", "chop", "porkchop", "cut"]}, "bacon": {"a": "bacon", "b": "1F953", "j": ["pig", "meat", "breakfast", "food", "pork"]}, "hamburger": {"a": "hamburger", "b": "1F354", "j": ["burger king", "fast food", "beef", "meat", "burger", "mcdonalds", "cheeseburger"]}, "french-fries": {"a": "french fries", "b": "1F35F", "j": ["fries", "fast food", "french", "chips", "snack"]}, "pizza": {"a": "pizza", "b": "1F355", "j": ["food", "cheese", "party", "slice"]}, "hot-dog": {"a": "hot dog", "b": "1F32D", "j": ["food", "hotdog", "sausage", "frankfurter"]}, "sandwich": {"a": "sandwich", "b": "1F96A", "j": ["lunch", "food", "bread"]}, "taco": {"a": "taco", "b": "1F32E", "j": ["food", "mexican"]}, "burrito": {"a": "burrito", "b": "1F32F", "j": ["food", "mexican", "wrap"]}, "tamale": {"a": "tamale", "b": "1FAD4", "j": ["masa", "food", "wrapped", "mexican"]}, "stuffed-flatbread": {"a": "stuffed flatbread", "b": "1F959", "j": ["kebab", "flatbread", "food", "stuffed", "gyro", "falafel"]}, "falafel": {"a": "falafel", "b": "1F9C6", "j": ["chickpea", "food", "meatball"]}, "egg": {"a": "egg", "b": "1F95A", "j": ["breakfast", "food", "chicken"]}, "cooking": {"a": "cooking", "b": "1F373", "j": ["breakfast", "food", "frying", "kitchen", "egg", "pan"]}, "shallow-pan-of-food": {"a": "shallow pan of food", "b": "1F958", "j": ["cooking", "shallow", "paella", "food", "pan", "casserole"]}, "pot-of-food": {"a": "pot of food", "b": "1F372", "j": ["pot", "stew", "soup", "meat", "food"]}, "fondue": {"a": "fondue", "b": "1FAD5", "j": ["pot", "melted", "cheese", "chocolate", "food", "Swiss"]}, "bowl-with-spoon": {"a": "bowl with spoon", "b": "1F963", "j": ["porridge", "breakfast", "food", "cereal", "congee", "oatmeal"]}, "green-salad": {"a": "green salad", "b": "1F957", "j": ["salad", "healthy", "food", "green", "lettuce"]}, "popcorn": {"a": "popcorn", "b": "1F37F", "j": ["snack", "food", "films", "movie theater"]}, "butter": {"a": "butter", "b": "1F9C8", "j": ["cook", "food", "dairy"]}, "salt": {"a": "salt", "b": "1F9C2", "j": ["shaker", "condiment"]}, "canned-food": {"a": "canned food", "b": "1F96B", "j": ["soup", "food", "can"]}, "bento-box": {"a": "bento box", "b": "1F371", "j": ["food", "box", "japanese", "bento"]}, "rice-cracker": {"a": "rice cracker", "b": "1F358", "j": ["rice", "food", "japanese", "cracker"]}, "rice-ball": {"a": "rice ball", "b": "1F359", "j": ["rice", "Japanese", "japanese", "ball", "food"]}, "cooked-rice": {"a": "cooked rice", "b": "1F35A", "j": ["china", "rice", "asian", "food", "cooked"]}, "curry-rice": {"a": "curry rice", "b": "1F35B", "j": ["curry", "rice", "hot", "spicy", "food", "indian"]}, "steaming-bowl": {"a": "steaming bowl", "b": "1F35C", "j": ["bowl", "japanese", "steaming", "food", "noodle", "ramen", "chopsticks"]}, "spaghetti": {"a": "spaghetti", "b": "1F35D", "j": ["italian", "food", "noodle", "pasta"]}, "roasted-sweet-potato": {"a": "roasted sweet potato", "b": "1F360", "j": ["roasted", "potato", "nature", "sweet", "food"]}, "oden": {"a": "oden", "b": "1F362", "j": ["stick", "kebab", "skewer", "japanese", "food", "seafood"]}, "sushi": {"a": "sushi", "b": "1F363", "j": ["rice", "food", "japanese", "fish"]}, "fried-shrimp": {"a": "fried shrimp", "b": "1F364", "j": ["prawn", "shrimp", "appetizer", "fried", "tempura", "food", "summer", "animal"]}, "fish-cake-with-swirl": {"a": "fish cake with swirl", "b": "1F365", "j": ["beach", "pink", "narutomaki", "sea", "fish", "surimi", "pastry", "cake", "food", "ramen", "swirl", "kamaboko", "japan"]}, "moon-cake": {"a": "moon cake", "b": "1F96E", "j": ["food", "yuèbǐng", "festival", "autumn"]}, "dango": {"a": "dango", "b": "1F361", "j": ["stick", "dessert", "Japanese", "japanese", "meat", "sweet", "barbecue", "food", "skewer"]}, "dumpling": {"a": "dumpling", "b": "1F95F", "j": ["jiaozi", "food", "pierogi", "empanada", "gyōza", "potsticker"]}, "fortune-cookie": {"a": "fortune cookie", "b": "1F960", "j": ["food", "prophecy"]}, "takeout-box": {"a": "takeout box", "b": "1F961", "j": ["oyster pail", "leftovers", "food"]}, "crab": {"a": "crab", "b": "1F980", "j": ["crustacean", "animal", "zodiac", "Cancer"]}, "lobster": {"a": "lobster", "b": "1F99E", "j": ["claws", "bisque", "nature", "animal", "seafood"]}, "shrimp": {"a": "shrimp", "b": "1F990", "j": ["shellfish", "nature", "ocean", "food", "small", "animal", "seafood"]}, "squid": {"a": "squid", "b": "1F991", "j": ["sea", "nature", "ocean", "food", "animal", "molusc"]}, "oyster": {"a": "oyster", "b": "1F9AA", "j": ["food", "pearl", "diving"]}, "soft-ice-cream": {"a": "soft ice cream", "b": "1F366", "j": ["hot", "dessert", "ice", "soft", "icecream", "sweet", "food", "summer", "cream"]}, "shaved-ice": {"a": "shaved ice", "b": "1F367", "j": ["hot", "dessert", "ice", "sweet", "summer", "shaved"]}, "ice-cream": {"a": "ice cream", "b": "1F368", "j": ["hot", "dessert", "ice", "sweet", "food", "cream"]}, "doughnut": {"a": "doughnut", "b": "1F369", "j": ["dessert", "sweet", "breakfast", "food", "snack", "donut"]}, "cookie": {"a": "cookie", "b": "1F36A", "j": ["dessert", "sweet", "chocolate", "food", "snack", "oreo"]}, "birthday-cake": {"a": "birthday cake", "b": "1F382", "j": ["birthday", "dessert", "pastry", "celebration", "sweet", "cake", "food"]}, "shortcake": {"a": "shortcake", "b": "1F370", "j": ["dessert", "pastry", "sweet", "cake", "food", "slice"]}, "cupcake": {"a": "cupcake", "b": "1F9C1", "j": ["sweet", "bakery", "dessert", "food"]}, "pie": {"a": "pie", "b": "1F967", "j": ["fruit", "dessert", "meat", "filling", "pastry", "food"]}, "chocolate-bar": {"a": "chocolate bar", "b": "1F36B", "j": ["dessert", "bar", "sweet", "chocolate", "food", "snack"]}, "candy": {"a": "candy", "b": "1F36C", "j": ["sweet", "snack", "dessert", "lolly"]}, "lollipop": {"a": "lollipop", "b": "1F36D", "j": ["dessert", "sweet", "candy", "food", "snack"]}, "custard": {"a": "custard", "b": "1F36E", "j": ["sweet", "dessert", "food", "pudding"]}, "honey-pot": {"a": "honey pot", "b": "1F36F", "j": ["pot", "kitchen", "bees", "sweet", "honeypot", "honey"]}, "baby-bottle": {"a": "baby bottle", "b": "1F37C", "j": ["milk", "drink", "bottle", "baby", "food", "container"]}, "glass-of-milk": {"a": "glass of milk", "b": "1F95B", "j": ["cow", "milk", "drink", "beverage", "glass"]}, "hot-beverage": {"a": "hot beverage", "b": "2615", "j": ["hot", "beverage", "drink", "steaming", "coffee", "caffeine", "tea", "latte", "espresso"]}, "teapot": {"a": "teapot", "b": "1FAD6", "j": ["hot", "pot", "drink", "tea"]}, "teacup-without-handle": {"a": "teacup without handle", "b": "1F375", "j": ["bowl", "cup", "british", "beverage", "teacup", "drink", "breakfast", "tea", "green"]}, "sake": {"a": "sake", "b": "1F376", "j": ["cup", "wine", "beverage", "drink", "drunk", "bottle", "bar", "japanese", "alcohol", "booze"]}, "bottle-with-popping-cork": {"a": "bottle with popping cork", "b": "1F37E", "j": ["wine", "drink", "bottle", "bar", "celebration", "popping", "cork"]}, "wine-glass": {"a": "wine glass", "b": "1F377", "j": ["wine", "beverage", "drink", "drunk", "alcohol", "bar", "booze", "glass"]}, "cocktail-glass": {"a": "cocktail glass", "b": "1F378", "j": ["drink", "alcohol", "drunk", "beverage", "bar", "cocktail", "mojito", "booze", "glass"]}, "tropical-drink": {"a": "tropical drink", "b": "1F379", "j": ["drink", "beverage", "alcohol", "bar", "cocktail", "mojito", "summer", "tropical", "booze", "beach"]}, "beer-mug": {"a": "beer mug", "b": "1F37A", "j": ["pub", "drink", "beverage", "drunk", "alcohol", "bar", "relax", "mug", "party", "summer", "booze", "beer"]}, "clinking-beer-mugs": {"a": "clinking beer mugs", "b": "1F37B", "j": ["pub", "drink", "beverage", "drunk", "alcohol", "clink", "bar", "relax", "mug", "party", "summer", "booze", "beer"]}, "clinking-glasses": {"a": "clinking glasses", "b": "1F942", "j": ["cheers", "toast", "champagne", "wine", "drink", "beverage", "alcohol", "clink", "party", "glass", "celebrate"]}, "tumbler-glass": {"a": "tumbler glass", "b": "1F943", "j": ["bourbon", "shot", "drink", "beverage", "drunk", "alcohol", "scotch", "liquor", "tumbler", "whisky", "booze", "glass"]}, "cup-with-straw": {"a": "cup with straw", "b": "1F964", "j": ["malt", "drink", "water", "soft drink", "soda", "juice"]}, "bubble-tea": {"a": "bubble tea", "b": "1F9CB", "j": ["bubble", "boba", "tea", "milk", "pearl", "straw", "milk tea", "taiwan"]}, "beverage-box": {"a": "beverage box", "b": "1F9C3", "j": ["beverage", "drink", "sweet", "straw", "juice", "box"]}, "mate": {"a": "mate", "b": "1F9C9", "j": ["drink", "beverage", "tea"]}, "ice": {"a": "ice", "b": "1F9CA", "j": ["iceberg", "cold", "ice cube", "water"]}, "chopsticks": {"a": "chopsticks", "b": "1F962", "j": ["food", "jeotgarak", "kuaizi", "hashi"]}, "fork-and-knife-with-plate": {"a": "fork and knife with plate", "b": "1F37D", "j": ["meal", "plate", "dinner", "knife", "eat", "lunch", "cooking", "food", "restaurant", "fork"]}, "fork-and-knife": {"a": "fork and knife", "b": "1F374", "j": ["knife", "cutlery", "cooking", "kitchen", "fork"]}, "spoon": {"a": "spoon", "b": "1F944", "j": ["kitchen", "tableware", "cutlery"]}, "kitchen-knife": {"a": "kitchen knife", "b": "1F52A", "j": ["hocho", "knife", "cutlery", "cooking", "weapon", "blade", "kitchen", "tool"]}, "amphora": {"a": "amphora", "b": "1F3FA", "j": ["Aquarius", "jar", "drink", "cooking", "zodiac", "vase", "jug"]}, "globe-showing-europeafrica": {"a": "globe showing Europe-Africa", "b": "1F30D", "j": ["Africa", "globe", "earth", "international", "Europe", "globe_showing_europe_africa", "world"]}, "globe-showing-americas": {"a": "globe showing Americas", "b": "1F30E", "j": ["globe", "earth", "international", "USA", "Americas", "world"]}, "globe-showing-asiaaustralia": {"a": "globe showing Asia-Australia", "b": "1F30F", "j": ["Asia", "globe", "earth", "globe_showing_asia_australia", "east", "Australia", "international", "world"]}, "globe-with-meridians": {"a": "globe with meridians", "b": "1F310", "j": ["meridians", "globe", "earth", "i18n", "international", "world", "internet", "interweb"]}, "world-map": {"a": "world map", "b": "1F5FA", "j": ["map", "location", "world", "direction"]}, "map-of-japan": {"a": "map of Japan", "b": "1F5FE", "j": ["asia", "map", "japanese", "country", "nation", "Japan"]}, "compass": {"a": "compass", "b": "1F9ED", "j": ["orienteering", "navigation", "magnetic"]}, "snowcapped-mountain": {"a": "snow-capped mountain", "b": "1F3D4", "j": ["snow", "mountain", "environment", "cold", "winter", "nature", "photo", "snow_capped_mountain"]}, "mountain": {"a": "mountain", "b": "26F0", "j": ["environment", "photo", "nature"]}, "volcano": {"a": "volcano", "b": "1F30B", "j": ["mountain", "eruption", "disaster", "nature", "photo"]}, "mount-fuji": {"a": "mount fuji", "b": "1F5FB", "j": ["fuji", "mountain", "japanese", "nature", "photo"]}, "camping": {"a": "camping", "b": "1F3D5", "j": ["outdoors", "photo", "tent"]}, "beach-with-umbrella": {"a": "beach with umbrella", "b": "1F3D6", "j": ["sand", "weather", "umbrella", "mojito", "summer", "sunny", "beach"]}, "desert": {"a": "desert", "b": "1F3DC", "j": ["warm", "saharah", "photo"]}, "desert-island": {"a": "desert island", "b": "1F3DD", "j": ["desert", "photo", "mojito", "tropical", "island"]}, "national-park": {"a": "national park", "b": "1F3DE", "j": ["environment", "park", "photo", "nature"]}, "stadium": {"a": "stadium", "b": "1F3DF", "j": ["venue", "sports", "place", "photo", "concert"]}, "classical-building": {"a": "classical building", "b": "1F3DB", "j": ["classical", "history", "culture", "art"]}, "building-construction": {"a": "building construction", "b": "1F3D7", "j": ["progress", "working", "wip", "construction"]}, "brick": {"a": "brick", "b": "1F9F1", "j": ["bricks", "wall", "clay", "mortar"]}, "rock": {"a": "rock", "b": "1FAA8", "j": ["stone", "heavy", "boulder", "solid"]}, "wood": {"a": "wood", "b": "1FAB5", "j": ["timber", "trunk", "log", "lumber", "nature"]}, "hut": {"a": "hut", "b": "1F6D6", "j": ["house", "structure", "yurt", "roundhouse"]}, "houses": {"a": "houses", "b": "1F3D8", "j": ["photo", "buildings"]}, "derelict-house": {"a": "derelict house", "b": "1F3DA", "j": ["abandon", "house", "broken", "building", "derelict", "evict"]}, "house": {"a": "house", "b": "1F3E0", "j": ["building", "home"]}, "house-with-garden": {"a": "house with garden", "b": "1F3E1", "j": ["garden", "house", "nature", "plant", "home"]}, "office-building": {"a": "office building", "b": "1F3E2", "j": ["bureau", "work", "building"]}, "japanese-post-office": {"a": "Japanese post office", "b": "1F3E3", "j": ["envelope", "communication", "Japanese", "building", "post"]}, "post-office": {"a": "post office", "b": "1F3E4", "j": ["email", "post", "European", "building"]}, "hospital": {"a": "hospital", "b": "1F3E5", "j": ["surgery", "building", "doctor", "medicine", "health"]}, "bank": {"a": "bank", "b": "1F3E6", "j": ["cash", "business", "building", "enterprise", "money", "sales"]}, "hotel": {"a": "hotel", "b": "1F3E8", "j": ["checkin", "accomodation", "building"]}, "love-hotel": {"a": "love hotel", "b": "1F3E9", "j": ["like", "dating", "love", "affection", "hotel"]}, "convenience-store": {"a": "convenience store", "b": "1F3EA", "j": ["shopping", "groceries", "building", "store", "convenience"]}, "school": {"a": "school", "b": "1F3EB", "j": ["learn", "building", "education", "student", "teach"]}, "department-store": {"a": "department store", "b": "1F3EC", "j": ["shopping", "department", "mall", "building", "store"]}, "factory": {"a": "factory", "b": "1F3ED", "j": ["smoke", "pollution", "building", "industry"]}, "japanese-castle": {"a": "Japanese castle", "b": "1F3EF", "j": ["castle", "Japanese", "photo", "building"]}, "castle": {"a": "castle", "b": "1F3F0", "j": ["history", "royalty", "European", "building"]}, "wedding": {"a": "wedding", "b": "1F492", "j": ["love", "like", "marriage", "bride", "groom", "romance", "chapel", "affection", "couple"]}, "tokyo-tower": {"a": "Tokyo tower", "b": "1F5FC", "j": ["japanese", "photo", "Tokyo", "tower"]}, "statue-of-liberty": {"a": "Statue of Liberty", "b": "1F5FD", "j": ["newyork", "liberty", "statue", "american"]}, "church": {"a": "church", "b": "26EA", "j": ["cross", "Christian", "building", "christ", "religion"]}, "mosque": {"a": "mosque", "b": "1F54C", "j": ["minaret", "worship", "islam", "Muslim", "religion"]}, "hindu-temple": {"a": "hindu temple", "b": "1F6D5", "j": ["hindu", "temple", "religion"]}, "synagogue": {"a": "synagogue", "b": "1F54D", "j": ["jewish", "Jew", "worship", "Jewish", "judaism", "temple", "religion"]}, "shinto-shrine": {"a": "shinto shrine", "b": "26E9", "j": ["kyoto", "shinto", "temple", "religion", "shrine", "japan"]}, "kaaba": {"a": "kaaba", "b": "1F54B", "j": ["mecca", "mosque", "islam", "Muslim", "religion"]}, "fountain": {"a": "fountain", "b": "26F2", "j": ["fresh", "photo", "summer", "water"]}, "tent": {"a": "tent", "b": "26FA", "j": ["photo", "outdoors", "camping"]}, "foggy": {"a": "foggy", "b": "1F301", "j": ["fog", "mountain", "photo"]}, "night-with-stars": {"a": "night with stars", "b": "1F303", "j": ["night", "downtown", "evening", "star", "city"]}, "cityscape": {"a": "cityscape", "b": "1F3D9", "j": ["night life", "urban", "city", "photo"]}, "sunrise-over-mountains": {"a": "sunrise over mountains", "b": "1F304", "j": ["sun", "sunrise", "mountain", "vacation", "morning", "view", "photo"]}, "sunrise": {"a": "sunrise", "b": "1F305", "j": ["sun", "vacation", "morning", "photo", "view"]}, "cityscape-at-dusk": {"a": "cityscape at dusk", "b": "1F306", "j": ["evening", "sunset", "city", "landscape", "sky", "dusk", "photo", "buildings"]}, "sunset": {"a": "sunset", "b": "1F307", "j": ["sun", "good morning", "dawn", "dusk", "photo"]}, "bridge-at-night": {"a": "bridge at night", "b": "1F309", "j": ["night", "sanfrancisco", "photo", "bridge"]}, "hot-springs": {"a": "hot springs", "b": "2668", "j": ["bath", "springs", "hot", "steaming", "relax", "warm", "hotsprings"]}, "carousel-horse": {"a": "carousel horse", "b": "1F3A0", "j": ["carnival", "carousel", "photo", "horse"]}, "ferris-wheel": {"a": "ferris wheel", "b": "1F3A1", "j": ["wheel", "carnival", "photo", "londoneye", "ferris", "amusement park"]}, "roller-coaster": {"a": "roller coaster", "b": "1F3A2", "j": ["coaster", "playground", "carnival", "photo", "fun", "roller", "amusement park"]}, "barber-pole": {"a": "barber pole", "b": "1F488", "j": ["salon", "hair", "style", "barber", "pole", "haircut"]}, "circus-tent": {"a": "circus tent", "b": "1F3AA", "j": ["festival", "carnival", "tent", "party", "circus"]}, "locomotive": {"a": "locomotive", "b": "1F682", "j": ["railway", "vehicle", "transportation", "engine", "train", "steam"]}, "railway-car": {"a": "railway car", "b": "1F683", "j": ["railway", "vehicle", "electric", "transportation", "tram", "trolleybus", "train", "car"]}, "highspeed-train": {"a": "high-speed train", "b": "1F684", "j": ["railway", "vehicle", "transportation", "speed", "high_speed_train", "train", "shinkansen"]}, "bullet-train": {"a": "bullet train", "b": "1F685", "j": ["railway", "vehicle", "bullet", "transportation", "fast", "speed", "travel", "shinkansen", "train", "public"]}, "train": {"a": "train", "b": "1F686", "j": ["railway", "vehicle", "transportation"]}, "metro": {"a": "metro", "b": "1F687", "j": ["subway", "transportation", "mrt", "blue-square", "underground", "tube"]}, "light-rail": {"a": "light rail", "b": "1F688", "j": ["railway", "vehicle", "transportation"]}, "station": {"a": "station", "b": "1F689", "j": ["railway", "vehicle", "transportation", "train", "public"]}, "tram": {"a": "tram", "b": "1F68A", "j": ["vehicle", "transportation", "trolleybus"]}, "monorail": {"a": "monorail", "b": "1F69D", "j": ["vehicle", "transportation"]}, "mountain-railway": {"a": "mountain railway", "b": "1F69E", "j": ["railway", "vehicle", "mountain", "transportation", "car"]}, "tram-car": {"a": "tram car", "b": "1F68B", "j": ["vehicle", "car", "transportation", "carriage", "trolleybus", "tram", "travel", "public"]}, "bus": {"a": "bus", "b": "1F68C", "j": ["vehicle", "transportation", "car"]}, "oncoming-bus": {"a": "oncoming bus", "b": "1F68D", "j": ["transportation", "vehicle", "oncoming", "bus"]}, "trolleybus": {"a": "trolleybus", "b": "1F68E", "j": ["vehicle", "bus", "transportation", "tram", "trolley", "bart"]}, "minibus": {"a": "minibus", "b": "1F690", "j": ["bus", "vehicle", "transportation", "car"]}, "ambulance": {"a": "ambulance", "b": "1F691", "j": ["hospital", "vehicle", "911", "health"]}, "fire-engine": {"a": "fire engine", "b": "1F692", "j": ["vehicle", "truck", "transportation", "engine", "cars", "fire"]}, "police-car": {"a": "police car", "b": "1F693", "j": ["vehicle", "police", "law", "transportation", "enforcement", "cars", "legal", "patrol", "car"]}, "oncoming-police-car": {"a": "oncoming police car", "b": "1F694", "j": ["vehicle", "police", "law", "oncoming", "enforcement", "911", "legal", "car"]}, "taxi": {"a": "taxi", "b": "1F695", "j": ["vehicle", "transportation", "cars", "uber"]}, "oncoming-taxi": {"a": "oncoming taxi", "b": "1F696", "j": ["vehicle", "oncoming", "cars", "uber", "taxi"]}, "automobile": {"a": "automobile", "b": "1F697", "j": ["vehicle", "transportation", "car", "red"]}, "oncoming-automobile": {"a": "oncoming automobile", "b": "1F698", "j": ["vehicle", "oncoming", "transportation", "automobile", "car"]}, "sport-utility-vehicle": {"a": "sport utility vehicle", "b": "1F699", "j": ["recreational", "vehicle", "sport utility", "transportation"]}, "pickup-truck": {"a": "pickup truck", "b": "1F6FB", "j": ["truck", "transportation", "pick-up", "pickup", "car"]}, "delivery-truck": {"a": "delivery truck", "b": "1F69A", "j": ["delivery", "transportation", "truck", "cars"]}, "articulated-lorry": {"a": "articulated lorry", "b": "1F69B", "j": ["vehicle", "truck", "lorry", "transportation", "express", "semi", "cars"]}, "tractor": {"a": "tractor", "b": "1F69C", "j": ["vehicle", "agriculture", "farming", "car"]}, "racing-car": {"a": "racing car", "b": "1F3CE", "j": ["formula", "f1", "fast", "sports", "race", "racing", "car"]}, "motorcycle": {"a": "motorcycle", "b": "1F3CD", "j": ["fast", "race", "sports", "racing"]}, "motor-scooter": {"a": "motor scooter", "b": "1F6F5", "j": ["vehicle", "scooter", "vespa", "sasha", "motor"]}, "manual-wheelchair": {"a": "manual wheelchair", "b": "1F9BD", "j": ["accessibility"]}, "motorized-wheelchair": {"a": "motorized wheelchair", "b": "1F9BC", "j": ["accessibility"]}, "auto-rickshaw": {"a": "auto rickshaw", "b": "1F6FA", "j": ["tuk tuk", "transportation", "move"]}, "bicycle": {"a": "bicycle", "b": "1F6B2", "j": ["bike", "hipster", "exercise", "sports"]}, "kick-scooter": {"a": "kick scooter", "b": "1F6F4", "j": ["scooter", "razor", "vehicle", "kick"]}, "skateboard": {"a": "skateboard", "b": "1F6F9", "j": ["board"]}, "roller-skate": {"a": "roller skate", "b": "1F6FC", "j": ["roller", "skate", "footwear", "sports"]}, "bus-stop": {"a": "bus stop", "b": "1F68F", "j": ["bus", "stop", "transportation", "busstop", "wait"]}, "motorway": {"a": "motorway", "b": "1F6E3", "j": ["highway", "road", "cupertino", "interstate"]}, "railway-track": {"a": "railway track", "b": "1F6E4", "j": ["railway", "train", "transportation"]}, "oil-drum": {"a": "oil drum", "b": "1F6E2", "j": ["barrell", "drum", "oil"]}, "fuel-pump": {"a": "fuel pump", "b": "26FD", "j": ["petroleum", "gas", "fuel", "pump", "fuelpump", "station", "gas station", "diesel"]}, "police-car-light": {"a": "police car light", "b": "1F6A8", "j": ["revolving", "beacon", "police", "alert", "law", "pinged", "emergency", "light", "ambulance", "911", "legal", "error", "car"]}, "horizontal-traffic-light": {"a": "horizontal traffic light", "b": "1F6A5", "j": ["transportation", "traffic", "light", "signal"]}, "vertical-traffic-light": {"a": "vertical traffic light", "b": "1F6A6", "j": ["traffic", "transportation", "light", "driving", "signal"]}, "stop-sign": {"a": "stop sign", "b": "1F6D1", "j": ["octagonal", "sign", "stop"]}, "construction": {"a": "construction", "b": "1F6A7", "j": ["warning", "wip", "barrier", "progress", "caution"]}, "anchor": {"a": "anchor", "b": "2693", "j": ["boat", "sea", "ferry", "ship", "tool"]}, "sailboat": {"a": "sailboat", "b": "26F5", "j": ["yacht", "resort", "boat", "sailing", "sea", "transportation", "water", "ship", "summer"]}, "canoe": {"a": "canoe", "b": "1F6F6", "j": ["paddle", "ship", "water", "boat"]}, "speedboat": {"a": "speedboat", "b": "1F6A4", "j": ["vehicle", "boat", "transportation", "ship", "summer"]}, "passenger-ship": {"a": "passenger ship", "b": "1F6F3", "j": ["yacht", "passenger", "cruise", "ferry", "ship"]}, "ferry": {"a": "ferry", "b": "26F4", "j": ["yacht", "ship", "passenger", "boat"]}, "motor-boat": {"a": "motor boat", "b": "1F6E5", "j": ["ship", "motorboat", "boat"]}, "ship": {"a": "ship", "b": "1F6A2", "j": ["titanic", "passenger", "boat", "transportation", "deploy"]}, "airplane": {"a": "airplane", "b": "2708", "j": ["vehicle", "flight", "transportation", "fly", "aeroplane"]}, "small-airplane": {"a": "small airplane", "b": "1F6E9", "j": ["vehicle", "flight", "transportation", "fly", "airplane", "aeroplane"]}, "airplane-departure": {"a": "airplane departure", "b": "1F6EB", "j": ["departure", "flight", "check-in", "airport", "airplane", "departures", "aeroplane", "landing"]}, "airplane-arrival": {"a": "airplane arrival", "b": "1F6EC", "j": ["arrivals", "arriving", "flight", "boarding", "airport", "airplane", "aeroplane", "landing"]}, "parachute": {"a": "parachute", "b": "1FA82", "j": ["skydive", "hang-glide", "fly", "parasail", "glide"]}, "seat": {"a": "seat", "b": "1F4BA", "j": ["bus", "transport", "flight", "chair", "sit", "fly", "airplane"]}, "helicopter": {"a": "helicopter", "b": "1F681", "j": ["vehicle", "transportation", "fly"]}, "suspension-railway": {"a": "suspension railway", "b": "1F69F", "j": ["railway", "vehicle", "transportation", "suspension"]}, "mountain-cableway": {"a": "mountain cableway", "b": "1F6A0", "j": ["vehicle", "mountain", "transportation", "ski", "gondola", "cable"]}, "aerial-tramway": {"a": "aerial tramway", "b": "1F6A1", "j": ["vehicle", "aerial", "transportation", "ski", "gondola", "cable", "tramway", "car"]}, "satellite": {"a": "satellite", "b": "1F6F0", "j": ["communication", "gps", "ISS", "space", "NASA", "orbit", "spaceflight"]}, "rocket": {"a": "rocket", "b": "1F680", "j": ["outer space", "launch", "NASA", "ship", "space", "staffmode", "fly", "outer_space"]}, "flying-saucer": {"a": "flying saucer", "b": "1F6F8", "j": ["transportation", "vehicle", "ufo", "UFO"]}, "bellhop-bell": {"a": "bellhop bell", "b": "1F6CE", "j": ["service", "bellhop", "hotel", "bell"]}, "luggage": {"a": "luggage", "b": "1F9F3", "j": ["packing", "travel"]}, "hourglass-done": {"a": "hourglass done", "b": "231B", "j": ["test", "quiz", "timer", "sand", "limit", "oldschool", "exam", "clock", "time"]}, "hourglass-not-done": {"a": "hourglass not done", "b": "23F3", "j": ["hourglass", "timer", "sand", "oldschool", "countdown", "time"]}, "watch": {"a": "watch", "b": "231A", "j": ["accessories", "clock", "time"]}, "alarm-clock": {"a": "alarm clock", "b": "23F0", "j": ["alarm", "clock", "wake", "time"]}, "stopwatch": {"a": "stopwatch", "b": "23F1", "j": ["clock", "time", "deadline"]}, "timer-clock": {"a": "timer clock", "b": "23F2", "j": ["clock", "alarm", "timer"]}, "mantelpiece-clock": {"a": "mantelpiece clock", "b": "1F570", "j": ["clock", "time"]}, "twelve-oclock": {"a": "twelve o’clock", "b": "1F55B", "j": ["midnight", "12", "12:00", "twelve", "midday", "noon", "late", "o’clock", "early", "twelve_o_clock", "schedule", "00", "clock", "time"]}, "twelvethirty": {"a": "twelve-thirty", "b": "1F567", "j": ["12", "twelve_thirty", "thirty", "twelve", "late", "early", "schedule", "12:30", "clock", "time"]}, "one-oclock": {"a": "one o’clock", "b": "1F550", "j": ["1:00", "1", "late", "time", "early", "o’clock", "schedule", "00", "one_o_clock", "clock", "one"]}, "onethirty": {"a": "one-thirty", "b": "1F55C", "j": ["1", "1:30", "thirty", "late", "time", "early", "schedule", "one_thirty", "clock", "one"]}, "two-oclock": {"a": "two o’clock", "b": "1F551", "j": ["two_o_clock", "2", "2:00", "late", "early", "schedule", "o’clock", "00", "clock", "two", "time"]}, "twothirty": {"a": "two-thirty", "b": "1F55D", "j": ["two_thirty", "2", "thirty", "late", "2:30", "early", "schedule", "clock", "two", "time"]}, "three-oclock": {"a": "three o’clock", "b": "1F552", "j": ["3:00", "three_o_clock", "late", "3", "early", "o’clock", "three", "schedule", "00", "clock", "time"]}, "threethirty": {"a": "three-thirty", "b": "1F55E", "j": ["thirty", "late", "3", "3:30", "three", "three_thirty", "early", "schedule", "clock", "time"]}, "four-oclock": {"a": "four o’clock", "b": "1F553", "j": ["four", "late", "early", "schedule", "o’clock", "4", "00", "four_o_clock", "clock", "4:00", "time"]}, "fourthirty": {"a": "four-thirty", "b": "1F55F", "j": ["thirty", "four", "late", "4:30", "early", "schedule", "four_thirty", "4", "clock", "time"]}, "five-oclock": {"a": "five o’clock", "b": "1F554", "j": ["five_o_clock", "late", "early", "schedule", "o’clock", "five", "00", "5:00", "5", "clock", "time"]}, "fivethirty": {"a": "five-thirty", "b": "1F560", "j": ["five_thirty", "thirty", "late", "early", "schedule", "five", "5", "clock", "5:30", "time"]}, "six-oclock": {"a": "six o’clock", "b": "1F555", "j": ["late", "early", "schedule", "o’clock", "six_o_clock", "6", "dawn", "00", "dusk", "6:00", "clock", "six", "time"]}, "sixthirty": {"a": "six-thirty", "b": "1F561", "j": ["thirty", "6:30", "late", "early", "schedule", "6", "six_thirty", "clock", "six", "time"]}, "seven-oclock": {"a": "seven o’clock", "b": "1F556", "j": ["7:00", "7", "seven_o_clock", "late", "early", "schedule", "o’clock", "seven", "00", "clock", "time"]}, "seventhirty": {"a": "seven-thirty", "b": "1F562", "j": ["seven_thirty", "7", "thirty", "7:30", "late", "early", "schedule", "seven", "clock", "time"]}, "eight-oclock": {"a": "eight o’clock", "b": "1F557", "j": ["8:00", "eight", "late", "o’clock", "early", "schedule", "00", "eight_o_clock", "clock", "8", "time"]}, "eightthirty": {"a": "eight-thirty", "b": "1F563", "j": ["8:30", "thirty", "eight_thirty", "eight", "late", "early", "schedule", "clock", "8", "time"]}, "nine-oclock": {"a": "nine o’clock", "b": "1F558", "j": ["nine", "9:00", "9", "nine_o_clock", "late", "early", "schedule", "o’clock", "00", "clock", "time"]}, "ninethirty": {"a": "nine-thirty", "b": "1F564", "j": ["nine", "9", "thirty", "late", "nine_thirty", "early", "schedule", "9:30", "clock", "time"]}, "ten-oclock": {"a": "ten o’clock", "b": "1F559", "j": ["ten", "late", "early", "schedule", "o’clock", "10:00", "00", "10", "ten_o_clock", "clock", "time"]}, "tenthirty": {"a": "ten-thirty", "b": "1F565", "j": ["10:30", "thirty", "ten", "late", "early", "schedule", "ten_thirty", "10", "clock", "time"]}, "eleven-oclock": {"a": "eleven o’clock", "b": "1F55A", "j": ["eleven_o_clock", "eleven", "late", "early", "schedule", "o’clock", "00", "11", "clock", "11:00", "time"]}, "eleventhirty": {"a": "eleven-thirty", "b": "1F566", "j": ["thirty", "eleven", "eleven_thirty", "late", "early", "schedule", "11:30", "11", "clock", "time"]}, "new-moon": {"a": "new moon", "b": "1F311", "j": ["night", "sleep", "evening", "moon", "nature", "space", "planet", "dark", "twilight"]}, "waxing-crescent-moon": {"a": "waxing crescent moon", "b": "1F312", "j": ["night", "sleep", "evening", "crescent", "moon", "nature", "space", "planet", "waxing", "twilight"]}, "first-quarter-moon": {"a": "first quarter moon", "b": "1F313", "j": ["night", "sleep", "evening", "moon", "nature", "space", "planet", "quarter", "twilight"]}, "waxing-gibbous-moon": {"a": "waxing gibbous moon", "b": "1F314", "j": ["night", "sleep", "evening", "moon", "nature", "sky", "space", "planet", "gibbous", "gray", "waxing", "twilight"]}, "full-moon": {"a": "full moon", "b": "1F315", "j": ["night", "full", "sleep", "evening", "moon", "nature", "space", "yellow", "planet", "twilight"]}, "waning-gibbous-moon": {"a": "waning gibbous moon", "b": "1F316", "j": ["night", "sleep", "waning", "evening", "moon", "nature", "waxing_gibbous_moon", "space", "planet", "gibbous", "twilight"]}, "last-quarter-moon": {"a": "last quarter moon", "b": "1F317", "j": ["night", "sleep", "evening", "moon", "nature", "space", "planet", "quarter", "twilight"]}, "waning-crescent-moon": {"a": "waning crescent moon", "b": "1F318", "j": ["night", "sleep", "waning", "evening", "crescent", "moon", "nature", "space", "planet", "twilight"]}, "crescent-moon": {"a": "crescent moon", "b": "1F319", "j": ["night", "sleep", "evening", "crescent", "moon", "sky", "magic"]}, "new-moon-face": {"a": "new moon face", "b": "1F31A", "j": ["night", "sleep", "evening", "moon", "face", "nature", "space", "planet", "twilight"]}, "first-quarter-moon-face": {"a": "first quarter moon face", "b": "1F31B", "j": ["night", "sleep", "evening", "moon", "face", "nature", "space", "planet", "quarter", "twilight"]}, "last-quarter-moon-face": {"a": "last quarter moon face", "b": "1F31C", "j": ["night", "sleep", "evening", "moon", "face", "nature", "space", "planet", "quarter", "twilight"]}, "thermometer": {"a": "thermometer", "b": "1F321", "j": ["weather", "hot", "cold", "temperature"]}, "sun": {"a": "sun", "b": "2600", "j": ["brightness", "rays", "spring", "bright", "nature", "weather", "summer", "sunny", "beach"]}, "full-moon-face": {"a": "full moon face", "b": "1F31D", "j": ["night", "full", "sleep", "evening", "moon", "bright", "face", "nature", "space", "planet", "twilight"]}, "sun-with-face": {"a": "sun with face", "b": "1F31E", "j": ["sun", "bright", "face", "nature", "sky", "morning"]}, "ringed-planet": {"a": "ringed planet", "b": "1FA90", "j": ["outerspace", "saturnine", "saturn"]}, "star": {"a": "star", "b": "2B50", "j": ["night", "yellow"]}, "glowing-star": {"a": "glowing star", "b": "1F31F", "j": ["awesome", "night", "shining", "star", "good", "glittery", "glow", "sparkle", "magic"]}, "shooting-star": {"a": "shooting star", "b": "1F320", "j": ["shooting", "night", "star", "falling", "photo"]}, "milky-way": {"a": "milky way", "b": "1F30C", "j": ["stars", "space", "photo"]}, "cloud": {"a": "cloud", "b": "2601", "j": ["weather", "sky"]}, "sun-behind-cloud": {"a": "sun behind cloud", "b": "26C5", "j": ["sun", "spring", "cloud", "nature", "weather", "morning", "fall", "cloudy"]}, "cloud-with-lightning-and-rain": {"a": "cloud with lightning and rain", "b": "26C8", "j": ["lightning", "rain", "cloud", "weather", "thunder"]}, "sun-behind-small-cloud": {"a": "sun behind small cloud", "b": "1F324", "j": ["sun", "weather", "cloud"]}, "sun-behind-large-cloud": {"a": "sun behind large cloud", "b": "1F325", "j": ["sun", "weather", "cloud"]}, "sun-behind-rain-cloud": {"a": "sun behind rain cloud", "b": "1F326", "j": ["sun", "weather", "rain", "cloud"]}, "cloud-with-rain": {"a": "cloud with rain", "b": "1F327", "j": ["weather", "rain", "cloud"]}, "cloud-with-snow": {"a": "cloud with snow", "b": "1F328", "j": ["weather", "snow", "cold", "cloud"]}, "cloud-with-lightning": {"a": "cloud with lightning", "b": "1F329", "j": ["weather", "lightning", "thunder", "cloud"]}, "tornado": {"a": "tornado", "b": "1F32A", "j": ["cyclone", "cloud", "weather", "twister", "whirlwind"]}, "fog": {"a": "fog", "b": "1F32B", "j": ["weather", "cloud"]}, "wind-face": {"a": "wind face", "b": "1F32C", "j": ["air", "blow", "face", "cloud", "gust", "wind"]}, "cyclone": {"a": "cyclone", "b": "1F300", "j": ["blue", "spin", "whirlpool", "typhoon", "cloud", "weather", "twister", "spiral", "dizzy", "hurricane", "vortex", "swirl", "tornado"]}, "rainbow": {"a": "rainbow", "b": "1F308", "j": ["rain", "spring", "nature", "sky", "photo", "unicorn_face", "happy"]}, "closed-umbrella": {"a": "closed umbrella", "b": "1F302", "j": ["rain", "umbrella", "weather", "clothing", "drizzle"]}, "umbrella": {"a": "umbrella", "b": "2602", "j": ["weather", "clothing", "rain", "spring"]}, "umbrella-with-rain-drops": {"a": "umbrella with rain drops", "b": "2614", "j": ["drop", "rain", "spring", "rainy", "umbrella", "clothing", "weather"]}, "umbrella-on-ground": {"a": "umbrella on ground", "b": "26F1", "j": ["sun", "rain", "umbrella", "weather", "summer"]}, "high-voltage": {"a": "high voltage", "b": "26A1", "j": ["danger", "lightning", "electric", "lightning bolt", "zap", "fast", "weather", "thunder", "voltage"]}, "snowflake": {"a": "snowflake", "b": "2744", "j": ["snow", "cold", "xmas", "winter", "season", "weather", "christmas"]}, "snowman": {"a": "snowman", "b": "2603", "j": ["snow", "cold", "winter", "xmas", "season", "weather", "frozen", "christmas"]}, "snowman-without-snow": {"a": "snowman without snow", "b": "26C4", "j": ["snow", "snowman", "cold", "winter", "xmas", "season", "weather", "frozen", "without_snow", "christmas"]}, "comet": {"a": "comet", "b": "2604", "j": ["space"]}, "fire": {"a": "fire", "b": "1F525", "j": ["flame", "cook", "tool", "hot"]}, "droplet": {"a": "droplet", "b": "1F4A7", "j": ["drop", "sweat", "drip", "spring", "cold", "water", "comic", "faucet"]}, "water-wave": {"a": "water wave", "b": "1F30A", "j": ["wave", "tsunami", "disaster", "sea", "water", "nature", "ocean"]}, "jackolantern": {"a": "jack-o-lantern", "b": "1F383", "j": ["jack_o_lantern", "creepy", "celebration", "halloween", "pumpkin", "light", "fall", "jack", "lantern"]}, "christmas-tree": {"a": "Christmas tree", "b": "1F384", "j": ["vacation", "festival", "xmas", "celebration", "Christmas", "december", "tree"]}, "fireworks": {"a": "fireworks", "b": "1F386", "j": ["congratulations", "festival", "celebration", "carnival", "photo"]}, "sparkler": {"a": "sparkler", "b": "1F387", "j": ["night", "fireworks", "shine", "stars", "celebration", "sparkle"]}, "firecracker": {"a": "firecracker", "b": "1F9E8", "j": ["boom", "fireworks", "explode", "explosion", "explosive", "dynamite"]}, "sparkles": {"a": "sparkles", "b": "2728", "j": ["awesome", "shiny", "cool", "shine", "star", "stars", "*", "good", "sparkle", "magic"]}, "balloon": {"a": "balloon", "b": "1F388", "j": ["birthday", "circus", "celebration", "party"]}, "party-popper": {"a": "party popper", "b": "1F389", "j": ["birthday", "tada", "congratulations", "popper", "celebration", "party", "circus", "magic"]}, "confetti-ball": {"a": "confetti ball", "b": "1F38A", "j": ["birthday", "festival", "ball", "celebration", "party", "confetti", "circus"]}, "tanabata-tree": {"a": "tanabata tree", "b": "1F38B", "j": ["banner", "Japanese", "nature", "celebration", "plant", "summer", "tree", "branch"]}, "pine-decoration": {"a": "pine decoration", "b": "1F38D", "j": ["bamboo", "panda", "pine", "Japanese", "nature", "celebration", "plant", "vegetable"]}, "japanese-dolls": {"a": "Japanese dolls", "b": "1F38E", "j": ["toy", "Japanese", "festival", "japanese", "celebration", "kimono", "doll"]}, "carp-streamer": {"a": "carp streamer", "b": "1F38F", "j": ["carp", "banner", "japanese", "fish", "celebration", "streamer", "koinobori"]}, "wind-chime": {"a": "wind chime", "b": "1F390", "j": ["ding", "spring", "chime", "bell", "celebration", "nature", "wind"]}, "moon-viewing-ceremony": {"a": "moon viewing ceremony", "b": "1F391", "j": ["tsukimi", "asia", "moon", "celebration", "ceremony", "photo", "japan"]}, "red-envelope": {"a": "red envelope", "b": "1F9E7", "j": ["hóngbāo", "lai see", "gift", "money", "good luck"]}, "ribbon": {"a": "ribbon", "b": "1F380", "j": ["bowtie", "pink", "girl", "decoration", "celebration"]}, "wrapped-gift": {"a": "wrapped gift", "b": "1F381", "j": ["birthday", "xmas", "celebration", "gift", "present", "wrapped", "box", "christmas"]}, "reminder-ribbon": {"a": "reminder ribbon", "b": "1F397", "j": ["cause", "support", "sports", "celebration", "reminder", "awareness", "ribbon"]}, "admission-tickets": {"a": "admission tickets", "b": "1F39F", "j": ["admission", "sports", "ticket", "entrance", "concert"]}, "ticket": {"a": "ticket", "b": "1F3AB", "j": ["admission", "event", "pass", "concert"]}, "military-medal": {"a": "military medal", "b": "1F396", "j": ["medal", "military", "award", "celebration", "army", "winning"]}, "trophy": {"a": "trophy", "b": "1F3C6", "j": ["ftw", "award", "contest", "place", "ceremony", "win", "prize"]}, "sports-medal": {"a": "sports medal", "b": "1F3C5", "j": ["medal", "winning", "award"]}, "1st-place-medal": {"a": "1st place medal", "b": "1F947", "j": ["medal", "award", "first", "gold", "winning"]}, "2nd-place-medal": {"a": "2nd place medal", "b": "1F948", "j": ["second", "medal", "award", "silver"]}, "3rd-place-medal": {"a": "3rd place medal", "b": "1F949", "j": ["medal", "award", "third", "bronze"]}, "soccer-ball": {"a": "soccer ball", "b": "26BD", "j": ["sports", "soccer", "football", "ball"]}, "baseball": {"a": "baseball", "b": "26BE", "j": ["balls", "sports", "ball"]}, "softball": {"a": "softball", "b": "1F94E", "j": ["underarm", "sports", "ball", "balls", "glove"]}, "basketball": {"a": "basketball", "b": "1F3C0", "j": ["hoop", "sports", "ball", "balls", "NBA"]}, "volleyball": {"a": "volleyball", "b": "1F3D0", "j": ["game", "balls", "sports", "ball"]}, "american-football": {"a": "american football", "b": "1F3C8", "j": ["sports", "NFL", "ball", "balls", "american", "football"]}, "rugby-football": {"a": "rugby football", "b": "1F3C9", "j": ["team", "sports", "ball", "rugby", "football"]}, "tennis": {"a": "tennis", "b": "1F3BE", "j": ["racquet", "sports", "ball", "balls", "green"]}, "flying-disc": {"a": "flying disc", "b": "1F94F", "j": ["frisbee", "ultimate", "sports"]}, "bowling": {"a": "bowling", "b": "1F3B3", "j": ["play", "sports", "ball", "game", "fun"]}, "cricket-game": {"a": "cricket game", "b": "1F3CF", "j": ["ball", "game", "bat", "sports"]}, "field-hockey": {"a": "field hockey", "b": "1F3D1", "j": ["stick", "ball", "sports", "field", "game", "hockey"]}, "ice-hockey": {"a": "ice hockey", "b": "1F3D2", "j": ["stick", "hockey", "ice", "sports", "game", "puck"]}, "lacrosse": {"a": "lacrosse", "b": "1F94D", "j": ["stick", "goal", "sports", "ball"]}, "ping-pong": {"a": "ping pong", "b": "1F3D3", "j": ["pingpong", "bat", "sports", "paddle", "ball", "game", "table tennis"]}, "badminton": {"a": "badminton", "b": "1F3F8", "j": ["shuttlecock", "racquet", "sports", "game", "birdie"]}, "boxing-glove": {"a": "boxing glove", "b": "1F94A", "j": ["boxing", "fighting", "sports", "glove"]}, "martial-arts-uniform": {"a": "martial arts uniform", "b": "1F94B", "j": ["judo", "martial arts", "taekwondo", "uniform", "karate"]}, "goal-net": {"a": "goal net", "b": "1F945", "j": ["goal", "net", "sports"]}, "flag-in-hole": {"a": "flag in hole", "b": "26F3", "j": ["business", "flag", "golf", "sports", "summer", "hole"]}, "ice-skate": {"a": "ice skate", "b": "26F8", "j": ["ice", "skate", "sports"]}, "fishing-pole": {"a": "fishing pole", "b": "1F3A3", "j": ["hobby", "fish", "food", "pole", "summer"]}, "diving-mask": {"a": "diving mask", "b": "1F93F", "j": ["scuba", "diving", "sport", "ocean", "snorkeling"]}, "running-shirt": {"a": "running shirt", "b": "1F3BD", "j": ["sash", "shirt", "athletics", "play", "pageant", "running"]}, "skis": {"a": "skis", "b": "1F3BF", "j": ["snow", "cold", "winter", "sports", "ski"]}, "sled": {"a": "sled", "b": "1F6F7", "j": ["luge", "toboggan", "sledge", "sleigh"]}, "curling-stone": {"a": "curling stone", "b": "1F94C", "j": ["game", "rock", "sports"]}, "bullseye": {"a": "bullseye", "b": "1F3AF", "j": ["target", "direct hit", "play", "dart", "hit", "bar", "game", "direct_hit"]}, "yoyo": {"a": "yo-yo", "b": "1FA80", "j": ["fluctuate", "toy", "yo_yo"]}, "kite": {"a": "kite", "b": "1FA81", "j": ["soar", "wind", "fly"]}, "pool-8-ball": {"a": "pool 8 ball", "b": "1F3B1", "j": ["pool", "hobby", "billiard", "eight", "ball", "game", "luck", "8", "magic"]}, "crystal-ball": {"a": "crystal ball", "b": "1F52E", "j": ["disco", "tool", "crystal", "ball", "fairy tale", "fantasy", "party", "fortune_teller", "circus", "fortune", "magic"]}, "magic-wand": {"a": "magic wand", "b": "1FA84", "j": ["witch", "power", "supernature", "wizard", "magic"]}, "nazar-amulet": {"a": "nazar amulet", "b": "1F9FF", "j": ["talisman", "charm", "bead", "nazar", "evil-eye"]}, "video-game": {"a": "video game", "b": "1F3AE", "j": ["controller", "play", "game", "PS4", "console"]}, "joystick": {"a": "joystick", "b": "1F579", "j": ["play", "game", "video game"]}, "slot-machine": {"a": "slot machine", "b": "1F3B0", "j": ["slot", "gamble", "casino", "game", "luck", "fruit machine", "bet", "vegas"]}, "game-die": {"a": "game die", "b": "1F3B2", "j": ["random", "play", "dice", "game", "luck", "die", "tabletop"]}, "puzzle-piece": {"a": "puzzle piece", "b": "1F9E9", "j": ["puzzle", "interlocking", "clue", "piece", "jigsaw"]}, "teddy-bear": {"a": "teddy bear", "b": "1F9F8", "j": ["plush", "toy", "plaything", "stuffed"]}, "piata": {"a": "piñata", "b": "1FA85", "j": ["mexico", "celebration", "candy", "pinata", "party"]}, "nesting-dolls": {"a": "nesting dolls", "b": "1FA86", "j": ["nesting", "toy", "russia", "matryoshka", "doll"]}, "spade-suit": {"a": "spade suit", "b": "2660", "j": ["card", "cards", "suits", "game", "poker", "magic"]}, "heart-suit": {"a": "heart suit", "b": "2665", "j": ["card", "cards", "suits", "game", "poker", "magic"]}, "diamond-suit": {"a": "diamond suit", "b": "2666", "j": ["card", "cards", "suits", "game", "poker", "magic"]}, "club-suit": {"a": "club suit", "b": "2663", "j": ["card", "cards", "suits", "game", "poker", "magic"]}, "chess-pawn": {"a": "chess pawn", "b": "265F", "j": ["chess", "expendable", "dupe"]}, "joker": {"a": "joker", "b": "1F0CF", "j": ["play", "magic", "card", "game", "poker", "wildcard", "cards"]}, "mahjong-red-dragon": {"a": "mahjong red dragon", "b": "1F004", "j": ["play", "mahjong", "kanji", "game", "red", "chinese"]}, "flower-playing-cards": {"a": "flower playing cards", "b": "1F3B4", "j": ["flower", "sunset", "card", "Japanese", "playing", "game", "red"]}, "performing-arts": {"a": "performing arts", "b": "1F3AD", "j": ["theater", "acting", "mask", "performing", "drama", "art", "theatre"]}, "framed-picture": {"a": "framed picture", "b": "1F5BC", "j": ["picture", "photography", "painting", "frame", "museum", "art"]}, "artist-palette": {"a": "artist palette", "b": "1F3A8", "j": ["draw", "design", "colors", "paint", "palette", "painting", "museum", "art"]}, "thread": {"a": "thread", "b": "1F9F5", "j": ["string", "needle", "spool", "sewing"]}, "sewing-needle": {"a": "sewing needle", "b": "1FAA1", "j": ["sutures", "stitches", "embroidery", "tailoring", "sewing", "needle"]}, "yarn": {"a": "yarn", "b": "1F9F6", "j": ["crochet", "knit", "ball"]}, "knot": {"a": "knot", "b": "1FAA2", "j": ["tangled", "twist", "rope", "tie", "twine", "scout"]}, "glasses": {"a": "glasses", "b": "1F453", "j": ["accessories", "nerdy", "geek", "eyeglasses", "eyesight", "clothing", "eye", "fashion", "eyewear", "dork"]}, "sunglasses": {"a": "sunglasses", "b": "1F576", "j": ["accessories", "glasses", "cool", "face", "eye", "eyewear", "dark"]}, "goggles": {"a": "goggles", "b": "1F97D", "j": ["welding", "swimming", "protection", "safety", "eye protection", "eyes"]}, "lab-coat": {"a": "lab coat", "b": "1F97C", "j": ["scientist", "chemist", "doctor", "experiment"]}, "safety-vest": {"a": "safety vest", "b": "1F9BA", "j": ["protection", "safety", "emergency", "vest"]}, "necktie": {"a": "necktie", "b": "1F454", "j": ["shirt", "business", "cloth", "formal", "tie", "clothing", "suitup", "fashion"]}, "tshirt": {"a": "t-shirt", "b": "1F455", "j": ["t_shirt", "shirt", "cloth", "clothing", "fashion", "tee", "casual"]}, "jeans": {"a": "jeans", "b": "1F456", "j": ["shopping", "trousers", "clothing", "fashion", "pants"]}, "scarf": {"a": "scarf", "b": "1F9E3", "j": ["neck", "winter", "clothes"]}, "gloves": {"a": "gloves", "b": "1F9E4", "j": ["hands", "hand", "winter", "clothes"]}, "coat": {"a": "coat", "b": "1F9E5", "j": ["jacket"]}, "socks": {"a": "socks", "b": "1F9E6", "j": ["stockings", "stocking", "clothes"]}, "dress": {"a": "dress", "b": "1F457", "j": ["shopping", "clothing", "fashion", "clothes"]}, "kimono": {"a": "kimono", "b": "1F458", "j": ["dress", "japanese", "clothing", "fashion", "women", "female"]}, "sari": {"a": "sari", "b": "1F97B", "j": ["dress", "clothing"]}, "onepiece-swimsuit": {"a": "one-piece swimsuit", "b": "1FA71", "j": ["one_piece_swimsuit", "fashion", "bathing suit"]}, "briefs": {"a": "briefs", "b": "1FA72", "j": ["swimsuit", "one-piece", "clothing", "underwear", "bathing suit"]}, "shorts": {"a": "shorts", "b": "1FA73", "j": ["clothing", "underwear", "pants", "bathing suit"]}, "bikini": {"a": "bikini", "b": "1F459", "j": ["swim", "woman", "girl", "swimming", "clothing", "fashion", "summer", "beach", "female"]}, "womans-clothes": {"a": "woman’s clothes", "b": "1F45A", "j": ["woman_s_clothes", "woman", "shopping_bags", "clothing", "fashion", "female"]}, "purse": {"a": "purse", "b": "1F45B", "j": ["accessories", "shopping", "clothing", "fashion", "money", "coin", "sales"]}, "handbag": {"a": "handbag", "b": "1F45C", "j": ["accessories", "shopping", "accessory", "clothing", "bag", "fashion", "purse"]}, "clutch-bag": {"a": "clutch bag", "b": "1F45D", "j": ["accessories", "shopping", "pouch", "clothing", "bag"]}, "shopping-bags": {"a": "shopping bags", "b": "1F6CD", "j": ["shopping", "mall", "buy", "bag", "purchase", "hotel"]}, "backpack": {"a": "backpack", "b": "1F392", "j": ["satchel", "school", "education", "student", "bag", "rucksack"]}, "thong-sandal": {"a": "thong sandal", "b": "1FA74", "j": ["beach sandals", "thong sandals", "zōri", "thongs", "sandals", "summer", "footwear"]}, "mans-shoe": {"a": "man’s shoe", "b": "1F45E", "j": ["man", "male", "man_s_shoe", "clothing", "fashion", "shoe"]}, "running-shoe": {"a": "running shoe", "b": "1F45F", "j": ["sneakers", "sneaker", "athletic", "shoes", "sports", "clothing", "shoe"]}, "hiking-boot": {"a": "hiking boot", "b": "1F97E", "j": ["backpacking", "boot", "camping", "hiking"]}, "flat-shoe": {"a": "flat shoe", "b": "1F97F", "j": ["ballet flat", "slip-on", "slipper", "ballet"]}, "highheeled-shoe": {"a": "high-heeled shoe", "b": "1F460", "j": ["woman", "pumps", "shoes", "heel", "high_heeled_shoe", "clothing", "fashion", "stiletto", "shoe", "female"]}, "womans-sandal": {"a": "woman’s sandal", "b": "1F461", "j": ["sandal", "woman", "shoes", "flip flops", "clothing", "woman_s_sandal", "fashion", "shoe"]}, "ballet-shoes": {"a": "ballet shoes", "b": "1FA70", "j": ["ballet", "dance"]}, "womans-boot": {"a": "woman’s boot", "b": "1F462", "j": ["woman", "shoes", "clothing", "fashion", "shoe", "boot", "woman_s_boot"]}, "crown": {"a": "crown", "b": "1F451", "j": ["royalty", "kod", "leader", "king", "clothing", "lord", "queen"]}, "womans-hat": {"a": "woman’s hat", "b": "1F452", "j": ["accessories", "spring", "woman", "lady", "woman_s_hat", "hat", "clothing", "fashion", "female"]}, "top-hat": {"a": "top hat", "b": "1F3A9", "j": ["classy", "top", "magic", "hat", "clothing", "tophat", "circus", "gentleman"]}, "graduation-cap": {"a": "graduation cap", "b": "1F393", "j": ["learn", "school", "hat", "college", "cap", "celebration", "clothing", "degree", "education", "legal", "university", "graduation"]}, "billed-cap": {"a": "billed cap", "b": "1F9E2", "j": ["cap", "baseball cap", "baseball"]}, "military-helmet": {"a": "military helmet", "b": "1FA96", "j": ["military", "warrior", "army", "helmet", "protection", "soldier"]}, "rescue-workers-helmet": {"a": "rescue worker’s helmet", "b": "26D1", "j": ["cross", "aid", "build", "construction", "face", "hat", "helmet", "rescue_worker_s_helmet"]}, "prayer-beads": {"a": "prayer beads", "b": "1F4FF", "j": ["dhikr", "religious", "beads", "clothing", "prayer", "necklace", "religion"]}, "lipstick": {"a": "lipstick", "b": "1F484", "j": ["woman", "girl", "makeup", "fashion", "cosmetics", "female"]}, "ring": {"a": "ring", "b": "1F48D", "j": ["wedding", "diamond", "marriage", "valentines", "propose", "fashion", "gem", "engagement", "jewelry"]}, "gem-stone": {"a": "gem stone", "b": "1F48E", "j": ["blue", "diamond", "gem", "ruby", "jewelry", "jewel"]}, "muted-speaker": {"a": "muted speaker", "b": "1F507", "j": ["silence", "speaker", "sound", "mute", "quiet", "silent", "volume"]}, "speaker-low-volume": {"a": "speaker low volume", "b": "1F508", "j": ["silence", "sound", "soft", "broadcast", "volume"]}, "speaker-medium-volume": {"a": "speaker medium volume", "b": "1F509", "j": ["speaker", "broadcast", "medium", "volume"]}, "speaker-high-volume": {"a": "speaker high volume", "b": "1F50A", "j": ["noisy", "noise", "speaker", "broadcast", "volume", "loud"]}, "loudspeaker": {"a": "loudspeaker", "b": "1F4E2", "j": ["public address", "volume", "sound", "loud"]}, "megaphone": {"a": "megaphone", "b": "1F4E3", "j": ["volume", "sound", "cheering", "speaker"]}, "postal-horn": {"a": "postal horn", "b": "1F4EF", "j": ["instrument", "horn", "post", "postal", "music"]}, "bell": {"a": "bell", "b": "1F514", "j": ["sound", "xmas", "chime", "notification", "christmas"]}, "bell-with-slash": {"a": "bell with slash", "b": "1F515", "j": ["forbidden", "sound", "mute", "bell", "quiet", "silent", "volume"]}, "musical-score": {"a": "musical score", "b": "1F3BC", "j": ["clef", "score", "treble", "compose", "music"]}, "musical-note": {"a": "musical note", "b": "1F3B5", "j": ["tone", "score", "sound", "note", "music"]}, "musical-notes": {"a": "musical notes", "b": "1F3B6", "j": ["notes", "note", "score", "music"]}, "studio-microphone": {"a": "studio microphone", "b": "1F399", "j": ["studio", "sing", "artist", "recording", "talkshow", "microphone", "mic", "music"]}, "level-slider": {"a": "level slider", "b": "1F39A", "j": ["slider", "music", "scale", "level"]}, "control-knobs": {"a": "control knobs", "b": "1F39B", "j": ["control", "dial", "music", "knobs"]}, "microphone": {"a": "microphone", "b": "1F3A4", "j": ["PA", "sing", "sound", "talkshow", "mic", "karaoke", "music"]}, "headphone": {"a": "headphone", "b": "1F3A7", "j": ["gadgets", "score", "earbud", "music"]}, "radio": {"a": "radio", "b": "1F4FB", "j": ["communication", "video", "program", "podcast", "music"]}, "saxophone": {"a": "saxophone", "b": "1F3B7", "j": ["sax", "instrument", "jazz", "blues", "music"]}, "accordion": {"a": "accordion", "b": "1FA97", "j": ["squeeze box", "music", "concertina"]}, "guitar": {"a": "guitar", "b": "1F3B8", "j": ["music", "instrument"]}, "musical-keyboard": {"a": "musical keyboard", "b": "1F3B9", "j": ["keyboard", "piano", "compose", "instrument", "music"]}, "trumpet": {"a": "trumpet", "b": "1F3BA", "j": ["brass", "music", "instrument"]}, "violin": {"a": "violin", "b": "1F3BB", "j": ["symphony", "orchestra", "music", "instrument"]}, "banjo": {"a": "banjo", "b": "1FA95", "j": ["instructment", "stringed", "music"]}, "drum": {"a": "drum", "b": "1F941", "j": ["drumsticks", "snare", "music", "instrument"]}, "long-drum": {"a": "long drum", "b": "1FA98", "j": ["drum", "beat", "conga", "music", "rhythm"]}, "mobile-phone": {"a": "mobile phone", "b": "1F4F1", "j": ["apple", "phone", "telephone", "mobile", "gadgets", "dial", "cell", "technology"]}, "mobile-phone-with-arrow": {"a": "mobile phone with arrow", "b": "1F4F2", "j": ["arrow", "incoming", "iphone", "phone", "mobile", "receive", "cell"]}, "telephone": {"a": "telephone", "b": "260E", "j": ["dial", "technology", "communication", "phone"]}, "telephone-receiver": {"a": "telephone receiver", "b": "1F4DE", "j": ["communication", "phone", "telephone", "dial", "receiver", "technology"]}, "pager": {"a": "pager", "b": "1F4DF", "j": ["90s", "bbcall", "oldschool"]}, "fax-machine": {"a": "fax machine", "b": "1F4E0", "j": ["fax", "technology", "communication"]}, "battery": {"a": "battery", "b": "1F50B", "j": ["energy", "power", "sustain"]}, "electric-plug": {"a": "electric plug", "b": "1F50C", "j": ["electric", "power", "charger", "electricity", "plug"]}, "laptop": {"a": "laptop", "b": "1F4BB", "j": ["computer", "display", "monitor", "pc", "screen", "technology", "personal"]}, "desktop-computer": {"a": "desktop computer", "b": "1F5A5", "j": ["computer", "desktop", "computing", "screen", "technology"]}, "printer": {"a": "printer", "b": "1F5A8", "j": ["ink", "computer", "paper"]}, "keyboard": {"a": "keyboard", "b": "2328", "j": ["computer", "text", "input", "type", "technology"]}, "computer-mouse": {"a": "computer mouse", "b": "1F5B1", "j": ["computer", "click"]}, "trackball": {"a": "trackball", "b": "1F5B2", "j": ["trackpad", "computer", "technology"]}, "computer-disk": {"a": "computer disk", "b": "1F4BD", "j": ["minidisk", "computer", "disk", "optical", "record", "90s", "technology", "data"]}, "floppy-disk": {"a": "floppy disk", "b": "1F4BE", "j": ["floppy", "computer", "disk", "80s", "save", "oldschool", "90s", "technology"]}, "optical-disk": {"a": "optical disk", "b": "1F4BF", "j": ["cd", "computer", "disk", "dvd", "optical", "90s", "technology", "disc"]}, "dvd": {"a": "dvd", "b": "1F4C0", "j": ["cd", "computer", "disk", "optical", "blu-ray", "disc"]}, "abacus": {"a": "abacus", "b": "1F9EE", "j": ["calculation"]}, "movie-camera": {"a": "movie camera", "b": "1F3A5", "j": ["cinema", "camera", "record", "film", "movie"]}, "film-frames": {"a": "film frames", "b": "1F39E", "j": ["frames", "movie", "cinema", "film"]}, "film-projector": {"a": "film projector", "b": "1F4FD", "j": ["cinema", "video", "record", "projector", "film", "tape", "movie"]}, "clapper-board": {"a": "clapper board", "b": "1F3AC", "j": ["movie", "clapper", "record", "film"]}, "television": {"a": "television", "b": "1F4FA", "j": ["video", "program", "oldschool", "show", "technology", "tv"]}, "camera": {"a": "camera", "b": "1F4F7", "j": ["gadgets", "photography", "video"]}, "camera-with-flash": {"a": "camera with flash", "b": "1F4F8", "j": ["video", "camera", "gadgets", "photography", "flash"]}, "video-camera": {"a": "video camera", "b": "1F4F9", "j": ["camera", "video", "record", "film"]}, "videocassette": {"a": "videocassette", "b": "1F4FC", "j": ["video", "80s", "record", "tape", "vhs", "oldschool", "90s"]}, "magnifying-glass-tilted-left": {"a": "magnifying glass tilted left", "b": "1F50D", "j": ["magnifying", "find", "search", "tool", "glass", "zoom", "detective"]}, "magnifying-glass-tilted-right": {"a": "magnifying glass tilted right", "b": "1F50E", "j": ["magnifying", "find", "search", "tool", "glass", "zoom", "detective"]}, "candle": {"a": "candle", "b": "1F56F", "j": ["wax", "light", "fire"]}, "light-bulb": {"a": "light bulb", "b": "1F4A1", "j": ["electric", "bulb", "comic", "light", "electricity", "idea"]}, "flashlight": {"a": "flashlight", "b": "1F526", "j": ["night", "electric", "sight", "torch", "light", "camping", "dark", "tool"]}, "red-paper-lantern": {"a": "red paper lantern", "b": "1F3EE", "j": ["paper", "bar", "halloween", "red", "light", "spooky", "lantern"]}, "diya-lamp": {"a": "diya lamp", "b": "1FA94", "j": ["lighting", "lamp", "diya", "oil"]}, "notebook-with-decorative-cover": {"a": "notebook with decorative cover", "b": "1F4D4", "j": ["book", "paper", "decorated", "record", "study", "cover", "classroom", "notes", "notebook"]}, "closed-book": {"a": "closed book", "b": "1F4D5", "j": ["learn", "book", "library", "read", "closed", "textbook", "knowledge"]}, "open-book": {"a": "open book", "b": "1F4D6", "j": ["learn", "book", "literature", "library", "study", "open", "read", "knowledge"]}, "green-book": {"a": "green book", "b": "1F4D7", "j": ["book", "library", "study", "read", "green", "knowledge"]}, "blue-book": {"a": "blue book", "b": "1F4D8", "j": ["blue", "learn", "book", "library", "study", "read", "knowledge"]}, "orange-book": {"a": "orange book", "b": "1F4D9", "j": ["book", "library", "orange", "study", "read", "textbook", "knowledge"]}, "books": {"a": "books", "b": "1F4DA", "j": ["book", "study", "library", "literature"]}, "notebook": {"a": "notebook", "b": "1F4D3", "j": ["paper", "record", "study", "stationery", "notes"]}, "ledger": {"a": "ledger", "b": "1F4D2", "j": ["notebook", "paper", "notes"]}, "page-with-curl": {"a": "page with curl", "b": "1F4C3", "j": ["document", "page", "curl", "paper", "documents", "office"]}, "scroll": {"a": "scroll", "b": "1F4DC", "j": ["paper", "history", "documents", "ancient"]}, "page-facing-up": {"a": "page facing up", "b": "1F4C4", "j": ["document", "page", "paper", "documents", "office", "information"]}, "newspaper": {"a": "newspaper", "b": "1F4F0", "j": ["headline", "paper", "press", "news"]}, "rolledup-newspaper": {"a": "rolled-up newspaper", "b": "1F5DE", "j": ["rolled_up_newspaper", "paper", "press", "news", "headline", "rolled", "newspaper"]}, "bookmark-tabs": {"a": "bookmark tabs", "b": "1F4D1", "j": ["order", "mark", "bookmark", "save", "favorite", "marker", "tidy", "tabs"]}, "bookmark": {"a": "bookmark", "b": "1F516", "j": ["save", "label", "favorite", "mark"]}, "label": {"a": "label", "b": "1F3F7", "j": ["tag", "sale"]}, "money-bag": {"a": "money bag", "b": "1F4B0", "j": ["moneybag", "dollar", "payment", "bag", "money", "coins", "sale"]}, "coin": {"a": "coin", "b": "1FA99", "j": ["metal", "currency", "silver", "treasure", "money", "gold"]}, "yen-banknote": {"a": "yen banknote", "b": "1F4B4", "j": ["bill", "currency", "japanese", "banknote", "dollar", "note", "yen", "money", "sales"]}, "dollar-banknote": {"a": "dollar banknote", "b": "1F4B5", "j": ["bill", "currency", "banknote", "dollar", "note", "money", "sales"]}, "euro-banknote": {"a": "euro banknote", "b": "1F4B6", "j": ["bill", "currency", "euro", "banknote", "dollar", "note", "money", "sales"]}, "pound-banknote": {"a": "pound banknote", "b": "1F4B7", "j": ["bill", "england", "currency", "british", "banknote", "uk", "note", "sterling", "sales", "money", "pound", "bills"]}, "money-with-wings": {"a": "money with wings", "b": "1F4B8", "j": ["bill", "banknote", "dollar", "payment", "money", "fly", "wings", "bills", "sale"]}, "credit-card": {"a": "credit card", "b": "1F4B3", "j": ["shopping", "bill", "card", "dollar", "credit", "payment", "money", "sales"]}, "receipt": {"a": "receipt", "b": "1F9FE", "j": ["bookkeeping", "accounting", "expenses", "evidence", "proof"]}, "chart-increasing-with-yen": {"a": "chart increasing with yen", "b": "1F4B9", "j": ["stats", "graph", "growth", "chart", "yen", "money", "presentation", "green-square"]}, "envelope": {"a": "envelope", "b": "2709", "j": ["letter", "communication", "email", "inbox", "postal"]}, "email": {"a": "e-mail", "b": "1F4E7", "j": ["e_mail", "letter", "communication", "mail", "inbox"]}, "incoming-envelope": {"a": "incoming envelope", "b": "1F4E8", "j": ["envelope", "incoming", "letter", "email", "receive", "e-mail", "inbox"]}, "envelope-with-arrow": {"a": "envelope with arrow", "b": "1F4E9", "j": ["arrow", "envelope", "communication", "email", "outgoing", "e-mail"]}, "outbox-tray": {"a": "outbox tray", "b": "1F4E4", "j": ["letter", "email", "outbox", "mail", "inbox", "box", "sent", "tray"]}, "inbox-tray": {"a": "inbox tray", "b": "1F4E5", "j": ["letter", "email", "documents", "mail", "receive", "inbox", "box", "tray"]}, "package": {"a": "package", "b": "1F4E6", "j": ["moving", "gift", "mail", "cardboard", "box", "parcel"]}, "closed-mailbox-with-raised-flag": {"a": "closed mailbox with raised flag", "b": "1F4EB", "j": ["postbox", "communication", "email", "mailbox", "closed", "mail", "inbox"]}, "closed-mailbox-with-lowered-flag": {"a": "closed mailbox with lowered flag", "b": "1F4EA", "j": ["postbox", "communication", "email", "lowered", "mailbox", "closed", "mail", "inbox"]}, "open-mailbox-with-raised-flag": {"a": "open mailbox with raised flag", "b": "1F4EC", "j": ["postbox", "communication", "email", "open", "mailbox", "mail", "inbox"]}, "open-mailbox-with-lowered-flag": {"a": "open mailbox with lowered flag", "b": "1F4ED", "j": ["postbox", "email", "lowered", "open", "mailbox", "mail", "inbox"]}, "postbox": {"a": "postbox", "b": "1F4EE", "j": ["envelope", "letter", "email", "mailbox", "mail"]}, "ballot-box-with-ballot": {"a": "ballot box with ballot", "b": "1F5F3", "j": ["election", "ballot", "box", "vote"]}, "pencil": {"a": "pencil", "b": "270F", "j": ["paper", "study", "school", "stationery", "writing", "write"]}, "black-nib": {"a": "black nib", "b": "2712", "j": ["stationery", "writing", "write", "nib", "pen"]}, "fountain-pen": {"a": "fountain pen", "b": "1F58B", "j": ["fountain", "stationery", "writing", "write", "pen"]}, "pen": {"a": "pen", "b": "1F58A", "j": ["ballpoint", "write", "stationery", "writing"]}, "paintbrush": {"a": "paintbrush", "b": "1F58C", "j": ["painting", "drawing", "art", "creativity"]}, "crayon": {"a": "crayon", "b": "1F58D", "j": ["creativity", "drawing"]}, "memo": {"a": "memo", "b": "1F4DD", "j": ["test", "pencil", "quiz", "compose", "paper", "documents", "study", "stationery", "writing", "write", "legal", "exam"]}, "briefcase": {"a": "briefcase", "b": "1F4BC", "j": ["job", "work", "business", "law", "documents", "career", "legal"]}, "file-folder": {"a": "file folder", "b": "1F4C1", "j": ["file", "business", "folder", "documents", "office"]}, "open-file-folder": {"a": "open file folder", "b": "1F4C2", "j": ["file", "folder", "documents", "open", "load"]}, "card-index-dividers": {"a": "card index dividers", "b": "1F5C2", "j": ["organizing", "business", "card", "stationery", "dividers", "index"]}, "calendar": {"a": "calendar", "b": "1F4C5", "j": ["date", "schedule"]}, "tearoff-calendar": {"a": "tear-off calendar", "b": "1F4C6", "j": ["date", "schedule", "calendar", "planning", "tear_off_calendar"]}, "spiral-notepad": {"a": "spiral notepad", "b": "1F5D2", "j": ["pad", "memo", "stationery", "note", "spiral"]}, "spiral-calendar": {"a": "spiral calendar", "b": "1F5D3", "j": ["pad", "date", "calendar", "schedule", "planning", "spiral"]}, "card-index": {"a": "card index", "b": "1F4C7", "j": ["business", "card", "stationery", "rolodex", "index"]}, "chart-increasing": {"a": "chart increasing", "b": "1F4C8", "j": ["stats", "upward", "business", "graph", "growth", "good", "trend", "chart", "success", "recovery", "money", "economics", "presentation", "sales"]}, "chart-decreasing": {"a": "chart decreasing", "b": "1F4C9", "j": ["stats", "business", "failure", "recession", "graph", "down", "bad", "trend", "chart", "money", "economics", "presentation", "sales"]}, "bar-chart": {"a": "bar chart", "b": "1F4CA", "j": ["stats", "graph", "bar", "chart", "presentation"]}, "clipboard": {"a": "clipboard", "b": "1F4CB", "j": ["documents", "stationery"]}, "pushpin": {"a": "pushpin", "b": "1F4CC", "j": ["here", "pin", "stationery", "mark"]}, "round-pushpin": {"a": "round pushpin", "b": "1F4CD", "j": ["pin", "map", "pushpin", "location", "stationery", "here"]}, "paperclip": {"a": "paperclip", "b": "1F4CE", "j": ["documents", "stationery"]}, "linked-paperclips": {"a": "linked paperclips", "b": "1F587", "j": ["link", "paperclip", "documents", "stationery"]}, "straight-ruler": {"a": "straight ruler", "b": "1F4CF", "j": ["architect", "math", "school", "stationery", "length", "drawing", "sketch", "calculate", "straight edge", "ruler"]}, "triangular-ruler": {"a": "triangular ruler", "b": "1F4D0", "j": ["architect", "math", "triangle", "stationery", "set", "sketch", "ruler"]}, "scissors": {"a": "scissors", "b": "2702", "j": ["cutting", "tool", "stationery", "cut"]}, "card-file-box": {"a": "card file box", "b": "1F5C3", "j": ["business", "file", "card", "stationery", "box"]}, "file-cabinet": {"a": "file cabinet", "b": "1F5C4", "j": ["file", "cabinet", "organizing", "filing"]}, "wastebasket": {"a": "wastebasket", "b": "1F5D1", "j": ["rubbish", "toss", "garbage", "trash", "bin"]}, "locked": {"a": "locked", "b": "1F512", "j": ["password", "padlock", "closed", "security"]}, "unlocked": {"a": "unlocked", "b": "1F513", "j": ["privacy", "open", "unlock", "lock", "security"]}, "locked-with-pen": {"a": "locked with pen", "b": "1F50F", "j": ["secret", "privacy", "lock", "nib", "security", "ink", "pen"]}, "locked-with-key": {"a": "locked with key", "b": "1F510", "j": ["privacy", "lock", "key", "closed", "security", "secure"]}, "key": {"a": "key", "b": "1F511", "j": ["password", "door", "lock"]}, "old-key": {"a": "old key", "b": "1F5DD", "j": ["door", "clue", "lock", "key", "old", "password"]}, "hammer": {"a": "hammer", "b": "1F528", "j": ["tool", "tools", "build", "create"]}, "axe": {"a": "axe", "b": "1FA93", "j": ["wood", "split", "chop", "tool", "hatchet", "cut"]}, "pick": {"a": "pick", "b": "26CF", "j": ["tool", "dig", "mining", "tools"]}, "hammer-and-pick": {"a": "hammer and pick", "b": "2692", "j": ["hammer", "build", "pick", "tools", "tool", "create"]}, "hammer-and-wrench": {"a": "hammer and wrench", "b": "1F6E0", "j": ["hammer", "build", "spanner", "tools", "tool", "wrench", "create"]}, "dagger": {"a": "dagger", "b": "1F5E1", "j": ["weapon", "knife"]}, "crossed-swords": {"a": "crossed swords", "b": "2694", "j": ["weapon", "crossed", "swords"]}, "water-pistol": {"a": "water pistol", "b": "1F52B", "j": ["violence", "tool", "water", "revolver", "weapon", "gun", "pistol", "handgun"]}, "boomerang": {"a": "boomerang", "b": "1FA83", "j": ["rebound", "australia", "repercussion", "weapon"]}, "bow-and-arrow": {"a": "bow and arrow", "b": "1F3F9", "j": ["arrow", "archer", "zodiac", "sports", "Sagittarius", "bow"]}, "shield": {"a": "shield", "b": "1F6E1", "j": ["weapon", "protection", "security"]}, "carpentry-saw": {"a": "carpentry saw", "b": "1FA9A", "j": ["carpenter", "lumber", "saw", "chop", "tool", "cut"]}, "wrench": {"a": "wrench", "b": "1F527", "j": ["diy", "ikea", "spanner", "tools", "fix", "maintainer", "tool"]}, "screwdriver": {"a": "screwdriver", "b": "1FA9B", "j": ["tool", "screw", "tools"]}, "nut-and-bolt": {"a": "nut and bolt", "b": "1F529", "j": ["handy", "tools", "fix", "nut", "tool", "bolt"]}, "gear": {"a": "gear", "b": "2699", "j": ["cog", "cogwheel", "tool"]}, "clamp": {"a": "clamp", "b": "1F5DC", "j": ["vice", "tool", "compress"]}, "balance-scale": {"a": "balance scale", "b": "2696", "j": ["balance", "Libra", "law", "zodiac", "fairness", "justice", "scale", "weight"]}, "white-cane": {"a": "white cane", "b": "1F9AF", "j": ["blind", "probing_cane", "accessibility"]}, "link": {"a": "link", "b": "1F517", "j": ["url", "rings"]}, "chains": {"a": "chains", "b": "26D3", "j": ["arrest", "lock", "chain"]}, "hook": {"a": "hook", "b": "1FA9D", "j": ["crook", "curve", "catch", "selling point", "tools", "ensnare"]}, "toolbox": {"a": "toolbox", "b": "1F9F0", "j": ["chest", "diy", "tools", "fix", "maintainer", "mechanic", "tool"]}, "magnet": {"a": "magnet", "b": "1F9F2", "j": ["attraction", "magnetic", "horseshoe"]}, "ladder": {"a": "ladder", "b": "1FA9C", "j": ["rung", "step", "tools", "climb"]}, "alembic": {"a": "alembic", "b": "2697", "j": ["chemistry", "distilling", "experiment", "science", "tool"]}, "test-tube": {"a": "test tube", "b": "1F9EA", "j": ["chemistry", "experiment", "lab", "science", "chemist"]}, "petri-dish": {"a": "petri dish", "b": "1F9EB", "j": ["biologist", "culture", "biology", "lab", "bacteria"]}, "dna": {"a": "dna", "b": "1F9EC", "j": ["biologist", "life", "gene", "evolution", "genetics"]}, "microscope": {"a": "microscope", "b": "1F52C", "j": ["study", "experiment", "laboratory", "science", "tool", "zoomin"]}, "telescope": {"a": "telescope", "b": "1F52D", "j": ["stars", "astronomy", "space", "science", "tool", "zoom"]}, "satellite-antenna": {"a": "satellite antenna", "b": "1F4E1", "j": ["communication", "satellite", "space", "antenna", "dish", "future", "radio"]}, "syringe": {"a": "syringe", "b": "1F489", "j": ["nurse", "shot", "doctor", "medicine", "hospital", "health", "sick", "needle", "drugs", "blood"]}, "drop-of-blood": {"a": "drop of blood", "b": "1FA78", "j": ["bleed", "menstruation", "harm", "medicine", "wound", "period", "blood donation", "injury", "hurt"]}, "pill": {"a": "pill", "b": "1F48A", "j": ["drug", "doctor", "medicine", "health", "sick", "pharmacy"]}, "adhesive-bandage": {"a": "adhesive bandage", "b": "1FA79", "j": ["heal", "bandage"]}, "stethoscope": {"a": "stethoscope", "b": "1FA7A", "j": ["heart", "medicine", "doctor", "health"]}, "door": {"a": "door", "b": "1F6AA", "j": ["house", "entry", "exit"]}, "elevator": {"a": "elevator", "b": "1F6D7", "j": ["lift", "hoist", "accessibility"]}, "mirror": {"a": "mirror", "b": "1FA9E", "j": ["reflection", "reflector", "speculum"]}, "window": {"a": "window", "b": "1FA9F", "j": ["transparent", "fresh air", "opening", "view", "scenery", "frame"]}, "bed": {"a": "bed", "b": "1F6CF", "j": ["sleep", "hotel", "rest"]}, "couch-and-lamp": {"a": "couch and lamp", "b": "1F6CB", "j": ["lamp", "chill", "couch", "read", "hotel"]}, "chair": {"a": "chair", "b": "1FA91", "j": ["sit", "furniture", "seat"]}, "toilet": {"a": "toilet", "b": "1F6BD", "j": ["potty", "bathroom", "washroom", "restroom", "wc"]}, "plunger": {"a": "plunger", "b": "1FAA0", "j": ["suction", "plumber", "force cup", "toilet"]}, "shower": {"a": "shower", "b": "1F6BF", "j": ["bathroom", "water", "clean"]}, "bathtub": {"a": "bathtub", "b": "1F6C1", "j": ["shower", "bathroom", "bath", "clean"]}, "mouse-trap": {"a": "mouse trap", "b": "1FAA4", "j": ["trap", "cheese", "bait", "mousetrap", "snare"]}, "razor": {"a": "razor", "b": "1FA92", "j": ["shave", "sharp", "cut"]}, "lotion-bottle": {"a": "lotion bottle", "b": "1F9F4", "j": ["sunscreen", "shampoo", "lotion", "moisturizer"]}, "safety-pin": {"a": "safety pin", "b": "1F9F7", "j": ["punk rock", "diaper"]}, "broom": {"a": "broom", "b": "1F9F9", "j": ["cleaning", "sweeping", "witch"]}, "basket": {"a": "basket", "b": "1F9FA", "j": ["farming", "laundry", "picnic"]}, "roll-of-paper": {"a": "roll of paper", "b": "1F9FB", "j": ["toilet paper", "roll", "paper towels"]}, "bucket": {"a": "bucket", "b": "1FAA3", "j": ["cask", "water", "pail", "vat", "container"]}, "soap": {"a": "soap", "b": "1F9FC", "j": ["soapdish", "bar", "lather", "bathing", "cleaning"]}, "toothbrush": {"a": "toothbrush", "b": "1FAA5", "j": ["brush", "bathroom", "hygiene", "teeth", "clean", "dental"]}, "sponge": {"a": "sponge", "b": "1F9FD", "j": ["absorbing", "cleaning", "porous"]}, "fire-extinguisher": {"a": "fire extinguisher", "b": "1F9EF", "j": ["quench", "extinguish", "fire"]}, "shopping-cart": {"a": "shopping cart", "b": "1F6D2", "j": ["shopping", "cart", "trolley"]}, "cigarette": {"a": "cigarette", "b": "1F6AC", "j": ["smoke", "smoking", "kills", "tobacco", "joint"]}, "coffin": {"a": "coffin", "b": "26B0", "j": ["death", "vampire", "rip", "casket", "funeral", "die", "dead", "box", "cemetery", "graveyard"]}, "headstone": {"a": "headstone", "b": "1FAA6", "j": ["death", "rip", "tombstone", "grave", "cemetery", "graveyard"]}, "funeral-urn": {"a": "funeral urn", "b": "26B1", "j": ["death", "rip", "funeral", "ashes", "die", "dead", "urn"]}, "moai": {"a": "moai", "b": "1F5FF", "j": ["rock", "moyai", "face", "statue", "easter island"]}, "placard": {"a": "placard", "b": "1FAA7", "j": ["sign", "announcement", "picket", "protest", "demonstration"]}, "atm-sign": {"a": "ATM sign", "b": "1F3E7", "j": ["cash", "bank", "teller", "automated", "atm", "blue-square", "payment", "money", "sales"]}, "litter-in-bin-sign": {"a": "litter in bin sign", "b": "1F6AE", "j": ["info", "sign", "litter", "human", "blue-square", "litter bin"]}, "potable-water": {"a": "potable water", "b": "1F6B0", "j": ["restroom", "water", "drinking", "blue-square", "liquid", "potable", "faucet", "cleaning"]}, "wheelchair-symbol": {"a": "wheelchair symbol", "b": "267F", "j": ["blue-square", "access", "disabled", "accessibility"]}, "mens-room": {"a": "men’s room", "b": "1F6B9", "j": ["gender", "man", "male", "restroom", "blue-square", "lavatory", "toilet", "men_s_room", "wc"]}, "womens-room": {"a": "women’s room", "b": "1F6BA", "j": ["gender", "woman", "restroom", "purple-square", "loo", "lavatory", "women_s_room", "toilet", "wc", "female"]}, "restroom": {"a": "restroom", "b": "1F6BB", "j": ["gender", "WC", "blue-square", "lavatory", "toilet", "refresh", "wc"]}, "baby-symbol": {"a": "baby symbol", "b": "1F6BC", "j": ["changing", "orange-square", "baby", "child"]}, "water-closet": {"a": "water closet", "b": "1F6BE", "j": ["restroom", "water", "blue-square", "lavatory", "closet", "toilet", "wc"]}, "passport-control": {"a": "passport control", "b": "1F6C2", "j": ["custom", "blue-square", "control", "passport"]}, "customs": {"a": "customs", "b": "1F6C3", "j": ["blue-square", "border", "passport"]}, "baggage-claim": {"a": "baggage claim", "b": "1F6C4", "j": ["transport", "claim", "baggage", "blue-square", "airport"]}, "left-luggage": {"a": "left luggage", "b": "1F6C5", "j": ["locker", "luggage", "baggage", "blue-square", "travel"]}, "warning": {"a": "warning", "b": "26A0", "j": ["alert", "wip", "problem", "error", "issue", "exclamation"]}, "children-crossing": {"a": "children crossing", "b": "1F6B8", "j": ["danger", "warning", "sign", "crossing", "yellow-diamond", "traffic", "pedestrian", "school", "child", "driving"]}, "no-entry": {"a": "no entry", "b": "26D4", "j": ["forbidden", "circle", "denied", "privacy", "stop", "no", "entry", "prohibited", "traffic", "bad", "not", "limit", "security"]}, "prohibited": {"a": "prohibited", "b": "1F6AB", "j": ["forbidden", "circle", "denied", "stop", "no", "entry", "disallow", "not", "limit", "forbid"]}, "no-bicycles": {"a": "no bicycles", "b": "1F6B3", "j": ["forbidden", "circle", "no", "prohibited", "bicycle", "bike", "cyclist"]}, "no-smoking": {"a": "no smoking", "b": "1F6AD", "j": ["smoke", "forbidden", "smoking", "smell", "no", "prohibited", "cigarette", "blue-square", "not"]}, "no-littering": {"a": "no littering", "b": "1F6AF", "j": ["forbidden", "circle", "litter", "no", "prohibited", "garbage", "not", "trash", "bin"]}, "nonpotable-water": {"a": "non-potable water", "b": "1F6B1", "j": ["non_potable_water", "circle", "non-drinking", "drink", "water", "faucet", "tap", "non-potable"]}, "no-pedestrians": {"a": "no pedestrians", "b": "1F6B7", "j": ["forbidden", "circle", "crossing", "no", "prohibited", "pedestrian", "walking", "not", "rules"]}, "no-mobile-phones": {"a": "no mobile phones", "b": "1F4F5", "j": ["forbidden", "circle", "iphone", "phone", "no", "mute", "mobile", "cell"]}, "no-one-under-eighteen": {"a": "no one under eighteen", "b": "1F51E", "j": ["pub", "underage", "night", "circle", "prohibited", "drink", "18", "eighteen", "age restriction", "minor"]}, "radioactive": {"a": "radioactive", "b": "2622", "j": ["danger", "sign", "nuclear"]}, "biohazard": {"a": "biohazard", "b": "2623", "j": ["danger", "sign"]}, "up-arrow": {"a": "up arrow", "b": "2B06", "j": ["arrow", "top", "blue-square", "continue", "direction", "north", "cardinal"]}, "upright-arrow": {"a": "up-right arrow", "b": "2197", "j": ["arrow", "up_right_arrow", "point", "diagonal", "blue-square", "direction", "northeast", "intercardinal"]}, "right-arrow": {"a": "right arrow", "b": "27A1", "j": ["arrow", "east", "blue-square", "direction", "next", "cardinal"]}, "downright-arrow": {"a": "down-right arrow", "b": "2198", "j": ["arrow", "diagonal", "blue-square", "down_right_arrow", "direction", "intercardinal", "southeast"]}, "down-arrow": {"a": "down arrow", "b": "2B07", "j": ["arrow", "down", "blue-square", "cardinal", "direction", "bottom", "south"]}, "downleft-arrow": {"a": "down-left arrow", "b": "2199", "j": ["arrow", "southwest", "diagonal", "blue-square", "down_left_arrow", "direction", "intercardinal"]}, "left-arrow": {"a": "left arrow", "b": "2B05", "j": ["arrow", "west", "blue-square", "previous", "back", "direction", "cardinal"]}, "upleft-arrow": {"a": "up-left arrow", "b": "2196", "j": ["arrow", "point", "northwest", "up_left_arrow", "diagonal", "blue-square", "direction", "intercardinal"]}, "updown-arrow": {"a": "up-down arrow", "b": "2195", "j": ["arrow", "blue-square", "vertical", "direction", "up_down_arrow", "way"]}, "leftright-arrow": {"a": "left-right arrow", "b": "2194", "j": ["left_right_arrow", "arrow", "sideways", "shape", "direction", "horizontal"]}, "right-arrow-curving-left": {"a": "right arrow curving left", "b": "21A9", "j": ["arrow", "undo", "back", "return", "blue-square", "enter"]}, "left-arrow-curving-right": {"a": "left arrow curving right", "b": "21AA", "j": ["arrow", "blue-square", "return", "direction", "rotate"]}, "right-arrow-curving-up": {"a": "right arrow curving up", "b": "2934", "j": ["blue-square", "arrow", "direction", "top"]}, "right-arrow-curving-down": {"a": "right arrow curving down", "b": "2935", "j": ["arrow", "down", "blue-square", "direction", "bottom"]}, "clockwise-vertical-arrows": {"a": "clockwise vertical arrows", "b": "1F503", "j": ["arrow", "sync", "round", "cycle", "repeat", "reload", "clockwise"]}, "counterclockwise-arrows-button": {"a": "counterclockwise arrows button", "b": "1F504", "j": ["arrow", "sync", "blue-square", "cycle", "anticlockwise", "withershins", "counterclockwise"]}, "back-arrow": {"a": "BACK arrow", "b": "1F519", "j": ["back", "arrow", "return", "words"]}, "end-arrow": {"a": "END arrow", "b": "1F51A", "j": ["end", "arrow", "words"]}, "on-arrow": {"a": "ON! arrow", "b": "1F51B", "j": ["arrow", "words", "on", "mark"]}, "soon-arrow": {"a": "SOON arrow", "b": "1F51C", "j": ["arrow", "soon", "words"]}, "top-arrow": {"a": "TOP arrow", "b": "1F51D", "j": ["arrow", "top", "words", "blue-square", "up"]}, "place-of-worship": {"a": "place of worship", "b": "1F6D0", "j": ["church", "worship", "prayer", "temple", "religion"]}, "atom-symbol": {"a": "atom symbol", "b": "269B", "j": ["chemistry", "atom", "atheist", "science", "physics"]}, "om": {"a": "om", "b": "1F549", "j": ["sikhism", "Hindu", "hinduism", "buddhism", "jainism", "religion"]}, "star-of-david": {"a": "star of David", "b": "2721", "j": ["star", "Jew", "David", "Jewish", "judaism", "religion"]}, "wheel-of-dharma": {"a": "wheel of dharma", "b": "2638", "j": ["dharma", "sikhism", "wheel", "hinduism", "buddhism", "jainism", "Buddhist", "religion"]}, "yin-yang": {"a": "yin yang", "b": "262F", "j": ["balance", "yang", "tao", "taoist", "yin", "religion"]}, "latin-cross": {"a": "latin cross", "b": "271D", "j": ["religion", "cross", "christianity", "Christian"]}, "orthodox-cross": {"a": "orthodox cross", "b": "2626", "j": ["cross", "religion", "suppedaneum", "Christian"]}, "star-and-crescent": {"a": "star and crescent", "b": "262A", "j": ["islam", "Muslim", "religion"]}, "peace-symbol": {"a": "peace symbol", "b": "262E", "j": ["hippie", "peace"]}, "menorah": {"a": "menorah", "b": "1F54E", "j": ["candlestick", "hanukkah", "jewish", "candelabrum", "candles", "religion"]}, "dotted-sixpointed-star": {"a": "dotted six-pointed star", "b": "1F52F", "j": ["jewish", "star", "purple-square", "dotted_six_pointed_star", "fortune", "religion", "hexagram"]}, "aries": {"a": "Aries", "b": "2648", "j": ["astrology", "sign", "ram", "purple-square", "zodiac"]}, "taurus": {"a": "Taurus", "b": "2649", "j": ["astrology", "sign", "purple-square", "ox", "zodiac", "bull"]}, "gemini": {"a": "Gemini", "b": "264A", "j": ["astrology", "sign", "twins", "purple-square", "zodiac"]}, "cancer": {"a": "Cancer", "b": "264B", "j": ["astrology", "sign", "purple-square", "zodiac", "crab"]}, "leo": {"a": "Leo", "b": "264C", "j": ["astrology", "sign", "lion", "purple-square", "zodiac"]}, "virgo": {"a": "Virgo", "b": "264D", "j": ["astrology", "sign", "purple-square", "zodiac"]}, "libra": {"a": "Libra", "b": "264E", "j": ["astrology", "sign", "balance", "purple-square", "zodiac", "scales", "justice"]}, "scorpio": {"a": "Scorpio", "b": "264F", "j": ["astrology", "sign", "scorpion", "purple-square", "zodiac", "scorpius"]}, "sagittarius": {"a": "Sagittarius", "b": "2650", "j": ["astrology", "sign", "archer", "purple-square", "zodiac"]}, "capricorn": {"a": "Capricorn", "b": "2651", "j": ["astrology", "sign", "purple-square", "zodiac", "goat"]}, "aquarius": {"a": "Aquarius", "b": "2652", "j": ["astrology", "sign", "purple-square", "water", "zodiac", "bearer"]}, "pisces": {"a": "Pisces", "b": "2653", "j": ["astrology", "sign", "purple-square", "fish", "zodiac"]}, "ophiuchus": {"a": "Ophiuchus", "b": "26CE", "j": ["astrology", "sign", "serpent", "snake", "purple-square", "zodiac", "constellation", "bearer"]}, "shuffle-tracks-button": {"a": "shuffle tracks button", "b": "1F500", "j": ["arrow", "random", "crossed", "blue-square", "shuffle", "music"]}, "repeat-button": {"a": "repeat button", "b": "1F501", "j": ["arrow", "record", "loop", "repeat", "clockwise"]}, "repeat-single-button": {"a": "repeat single button", "b": "1F502", "j": ["arrow", "once", "blue-square", "loop", "clockwise"]}, "play-button": {"a": "play button", "b": "25B6", "j": ["arrow", "play", "triangle", "blue-square", "direction", "right"]}, "fastforward-button": {"a": "fast-forward button", "b": "23E9", "j": ["arrow", "play", "fast", "fast_forward_button", "blue-square", "speed", "continue", "double", "forward"]}, "next-track-button": {"a": "next track button", "b": "23ED", "j": ["arrow", "next track", "next scene", "triangle", "blue-square", "next", "forward"]}, "play-or-pause-button": {"a": "play or pause button", "b": "23EF", "j": ["arrow", "play", "triangle", "blue-square", "pause", "right"]}, "reverse-button": {"a": "reverse button", "b": "25C0", "j": ["arrow", "reverse", "triangle", "left", "blue-square", "direction"]}, "fast-reverse-button": {"a": "fast reverse button", "b": "23EA", "j": ["arrow", "play", "blue-square", "double", "rewind"]}, "last-track-button": {"a": "last track button", "b": "23EE", "j": ["previous track", "arrow", "previous scene", "triangle", "backward"]}, "upwards-button": {"a": "upwards button", "b": "1F53C", "j": ["arrow", "top", "point", "triangle", "blue-square", "red", "direction", "button", "forward"]}, "fast-up-button": {"a": "fast up button", "b": "23EB", "j": ["arrow", "top", "blue-square", "direction", "double"]}, "downwards-button": {"a": "downwards button", "b": "1F53D", "j": ["arrow", "down", "blue-square", "red", "direction", "button", "bottom"]}, "fast-down-button": {"a": "fast down button", "b": "23EC", "j": ["arrow", "down", "blue-square", "direction", "double", "bottom"]}, "pause-button": {"a": "pause button", "b": "23F8", "j": ["bar", "blue-square", "vertical", "double", "pause"]}, "stop-button": {"a": "stop button", "b": "23F9", "j": ["blue-square", "square", "stop"]}, "record-button": {"a": "record button", "b": "23FA", "j": ["blue-square", "circle", "record"]}, "eject-button": {"a": "eject button", "b": "23CF", "j": ["blue-square", "eject"]}, "cinema": {"a": "cinema", "b": "1F3A6", "j": ["theater", "stage", "camera", "record", "curtain", "film", "blue-square", "movie"]}, "dim-button": {"a": "dim button", "b": "1F505", "j": ["sun", "brightness", "low", "warm", "afternoon", "dim", "summer"]}, "bright-button": {"a": "bright button", "b": "1F506", "j": ["sun", "brightness", "light", "bright"]}, "antenna-bars": {"a": "antenna bars", "b": "1F4F6", "j": ["phone", "bars", "bluetooth", "bar", "mobile", "blue-square", "internet", "antenna", "connection", "wifi", "cell", "reception"]}, "vibration-mode": {"a": "vibration mode", "b": "1F4F3", "j": ["phone", "orange-square", "telephone", "mobile", "vibration", "mode", "cell"]}, "mobile-phone-off": {"a": "mobile phone off", "b": "1F4F4", "j": ["silence", "phone", "orange-square", "telephone", "mute", "mobile", "quiet", "cell", "off"]}, "female-sign": {"a": "female sign", "b": "2640", "j": ["lady", "women", "girl", "woman"]}, "male-sign": {"a": "male sign", "b": "2642", "j": ["boy", "man", "men"]}, "transgender-symbol": {"a": "transgender symbol", "b": "26A7", "j": ["transgender", "lgbtq"]}, "multiply": {"a": "multiply", "b": "2716", "j": ["sign", "multiplication_sign", "math", "cancel", "multiplication", "calculation", "x", "×"]}, "plus": {"a": "plus", "b": "2795", "j": ["sign", "+", "increase", "math", "more", "calculation", "plus_sign", "addition"]}, "minus": {"a": "minus", "b": "2796", "j": ["minus_sign", "sign", "math", "−", "calculation", "-", "less", "subtract"]}, "divide": {"a": "divide", "b": "2797", "j": ["sign", "division_sign", "math", "÷", "division", "calculation"]}, "infinity": {"a": "infinity", "b": "267E", "j": ["unbounded", "universal", "forever"]}, "double-exclamation-mark": {"a": "double exclamation mark", "b": "203C", "j": ["!!", "mark", "bangbang", "exclamation", "!", "surprise"]}, "exclamation-question-mark": {"a": "exclamation question mark", "b": "2049", "j": ["punctuation", "interrobang", "mark", "exclamation", "?", "wat", "!?", "question", "!", "surprise"]}, "red-question-mark": {"a": "red question mark", "b": "2753", "j": ["punctuation", "question_mark", "mark", "?", "question", "confused", "doubt"]}, "white-question-mark": {"a": "white question mark", "b": "2754", "j": ["confused", "punctuation", "mark", "?", "outlined", "huh", "doubts", "question", "gray"]}, "white-exclamation-mark": {"a": "white exclamation mark", "b": "2755", "j": ["warning", "punctuation", "mark", "wow", "outlined", "exclamation", "!", "surprise", "gray"]}, "red-exclamation-mark": {"a": "red exclamation mark", "b": "2757", "j": ["danger", "warning", "punctuation", "heavy_exclamation_mark", "mark", "exclamation_mark", "wow", "exclamation", "!", "surprise"]}, "wavy-dash": {"a": "wavy dash", "b": "3030", "j": ["moustache", "punctuation", "draw", "dash", "squiggle", "scribble", "mustache", "line", "wavy"]}, "currency-exchange": {"a": "currency exchange", "b": "1F4B1", "j": ["currency", "bank", "dollar", "travel", "exchange", "money", "sales"]}, "heavy-dollar-sign": {"a": "heavy dollar sign", "b": "1F4B2", "j": ["currency", "dollar", "payment", "money", "sales", "buck"]}, "medical-symbol": {"a": "medical symbol", "b": "2695", "j": ["staff", "aesculapius", "hospital", "medicine", "health"]}, "recycling-symbol": {"a": "recycling symbol", "b": "267B", "j": ["arrow", "recycle", "environment", "garbage", "trash"]}, "fleurdelis": {"a": "fleur-de-lis", "b": "269C", "j": ["fleur_de_lis", "decorative", "scout"]}, "trident-emblem": {"a": "trident emblem", "b": "1F531", "j": ["emblem", "anchor", "weapon", "ship", "tool", "spear", "trident"]}, "name-badge": {"a": "name badge", "b": "1F4DB", "j": ["name", "forbid", "fire", "badge"]}, "japanese-symbol-for-beginner": {"a": "Japanese symbol for beginner", "b": "1F530", "j": ["chevron", "badge", "leaf", "shield", "Japanese", "beginner"]}, "hollow-red-circle": {"a": "hollow red circle", "b": "2B55", "j": ["large", "circle", "o", "red", "round"]}, "check-mark-button": {"a": "check mark button", "b": "2705", "j": ["election", "check", "✓", "green-square", "mark", "vote", "agree", "answer", "tick", "button", "ok"]}, "check-box-with-check": {"a": "check box with check", "b": "2611", "j": ["election", "yes", "check", "✓", "black-square", "vote", "confirm", "agree", "tick", "box", "ok"]}, "check-mark": {"a": "check mark", "b": "2714", "j": ["yes", "check", "✓", "nike", "mark", "answer", "tick", "ok"]}, "cross-mark": {"a": "cross mark", "b": "274C", "j": ["cross", "mark", "no", "delete", "cancel", "multiply", "remove", "multiplication", "red", "x", "×"]}, "cross-mark-button": {"a": "cross mark button", "b": "274E", "j": ["mark", "no", "square", "deny", "x", "green-square", "×"]}, "curly-loop": {"a": "curly loop", "b": "27B0", "j": ["draw", "curl", "shape", "squiggle", "scribble", "loop"]}, "double-curly-loop": {"a": "double curly loop", "b": "27BF", "j": ["curl", "tape", "cassette", "double", "loop"]}, "part-alternation-mark": {"a": "part alternation mark", "b": "303D", "j": ["stats", "business", "mark", "graph", "bad", "part", "economics", "presentation"]}, "eightspoked-asterisk": {"a": "eight-spoked asterisk", "b": "2733", "j": ["eight_spoked_asterisk", "star", "*", "sparkle", "asterisk", "green-square"]}, "eightpointed-star": {"a": "eight-pointed star", "b": "2734", "j": ["polygon", "orange-square", "star", "*", "shape", "eight_pointed_star"]}, "sparkle": {"a": "sparkle", "b": "2747", "j": ["awesome", "fireworks", "good", "stars", "*", "green-square"]}, "copyright": {"a": "copyright", "b": "00A9", "j": ["ip", "circle", "license", "law", "legal", "c"]}, "registered": {"a": "registered", "b": "00AE", "j": ["alphabet", "circle", "r"]}, "trade-mark": {"a": "trade mark", "b": "2122", "j": ["mark", "tm", "law", "brand", "legal", "trademark"]}, "keycap": {"a": "keycap: *", "b": "002A-FE0F-20E3", "j": ["star", "keycap_"]}, "keycap-0": {"a": "keycap: 0", "b": "0030-FE0F-20E3", "j": ["0", "keycap", "numbers", "blue-square", "null"]}, "keycap-1": {"a": "keycap: 1", "b": "0031-FE0F-20E3", "j": ["numbers", "blue-square", "1", "keycap"]}, "keycap-2": {"a": "keycap: 2", "b": "0032-FE0F-20E3", "j": ["keycap", "numbers", "2", "blue-square", "prime"]}, "keycap-3": {"a": "keycap: 3", "b": "0033-FE0F-20E3", "j": ["keycap", "numbers", "3", "blue-square", "prime"]}, "keycap-4": {"a": "keycap: 4", "b": "0034-FE0F-20E3", "j": ["numbers", "blue-square", "4", "keycap"]}, "keycap-5": {"a": "keycap: 5", "b": "0035-FE0F-20E3", "j": ["keycap", "numbers", "blue-square", "prime", "5"]}, "keycap-6": {"a": "keycap: 6", "b": "0036-FE0F-20E3", "j": ["numbers", "6", "keycap", "blue-square"]}, "keycap-7": {"a": "keycap: 7", "b": "0037-FE0F-20E3", "j": ["7", "keycap", "numbers", "blue-square", "prime"]}, "keycap-8": {"a": "keycap: 8", "b": "0038-FE0F-20E3", "j": ["numbers", "blue-square", "8", "keycap"]}, "keycap-9": {"a": "keycap: 9", "b": "0039-FE0F-20E3", "j": ["numbers", "blue-square", "9", "keycap"]}, "keycap-10": {"a": "keycap: 10", "b": "1F51F", "j": ["numbers", "blue-square", "10", "keycap"]}, "input-latin-uppercase": {"a": "input latin uppercase", "b": "1F520", "j": ["latin", "words", "alphabet", "input", "ABCD", "uppercase", "blue-square", "letters"]}, "input-latin-lowercase": {"a": "input latin lowercase", "b": "1F521", "j": ["latin", "alphabet", "abcd", "input", "blue-square", "letters", "lowercase"]}, "input-numbers": {"a": "input numbers", "b": "1F522", "j": ["numbers", "blue-square", "1234", "input"]}, "input-symbols": {"a": "input symbols", "b": "1F523", "j": ["percent", "〒♪&%", "ampersand", "input", "blue-square", "note", "glyphs", "characters", "music"]}, "input-latin-letters": {"a": "input latin letters", "b": "1F524", "j": ["latin", "alphabet", "input", "blue-square", "abc", "letters"]}, "a-button-blood-type": {"a": "A button (blood type)", "b": "1F170", "j": ["a_button", "letter", "alphabet", "a", "red-square", "blood type"]}, "ab-button-blood-type": {"a": "AB button (blood type)", "b": "1F18E", "j": ["ab_button", "alphabet", "red-square", "ab", "blood type"]}, "b-button-blood-type": {"a": "B button (blood type)", "b": "1F171", "j": ["letter", "alphabet", "b", "red-square", "b_button", "blood type"]}, "cl-button": {"a": "CL button", "b": "1F191", "j": ["alphabet", "red-square", "words", "cl"]}, "cool-button": {"a": "COOL button", "b": "1F192", "j": ["blue-square", "words", "cool"]}, "free-button": {"a": "FREE button", "b": "1F193", "j": ["blue-square", "free", "words"]}, "information": {"a": "information", "b": "2139", "j": ["i", "alphabet", "blue-square", "letter"]}, "id-button": {"a": "ID button", "b": "1F194", "j": ["id", "identity", "purple-square", "words"]}, "circled-m": {"a": "circled M", "b": "24C2", "j": ["circle", "blue-circle", "letter", "alphabet", "m"]}, "new-button": {"a": "NEW button", "b": "1F195", "j": ["blue-square", "start", "new", "words"]}, "ng-button": {"a": "NG button", "b": "1F196", "j": ["icon", "words", "blue-square", "ng", "shape"]}, "o-button-blood-type": {"a": "O button (blood type)", "b": "1F17E", "j": ["letter", "alphabet", "o", "o_button", "red-square", "blood type"]}, "ok-button": {"a": "OK button", "b": "1F197", "j": ["yes", "OK", "good", "agree", "blue-square"]}, "p-button": {"a": "P button", "b": "1F17F", "j": ["letter", "alphabet", "blue-square", "parking", "cars"]}, "sos-button": {"a": "SOS button", "b": "1F198", "j": ["words", "sos", "emergency", "red-square", "911", "help"]}, "up-button": {"a": "UP! button", "b": "1F199", "j": ["mark", "high", "above", "blue-square", "up"]}, "vs-button": {"a": "VS button", "b": "1F19A", "j": ["orange-square", "vs", "words", "versus"]}, "japanese-here-button": {"a": "Japanese “here” button", "b": "1F201", "j": ["destination", "ココ", "katakana", "Japanese", "japanese", "“here”", "blue-square", "here"]}, "japanese-service-charge-button": {"a": "Japanese “service charge” button", "b": "1F202", "j": ["katakana", "Japanese", "japanese", "blue-square", "“service charge”", "サ"]}, "japanese-monthly-amount-button": {"a": "Japanese “monthly amount” button", "b": "1F237", "j": ["orange-square", "moon", "Japanese", "japanese", "kanji", "ideograph", "月", "chinese", "“monthly amount”", "month"]}, "japanese-not-free-of-charge-button": {"a": "Japanese “not free of charge” button", "b": "1F236", "j": ["有", "orange-square", "Japanese", "have", "kanji", "ideograph", "chinese", "“not free of charge”"]}, "japanese-reserved-button": {"a": "Japanese “reserved” button", "b": "1F22F", "j": ["point", "“reserved”", "Japanese", "kanji", "ideograph", "chinese", "green-square", "指"]}, "japanese-bargain-button": {"a": "Japanese “bargain” button", "b": "1F250", "j": ["circle", "得", "obtain", "Japanese", "get", "“bargain”", "kanji", "ideograph", "chinese"]}, "japanese-discount-button": {"a": "Japanese “discount” button", "b": "1F239", "j": ["pink-square", "Japanese", "“discount”", "kanji", "ideograph", "割", "chinese", "divide", "cut"]}, "japanese-free-of-charge-button": {"a": "Japanese “free of charge” button", "b": "1F21A", "j": ["“free of charge”", "orange-square", "Japanese", "japanese", "nothing", "kanji", "ideograph", "chinese", "無"]}, "japanese-prohibited-button": {"a": "Japanese “prohibited” button", "b": "1F232", "j": ["“prohibited”", "forbidden", "禁", "Japanese", "japanese", "red-square", "kanji", "ideograph", "limit", "chinese", "restricted"]}, "japanese-acceptable-button": {"a": "Japanese “acceptable” button", "b": "1F251", "j": ["yes", "good", "orange-circle", "可", "Japanese", "agree", "kanji", "ideograph", "chinese", "ok", "“acceptable”"]}, "japanese-application-button": {"a": "Japanese “application” button", "b": "1F238", "j": ["orange-square", "Japanese", "japanese", "kanji", "ideograph", "“application”", "chinese", "申"]}, "japanese-passing-grade-button": {"a": "Japanese “passing grade” button", "b": "1F234", "j": ["join", "Japanese", "japanese", "“passing grade”", "red-square", "kanji", "ideograph", "chinese", "合"]}, "japanese-vacancy-button": {"a": "Japanese “vacancy” button", "b": "1F233", "j": ["“vacancy”", "空", "Japanese", "japanese", "blue-square", "sky", "kanji", "ideograph", "empty", "chinese"]}, "japanese-congratulations-button": {"a": "Japanese “congratulations” button", "b": "3297", "j": ["Japanese", "japanese", "kanji", "ideograph", "chinese", "red-circle", "“congratulations”", "祝"]}, "japanese-secret-button": {"a": "Japanese “secret” button", "b": "3299", "j": ["privacy", "“secret”", "Japanese", "sshh", "kanji", "ideograph", "秘", "red-circle", "chinese"]}, "japanese-open-for-business-button": {"a": "Japanese “open for business” button", "b": "1F23A", "j": ["orange-square", "Japanese", "営", "japanese", "opening hours", "“open for business”", "ideograph"]}, "japanese-no-vacancy-button": {"a": "Japanese “no vacancy” button", "b": "1F235", "j": ["満", "full", "Japanese", "japanese", "red-square", "kanji", "ideograph", "chinese", "“no vacancy”"]}, "red-circle": {"a": "red circle", "b": "1F534", "j": ["danger", "circle", "shape", "red", "geometric", "error"]}, "orange-circle": {"a": "orange circle", "b": "1F7E0", "j": ["circle", "orange", "round"]}, "yellow-circle": {"a": "yellow circle", "b": "1F7E1", "j": ["circle", "round", "yellow"]}, "green-circle": {"a": "green circle", "b": "1F7E2", "j": ["circle", "round", "green"]}, "blue-circle": {"a": "blue circle", "b": "1F535", "j": ["blue", "circle", "icon", "geometric", "shape", "button"]}, "purple-circle": {"a": "purple circle", "b": "1F7E3", "j": ["circle", "purple", "round"]}, "brown-circle": {"a": "brown circle", "b": "1F7E4", "j": ["circle", "brown", "round"]}, "black-circle": {"a": "black circle", "b": "26AB", "j": ["circle", "shape", "geometric", "button", "round"]}, "white-circle": {"a": "white circle", "b": "26AA", "j": ["circle", "shape", "round", "geometric"]}, "red-square": {"a": "red square", "b": "1F7E5", "j": ["red", "square"]}, "orange-square": {"a": "orange square", "b": "1F7E7", "j": ["square", "orange"]}, "yellow-square": {"a": "yellow square", "b": "1F7E8", "j": ["square", "yellow"]}, "green-square": {"a": "green square", "b": "1F7E9", "j": ["square", "green"]}, "blue-square": {"a": "blue square", "b": "1F7E6", "j": ["blue", "square"]}, "purple-square": {"a": "purple square", "b": "1F7EA", "j": ["square", "purple"]}, "brown-square": {"a": "brown square", "b": "1F7EB", "j": ["square", "brown"]}, "black-large-square": {"a": "black large square", "b": "2B1B", "j": ["icon", "geometric", "shape", "square", "button"]}, "white-large-square": {"a": "white large square", "b": "2B1C", "j": ["icon", "stone", "shape", "geometric", "square", "button"]}, "black-medium-square": {"a": "black medium square", "b": "25FC", "j": ["icon", "geometric", "shape", "square", "button"]}, "white-medium-square": {"a": "white medium square", "b": "25FB", "j": ["icon", "stone", "shape", "geometric", "square"]}, "black-mediumsmall-square": {"a": "black medium-small square", "b": "25FE", "j": ["icon", "geometric", "shape", "square", "black_medium_small_square", "button"]}, "white-mediumsmall-square": {"a": "white medium-small square", "b": "25FD", "j": ["icon", "stone", "geometric", "shape", "square", "white_medium_small_square", "button"]}, "black-small-square": {"a": "black small square", "b": "25AA", "j": ["geometric", "shape", "icon", "square"]}, "white-small-square": {"a": "white small square", "b": "25AB", "j": ["geometric", "shape", "icon", "square"]}, "large-orange-diamond": {"a": "large orange diamond", "b": "1F536", "j": ["diamond", "orange", "gem", "shape", "geometric", "jewel"]}, "large-blue-diamond": {"a": "large blue diamond", "b": "1F537", "j": ["blue", "diamond", "geometric", "shape", "gem", "jewel"]}, "small-orange-diamond": {"a": "small orange diamond", "b": "1F538", "j": ["diamond", "orange", "gem", "shape", "geometric", "jewel"]}, "small-blue-diamond": {"a": "small blue diamond", "b": "1F539", "j": ["blue", "diamond", "geometric", "shape", "gem", "jewel"]}, "red-triangle-pointed-up": {"a": "red triangle pointed up", "b": "1F53A", "j": ["top", "geometric", "shape", "red", "direction", "up"]}, "red-triangle-pointed-down": {"a": "red triangle pointed down", "b": "1F53B", "j": ["down", "shape", "red", "geometric", "direction", "bottom"]}, "diamond-with-a-dot": {"a": "diamond with a dot", "b": "1F4A0", "j": ["blue", "diamond", "fancy", "inside", "crystal", "comic", "geometric", "gem", "jewel"]}, "radio-button": {"a": "radio button", "b": "1F518", "j": ["circle", "input", "geometric", "old", "button", "music", "radio"]}, "white-square-button": {"a": "white square button", "b": "1F533", "j": ["input", "outlined", "geometric", "shape", "square", "button"]}, "black-square-button": {"a": "black square button", "b": "1F532", "j": ["input", "geometric", "shape", "square", "button", "frame"]}, "chequered-flag": {"a": "chequered flag", "b": "1F3C1", "j": ["checkered", "contest", "finishline", "race", "racing", "gokart", "chequered"]}, "triangular-flag": {"a": "triangular flag", "b": "1F6A9", "j": ["place", "post", "milestone", "mark"]}, "crossed-flags": {"a": "crossed flags", "b": "1F38C", "j": ["cross", "Japanese", "crossed", "japanese", "celebration", "nation", "country", "border"]}, "black-flag": {"a": "black flag", "b": "1F3F4", "j": ["waving", "pirate"]}, "white-flag": {"a": "white flag", "b": "1F3F3", "j": ["waving", "give up", "loser", "losing", "fail", "lost", "surrender"]}, "rainbow-flag": {"a": "rainbow flag", "b": "1F3F3-FE0F-200D-1F308", "j": ["homosexual", "glbt", "flag", "pride", "bisexual", "gay", "queer", "lesbian", "lgbt", "rainbow", "transgender"]}, "transgender-flag": {"a": "transgender flag", "b": "1F3F3-FE0F-200D-26A7-FE0F", "j": ["flag", "lgbtq", "light blue", "pink", "white", "transgender"]}, "pirate-flag": {"a": "pirate flag", "b": "1F3F4-200D-2620-FE0F", "j": ["banner", "pirate", "skull", "flag", "Jolly Roger", "treasure", "plunder", "crossbones"]}, "flag-ascension-island": {"a": "flag: Ascension Island", "b": "1F1E6-1F1E8", "j": ["flag"]}, "flag-andorra": {"a": "flag: Andorra", "b": "1F1E6-1F1E9", "j": ["banner", "ad", "flag", "country", "nation"]}, "flag-united-arab-emirates": {"a": "flag: United Arab Emirates", "b": "1F1E6-1F1EA", "j": ["united", "banner", "flag", "arab", "nation", "country", "emirates"]}, "flag-afghanistan": {"a": "flag: Afghanistan", "b": "1F1E6-1F1EB", "j": ["banner", "af", "flag", "country", "nation"]}, "flag-antigua--barbuda": {"a": "flag: Antigua & Barbuda", "b": "1F1E6-1F1EC", "j": ["banner", "antigua", "flag", "flag_antigua_barbuda", "nation", "country", "barbuda"]}, "flag-anguilla": {"a": "flag: Anguilla", "b": "1F1E6-1F1EE", "j": ["banner", "flag", "ai", "country", "nation"]}, "flag-albania": {"a": "flag: Albania", "b": "1F1E6-1F1F1", "j": ["banner", "flag", "nation", "country", "al"]}, "flag-armenia": {"a": "flag: Armenia", "b": "1F1E6-1F1F2", "j": ["banner", "am", "flag", "nation", "country"]}, "flag-angola": {"a": "flag: Angola", "b": "1F1E6-1F1F4", "j": ["banner", "flag", "ao", "country", "nation"]}, "flag-antarctica": {"a": "flag: Antarctica", "b": "1F1E6-1F1F6", "j": ["banner", "flag", "nation", "country", "aq"]}, "flag-argentina": {"a": "flag: Argentina", "b": "1F1E6-1F1F7", "j": ["banner", "flag", "ar", "nation", "country"]}, "flag-american-samoa": {"a": "flag: American Samoa", "b": "1F1E6-1F1F8", "j": ["banner", "flag", "ws", "nation", "country", "american"]}, "flag-austria": {"a": "flag: Austria", "b": "1F1E6-1F1F9", "j": ["banner", "at", "flag", "nation", "country"]}, "flag-australia": {"a": "flag: Australia", "b": "1F1E6-1F1FA", "j": ["banner", "flag", "au", "nation", "country"]}, "flag-aruba": {"a": "flag: Aruba", "b": "1F1E6-1F1FC", "j": ["banner", "flag", "nation", "country", "aw"]}, "flag-land-islands": {"a": "flag: Åland Islands", "b": "1F1E6-1F1FD", "j": ["banner", "Åland", "flag_aland_islands", "flag", "islands", "nation", "country"]}, "flag-azerbaijan": {"a": "flag: Azerbaijan", "b": "1F1E6-1F1FF", "j": ["banner", "az", "flag", "country", "nation"]}, "flag-bosnia--herzegovina": {"a": "flag: Bosnia & Herzegovina", "b": "1F1E7-1F1E6", "j": ["banner", "flag", "flag_bosnia_herzegovina", "herzegovina", "bosnia", "nation", "country"]}, "flag-barbados": {"a": "flag: Barbados", "b": "1F1E7-1F1E7", "j": ["banner", "bb", "flag", "country", "nation"]}, "flag-bangladesh": {"a": "flag: Bangladesh", "b": "1F1E7-1F1E9", "j": ["banner", "flag", "country", "nation", "bd"]}, "flag-belgium": {"a": "flag: Belgium", "b": "1F1E7-1F1EA", "j": ["banner", "flag", "country", "nation", "be"]}, "flag-burkina-faso": {"a": "flag: Burkina Faso", "b": "1F1E7-1F1EB", "j": ["banner", "flag", "faso", "nation", "country", "burkina"]}, "flag-bulgaria": {"a": "flag: Bulgaria", "b": "1F1E7-1F1EC", "j": ["banner", "flag", "bg", "country", "nation"]}, "flag-bahrain": {"a": "flag: Bahrain", "b": "1F1E7-1F1ED", "j": ["banner", "flag", "bh", "country", "nation"]}, "flag-burundi": {"a": "flag: Burundi", "b": "1F1E7-1F1EE", "j": ["banner", "flag", "bi", "country", "nation"]}, "flag-benin": {"a": "flag: Benin", "b": "1F1E7-1F1EF", "j": ["banner", "flag", "bj", "country", "nation"]}, "flag-st-barthlemy": {"a": "flag: St. Barthélemy", "b": "1F1E7-1F1F1", "j": ["banner", "flag", "flag_st_barthelemy", "nation", "country", "barthélemy", "saint"]}, "flag-bermuda": {"a": "flag: Bermuda", "b": "1F1E7-1F1F2", "j": ["banner", "bm", "flag", "country", "nation"]}, "flag-brunei": {"a": "flag: Brunei", "b": "1F1E7-1F1F3", "j": ["banner", "darussalam", "flag", "nation", "bn", "country"]}, "flag-bolivia": {"a": "flag: Bolivia", "b": "1F1E7-1F1F4", "j": ["banner", "flag", "country", "nation", "bo"]}, "flag-caribbean-netherlands": {"a": "flag: Caribbean Netherlands", "b": "1F1E7-1F1F6", "j": ["banner", "flag", "bonaire", "nation", "country"]}, "flag-brazil": {"a": "flag: Brazil", "b": "1F1E7-1F1F7", "j": ["banner", "flag", "br", "country", "nation"]}, "flag-bahamas": {"a": "flag: Bahamas", "b": "1F1E7-1F1F8", "j": ["banner", "flag", "country", "nation", "bs"]}, "flag-bhutan": {"a": "flag: Bhutan", "b": "1F1E7-1F1F9", "j": ["bt", "banner", "flag", "country", "nation"]}, "flag-bouvet-island": {"a": "flag: Bouvet Island", "b": "1F1E7-1F1FB", "j": ["norway", "flag"]}, "flag-botswana": {"a": "flag: Botswana", "b": "1F1E7-1F1FC", "j": ["banner", "flag", "bw", "country", "nation"]}, "flag-belarus": {"a": "flag: Belarus", "b": "1F1E7-1F1FE", "j": ["banner", "flag", "nation", "country", "by"]}, "flag-belize": {"a": "flag: Belize", "b": "1F1E7-1F1FF", "j": ["banner", "flag", "country", "bz", "nation"]}, "flag-canada": {"a": "flag: Canada", "b": "1F1E8-1F1E6", "j": ["banner", "flag", "ca", "country", "nation"]}, "flag-cocos-keeling-islands": {"a": "flag: Cocos (Keeling) Islands", "b": "1F1E8-1F1E8", "j": ["keeling", "banner", "flag", "cocos", "islands", "nation", "country", "flag_cocos_islands"]}, "flag-congo--kinshasa": {"a": "flag: Congo - Kinshasa", "b": "1F1E8-1F1E9", "j": ["banner", "flag_congo_kinshasa", "republic", "democratic", "flag", "congo", "nation", "country"]}, "flag-central-african-republic": {"a": "flag: Central African Republic", "b": "1F1E8-1F1EB", "j": ["banner", "republic", "flag", "nation", "african", "country", "central"]}, "flag-congo--brazzaville": {"a": "flag: Congo - Brazzaville", "b": "1F1E8-1F1EC", "j": ["banner", "flag", "congo", "flag_congo_brazzaville", "country", "nation"]}, "flag-switzerland": {"a": "flag: Switzerland", "b": "1F1E8-1F1ED", "j": ["banner", "ch", "flag", "country", "nation"]}, "flag-cte-divoire": {"a": "flag: Côte d’Ivoire", "b": "1F1E8-1F1EE", "j": ["banner", "coast", "flag", "country", "nation", "flag_cote_d_ivoire", "ivory"]}, "flag-cook-islands": {"a": "flag: Cook Islands", "b": "1F1E8-1F1F0", "j": ["banner", "flag", "islands", "nation", "country", "cook"]}, "flag-chile": {"a": "flag: Chile", "b": "1F1E8-1F1F1", "j": ["flag", "banner", "nation", "country"]}, "flag-cameroon": {"a": "flag: Cameroon", "b": "1F1E8-1F1F2", "j": ["banner", "flag", "cm", "nation", "country"]}, "flag-china": {"a": "flag: China", "b": "1F1E8-1F1F3", "j": ["china", "banner", "flag", "prc", "country", "chinese", "nation"]}, "flag-colombia": {"a": "flag: Colombia", "b": "1F1E8-1F1F4", "j": ["banner", "co", "flag", "nation", "country"]}, "flag-clipperton-island": {"a": "flag: Clipperton Island", "b": "1F1E8-1F1F5", "j": ["flag"]}, "flag-costa-rica": {"a": "flag: Costa Rica", "b": "1F1E8-1F1F7", "j": ["banner", "flag", "nation", "rica", "costa", "country"]}, "flag-cuba": {"a": "flag: Cuba", "b": "1F1E8-1F1FA", "j": ["banner", "cu", "flag", "nation", "country"]}, "flag-cape-verde": {"a": "flag: Cape Verde", "b": "1F1E8-1F1FB", "j": ["banner", "flag", "cabo", "verde", "nation", "country"]}, "flag-curaao": {"a": "flag: Curaçao", "b": "1F1E8-1F1FC", "j": ["banner", "flag", "curaçao", "country", "flag_curacao", "nation"]}, "flag-christmas-island": {"a": "flag: Christmas Island", "b": "1F1E8-1F1FD", "j": ["banner", "flag", "nation", "country", "island", "christmas"]}, "flag-cyprus": {"a": "flag: Cyprus", "b": "1F1E8-1F1FE", "j": ["banner", "cy", "flag", "country", "nation"]}, "flag-czechia": {"a": "flag: Czechia", "b": "1F1E8-1F1FF", "j": ["cz", "banner", "flag", "nation", "country"]}, "flag-germany": {"a": "flag: Germany", "b": "1F1E9-1F1EA", "j": ["banner", "flag", "german", "country", "nation"]}, "flag-diego-garcia": {"a": "flag: Diego Garcia", "b": "1F1E9-1F1EC", "j": ["flag"]}, "flag-djibouti": {"a": "flag: Djibouti", "b": "1F1E9-1F1EF", "j": ["banner", "flag", "dj", "country", "nation"]}, "flag-denmark": {"a": "flag: Denmark", "b": "1F1E9-1F1F0", "j": ["banner", "flag", "dk", "country", "nation"]}, "flag-dominica": {"a": "flag: Dominica", "b": "1F1E9-1F1F2", "j": ["banner", "dm", "flag", "country", "nation"]}, "flag-dominican-republic": {"a": "flag: Dominican Republic", "b": "1F1E9-1F1F4", "j": ["banner", "republic", "flag", "dominican", "nation", "country"]}, "flag-algeria": {"a": "flag: Algeria", "b": "1F1E9-1F1FF", "j": ["banner", "flag", "dz", "country", "nation"]}, "flag-ceuta--melilla": {"a": "flag: Ceuta & Melilla", "b": "1F1EA-1F1E6", "j": ["flag_ceuta_melilla", "flag"]}, "flag-ecuador": {"a": "flag: Ecuador", "b": "1F1EA-1F1E8", "j": ["banner", "flag", "ec", "country", "nation"]}, "flag-estonia": {"a": "flag: Estonia", "b": "1F1EA-1F1EA", "j": ["ee", "banner", "flag", "nation", "country"]}, "flag-egypt": {"a": "flag: Egypt", "b": "1F1EA-1F1EC", "j": ["banner", "flag", "eg", "country", "nation"]}, "flag-western-sahara": {"a": "flag: Western Sahara", "b": "1F1EA-1F1ED", "j": ["banner", "flag", "sahara", "nation", "country", "western"]}, "flag-eritrea": {"a": "flag: Eritrea", "b": "1F1EA-1F1F7", "j": ["banner", "flag", "er", "country", "nation"]}, "flag-spain": {"a": "flag: Spain", "b": "1F1EA-1F1F8", "j": ["spain", "banner", "flag", "country", "nation"]}, "flag-ethiopia": {"a": "flag: Ethiopia", "b": "1F1EA-1F1F9", "j": ["banner", "flag", "et", "nation", "country"]}, "flag-european-union": {"a": "flag: European Union", "b": "1F1EA-1F1FA", "j": ["banner", "european", "flag", "union"]}, "flag-finland": {"a": "flag: Finland", "b": "1F1EB-1F1EE", "j": ["banner", "fi", "flag", "nation", "country"]}, "flag-fiji": {"a": "flag: Fiji", "b": "1F1EB-1F1EF", "j": ["banner", "fj", "flag", "country", "nation"]}, "flag-falkland-islands": {"a": "flag: Falkland Islands", "b": "1F1EB-1F1F0", "j": ["banner", "flag", "malvinas", "falkland", "islands", "nation", "country"]}, "flag-micronesia": {"a": "flag: Micronesia", "b": "1F1EB-1F1F2", "j": ["banner", "flag", "federated", "micronesia", "nation", "country", "states"]}, "flag-faroe-islands": {"a": "flag: Faroe Islands", "b": "1F1EB-1F1F4", "j": ["banner", "flag", "islands", "nation", "country", "faroe"]}, "flag-france": {"a": "flag: France", "b": "1F1EB-1F1F7", "j": ["banner", "flag", "french", "france", "nation", "country"]}, "flag-gabon": {"a": "flag: Gabon", "b": "1F1EC-1F1E6", "j": ["banner", "flag", "ga", "country", "nation"]}, "flag-united-kingdom": {"a": "flag: United Kingdom", "b": "1F1EC-1F1E7", "j": ["united", "banner", "UK", "england", "ireland", "flag", "british", "britain", "english", "northern", "great", "kingdom", "nation", "country", "union jack"]}, "flag-grenada": {"a": "flag: Grenada", "b": "1F1EC-1F1E9", "j": ["banner", "flag", "gd", "country", "nation"]}, "flag-georgia": {"a": "flag: Georgia", "b": "1F1EC-1F1EA", "j": ["banner", "flag", "ge", "country", "nation"]}, "flag-french-guiana": {"a": "flag: French Guiana", "b": "1F1EC-1F1EB", "j": ["banner", "flag", "french", "guiana", "nation", "country"]}, "flag-guernsey": {"a": "flag: Guernsey", "b": "1F1EC-1F1EC", "j": ["banner", "gg", "flag", "country", "nation"]}, "flag-ghana": {"a": "flag: Ghana", "b": "1F1EC-1F1ED", "j": ["banner", "flag", "country", "nation", "gh"]}, "flag-gibraltar": {"a": "flag: Gibraltar", "b": "1F1EC-1F1EE", "j": ["banner", "flag", "nation", "country", "gi"]}, "flag-greenland": {"a": "flag: Greenland", "b": "1F1EC-1F1F1", "j": ["banner", "flag", "country", "nation", "gl"]}, "flag-gambia": {"a": "flag: Gambia", "b": "1F1EC-1F1F2", "j": ["banner", "gm", "flag", "country", "nation"]}, "flag-guinea": {"a": "flag: Guinea", "b": "1F1EC-1F1F3", "j": ["banner", "flag", "gn", "country", "nation"]}, "flag-guadeloupe": {"a": "flag: Guadeloupe", "b": "1F1EC-1F1F5", "j": ["banner", "flag", "country", "gp", "nation"]}, "flag-equatorial-guinea": {"a": "flag: Equatorial Guinea", "b": "1F1EC-1F1F6", "j": ["banner", "flag", "gn", "equatorial", "nation", "country"]}, "flag-greece": {"a": "flag: Greece", "b": "1F1EC-1F1F7", "j": ["banner", "flag", "gr", "nation", "country"]}, "flag-south-georgia--south-sandwich-islands": {"a": "flag: South Georgia & South Sandwich Islands", "b": "1F1EC-1F1F8", "j": ["banner", "flag", "flag_south_georgia_south_sandwich_islands", "islands", "georgia", "nation", "country", "sandwich", "south"]}, "flag-guatemala": {"a": "flag: Guatemala", "b": "1F1EC-1F1F9", "j": ["banner", "flag", "gt", "country", "nation"]}, "flag-guam": {"a": "flag: Guam", "b": "1F1EC-1F1FA", "j": ["banner", "flag", "nation", "country", "gu"]}, "flag-guineabissau": {"a": "flag: Guinea-Bissau", "b": "1F1EC-1F1FC", "j": ["banner", "flag_guinea_bissau", "flag", "nation", "country", "bissau", "gw"]}, "flag-guyana": {"a": "flag: Guyana", "b": "1F1EC-1F1FE", "j": ["banner", "flag", "gy", "country", "nation"]}, "flag-hong-kong-sar-china": {"a": "flag: Hong Kong SAR China", "b": "1F1ED-1F1F0", "j": ["banner", "kong", "flag", "hong", "nation", "country"]}, "flag-heard--mcdonald-islands": {"a": "flag: Heard & McDonald Islands", "b": "1F1ED-1F1F2", "j": ["flag_heard_mcdonald_islands", "flag"]}, "flag-honduras": {"a": "flag: Honduras", "b": "1F1ED-1F1F3", "j": ["banner", "flag", "hn", "nation", "country"]}, "flag-croatia": {"a": "flag: Croatia", "b": "1F1ED-1F1F7", "j": ["banner", "flag", "country", "nation", "hr"]}, "flag-haiti": {"a": "flag: Haiti", "b": "1F1ED-1F1F9", "j": ["banner", "flag", "country", "nation", "ht"]}, "flag-hungary": {"a": "flag: Hungary", "b": "1F1ED-1F1FA", "j": ["banner", "flag", "hu", "country", "nation"]}, "flag-canary-islands": {"a": "flag: Canary Islands", "b": "1F1EE-1F1E8", "j": ["banner", "flag", "canary", "islands", "nation", "country"]}, "flag-indonesia": {"a": "flag: Indonesia", "b": "1F1EE-1F1E9", "j": ["flag", "banner", "nation", "country"]}, "flag-ireland": {"a": "flag: Ireland", "b": "1F1EE-1F1EA", "j": ["banner", "flag", "ie", "nation", "country"]}, "flag-israel": {"a": "flag: Israel", "b": "1F1EE-1F1F1", "j": ["banner", "flag", "il", "country", "nation"]}, "flag-isle-of-man": {"a": "flag: Isle of Man", "b": "1F1EE-1F1F2", "j": ["isle", "banner", "man", "flag", "nation", "country"]}, "flag-india": {"a": "flag: India", "b": "1F1EE-1F1F3", "j": ["banner", "flag", "in", "country", "nation"]}, "flag-british-indian-ocean-territory": {"a": "flag: British Indian Ocean Territory", "b": "1F1EE-1F1F4", "j": ["banner", "flag", "british", "ocean", "nation", "territory", "country", "indian"]}, "flag-iraq": {"a": "flag: Iraq", "b": "1F1EE-1F1F6", "j": ["banner", "iq", "flag", "nation", "country"]}, "flag-iran": {"a": "flag: Iran", "b": "1F1EE-1F1F7", "j": ["banner", "republic", "flag", "iran", "islamic", "nation", "country"]}, "flag-iceland": {"a": "flag: Iceland", "b": "1F1EE-1F1F8", "j": ["banner", "flag", "is", "country", "nation"]}, "flag-italy": {"a": "flag: Italy", "b": "1F1EE-1F1F9", "j": ["banner", "flag", "italy", "country", "nation"]}, "flag-jersey": {"a": "flag: Jersey", "b": "1F1EF-1F1EA", "j": ["je", "banner", "flag", "nation", "country"]}, "flag-jamaica": {"a": "flag: Jamaica", "b": "1F1EF-1F1F2", "j": ["banner", "flag", "nation", "country", "jm"]}, "flag-jordan": {"a": "flag: Jordan", "b": "1F1EF-1F1F4", "j": ["jo", "banner", "flag", "nation", "country"]}, "flag-japan": {"a": "flag: Japan", "b": "1F1EF-1F1F5", "j": ["banner", "flag", "japanese", "nation", "country"]}, "flag-kenya": {"a": "flag: Kenya", "b": "1F1F0-1F1EA", "j": ["banner", "flag", "country", "nation", "ke"]}, "flag-kyrgyzstan": {"a": "flag: Kyrgyzstan", "b": "1F1F0-1F1EC", "j": ["kg", "banner", "flag", "nation", "country"]}, "flag-cambodia": {"a": "flag: Cambodia", "b": "1F1F0-1F1ED", "j": ["banner", "flag", "kh", "nation", "country"]}, "flag-kiribati": {"a": "flag: Kiribati", "b": "1F1F0-1F1EE", "j": ["banner", "flag", "nation", "country", "ki"]}, "flag-comoros": {"a": "flag: Comoros", "b": "1F1F0-1F1F2", "j": ["banner", "flag", "km", "country", "nation"]}, "flag-st-kitts--nevis": {"a": "flag: St. Kitts & Nevis", "b": "1F1F0-1F1F3", "j": ["nevis", "banner", "kitts", "flag", "flag_st_kitts_nevis", "nation", "country", "saint"]}, "flag-north-korea": {"a": "flag: North Korea", "b": "1F1F0-1F1F5", "j": ["banner", "flag", "korea", "country", "nation", "north"]}, "flag-south-korea": {"a": "flag: South Korea", "b": "1F1F0-1F1F7", "j": ["banner", "flag", "korea", "nation", "country", "south"]}, "flag-kuwait": {"a": "flag: Kuwait", "b": "1F1F0-1F1FC", "j": ["banner", "flag", "kw", "nation", "country"]}, "flag-cayman-islands": {"a": "flag: Cayman Islands", "b": "1F1F0-1F1FE", "j": ["banner", "flag", "cayman", "islands", "nation", "country"]}, "flag-kazakhstan": {"a": "flag: Kazakhstan", "b": "1F1F0-1F1FF", "j": ["kz", "banner", "flag", "nation", "country"]}, "flag-laos": {"a": "flag: Laos", "b": "1F1F1-1F1E6", "j": ["banner", "republic", "flag", "democratic", "nation", "country", "lao"]}, "flag-lebanon": {"a": "flag: Lebanon", "b": "1F1F1-1F1E7", "j": ["banner", "flag", "lb", "country", "nation"]}, "flag-st-lucia": {"a": "flag: St. Lucia", "b": "1F1F1-1F1E8", "j": ["banner", "flag", "lucia", "nation", "country", "saint"]}, "flag-liechtenstein": {"a": "flag: Liechtenstein", "b": "1F1F1-1F1EE", "j": ["banner", "flag", "country", "nation", "li"]}, "flag-sri-lanka": {"a": "flag: Sri Lanka", "b": "1F1F1-1F1F0", "j": ["lanka", "banner", "flag", "nation", "country", "sri"]}, "flag-liberia": {"a": "flag: Liberia", "b": "1F1F1-1F1F7", "j": ["banner", "flag", "lr", "country", "nation"]}, "flag-lesotho": {"a": "flag: Lesotho", "b": "1F1F1-1F1F8", "j": ["banner", "flag", "country", "nation", "ls"]}, "flag-lithuania": {"a": "flag: Lithuania", "b": "1F1F1-1F1F9", "j": ["banner", "flag", "lt", "country", "nation"]}, "flag-luxembourg": {"a": "flag: Luxembourg", "b": "1F1F1-1F1FA", "j": ["banner", "flag", "country", "nation", "lu"]}, "flag-latvia": {"a": "flag: Latvia", "b": "1F1F1-1F1FB", "j": ["lv", "banner", "flag", "nation", "country"]}, "flag-libya": {"a": "flag: Libya", "b": "1F1F1-1F1FE", "j": ["banner", "ly", "flag", "country", "nation"]}, "flag-morocco": {"a": "flag: Morocco", "b": "1F1F2-1F1E6", "j": ["banner", "ma", "flag", "country", "nation"]}, "flag-monaco": {"a": "flag: Monaco", "b": "1F1F2-1F1E8", "j": ["banner", "flag", "mc", "nation", "country"]}, "flag-moldova": {"a": "flag: Moldova", "b": "1F1F2-1F1E9", "j": ["banner", "republic", "flag", "country", "nation", "moldova"]}, "flag-montenegro": {"a": "flag: Montenegro", "b": "1F1F2-1F1EA", "j": ["banner", "flag", "me", "country", "nation"]}, "flag-st-martin": {"a": "flag: St. Martin", "b": "1F1F2-1F1EB", "j": ["flag"]}, "flag-madagascar": {"a": "flag: Madagascar", "b": "1F1F2-1F1EC", "j": ["banner", "flag", "country", "nation", "mg"]}, "flag-marshall-islands": {"a": "flag: Marshall Islands", "b": "1F1F2-1F1ED", "j": ["banner", "flag", "islands", "nation", "country", "marshall"]}, "flag-north-macedonia": {"a": "flag: North Macedonia", "b": "1F1F2-1F1F0", "j": ["banner", "flag", "macedonia", "country", "nation"]}, "flag-mali": {"a": "flag: Mali", "b": "1F1F2-1F1F1", "j": ["banner", "flag", "country", "ml", "nation"]}, "flag-myanmar-burma": {"a": "flag: Myanmar (Burma)", "b": "1F1F2-1F1F2", "j": ["banner", "flag", "flag_myanmar", "mm", "country", "nation"]}, "flag-mongolia": {"a": "flag: Mongolia", "b": "1F1F2-1F1F3", "j": ["banner", "flag", "mn", "country", "nation"]}, "flag-macao-sar-china": {"a": "flag: Macao SAR China", "b": "1F1F2-1F1F4", "j": ["banner", "flag", "country", "macao", "nation"]}, "flag-northern-mariana-islands": {"a": "flag: Northern Mariana Islands", "b": "1F1F2-1F1F5", "j": ["banner", "flag", "northern", "islands", "nation", "country", "mariana"]}, "flag-martinique": {"a": "flag: Martinique", "b": "1F1F2-1F1F6", "j": ["banner", "flag", "country", "nation", "mq"]}, "flag-mauritania": {"a": "flag: Mauritania", "b": "1F1F2-1F1F7", "j": ["banner", "mr", "flag", "country", "nation"]}, "flag-montserrat": {"a": "flag: Montserrat", "b": "1F1F2-1F1F8", "j": ["banner", "flag", "ms", "country", "nation"]}, "flag-malta": {"a": "flag: Malta", "b": "1F1F2-1F1F9", "j": ["banner", "mt", "flag", "country", "nation"]}, "flag-mauritius": {"a": "flag: Mauritius", "b": "1F1F2-1F1FA", "j": ["banner", "flag", "country", "nation", "mu"]}, "flag-maldives": {"a": "flag: Maldives", "b": "1F1F2-1F1FB", "j": ["banner", "mv", "flag", "country", "nation"]}, "flag-malawi": {"a": "flag: Malawi", "b": "1F1F2-1F1FC", "j": ["banner", "flag", "country", "nation", "mw"]}, "flag-mexico": {"a": "flag: Mexico", "b": "1F1F2-1F1FD", "j": ["banner", "flag", "mx", "nation", "country"]}, "flag-malaysia": {"a": "flag: Malaysia", "b": "1F1F2-1F1FE", "j": ["banner", "flag", "my", "country", "nation"]}, "flag-mozambique": {"a": "flag: Mozambique", "b": "1F1F2-1F1FF", "j": ["banner", "flag", "country", "nation", "mz"]}, "flag-namibia": {"a": "flag: Namibia", "b": "1F1F3-1F1E6", "j": ["banner", "flag", "nation", "country", "na"]}, "flag-new-caledonia": {"a": "flag: New Caledonia", "b": "1F1F3-1F1E8", "j": ["banner", "flag", "new", "nation", "country", "caledonia"]}, "flag-niger": {"a": "flag: Niger", "b": "1F1F3-1F1EA", "j": ["banner", "flag", "ne", "nation", "country"]}, "flag-norfolk-island": {"a": "flag: Norfolk Island", "b": "1F1F3-1F1EB", "j": ["banner", "flag", "nation", "country", "norfolk", "island"]}, "flag-nigeria": {"a": "flag: Nigeria", "b": "1F1F3-1F1EC", "j": ["flag", "banner", "nation", "country"]}, "flag-nicaragua": {"a": "flag: Nicaragua", "b": "1F1F3-1F1EE", "j": ["banner", "flag", "ni", "country", "nation"]}, "flag-netherlands": {"a": "flag: Netherlands", "b": "1F1F3-1F1F1", "j": ["banner", "flag", "nl", "country", "nation"]}, "flag-norway": {"a": "flag: Norway", "b": "1F1F3-1F1F4", "j": ["banner", "flag", "no", "country", "nation"]}, "flag-nepal": {"a": "flag: Nepal", "b": "1F1F3-1F1F5", "j": ["banner", "flag", "country", "nation", "np"]}, "flag-nauru": {"a": "flag: Nauru", "b": "1F1F3-1F1F7", "j": ["banner", "nr", "flag", "nation", "country"]}, "flag-niue": {"a": "flag: Niue", "b": "1F1F3-1F1FA", "j": ["banner", "flag", "nu", "country", "nation"]}, "flag-new-zealand": {"a": "flag: New Zealand", "b": "1F1F3-1F1FF", "j": ["banner", "flag", "zealand", "nation", "country", "new"]}, "flag-oman": {"a": "flag: Oman", "b": "1F1F4-1F1F2", "j": ["banner", "flag", "nation", "country", "om_symbol"]}, "flag-panama": {"a": "flag: Panama", "b": "1F1F5-1F1E6", "j": ["banner", "flag", "pa", "country", "nation"]}, "flag-peru": {"a": "flag: Peru", "b": "1F1F5-1F1EA", "j": ["banner", "flag", "country", "nation", "pe"]}, "flag-french-polynesia": {"a": "flag: French Polynesia", "b": "1F1F5-1F1EB", "j": ["banner", "flag", "french", "polynesia", "nation", "country"]}, "flag-papua-new-guinea": {"a": "flag: Papua New Guinea", "b": "1F1F5-1F1EC", "j": ["banner", "flag", "papua", "nation", "country", "new", "guinea"]}, "flag-philippines": {"a": "flag: Philippines", "b": "1F1F5-1F1ED", "j": ["banner", "flag", "ph", "country", "nation"]}, "flag-pakistan": {"a": "flag: Pakistan", "b": "1F1F5-1F1F0", "j": ["banner", "flag", "pk", "country", "nation"]}, "flag-poland": {"a": "flag: Poland", "b": "1F1F5-1F1F1", "j": ["banner", "pl", "flag", "country", "nation"]}, "flag-st-pierre--miquelon": {"a": "flag: St. Pierre & Miquelon", "b": "1F1F5-1F1F2", "j": ["banner", "flag", "flag_st_pierre_miquelon", "miquelon", "nation", "country", "saint", "pierre"]}, "flag-pitcairn-islands": {"a": "flag: Pitcairn Islands", "b": "1F1F5-1F1F3", "j": ["banner", "flag", "nation", "country", "pitcairn"]}, "flag-puerto-rico": {"a": "flag: Puerto Rico", "b": "1F1F5-1F1F7", "j": ["banner", "puerto", "flag", "nation", "country", "rico"]}, "flag-palestinian-territories": {"a": "flag: Palestinian Territories", "b": "1F1F5-1F1F8", "j": ["banner", "flag", "palestinian", "territories", "nation", "country", "palestine"]}, "flag-portugal": {"a": "flag: Portugal", "b": "1F1F5-1F1F9", "j": ["banner", "flag", "country", "nation", "pt"]}, "flag-palau": {"a": "flag: Palau", "b": "1F1F5-1F1FC", "j": ["banner", "flag", "country", "nation", "pw"]}, "flag-paraguay": {"a": "flag: Paraguay", "b": "1F1F5-1F1FE", "j": ["banner", "flag", "py", "nation", "country"]}, "flag-qatar": {"a": "flag: Qatar", "b": "1F1F6-1F1E6", "j": ["banner", "flag", "country", "nation", "qa"]}, "flag-runion": {"a": "flag: Réunion", "b": "1F1F7-1F1EA", "j": ["banner", "flag", "réunion", "country", "nation", "flag_reunion"]}, "flag-romania": {"a": "flag: Romania", "b": "1F1F7-1F1F4", "j": ["banner", "flag", "nation", "country", "ro"]}, "flag-serbia": {"a": "flag: Serbia", "b": "1F1F7-1F1F8", "j": ["banner", "flag", "rs", "country", "nation"]}, "flag-russia": {"a": "flag: Russia", "b": "1F1F7-1F1FA", "j": ["banner", "russian", "flag", "federation", "nation", "country"]}, "flag-rwanda": {"a": "flag: Rwanda", "b": "1F1F7-1F1FC", "j": ["banner", "flag", "country", "nation", "rw"]}, "flag-saudi-arabia": {"a": "flag: Saudi Arabia", "b": "1F1F8-1F1E6", "j": ["flag", "banner", "nation", "country"]}, "flag-solomon-islands": {"a": "flag: Solomon Islands", "b": "1F1F8-1F1E7", "j": ["banner", "flag", "islands", "nation", "country", "solomon"]}, "flag-seychelles": {"a": "flag: Seychelles", "b": "1F1F8-1F1E8", "j": ["banner", "flag", "sc", "nation", "country"]}, "flag-sudan": {"a": "flag: Sudan", "b": "1F1F8-1F1E9", "j": ["banner", "sd", "flag", "country", "nation"]}, "flag-sweden": {"a": "flag: Sweden", "b": "1F1F8-1F1EA", "j": ["banner", "flag", "se", "country", "nation"]}, "flag-singapore": {"a": "flag: Singapore", "b": "1F1F8-1F1EC", "j": ["banner", "flag", "country", "nation", "sg"]}, "flag-st-helena": {"a": "flag: St. Helena", "b": "1F1F8-1F1ED", "j": ["banner", "flag", "cunha", "ascension", "helena", "nation", "country", "saint", "tristan"]}, "flag-slovenia": {"a": "flag: Slovenia", "b": "1F1F8-1F1EE", "j": ["banner", "flag", "nation", "si", "country"]}, "flag-svalbard--jan-mayen": {"a": "flag: Svalbard & Jan Mayen", "b": "1F1F8-1F1EF", "j": ["flag_svalbard_jan_mayen", "flag"]}, "flag-slovakia": {"a": "flag: Slovakia", "b": "1F1F8-1F1F0", "j": ["sk", "banner", "flag", "nation", "country"]}, "flag-sierra-leone": {"a": "flag: Sierra Leone", "b": "1F1F8-1F1F1", "j": ["banner", "flag", "sierra", "leone", "nation", "country"]}, "flag-san-marino": {"a": "flag: San Marino", "b": "1F1F8-1F1F2", "j": ["banner", "flag", "san", "nation", "country", "marino"]}, "flag-senegal": {"a": "flag: Senegal", "b": "1F1F8-1F1F3", "j": ["banner", "flag", "nation", "sn", "country"]}, "flag-somalia": {"a": "flag: Somalia", "b": "1F1F8-1F1F4", "j": ["banner", "so", "flag", "country", "nation"]}, "flag-suriname": {"a": "flag: Suriname", "b": "1F1F8-1F1F7", "j": ["banner", "flag", "sr", "country", "nation"]}, "flag-south-sudan": {"a": "flag: South Sudan", "b": "1F1F8-1F1F8", "j": ["banner", "sd", "flag", "nation", "country", "south"]}, "flag-so-tom--prncipe": {"a": "flag: São Tomé & Príncipe", "b": "1F1F8-1F1F9", "j": ["tome", "sao", "banner", "flag", "principe", "nation", "flag_sao_tome_principe", "country"]}, "flag-el-salvador": {"a": "flag: El Salvador", "b": "1F1F8-1F1FB", "j": ["banner", "flag", "nation", "country", "salvador", "el"]}, "flag-sint-maarten": {"a": "flag: Sint Maarten", "b": "1F1F8-1F1FD", "j": ["banner", "flag", "maarten", "dutch", "sint", "nation", "country"]}, "flag-syria": {"a": "flag: Syria", "b": "1F1F8-1F1FE", "j": ["banner", "republic", "flag", "syrian", "arab", "nation", "country"]}, "flag-eswatini": {"a": "flag: Eswatini", "b": "1F1F8-1F1FF", "j": ["banner", "flag", "sz", "country", "nation"]}, "flag-tristan-da-cunha": {"a": "flag: Tristan da Cunha", "b": "1F1F9-1F1E6", "j": ["flag"]}, "flag-turks--caicos-islands": {"a": "flag: Turks & Caicos Islands", "b": "1F1F9-1F1E8", "j": ["banner", "caicos", "flag", "islands", "nation", "country", "turks", "flag_turks_caicos_islands"]}, "flag-chad": {"a": "flag: Chad", "b": "1F1F9-1F1E9", "j": ["banner", "td", "flag", "country", "nation"]}, "flag-french-southern-territories": {"a": "flag: French Southern Territories", "b": "1F1F9-1F1EB", "j": ["banner", "flag", "french", "southern", "territories", "nation", "country"]}, "flag-togo": {"a": "flag: Togo", "b": "1F1F9-1F1EC", "j": ["banner", "flag", "tg", "country", "nation"]}, "flag-thailand": {"a": "flag: Thailand", "b": "1F1F9-1F1ED", "j": ["banner", "flag", "country", "nation", "th"]}, "flag-tajikistan": {"a": "flag: Tajikistan", "b": "1F1F9-1F1EF", "j": ["banner", "flag", "tj", "country", "nation"]}, "flag-tokelau": {"a": "flag: Tokelau", "b": "1F1F9-1F1F0", "j": ["tk", "banner", "flag", "country", "nation"]}, "flag-timorleste": {"a": "flag: Timor-Leste", "b": "1F1F9-1F1F1", "j": ["leste", "banner", "timor", "flag", "nation", "country", "flag_timor_leste"]}, "flag-turkmenistan": {"a": "flag: Turkmenistan", "b": "1F1F9-1F1F2", "j": ["flag", "banner", "country", "nation"]}, "flag-tunisia": {"a": "flag: Tunisia", "b": "1F1F9-1F1F3", "j": ["banner", "flag", "country", "nation", "tn"]}, "flag-tonga": {"a": "flag: Tonga", "b": "1F1F9-1F1F4", "j": ["banner", "flag", "country", "nation", "to"]}, "flag-turkey": {"a": "flag: Turkey", "b": "1F1F9-1F1F7", "j": ["banner", "flag", "nation", "turkey", "country"]}, "flag-trinidad--tobago": {"a": "flag: Trinidad & Tobago", "b": "1F1F9-1F1F9", "j": ["banner", "flag_trinidad_tobago", "flag", "trinidad", "nation", "country", "tobago"]}, "flag-tuvalu": {"a": "flag: Tuvalu", "b": "1F1F9-1F1FB", "j": ["flag", "banner", "nation", "country"]}, "flag-taiwan": {"a": "flag: Taiwan", "b": "1F1F9-1F1FC", "j": ["banner", "flag", "country", "nation", "tw"]}, "flag-tanzania": {"a": "flag: Tanzania", "b": "1F1F9-1F1FF", "j": ["united", "banner", "republic", "flag", "nation", "country", "tanzania"]}, "flag-ukraine": {"a": "flag: Ukraine", "b": "1F1FA-1F1E6", "j": ["banner", "flag", "ua", "country", "nation"]}, "flag-uganda": {"a": "flag: Uganda", "b": "1F1FA-1F1EC", "j": ["banner", "flag", "ug", "country", "nation"]}, "flag-us-outlying-islands": {"a": "flag: U.S. Outlying Islands", "b": "1F1FA-1F1F2", "j": ["flag_u_s_outlying_islands", "flag"]}, "flag-united-nations": {"a": "flag: United Nations", "b": "1F1FA-1F1F3", "j": ["banner", "un", "flag"]}, "flag-united-states": {"a": "flag: United States", "b": "1F1FA-1F1F8", "j": ["united", "banner", "flag", "america", "nation", "country", "states"]}, "flag-uruguay": {"a": "flag: Uruguay", "b": "1F1FA-1F1FE", "j": ["banner", "flag", "uy", "country", "nation"]}, "flag-uzbekistan": {"a": "flag: Uzbekistan", "b": "1F1FA-1F1FF", "j": ["banner", "uz", "flag", "country", "nation"]}, "flag-vatican-city": {"a": "flag: Vatican City", "b": "1F1FB-1F1E6", "j": ["banner", "flag", "vatican", "city", "nation", "country"]}, "flag-st-vincent--grenadines": {"a": "flag: St. Vincent & Grenadines", "b": "1F1FB-1F1E8", "j": ["banner", "flag", "flag_st_vincent_grenadines", "grenadines", "nation", "country", "vincent", "saint"]}, "flag-venezuela": {"a": "flag: Venezuela", "b": "1F1FB-1F1EA", "j": ["banner", "republic", "flag", "bolivarian", "ve", "nation", "country"]}, "flag-british-virgin-islands": {"a": "flag: British Virgin Islands", "b": "1F1FB-1F1EC", "j": ["banner", "virgin", "bvi", "flag", "british", "islands", "nation", "country"]}, "flag-us-virgin-islands": {"a": "flag: U.S. Virgin Islands", "b": "1F1FB-1F1EE", "j": ["banner", "virgin", "flag", "us", "islands", "nation", "country", "flag_u_s_virgin_islands"]}, "flag-vietnam": {"a": "flag: Vietnam", "b": "1F1FB-1F1F3", "j": ["banner", "flag", "nation", "nam", "country", "viet"]}, "flag-vanuatu": {"a": "flag: Vanuatu", "b": "1F1FB-1F1FA", "j": ["banner", "flag", "vu", "country", "nation"]}, "flag-wallis--futuna": {"a": "flag: Wallis & Futuna", "b": "1F1FC-1F1EB", "j": ["banner", "flag_wallis_futuna", "flag", "wallis", "nation", "country", "futuna"]}, "flag-samoa": {"a": "flag: Samoa", "b": "1F1FC-1F1F8", "j": ["banner", "flag", "ws", "nation", "country"]}, "flag-kosovo": {"a": "flag: Kosovo", "b": "1F1FD-1F1F0", "j": ["banner", "flag", "country", "nation", "xk"]}, "flag-yemen": {"a": "flag: Yemen", "b": "1F1FE-1F1EA", "j": ["banner", "flag", "nation", "ye", "country"]}, "flag-mayotte": {"a": "flag: Mayotte", "b": "1F1FE-1F1F9", "j": ["banner", "flag", "yt", "country", "nation"]}, "flag-south-africa": {"a": "flag: South Africa", "b": "1F1FF-1F1E6", "j": ["banner", "africa", "flag", "nation", "country", "south"]}, "flag-zambia": {"a": "flag: Zambia", "b": "1F1FF-1F1F2", "j": ["banner", "flag", "zm", "country", "nation"]}, "flag-zimbabwe": {"a": "flag: Zimbabwe", "b": "1F1FF-1F1FC", "j": ["banner", "flag", "zw", "country", "nation"]}, "flag-england": {"a": "flag: England", "b": "1F3F4-E0067-E0062-E0065-E006E-E0067-E007F", "j": ["english", "flag"]}, "flag-scotland": {"a": "flag: Scotland", "b": "1F3F4-E0067-E0062-E0073-E0063-E0074-E007F", "j": ["scottish", "flag"]}, "flag-wales": {"a": "flag: Wales", "b": "1F3F4-E0067-E0062-E0077-E006C-E0073-E007F", "j": ["welsh", "flag"]}}, "aliases": {}}
\ No newline at end of file
+{"compressed":true,"categories":[{"id":"smileys_&_emotion","name":"Smileys & Emotion","emojis":["grinning-face","grinning-face-with-big-eyes","grinning-face-with-smiling-eyes","beaming-face-with-smiling-eyes","grinning-squinting-face","grinning-face-with-sweat","rolling-on-the-floor-laughing","face-with-tears-of-joy","slightly-smiling-face","upsidedown-face","winking-face","smiling-face-with-smiling-eyes","smiling-face-with-halo","smiling-face-with-hearts","smiling-face-with-hearteyes","starstruck","face-blowing-a-kiss","kissing-face","smiling-face","kissing-face-with-closed-eyes","kissing-face-with-smiling-eyes","smiling-face-with-tear","face-savoring-food","face-with-tongue","winking-face-with-tongue","zany-face","squinting-face-with-tongue","moneymouth-face","hugging-face","face-with-hand-over-mouth","shushing-face","thinking-face","zippermouth-face","face-with-raised-eyebrow","neutral-face","expressionless-face","face-without-mouth","face-in-clouds","smirking-face","unamused-face","face-with-rolling-eyes","grimacing-face","face-exhaling","lying-face","relieved-face","pensive-face","sleepy-face","drooling-face","sleeping-face","face-with-medical-mask","face-with-thermometer","face-with-headbandage","nauseated-face","face-vomiting","sneezing-face","hot-face","cold-face","woozy-face","knockedout-face","face-with-spiral-eyes","exploding-head","cowboy-hat-face","partying-face","disguised-face","smiling-face-with-sunglasses","nerd-face","face-with-monocle","confused-face","worried-face","slightly-frowning-face","frowning-face","face-with-open-mouth","hushed-face","astonished-face","flushed-face","pleading-face","frowning-face-with-open-mouth","anguished-face","fearful-face","anxious-face-with-sweat","sad-but-relieved-face","crying-face","loudly-crying-face","face-screaming-in-fear","confounded-face","persevering-face","disappointed-face","downcast-face-with-sweat","weary-face","tired-face","yawning-face","face-with-steam-from-nose","pouting-face","angry-face","face-with-symbols-on-mouth","smiling-face-with-horns","angry-face-with-horns","skull","skull-and-crossbones","pile-of-poo","clown-face","ogre","goblin","ghost","alien","alien-monster","robot","grinning-cat","grinning-cat-with-smiling-eyes","cat-with-tears-of-joy","smiling-cat-with-hearteyes","cat-with-wry-smile","kissing-cat","weary-cat","crying-cat","pouting-cat","seenoevil-monkey","hearnoevil-monkey","speaknoevil-monkey","kiss-mark","love-letter","heart-with-arrow","heart-with-ribbon","sparkling-heart","growing-heart","beating-heart","revolving-hearts","two-hearts","heart-decoration","heart-exclamation","broken-heart","heart-on-fire","mending-heart","red-heart","orange-heart","yellow-heart","green-heart","blue-heart","purple-heart","brown-heart","black-heart","white-heart","hundred-points","anger-symbol","collision","dizzy","sweat-droplets","dashing-away","hole","bomb","speech-balloon","eye-in-speech-bubble","left-speech-bubble","right-anger-bubble","thought-balloon","zzz"]},{"id":"people_&_body","name":"People & Body","emojis":["waving-hand","raised-back-of-hand","hand-with-fingers-splayed","raised-hand","vulcan-salute","ok-hand","pinched-fingers","pinching-hand","victory-hand","crossed-fingers","loveyou-gesture","sign-of-the-horns","call-me-hand","backhand-index-pointing-left","backhand-index-pointing-right","backhand-index-pointing-up","middle-finger","backhand-index-pointing-down","index-pointing-up","thumbs-up","thumbs-down","raised-fist","oncoming-fist","leftfacing-fist","rightfacing-fist","clapping-hands","raising-hands","open-hands","palms-up-together","handshake","folded-hands","writing-hand","nail-polish","selfie","flexed-biceps","mechanical-arm","mechanical-leg","leg","foot","ear","ear-with-hearing-aid","nose","brain","anatomical-heart","lungs","tooth","bone","eyes","eye","tongue","mouth","baby","child","boy","girl","person","person-blond-hair","man","person-beard","man-beard","woman-beard","man-red-hair","man-curly-hair","man-white-hair","man-bald","woman","woman-red-hair","person-red-hair","woman-curly-hair","person-curly-hair","woman-white-hair","person-white-hair","woman-bald","person-bald","woman-blond-hair","man-blond-hair","older-person","old-man","old-woman","person-frowning","man-frowning","woman-frowning","person-pouting","man-pouting","woman-pouting","person-gesturing-no","man-gesturing-no","woman-gesturing-no","person-gesturing-ok","man-gesturing-ok","woman-gesturing-ok","person-tipping-hand","man-tipping-hand","woman-tipping-hand","person-raising-hand","man-raising-hand","woman-raising-hand","deaf-person","deaf-man","deaf-woman","person-bowing","man-bowing","woman-bowing","person-facepalming","man-facepalming","woman-facepalming","person-shrugging","man-shrugging","woman-shrugging","health-worker","man-health-worker","woman-health-worker","student","man-student","woman-student","teacher","man-teacher","woman-teacher","judge","man-judge","woman-judge","farmer","man-farmer","woman-farmer","cook","man-cook","woman-cook","mechanic","man-mechanic","woman-mechanic","factory-worker","man-factory-worker","woman-factory-worker","office-worker","man-office-worker","woman-office-worker","scientist","man-scientist","woman-scientist","technologist","man-technologist","woman-technologist","singer","man-singer","woman-singer","artist","man-artist","woman-artist","pilot","man-pilot","woman-pilot","astronaut","man-astronaut","woman-astronaut","firefighter","man-firefighter","woman-firefighter","police-officer","man-police-officer","woman-police-officer","detective","man-detective","woman-detective","guard","man-guard","woman-guard","ninja","construction-worker","man-construction-worker","woman-construction-worker","prince","princess","person-wearing-turban","man-wearing-turban","woman-wearing-turban","person-with-skullcap","woman-with-headscarf","person-in-tuxedo","man-in-tuxedo","woman-in-tuxedo","person-with-veil","man-with-veil","woman-with-veil","pregnant-woman","breastfeeding","woman-feeding-baby","man-feeding-baby","person-feeding-baby","baby-angel","santa-claus","mrs-claus","mx-claus","superhero","man-superhero","woman-superhero","supervillain","man-supervillain","woman-supervillain","mage","man-mage","woman-mage","fairy","man-fairy","woman-fairy","vampire","man-vampire","woman-vampire","merperson","merman","mermaid","elf","man-elf","woman-elf","genie","man-genie","woman-genie","zombie","man-zombie","woman-zombie","person-getting-massage","man-getting-massage","woman-getting-massage","person-getting-haircut","man-getting-haircut","woman-getting-haircut","person-walking","man-walking","woman-walking","person-standing","man-standing","woman-standing","person-kneeling","man-kneeling","woman-kneeling","person-with-white-cane","man-with-white-cane","woman-with-white-cane","person-in-motorized-wheelchair","man-in-motorized-wheelchair","woman-in-motorized-wheelchair","person-in-manual-wheelchair","man-in-manual-wheelchair","woman-in-manual-wheelchair","person-running","man-running","woman-running","woman-dancing","man-dancing","person-in-suit-levitating","people-with-bunny-ears","men-with-bunny-ears","women-with-bunny-ears","person-in-steamy-room","man-in-steamy-room","woman-in-steamy-room","person-climbing","man-climbing","woman-climbing","person-fencing","horse-racing","skier","snowboarder","person-golfing","man-golfing","woman-golfing","person-surfing","man-surfing","woman-surfing","person-rowing-boat","man-rowing-boat","woman-rowing-boat","person-swimming","man-swimming","woman-swimming","person-bouncing-ball","man-bouncing-ball","woman-bouncing-ball","person-lifting-weights","man-lifting-weights","woman-lifting-weights","person-biking","man-biking","woman-biking","person-mountain-biking","man-mountain-biking","woman-mountain-biking","person-cartwheeling","man-cartwheeling","woman-cartwheeling","people-wrestling","men-wrestling","women-wrestling","person-playing-water-polo","man-playing-water-polo","woman-playing-water-polo","person-playing-handball","man-playing-handball","woman-playing-handball","person-juggling","man-juggling","woman-juggling","person-in-lotus-position","man-in-lotus-position","woman-in-lotus-position","person-taking-bath","person-in-bed","people-holding-hands","women-holding-hands","woman-and-man-holding-hands","men-holding-hands","kiss","kiss-woman-man","kiss-man-man","kiss-woman-woman","couple-with-heart","couple-with-heart-woman-man","couple-with-heart-man-man","couple-with-heart-woman-woman","family","family-man-woman-boy","family-man-woman-girl","family-man-woman-girl-boy","family-man-woman-boy-boy","family-man-woman-girl-girl","family-man-man-boy","family-man-man-girl","family-man-man-girl-boy","family-man-man-boy-boy","family-man-man-girl-girl","family-woman-woman-boy","family-woman-woman-girl","family-woman-woman-girl-boy","family-woman-woman-boy-boy","family-woman-woman-girl-girl","family-man-boy","family-man-boy-boy","family-man-girl","family-man-girl-boy","family-man-girl-girl","family-woman-boy","family-woman-boy-boy","family-woman-girl","family-woman-girl-boy","family-woman-girl-girl","speaking-head","bust-in-silhouette","busts-in-silhouette","people-hugging","footprints"]},{"id":"animals_&_nature","name":"Animals & Nature","emojis":["monkey-face","monkey","gorilla","orangutan","dog-face","dog","guide-dog","service-dog","poodle","wolf","fox","raccoon","cat-face","cat","black-cat","lion","tiger-face","tiger","leopard","horse-face","horse","unicorn","zebra","deer","bison","cow-face","ox","water-buffalo","cow","pig-face","pig","boar","pig-nose","ram","ewe","goat","camel","twohump-camel","llama","giraffe","elephant","mammoth","rhinoceros","hippopotamus","mouse-face","mouse","rat","hamster","rabbit-face","rabbit","chipmunk","beaver","hedgehog","bat","bear","polar-bear","koala","panda","sloth","otter","skunk","kangaroo","badger","paw-prints","turkey","chicken","rooster","hatching-chick","baby-chick","frontfacing-baby-chick","bird","penguin","dove","eagle","duck","swan","owl","dodo","feather","flamingo","peacock","parrot","frog","crocodile","turtle","lizard","snake","dragon-face","dragon","sauropod","trex","spouting-whale","whale","dolphin","seal","fish","tropical-fish","blowfish","shark","octopus","spiral-shell","snail","butterfly","bug","ant","honeybee","beetle","lady-beetle","cricket","cockroach","spider","spider-web","scorpion","mosquito","fly","worm","microbe","bouquet","cherry-blossom","white-flower","rosette","rose","wilted-flower","hibiscus","sunflower","blossom","tulip","seedling","potted-plant","evergreen-tree","deciduous-tree","palm-tree","cactus","sheaf-of-rice","herb","shamrock","four-leaf-clover","maple-leaf","fallen-leaf","leaf-fluttering-in-wind"]},{"id":"food_&_drink","name":"Food & Drink","emojis":["grapes","melon","watermelon","tangerine","lemon","banana","pineapple","mango","red-apple","green-apple","pear","peach","cherries","strawberry","blueberries","kiwi-fruit","tomato","olive","coconut","avocado","eggplant","potato","carrot","ear-of-corn","hot-pepper","bell-pepper","cucumber","leafy-green","broccoli","garlic","onion","mushroom","peanuts","chestnut","bread","croissant","baguette-bread","flatbread","pretzel","bagel","pancakes","waffle","cheese-wedge","meat-on-bone","poultry-leg","cut-of-meat","bacon","hamburger","french-fries","pizza","hot-dog","sandwich","taco","burrito","tamale","stuffed-flatbread","falafel","egg","cooking","shallow-pan-of-food","pot-of-food","fondue","bowl-with-spoon","green-salad","popcorn","butter","salt","canned-food","bento-box","rice-cracker","rice-ball","cooked-rice","curry-rice","steaming-bowl","spaghetti","roasted-sweet-potato","oden","sushi","fried-shrimp","fish-cake-with-swirl","moon-cake","dango","dumpling","fortune-cookie","takeout-box","crab","lobster","shrimp","squid","oyster","soft-ice-cream","shaved-ice","ice-cream","doughnut","cookie","birthday-cake","shortcake","cupcake","pie","chocolate-bar","candy","lollipop","custard","honey-pot","baby-bottle","glass-of-milk","hot-beverage","teapot","teacup-without-handle","sake","bottle-with-popping-cork","wine-glass","cocktail-glass","tropical-drink","beer-mug","clinking-beer-mugs","clinking-glasses","tumbler-glass","cup-with-straw","bubble-tea","beverage-box","mate","ice","chopsticks","fork-and-knife-with-plate","fork-and-knife","spoon","kitchen-knife","amphora"]},{"id":"travel_&_places","name":"Travel & Places","emojis":["globe-showing-europeafrica","globe-showing-americas","globe-showing-asiaaustralia","globe-with-meridians","world-map","map-of-japan","compass","snowcapped-mountain","mountain","volcano","mount-fuji","camping","beach-with-umbrella","desert","desert-island","national-park","stadium","classical-building","building-construction","brick","rock","wood","hut","houses","derelict-house","house","house-with-garden","office-building","japanese-post-office","post-office","hospital","bank","hotel","love-hotel","convenience-store","school","department-store","factory","japanese-castle","castle","wedding","tokyo-tower","statue-of-liberty","church","mosque","hindu-temple","synagogue","shinto-shrine","kaaba","fountain","tent","foggy","night-with-stars","cityscape","sunrise-over-mountains","sunrise","cityscape-at-dusk","sunset","bridge-at-night","hot-springs","carousel-horse","ferris-wheel","roller-coaster","barber-pole","circus-tent","locomotive","railway-car","highspeed-train","bullet-train","train","metro","light-rail","station","tram","monorail","mountain-railway","tram-car","bus","oncoming-bus","trolleybus","minibus","ambulance","fire-engine","police-car","oncoming-police-car","taxi","oncoming-taxi","automobile","oncoming-automobile","sport-utility-vehicle","pickup-truck","delivery-truck","articulated-lorry","tractor","racing-car","motorcycle","motor-scooter","manual-wheelchair","motorized-wheelchair","auto-rickshaw","bicycle","kick-scooter","skateboard","roller-skate","bus-stop","motorway","railway-track","oil-drum","fuel-pump","police-car-light","horizontal-traffic-light","vertical-traffic-light","stop-sign","construction","anchor","sailboat","canoe","speedboat","passenger-ship","ferry","motor-boat","ship","airplane","small-airplane","airplane-departure","airplane-arrival","parachute","seat","helicopter","suspension-railway","mountain-cableway","aerial-tramway","satellite","rocket","flying-saucer","bellhop-bell","luggage","hourglass-done","hourglass-not-done","watch","alarm-clock","stopwatch","timer-clock","mantelpiece-clock","twelve-oclock","twelvethirty","one-oclock","onethirty","two-oclock","twothirty","three-oclock","threethirty","four-oclock","fourthirty","five-oclock","fivethirty","six-oclock","sixthirty","seven-oclock","seventhirty","eight-oclock","eightthirty","nine-oclock","ninethirty","ten-oclock","tenthirty","eleven-oclock","eleventhirty","new-moon","waxing-crescent-moon","first-quarter-moon","waxing-gibbous-moon","full-moon","waning-gibbous-moon","last-quarter-moon","waning-crescent-moon","crescent-moon","new-moon-face","first-quarter-moon-face","last-quarter-moon-face","thermometer","sun","full-moon-face","sun-with-face","ringed-planet","star","glowing-star","shooting-star","milky-way","cloud","sun-behind-cloud","cloud-with-lightning-and-rain","sun-behind-small-cloud","sun-behind-large-cloud","sun-behind-rain-cloud","cloud-with-rain","cloud-with-snow","cloud-with-lightning","tornado","fog","wind-face","cyclone","rainbow","closed-umbrella","umbrella","umbrella-with-rain-drops","umbrella-on-ground","high-voltage","snowflake","snowman","snowman-without-snow","comet","fire","droplet","water-wave"]},{"id":"activities","name":"Activities","emojis":["jackolantern","christmas-tree","fireworks","sparkler","firecracker","sparkles","balloon","party-popper","confetti-ball","tanabata-tree","pine-decoration","japanese-dolls","carp-streamer","wind-chime","moon-viewing-ceremony","red-envelope","ribbon","wrapped-gift","reminder-ribbon","admission-tickets","ticket","military-medal","trophy","sports-medal","1st-place-medal","2nd-place-medal","3rd-place-medal","soccer-ball","baseball","softball","basketball","volleyball","american-football","rugby-football","tennis","flying-disc","bowling","cricket-game","field-hockey","ice-hockey","lacrosse","ping-pong","badminton","boxing-glove","martial-arts-uniform","goal-net","flag-in-hole","ice-skate","fishing-pole","diving-mask","running-shirt","skis","sled","curling-stone","bullseye","yoyo","kite","pool-8-ball","crystal-ball","magic-wand","nazar-amulet","video-game","joystick","slot-machine","game-die","puzzle-piece","teddy-bear","piata","nesting-dolls","spade-suit","heart-suit","diamond-suit","club-suit","chess-pawn","joker","mahjong-red-dragon","flower-playing-cards","performing-arts","framed-picture","artist-palette","thread","sewing-needle","yarn","knot"]},{"id":"objects","name":"Objects","emojis":["glasses","sunglasses","goggles","lab-coat","safety-vest","necktie","tshirt","jeans","scarf","gloves","coat","socks","dress","kimono","sari","onepiece-swimsuit","briefs","shorts","bikini","womans-clothes","purse","handbag","clutch-bag","shopping-bags","backpack","thong-sandal","mans-shoe","running-shoe","hiking-boot","flat-shoe","highheeled-shoe","womans-sandal","ballet-shoes","womans-boot","crown","womans-hat","top-hat","graduation-cap","billed-cap","military-helmet","rescue-workers-helmet","prayer-beads","lipstick","ring","gem-stone","muted-speaker","speaker-low-volume","speaker-medium-volume","speaker-high-volume","loudspeaker","megaphone","postal-horn","bell","bell-with-slash","musical-score","musical-note","musical-notes","studio-microphone","level-slider","control-knobs","microphone","headphone","radio","saxophone","accordion","guitar","musical-keyboard","trumpet","violin","banjo","drum","long-drum","mobile-phone","mobile-phone-with-arrow","telephone","telephone-receiver","pager","fax-machine","battery","electric-plug","laptop","desktop-computer","printer","keyboard","computer-mouse","trackball","computer-disk","floppy-disk","optical-disk","dvd","abacus","movie-camera","film-frames","film-projector","clapper-board","television","camera","camera-with-flash","video-camera","videocassette","magnifying-glass-tilted-left","magnifying-glass-tilted-right","candle","light-bulb","flashlight","red-paper-lantern","diya-lamp","notebook-with-decorative-cover","closed-book","open-book","green-book","blue-book","orange-book","books","notebook","ledger","page-with-curl","scroll","page-facing-up","newspaper","rolledup-newspaper","bookmark-tabs","bookmark","label","money-bag","coin","yen-banknote","dollar-banknote","euro-banknote","pound-banknote","money-with-wings","credit-card","receipt","chart-increasing-with-yen","envelope","email","incoming-envelope","envelope-with-arrow","outbox-tray","inbox-tray","package","closed-mailbox-with-raised-flag","closed-mailbox-with-lowered-flag","open-mailbox-with-raised-flag","open-mailbox-with-lowered-flag","postbox","ballot-box-with-ballot","pencil","black-nib","fountain-pen","pen","paintbrush","crayon","memo","briefcase","file-folder","open-file-folder","card-index-dividers","calendar","tearoff-calendar","spiral-notepad","spiral-calendar","card-index","chart-increasing","chart-decreasing","bar-chart","clipboard","pushpin","round-pushpin","paperclip","linked-paperclips","straight-ruler","triangular-ruler","scissors","card-file-box","file-cabinet","wastebasket","locked","unlocked","locked-with-pen","locked-with-key","key","old-key","hammer","axe","pick","hammer-and-pick","hammer-and-wrench","dagger","crossed-swords","water-pistol","boomerang","bow-and-arrow","shield","carpentry-saw","wrench","screwdriver","nut-and-bolt","gear","clamp","balance-scale","white-cane","link","chains","hook","toolbox","magnet","ladder","alembic","test-tube","petri-dish","dna","microscope","telescope","satellite-antenna","syringe","drop-of-blood","pill","adhesive-bandage","stethoscope","door","elevator","mirror","window","bed","couch-and-lamp","chair","toilet","plunger","shower","bathtub","mouse-trap","razor","lotion-bottle","safety-pin","broom","basket","roll-of-paper","bucket","soap","toothbrush","sponge","fire-extinguisher","shopping-cart","cigarette","coffin","headstone","funeral-urn","moai","placard"]},{"id":"symbols","name":"Symbols","emojis":["atm-sign","litter-in-bin-sign","potable-water","wheelchair-symbol","mens-room","womens-room","restroom","baby-symbol","water-closet","passport-control","customs","baggage-claim","left-luggage","warning","children-crossing","no-entry","prohibited","no-bicycles","no-smoking","no-littering","nonpotable-water","no-pedestrians","no-mobile-phones","no-one-under-eighteen","radioactive","biohazard","up-arrow","upright-arrow","right-arrow","downright-arrow","down-arrow","downleft-arrow","left-arrow","upleft-arrow","updown-arrow","leftright-arrow","right-arrow-curving-left","left-arrow-curving-right","right-arrow-curving-up","right-arrow-curving-down","clockwise-vertical-arrows","counterclockwise-arrows-button","back-arrow","end-arrow","on-arrow","soon-arrow","top-arrow","place-of-worship","atom-symbol","om","star-of-david","wheel-of-dharma","yin-yang","latin-cross","orthodox-cross","star-and-crescent","peace-symbol","menorah","dotted-sixpointed-star","aries","taurus","gemini","cancer","leo","virgo","libra","scorpio","sagittarius","capricorn","aquarius","pisces","ophiuchus","shuffle-tracks-button","repeat-button","repeat-single-button","play-button","fastforward-button","next-track-button","play-or-pause-button","reverse-button","fast-reverse-button","last-track-button","upwards-button","fast-up-button","downwards-button","fast-down-button","pause-button","stop-button","record-button","eject-button","cinema","dim-button","bright-button","antenna-bars","vibration-mode","mobile-phone-off","female-sign","male-sign","transgender-symbol","multiply","plus","minus","divide","infinity","double-exclamation-mark","exclamation-question-mark","red-question-mark","white-question-mark","white-exclamation-mark","red-exclamation-mark","wavy-dash","currency-exchange","heavy-dollar-sign","medical-symbol","recycling-symbol","fleurdelis","trident-emblem","name-badge","japanese-symbol-for-beginner","hollow-red-circle","check-mark-button","check-box-with-check","check-mark","cross-mark","cross-mark-button","curly-loop","double-curly-loop","part-alternation-mark","eightspoked-asterisk","eightpointed-star","sparkle","copyright","registered","trade-mark","keycap","keycap","keycap-0","keycap-1","keycap-2","keycap-3","keycap-4","keycap-5","keycap-6","keycap-7","keycap-8","keycap-9","keycap-10","input-latin-uppercase","input-latin-lowercase","input-numbers","input-symbols","input-latin-letters","a-button-blood-type","ab-button-blood-type","b-button-blood-type","cl-button","cool-button","free-button","information","id-button","circled-m","new-button","ng-button","o-button-blood-type","ok-button","p-button","sos-button","up-button","vs-button","japanese-here-button","japanese-service-charge-button","japanese-monthly-amount-button","japanese-not-free-of-charge-button","japanese-reserved-button","japanese-bargain-button","japanese-discount-button","japanese-free-of-charge-button","japanese-prohibited-button","japanese-acceptable-button","japanese-application-button","japanese-passing-grade-button","japanese-vacancy-button","japanese-congratulations-button","japanese-secret-button","japanese-open-for-business-button","japanese-no-vacancy-button","red-circle","orange-circle","yellow-circle","green-circle","blue-circle","purple-circle","brown-circle","black-circle","white-circle","red-square","orange-square","yellow-square","green-square","blue-square","purple-square","brown-square","black-large-square","white-large-square","black-medium-square","white-medium-square","black-mediumsmall-square","white-mediumsmall-square","black-small-square","white-small-square","large-orange-diamond","large-blue-diamond","small-orange-diamond","small-blue-diamond","red-triangle-pointed-up","red-triangle-pointed-down","diamond-with-a-dot","radio-button","white-square-button","black-square-button"]},{"id":"flags","name":"Flags","emojis":["chequered-flag","triangular-flag","crossed-flags","black-flag","white-flag","rainbow-flag","transgender-flag","pirate-flag","flag-ascension-island","flag-andorra","flag-united-arab-emirates","flag-afghanistan","flag-antigua--barbuda","flag-anguilla","flag-albania","flag-armenia","flag-angola","flag-antarctica","flag-argentina","flag-american-samoa","flag-austria","flag-australia","flag-aruba","flag-land-islands","flag-azerbaijan","flag-bosnia--herzegovina","flag-barbados","flag-bangladesh","flag-belgium","flag-burkina-faso","flag-bulgaria","flag-bahrain","flag-burundi","flag-benin","flag-st-barthlemy","flag-bermuda","flag-brunei","flag-bolivia","flag-caribbean-netherlands","flag-brazil","flag-bahamas","flag-bhutan","flag-bouvet-island","flag-botswana","flag-belarus","flag-belize","flag-canada","flag-cocos-keeling-islands","flag-congo--kinshasa","flag-central-african-republic","flag-congo--brazzaville","flag-switzerland","flag-cte-divoire","flag-cook-islands","flag-chile","flag-cameroon","flag-china","flag-colombia","flag-clipperton-island","flag-costa-rica","flag-cuba","flag-cape-verde","flag-curaao","flag-christmas-island","flag-cyprus","flag-czechia","flag-germany","flag-diego-garcia","flag-djibouti","flag-denmark","flag-dominica","flag-dominican-republic","flag-algeria","flag-ceuta--melilla","flag-ecuador","flag-estonia","flag-egypt","flag-western-sahara","flag-eritrea","flag-spain","flag-ethiopia","flag-european-union","flag-finland","flag-fiji","flag-falkland-islands","flag-micronesia","flag-faroe-islands","flag-france","flag-gabon","flag-united-kingdom","flag-grenada","flag-georgia","flag-french-guiana","flag-guernsey","flag-ghana","flag-gibraltar","flag-greenland","flag-gambia","flag-guinea","flag-guadeloupe","flag-equatorial-guinea","flag-greece","flag-south-georgia--south-sandwich-islands","flag-guatemala","flag-guam","flag-guineabissau","flag-guyana","flag-hong-kong-sar-china","flag-heard--mcdonald-islands","flag-honduras","flag-croatia","flag-haiti","flag-hungary","flag-canary-islands","flag-indonesia","flag-ireland","flag-israel","flag-isle-of-man","flag-india","flag-british-indian-ocean-territory","flag-iraq","flag-iran","flag-iceland","flag-italy","flag-jersey","flag-jamaica","flag-jordan","flag-japan","flag-kenya","flag-kyrgyzstan","flag-cambodia","flag-kiribati","flag-comoros","flag-st-kitts--nevis","flag-north-korea","flag-south-korea","flag-kuwait","flag-cayman-islands","flag-kazakhstan","flag-laos","flag-lebanon","flag-st-lucia","flag-liechtenstein","flag-sri-lanka","flag-liberia","flag-lesotho","flag-lithuania","flag-luxembourg","flag-latvia","flag-libya","flag-morocco","flag-monaco","flag-moldova","flag-montenegro","flag-st-martin","flag-madagascar","flag-marshall-islands","flag-north-macedonia","flag-mali","flag-myanmar-burma","flag-mongolia","flag-macao-sar-china","flag-northern-mariana-islands","flag-martinique","flag-mauritania","flag-montserrat","flag-malta","flag-mauritius","flag-maldives","flag-malawi","flag-mexico","flag-malaysia","flag-mozambique","flag-namibia","flag-new-caledonia","flag-niger","flag-norfolk-island","flag-nigeria","flag-nicaragua","flag-netherlands","flag-norway","flag-nepal","flag-nauru","flag-niue","flag-new-zealand","flag-oman","flag-panama","flag-peru","flag-french-polynesia","flag-papua-new-guinea","flag-philippines","flag-pakistan","flag-poland","flag-st-pierre--miquelon","flag-pitcairn-islands","flag-puerto-rico","flag-palestinian-territories","flag-portugal","flag-palau","flag-paraguay","flag-qatar","flag-runion","flag-romania","flag-serbia","flag-russia","flag-rwanda","flag-saudi-arabia","flag-solomon-islands","flag-seychelles","flag-sudan","flag-sweden","flag-singapore","flag-st-helena","flag-slovenia","flag-svalbard--jan-mayen","flag-slovakia","flag-sierra-leone","flag-san-marino","flag-senegal","flag-somalia","flag-suriname","flag-south-sudan","flag-so-tom--prncipe","flag-el-salvador","flag-sint-maarten","flag-syria","flag-eswatini","flag-tristan-da-cunha","flag-turks--caicos-islands","flag-chad","flag-french-southern-territories","flag-togo","flag-thailand","flag-tajikistan","flag-tokelau","flag-timorleste","flag-turkmenistan","flag-tunisia","flag-tonga","flag-turkey","flag-trinidad--tobago","flag-tuvalu","flag-taiwan","flag-tanzania","flag-ukraine","flag-uganda","flag-us-outlying-islands","flag-united-nations","flag-united-states","flag-uruguay","flag-uzbekistan","flag-vatican-city","flag-st-vincent--grenadines","flag-venezuela","flag-british-virgin-islands","flag-us-virgin-islands","flag-vietnam","flag-vanuatu","flag-wallis--futuna","flag-samoa","flag-kosovo","flag-yemen","flag-mayotte","flag-south-africa","flag-zambia","flag-zimbabwe","flag-england","flag-scotland","flag-wales"]}],"emojis":{"grinning-face":{"a":"Grinning Face","b":"1F600","j":["grin","joy",":D","smile","happy","face"]},"grinning-face-with-big-eyes":{"a":"Grinning Face with Big Eyes","b":"1F603","j":["mouth","open","joy",":)",":D","funny","smile","happy","face","haha"]},"grinning-face-with-smiling-eyes":{"a":"Grinning Face with Smiling Eyes","b":"1F604","j":["mouth","open","eye","joy",":)","like",":D","funny","smile","happy","laugh","face","haha"]},"beaming-face-with-smiling-eyes":{"a":"Beaming Face with Smiling Eyes","b":"1F601","j":["grin","joy","eye","smile","kawaii","happy","face"]},"grinning-squinting-face":{"a":"Grinning Squinting Face","b":"1F606","j":["mouth","lol","joy","glad","XD","haha","smile","happy","laugh","face","satisfied"]},"grinning-face-with-sweat":{"a":"Grinning Face with Sweat","b":"1F605","j":["relief","open","sweat","hot","smile","cold","happy","laugh","face"]},"rolling-on-the-floor-laughing":{"a":"Rolling on the Floor Laughing","b":"1F923","j":["floor","lol","rolling","rotfl","rofl","laughing","laugh","face","haha"]},"face-with-tears-of-joy":{"a":"Face with Tears of Joy","b":"1F602","j":["tears","weep","tear","cry","joy","happytears","happy","laugh","face","haha"]},"slightly-smiling-face":{"a":"Slightly Smiling Face","b":"1F642","j":["smile","face"]},"upsidedown-face":{"a":"Upside-Down Face","b":"1F643","j":["upside_down_face","flipped","upside-down","smile","face","silly"]},"winking-face":{"a":"Winking Face","b":"1F609","j":["mischievous",";)","wink","eye","smile","secret","happy","face"]},"smiling-face-with-smiling-eyes":{"a":"Smiling Face with Smiling Eyes","b":"1F60A","j":["blush","eye","joy","smile","embarrassed","shy","crush","happy","flushed","face"]},"smiling-face-with-halo":{"a":"Smiling Face with Halo","b":"1F607","j":["halo","fantasy","innocent","angel","face","heaven"]},"smiling-face-with-hearts":{"a":"Smiling Face with Hearts","b":"1F970","j":["infatuation","hearts","love","like","valentines","affection","in love","crush","adore","face"]},"smiling-face-with-hearteyes":{"a":"Smiling Face with Heart-Eyes","b":"1F60D","j":["heart","smiling face with heart-eyes","eye","love","infatuation","like","affection","smile","valentines","smiling_face_with_heart_eyes","crush","face"]},"starstruck":{"a":"Star-Struck","b":"1F929","j":["starry-eyed","eyes","star_struck","grinning","smile","star-struck","starry","face","star"]},"face-blowing-a-kiss":{"a":"Face Blowing a Kiss","b":"1F618","j":["infatuation","love","kiss","like","valentines","affection","face"]},"kissing-face":{"a":"Kissing Face","b":"1F617","j":["3","infatuation","kiss","love","like","valentines","face"]},"smiling-face":{"a":"Smiling Face","b":"263A","j":["massage","outlined","blush","smile","happiness","relaxed","face"]},"kissing-face-with-closed-eyes":{"a":"Kissing Face with Closed Eyes","b":"1F61A","j":["closed","infatuation","eye","kiss","love","like","valentines","affection","face"]},"kissing-face-with-smiling-eyes":{"a":"Kissing Face with Smiling Eyes","b":"1F619","j":["infatuation","eye","kiss","valentines","smile","affection","face"]},"smiling-face-with-tear":{"a":"Smiling Face with Tear","b":"1F972","j":["touched","sad","grateful","tear","relieved","cry","smiling","proud","pretend"]},"face-savoring-food":{"a":"Face Savoring Food","b":"1F60B","j":["joy","nom","tongue","savouring","smile","delicious","yummy","yum","happy","face","silly"]},"face-with-tongue":{"a":"Face with Tongue","b":"1F61B","j":["prank","mischievous","playful","childish","tongue","smile","face"]},"winking-face-with-tongue":{"a":"Winking Face with Tongue","b":"1F61C","j":["prank","mischievous","playful","childish","wink","eye","tongue","smile","joke","face"]},"zany-face":{"a":"Zany Face","b":"1F92A","j":["eye","small","large","crazy","goofy","face"]},"squinting-face-with-tongue":{"a":"Squinting Face with Tongue","b":"1F61D","j":["prank","mischievous","taste","playful","eye","tongue","horrible","smile","face"]},"moneymouth-face":{"a":"Money-Mouth Face","b":"1F911","j":["mouth","dollar","money-mouth face","money","rich","face","money_mouth_face"]},"hugging-face":{"a":"Hugging Face","b":"1F917","j":["hugging","smile","hug","face"]},"face-with-hand-over-mouth":{"a":"Face with Hand over Mouth","b":"1F92D","j":["surprise","whoops","shock","face","sudden realization"]},"shushing-face":{"a":"Shushing Face","b":"1F92B","j":["shhh","shush","quiet","face"]},"thinking-face":{"a":"Thinking Face","b":"1F914","j":["consider","face","thinking","think","hmmm"]},"zippermouth-face":{"a":"Zipper-Mouth Face","b":"1F910","j":["zipper-mouth face","mouth","sealed","zipper_mouth_face","zipper","secret","face"]},"face-with-raised-eyebrow":{"a":"Face with Raised Eyebrow","b":"1F928","j":["disbelief","surprise","mild surprise","scepticism","disapproval","distrust","face","skeptic"]},"neutral-face":{"a":"Neutral Face","b":"1F610","j":["deadpan",":|","neutral","meh","face","indifference"]},"expressionless-face":{"a":"Expressionless Face","b":"1F611","j":["unexpressive","expressionless","-_-","deadpan","indifferent","meh","face","inexpressive"]},"face-without-mouth":{"a":"Face Without Mouth","b":"1F636","j":["mouth","silent","hellokitty","quiet","face"]},"face-in-clouds":{"a":"⊛ Face in Clouds","b":"1F636-200D-1F32B-FE0F","j":["absentminded","face in clouds","face in the fog","head in clouds"]},"smirking-face":{"a":"Smirking Face","b":"1F60F","j":["prank","smug","mean","sarcasm","smirk","smile","face"]},"unamused-face":{"a":"Unamused Face","b":"1F612","j":["unhappy","straight face","bored","side_eye","skeptical","dubious","sarcasm","unamused","serious","unimpressed","face","indifference"]},"face-with-rolling-eyes":{"a":"Face with Rolling Eyes","b":"1F644","j":["eyeroll","frustrated","rolling","eyes","face"]},"grimacing-face":{"a":"Grimacing Face","b":"1F62C","j":["teeth","grimace","face"]},"face-exhaling":{"a":"⊛ Face Exhaling","b":"1F62E-200D-1F4A8","j":["exhale","face exhaling","gasp","groan","relief","whisper","whistle"]},"lying-face":{"a":"Lying Face","b":"1F925","j":["lie","face","pinocchio"]},"relieved-face":{"a":"Relieved Face","b":"1F60C","j":["massage","relieved","phew","happiness","relaxed","face"]},"pensive-face":{"a":"Pensive Face","b":"1F614","j":["dejected","sad","pensive","depressed","upset","face"]},"sleepy-face":{"a":"Sleepy Face","b":"1F62A","j":["tired","rest","nap","face","sleep"]},"drooling-face":{"a":"Drooling Face","b":"1F924","j":["face","drooling"]},"sleeping-face":{"a":"Sleeping Face","b":"1F634","j":["night","sleepy","zzz","tired","face","sleep"]},"face-with-medical-mask":{"a":"Face with Medical Mask","b":"1F637","j":["sick","doctor","ill","disease","mask","cold","face"]},"face-with-thermometer":{"a":"Face with Thermometer","b":"1F912","j":["sick","thermometer","temperature","fever","ill","cold","face"]},"face-with-headbandage":{"a":"Face with Head-Bandage","b":"1F915","j":["face_with_head_bandage","injured","injury","clumsy","face with head-bandage","bandage","face","hurt"]},"nauseated-face":{"a":"Nauseated Face","b":"1F922","j":["sick","throw up","nauseated","ill","green","vomit","gross","face"]},"face-vomiting":{"a":"Face Vomiting","b":"1F92E","j":["puke","vomit","face","sick"]},"sneezing-face":{"a":"Sneezing Face","b":"1F927","j":["sick","allergy","sneeze","gesundheit","face"]},"hot-face":{"a":"Hot Face","b":"1F975","j":["red","hot","heat","feverish","heat stroke","sweating","face","red-faced"]},"cold-face":{"a":"Cold Face","b":"1F976","j":["icicles","freezing","frozen","blue-faced","frostbite","cold","face","blue"]},"woozy-face":{"a":"Woozy Face","b":"1F974","j":["dizzy","face","wavy mouth","tipsy","wavy","uneven eyes","intoxicated"]},"knockedout-face":{"a":"Knocked-out Face","b":"1F635","j":["knocked-out face","dizzy_face","dizzy","knocked out","xox","spent","unconscious","face","dead"]},"face-with-spiral-eyes":{"a":"⊛ Face with Spiral Eyes","b":"1F635-200D-1F4AB","j":["dizzy","face with spiral eyes","hypnotized","spiral","trouble","whoa"]},"exploding-head":{"a":"Exploding Head","b":"1F92F","j":["shocked","mind","blown","mind blown","face"]},"cowboy-hat-face":{"a":"Cowboy Hat Face","b":"1F920","j":["cowboy","cowgirl","face","hat"]},"partying-face":{"a":"Partying Face","b":"1F973","j":["hat","celebration","horn","woohoo","face","party"]},"disguised-face":{"a":"Disguised Face","b":"1F978","j":["brows","glasses","incognito","moustache","disguise","nose","face","pretent"]},"smiling-face-with-sunglasses":{"a":"Smiling Face with Sunglasses","b":"1F60E","j":["cool","sunglass","sun","smile","bright","beach","summer","sunglasses","face"]},"nerd-face":{"a":"Nerd Face","b":"1F913","j":["nerdy","dork","nerd","geek","face"]},"face-with-monocle":{"a":"Face with Monocle","b":"1F9D0","j":["wealthy","stuffy","face"]},"confused-face":{"a":"Confused Face","b":"1F615","j":[":/","face","meh","confused","huh","hmmm","weird","indifference"]},"worried-face":{"a":"Worried Face","b":"1F61F","j":[":(","worried","nervous","concern","face"]},"slightly-frowning-face":{"a":"Slightly Frowning Face","b":"1F641","j":["sad","frowning","frown","disappointed","upset","face"]},"frowning-face":{"a":"Frowning Face","b":"2639","j":["sad","upset","face","frown"]},"face-with-open-mouth":{"a":"Face with Open Mouth","b":"1F62E","j":["surprise","mouth","wow","whoa","open","sympathy","impressed",":O","face"]},"hushed-face":{"a":"Hushed Face","b":"1F62F","j":["shh","woo","surprised","hushed","stunned","face"]},"astonished-face":{"a":"Astonished Face","b":"1F632","j":["shocked","poisoned","totally","surprised","astonished","xox","face"]},"flushed-face":{"a":"Flushed Face","b":"1F633","j":["blush","flattered","shy","dazed","flushed","face"]},"pleading-face":{"a":"Pleading Face","b":"1F97A","j":["begging","mercy","face","puppy eyes"]},"frowning-face-with-open-mouth":{"a":"Frowning Face with Open Mouth","b":"1F626","j":["mouth","aw","what","open","frown","face"]},"anguished-face":{"a":"Anguished Face","b":"1F627","j":["stunned","anguished","face","nervous"]},"fearful-face":{"a":"Fearful Face","b":"1F628","j":["fearful","terrified","oops","scared","fear","nervous","huh","face"]},"anxious-face-with-sweat":{"a":"Anxious Face with Sweat","b":"1F630","j":["sweat","nervous","cold","rushed","face","blue"]},"sad-but-relieved-face":{"a":"Sad but Relieved Face","b":"1F625","j":["whew","relieved","sweat","phew","disappointed","nervous","face"]},"crying-face":{"a":"Crying Face","b":"1F622","j":["sad","tears","tear",":'(","cry","depressed","upset","face"]},"loudly-crying-face":{"a":"Loudly Crying Face","b":"1F62D","j":["sad","tears","tear","cry","depressed","sob","upset","face"]},"face-screaming-in-fear":{"a":"Face Screaming in Fear","b":"1F631","j":["munch","scared","scream","omg","fear","face"]},"confounded-face":{"a":"Confounded Face","b":"1F616","j":["unwell","sick","confounded","oops",":S","confused","face"]},"persevering-face":{"a":"Persevering Face","b":"1F623","j":["sick","no","oops","upset","face","persevere"]},"disappointed-face":{"a":"Disappointed Face","b":"1F61E","j":["sad","depressed","disappointed",":(","upset","face"]},"downcast-face-with-sweat":{"a":"Downcast Face with Sweat","b":"1F613","j":["sad","exercise","sweat","hot","tired","cold","face"]},"weary-face":{"a":"Weary Face","b":"1F629","j":["sad","weary","sleepy","frustrated","tired","upset","face"]},"tired-face":{"a":"Tired Face","b":"1F62B","j":["sick","frustrated","tired","upset","whine","face"]},"yawning-face":{"a":"Yawning Face","b":"1F971","j":["","bored","yawn","tired","sleepy"]},"face-with-steam-from-nose":{"a":"Face with Steam From Nose","b":"1F624","j":["gas","won","pride","phew","proud","face","triumph"]},"pouting-face":{"a":"Pouting Face","b":"1F621","j":["despise","red","mad","hate","angry","pouting","face","rage"]},"angry-face":{"a":"Angry Face","b":"1F620","j":["annoyed","mad","frustrated","angry","anger","face"]},"face-with-symbols-on-mouth":{"a":"Face with Symbols on Mouth","b":"1F92C","j":["swearing","profanity","cursing","expletive","cussing","face"]},"smiling-face-with-horns":{"a":"Smiling Face with Horns","b":"1F608","j":["devil","horns","fairy tale","fantasy","smile","face"]},"angry-face-with-horns":{"a":"Angry Face with Horns","b":"1F47F","j":["demon","imp","devil","horns","fantasy","angry","face"]},"skull":{"a":"Skull","b":"1F480","j":["monster","skeleton","fairy tale","creepy","death","face","dead"]},"skull-and-crossbones":{"a":"Skull and Crossbones","b":"2620","j":["monster","scary","poison","skull","crossbones","deadly","evil","danger","death","face","pirate"]},"pile-of-poo":{"a":"Pile of Poo","b":"1F4A9","j":["monster","poop","dung","shitface","hankey","poo","shit","turd","face","fail"]},"clown-face":{"a":"Clown Face","b":"1F921","j":["face","clown"]},"ogre":{"a":"Ogre","b":"1F479","j":["monster","demon","devil","red","fairy tale","fantasy","troll","halloween","creepy","creature","mask","japanese","scary","face"]},"goblin":{"a":"Goblin","b":"1F47A","j":["monster","red","fairy tale","fantasy","creature","creepy","mask","japanese","scary","evil","face"]},"ghost":{"a":"Ghost","b":"1F47B","j":["monster","fairy tale","fantasy","halloween","spooky","creature","scary","face"]},"alien":{"a":"Alien","b":"1F47D","j":["paul","ufo","outer_space","UFO","extraterrestrial","fantasy","creature","face","weird"]},"alien-monster":{"a":"Alien Monster","b":"1F47E","j":["monster","ufo","arcade","alien","extraterrestrial","creature","game","face","play"]},"robot":{"a":"Robot","b":"1F916","j":["monster","machine","bot","computer","face"]},"grinning-cat":{"a":"Grinning Cat","b":"1F63A","j":["mouth","open","animal","grinning","smile","cats","happy","cat","face"]},"grinning-cat-with-smiling-eyes":{"a":"Grinning Cat with Smiling Eyes","b":"1F638","j":["grin","animal","eye","cats","smile","cat","face"]},"cat-with-tears-of-joy":{"a":"Cat with Tears of Joy","b":"1F639","j":["tears","tear","joy","animal","cats","happy","cat","face","haha"]},"smiling-cat-with-hearteyes":{"a":"Smiling Cat with Heart-Eyes","b":"1F63B","j":["heart","smiling cat with heart-eyes","smiling_cat_with_heart_eyes","eye","love","animal","like","affection","smile","cats","valentines","cat","face"]},"cat-with-wry-smile":{"a":"Cat with Wry Smile","b":"1F63C","j":["animal","ironic","smirk","smile","cats","wry","cat","face"]},"kissing-cat":{"a":"Kissing Cat","b":"1F63D","j":["animal","kiss","eye","cats","cat","face"]},"weary-cat":{"a":"Weary Cat","b":"1F640","j":["weary","cat","animal","munch","scared","surprised","scream","cats","oh","face"]},"crying-cat":{"a":"Crying Cat","b":"1F63F","j":["sad","tears","tear","weep","cry","animal","cats","upset","cat","face"]},"pouting-cat":{"a":"Pouting Cat","b":"1F63E","j":["animal","cats","pouting","cat","face"]},"seenoevil-monkey":{"a":"See-No-Evil Monkey","b":"1F648","j":["animal","see","see-no-evil monkey","face","see_no_evil_monkey","nature","forbidden","evil","monkey","haha"]},"hearnoevil-monkey":{"a":"Hear-No-Evil Monkey","b":"1F649","j":["hear-no-evil monkey","hear","monkey","animal","hear_no_evil_monkey","nature","forbidden","evil","face"]},"speaknoevil-monkey":{"a":"Speak-No-Evil Monkey","b":"1F64A","j":["speak","speak-no-evil monkey","animal","face","omg","speak_no_evil_monkey","nature","forbidden","evil","monkey"]},"kiss-mark":{"a":"Kiss Mark","b":"1F48B","j":["lips","love","kiss","like","valentines","affection","face"]},"love-letter":{"a":"Love Letter","b":"1F48C","j":["heart","letter","envelope","email","love","like","valentines","mail","affection"]},"heart-with-arrow":{"a":"Heart with Arrow","b":"1F498","j":["cupid","heart","arrow","love","like","valentines","affection"]},"heart-with-ribbon":{"a":"Heart with Ribbon","b":"1F49D","j":["ribbon","love","valentines","valentine"]},"sparkling-heart":{"a":"Sparkling Heart","b":"1F496","j":["sparkle","love","like","valentines","excited","affection"]},"growing-heart":{"a":"Growing Heart","b":"1F497","j":["pink","pulse","growing","love","like","valentines","nervous","excited","affection"]},"beating-heart":{"a":"Beating Heart","b":"1F493","j":["heartbeat","pink","heart","love","like","valentines","beating","affection","pulsating"]},"revolving-hearts":{"a":"Revolving Hearts","b":"1F49E","j":["love","like","valentines","revolving","affection"]},"two-hearts":{"a":"Two Hearts","b":"1F495","j":["heart","love","like","valentines","affection"]},"heart-decoration":{"a":"Heart Decoration","b":"1F49F","j":["purple-square","heart","love","like"]},"heart-exclamation":{"a":"Heart Exclamation","b":"2763","j":["exclamation","decoration","punctuation","love","mark"]},"broken-heart":{"a":"Broken Heart","b":"1F494","j":["sad","heart","heartbreak","break","sorry","broken"]},"heart-on-fire":{"a":"⊛ Heart on Fire","b":"2764-FE0F-200D-1F525","j":["burn","heart","heart on fire","love","lust","sacred heart"]},"mending-heart":{"a":"⊛ Mending Heart","b":"2764-FE0F-200D-1FA79","j":["healthier","improving","mending","mending heart","recovering","recuperating","well"]},"red-heart":{"a":"Red Heart","b":"2764","j":["heart","love","valentines","like"]},"orange-heart":{"a":"Orange Heart","b":"1F9E1","j":["love","like","orange","valentines","affection"]},"yellow-heart":{"a":"Yellow Heart","b":"1F49B","j":["yellow","love","like","valentines","affection"]},"green-heart":{"a":"Green Heart","b":"1F49A","j":["love","like","green","valentines","affection"]},"blue-heart":{"a":"Blue Heart","b":"1F499","j":["love","like","valentines","affection","blue"]},"purple-heart":{"a":"Purple Heart","b":"1F49C","j":["love","like","purple","valentines","affection"]},"brown-heart":{"a":"Brown Heart","b":"1F90E","j":["brown","coffee","heart"]},"black-heart":{"a":"Black Heart","b":"1F5A4","j":["black","wicked","evil"]},"white-heart":{"a":"White Heart","b":"1F90D","j":["heart","pure","white"]},"hundred-points":{"a":"Hundred Points","b":"1F4AF","j":["test","100","exam","score","numbers","full","quiz","hundred","century","pass","perfect"]},"anger-symbol":{"a":"Anger Symbol","b":"1F4A2","j":["mad","comic","angry"]},"collision":{"a":"Collision","b":"1F4A5","j":["explode","boom","bomb","comic","blown","explosion"]},"dizzy":{"a":"Dizzy","b":"1F4AB","j":["sparkle","magic","shoot","comic","star"]},"sweat-droplets":{"a":"Sweat Droplets","b":"1F4A6","j":["sweat","oops","water","drip","comic","splashing"]},"dashing-away":{"a":"Dashing Away","b":"1F4A8","j":["running","air","fart","shoo","wind","smoke","comic","fast","puff","dash"]},"hole":{"a":"Hole","b":"1F573","j":["embarrassing"]},"bomb":{"a":"Bomb","b":"1F4A3","j":["explode","terrorism","boom","comic","explosion"]},"speech-balloon":{"a":"Speech Balloon","b":"1F4AC","j":["chatting","dialog","speech","bubble","words","message","balloon","comic","talk"]},"eye-in-speech-bubble":{"a":"Eye in Speech Bubble","b":"1F441-FE0F-200D-1F5E8-FE0F","j":["speech bubble","info","eye","witness"]},"left-speech-bubble":{"a":"Left Speech Bubble","b":"1F5E8","j":["chatting","dialog","speech","words","message","talk"]},"right-anger-bubble":{"a":"Right Anger Bubble","b":"1F5EF","j":["mad","speech","bubble","thinking","balloon","angry","caption"]},"thought-balloon":{"a":"Thought Balloon","b":"1F4AD","j":["thought","dream","cloud","bubble","speech","thinking","balloon","comic"]},"zzz":{"a":"Zzz","b":"1F4A4","j":["dream","tired","comic","sleepy","sleep"]},"waving-hand":{"a":"Waving Hand","b":"1F44B","j":["palm","gesture","farewell","wave","hands","hello","hi","solong","waving","hand","goodbye"]},"raised-back-of-hand":{"a":"Raised Back of Hand","b":"1F91A","j":["raised","fingers","backhand"]},"hand-with-fingers-splayed":{"a":"Hand with Fingers Splayed","b":"1F590","j":["splayed","palm","finger","hand","fingers"]},"raised-hand":{"a":"Raised Hand","b":"270B","j":["stop","palm","high 5","highfive","high five","hand","fingers","ban"]},"vulcan-salute":{"a":"Vulcan Salute","b":"1F596","j":["spock","finger","hand","star trek","fingers","vulcan"]},"ok-hand":{"a":"Ok Hand","b":"1F44C","j":["ok","perfect","limbs","hand","OK","okay","fingers"]},"pinched-fingers":{"a":"Pinched Fingers","b":"1F90C","j":["pinched","small","interrogation","hand gesture","sarcastic","size","fingers","tiny"]},"pinching-hand":{"a":"Pinching Hand","b":"1F90F","j":["small","size","small amount","tiny"]},"victory-hand":{"a":"Victory Hand","b":"270C","j":["victory","ohyeah","peace","two","v","hand","fingers"]},"crossed-fingers":{"a":"Crossed Fingers","b":"1F91E","j":["lucky","cross","luck","finger","good","hand"]},"loveyou-gesture":{"a":"Love-You Gesture","b":"1F91F","j":["gesture","love-you gesture","hand","ILY","fingers","love_you_gesture"]},"sign-of-the-horns":{"a":"Sign of the Horns","b":"1F918","j":["evil_eye","sign_of_horns","horns","finger","rock_on","hand","fingers","rock-on"]},"call-me-hand":{"a":"Call Me Hand","b":"1F919","j":["hand","gesture","call","hands"]},"backhand-index-pointing-left":{"a":"Backhand Index Pointing Left","b":"1F448","j":["point","backhand","index","left","direction","finger","hand","fingers"]},"backhand-index-pointing-right":{"a":"Backhand Index Pointing Right","b":"1F449","j":["point","backhand","index","direction","right","finger","hand","fingers"]},"backhand-index-pointing-up":{"a":"Backhand Index Pointing Up","b":"1F446","j":["up","point","backhand","direction","finger","hand","fingers"]},"middle-finger":{"a":"Middle Finger","b":"1F595","j":["flipping","rude","middle","finger","hand","fingers"]},"backhand-index-pointing-down":{"a":"Backhand Index Pointing Down","b":"1F447","j":["point","backhand","direction","down","finger","hand","fingers"]},"index-pointing-up":{"a":"Index Pointing Up","b":"261D","j":["up","point","index","direction","finger","hand","fingers"]},"thumbs-up":{"a":"Thumbs Up","b":"1F44D","j":["up","cool","thumb","+1","thumbsup","awesome","like","good","accept","hand","yes","agree"]},"thumbs-down":{"a":"Thumbs Down","b":"1F44E","j":["-1","thumb","no","dislike","down","thumbsdown","hand"]},"raised-fist":{"a":"Raised Fist","b":"270A","j":["punch","fist","grasp","clenched","hand","fingers"]},"oncoming-fist":{"a":"Oncoming Fist","b":"1F44A","j":["punch","attack","fist","hit","clenched","angry","hand","violence"]},"leftfacing-fist":{"a":"Left-Facing Fist","b":"1F91B","j":["fist","left-facing fist","leftwards","left_facing_fist","hand","fistbump"]},"rightfacing-fist":{"a":"Right-Facing Fist","b":"1F91C","j":["rightwards","fist","right-facing fist","right_facing_fist","hand","fistbump"]},"clapping-hands":{"a":"Clapping Hands","b":"1F44F","j":["congrats","praise","applause","yay","hands","hand","clap"]},"raising-hands":{"a":"Raising Hands","b":"1F64C","j":["hooray","gesture","celebration","raised","yea","hands","hand"]},"open-hands":{"a":"Open Hands","b":"1F450","j":["open","butterfly","hands","hand","fingers"]},"palms-up-together":{"a":"Palms Up Together","b":"1F932","j":["gesture","hands","cupped hands","cupped","prayer"]},"handshake":{"a":"Handshake","b":"1F91D","j":["agreement","hand","meeting","shake"]},"folded-hands":{"a":"Folded Hands","b":"1F64F","j":["thanks","wish","please","high 5","hope","namaste","pray","highfive","high five","hand","ask"]},"writing-hand":{"a":"Writing Hand","b":"270D","j":["lower_left_ballpoint_pen","write","stationery","compose","hand"]},"nail-polish":{"a":"Nail Polish","b":"1F485","j":["manicure","polish","beauty","finger","fashion","nail","cosmetics","care"]},"selfie":{"a":"Selfie","b":"1F933","j":["camera","phone"]},"flexed-biceps":{"a":"Flexed Biceps","b":"1F4AA","j":["strong","hand","flex","biceps","comic","arm","summer","muscle"]},"mechanical-arm":{"a":"Mechanical Arm","b":"1F9BE","j":["accessibility","prosthetic"]},"mechanical-leg":{"a":"Mechanical Leg","b":"1F9BF","j":["accessibility","prosthetic"]},"leg":{"a":"Leg","b":"1F9B5","j":["limb","kick"]},"foot":{"a":"Foot","b":"1F9B6","j":["stomp","kick"]},"ear":{"a":"Ear","b":"1F442","j":["listen","hear","body","sound","face"]},"ear-with-hearing-aid":{"a":"Ear with Hearing Aid","b":"1F9BB","j":["accessibility","hard of hearing"]},"nose":{"a":"Nose","b":"1F443","j":["body","smell","sniff"]},"brain":{"a":"Brain","b":"1F9E0","j":["smart","intelligent"]},"anatomical-heart":{"a":"Anatomical Heart","b":"1FAC0","j":["heartbeat","heart","pulse","health","organ","anatomical","cardiology"]},"lungs":{"a":"Lungs","b":"1FAC1","j":["organ","respiration","breathe","exhalation","breath","inhalation"]},"tooth":{"a":"Tooth","b":"1F9B7","j":["teeth","dentist"]},"bone":{"a":"Bone","b":"1F9B4","j":["skeleton"]},"eyes":{"a":"Eyes","b":"1F440","j":["stalk","eye","see","peek","watch","look","face"]},"eye":{"a":"Eye","b":"1F441","j":["body","stare","see","watch","look","face"]},"tongue":{"a":"Tongue","b":"1F445","j":["body","mouth","playful"]},"mouth":{"a":"Mouth","b":"1F444","j":["lips","kiss"]},"baby":{"a":"Baby","b":"1F476","j":["young","child","girl","boy","toddler"]},"child":{"a":"Child","b":"1F9D2","j":["gender-neutral","unspecified gender","young"]},"boy":{"a":"Boy","b":"1F466","j":["male","man","teenager","young","guy"]},"girl":{"a":"Girl","b":"1F467","j":["Virgo","woman","teenager","young","female","zodiac"]},"person":{"a":"Person","b":"1F9D1","j":["gender-neutral","unspecified gender","adult"]},"person-blond-hair":{"a":"Person: Blond Hair","b":"1F471","j":["blond","blond-haired person","hair","person: blond hair","hairstyle"]},"man":{"a":"Man","b":"1F468","j":["dad","classy","adult","mustache","guy","moustache","father","sir"]},"person-beard":{"a":"Person: Beard","b":"1F9D4","j":["man_beard","beard","bewhiskered","person: beard","person"]},"man-beard":{"a":"⊛ Man: Beard","b":"1F9D4-200D-2642-FE0F","j":["beard","man","man: beard"]},"woman-beard":{"a":"⊛ Woman: Beard","b":"1F9D4-200D-2640-FE0F","j":["beard","woman","woman: beard"]},"man-red-hair":{"a":"Man: Red Hair","b":"1F468-200D-1F9B0","j":["man","hairstyle","adult","red hair"]},"man-curly-hair":{"a":"Man: Curly Hair","b":"1F468-200D-1F9B1","j":["man","curly hair","hairstyle","adult"]},"man-white-hair":{"a":"Man: White Hair","b":"1F468-200D-1F9B3","j":["man","old","adult","white hair","elder"]},"man-bald":{"a":"Man: Bald","b":"1F468-200D-1F9B2","j":["man","hairless","bald","adult"]},"woman":{"a":"Woman","b":"1F469","j":["female","lady","adult","girls"]},"woman-red-hair":{"a":"Woman: Red Hair","b":"1F469-200D-1F9B0","j":["woman","hairstyle","adult","red hair"]},"person-red-hair":{"a":"Person: Red Hair","b":"1F9D1-200D-1F9B0","j":["gender-neutral","unspecified gender","adult","red hair","hairstyle","person"]},"woman-curly-hair":{"a":"Woman: Curly Hair","b":"1F469-200D-1F9B1","j":["curly hair","hairstyle","woman","adult"]},"person-curly-hair":{"a":"Person: Curly Hair","b":"1F9D1-200D-1F9B1","j":["gender-neutral","unspecified gender","adult","curly hair","hairstyle","person"]},"woman-white-hair":{"a":"Woman: White Hair","b":"1F469-200D-1F9B3","j":["woman","old","adult","white hair","elder"]},"person-white-hair":{"a":"Person: White Hair","b":"1F9D1-200D-1F9B3","j":["gender-neutral","unspecified gender","old","adult","white hair","person","elder"]},"woman-bald":{"a":"Woman: Bald","b":"1F469-200D-1F9B2","j":["woman","bald","hairless","adult"]},"person-bald":{"a":"Person: Bald","b":"1F9D1-200D-1F9B2","j":["gender-neutral","bald","unspecified gender","adult","hairless","person"]},"woman-blond-hair":{"a":"Woman: Blond Hair","b":"1F471-200D-2640-FE0F","j":["blond-haired woman","woman","female","hair","girl","woman: blond hair","person","blonde"]},"man-blond-hair":{"a":"Man: Blond Hair","b":"1F471-200D-2642-FE0F","j":["blond","male","man","blond-haired man","man: blond hair","hair","guy","boy","person","blonde"]},"older-person":{"a":"Older Person","b":"1F9D3","j":["gender-neutral","unspecified gender","old","adult","senior","human","elder"]},"old-man":{"a":"Old Man","b":"1F474","j":["male","men","man","old","adult","senior","human","elder"]},"old-woman":{"a":"Old Woman","b":"1F475","j":["old","woman","adult","female","lady","senior","women","human","elder"]},"person-frowning":{"a":"Person Frowning","b":"1F64D","j":["frown","gesture","worried"]},"man-frowning":{"a":"Man Frowning","b":"1F64D-200D-2642-FE0F","j":["sad","unhappy","frowning","male","man","gesture","depressed","boy","discouraged"]},"woman-frowning":{"a":"Woman Frowning","b":"1F64D-200D-2640-FE0F","j":["sad","unhappy","frowning","gesture","woman","depressed","female","girl","discouraged"]},"person-pouting":{"a":"Person Pouting","b":"1F64E","j":["gesture","upset","pouting"]},"man-pouting":{"a":"Man Pouting","b":"1F64E-200D-2642-FE0F","j":["male","man","gesture","pouting","boy"]},"woman-pouting":{"a":"Woman Pouting","b":"1F64E-200D-2640-FE0F","j":["gesture","woman","female","girl","pouting"]},"person-gesturing-no":{"a":"Person Gesturing No","b":"1F645","j":["prohibited","gesture","hand","forbidden","decline","person gesturing NO"]},"man-gesturing-no":{"a":"Man Gesturing No","b":"1F645-200D-2642-FE0F","j":["male","nope","man","gesture","prohibited","hand","forbidden","boy","man gesturing NO"]},"woman-gesturing-no":{"a":"Woman Gesturing No","b":"1F645-200D-2640-FE0F","j":["nope","prohibited","gesture","woman","woman gesturing NO","female","girl","hand","forbidden"]},"person-gesturing-ok":{"a":"Person Gesturing Ok","b":"1F646","j":["person gesturing OK","gesture","hand","OK","agree"]},"man-gesturing-ok":{"a":"Man Gesturing Ok","b":"1F646-200D-2642-FE0F","j":["male","men","OK","man","gesture","man gesturing OK","hand","boy","human","blue"]},"woman-gesturing-ok":{"a":"Woman Gesturing Ok","b":"1F646-200D-2640-FE0F","j":["pink","OK","gesture","woman","female","woman gesturing OK","girl","hand","women","human"]},"person-tipping-hand":{"a":"Person Tipping Hand","b":"1F481","j":["information","tipping","sassy","help","hand"]},"man-tipping-hand":{"a":"Man Tipping Hand","b":"1F481-200D-2642-FE0F","j":["male","information","man","sassy","tipping hand","boy","human"]},"woman-tipping-hand":{"a":"Woman Tipping Hand","b":"1F481-200D-2640-FE0F","j":["information","woman","sassy","female","girl","tipping hand","human"]},"person-raising-hand":{"a":"Person Raising Hand","b":"1F64B","j":["gesture","raised","question","hand","happy"]},"man-raising-hand":{"a":"Man Raising Hand","b":"1F64B-200D-2642-FE0F","j":["male","man","gesture","raising hand","boy"]},"woman-raising-hand":{"a":"Woman Raising Hand","b":"1F64B-200D-2640-FE0F","j":["gesture","woman","female","raising hand","girl"]},"deaf-person":{"a":"Deaf Person","b":"1F9CF","j":["accessibility","ear","deaf","hear"]},"deaf-man":{"a":"Deaf Man","b":"1F9CF-200D-2642-FE0F","j":["man","accessibility","deaf"]},"deaf-woman":{"a":"Deaf Woman","b":"1F9CF-200D-2640-FE0F","j":["woman","deaf","accessibility"]},"person-bowing":{"a":"Person Bowing","b":"1F647","j":["bow","gesture","sorry","respectiful","apology"]},"man-bowing":{"a":"Man Bowing","b":"1F647-200D-2642-FE0F","j":["favor","male","man","gesture","sorry","apology","boy","bowing"]},"woman-bowing":{"a":"Woman Bowing","b":"1F647-200D-2640-FE0F","j":["favor","gesture","woman","sorry","apology","female","girl","bowing"]},"person-facepalming":{"a":"Person Facepalming","b":"1F926","j":["disbelief","palm","exasperation","disappointed","face"]},"man-facepalming":{"a":"Man Facepalming","b":"1F926-200D-2642-FE0F","j":["disbelief","male","exasperation","man","facepalm","boy"]},"woman-facepalming":{"a":"Woman Facepalming","b":"1F926-200D-2640-FE0F","j":["disbelief","exasperation","woman","facepalm","female","girl"]},"person-shrugging":{"a":"Person Shrugging","b":"1F937","j":["shrug","ignorance","regardless","doubt","indifference"]},"man-shrugging":{"a":"Man Shrugging","b":"1F937-200D-2642-FE0F","j":["male","shrug","ignorance","man","indifferent","confused","boy","doubt","indifference"]},"woman-shrugging":{"a":"Woman Shrugging","b":"1F937-200D-2640-FE0F","j":["shrug","ignorance","woman","indifferent","female","girl","confused","doubt","indifference"]},"health-worker":{"a":"Health Worker","b":"1F9D1-200D-2695-FE0F","j":["nurse","doctor","healthcare","hospital","therapist"]},"man-health-worker":{"a":"Man Health Worker","b":"1F468-200D-2695-FE0F","j":["nurse","man","doctor","healthcare","human","therapist"]},"woman-health-worker":{"a":"Woman Health Worker","b":"1F469-200D-2695-FE0F","j":["nurse","woman","doctor","healthcare","human","therapist"]},"student":{"a":"Student","b":"1F9D1-200D-1F393","j":["graduate","learn"]},"man-student":{"a":"Man Student","b":"1F468-200D-1F393","j":["man","student","human","graduate"]},"woman-student":{"a":"Woman Student","b":"1F469-200D-1F393","j":["woman","student","human","graduate"]},"teacher":{"a":"Teacher","b":"1F9D1-200D-1F3EB","j":["instructor","professor"]},"man-teacher":{"a":"Man Teacher","b":"1F468-200D-1F3EB","j":["man","teacher","professor","instructor","human"]},"woman-teacher":{"a":"Woman Teacher","b":"1F469-200D-1F3EB","j":["woman","teacher","professor","instructor","human"]},"judge":{"a":"Judge","b":"1F9D1-200D-2696-FE0F","j":["law","scales","justice"]},"man-judge":{"a":"Man Judge","b":"1F468-200D-2696-FE0F","j":["man","scales","court","judge","human","justice"]},"woman-judge":{"a":"Woman Judge","b":"1F469-200D-2696-FE0F","j":["woman","scales","court","judge","human","justice"]},"farmer":{"a":"Farmer","b":"1F9D1-200D-1F33E","j":["rancher","crops","gardener"]},"man-farmer":{"a":"Man Farmer","b":"1F468-200D-1F33E","j":["man","rancher","farmer","gardener","human"]},"woman-farmer":{"a":"Woman Farmer","b":"1F469-200D-1F33E","j":["rancher","woman","farmer","gardener","human"]},"cook":{"a":"Cook","b":"1F9D1-200D-1F373","j":["culinary","kitchen","chef","food"]},"man-cook":{"a":"Man Cook","b":"1F468-200D-1F373","j":["cook","human","chef","man"]},"woman-cook":{"a":"Woman Cook","b":"1F469-200D-1F373","j":["cook","woman","human","chef"]},"mechanic":{"a":"Mechanic","b":"1F9D1-200D-1F527","j":["tradesperson","plumber","electrician","worker","technician"]},"man-mechanic":{"a":"Man Mechanic","b":"1F468-200D-1F527","j":["plumber","tradesperson","wrench","man","electrician","mechanic","human"]},"woman-mechanic":{"a":"Woman Mechanic","b":"1F469-200D-1F527","j":["tradesperson","plumber","wrench","woman","electrician","mechanic","human"]},"factory-worker":{"a":"Factory Worker","b":"1F9D1-200D-1F3ED","j":["industrial","assembly","worker","factory","labor"]},"man-factory-worker":{"a":"Man Factory Worker","b":"1F468-200D-1F3ED","j":["man","industrial","assembly","worker","factory","human"]},"woman-factory-worker":{"a":"Woman Factory Worker","b":"1F469-200D-1F3ED","j":["woman","industrial","assembly","worker","factory","human"]},"office-worker":{"a":"Office Worker","b":"1F9D1-200D-1F4BC","j":["business","white-collar","architect","manager"]},"man-office-worker":{"a":"Man Office Worker","b":"1F468-200D-1F4BC","j":["business","architect","man","white-collar","human","manager"]},"woman-office-worker":{"a":"Woman Office Worker","b":"1F469-200D-1F4BC","j":["business","architect","woman","white-collar","human","manager"]},"scientist":{"a":"Scientist","b":"1F9D1-200D-1F52C","j":["chemist","chemistry","biologist","physicist","engineer"]},"man-scientist":{"a":"Man Scientist","b":"1F468-200D-1F52C","j":["man","chemist","biologist","physicist","human","engineer","scientist"]},"woman-scientist":{"a":"Woman Scientist","b":"1F469-200D-1F52C","j":["woman","chemist","biologist","physicist","human","engineer","scientist"]},"technologist":{"a":"Technologist","b":"1F9D1-200D-1F4BB","j":["inventor","software","computer","developer","coder"]},"man-technologist":{"a":"Man Technologist","b":"1F468-200D-1F4BB","j":["inventor","man","engineer","software","laptop","computer","developer","coder","technologist","human","programmer"]},"woman-technologist":{"a":"Woman Technologist","b":"1F469-200D-1F4BB","j":["inventor","woman","engineer","software","laptop","computer","developer","coder","technologist","human","programmer"]},"singer":{"a":"Singer","b":"1F9D1-200D-1F3A4","j":["actor","entertainer","performer","rock","song","artist","star"]},"man-singer":{"a":"Man Singer","b":"1F468-200D-1F3A4","j":["actor","entertainer","singer","rockstar","man","rock","human","star"]},"woman-singer":{"a":"Woman Singer","b":"1F469-200D-1F3A4","j":["actor","entertainer","singer","rockstar","woman","rock","human","star"]},"artist":{"a":"Artist","b":"1F9D1-200D-1F3A8","j":["palette","creativity","draw","painting"]},"man-artist":{"a":"Man Artist","b":"1F468-200D-1F3A8","j":["man","painter","palette","artist","human"]},"woman-artist":{"a":"Woman Artist","b":"1F469-200D-1F3A8","j":["woman","painter","palette","artist","human"]},"pilot":{"a":"Pilot","b":"1F9D1-200D-2708-FE0F","j":["airplane","plane","fly"]},"man-pilot":{"a":"Man Pilot","b":"1F468-200D-2708-FE0F","j":["man","plane","pilot","human","aviator"]},"woman-pilot":{"a":"Woman Pilot","b":"1F469-200D-2708-FE0F","j":["woman","plane","pilot","human","aviator"]},"astronaut":{"a":"Astronaut","b":"1F9D1-200D-1F680","j":["outerspace","rocket"]},"man-astronaut":{"a":"Man Astronaut","b":"1F468-200D-1F680","j":["man","space","astronaut","rocket","human"]},"woman-astronaut":{"a":"Woman Astronaut","b":"1F469-200D-1F680","j":["woman","space","astronaut","rocket","human"]},"firefighter":{"a":"Firefighter","b":"1F9D1-200D-1F692","j":["fire","firetruck"]},"man-firefighter":{"a":"Man Firefighter","b":"1F468-200D-1F692","j":["man","firetruck","firefighter","human","fireman"]},"woman-firefighter":{"a":"Woman Firefighter","b":"1F469-200D-1F692","j":["firetruck","woman","firefighter","human","fireman"]},"police-officer":{"a":"Police Officer","b":"1F46E","j":["cop","officer","police"]},"man-police-officer":{"a":"Man Police Officer","b":"1F46E-200D-2642-FE0F","j":["arrest","cop","man","911","officer","police","enforcement","legal","law"]},"woman-police-officer":{"a":"Woman Police Officer","b":"1F46E-200D-2640-FE0F","j":["arrest","cop","woman","911","female","officer","police","enforcement","legal","law"]},"detective":{"a":"Detective","b":"1F575","j":["spy","sleuth","human"]},"man-detective":{"a":"Man Detective","b":"1F575-FE0F-200D-2642-FE0F","j":["sleuth","man","spy","crime","detective"]},"woman-detective":{"a":"Woman Detective","b":"1F575-FE0F-200D-2640-FE0F","j":["sleuth","spy","woman","detective","female","human"]},"guard":{"a":"Guard","b":"1F482","j":["protect"]},"man-guard":{"a":"Man Guard","b":"1F482-200D-2642-FE0F","j":["uk","male","british","man","royal","guy","gb","guard"]},"woman-guard":{"a":"Woman Guard","b":"1F482-200D-2640-FE0F","j":["uk","british","royal","woman","female","gb","guard"]},"ninja":{"a":"Ninja","b":"1F977","j":["fighter","ninjutsu","stealth","skills","hidden","japanese"]},"construction-worker":{"a":"Construction Worker","b":"1F477","j":["hat","construction","build","worker","labor"]},"man-construction-worker":{"a":"Man Construction Worker","b":"1F477-200D-2642-FE0F","j":["male","wip","man","construction","build","guy","worker","human","labor"]},"woman-construction-worker":{"a":"Woman Construction Worker","b":"1F477-200D-2640-FE0F","j":["wip","woman","construction","build","female","worker","human","labor"]},"prince":{"a":"Prince","b":"1F934","j":["male","man","royal","crown","boy","king"]},"princess":{"a":"Princess","b":"1F478","j":["blond","queen","fairy tale","royal","woman","crown","fantasy","female","girl"]},"person-wearing-turban":{"a":"Person Wearing Turban","b":"1F473","j":["headdress","turban"]},"man-wearing-turban":{"a":"Man Wearing Turban","b":"1F473-200D-2642-FE0F","j":["male","turban","hinduism","man","indian","arabs"]},"woman-wearing-turban":{"a":"Woman Wearing Turban","b":"1F473-200D-2640-FE0F","j":["turban","hinduism","woman","female","indian","arabs"]},"person-with-skullcap":{"a":"Person with Skullcap","b":"1F472","j":["male","hat","cap","man_with_skullcap","skullcap","chinese","gua pi mao","boy","person"]},"woman-with-headscarf":{"a":"Woman with Headscarf","b":"1F9D5","j":["hijab","head kerchief","mantilla","bandana","female","tichel","headscarf"]},"person-in-tuxedo":{"a":"Person in Tuxedo","b":"1F935","j":["wedding","marriage","couple","groom","tuxedo","person","man_in_tuxedo"]},"man-in-tuxedo":{"a":"Man in Tuxedo","b":"1F935-200D-2642-FE0F","j":["man","tuxedo","fashion","formal"]},"woman-in-tuxedo":{"a":"Woman in Tuxedo","b":"1F935-200D-2640-FE0F","j":["woman","tuxedo","fashion","formal"]},"person-with-veil":{"a":"Person with Veil","b":"1F470","j":["bride","wedding","veil","marriage","woman","couple","bride_with_veil","person"]},"man-with-veil":{"a":"Man with Veil","b":"1F470-200D-2642-FE0F","j":["man","marriage","wedding","veil"]},"woman-with-veil":{"a":"Woman with Veil","b":"1F470-200D-2640-FE0F","j":["woman","marriage","wedding","veil"]},"pregnant-woman":{"a":"Pregnant Woman","b":"1F930","j":["woman","pregnant","baby"]},"breastfeeding":{"a":"Breast-Feeding","b":"1F931","j":["breast","breast-feeding","breast_feeding","nursing","baby"]},"woman-feeding-baby":{"a":"Woman Feeding Baby","b":"1F469-200D-1F37C","j":["food","birth","woman","feeding","nursing","baby"]},"man-feeding-baby":{"a":"Man Feeding Baby","b":"1F468-200D-1F37C","j":["food","birth","man","feeding","nursing","baby"]},"person-feeding-baby":{"a":"Person Feeding Baby","b":"1F9D1-200D-1F37C","j":["food","birth","feeding","nursing","baby","person"]},"baby-angel":{"a":"Baby Angel","b":"1F47C","j":["fairy tale","halo","fantasy","wings","baby","angel","face","heaven"]},"santa-claus":{"a":"Santa Claus","b":"1F385","j":["xmas","male","festival","man","father christmas","celebration","santa","Christmas","claus","father"]},"mrs-claus":{"a":"Mrs. Claus","b":"1F936","j":["xmas","mother","Mrs.","woman","celebration","female","mother christmas","Christmas","claus"]},"mx-claus":{"a":"Mx Claus","b":"1F9D1-200D-1F384","j":["Claus, christmas","christmas"]},"superhero":{"a":"Superhero","b":"1F9B8","j":["heroine","marvel","good","superpower","hero"]},"man-superhero":{"a":"Man Superhero","b":"1F9B8-200D-2642-FE0F","j":["male","man","superpowers","good","superpower","hero"]},"woman-superhero":{"a":"Woman Superhero","b":"1F9B8-200D-2640-FE0F","j":["woman","heroine","superpowers","female","good","superpower","hero"]},"supervillain":{"a":"Supervillain","b":"1F9B9","j":["villain","marvel","criminal","superpower","evil"]},"man-supervillain":{"a":"Man Supervillain","b":"1F9B9-200D-2642-FE0F","j":["villain","male","man","criminal","superpowers","bad","superpower","evil","hero"]},"woman-supervillain":{"a":"Woman Supervillain","b":"1F9B9-200D-2640-FE0F","j":["villain","woman","heroine","criminal","female","superpowers","bad","superpower","evil"]},"mage":{"a":"Mage","b":"1F9D9","j":["sorcerer","wizard","witch","sorceress","magic"]},"man-mage":{"a":"Man Mage","b":"1F9D9-200D-2642-FE0F","j":["sorcerer","male","wizard","man","mage"]},"woman-mage":{"a":"Woman Mage","b":"1F9D9-200D-2640-FE0F","j":["woman","witch","sorceress","mage","female"]},"fairy":{"a":"Fairy","b":"1F9DA","j":["Titania","wings","Oberon","Puck","magical"]},"man-fairy":{"a":"Man Fairy","b":"1F9DA-200D-2642-FE0F","j":["man","Puck","male","Oberon"]},"woman-fairy":{"a":"Woman Fairy","b":"1F9DA-200D-2640-FE0F","j":["Titania","female","woman"]},"vampire":{"a":"Vampire","b":"1F9DB","j":["undead","blood","twilight","Dracula"]},"man-vampire":{"a":"Man Vampire","b":"1F9DB-200D-2642-FE0F","j":["male","Dracula","man","dracula","undead"]},"woman-vampire":{"a":"Woman Vampire","b":"1F9DB-200D-2640-FE0F","j":["woman","female","undead"]},"merperson":{"a":"Merperson","b":"1F9DC","j":["mermaid","sea","merman","merwoman"]},"merman":{"a":"Merman","b":"1F9DC-200D-2642-FE0F","j":["man","male","Triton","triton"]},"mermaid":{"a":"Mermaid","b":"1F9DC-200D-2640-FE0F","j":["woman","female","merwoman","ariel"]},"elf":{"a":"Elf","b":"1F9DD","j":["LOTR style","magical"]},"man-elf":{"a":"Man Elf","b":"1F9DD-200D-2642-FE0F","j":["man","male","magical"]},"woman-elf":{"a":"Woman Elf","b":"1F9DD-200D-2640-FE0F","j":["woman","female","magical"]},"genie":{"a":"Genie","b":"1F9DE","j":["(non-human color)","djinn","wishes","magical"]},"man-genie":{"a":"Man Genie","b":"1F9DE-200D-2642-FE0F","j":["man","male","djinn"]},"woman-genie":{"a":"Woman Genie","b":"1F9DE-200D-2640-FE0F","j":["woman","female","djinn"]},"zombie":{"a":"Zombie","b":"1F9DF","j":["(non-human color)","undead","walking dead","dead"]},"man-zombie":{"a":"Man Zombie","b":"1F9DF-200D-2642-FE0F","j":["walking dead","male","man","dracula","undead"]},"woman-zombie":{"a":"Woman Zombie","b":"1F9DF-200D-2640-FE0F","j":["woman","female","walking dead","undead"]},"person-getting-massage":{"a":"Person Getting Massage","b":"1F486","j":["relax","massage","face","salon"]},"man-getting-massage":{"a":"Man Getting Massage","b":"1F486-200D-2642-FE0F","j":["massage","male","man","head","boy","face"]},"woman-getting-massage":{"a":"Woman Getting Massage","b":"1F486-200D-2640-FE0F","j":["massage","woman","female","head","girl","face"]},"person-getting-haircut":{"a":"Person Getting Haircut","b":"1F487","j":["parlor","haircut","beauty","barber","hairstyle"]},"man-getting-haircut":{"a":"Man Getting Haircut","b":"1F487-200D-2642-FE0F","j":["man","boy","haircut","male"]},"woman-getting-haircut":{"a":"Woman Getting Haircut","b":"1F487-200D-2640-FE0F","j":["woman","female","haircut","girl"]},"person-walking":{"a":"Person Walking","b":"1F6B6","j":["walk","move","walking","hike"]},"man-walking":{"a":"Man Walking","b":"1F6B6-200D-2642-FE0F","j":["feet","walk","man","hike","human","steps"]},"woman-walking":{"a":"Woman Walking","b":"1F6B6-200D-2640-FE0F","j":["feet","walk","woman","hike","female","human","steps"]},"person-standing":{"a":"Person Standing","b":"1F9CD","j":["standing","stand","still"]},"man-standing":{"a":"Man Standing","b":"1F9CD-200D-2642-FE0F","j":["man","standing","still"]},"woman-standing":{"a":"Woman Standing","b":"1F9CD-200D-2640-FE0F","j":["standing","woman","still"]},"person-kneeling":{"a":"Person Kneeling","b":"1F9CE","j":["kneel","kneeling","pray","respectful"]},"man-kneeling":{"a":"Man Kneeling","b":"1F9CE-200D-2642-FE0F","j":["man","kneeling","pray","respectful"]},"woman-kneeling":{"a":"Woman Kneeling","b":"1F9CE-200D-2640-FE0F","j":["woman","pray","kneeling","respectful"]},"person-with-white-cane":{"a":"Person with White Cane","b":"1F9D1-200D-1F9AF","j":["accessibility","blind","person_with_probing_cane"]},"man-with-white-cane":{"a":"Man with White Cane","b":"1F468-200D-1F9AF","j":["man","accessibility","blind","man_with_probing_cane"]},"woman-with-white-cane":{"a":"Woman with White Cane","b":"1F469-200D-1F9AF","j":["woman","blind","woman_with_probing_cane","accessibility"]},"person-in-motorized-wheelchair":{"a":"Person in Motorized Wheelchair","b":"1F9D1-200D-1F9BC","j":["accessibility","disability","wheelchair"]},"man-in-motorized-wheelchair":{"a":"Man in Motorized Wheelchair","b":"1F468-200D-1F9BC","j":["man","accessibility","disability","wheelchair"]},"woman-in-motorized-wheelchair":{"a":"Woman in Motorized Wheelchair","b":"1F469-200D-1F9BC","j":["wheelchair","woman","disability","accessibility"]},"person-in-manual-wheelchair":{"a":"Person in Manual Wheelchair","b":"1F9D1-200D-1F9BD","j":["accessibility","disability","wheelchair"]},"man-in-manual-wheelchair":{"a":"Man in Manual Wheelchair","b":"1F468-200D-1F9BD","j":["man","accessibility","disability","wheelchair"]},"woman-in-manual-wheelchair":{"a":"Woman in Manual Wheelchair","b":"1F469-200D-1F9BD","j":["wheelchair","woman","disability","accessibility"]},"person-running":{"a":"Person Running","b":"1F3C3","j":["running","move","marathon"]},"man-running":{"a":"Man Running","b":"1F3C3-200D-2642-FE0F","j":["exercise","running","man","racing","race","marathon","walking"]},"woman-running":{"a":"Woman Running","b":"1F3C3-200D-2640-FE0F","j":["exercise","running","woman","racing","race","marathon","female","walking"]},"woman-dancing":{"a":"Woman Dancing","b":"1F483","j":["dance","woman","female","dancing","girl","fun"]},"man-dancing":{"a":"Man Dancing","b":"1F57A","j":["dancer","male","dance","man","dancing","boy","fun"]},"person-in-suit-levitating":{"a":"Person in Suit Levitating","b":"1F574","j":["business","jump","hover","levitate","suit","man_in_suit_levitating","person"]},"people-with-bunny-ears":{"a":"People with Bunny Ears","b":"1F46F","j":["dancer","partying","bunny ear","costume","perform"]},"men-with-bunny-ears":{"a":"Men with Bunny Ears","b":"1F46F-200D-2642-FE0F","j":["dancer","male","bunny","men","boys","partying","bunny ear"]},"women-with-bunny-ears":{"a":"Women with Bunny Ears","b":"1F46F-200D-2640-FE0F","j":["dancer","bunny","partying","female","bunny ear","women","girls"]},"person-in-steamy-room":{"a":"Person in Steamy Room","b":"1F9D6","j":["relax","sauna","spa","steambath","hamam","steam room"]},"man-in-steamy-room":{"a":"Man in Steamy Room","b":"1F9D6-200D-2642-FE0F","j":["sauna","male","spa","man","steamroom","steam room"]},"woman-in-steamy-room":{"a":"Woman in Steamy Room","b":"1F9D6-200D-2640-FE0F","j":["sauna","spa","woman","steamroom","female","steam room"]},"person-climbing":{"a":"Person Climbing","b":"1F9D7","j":["sport","climber"]},"man-climbing":{"a":"Man Climbing","b":"1F9D7-200D-2642-FE0F","j":["male","sports","man","rock","hobby","climber"]},"woman-climbing":{"a":"Woman Climbing","b":"1F9D7-200D-2640-FE0F","j":["sports","woman","rock","hobby","female","climber"]},"person-fencing":{"a":"Person Fencing","b":"1F93A","j":["sword","fencing","sports","fencer"]},"horse-racing":{"a":"Horse Racing","b":"1F3C7","j":["racehorse","racing","animal","competition","horse","luck","betting","gambling","jockey"]},"skier":{"a":"Skier","b":"26F7","j":["ski","winter","sports","snow"]},"snowboarder":{"a":"Snowboarder","b":"1F3C2","j":["sports","snow","winter","snowboard","ski"]},"person-golfing":{"a":"Person Golfing","b":"1F3CC","j":["business","golf","sports","ball"]},"man-golfing":{"a":"Man Golfing","b":"1F3CC-FE0F-200D-2642-FE0F","j":["golf","sport","man"]},"woman-golfing":{"a":"Woman Golfing","b":"1F3CC-FE0F-200D-2640-FE0F","j":["business","sports","golf","woman","female"]},"person-surfing":{"a":"Person Surfing","b":"1F3C4","j":["sport","sea","surfing"]},"man-surfing":{"a":"Man Surfing","b":"1F3C4-200D-2642-FE0F","j":["sports","man","sea","ocean","surfing","beach","summer"]},"woman-surfing":{"a":"Woman Surfing","b":"1F3C4-200D-2640-FE0F","j":["sports","woman","ocean","sea","female","surfing","beach","summer"]},"person-rowing-boat":{"a":"Person Rowing Boat","b":"1F6A3","j":["sport","rowboat","boat","move"]},"man-rowing-boat":{"a":"Man Rowing Boat","b":"1F6A3-200D-2642-FE0F","j":["rowboat","boat","sports","man","ship","water","hobby"]},"woman-rowing-boat":{"a":"Woman Rowing Boat","b":"1F6A3-200D-2640-FE0F","j":["rowboat","boat","sports","woman","water","ship","hobby","female"]},"person-swimming":{"a":"Person Swimming","b":"1F3CA","j":["swim","sport","pool"]},"man-swimming":{"a":"Man Swimming","b":"1F3CA-200D-2642-FE0F","j":["swim","exercise","athlete","sports","man","water","summer","human"]},"woman-swimming":{"a":"Woman Swimming","b":"1F3CA-200D-2640-FE0F","j":["swim","exercise","athlete","sports","woman","water","female","summer","human"]},"person-bouncing-ball":{"a":"Person Bouncing Ball","b":"26F9","j":["human","sports","ball"]},"man-bouncing-ball":{"a":"Man Bouncing Ball","b":"26F9-FE0F-200D-2642-FE0F","j":["man","sport","ball"]},"woman-bouncing-ball":{"a":"Woman Bouncing Ball","b":"26F9-FE0F-200D-2640-FE0F","j":["sports","woman","female","ball","human"]},"person-lifting-weights":{"a":"Person Lifting Weights","b":"1F3CB","j":["exercise","sports","lifter","training","weight"]},"man-lifting-weights":{"a":"Man Lifting Weights","b":"1F3CB-FE0F-200D-2642-FE0F","j":["man","sport","weight lifter"]},"woman-lifting-weights":{"a":"Woman Lifting Weights","b":"1F3CB-FE0F-200D-2640-FE0F","j":["exercise","sports","woman","female","training","weight lifter"]},"person-biking":{"a":"Person Biking","b":"1F6B4","j":["cyclist","sport","move","biking","bicycle"]},"man-biking":{"a":"Man Biking","b":"1F6B4-200D-2642-FE0F","j":["exercise","sports","cyclist","man","bike","bicycle","biking","hipster"]},"woman-biking":{"a":"Woman Biking","b":"1F6B4-200D-2640-FE0F","j":["exercise","sports","cyclist","woman","bike","bicycle","biking","hipster","female"]},"person-mountain-biking":{"a":"Person Mountain Biking","b":"1F6B5","j":["cyclist","sport","bike","move","bicycle","mountain","bicyclist"]},"man-mountain-biking":{"a":"Man Mountain Biking","b":"1F6B5-200D-2642-FE0F","j":["transportation","cyclist","man","bike","sports","race","bicycle","mountain","human"]},"woman-mountain-biking":{"a":"Woman Mountain Biking","b":"1F6B5-200D-2640-FE0F","j":["transportation","cyclist","sports","bike","woman","race","bicycle","biking","female","mountain","human"]},"person-cartwheeling":{"a":"Person Cartwheeling","b":"1F938","j":["cartwheel","gymnastic","gymnastics","sport"]},"man-cartwheeling":{"a":"Man Cartwheeling","b":"1F938-200D-2642-FE0F","j":["cartwheel","gymnastics","man"]},"woman-cartwheeling":{"a":"Woman Cartwheeling","b":"1F938-200D-2640-FE0F","j":["cartwheel","woman","gymnastics"]},"people-wrestling":{"a":"People Wrestling","b":"1F93C","j":["sport","wrestle","wrestler"]},"men-wrestling":{"a":"Men Wrestling","b":"1F93C-200D-2642-FE0F","j":["wrestle","men","sports","wrestlers"]},"women-wrestling":{"a":"Women Wrestling","b":"1F93C-200D-2640-FE0F","j":["wrestle","women","sports","wrestlers"]},"person-playing-water-polo":{"a":"Person Playing Water Polo","b":"1F93D","j":["sport","water","polo"]},"man-playing-water-polo":{"a":"Man Playing Water Polo","b":"1F93D-200D-2642-FE0F","j":["man","water polo","sports","pool"]},"woman-playing-water-polo":{"a":"Woman Playing Water Polo","b":"1F93D-200D-2640-FE0F","j":["woman","water polo","sports","pool"]},"person-playing-handball":{"a":"Person Playing Handball","b":"1F93E","j":["sport","handball","ball"]},"man-playing-handball":{"a":"Man Playing Handball","b":"1F93E-200D-2642-FE0F","j":["man","handball","sports"]},"woman-playing-handball":{"a":"Woman Playing Handball","b":"1F93E-200D-2640-FE0F","j":["woman","handball","sports"]},"person-juggling":{"a":"Person Juggling","b":"1F939","j":["balance","juggle","skill","multitask","performance"]},"man-juggling":{"a":"Man Juggling","b":"1F939-200D-2642-FE0F","j":["balance","man","juggle","juggling","skill","multitask"]},"woman-juggling":{"a":"Woman Juggling","b":"1F939-200D-2640-FE0F","j":["balance","woman","juggle","juggling","skill","multitask"]},"person-in-lotus-position":{"a":"Person in Lotus Position","b":"1F9D8","j":["meditation","yoga","serenity","meditate"]},"man-in-lotus-position":{"a":"Man in Lotus Position","b":"1F9D8-200D-2642-FE0F","j":["meditation","yoga","male","man","mindfulness","serenity","zen"]},"woman-in-lotus-position":{"a":"Woman in Lotus Position","b":"1F9D8-200D-2640-FE0F","j":["meditation","yoga","woman","female","mindfulness","serenity","zen"]},"person-taking-bath":{"a":"Person Taking Bath","b":"1F6C0","j":["bath","bathtub","bathroom","clean","shower"]},"person-in-bed":{"a":"Person in Bed","b":"1F6CC","j":["rest","hotel","bed","sleep"]},"people-holding-hands":{"a":"People Holding Hands","b":"1F9D1-200D-1F91D-200D-1F9D1","j":["friendship","couple","hold","holding hands","hand","person"]},"women-holding-hands":{"a":"Women Holding Hands","b":"1F46D","j":["hand","pair","friendship","couple","love","like","female","holding hands","people","women","human"]},"woman-and-man-holding-hands":{"a":"Woman and Man Holding Hands","b":"1F46B","j":["dating","man","marriage","couple","love","like","valentines","hold","people","hand","human","affection","pair","woman","holding hands","date"]},"men-holding-hands":{"a":"Men Holding Hands","b":"1F46C","j":["Gemini","men","pair","man","twins","friendship","couple","love","like","holding hands","people","human","zodiac","bromance"]},"kiss":{"a":"Kiss","b":"1F48F","j":["pair","marriage","love","couple","like","valentines","dating"]},"kiss-woman-man":{"a":"Kiss: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["man","woman","kiss","love","couple"]},"kiss-man-man":{"a":"Kiss: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["pair","man","marriage","kiss","couple","love","like","valentines","dating"]},"kiss-woman-woman":{"a":"Kiss: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F469","j":["pair","woman","marriage","kiss","couple","love","like","valentines","dating"]},"couple-with-heart":{"a":"Couple with Heart","b":"1F491","j":["pair","marriage","love","couple","like","valentines","dating","human","affection"]},"couple-with-heart-woman-man":{"a":"Couple with Heart: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F468","j":["man","woman","love","couple with heart","couple"]},"couple-with-heart-man-man":{"a":"Couple with Heart: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F468","j":["pair","man","marriage","love","couple","couple with heart","like","valentines","dating","human","affection"]},"couple-with-heart-woman-woman":{"a":"Couple with Heart: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F469","j":["pair","woman","marriage","love","couple","couple with heart","like","valentines","dating","human","affection"]},"family":{"a":"Family","b":"1F46A","j":["mom","mother","dad","father","parents","child","home","people","human"]},"family-man-woman-boy":{"a":"Family: Man, Woman, Boy","b":"1F468-200D-1F469-200D-1F466","j":["man","woman","family","love","boy"]},"family-man-woman-girl":{"a":"Family: Man, Woman, Girl","b":"1F468-200D-1F469-200D-1F467","j":["parents","man","woman","family","child","girl","home","people","human"]},"family-man-woman-girl-boy":{"a":"Family: Man, Woman, Girl, Boy","b":"1F468-200D-1F469-200D-1F467-200D-1F466","j":["children","parents","man","woman","family","girl","home","people","boy","human"]},"family-man-woman-boy-boy":{"a":"Family: Man, Woman, Boy, Boy","b":"1F468-200D-1F469-200D-1F466-200D-1F466","j":["children","parents","man","woman","family","home","people","boy","human"]},"family-man-woman-girl-girl":{"a":"Family: Man, Woman, Girl, Girl","b":"1F468-200D-1F469-200D-1F467-200D-1F467","j":["children","parents","man","woman","family","girl","home","people","human"]},"family-man-man-boy":{"a":"Family: Man, Man, Boy","b":"1F468-200D-1F468-200D-1F466","j":["children","parents","man","family","home","people","boy","human"]},"family-man-man-girl":{"a":"Family: Man, Man, Girl","b":"1F468-200D-1F468-200D-1F467","j":["children","parents","man","family","girl","home","people","human"]},"family-man-man-girl-boy":{"a":"Family: Man, Man, Girl, Boy","b":"1F468-200D-1F468-200D-1F467-200D-1F466","j":["children","parents","man","family","girl","home","people","boy","human"]},"family-man-man-boy-boy":{"a":"Family: Man, Man, Boy, Boy","b":"1F468-200D-1F468-200D-1F466-200D-1F466","j":["children","parents","man","family","home","people","boy","human"]},"family-man-man-girl-girl":{"a":"Family: Man, Man, Girl, Girl","b":"1F468-200D-1F468-200D-1F467-200D-1F467","j":["children","parents","man","family","girl","home","people","human"]},"family-woman-woman-boy":{"a":"Family: Woman, Woman, Boy","b":"1F469-200D-1F469-200D-1F466","j":["children","parents","woman","family","home","people","boy","human"]},"family-woman-woman-girl":{"a":"Family: Woman, Woman, Girl","b":"1F469-200D-1F469-200D-1F467","j":["children","parents","woman","family","girl","home","people","human"]},"family-woman-woman-girl-boy":{"a":"Family: Woman, Woman, Girl, Boy","b":"1F469-200D-1F469-200D-1F467-200D-1F466","j":["children","parents","woman","family","girl","home","people","boy","human"]},"family-woman-woman-boy-boy":{"a":"Family: Woman, Woman, Boy, Boy","b":"1F469-200D-1F469-200D-1F466-200D-1F466","j":["children","parents","woman","family","home","people","boy","human"]},"family-woman-woman-girl-girl":{"a":"Family: Woman, Woman, Girl, Girl","b":"1F469-200D-1F469-200D-1F467-200D-1F467","j":["children","parents","woman","family","girl","home","people","human"]},"family-man-boy":{"a":"Family: Man, Boy","b":"1F468-200D-1F466","j":["man","parent","family","child","home","people","boy","human"]},"family-man-boy-boy":{"a":"Family: Man, Boy, Boy","b":"1F468-200D-1F466-200D-1F466","j":["children","man","parent","family","home","people","boy","human"]},"family-man-girl":{"a":"Family: Man, Girl","b":"1F468-200D-1F467","j":["man","parent","family","child","girl","home","people","human"]},"family-man-girl-boy":{"a":"Family: Man, Girl, Boy","b":"1F468-200D-1F467-200D-1F466","j":["children","man","parent","family","girl","home","people","boy","human"]},"family-man-girl-girl":{"a":"Family: Man, Girl, Girl","b":"1F468-200D-1F467-200D-1F467","j":["children","man","parent","family","girl","home","people","human"]},"family-woman-boy":{"a":"Family: Woman, Boy","b":"1F469-200D-1F466","j":["woman","family","parent","child","home","people","boy","human"]},"family-woman-boy-boy":{"a":"Family: Woman, Boy, Boy","b":"1F469-200D-1F466-200D-1F466","j":["children","woman","family","parent","home","people","boy","human"]},"family-woman-girl":{"a":"Family: Woman, Girl","b":"1F469-200D-1F467","j":["woman","family","parent","child","girl","home","people","human"]},"family-woman-girl-boy":{"a":"Family: Woman, Girl, Boy","b":"1F469-200D-1F467-200D-1F466","j":["children","woman","family","parent","girl","home","people","boy","human"]},"family-woman-girl-girl":{"a":"Family: Woman, Girl, Girl","b":"1F469-200D-1F467-200D-1F467","j":["children","woman","family","parent","girl","home","people","human"]},"speaking-head":{"a":"Speaking Head","b":"1F5E3","j":["speak","talk","say","sing","user","face","head","silhouette","speaking","human","person"]},"bust-in-silhouette":{"a":"Bust in Silhouette","b":"1F464","j":["bust","user","silhouette","human","person"]},"busts-in-silhouette":{"a":"Busts in Silhouette","b":"1F465","j":["group","bust","user","team","silhouette","human","person"]},"people-hugging":{"a":"People Hugging","b":"1FAC2","j":["thanks","hug","goodbye","hello","care"]},"footprints":{"a":"Footprints","b":"1F463","j":["clothing","print","tracking","feet","footprint","walking","beach"]},"red-hair":{"a":"Red Hair","b":"1F9B0","j":["ginger","red hair","redhead"]},"curly-hair":{"a":"Curly Hair","b":"1F9B1","j":["afro","curly","curly hair","ringlets"]},"white-hair":{"a":"White Hair","b":"1F9B3","j":["gray","hair","old","white"]},"bald":{"a":"Bald","b":"1F9B2","j":["bald","chemotherapy","hairless","no hair","shaven"]},"monkey-face":{"a":"Monkey Face","b":"1F435","j":["animal","circus","face","nature","monkey"]},"monkey":{"a":"Monkey","b":"1F412","j":["banana","animal","circus","nature"]},"gorilla":{"a":"Gorilla","b":"1F98D","j":["animal","circus","nature"]},"orangutan":{"a":"Orangutan","b":"1F9A7","j":["ape","animal"]},"dog-face":{"a":"Dog Face","b":"1F436","j":["animal","dog","pet","friend","nature","puppy","faithful","face","woof"]},"dog":{"a":"Dog","b":"1F415","j":["animal","pet","friend","nature","doge","faithful"]},"guide-dog":{"a":"Guide Dog","b":"1F9AE","j":["accessibility","animal","blind","guide"]},"service-dog":{"a":"Service Dog","b":"1F415-200D-1F9BA","j":["blind","animal","assistance","dog","accessibility","service"]},"poodle":{"a":"Poodle","b":"1F429","j":["animal","dog","pet","nature","101"]},"wolf":{"a":"Wolf","b":"1F43A","j":["animal","face","wild","nature"]},"fox":{"a":"Fox","b":"1F98A","j":["animal","face","nature"]},"raccoon":{"a":"Raccoon","b":"1F99D","j":["curious","animal","sly","nature"]},"cat-face":{"a":"Cat Face","b":"1F431","j":["meow","animal","pet","nature","kitten","cat","face"]},"cat":{"a":"Cat","b":"1F408","j":["animal","pet","cats","meow"]},"black-cat":{"a":"Black Cat","b":"1F408-200D-2B1B","j":["black","unlucky","luck","cat","superstition"]},"lion":{"a":"Lion","b":"1F981","j":["animal","Leo","nature","face","zodiac"]},"tiger-face":{"a":"Tiger Face","b":"1F42F","j":["tiger","animal","roar","wild","nature","danger","cat","face"]},"tiger":{"a":"Tiger","b":"1F405","j":["roar","animal","nature"]},"leopard":{"a":"Leopard","b":"1F406","j":["animal","nature"]},"horse-face":{"a":"Horse Face","b":"1F434","j":["brown","animal","horse","nature","face"]},"horse":{"a":"Horse","b":"1F40E","j":["racehorse","equestrian","animal","racing","luck","gamble"]},"unicorn":{"a":"Unicorn","b":"1F984","j":["nature","animal","mystical","face"]},"zebra":{"a":"Zebra","b":"1F993","j":["safari","stripes","animal","stripe","nature"]},"deer":{"a":"Deer","b":"1F98C","j":["venison","animal","horns","nature"]},"bison":{"a":"Bison","b":"1F9AC","j":["ox","herd","buffalo","wisent"]},"cow-face":{"a":"Cow Face","b":"1F42E","j":["nature","ox","cow","animal","beef","milk","moo","face"]},"ox":{"a":"Ox","b":"1F402","j":["Taurus","animal","cow","beef","bull","zodiac"]},"water-buffalo":{"a":"Water Buffalo","b":"1F403","j":["ox","water","animal","cow","buffalo","nature"]},"cow":{"a":"Cow","b":"1F404","j":["ox","animal","moo","beef","milk","nature"]},"pig-face":{"a":"Pig Face","b":"1F437","j":["pig","animal","nature","face","oink"]},"pig":{"a":"Pig","b":"1F416","j":["animal","sow","nature"]},"boar":{"a":"Boar","b":"1F417","j":["pig","animal","nature"]},"pig-nose":{"a":"Pig Nose","b":"1F43D","j":["pig","animal","nose","face","oink"]},"ram":{"a":"Ram","b":"1F40F","j":["Aries","sheep","male","animal","nature","zodiac"]},"ewe":{"a":"Ewe","b":"1F411","j":["sheep","shipit","animal","wool","female","nature"]},"goat":{"a":"Goat","b":"1F410","j":["Capricorn","animal","zodiac","nature"]},"camel":{"a":"Camel","b":"1F42A","j":["dromedary","hot","animal","desert","hump"]},"twohump-camel":{"a":"Two-Hump Camel","b":"1F42B","j":["camel","two_hump_camel","hot","animal","two-hump camel","desert","nature","bactrian","hump"]},"llama":{"a":"Llama","b":"1F999","j":["alpaca","nature","animal","wool","vicuña","guanaco"]},"giraffe":{"a":"Giraffe","b":"1F992","j":["nature","spots","animal","safari"]},"elephant":{"a":"Elephant","b":"1F418","j":["animal","nature","th","nose","circus"]},"mammoth":{"a":"Mammoth","b":"1F9A3","j":["tusk","extinction","large","woolly","elephant","tusks"]},"rhinoceros":{"a":"Rhinoceros","b":"1F98F","j":["nature","animal","horn"]},"hippopotamus":{"a":"Hippopotamus","b":"1F99B","j":["hippo","animal","nature"]},"mouse-face":{"a":"Mouse Face","b":"1F42D","j":["mouse","animal","cheese_wedge","nature","face","rodent"]},"mouse":{"a":"Mouse","b":"1F401","j":["animal","rodent","nature"]},"rat":{"a":"Rat","b":"1F400","j":["mouse","animal","rodent"]},"hamster":{"a":"Hamster","b":"1F439","j":["pet","animal","face","nature"]},"rabbit-face":{"a":"Rabbit Face","b":"1F430","j":["bunny","animal","spring","magic","pet","rabbit","nature","face"]},"rabbit":{"a":"Rabbit","b":"1F407","j":["bunny","animal","spring","magic","pet","nature"]},"chipmunk":{"a":"Chipmunk","b":"1F43F","j":["animal","squirrel","rodent","nature"]},"beaver":{"a":"Beaver","b":"1F9AB","j":["animal","dam","rodent"]},"hedgehog":{"a":"Hedgehog","b":"1F994","j":["animal","spiny","nature"]},"bat":{"a":"Bat","b":"1F987","j":["blind","vampire","animal","nature"]},"bear":{"a":"Bear","b":"1F43B","j":["animal","face","wild","nature"]},"polar-bear":{"a":"Polar Bear","b":"1F43B-200D-2744-FE0F","j":["bear","animal","white","arctic"]},"koala":{"a":"Koala","b":"1F428","j":["bear","animal","nature"]},"panda":{"a":"Panda","b":"1F43C","j":["animal","face","nature"]},"sloth":{"a":"Sloth","b":"1F9A5","j":["slow","lazy","animal"]},"otter":{"a":"Otter","b":"1F9A6","j":["fishing","animal","playful"]},"skunk":{"a":"Skunk","b":"1F9A8","j":["stink","animal"]},"kangaroo":{"a":"Kangaroo","b":"1F998","j":["jump","hop","australia","marsupial","animal","Australia","nature","joey"]},"badger":{"a":"Badger","b":"1F9A1","j":["animal","pester","nature","honey","honey badger"]},"paw-prints":{"a":"Paw Prints","b":"1F43E","j":["print","tracking","feet","cat","animal","paw","dog","pet","footprints"]},"turkey":{"a":"Turkey","b":"1F983","j":["animal","bird"]},"chicken":{"a":"Chicken","b":"1F414","j":["animal","cluck","bird","nature"]},"rooster":{"a":"Rooster","b":"1F413","j":["nature","animal","chicken","bird"]},"hatching-chick":{"a":"Hatching Chick","b":"1F423","j":["animal","chick","egg","born","baby","bird","hatching","chicken"]},"baby-chick":{"a":"Baby Chick","b":"1F424","j":["animal","chick","baby","bird","chicken"]},"frontfacing-baby-chick":{"a":"Front-Facing Baby Chick","b":"1F425","j":["chicken","animal","front_facing_baby_chick","chick","front-facing baby chick","baby","bird"]},"bird":{"a":"Bird","b":"1F426","j":["fly","animal","spring","tweet","nature"]},"penguin":{"a":"Penguin","b":"1F427","j":["nature","animal","bird"]},"dove":{"a":"Dove","b":"1F54A","j":["animal","fly","peace","bird"]},"eagle":{"a":"Eagle","b":"1F985","j":["nature","animal","bird"]},"duck":{"a":"Duck","b":"1F986","j":["nature","animal","mallard","bird"]},"swan":{"a":"Swan","b":"1F9A2","j":["nature","animal","ugly duckling","cygnet","bird"]},"owl":{"a":"Owl","b":"1F989","j":["wise","nature","animal","bird","hoot"]},"dodo":{"a":"Dodo","b":"1F9A4","j":["extinction","Mauritius","animal","large","bird"]},"feather":{"a":"Feather","b":"1FAB6","j":["fly","flight","plumage","light","bird"]},"flamingo":{"a":"Flamingo","b":"1F9A9","j":["animal","flamboyant","tropical"]},"peacock":{"a":"Peacock","b":"1F99A","j":["ostentatious","animal","peahen","proud","nature","bird"]},"parrot":{"a":"Parrot","b":"1F99C","j":["nature","animal","bird","talk","pirate"]},"frog":{"a":"Frog","b":"1F438","j":["animal","toad","croak","nature","face"]},"crocodile":{"a":"Crocodile","b":"1F40A","j":["alligator","animal","nature","reptile","lizard"]},"turtle":{"a":"Turtle","b":"1F422","j":["slow","animal","tortoise","terrapin","nature"]},"lizard":{"a":"Lizard","b":"1F98E","j":["reptile","animal","nature"]},"snake":{"a":"Snake","b":"1F40D","j":["python","animal","bearer","Ophiuchus","hiss","nature","serpent","evil","zodiac"]},"dragon-face":{"a":"Dragon Face","b":"1F432","j":["dragon","fairy tale","myth","animal","green","chinese","nature","face"]},"dragon":{"a":"Dragon","b":"1F409","j":["fairy tale","myth","animal","green","chinese","nature"]},"sauropod":{"a":"Sauropod","b":"1F995","j":["dinosaur","brontosaurus","animal","brachiosaurus","diplodocus","nature","extinct"]},"trex":{"a":"T-Rex","b":"1F996","j":["dinosaur","t_rex","animal","Tyrannosaurus Rex","tyrannosaurus","nature","extinct"]},"spouting-whale":{"a":"Spouting Whale","b":"1F433","j":["nature","sea","ocean","animal","spouting","whale","face"]},"whale":{"a":"Whale","b":"1F40B","j":["sea","ocean","animal","nature"]},"dolphin":{"a":"Dolphin","b":"1F42C","j":["fish","sea","ocean","animal","flipper","fins","beach","nature"]},"seal":{"a":"Seal","b":"1F9AD","j":["sea","animal","sea lion","creature"]},"fish":{"a":"Fish","b":"1F41F","j":["Pisces","food","animal","nature","zodiac"]},"tropical-fish":{"a":"Tropical Fish","b":"1F420","j":["swim","fish","nemo","ocean","animal","beach","tropical"]},"blowfish":{"a":"Blowfish","b":"1F421","j":["fish","food","sea","ocean","animal","nature"]},"shark":{"a":"Shark","b":"1F988","j":["fish","sea","ocean","animal","fins","beach","nature","jaws"]},"octopus":{"a":"Octopus","b":"1F419","j":["sea","ocean","animal","beach","nature","creature"]},"spiral-shell":{"a":"Spiral Shell","b":"1F41A","j":["sea","beach","nature","spiral","shell"]},"snail":{"a":"Snail","b":"1F40C","j":["slow","animal","shell"]},"butterfly":{"a":"Butterfly","b":"1F98B","j":["pretty","animal","caterpillar","nature","insect"]},"bug":{"a":"Bug","b":"1F41B","j":["nature","animal","worm","insect"]},"ant":{"a":"Ant","b":"1F41C","j":["nature","bug","animal","insect"]},"honeybee":{"a":"Honeybee","b":"1F41D","j":["bee","animal","spring","nature","honey","bug","insect"]},"beetle":{"a":"Beetle","b":"1FAB2","j":["bug","insect"]},"lady-beetle":{"a":"Lady Beetle","b":"1F41E","j":["ladybird","beetle","animal","ladybug","nature","insect"]},"cricket":{"a":"Cricket","b":"1F997","j":["chirp","animal","grasshopper","Orthoptera"]},"cockroach":{"a":"Cockroach","b":"1FAB3","j":["pest","roach","pests","insect"]},"spider":{"a":"Spider","b":"1F577","j":["arachnid","animal","insect"]},"spider-web":{"a":"Spider Web","b":"1F578","j":["spider","web","animal","arachnid","silk","insect"]},"scorpion":{"a":"Scorpion","b":"1F982","j":["Scorpio","animal","scorpio","arachnid","zodiac"]},"mosquito":{"a":"Mosquito","b":"1F99F","j":["virus","animal","fever","disease","malaria","nature","pest","insect"]},"fly":{"a":"Fly","b":"1FAB0","j":["maggot","disease","pest","rotting","insect"]},"worm":{"a":"Worm","b":"1FAB1","j":["annelid","earthworm","animal","parasite"]},"microbe":{"a":"Microbe","b":"1F9A0","j":["amoeba","virus","bacteria","germs"]},"bouquet":{"a":"Bouquet","b":"1F490","j":["flowers","spring","flower","nature"]},"cherry-blossom":{"a":"Cherry Blossom","b":"1F338","j":["blossom","spring","flower","nature","plant","cherry"]},"white-flower":{"a":"White Flower","b":"1F4AE","j":["japanese","spring","flower"]},"rosette":{"a":"Rosette","b":"1F3F5","j":["plant","military","flower","decoration"]},"rose":{"a":"Rose","b":"1F339","j":["flowers","spring","love","valentines","flower"]},"wilted-flower":{"a":"Wilted Flower","b":"1F940","j":["plant","wilted","flower","nature"]},"hibiscus":{"a":"Hibiscus","b":"1F33A","j":["flowers","vegetable","beach","flower","plant"]},"sunflower":{"a":"Sunflower","b":"1F33B","j":["sun","flower","nature","plant","fall"]},"blossom":{"a":"Blossom","b":"1F33C","j":["flowers","yellow","flower","nature"]},"tulip":{"a":"Tulip","b":"1F337","j":["flowers","spring","flower","nature","summer","plant"]},"seedling":{"a":"Seedling","b":"1F331","j":["lawn","spring","young","nature","plant","grass"]},"potted-plant":{"a":"Potted Plant","b":"1FAB4","j":["useless","boring","greenery","house","nurturing","plant","grow"]},"evergreen-tree":{"a":"Evergreen Tree","b":"1F332","j":["plant","tree","nature"]},"deciduous-tree":{"a":"Deciduous Tree","b":"1F333","j":["deciduous","shedding","tree","nature","plant"]},"palm-tree":{"a":"Palm Tree","b":"1F334","j":["mojito","vegetable","palm","beach","tree","nature","summer","plant","tropical"]},"cactus":{"a":"Cactus","b":"1F335","j":["plant","vegetable","nature"]},"sheaf-of-rice":{"a":"Sheaf of Rice","b":"1F33E","j":["rice","grain","nature","ear","plant"]},"herb":{"a":"Herb","b":"1F33F","j":["lawn","vegetable","medicine","leaf","plant","weed","grass"]},"shamrock":{"a":"Shamrock","b":"2618","j":["irish","vegetable","clover","nature","plant"]},"four-leaf-clover":{"a":"Four Leaf Clover","b":"1F340","j":["lucky","irish","four","vegetable","clover","four-leaf clover","leaf","4","nature","plant"]},"maple-leaf":{"a":"Maple Leaf","b":"1F341","j":["ca","vegetable","leaf","falling","nature","plant","maple","fall"]},"fallen-leaf":{"a":"Fallen Leaf","b":"1F342","j":["vegetable","leaf","leaves","falling","nature","plant"]},"leaf-fluttering-in-wind":{"a":"Leaf Fluttering in Wind","b":"1F343","j":["grass","lawn","vegetable","leaf","spring","flutter","wind","tree","nature","plant","blow"]},"grapes":{"a":"Grapes","b":"1F347","j":["wine","food","grape","fruit"]},"melon":{"a":"Melon","b":"1F348","j":["food","fruit","nature"]},"watermelon":{"a":"Watermelon","b":"1F349","j":["summer","food","picnic","fruit"]},"tangerine":{"a":"Tangerine","b":"1F34A","j":["food","orange","fruit","nature"]},"lemon":{"a":"Lemon","b":"1F34B","j":["fruit","citrus","nature"]},"banana":{"a":"Banana","b":"1F34C","j":["food","monkey","fruit"]},"pineapple":{"a":"Pineapple","b":"1F34D","j":["food","fruit","nature"]},"mango":{"a":"Mango","b":"1F96D","j":["food","fruit","tropical"]},"red-apple":{"a":"Red Apple","b":"1F34E","j":["red","fruit","school","mac","apple"]},"green-apple":{"a":"Green Apple","b":"1F34F","j":["green","fruit","apple","nature"]},"pear":{"a":"Pear","b":"1F350","j":["food","fruit","nature"]},"peach":{"a":"Peach","b":"1F351","j":["food","fruit","nature"]},"cherries":{"a":"Cherries","b":"1F352","j":["food","red","fruit","berries","cherry"]},"strawberry":{"a":"Strawberry","b":"1F353","j":["food","nature","berry","fruit"]},"blueberries":{"a":"Blueberries","b":"1FAD0","j":["fruit","berry","blue","bilberry","blueberry"]},"kiwi-fruit":{"a":"Kiwi Fruit","b":"1F95D","j":["food","kiwi","fruit"]},"tomato":{"a":"Tomato","b":"1F345","j":["food","fruit","vegetable","nature"]},"olive":{"a":"Olive","b":"1FAD2","j":["food","fruit"]},"coconut":{"a":"Coconut","b":"1F965","j":["food","fruit","palm","nature","piña colada"]},"avocado":{"a":"Avocado","b":"1F951","j":["food","fruit"]},"eggplant":{"a":"Eggplant","b":"1F346","j":["food","aubergine","vegetable","nature"]},"potato":{"a":"Potato","b":"1F954","j":["food","tuber","vegetable","vegatable","starch"]},"carrot":{"a":"Carrot","b":"1F955","j":["food","vegetable","orange"]},"ear-of-corn":{"a":"Ear of Corn","b":"1F33D","j":["food","vegetable","corn","maize","maze","ear","plant"]},"hot-pepper":{"a":"Hot Pepper","b":"1F336","j":["food","hot","spicy","chili","pepper","chilli"]},"bell-pepper":{"a":"Bell Pepper","b":"1FAD1","j":["fruit","vegetable","capsicum","pepper","plant"]},"cucumber":{"a":"Cucumber","b":"1F952","j":["food","pickle","vegetable","fruit"]},"leafy-green":{"a":"Leafy Green","b":"1F96C","j":["food","vegetable","cabbage","kale","plant","lettuce","bok choy"]},"broccoli":{"a":"Broccoli","b":"1F966","j":["food","wild cabbage","fruit","vegetable"]},"garlic":{"a":"Garlic","b":"1F9C4","j":["cook","food","spice","flavoring"]},"onion":{"a":"Onion","b":"1F9C5","j":["cook","food","spice","flavoring"]},"mushroom":{"a":"Mushroom","b":"1F344","j":["toadstool","plant","vegetable"]},"peanuts":{"a":"Peanuts","b":"1F95C","j":["nut","food","peanut","vegetable"]},"chestnut":{"a":"Chestnut","b":"1F330","j":["plant","squirrel","food"]},"bread":{"a":"Bread","b":"1F35E","j":["food","wheat","loaf","breakfast","toast"]},"croissant":{"a":"Croissant","b":"1F950","j":["food","bread","breakfast","french","roll"]},"baguette-bread":{"a":"Baguette Bread","b":"1F956","j":["food","bread","french","baguette"]},"flatbread":{"a":"Flatbread","b":"1FAD3","j":["food","pita","naan","arepa","lavash","flour"]},"pretzel":{"a":"Pretzel","b":"1F968","j":["twisted","food","bread","convoluted"]},"bagel":{"a":"Bagel","b":"1F96F","j":["food","bread","breakfast","schmear","bakery"]},"pancakes":{"a":"Pancakes","b":"1F95E","j":["flapjacks","food","pancake","hotcakes","breakfast","crêpe","hotcake"]},"waffle":{"a":"Waffle","b":"1F9C7","j":["food","breakfast","indecisive","iron"]},"cheese-wedge":{"a":"Cheese Wedge","b":"1F9C0","j":["food","chadder","cheese"]},"meat-on-bone":{"a":"Meat on Bone","b":"1F356","j":["food","drumstick","bone","good","meat"]},"poultry-leg":{"a":"Poultry Leg","b":"1F357","j":["food","turkey","drumstick","bone","leg","poultry","bird","meat","chicken"]},"cut-of-meat":{"a":"Cut of Meat","b":"1F969","j":["food","porkchop","chop","cow","cut","lambchop","steak","meat"]},"bacon":{"a":"Bacon","b":"1F953","j":["pig","food","pork","breakfast","meat"]},"hamburger":{"a":"Hamburger","b":"1F354","j":["burger","cheeseburger","beef","fast food","burger king","meat","mcdonalds"]},"french-fries":{"a":"French Fries","b":"1F35F","j":["fries","fast food","french","chips","snack"]},"pizza":{"a":"Pizza","b":"1F355","j":["food","cheese","party","slice"]},"hot-dog":{"a":"Hot Dog","b":"1F32D","j":["hotdog","food","sausage","frankfurter"]},"sandwich":{"a":"Sandwich","b":"1F96A","j":["lunch","bread","food"]},"taco":{"a":"Taco","b":"1F32E","j":["mexican","food"]},"burrito":{"a":"Burrito","b":"1F32F","j":["wrap","mexican","food"]},"tamale":{"a":"Tamale","b":"1FAD4","j":["mexican","food","wrapped","masa"]},"stuffed-flatbread":{"a":"Stuffed Flatbread","b":"1F959","j":["food","kebab","stuffed","gyro","falafel","flatbread"]},"falafel":{"a":"Falafel","b":"1F9C6","j":["chickpea","food","meatball"]},"egg":{"a":"Egg","b":"1F95A","j":["food","chicken","breakfast"]},"cooking":{"a":"Cooking","b":"1F373","j":["food","frying","kitchen","breakfast","egg","pan"]},"shallow-pan-of-food":{"a":"Shallow Pan of Food","b":"1F958","j":["food","casserole","cooking","paella","pan","shallow"]},"pot-of-food":{"a":"Pot of Food","b":"1F372","j":["food","stew","pot","soup","meat"]},"fondue":{"a":"Fondue","b":"1FAD5","j":["food","pot","chocolate","melted","Swiss","cheese"]},"bowl-with-spoon":{"a":"Bowl with Spoon","b":"1F963","j":["food","congee","porridge","breakfast","cereal","oatmeal"]},"green-salad":{"a":"Green Salad","b":"1F957","j":["food","healthy","green","lettuce","salad"]},"popcorn":{"a":"Popcorn","b":"1F37F","j":["movie theater","food","films","snack"]},"butter":{"a":"Butter","b":"1F9C8","j":["cook","food","dairy"]},"salt":{"a":"Salt","b":"1F9C2","j":["shaker","condiment"]},"canned-food":{"a":"Canned Food","b":"1F96B","j":["soup","food","can"]},"bento-box":{"a":"Bento Box","b":"1F371","j":["bento","food","japanese","box"]},"rice-cracker":{"a":"Rice Cracker","b":"1F358","j":["rice","japanese","food","cracker"]},"rice-ball":{"a":"Rice Ball","b":"1F359","j":["food","Japanese","rice","ball","japanese"]},"cooked-rice":{"a":"Cooked Rice","b":"1F35A","j":["food","china","rice","asian","cooked"]},"curry-rice":{"a":"Curry Rice","b":"1F35B","j":["food","hot","spicy","curry","rice","indian"]},"steaming-bowl":{"a":"Steaming Bowl","b":"1F35C","j":["food","noodle","steaming","bowl","chopsticks","japanese","ramen"]},"spaghetti":{"a":"Spaghetti","b":"1F35D","j":["pasta","italian","noodle","food"]},"roasted-sweet-potato":{"a":"Roasted Sweet Potato","b":"1F360","j":["food","potato","roasted","nature","sweet"]},"oden":{"a":"Oden","b":"1F362","j":["food","kebab","seafood","skewer","japanese","stick"]},"sushi":{"a":"Sushi","b":"1F363","j":["rice","fish","food","japanese"]},"fried-shrimp":{"a":"Fried Shrimp","b":"1F364","j":["tempura","food","shrimp","animal","prawn","appetizer","summer","fried"]},"fish-cake-with-swirl":{"a":"Fish Cake with Swirl","b":"1F365","j":["fish","food","pink","kamaboko","sea","pastry","narutomaki","cake","swirl","beach","japan","ramen","surimi"]},"moon-cake":{"a":"Moon Cake","b":"1F96E","j":["yuèbǐng","autumn","food","festival"]},"dango":{"a":"Dango","b":"1F361","j":["food","stick","Japanese","skewer","japanese","dessert","sweet","barbecue","meat"]},"dumpling":{"a":"Dumpling","b":"1F95F","j":["food","empanada","jiaozi","potsticker","gyōza","pierogi"]},"fortune-cookie":{"a":"Fortune Cookie","b":"1F960","j":["food","prophecy"]},"takeout-box":{"a":"Takeout Box","b":"1F961","j":["leftovers","food","oyster pail"]},"crab":{"a":"Crab","b":"1F980","j":["Cancer","animal","crustacean","zodiac"]},"lobster":{"a":"Lobster","b":"1F99E","j":["bisque","animal","seafood","claws","nature"]},"shrimp":{"a":"Shrimp","b":"1F990","j":["food","shellfish","ocean","animal","small","seafood","nature"]},"squid":{"a":"Squid","b":"1F991","j":["food","sea","ocean","animal","nature","molusc"]},"oyster":{"a":"Oyster","b":"1F9AA","j":["diving","food","pearl"]},"soft-ice-cream":{"a":"Soft Ice Cream","b":"1F366","j":["food","soft","icecream","ice","hot","dessert","summer","sweet","cream"]},"shaved-ice":{"a":"Shaved Ice","b":"1F367","j":["ice","shaved","hot","dessert","summer","sweet"]},"ice-cream":{"a":"Ice Cream","b":"1F368","j":["food","ice","hot","dessert","sweet","cream"]},"doughnut":{"a":"Doughnut","b":"1F369","j":["food","breakfast","donut","dessert","sweet","snack"]},"cookie":{"a":"Cookie","b":"1F36A","j":["food","oreo","chocolate","dessert","sweet","snack"]},"birthday-cake":{"a":"Birthday Cake","b":"1F382","j":["food","birthday","celebration","pastry","cake","dessert","sweet"]},"shortcake":{"a":"Shortcake","b":"1F370","j":["food","pastry","cake","dessert","sweet","slice"]},"cupcake":{"a":"Cupcake","b":"1F9C1","j":["bakery","food","sweet","dessert"]},"pie":{"a":"Pie","b":"1F967","j":["food","fruit","pastry","filling","dessert","meat"]},"chocolate-bar":{"a":"Chocolate Bar","b":"1F36B","j":["food","chocolate","bar","dessert","sweet","snack"]},"candy":{"a":"Candy","b":"1F36C","j":["sweet","snack","lolly","dessert"]},"lollipop":{"a":"Lollipop","b":"1F36D","j":["candy","food","dessert","sweet","snack"]},"custard":{"a":"Custard","b":"1F36E","j":["sweet","food","dessert","pudding"]},"honey-pot":{"a":"Honey Pot","b":"1F36F","j":["honeypot","pot","kitchen","bees","honey","sweet"]},"baby-bottle":{"a":"Baby Bottle","b":"1F37C","j":["bottle","food","container","milk","drink","baby"]},"glass-of-milk":{"a":"Glass of Milk","b":"1F95B","j":["cow","milk","beverage","drink","glass"]},"hot-beverage":{"a":"Hot Beverage","b":"2615","j":["latte","tea","steaming","coffee","caffeine","hot","espresso","beverage","drink"]},"teapot":{"a":"Teapot","b":"1FAD6","j":["tea","hot","drink","pot"]},"teacup-without-handle":{"a":"Teacup Without Handle","b":"1F375","j":["tea","teacup","british","breakfast","green","beverage","drink","bowl","cup"]},"sake":{"a":"Sake","b":"1F376","j":["bottle","drunk","wine","booze","beverage","bar","drink","japanese","alcohol","cup"]},"bottle-with-popping-cork":{"a":"Bottle with Popping Cork","b":"1F37E","j":["bottle","wine","celebration","cork","bar","drink","popping"]},"wine-glass":{"a":"Wine Glass","b":"1F377","j":["wine","booze","beverage","bar","drink","drunk","alcohol","glass"]},"cocktail-glass":{"a":"Cocktail Glass","b":"1F378","j":["mojito","booze","beverage","bar","cocktail","drink","drunk","alcohol","glass"]},"tropical-drink":{"a":"Tropical Drink","b":"1F379","j":["mojito","booze","beverage","bar","drink","cocktail","beach","summer","alcohol","tropical"]},"beer-mug":{"a":"Beer Mug","b":"1F37A","j":["relax","beer","booze","beverage","bar","drink","summer","drunk","alcohol","pub","mug","party"]},"clinking-beer-mugs":{"a":"Clinking Beer Mugs","b":"1F37B","j":["relax","beer","booze","beverage","bar","drink","summer","drunk","alcohol","pub","mug","clink","party"]},"clinking-glasses":{"a":"Clinking Glasses","b":"1F942","j":["wine","champagne","cheers","toast","beverage","drink","celebrate","alcohol","glass","clink","party"]},"tumbler-glass":{"a":"Tumbler Glass","b":"1F943","j":["whisky","booze","liquor","bourbon","shot","beverage","drink","scotch","drunk","alcohol","glass","tumbler"]},"cup-with-straw":{"a":"Cup with Straw","b":"1F964","j":["soda","soft drink","water","juice","malt","drink"]},"bubble-tea":{"a":"Bubble Tea","b":"1F9CB","j":["tea","boba","milk tea","bubble","straw","milk","taiwan","pearl"]},"beverage-box":{"a":"Beverage Box","b":"1F9C3","j":["straw","juice","beverage","drink","box","sweet"]},"mate":{"a":"Mate","b":"1F9C9","j":["beverage","tea","drink"]},"ice":{"a":"Ice","b":"1F9CA","j":["cold","water","ice cube","iceberg"]},"chopsticks":{"a":"Chopsticks","b":"1F962","j":["jeotgarak","food","hashi","kuaizi"]},"fork-and-knife-with-plate":{"a":"Fork and Knife with Plate","b":"1F37D","j":["food","dinner","knife","cooking","restaurant","plate","meal","lunch","fork","eat"]},"fork-and-knife":{"a":"Fork and Knife","b":"1F374","j":["cooking","knife","kitchen","cutlery","fork"]},"spoon":{"a":"Spoon","b":"1F944","j":["tableware","kitchen","cutlery"]},"kitchen-knife":{"a":"Kitchen Knife","b":"1F52A","j":["blade","cooking","knife","hocho","tool","kitchen","cutlery","weapon"]},"amphora":{"a":"Amphora","b":"1F3FA","j":["jar","cooking","Aquarius","jug","drink","vase","zodiac"]},"globe-showing-europeafrica":{"a":"Globe Showing Europe-Africa","b":"1F30D","j":["Europe","globe showing Europe-Africa","world","international","Africa","globe_showing_europe_africa","earth","globe"]},"globe-showing-americas":{"a":"Globe Showing Americas","b":"1F30E","j":["USA","world","international","globe showing Americas","earth","Americas","globe"]},"globe-showing-asiaaustralia":{"a":"Globe Showing Asia-Australia","b":"1F30F","j":["globe showing Asia-Australia","world","international","Asia","earth","globe_showing_asia_australia","east","Australia","globe"]},"globe-with-meridians":{"a":"Globe with Meridians","b":"1F310","j":["world","international","meridians","internet","earth","interweb","globe","i18n"]},"world-map":{"a":"World Map","b":"1F5FA","j":["location","direction","map","world"]},"map-of-japan":{"a":"Map of Japan","b":"1F5FE","j":["map of Japan","Japan","asia","japanese","country","map","nation"]},"compass":{"a":"Compass","b":"1F9ED","j":["magnetic","orienteering","navigation"]},"snowcapped-mountain":{"a":"Snow-Capped Mountain","b":"1F3D4","j":["snow-capped mountain","snow_capped_mountain","snow","photo","winter","mountain","nature","cold","environment"]},"mountain":{"a":"Mountain","b":"26F0","j":["photo","environment","nature"]},"volcano":{"a":"Volcano","b":"1F30B","j":["photo","eruption","disaster","mountain","nature"]},"mount-fuji":{"a":"Mount Fuji","b":"1F5FB","j":["fuji","photo","mountain","nature","japanese"]},"camping":{"a":"Camping","b":"1F3D5","j":["photo","outdoors","tent"]},"beach-with-umbrella":{"a":"Beach with Umbrella","b":"1F3D6","j":["mojito","sand","umbrella","sunny","beach","summer","weather"]},"desert":{"a":"Desert","b":"1F3DC","j":["photo","saharah","warm"]},"desert-island":{"a":"Desert Island","b":"1F3DD","j":["mojito","photo","desert","island","tropical"]},"national-park":{"a":"National Park","b":"1F3DE","j":["photo","park","environment","nature"]},"stadium":{"a":"Stadium","b":"1F3DF","j":["sports","photo","concert","venue","place"]},"classical-building":{"a":"Classical Building","b":"1F3DB","j":["history","classical","art","culture"]},"building-construction":{"a":"Building Construction","b":"1F3D7","j":["working","construction","progress","wip"]},"brick":{"a":"Brick","b":"1F9F1","j":["clay","bricks","mortar","wall"]},"rock":{"a":"Rock","b":"1FAA8","j":["heavy","solid","boulder","stone"]},"wood":{"a":"Wood","b":"1FAB5","j":["log","trunk","timber","nature","lumber"]},"hut":{"a":"Hut","b":"1F6D6","j":["yurt","roundhouse","structure","house"]},"houses":{"a":"Houses","b":"1F3D8","j":["photo","buildings"]},"derelict-house":{"a":"Derelict House","b":"1F3DA","j":["evict","house","broken","derelict","building","abandon"]},"house":{"a":"House","b":"1F3E0","j":["building","home"]},"house-with-garden":{"a":"House with Garden","b":"1F3E1","j":["nature","house","home","plant","garden"]},"office-building":{"a":"Office Building","b":"1F3E2","j":["building","work","bureau"]},"japanese-post-office":{"a":"Japanese Post Office","b":"1F3E3","j":["communication","envelope","Japanese post office","Japanese","building","post"]},"post-office":{"a":"Post Office","b":"1F3E4","j":["email","building","European","post"]},"hospital":{"a":"Hospital","b":"1F3E5","j":["health","medicine","surgery","doctor","building"]},"bank":{"a":"Bank","b":"1F3E6","j":["business","enterprise","cash","money","building","sales"]},"hotel":{"a":"Hotel","b":"1F3E8","j":["accomodation","building","checkin"]},"love-hotel":{"a":"Love Hotel","b":"1F3E9","j":["love","like","dating","hotel","affection"]},"convenience-store":{"a":"Convenience Store","b":"1F3EA","j":["store","building","groceries","convenience","shopping"]},"school":{"a":"School","b":"1F3EB","j":["student","learn","teach","education","building"]},"department-store":{"a":"Department Store","b":"1F3EC","j":["store","building","department","mall","shopping"]},"factory":{"a":"Factory","b":"1F3ED","j":["smoke","building","pollution","industry"]},"japanese-castle":{"a":"Japanese Castle","b":"1F3EF","j":["castle","building","Japanese","photo"]},"castle":{"a":"Castle","b":"1F3F0","j":["building","royalty","history","European"]},"wedding":{"a":"Wedding","b":"1F492","j":["romance","bride","marriage","love","couple","like","chapel","groom","affection"]},"tokyo-tower":{"a":"Tokyo Tower","b":"1F5FC","j":["photo","japanese","tower","Tokyo"]},"statue-of-liberty":{"a":"Statue of Liberty","b":"1F5FD","j":["statue","newyork","liberty","american"]},"church":{"a":"Church","b":"26EA","j":["religion","cross","building","Christian","christ"]},"mosque":{"a":"Mosque","b":"1F54C","j":["islam","worship","minaret","religion","Muslim"]},"hindu-temple":{"a":"Hindu Temple","b":"1F6D5","j":["temple","religion","hindu"]},"synagogue":{"a":"Synagogue","b":"1F54D","j":["Jew","worship","religion","jewish","temple","Jewish","judaism"]},"shinto-shrine":{"a":"Shinto Shrine","b":"26E9","j":["kyoto","shrine","religion","temple","japan","shinto"]},"kaaba":{"a":"Kaaba","b":"1F54B","j":["islam","religion","mosque","mecca","Muslim"]},"fountain":{"a":"Fountain","b":"26F2","j":["photo","water","fresh","summer"]},"tent":{"a":"Tent","b":"26FA","j":["photo","outdoors","camping"]},"foggy":{"a":"Foggy","b":"1F301","j":["photo","fog","mountain"]},"night-with-stars":{"a":"Night with Stars","b":"1F303","j":["night","downtown","city","evening","star"]},"cityscape":{"a":"Cityscape","b":"1F3D9","j":["photo","night life","urban","city"]},"sunrise-over-mountains":{"a":"Sunrise over Mountains","b":"1F304","j":["morning","photo","sunrise","sun","mountain","view","vacation"]},"sunrise":{"a":"Sunrise","b":"1F305","j":["morning","photo","sun","view","vacation"]},"cityscape-at-dusk":{"a":"Cityscape at Dusk","b":"1F306","j":["dusk","photo","sunset","city","sky","evening","landscape","buildings"]},"sunset":{"a":"Sunset","b":"1F307","j":["dusk","photo","good morning","dawn","sun"]},"bridge-at-night":{"a":"Bridge at Night","b":"1F309","j":["photo","night","bridge","sanfrancisco"]},"hot-springs":{"a":"Hot Springs","b":"2668","j":["relax","steaming","bath","springs","hot","warm","hotsprings"]},"carousel-horse":{"a":"Carousel Horse","b":"1F3A0","j":["photo","carnival","carousel","horse"]},"ferris-wheel":{"a":"Ferris Wheel","b":"1F3A1","j":["photo","wheel","londoneye","amusement park","ferris","carnival"]},"roller-coaster":{"a":"Roller Coaster","b":"1F3A2","j":["roller","photo","playground","amusement park","carnival","coaster","fun"]},"barber-pole":{"a":"Barber Pole","b":"1F488","j":["pole","style","haircut","barber","hair","salon"]},"circus-tent":{"a":"Circus Tent","b":"1F3AA","j":["festival","circus","carnival","party","tent"]},"locomotive":{"a":"Locomotive","b":"1F682","j":["vehicle","train","transportation","steam","railway","engine"]},"railway-car":{"a":"Railway Car","b":"1F683","j":["car","electric","vehicle","train","trolleybus","transportation","railway","tram"]},"highspeed-train":{"a":"High-Speed Train","b":"1F684","j":["vehicle","high_speed_train","train","speed","transportation","shinkansen","railway","high-speed train"]},"bullet-train":{"a":"Bullet Train","b":"1F685","j":["vehicle","train","speed","transportation","bullet","shinkansen","railway","travel","fast","public"]},"train":{"a":"Train","b":"1F686","j":["vehicle","railway","transportation"]},"metro":{"a":"Metro","b":"1F687","j":["transportation","subway","tube","blue-square","mrt","underground"]},"light-rail":{"a":"Light Rail","b":"1F688","j":["vehicle","railway","transportation"]},"station":{"a":"Station","b":"1F689","j":["vehicle","train","transportation","railway","public"]},"tram":{"a":"Tram","b":"1F68A","j":["vehicle","trolleybus","transportation"]},"monorail":{"a":"Monorail","b":"1F69D","j":["vehicle","transportation"]},"mountain-railway":{"a":"Mountain Railway","b":"1F69E","j":["car","vehicle","transportation","railway","mountain"]},"tram-car":{"a":"Tram Car","b":"1F68B","j":["car","vehicle","trolleybus","transportation","carriage","travel","public","tram"]},"bus":{"a":"Bus","b":"1F68C","j":["car","vehicle","transportation"]},"oncoming-bus":{"a":"Oncoming Bus","b":"1F68D","j":["bus","vehicle","transportation","oncoming"]},"trolleybus":{"a":"Trolleybus","b":"1F68E","j":["bus","vehicle","transportation","trolley","bart","tram"]},"minibus":{"a":"Minibus","b":"1F690","j":["bus","vehicle","transportation","car"]},"ambulance":{"a":"Ambulance","b":"1F691","j":["911","vehicle","health","hospital"]},"fire-engine":{"a":"Fire Engine","b":"1F692","j":["cars","truck","vehicle","transportation","fire","engine"]},"police-car":{"a":"Police Car","b":"1F693","j":["cars","car","vehicle","transportation","patrol","police","enforcement","legal","law"]},"oncoming-police-car":{"a":"Oncoming Police Car","b":"1F694","j":["car","vehicle","oncoming","911","police","enforcement","legal","law"]},"taxi":{"a":"Taxi","b":"1F695","j":["cars","vehicle","uber","transportation"]},"oncoming-taxi":{"a":"Oncoming Taxi","b":"1F696","j":["cars","vehicle","oncoming","taxi","uber"]},"automobile":{"a":"Automobile","b":"1F697","j":["car","vehicle","red","transportation"]},"oncoming-automobile":{"a":"Oncoming Automobile","b":"1F698","j":["car","vehicle","automobile","transportation","oncoming"]},"sport-utility-vehicle":{"a":"Sport Utility Vehicle","b":"1F699","j":["vehicle","recreational","transportation","sport utility"]},"pickup-truck":{"a":"Pickup Truck","b":"1F6FB","j":["car","truck","transportation","pickup","pick-up"]},"delivery-truck":{"a":"Delivery Truck","b":"1F69A","j":["cars","truck","transportation","delivery"]},"articulated-lorry":{"a":"Articulated Lorry","b":"1F69B","j":["cars","truck","vehicle","transportation","semi","lorry","express"]},"tractor":{"a":"Tractor","b":"1F69C","j":["car","vehicle","farming","agriculture"]},"racing-car":{"a":"Racing Car","b":"1F3CE","j":["car","sports","racing","race","f1","fast","formula"]},"motorcycle":{"a":"Motorcycle","b":"1F3CD","j":["racing","fast","sports","race"]},"motor-scooter":{"a":"Motor Scooter","b":"1F6F5","j":["vehicle","vespa","sasha","motor","scooter"]},"manual-wheelchair":{"a":"Manual Wheelchair","b":"1F9BD","j":["accessibility"]},"motorized-wheelchair":{"a":"Motorized Wheelchair","b":"1F9BC","j":["accessibility"]},"auto-rickshaw":{"a":"Auto Rickshaw","b":"1F6FA","j":["move","tuk tuk","transportation"]},"bicycle":{"a":"Bicycle","b":"1F6B2","j":["exercise","bike","sports","hipster"]},"kick-scooter":{"a":"Kick Scooter","b":"1F6F4","j":["vehicle","razor","scooter","kick"]},"skateboard":{"a":"Skateboard","b":"1F6F9","j":["board"]},"roller-skate":{"a":"Roller Skate","b":"1F6FC","j":["roller","skate","sports","footwear"]},"bus-stop":{"a":"Bus Stop","b":"1F68F","j":["bus","stop","busstop","transportation","wait"]},"motorway":{"a":"Motorway","b":"1F6E3","j":["highway","road","cupertino","interstate"]},"railway-track":{"a":"Railway Track","b":"1F6E4","j":["railway","train","transportation"]},"oil-drum":{"a":"Oil Drum","b":"1F6E2","j":["oil","barrell","drum"]},"fuel-pump":{"a":"Fuel Pump","b":"26FD","j":["gas","fuel","diesel","pump","fuelpump","station","petroleum","gas station"]},"police-car-light":{"a":"Police Car Light","b":"1F6A8","j":["car","ambulance","911","beacon","light","error","emergency","pinged","police","revolving","legal","law","alert"]},"horizontal-traffic-light":{"a":"Horizontal Traffic Light","b":"1F6A5","j":["light","traffic","signal","transportation"]},"vertical-traffic-light":{"a":"Vertical Traffic Light","b":"1F6A6","j":["traffic","transportation","driving","light","signal"]},"stop-sign":{"a":"Stop Sign","b":"1F6D1","j":["octagonal","stop","sign"]},"construction":{"a":"Construction","b":"1F6A7","j":["progress","caution","wip","barrier","warning"]},"anchor":{"a":"Anchor","b":"2693","j":["boat","ship","sea","tool","ferry"]},"sailboat":{"a":"Sailboat","b":"26F5","j":["boat","yacht","transportation","sea","ship","resort","water","summer","sailing"]},"canoe":{"a":"Canoe","b":"1F6F6","j":["ship","water","boat","paddle"]},"speedboat":{"a":"Speedboat","b":"1F6A4","j":["vehicle","boat","transportation","ship","summer"]},"passenger-ship":{"a":"Passenger Ship","b":"1F6F3","j":["yacht","ship","cruise","ferry","passenger"]},"ferry":{"a":"Ferry","b":"26F4","j":["ship","yacht","boat","passenger"]},"motor-boat":{"a":"Motor Boat","b":"1F6E5","j":["motorboat","ship","boat"]},"ship":{"a":"Ship","b":"1F6A2","j":["boat","transportation","titanic","deploy","passenger"]},"airplane":{"a":"Airplane","b":"2708","j":["vehicle","transportation","flight","aeroplane","fly"]},"small-airplane":{"a":"Small Airplane","b":"1F6E9","j":["vehicle","transportation","flight","aeroplane","fly","airplane"]},"airplane-departure":{"a":"Airplane Departure","b":"1F6EB","j":["check-in","departures","departure","flight","airport","aeroplane","airplane","landing"]},"airplane-arrival":{"a":"Airplane Arrival","b":"1F6EC","j":["flight","airport","arrivals","aeroplane","boarding","arriving","airplane","landing"]},"parachute":{"a":"Parachute","b":"1FA82","j":["hang-glide","parasail","skydive","fly","glide"]},"seat":{"a":"Seat","b":"1F4BA","j":["bus","chair","flight","transport","sit","fly","airplane"]},"helicopter":{"a":"Helicopter","b":"1F681","j":["vehicle","transportation","fly"]},"suspension-railway":{"a":"Suspension Railway","b":"1F69F","j":["vehicle","railway","suspension","transportation"]},"mountain-cableway":{"a":"Mountain Cableway","b":"1F6A0","j":["vehicle","transportation","gondola","cable","mountain","ski"]},"aerial-tramway":{"a":"Aerial Tramway","b":"1F6A1","j":["car","vehicle","transportation","gondola","cable","aerial","ski","tramway"]},"satellite":{"a":"Satellite","b":"1F6F0","j":["communication","gps","spaceflight","ISS","NASA","space","orbit"]},"rocket":{"a":"Rocket","b":"1F680","j":["staffmode","outer_space","NASA","ship","space","fly","outer space","launch"]},"flying-saucer":{"a":"Flying Saucer","b":"1F6F8","j":["vehicle","ufo","transportation","UFO"]},"bellhop-bell":{"a":"Bellhop Bell","b":"1F6CE","j":["bell","bellhop","hotel","service"]},"luggage":{"a":"Luggage","b":"1F9F3","j":["travel","packing"]},"hourglass-done":{"a":"Hourglass Done","b":"231B","j":["test","clock","exam","sand","limit","time","quiz","timer","oldschool"]},"hourglass-not-done":{"a":"Hourglass Not Done","b":"23F3","j":["sand","hourglass","time","countdown","timer","oldschool"]},"watch":{"a":"Watch","b":"231A","j":["time","clock","accessories"]},"alarm-clock":{"a":"Alarm Clock","b":"23F0","j":["time","clock","alarm","wake"]},"stopwatch":{"a":"Stopwatch","b":"23F1","j":["time","clock","deadline"]},"timer-clock":{"a":"Timer Clock","b":"23F2","j":["clock","timer","alarm"]},"mantelpiece-clock":{"a":"Mantelpiece Clock","b":"1F570","j":["time","clock"]},"twelve-oclock":{"a":"Twelve O’Clock","b":"1F55B","j":["o’clock","clock","twelve_o_clock","noon","12","00","late","time","early","twelve","midnight","12:00","midday","schedule"]},"twelvethirty":{"a":"Twelve-Thirty","b":"1F567","j":["clock","late","12","time","schedule","early","twelve_thirty","twelve","twelve-thirty","thirty","12:30"]},"one-oclock":{"a":"One O’Clock","b":"1F550","j":["o’clock","clock","late","00","time","early","one","1","1:00","one_o_clock","schedule"]},"onethirty":{"a":"One-Thirty","b":"1F55C","j":["clock","late","time","schedule","early","one","1","1:30","one_thirty","thirty","one-thirty"]},"two-oclock":{"a":"Two O’Clock","b":"1F551","j":["o’clock","clock","late","00","time","early","two","two_o_clock","2:00","2","schedule"]},"twothirty":{"a":"Two-Thirty","b":"1F55D","j":["2:30","clock","late","two_thirty","time","early","two","two-thirty","2","thirty","schedule"]},"three-oclock":{"a":"Three O’Clock","b":"1F552","j":["o’clock","clock","late","00","three","3","time","early","3:00","three_o_clock","schedule"]},"threethirty":{"a":"Three-Thirty","b":"1F55E","j":["clock","late","three","3","time","early","three_thirty","schedule","three-thirty","thirty","3:30"]},"four-oclock":{"a":"Four O’Clock","b":"1F553","j":["o’clock","clock","four","00","late","time","early","four_o_clock","4","4:00","schedule"]},"fourthirty":{"a":"Four-Thirty","b":"1F55F","j":["clock","four","four-thirty","late","time","4:30","early","four_thirty","4","thirty","schedule"]},"five-oclock":{"a":"Five O’Clock","b":"1F554","j":["o’clock","clock","5:00","00","late","five_o_clock","five","time","early","5","schedule"]},"fivethirty":{"a":"Five-Thirty","b":"1F560","j":["clock","5:30","late","five","time","early","five_thirty","5","five-thirty","thirty","schedule"]},"six-oclock":{"a":"Six O’Clock","b":"1F555","j":["o’clock","clock","late","00","dusk","time","six_o_clock","six","early","dawn","6","6:00","schedule"]},"sixthirty":{"a":"Six-Thirty","b":"1F561","j":["clock","late","six_thirty","time","six","early","6","six-thirty","6:30","thirty","schedule"]},"seven-oclock":{"a":"Seven O’Clock","b":"1F556","j":["o’clock","clock","seven","late","00","7","time","early","seven_o_clock","7:00","schedule"]},"seventhirty":{"a":"Seven-Thirty","b":"1F562","j":["seven_thirty","clock","seven","late","7","time","7:30","early","seven-thirty","thirty","schedule"]},"eight-oclock":{"a":"Eight O’Clock","b":"1F557","j":["o’clock","clock","late","00","8:00","time","early","eight","8","eight_o_clock","schedule"]},"eightthirty":{"a":"Eight-Thirty","b":"1F563","j":["clock","late","eight_thirty","time","8:30","early","eight-thirty","eight","8","thirty","schedule"]},"nine-oclock":{"a":"Nine O’Clock","b":"1F558","j":["o’clock","clock","late","00","nine","nine_o_clock","time","early","9:00","9","schedule"]},"ninethirty":{"a":"Nine-Thirty","b":"1F564","j":["clock","late","nine","time","early","nine-thirty","nine_thirty","9:30","9","thirty","schedule"]},"ten-oclock":{"a":"Ten O’Clock","b":"1F559","j":["o’clock","clock","10","late","00","ten_o_clock","time","early","ten","10:00","schedule"]},"tenthirty":{"a":"Ten-Thirty","b":"1F565","j":["ten-thirty","clock","10","late","time","ten_thirty","early","10:30","ten","thirty","schedule"]},"eleven-oclock":{"a":"Eleven O’Clock","b":"1F55A","j":["o’clock","clock","late","00","time","eleven","11","early","11:00","eleven_o_clock","schedule"]},"eleventhirty":{"a":"Eleven-Thirty","b":"1F566","j":["clock","late","eleven-thirty","time","schedule","eleven","11","early","eleven_thirty","thirty","11:30"]},"new-moon":{"a":"New Moon","b":"1F311","j":["planet","night","space","evening","twilight","nature","dark","moon","sleep"]},"waxing-crescent-moon":{"a":"Waxing Crescent Moon","b":"1F312","j":["planet","night","waxing","space","evening","crescent","twilight","nature","moon","sleep"]},"first-quarter-moon":{"a":"First Quarter Moon","b":"1F313","j":["quarter","planet","night","space","evening","twilight","nature","moon","sleep"]},"waxing-gibbous-moon":{"a":"Waxing Gibbous Moon","b":"1F314","j":["planet","night","waxing","gibbous","gray","space","sky","evening","twilight","nature","moon","sleep"]},"full-moon":{"a":"Full Moon","b":"1F315","j":["yellow","planet","night","full","space","evening","twilight","nature","moon","sleep"]},"waning-gibbous-moon":{"a":"Waning Gibbous Moon","b":"1F316","j":["waning","planet","night","gibbous","space","waxing_gibbous_moon","evening","twilight","nature","moon","sleep"]},"last-quarter-moon":{"a":"Last Quarter Moon","b":"1F317","j":["quarter","planet","night","space","evening","twilight","nature","moon","sleep"]},"waning-crescent-moon":{"a":"Waning Crescent Moon","b":"1F318","j":["waning","planet","night","space","evening","crescent","twilight","nature","moon","sleep"]},"crescent-moon":{"a":"Crescent Moon","b":"1F319","j":["night","magic","sky","evening","crescent","moon","sleep"]},"new-moon-face":{"a":"New Moon Face","b":"1F31A","j":["planet","night","space","evening","twilight","nature","moon","face","sleep"]},"first-quarter-moon-face":{"a":"First Quarter Moon Face","b":"1F31B","j":["quarter","planet","night","space","evening","twilight","nature","moon","face","sleep"]},"last-quarter-moon-face":{"a":"Last Quarter Moon Face","b":"1F31C","j":["quarter","planet","night","space","evening","twilight","nature","moon","face","sleep"]},"thermometer":{"a":"Thermometer","b":"1F321","j":["cold","hot","temperature","weather"]},"sun":{"a":"Sun","b":"2600","j":["rays","spring","sunny","bright","nature","summer","beach","brightness","weather"]},"full-moon-face":{"a":"Full Moon Face","b":"1F31D","j":["planet","night","full","space","evening","bright","twilight","nature","moon","face","sleep"]},"sun-with-face":{"a":"Sun with Face","b":"1F31E","j":["morning","sun","sky","bright","nature","face"]},"ringed-planet":{"a":"Ringed Planet","b":"1FA90","j":["saturn","outerspace","saturnine"]},"star":{"a":"Star","b":"2B50","j":["yellow","night"]},"glowing-star":{"a":"Glowing Star","b":"1F31F","j":["sparkle","night","glow","awesome","glittery","magic","good","star","shining"]},"shooting-star":{"a":"Shooting Star","b":"1F320","j":["night","shooting","photo","falling","star"]},"milky-way":{"a":"Milky Way","b":"1F30C","j":["photo","space","stars"]},"cloud":{"a":"Cloud","b":"2601","j":["sky","weather"]},"sun-behind-cloud":{"a":"Sun Behind Cloud","b":"26C5","j":["morning","cloud","spring","cloudy","sun","nature","fall","weather"]},"cloud-with-lightning-and-rain":{"a":"Cloud with Lightning and Rain","b":"26C8","j":["rain","lightning","thunder","cloud","weather"]},"sun-behind-small-cloud":{"a":"Sun Behind Small Cloud","b":"1F324","j":["sun","cloud","weather"]},"sun-behind-large-cloud":{"a":"Sun Behind Large Cloud","b":"1F325","j":["sun","cloud","weather"]},"sun-behind-rain-cloud":{"a":"Sun Behind Rain Cloud","b":"1F326","j":["rain","sun","cloud","weather"]},"cloud-with-rain":{"a":"Cloud with Rain","b":"1F327","j":["rain","cloud","weather"]},"cloud-with-snow":{"a":"Cloud with Snow","b":"1F328","j":["cold","cloud","snow","weather"]},"cloud-with-lightning":{"a":"Cloud with Lightning","b":"1F329","j":["lightning","cloud","thunder","weather"]},"tornado":{"a":"Tornado","b":"1F32A","j":["whirlwind","twister","cyclone","cloud","weather"]},"fog":{"a":"Fog","b":"1F32B","j":["cloud","weather"]},"wind-face":{"a":"Wind Face","b":"1F32C","j":["air","gust","cloud","wind","blow","face"]},"cyclone":{"a":"Cyclone","b":"1F300","j":["vortex","dizzy","tornado","twister","cloud","hurricane","typhoon","spin","weather","swirl","whirlpool","spiral","blue"]},"rainbow":{"a":"Rainbow","b":"1F308","j":["rain","photo","spring","sky","nature","unicorn_face","happy"]},"closed-umbrella":{"a":"Closed Umbrella","b":"1F302","j":["clothing","drizzle","umbrella","rain","weather"]},"umbrella":{"a":"Umbrella","b":"2602","j":["rain","clothing","spring","weather"]},"umbrella-with-rain-drops":{"a":"Umbrella with Rain Drops","b":"2614","j":["clothing","umbrella","drop","rain","spring","rainy","weather"]},"umbrella-on-ground":{"a":"Umbrella on Ground","b":"26F1","j":["umbrella","rain","sun","summer","weather"]},"high-voltage":{"a":"High Voltage","b":"26A1","j":["electric","zap","lightning","thunder","lightning bolt","fast","voltage","danger","weather"]},"snowflake":{"a":"Snowflake","b":"2744","j":["xmas","snow","christmas","season","winter","cold","weather"]},"snowman":{"a":"Snowman","b":"2603","j":["xmas","snow","christmas","season","winter","weather","cold","frozen"]},"snowman-without-snow":{"a":"Snowman Without Snow","b":"26C4","j":["xmas","snow","christmas","winter","season","frozen","cold","without_snow","snowman","weather"]},"comet":{"a":"Comet","b":"2604","j":["space"]},"fire":{"a":"Fire","b":"1F525","j":["cook","hot","tool","flame"]},"droplet":{"a":"Droplet","b":"1F4A7","j":["sweat","drop","water","spring","drip","comic","cold","faucet"]},"water-wave":{"a":"Water Wave","b":"1F30A","j":["sea","water","ocean","tsunami","disaster","nature","wave"]},"jackolantern":{"a":"Jack-O-Lantern","b":"1F383","j":["jack_o_lantern","pumpkin","jack-o-lantern","celebration","halloween","creepy","light","jack","fall","lantern"]},"christmas-tree":{"a":"Christmas Tree","b":"1F384","j":["xmas","festival","celebration","Christmas","december","tree","vacation"]},"fireworks":{"a":"Fireworks","b":"1F386","j":["festival","photo","celebration","carnival","congratulations"]},"sparkler":{"a":"Sparkler","b":"1F387","j":["stars","night","sparkle","fireworks","celebration","shine"]},"firecracker":{"a":"Firecracker","b":"1F9E8","j":["explode","explosive","fireworks","boom","dynamite","explosion"]},"sparkles":{"a":"Sparkles","b":"2728","j":["*","stars","sparkle","cool","awesome","magic","shiny","good","shine","star"]},"balloon":{"a":"Balloon","b":"1F388","j":["birthday","celebration","circus","party"]},"party-popper":{"a":"Party Popper","b":"1F389","j":["birthday","celebration","tada","magic","popper","congratulations","circus","party"]},"confetti-ball":{"a":"Confetti Ball","b":"1F38A","j":["festival","birthday","celebration","ball","confetti","circus","party"]},"tanabata-tree":{"a":"Tanabata Tree","b":"1F38B","j":["branch","celebration","Japanese","banner","tree","nature","summer","plant"]},"pine-decoration":{"a":"Pine Decoration","b":"1F38D","j":["pine","panda","vegetable","bamboo","celebration","Japanese","nature","plant"]},"japanese-dolls":{"a":"Japanese Dolls","b":"1F38E","j":["Japanese dolls","festival","toy","celebration","Japanese","kimono","japanese","doll"]},"carp-streamer":{"a":"Carp Streamer","b":"1F38F","j":["fish","celebration","carp","banner","streamer","japanese","koinobori"]},"wind-chime":{"a":"Wind Chime","b":"1F390","j":["spring","celebration","ding","chime","bell","wind","nature"]},"moon-viewing-ceremony":{"a":"Moon Viewing Ceremony","b":"1F391","j":["ceremony","photo","celebration","tsukimi","asia","japan","moon"]},"red-envelope":{"a":"Red Envelope","b":"1F9E7","j":["good luck","hóngbāo","lai see","gift","money"]},"ribbon":{"a":"Ribbon","b":"1F380","j":["pink","decoration","celebration","girl","bowtie"]},"wrapped-gift":{"a":"Wrapped Gift","b":"1F381","j":["xmas","wrapped","christmas","birthday","celebration","present","gift","box"]},"reminder-ribbon":{"a":"Reminder Ribbon","b":"1F397","j":["cause","ribbon","sports","support","celebration","reminder","awareness"]},"admission-tickets":{"a":"Admission Tickets","b":"1F39F","j":["entrance","sports","admission","concert","ticket"]},"ticket":{"a":"Ticket","b":"1F3AB","j":["concert","admission","pass","event"]},"military-medal":{"a":"Military Medal","b":"1F396","j":["winning","military","award","celebration","army","medal"]},"trophy":{"a":"Trophy","b":"1F3C6","j":["ftw","win","prize","award","ceremony","contest","place"]},"sports-medal":{"a":"Sports Medal","b":"1F3C5","j":["medal","winning","award"]},"1st-place-medal":{"a":"1st Place Medal","b":"1F947","j":["winning","gold","award","first","medal"]},"2nd-place-medal":{"a":"2nd Place Medal","b":"1F948","j":["medal","second","silver","award"]},"3rd-place-medal":{"a":"3rd Place Medal","b":"1F949","j":["medal","third","bronze","award"]},"soccer-ball":{"a":"Soccer Ball","b":"26BD","j":["football","soccer","sports","ball"]},"baseball":{"a":"Baseball","b":"26BE","j":["balls","sports","ball"]},"softball":{"a":"Softball","b":"1F94E","j":["sports","balls","underarm","glove","ball"]},"basketball":{"a":"Basketball","b":"1F3C0","j":["sports","balls","ball","NBA","hoop"]},"volleyball":{"a":"Volleyball","b":"1F3D0","j":["game","balls","sports","ball"]},"american-football":{"a":"American Football","b":"1F3C8","j":["NFL","sports","balls","ball","football","american"]},"rugby-football":{"a":"Rugby Football","b":"1F3C9","j":["sports","team","rugby","ball","football"]},"tennis":{"a":"Tennis","b":"1F3BE","j":["sports","balls","green","racquet","ball"]},"flying-disc":{"a":"Flying Disc","b":"1F94F","j":["ultimate","sports","frisbee"]},"bowling":{"a":"Bowling","b":"1F3B3","j":["sports","ball","game","play","fun"]},"cricket-game":{"a":"Cricket Game","b":"1F3CF","j":["game","bat","sports","ball"]},"field-hockey":{"a":"Field Hockey","b":"1F3D1","j":["sports","hockey","ball","stick","game","field"]},"ice-hockey":{"a":"Ice Hockey","b":"1F3D2","j":["ice","sports","hockey","puck","stick","game"]},"lacrosse":{"a":"Lacrosse","b":"1F94D","j":["stick","sports","goal","ball"]},"ping-pong":{"a":"Ping Pong","b":"1F3D3","j":["bat","pingpong","sports","paddle","table tennis","ball","game"]},"badminton":{"a":"Badminton","b":"1F3F8","j":["birdie","sports","racquet","game","shuttlecock"]},"boxing-glove":{"a":"Boxing Glove","b":"1F94A","j":["boxing","glove","sports","fighting"]},"martial-arts-uniform":{"a":"Martial Arts Uniform","b":"1F94B","j":["taekwondo","karate","uniform","martial arts","judo"]},"goal-net":{"a":"Goal Net","b":"1F945","j":["net","sports","goal"]},"flag-in-hole":{"a":"Flag in Hole","b":"26F3","j":["business","hole","sports","golf","flag","summer"]},"ice-skate":{"a":"Ice Skate","b":"26F8","j":["skate","sports","ice"]},"fishing-pole":{"a":"Fishing Pole","b":"1F3A3","j":["pole","fish","food","hobby","summer"]},"diving-mask":{"a":"Diving Mask","b":"1F93F","j":["scuba","sport","ocean","diving","snorkeling"]},"running-shirt":{"a":"Running Shirt","b":"1F3BD","j":["running","sash","pageant","shirt","athletics","play"]},"skis":{"a":"Skis","b":"1F3BF","j":["sports","snow","winter","cold","ski"]},"sled":{"a":"Sled","b":"1F6F7","j":["luge","sledge","sleigh","toboggan"]},"curling-stone":{"a":"Curling Stone","b":"1F94C","j":["game","sports","rock"]},"bullseye":{"a":"Bullseye","b":"1F3AF","j":["dart","direct hit","target","bar","hit","game","direct_hit","play"]},"yoyo":{"a":"Yo-Yo","b":"1FA80","j":["toy","yo-yo","fluctuate","yo_yo"]},"kite":{"a":"Kite","b":"1FA81","j":["wind","soar","fly"]},"pool-8-ball":{"a":"Pool 8 Ball","b":"1F3B1","j":["8","billiard","pool","hobby","luck","magic","eight","ball","game"]},"crystal-ball":{"a":"Crystal Ball","b":"1F52E","j":["fairy tale","tool","fantasy","magic","crystal","fortune_teller","ball","fortune","disco","circus","party"]},"magic-wand":{"a":"Magic Wand","b":"1FA84","j":["wizard","witch","magic","supernature","power"]},"nazar-amulet":{"a":"Nazar Amulet","b":"1F9FF","j":["nazar","talisman","evil-eye","bead","charm"]},"video-game":{"a":"Video Game","b":"1F3AE","j":["console","PS4","controller","game","play"]},"joystick":{"a":"Joystick","b":"1F579","j":["game","video game","play"]},"slot-machine":{"a":"Slot Machine","b":"1F3B0","j":["casino","bet","vegas","luck","slot","gamble","game","fruit machine"]},"game-die":{"a":"Game Die","b":"1F3B2","j":["random","tabletop","luck","die","game","dice","play"]},"puzzle-piece":{"a":"Puzzle Piece","b":"1F9E9","j":["puzzle","piece","jigsaw","interlocking","clue"]},"teddy-bear":{"a":"Teddy Bear","b":"1F9F8","j":["toy","plaything","plush","stuffed"]},"piata":{"a":"Piñata","b":"1FA85","j":["candy","celebration","mexico","pinata","piñata","party"]},"nesting-dolls":{"a":"Nesting Dolls","b":"1FA86","j":["matryoshka","toy","nesting","doll","russia"]},"spade-suit":{"a":"Spade Suit","b":"2660","j":["cards","suits","card","magic","game","poker"]},"heart-suit":{"a":"Heart Suit","b":"2665","j":["cards","suits","card","magic","game","poker"]},"diamond-suit":{"a":"Diamond Suit","b":"2666","j":["cards","suits","card","magic","game","poker"]},"club-suit":{"a":"Club Suit","b":"2663","j":["cards","suits","card","magic","game","poker"]},"chess-pawn":{"a":"Chess Pawn","b":"265F","j":["chess","dupe","expendable"]},"joker":{"a":"Joker","b":"1F0CF","j":["cards","card","magic","wildcard","game","poker","play"]},"mahjong-red-dragon":{"a":"Mahjong Red Dragon","b":"1F004","j":["red","mahjong","chinese","kanji","game","play"]},"flower-playing-cards":{"a":"Flower Playing Cards","b":"1F3B4","j":["card","red","sunset","Japanese","playing","flower","game"]},"performing-arts":{"a":"Performing Arts","b":"1F3AD","j":["theatre","drama","acting","mask","performing","art","theater"]},"framed-picture":{"a":"Framed Picture","b":"1F5BC","j":["frame","photography","museum","art","picture","painting"]},"artist-palette":{"a":"Artist Palette","b":"1F3A8","j":["draw","paint","museum","palette","design","colors","art","painting"]},"thread":{"a":"Thread","b":"1F9F5","j":["needle","spool","sewing","string"]},"sewing-needle":{"a":"Sewing Needle","b":"1FAA1","j":["needle","sewing","embroidery","sutures","stitches","tailoring"]},"yarn":{"a":"Yarn","b":"1F9F6","j":["knit","crochet","ball"]},"knot":{"a":"Knot","b":"1FAA2","j":["rope","twist","tangled","tie","twine","scout"]},"glasses":{"a":"Glasses","b":"1F453","j":["eyeglasses","nerdy","clothing","dork","eye","accessories","eyesight","fashion","geek","eyewear"]},"sunglasses":{"a":"Sunglasses","b":"1F576","j":["cool","glasses","eye","accessories","dark","eyewear","face"]},"goggles":{"a":"Goggles","b":"1F97D","j":["swimming","eyes","eye protection","welding","safety","protection"]},"lab-coat":{"a":"Lab Coat","b":"1F97C","j":["chemist","doctor","scientist","experiment"]},"safety-vest":{"a":"Safety Vest","b":"1F9BA","j":["vest","emergency","safety","protection"]},"necktie":{"a":"Necktie","b":"1F454","j":["business","clothing","suitup","shirt","tie","fashion","formal","cloth"]},"tshirt":{"a":"T-Shirt","b":"1F455","j":["casual","clothing","t_shirt","shirt","fashion","tee","t-shirt","cloth"]},"jeans":{"a":"Jeans","b":"1F456","j":["clothing","trousers","fashion","pants","shopping"]},"scarf":{"a":"Scarf","b":"1F9E3","j":["clothes","neck","winter"]},"gloves":{"a":"Gloves","b":"1F9E4","j":["clothes","hand","winter","hands"]},"coat":{"a":"Coat","b":"1F9E5","j":["jacket"]},"socks":{"a":"Socks","b":"1F9E6","j":["clothes","stockings","stocking"]},"dress":{"a":"Dress","b":"1F457","j":["clothes","clothing","fashion","shopping"]},"kimono":{"a":"Kimono","b":"1F458","j":["clothing","dress","female","fashion","japanese","women"]},"sari":{"a":"Sari","b":"1F97B","j":["clothing","dress"]},"onepiece-swimsuit":{"a":"One-Piece Swimsuit","b":"1FA71","j":["bathing suit","fashion","one-piece swimsuit","one_piece_swimsuit"]},"briefs":{"a":"Briefs","b":"1FA72","j":["clothing","swimsuit","one-piece","bathing suit","underwear"]},"shorts":{"a":"Shorts","b":"1FA73","j":["underwear","clothing","pants","bathing suit"]},"bikini":{"a":"Bikini","b":"1F459","j":["swim","clothing","woman","swimming","female","girl","fashion","beach","summer"]},"womans-clothes":{"a":"Woman’S Clothes","b":"1F45A","j":["clothing","shopping_bags","woman","woman_s_clothes","female","woman’s clothes","fashion"]},"purse":{"a":"Purse","b":"1F45B","j":["clothing","accessories","shopping","money","sales","fashion","coin"]},"handbag":{"a":"Handbag","b":"1F45C","j":["clothing","purse","accessory","accessories","fashion","bag","shopping"]},"clutch-bag":{"a":"Clutch Bag","b":"1F45D","j":["clothing","accessories","shopping","bag","pouch"]},"shopping-bags":{"a":"Shopping Bags","b":"1F6CD","j":["purchase","buy","bag","hotel","mall","shopping"]},"backpack":{"a":"Backpack","b":"1F392","j":["satchel","school","student","education","bag","rucksack"]},"thong-sandal":{"a":"Thong Sandal","b":"1FA74","j":["zōri","thongs","sandals","thong sandals","footwear","summer","beach sandals"]},"mans-shoe":{"a":"Man’S Shoe","b":"1F45E","j":["shoe","clothing","male","man","fashion","man_s_shoe","man’s shoe"]},"running-shoe":{"a":"Running Shoe","b":"1F45F","j":["shoe","clothing","sports","shoes","sneakers","athletic","sneaker"]},"hiking-boot":{"a":"Hiking Boot","b":"1F97E","j":["hiking","backpacking","camping","boot"]},"flat-shoe":{"a":"Flat Shoe","b":"1F97F","j":["slipper","slip-on","ballet flat","ballet"]},"highheeled-shoe":{"a":"High-Heeled Shoe","b":"1F460","j":["shoe","clothing","shoes","woman","stiletto","female","heel","pumps","fashion","high_heeled_shoe","high-heeled shoe"]},"womans-sandal":{"a":"Woman’S Sandal","b":"1F461","j":["shoe","flip flops","clothing","shoes","woman","woman_s_sandal","sandal","fashion","woman’s sandal"]},"ballet-shoes":{"a":"Ballet Shoes","b":"1FA70","j":["ballet","dance"]},"womans-boot":{"a":"Woman’S Boot","b":"1F462","j":["shoe","clothing","shoes","woman","woman’s boot","fashion","boot","woman_s_boot"]},"crown":{"a":"Crown","b":"1F451","j":["clothing","royalty","queen","leader","lord","kod","king"]},"womans-hat":{"a":"Woman’S Hat","b":"1F452","j":["clothing","hat","woman’s hat","woman","spring","woman_s_hat","accessories","female","fashion","lady"]},"top-hat":{"a":"Top Hat","b":"1F3A9","j":["clothing","hat","tophat","classy","top","magic","gentleman","circus"]},"graduation-cap":{"a":"Graduation Cap","b":"1F393","j":["clothing","hat","school","cap","celebration","degree","learn","education","university","graduation","legal","college"]},"billed-cap":{"a":"Billed Cap","b":"1F9E2","j":["cap","baseball","baseball cap"]},"military-helmet":{"a":"Military Helmet","b":"1FA96","j":["military","army","helmet","protection","warrior","soldier"]},"rescue-workers-helmet":{"a":"Rescue Worker’S Helmet","b":"26D1","j":["hat","rescue worker’s helmet","construction","build","cross","aid","helmet","rescue_worker_s_helmet","face"]},"prayer-beads":{"a":"Prayer Beads","b":"1F4FF","j":["beads","clothing","religion","religious","dhikr","necklace","prayer"]},"lipstick":{"a":"Lipstick","b":"1F484","j":["woman","female","makeup","girl","fashion","cosmetics"]},"ring":{"a":"Ring","b":"1F48D","j":["wedding","gem","marriage","jewelry","valentines","propose","fashion","diamond","engagement"]},"gem-stone":{"a":"Gem Stone","b":"1F48E","j":["gem","ruby","jewel","jewelry","diamond","blue"]},"muted-speaker":{"a":"Muted Speaker","b":"1F507","j":["speaker","sound","silent","mute","silence","volume","quiet"]},"speaker-low-volume":{"a":"Speaker Low Volume","b":"1F508","j":["broadcast","soft","silence","volume","sound"]},"speaker-medium-volume":{"a":"Speaker Medium Volume","b":"1F509","j":["speaker","volume","medium","broadcast"]},"speaker-high-volume":{"a":"Speaker High Volume","b":"1F50A","j":["speaker","broadcast","noise","loud","volume","noisy"]},"loudspeaker":{"a":"Loudspeaker","b":"1F4E2","j":["volume","public address","sound","loud"]},"megaphone":{"a":"Megaphone","b":"1F4E3","j":["speaker","cheering","sound","volume"]},"postal-horn":{"a":"Postal Horn","b":"1F4EF","j":["postal","horn","music","post","instrument"]},"bell":{"a":"Bell","b":"1F514","j":["xmas","christmas","chime","notification","sound"]},"bell-with-slash":{"a":"Bell with Slash","b":"1F515","j":["silent","mute","bell","volume","sound","forbidden","quiet"]},"musical-score":{"a":"Musical Score","b":"1F3BC","j":["score","treble","clef","compose","music"]},"musical-note":{"a":"Musical Note","b":"1F3B5","j":["score","note","music","tone","sound"]},"musical-notes":{"a":"Musical Notes","b":"1F3B6","j":["note","score","music","notes"]},"studio-microphone":{"a":"Studio Microphone","b":"1F399","j":["mic","recording","microphone","sing","talkshow","music","artist","studio"]},"level-slider":{"a":"Level Slider","b":"1F39A","j":["scale","slider","music","level"]},"control-knobs":{"a":"Control Knobs","b":"1F39B","j":["control","dial","music","knobs"]},"microphone":{"a":"Microphone","b":"1F3A4","j":["mic","karaoke","sing","PA","talkshow","music","sound"]},"headphone":{"a":"Headphone","b":"1F3A7","j":["gadgets","earbud","music","score"]},"radio":{"a":"Radio","b":"1F4FB","j":["podcast","communication","video","program","music"]},"saxophone":{"a":"Saxophone","b":"1F3B7","j":["sax","jazz","blues","music","instrument"]},"accordion":{"a":"Accordion","b":"1FA97","j":["concertina","music","squeeze box"]},"guitar":{"a":"Guitar","b":"1F3B8","j":["instrument","music"]},"musical-keyboard":{"a":"Musical Keyboard","b":"1F3B9","j":["piano","keyboard","compose","music","instrument"]},"trumpet":{"a":"Trumpet","b":"1F3BA","j":["brass","instrument","music"]},"violin":{"a":"Violin","b":"1F3BB","j":["orchestra","instrument","music","symphony"]},"banjo":{"a":"Banjo","b":"1FA95","j":["instructment","stringed","music"]},"drum":{"a":"Drum","b":"1F941","j":["drumsticks","instrument","music","snare"]},"long-drum":{"a":"Long Drum","b":"1FA98","j":["beat","rhythm","drum","music","conga"]},"mobile-phone":{"a":"Mobile Phone","b":"1F4F1","j":["gadgets","dial","mobile","cell","phone","telephone","technology","apple"]},"mobile-phone-with-arrow":{"a":"Mobile Phone with Arrow","b":"1F4F2","j":["mobile","receive","arrow","cell","incoming","iphone","phone"]},"telephone":{"a":"Telephone","b":"260E","j":["dial","communication","phone","technology"]},"telephone-receiver":{"a":"Telephone Receiver","b":"1F4DE","j":["communication","dial","receiver","telephone","technology","phone"]},"pager":{"a":"Pager","b":"1F4DF","j":["bbcall","90s","oldschool"]},"fax-machine":{"a":"Fax Machine","b":"1F4E0","j":["communication","fax","technology"]},"battery":{"a":"Battery","b":"1F50B","j":["sustain","energy","power"]},"electric-plug":{"a":"Electric Plug","b":"1F50C","j":["electric","electricity","plug","charger","power"]},"laptop":{"a":"Laptop","b":"1F4BB","j":["screen","personal","display","technology","computer","pc","monitor"]},"desktop-computer":{"a":"Desktop Computer","b":"1F5A5","j":["screen","desktop","technology","computer","computing"]},"printer":{"a":"Printer","b":"1F5A8","j":["paper","ink","computer"]},"keyboard":{"a":"Keyboard","b":"2328","j":["type","text","technology","computer","input"]},"computer-mouse":{"a":"Computer Mouse","b":"1F5B1","j":["click","computer"]},"trackball":{"a":"Trackball","b":"1F5B2","j":["trackpad","technology","computer"]},"computer-disk":{"a":"Computer Disk","b":"1F4BD","j":["90s","optical","minidisk","technology","computer","record","data","disk"]},"floppy-disk":{"a":"Floppy Disk","b":"1F4BE","j":["oldschool","80s","90s","floppy","technology","computer","save","disk"]},"optical-disk":{"a":"Optical Disk","b":"1F4BF","j":["90s","disc","optical","cd","technology","computer","dvd","disk"]},"dvd":{"a":"Dvd","b":"1F4C0","j":["blu-ray","disc","optical","cd","computer","disk"]},"abacus":{"a":"Abacus","b":"1F9EE","j":["calculation"]},"movie-camera":{"a":"Movie Camera","b":"1F3A5","j":["movie","camera","cinema","film","record"]},"film-frames":{"a":"Film Frames","b":"1F39E","j":["cinema","frames","movie","film"]},"film-projector":{"a":"Film Projector","b":"1F4FD","j":["movie","cinema","projector","video","film","record","tape"]},"clapper-board":{"a":"Clapper Board","b":"1F3AC","j":["clapper","movie","record","film"]},"television":{"a":"Television","b":"1F4FA","j":["video","program","tv","technology","oldschool","show"]},"camera":{"a":"Camera","b":"1F4F7","j":["gadgets","video","photography"]},"camera-with-flash":{"a":"Camera with Flash","b":"1F4F8","j":["gadgets","camera","photography","flash","video"]},"video-camera":{"a":"Video Camera","b":"1F4F9","j":["record","camera","video","film"]},"videocassette":{"a":"Videocassette","b":"1F4FC","j":["vhs","80s","90s","video","oldschool","record","tape"]},"magnifying-glass-tilted-left":{"a":"Magnifying Glass Tilted Left","b":"1F50D","j":["find","zoom","detective","search","tool","magnifying","glass"]},"magnifying-glass-tilted-right":{"a":"Magnifying Glass Tilted Right","b":"1F50E","j":["find","zoom","detective","search","tool","magnifying","glass"]},"candle":{"a":"Candle","b":"1F56F","j":["light","fire","wax"]},"light-bulb":{"a":"Light Bulb","b":"1F4A1","j":["electric","electricity","idea","light","comic","bulb"]},"flashlight":{"a":"Flashlight","b":"1F526","j":["electric","torch","sight","night","tool","light","dark","camping"]},"red-paper-lantern":{"a":"Red Paper Lantern","b":"1F3EE","j":["red","paper","halloween","spooky","light","bar","lantern"]},"diya-lamp":{"a":"Diya Lamp","b":"1FA94","j":["oil","lamp","diya","lighting"]},"notebook-with-decorative-cover":{"a":"Notebook with Decorative Cover","b":"1F4D4","j":["decorated","notebook","cover","paper","book","record","study","notes","classroom"]},"closed-book":{"a":"Closed Book","b":"1F4D5","j":["closed","read","learn","textbook","book","knowledge","library"]},"open-book":{"a":"Open Book","b":"1F4D6","j":["open","read","learn","book","literature","knowledge","library","study"]},"green-book":{"a":"Green Book","b":"1F4D7","j":["read","green","book","knowledge","library","study"]},"blue-book":{"a":"Blue Book","b":"1F4D8","j":["read","learn","book","knowledge","library","study","blue"]},"orange-book":{"a":"Orange Book","b":"1F4D9","j":["read","orange","textbook","book","knowledge","library","study"]},"books":{"a":"Books","b":"1F4DA","j":["library","book","study","literature"]},"notebook":{"a":"Notebook","b":"1F4D3","j":["paper","stationery","record","study","notes"]},"ledger":{"a":"Ledger","b":"1F4D2","j":["paper","notes","notebook"]},"page-with-curl":{"a":"Page with Curl","b":"1F4C3","j":["document","paper","documents","page","office","curl"]},"scroll":{"a":"Scroll","b":"1F4DC","j":["paper","documents","ancient","history"]},"page-facing-up":{"a":"Page Facing Up","b":"1F4C4","j":["document","information","paper","documents","page","office"]},"newspaper":{"a":"Newspaper","b":"1F4F0","j":["paper","news","press","headline"]},"rolledup-newspaper":{"a":"Rolled-Up Newspaper","b":"1F5DE","j":["rolled","paper","press","newspaper","news","rolled-up newspaper","rolled_up_newspaper","headline"]},"bookmark-tabs":{"a":"Bookmark Tabs","b":"1F4D1","j":["order","bookmark","tidy","mark","marker","save","favorite","tabs"]},"bookmark":{"a":"Bookmark","b":"1F516","j":["save","label","mark","favorite"]},"label":{"a":"Label","b":"1F3F7","j":["tag","sale"]},"money-bag":{"a":"Money Bag","b":"1F4B0","j":["sale","payment","coins","dollar","moneybag","money","bag"]},"coin":{"a":"Coin","b":"1FA99","j":["gold","currency","money","treasure","silver","metal"]},"yen-banknote":{"a":"Yen Banknote","b":"1F4B4","j":["banknote","currency","bill","note","dollar","money","sales","yen","japanese"]},"dollar-banknote":{"a":"Dollar Banknote","b":"1F4B5","j":["banknote","currency","bill","dollar","note","money","sales"]},"euro-banknote":{"a":"Euro Banknote","b":"1F4B6","j":["banknote","currency","bill","euro","note","dollar","money","sales"]},"pound-banknote":{"a":"Pound Banknote","b":"1F4B7","j":["banknote","uk","currency","bill","british","sterling","note","money","sales","bills","england","pound"]},"money-with-wings":{"a":"Money with Wings","b":"1F4B8","j":["banknote","bill","sale","wings","payment","dollar","money","bills","fly"]},"credit-card":{"a":"Credit Card","b":"1F4B3","j":["credit","card","bill","payment","dollar","money","sales","shopping"]},"receipt":{"a":"Receipt","b":"1F9FE","j":["evidence","proof","accounting","expenses","bookkeeping"]},"chart-increasing-with-yen":{"a":"Chart Increasing with Yen","b":"1F4B9","j":["stats","presentation","growth","green-square","money","chart","yen","graph"]},"envelope":{"a":"Envelope","b":"2709","j":["postal","letter","communication","email","inbox"]},"email":{"a":"E-Mail","b":"1F4E7","j":["letter","communication","e_mail","inbox","e-mail","mail"]},"incoming-envelope":{"a":"Incoming Envelope","b":"1F4E8","j":["letter","envelope","receive","email","incoming","e-mail","inbox"]},"envelope-with-arrow":{"a":"Envelope with Arrow","b":"1F4E9","j":["communication","envelope","email","arrow","outgoing","e-mail"]},"outbox-tray":{"a":"Outbox Tray","b":"1F4E4","j":["letter","sent","email","outbox","tray","box","mail","inbox"]},"inbox-tray":{"a":"Inbox Tray","b":"1F4E5","j":["letter","receive","email","documents","tray","box","mail","inbox"]},"package":{"a":"Package","b":"1F4E6","j":["cardboard","gift","moving","box","parcel","mail"]},"closed-mailbox-with-raised-flag":{"a":"Closed Mailbox with Raised Flag","b":"1F4EB","j":["communication","closed","email","inbox","mailbox","mail","postbox"]},"closed-mailbox-with-lowered-flag":{"a":"Closed Mailbox with Lowered Flag","b":"1F4EA","j":["communication","closed","email","lowered","inbox","mailbox","mail","postbox"]},"open-mailbox-with-raised-flag":{"a":"Open Mailbox with Raised Flag","b":"1F4EC","j":["communication","open","email","inbox","mailbox","mail","postbox"]},"open-mailbox-with-lowered-flag":{"a":"Open Mailbox with Lowered Flag","b":"1F4ED","j":["open","email","lowered","inbox","mailbox","mail","postbox"]},"postbox":{"a":"Postbox","b":"1F4EE","j":["letter","envelope","email","mailbox","mail"]},"ballot-box-with-ballot":{"a":"Ballot Box with Ballot","b":"1F5F3","j":["election","ballot","box","vote"]},"pencil":{"a":"Pencil","b":"270F","j":["paper","school","write","stationery","writing","study"]},"black-nib":{"a":"Black Nib","b":"2712","j":["pen","write","stationery","writing","nib"]},"fountain-pen":{"a":"Fountain Pen","b":"1F58B","j":["pen","write","stationery","fountain","writing"]},"pen":{"a":"Pen","b":"1F58A","j":["stationery","ballpoint","writing","write"]},"paintbrush":{"a":"Paintbrush","b":"1F58C","j":["drawing","art","creativity","painting"]},"crayon":{"a":"Crayon","b":"1F58D","j":["drawing","creativity"]},"memo":{"a":"Memo","b":"1F4DD","j":["test","exam","paper","quiz","write","pencil","stationery","documents","compose","legal","writing","study"]},"briefcase":{"a":"Briefcase","b":"1F4BC","j":["business","documents","work","legal","job","law","career"]},"file-folder":{"a":"File Folder","b":"1F4C1","j":["business","file","folder","documents","office"]},"open-file-folder":{"a":"Open File Folder","b":"1F4C2","j":["open","file","load","folder","documents"]},"card-index-dividers":{"a":"Card Index Dividers","b":"1F5C2","j":["business","card","index","dividers","stationery","organizing"]},"calendar":{"a":"Calendar","b":"1F4C5","j":["date","schedule"]},"tearoff-calendar":{"a":"Tear-off Calendar","b":"1F4C6","j":["tear-off calendar","tear_off_calendar","planning","calendar","date","schedule"]},"spiral-notepad":{"a":"Spiral Notepad","b":"1F5D2","j":["memo","stationery","note","pad","spiral"]},"spiral-calendar":{"a":"Spiral Calendar","b":"1F5D3","j":["pad","planning","calendar","date","spiral","schedule"]},"card-index":{"a":"Card Index","b":"1F4C7","j":["business","card","index","rolodex","stationery"]},"chart-increasing":{"a":"Chart Increasing","b":"1F4C8","j":["business","stats","presentation","growth","success","money","chart","sales","good","recovery","graph","trend","upward","economics"]},"chart-decreasing":{"a":"Chart Decreasing","b":"1F4C9","j":["business","stats","failure","presentation","down","money","chart","recession","sales","bad","graph","trend","economics"]},"bar-chart":{"a":"Bar Chart","b":"1F4CA","j":["stats","presentation","bar","chart","graph"]},"clipboard":{"a":"Clipboard","b":"1F4CB","j":["stationery","documents"]},"pushpin":{"a":"Pushpin","b":"1F4CC","j":["stationery","mark","here","pin"]},"round-pushpin":{"a":"Round Pushpin","b":"1F4CD","j":["pushpin","location","stationery","map","here","pin"]},"paperclip":{"a":"Paperclip","b":"1F4CE","j":["stationery","documents"]},"linked-paperclips":{"a":"Linked Paperclips","b":"1F587","j":["stationery","link","documents","paperclip"]},"straight-ruler":{"a":"Straight Ruler","b":"1F4CF","j":["drawing","architect","sketch","school","math","stationery","calculate","straight edge","ruler","length"]},"triangular-ruler":{"a":"Triangular Ruler","b":"1F4D0","j":["sketch","architect","math","triangle","stationery","ruler","set"]},"scissors":{"a":"Scissors","b":"2702","j":["stationery","tool","cut","cutting"]},"card-file-box":{"a":"Card File Box","b":"1F5C3","j":["business","card","file","stationery","box"]},"file-cabinet":{"a":"File Cabinet","b":"1F5C4","j":["cabinet","file","filing","organizing"]},"wastebasket":{"a":"Wastebasket","b":"1F5D1","j":["rubbish","trash","garbage","bin","toss"]},"locked":{"a":"Locked","b":"1F512","j":["padlock","closed","password","security"]},"unlocked":{"a":"Unlocked","b":"1F513","j":["privacy","unlock","open","lock","security"]},"locked-with-pen":{"a":"Locked with Pen","b":"1F50F","j":["privacy","pen","lock","ink","security","secret","nib"]},"locked-with-key":{"a":"Locked with Key","b":"1F510","j":["privacy","closed","lock","key","security","secure"]},"key":{"a":"Key","b":"1F511","j":["door","password","lock"]},"old-key":{"a":"Old Key","b":"1F5DD","j":["password","lock","old","door","key","clue"]},"hammer":{"a":"Hammer","b":"1F528","j":["create","tools","tool","build"]},"axe":{"a":"Axe","b":"1FA93","j":["chop","hatchet","wood","tool","split","cut"]},"pick":{"a":"Pick","b":"26CF","j":["dig","tools","tool","mining"]},"hammer-and-pick":{"a":"Hammer and Pick","b":"2692","j":["hammer","build","tool","pick","create","tools"]},"hammer-and-wrench":{"a":"Hammer and Wrench","b":"1F6E0","j":["spanner","wrench","hammer","build","tool","create","tools"]},"dagger":{"a":"Dagger","b":"1F5E1","j":["knife","weapon"]},"crossed-swords":{"a":"Crossed Swords","b":"2694","j":["crossed","weapon","swords"]},"water-pistol":{"a":"Water Pistol","b":"1F52B","j":["gun","water","revolver","tool","weapon","handgun","pistol","violence"]},"boomerang":{"a":"Boomerang","b":"1FA83","j":["repercussion","rebound","australia","weapon"]},"bow-and-arrow":{"a":"Bow and Arrow","b":"1F3F9","j":["archer","sports","bow","Sagittarius","arrow","zodiac"]},"shield":{"a":"Shield","b":"1F6E1","j":["protection","security","weapon"]},"carpentry-saw":{"a":"Carpentry Saw","b":"1FA9A","j":["chop","carpenter","tool","cut","lumber","saw"]},"wrench":{"a":"Wrench","b":"1F527","j":["spanner","fix","tool","diy","ikea","maintainer","tools"]},"screwdriver":{"a":"Screwdriver","b":"1FA9B","j":["screw","tools","tool"]},"nut-and-bolt":{"a":"Nut and Bolt","b":"1F529","j":["fix","nut","bolt","tool","handy","tools"]},"gear":{"a":"Gear","b":"2699","j":["cogwheel","tool","cog"]},"clamp":{"a":"Clamp","b":"1F5DC","j":["compress","vice","tool"]},"balance-scale":{"a":"Balance Scale","b":"2696","j":["balance","scale","Libra","weight","law","justice","zodiac","fairness"]},"white-cane":{"a":"White Cane","b":"1F9AF","j":["accessibility","blind","probing_cane"]},"link":{"a":"Link","b":"1F517","j":["rings","url"]},"chains":{"a":"Chains","b":"26D3","j":["arrest","chain","lock"]},"hook":{"a":"Hook","b":"1FA9D","j":["crook","catch","ensnare","curve","selling point","tools"]},"toolbox":{"a":"Toolbox","b":"1F9F0","j":["fix","chest","tool","diy","mechanic","maintainer","tools"]},"magnet":{"a":"Magnet","b":"1F9F2","j":["magnetic","attraction","horseshoe"]},"ladder":{"a":"Ladder","b":"1FA9C","j":["rung","tools","climb","step"]},"alembic":{"a":"Alembic","b":"2697","j":["tool","chemistry","experiment","distilling","science"]},"test-tube":{"a":"Test Tube","b":"1F9EA","j":["chemist","experiment","chemistry","lab","science"]},"petri-dish":{"a":"Petri Dish","b":"1F9EB","j":["bacteria","culture","biology","lab","biologist"]},"dna":{"a":"Dna","b":"1F9EC","j":["genetics","gene","biologist","life","evolution"]},"microscope":{"a":"Microscope","b":"1F52C","j":["tool","experiment","zoomin","laboratory","study","science"]},"telescope":{"a":"Telescope","b":"1F52D","j":["stars","zoom","space","tool","astronomy","science"]},"satellite-antenna":{"a":"Satellite Antenna","b":"1F4E1","j":["communication","space","satellite","future","antenna","radio","dish"]},"syringe":{"a":"Syringe","b":"1F489","j":["sick","needle","drugs","blood","health","nurse","medicine","doctor","shot","hospital"]},"drop-of-blood":{"a":"Drop of Blood","b":"1FA78","j":["period","harm","injury","medicine","menstruation","wound","bleed","blood donation","hurt"]},"pill":{"a":"Pill","b":"1F48A","j":["sick","health","medicine","doctor","drug","pharmacy"]},"adhesive-bandage":{"a":"Adhesive Bandage","b":"1FA79","j":["bandage","heal"]},"stethoscope":{"a":"Stethoscope","b":"1FA7A","j":["medicine","heart","doctor","health"]},"door":{"a":"Door","b":"1F6AA","j":["entry","exit","house"]},"elevator":{"a":"Elevator","b":"1F6D7","j":["accessibility","hoist","lift"]},"mirror":{"a":"Mirror","b":"1FA9E","j":["speculum","reflection","reflector"]},"window":{"a":"Window","b":"1FA9F","j":["frame","transparent","scenery","fresh air","opening","view"]},"bed":{"a":"Bed","b":"1F6CF","j":["rest","hotel","sleep"]},"couch-and-lamp":{"a":"Couch and Lamp","b":"1F6CB","j":["lamp","read","chill","couch","hotel"]},"chair":{"a":"Chair","b":"1FA91","j":["furniture","sit","seat"]},"toilet":{"a":"Toilet","b":"1F6BD","j":["washroom","bathroom","potty","restroom","wc"]},"plunger":{"a":"Plunger","b":"1FAA0","j":["suction","plumber","toilet","force cup"]},"shower":{"a":"Shower","b":"1F6BF","j":["water","bathroom","clean"]},"bathtub":{"a":"Bathtub","b":"1F6C1","j":["shower","bath","bathroom","clean"]},"mouse-trap":{"a":"Mouse Trap","b":"1FAA4","j":["trap","bait","snare","cheese","mousetrap"]},"razor":{"a":"Razor","b":"1FA92","j":["cut","sharp","shave"]},"lotion-bottle":{"a":"Lotion Bottle","b":"1F9F4","j":["moisturizer","lotion","sunscreen","shampoo"]},"safety-pin":{"a":"Safety Pin","b":"1F9F7","j":["diaper","punk rock"]},"broom":{"a":"Broom","b":"1F9F9","j":["cleaning","sweeping","witch"]},"basket":{"a":"Basket","b":"1F9FA","j":["picnic","farming","laundry"]},"roll-of-paper":{"a":"Roll of Paper","b":"1F9FB","j":["roll","paper towels","toilet paper"]},"bucket":{"a":"Bucket","b":"1FAA3","j":["vat","water","container","cask","pail"]},"soap":{"a":"Soap","b":"1F9FC","j":["soapdish","lather","bar","bathing","cleaning"]},"toothbrush":{"a":"Toothbrush","b":"1FAA5","j":["hygiene","teeth","dental","bathroom","clean","brush"]},"sponge":{"a":"Sponge","b":"1F9FD","j":["porous","cleaning","absorbing"]},"fire-extinguisher":{"a":"Fire Extinguisher","b":"1F9EF","j":["fire","extinguish","quench"]},"shopping-cart":{"a":"Shopping Cart","b":"1F6D2","j":["trolley","cart","shopping"]},"cigarette":{"a":"Cigarette","b":"1F6AC","j":["kills","smoking","smoke","joint","tobacco"]},"coffin":{"a":"Coffin","b":"26B0","j":["funeral","cemetery","vampire","rip","die","graveyard","box","death","casket","dead"]},"headstone":{"a":"Headstone","b":"1FAA6","j":["cemetery","rip","graveyard","grave","tombstone","death"]},"funeral-urn":{"a":"Funeral Urn","b":"26B1","j":["funeral","rip","ashes","die","urn","death","dead"]},"moai":{"a":"Moai","b":"1F5FF","j":["moyai","rock","statue","face","easter island"]},"placard":{"a":"Placard","b":"1FAA7","j":["demonstration","picket","sign","announcement","protest"]},"atm-sign":{"a":"Atm Sign","b":"1F3E7","j":["teller","cash","payment","ATM sign","money","sales","automated","blue-square","atm","bank"]},"litter-in-bin-sign":{"a":"Litter in Bin Sign","b":"1F6AE","j":["info","litter bin","sign","blue-square","litter","human"]},"potable-water":{"a":"Potable Water","b":"1F6B0","j":["cleaning","water","restroom","potable","blue-square","drinking","faucet","liquid"]},"wheelchair-symbol":{"a":"Wheelchair Symbol","b":"267F","j":["accessibility","disabled","blue-square","access"]},"mens-room":{"a":"Men’S Room","b":"1F6B9","j":["lavatory","men_s_room","male","man","toilet","gender","restroom","blue-square","men’s room","wc"]},"womens-room":{"a":"Women’S Room","b":"1F6BA","j":["lavatory","purple-square","loo","women_s_room","woman","toilet","gender","female","restroom","women’s room","wc"]},"restroom":{"a":"Restroom","b":"1F6BB","j":["lavatory","toilet","gender","refresh","WC","blue-square","wc"]},"baby-symbol":{"a":"Baby Symbol","b":"1F6BC","j":["orange-square","child","changing","baby"]},"water-closet":{"a":"Water Closet","b":"1F6BE","j":["lavatory","water","toilet","closet","restroom","blue-square","wc"]},"passport-control":{"a":"Passport Control","b":"1F6C2","j":["control","passport","blue-square","custom"]},"customs":{"a":"Customs","b":"1F6C3","j":["border","blue-square","passport"]},"baggage-claim":{"a":"Baggage Claim","b":"1F6C4","j":["baggage","claim","transport","airport","blue-square"]},"left-luggage":{"a":"Left Luggage","b":"1F6C5","j":["baggage","luggage","travel","blue-square","locker"]},"warning":{"a":"Warning","b":"26A0","j":["exclamation","wip","issue","error","problem","alert"]},"children-crossing":{"a":"Children Crossing","b":"1F6B8","j":["traffic","driving","school","sign","child","pedestrian","crossing","warning","danger","yellow-diamond"]},"no-entry":{"a":"No Entry","b":"26D4","j":["privacy","traffic","limit","stop","no","not","prohibited","denied","entry","circle","bad","security","forbidden"]},"prohibited":{"a":"Prohibited","b":"1F6AB","j":["limit","stop","disallow","no","not","denied","forbid","entry","circle","forbidden"]},"no-bicycles":{"a":"No Bicycles","b":"1F6B3","j":["cyclist","no","bike","prohibited","bicycle","circle","forbidden"]},"no-smoking":{"a":"No Smoking","b":"1F6AD","j":["cigarette","no","prohibited","not","smoking","smell","smoke","blue-square","forbidden"]},"no-littering":{"a":"No Littering","b":"1F6AF","j":["trash","not","no","prohibited","garbage","bin","circle","litter","forbidden"]},"nonpotable-water":{"a":"Non-Potable Water","b":"1F6B1","j":["non_potable_water","faucet","water","drink","circle","tap","non-drinking","non-potable"]},"no-pedestrians":{"a":"No Pedestrians","b":"1F6B7","j":["no","not","prohibited","rules","circle","walking","pedestrian","crossing","forbidden"]},"no-mobile-phones":{"a":"No Mobile Phones","b":"1F4F5","j":["mobile","no","mute","cell","circle","iphone","forbidden","phone"]},"no-one-under-eighteen":{"a":"No One Under Eighteen","b":"1F51E","j":["night","prohibited","underage","eighteen","drink","circle","18","minor","pub","age restriction"]},"radioactive":{"a":"Radioactive","b":"2622","j":["nuclear","danger","sign"]},"biohazard":{"a":"Biohazard","b":"2623","j":["danger","sign"]},"up-arrow":{"a":"Up Arrow","b":"2B06","j":["north","arrow","direction","cardinal","continue","top","blue-square"]},"upright-arrow":{"a":"Up-Right Arrow","b":"2197","j":["point","up_right_arrow","arrow","direction","northeast","diagonal","blue-square","intercardinal","up-right arrow"]},"right-arrow":{"a":"Right Arrow","b":"27A1","j":["arrow","direction","cardinal","east","next","blue-square"]},"downright-arrow":{"a":"Down-Right Arrow","b":"2198","j":["down_right_arrow","arrow","direction","southeast","diagonal","blue-square","down-right arrow","intercardinal"]},"down-arrow":{"a":"Down Arrow","b":"2B07","j":["south","arrow","direction","cardinal","down","blue-square","bottom"]},"downleft-arrow":{"a":"Down-Left Arrow","b":"2199","j":["arrow","direction","down_left_arrow","down-left arrow","southwest","diagonal","blue-square","intercardinal"]},"left-arrow":{"a":"Left Arrow","b":"2B05","j":["previous","arrow","cardinal","direction","west","blue-square","back"]},"upleft-arrow":{"a":"Up-Left Arrow","b":"2196","j":["point","arrow","direction","northwest","diagonal","blue-square","intercardinal","up_left_arrow","up-left arrow"]},"updown-arrow":{"a":"Up-Down Arrow","b":"2195","j":["arrow","direction","way","up_down_arrow","blue-square","vertical","up-down arrow"]},"leftright-arrow":{"a":"Left-Right Arrow","b":"2194","j":["sideways","horizontal","left-right arrow","arrow","direction","shape","left_right_arrow"]},"right-arrow-curving-left":{"a":"Right Arrow Curving Left","b":"21A9","j":["enter","arrow","return","blue-square","undo","back"]},"left-arrow-curving-right":{"a":"Left Arrow Curving Right","b":"21AA","j":["arrow","direction","rotate","return","blue-square"]},"right-arrow-curving-up":{"a":"Right Arrow Curving Up","b":"2934","j":["top","arrow","direction","blue-square"]},"right-arrow-curving-down":{"a":"Right Arrow Curving Down","b":"2935","j":["arrow","direction","down","blue-square","bottom"]},"clockwise-vertical-arrows":{"a":"Clockwise Vertical Arrows","b":"1F503","j":["reload","clockwise","arrow","cycle","repeat","sync","round"]},"counterclockwise-arrows-button":{"a":"Counterclockwise Arrows Button","b":"1F504","j":["withershins","arrow","cycle","sync","blue-square","anticlockwise","counterclockwise"]},"back-arrow":{"a":"Back Arrow","b":"1F519","j":["arrow","return","words","BACK arrow","back"]},"end-arrow":{"a":"End Arrow","b":"1F51A","j":["words","arrow","END arrow","end"]},"on-arrow":{"a":"On! Arrow","b":"1F51B","j":["on","arrow","words","ON! arrow","mark"]},"soon-arrow":{"a":"Soon Arrow","b":"1F51C","j":["words","arrow","SOON arrow","soon"]},"top-arrow":{"a":"Top Arrow","b":"1F51D","j":["up","TOP arrow","top","arrow","words","blue-square"]},"place-of-worship":{"a":"Place of Worship","b":"1F6D0","j":["church","worship","religion","temple","prayer"]},"atom-symbol":{"a":"Atom Symbol","b":"269B","j":["atheist","atom","chemistry","physics","science"]},"om":{"a":"Om","b":"1F549","j":["hinduism","religion","sikhism","jainism","Hindu","buddhism"]},"star-of-david":{"a":"Star of David","b":"2721","j":["Jew","star of David","religion","Jewish","David","judaism","star"]},"wheel-of-dharma":{"a":"Wheel of Dharma","b":"2638","j":["dharma","hinduism","Buddhist","wheel","religion","sikhism","jainism","buddhism"]},"yin-yang":{"a":"Yin Yang","b":"262F","j":["taoist","balance","religion","yang","yin","tao"]},"latin-cross":{"a":"Latin Cross","b":"271D","j":["religion","Christian","christianity","cross"]},"orthodox-cross":{"a":"Orthodox Cross","b":"2626","j":["religion","suppedaneum","Christian","cross"]},"star-and-crescent":{"a":"Star and Crescent","b":"262A","j":["religion","islam","Muslim"]},"peace-symbol":{"a":"Peace Symbol","b":"262E","j":["peace","hippie"]},"menorah":{"a":"Menorah","b":"1F54E","j":["religion","candelabrum","jewish","candlestick","hanukkah","candles"]},"dotted-sixpointed-star":{"a":"Dotted Six-Pointed Star","b":"1F52F","j":["purple-square","dotted six-pointed star","dotted_six_pointed_star","religion","jewish","hexagram","fortune","star"]},"aries":{"a":"Aries","b":"2648","j":["purple-square","sign","ram","astrology","zodiac"]},"taurus":{"a":"Taurus","b":"2649","j":["purple-square","ox","sign","bull","astrology","zodiac"]},"gemini":{"a":"Gemini","b":"264A","j":["purple-square","twins","sign","astrology","zodiac"]},"cancer":{"a":"Cancer","b":"264B","j":["purple-square","sign","astrology","crab","zodiac"]},"leo":{"a":"Leo","b":"264C","j":["purple-square","lion","sign","astrology","zodiac"]},"virgo":{"a":"Virgo","b":"264D","j":["zodiac","purple-square","sign","astrology"]},"libra":{"a":"Libra","b":"264E","j":["balance","purple-square","scales","sign","astrology","justice","zodiac"]},"scorpio":{"a":"Scorpio","b":"264F","j":["purple-square","scorpius","sign","astrology","zodiac","scorpion"]},"sagittarius":{"a":"Sagittarius","b":"2650","j":["purple-square","archer","sign","astrology","zodiac"]},"capricorn":{"a":"Capricorn","b":"2651","j":["purple-square","sign","goat","astrology","zodiac"]},"aquarius":{"a":"Aquarius","b":"2652","j":["purple-square","water","sign","astrology","bearer","zodiac"]},"pisces":{"a":"Pisces","b":"2653","j":["fish","purple-square","sign","astrology","zodiac"]},"ophiuchus":{"a":"Ophiuchus","b":"26CE","j":["purple-square","constellation","sign","astrology","snake","bearer","serpent","zodiac"]},"shuffle-tracks-button":{"a":"Shuffle Tracks Button","b":"1F500","j":["shuffle","random","arrow","music","blue-square","crossed"]},"repeat-button":{"a":"Repeat Button","b":"1F501","j":["loop","clockwise","arrow","repeat","record"]},"repeat-single-button":{"a":"Repeat Single Button","b":"1F502","j":["loop","clockwise","arrow","once","blue-square"]},"play-button":{"a":"Play Button","b":"25B6","j":["right","arrow","direction","triangle","blue-square","play"]},"fastforward-button":{"a":"Fast-Forward Button","b":"23E9","j":["speed","forward","arrow","fast_forward_button","continue","double","fast","blue-square","fast-forward button","play"]},"next-track-button":{"a":"Next Track Button","b":"23ED","j":["next scene","forward","arrow","triangle","next","blue-square","next track"]},"play-or-pause-button":{"a":"Play or Pause Button","b":"23EF","j":["right","arrow","triangle","blue-square","pause","play"]},"reverse-button":{"a":"Reverse Button","b":"25C0","j":["left","arrow","direction","triangle","reverse","blue-square"]},"fast-reverse-button":{"a":"Fast Reverse Button","b":"23EA","j":["arrow","double","blue-square","rewind","play"]},"last-track-button":{"a":"Last Track Button","b":"23EE","j":["previous track","arrow","triangle","backward","previous scene"]},"upwards-button":{"a":"Upwards Button","b":"1F53C","j":["point","red","forward","arrow","direction","top","triangle","button","blue-square"]},"fast-up-button":{"a":"Fast Up Button","b":"23EB","j":["top","arrow","direction","double","blue-square"]},"downwards-button":{"a":"Downwards Button","b":"1F53D","j":["red","arrow","direction","down","button","blue-square","bottom"]},"fast-down-button":{"a":"Fast Down Button","b":"23EC","j":["arrow","direction","down","double","blue-square","bottom"]},"pause-button":{"a":"Pause Button","b":"23F8","j":["double","bar","blue-square","pause","vertical"]},"stop-button":{"a":"Stop Button","b":"23F9","j":["square","stop","blue-square"]},"record-button":{"a":"Record Button","b":"23FA","j":["record","circle","blue-square"]},"eject-button":{"a":"Eject Button","b":"23CF","j":["eject","blue-square"]},"cinema":{"a":"Cinema","b":"1F3A6","j":["movie","camera","film","stage","curtain","blue-square","record","theater"]},"dim-button":{"a":"Dim Button","b":"1F505","j":["dim","low","warm","sun","summer","afternoon","brightness"]},"bright-button":{"a":"Bright Button","b":"1F506","j":["light","sun","brightness","bright"]},"antenna-bars":{"a":"Antenna Bars","b":"1F4F6","j":["mobile","internet","connection","wifi","cell","bar","bars","reception","blue-square","antenna","bluetooth","phone"]},"vibration-mode":{"a":"Vibration Mode","b":"1F4F3","j":["orange-square","mobile","mode","vibration","cell","telephone","phone"]},"mobile-phone-off":{"a":"Mobile Phone off","b":"1F4F4","j":["orange-square","mobile","mute","cell","off","telephone","silence","quiet","phone"]},"female-sign":{"a":"Female Sign","b":"2640","j":["woman","women","girl","lady"]},"male-sign":{"a":"Male Sign","b":"2642","j":["man","boy","men"]},"transgender-symbol":{"a":"Transgender Symbol","b":"26A7","j":["lgbtq","transgender"]},"multiply":{"a":"Multiply","b":"2716","j":["cancel","multiplication_sign","x","math","sign","multiplication","calculation","×"]},"plus":{"a":"Plus","b":"2795","j":["+","addition","math","more","sign","increase","calculation","plus_sign"]},"minus":{"a":"Minus","b":"2796","j":["-","math","less","sign","−","minus_sign","subtract","calculation"]},"divide":{"a":"Divide","b":"2797","j":["÷","math","division","sign","calculation","division_sign"]},"infinity":{"a":"Infinity","b":"267E","j":["universal","forever","unbounded"]},"double-exclamation-mark":{"a":"Double Exclamation Mark","b":"203C","j":["exclamation","surprise","!","mark","!!","bangbang"]},"exclamation-question-mark":{"a":"Exclamation Question Mark","b":"2049","j":["exclamation","surprise","wat","punctuation","!","?","mark","question","interrobang","!?"]},"red-question-mark":{"a":"Red Question Mark","b":"2753","j":["punctuation","question_mark","confused","question","?","mark","doubt"]},"white-question-mark":{"a":"White Question Mark","b":"2754","j":["outlined","gray","punctuation","doubts","confused","question","?","huh","mark"]},"white-exclamation-mark":{"a":"White Exclamation Mark","b":"2755","j":["exclamation","surprise","wow","outlined","gray","punctuation","!","mark","warning"]},"red-exclamation-mark":{"a":"Red Exclamation Mark","b":"2757","j":["exclamation","surprise","wow","punctuation","exclamation_mark","!","mark","warning","danger","heavy_exclamation_mark"]},"wavy-dash":{"a":"Wavy Dash","b":"3030","j":["draw","punctuation","mustache","line","moustache","squiggle","wavy","scribble","dash"]},"currency-exchange":{"a":"Currency Exchange","b":"1F4B1","j":["exchange","currency","dollar","money","sales","travel","bank"]},"heavy-dollar-sign":{"a":"Heavy Dollar Sign","b":"1F4B2","j":["currency","buck","payment","dollar","money","sales"]},"medical-symbol":{"a":"Medical Symbol","b":"2695","j":["health","medicine","staff","aesculapius","hospital"]},"recycling-symbol":{"a":"Recycling Symbol","b":"267B","j":["recycle","trash","garbage","arrow","environment"]},"fleurdelis":{"a":"Fleur-De-Lis","b":"269C","j":["scout","fleur-de-lis","decorative","fleur_de_lis"]},"trident-emblem":{"a":"Trident Emblem","b":"1F531","j":["trident","ship","spear","tool","emblem","weapon","anchor"]},"name-badge":{"a":"Name Badge","b":"1F4DB","j":["name","fire","badge","forbid"]},"japanese-symbol-for-beginner":{"a":"Japanese Symbol for Beginner","b":"1F530","j":["shield","badge","leaf","Japanese","chevron","Japanese symbol for beginner","beginner"]},"hollow-red-circle":{"a":"Hollow Red Circle","b":"2B55","j":["red","o","large","circle","round"]},"check-mark-button":{"a":"Check Mark Button","b":"2705","j":["ok","answer","check","green-square","tick","election","✓","button","mark","vote","agree"]},"check-box-with-check":{"a":"Check Box with Check","b":"2611","j":["confirm","ok","black-square","check","tick","election","✓","box","vote","yes","agree"]},"check-mark":{"a":"Check Mark","b":"2714","j":["ok","answer","check","nike","tick","✓","mark","yes"]},"cross-mark":{"a":"Cross Mark","b":"274C","j":["cancel","multiply","red","no","x","cross","delete","remove","multiplication","mark","×"]},"cross-mark-button":{"a":"Cross Mark Button","b":"274E","j":["no","x","green-square","mark","×","square","deny"]},"curly-loop":{"a":"Curly Loop","b":"27B0","j":["loop","draw","shape","squiggle","scribble","curl"]},"double-curly-loop":{"a":"Double Curly Loop","b":"27BF","j":["loop","cassette","double","tape","curl"]},"part-alternation-mark":{"a":"Part Alternation Mark","b":"303D","j":["business","stats","presentation","bad","mark","graph","part","economics"]},"eightspoked-asterisk":{"a":"Eight-Spoked Asterisk","b":"2733","j":["*","sparkle","green-square","eight_spoked_asterisk","asterisk","eight-spoked asterisk","star"]},"eightpointed-star":{"a":"Eight-Pointed Star","b":"2734","j":["*","orange-square","polygon","eight_pointed_star","eight-pointed star","shape","star"]},"sparkle":{"a":"Sparkle","b":"2747","j":["*","stars","fireworks","awesome","green-square","good"]},"copyright":{"a":"Copyright","b":"00A9","j":["license","ip","circle","c","legal","law"]},"registered":{"a":"Registered","b":"00AE","j":["alphabet","circle","r"]},"trade-mark":{"a":"Trade Mark","b":"2122","j":["trademark","brand","tm","mark","legal","law"]},"keycap":{"a":"Keycap: *","b":"002A-FE0F-20E3","j":["star","keycap_"]},"keycap-0":{"a":"Keycap: 0","b":"0030-FE0F-20E3","j":["null","numbers","0","blue-square","keycap"]},"keycap-1":{"a":"Keycap: 1","b":"0031-FE0F-20E3","j":["1","numbers","keycap","blue-square"]},"keycap-2":{"a":"Keycap: 2","b":"0032-FE0F-20E3","j":["numbers","prime","blue-square","keycap","2"]},"keycap-3":{"a":"Keycap: 3","b":"0033-FE0F-20E3","j":["numbers","3","prime","blue-square","keycap"]},"keycap-4":{"a":"Keycap: 4","b":"0034-FE0F-20E3","j":["numbers","keycap","4","blue-square"]},"keycap-5":{"a":"Keycap: 5","b":"0035-FE0F-20E3","j":["numbers","5","prime","blue-square","keycap"]},"keycap-6":{"a":"Keycap: 6","b":"0036-FE0F-20E3","j":["6","numbers","keycap","blue-square"]},"keycap-7":{"a":"Keycap: 7","b":"0037-FE0F-20E3","j":["numbers","7","prime","blue-square","keycap"]},"keycap-8":{"a":"Keycap: 8","b":"0038-FE0F-20E3","j":["numbers","keycap","8","blue-square"]},"keycap-9":{"a":"Keycap: 9","b":"0039-FE0F-20E3","j":["numbers","keycap","9","blue-square"]},"keycap-10":{"a":"Keycap: 10","b":"1F51F","j":["10","numbers","keycap","blue-square"]},"input-latin-uppercase":{"a":"Input Latin Uppercase","b":"1F520","j":["alphabet","ABCD","uppercase","words","blue-square","letters","latin","input"]},"input-latin-lowercase":{"a":"Input Latin Lowercase","b":"1F521","j":["alphabet","abcd","blue-square","letters","latin","input","lowercase"]},"input-numbers":{"a":"Input Numbers","b":"1F522","j":["numbers","1234","input","blue-square"]},"input-symbols":{"a":"Input Symbols","b":"1F523","j":["〒♪&%","characters","glyphs","note","music","blue-square","percent","ampersand","input"]},"input-latin-letters":{"a":"Input Latin Letters","b":"1F524","j":["alphabet","abc","blue-square","letters","latin","input"]},"a-button-blood-type":{"a":"A Button (Blood Type)","b":"1F170","j":["a","letter","alphabet","a_button","red-square","A button (blood type)","blood type"]},"ab-button-blood-type":{"a":"Ab Button (Blood Type)","b":"1F18E","j":["ab","alphabet","ab_button","red-square","AB button (blood type)","blood type"]},"b-button-blood-type":{"a":"B Button (Blood Type)","b":"1F171","j":["letter","alphabet","b","B button (blood type)","red-square","b_button","blood type"]},"cl-button":{"a":"Cl Button","b":"1F191","j":["cl","alphabet","CL button","words","red-square"]},"cool-button":{"a":"Cool Button","b":"1F192","j":["words","cool","COOL button","blue-square"]},"free-button":{"a":"Free Button","b":"1F193","j":["words","FREE button","free","blue-square"]},"information":{"a":"Information","b":"2139","j":["alphabet","letter","i","blue-square"]},"id-button":{"a":"Id Button","b":"1F194","j":["purple-square","id","ID button","words","identity"]},"circled-m":{"a":"Circled M","b":"24C2","j":["blue-circle","letter","alphabet","circle","circled M","m"]},"new-button":{"a":"New Button","b":"1F195","j":["start","words","NEW button","blue-square","new"]},"ng-button":{"a":"Ng Button","b":"1F196","j":["NG button","ng","icon","words","shape","blue-square"]},"o-button-blood-type":{"a":"O Button (Blood Type)","b":"1F17E","j":["letter","O button (blood type)","o","alphabet","o_button","red-square","blood type"]},"ok-button":{"a":"Ok Button","b":"1F197","j":["OK button","good","blue-square","OK","yes","agree"]},"p-button":{"a":"P Button","b":"1F17F","j":["cars","letter","alphabet","blue-square","parking","P button"]},"sos-button":{"a":"Sos Button","b":"1F198","j":["SOS button","911","help","words","emergency","red-square","sos"]},"up-button":{"a":"Up! Button","b":"1F199","j":["up","high","above","mark","blue-square","UP! button"]},"vs-button":{"a":"Vs Button","b":"1F19A","j":["orange-square","vs","words","VS button","versus"]},"japanese-here-button":{"a":"Japanese “Here” Button","b":"1F201","j":["Japanese “here” button","Japanese","destination","katakana","“here”","blue-square","japanese","ココ","here"]},"japanese-service-charge-button":{"a":"Japanese “Service Charge” Button","b":"1F202","j":["“service charge”","Japanese","katakana","Japanese “service charge” button","サ","blue-square","japanese"]},"japanese-monthly-amount-button":{"a":"Japanese “Monthly Amount” Button","b":"1F237","j":["orange-square","month","Japanese","Japanese “monthly amount” button","“monthly amount”","chinese","月","kanji","japanese","ideograph","moon"]},"japanese-not-free-of-charge-button":{"a":"Japanese “Not Free of Charge” Button","b":"1F236","j":["orange-square","有","“not free of charge”","Japanese","Japanese “not free of charge” button","chinese","kanji","ideograph","have"]},"japanese-reserved-button":{"a":"Japanese “Reserved” Button","b":"1F22F","j":["point","Japanese “reserved” button","green-square","Japanese","chinese","指","kanji","ideograph","“reserved”"]},"japanese-bargain-button":{"a":"Japanese “Bargain” Button","b":"1F250","j":["“bargain”","得","Japanese “bargain” button","Japanese","get","circle","chinese","kanji","ideograph","obtain"]},"japanese-discount-button":{"a":"Japanese “Discount” Button","b":"1F239","j":["“discount”","Japanese","Japanese “discount” button","divide","chinese","kanji","ideograph","pink-square","cut","割"]},"japanese-free-of-charge-button":{"a":"Japanese “Free of Charge” Button","b":"1F21A","j":["“free of charge”","orange-square","無","Japanese","Japanese “free of charge” button","chinese","kanji","japanese","ideograph","nothing"]},"japanese-prohibited-button":{"a":"Japanese “Prohibited” Button","b":"1F232","j":["禁","limit","forbidden","“prohibited”","Japanese “prohibited” button","Japanese","restricted","kanji","chinese","japanese","red-square","ideograph"]},"japanese-acceptable-button":{"a":"Japanese “Acceptable” Button","b":"1F251","j":["ok","Japanese “acceptable” button","Japanese","可","chinese","good","kanji","ideograph","orange-circle","yes","“acceptable”","agree"]},"japanese-application-button":{"a":"Japanese “Application” Button","b":"1F238","j":["orange-square","申","“application”","Japanese","chinese","kanji","japanese","Japanese “application” button","ideograph"]},"japanese-passing-grade-button":{"a":"Japanese “Passing Grade” Button","b":"1F234","j":["“passing grade”","Japanese “passing grade” button","Japanese","join","chinese","kanji","合","japanese","red-square","ideograph"]},"japanese-vacancy-button":{"a":"Japanese “Vacancy” Button","b":"1F233","j":["Japanese “vacancy” button","Japanese","sky","japanese","kanji","chinese","empty","blue-square","“vacancy”","空","ideograph"]},"japanese-congratulations-button":{"a":"Japanese “Congratulations” Button","b":"3297","j":["Japanese","祝","Japanese “congratulations” button","chinese","kanji","“congratulations”","japanese","ideograph","red-circle"]},"japanese-secret-button":{"a":"Japanese “Secret” Button","b":"3299","j":["Japanese “secret” button","privacy","sshh","秘","Japanese","chinese","kanji","ideograph","“secret”","red-circle"]},"japanese-open-for-business-button":{"a":"Japanese “Open for Business” Button","b":"1F23A","j":["“open for business”","orange-square","opening hours","Japanese “open for business” button","Japanese","営","japanese","ideograph"]},"japanese-no-vacancy-button":{"a":"Japanese “No Vacancy” Button","b":"1F235","j":["full","満","Japanese","“no vacancy”","chinese","kanji","japanese","red-square","ideograph","Japanese “no vacancy” button"]},"red-circle":{"a":"Red Circle","b":"1F534","j":["geometric","red","shape","error","circle","danger"]},"orange-circle":{"a":"Orange Circle","b":"1F7E0","j":["circle","round","orange"]},"yellow-circle":{"a":"Yellow Circle","b":"1F7E1","j":["yellow","circle","round"]},"green-circle":{"a":"Green Circle","b":"1F7E2","j":["green","circle","round"]},"blue-circle":{"a":"Blue Circle","b":"1F535","j":["geometric","icon","shape","button","circle","blue"]},"purple-circle":{"a":"Purple Circle","b":"1F7E3","j":["circle","round","purple"]},"brown-circle":{"a":"Brown Circle","b":"1F7E4","j":["brown","circle","round"]},"black-circle":{"a":"Black Circle","b":"26AB","j":["geometric","shape","button","circle","round"]},"white-circle":{"a":"White Circle","b":"26AA","j":["shape","geometric","round","circle"]},"red-square":{"a":"Red Square","b":"1F7E5","j":["square","red"]},"orange-square":{"a":"Orange Square","b":"1F7E7","j":["square","orange"]},"yellow-square":{"a":"Yellow Square","b":"1F7E8","j":["yellow","square"]},"green-square":{"a":"Green Square","b":"1F7E9","j":["green","square"]},"blue-square":{"a":"Blue Square","b":"1F7E6","j":["square","blue"]},"purple-square":{"a":"Purple Square","b":"1F7EA","j":["square","purple"]},"brown-square":{"a":"Brown Square","b":"1F7EB","j":["brown","square"]},"black-large-square":{"a":"Black Large Square","b":"2B1B","j":["geometric","icon","shape","button","square"]},"white-large-square":{"a":"White Large Square","b":"2B1C","j":["geometric","icon","stone","shape","button","square"]},"black-medium-square":{"a":"Black Medium Square","b":"25FC","j":["geometric","icon","shape","button","square"]},"white-medium-square":{"a":"White Medium Square","b":"25FB","j":["geometric","icon","stone","shape","square"]},"black-mediumsmall-square":{"a":"Black Medium-Small Square","b":"25FE","j":["black medium-small square","geometric","icon","black_medium_small_square","shape","button","square"]},"white-mediumsmall-square":{"a":"White Medium-Small Square","b":"25FD","j":["geometric","white medium-small square","white_medium_small_square","icon","stone","shape","button","square"]},"black-small-square":{"a":"Black Small Square","b":"25AA","j":["icon","shape","square","geometric"]},"white-small-square":{"a":"White Small Square","b":"25AB","j":["icon","shape","square","geometric"]},"large-orange-diamond":{"a":"Large Orange Diamond","b":"1F536","j":["geometric","gem","jewel","orange","shape","diamond"]},"large-blue-diamond":{"a":"Large Blue Diamond","b":"1F537","j":["geometric","gem","jewel","shape","diamond","blue"]},"small-orange-diamond":{"a":"Small Orange Diamond","b":"1F538","j":["geometric","gem","jewel","orange","shape","diamond"]},"small-blue-diamond":{"a":"Small Blue Diamond","b":"1F539","j":["geometric","gem","jewel","shape","diamond","blue"]},"red-triangle-pointed-up":{"a":"Red Triangle Pointed Up","b":"1F53A","j":["up","geometric","red","top","direction","shape"]},"red-triangle-pointed-down":{"a":"Red Triangle Pointed Down","b":"1F53B","j":["geometric","red","direction","down","shape","bottom"]},"diamond-with-a-dot":{"a":"Diamond with a Dot","b":"1F4A0","j":["geometric","gem","fancy","jewel","inside","comic","diamond","crystal","blue"]},"radio-button":{"a":"Radio Button","b":"1F518","j":["geometric","old","button","circle","music","radio","input"]},"white-square-button":{"a":"White Square Button","b":"1F533","j":["geometric","outlined","shape","button","square","input"]},"black-square-button":{"a":"Black Square Button","b":"1F532","j":["frame","geometric","shape","button","square","input"]},"chequered-flag":{"a":"Chequered Flag","b":"1F3C1","j":["chequered","checkered","race","racing","gokart","finishline","contest"]},"triangular-flag":{"a":"Triangular Flag","b":"1F6A9","j":["milestone","place","mark","post"]},"crossed-flags":{"a":"Crossed Flags","b":"1F38C","j":["nation","celebration","cross","Japanese","border","japanese","country","crossed"]},"black-flag":{"a":"Black Flag","b":"1F3F4","j":["waving","pirate"]},"white-flag":{"a":"White Flag","b":"1F3F3","j":["loser","give up","surrender","lost","waving","losing","fail"]},"rainbow-flag":{"a":"Rainbow Flag","b":"1F3F3-FE0F-200D-1F308","j":["gay","glbt","pride","lesbian","homosexual","flag","lgbt","bisexual","rainbow","queer","transgender"]},"transgender-flag":{"a":"Transgender Flag","b":"1F3F3-FE0F-200D-26A7-FE0F","j":["pink","lgbtq","light blue","flag","white","transgender"]},"pirate-flag":{"a":"Pirate Flag","b":"1F3F4-200D-2620-FE0F","j":["skull","crossbones","plunder","flag","Jolly Roger","treasure","banner","pirate"]},"flag-ascension-island":{"a":"Flag: Ascension Island","b":"1F1E6-1F1E8","j":["flag"]},"flag-andorra":{"a":"Flag: Andorra","b":"1F1E6-1F1E9","j":["flag","ad","banner","country","nation"]},"flag-united-arab-emirates":{"a":"Flag: United Arab Emirates","b":"1F1E6-1F1EA","j":["united","flag","emirates","banner","arab","country","nation"]},"flag-afghanistan":{"a":"Flag: Afghanistan","b":"1F1E6-1F1EB","j":["af","flag","banner","country","nation"]},"flag-antigua--barbuda":{"a":"Flag: Antigua & Barbuda","b":"1F1E6-1F1EC","j":["barbuda","antigua","flag","banner","country","nation","flag_antigua_barbuda"]},"flag-anguilla":{"a":"Flag: Anguilla","b":"1F1E6-1F1EE","j":["ai","flag","banner","country","nation"]},"flag-albania":{"a":"Flag: Albania","b":"1F1E6-1F1F1","j":["al","flag","banner","country","nation"]},"flag-armenia":{"a":"Flag: Armenia","b":"1F1E6-1F1F2","j":["country","flag","banner","am","nation"]},"flag-angola":{"a":"Flag: Angola","b":"1F1E6-1F1F4","j":["ao","flag","banner","country","nation"]},"flag-antarctica":{"a":"Flag: Antarctica","b":"1F1E6-1F1F6","j":["aq","flag","banner","country","nation"]},"flag-argentina":{"a":"Flag: Argentina","b":"1F1E6-1F1F7","j":["ar","flag","banner","country","nation"]},"flag-american-samoa":{"a":"Flag: American Samoa","b":"1F1E6-1F1F8","j":["ws","flag","banner","country","nation","american"]},"flag-austria":{"a":"Flag: Austria","b":"1F1E6-1F1F9","j":["at","flag","banner","country","nation"]},"flag-australia":{"a":"Flag: Australia","b":"1F1E6-1F1FA","j":["flag","banner","au","country","nation"]},"flag-aruba":{"a":"Flag: Aruba","b":"1F1E6-1F1FC","j":["aw","flag","banner","country","nation"]},"flag-land-islands":{"a":"Flag: Åland Islands","b":"1F1E6-1F1FD","j":["islands","flag","flag_aland_islands","Åland","banner","country","nation"]},"flag-azerbaijan":{"a":"Flag: Azerbaijan","b":"1F1E6-1F1FF","j":["az","flag","banner","country","nation"]},"flag-bosnia--herzegovina":{"a":"Flag: Bosnia & Herzegovina","b":"1F1E7-1F1E6","j":["bosnia","flag_bosnia_herzegovina","flag","herzegovina","banner","country","nation"]},"flag-barbados":{"a":"Flag: Barbados","b":"1F1E7-1F1E7","j":["bb","flag","banner","country","nation"]},"flag-bangladesh":{"a":"Flag: Bangladesh","b":"1F1E7-1F1E9","j":["bd","flag","banner","country","nation"]},"flag-belgium":{"a":"Flag: Belgium","b":"1F1E7-1F1EA","j":["country","flag","banner","be","nation"]},"flag-burkina-faso":{"a":"Flag: Burkina Faso","b":"1F1E7-1F1EB","j":["flag","burkina","banner","faso","country","nation"]},"flag-bulgaria":{"a":"Flag: Bulgaria","b":"1F1E7-1F1EC","j":["flag","banner","bg","country","nation"]},"flag-bahrain":{"a":"Flag: Bahrain","b":"1F1E7-1F1ED","j":["bh","flag","banner","country","nation"]},"flag-burundi":{"a":"Flag: Burundi","b":"1F1E7-1F1EE","j":["flag","banner","bi","country","nation"]},"flag-benin":{"a":"Flag: Benin","b":"1F1E7-1F1EF","j":["country","flag","banner","bj","nation"]},"flag-st-barthlemy":{"a":"Flag: St. Barthélemy","b":"1F1E7-1F1F1","j":["flag_st_barthelemy","saint","flag","banner","country","barthélemy","nation"]},"flag-bermuda":{"a":"Flag: Bermuda","b":"1F1E7-1F1F2","j":["bm","flag","banner","country","nation"]},"flag-brunei":{"a":"Flag: Brunei","b":"1F1E7-1F1F3","j":["darussalam","bn","flag","banner","country","nation"]},"flag-bolivia":{"a":"Flag: Bolivia","b":"1F1E7-1F1F4","j":["country","flag","banner","bo","nation"]},"flag-caribbean-netherlands":{"a":"Flag: Caribbean Netherlands","b":"1F1E7-1F1F6","j":["flag","banner","country","bonaire","nation"]},"flag-brazil":{"a":"Flag: Brazil","b":"1F1E7-1F1F7","j":["flag","banner","br","country","nation"]},"flag-bahamas":{"a":"Flag: Bahamas","b":"1F1E7-1F1F8","j":["bs","flag","banner","country","nation"]},"flag-bhutan":{"a":"Flag: Bhutan","b":"1F1E7-1F1F9","j":["bt","flag","banner","country","nation"]},"flag-bouvet-island":{"a":"Flag: Bouvet Island","b":"1F1E7-1F1FB","j":["flag","norway"]},"flag-botswana":{"a":"Flag: Botswana","b":"1F1E7-1F1FC","j":["flag","bw","banner","country","nation"]},"flag-belarus":{"a":"Flag: Belarus","b":"1F1E7-1F1FE","j":["country","flag","banner","by","nation"]},"flag-belize":{"a":"Flag: Belize","b":"1F1E7-1F1FF","j":["flag","banner","bz","country","nation"]},"flag-canada":{"a":"Flag: Canada","b":"1F1E8-1F1E6","j":["ca","flag","banner","country","nation"]},"flag-cocos-keeling-islands":{"a":"Flag: Cocos (Keeling) Islands","b":"1F1E8-1F1E8","j":["islands","cocos","flag","keeling","banner","flag_cocos_islands","country","nation"]},"flag-congo--kinshasa":{"a":"Flag: Congo - Kinshasa","b":"1F1E8-1F1E9","j":["democratic","congo","flag","banner","flag_congo_kinshasa","republic","country","nation"]},"flag-central-african-republic":{"a":"Flag: Central African Republic","b":"1F1E8-1F1EB","j":["african","central","flag","banner","republic","country","nation"]},"flag-congo--brazzaville":{"a":"Flag: Congo - Brazzaville","b":"1F1E8-1F1EC","j":["flag_congo_brazzaville","congo","flag","banner","country","nation"]},"flag-switzerland":{"a":"Flag: Switzerland","b":"1F1E8-1F1ED","j":["ch","flag","banner","country","nation"]},"flag-cte-divoire":{"a":"Flag: Côte D’Ivoire","b":"1F1E8-1F1EE","j":["flag","flag_cote_d_ivoire","banner","ivory","coast","country","nation"]},"flag-cook-islands":{"a":"Flag: Cook Islands","b":"1F1E8-1F1F0","j":["islands","cook","flag","banner","country","nation"]},"flag-chile":{"a":"Flag: Chile","b":"1F1E8-1F1F1","j":["flag","country","banner","nation"]},"flag-cameroon":{"a":"Flag: Cameroon","b":"1F1E8-1F1F2","j":["cm","flag","banner","country","nation"]},"flag-china":{"a":"Flag: China","b":"1F1E8-1F1F3","j":["china","flag","chinese","banner","country","prc","nation"]},"flag-colombia":{"a":"Flag: Colombia","b":"1F1E8-1F1F4","j":["co","flag","banner","country","nation"]},"flag-clipperton-island":{"a":"Flag: Clipperton Island","b":"1F1E8-1F1F5","j":["flag"]},"flag-costa-rica":{"a":"Flag: Costa Rica","b":"1F1E8-1F1F7","j":["rica","costa","flag","banner","country","nation"]},"flag-cuba":{"a":"Flag: Cuba","b":"1F1E8-1F1FA","j":["cu","flag","banner","country","nation"]},"flag-cape-verde":{"a":"Flag: Cape Verde","b":"1F1E8-1F1FB","j":["cabo","flag","banner","verde","country","nation"]},"flag-curaao":{"a":"Flag: Curaçao","b":"1F1E8-1F1FC","j":["flag_curacao","curaçao","flag","banner","country","nation"]},"flag-christmas-island":{"a":"Flag: Christmas Island","b":"1F1E8-1F1FD","j":["christmas","flag","banner","country","island","nation"]},"flag-cyprus":{"a":"Flag: Cyprus","b":"1F1E8-1F1FE","j":["flag","banner","country","nation","cy"]},"flag-czechia":{"a":"Flag: Czechia","b":"1F1E8-1F1FF","j":["cz","flag","banner","country","nation"]},"flag-germany":{"a":"Flag: Germany","b":"1F1E9-1F1EA","j":["country","flag","banner","german","nation"]},"flag-diego-garcia":{"a":"Flag: Diego Garcia","b":"1F1E9-1F1EC","j":["flag"]},"flag-djibouti":{"a":"Flag: Djibouti","b":"1F1E9-1F1EF","j":["dj","flag","banner","country","nation"]},"flag-denmark":{"a":"Flag: Denmark","b":"1F1E9-1F1F0","j":["flag","banner","dk","country","nation"]},"flag-dominica":{"a":"Flag: Dominica","b":"1F1E9-1F1F2","j":["flag","dm","banner","country","nation"]},"flag-dominican-republic":{"a":"Flag: Dominican Republic","b":"1F1E9-1F1F4","j":["flag","banner","republic","country","dominican","nation"]},"flag-algeria":{"a":"Flag: Algeria","b":"1F1E9-1F1FF","j":["flag","banner","dz","country","nation"]},"flag-ceuta--melilla":{"a":"Flag: Ceuta & Melilla","b":"1F1EA-1F1E6","j":["flag_ceuta_melilla","flag"]},"flag-ecuador":{"a":"Flag: Ecuador","b":"1F1EA-1F1E8","j":["nation","flag","banner","country","ec"]},"flag-estonia":{"a":"Flag: Estonia","b":"1F1EA-1F1EA","j":["ee","flag","banner","country","nation"]},"flag-egypt":{"a":"Flag: Egypt","b":"1F1EA-1F1EC","j":["flag","eg","banner","country","nation"]},"flag-western-sahara":{"a":"Flag: Western Sahara","b":"1F1EA-1F1ED","j":["sahara","flag","western","banner","country","nation"]},"flag-eritrea":{"a":"Flag: Eritrea","b":"1F1EA-1F1F7","j":["flag","banner","country","nation","er"]},"flag-spain":{"a":"Flag: Spain","b":"1F1EA-1F1F8","j":["spain","flag","banner","country","nation"]},"flag-ethiopia":{"a":"Flag: Ethiopia","b":"1F1EA-1F1F9","j":["et","flag","banner","country","nation"]},"flag-european-union":{"a":"Flag: European Union","b":"1F1EA-1F1FA","j":["european","flag","banner","union"]},"flag-finland":{"a":"Flag: Finland","b":"1F1EB-1F1EE","j":["flag","banner","fi","country","nation"]},"flag-fiji":{"a":"Flag: Fiji","b":"1F1EB-1F1EF","j":["flag","banner","fj","country","nation"]},"flag-falkland-islands":{"a":"Flag: Falkland Islands","b":"1F1EB-1F1F0","j":["islands","falkland","flag","banner","malvinas","country","nation"]},"flag-micronesia":{"a":"Flag: Micronesia","b":"1F1EB-1F1F2","j":["federated","country","states","flag","banner","micronesia","nation"]},"flag-faroe-islands":{"a":"Flag: Faroe Islands","b":"1F1EB-1F1F4","j":["faroe","islands","flag","banner","country","nation"]},"flag-france":{"a":"Flag: France","b":"1F1EB-1F1F7","j":["flag","banner","french","france","country","nation"]},"flag-gabon":{"a":"Flag: Gabon","b":"1F1EC-1F1E6","j":["flag","ga","banner","country","nation"]},"flag-united-kingdom":{"a":"Flag: United Kingdom","b":"1F1EC-1F1E7","j":["northern","great","british","UK","english","kingdom","united","flag","banner","england","britain","ireland","country","union jack","nation"]},"flag-grenada":{"a":"Flag: Grenada","b":"1F1EC-1F1E9","j":["gd","flag","banner","country","nation"]},"flag-georgia":{"a":"Flag: Georgia","b":"1F1EC-1F1EA","j":["ge","flag","banner","country","nation"]},"flag-french-guiana":{"a":"Flag: French Guiana","b":"1F1EC-1F1EB","j":["guiana","flag","banner","french","country","nation"]},"flag-guernsey":{"a":"Flag: Guernsey","b":"1F1EC-1F1EC","j":["gg","flag","banner","country","nation"]},"flag-ghana":{"a":"Flag: Ghana","b":"1F1EC-1F1ED","j":["gh","flag","banner","country","nation"]},"flag-gibraltar":{"a":"Flag: Gibraltar","b":"1F1EC-1F1EE","j":["flag","banner","country","nation","gi"]},"flag-greenland":{"a":"Flag: Greenland","b":"1F1EC-1F1F1","j":["gl","flag","banner","country","nation"]},"flag-gambia":{"a":"Flag: Gambia","b":"1F1EC-1F1F2","j":["gm","flag","banner","country","nation"]},"flag-guinea":{"a":"Flag: Guinea","b":"1F1EC-1F1F3","j":["gn","flag","banner","country","nation"]},"flag-guadeloupe":{"a":"Flag: Guadeloupe","b":"1F1EC-1F1F5","j":["gp","flag","banner","country","nation"]},"flag-equatorial-guinea":{"a":"Flag: Equatorial Guinea","b":"1F1EC-1F1F6","j":["equatorial","gn","flag","banner","country","nation"]},"flag-greece":{"a":"Flag: Greece","b":"1F1EC-1F1F7","j":["gr","flag","banner","country","nation"]},"flag-south-georgia--south-sandwich-islands":{"a":"Flag: South Georgia & South Sandwich Islands","b":"1F1EC-1F1F8","j":["georgia","islands","south","flag_south_georgia_south_sandwich_islands","flag","sandwich","banner","country","nation"]},"flag-guatemala":{"a":"Flag: Guatemala","b":"1F1EC-1F1F9","j":["flag","gt","banner","country","nation"]},"flag-guam":{"a":"Flag: Guam","b":"1F1EC-1F1FA","j":["gu","flag","banner","country","nation"]},"flag-guineabissau":{"a":"Flag: Guinea-Bissau","b":"1F1EC-1F1FC","j":["bissau","nation","gw","flag","banner","country","flag_guinea_bissau"]},"flag-guyana":{"a":"Flag: Guyana","b":"1F1EC-1F1FE","j":["gy","flag","banner","country","nation"]},"flag-hong-kong-sar-china":{"a":"Flag: Hong Kong Sar China","b":"1F1ED-1F1F0","j":["flag","banner","hong","kong","country","nation"]},"flag-heard--mcdonald-islands":{"a":"Flag: Heard & Mcdonald Islands","b":"1F1ED-1F1F2","j":["flag","flag_heard_mcdonald_islands"]},"flag-honduras":{"a":"Flag: Honduras","b":"1F1ED-1F1F3","j":["country","flag","banner","hn","nation"]},"flag-croatia":{"a":"Flag: Croatia","b":"1F1ED-1F1F7","j":["flag","banner","hr","country","nation"]},"flag-haiti":{"a":"Flag: Haiti","b":"1F1ED-1F1F9","j":["ht","flag","banner","country","nation"]},"flag-hungary":{"a":"Flag: Hungary","b":"1F1ED-1F1FA","j":["flag","banner","hu","country","nation"]},"flag-canary-islands":{"a":"Flag: Canary Islands","b":"1F1EE-1F1E8","j":["islands","canary","flag","banner","country","nation"]},"flag-indonesia":{"a":"Flag: Indonesia","b":"1F1EE-1F1E9","j":["flag","country","banner","nation"]},"flag-ireland":{"a":"Flag: Ireland","b":"1F1EE-1F1EA","j":["ie","flag","banner","country","nation"]},"flag-israel":{"a":"Flag: Israel","b":"1F1EE-1F1F1","j":["il","flag","banner","country","nation"]},"flag-isle-of-man":{"a":"Flag: Isle of Man","b":"1F1EE-1F1F2","j":["man","isle","flag","banner","country","nation"]},"flag-india":{"a":"Flag: India","b":"1F1EE-1F1F3","j":["country","flag","banner","in","nation"]},"flag-british-indian-ocean-territory":{"a":"Flag: British Indian Ocean Territory","b":"1F1EE-1F1F4","j":["british","ocean","flag","banner","territory","indian","country","nation"]},"flag-iraq":{"a":"Flag: Iraq","b":"1F1EE-1F1F6","j":["iq","flag","banner","country","nation"]},"flag-iran":{"a":"Flag: Iran","b":"1F1EE-1F1F7","j":["iran","islamic","flag","banner","republic","country","nation"]},"flag-iceland":{"a":"Flag: Iceland","b":"1F1EE-1F1F8","j":["flag","banner","country","is","nation"]},"flag-italy":{"a":"Flag: Italy","b":"1F1EE-1F1F9","j":["italy","flag","banner","country","nation"]},"flag-jersey":{"a":"Flag: Jersey","b":"1F1EF-1F1EA","j":["je","flag","banner","country","nation"]},"flag-jamaica":{"a":"Flag: Jamaica","b":"1F1EF-1F1F2","j":["flag","banner","jm","country","nation"]},"flag-jordan":{"a":"Flag: Jordan","b":"1F1EF-1F1F4","j":["jo","flag","banner","country","nation"]},"flag-japan":{"a":"Flag: Japan","b":"1F1EF-1F1F5","j":["flag","banner","japanese","country","nation"]},"flag-kenya":{"a":"Flag: Kenya","b":"1F1F0-1F1EA","j":["flag","banner","ke","country","nation"]},"flag-kyrgyzstan":{"a":"Flag: Kyrgyzstan","b":"1F1F0-1F1EC","j":["kg","flag","banner","country","nation"]},"flag-cambodia":{"a":"Flag: Cambodia","b":"1F1F0-1F1ED","j":["kh","flag","banner","country","nation"]},"flag-kiribati":{"a":"Flag: Kiribati","b":"1F1F0-1F1EE","j":["ki","flag","banner","country","nation"]},"flag-comoros":{"a":"Flag: Comoros","b":"1F1F0-1F1F2","j":["km","flag","banner","country","nation"]},"flag-st-kitts--nevis":{"a":"Flag: St. Kitts & Nevis","b":"1F1F0-1F1F3","j":["nation","nevis","flag","kitts","flag_st_kitts_nevis","banner","country","saint"]},"flag-north-korea":{"a":"Flag: North Korea","b":"1F1F0-1F1F5","j":["north","flag","banner","korea","country","nation"]},"flag-south-korea":{"a":"Flag: South Korea","b":"1F1F0-1F1F7","j":["south","flag","banner","korea","country","nation"]},"flag-kuwait":{"a":"Flag: Kuwait","b":"1F1F0-1F1FC","j":["kw","flag","banner","country","nation"]},"flag-cayman-islands":{"a":"Flag: Cayman Islands","b":"1F1F0-1F1FE","j":["islands","flag","banner","cayman","country","nation"]},"flag-kazakhstan":{"a":"Flag: Kazakhstan","b":"1F1F0-1F1FF","j":["kz","flag","banner","country","nation"]},"flag-laos":{"a":"Flag: Laos","b":"1F1F1-1F1E6","j":["democratic","flag","banner","lao","republic","country","nation"]},"flag-lebanon":{"a":"Flag: Lebanon","b":"1F1F1-1F1E7","j":["lb","flag","banner","country","nation"]},"flag-st-lucia":{"a":"Flag: St. Lucia","b":"1F1F1-1F1E8","j":["nation","saint","flag","banner","country","lucia"]},"flag-liechtenstein":{"a":"Flag: Liechtenstein","b":"1F1F1-1F1EE","j":["flag","li","banner","country","nation"]},"flag-sri-lanka":{"a":"Flag: Sri Lanka","b":"1F1F1-1F1F0","j":["lanka","sri","flag","banner","country","nation"]},"flag-liberia":{"a":"Flag: Liberia","b":"1F1F1-1F1F7","j":["flag","lr","banner","country","nation"]},"flag-lesotho":{"a":"Flag: Lesotho","b":"1F1F1-1F1F8","j":["ls","flag","banner","country","nation"]},"flag-lithuania":{"a":"Flag: Lithuania","b":"1F1F1-1F1F9","j":["flag","banner","country","nation","lt"]},"flag-luxembourg":{"a":"Flag: Luxembourg","b":"1F1F1-1F1FA","j":["lu","flag","banner","country","nation"]},"flag-latvia":{"a":"Flag: Latvia","b":"1F1F1-1F1FB","j":["flag","banner","lv","country","nation"]},"flag-libya":{"a":"Flag: Libya","b":"1F1F1-1F1FE","j":["ly","flag","banner","country","nation"]},"flag-morocco":{"a":"Flag: Morocco","b":"1F1F2-1F1E6","j":["ma","flag","banner","country","nation"]},"flag-monaco":{"a":"Flag: Monaco","b":"1F1F2-1F1E8","j":["mc","flag","banner","country","nation"]},"flag-moldova":{"a":"Flag: Moldova","b":"1F1F2-1F1E9","j":["flag","banner","republic","country","moldova","nation"]},"flag-montenegro":{"a":"Flag: Montenegro","b":"1F1F2-1F1EA","j":["me","flag","banner","country","nation"]},"flag-st-martin":{"a":"Flag: St. Martin","b":"1F1F2-1F1EB","j":["flag"]},"flag-madagascar":{"a":"Flag: Madagascar","b":"1F1F2-1F1EC","j":["mg","flag","banner","country","nation"]},"flag-marshall-islands":{"a":"Flag: Marshall Islands","b":"1F1F2-1F1ED","j":["islands","marshall","flag","banner","country","nation"]},"flag-north-macedonia":{"a":"Flag: North Macedonia","b":"1F1F2-1F1F0","j":["macedonia","flag","banner","country","nation"]},"flag-mali":{"a":"Flag: Mali","b":"1F1F2-1F1F1","j":["ml","flag","banner","country","nation"]},"flag-myanmar-burma":{"a":"Flag: Myanmar (Burma)","b":"1F1F2-1F1F2","j":["mm","country","flag","banner","flag_myanmar","nation"]},"flag-mongolia":{"a":"Flag: Mongolia","b":"1F1F2-1F1F3","j":["country","flag","banner","mn","nation"]},"flag-macao-sar-china":{"a":"Flag: Macao Sar China","b":"1F1F2-1F1F4","j":["flag","banner","country","nation","macao"]},"flag-northern-mariana-islands":{"a":"Flag: Northern Mariana Islands","b":"1F1F2-1F1F5","j":["northern","islands","flag","mariana","banner","country","nation"]},"flag-martinique":{"a":"Flag: Martinique","b":"1F1F2-1F1F6","j":["mq","flag","banner","country","nation"]},"flag-mauritania":{"a":"Flag: Mauritania","b":"1F1F2-1F1F7","j":["flag","banner","mr","country","nation"]},"flag-montserrat":{"a":"Flag: Montserrat","b":"1F1F2-1F1F8","j":["flag","banner","ms","country","nation"]},"flag-malta":{"a":"Flag: Malta","b":"1F1F2-1F1F9","j":["mt","flag","banner","country","nation"]},"flag-mauritius":{"a":"Flag: Mauritius","b":"1F1F2-1F1FA","j":["mu","flag","banner","country","nation"]},"flag-maldives":{"a":"Flag: Maldives","b":"1F1F2-1F1FB","j":["flag","banner","mv","country","nation"]},"flag-malawi":{"a":"Flag: Malawi","b":"1F1F2-1F1FC","j":["mw","flag","banner","country","nation"]},"flag-mexico":{"a":"Flag: Mexico","b":"1F1F2-1F1FD","j":["mx","flag","banner","country","nation"]},"flag-malaysia":{"a":"Flag: Malaysia","b":"1F1F2-1F1FE","j":["flag","my","banner","country","nation"]},"flag-mozambique":{"a":"Flag: Mozambique","b":"1F1F2-1F1FF","j":["flag","banner","mz","country","nation"]},"flag-namibia":{"a":"Flag: Namibia","b":"1F1F3-1F1E6","j":["na","flag","banner","country","nation"]},"flag-new-caledonia":{"a":"Flag: New Caledonia","b":"1F1F3-1F1E8","j":["country","flag","banner","caledonia","nation","new"]},"flag-niger":{"a":"Flag: Niger","b":"1F1F3-1F1EA","j":["flag","banner","ne","country","nation"]},"flag-norfolk-island":{"a":"Flag: Norfolk Island","b":"1F1F3-1F1EB","j":["norfolk","flag","banner","country","island","nation"]},"flag-nigeria":{"a":"Flag: Nigeria","b":"1F1F3-1F1EC","j":["flag","country","banner","nation"]},"flag-nicaragua":{"a":"Flag: Nicaragua","b":"1F1F3-1F1EE","j":["flag","banner","country","nation","ni"]},"flag-netherlands":{"a":"Flag: Netherlands","b":"1F1F3-1F1F1","j":["flag","banner","nl","country","nation"]},"flag-norway":{"a":"Flag: Norway","b":"1F1F3-1F1F4","j":["no","flag","banner","country","nation"]},"flag-nepal":{"a":"Flag: Nepal","b":"1F1F3-1F1F5","j":["flag","np","banner","country","nation"]},"flag-nauru":{"a":"Flag: Nauru","b":"1F1F3-1F1F7","j":["nr","flag","banner","country","nation"]},"flag-niue":{"a":"Flag: Niue","b":"1F1F3-1F1FA","j":["nu","flag","banner","country","nation"]},"flag-new-zealand":{"a":"Flag: New Zealand","b":"1F1F3-1F1FF","j":["flag","banner","country","zealand","nation","new"]},"flag-oman":{"a":"Flag: Oman","b":"1F1F4-1F1F2","j":["om_symbol","flag","banner","country","nation"]},"flag-panama":{"a":"Flag: Panama","b":"1F1F5-1F1E6","j":["flag","banner","country","nation","pa"]},"flag-peru":{"a":"Flag: Peru","b":"1F1F5-1F1EA","j":["flag","banner","pe","country","nation"]},"flag-french-polynesia":{"a":"Flag: French Polynesia","b":"1F1F5-1F1EB","j":["flag","banner","french","country","nation","polynesia"]},"flag-papua-new-guinea":{"a":"Flag: Papua New Guinea","b":"1F1F5-1F1EC","j":["flag","banner","guinea","country","nation","papua","new"]},"flag-philippines":{"a":"Flag: Philippines","b":"1F1F5-1F1ED","j":["ph","flag","banner","country","nation"]},"flag-pakistan":{"a":"Flag: Pakistan","b":"1F1F5-1F1F0","j":["pk","flag","banner","country","nation"]},"flag-poland":{"a":"Flag: Poland","b":"1F1F5-1F1F1","j":["flag","pl","banner","country","nation"]},"flag-st-pierre--miquelon":{"a":"Flag: St. Pierre & Miquelon","b":"1F1F5-1F1F2","j":["pierre","nation","flag_st_pierre_miquelon","flag","miquelon","banner","country","saint"]},"flag-pitcairn-islands":{"a":"Flag: Pitcairn Islands","b":"1F1F5-1F1F3","j":["country","flag","banner","pitcairn","nation"]},"flag-puerto-rico":{"a":"Flag: Puerto Rico","b":"1F1F5-1F1F7","j":["flag","banner","rico","country","puerto","nation"]},"flag-palestinian-territories":{"a":"Flag: Palestinian Territories","b":"1F1F5-1F1F8","j":["palestine","nation","territories","flag","banner","country","palestinian"]},"flag-portugal":{"a":"Flag: Portugal","b":"1F1F5-1F1F9","j":["flag","pt","banner","country","nation"]},"flag-palau":{"a":"Flag: Palau","b":"1F1F5-1F1FC","j":["flag","banner","pw","country","nation"]},"flag-paraguay":{"a":"Flag: Paraguay","b":"1F1F5-1F1FE","j":["py","flag","banner","country","nation"]},"flag-qatar":{"a":"Flag: Qatar","b":"1F1F6-1F1E6","j":["flag","qa","banner","country","nation"]},"flag-runion":{"a":"Flag: Réunion","b":"1F1F7-1F1EA","j":["flag_reunion","réunion","flag","banner","country","nation"]},"flag-romania":{"a":"Flag: Romania","b":"1F1F7-1F1F4","j":["ro","flag","banner","country","nation"]},"flag-serbia":{"a":"Flag: Serbia","b":"1F1F7-1F1F8","j":["flag","banner","rs","country","nation"]},"flag-russia":{"a":"Flag: Russia","b":"1F1F7-1F1FA","j":["russian","federation","flag","banner","country","nation"]},"flag-rwanda":{"a":"Flag: Rwanda","b":"1F1F7-1F1FC","j":["rw","flag","banner","country","nation"]},"flag-saudi-arabia":{"a":"Flag: Saudi Arabia","b":"1F1F8-1F1E6","j":["flag","country","banner","nation"]},"flag-solomon-islands":{"a":"Flag: Solomon Islands","b":"1F1F8-1F1E7","j":["islands","flag","banner","country","nation","solomon"]},"flag-seychelles":{"a":"Flag: Seychelles","b":"1F1F8-1F1E8","j":["flag","banner","sc","country","nation"]},"flag-sudan":{"a":"Flag: Sudan","b":"1F1F8-1F1E9","j":["sd","flag","banner","country","nation"]},"flag-sweden":{"a":"Flag: Sweden","b":"1F1F8-1F1EA","j":["flag","banner","country","nation","se"]},"flag-singapore":{"a":"Flag: Singapore","b":"1F1F8-1F1EC","j":["flag","banner","sg","country","nation"]},"flag-st-helena":{"a":"Flag: St. Helena","b":"1F1F8-1F1ED","j":["cunha","saint","flag","tristan","banner","helena","ascension","country","nation"]},"flag-slovenia":{"a":"Flag: Slovenia","b":"1F1F8-1F1EE","j":["flag","si","banner","country","nation"]},"flag-svalbard--jan-mayen":{"a":"Flag: Svalbard & Jan Mayen","b":"1F1F8-1F1EF","j":["flag_svalbard_jan_mayen","flag"]},"flag-slovakia":{"a":"Flag: Slovakia","b":"1F1F8-1F1F0","j":["flag","sk","banner","country","nation"]},"flag-sierra-leone":{"a":"Flag: Sierra Leone","b":"1F1F8-1F1F1","j":["sierra","leone","flag","banner","country","nation"]},"flag-san-marino":{"a":"Flag: San Marino","b":"1F1F8-1F1F2","j":["san","marino","flag","banner","country","nation"]},"flag-senegal":{"a":"Flag: Senegal","b":"1F1F8-1F1F3","j":["sn","flag","banner","country","nation"]},"flag-somalia":{"a":"Flag: Somalia","b":"1F1F8-1F1F4","j":["flag","banner","so","country","nation"]},"flag-suriname":{"a":"Flag: Suriname","b":"1F1F8-1F1F7","j":["sr","flag","banner","country","nation"]},"flag-south-sudan":{"a":"Flag: South Sudan","b":"1F1F8-1F1F8","j":["sd","south","flag","banner","country","nation"]},"flag-so-tom--prncipe":{"a":"Flag: São Tomé & Príncipe","b":"1F1F8-1F1F9","j":["principe","tome","flag","flag_sao_tome_principe","banner","country","nation","sao"]},"flag-el-salvador":{"a":"Flag: El Salvador","b":"1F1F8-1F1FB","j":["el","flag","banner","salvador","country","nation"]},"flag-sint-maarten":{"a":"Flag: Sint Maarten","b":"1F1F8-1F1FD","j":["maarten","sint","dutch","flag","banner","country","nation"]},"flag-syria":{"a":"Flag: Syria","b":"1F1F8-1F1FE","j":["syrian","flag","banner","arab","republic","country","nation"]},"flag-eswatini":{"a":"Flag: Eswatini","b":"1F1F8-1F1FF","j":["sz","flag","banner","country","nation"]},"flag-tristan-da-cunha":{"a":"Flag: Tristan Da Cunha","b":"1F1F9-1F1E6","j":["flag"]},"flag-turks--caicos-islands":{"a":"Flag: Turks & Caicos Islands","b":"1F1F9-1F1E8","j":["islands","turks","flag","flag_turks_caicos_islands","banner","caicos","country","nation"]},"flag-chad":{"a":"Flag: Chad","b":"1F1F9-1F1E9","j":["td","flag","banner","country","nation"]},"flag-french-southern-territories":{"a":"Flag: French Southern Territories","b":"1F1F9-1F1EB","j":["territories","southern","flag","banner","french","country","nation"]},"flag-togo":{"a":"Flag: Togo","b":"1F1F9-1F1EC","j":["tg","flag","banner","country","nation"]},"flag-thailand":{"a":"Flag: Thailand","b":"1F1F9-1F1ED","j":["flag","banner","th","country","nation"]},"flag-tajikistan":{"a":"Flag: Tajikistan","b":"1F1F9-1F1EF","j":["tj","flag","banner","country","nation"]},"flag-tokelau":{"a":"Flag: Tokelau","b":"1F1F9-1F1F0","j":["tk","flag","banner","country","nation"]},"flag-timorleste":{"a":"Flag: Timor-Leste","b":"1F1F9-1F1F1","j":["timor","flag_timor_leste","flag","banner","leste","country","nation"]},"flag-turkmenistan":{"a":"Flag: Turkmenistan","b":"1F1F9-1F1F2","j":["flag","country","banner","nation"]},"flag-tunisia":{"a":"Flag: Tunisia","b":"1F1F9-1F1F3","j":["tn","flag","banner","country","nation"]},"flag-tonga":{"a":"Flag: Tonga","b":"1F1F9-1F1F4","j":["to","flag","banner","country","nation"]},"flag-turkey":{"a":"Flag: Turkey","b":"1F1F9-1F1F7","j":["turkey","flag","banner","country","nation"]},"flag-trinidad--tobago":{"a":"Flag: Trinidad & Tobago","b":"1F1F9-1F1F9","j":["flag_trinidad_tobago","flag","banner","trinidad","tobago","country","nation"]},"flag-tuvalu":{"a":"Flag: Tuvalu","b":"1F1F9-1F1FB","j":["flag","country","banner","nation"]},"flag-taiwan":{"a":"Flag: Taiwan","b":"1F1F9-1F1FC","j":["tw","flag","banner","country","nation"]},"flag-tanzania":{"a":"Flag: Tanzania","b":"1F1F9-1F1FF","j":["tanzania","united","flag","banner","republic","country","nation"]},"flag-ukraine":{"a":"Flag: Ukraine","b":"1F1FA-1F1E6","j":["flag","banner","country","nation","ua"]},"flag-uganda":{"a":"Flag: Uganda","b":"1F1FA-1F1EC","j":["ug","flag","banner","country","nation"]},"flag-us-outlying-islands":{"a":"Flag: U.S. Outlying Islands","b":"1F1FA-1F1F2","j":["flag","flag_u_s_outlying_islands"]},"flag-united-nations":{"a":"Flag: United Nations","b":"1F1FA-1F1F3","j":["flag","un","banner"]},"flag-united-states":{"a":"Flag: United States","b":"1F1FA-1F1F8","j":["america","united","flag","states","banner","country","nation"]},"flag-uruguay":{"a":"Flag: Uruguay","b":"1F1FA-1F1FE","j":["flag","uy","banner","country","nation"]},"flag-uzbekistan":{"a":"Flag: Uzbekistan","b":"1F1FA-1F1FF","j":["uz","flag","banner","country","nation"]},"flag-vatican-city":{"a":"Flag: Vatican City","b":"1F1FB-1F1E6","j":["vatican","city","flag","banner","country","nation"]},"flag-st-vincent--grenadines":{"a":"Flag: St. Vincent & Grenadines","b":"1F1FB-1F1E8","j":["nation","flag_st_vincent_grenadines","vincent","grenadines","flag","banner","country","saint"]},"flag-venezuela":{"a":"Flag: Venezuela","b":"1F1FB-1F1EA","j":["bolivarian","ve","flag","banner","republic","country","nation"]},"flag-british-virgin-islands":{"a":"Flag: British Virgin Islands","b":"1F1FB-1F1EC","j":["virgin","bvi","islands","british","flag","banner","country","nation"]},"flag-us-virgin-islands":{"a":"Flag: U.S. Virgin Islands","b":"1F1FB-1F1EE","j":["virgin","islands","us","flag","banner","country","nation","flag_u_s_virgin_islands"]},"flag-vietnam":{"a":"Flag: Vietnam","b":"1F1FB-1F1F3","j":["nam","flag","banner","viet","country","nation"]},"flag-vanuatu":{"a":"Flag: Vanuatu","b":"1F1FB-1F1FA","j":["flag","banner","vu","country","nation"]},"flag-wallis--futuna":{"a":"Flag: Wallis & Futuna","b":"1F1FC-1F1EB","j":["flag_wallis_futuna","flag","wallis","futuna","banner","country","nation"]},"flag-samoa":{"a":"Flag: Samoa","b":"1F1FC-1F1F8","j":["ws","flag","banner","country","nation"]},"flag-kosovo":{"a":"Flag: Kosovo","b":"1F1FD-1F1F0","j":["flag","banner","country","nation","xk"]},"flag-yemen":{"a":"Flag: Yemen","b":"1F1FE-1F1EA","j":["flag","banner","ye","country","nation"]},"flag-mayotte":{"a":"Flag: Mayotte","b":"1F1FE-1F1F9","j":["flag","banner","country","yt","nation"]},"flag-south-africa":{"a":"Flag: South Africa","b":"1F1FF-1F1E6","j":["south","africa","flag","banner","country","nation"]},"flag-zambia":{"a":"Flag: Zambia","b":"1F1FF-1F1F2","j":["zm","flag","banner","country","nation"]},"flag-zimbabwe":{"a":"Flag: Zimbabwe","b":"1F1FF-1F1FC","j":["zw","flag","banner","country","nation"]},"flag-england":{"a":"Flag: England","b":"1F3F4-E0067-E0062-E0065-E006E-E0067-E007F","j":["flag","english"]},"flag-scotland":{"a":"Flag: Scotland","b":"1F3F4-E0067-E0062-E0073-E0063-E0074-E007F","j":["scottish","flag"]},"flag-wales":{"a":"Flag: Wales","b":"1F3F4-E0067-E0062-E0077-E006C-E0073-E007F","j":["flag","welsh"]}},"aliases":{}}
\ No newline at end of file

From 40929b96406ea510da36291e450351b4ac992375 Mon Sep 17 00:00:00 2001
From: oogm <ga84dom@mytum.de>
Date: Fri, 26 Mar 2021 17:21:33 +0100
Subject: [PATCH 428/578] Update CHANGES.md for a release with 1.1.4

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 03d9a45544..feff52b7b3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
  - Improve message with Emoji only detection (#3017)
  - Picture preview when replying. Also add the image preview in the message detail bottomsheet (#2916)
  - Api interceptor to allow app developers peek responses (#2986)
+ - Update reactions to Unicode 13.1 (#2998)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
@@ -68,7 +69,6 @@ Improvements 🙌:
  - Sending is now queuing by room and not uniquely to the session
  - Improve Snackbar duration (#2929)
  - Improve sending message state (#2937)
- - Update reactions to Unicode 13.1 (#2998)
 
 Bugfix 🐛:
  - Try to fix crash about UrlPreview (#2640)

From 8f67511b22b14c3f347291528c7f4480f4b4edea Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sat, 27 Mar 2021 19:20:16 +0000
Subject: [PATCH 429/578] Convert VerificationService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../java/org/matrix/android/sdk/common/CryptoTestHelper.kt  | 3 +--
 .../android/sdk/internal/crypto/verification/SASTest.kt     | 6 ++----
 .../api/session/crypto/verification/VerificationService.kt  | 4 +---
 .../crypto/verification/DefaultVerificationService.kt       | 4 +---
 .../crypto/verification/VerificationBottomSheetViewModel.kt | 3 +--
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index eb7e4a9fbe..12f7928835 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -337,8 +337,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
                 requestID,
                 roomId,
                 bob.myUserId,
-                bob.sessionParams.credentials.deviceId!!,
-                null)
+                bob.sessionParams.credentials.deviceId!!)
 
         // we should reach SHOW SAS on both
         var alicePovTx: OutgoingSasVerificationTransaction? = null
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index a81f503e77..4ea8cdc074 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -593,16 +593,14 @@ class SASTest : InstrumentedTest {
                 requestID!!,
                 cryptoTestData.roomId,
                 bobSession.myUserId,
-                bobSession.sessionParams.deviceId!!,
-                null)
+                bobSession.sessionParams.deviceId!!)
 
         bobVerificationService.beginKeyVerificationInDMs(
                 VerificationMethod.SAS,
                 requestID!!,
                 cryptoTestData.roomId,
                 aliceSession.myUserId,
-                aliceSession.sessionParams.deviceId!!,
-                null)
+                aliceSession.sessionParams.deviceId!!)
 
         // we should reach SHOW SAS on both
         var alicePovTx: SasVerificationTransaction?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
index 2413786ea9..54a1e896ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.api.session.crypto.verification
 
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.LocalEcho
 
@@ -79,8 +78,7 @@ interface VerificationService {
                                   transactionId: String,
                                   roomId: String,
                                   otherUserId: String,
-                                  otherDeviceId: String,
-                                  callback: MatrixCallback<String>?): String?
+                                  otherDeviceId: String): String
 
     /**
      * Returns false if the request is unknown
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
index a92f5c5bf1..d9da88770c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.crypto.verification
 import android.os.Handler
 import android.os.Looper
 import dagger.Lazy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
@@ -1293,8 +1292,7 @@ internal class DefaultVerificationService @Inject constructor(
                                            transactionId: String,
                                            roomId: String,
                                            otherUserId: String,
-                                           otherDeviceId: String,
-                                           callback: MatrixCallback<String>?): String? {
+                                           otherDeviceId: String): String {
         if (method == VerificationMethod.SAS) {
             val tx = DefaultOutgoingSASDefaultVerificationTransaction(
                     setDeviceVerificationAction,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index 04ac79d4a4..0e230c6727 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -305,8 +305,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                             transactionId = action.pendingRequestTransactionId,
                             roomId = roomId,
                             otherUserId = request.otherUserId,
-                            otherDeviceId = otherDevice ?: "",
-                            callback = null
+                            otherDeviceId = otherDevice ?: ""
                     )
                 }
                 Unit

From f8718e397c27a18165bfe81f00a87b4a30d1a610 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 8 Nov 2020 13:06:50 +0000
Subject: [PATCH 430/578] Convert ReadService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../sdk/api/session/room/read/ReadService.kt  |  7 +++--
 .../session/room/read/DefaultReadService.kt   | 26 +++++--------------
 .../home/room/detail/RoomDetailViewModel.kt   | 16 +++++++++---
 .../NotificationBroadcastReceiver.kt          | 10 +++++--
 4 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
index 4f44c9a912..b037a3f366 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.api.session.room.read
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.util.Optional
 
@@ -35,17 +34,17 @@ interface ReadService {
     /**
      * Force the read marker to be set on the latest event.
      */
-    fun markAsRead(params: MarkAsReadParams = MarkAsReadParams.BOTH, callback: MatrixCallback<Unit>)
+    suspend fun markAsRead(params: MarkAsReadParams = MarkAsReadParams.BOTH)
 
     /**
      * Set the read receipt on the event with provided eventId.
      */
-    fun setReadReceipt(eventId: String, callback: MatrixCallback<Unit>)
+    suspend fun setReadReceipt(eventId: String)
 
     /**
      * Set the read marker on the event with provided eventId.
      */
-    fun setReadMarker(fullyReadEventId: String, callback: MatrixCallback<Unit>)
+    suspend fun setReadMarker(fullyReadEventId: String)
 
     /**
      * Check if an event is already read, ie. your read receipt is set on a more recent event.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
index 3cf8cfe5ee..d4d03dca05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
@@ -22,7 +22,6 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.read.ReadService
 import org.matrix.android.sdk.api.util.Optional
@@ -36,7 +35,6 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 
 internal class DefaultReadService @AssistedInject constructor(
         @Assisted private val roomId: String,
@@ -52,35 +50,23 @@ internal class DefaultReadService @AssistedInject constructor(
         fun create(roomId: String): DefaultReadService
     }
 
-    override fun markAsRead(params: ReadService.MarkAsReadParams, callback: MatrixCallback<Unit>) {
+    override suspend fun markAsRead(params: ReadService.MarkAsReadParams) {
         val taskParams = SetReadMarkersTask.Params(
                 roomId = roomId,
                 forceReadMarker = params.forceReadMarker(),
                 forceReadReceipt = params.forceReadReceipt()
         )
-        setReadMarkersTask
-                .configureWith(taskParams) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        setReadMarkersTask.execute(taskParams)
     }
 
-    override fun setReadReceipt(eventId: String, callback: MatrixCallback<Unit>) {
+    override suspend fun setReadReceipt(eventId: String) {
         val params = SetReadMarkersTask.Params(roomId, fullyReadEventId = null, readReceiptEventId = eventId)
-        setReadMarkersTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        setReadMarkersTask.execute(params)
     }
 
-    override fun setReadMarker(fullyReadEventId: String, callback: MatrixCallback<Unit>) {
+    override suspend fun setReadMarker(fullyReadEventId: String) {
         val params = SetReadMarkersTask.Params(roomId, fullyReadEventId = fullyReadEventId, readReceiptEventId = null)
-        setReadMarkersTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        setReadMarkersTask.execute(params)
     }
 
     override fun isEventRead(eventId: String): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index af3d5461ef..120e80a1b6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -181,7 +181,9 @@ class RoomDetailViewModel @AssistedInject constructor(
         observePowerLevel()
         updateShowDialerOptionState()
         room.getRoomSummaryLive()
-        room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT, NoOpMatrixCallback())
+        viewModelScope.launch {
+            room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT)
+        }
         // Inform the SDK that the room is displayed
         session.onRoomDisplayed(initialState.roomId)
         callManager.addPstnSupportListener(this)
@@ -546,7 +548,9 @@ class RoomDetailViewModel @AssistedInject constructor(
     private fun stopTrackingUnreadMessages() {
         if (trackUnreadMessages.getAndSet(false)) {
             mostRecentDisplayedEvent?.root?.eventId?.also {
-                room.setReadMarker(it, callback = NoOpMatrixCallback())
+                viewModelScope.launch {
+                    room.setReadMarker(it)
+                }
             }
             mostRecentDisplayedEvent = null
         }
@@ -1248,14 +1252,18 @@ class RoomDetailViewModel @AssistedInject constructor(
                         }
                     }
                     bufferedMostRecentDisplayedEvent.root.eventId?.let { eventId ->
-                        room.setReadReceipt(eventId, callback = NoOpMatrixCallback())
+                        viewModelScope.launch {
+                            room.setReadReceipt(eventId)
+                        }
                     }
                 })
                 .disposeOnClear()
     }
 
     private fun handleMarkAllAsRead() {
-        room.markAsRead(ReadService.MarkAsReadParams.BOTH, NoOpMatrixCallback())
+        viewModelScope.launch {
+            room.markAsRead(ReadService.MarkAsReadParams.BOTH)
+        }
     }
 
     private fun handleReportContent(action: RoomDetailAction.ReportContent) {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index d79d16a052..c4d7376c55 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -23,6 +23,8 @@ import androidx.core.app.RemoteInput
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.vectorComponent
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
@@ -88,8 +90,12 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
 
     private fun handleMarkAsRead(roomId: String) {
         activeSessionHolder.getActiveSession().let { session ->
-            session.getRoom(roomId)
-                    ?.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT, NoOpMatrixCallback())
+            val room = session.getRoom(roomId)
+            if (room != null) {
+                GlobalScope.launch {
+                    room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT)
+                }
+            }
         }
     }
 

From b9b755e6e11d8d59afca5491f827a5f292dabe53 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 8 Nov 2020 13:52:09 +0000
Subject: [PATCH 431/578] Convert UserService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../org/matrix/android/sdk/rx/RxSession.kt    |  5 +-
 .../sdk/api/session/user/UserService.kt       | 11 ++--
 .../session/user/DefaultUserService.kt        | 64 +++++--------------
 .../home/room/detail/RoomDetailViewModel.kt   | 16 ++---
 .../matrixto/MatrixToBottomSheetViewModel.kt  |  7 +-
 .../RoomMemberProfileViewModel.kt             | 24 ++++---
 .../settings/ignored/IgnoredUsersViewModel.kt | 29 +++------
 .../usercode/UserCodeSharedViewModel.kt       |  7 +-
 8 files changed, 54 insertions(+), 109 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index a7b269fcc6..33bcad8f4d 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -20,6 +20,7 @@ import androidx.paging.PagedList
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.functions.Function3
+import kotlinx.coroutines.rx2.rxSingle
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
@@ -129,8 +130,8 @@ class RxSession(private val session: Session) {
 
     fun searchUsersDirectory(search: String,
                              limit: Int,
-                             excludedUserIds: Set<String>): Single<List<User>> = singleBuilder {
-        session.searchUsersDirectory(search, limit, excludedUserIds, it)
+                             excludedUserIds: Set<String>): Single<List<User>> = rxSingle {
+        session.searchUsersDirectory(search, limit, excludedUserIds)
     }
 
     fun joinRoom(roomIdOrAlias: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
index ab85f979bf..cd4fb216d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
@@ -18,9 +18,7 @@ package org.matrix.android.sdk.api.session.user
 
 import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 
 /**
@@ -38,17 +36,16 @@ interface UserService {
     /**
      * Try to resolve user from known users, or using profile api
      */
-    fun resolveUser(userId: String, callback: MatrixCallback<User>)
+    suspend fun resolveUser(userId: String): User
 
     /**
      * Search list of users on server directory.
      * @param search the searched term
      * @param limit the max number of users to return
      * @param excludedUserIds the user ids to filter from the search
-     * @param callback the async callback
      * @return Cancelable
      */
-    fun searchUsersDirectory(search: String, limit: Int, excludedUserIds: Set<String>, callback: MatrixCallback<List<User>>): Cancelable
+    suspend fun searchUsersDirectory(search: String, limit: Int, excludedUserIds: Set<String>): List<User>
 
     /**
      * Observe a live user from a userId
@@ -79,10 +76,10 @@ interface UserService {
     /**
      * Ignore users
      */
-    fun ignoreUserIds(userIds: List<String>, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun ignoreUserIds(userIds: List<String>)
 
     /**
      * Un-ignore some users
      */
-    fun unIgnoreUserIds(userIds: List<String>, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun unIgnoreUserIds(userIds: List<String>)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
index 1740956915..52b8cc3689 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
@@ -18,54 +18,35 @@ package org.matrix.android.sdk.internal.session.user
 
 import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.user.UserService
 import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.session.profile.GetProfileInfoTask
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateIgnoredUserIdsTask
 import org.matrix.android.sdk.internal.session.user.model.SearchUserTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import javax.inject.Inject
 
 internal class DefaultUserService @Inject constructor(private val userDataSource: UserDataSource,
                                                       private val searchUserTask: SearchUserTask,
                                                       private val updateIgnoredUserIdsTask: UpdateIgnoredUserIdsTask,
-                                                      private val getProfileInfoTask: GetProfileInfoTask,
-                                                      private val taskExecutor: TaskExecutor) : UserService {
+                                                      private val getProfileInfoTask: GetProfileInfoTask) : UserService {
 
     override fun getUser(userId: String): User? {
         return userDataSource.getUser(userId)
     }
 
-    override fun resolveUser(userId: String, callback: MatrixCallback<User>) {
+    override suspend fun resolveUser(userId: String): User {
         val known = getUser(userId)
         if (known != null) {
-            callback.onSuccess(known)
+            return known
         } else {
             val params = GetProfileInfoTask.Params(userId)
-            getProfileInfoTask
-                    .configureWith(params) {
-                        this.callback = object : MatrixCallback<JsonDict> {
-                            override fun onSuccess(data: JsonDict) {
-                                callback.onSuccess(
-                                        User(
-                                                userId,
-                                                data[ProfileService.DISPLAY_NAME_KEY] as? String,
-                                                data[ProfileService.AVATAR_URL_KEY] as? String)
-                                )
-                            }
-
-                            override fun onFailure(failure: Throwable) {
-                                callback.onFailure(failure)
-                            }
-                        }
-                    }
-                    .executeBy(taskExecutor)
+            val data = getProfileInfoTask.execute(params)
+            return User(
+                    userId,
+                    data[ProfileService.DISPLAY_NAME_KEY] as? String,
+                    data[ProfileService.AVATAR_URL_KEY] as? String)
         }
     }
 
@@ -85,33 +66,20 @@ internal class DefaultUserService @Inject constructor(private val userDataSource
         return userDataSource.getIgnoredUsersLive()
     }
 
-    override fun searchUsersDirectory(search: String,
-                                      limit: Int,
-                                      excludedUserIds: Set<String>,
-                                      callback: MatrixCallback<List<User>>): Cancelable {
+    override suspend fun searchUsersDirectory(search: String,
+                                              limit: Int,
+                                              excludedUserIds: Set<String>): List<User> {
         val params = SearchUserTask.Params(limit, search, excludedUserIds)
-        return searchUserTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        return searchUserTask.execute(params)
     }
 
-    override fun ignoreUserIds(userIds: List<String>, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun ignoreUserIds(userIds: List<String>) {
         val params = UpdateIgnoredUserIdsTask.Params(userIdsToIgnore = userIds.toList())
-        return updateIgnoredUserIdsTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        updateIgnoredUserIdsTask.execute(params)
     }
 
-    override fun unIgnoreUserIds(userIds: List<String>, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun unIgnoreUserIds(userIds: List<String>) {
         val params = UpdateIgnoredUserIdsTask.Params(userIdsToUnIgnore = userIds.toList())
-        return updateIgnoredUserIdsTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        updateIgnoredUserIdsTask.execute(params)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index af3d5461ef..2d301a813b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -1275,15 +1275,15 @@ class RoomDetailViewModel @AssistedInject constructor(
             return
         }
 
-        session.ignoreUserIds(listOf(action.userId), object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
-                _viewEvents.post(RoomDetailViewEvents.ActionSuccess(action))
+        viewModelScope.launch {
+            val event = try {
+                session.ignoreUserIds(listOf(action.userId))
+                RoomDetailViewEvents.ActionSuccess(action)
+            } catch (failure: Throwable) {
+                RoomDetailViewEvents.ActionFailure(action, failure)
             }
-
-            override fun onFailure(failure: Throwable) {
-                _viewEvents.post(RoomDetailViewEvents.ActionFailure(action, failure))
-            }
-        })
+            _viewEvents.post(event)
+        }
     }
 
     private fun handleAcceptVerification(action: RoomDetailAction.AcceptVerificationRequest) {
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index e5bdc9bca8..b961383575 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -41,7 +41,6 @@ import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
-import org.matrix.android.sdk.internal.util.awaitCallback
 
 class MatrixToBottomSheetViewModel @AssistedInject constructor(
         @Assisted initialState: MatrixToBottomSheetState,
@@ -101,11 +100,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
     }
 
     private suspend fun resolveUser(userId: String): User {
-        return tryOrNull {
-            awaitCallback<User> {
-                session.resolveUser(userId, it)
-            }
-        }
+        return tryOrNull { session.resolveUser(userId) }
         // Create raw user in case the user is not searchable
                 ?: User(userId, null, null)
     }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index 0556b9d2d6..108841faa0 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -37,7 +37,6 @@ import io.reactivex.functions.BiFunction
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -321,19 +320,18 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
     private fun handleIgnoreAction() = withState { state ->
         val isIgnored = state.isIgnored() ?: return@withState
         _viewEvents.post(RoomMemberProfileViewEvents.Loading())
-        val ignoreActionCallback = object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
-                _viewEvents.post(RoomMemberProfileViewEvents.OnIgnoreActionSuccess)
+        viewModelScope.launch {
+            val event = try {
+                if (isIgnored) {
+                    session.unIgnoreUserIds(listOf(state.userId))
+                } else {
+                    session.ignoreUserIds(listOf(state.userId))
+                }
+                RoomMemberProfileViewEvents.OnIgnoreActionSuccess
+            } catch (failure: Throwable) {
+                RoomMemberProfileViewEvents.Failure(failure)
             }
-
-            override fun onFailure(failure: Throwable) {
-                _viewEvents.post(RoomMemberProfileViewEvents.Failure(failure))
-            }
-        }
-        if (isIgnored) {
-            session.unIgnoreUserIds(listOf(state.userId), ignoreActionCallback)
-        } else {
-            session.ignoreUserIds(listOf(state.userId), ignoreActionCallback)
+            _viewEvents.post(event)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
index fdc6585829..aa00f71542 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.settings.ignored
 
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -30,7 +31,7 @@ import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
-import org.matrix.android.sdk.api.MatrixCallback
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.rx.rx
@@ -89,24 +90,14 @@ class IgnoredUsersViewModel @AssistedInject constructor(@Assisted initialState:
             )
         }
 
-        session.unIgnoreUserIds(listOf(action.userId), object : MatrixCallback<Unit> {
-            override fun onFailure(failure: Throwable) {
-                setState {
-                    copy(
-                            unIgnoreRequest = Fail(failure)
-                    )
-                }
-
-                _viewEvents.post(IgnoredUsersViewEvents.Failure(failure))
+        viewModelScope.launch {
+            val result = runCatching { session.unIgnoreUserIds(listOf(action.userId)) }
+            setState {
+                copy(
+                        unIgnoreRequest = result.fold(::Success, ::Fail)
+                )
             }
-
-            override fun onSuccess(data: Unit) {
-                setState {
-                    copy(
-                            unIgnoreRequest = Success(data)
-                    )
-                }
-            }
-        })
+            result.onFailure { _viewEvents.post(IgnoredUsersViewEvents.Failure(it)) }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
index 671d018b63..9637b72581 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt
@@ -37,7 +37,6 @@ import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
-import org.matrix.android.sdk.internal.util.awaitCallback
 
 class UserCodeSharedViewModel @AssistedInject constructor(
         @Assisted val initialState: UserCodeState,
@@ -126,11 +125,7 @@ class UserCodeSharedViewModel @AssistedInject constructor(
                     _viewEvents.post(UserCodeShareViewEvents.ToastMessage(stringProvider.getString(R.string.not_implemented)))
                 }
                 is PermalinkData.UserLink -> {
-                    val user = tryOrNull {
-                        awaitCallback<User> {
-                            session.resolveUser(linkedId.userId, it)
-                        }
-                    }
+                    val user = tryOrNull { session.resolveUser(linkedId.userId) }
                     // Create raw Uxid in case the user is not searchable
                             ?: User(linkedId.userId, null, null)
 

From 7fbe485603e1ffdd605e62f9235fff194f24aff7 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sat, 27 Mar 2021 20:44:07 +0000
Subject: [PATCH 432/578] Convert PushersService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../sdk/api/session/pushers/PushersService.kt | 13 ++++-----
 .../session/pushers/DefaultPushersService.kt  | 26 +++++------------
 .../vector/app/core/pushers/PushersManager.kt | 11 ++++---
 ...rSettingsNotificationPreferenceFragment.kt | 29 +++++++++----------
 4 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 3993422b1d..9ea820f5b3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -16,8 +16,6 @@
 package org.matrix.android.sdk.api.session.pushers
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
 import java.util.UUID
 
 interface PushersService {
@@ -75,16 +73,15 @@ interface PushersService {
      * @param callback callback to know if the push gateway has accepted the request. In this case, the app should receive a Push with the provided eventId.
      *                 In case of error, PusherRejected failure can happen. In this case it means that the pushkey is not valid.
      */
-    fun testPush(url: String,
-                 appId: String,
-                 pushkey: String,
-                 eventId: String,
-                 callback: MatrixCallback<Unit>): Cancelable
+    suspend fun testPush(url: String,
+                         appId: String,
+                         pushkey: String,
+                         eventId: String)
 
     /**
      * Remove the http pusher
      */
-    fun removeHttpPusher(pushkey: String, appId: String, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun removeHttpPusher(pushkey: String, appId: String)
 
     /**
      * Get the current pushers, as a LiveData
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index d290bb1a03..a772cf5ebb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -18,10 +18,8 @@ package org.matrix.android.sdk.internal.session.pushers
 import androidx.lifecycle.LiveData
 import androidx.work.BackoffPolicy
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.pushers.Pusher
 import org.matrix.android.sdk.api.session.pushers.PushersService
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.PusherEntity
 import org.matrix.android.sdk.internal.database.query.where
@@ -47,16 +45,11 @@ internal class DefaultPushersService @Inject constructor(
         private val taskExecutor: TaskExecutor
 ) : PushersService {
 
-    override fun testPush(url: String,
-                          appId: String,
-                          pushkey: String,
-                          eventId: String,
-                          callback: MatrixCallback<Unit>): Cancelable {
-        return pushGatewayNotifyTask
-                .configureWith(PushGatewayNotifyTask.Params(url, appId, pushkey, eventId)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun testPush(url: String,
+                                  appId: String,
+                                  pushkey: String,
+                                  eventId: String) {
+        pushGatewayNotifyTask.execute(PushGatewayNotifyTask.Params(url, appId, pushkey, eventId))
     }
 
     override fun refreshPushers() {
@@ -102,14 +95,9 @@ internal class DefaultPushersService @Inject constructor(
         return request.id
     }
 
-    override fun removeHttpPusher(pushkey: String, appId: String, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun removeHttpPusher(pushkey: String, appId: String) {
         val params = RemovePusherTask.Params(pushkey, appId)
-        return removePusherTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                // .enableRetry() ??
-                .executeBy(taskExecutor)
+        removePusherTask.execute(params)
     }
 
     override fun getPushersLive(): LiveData<List<Pusher>> {
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index 5fe30141d9..dda8b70b08 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -35,15 +35,14 @@ class PushersManager @Inject constructor(
         private val stringProvider: StringProvider,
         private val appNameProvider: AppNameProvider
 ) {
-    fun testPush(pushKey: String, callback: MatrixCallback<Unit>): Cancelable {
+    suspend fun testPush(pushKey: String) {
         val currentSession = activeSessionHolder.getActiveSession()
 
-        return currentSession.testPush(
+        currentSession.testPush(
                 stringProvider.getString(R.string.pusher_http_url),
                 stringProvider.getString(R.string.pusher_app_id),
                 pushKey,
-                TEST_EVENT_ID,
-                callback
+                TEST_EVENT_ID
         )
     }
 
@@ -64,9 +63,9 @@ class PushersManager @Inject constructor(
         )
     }
 
-    fun unregisterPusher(pushKey: String, callback: MatrixCallback<Unit>) {
+    suspend fun unregisterPusher(pushKey: String) {
         val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
-        currentSession.removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id), callback)
+        currentSession.removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id))
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
index 47868eed51..fd1f406bcb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
@@ -39,7 +39,6 @@ import im.vector.app.core.utils.requestDisablingBatteryOptimization
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.push.fcm.FcmHelper
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.pushrules.RuleKind
@@ -295,20 +294,20 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             }
         } else {
             FcmHelper.getFcmToken(requireContext())?.let {
-                pushManager.unregisterPusher(it, object : MatrixCallback<Unit> {
-                    override fun onSuccess(data: Unit) {
-                        session.refreshPushers()
-                    }
-
-                    override fun onFailure(failure: Throwable) {
-                        if (!isAdded) {
-                            return
-                        }
-                        // revert the check box
-                        switchPref.isChecked = !switchPref.isChecked
-                        Toast.makeText(activity, R.string.unknown_error, Toast.LENGTH_SHORT).show()
-                    }
-                })
+                lifecycleScope.launch {
+                    runCatching { pushManager.unregisterPusher(it) }
+                            .fold(
+                                    { session.refreshPushers() },
+                                    {
+                                        if (!isAdded) {
+                                            return@fold
+                                        }
+                                        // revert the check box
+                                        switchPref.isChecked = !switchPref.isChecked
+                                        Toast.makeText(activity, R.string.unknown_error, Toast.LENGTH_SHORT).show()
+                                    }
+                            )
+                }
             }
         }
     }

From b70585016cffa6a38819c0ebb969c79942cf6a9c Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 28 Mar 2021 11:50:17 +0100
Subject: [PATCH 433/578] Convert SharedSecretStorageService to suspend
 functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../sdk/internal/crypto/ssss/QuadSTests.kt    | 107 ++++-----
 .../SharedSecretStorageService.kt             |  31 ++-
 .../DefaultSharedSecretStorageService.kt      | 215 +++++++-----------
 .../quads/SharedSecureStorageViewModel.kt     |  37 ++-
 .../recover/BackupToQuadSMigrationTask.kt     |  63 +++--
 .../recover/BootstrapCrossSigningTask.kt      | 103 ++++-----
 6 files changed, 227 insertions(+), 329 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index 0489ee179f..eb4773f3c8 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.crypto.ssss
 import androidx.lifecycle.Observer
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.matrix.android.sdk.InstrumentedTest
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.securestorage.EncryptedSecretContent
 import org.matrix.android.sdk.api.session.securestorage.KeySigner
@@ -31,7 +30,6 @@ import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
-import org.matrix.android.sdk.common.TestMatrixCallback
 import org.matrix.android.sdk.internal.crypto.SSSS_ALGORITHM_AES_HMAC_SHA2
 import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
 import org.matrix.android.sdk.internal.crypto.secrets.DefaultSharedSecretStorageService
@@ -40,7 +38,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import org.amshove.kluent.shouldBe
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
@@ -70,8 +67,8 @@ class QuadSTests : InstrumentedTest {
 
         val TEST_KEY_ID = "my.test.Key"
 
-        mTestHelper.doSync<SsssKeyCreationInfo> {
-            quadS.generateKey(TEST_KEY_ID, null, "Test Key", emptyKeySigner, it)
+        mTestHelper.runBlockingTest {
+            quadS.generateKey(TEST_KEY_ID, null, "Test Key", emptyKeySigner)
         }
 
         // Assert Account data is updated
@@ -99,7 +96,9 @@ class QuadSTests : InstrumentedTest {
         assertNull("Key was not generated from passphrase", parsed.passphrase)
 
         // Set as default key
-        quadS.setDefaultKey(TEST_KEY_ID, object : MatrixCallback<Unit> {})
+        GlobalScope.launch {
+            quadS.setDefaultKey(TEST_KEY_ID)
+        }
 
         var defaultKeyAccountData: UserAccountDataEvent? = null
         val defaultDataLock = CountDownLatch(1)
@@ -133,12 +132,11 @@ class QuadSTests : InstrumentedTest {
 
         // Store a secret
         val clearSecret = "42".toByteArray().toBase64NoPadding()
-        mTestHelper.doSync<Unit> {
+        mTestHelper.runBlockingTest {
             aliceSession.sharedSecretStorageService.storeSecret(
                     "secret.of.life",
                     clearSecret,
-                    listOf(SharedSecretStorageService.KeyRef(null, keySpec)), // default key
-                    it
+                    listOf(SharedSecretStorageService.KeyRef(null, keySpec)) // default key
             )
         }
 
@@ -155,12 +153,11 @@ class QuadSTests : InstrumentedTest {
 
         // Try to decrypt??
 
-        val decryptedSecret = mTestHelper.doSync<String> {
+        val decryptedSecret = mTestHelper.runBlockingTest {
             aliceSession.sharedSecretStorageService.getSecret(
                     "secret.of.life",
                     null, // default key
-                    keySpec!!,
-                    it
+                    keySpec!!
             )
         }
 
@@ -176,13 +173,13 @@ class QuadSTests : InstrumentedTest {
 
         val TEST_KEY_ID = "my.test.Key"
 
-        mTestHelper.doSync<SsssKeyCreationInfo> {
-            quadS.generateKey(TEST_KEY_ID, null, "Test Key", emptyKeySigner, it)
+        mTestHelper.runBlockingTest {
+            quadS.generateKey(TEST_KEY_ID, null, "Test Key", emptyKeySigner)
         }
 
         // Test that we don't need to wait for an account data sync to access directly the keyid from DB
-        mTestHelper.doSync<Unit> {
-            quadS.setDefaultKey(TEST_KEY_ID, it)
+        mTestHelper.runBlockingTest {
+            quadS.setDefaultKey(TEST_KEY_ID)
         }
 
         mTestHelper.signOutAndClose(aliceSession)
@@ -198,15 +195,14 @@ class QuadSTests : InstrumentedTest {
 
         val mySecretText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
 
-        mTestHelper.doSync<Unit> {
+        mTestHelper.runBlockingTest {
             aliceSession.sharedSecretStorageService.storeSecret(
                     "my.secret",
                     mySecretText.toByteArray().toBase64NoPadding(),
                     listOf(
                             SharedSecretStorageService.KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)),
                             SharedSecretStorageService.KeyRef(keyId2, RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey))
-                    ),
-                    it
+                    )
             )
         }
 
@@ -219,19 +215,17 @@ class QuadSTests : InstrumentedTest {
         assertNotNull(encryptedContent?.get(keyId2))
 
         // Assert that can decrypt with both keys
-        mTestHelper.doSync<String> {
+        mTestHelper.runBlockingTest {
             aliceSession.sharedSecretStorageService.getSecret("my.secret",
                     keyId1,
-                    RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)!!,
-                    it
+                    RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)!!
             )
         }
 
-        mTestHelper.doSync<String> {
+        mTestHelper.runBlockingTest {
             aliceSession.sharedSecretStorageService.getSecret("my.secret",
                     keyId2,
-                    RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey)!!,
-                    it
+                    RawBytesKeySpec.fromRecoveryKey(key2Info.recoveryKey)!!
             )
         }
 
@@ -247,50 +241,34 @@ class QuadSTests : InstrumentedTest {
 
         val mySecretText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit"
 
-        mTestHelper.doSync<Unit> {
+        mTestHelper.runBlockingTest {
             aliceSession.sharedSecretStorageService.storeSecret(
                     "my.secret",
                     mySecretText.toByteArray().toBase64NoPadding(),
-                    listOf(SharedSecretStorageService.KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey))),
-                    it
+                    listOf(SharedSecretStorageService.KeyRef(keyId1, RawBytesKeySpec.fromRecoveryKey(key1Info.recoveryKey)))
             )
         }
 
-        val decryptCountDownLatch = CountDownLatch(1)
-        var error = false
-        aliceSession.sharedSecretStorageService.getSecret("my.secret",
-                keyId1,
-                RawBytesKeySpec.fromPassphrase(
-                        "A bad passphrase",
-                        key1Info.content?.passphrase?.salt ?: "",
-                        key1Info.content?.passphrase?.iterations ?: 0,
-                        null),
-                object : MatrixCallback<String> {
-                    override fun onSuccess(data: String) {
-                        decryptCountDownLatch.countDown()
-                    }
-
-                    override fun onFailure(failure: Throwable) {
-                        error = true
-                        decryptCountDownLatch.countDown()
-                    }
-                }
-        )
-
-        mTestHelper.await(decryptCountDownLatch)
-
-        error shouldBe true
+        mTestHelper.runBlockingTest {
+            aliceSession.sharedSecretStorageService.getSecret("my.secret",
+                    keyId1,
+                    RawBytesKeySpec.fromPassphrase(
+                            "A bad passphrase",
+                            key1Info.content?.passphrase?.salt ?: "",
+                            key1Info.content?.passphrase?.iterations ?: 0,
+                            null)
+            )
+        }
 
         // Now try with correct key
-        mTestHelper.doSync<String> {
+        mTestHelper.runBlockingTest {
             aliceSession.sharedSecretStorageService.getSecret("my.secret",
                     keyId1,
                     RawBytesKeySpec.fromPassphrase(
                             passphrase,
                             key1Info.content?.passphrase?.salt ?: "",
                             key1Info.content?.passphrase?.iterations ?: 0,
-                            null),
-                    it
+                            null)
             )
         }
 
@@ -321,15 +299,15 @@ class QuadSTests : InstrumentedTest {
     private fun generatedSecret(session: Session, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
         val quadS = session.sharedSecretStorageService
 
-        val creationInfo = mTestHelper.doSync<SsssKeyCreationInfo> {
-            quadS.generateKey(keyId, null, keyId, emptyKeySigner, it)
+        val creationInfo = mTestHelper.runBlockingTest {
+            quadS.generateKey(keyId, null, keyId, emptyKeySigner)
         }
 
         assertAccountData(session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
 
         if (asDefault) {
-            mTestHelper.doSync<Unit> {
-                quadS.setDefaultKey(keyId, it)
+            mTestHelper.runBlockingTest {
+                quadS.setDefaultKey(keyId)
             }
             assertAccountData(session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
         }
@@ -340,21 +318,20 @@ class QuadSTests : InstrumentedTest {
     private fun generatedSecretFromPassphrase(session: Session, passphrase: String, keyId: String, asDefault: Boolean = true): SsssKeyCreationInfo {
         val quadS = session.sharedSecretStorageService
 
-        val creationInfo = mTestHelper.doSync<SsssKeyCreationInfo> {
+        val creationInfo = mTestHelper.runBlockingTest {
             quadS.generateKeyWithPassphrase(
                     keyId,
                     keyId,
                     passphrase,
                     emptyKeySigner,
-                    null,
-                    it)
+                    null)
         }
 
         assertAccountData(session, "${DefaultSharedSecretStorageService.KEY_ID_BASE}.$keyId")
         if (asDefault) {
-            val setDefaultLatch = CountDownLatch(1)
-            quadS.setDefaultKey(keyId, TestMatrixCallback(setDefaultLatch))
-            mTestHelper.await(setDefaultLatch)
+            mTestHelper.runBlockingTest {
+                quadS.setDefaultKey(keyId)
+            }
             assertAccountData(session, DefaultSharedSecretStorageService.DEFAULT_KEY_ID)
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
index 37ecf99f9a..721a2bc8af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.api.session.securestorage
 
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
@@ -43,13 +42,12 @@ interface SharedSecretStorageService {
      * @param keyName a human readable name
      * @param keySigner Used to add a signature to the key (client should check key signature before storing secret)
      *
-     * @param callback Get key creation info
+     * @return key creation info
      */
-    fun generateKey(keyId: String,
-                    key: SsssKeySpec?,
-                    keyName: String,
-                    keySigner: KeySigner?,
-                    callback: MatrixCallback<SsssKeyCreationInfo>)
+    suspend fun generateKey(keyId: String,
+                            key: SsssKeySpec?,
+                            keyName: String,
+                            keySigner: KeySigner?): SsssKeyCreationInfo
 
     /**
      * Generates a SSSS key using the given passphrase.
@@ -61,14 +59,13 @@ interface SharedSecretStorageService {
      * @param keySigner Used to add a signature to the key (client should check key signature before retrieving secret)
      * @param progressListener The derivation of the passphrase may take long depending on the device, use this to report progress
      *
-     * @param callback Get key creation info
+     * @return key creation info
      */
-    fun generateKeyWithPassphrase(keyId: String,
-                                  keyName: String,
-                                  passphrase: String,
-                                  keySigner: KeySigner,
-                                  progressListener: ProgressListener?,
-                                  callback: MatrixCallback<SsssKeyCreationInfo>)
+    suspend fun generateKeyWithPassphrase(keyId: String,
+                                          keyName: String,
+                                          passphrase: String,
+                                          keySigner: KeySigner,
+                                          progressListener: ProgressListener?): SsssKeyCreationInfo
 
     fun getKey(keyId: String): KeyInfoResult
 
@@ -80,7 +77,7 @@ interface SharedSecretStorageService {
      */
     fun getDefaultKey(): KeyInfoResult
 
-    fun setDefaultKey(keyId: String, callback: MatrixCallback<Unit>)
+    suspend fun setDefaultKey(keyId: String)
 
     /**
      * Check whether we have a key with a given ID.
@@ -98,7 +95,7 @@ interface SharedSecretStorageService {
      * @param secret The secret contents.
      * @param keys The list of (ID,privateKey) of the keys to use to encrypt the secret.
      */
-    fun storeSecret(name: String, secretBase64: String, keys: List<KeyRef>, callback: MatrixCallback<Unit>)
+    suspend fun storeSecret(name: String, secretBase64: String, keys: List<KeyRef>)
 
     /**
      * Use this call to determine which SSSSKeySpec to use for requesting secret
@@ -113,7 +110,7 @@ interface SharedSecretStorageService {
      * @param secretKey the secret key to use (@see #RawBytesKeySpec)
      *
      */
-    fun getSecret(name: String, keyId: String?, secretKey: SsssKeySpec, callback: MatrixCallback<String>)
+    suspend fun getSecret(name: String, keyId: String?, secretKey: SsssKeySpec): String
 
     /**
      * Return true if SSSS is configured
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
index 82b5185fe8..6869d5188e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.crypto.secrets
 
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
@@ -43,10 +42,10 @@ import org.matrix.android.sdk.internal.crypto.keysbackup.util.computeRecoveryKey
 import org.matrix.android.sdk.internal.crypto.tools.HkdfSha256
 import org.matrix.android.sdk.internal.crypto.tools.withOlmDecryption
 import org.matrix.android.sdk.internal.di.UserId
-import org.matrix.android.sdk.internal.extensions.foldToCallback
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.olm.OlmPkMessage
 import java.security.SecureRandom
 import javax.crypto.Cipher
@@ -64,21 +63,15 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
         private val cryptoCoroutineScope: CoroutineScope
 ) : SharedSecretStorageService {
 
-    override fun generateKey(keyId: String,
-                             key: SsssKeySpec?,
-                             keyName: String,
-                             keySigner: KeySigner?,
-                             callback: MatrixCallback<SsssKeyCreationInfo>) {
-        cryptoCoroutineScope.launch(coroutineDispatchers.main) {
-            val bytes = try {
-                (key as? RawBytesKeySpec)?.privateKey
-                        ?: ByteArray(32).also {
-                            SecureRandom().nextBytes(it)
-                        }
-            } catch (failure: Throwable) {
-                callback.onFailure(failure)
-                return@launch
-            }
+    override suspend fun generateKey(keyId: String,
+                                     key: SsssKeySpec?,
+                                     keyName: String,
+                                     keySigner: KeySigner?): SsssKeyCreationInfo {
+        return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
+            val bytes = (key as? RawBytesKeySpec)?.privateKey
+                    ?: ByteArray(32).also {
+                        SecureRandom().nextBytes(it)
+                    }
 
             val storageKeyContent = SecretStorageKeyContent(
                     name = keyName,
@@ -92,34 +85,24 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 )
             } ?: storageKeyContent
 
-            accountDataService.updateAccountData(
-                    "$KEY_ID_BASE.$keyId",
-                    signedContent.toContent(),
-                    object : MatrixCallback<Unit> {
-                        override fun onFailure(failure: Throwable) {
-                            callback.onFailure(failure)
-                        }
-
-                        override fun onSuccess(data: Unit) {
-                            callback.onSuccess(SsssKeyCreationInfo(
-                                    keyId = keyId,
-                                    content = storageKeyContent,
-                                    recoveryKey = computeRecoveryKey(bytes),
-                                    keySpec = RawBytesKeySpec(bytes)
-                            ))
-                        }
-                    }
+            awaitCallback<Unit> {
+                accountDataService.updateAccountData("$KEY_ID_BASE.$keyId", signedContent.toContent(), it)
+            }
+            SsssKeyCreationInfo(
+                    keyId = keyId,
+                    content = storageKeyContent,
+                    recoveryKey = computeRecoveryKey(bytes),
+                    keySpec = RawBytesKeySpec(bytes)
             )
         }
     }
 
-    override fun generateKeyWithPassphrase(keyId: String,
-                                           keyName: String,
-                                           passphrase: String,
-                                           keySigner: KeySigner,
-                                           progressListener: ProgressListener?,
-                                           callback: MatrixCallback<SsssKeyCreationInfo>) {
-        cryptoCoroutineScope.launch(coroutineDispatchers.main) {
+    override suspend fun generateKeyWithPassphrase(keyId: String,
+                                                   keyName: String,
+                                                   passphrase: String,
+                                                   keySigner: KeySigner,
+                                                   progressListener: ProgressListener?): SsssKeyCreationInfo {
+        return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
             val privatePart = generatePrivateKeyWithPassword(passphrase, progressListener)
 
             val storageKeyContent = SecretStorageKeyContent(
@@ -133,23 +116,18 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 )
             } ?: storageKeyContent
 
-            accountDataService.updateAccountData(
-                    "$KEY_ID_BASE.$keyId",
-                    signedContent.toContent(),
-                    object : MatrixCallback<Unit> {
-                        override fun onFailure(failure: Throwable) {
-                            callback.onFailure(failure)
-                        }
-
-                        override fun onSuccess(data: Unit) {
-                            callback.onSuccess(SsssKeyCreationInfo(
-                                    keyId = keyId,
-                                    content = storageKeyContent,
-                                    recoveryKey = computeRecoveryKey(privatePart.privateKey),
-                                    keySpec = RawBytesKeySpec(privatePart.privateKey)
-                            ))
-                        }
-                    }
+            awaitCallback<Unit> {
+                accountDataService.updateAccountData(
+                        "$KEY_ID_BASE.$keyId",
+                        signedContent.toContent(),
+                        it
+                )
+            }
+            SsssKeyCreationInfo(
+                    keyId = keyId,
+                    content = storageKeyContent,
+                    recoveryKey = computeRecoveryKey(privatePart.privateKey),
+                    keySpec = RawBytesKeySpec(privatePart.privateKey)
             )
         }
     }
@@ -168,15 +146,17 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
         } ?: KeyInfoResult.Error(SharedSecretStorageError.UnknownAlgorithm(keyId))
     }
 
-    override fun setDefaultKey(keyId: String, callback: MatrixCallback<Unit>) {
+    override suspend fun setDefaultKey(keyId: String) {
         val existingKey = getKey(keyId)
         if (existingKey is KeyInfoResult.Success) {
-            accountDataService.updateAccountData(DEFAULT_KEY_ID,
-                    mapOf("key" to keyId),
-                    callback
-            )
+            awaitCallback<Unit> {
+                accountDataService.updateAccountData(DEFAULT_KEY_ID,
+                        mapOf("key" to keyId),
+                        it
+                )
+            }
         } else {
-            callback.onFailure(SharedSecretStorageError.UnknownKey(keyId))
+            throw SharedSecretStorageError.UnknownKey(keyId)
         }
     }
 
@@ -188,41 +168,35 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
         return getKey(keyId)
     }
 
-    override fun storeSecret(name: String, secretBase64: String, keys: List<SharedSecretStorageService.KeyRef>, callback: MatrixCallback<Unit>) {
-        cryptoCoroutineScope.launch(coroutineDispatchers.main) {
+    override suspend fun storeSecret(name: String, secretBase64: String, keys: List<SharedSecretStorageService.KeyRef>) {
+        withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
             val encryptedContents = HashMap<String, EncryptedSecretContent>()
-            try {
-                keys.forEach {
-                    val keyId = it.keyId
-                    // encrypt the content
-                    when (val key = keyId?.let { getKey(keyId) } ?: getDefaultKey()) {
-                        is KeyInfoResult.Success -> {
-                            if (key.keyInfo.content.algorithm == SSSS_ALGORITHM_AES_HMAC_SHA2) {
-                                encryptAesHmacSha2(it.keySpec!!, name, secretBase64).let {
-                                    encryptedContents[key.keyInfo.id] = it
-                                }
-                            } else {
-                                // Unknown algorithm
-                                callback.onFailure(SharedSecretStorageError.UnknownAlgorithm(key.keyInfo.content.algorithm ?: ""))
-                                return@launch
+            keys.forEach {
+                val keyId = it.keyId
+                // encrypt the content
+                when (val key = keyId?.let { getKey(keyId) } ?: getDefaultKey()) {
+                    is KeyInfoResult.Success -> {
+                        if (key.keyInfo.content.algorithm == SSSS_ALGORITHM_AES_HMAC_SHA2) {
+                            encryptAesHmacSha2(it.keySpec!!, name, secretBase64).let {
+                                encryptedContents[key.keyInfo.id] = it
                             }
-                        }
-                        is KeyInfoResult.Error   -> {
-                            callback.onFailure(key.error)
-                            return@launch
+                        } else {
+                            // Unknown algorithm
+                            throw SharedSecretStorageError.UnknownAlgorithm(key.keyInfo.content.algorithm ?: "")
                         }
                     }
+                    is KeyInfoResult.Error -> throw key.error
                 }
+            }
 
+            awaitCallback<Unit> {
                 accountDataService.updateAccountData(
                         type = name,
                         content = mapOf(
                                 "encrypted" to encryptedContents
                         ),
-                        callback = callback
+                        callback = it
                 )
-            } catch (failure: Throwable) {
-                callback.onFailure(failure)
             }
         }
     }
@@ -344,57 +318,40 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
         return results
     }
 
-    override fun getSecret(name: String, keyId: String?, secretKey: SsssKeySpec, callback: MatrixCallback<String>) {
-        val accountData = accountDataService.getAccountDataEvent(name) ?: return Unit.also {
-            callback.onFailure(SharedSecretStorageError.UnknownSecret(name))
-        }
-        val encryptedContent = accountData.content[ENCRYPTED] as? Map<*, *> ?: return Unit.also {
-            callback.onFailure(SharedSecretStorageError.SecretNotEncrypted(name))
-        }
-        val key = keyId?.let { getKey(it) } as? KeyInfoResult.Success ?: getDefaultKey() as? KeyInfoResult.Success ?: return Unit.also {
-            callback.onFailure(SharedSecretStorageError.UnknownKey(name))
-        }
+    override suspend fun getSecret(name: String, keyId: String?, secretKey: SsssKeySpec): String {
+        val accountData = accountDataService.getAccountDataEvent(name) ?: throw SharedSecretStorageError.UnknownSecret(name)
+        val encryptedContent = accountData.content[ENCRYPTED] as? Map<*, *> ?: throw SharedSecretStorageError.SecretNotEncrypted(name)
+        val key = keyId?.let { getKey(it) } as? KeyInfoResult.Success ?: getDefaultKey() as? KeyInfoResult.Success
+        ?: throw SharedSecretStorageError.UnknownKey(name)
 
-        val encryptedForKey = encryptedContent[key.keyInfo.id] ?: return Unit.also {
-            callback.onFailure(SharedSecretStorageError.SecretNotEncryptedWithKey(name, key.keyInfo.id))
-        }
+        val encryptedForKey = encryptedContent[key.keyInfo.id] ?: throw SharedSecretStorageError.SecretNotEncryptedWithKey(name, key.keyInfo.id)
 
         val secretContent = EncryptedSecretContent.fromJson(encryptedForKey)
-                ?: return Unit.also {
-                    callback.onFailure(SharedSecretStorageError.ParsingError)
-                }
+                ?: throw SharedSecretStorageError.ParsingError
 
         val algorithm = key.keyInfo.content
         if (SSSS_ALGORITHM_CURVE25519_AES_SHA2 == algorithm.algorithm) {
-            val keySpec = secretKey as? RawBytesKeySpec ?: return Unit.also {
-                callback.onFailure(SharedSecretStorageError.BadKeyFormat)
-            }
-            cryptoCoroutineScope.launch(coroutineDispatchers.main) {
-                runCatching {
-                    // decrypt from recovery key
-                    withOlmDecryption { olmPkDecryption ->
-                        olmPkDecryption.setPrivateKey(keySpec.privateKey)
-                        olmPkDecryption.decrypt(OlmPkMessage()
-                                .apply {
-                                    mCipherText = secretContent.ciphertext
-                                    mEphemeralKey = secretContent.ephemeral
-                                    mMac = secretContent.mac
-                                }
-                        )
-                    }
-                }.foldToCallback(callback)
+            val keySpec = secretKey as? RawBytesKeySpec ?: throw SharedSecretStorageError.BadKeyFormat
+            return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
+                // decrypt from recovery key
+                withOlmDecryption { olmPkDecryption ->
+                    olmPkDecryption.setPrivateKey(keySpec.privateKey)
+                    olmPkDecryption.decrypt(OlmPkMessage()
+                            .apply {
+                                mCipherText = secretContent.ciphertext
+                                mEphemeralKey = secretContent.ephemeral
+                                mMac = secretContent.mac
+                            }
+                    )
+                }
             }
         } else if (SSSS_ALGORITHM_AES_HMAC_SHA2 == algorithm.algorithm) {
-            val keySpec = secretKey as? RawBytesKeySpec ?: return Unit.also {
-                callback.onFailure(SharedSecretStorageError.BadKeyFormat)
-            }
-            cryptoCoroutineScope.launch(coroutineDispatchers.main) {
-                runCatching {
-                    decryptAesHmacSha2(keySpec, name, secretContent)
-                }.foldToCallback(callback)
+            val keySpec = secretKey as? RawBytesKeySpec ?: throw SharedSecretStorageError.BadKeyFormat
+            return withContext(cryptoCoroutineScope.coroutineContext + coroutineDispatchers.main) {
+                decryptAesHmacSha2(keySpec, name, secretContent)
             }
         } else {
-            callback.onFailure(SharedSecretStorageError.UnsupportedAlgorithm(algorithm.algorithm ?: ""))
+            throw SharedSecretStorageError.UnsupportedAlgorithm(algorithm.algorithm ?: "")
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
index e95f250dd3..573a95a7dd 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
@@ -43,7 +43,6 @@ import org.matrix.android.sdk.api.session.securestorage.IntegrityResult
 import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
 import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
 import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.io.ByteArrayOutputStream
@@ -130,13 +129,13 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
     override fun handle(action: SharedSecureStorageAction) = withState {
         when (action) {
             is SharedSecureStorageAction.TogglePasswordVisibility -> handleTogglePasswordVisibility()
-            is SharedSecureStorageAction.Cancel                   -> handleCancel()
-            is SharedSecureStorageAction.SubmitPassphrase         -> handleSubmitPassphrase(action)
-            SharedSecureStorageAction.UseKey                      -> handleUseKey()
-            is SharedSecureStorageAction.SubmitKey                -> handleSubmitKey(action)
-            SharedSecureStorageAction.Back                        -> handleBack()
-            SharedSecureStorageAction.ForgotResetAll              -> handleResetAll()
-            SharedSecureStorageAction.DoResetAll                  -> handleDoResetAll()
+            is SharedSecureStorageAction.Cancel -> handleCancel()
+            is SharedSecureStorageAction.SubmitPassphrase -> handleSubmitPassphrase(action)
+            SharedSecureStorageAction.UseKey -> handleUseKey()
+            is SharedSecureStorageAction.SubmitKey -> handleSubmitKey(action)
+            SharedSecureStorageAction.Back -> handleBack()
+            SharedSecureStorageAction.ForgotResetAll -> handleResetAll()
+            SharedSecureStorageAction.DoResetAll -> handleDoResetAll()
         }.exhaustive
     }
 
@@ -220,13 +219,10 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 withContext(Dispatchers.IO) {
                     args.requestedSecrets.forEach {
                         if (session.getAccountDataEvent(it) != null) {
-                            val res = awaitCallback<String> { callback ->
-                                session.sharedSecretStorageService.getSecret(
-                                        name = it,
-                                        keyId = keyInfo.id,
-                                        secretKey = keySpec,
-                                        callback = callback)
-                            }
+                            val res = session.sharedSecretStorageService.getSecret(
+                                    name = it,
+                                    keyId = keyInfo.id,
+                                    secretKey = keySpec)
                             decryptedSecretMap[it] = res
                         } else {
                             Timber.w("## Cannot find secret $it in SSSS, skip")
@@ -292,13 +288,10 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 withContext(Dispatchers.IO) {
                     args.requestedSecrets.forEach {
                         if (session.getAccountDataEvent(it) != null) {
-                            val res = awaitCallback<String> { callback ->
-                                session.sharedSecretStorageService.getSecret(
-                                        name = it,
-                                        keyId = keyInfo.id,
-                                        secretKey = keySpec,
-                                        callback = callback)
-                            }
+                            val res = session.sharedSecretStorageService.getSecret(
+                                    name = it,
+                                    keyId = keyInfo.id,
+                                    secretKey = keySpec)
                             decryptedSecretMap[it] = res
                         } else {
                             Timber.w("## Cannot find secret $it in SSSS, skip")
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
index 8fbef016cf..74bab9b0b6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt
@@ -97,37 +97,31 @@ class BackupToQuadSMigrationTask @Inject constructor(
                     when {
                         params.passphrase?.isNotEmpty() == true -> {
                             reportProgress(params, R.string.bootstrap_progress_generating_ssss)
-                            awaitCallback {
-                                quadS.generateKeyWithPassphrase(
-                                        UUID.randomUUID().toString(),
-                                        "ssss_key",
-                                        params.passphrase,
-                                        EmptyKeySigner(),
-                                        object : ProgressListener {
-                                            override fun onProgress(progress: Int, total: Int) {
-                                                params.progressListener?.onProgress(
-                                                        WaitingViewData(
-                                                                stringProvider.getString(
-                                                                        R.string.bootstrap_progress_generating_ssss_with_info,
-                                                                        "$progress/$total")
-                                                        ))
-                                            }
-                                        },
-                                        it
-                                )
-                            }
+                            quadS.generateKeyWithPassphrase(
+                                    UUID.randomUUID().toString(),
+                                    "ssss_key",
+                                    params.passphrase,
+                                    EmptyKeySigner(),
+                                    object : ProgressListener {
+                                        override fun onProgress(progress: Int, total: Int) {
+                                            params.progressListener?.onProgress(
+                                                    WaitingViewData(
+                                                            stringProvider.getString(
+                                                                    R.string.bootstrap_progress_generating_ssss_with_info,
+                                                                    "$progress/$total")
+                                                    ))
+                                        }
+                                    }
+                            )
                         }
                         params.recoveryKey != null              -> {
                             reportProgress(params, R.string.bootstrap_progress_generating_ssss_recovery)
-                            awaitCallback {
-                                quadS.generateKey(
-                                        UUID.randomUUID().toString(),
-                                        extractCurveKeyFromRecoveryKey(params.recoveryKey)?.let { RawBytesKeySpec(it) },
-                                        "ssss_key",
-                                        EmptyKeySigner(),
-                                        it
-                                )
-                            }
+                            quadS.generateKey(
+                                    UUID.randomUUID().toString(),
+                                    extractCurveKeyFromRecoveryKey(params.recoveryKey)?.let { RawBytesKeySpec(it) },
+                                    "ssss_key",
+                                    EmptyKeySigner()
+                            )
                         }
                         else                                    -> {
                             return Result.IllegalParams
@@ -137,14 +131,11 @@ class BackupToQuadSMigrationTask @Inject constructor(
             // Ok, so now we have migrated the old keybackup secret as the quadS key
             // Now we need to store the keybackup key in SSSS in a compatible way
             reportProgress(params, R.string.bootstrap_progress_storing_in_sss)
-            awaitCallback<Unit> {
-                quadS.storeSecret(
-                        KEYBACKUP_SECRET_SSSS_NAME,
-                        curveKey.toBase64NoPadding(),
-                        listOf(SharedSecretStorageService.KeyRef(info.keyId, info.keySpec)),
-                        it
-                )
-            }
+            quadS.storeSecret(
+                    KEYBACKUP_SECRET_SSSS_NAME,
+                    curveKey.toBase64NoPadding(),
+                    listOf(SharedSecretStorageService.KeyRef(info.keyId, info.keySpec))
+            )
 
             // save for gossiping
             keysBackupService.saveBackupRecoveryKey(recoveryKey, version.version)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index d1a1237463..87074b7a12 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -126,25 +126,21 @@ class BootstrapCrossSigningTask @Inject constructor(
 
         Timber.d("## BootstrapCrossSigningTask: Creating 4S key with pass: ${params.passphrase != null}")
         try {
-            keyInfo = awaitCallback {
-                params.passphrase?.let { passphrase ->
-                    ssssService.generateKeyWithPassphrase(
-                            UUID.randomUUID().toString(),
-                            "ssss_key",
-                            passphrase,
-                            EmptyKeySigner(),
-                            null,
-                            it
-                    )
-                } ?: run {
-                    ssssService.generateKey(
-                            UUID.randomUUID().toString(),
-                            params.keySpec,
-                            "ssss_key",
-                            EmptyKeySigner(),
-                            it
-                    )
-                }
+            keyInfo = params.passphrase?.let { passphrase ->
+                ssssService.generateKeyWithPassphrase(
+                        UUID.randomUUID().toString(),
+                        "ssss_key",
+                        passphrase,
+                        EmptyKeySigner(),
+                        null
+                )
+            } ?: run {
+                ssssService.generateKey(
+                        UUID.randomUUID().toString(),
+                        params.keySpec,
+                        "ssss_key",
+                        EmptyKeySigner()
+                )
             }
         } catch (failure: Failure) {
             Timber.e("## BootstrapCrossSigningTask: Creating 4S - Failed to generate key <${failure.localizedMessage}>")
@@ -159,9 +155,7 @@ class BootstrapCrossSigningTask @Inject constructor(
 
         Timber.d("## BootstrapCrossSigningTask: Creating 4S - Set default key")
         try {
-            awaitCallback<Unit> {
-                ssssService.setDefaultKey(keyInfo.keyId, it)
-            }
+            ssssService.setDefaultKey(keyInfo.keyId)
         } catch (failure: Failure) {
             // Maybe we could just ignore this error?
             Timber.e("## BootstrapCrossSigningTask: Creating 4S - Set default key error <${failure.localizedMessage}>")
@@ -183,13 +177,11 @@ class BootstrapCrossSigningTask @Inject constructor(
                     )
             )
             Timber.d("## BootstrapCrossSigningTask: Creating 4S - Storing MSK...")
-            awaitCallback<Unit> {
-                ssssService.storeSecret(
-                        MASTER_KEY_SSSS_NAME,
-                        mskPrivateKey,
-                        listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec)), it
-                )
-            }
+            ssssService.storeSecret(
+                    MASTER_KEY_SSSS_NAME,
+                    mskPrivateKey,
+                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+            )
             params.progressListener?.onProgress(
                     WaitingViewData(
                             stringProvider.getString(R.string.bootstrap_crosssigning_progress_save_usk),
@@ -197,27 +189,22 @@ class BootstrapCrossSigningTask @Inject constructor(
                     )
             )
             Timber.d("## BootstrapCrossSigningTask: Creating 4S - Storing USK...")
-            awaitCallback<Unit> {
-                ssssService.storeSecret(
-                        USER_SIGNING_KEY_SSSS_NAME,
-                        uskPrivateKey,
-                        listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec)),
-                        it
-                )
-            }
+            ssssService.storeSecret(
+                    USER_SIGNING_KEY_SSSS_NAME,
+                    uskPrivateKey,
+                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec)),
+            )
             params.progressListener?.onProgress(
                     WaitingViewData(
                             stringProvider.getString(R.string.bootstrap_crosssigning_progress_save_ssk), isIndeterminate = true
                     )
             )
             Timber.d("## BootstrapCrossSigningTask: Creating 4S - Storing SSK...")
-            awaitCallback<Unit> {
-                ssssService.storeSecret(
-                        SELF_SIGNING_KEY_SSSS_NAME,
-                        sskPrivateKey,
-                        listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec)), it
-                )
-            }
+            ssssService.storeSecret(
+                    SELF_SIGNING_KEY_SSSS_NAME,
+                    sskPrivateKey,
+                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+            )
         } catch (failure: Failure) {
             Timber.e("## BootstrapCrossSigningTask: Creating 4S - Failed to store keys <${failure.localizedMessage}>")
             // Maybe we could just ignore this error?
@@ -265,14 +252,12 @@ class BootstrapCrossSigningTask @Inject constructor(
                 Timber.d("## BootstrapCrossSigningTask: Creating 4S - Save megolm backup key for gossiping")
                 session.cryptoService().keysBackupService().saveBackupRecoveryKey(creationInfo.recoveryKey, version = version.version)
 
-                awaitCallback<Unit> {
-                    extractCurveKeyFromRecoveryKey(creationInfo.recoveryKey)?.toBase64NoPadding()?.let { secret ->
-                        ssssService.storeSecret(
-                                KEYBACKUP_SECRET_SSSS_NAME,
-                                secret,
-                                listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec)), it
-                        )
-                    }
+                extractCurveKeyFromRecoveryKey(creationInfo.recoveryKey)?.toBase64NoPadding()?.let { secret ->
+                    ssssService.storeSecret(
+                            KEYBACKUP_SECRET_SSSS_NAME,
+                            secret,
+                            listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                    )
                 }
             } else {
                 Timber.d("## BootstrapCrossSigningTask: Creating 4S - Existing megolm backup found")
@@ -284,14 +269,12 @@ class BootstrapCrossSigningTask @Inject constructor(
                     }
                     if (isValid) {
                         Timber.d("## BootstrapCrossSigningTask: Creating 4S - Megolm key valid and known")
-                        awaitCallback<Unit> {
-                            extractCurveKeyFromRecoveryKey(knownMegolmSecret!!.recoveryKey)?.toBase64NoPadding()?.let { secret ->
-                                ssssService.storeSecret(
-                                        KEYBACKUP_SECRET_SSSS_NAME,
-                                        secret,
-                                        listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec)), it
-                                )
-                            }
+                        extractCurveKeyFromRecoveryKey(knownMegolmSecret!!.recoveryKey)?.toBase64NoPadding()?.let { secret ->
+                            ssssService.storeSecret(
+                                    KEYBACKUP_SECRET_SSSS_NAME,
+                                    secret,
+                                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
+                            )
                         }
                     } else {
                         Timber.d("## BootstrapCrossSigningTask: Creating 4S - Megolm key is unknown by this session")

From 7aba3cff66c5e4a73c41176af599a4fe5b473964 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 28 Mar 2021 11:59:44 +0100
Subject: [PATCH 434/578] Convert AccountDataService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../session/accountdata/AccountDataService.kt |  4 +--
 .../DefaultSharedSecretStorageService.kt      | 36 ++++++-------------
 .../accountdata/DefaultAccountDataService.kt  | 33 +++++++----------
 .../settings/devtools/AccountDataViewModel.kt |  5 +--
 .../features/widgets/WidgetPostAPIHandler.kt  | 11 +++---
 5 files changed, 30 insertions(+), 59 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
index f5d2a7df3e..5ebeaad3de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
@@ -17,9 +17,7 @@
 package org.matrix.android.sdk.api.session.accountdata
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Content
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 
 interface AccountDataService {
@@ -48,5 +46,5 @@ interface AccountDataService {
     /**
      * Update the account data with the provided type and the provided account data content
      */
-    fun updateAccountData(type: String, content: Content, callback: MatrixCallback<Unit>? = null): Cancelable
+    suspend fun updateAccountData(type: String, content: Content)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
index 6869d5188e..1f80ce2c81 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
@@ -45,7 +45,6 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.withContext
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.olm.OlmPkMessage
 import java.security.SecureRandom
 import javax.crypto.Cipher
@@ -85,9 +84,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 )
             } ?: storageKeyContent
 
-            awaitCallback<Unit> {
-                accountDataService.updateAccountData("$KEY_ID_BASE.$keyId", signedContent.toContent(), it)
-            }
+            accountDataService.updateAccountData("$KEY_ID_BASE.$keyId", signedContent.toContent())
             SsssKeyCreationInfo(
                     keyId = keyId,
                     content = storageKeyContent,
@@ -116,13 +113,10 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 )
             } ?: storageKeyContent
 
-            awaitCallback<Unit> {
-                accountDataService.updateAccountData(
-                        "$KEY_ID_BASE.$keyId",
-                        signedContent.toContent(),
-                        it
-                )
-            }
+            accountDataService.updateAccountData(
+                    "$KEY_ID_BASE.$keyId",
+                    signedContent.toContent()
+            )
             SsssKeyCreationInfo(
                     keyId = keyId,
                     content = storageKeyContent,
@@ -149,12 +143,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
     override suspend fun setDefaultKey(keyId: String) {
         val existingKey = getKey(keyId)
         if (existingKey is KeyInfoResult.Success) {
-            awaitCallback<Unit> {
-                accountDataService.updateAccountData(DEFAULT_KEY_ID,
-                        mapOf("key" to keyId),
-                        it
-                )
-            }
+            accountDataService.updateAccountData(DEFAULT_KEY_ID, mapOf("key" to keyId))
         } else {
             throw SharedSecretStorageError.UnknownKey(keyId)
         }
@@ -189,15 +178,10 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 }
             }
 
-            awaitCallback<Unit> {
-                accountDataService.updateAccountData(
-                        type = name,
-                        content = mapOf(
-                                "encrypted" to encryptedContents
-                        ),
-                        callback = it
-                )
-            }
+            accountDataService.updateAccountData(
+                    type = name,
+                    content = mapOf("encrypted" to encryptedContents)
+            )
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
index 1f1e987ebf..27db30f3b3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
@@ -18,16 +18,15 @@ package org.matrix.android.sdk.internal.session.user.accountdata
 
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
 import org.matrix.android.sdk.api.session.events.model.Content
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.sync.UserAccountDataSyncHandler
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
+import org.matrix.android.sdk.internal.util.awaitCallback
 import javax.inject.Inject
 
 internal class DefaultAccountDataService @Inject constructor(
@@ -54,26 +53,18 @@ internal class DefaultAccountDataService @Inject constructor(
         return accountDataDataSource.getLiveAccountDataEvents(types)
     }
 
-    override fun updateAccountData(type: String, content: Content, callback: MatrixCallback<Unit>?): Cancelable {
-        return updateUserAccountDataTask.configureWith(UpdateUserAccountDataTask.AnyParams(
-                type = type,
-                any = content
-        )) {
-            this.retryCount = 5
-            this.callback = object : MatrixCallback<Unit> {
-                override fun onSuccess(data: Unit) {
-                    // TODO Move that to the task (but it created a circular dependencies...)
-                    monarchy.runTransactionSync { realm ->
-                        userAccountDataSyncHandler.handleGenericAccountData(realm, type, content)
-                    }
-                    callback?.onSuccess(data)
-                }
-
-                override fun onFailure(failure: Throwable) {
-                    callback?.onFailure(failure)
-                }
+    override suspend fun updateAccountData(type: String, content: Content) {
+        val params = UpdateUserAccountDataTask.AnyParams(type = type, any = content)
+        awaitCallback<Unit> { callback ->
+            updateUserAccountDataTask.configureWith(params) {
+                this.retryCount = 5 // TODO: Need to refactor retrying out into a helper method.
+                this.callback = callback
             }
+                    .executeBy(taskExecutor)
+        }
+        // TODO Move that to the task (but it created a circular dependencies...)
+        monarchy.runTransactionSync { realm ->
+            userAccountDataSyncHandler.handleGenericAccountData(realm, type, content)
         }
-                .executeBy(taskExecutor)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
index b2200e6a6d..7880e734a5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt
@@ -32,7 +32,6 @@ import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 
 data class AccountDataViewState(
@@ -58,9 +57,7 @@ class AccountDataViewModel @AssistedInject constructor(@Assisted initialState: A
 
     private fun handleDeleteAccountData(action: AccountDataAction.DeleteAccountData) {
         viewModelScope.launch {
-            awaitCallback {
-                session.updateAccountData(action.type, emptyMap(), it)
-            }
+            session.updateAccountData(action.type, emptyMap())
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index 13d49eb20b..daa72fcd32 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -283,11 +283,12 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
                             "type" to "m.widget"
                     )
             )
-            session.updateAccountData(
-                    type = UserAccountDataTypes.TYPE_WIDGETS,
-                    content = addUserWidgetBody,
-                    callback = createWidgetAPICallback(widgetPostAPIMediator, eventData)
-            )
+            launchWidgetAPIAction(widgetPostAPIMediator, eventData) {
+                session.updateAccountData(
+                        type = UserAccountDataTypes.TYPE_WIDGETS,
+                        content = addUserWidgetBody
+                )
+            }
         } else {
             session.widgetService().createRoomWidget(
                     roomId = roomId,

From b6f4be289419017cb3b122c5f0e8906119911229 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 28 Mar 2021 13:52:16 +0100
Subject: [PATCH 435/578] Convert FileService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../sdk/api/session/file/FileService.kt       |  13 +-
 .../internal/session/DefaultFileService.kt    | 203 ++++++++----------
 .../app/core/glide/VectorGlideModelLoader.kt  |  32 ++-
 .../home/room/detail/RoomDetailFragment.kt    |  47 ++--
 .../home/room/detail/RoomDetailViewModel.kt   |  29 +--
 .../features/media/BaseAttachmentProvider.kt  |  32 +--
 .../media/DataAttachmentRoomProvider.kt       |  29 ++-
 .../media/RoomEventsAttachmentProvider.kt     |  28 ++-
 .../features/media/VideoContentRenderer.kt    |  94 ++++----
 .../uploads/RoomUploadsViewModel.kt           |  17 +-
 10 files changed, 232 insertions(+), 292 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
index bcdb5ea257..adfdc2498e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
@@ -17,11 +17,9 @@
 package org.matrix.android.sdk.api.session.file
 
 import android.net.Uri
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
 import org.matrix.android.sdk.api.session.room.model.message.getFileName
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import java.io.File
@@ -41,20 +39,17 @@ interface FileService {
      * Download a file.
      * Result will be a decrypted file, stored in the cache folder. url parameter will be used to create unique filename to avoid name collision.
      */
-    fun downloadFile(fileName: String,
+    suspend fun downloadFile(fileName: String,
                      mimeType: String?,
                      url: String?,
-                     elementToDecrypt: ElementToDecrypt?,
-                     callback: MatrixCallback<File>): Cancelable
+                     elementToDecrypt: ElementToDecrypt?): File
 
-    fun downloadFile(messageContent: MessageWithAttachmentContent,
-                     callback: MatrixCallback<File>): Cancelable =
+    suspend fun downloadFile(messageContent: MessageWithAttachmentContent): File =
             downloadFile(
                     fileName = messageContent.getFileName(),
                     mimeType = messageContent.mimeType,
                     url = messageContent.getFileUrl(),
-                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(),
-                    callback = callback
+                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt()
             )
 
     fun isFileInCache(mxcUrl: String?,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
index 07cde3da60..d05ee48c1b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@@ -20,26 +20,20 @@ import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
 import androidx.core.content.FileProvider
-import arrow.core.Try
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.completeWith
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.session.file.FileService
-import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.api.util.NoOpCancellable
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import org.matrix.android.sdk.internal.crypto.attachments.MXEncryptedAttachments
 import org.matrix.android.sdk.internal.di.SessionDownloadsDirectory
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificateWithProgress
 import org.matrix.android.sdk.internal.session.download.DownloadProgressInterceptor.Companion.DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER
-import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.internal.util.md5
-import org.matrix.android.sdk.internal.util.toCancelable
 import org.matrix.android.sdk.internal.util.writeToFile
 import timber.log.Timber
 import java.io.File
@@ -53,14 +47,15 @@ internal class DefaultFileService @Inject constructor(
         private val contentUrlResolver: ContentUrlResolver,
         @UnauthenticatedWithCertificateWithProgress
         private val okHttpClient: OkHttpClient,
-        private val coroutineDispatchers: MatrixCoroutineDispatchers,
-        private val taskExecutor: TaskExecutor
+        private val coroutineDispatchers: MatrixCoroutineDispatchers
 ) : FileService {
 
     // Legacy folder, will be deleted
     private val legacyFolder = File(sessionCacheDirectory, "MF")
+
     // Folder to store downloaded files (not decrypted)
     private val downloadFolder = File(sessionCacheDirectory, "F")
+
     // Folder to store decrypted files
     private val decryptedFolder = File(downloadFolder, "D")
 
@@ -73,134 +68,113 @@ internal class DefaultFileService @Inject constructor(
      * Retain ongoing downloads to avoid re-downloading and already downloading file
      * map of mxCurl to callbacks
      */
-    private val ongoing = mutableMapOf<String, ArrayList<MatrixCallback<File>>>()
+    private val ongoing = mutableMapOf<String, CompletableDeferred<File>>()
 
     /**
      * Download file in the cache folder, and eventually decrypt it
      * TODO looks like files are copied 3 times
      */
-    override fun downloadFile(fileName: String,
-                              mimeType: String?,
-                              url: String?,
-                              elementToDecrypt: ElementToDecrypt?,
-                              callback: MatrixCallback<File>): Cancelable {
-        url ?: return NoOpCancellable.also {
-            callback.onFailure(IllegalArgumentException("url is null"))
-        }
+    override suspend fun downloadFile(fileName: String,
+                                      mimeType: String?,
+                                      url: String?,
+                                      elementToDecrypt: ElementToDecrypt?): File {
+        url ?: throw IllegalArgumentException("url is null")
 
         Timber.v("## FileService downloadFile $url")
 
-        synchronized(ongoing) {
+        // TODO: Remove use of `synchronized` in suspend function.
+        val existingDownload = synchronized(ongoing) {
             val existing = ongoing[url]
             if (existing != null) {
                 Timber.v("## FileService downloadFile is already downloading.. ")
-                existing.add(callback)
-                return NoOpCancellable
+                existing
             } else {
                 // mark as tracked
-                ongoing[url] = ArrayList()
+                ongoing[url] = CompletableDeferred()
                 // and proceed to download
+                null
             }
         }
 
-        return taskExecutor.executorScope.launch(coroutineDispatchers.main) {
-            withContext(coroutineDispatchers.io) {
-                Try {
-                    if (!decryptedFolder.exists()) {
-                        decryptedFolder.mkdirs()
-                    }
-                    // ensure we use unique file name by using URL (mapped to suitable file name)
-                    // Also we need to add extension for the FileProvider, if not it lot's of app that it's
-                    // shared with will not function well (even if mime type is passed in the intent)
-                    getFiles(url, fileName, mimeType, elementToDecrypt != null)
-                }.flatMap { cachedFiles ->
-                    if (!cachedFiles.file.exists()) {
-                        val resolvedUrl = contentUrlResolver.resolveFullSize(url) ?: return@flatMap Try.Failure(IllegalArgumentException("url is null"))
+        if (existingDownload != null) {
+            // FIXME If the first downloader cancels then we'll unfortunately be cancelled too.
+            return existingDownload.await()
+        }
 
-                        val request = Request.Builder()
-                                .url(resolvedUrl)
-                                .header(DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER, url)
-                                .build()
-
-                        val response = try {
-                            okHttpClient.newCall(request).execute()
-                        } catch (e: Throwable) {
-                            return@flatMap Try.Failure(e)
-                        }
-
-                        if (!response.isSuccessful) {
-                            return@flatMap Try.Failure(IOException())
-                        }
-
-                        val source = response.body?.source()
-                                ?: return@flatMap Try.Failure(IOException())
-
-                        Timber.v("Response size ${response.body?.contentLength()} - Stream available: ${!source.exhausted()}")
-
-                        // Write the file to cache (encrypted version if the file is encrypted)
-                        writeToFile(source.inputStream(), cachedFiles.file)
-                        response.close()
-                    } else {
-                        Timber.v("## FileService: cache hit for $url")
-                    }
-
-                    Try.just(cachedFiles)
+        val result = runCatching {
+            val cachedFiles = withContext(coroutineDispatchers.io) {
+                if (!decryptedFolder.exists()) {
+                    decryptedFolder.mkdirs()
                 }
-            }.flatMap { cachedFiles ->
-                // Decrypt if necessary
-                if (cachedFiles.decryptedFile != null) {
-                    if (!cachedFiles.decryptedFile.exists()) {
-                        Timber.v("## FileService: decrypt file")
-                        // Ensure the parent folder exists
-                        cachedFiles.decryptedFile.parentFile?.mkdirs()
-                        val decryptSuccess = cachedFiles.file.inputStream().use { inputStream ->
-                            cachedFiles.decryptedFile.outputStream().buffered().use { outputStream ->
-                                MXEncryptedAttachments.decryptAttachment(
-                                        inputStream,
-                                        elementToDecrypt,
-                                        outputStream
-                                )
-                            }
-                        }
-                        if (!decryptSuccess) {
-                            return@flatMap Try.Failure(IllegalStateException("Decryption error"))
-                        }
-                    } else {
-                        Timber.v("## FileService: cache hit for decrypted file")
+
+                // ensure we use unique file name by using URL (mapped to suitable file name)
+                // Also we need to add extension for the FileProvider, if not it lot's of app that it's
+                // shared with will not function well (even if mime type is passed in the intent)
+                val cachedFiles = getFiles(url, fileName, mimeType, elementToDecrypt != null)
+
+                if (!cachedFiles.file.exists()) {
+                    val resolvedUrl = contentUrlResolver.resolveFullSize(url) ?: throw IllegalArgumentException("url is null")
+
+                    val request = Request.Builder()
+                            .url(resolvedUrl)
+                            .header(DOWNLOAD_PROGRESS_INTERCEPTOR_HEADER, url)
+                            .build()
+
+                    val response = okHttpClient.newCall(request).execute()
+
+                    if (!response.isSuccessful) {
+                        throw IOException()
                     }
-                    Try.just(cachedFiles.decryptedFile)
+
+                    val source = response.body?.source() ?: throw IOException()
+
+                    Timber.v("Response size ${response.body?.contentLength()} - Stream available: ${!source.exhausted()}")
+
+                    // Write the file to cache (encrypted version if the file is encrypted)
+                    writeToFile(source.inputStream(), cachedFiles.file)
+                    response.close()
                 } else {
-                    // Clear file
-                    Try.just(cachedFiles.file)
+                    Timber.v("## FileService: cache hit for $url")
                 }
-            }.fold(
-                    { throwable ->
-                        callback.onFailure(throwable)
-                        // notify concurrent requests
-                        val toNotify = synchronized(ongoing) {
-                            ongoing[url]?.also {
-                                ongoing.remove(url)
-                            }
-                        }
-                        toNotify?.forEach { otherCallbacks ->
-                            tryOrNull { otherCallbacks.onFailure(throwable) }
-                        }
-                    },
-                    { file ->
-                        callback.onSuccess(file)
-                        // notify concurrent requests
-                        val toNotify = synchronized(ongoing) {
-                            ongoing[url]?.also {
-                                ongoing.remove(url)
-                            }
-                        }
-                        Timber.v("## FileService additional to notify ${toNotify?.size ?: 0} ")
-                        toNotify?.forEach { otherCallbacks ->
-                            tryOrNull { otherCallbacks.onSuccess(file) }
+                cachedFiles
+            }
+
+            // Decrypt if necessary
+            if (cachedFiles.decryptedFile != null) {
+                if (!cachedFiles.decryptedFile.exists()) {
+                    Timber.v("## FileService: decrypt file")
+                    // Ensure the parent folder exists
+                    cachedFiles.decryptedFile.parentFile?.mkdirs()
+                    val decryptSuccess = cachedFiles.file.inputStream().use { inputStream ->
+                        cachedFiles.decryptedFile.outputStream().buffered().use { outputStream ->
+                            MXEncryptedAttachments.decryptAttachment(
+                                    inputStream,
+                                    elementToDecrypt,
+                                    outputStream
+                            )
                         }
                     }
-            )
-        }.toCancelable()
+                    if (!decryptSuccess) {
+                        throw IllegalStateException("Decryption error")
+                    }
+                } else {
+                    Timber.v("## FileService: cache hit for decrypted file")
+                }
+                cachedFiles.decryptedFile
+            } else {
+                // Clear file
+                cachedFiles.file
+            }
+        }
+
+        // notify concurrent requests
+        val toNotify = synchronized(ongoing) { ongoing.remove(url) }
+        result.onSuccess {
+            Timber.v("## FileService additional to notify is > 0 ")
+        }
+        toNotify?.completeWith(result)
+
+        return result.getOrThrow()
     }
 
     fun storeDataFor(mxcUrl: String,
@@ -325,6 +299,7 @@ internal class DefaultFileService @Inject constructor(
 
     companion object {
         private const val ENCRYPTED_FILENAME = "encrypted.bin"
+
         // The extension would be added from the mimetype
         private const val DEFAULT_FILENAME = "file"
     }
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index 81e81bb78a..cbc5effe44 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -28,10 +28,10 @@ import com.bumptech.glide.signature.ObjectKey
 import im.vector.app.core.extensions.vectorComponent
 import im.vector.app.core.files.LocalFilesHelper
 import im.vector.app.features.media.ImageContentRenderer
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
-import org.matrix.android.sdk.api.MatrixCallback
 import timber.log.Timber
-import java.io.File
 import java.io.IOException
 import java.io.InputStream
 
@@ -113,21 +113,19 @@ class VectorGlideDataFetcher(context: Context,
             callback.onLoadFailed(IllegalArgumentException("No File service"))
         }
         // Use the file vector service, will avoid flickering and redownload after upload
-        fileService.downloadFile(
-                fileName = data.filename,
-                mimeType = data.mimeType,
-                url = data.url,
-                elementToDecrypt = data.elementToDecrypt,
-                callback = object : MatrixCallback<File> {
-                    override fun onSuccess(data: File) {
-                        callback.onDataReady(data.inputStream())
-                    }
-
-                    override fun onFailure(failure: Throwable) {
-                        callback.onLoadFailed(failure as? Exception ?: IOException(failure.localizedMessage))
-                    }
-                }
-        )
+        GlobalScope.launch {
+            val result = runCatching {
+                fileService.downloadFile(
+                        fileName = data.filename,
+                        mimeType = data.mimeType,
+                        url = data.url,
+                        elementToDecrypt = data.elementToDecrypt)
+            }
+            result.fold(
+                    { callback.onDataReady(it.inputStream()) },
+                    { callback.onLoadFailed(it as? Exception ?: IOException(it.localizedMessage)) }
+            )
+        }
 //        val url = contentUrlResolver.resolveFullSize(data.url)
 //                ?: return
 //
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 64bffcb49c..f116c2b9af 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -170,12 +170,12 @@ import im.vector.app.features.widgets.WidgetKind
 import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import nl.dionsegijn.konfetti.models.Shape
 import nl.dionsegijn.konfetti.models.Size
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
 import org.commonmark.parser.Parser
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -201,7 +201,6 @@ import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
 import timber.log.Timber
-import java.io.File
 import java.net.URL
 import java.util.UUID
 import java.util.concurrent.TimeUnit
@@ -1676,16 +1675,12 @@ class RoomDetailFragment @Inject constructor(
         if (action.messageContent is MessageTextContent) {
             shareText(requireContext(), action.messageContent.body)
         } else if (action.messageContent is MessageWithAttachmentContent) {
-            session.fileService().downloadFile(
-                    messageContent = action.messageContent,
-                    callback = object : MatrixCallback<File> {
-                        override fun onSuccess(data: File) {
-                            if (isAdded) {
-                                shareMedia(requireContext(), data, getMimeTypeFromUri(requireContext(), data.toUri()))
-                            }
-                        }
-                    }
-            )
+            lifecycleScope.launch {
+                val data = session.fileService().downloadFile(messageContent = action.messageContent)
+                if (isAdded) {
+                    shareMedia(requireContext(), data, getMimeTypeFromUri(requireContext(), data.toUri()))
+                }
+            }
         }
     }
 
@@ -1706,22 +1701,18 @@ class RoomDetailFragment @Inject constructor(
             sharedActionViewModel.pendingAction = action
             return
         }
-        session.fileService().downloadFile(
-                messageContent = action.messageContent,
-                callback = object : MatrixCallback<File> {
-                    override fun onSuccess(data: File) {
-                        if (isAdded) {
-                            saveMedia(
-                                    context = requireContext(),
-                                    file = data,
-                                    title = action.messageContent.body,
-                                    mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), data.toUri()),
-                                    notificationUtils = notificationUtils
-                            )
-                        }
-                    }
-                }
-        )
+        lifecycleScope.launch {
+            val data = session.fileService().downloadFile(messageContent = action.messageContent)
+            if (isAdded) {
+                saveMedia(
+                        context = requireContext(),
+                        file = data,
+                        title = action.messageContent.body,
+                        mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), data.toUri()),
+                        notificationUtils = notificationUtils
+                )
+            }
+        }
     }
 
     private fun handleActions(action: EventSharedAction) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index af3d5461ef..19912ee02e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -106,7 +106,6 @@ import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
 import timber.log.Timber
-import java.io.File
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
@@ -1140,25 +1139,17 @@ class RoomDetailViewModel @AssistedInject constructor(
                 ))
             }
         } else {
-            session.fileService().downloadFile(
-                    messageContent = action.messageFileContent,
-                    callback = object : MatrixCallback<File> {
-                        override fun onSuccess(data: File) {
-                            _viewEvents.post(RoomDetailViewEvents.DownloadFileState(
-                                    action.messageFileContent.mimeType,
-                                    data,
-                                    null
-                            ))
-                        }
+            viewModelScope.launch {
+                val result = runCatching {
+                    session.fileService().downloadFile(messageContent = action.messageFileContent)
+                }
 
-                        override fun onFailure(failure: Throwable) {
-                            _viewEvents.post(RoomDetailViewEvents.DownloadFileState(
-                                    action.messageFileContent.mimeType,
-                                    null,
-                                    failure
-                            ))
-                        }
-                    })
+                _viewEvents.post(RoomDetailViewEvents.DownloadFileState(
+                        action.messageFileContent.mimeType,
+                        result.getOrNull(),
+                        result.exceptionOrNull()
+                ))
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
index 11b8832c94..103f42e903 100644
--- a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
@@ -31,7 +31,8 @@ import im.vector.lib.attachmentviewer.AttachmentInfo
 import im.vector.lib.attachmentviewer.AttachmentSourceProvider
 import im.vector.lib.attachmentviewer.ImageLoaderTarget
 import im.vector.lib.attachmentviewer.VideoLoaderTarget
-import org.matrix.android.sdk.api.MatrixCallback
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.events.model.isVideoMessage
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -152,21 +153,20 @@ abstract class BaseAttachmentProvider<Type>(
             target.onVideoURLReady(info.uid, data.url)
         } else {
             target.onVideoFileLoading(info.uid)
-            fileService.downloadFile(
-                    fileName = data.filename,
-                    mimeType = data.mimeType,
-                    url = data.url,
-                    elementToDecrypt = data.elementToDecrypt,
-                    callback = object : MatrixCallback<File> {
-                        override fun onSuccess(data: File) {
-                            target.onVideoFileReady(info.uid, data)
-                        }
-
-                        override fun onFailure(failure: Throwable) {
-                            target.onVideoFileLoadFailed(info.uid)
-                        }
-                    }
-            )
+            GlobalScope.launch {
+                val result = runCatching {
+                    fileService.downloadFile(
+                            fileName = data.filename,
+                            mimeType = data.mimeType,
+                            url = data.url,
+                            elementToDecrypt = data.elementToDecrypt
+                    )
+                }
+                result.fold(
+                        { target.onVideoFileReady(info.uid, it) },
+                        { target.onVideoFileLoadFailed(info.uid) }
+                )
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
index 328d8f943e..d326b8e50a 100644
--- a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
@@ -19,7 +19,8 @@ package im.vector.app.features.media
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.resources.StringProvider
 import im.vector.lib.attachmentviewer.AttachmentInfo
-import org.matrix.android.sdk.api.MatrixCallback
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -77,20 +78,16 @@ class DataAttachmentRoomProvider(
 
     override fun getFileForSharing(position: Int, callback: (File?) -> Unit) {
         val item = getItem(position)
-        fileService.downloadFile(
-                fileName = item.filename,
-                mimeType = item.mimeType,
-                url = item.url,
-                elementToDecrypt = item.elementToDecrypt,
-                callback = object : MatrixCallback<File> {
-                    override fun onSuccess(data: File) {
-                        callback(data)
-                    }
-
-                    override fun onFailure(failure: Throwable) {
-                        callback(null)
-                    }
-                }
-        )
+        GlobalScope.launch {
+            val result = runCatching {
+                fileService.downloadFile(
+                        fileName = item.filename,
+                        mimeType = item.mimeType,
+                        url = item.url,
+                        elementToDecrypt = item.elementToDecrypt
+                )
+            }
+            callback(result.getOrNull())
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
index 53c5dac9ad..fd3386826a 100644
--- a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@@ -19,7 +19,8 @@ package im.vector.app.features.media
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.resources.StringProvider
 import im.vector.lib.attachmentviewer.AttachmentInfo
-import org.matrix.android.sdk.api.MatrixCallback
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
@@ -125,21 +126,16 @@ class RoomEventsAttachmentProvider(
             val messageContent = timelineEvent.root.getClearContent().toModel<MessageContent>()
                     as? MessageWithAttachmentContent
                     ?: return@let
-            fileService.downloadFile(
-                    fileName = messageContent.body,
-                    mimeType = messageContent.mimeType,
-                    url = messageContent.getFileUrl(),
-                    elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(),
-                    callback = object : MatrixCallback<File> {
-                        override fun onSuccess(data: File) {
-                            callback(data)
-                        }
-
-                        override fun onFailure(failure: Throwable) {
-                            callback(null)
-                        }
-                    }
-            )
+            GlobalScope.launch {
+                val result = runCatching {
+                    fileService.downloadFile(
+                            fileName = messageContent.body,
+                            mimeType = messageContent.mimeType,
+                            url = messageContent.getFileUrl(),
+                            elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt())
+                }
+                callback(result.getOrNull())
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
index 7e4ea15ff0..59b612afb1 100644
--- a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@@ -25,11 +25,11 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.files.LocalFilesHelper
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
 import timber.log.Timber
-import java.io.File
 import java.net.URLEncoder
 import javax.inject.Inject
 
@@ -74,28 +74,31 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
                 thumbnailView.isVisible = true
                 loadingView.isVisible = true
 
-                activeSessionHolder.getActiveSession().fileService()
-                        .downloadFile(
-                                fileName = data.filename,
-                                mimeType = data.mimeType,
-                                url = data.url,
-                                elementToDecrypt = data.elementToDecrypt,
-                                callback = object : MatrixCallback<File> {
-                                    override fun onSuccess(data: File) {
-                                        thumbnailView.isVisible = false
-                                        loadingView.isVisible = false
-                                        videoView.isVisible = true
+                GlobalScope.launch {
+                    val result = runCatching {
+                        activeSessionHolder.getActiveSession().fileService()
+                                .downloadFile(
+                                        fileName = data.filename,
+                                        mimeType = data.mimeType,
+                                        url = data.url,
+                                        elementToDecrypt = data.elementToDecrypt)
+                    }
+                    result.fold(
+                            { data ->
+                                thumbnailView.isVisible = false
+                                loadingView.isVisible = false
+                                videoView.isVisible = true
 
-                                        videoView.setVideoPath(data.path)
-                                        videoView.start()
-                                    }
-
-                                    override fun onFailure(failure: Throwable) {
-                                        loadingView.isVisible = false
-                                        errorView.isVisible = true
-                                        errorView.text = errorFormatter.toHumanReadable(failure)
-                                    }
-                                })
+                                videoView.setVideoPath(data.path)
+                                videoView.start()
+                            },
+                            {
+                                loadingView.isVisible = false
+                                errorView.isVisible = true
+                                errorView.text = errorFormatter.toHumanReadable(it)
+                            }
+                    )
+                }
             }
         } else {
             val resolvedUrl = contentUrlResolver.resolveFullSize(data.url)
@@ -112,28 +115,31 @@ class VideoContentRenderer @Inject constructor(private val localFilesHelper: Loc
                 thumbnailView.isVisible = true
                 loadingView.isVisible = true
 
-                activeSessionHolder.getActiveSession().fileService()
-                        .downloadFile(
-                                fileName = data.filename,
-                                mimeType = data.mimeType,
-                                url = data.url,
-                                elementToDecrypt = null,
-                                callback = object : MatrixCallback<File> {
-                                    override fun onSuccess(data: File) {
-                                        thumbnailView.isVisible = false
-                                        loadingView.isVisible = false
-                                        videoView.isVisible = true
+                GlobalScope.launch {
+                    val result = runCatching {
+                        activeSessionHolder.getActiveSession().fileService()
+                                .downloadFile(
+                                        fileName = data.filename,
+                                        mimeType = data.mimeType,
+                                        url = data.url,
+                                        elementToDecrypt = null)
+                    }
+                    result.fold(
+                            { data ->
+                                thumbnailView.isVisible = false
+                                loadingView.isVisible = false
+                                videoView.isVisible = true
 
-                                        videoView.setVideoPath(data.path)
-                                        videoView.start()
-                                    }
-
-                                    override fun onFailure(failure: Throwable) {
-                                        loadingView.isVisible = false
-                                        errorView.isVisible = true
-                                        errorView.text = errorFormatter.toHumanReadable(failure)
-                                    }
-                                })
+                                videoView.setVideoPath(data.path)
+                                videoView.start()
+                            },
+                            {
+                                loadingView.isVisible = false
+                                errorView.isVisible = true
+                                errorView.text = errorFormatter.toHumanReadable(it)
+                            }
+                    )
+                }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
index cdf139c7f6..bae4847f7e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@@ -32,10 +32,8 @@ import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
-import java.io.File
 
 class RoomUploadsViewModel @AssistedInject constructor(
         @Assisted initialState: RoomUploadsViewState,
@@ -130,12 +128,8 @@ class RoomUploadsViewModel @AssistedInject constructor(
     private fun handleShare(action: RoomUploadsAction.Share) {
         viewModelScope.launch {
             try {
-                val file = awaitCallback<File> {
-                    session.fileService().downloadFile(
-                            messageContent = action.uploadEvent.contentWithAttachmentContent,
-                            callback = it
-                    )
-                }
+                val file = session.fileService().downloadFile(
+                        messageContent = action.uploadEvent.contentWithAttachmentContent)
                 _viewEvents.post(RoomUploadsViewEvents.FileReadyForSharing(file))
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomUploadsViewEvents.Failure(failure))
@@ -146,11 +140,8 @@ class RoomUploadsViewModel @AssistedInject constructor(
     private fun handleDownload(action: RoomUploadsAction.Download) {
         viewModelScope.launch {
             try {
-                val file = awaitCallback<File> {
-                    session.fileService().downloadFile(
-                            messageContent = action.uploadEvent.contentWithAttachmentContent,
-                            callback = it)
-                }
+                val file = session.fileService().downloadFile(
+                        messageContent = action.uploadEvent.contentWithAttachmentContent)
                 _viewEvents.post(RoomUploadsViewEvents.FileReadyForSaving(file, action.uploadEvent.contentWithAttachmentContent.body))
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomUploadsViewEvents.Failure(failure))

From 8f4dbd2aefb92b5f74c7caabb41a83eae3611221 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 08:30:44 +0000
Subject: [PATCH 436/578] Bump realm-gradle-plugin from 10.3.1 to 10.4.0

Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.3.1 to 10.4.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.3.1...v10.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 7fb626ab46..60623a14c9 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "io.realm:realm-gradle-plugin:10.3.1"
+        classpath "io.realm:realm-gradle-plugin:10.4.0"
     }
 }
 

From 1d23f1d9e321eb05490812931ed2d4808e9bd366 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 14:06:57 +0200
Subject: [PATCH 437/578] Realm from 10.4.0 and forward are now found on
 mavenCentral() instead of jcenter().

---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 60623a14c9..d74678ae55 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'realm-android'
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "io.realm:realm-gradle-plugin:10.4.0"

From 980d057b4a055874f2c021bffcd328f8c2267841 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 14:46:27 +0000
Subject: [PATCH 438/578] Bump epoxy_version from 4.4.3 to 4.4.4

Bumps `epoxy_version` from 4.4.3 to 4.4.4.

Updates `epoxy` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-glide-preloading` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-processor` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Updates `epoxy-paging` from 4.4.3 to 4.4.4
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.3...4.4.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index e3a7b090e3..0674089aaa 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -290,7 +290,7 @@ android {
 
 dependencies {
 
-    def epoxy_version = '4.4.3'
+    def epoxy_version = '4.4.4'
     def fragment_version = '1.3.2'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'

From d6d4293ea8e87a7b26478034558ddb7883f942c7 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 29 Mar 2021 16:50:12 +0200
Subject: [PATCH 439/578] Timeline : remove filtering from SDK

---
 .../sdk/api/session/room/timeline/Timeline.kt |   6 -
 .../session/room/timeline/TimelineSettings.kt |   4 -
 .../database/mapper/TimelineEventMapper.kt    |   4 +-
 .../session/room/timeline/DefaultTimeline.kt  | 139 +++----------
 .../room/timeline/DefaultTimelineService.kt   |   2 -
 .../session/room/timeline/Extensions.kt       |  50 -----
 .../timeline/TimelineHiddenReadReceipts.kt    | 195 ------------------
 .../session/room/timeline/UIEchoManager.kt    |  21 +-
 .../home/room/detail/RoomDetailFragment.kt    |   1 -
 .../home/room/detail/RoomDetailViewModel.kt   |  22 +-
 .../ScrollOnHighlightedEventCallback.kt       |   6 +-
 .../helper/TimelineSettingsFactory.kt         |  42 +---
 12 files changed, 51 insertions(+), 441 deletions(-)
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/Extensions.kt
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
index 8932d0734e..06c88db831 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
@@ -95,12 +95,6 @@ interface Timeline {
      */
     fun getTimelineEventWithId(eventId: String?): TimelineEvent?
 
-    /**
-     * Returns the first displayable events starting from eventId.
-     * It does depend on the provided [TimelineSettings].
-     */
-    fun getFirstDisplayableEventId(eventId: String): String?
-
     interface Listener {
         /**
          * Call when the timeline has been updated through pagination or sync.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
index 25c63d6fbc..ceffedb234 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
@@ -24,10 +24,6 @@ data class TimelineSettings(
          * The initial number of events to retrieve from cache. You might get less events if you don't have loaded enough yet.
          */
         val initialSize: Int,
-        /**
-         * Filters for timeline event
-         */
-        val filters: TimelineEventFilters = TimelineEventFilters(),
         /**
          * If true, will build read receipts for each event.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
index a2b36ce590..07954650b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
@@ -25,9 +25,9 @@ import javax.inject.Inject
 
 internal class TimelineEventMapper @Inject constructor(private val readReceiptsSummaryMapper: ReadReceiptsSummaryMapper) {
 
-    fun map(timelineEventEntity: TimelineEventEntity, buildReadReceipts: Boolean = true, correctedReadReceipts: List<ReadReceipt>? = null): TimelineEvent {
+    fun map(timelineEventEntity: TimelineEventEntity, buildReadReceipts: Boolean = true): TimelineEvent {
         val readReceipts = if (buildReadReceipts) {
-            correctedReadReceipts ?: timelineEventEntity.readReceipts
+            timelineEventEntity.readReceipts
                     ?.let {
                         readReceiptsSummaryMapper.map(it)
                     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 61f770b956..1ed142ce23 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -28,7 +28,6 @@ import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -70,14 +69,12 @@ internal class DefaultTimeline(
         private val paginationTask: PaginationTask,
         private val timelineEventMapper: TimelineEventMapper,
         private val settings: TimelineSettings,
-        private val hiddenReadReceipts: TimelineHiddenReadReceipts,
         private val timelineInput: TimelineInput,
         private val eventDecryptor: TimelineEventDecryptor,
         private val realmSessionProvider: RealmSessionProvider,
         private val loadRoomMembersTask: LoadRoomMembersTask,
         private val readReceiptHandler: ReadReceiptHandler
 ) : Timeline,
-        TimelineHiddenReadReceipts.Delegate,
         TimelineInput.Listener,
         UIEchoManager.Listener {
 
@@ -93,8 +90,7 @@ internal class DefaultTimeline(
     private val cancelableBag = CancelableBag()
     private val debouncer = Debouncer(mainHandler)
 
-    private lateinit var nonFilteredEvents: RealmResults<TimelineEventEntity>
-    private lateinit var filteredEvents: RealmResults<TimelineEventEntity>
+    private lateinit var timelineEvents: RealmResults<TimelineEventEntity>
     private lateinit var sendingEvents: RealmResults<TimelineEventEntity>
 
     private var prevDisplayIndex: Int? = null
@@ -168,16 +164,9 @@ internal class DefaultTimeline(
                     postSnapshot()
                 }
 
-                nonFilteredEvents = buildEventQuery(realm).sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING).findAll()
-                filteredEvents = nonFilteredEvents.where()
-                        .filterEventsWithSettings(settings)
-                        .findAll()
-                nonFilteredEvents.addChangeListener(eventsChangeListener)
+                timelineEvents = buildEventQuery(realm).sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING).findAll()
+                timelineEvents.addChangeListener(eventsChangeListener)
                 handleInitialLoad()
-                if (settings.shouldHandleHiddenReadReceipts()) {
-                    hiddenReadReceipts.start(realm, filteredEvents, nonFilteredEvents, this)
-                }
-
                 loadRoomMembersTask
                         .configureWith(LoadRoomMembersTask.Params(roomId)) {
                             this.callback = NoOpMatrixCallback()
@@ -205,10 +194,6 @@ internal class DefaultTimeline(
                 }
     }
 
-    private fun TimelineSettings.shouldHandleHiddenReadReceipts(): Boolean {
-        return buildReadReceipts && (filters.filterEdits || filters.filterTypes)
-    }
-
     override fun dispose() {
         if (isStarted.compareAndSet(true, false)) {
             isReady.set(false)
@@ -220,11 +205,8 @@ internal class DefaultTimeline(
                 if (this::sendingEvents.isInitialized) {
                     sendingEvents.removeAllChangeListeners()
                 }
-                if (this::nonFilteredEvents.isInitialized) {
-                    nonFilteredEvents.removeAllChangeListeners()
-                }
-                if (settings.shouldHandleHiddenReadReceipts()) {
-                    hiddenReadReceipts.dispose()
+                if (this::timelineEvents.isInitialized) {
+                    timelineEvents.removeAllChangeListeners()
                 }
                 clearAllValues()
                 backgroundRealm.getAndSet(null).also {
@@ -256,48 +238,6 @@ internal class DefaultTimeline(
         }
     }
 
-    override fun getFirstDisplayableEventId(eventId: String): String? {
-        // If the item is built, the id is obviously displayable
-        val builtIndex = builtEventsIdMap[eventId]
-        if (builtIndex != null) {
-            return eventId
-        }
-        // Otherwise, we should check if the event is in the db, but is hidden because of filters
-        return realmSessionProvider.withRealm { localRealm ->
-            val nonFilteredEvents = buildEventQuery(localRealm)
-                    .sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
-                    .findAll()
-
-            val nonFilteredEvent = nonFilteredEvents.where()
-                    .equalTo(TimelineEventEntityFields.EVENT_ID, eventId)
-                    .findFirst()
-
-            val filteredEvents = nonFilteredEvents.where()
-                    .filterEventsWithSettings(settings)
-                    .findAll()
-            val isEventInDb = nonFilteredEvent != null
-
-            val isHidden = isEventInDb && filteredEvents.where()
-                    .equalTo(TimelineEventEntityFields.EVENT_ID, eventId)
-                    .findFirst() == null
-
-            if (isHidden) {
-                val displayIndex = nonFilteredEvent?.displayIndex
-                if (displayIndex != null) {
-                    // Then we are looking for the first displayable event after the hidden one
-                    val firstDisplayedEvent = filteredEvents.where()
-                            .lessThanOrEqualTo(TimelineEventEntityFields.DISPLAY_INDEX, displayIndex)
-                            .findFirst()
-                    firstDisplayedEvent?.eventId
-                } else {
-                    null
-                }
-            } else {
-                null
-            }
-        }
-    }
-
     override fun hasMoreToLoad(direction: Timeline.Direction): Boolean {
         return hasMoreInCache(direction) || !hasReachedEnd(direction)
     }
@@ -319,18 +259,6 @@ internal class DefaultTimeline(
         listeners.clear()
     }
 
-// TimelineHiddenReadReceipts.Delegate
-
-    override fun rebuildEvent(eventId: String, readReceipts: List<ReadReceipt>): Boolean {
-        return rebuildEvent(eventId) { te ->
-            te.copy(readReceipts = readReceipts)
-        }
-    }
-
-    override fun onReadReceiptsUpdated() {
-        postSnapshot()
-    }
-
     override fun onNewTimelineEvents(roomId: String, eventIds: List<String>) {
         if (isLive && this.roomId == roomId) {
             listeners.forEach {
@@ -341,18 +269,13 @@ internal class DefaultTimeline(
 
     override fun onLocalEchoCreated(roomId: String, timelineEvent: TimelineEvent) {
         if (roomId != this.roomId || !isLive) return
-
-        val postSnapShot = uiEchoManager.onLocalEchoCreated(timelineEvent)
-
-        if (listOf(timelineEvent).filterEventsWithSettings(settings).isNotEmpty()) {
-            listeners.forEach {
+        uiEchoManager.onLocalEchoCreated(timelineEvent)
+        listeners.forEach {
+            tryOrNull {
                 it.onNewTimelineEvents(listOf(timelineEvent.eventId))
             }
         }
-
-        if (postSnapShot) {
-            postSnapshot()
-        }
+        postSnapshot()
     }
 
     override fun onLocalEchoUpdated(roomId: String, eventId: String, sendState: SendState) {
@@ -439,23 +362,21 @@ internal class DefaultTimeline(
         val builtSendingEvents = mutableListOf<TimelineEvent>()
         if (hasReachedEnd(Timeline.Direction.FORWARDS) && !hasMoreInCache(Timeline.Direction.FORWARDS)) {
             uiEchoManager.getInMemorySendingEvents()
-                    .filterSendingEventsTo(builtSendingEvents)
+                    .updateWithUiEchoInto(builtSendingEvents)
             sendingEvents
                     .filter { timelineEvent ->
                         builtSendingEvents.none { it.eventId == timelineEvent.eventId }
                     }
                     .map { timelineEventMapper.map(it) }
-                    .filterSendingEventsTo(builtSendingEvents)
+                    .updateWithUiEchoInto(builtSendingEvents)
         }
         return builtSendingEvents
     }
 
-    private fun List<TimelineEvent>.filterSendingEventsTo(target: MutableList<TimelineEvent>) {
+    private fun List<TimelineEvent>.updateWithUiEchoInto(target: MutableList<TimelineEvent>) {
         target.addAll(
-                // Filter out sending event that are not displayable!
-                filterEventsWithSettings(settings)
-                        // Get most up to date send state (in memory)
-                        .map { uiEchoManager.updateSentStateWithUiEcho(it) }
+                // Get most up to date send state (in memory)
+                map { uiEchoManager.updateSentStateWithUiEcho(it) }
         )
     }
 
@@ -465,14 +386,14 @@ internal class DefaultTimeline(
 
     private fun getState(direction: Timeline.Direction): TimelineState {
         return when (direction) {
-            Timeline.Direction.FORWARDS  -> forwardsState.get()
+            Timeline.Direction.FORWARDS -> forwardsState.get()
             Timeline.Direction.BACKWARDS -> backwardsState.get()
         }
     }
 
     private fun updateState(direction: Timeline.Direction, update: (TimelineState) -> TimelineState) {
         val stateReference = when (direction) {
-            Timeline.Direction.FORWARDS  -> forwardsState
+            Timeline.Direction.FORWARDS -> forwardsState
             Timeline.Direction.BACKWARDS -> backwardsState
         }
         val currentValue = stateReference.get()
@@ -487,9 +408,9 @@ internal class DefaultTimeline(
         var shouldFetchInitialEvent = false
         val currentInitialEventId = initialEventId
         val initialDisplayIndex = if (currentInitialEventId == null) {
-            nonFilteredEvents.firstOrNull()?.displayIndex
+            timelineEvents.firstOrNull()?.displayIndex
         } else {
-            val initialEvent = nonFilteredEvents.where()
+            val initialEvent = timelineEvents.where()
                     .equalTo(TimelineEventEntityFields.EVENT_ID, initialEventId)
                     .findFirst()
 
@@ -501,7 +422,7 @@ internal class DefaultTimeline(
         if (currentInitialEventId != null && shouldFetchInitialEvent) {
             fetchEvent(currentInitialEventId)
         } else {
-            val count = filteredEvents.size.coerceAtMost(settings.initialSize)
+            val count = timelineEvents.size.coerceAtMost(settings.initialSize)
             if (initialEventId == null) {
                 paginateInternal(initialDisplayIndex, Timeline.Direction.BACKWARDS, count)
             } else {
@@ -541,8 +462,7 @@ internal class DefaultTimeline(
             val eventEntity = results[index]
             eventEntity?.eventId?.let { eventId ->
                 postSnapshot = rebuildEvent(eventId) {
-                    val builtEvent = buildTimelineEvent(eventEntity)
-                    listOf(builtEvent).filterEventsWithSettings(settings).firstOrNull()
+                    buildTimelineEvent(eventEntity)
                 } || postSnapshot
             }
         }
@@ -563,9 +483,9 @@ internal class DefaultTimeline(
                 // We are in the case where event exists, but we do not know the token.
                 // Fetch (again) the last event to get a token
                 val lastKnownEventId = if (direction == Timeline.Direction.FORWARDS) {
-                    nonFilteredEvents.firstOrNull()?.eventId
+                    timelineEvents.firstOrNull()?.eventId
                 } else {
-                    nonFilteredEvents.lastOrNull()?.eventId
+                    timelineEvents.lastOrNull()?.eventId
                 }
                 if (lastKnownEventId == null) {
                     updateState(direction) { it.copy(isPaginating = false, requestedPaginationCount = 0) }
@@ -636,7 +556,7 @@ internal class DefaultTimeline(
      * Return the current Chunk
      */
     private fun getLiveChunk(): ChunkEntity? {
-        return nonFilteredEvents.firstOrNull()?.chunk?.firstOrNull()
+        return timelineEvents.firstOrNull()?.chunk?.firstOrNull()
     }
 
     /**
@@ -680,14 +600,13 @@ internal class DefaultTimeline(
         val time = System.currentTimeMillis() - start
         Timber.v("Built ${offsetResults.size} items from db in $time ms")
         // For the case where wo reach the lastForward chunk
-        updateLoadingStates(filteredEvents)
+        updateLoadingStates(timelineEvents)
         return offsetResults.size
     }
 
     private fun buildTimelineEvent(eventEntity: TimelineEventEntity) = timelineEventMapper.map(
             timelineEventEntity = eventEntity,
-            buildReadReceipts = settings.buildReadReceipts,
-            correctedReadReceipts = hiddenReadReceipts.correctedReadReceipts(eventEntity.eventId)
+            buildReadReceipts = settings.buildReadReceipts
     ).let {
         // eventually enhance with ui echo?
         (uiEchoManager.decorateEventWithReactionUiEcho(it) ?: it)
@@ -699,7 +618,7 @@ internal class DefaultTimeline(
     private fun getOffsetResults(startDisplayIndex: Int,
                                  direction: Timeline.Direction,
                                  count: Long): RealmResults<TimelineEventEntity> {
-        val offsetQuery = filteredEvents.where()
+        val offsetQuery = timelineEvents.where()
         if (direction == Timeline.Direction.BACKWARDS) {
             offsetQuery
                     .sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
@@ -747,7 +666,7 @@ internal class DefaultTimeline(
             if (isReady.get().not()) {
                 return@post
             }
-            updateLoadingStates(filteredEvents)
+            updateLoadingStates(timelineEvents)
             val snapshot = createSnapshot()
             val runnable = Runnable {
                 listeners.forEach {
@@ -783,10 +702,10 @@ internal class DefaultTimeline(
         return object : MatrixCallback<TokenChunkEventPersistor.Result> {
             override fun onSuccess(data: TokenChunkEventPersistor.Result) {
                 when (data) {
-                    TokenChunkEventPersistor.Result.SUCCESS           -> {
+                    TokenChunkEventPersistor.Result.SUCCESS -> {
                         Timber.v("Success fetching $limit items $direction from pagination request")
                     }
-                    TokenChunkEventPersistor.Result.REACHED_END       -> {
+                    TokenChunkEventPersistor.Result.REACHED_END -> {
                         postSnapshot()
                     }
                     TokenChunkEventPersistor.Result.SHOULD_FETCH_MORE ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index c3714a1303..6b50e2e8de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -52,7 +52,6 @@ internal class DefaultTimelineService @AssistedInject constructor(
         private val paginationTask: PaginationTask,
         private val fetchTokenAndPaginateTask: FetchTokenAndPaginateTask,
         private val timelineEventMapper: TimelineEventMapper,
-        private val readReceiptsSummaryMapper: ReadReceiptsSummaryMapper,
         private val loadRoomMembersTask: LoadRoomMembersTask,
         private val readReceiptHandler: ReadReceiptHandler
 ) : TimelineService {
@@ -72,7 +71,6 @@ internal class DefaultTimelineService @AssistedInject constructor(
                 paginationTask = paginationTask,
                 timelineEventMapper = timelineEventMapper,
                 settings = settings,
-                hiddenReadReceipts = TimelineHiddenReadReceipts(readReceiptsSummaryMapper, roomId, settings),
                 timelineInput = timelineInput,
                 eventDecryptor = eventDecryptor,
                 fetchTokenAndPaginateTask = fetchTokenAndPaginateTask,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/Extensions.kt
deleted file mode 100644
index b2c8021f3b..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/Extensions.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.session.room.timeline
-
-import io.realm.RealmQuery
-import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.RelationType
-import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.message.MessageContent
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
-import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
-import org.matrix.android.sdk.internal.database.query.filterEvents
-
-internal fun RealmQuery<TimelineEventEntity>.filterEventsWithSettings(settings: TimelineSettings): RealmQuery<TimelineEventEntity> {
-    return filterEvents(settings.filters)
-}
-
-internal fun List<TimelineEvent>.filterEventsWithSettings(settings: TimelineSettings): List<TimelineEvent> {
-    return filter { event ->
-        val filterType = !settings.filters.filterTypes
-                || settings.filters.allowedTypes.any { it.eventType == event.root.type && (it.stateKey == null || it.stateKey == event.root.senderId) }
-        if (!filterType) return@filter false
-
-        val filterEdits = if (settings.filters.filterEdits && event.root.getClearType() == EventType.MESSAGE) {
-            val messageContent = event.root.getClearContent().toModel<MessageContent>()
-            messageContent?.relatesTo?.type != RelationType.REPLACE && messageContent?.relatesTo?.type != RelationType.RESPONSE
-        } else {
-            true
-        }
-        if (!filterEdits) return@filter false
-
-        val filterRedacted = settings.filters.filterRedacted && event.root.isRedacted()
-        !filterRedacted
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
deleted file mode 100644
index 0ade8ad3b8..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.session.room.timeline
-
-import android.util.SparseArray
-import io.realm.OrderedRealmCollectionChangeListener
-import io.realm.Realm
-import io.realm.RealmQuery
-import io.realm.RealmResults
-import org.matrix.android.sdk.api.session.room.model.ReadReceipt
-import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.internal.database.mapper.ReadReceiptsSummaryMapper
-import org.matrix.android.sdk.internal.database.model.EventEntityFields
-import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntity
-import org.matrix.android.sdk.internal.database.model.ReadReceiptsSummaryEntityFields
-import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
-import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
-import org.matrix.android.sdk.internal.database.query.TimelineEventFilter
-import org.matrix.android.sdk.internal.database.query.whereInRoom
-
-/**
- * This class is responsible for handling the read receipts for hidden events (check [TimelineSettings] to see filtering).
- * When an hidden event has read receipts, we want to transfer these read receipts on the first older displayed event.
- * It has to be used in [DefaultTimeline] and we should call the [start] and [dispose] methods to properly handle realm subscription.
- */
-internal class TimelineHiddenReadReceipts constructor(private val readReceiptsSummaryMapper: ReadReceiptsSummaryMapper,
-                                                      private val roomId: String,
-                                                      private val settings: TimelineSettings) {
-
-    interface Delegate {
-        fun rebuildEvent(eventId: String, readReceipts: List<ReadReceipt>): Boolean
-        fun onReadReceiptsUpdated()
-    }
-
-    private val correctedReadReceiptsEventByIndex = SparseArray<String>()
-    private val correctedReadReceiptsByEvent = HashMap<String, MutableList<ReadReceipt>>()
-
-    private lateinit var hiddenReadReceipts: RealmResults<ReadReceiptsSummaryEntity>
-    private lateinit var nonFilteredEvents: RealmResults<TimelineEventEntity>
-    private lateinit var filteredEvents: RealmResults<TimelineEventEntity>
-    private lateinit var delegate: Delegate
-
-    private val hiddenReadReceiptsListener = OrderedRealmCollectionChangeListener<RealmResults<ReadReceiptsSummaryEntity>> { collection, changeSet ->
-        if (!collection.isLoaded || !collection.isValid) {
-            return@OrderedRealmCollectionChangeListener
-        }
-        var hasChange = false
-        // Deletion here means we don't have any readReceipts for the given hidden events
-        changeSet.deletions.forEach {
-            val eventId = correctedReadReceiptsEventByIndex.get(it, "")
-            val timelineEvent = filteredEvents.where()
-                    .equalTo(TimelineEventEntityFields.EVENT_ID, eventId)
-                    .findFirst()
-
-            // We are rebuilding the corresponding event with only his own RR
-            val readReceipts = readReceiptsSummaryMapper.map(timelineEvent?.readReceipts)
-            hasChange = delegate.rebuildEvent(eventId, readReceipts) || hasChange
-        }
-        correctedReadReceiptsEventByIndex.clear()
-        correctedReadReceiptsByEvent.clear()
-        for (index in 0 until hiddenReadReceipts.size) {
-            val summary = hiddenReadReceipts[index] ?: continue
-            val timelineEvent = summary.timelineEvent?.firstOrNull() ?: continue
-            val isLoaded = nonFilteredEvents.where()
-                    .equalTo(TimelineEventEntityFields.EVENT_ID, timelineEvent.eventId).findFirst() != null
-            val displayIndex = timelineEvent.displayIndex
-
-            if (isLoaded) {
-                // Then we are looking for the first displayable event after the hidden one
-                val firstDisplayedEvent = filteredEvents.where()
-                        .lessThanOrEqualTo(TimelineEventEntityFields.DISPLAY_INDEX, displayIndex)
-                        .findFirst()
-
-                // If we find one, we should
-                if (firstDisplayedEvent != null) {
-                    correctedReadReceiptsEventByIndex.put(index, firstDisplayedEvent.eventId)
-                    correctedReadReceiptsByEvent
-                            .getOrPut(firstDisplayedEvent.eventId, {
-                                ArrayList(readReceiptsSummaryMapper.map(firstDisplayedEvent.readReceipts))
-                            })
-                            .addAll(readReceiptsSummaryMapper.map(summary))
-                }
-            }
-        }
-        if (correctedReadReceiptsByEvent.isNotEmpty()) {
-            correctedReadReceiptsByEvent.forEach { (eventId, correctedReadReceipts) ->
-                val sortedReadReceipts = correctedReadReceipts.sortedByDescending {
-                    it.originServerTs
-                }
-                hasChange = delegate.rebuildEvent(eventId, sortedReadReceipts) || hasChange
-            }
-        }
-        if (hasChange) {
-            delegate.onReadReceiptsUpdated()
-        }
-    }
-
-    /**
-     * Start the realm query subscription. Has to be called on an HandlerThread
-     */
-    fun start(realm: Realm,
-              filteredEvents: RealmResults<TimelineEventEntity>,
-              nonFilteredEvents: RealmResults<TimelineEventEntity>,
-              delegate: Delegate) {
-        this.filteredEvents = filteredEvents
-        this.nonFilteredEvents = nonFilteredEvents
-        this.delegate = delegate
-        // We are looking for read receipts set on hidden events.
-        // We only accept those with a timelineEvent (so coming from pagination/sync).
-        this.hiddenReadReceipts = ReadReceiptsSummaryEntity.whereInRoom(realm, roomId)
-                .isNotEmpty(ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.`$`)
-                .isNotEmpty(ReadReceiptsSummaryEntityFields.READ_RECEIPTS.`$`)
-                .filterReceiptsWithSettings()
-                .findAllAsync()
-                .also { it.addChangeListener(hiddenReadReceiptsListener) }
-    }
-
-    /**
-     * Dispose the realm query subscription. Has to be called on an HandlerThread
-     */
-    fun dispose() {
-        if (this::hiddenReadReceipts.isInitialized) {
-            this.hiddenReadReceipts.removeAllChangeListeners()
-        }
-    }
-
-    /**
-     * Return the current corrected [ReadReceipt] list for an event, or null
-     */
-    fun correctedReadReceipts(eventId: String?): List<ReadReceipt>? {
-        return correctedReadReceiptsByEvent[eventId]
-    }
-
-    /**
-     * We are looking for receipts related to filtered events. So, it's the opposite of [DefaultTimeline.filterEventsWithSettings] method.
-     */
-    private fun RealmQuery<ReadReceiptsSummaryEntity>.filterReceiptsWithSettings(): RealmQuery<ReadReceiptsSummaryEntity> {
-        beginGroup()
-        var needOr = false
-        if (settings.filters.filterTypes) {
-            beginGroup()
-            // Events: A, B, C, D, (E and S1), F, G, (H and S1), I
-            // Allowed: A, B, C, (E and S1), G, (H and S2)
-            // Result: D, F, H, I
-            settings.filters.allowedTypes.forEachIndexed { index, filter ->
-                if (filter.stateKey == null) {
-                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.TYPE}", filter.eventType)
-                } else {
-                    beginGroup()
-                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.TYPE}", filter.eventType)
-                    or()
-                    notEqualTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.STATE_KEY}", filter.stateKey)
-                    endGroup()
-                }
-                if (index != settings.filters.allowedTypes.size - 1) {
-                    and()
-                }
-            }
-            endGroup()
-            needOr = true
-        }
-        if (settings.filters.filterUseless) {
-            if (needOr) or()
-            equalTo("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.IS_USELESS}", true)
-            needOr = true
-        }
-        if (settings.filters.filterEdits) {
-            if (needOr) or()
-            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.CONTENT}", TimelineEventFilter.Content.EDIT)
-            or()
-            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.CONTENT}", TimelineEventFilter.Content.RESPONSE)
-            needOr = true
-        }
-        if (settings.filters.filterRedacted) {
-            if (needOr) or()
-            like("${ReadReceiptsSummaryEntityFields.TIMELINE_EVENT.ROOT}.${EventEntityFields.UNSIGNED_DATA}", TimelineEventFilter.Unsigned.REDACTED)
-        }
-        endGroup()
-        return this
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
index 67d0d90d77..44326ce1ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
@@ -70,15 +70,13 @@ internal class UIEchoManager(
         return existingState != sendState
     }
 
-    // return true if should update
-    fun onLocalEchoCreated(timelineEvent: TimelineEvent): Boolean {
-        var postSnapshot = false
+    fun onLocalEchoCreated(timelineEvent: TimelineEvent)  {
 
         // Manage some ui echos (do it before filter because actual event could be filtered out)
         when (timelineEvent.root.getClearType()) {
             EventType.REDACTION -> {
             }
-            EventType.REACTION  -> {
+            EventType.REACTION -> {
                 val content = timelineEvent.root.content?.toModel<ReactionContent>()
                 if (RelationType.ANNOTATION == content?.relatesTo?.type) {
                     val reaction = content.relatesTo.key
@@ -91,21 +89,14 @@ internal class UIEchoManager(
                                             reaction = reaction
                                     )
                             )
-                    postSnapshot = listener.rebuildEvent(relatedEventID) {
+                    listener.rebuildEvent(relatedEventID) {
                         decorateEventWithReactionUiEcho(it)
-                    } || postSnapshot
+                    }
                 }
             }
         }
-
-        // do not add events that would have been filtered
-        if (listOf(timelineEvent).filterEventsWithSettings(settings).isNotEmpty()) {
-            Timber.v("On local echo created: ${timelineEvent.eventId}")
-            inMemorySendingEvents.add(0, timelineEvent)
-            postSnapshot = true
-        }
-
-        return postSnapshot
+        Timber.v("On local echo created: ${timelineEvent.eventId}")
+        inMemorySendingEvents.add(0, timelineEvent)
     }
 
     fun decorateEventWithReactionUiEcho(timelineEvent: TimelineEvent): TimelineEvent? {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index f116c2b9af..b2e7004d0f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1205,7 +1205,6 @@ class RoomDetailFragment @Inject constructor(
         if (summary?.membership == Membership.JOIN) {
             views.jumpToBottomView.count = summary.notificationCount
             views.jumpToBottomView.drawBadge = summary.hasUnreadMessages
-            scrollOnHighlightedEventCallback.timeline = roomDetailViewModel.timeline
             timelineEventController.update(state)
             views.inviteView.visibility = View.GONE
             if (state.tombstoneEvent == null) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 8b8d4fc823..669cf036d1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -1156,16 +1156,15 @@ class RoomDetailViewModel @AssistedInject constructor(
     private fun handleNavigateToEvent(action: RoomDetailAction.NavigateToEvent) {
         stopTrackingUnreadMessages()
         val targetEventId: String = action.eventId
-        val correctedEventId = timeline.getFirstDisplayableEventId(targetEventId) ?: targetEventId
-        val indexOfEvent = timeline.getIndexOfEvent(correctedEventId)
+        val indexOfEvent = timeline.getIndexOfEvent(targetEventId)
         if (indexOfEvent == null) {
             // Event is not already in RAM
             timeline.restartWithEventId(targetEventId)
         }
         if (action.highlight) {
-            setState { copy(highlightedEventId = correctedEventId) }
+            setState { copy(highlightedEventId = targetEventId) }
         }
-        _viewEvents.post(RoomDetailViewEvents.NavigateToEvent(correctedEventId))
+        _viewEvents.post(RoomDetailViewEvents.NavigateToEvent(targetEventId))
     }
 
     private fun handleResendEvent(action: RoomDetailAction.ResendMessage) {
@@ -1389,15 +1388,12 @@ class RoomDetailViewModel @AssistedInject constructor(
     private fun computeUnreadState(events: List<TimelineEvent>, roomSummary: RoomSummary): UnreadState {
         if (events.isEmpty()) return UnreadState.Unknown
         val readMarkerIdSnapshot = roomSummary.readMarkerId ?: return UnreadState.Unknown
-        val firstDisplayableEventId = timeline.getFirstDisplayableEventId(readMarkerIdSnapshot)
-        val firstDisplayableEventIndex = timeline.getIndexOfEvent(firstDisplayableEventId)
-        if (firstDisplayableEventId == null || firstDisplayableEventIndex == null) {
-            return if (timeline.isLive) {
-                UnreadState.ReadMarkerNotLoaded(readMarkerIdSnapshot)
-            } else {
-                UnreadState.Unknown
-            }
-        }
+        val firstDisplayableEventIndex = timeline.getIndexOfEvent(readMarkerIdSnapshot)
+                ?: return if (timeline.isLive) {
+                    UnreadState.ReadMarkerNotLoaded(readMarkerIdSnapshot)
+                } else {
+                    UnreadState.Unknown
+                }
         for (i in (firstDisplayableEventIndex - 1) downTo 0) {
             val timelineEvent = events.getOrNull(i) ?: return UnreadState.Unknown
             val eventId = timelineEvent.root.eventId ?: return UnreadState.Unknown
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
index 0eb02f5c75..72f827e469 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
@@ -33,8 +33,6 @@ class ScrollOnHighlightedEventCallback(private val recyclerView: RecyclerView,
 
     private val scheduledEventId = AtomicReference<String?>()
 
-    var timeline: Timeline? = null
-
     override fun onInserted(position: Int, count: Int) {
         scrollIfNeeded()
     }
@@ -45,9 +43,7 @@ class ScrollOnHighlightedEventCallback(private val recyclerView: RecyclerView,
 
     private fun scrollIfNeeded() {
         val eventId = scheduledEventId.get() ?: return
-        val nonNullTimeline = timeline ?: return
-        val correctedEventId = nonNullTimeline.getFirstDisplayableEventId(eventId)
-        val positionToScroll = timelineEventController.searchPositionOfEvent(correctedEventId)
+        val positionToScroll = timelineEventController.searchPositionOfEvent(eventId)
         if (positionToScroll != null) {
             val firstVisibleItem = layoutManager.findFirstCompletelyVisibleItemPosition()
             val lastVisibleItem = layoutManager.findLastCompletelyVisibleItemPosition()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
index 01c7ad3986..3aee65bf19 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
@@ -17,48 +17,14 @@
 package im.vector.app.features.home.room.detail.timeline.helper
 
 import im.vector.app.core.resources.UserPreferencesProvider
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.room.timeline.EventTypeFilter
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEventFilters
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import javax.inject.Inject
 
-class TimelineSettingsFactory @Inject constructor(
-        private val userPreferencesProvider: UserPreferencesProvider,
-        private val session: Session
-) {
+class TimelineSettingsFactory @Inject constructor(private val userPreferencesProvider: UserPreferencesProvider) {
 
     fun create(): TimelineSettings {
-        return if (userPreferencesProvider.shouldShowHiddenEvents()) {
-            TimelineSettings(
-                    initialSize = 30,
-                    filters = TimelineEventFilters(
-                            filterEdits = false,
-                            filterRedacted = userPreferencesProvider.shouldShowRedactedMessages().not(),
-                            filterUseless = false,
-                            filterTypes = false),
-                    buildReadReceipts = userPreferencesProvider.shouldShowReadReceipts())
-        } else {
-            val allowedTypes = TimelineDisplayableEvents.DISPLAYABLE_TYPES.createAllowedEventTypeFilters()
-            TimelineSettings(
-                    initialSize = 30,
-                    filters = TimelineEventFilters(
-                            filterEdits = true,
-                            filterRedacted = userPreferencesProvider.shouldShowRedactedMessages().not(),
-                            filterUseless = true,
-                            filterTypes = true,
-                            allowedTypes = allowedTypes),
-                    buildReadReceipts = userPreferencesProvider.shouldShowReadReceipts())
-        }
-    }
-
-    private fun List<String>.createAllowedEventTypeFilters(): List<EventTypeFilter> {
-        return map {
-            EventTypeFilter(
-                    eventType = it,
-                    stateKey = if (it == EventType.STATE_ROOM_MEMBER && !userPreferencesProvider.shouldShowRoomMemberStateEvents()) session.myUserId else null
-            )
-        }
+        return TimelineSettings(
+                initialSize = 30,
+                buildReadReceipts = userPreferencesProvider.shouldShowReadReceipts())
     }
 }

From c548a3d2fa368f8a3c335d01795a498792081d93 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sat, 27 Mar 2021 19:38:09 +0000
Subject: [PATCH 440/578] Convert WidgetService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../sdk/api/session/widgets/WidgetService.kt  |  10 +-
 .../session/widgets/DefaultWidgetService.kt   |  20 +--
 .../internal/session/widgets/WidgetManager.kt |  55 +++----
 .../home/room/detail/RoomDetailViewModel.kt   | 138 +++++++++---------
 .../features/widgets/WidgetPostAPIHandler.kt  |  13 +-
 .../app/features/widgets/WidgetViewModel.kt   |  19 +--
 6 files changed, 115 insertions(+), 140 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
index bf3ff8959d..8f35ff0e4a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
@@ -17,10 +17,8 @@
 package org.matrix.android.sdk.api.session.widgets
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Content
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 
 /**
@@ -107,20 +105,16 @@ interface WidgetService {
      * @param roomId the room where you want to create the widget.
      * @param widgetId the widget to create.
      * @param content the content of the widget
-     * @param callback the matrix callback to listen for result.
-     * @return Cancelable
      */
-    fun createRoomWidget(roomId: String, widgetId: String, content: Content, callback: MatrixCallback<Widget>): Cancelable
+    suspend fun createRoomWidget(roomId: String, widgetId: String, content: Content): Widget
 
     /**
      * Deactivate a widget in a room. It makes sure you have the rights to handle this.
      *
      * @param roomId: the room where you want to deactivate the widget.
      * @param widgetId: the widget to deactivate.
-     * @param callback the matrix callback to listen for result.
-     * @return Cancelable
      */
-    fun destroyRoomWidget(roomId: String, widgetId: String, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun destroyRoomWidget(roomId: String, widgetId: String)
 
     /**
      * Returns true if you can add/remove widgets. It goes through
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
index 9f5a9360ee..5912dc7b53 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
@@ -17,14 +17,12 @@
 package org.matrix.android.sdk.internal.session.widgets
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
 import org.matrix.android.sdk.api.session.widgets.WidgetService
 import org.matrix.android.sdk.api.session.widgets.WidgetURLFormatter
 import org.matrix.android.sdk.api.session.widgets.model.Widget
-import org.matrix.android.sdk.api.util.Cancelable
 import javax.inject.Inject
 import javax.inject.Provider
 
@@ -77,21 +75,19 @@ internal class DefaultWidgetService @Inject constructor(private val widgetManage
         return widgetManager.getUserWidgets(widgetTypes, excludedTypes)
     }
 
-    override fun createRoomWidget(
+    override suspend fun createRoomWidget(
             roomId: String,
             widgetId: String,
-            content: Content,
-            callback: MatrixCallback<Widget>
-    ): Cancelable {
-        return widgetManager.createRoomWidget(roomId, widgetId, content, callback)
+            content: Content
+    ): Widget {
+        return widgetManager.createRoomWidget(roomId, widgetId, content)
     }
 
-    override fun destroyRoomWidget(
+    override suspend fun destroyRoomWidget(
             roomId: String,
-            widgetId: String,
-            callback: MatrixCallback<Unit>
-    ): Cancelable {
-        return widgetManager.destroyRoomWidget(roomId, widgetId, callback)
+            widgetId: String
+    ) {
+        return widgetManager.destroyRoomWidget(roomId, widgetId)
     }
 
     override fun hasPermissionsToHandleWidgets(roomId: String): Boolean {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
index 73a4cc697d..3244212487 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
@@ -21,7 +21,6 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
@@ -34,7 +33,6 @@ import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.widgets.WidgetManagementFailure
 import org.matrix.android.sdk.api.session.widgets.model.Widget
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.session.SessionScope
@@ -43,8 +41,6 @@ import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
 import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataDataSource
 import org.matrix.android.sdk.internal.session.widgets.helper.WidgetFactory
 import org.matrix.android.sdk.internal.session.widgets.helper.extractWidgetSequence
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.launchToCallback
 import java.util.HashMap
 import javax.inject.Inject
 
@@ -52,7 +48,6 @@ import javax.inject.Inject
 internal class WidgetManager @Inject constructor(private val integrationManager: IntegrationManager,
                                                  private val accountDataDataSource: AccountDataDataSource,
                                                  private val stateEventDataSource: StateEventDataSource,
-                                                 private val taskExecutor: TaskExecutor,
                                                  private val createWidgetTask: CreateWidgetTask,
                                                  private val widgetFactory: WidgetFactory,
                                                  @UserId private val userId: String)
@@ -165,37 +160,33 @@ internal class WidgetManager @Inject constructor(private val integrationManager:
                 .toList()
     }
 
-    fun createRoomWidget(roomId: String, widgetId: String, content: Content, callback: MatrixCallback<Widget>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(callback = callback) {
-            if (!hasPermissionsToHandleWidgets(roomId)) {
-                throw WidgetManagementFailure.NotEnoughPower
-            }
-            val params = CreateWidgetTask.Params(
-                    roomId = roomId,
-                    widgetId = widgetId,
-                    content = content
-            )
-            createWidgetTask.execute(params)
-            try {
-                getRoomWidgets(roomId, widgetId = QueryStringValue.Equals(widgetId, QueryStringValue.Case.INSENSITIVE)).first()
-            } catch (failure: Throwable) {
-                throw WidgetManagementFailure.CreationFailed
-            }
+    suspend fun createRoomWidget(roomId: String, widgetId: String, content: Content): Widget {
+        if (!hasPermissionsToHandleWidgets(roomId)) {
+            throw WidgetManagementFailure.NotEnoughPower
+        }
+        val params = CreateWidgetTask.Params(
+                roomId = roomId,
+                widgetId = widgetId,
+                content = content
+        )
+        createWidgetTask.execute(params)
+        try {
+            return getRoomWidgets(roomId, widgetId = QueryStringValue.Equals(widgetId, QueryStringValue.Case.INSENSITIVE)).first()
+        } catch (failure: Throwable) {
+            throw WidgetManagementFailure.CreationFailed
         }
     }
 
-    fun destroyRoomWidget(roomId: String, widgetId: String, callback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(callback = callback) {
-            if (!hasPermissionsToHandleWidgets(roomId)) {
-                throw WidgetManagementFailure.NotEnoughPower
-            }
-            val params = CreateWidgetTask.Params(
-                    roomId = roomId,
-                    widgetId = widgetId,
-                    content = emptyMap()
-            )
-            createWidgetTask.execute(params)
+    suspend fun destroyRoomWidget(roomId: String, widgetId: String) {
+        if (!hasPermissionsToHandleWidgets(roomId)) {
+            throw WidgetManagementFailure.NotEnoughPower
         }
+        val params = CreateWidgetTask.Params(
+                roomId = roomId,
+                widgetId = widgetId,
+                content = emptyMap()
+        )
+        createWidgetTask.execute(params)
     }
 
     fun hasPermissionsToHandleWidgets(roomId: String): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index af3d5461ef..adae933e58 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -97,12 +97,10 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.getRelationContent
 import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
-import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.api.util.appendParamToUrl
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
 import timber.log.Timber
@@ -262,68 +260,68 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     override fun handle(action: RoomDetailAction) {
         when (action) {
-            is RoomDetailAction.UserIsTyping                     -> handleUserIsTyping(action)
-            is RoomDetailAction.ComposerFocusChange              -> handleComposerFocusChange(action)
-            is RoomDetailAction.SaveDraft                        -> handleSaveDraft(action)
-            is RoomDetailAction.SendMessage                      -> handleSendMessage(action)
-            is RoomDetailAction.SendMedia                        -> handleSendMedia(action)
-            is RoomDetailAction.SendSticker                      -> handleSendSticker(action)
-            is RoomDetailAction.TimelineEventTurnsVisible        -> handleEventVisible(action)
-            is RoomDetailAction.TimelineEventTurnsInvisible      -> handleEventInvisible(action)
-            is RoomDetailAction.LoadMoreTimelineEvents           -> handleLoadMore(action)
-            is RoomDetailAction.SendReaction                     -> handleSendReaction(action)
-            is RoomDetailAction.AcceptInvite                     -> handleAcceptInvite()
-            is RoomDetailAction.RejectInvite                     -> handleRejectInvite()
-            is RoomDetailAction.RedactAction                     -> handleRedactEvent(action)
-            is RoomDetailAction.UndoReaction                     -> handleUndoReact(action)
-            is RoomDetailAction.UpdateQuickReactAction           -> handleUpdateQuickReaction(action)
-            is RoomDetailAction.EnterRegularMode                 -> handleEnterRegularMode(action)
-            is RoomDetailAction.EnterEditMode                    -> handleEditAction(action)
-            is RoomDetailAction.EnterQuoteMode                   -> handleQuoteAction(action)
-            is RoomDetailAction.EnterReplyMode                   -> handleReplyAction(action)
-            is RoomDetailAction.DownloadOrOpen                   -> handleOpenOrDownloadFile(action)
-            is RoomDetailAction.NavigateToEvent                  -> handleNavigateToEvent(action)
-            is RoomDetailAction.HandleTombstoneEvent             -> handleTombstoneEvent(action)
-            is RoomDetailAction.ResendMessage                    -> handleResendEvent(action)
-            is RoomDetailAction.RemoveFailedEcho                 -> handleRemove(action)
-            is RoomDetailAction.ResendAll                        -> handleResendAll()
-            is RoomDetailAction.MarkAllAsRead                    -> handleMarkAllAsRead()
-            is RoomDetailAction.ReportContent                    -> handleReportContent(action)
-            is RoomDetailAction.IgnoreUser                       -> handleIgnoreUser(action)
+            is RoomDetailAction.UserIsTyping -> handleUserIsTyping(action)
+            is RoomDetailAction.ComposerFocusChange -> handleComposerFocusChange(action)
+            is RoomDetailAction.SaveDraft -> handleSaveDraft(action)
+            is RoomDetailAction.SendMessage -> handleSendMessage(action)
+            is RoomDetailAction.SendMedia -> handleSendMedia(action)
+            is RoomDetailAction.SendSticker -> handleSendSticker(action)
+            is RoomDetailAction.TimelineEventTurnsVisible -> handleEventVisible(action)
+            is RoomDetailAction.TimelineEventTurnsInvisible -> handleEventInvisible(action)
+            is RoomDetailAction.LoadMoreTimelineEvents -> handleLoadMore(action)
+            is RoomDetailAction.SendReaction -> handleSendReaction(action)
+            is RoomDetailAction.AcceptInvite -> handleAcceptInvite()
+            is RoomDetailAction.RejectInvite -> handleRejectInvite()
+            is RoomDetailAction.RedactAction -> handleRedactEvent(action)
+            is RoomDetailAction.UndoReaction -> handleUndoReact(action)
+            is RoomDetailAction.UpdateQuickReactAction -> handleUpdateQuickReaction(action)
+            is RoomDetailAction.EnterRegularMode -> handleEnterRegularMode(action)
+            is RoomDetailAction.EnterEditMode -> handleEditAction(action)
+            is RoomDetailAction.EnterQuoteMode -> handleQuoteAction(action)
+            is RoomDetailAction.EnterReplyMode -> handleReplyAction(action)
+            is RoomDetailAction.DownloadOrOpen -> handleOpenOrDownloadFile(action)
+            is RoomDetailAction.NavigateToEvent -> handleNavigateToEvent(action)
+            is RoomDetailAction.HandleTombstoneEvent -> handleTombstoneEvent(action)
+            is RoomDetailAction.ResendMessage -> handleResendEvent(action)
+            is RoomDetailAction.RemoveFailedEcho -> handleRemove(action)
+            is RoomDetailAction.ResendAll -> handleResendAll()
+            is RoomDetailAction.MarkAllAsRead -> handleMarkAllAsRead()
+            is RoomDetailAction.ReportContent -> handleReportContent(action)
+            is RoomDetailAction.IgnoreUser -> handleIgnoreUser(action)
             is RoomDetailAction.EnterTrackingUnreadMessagesState -> startTrackingUnreadMessages()
-            is RoomDetailAction.ExitTrackingUnreadMessagesState  -> stopTrackingUnreadMessages()
-            is RoomDetailAction.ReplyToOptions                   -> handleReplyToOptions(action)
-            is RoomDetailAction.AcceptVerificationRequest        -> handleAcceptVerification(action)
-            is RoomDetailAction.DeclineVerificationRequest       -> handleDeclineVerification(action)
-            is RoomDetailAction.RequestVerification              -> handleRequestVerification(action)
-            is RoomDetailAction.ResumeVerification               -> handleResumeRequestVerification(action)
-            is RoomDetailAction.ReRequestKeys                    -> handleReRequestKeys(action)
-            is RoomDetailAction.TapOnFailedToDecrypt             -> handleTapOnFailedToDecrypt(action)
-            is RoomDetailAction.SelectStickerAttachment          -> handleSelectStickerAttachment()
-            is RoomDetailAction.OpenIntegrationManager           -> handleOpenIntegrationManager()
-            is RoomDetailAction.StartCallWithPhoneNumber         -> handleStartCallWithPhoneNumber(action)
-            is RoomDetailAction.StartCall                        -> handleStartCall(action)
-            is RoomDetailAction.AcceptCall                       -> handleAcceptCall(action)
-            is RoomDetailAction.EndCall                          -> handleEndCall()
-            is RoomDetailAction.ManageIntegrations               -> handleManageIntegrations()
-            is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
-            is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
-            is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
-            is RoomDetailAction.CancelSend                       -> handleCancel(action)
-            is RoomDetailAction.OpenOrCreateDm                   -> handleOpenOrCreateDm(action)
-            is RoomDetailAction.JumpToReadReceipt                -> handleJumpToReadReceipt(action)
-            RoomDetailAction.QuickActionInvitePeople             -> handleInvitePeople()
-            RoomDetailAction.QuickActionSetAvatar                -> handleQuickSetAvatar()
-            is RoomDetailAction.SetAvatarAction                  -> handleSetNewAvatar(action)
-            RoomDetailAction.QuickActionSetTopic                 -> _viewEvents.post(RoomDetailViewEvents.OpenRoomSettings)
-            is RoomDetailAction.ShowRoomAvatarFullScreen         -> {
+            is RoomDetailAction.ExitTrackingUnreadMessagesState -> stopTrackingUnreadMessages()
+            is RoomDetailAction.ReplyToOptions -> handleReplyToOptions(action)
+            is RoomDetailAction.AcceptVerificationRequest -> handleAcceptVerification(action)
+            is RoomDetailAction.DeclineVerificationRequest -> handleDeclineVerification(action)
+            is RoomDetailAction.RequestVerification -> handleRequestVerification(action)
+            is RoomDetailAction.ResumeVerification -> handleResumeRequestVerification(action)
+            is RoomDetailAction.ReRequestKeys -> handleReRequestKeys(action)
+            is RoomDetailAction.TapOnFailedToDecrypt -> handleTapOnFailedToDecrypt(action)
+            is RoomDetailAction.SelectStickerAttachment -> handleSelectStickerAttachment()
+            is RoomDetailAction.OpenIntegrationManager -> handleOpenIntegrationManager()
+            is RoomDetailAction.StartCallWithPhoneNumber -> handleStartCallWithPhoneNumber(action)
+            is RoomDetailAction.StartCall -> handleStartCall(action)
+            is RoomDetailAction.AcceptCall -> handleAcceptCall(action)
+            is RoomDetailAction.EndCall -> handleEndCall()
+            is RoomDetailAction.ManageIntegrations -> handleManageIntegrations()
+            is RoomDetailAction.AddJitsiWidget -> handleAddJitsiConference(action)
+            is RoomDetailAction.RemoveWidget -> handleDeleteWidget(action.widgetId)
+            is RoomDetailAction.EnsureNativeWidgetAllowed -> handleCheckWidgetAllowed(action)
+            is RoomDetailAction.CancelSend -> handleCancel(action)
+            is RoomDetailAction.OpenOrCreateDm -> handleOpenOrCreateDm(action)
+            is RoomDetailAction.JumpToReadReceipt -> handleJumpToReadReceipt(action)
+            RoomDetailAction.QuickActionInvitePeople -> handleInvitePeople()
+            RoomDetailAction.QuickActionSetAvatar -> handleQuickSetAvatar()
+            is RoomDetailAction.SetAvatarAction -> handleSetNewAvatar(action)
+            RoomDetailAction.QuickActionSetTopic -> _viewEvents.post(RoomDetailViewEvents.OpenRoomSettings)
+            is RoomDetailAction.ShowRoomAvatarFullScreen -> {
                 _viewEvents.post(
                         RoomDetailViewEvents.ShowRoomAvatarFullScreen(action.matrixItem, action.transitionView)
                 )
             }
-            is RoomDetailAction.DoNotShowPreviewUrlFor           -> handleDoNotShowPreviewUrlFor(action)
-            RoomDetailAction.RemoveAllFailedMessages             -> handleRemoveAllFailedMessages()
-            RoomDetailAction.ResendAll                           -> handleResendAll()
+            is RoomDetailAction.DoNotShowPreviewUrlFor -> handleDoNotShowPreviewUrlFor(action)
+            RoomDetailAction.RemoveAllFailedMessages -> handleRemoveAllFailedMessages()
+            RoomDetailAction.ResendAll -> handleResendAll()
         }.exhaustive
     }
 
@@ -483,9 +481,7 @@ class RoomDetailViewModel @AssistedInject constructor(
             )
 
             try {
-                val widget = awaitCallback<Widget> {
-                    session.widgetService().createRoomWidget(roomId, widgetId, widgetEventContent, it)
-                }
+                val widget = session.widgetService().createRoomWidget(roomId, widgetId, widgetEventContent)
                 _viewEvents.post(RoomDetailViewEvents.JoinJitsiConference(widget, action.withVideo))
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.ShowMessage(stringProvider.getString(R.string.failed_to_add_widget)))
@@ -499,7 +495,7 @@ class RoomDetailViewModel @AssistedInject constructor(
         _viewEvents.post(RoomDetailViewEvents.ShowWaitingView)
         viewModelScope.launch(Dispatchers.IO) {
             try {
-                awaitCallback<Unit> { session.widgetService().destroyRoomWidget(room.roomId, widgetId, it) }
+                session.widgetService().destroyRoomWidget(room.roomId, widgetId)
                 // local echo
                 setState {
                     copy(
@@ -663,13 +659,13 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
         when (itemId) {
             R.id.timeline_setting -> true
-            R.id.invite           -> state.canInvite
+            R.id.invite -> state.canInvite
             R.id.open_matrix_apps -> true
             R.id.voice_call,
-            R.id.video_call       -> callManager.getCallsByRoomId(state.roomId).isEmpty()
-            R.id.hangup_call      -> callManager.getCallsByRoomId(state.roomId).isNotEmpty()
-            R.id.search           -> true
-            R.id.dev_tools        -> vectorPreferences.developerMode()
+            R.id.video_call -> callManager.getCallsByRoomId(state.roomId).isEmpty()
+            R.id.hangup_call -> callManager.getCallsByRoomId(state.roomId).isNotEmpty()
+            R.id.search -> true
+            R.id.dev_tools -> vectorPreferences.developerMode()
             else                  -> false
         }
     }
@@ -816,7 +812,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                         }
                     }.exhaustive
                 }
-                is SendMode.EDIT    -> {
+                is SendMode.EDIT -> {
                     // is original event a reply?
                     val inReplyTo = state.sendMode.timelineEvent.getRelationContent()?.inReplyTo?.eventId
                     if (inReplyTo != null) {
@@ -839,7 +835,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.QUOTE   -> {
+                is SendMode.QUOTE -> {
                     val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
                     val textMsg = messageContent?.body
 
@@ -860,7 +856,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.REPLY   -> {
+                is SendMode.REPLY -> {
                     state.sendMode.timelineEvent.let {
                         room.replyToMessage(it, action.text.toString(), action.autoMarkdown)
                         _viewEvents.post(RoomDetailViewEvents.MessageSent)
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index 13d49eb20b..e20c8cf4c6 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -289,12 +289,13 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
                     callback = createWidgetAPICallback(widgetPostAPIMediator, eventData)
             )
         } else {
-            session.widgetService().createRoomWidget(
-                    roomId = roomId,
-                    widgetId = widgetId,
-                    content = widgetEventContent,
-                    callback = createWidgetAPICallback(widgetPostAPIMediator, eventData)
-            )
+            launchWidgetAPIAction(widgetPostAPIMediator, eventData) {
+                session.widgetService().createRoomWidget(
+                        roomId = roomId,
+                        widgetId = widgetId,
+                        content = widgetEventContent
+                )
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
index d4e63b1338..0388b7b495 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
@@ -41,7 +41,6 @@ import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerS
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.widgets.WidgetManagementFailure
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.mapOptional
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
@@ -147,13 +146,13 @@ class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: Wi
 
     override fun handle(action: WidgetAction) {
         when (action) {
-            is WidgetAction.OnWebViewLoadingError   -> handleWebViewLoadingError(action)
+            is WidgetAction.OnWebViewLoadingError -> handleWebViewLoadingError(action)
             is WidgetAction.OnWebViewLoadingSuccess -> handleWebViewLoadingSuccess(action)
-            is WidgetAction.OnWebViewStartedToLoad  -> handleWebViewStartLoading()
-            WidgetAction.LoadFormattedUrl           -> loadFormattedUrl(forceFetchToken = false)
-            WidgetAction.DeleteWidget               -> handleDeleteWidget()
-            WidgetAction.RevokeWidget               -> handleRevokeWidget()
-            WidgetAction.OnTermsReviewed            -> loadFormattedUrl(forceFetchToken = false)
+            is WidgetAction.OnWebViewStartedToLoad -> handleWebViewStartLoading()
+            WidgetAction.LoadFormattedUrl -> loadFormattedUrl(forceFetchToken = false)
+            WidgetAction.DeleteWidget -> handleDeleteWidget()
+            WidgetAction.RevokeWidget -> handleRevokeWidget()
+            WidgetAction.OnTermsReviewed -> loadFormattedUrl(forceFetchToken = false)
         }
     }
 
@@ -173,10 +172,8 @@ class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: Wi
         viewModelScope.launch {
             val widgetId = initialState.widgetId ?: return@launch
             try {
-                awaitCallback<Unit> {
-                    widgetService.destroyRoomWidget(initialState.roomId, widgetId, it)
-                    _viewEvents.post(WidgetViewEvents.Close())
-                }
+                widgetService.destroyRoomWidget(initialState.roomId, widgetId)
+                _viewEvents.post(WidgetViewEvents.Close())
             } catch (failure: Throwable) {
                 _viewEvents.post(WidgetViewEvents.Failure(failure))
             }

From e23cba1d2011b2531bafe1a3d7799b2b7ed596d4 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sat, 27 Mar 2021 20:14:59 +0000
Subject: [PATCH 441/578] Convert ProfileService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../org/matrix/android/sdk/rx/RxSession.kt    |   5 +-
 .../sdk/api/session/profile/ProfileService.kt |  26 ++--
 .../session/profile/DefaultProfileService.kt  | 126 +++++-------------
 .../home/room/detail/RoomDetailViewModel.kt   |   4 +-
 .../settings/VectorSettingsGeneralFragment.kt |  46 +++----
 .../threepids/ThreePidsSettingsViewModel.kt   |  82 ++++++------
 6 files changed, 108 insertions(+), 181 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index a7b269fcc6..150a9dc9aa 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -20,6 +20,7 @@ import androidx.paging.PagedList
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.functions.Function3
+import kotlinx.coroutines.rx2.rxSingle
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
@@ -144,8 +145,8 @@ class RxSession(private val session: Session) {
         session.getRoomIdByAlias(roomAlias, searchOnServer, it)
     }
 
-    fun getProfileInfo(userId: String): Single<JsonDict> = singleBuilder {
-        session.getProfile(userId, it)
+    fun getProfileInfo(userId: String): Single<JsonDict> = rxSingle {
+        session.getProfile(userId)
     }
 
     fun liveUserCryptoDevices(userId: String): Observable<List<CryptoDeviceInfo>> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index a4d5b665c6..e493adeaf2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -19,10 +19,8 @@ package org.matrix.android.sdk.api.session.profile
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.session.identity.ThreePid
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.Optional
 
@@ -41,14 +39,14 @@ interface ProfileService {
      * @param userId the userId param to look for
      *
      */
-    fun getDisplayName(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable
+    suspend fun getDisplayName(userId: String): Optional<String>
 
     /**
      * Update the display name for this user
      * @param userId the userId to update the display name of
      * @param newDisplayName the new display name of the user
      */
-    fun setDisplayName(userId: String, newDisplayName: String, matrixCallback: MatrixCallback<Unit>): Cancelable
+    suspend fun setDisplayName(userId: String, newDisplayName: String)
 
     /**
      * Update the avatar for this user
@@ -56,14 +54,14 @@ interface ProfileService {
      * @param newAvatarUri the new avatar uri of the user
      * @param fileName the fileName of selected image
      */
-    fun updateAvatar(userId: String, newAvatarUri: Uri, fileName: String, matrixCallback: MatrixCallback<Unit>): Cancelable
+    suspend fun updateAvatar(userId: String, newAvatarUri: Uri, fileName: String)
 
     /**
      * Return the current avatarUrl for this user.
      * @param userId the userId param to look for
      *
      */
-    fun getAvatarUrl(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable
+    suspend fun getAvatarUrl(userId: String): Optional<String>
 
     /**
      * Get the combined profile information for this user.
@@ -71,7 +69,7 @@ interface ProfileService {
      * @param userId the userId param to look for
      *
      */
-    fun getProfile(userId: String, matrixCallback: MatrixCallback<JsonDict>): Cancelable
+    suspend fun getProfile(userId: String): JsonDict
 
     /**
      * Get the current user 3Pids
@@ -97,28 +95,26 @@ interface ProfileService {
     /**
      * Add a 3Pids. This is the first step to add a ThreePid to an account. Then the threePid will be added to the pending threePid list.
      */
-    fun addThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable
+    suspend fun addThreePid(threePid: ThreePid)
 
     /**
      * Validate a code received by text message
      */
-    fun submitSmsCode(threePid: ThreePid.Msisdn, code: String, matrixCallback: MatrixCallback<Unit>): Cancelable
+    suspend fun submitSmsCode(threePid: ThreePid.Msisdn, code: String)
 
     /**
      * Finalize adding a 3Pids. Call this method once the user has validated that he owns the ThreePid
      */
-    fun finalizeAddingThreePid(threePid: ThreePid,
-                               userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor,
-                               matrixCallback: MatrixCallback<Unit>): Cancelable
+    suspend fun finalizeAddingThreePid(threePid: ThreePid,
+                                       userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor)
 
     /**
      * Cancel adding a threepid. It will remove locally stored data about this ThreePid
      */
-    fun cancelAddingThreePid(threePid: ThreePid,
-                             matrixCallback: MatrixCallback<Unit>): Cancelable
+    suspend fun cancelAddingThreePid(threePid: ThreePid)
 
     /**
      * Remove a 3Pid from the Matrix account.
      */
-    fun deleteThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable
+    suspend fun deleteThreePid(threePid: ThreePid)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index b3216d744d..386fec8256 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -21,11 +21,10 @@ import android.net.Uri
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
 import io.realm.kotlin.where
-import org.matrix.android.sdk.api.MatrixCallback
+import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.profile.ProfileService
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.api.util.Optional
@@ -36,7 +35,6 @@ import org.matrix.android.sdk.internal.session.content.FileUploader
 import org.matrix.android.sdk.internal.session.user.UserStore
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
-import org.matrix.android.sdk.internal.task.launchToCallback
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import javax.inject.Inject
 
@@ -55,64 +53,38 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                                                          private val userStore: UserStore,
                                                          private val fileUploader: FileUploader) : ProfileService {
 
-    override fun getDisplayName(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable {
+    override suspend fun getDisplayName(userId: String): Optional<String> {
         val params = GetProfileInfoTask.Params(userId)
-        return getProfileInfoTask
-                .configureWith(params) {
-                    this.callback = object : MatrixCallback<JsonDict> {
-                        override fun onSuccess(data: JsonDict) {
-                            val displayName = data[ProfileService.DISPLAY_NAME_KEY] as? String
-                            matrixCallback.onSuccess(Optional.from(displayName))
-                        }
-
-                        override fun onFailure(failure: Throwable) {
-                            matrixCallback.onFailure(failure)
-                        }
-                    }
-                }
-                .executeBy(taskExecutor)
+        val data = getProfileInfoTask.execute(params)
+        val displayName = data[ProfileService.DISPLAY_NAME_KEY] as? String
+        return Optional.from(displayName)
     }
 
-    override fun setDisplayName(userId: String, newDisplayName: String, matrixCallback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.io, matrixCallback) {
+    override suspend fun setDisplayName(userId: String, newDisplayName: String) {
+        withContext(coroutineDispatchers.io) {
             setDisplayNameTask.execute(SetDisplayNameTask.Params(userId = userId, newDisplayName = newDisplayName))
             userStore.updateDisplayName(userId, newDisplayName)
         }
     }
 
-    override fun updateAvatar(userId: String, newAvatarUri: Uri, fileName: String, matrixCallback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, matrixCallback) {
+    override suspend fun updateAvatar(userId: String, newAvatarUri: Uri, fileName: String) {
+        withContext(coroutineDispatchers.main) {
             val response = fileUploader.uploadFromUri(newAvatarUri, fileName, MimeTypes.Jpeg)
             setAvatarUrlTask.execute(SetAvatarUrlTask.Params(userId = userId, newAvatarUrl = response.contentUri))
             userStore.updateAvatar(userId, response.contentUri)
         }
     }
 
-    override fun getAvatarUrl(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable {
+    override suspend fun getAvatarUrl(userId: String): Optional<String> {
         val params = GetProfileInfoTask.Params(userId)
-        return getProfileInfoTask
-                .configureWith(params) {
-                    this.callback = object : MatrixCallback<JsonDict> {
-                        override fun onSuccess(data: JsonDict) {
-                            val avatarUrl = data[ProfileService.AVATAR_URL_KEY] as? String
-                            matrixCallback.onSuccess(Optional.from(avatarUrl))
-                        }
-
-                        override fun onFailure(failure: Throwable) {
-                            matrixCallback.onFailure(failure)
-                        }
-                    }
-                }
-                .executeBy(taskExecutor)
+        val data = getProfileInfoTask.execute(params)
+        val avatarUrl = data[ProfileService.AVATAR_URL_KEY] as? String
+        return Optional.from(avatarUrl)
     }
 
-    override fun getProfile(userId: String, matrixCallback: MatrixCallback<JsonDict>): Cancelable {
+    override suspend fun getProfile(userId: String): JsonDict {
         val params = GetProfileInfoTask.Params(userId)
-        return getProfileInfoTask
-                .configureWith(params) {
-                    this.callback = matrixCallback
-                }
-                .executeBy(taskExecutor)
+        return getProfileInfoTask.execute(params)
     }
 
     override fun getThreePids(): List<ThreePid> {
@@ -154,70 +126,38 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
         )
     }
 
-    override fun addThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
-        return addThreePidTask
-                .configureWith(AddThreePidTask.Params(threePid)) {
-                    callback = matrixCallback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun addThreePid(threePid: ThreePid) {
+        addThreePidTask.execute(AddThreePidTask.Params(threePid))
     }
 
-    override fun submitSmsCode(threePid: ThreePid.Msisdn, code: String, matrixCallback: MatrixCallback<Unit>): Cancelable {
-        return validateSmsCodeTask
-                .configureWith(ValidateSmsCodeTask.Params(threePid, code)) {
-                    callback = matrixCallback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun submitSmsCode(threePid: ThreePid.Msisdn, code: String) {
+        validateSmsCodeTask.execute(ValidateSmsCodeTask.Params(threePid, code))
     }
 
-    override fun finalizeAddingThreePid(threePid: ThreePid,
-                                        userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor,
-                                        matrixCallback: MatrixCallback<Unit>): Cancelable {
-        return finalizeAddingThreePidTask
-                .configureWith(FinalizeAddingThreePidTask.Params(
+    override suspend fun finalizeAddingThreePid(threePid: ThreePid,
+                                                userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor) {
+        finalizeAddingThreePidTask
+                .execute(FinalizeAddingThreePidTask.Params(
                         threePid = threePid,
                         userInteractiveAuthInterceptor = userInteractiveAuthInterceptor,
                         userWantsToCancel = false
-                )) {
-                    callback = alsoRefresh(matrixCallback)
-                }
-                .executeBy(taskExecutor)
+                ))
+        refreshThreePids()
     }
 
-    override fun cancelAddingThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
-        return finalizeAddingThreePidTask
-                .configureWith(FinalizeAddingThreePidTask.Params(
+    override suspend fun cancelAddingThreePid(threePid: ThreePid) {
+        finalizeAddingThreePidTask
+                .execute(FinalizeAddingThreePidTask.Params(
                         threePid = threePid,
                         userInteractiveAuthInterceptor = null,
                         userWantsToCancel = true
-                )) {
-                    callback = alsoRefresh(matrixCallback)
-                }
-                .executeBy(taskExecutor)
+                ))
+        refreshThreePids()
     }
 
-    /**
-     * Wrap the callback to fetch 3Pids from the server in case of success
-     */
-    private fun alsoRefresh(callback: MatrixCallback<Unit>): MatrixCallback<Unit> {
-        return object : MatrixCallback<Unit> {
-            override fun onFailure(failure: Throwable) {
-                callback.onFailure(failure)
-            }
-
-            override fun onSuccess(data: Unit) {
-                refreshThreePids()
-                callback.onSuccess(data)
-            }
-        }
-    }
-
-    override fun deleteThreePid(threePid: ThreePid, matrixCallback: MatrixCallback<Unit>): Cancelable {
-        return deleteThreePidTask
-                .configureWith(DeleteThreePidTask.Params(threePid)) {
-                    callback = alsoRefresh(matrixCallback)
-                }
-                .executeBy(taskExecutor)
+    override suspend fun deleteThreePid(threePid: ThreePid) {
+        deleteThreePidTask.execute(DeleteThreePidTask.Params(threePid))
+        refreshThreePids()
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index af3d5461ef..2f099e7284 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -965,8 +965,8 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleChangeDisplayNameSlashCommand(changeDisplayName: ParsedCommand.ChangeDisplayName) {
-        launchSlashCommandFlow {
-            session.setDisplayName(session.myUserId, changeDisplayName.displayName, it)
+        launchSlashCommandFlowSuspendable {
+            session.setDisplayName(session.myUserId, changeDisplayName.displayName)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index b66a37b75f..334464e304 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -55,7 +55,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.failure.isInvalidPassword
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
@@ -305,17 +304,13 @@ class VectorSettingsGeneralFragment @Inject constructor(
     private fun uploadAvatar(uri: Uri) {
         displayLoadingView()
 
-        session.updateAvatar(session.myUserId, uri, getFilenameFromUri(context, uri) ?: UUID.randomUUID().toString(), object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
-                if (!isAdded) return
-                onCommonDone(null)
+        lifecycleScope.launch {
+            val result = runCatching {
+                session.updateAvatar(session.myUserId, uri, getFilenameFromUri(context, uri) ?: UUID.randomUUID().toString())
             }
-
-            override fun onFailure(failure: Throwable) {
-                if (!isAdded) return
-                onCommonDone(failure.localizedMessage)
-            }
-        })
+            if (!isAdded) return@launch
+            onCommonDone(result.fold({ null }, { it.localizedMessage }))
+        }
     }
 
     // ==============================================================================================================
@@ -477,20 +472,21 @@ class VectorSettingsGeneralFragment @Inject constructor(
         if (currentDisplayName != value) {
             displayLoadingView()
 
-            session.setDisplayName(session.myUserId, value, object : MatrixCallback<Unit> {
-                override fun onSuccess(data: Unit) {
-                    if (!isAdded) return
-                    // refresh the settings value
-                    mDisplayNamePreference.summary = value
-                    mDisplayNamePreference.text = value
-                    onCommonDone(null)
-                }
-
-                override fun onFailure(failure: Throwable) {
-                    if (!isAdded) return
-                    onCommonDone(failure.localizedMessage)
-                }
-            })
+            lifecycleScope.launch {
+                val result = runCatching { session.setDisplayName(session.myUserId, value) }
+                if (!isAdded) return@launch
+                result.fold(
+                        {
+                            // refresh the settings value
+                            mDisplayNamePreference.summary = value
+                            mDisplayNamePreference.text = value
+                            onCommonDone(null)
+                        },
+                        {
+                            onCommonDone(it.localizedMessage)
+                        }
+                )
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 89d632b813..ac565e72a1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -33,7 +33,6 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.ReadOnceTrue
 import im.vector.app.features.auth.ReAuthActivity
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
 import org.matrix.android.sdk.api.auth.registration.RegistrationFlowResponse
 import org.matrix.android.sdk.api.session.Session
@@ -58,16 +57,18 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
     private var pendingThreePid: ThreePid? = null
 //    private var pendingSession: String? = null
 
-    private val loadingCallback: MatrixCallback<Unit> = object : MatrixCallback<Unit> {
-        override fun onFailure(failure: Throwable) {
-            isLoading(false)
-            _viewEvents.post(ThreePidsSettingsViewEvents.Failure(failure))
-        }
-
-        override fun onSuccess(data: Unit) {
-            pendingThreePid = null
-            isLoading(false)
-        }
+    private suspend fun loadingSuspendable(block: suspend () -> Unit) {
+        runCatching { block() }
+                .fold(
+                        {
+                            pendingThreePid = null
+                            isLoading(false)
+                        },
+                        {
+                            isLoading(false)
+                            _viewEvents.post(ThreePidsSettingsViewEvents.Failure(it))
+                        }
+                )
     }
 
     private fun isLoading(isLoading: Boolean) {
@@ -186,24 +187,23 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             // First submit the code
-            session.submitSmsCode(action.threePid, action.code, object : MatrixCallback<Unit> {
-                override fun onSuccess(data: Unit) {
-                    // then finalize
-                    pendingThreePid = action.threePid
-                    session.finalizeAddingThreePid(action.threePid, uiaInterceptor, loadingCallback)
+            try {
+                session.submitSmsCode(action.threePid, action.code)
+            } catch (failure: Throwable) {
+                isLoading(false)
+                setState {
+                    copy(
+                            msisdnValidationRequests = msisdnValidationRequests.toMutableMap().apply {
+                                put(action.threePid.value, Fail(failure))
+                            }
+                    )
                 }
+                return@launch
+            }
 
-                override fun onFailure(failure: Throwable) {
-                    isLoading(false)
-                    setState {
-                        copy(
-                                msisdnValidationRequests = msisdnValidationRequests.toMutableMap().apply {
-                                    put(action.threePid.value, Fail(failure))
-                                }
-                        )
-                    }
-                }
-            })
+            // then finalize
+            pendingThreePid = action.threePid
+            loadingSuspendable { session.finalizeAddingThreePid(action.threePid, uiaInterceptor) }
         }
     }
 
@@ -230,21 +230,15 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
                 ))))
             } else {
                 viewModelScope.launch {
-                    session.addThreePid(action.threePid, object : MatrixCallback<Unit> {
-                        override fun onSuccess(data: Unit) {
-                            // Also reset the state
-                            setState {
-                                copy(
-                                        uiState = ThreePidsSettingsUiState.Idle
-                                )
-                            }
-                            loadingCallback.onSuccess(data)
+                    loadingSuspendable {
+                        session.addThreePid(action.threePid)
+                        // Also reset the state
+                        setState {
+                            copy(
+                                    uiState = ThreePidsSettingsUiState.Idle
+                            )
                         }
-
-                        override fun onFailure(failure: Throwable) {
-                            loadingCallback.onFailure(failure)
-                        }
-                    })
+                    }
                 }
             }
         }
@@ -254,14 +248,14 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
         isLoading(true)
         pendingThreePid = action.threePid
         viewModelScope.launch {
-            session.finalizeAddingThreePid(action.threePid, uiaInterceptor, loadingCallback)
+            loadingSuspendable { session.finalizeAddingThreePid(action.threePid, uiaInterceptor) }
         }
     }
 
     private fun handleCancelThreePid(action: ThreePidsSettingsAction.CancelThreePid) {
         isLoading(true)
         viewModelScope.launch {
-            session.cancelAddingThreePid(action.threePid, loadingCallback)
+            loadingSuspendable { session.cancelAddingThreePid(action.threePid) }
         }
     }
 
@@ -277,7 +271,7 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
     private fun handleDeleteThreePid(action: ThreePidsSettingsAction.DeleteThreePid) {
         isLoading(true)
         viewModelScope.launch {
-            session.deleteThreePid(action.threePid, loadingCallback)
+            loadingSuspendable { session.deleteThreePid(action.threePid) }
         }
     }
 }

From 42166c1c0f8070e16f69a6a5b98f1807d6ed2fde Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Mon, 29 Mar 2021 19:48:26 +0100
Subject: [PATCH 442/578] Error handling

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../home/room/detail/RoomDetailViewModel.kt       | 15 ++++++++++++---
 .../NotificationBroadcastReceiver.kt              |  5 ++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 120e80a1b6..81968ab13a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -182,7 +182,10 @@ class RoomDetailViewModel @AssistedInject constructor(
         updateShowDialerOptionState()
         room.getRoomSummaryLive()
         viewModelScope.launch {
-            room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT)
+            try {
+                room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT)
+            } catch (_: Exception) {
+            }
         }
         // Inform the SDK that the room is displayed
         session.onRoomDisplayed(initialState.roomId)
@@ -549,7 +552,10 @@ class RoomDetailViewModel @AssistedInject constructor(
         if (trackUnreadMessages.getAndSet(false)) {
             mostRecentDisplayedEvent?.root?.eventId?.also {
                 viewModelScope.launch {
-                    room.setReadMarker(it)
+                    try {
+                        room.setReadMarker(it)
+                    } catch (_: Exception) {
+                    }
                 }
             }
             mostRecentDisplayedEvent = null
@@ -1262,7 +1268,10 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     private fun handleMarkAllAsRead() {
         viewModelScope.launch {
-            room.markAsRead(ReadService.MarkAsReadParams.BOTH)
+            try {
+                room.markAsRead(ReadService.MarkAsReadParams.BOTH)
+            } catch (_: Exception) {
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index c4d7376c55..9dd41e4cea 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -93,7 +93,10 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             val room = session.getRoom(roomId)
             if (room != null) {
                 GlobalScope.launch {
-                    room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT)
+                    try {
+                        room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT)
+                    } catch (_: Exception) {
+                    }
                 }
             }
         }

From 1e58767374502cd721b7fd3f0e3b8fe15131fd57 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Mon, 29 Mar 2021 20:02:03 +0100
Subject: [PATCH 443/578] Missing file

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../troubleshoot/TestPushFromPushGateway.kt   | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index da93d54075..6cf7d68561 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -24,9 +24,8 @@ import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.FcmHelper
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.pushers.PushGatewayFailure
-import org.matrix.android.sdk.api.util.Cancelable
+import kotlinx.coroutines.*
 import javax.inject.Inject
 
 /**
@@ -38,29 +37,31 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
                                                   private val pushersManager: PushersManager)
     : TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
-    private var action: Cancelable? = null
+    private var action: Job? = null
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val fcmToken = FcmHelper.getFcmToken(context) ?: run {
             status = TestStatus.FAILED
             return
         }
-        action = pushersManager.testPush(fcmToken, object : MatrixCallback<Unit> {
-            override fun onFailure(failure: Throwable) {
-                description = if (failure is PushGatewayFailure.PusherRejected) {
-                    stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
-                } else {
-                    errorFormatter.toHumanReadable(failure)
-                }
-                status = TestStatus.FAILED
-            }
-
-            override fun onSuccess(data: Unit) {
-                // Wait for the push to be received
-                description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
-                status = TestStatus.RUNNING
-            }
-        })
+        action = GlobalScope.launch {
+            runCatching { pushersManager.testPush(fcmToken) }
+                .fold(
+                        {
+                            // Wait for the push to be received
+                            description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
+                            status = TestStatus.RUNNING
+                        },
+                        {
+                            description = if (failure is PushGatewayFailure.PusherRejected) {
+                                stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
+                            } else {
+                                errorFormatter.toHumanReadable(it)
+                            }
+                            status = TestStatus.FAILED
+                        }
+                )
+        }
     }
 
     override fun onPushReceived() {
@@ -69,6 +70,6 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
     }
 
     override fun cancel() {
-        action?.cancel()
+        job?.cancel()
     }
 }

From bc5e090b09734b440570861d9a5358c7fa0b1110 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Mon, 29 Mar 2021 20:06:28 +0100
Subject: [PATCH 444/578] Lint

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../app/features/crypto/recover/BootstrapCrossSigningTask.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index 87074b7a12..70cda4bf79 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -192,7 +192,7 @@ class BootstrapCrossSigningTask @Inject constructor(
             ssssService.storeSecret(
                     USER_SIGNING_KEY_SSSS_NAME,
                     uskPrivateKey,
-                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec)),
+                    listOf(SharedSecretStorageService.KeyRef(keyInfo.keyId, keyInfo.keySpec))
             )
             params.progressListener?.onProgress(
                     WaitingViewData(

From bc68075ae3d698c4cc8f5828acbe1038f956e7d3 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 28 Mar 2021 12:52:12 +0100
Subject: [PATCH 445/578] Convert MembershipService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../java/org/matrix/android/sdk/rx/RxRoom.kt  | 17 ++---
 .../android/sdk/common/CryptoTestHelper.kt    | 10 +--
 .../crypto/gossiping/KeyShareTests.kt         |  4 +-
 .../session/room/members/MembershipService.kt | 31 +++------
 .../membership/DefaultMembershipService.kt    | 69 +++++--------------
 .../home/room/detail/RoomDetailViewModel.kt   | 34 +++++----
 .../home/room/list/RoomListViewModel.kt       | 40 +++++------
 .../NotificationBroadcastReceiver.kt          | 18 +++--
 .../RoomMemberProfileViewModel.kt             | 19 ++---
 .../roomprofile/RoomProfileViewModel.kt       | 12 ++--
 .../banned/RoomBannedMemberListViewModel.kt   |  5 +-
 .../features/widgets/WidgetPostAPIHandler.kt  |  4 +-
 12 files changed, 109 insertions(+), 154 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
index b938f60e39..21db4e1893 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
@@ -21,6 +21,7 @@ import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.Single
 import kotlinx.coroutines.rx2.rxCompletable
+import kotlinx.coroutines.rx2.rxSingle
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.identity.ThreePid
@@ -90,13 +91,13 @@ class RxRoom(private val room: Room) {
         return room.getMyReadReceiptLive().asObservable()
     }
 
-    fun loadRoomMembersIfNeeded(): Single<Unit> = singleBuilder {
-        room.loadRoomMembersIfNeeded(it)
+    fun loadRoomMembersIfNeeded(): Single<Unit> = rxSingle {
+        room.loadRoomMembersIfNeeded()
     }
 
     fun joinRoom(reason: String? = null,
-                 viaServers: List<String> = emptyList()): Single<Unit> = singleBuilder {
-        room.join(reason, viaServers, it)
+                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
+        room.join(reason, viaServers)
     }
 
     fun liveEventReadReceipts(eventId: String): Observable<List<ReadReceipt>> {
@@ -114,12 +115,12 @@ class RxRoom(private val room: Room) {
         return room.getLiveRoomNotificationState().asObservable()
     }
 
-    fun invite(userId: String, reason: String? = null): Completable = completableBuilder<Unit> {
-        room.invite(userId, reason, it)
+    fun invite(userId: String, reason: String? = null): Completable = rxCompletable {
+        room.invite(userId, reason)
     }
 
-    fun invite3pid(threePid: ThreePid): Completable = completableBuilder<Unit> {
-        room.invite3pid(threePid, it)
+    fun invite3pid(threePid: ThreePid): Completable = rxCompletable {
+        room.invite3pid(threePid)
     }
 
     fun updateTopic(topic: String): Completable = rxCompletable {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index eb7e4a9fbe..effea8313a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -112,8 +112,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             bobRoomSummariesLive.observeForever(newRoomObserver)
         }
 
-        mTestHelper.doSync<Unit> {
-            aliceRoom.invite(bobSession.myUserId, callback = it)
+        mTestHelper.runBlockingTest {
+            aliceRoom.invite(bobSession.myUserId)
         }
 
         mTestHelper.await(lock1)
@@ -172,8 +172,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
     fun createSamAccountAndInviteToTheRoom(room: Room): Session {
         val samSession = mTestHelper.createAccount(TestConstants.USER_SAM, defaultSessionParams)
 
-        mTestHelper.doSync<Unit> {
-            room.invite(samSession.myUserId, null, it)
+        mTestHelper.runBlockingTest {
+            room.invite(samSession.myUserId, null)
         }
 
         mTestHelper.doSync<Unit> {
@@ -411,7 +411,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
         val sessions = mutableListOf(aliceSession)
         for (index in 1 until numberOfMembers) {
             val session = mTestHelper.createAccount("User_$index", defaultSessionParams)
-            mTestHelper.doSync<Unit>(timeout = 600_000) { room.invite(session.myUserId, null, it) }
+            mTestHelper.runBlockingTest(timeout = 600_000) { room.invite(session.myUserId, null) }
             println("TEST -> " + session.myUserId + " invited")
             mTestHelper.doSync<Unit> { session.joinRoom(room.roomId, null, emptyList(), it) }
             println("TEST -> " + session.myUserId + " joined")
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 8c3917adc1..e6b364f3fb 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -367,8 +367,8 @@ class KeyShareTests : InstrumentedTest {
         }
 
         // Let alice invite bob
-        mTestHelper.doSync<Unit> {
-            roomAlicePov.invite(bobSession.myUserId, null, it)
+        mTestHelper.runBlockingTest {
+            roomAlicePov.invite(bobSession.myUserId, null)
         }
 
         mTestHelper.doSync<Unit> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
index 2c3ffac687..198d6677a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
@@ -17,10 +17,8 @@
 package org.matrix.android.sdk.api.session.room.members
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
-import org.matrix.android.sdk.api.util.Cancelable
 
 /**
  * This interface defines methods to handling membership. It's implemented at the room level.
@@ -29,9 +27,8 @@ interface MembershipService {
 
     /**
      * This methods load all room members if it was done yet.
-     * @return a [Cancelable]
      */
-    fun loadRoomMembersIfNeeded(matrixCallback: MatrixCallback<Unit>): Cancelable
+    suspend fun loadRoomMembersIfNeeded()
 
     /**
      * Return the roomMember with userId or null.
@@ -60,47 +57,35 @@ interface MembershipService {
     /**
      * Invite a user in the room
      */
-    fun invite(userId: String,
-               reason: String? = null,
-               callback: MatrixCallback<Unit>): Cancelable
+    suspend fun invite(userId: String, reason: String? = null)
 
     /**
      * Invite a user with email or phone number in the room
      */
-    fun invite3pid(threePid: ThreePid,
-                   callback: MatrixCallback<Unit>): Cancelable
+    suspend fun invite3pid(threePid: ThreePid)
 
     /**
      * Ban a user from the room
      */
-    fun ban(userId: String,
-            reason: String? = null,
-            callback: MatrixCallback<Unit>): Cancelable
+    suspend fun ban(userId: String, reason: String? = null)
 
     /**
      * Unban a user from the room
      */
-    fun unban(userId: String,
-              reason: String? = null,
-              callback: MatrixCallback<Unit>): Cancelable
+    suspend fun unban(userId: String, reason: String? = null)
 
     /**
      * Kick a user from the room
      */
-    fun kick(userId: String,
-             reason: String? = null,
-             callback: MatrixCallback<Unit>): Cancelable
+    suspend fun kick(userId: String, reason: String? = null)
 
     /**
      * Join the room, or accept an invitation.
      */
-    fun join(reason: String? = null,
-             viaServers: List<String> = emptyList(),
-             callback: MatrixCallback<Unit>): Cancelable
+    suspend fun join(reason: String? = null, viaServers: List<String> = emptyList())
 
     /**
      * Leave the room, or reject an invitation.
      */
-    fun leave(reason: String? = null,
-              callback: MatrixCallback<Unit>): Cancelable
+    suspend fun leave(reason: String? = null)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
index cd1c9bbbdd..41e891f78e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
@@ -21,13 +21,11 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.members.MembershipService
 import org.matrix.android.sdk.api.session.room.members.RoomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
@@ -39,8 +37,6 @@ import org.matrix.android.sdk.internal.session.room.membership.joining.InviteTas
 import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
 import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
 import org.matrix.android.sdk.internal.session.room.membership.threepid.InviteThreePidTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.fetchCopied
 import io.realm.Realm
 import io.realm.RealmQuery
@@ -48,7 +44,6 @@ import io.realm.RealmQuery
 internal class DefaultMembershipService @AssistedInject constructor(
         @Assisted private val roomId: String,
         @SessionDatabase private val monarchy: Monarchy,
-        private val taskExecutor: TaskExecutor,
         private val loadRoomMembersTask: LoadRoomMembersTask,
         private val inviteTask: InviteTask,
         private val inviteThreePidTask: InviteThreePidTask,
@@ -64,13 +59,9 @@ internal class DefaultMembershipService @AssistedInject constructor(
         fun create(roomId: String): DefaultMembershipService
     }
 
-    override fun loadRoomMembersIfNeeded(matrixCallback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun loadRoomMembersIfNeeded() {
         val params = LoadRoomMembersTask.Params(roomId, Membership.LEAVE)
-        return loadRoomMembersTask
-                .configureWith(params) {
-                    this.callback = matrixCallback
-                }
-                .executeBy(taskExecutor)
+        loadRoomMembersTask.execute(params)
     }
 
     override fun getRoomMember(userId: String): RoomMemberSummary? {
@@ -120,66 +111,38 @@ internal class DefaultMembershipService @AssistedInject constructor(
         }
     }
 
-    override fun ban(userId: String, reason: String?, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun ban(userId: String, reason: String?) {
         val params = MembershipAdminTask.Params(MembershipAdminTask.Type.BAN, roomId, userId, reason)
-        return membershipAdminTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        membershipAdminTask.execute(params)
     }
 
-    override fun unban(userId: String, reason: String?, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun unban(userId: String, reason: String?) {
         val params = MembershipAdminTask.Params(MembershipAdminTask.Type.UNBAN, roomId, userId, reason)
-        return membershipAdminTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        membershipAdminTask.execute(params)
     }
 
-    override fun kick(userId: String, reason: String?, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun kick(userId: String, reason: String?) {
         val params = MembershipAdminTask.Params(MembershipAdminTask.Type.KICK, roomId, userId, reason)
-        return membershipAdminTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        membershipAdminTask.execute(params)
     }
 
-    override fun invite(userId: String, reason: String?, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun invite(userId: String, reason: String?) {
         val params = InviteTask.Params(roomId, userId, reason)
-        return inviteTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        inviteTask.execute(params)
     }
 
-    override fun invite3pid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun invite3pid(threePid: ThreePid) {
         val params = InviteThreePidTask.Params(roomId, threePid)
-        return inviteThreePidTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        return inviteThreePidTask.execute(params)
     }
 
-    override fun join(reason: String?, viaServers: List<String>, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun join(reason: String?, viaServers: List<String>) {
         val params = JoinRoomTask.Params(roomId, reason, viaServers)
-        return joinTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        joinTask.execute(params)
     }
 
-    override fun leave(reason: String?, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun leave(reason: String?) {
         val params = LeaveRoomTask.Params(roomId, reason)
-        return leaveRoomTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        leaveRoomTask.execute(params)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index af3d5461ef..0584641c59 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -940,14 +940,14 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleInviteSlashCommand(invite: ParsedCommand.Invite) {
-        launchSlashCommandFlow {
-            room.invite(invite.userId, invite.reason, it)
+        launchSlashCommandFlowSuspendable {
+            room.invite(invite.userId, invite.reason)
         }
     }
 
     private fun handleInvite3pidSlashCommand(invite: ParsedCommand.Invite3Pid) {
-        launchSlashCommandFlow {
-            room.invite3pid(invite.threePid, it)
+        launchSlashCommandFlowSuspendable {
+            room.invite3pid(invite.threePid)
         }
     }
 
@@ -971,20 +971,20 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleKickSlashCommand(kick: ParsedCommand.KickUser) {
-        launchSlashCommandFlow {
-            room.kick(kick.userId, kick.reason, it)
+        launchSlashCommandFlowSuspendable {
+            room.kick(kick.userId, kick.reason)
         }
     }
 
     private fun handleBanSlashCommand(ban: ParsedCommand.BanUser) {
-        launchSlashCommandFlow {
-            room.ban(ban.userId, ban.reason, it)
+        launchSlashCommandFlowSuspendable {
+            room.ban(ban.userId, ban.reason)
         }
     }
 
     private fun handleUnbanSlashCommand(unban: ParsedCommand.UnbanUser) {
-        launchSlashCommandFlow {
-            room.unban(unban.userId, unban.reason, it)
+        launchSlashCommandFlowSuspendable {
+            room.unban(unban.userId, unban.reason)
         }
     }
 
@@ -1088,11 +1088,21 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleRejectInvite() {
-        room.leave(null, NoOpMatrixCallback())
+        viewModelScope.launch {
+            try {
+                room.leave(null)
+            } catch (_: Exception) {
+            }
+        }
     }
 
     private fun handleAcceptInvite() {
-        room.join(callback = NoOpMatrixCallback())
+        viewModelScope.launch {
+            try {
+                room.join()
+            } catch (_: Exception) {
+            }
+        }
     }
 
     private fun handleEditAction(action: RoomDetailAction.EnterEditMode) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 6e5081a31c..3a5e797f98 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -26,7 +26,6 @@ import im.vector.app.core.utils.DataSource
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
@@ -127,17 +126,17 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
             return@withState
         }
 
-        session.getRoom(roomId)?.join(callback = object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
+        val room = session.getRoom(roomId) ?: return@withState
+        viewModelScope.launch {
+            try {
+                room.join()
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
-            }
-
-            override fun onFailure(failure: Throwable) {
+            } catch (failure: Throwable) {
                 // Notify the user
                 _viewEvents.post(RoomListViewEvents.Failure(failure))
             }
-        })
+        }
     }
 
     private fun handleRejectInvitation(action: RoomListAction.RejectInvitation) = withState { state ->
@@ -149,19 +148,19 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
             return@withState
         }
 
-        session.getRoom(roomId)?.leave(null, object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
+        val room = session.getRoom(roomId) ?: return@withState
+        viewModelScope.launch {
+            try {
+                room.leave(null)
                 // We do not update the rejectingRoomsIds here, because, the room is not rejected yet regarding the sync data.
                 // Instead, we wait for the room to be rejected
                 // Known bug: if the user is invited again (after rejecting the first invitation), the loading will be displayed instead of the buttons.
                 // If we update the state, the button will be displayed again, so it's not ideal...
-            }
-
-            override fun onFailure(failure: Throwable) {
+            } catch (failure: Throwable) {
                 // Notify the user
                 _viewEvents.post(RoomListViewEvents.Failure(failure))
             }
-        })
+        }
     }
 
     private fun handleMarkAllRoomsRead() = withState { state ->
@@ -220,15 +219,12 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
 
     private fun handleLeaveRoom(action: RoomListAction.LeaveRoom) {
         _viewEvents.post(RoomListViewEvents.Loading(null))
-        session.getRoom(action.roomId)?.leave(null, object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
-                _viewEvents.post(RoomListViewEvents.Done)
-            }
-
-            override fun onFailure(failure: Throwable) {
-                _viewEvents.post(RoomListViewEvents.Failure(failure))
-            }
-        })
+        val room = session.getRoom(action.roomId) ?: return
+        viewModelScope.launch {
+            val value = runCatching { room.leave(null) }
+                    .fold({ RoomListViewEvents.Done }, { RoomListViewEvents.Failure(it) })
+            _viewEvents.post(value)
+        }
     }
 
     private fun observeMembershipChanges() {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index d79d16a052..8136a172fb 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -23,6 +23,8 @@ import androidx.core.app.RemoteInput
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.vectorComponent
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
@@ -74,15 +76,23 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
 
     private fun handleJoinRoom(roomId: String) {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
-            session.getRoom(roomId)
-                    ?.join(callback = NoOpMatrixCallback())
+            val room = session.getRoom(roomId)
+            if (room != null) {
+                GlobalScope.launch {
+                    room.join()
+                }
+            }
         }
     }
 
     private fun handleRejectRoom(roomId: String) {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
-            session.getRoom(roomId)
-                    ?.leave(callback = NoOpMatrixCallback())
+            val room = session.getRoom(roomId)
+            if (room != null) {
+                GlobalScope.launch {
+                    room.leave()
+                }
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index 0556b9d2d6..e34e48e09c 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -53,7 +53,6 @@ import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.api.util.toOptional
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
 
@@ -198,9 +197,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
         viewModelScope.launch {
             try {
                 _viewEvents.post(RoomMemberProfileViewEvents.Loading())
-                awaitCallback<Unit> {
-                    room.invite(initialState.userId, callback = it)
-                }
+                room.invite(initialState.userId)
                 _viewEvents.post(RoomMemberProfileViewEvents.OnInviteActionSuccess)
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomMemberProfileViewEvents.Failure(failure))
@@ -215,9 +212,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
         viewModelScope.launch {
             try {
                 _viewEvents.post(RoomMemberProfileViewEvents.Loading())
-                awaitCallback<Unit> {
-                    room.kick(initialState.userId, action.reason, it)
-                }
+                room.kick(initialState.userId, action.reason)
                 _viewEvents.post(RoomMemberProfileViewEvents.OnKickActionSuccess)
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomMemberProfileViewEvents.Failure(failure))
@@ -233,12 +228,10 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
         viewModelScope.launch {
             try {
                 _viewEvents.post(RoomMemberProfileViewEvents.Loading())
-                awaitCallback<Unit> {
-                    if (membership == Membership.BAN) {
-                        room.unban(initialState.userId, action.reason, it)
-                    } else {
-                        room.ban(initialState.userId, action.reason, it)
-                    }
+                if (membership == Membership.BAN) {
+                    room.unban(initialState.userId, action.reason)
+                } else {
+                    room.ban(initialState.userId, action.reason)
                 }
                 _viewEvents.post(RoomMemberProfileViewEvents.OnBanActionSuccess)
             } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index c8bb6b5b5c..209ebcc35b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -32,7 +32,6 @@ import im.vector.app.features.home.ShortcutCreator
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -169,15 +168,14 @@ class RoomProfileViewModel @AssistedInject constructor(
 
     private fun handleLeaveRoom() {
         _viewEvents.post(RoomProfileViewEvents.Loading(stringProvider.getString(R.string.room_profile_leaving_room)))
-        room.leave(null, object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
+        viewModelScope.launch {
+            try {
+                room.leave(null)
                 // Do nothing, we will be closing the room automatically when it will get back from sync
-            }
-
-            override fun onFailure(failure: Throwable) {
+            } catch (failure: Throwable) {
                 _viewEvents.post(RoomProfileViewEvents.Failure(failure))
             }
-        })
+        }
     }
 
     private fun handleShareRoomProfile() {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
index 5663392c6c..9e12e30399 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
@@ -39,7 +39,6 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
 
@@ -124,9 +123,7 @@ class RoomBannedMemberListViewModel @AssistedInject constructor(@Assisted initia
         }
         viewModelScope.launch(Dispatchers.IO) {
             try {
-                awaitCallback<Unit> {
-                    room.unban(roomMemberSummary.userId, null, it)
-                }
+                room.unban(roomMemberSummary.userId, null)
             } catch (failure: Throwable) {
                 _viewEvents.post(RoomBannedMemberListViewEvents.ToastError(stringProvider.getString(R.string.failed_to_unban)))
             } finally {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index 13d49eb20b..467271c12d 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -386,7 +386,9 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
         if (member != null && member.membership == Membership.JOIN) {
             widgetPostAPIMediator.sendSuccess(eventData)
         } else {
-            room.invite(userId = userId, callback = createWidgetAPICallback(widgetPostAPIMediator, eventData))
+            launchWidgetAPIAction(widgetPostAPIMediator, eventData) {
+                room.invite(userId = userId)
+            }
         }
     }
 

From 501b870c351d9ef7eb3de70f08d44aaec2affbe0 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sat, 27 Mar 2021 18:41:29 +0000
Subject: [PATCH 446/578] Convert IdentityService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../api/session/identity/IdentityService.kt   |  29 ++--
 .../identity/DefaultIdentityService.kt        | 149 +++++++-----------
 .../contactsbook/ContactsBookViewModel.kt     |  78 +++++----
 .../discovery/DiscoverySettingsViewModel.kt   |  25 ++-
 .../change/SetIdentityServerViewModel.kt      |   5 +-
 5 files changed, 119 insertions(+), 167 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
index aedb813735..8f8967e8fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
@@ -16,9 +16,6 @@
 
 package org.matrix.android.sdk.api.session.identity
 
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-
 /**
  * Provides access to the identity server configuration and services identity server can provide
  */
@@ -40,55 +37,55 @@ interface IdentityService {
      * See https://matrix.org/docs/spec/identity_service/latest#status-check
      * RiotX SDK only supports identity server API v2
      */
-    fun isValidIdentityServer(url: String, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun isValidIdentityServer(url: String)
 
     /**
      * Update the identity server url.
      * If successful, any previous identity server will be disconnected.
      * In case of error, any previous identity server will remain configured.
      * @param url the new url.
-     * @param callback will notify the user if change is successful. The String will be the final url of the identity server.
+     * @return The String will be the final url of the identity server.
      * The SDK can prepend "https://" for instance.
      */
-    fun setNewIdentityServer(url: String, callback: MatrixCallback<String>): Cancelable
+    suspend fun setNewIdentityServer(url: String): String
 
     /**
      * Disconnect (logout) from the current identity server
      */
-    fun disconnect(callback: MatrixCallback<Unit>): Cancelable
+    suspend fun disconnect()
 
     /**
      * This will ask the identity server to send an email or an SMS to let the user confirm he owns the ThreePid
      */
-    fun startBindThreePid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun startBindThreePid(threePid: ThreePid)
 
     /**
      * This will cancel a pending binding of threePid.
      */
-    fun cancelBindThreePid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun cancelBindThreePid(threePid: ThreePid)
 
     /**
      * This will ask the identity server to send an new email or a new SMS to let the user confirm he owns the ThreePid
      */
-    fun sendAgainValidationCode(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun sendAgainValidationCode(threePid: ThreePid)
 
     /**
      * Submit the code that the identity server has sent to the user (in email or SMS)
      * Once successful, you will have to call [finalizeBindThreePid]
      * @param code the code sent to the user
      */
-    fun submitValidationToken(threePid: ThreePid, code: String, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun submitValidationToken(threePid: ThreePid, code: String)
 
     /**
      * This will perform the actual association of ThreePid and Matrix account
      */
-    fun finalizeBindThreePid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun finalizeBindThreePid(threePid: ThreePid)
 
     /**
      * Unbind a threePid
      * The request will actually be done on the homeserver
      */
-    fun unbindThreePid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun unbindThreePid(threePid: ThreePid)
 
     /**
      * Search MatrixId of users providing email and phone numbers
@@ -96,7 +93,7 @@ interface IdentityService {
      * Application has to explicitly ask for the user consent, and the answer can be stored using [setUserConsent]
      * Please see https://support.google.com/googleplay/android-developer/answer/9888076?hl=en for more details.
      */
-    fun lookUp(threePids: List<ThreePid>, callback: MatrixCallback<List<FoundThreePid>>): Cancelable
+    suspend fun lookUp(threePids: List<ThreePid>): List<FoundThreePid>
 
     /**
      * Return the current user consent for the current identity server, which has been stored using [setUserConsent].
@@ -120,9 +117,9 @@ interface IdentityService {
      * A lookup will be performed, but also pending binding state will be restored
      *
      * @param threePids the list of threePid the user owns (retrieved form the homeserver)
-     * @param callback onSuccess will be called with a map of ThreePid -> SharedState
+     * @return a map of ThreePid -> SharedState
      */
-    fun getShareStatus(threePids: List<ThreePid>, callback: MatrixCallback<Map<ThreePid, SharedState>>): Cancelable
+    suspend fun getShareStatus(threePids: List<ThreePid>): Map<ThreePid, SharedState>
 
     fun addListener(listener: IdentityServiceListener)
     fun removeListener(listener: IdentityServiceListener)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index 948e387cb1..f5391d6cdb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -20,7 +20,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import dagger.Lazy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.failure.Failure
@@ -33,8 +32,6 @@ import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.IdentityServiceListener
 import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
-import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.api.util.NoOpCancellable
 import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
 import org.matrix.android.sdk.internal.extensions.observeNotNull
@@ -49,8 +46,6 @@ import org.matrix.android.sdk.internal.session.sync.model.accountdata.IdentitySe
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataDataSource
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.launchToCallback
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.internal.util.ensureProtocol
 import kotlinx.coroutines.withContext
@@ -83,8 +78,7 @@ internal class DefaultIdentityService @Inject constructor(
         private val identityApiProvider: IdentityApiProvider,
         private val accountDataDataSource: AccountDataDataSource,
         private val homeServerCapabilitiesService: HomeServerCapabilitiesService,
-        private val sessionParams: SessionParams,
-        private val taskExecutor: TaskExecutor
+        private val sessionParams: SessionParams
 ) : IdentityService, SessionLifecycleObserver {
 
     private val lifecycleOwner: LifecycleOwner = LifecycleOwner { lifecycleRegistry }
@@ -136,101 +130,81 @@ internal class DefaultIdentityService @Inject constructor(
         return identityStore.getIdentityData()?.identityServerUrl
     }
 
-    override fun startBindThreePid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun startBindThreePid(threePid: ThreePid) {
         if (homeServerCapabilitiesService.getHomeServerCapabilities().lastVersionIdentityServerSupported.not()) {
-            callback.onFailure(IdentityServiceError.OutdatedHomeServer)
-            return NoOpCancellable
+            throw IdentityServiceError.OutdatedHomeServer
         }
 
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            identityRequestTokenForBindingTask.execute(IdentityRequestTokenForBindingTask.Params(threePid, false))
-        }
+        identityRequestTokenForBindingTask.execute(IdentityRequestTokenForBindingTask.Params(threePid, false))
     }
 
-    override fun cancelBindThreePid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            identityStore.deletePendingBinding(threePid)
-        }
+    override suspend fun cancelBindThreePid(threePid: ThreePid) {
+        identityStore.deletePendingBinding(threePid)
     }
 
-    override fun sendAgainValidationCode(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            identityRequestTokenForBindingTask.execute(IdentityRequestTokenForBindingTask.Params(threePid, true))
-        }
+    override suspend fun sendAgainValidationCode(threePid: ThreePid) {
+        identityRequestTokenForBindingTask.execute(IdentityRequestTokenForBindingTask.Params(threePid, true))
     }
 
-    override fun finalizeBindThreePid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun finalizeBindThreePid(threePid: ThreePid) {
         if (homeServerCapabilitiesService.getHomeServerCapabilities().lastVersionIdentityServerSupported.not()) {
-            callback.onFailure(IdentityServiceError.OutdatedHomeServer)
-            return NoOpCancellable
+            throw IdentityServiceError.OutdatedHomeServer
         }
 
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            bindThreePidsTask.execute(BindThreePidsTask.Params(threePid))
-        }
+        bindThreePidsTask.execute(BindThreePidsTask.Params(threePid))
     }
 
-    override fun submitValidationToken(threePid: ThreePid, code: String, callback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            submitTokenForBindingTask.execute(IdentitySubmitTokenForBindingTask.Params(threePid, code))
-        }
+    override suspend fun submitValidationToken(threePid: ThreePid, code: String) {
+        submitTokenForBindingTask.execute(IdentitySubmitTokenForBindingTask.Params(threePid, code))
     }
 
-    override fun unbindThreePid(threePid: ThreePid, callback: MatrixCallback<Unit>): Cancelable {
+    override suspend fun unbindThreePid(threePid: ThreePid) {
         if (homeServerCapabilitiesService.getHomeServerCapabilities().lastVersionIdentityServerSupported.not()) {
-            callback.onFailure(IdentityServiceError.OutdatedHomeServer)
-            return NoOpCancellable
+            throw IdentityServiceError.OutdatedHomeServer
         }
 
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            unbindThreePidsTask.execute(UnbindThreePidsTask.Params(threePid))
-        }
+        unbindThreePidsTask.execute(UnbindThreePidsTask.Params(threePid))
     }
 
-    override fun isValidIdentityServer(url: String, callback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            val api = retrofitFactory.create(unauthenticatedOkHttpClient, url).create(IdentityAuthAPI::class.java)
+    override suspend fun isValidIdentityServer(url: String) {
+        val api = retrofitFactory.create(unauthenticatedOkHttpClient, url).create(IdentityAuthAPI::class.java)
 
-            identityPingTask.execute(IdentityPingTask.Params(api))
-        }
+        identityPingTask.execute(IdentityPingTask.Params(api))
     }
 
-    override fun disconnect(callback: MatrixCallback<Unit>): Cancelable {
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            identityDisconnectTask.execute(Unit)
+    override suspend fun disconnect() {
+        identityDisconnectTask.execute(Unit)
 
-            identityStore.setUrl(null)
-            updateIdentityAPI(null)
-            updateAccountData(null)
-        }
+        identityStore.setUrl(null)
+        updateIdentityAPI(null)
+        updateAccountData(null)
     }
 
-    override fun setNewIdentityServer(url: String, callback: MatrixCallback<String>): Cancelable {
+    override suspend fun setNewIdentityServer(url: String): String {
         val urlCandidate = url.ensureProtocol()
 
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            val current = getCurrentIdentityServerUrl()
-            if (urlCandidate == current) {
-                // Nothing to do
-                Timber.d("Same URL, nothing to do")
-            } else {
-                // Disconnect previous one if any, first, because the token will change.
-                // In case of error when configuring the new identity server, this is not a big deal,
-                // we will ask for a new token on the previous Identity server
-                runCatching { identityDisconnectTask.execute(Unit) }
-                        .onFailure { Timber.w(it, "Unable to disconnect identity server") }
+        val current = getCurrentIdentityServerUrl()
+        if (urlCandidate == current) {
+            // Nothing to do
+            Timber.d("Same URL, nothing to do")
+        } else {
+            // Disconnect previous one if any, first, because the token will change.
+            // In case of error when configuring the new identity server, this is not a big deal,
+            // we will ask for a new token on the previous Identity server
+            runCatching { identityDisconnectTask.execute(Unit) }
+                    .onFailure { Timber.w(it, "Unable to disconnect identity server") }
 
-                // Try to get a token
-                val token = getNewIdentityServerToken(urlCandidate)
+            // Try to get a token
+            val token = getNewIdentityServerToken(urlCandidate)
 
-                identityStore.setUrl(urlCandidate)
-                identityStore.setToken(token)
-                updateIdentityAPI(urlCandidate)
+            identityStore.setUrl(urlCandidate)
+            identityStore.setToken(token)
+            updateIdentityAPI(urlCandidate)
 
-                updateAccountData(urlCandidate)
-            }
-            urlCandidate
+            updateAccountData(urlCandidate)
         }
+
+        return urlCandidate
     }
 
     private suspend fun updateAccountData(url: String?) {
@@ -252,45 +226,38 @@ internal class DefaultIdentityService @Inject constructor(
         identityStore.setUserConsent(newValue)
     }
 
-    override fun lookUp(threePids: List<ThreePid>, callback: MatrixCallback<List<FoundThreePid>>): Cancelable {
+    override suspend fun lookUp(threePids: List<ThreePid>): List<FoundThreePid> {
         if (!getUserConsent()) {
-            callback.onFailure(IdentityServiceError.UserConsentNotProvided)
-            return NoOpCancellable
+            throw IdentityServiceError.UserConsentNotProvided
         }
 
         if (threePids.isEmpty()) {
-            callback.onSuccess(emptyList())
-            return NoOpCancellable
+            return emptyList()
         }
 
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            lookUpInternal(true, threePids)
-        }
+        return lookUpInternal(true, threePids)
     }
 
-    override fun getShareStatus(threePids: List<ThreePid>, callback: MatrixCallback<Map<ThreePid, SharedState>>): Cancelable {
+    override suspend fun getShareStatus(threePids: List<ThreePid>): Map<ThreePid, SharedState> {
         // Note: we do not require user consent here, because it is used for emails and phone numbers that the user has already sent
         // to the home server, and not emails and phone numbers from the contact book of the user
 
         if (threePids.isEmpty()) {
-            callback.onSuccess(emptyMap())
-            return NoOpCancellable
+            return emptyMap()
         }
 
-        return taskExecutor.executorScope.launchToCallback(coroutineDispatchers.main, callback) {
-            val lookupResult = lookUpInternal(true, threePids)
+        val lookupResult = lookUpInternal(true, threePids)
 
-            threePids.associateWith { threePid ->
-                // If not in lookup result, check if there is a pending binding
-                if (lookupResult.firstOrNull { it.threePid == threePid } == null) {
-                    if (identityStore.getPendingBinding(threePid) == null) {
-                        SharedState.NOT_SHARED
-                    } else {
-                        SharedState.BINDING_IN_PROGRESS
-                    }
+        return threePids.associateWith { threePid ->
+            // If not in lookup result, check if there is a pending binding
+            if (lookupResult.firstOrNull { it.threePid == threePid } == null) {
+                if (identityStore.getPendingBinding(threePid) == null) {
+                    SharedState.NOT_SHARED
                 } else {
-                    SharedState.SHARED
+                    SharedState.BINDING_IN_PROGRESS
                 }
+            } else {
+                SharedState.SHARED
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
index 05af63d7ba..cfbdef8ffb 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
@@ -33,9 +33,7 @@ import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.identity.FoundThreePid
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import timber.log.Timber
@@ -101,56 +99,56 @@ class ContactsBookViewModel @AssistedInject constructor(@Assisted
         }
     }
 
-    private fun performLookup(data: List<MappedContact>) {
+    private fun performLookup(contacts: List<MappedContact>) {
         if (!session.identityService().getUserConsent()) {
             return
         }
         viewModelScope.launch {
-            val threePids = data.flatMap { contact ->
+            val threePids = contacts.flatMap { contact ->
                 contact.emails.map { ThreePid.Email(it.email) } +
                         contact.msisdns.map { ThreePid.Msisdn(it.phoneNumber) }
             }
-            session.identityService().lookUp(threePids, object : MatrixCallback<List<FoundThreePid>> {
-                override fun onFailure(failure: Throwable) {
-                    Timber.w(failure, "Unable to perform the lookup")
 
-                    // Should not happen, but just to be sure
-                    if (failure is IdentityServiceError.UserConsentNotProvided) {
-                        setState {
-                            copy(userConsent = false)
-                        }
-                    }
-                }
-
-                override fun onSuccess(data: List<FoundThreePid>) {
-                    mappedContacts = allContacts.map { contactModel ->
-                        contactModel.copy(
-                                emails = contactModel.emails.map { email ->
-                                    email.copy(
-                                            matrixId = data
-                                                    .firstOrNull { foundThreePid -> foundThreePid.threePid.value == email.email }
-                                                    ?.matrixId
-                                    )
-                                },
-                                msisdns = contactModel.msisdns.map { msisdn ->
-                                    msisdn.copy(
-                                            matrixId = data
-                                                    .firstOrNull { foundThreePid -> foundThreePid.threePid.value == msisdn.phoneNumber }
-                                                    ?.matrixId
-                                    )
-                                }
-                        )
-                    }
+            val data = try {
+                session.identityService().lookUp(threePids)
+            } catch (failure: Throwable) {
+                Timber.w(failure, "Unable to perform the lookup")
 
+                // Should not happen, but just to be sure
+                if (failure is IdentityServiceError.UserConsentNotProvided) {
                     setState {
-                        copy(
-                                isBoundRetrieved = true
-                        )
+                        copy(userConsent = false)
                     }
-
-                    updateFilteredMappedContacts()
                 }
-            })
+                return@launch
+            }
+
+            mappedContacts = allContacts.map { contactModel ->
+                contactModel.copy(
+                        emails = contactModel.emails.map { email ->
+                            email.copy(
+                                    matrixId = data
+                                            .firstOrNull { foundThreePid -> foundThreePid.threePid.value == email.email }
+                                            ?.matrixId
+                            )
+                        },
+                        msisdns = contactModel.msisdns.map { msisdn ->
+                            msisdn.copy(
+                                    matrixId = data
+                                            .firstOrNull { foundThreePid -> foundThreePid.threePid.value == msisdn.phoneNumber }
+                                            ?.matrixId
+                            )
+                        }
+                )
+            }
+
+            setState {
+                copy(
+                        isBoundRetrieved = true
+                )
+            }
+
+            updateFilteredMappedContacts()
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
index bf2defafa1..11fd796534 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
@@ -35,7 +35,6 @@ import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.IdentityServiceListener
 import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 
 class DiscoverySettingsViewModel @AssistedInject constructor(
@@ -123,7 +122,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> { session.identityService().disconnect(it) }
+                session.identityService().disconnect()
                 setState {
                     copy(
                             identityServer = Success(null),
@@ -141,9 +140,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                val data = awaitCallback<String?> {
-                    session.identityService().setNewIdentityServer(action.url, it)
-                }
+                val data = session.identityService().setNewIdentityServer(action.url)
                 setState {
                     copy(
                             identityServer = Success(data),
@@ -163,7 +160,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> { identityService.startBindThreePid(action.threePid, it) }
+                identityService.startBindThreePid(action.threePid)
                 changeThreePidState(action.threePid, Success(SharedState.BINDING_IN_PROGRESS))
             } catch (failure: Throwable) {
                 _viewEvents.post(DiscoverySettingsViewEvents.Failure(failure))
@@ -240,7 +237,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> { identityService.unbindThreePid(threePid, it) }
+                identityService.unbindThreePid(threePid)
                 changeThreePidState(threePid, Success(SharedState.NOT_SHARED))
             } catch (failure: Throwable) {
                 _viewEvents.post(DiscoverySettingsViewEvents.Failure(failure))
@@ -256,7 +253,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> { identityService.unbindThreePid(threePid, it) }
+                identityService.unbindThreePid(threePid)
                 changeThreePidState(threePid, Success(SharedState.NOT_SHARED))
             } catch (failure: Throwable) {
                 _viewEvents.post(DiscoverySettingsViewEvents.Failure(failure))
@@ -268,7 +265,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
     private fun cancelBinding(action: DiscoverySettingsAction.CancelBinding) {
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> { identityService.cancelBindThreePid(action.threePid, it) }
+                identityService.cancelBindThreePid(action.threePid)
                 changeThreePidState(action.threePid, Success(SharedState.NOT_SHARED))
                 changeThreePidSubmitState(action.threePid, Uninitialized)
             } catch (failure: Throwable) {
@@ -304,9 +301,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                val data = awaitCallback<Map<ThreePid, SharedState>> {
-                    identityService.getShareStatus(threePids, it)
-                }
+                val data = identityService.getShareStatus(threePids)
                 setState {
                     copy(
                             emailList = Success(data.filter { it.key is ThreePid.Email }.toPidInfoList()),
@@ -346,9 +341,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> {
-                    identityService.submitValidationToken(action.threePid, action.code, it)
-                }
+                identityService.submitValidationToken(action.threePid, action.code)
                 changeThreePidSubmitState(action.threePid, Uninitialized)
                 finalizeBind3pid(DiscoverySettingsAction.FinalizeBind3pid(action.threePid), true)
             } catch (failure: Throwable) {
@@ -371,7 +364,7 @@ class DiscoverySettingsViewModel @AssistedInject constructor(
 
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> { identityService.finalizeBindThreePid(threePid, it) }
+                identityService.finalizeBindThreePid(threePid)
                 changeThreePidSubmitState(action.threePid, Uninitialized)
                 changeThreePidState(action.threePid, Success(SharedState.SHARED))
             } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
index 9455b1bff4..08632a2bd1 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
@@ -33,7 +33,6 @@ import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.terms.TermsService
-import org.matrix.android.sdk.internal.util.awaitCallback
 import java.net.UnknownHostException
 
 class SetIdentityServerViewModel @AssistedInject constructor(
@@ -97,9 +96,7 @@ class SetIdentityServerViewModel @AssistedInject constructor(
         viewModelScope.launch {
             try {
                 // First ping the identity server v2 API
-                awaitCallback<Unit> {
-                    mxSession.identityService().isValidIdentityServer(baseUrl, it)
-                }
+                mxSession.identityService().isValidIdentityServer(baseUrl)
                 // Ok, next step
                 checkTerms(baseUrl)
             } catch (failure: Throwable) {

From 7986f17c8cc6e21de8cf6d9380c65f37b6daf760 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Tue, 30 Mar 2021 08:56:54 +0100
Subject: [PATCH 447/578] Formatting

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../home/room/detail/RoomDetailViewModel.kt   | 114 +++++++++---------
 .../app/features/widgets/WidgetViewModel.kt   |  12 +-
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index adae933e58..017fb8163d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -260,68 +260,68 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     override fun handle(action: RoomDetailAction) {
         when (action) {
-            is RoomDetailAction.UserIsTyping -> handleUserIsTyping(action)
-            is RoomDetailAction.ComposerFocusChange -> handleComposerFocusChange(action)
-            is RoomDetailAction.SaveDraft -> handleSaveDraft(action)
-            is RoomDetailAction.SendMessage -> handleSendMessage(action)
-            is RoomDetailAction.SendMedia -> handleSendMedia(action)
-            is RoomDetailAction.SendSticker -> handleSendSticker(action)
-            is RoomDetailAction.TimelineEventTurnsVisible -> handleEventVisible(action)
-            is RoomDetailAction.TimelineEventTurnsInvisible -> handleEventInvisible(action)
-            is RoomDetailAction.LoadMoreTimelineEvents -> handleLoadMore(action)
-            is RoomDetailAction.SendReaction -> handleSendReaction(action)
-            is RoomDetailAction.AcceptInvite -> handleAcceptInvite()
-            is RoomDetailAction.RejectInvite -> handleRejectInvite()
-            is RoomDetailAction.RedactAction -> handleRedactEvent(action)
-            is RoomDetailAction.UndoReaction -> handleUndoReact(action)
-            is RoomDetailAction.UpdateQuickReactAction -> handleUpdateQuickReaction(action)
-            is RoomDetailAction.EnterRegularMode -> handleEnterRegularMode(action)
-            is RoomDetailAction.EnterEditMode -> handleEditAction(action)
-            is RoomDetailAction.EnterQuoteMode -> handleQuoteAction(action)
-            is RoomDetailAction.EnterReplyMode -> handleReplyAction(action)
-            is RoomDetailAction.DownloadOrOpen -> handleOpenOrDownloadFile(action)
-            is RoomDetailAction.NavigateToEvent -> handleNavigateToEvent(action)
-            is RoomDetailAction.HandleTombstoneEvent -> handleTombstoneEvent(action)
-            is RoomDetailAction.ResendMessage -> handleResendEvent(action)
-            is RoomDetailAction.RemoveFailedEcho -> handleRemove(action)
-            is RoomDetailAction.ResendAll -> handleResendAll()
-            is RoomDetailAction.MarkAllAsRead -> handleMarkAllAsRead()
-            is RoomDetailAction.ReportContent -> handleReportContent(action)
-            is RoomDetailAction.IgnoreUser -> handleIgnoreUser(action)
+            is RoomDetailAction.UserIsTyping                     -> handleUserIsTyping(action)
+            is RoomDetailAction.ComposerFocusChange              -> handleComposerFocusChange(action)
+            is RoomDetailAction.SaveDraft                        -> handleSaveDraft(action)
+            is RoomDetailAction.SendMessage                      -> handleSendMessage(action)
+            is RoomDetailAction.SendMedia                        -> handleSendMedia(action)
+            is RoomDetailAction.SendSticker                      -> handleSendSticker(action)
+            is RoomDetailAction.TimelineEventTurnsVisible        -> handleEventVisible(action)
+            is RoomDetailAction.TimelineEventTurnsInvisible      -> handleEventInvisible(action)
+            is RoomDetailAction.LoadMoreTimelineEvents           -> handleLoadMore(action)
+            is RoomDetailAction.SendReaction                     -> handleSendReaction(action)
+            is RoomDetailAction.AcceptInvite                     -> handleAcceptInvite()
+            is RoomDetailAction.RejectInvite                     -> handleRejectInvite()
+            is RoomDetailAction.RedactAction                     -> handleRedactEvent(action)
+            is RoomDetailAction.UndoReaction                     -> handleUndoReact(action)
+            is RoomDetailAction.UpdateQuickReactAction           -> handleUpdateQuickReaction(action)
+            is RoomDetailAction.EnterRegularMode                 -> handleEnterRegularMode(action)
+            is RoomDetailAction.EnterEditMode                    -> handleEditAction(action)
+            is RoomDetailAction.EnterQuoteMode                   -> handleQuoteAction(action)
+            is RoomDetailAction.EnterReplyMode                   -> handleReplyAction(action)
+            is RoomDetailAction.DownloadOrOpen                   -> handleOpenOrDownloadFile(action)
+            is RoomDetailAction.NavigateToEvent                  -> handleNavigateToEvent(action)
+            is RoomDetailAction.HandleTombstoneEvent             -> handleTombstoneEvent(action)
+            is RoomDetailAction.ResendMessage                    -> handleResendEvent(action)
+            is RoomDetailAction.RemoveFailedEcho                 -> handleRemove(action)
+            is RoomDetailAction.ResendAll                        -> handleResendAll()
+            is RoomDetailAction.MarkAllAsRead                    -> handleMarkAllAsRead()
+            is RoomDetailAction.ReportContent                    -> handleReportContent(action)
+            is RoomDetailAction.IgnoreUser                       -> handleIgnoreUser(action)
             is RoomDetailAction.EnterTrackingUnreadMessagesState -> startTrackingUnreadMessages()
-            is RoomDetailAction.ExitTrackingUnreadMessagesState -> stopTrackingUnreadMessages()
-            is RoomDetailAction.ReplyToOptions -> handleReplyToOptions(action)
-            is RoomDetailAction.AcceptVerificationRequest -> handleAcceptVerification(action)
-            is RoomDetailAction.DeclineVerificationRequest -> handleDeclineVerification(action)
-            is RoomDetailAction.RequestVerification -> handleRequestVerification(action)
-            is RoomDetailAction.ResumeVerification -> handleResumeRequestVerification(action)
-            is RoomDetailAction.ReRequestKeys -> handleReRequestKeys(action)
-            is RoomDetailAction.TapOnFailedToDecrypt -> handleTapOnFailedToDecrypt(action)
-            is RoomDetailAction.SelectStickerAttachment -> handleSelectStickerAttachment()
-            is RoomDetailAction.OpenIntegrationManager -> handleOpenIntegrationManager()
-            is RoomDetailAction.StartCallWithPhoneNumber -> handleStartCallWithPhoneNumber(action)
-            is RoomDetailAction.StartCall -> handleStartCall(action)
-            is RoomDetailAction.AcceptCall -> handleAcceptCall(action)
-            is RoomDetailAction.EndCall -> handleEndCall()
-            is RoomDetailAction.ManageIntegrations -> handleManageIntegrations()
-            is RoomDetailAction.AddJitsiWidget -> handleAddJitsiConference(action)
-            is RoomDetailAction.RemoveWidget -> handleDeleteWidget(action.widgetId)
-            is RoomDetailAction.EnsureNativeWidgetAllowed -> handleCheckWidgetAllowed(action)
-            is RoomDetailAction.CancelSend -> handleCancel(action)
-            is RoomDetailAction.OpenOrCreateDm -> handleOpenOrCreateDm(action)
-            is RoomDetailAction.JumpToReadReceipt -> handleJumpToReadReceipt(action)
-            RoomDetailAction.QuickActionInvitePeople -> handleInvitePeople()
-            RoomDetailAction.QuickActionSetAvatar -> handleQuickSetAvatar()
-            is RoomDetailAction.SetAvatarAction -> handleSetNewAvatar(action)
-            RoomDetailAction.QuickActionSetTopic -> _viewEvents.post(RoomDetailViewEvents.OpenRoomSettings)
-            is RoomDetailAction.ShowRoomAvatarFullScreen -> {
+            is RoomDetailAction.ExitTrackingUnreadMessagesState  -> stopTrackingUnreadMessages()
+            is RoomDetailAction.ReplyToOptions                   -> handleReplyToOptions(action)
+            is RoomDetailAction.AcceptVerificationRequest        -> handleAcceptVerification(action)
+            is RoomDetailAction.DeclineVerificationRequest       -> handleDeclineVerification(action)
+            is RoomDetailAction.RequestVerification              -> handleRequestVerification(action)
+            is RoomDetailAction.ResumeVerification               -> handleResumeRequestVerification(action)
+            is RoomDetailAction.ReRequestKeys                    -> handleReRequestKeys(action)
+            is RoomDetailAction.TapOnFailedToDecrypt             -> handleTapOnFailedToDecrypt(action)
+            is RoomDetailAction.SelectStickerAttachment          -> handleSelectStickerAttachment()
+            is RoomDetailAction.OpenIntegrationManager           -> handleOpenIntegrationManager()
+            is RoomDetailAction.StartCallWithPhoneNumber         -> handleStartCallWithPhoneNumber(action)
+            is RoomDetailAction.StartCall                        -> handleStartCall(action)
+            is RoomDetailAction.AcceptCall                       -> handleAcceptCall(action)
+            is RoomDetailAction.EndCall                          -> handleEndCall()
+            is RoomDetailAction.ManageIntegrations               -> handleManageIntegrations()
+            is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
+            is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
+            is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
+            is RoomDetailAction.CancelSend                       -> handleCancel(action)
+            is RoomDetailAction.OpenOrCreateDm                   -> handleOpenOrCreateDm(action)
+            is RoomDetailAction.JumpToReadReceipt                -> handleJumpToReadReceipt(action)
+            RoomDetailAction.QuickActionInvitePeople             -> handleInvitePeople()
+            RoomDetailAction.QuickActionSetAvatar                -> handleQuickSetAvatar()
+            is RoomDetailAction.SetAvatarAction                  -> handleSetNewAvatar(action)
+            RoomDetailAction.QuickActionSetTopic                 -> _viewEvents.post(RoomDetailViewEvents.OpenRoomSettings)
+            is RoomDetailAction.ShowRoomAvatarFullScreen         -> {
                 _viewEvents.post(
                         RoomDetailViewEvents.ShowRoomAvatarFullScreen(action.matrixItem, action.transitionView)
                 )
             }
-            is RoomDetailAction.DoNotShowPreviewUrlFor -> handleDoNotShowPreviewUrlFor(action)
-            RoomDetailAction.RemoveAllFailedMessages -> handleRemoveAllFailedMessages()
-            RoomDetailAction.ResendAll -> handleResendAll()
+            is RoomDetailAction.DoNotShowPreviewUrlFor           -> handleDoNotShowPreviewUrlFor(action)
+            RoomDetailAction.RemoveAllFailedMessages             -> handleRemoveAllFailedMessages()
+            RoomDetailAction.ResendAll                           -> handleResendAll()
         }.exhaustive
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
index 0388b7b495..b6548a6542 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
@@ -146,13 +146,13 @@ class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: Wi
 
     override fun handle(action: WidgetAction) {
         when (action) {
-            is WidgetAction.OnWebViewLoadingError -> handleWebViewLoadingError(action)
+            is WidgetAction.OnWebViewLoadingError   -> handleWebViewLoadingError(action)
             is WidgetAction.OnWebViewLoadingSuccess -> handleWebViewLoadingSuccess(action)
-            is WidgetAction.OnWebViewStartedToLoad -> handleWebViewStartLoading()
-            WidgetAction.LoadFormattedUrl -> loadFormattedUrl(forceFetchToken = false)
-            WidgetAction.DeleteWidget -> handleDeleteWidget()
-            WidgetAction.RevokeWidget -> handleRevokeWidget()
-            WidgetAction.OnTermsReviewed -> loadFormattedUrl(forceFetchToken = false)
+            is WidgetAction.OnWebViewStartedToLoad  -> handleWebViewStartLoading()
+            WidgetAction.LoadFormattedUrl           -> loadFormattedUrl(forceFetchToken = false)
+            WidgetAction.DeleteWidget               -> handleDeleteWidget()
+            WidgetAction.RevokeWidget               -> handleRevokeWidget()
+            WidgetAction.OnTermsReviewed            -> loadFormattedUrl(forceFetchToken = false)
         }
     }
 

From 7817b3b0b867dd6496d9e75246093664e74d6bf9 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Tue, 30 Mar 2021 09:00:39 +0100
Subject: [PATCH 448/578] Formatting

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../features/home/room/detail/RoomDetailViewModel.kt   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 017fb8163d..c52a41baf4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -659,13 +659,13 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
         when (itemId) {
             R.id.timeline_setting -> true
-            R.id.invite -> state.canInvite
+            R.id.invite           -> state.canInvite
             R.id.open_matrix_apps -> true
             R.id.voice_call,
-            R.id.video_call -> callManager.getCallsByRoomId(state.roomId).isEmpty()
-            R.id.hangup_call -> callManager.getCallsByRoomId(state.roomId).isNotEmpty()
-            R.id.search -> true
-            R.id.dev_tools -> vectorPreferences.developerMode()
+            R.id.video_call       -> callManager.getCallsByRoomId(state.roomId).isEmpty()
+            R.id.hangup_call      -> callManager.getCallsByRoomId(state.roomId).isNotEmpty()
+            R.id.search           -> true
+            R.id.dev_tools        -> vectorPreferences.developerMode()
             else                  -> false
         }
     }

From 2b933671659ba85323c7ef56e203f41779ffd664 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 29 Mar 2021 21:05:25 +0200
Subject: [PATCH 449/578] Timeline: handle filtering in epoxy

---
 .../app/core/epoxy/TimelineEmptyItem.kt       |   9 ++
 .../JumpToBottomViewVisibilityManager.kt      |   2 +-
 .../room/detail/ScrollOnNewMessageCallback.kt |  21 +--
 .../timeline/TimelineEventController.kt       | 135 ++++++++++++------
 .../timeline/factory/DefaultItemFactory.kt    |   3 +-
 .../factory/MergedHeaderItemFactory.kt        |  11 +-
 .../factory/ReadReceiptsItemFactory.kt        |  55 +++++++
 .../timeline/factory/TimelineItemFactory.kt   |  50 +++----
 .../helper/MessageInformationDataFactory.kt   |   9 --
 .../TimelineControllerInterceptorHelper.kt    |  37 ++++-
 .../helper/TimelineDisplayableEvents.kt       |  42 +-----
 .../helper/TimelineEventVisibilityHelper.kt   | 131 +++++++++++++++++
 .../timeline/item/AbsBaseMessageItem.kt       |  11 --
 .../detail/timeline/item/BaseEventItem.kt     |   1 -
 .../detail/timeline/item/BasedMergedItem.kt   |   3 -
 .../room/detail/timeline/item/DefaultItem.kt  |   7 -
 .../item/MergedMembershipEventsItem.kt        |   3 -
 .../timeline/item/MergedRoomCreationItem.kt   |   3 -
 .../timeline/item/MessageInformationData.kt   |   2 -
 .../room/detail/timeline/item/NoticeItem.kt   |   6 -
 .../detail/timeline/item/ReadReceiptsItem.kt  |  51 +++++++
 .../main/res/layout/item_timeline_empty.xml   |   2 +-
 .../res/layout/item_timeline_event_base.xml   |   9 --
 .../item_timeline_event_base_noinfo.xml       |  12 +-
 .../layout/item_timeline_event_base_state.xml |   8 --
 .../item_timeline_event_read_receipts.xml     |  14 ++
 26 files changed, 431 insertions(+), 206 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
 create mode 100644 vector/src/main/res/layout/item_timeline_event_read_receipts.xml

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/TimelineEmptyItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/TimelineEmptyItem.kt
index b77670ba76..9c49a5d458 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/TimelineEmptyItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/TimelineEmptyItem.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.core.epoxy
 
+import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -25,6 +26,14 @@ import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
 abstract class TimelineEmptyItem : VectorEpoxyModel<TimelineEmptyItem.Holder>(), ItemWithEvents {
 
     @EpoxyAttribute lateinit var eventId: String
+    @EpoxyAttribute var visible: Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.view.updateLayoutParams {
+            this.height = if (visible) 1 else 0
+        }
+    }
 
     override fun getEventIds(): List<String> {
         return listOf(eventId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
index 2810b27aa6..7c0dcbb0d2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt
@@ -66,7 +66,7 @@ class JumpToBottomViewVisibilityManager(
     }
 
     private fun maybeShowJumpToBottomViewVisibility() {
-        if (layoutManager.findFirstVisibleItemPosition() != 0) {
+        if (layoutManager.findFirstVisibleItemPosition() > 1) {
             jumpToBottomView.show()
         } else {
             jumpToBottomView.hide()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
index fbf9ebe32f..249618e12f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt
@@ -20,7 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import im.vector.app.core.platform.DefaultListUpdateCallback
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
-import timber.log.Timber
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import java.util.concurrent.CopyOnWriteArrayList
 
 class ScrollOnNewMessageCallback(private val layoutManager: LinearLayoutManager,
@@ -38,24 +38,27 @@ class ScrollOnNewMessageCallback(private val layoutManager: LinearLayoutManager,
     }
 
     override fun onInserted(position: Int, count: Int) {
+        if (position != 0) {
+            return
+        }
         if (forceScroll) {
             forceScroll = false
-            layoutManager.scrollToPosition(position)
+            layoutManager.scrollToPosition(0)
             return
         }
-        Timber.v("On inserted $count count at position: $position")
-        if (layoutManager.findFirstVisibleItemPosition() != position) {
+        if (layoutManager.findFirstVisibleItemPosition() > 1) {
             return
         }
-        val firstNewItem = timelineEventController.adapter.getModelAtPosition(position) as? ItemWithEvents ?: return
+        val firstNewItem = tryOrNull {
+            timelineEventController.adapter.getModelAtPosition(position)
+        } as? ItemWithEvents ?: return
         val firstNewItemIds = firstNewItem.getEventIds().firstOrNull() ?: return
         val indexOfFirstNewItem = newTimelineEventIds.indexOf(firstNewItemIds)
         if (indexOfFirstNewItem != -1) {
-            Timber.v("Should scroll to position: $position")
-            repeat(newTimelineEventIds.size - indexOfFirstNewItem) {
-                newTimelineEventIds.removeAt(indexOfFirstNewItem)
+            while (newTimelineEventIds.lastOrNull() != firstNewItemIds) {
+                newTimelineEventIds.removeLastOrNull()
             }
-            layoutManager.scrollToPosition(position)
+            layoutManager.scrollToPosition(0)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 44f1e9b759..972736fb2a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -31,16 +31,21 @@ import im.vector.app.core.epoxy.LoadingItem_
 import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.extensions.nextOrNull
 import im.vector.app.core.extensions.prevOrNull
+import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.call.webrtc.WebRtcCallManager
+import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.RoomDetailViewState
 import im.vector.app.features.home.room.detail.UnreadState
 import im.vector.app.features.home.room.detail.timeline.factory.MergedHeaderItemFactory
+import im.vector.app.features.home.room.detail.timeline.factory.ReadReceiptsItemFactory
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactory
 import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineControllerInterceptorHelper
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
@@ -49,6 +54,8 @@ import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem
 import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem_
 import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
 import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.media.ImageContentRenderer
@@ -58,6 +65,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
@@ -65,8 +73,6 @@ import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
-private const val DEFAULT_PREFETCH_THRESHOLD = 30
-
 class TimelineEventController @Inject constructor(private val dateFormatter: VectorDateFormatter,
                                                   private val vectorPreferences: VectorPreferences,
                                                   private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
@@ -77,7 +83,10 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                                                   private val session: Session,
                                                   private val callManager: WebRtcCallManager,
                                                   @TimelineEventControllerHandler
-                                                  private val backgroundHandler: Handler
+                                                  private val backgroundHandler: Handler,
+                                                  private val userPreferencesProvider: UserPreferencesProvider,
+                                                  private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper,
+                                                  private val readReceiptsItemFactory: ReadReceiptsItemFactory
 ) : EpoxyController(backgroundHandler, backgroundHandler), Timeline.Listener, EpoxyController.Interceptor {
 
     interface Callback :
@@ -147,7 +156,6 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     private var unreadState: UnreadState = UnreadState.Unknown
     private var positionOfReadMarker: Int? = null
     private var eventIdToHighlight: String? = null
-    private var previousModelsSize = 0
 
     var callback: Callback? = null
     var timeline: Timeline? = null
@@ -198,7 +206,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     private val interceptorHelper = TimelineControllerInterceptorHelper(
             ::positionOfReadMarker,
             adapterPositionMapping,
-            vectorPreferences,
+            userPreferencesProvider,
             callManager
     )
 
@@ -311,7 +319,9 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                     } else {
                         cacheItemData.eventModel
                     }
-                    listOf(eventModel,
+                    listOf(
+                            cacheItemData?.readReceiptsItem?.takeIf { cacheItemData.mergedHeaderModel == null },
+                            eventModel,
                             cacheItemData?.mergedHeaderModel,
                             cacheItemData?.formattedDayModel?.takeIf { eventModel != null || cacheItemData.mergedHeaderModel != null }
                     )
@@ -323,61 +333,94 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     private fun buildCacheItemsIfNeeded() = synchronized(modelCache) {
         hasUTD = false
         hasReachedInvite = false
-
         if (modelCache.isEmpty()) {
             return
         }
+        val receiptsByEvents = getReadReceiptsByShownEvent()
         (0 until modelCache.size).forEach { position ->
-            // Should be build if not cached or if cached but contains additional models
-            // We then are sure we always have items up to date.
-            if (modelCache[position] == null || modelCache[position]?.shouldTriggerBuild() == true) {
-                modelCache[position] = buildCacheItem(position, currentSnapshot)
+            val event = currentSnapshot[position]
+            val nextEvent = currentSnapshot.nextOrNull(position)
+            val prevEvent = currentSnapshot.prevOrNull(position)
+            // Should be build if not cached or if model should be refreshed
+            if (modelCache[position] == null || modelCache[position]?.shouldTriggerBuild == true) {
+                modelCache[position] = buildCacheItem(event, nextEvent, prevEvent)
             }
+            val itemCachedData = modelCache[position] ?: return@forEach
+            // Then update with additional models if needed
+            modelCache[position] = itemCachedData.enrichWithModels(event, nextEvent, position, receiptsByEvents)
         }
     }
 
-    private fun buildCacheItem(currentPosition: Int, items: List<TimelineEvent>): CacheItemData {
-        val event = items[currentPosition]
-        val nextEvent = items.nextOrNull(currentPosition)
-        val prevEvent = items.prevOrNull(currentPosition)
+    private fun buildCacheItem(event: TimelineEvent,
+                               nextEvent: TimelineEvent?,
+                               prevEvent: TimelineEvent?
+    ): CacheItemData {
         if (hasReachedInvite && hasUTD) {
-            return CacheItemData(event.localId, event.root.eventId, null, null, null)
+            return CacheItemData(event.localId, event.root.eventId)
         }
         updateUTDStates(event, nextEvent)
         val eventModel = timelineItemFactory.create(event, prevEvent, nextEvent, eventIdToHighlight, callback).also {
             it.id(event.localId)
             it.setOnVisibilityStateChanged(TimelineEventVisibilityStateChangedListener(callback, event))
         }
-        val addDaySeparator = if (hasReachedInvite && hasUTD) {
-            true
-        } else {
-            val date = event.root.localDateTime()
-            val nextDate = nextEvent?.root?.localDateTime()
-            date.toLocalDate() != nextDate?.toLocalDate()
-        }
+        val shouldTriggerBuild = eventModel is AbsMessageItem && eventModel.attributes.informationData.sendStateDecoration == SendStateDecoration.SENT
+        return CacheItemData(
+                localId = event.localId,
+                eventId = event.root.eventId,
+                eventModel = eventModel,
+                shouldTriggerBuild = shouldTriggerBuild)
+    }
+
+    private fun CacheItemData.enrichWithModels(event: TimelineEvent,
+                                               nextEvent: TimelineEvent?,
+                                               position: Int,
+                                               receiptsByEvents: Map<String, List<ReadReceipt>>): CacheItemData {
+        val wantsDateSeparator = wantsDateSeparator(event, nextEvent)
         val mergedHeaderModel = mergedHeaderItemFactory.create(event,
                 nextEvent = nextEvent,
-                items = items,
-                addDaySeparator = addDaySeparator,
-                currentPosition = currentPosition,
+                items = this@TimelineEventController.currentSnapshot,
+                addDaySeparator = wantsDateSeparator,
+                currentPosition = position,
                 eventIdToHighlight = eventIdToHighlight,
                 callback = callback
         ) {
             requestModelBuild()
         }
-        val daySeparatorItem = buildDaySeparatorItem(addDaySeparator, event.root.originServerTs)
-        // If we have a SENT decoration, we want to built again as it might have to be changed to NONE if more recent event has also SENT decoration
-        val forceTriggerBuild = eventModel is AbsMessageItem && eventModel.attributes.informationData.sendStateDecoration == SendStateDecoration.SENT
-        return CacheItemData(event.localId, event.root.eventId, eventModel, mergedHeaderModel, daySeparatorItem, forceTriggerBuild)
-    }
-
-    private fun buildDaySeparatorItem(addDaySeparator: Boolean, originServerTs: Long?): DaySeparatorItem? {
-        return if (addDaySeparator) {
-            val formattedDay = dateFormatter.format(originServerTs, DateFormatKind.TIMELINE_DAY_DIVIDER)
-            DaySeparatorItem_().formattedDay(formattedDay).id(formattedDay)
+        val formattedDayModel = if (wantsDateSeparator) {
+            buildDaySeparatorItem(event.root.originServerTs)
         } else {
             null
         }
+        val readReceipts = receiptsByEvents[event.eventId].orEmpty()
+        return copy(
+                readReceiptsItem = readReceiptsItemFactory.create(event.eventId, readReceipts, callback),
+                formattedDayModel = formattedDayModel,
+                mergedHeaderModel = mergedHeaderModel
+        )
+    }
+
+    private fun getReadReceiptsByShownEvent(): Map<String, List<ReadReceipt>> {
+        val receiptsByEvent = HashMap<String, MutableList<ReadReceipt>>()
+        var lastShownEventId: String? = null
+        val itr = currentSnapshot.listIterator(currentSnapshot.size)
+        while (itr.hasPrevious()) {
+            val event = itr.previous()
+            val currentReadReceipts = ArrayList(event.readReceipts)
+            if (timelineEventVisibilityHelper.shouldShowEvent(event, eventIdToHighlight)) {
+                lastShownEventId = event.eventId
+            }
+            if (lastShownEventId == null) {
+                continue
+            }
+            val existingReceipts = receiptsByEvent.getOrPut(lastShownEventId) { ArrayList() }
+            existingReceipts.addAll(currentReadReceipts)
+        }
+        return receiptsByEvent
+    }
+
+    private fun buildDaySeparatorItem(originServerTs: Long?): DaySeparatorItem {
+        val formattedDay = dateFormatter.format(originServerTs, DateFormatKind.TIMELINE_DAY_DIVIDER)
+        return DaySeparatorItem_().formattedDay(formattedDay).id(formattedDay)
     }
 
     private fun LoadingItem_.setVisibilityStateChangedListener(direction: Timeline.Direction): LoadingItem_ {
@@ -409,6 +452,16 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         }
     }
 
+    private fun wantsDateSeparator(event: TimelineEvent, nextEvent: TimelineEvent?): Boolean {
+        return if (hasReachedInvite && hasUTD) {
+            true
+        } else {
+            val date = event.root.localDateTime()
+            val nextDate = nextEvent?.root?.localDateTime()
+            date.toLocalDate() != nextDate?.toLocalDate()
+        }
+    }
+
     /**
      * Return true if added
      */
@@ -429,14 +482,10 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     private data class CacheItemData(
             val localId: Long,
             val eventId: String?,
+            val readReceiptsItem: ReadReceiptsItem? = null,
             val eventModel: EpoxyModel<*>? = null,
             val mergedHeaderModel: BasedMergedItem<*>? = null,
             val formattedDayModel: DaySeparatorItem? = null,
-            val forceTriggerBuild: Boolean = false
-    ) {
-        fun shouldTriggerBuild(): Boolean {
-            // Since those items can change when we paginate, force a re-build
-            return forceTriggerBuild || mergedHeaderModel != null || formattedDayModel != null
-        }
-    }
+            val shouldTriggerBuild: Boolean = false
+    )
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
index 71ac46307b..5f5d3f5156 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
@@ -43,8 +43,7 @@ class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: Ava
                 text = text,
                 itemLongClickListener = { view ->
                     callback?.onEventLongClicked(informationData, null, view) ?: false
-                },
-                readReceiptsCallback = callback
+                }
         )
         return DefaultItem_()
                 .leftGuideline(avatarSizeProvider.leftGuideline)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index 2134645d8d..4e4a7fce02 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -23,9 +23,9 @@ import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MergedTimelineEventVisibilityStateChangedListener
 import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
 import im.vector.app.features.home.room.detail.timeline.helper.canBeMerged
 import im.vector.app.features.home.room.detail.timeline.helper.isRoomConfiguration
-import im.vector.app.features.home.room.detail.timeline.helper.prevSameTypeEvents
 import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem
 import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem
 import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem_
@@ -47,7 +47,8 @@ import javax.inject.Inject
 class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
                                                   private val avatarRenderer: AvatarRenderer,
                                                   private val avatarSizeProvider: AvatarSizeProvider,
-                                                  private val roomSummariesHolder: RoomSummariesHolder) {
+                                                  private val roomSummariesHolder: RoomSummariesHolder,
+private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
 
     private val collapsedEventIds = linkedSetOf<Long>()
     private val mergeItemCollapseStates = HashMap<Long, Boolean>()
@@ -85,7 +86,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                                                    eventIdToHighlight: String?,
                                                    requestModelBuild: () -> Unit,
                                                    callback: TimelineEventController.Callback?): MergedMembershipEventsItem_? {
-        val prevSameTypeEvents = items.prevSameTypeEvents(currentPosition, 2)
+        val prevSameTypeEvents = timelineEventVisibilityHelper.prevSameTypeEvents(items, currentPosition, 2)
         return if (prevSameTypeEvents.isEmpty()) {
             null
         } else {
@@ -126,8 +127,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                     onCollapsedStateChanged = {
                         mergeItemCollapseStates[event.localId] = it
                         requestModelBuild()
-                    },
-                    readReceiptsCallback = callback
+                    }
             )
             MergedMembershipEventsItem_()
                     .id(mergeId)
@@ -205,7 +205,6 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                     },
                     hasEncryptionEvent = hasEncryption,
                     isEncryptionAlgorithmSecure = encryptionAlgorithm == MXCRYPTO_ALGORITHM_MEGOLM,
-                    readReceiptsCallback = callback,
                     callback = callback,
                     currentUserId = currentUserId,
                     roomSummary = roomSummariesHolder.get(event.roomId),
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
new file mode 100644
index 0000000000..a3e8541b05
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.factory
+
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem
+import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem_
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.ReadReceipt
+import javax.inject.Inject
+
+class ReadReceiptsItemFactory @Inject constructor(private val session: Session,
+                                                  private val avatarRenderer: AvatarRenderer) {
+
+    fun create(eventId: String, readReceipts: List<ReadReceipt>, callback: TimelineEventController.Callback?): ReadReceiptsItem? {
+        val readReceiptsData = readReceipts
+                .asSequence()
+                .filter {
+                    it.user.userId != session.myUserId
+                }
+                .map {
+                    ReadReceiptData(it.user.userId, it.user.avatarUrl, it.user.displayName, it.originServerTs)
+                }
+                .toList()
+
+        if (readReceiptsData.isEmpty()) {
+            return null
+        }
+        return ReadReceiptsItem_()
+                .id("read_receipts_$eventId")
+                .eventId(eventId)
+                .readReceipts(readReceiptsData)
+                .avatarRenderer(avatarRenderer)
+                .clickListener(DebouncedClickListener({ _ ->
+                    callback?.onReadReceiptsClicked(readReceiptsData)
+                }))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 73f101d1f5..df4eab0efe 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -21,6 +21,7 @@ import im.vector.app.core.epoxy.TimelineEmptyItem_
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import timber.log.Timber
@@ -35,7 +36,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                                               private val widgetItemFactory: WidgetItemFactory,
                                               private val verificationConclusionItemFactory: VerificationItemFactory,
                                               private val callItemFactory: CallItemFactory,
-                                              private val userPreferencesProvider: UserPreferencesProvider) {
+                                              private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
 
     /**
      * Reminder: nextEvent is older and prevEvent is newer.
@@ -46,12 +47,14 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                eventIdToHighlight: String?,
                callback: TimelineEventController.Callback?): VectorEpoxyModel<*> {
         val highlight = event.root.eventId == eventIdToHighlight
-
         val computedModel = try {
+            if (!timelineEventVisibilityHelper.shouldShowEvent(event, eventIdToHighlight)) {
+                return buildEmptyItem(event, prevEvent, eventIdToHighlight)
+            }
             when (event.root.getClearType()) {
+                // Message items
                 EventType.STICKER,
                 EventType.MESSAGE               -> messageItemFactory.create(event, prevEvent, nextEvent, highlight, callback)
-                // State and call
                 EventType.STATE_ROOM_TOMBSTONE,
                 EventType.STATE_ROOM_NAME,
                 EventType.STATE_ROOM_TOPIC,
@@ -63,8 +66,19 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.STATE_ROOM_HISTORY_VISIBILITY,
                 EventType.STATE_ROOM_SERVER_ACL,
                 EventType.STATE_ROOM_GUEST_ACCESS,
-                EventType.STATE_ROOM_POWER_LEVELS,
-                EventType.REDACTION             -> noticeItemFactory.create(event, highlight, callback)
+                EventType.REDACTION            ,
+                EventType.STATE_ROOM_ALIASES,
+                EventType.KEY_VERIFICATION_ACCEPT,
+                EventType.KEY_VERIFICATION_START,
+                EventType.KEY_VERIFICATION_KEY,
+                EventType.KEY_VERIFICATION_READY,
+                EventType.KEY_VERIFICATION_MAC,
+                EventType.CALL_CANDIDATES,
+                EventType.CALL_REPLACES,
+                EventType.CALL_SELECT_ANSWER,
+                EventType.CALL_NEGOTIATE,
+                EventType.REACTION,
+                EventType.STATE_ROOM_POWER_LEVELS -> noticeItemFactory.create(event, highlight, callback)
                 EventType.STATE_ROOM_WIDGET_LEGACY,
                 EventType.STATE_ROOM_WIDGET     -> widgetItemFactory.create(event, highlight, callback)
                 EventType.STATE_ROOM_ENCRYPTION -> encryptionItemFactory.create(event, highlight, callback)
@@ -84,30 +98,10 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                         encryptedItemFactory.create(event, prevEvent, nextEvent, highlight, callback)
                     }
                 }
-                EventType.STATE_ROOM_ALIASES,
-                EventType.KEY_VERIFICATION_ACCEPT,
-                EventType.KEY_VERIFICATION_START,
-                EventType.KEY_VERIFICATION_KEY,
-                EventType.KEY_VERIFICATION_READY,
-                EventType.KEY_VERIFICATION_MAC,
-                EventType.REACTION,
-                EventType.CALL_CANDIDATES,
-                EventType.CALL_REPLACES,
-                EventType.CALL_SELECT_ANSWER,
-                EventType.CALL_NEGOTIATE        -> {
-                    // TODO These are not filtered out by timeline when encrypted
-                    // For now manually ignore
-                    if (userPreferencesProvider.shouldShowHiddenEvents()) {
-                        noticeItemFactory.create(event, highlight, callback)
-                    } else {
-                        null
-                    }
-                }
                 EventType.KEY_VERIFICATION_CANCEL,
                 EventType.KEY_VERIFICATION_DONE -> {
                     verificationConclusionItemFactory.create(event, highlight, callback)
                 }
-
                 // Unhandled event types
                 else                            -> {
                     // Should only happen when shouldShowHiddenEvents() settings is ON
@@ -119,12 +113,14 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
             Timber.e(throwable, "failed to create message item")
             defaultItemFactory.create(event, highlight, callback, throwable)
         }
-        return computedModel ?: buildEmptyItem(event)
+        return computedModel ?: buildEmptyItem(event, prevEvent, eventIdToHighlight)
     }
 
-    private fun buildEmptyItem(timelineEvent: TimelineEvent): TimelineEmptyItem {
+    private fun buildEmptyItem(timelineEvent: TimelineEvent, prevEvent: TimelineEvent?, eventIdToHighlight: String?): TimelineEmptyItem {
+        val makesEmptyItemVisible = prevEvent == null || timelineEventVisibilityHelper.shouldShowEvent(prevEvent, eventIdToHighlight)
         return TimelineEmptyItem_()
                 .id(timelineEvent.localId)
                 .eventId(timelineEvent.eventId)
+                .visible(makesEmptyItemVisible)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 09f173de14..abaa2ffa17 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -111,15 +111,6 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                 },
                 hasBeenEdited = event.hasBeenEdited(),
                 hasPendingEdits = event.annotations?.editSummary?.localEchos?.any() ?: false,
-                readReceipts = event.readReceipts
-                        .asSequence()
-                        .filter {
-                            it.user.userId != session.myUserId
-                        }
-                        .map {
-                            ReadReceiptData(it.user.userId, it.user.avatarUrl, it.user.displayName, it.originServerTs)
-                        }
-                        .toList(),
                 referencesInfoData = event.annotations?.referencesAggregatedSummary?.let { referencesAggregatedSummary ->
                     val verificationState = referencesAggregatedSummary.content.toModel<ReferencesAggregatedContent>()?.verificationState
                             ?: VerificationState.REQUEST
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
index 971a3a35d8..392cb0ae57 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
@@ -19,11 +19,14 @@ package im.vector.app.features.home.room.detail.timeline.helper
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.VisibilityState
 import im.vector.app.core.epoxy.LoadingItem_
+import im.vector.app.core.epoxy.TimelineEmptyItem
 import im.vector.app.core.epoxy.TimelineEmptyItem_
+import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.home.room.detail.UnreadState
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.item.CallTileTimelineItem
+import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem
 import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
 import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
 import im.vector.app.features.settings.VectorPreferences
@@ -34,7 +37,7 @@ private const val DEFAULT_PREFETCH_THRESHOLD = 30
 
 class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMutableProperty0<Int?>,
                                           private val adapterPositionMapping: MutableMap<String, Int>,
-                                          private val vectorPreferences: VectorPreferences,
+                                          private val userPreferencesProvider: UserPreferencesProvider,
                                           private val callManager: WebRtcCallManager
 ) {
 
@@ -56,23 +59,40 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
         models.addForwardPrefetchIfNeeded(timeline, callback)
 
         val modelsIterator = models.listIterator()
-        val showHiddenEvents = vectorPreferences.shouldShowHiddenEvents()
+        val showHiddenEvents = userPreferencesProvider.shouldShowHiddenEvents()
         var index = 0
         val firstUnreadEventId = (unreadState as? UnreadState.HasUnread)?.firstUnreadEventId
+        var atLeastOneVisibleItemSinceLastDaySeparator = false
+        var atLeastOneVisibleItemsBeforeReadMarker = false
+
         // Then iterate on models so we have the exact positions in the adapter
         modelsIterator.forEach { epoxyModel ->
+            if(epoxyModel !is TimelineEmptyItem){
+                atLeastOneVisibleItemSinceLastDaySeparator = true
+                atLeastOneVisibleItemsBeforeReadMarker = true
+            }
             if (epoxyModel is ItemWithEvents) {
                 epoxyModel.getEventIds().forEach { eventId ->
                     adapterPositionMapping[eventId] = index
-                    if (eventId == firstUnreadEventId) {
+                    if (eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker) {
                         modelsIterator.addReadMarkerItem(callback)
                         index++
                         positionOfReadMarker.set(index)
                     }
                 }
             }
-            if (epoxyModel is CallTileTimelineItem) {
-                modelsIterator.removeCallItemIfNeeded(epoxyModel, callIds, showHiddenEvents)
+            if(epoxyModel is DaySeparatorItem){
+                if(!atLeastOneVisibleItemSinceLastDaySeparator){
+                    modelsIterator.remove()
+                    return@forEach
+                }
+                atLeastOneVisibleItemSinceLastDaySeparator = false
+            }
+            else if (epoxyModel is CallTileTimelineItem) {
+                val hasBeenRemoved = modelsIterator.removeCallItemIfNeeded(epoxyModel, callIds, showHiddenEvents)
+                if(!hasBeenRemoved){
+                    atLeastOneVisibleItemSinceLastDaySeparator = true
+                }
             }
             index++
         }
@@ -94,20 +114,23 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
             epoxyModel: CallTileTimelineItem,
             callIds: MutableSet<String>,
             showHiddenEvents: Boolean
-    ) {
+    ): Boolean {
         val callId = epoxyModel.attributes.callId
         // We should remove the call tile if we already have one for this call or
         // if this is an active call tile without an actual call (which can happen with permalink)
         val shouldRemoveCallItem = callIds.contains(callId)
                 || (!callManager.getAdvertisedCalls().contains(callId) && epoxyModel.attributes.callStatus.isActive())
-        if (shouldRemoveCallItem && !showHiddenEvents) {
+        val removed = shouldRemoveCallItem && !showHiddenEvents
+        if (removed) {
             remove()
             val emptyItem = TimelineEmptyItem_()
                     .id(epoxyModel.id())
                     .eventId(epoxyModel.attributes.informationData.eventId)
+                    .visible(false)
             add(emptyItem)
         }
         callIds.add(callId)
+        return removed
     }
 
     private fun MutableList<EpoxyModel<*>>.addBackwardPrefetchIfNeeded(timeline: Timeline?, callback: TimelineEventController.Callback?) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
index eb5b8081f9..a597fb966e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
@@ -22,6 +22,9 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 object TimelineDisplayableEvents {
 
+    /**
+     * All types we have an item to build with. Every type not defined here will be shown as DefaultItem if forced to be shown, otherwise will be hidden.
+     */
     val DISPLAYABLE_TYPES = listOf(
             EventType.MESSAGE,
             EventType.STATE_ROOM_WIDGET_LEGACY,
@@ -50,6 +53,7 @@ object TimelineDisplayableEvents {
             EventType.KEY_VERIFICATION_DONE,
             EventType.KEY_VERIFICATION_CANCEL
     )
+
 }
 
 fun TimelineEvent.canBeMerged(): Boolean {
@@ -68,7 +72,7 @@ fun TimelineEvent.isRoomConfiguration(roomCreatorUserId: String?): Boolean {
         EventType.STATE_ROOM_CANONICAL_ALIAS,
         EventType.STATE_ROOM_POWER_LEVELS,
         EventType.STATE_ROOM_ENCRYPTION -> true
-        EventType.STATE_ROOM_MEMBER     -> {
+        EventType.STATE_ROOM_MEMBER -> {
             // Keep only room member events regarding the room creator (when he joined the room),
             // but exclude events where the room creator invite others, or where others join
             roomCreatorUserId != null && root.stateKey == roomCreatorUserId
@@ -76,39 +80,3 @@ fun TimelineEvent.isRoomConfiguration(roomCreatorUserId: String?): Boolean {
         else                            -> false
     }
 }
-
-fun List<TimelineEvent>.nextSameTypeEvents(index: Int, minSize: Int): List<TimelineEvent> {
-    if (index >= size - 1) {
-        return emptyList()
-    }
-    val timelineEvent = this[index]
-    val nextSubList = subList(index + 1, size)
-    val indexOfNextDay = nextSubList.indexOfFirst {
-        val date = it.root.localDateTime()
-        val nextDate = timelineEvent.root.localDateTime()
-        date.toLocalDate() != nextDate.toLocalDate()
-    }
-    val nextSameDayEvents = if (indexOfNextDay == -1) {
-        nextSubList
-    } else {
-        nextSubList.subList(0, indexOfNextDay)
-    }
-    val indexOfFirstDifferentEventType = nextSameDayEvents.indexOfFirst { it.root.getClearType() != timelineEvent.root.getClearType() }
-    val sameTypeEvents = if (indexOfFirstDifferentEventType == -1) {
-        nextSameDayEvents
-    } else {
-        nextSameDayEvents.subList(0, indexOfFirstDifferentEventType)
-    }
-    if (sameTypeEvents.size < minSize) {
-        return emptyList()
-    }
-    return sameTypeEvents
-}
-
-fun List<TimelineEvent>.prevSameTypeEvents(index: Int, minSize: Int): List<TimelineEvent> {
-    val prevSub = subList(0, index + 1)
-    return prevSub
-            .reversed()
-            .nextSameTypeEvents(0, minSize)
-            .reversed()
-}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
new file mode 100644
index 0000000000..54d76bc681
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.helper
+
+import im.vector.app.core.extensions.localDateTime
+import im.vector.app.core.resources.UserPreferencesProvider
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.events.model.getRelationContent
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import javax.inject.Inject
+
+class TimelineEventVisibilityHelper @Inject constructor(private val userPreferencesProvider: UserPreferencesProvider) {
+
+    fun nextSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int): List<TimelineEvent> {
+        if (index >= timelineEvents.size - 1) {
+            return emptyList()
+        }
+        val timelineEvent = timelineEvents[index]
+        val nextSubList = timelineEvents.subList(index + 1, timelineEvents.size)
+        val indexOfNextDay = nextSubList.indexOfFirst {
+            val date = it.root.localDateTime()
+            val nextDate = timelineEvent.root.localDateTime()
+            date.toLocalDate() != nextDate.toLocalDate()
+        }
+        val nextSameDayEvents = if (indexOfNextDay == -1) {
+            nextSubList
+        } else {
+            nextSubList.subList(0, indexOfNextDay)
+        }
+        val indexOfFirstDifferentEventType = nextSameDayEvents.indexOfFirst { it.root.getClearType() != timelineEvent.root.getClearType() }
+        val sameTypeEvents = if (indexOfFirstDifferentEventType == -1) {
+            nextSameDayEvents
+        } else {
+            nextSameDayEvents.subList(0, indexOfFirstDifferentEventType)
+        }
+        val filteredSameTypeEvents = sameTypeEvents.filter { shouldShowEvent(it)}
+        if (filteredSameTypeEvents.size < minSize) {
+            return emptyList()
+        }
+        return  filteredSameTypeEvents
+    }
+
+    fun prevSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int): List<TimelineEvent> {
+        val prevSub = timelineEvents.subList(0, index + 1)
+        return prevSub
+                .reversed()
+                .let {
+                    nextSameTypeEvents(it, 0, minSize)
+                }
+                .reversed()
+    }
+
+    fun shouldShowEvent(timelineEvent: TimelineEvent, highlightEventId: String? = null): Boolean {
+        // If show hidden events is true we should always display something
+        if (userPreferencesProvider.shouldShowHiddenEvents()) {
+            return true
+        }
+        // We always show highlighted event
+        if (timelineEvent.eventId == highlightEventId) {
+            return true
+        }
+        if (!timelineEvent.isDisplayable()) {
+            return false
+        }
+        // Check for special case where we should hide the event, like redacted, relation, memberships... according to user preferences.
+        return !timelineEvent.shouldBeHidden()
+    }
+
+    private fun TimelineEvent.isDisplayable(): Boolean {
+        return TimelineDisplayableEvents.DISPLAYABLE_TYPES.contains(root.getClearType())
+    }
+
+    private fun TimelineEvent.shouldBeHidden(): Boolean {
+        if (root.isRedacted() && !userPreferencesProvider.shouldShowRedactedMessages()) {
+            return true
+        }
+        if (root.getRelationContent()?.type == RelationType.REPLACE) {
+            return true
+        }
+        if (root.getClearType() == EventType.STATE_ROOM_MEMBER) {
+            val diff = computeMembershipDiff()
+            if ((diff.isJoin || diff.isPart) && !userPreferencesProvider.shouldShowRoomMemberStateEvents()) return true
+        }
+        return false
+    }
+
+    private fun TimelineEvent.computeMembershipDiff(): MembershipDiff {
+        val content = root.getClearContent().toModel<RoomMemberContent>()
+        val prevContent = root.resolvedPrevContent().toModel<RoomMemberContent>()
+
+        val isMembershipChanged = content?.membership != prevContent?.membership;
+        val isJoin = isMembershipChanged && content?.membership == Membership.JOIN
+        val isPart = isMembershipChanged && content?.membership == Membership.LEAVE && root.stateKey == root.senderId
+
+        val isJoinToJoin = !isMembershipChanged && content?.membership == Membership.JOIN
+        val isDisplaynameChange = isJoinToJoin && content?.displayName != prevContent?.displayName;
+        val isAvatarChange = isJoinToJoin && content?.avatarUrl !== prevContent?.avatarUrl
+
+        return MembershipDiff(
+                isJoin = isJoin,
+                isPart = isPart,
+                isDisplaynameChange = isDisplaynameChange,
+                isAvatarChange = isAvatarChange
+        )
+    }
+
+    private data class MembershipDiff(
+            val isJoin: Boolean,
+            val isPart: Boolean,
+            val isDisplaynameChange: Boolean,
+            val isAvatarChange: Boolean
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
index a65f1e10f2..a5f3f7c547 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
@@ -41,10 +41,6 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
 
     abstract val baseAttributes: Attributes
 
-    private val _readReceiptsClickListener = DebouncedClickListener({
-        baseAttributes.readReceiptsCallback?.onReadReceiptsClicked(baseAttributes.informationData.readReceipts)
-    })
-
     private var reactionClickListener: ReactionButton.ReactedListener = object : ReactionButton.ReactedListener {
         override fun onReacted(reactionButton: ReactionButton) {
             baseAttributes.reactionPillCallback?.onClickOnReactionPill(baseAttributes.informationData, reactionButton.reactionString, true)
@@ -69,12 +65,6 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
 
     override fun bind(holder: H) {
         super.bind(holder)
-        holder.readReceiptsView.render(
-                baseAttributes.informationData.readReceipts,
-                baseAttributes.avatarRenderer,
-                _readReceiptsClickListener
-        )
-
         val reactions = baseAttributes.informationData.orderedReactionList
         if (!shouldShowReactionAtBottom() || reactions.isNullOrEmpty()) {
             holder.reactionsContainer.isVisible = false
@@ -111,7 +101,6 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
 
     override fun unbind(holder: H) {
         holder.reactionsContainer.setOnLongClickListener(null)
-        holder.readReceiptsView.unbind(baseAttributes.avatarRenderer)
         super.unbind(holder)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
index 13bb6db6ef..aae1edbed1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -56,7 +56,6 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
     abstract class BaseHolder(@IdRes val stubId: Int) : VectorEpoxyHolder() {
         val leftGuideline by bind<View>(R.id.messageStartGuideline)
         val checkableBackground by bind<CheckableView>(R.id.messageSelectedBackground)
-        val readReceiptsView by bind<ReadReceiptsView>(R.id.readReceiptsView)
 
         override fun bindView(itemView: View) {
             super.bindView(itemView)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
index 1f8ad3df1b..8a49bd6803 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
@@ -41,8 +41,6 @@ abstract class BasedMergedItem<H : BasedMergedItem.Holder> : BaseEventItem<H>()
             holder.separatorView.visibility = View.VISIBLE
             holder.expandView.setText(R.string.merged_events_collapse)
         }
-        // No read receipt for this item
-        holder.readReceiptsView.isVisible = false
     }
 
     protected val distinctMergeData by lazy {
@@ -72,7 +70,6 @@ abstract class BasedMergedItem<H : BasedMergedItem.Holder> : BaseEventItem<H>()
         val isCollapsed: Boolean
         val mergeData: List<Data>
         val avatarRenderer: AvatarRenderer
-        val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback?
         val onCollapsedStateChanged: (Boolean) -> Unit
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
index cdc677334e..580a56bf05 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
@@ -32,21 +32,15 @@ abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
     @EpoxyAttribute
     lateinit var attributes: Attributes
 
-    private val _readReceiptsClickListener = DebouncedClickListener({
-        attributes.readReceiptsCallback?.onReadReceiptsClicked(attributes.informationData.readReceipts)
-    })
-
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.messageTextView.text = attributes.text
         attributes.avatarRenderer.render(attributes.informationData.matrixItem, holder.avatarImageView)
         holder.view.setOnLongClickListener(attributes.itemLongClickListener)
-        holder.readReceiptsView.render(attributes.informationData.readReceipts, attributes.avatarRenderer, _readReceiptsClickListener)
     }
 
     override fun unbind(holder: Holder) {
         attributes.avatarRenderer.clear(holder.avatarImageView)
-        holder.readReceiptsView.unbind(attributes.avatarRenderer)
         super.unbind(holder)
     }
 
@@ -66,7 +60,6 @@ abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
             val informationData: MessageInformationData,
             val text: CharSequence,
             val itemLongClickListener: View.OnLongClickListener? = null,
-            val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback? = null
     )
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
index ef4a6662b4..70a6864a1f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
@@ -56,8 +56,6 @@ abstract class MergedMembershipEventsItem : BasedMergedItem<MergedMembershipEven
             holder.avatarListView.visibility = View.INVISIBLE
             holder.summaryView.visibility = View.GONE
         }
-        // No read receipt for this item
-        holder.readReceiptsView.isVisible = false
     }
 
     class Holder : BasedMergedItem.Holder(STUB_ID) {
@@ -73,7 +71,6 @@ abstract class MergedMembershipEventsItem : BasedMergedItem<MergedMembershipEven
             override val isCollapsed: Boolean,
             override val mergeData: List<Data>,
             override val avatarRenderer: AvatarRenderer,
-            override val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback? = null,
             override val onCollapsedStateChanged: (Boolean) -> Unit
     ) : BasedMergedItem.Attributes
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
index 6a665bb44f..9faef589ca 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
@@ -92,8 +92,6 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
             holder.summaryView.visibility = View.GONE
             holder.encryptionTile.isGone = true
         }
-        // No read receipt for this item
-        holder.readReceiptsView.isVisible = false
     }
 
     private fun bindEncryptionTile(holder: Holder, data: Data?) {
@@ -223,7 +221,6 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
             override val isCollapsed: Boolean,
             override val mergeData: List<Data>,
             override val avatarRenderer: AvatarRenderer,
-            override val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback? = null,
             override val onCollapsedStateChanged: (Boolean) -> Unit,
             val callback: TimelineEventController.Callback? = null,
             val currentUserId: String,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index 67b79bab9b..08aa301538 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -36,10 +36,8 @@ data class MessageInformationData(
         /*List of reactions (emoji,count,isSelected)*/
         val orderedReactionList: List<ReactionInfoData>? = null,
         val pollResponseAggregatedSummary: PollResponseData? = null,
-
         val hasBeenEdited: Boolean = false,
         val hasPendingEdits: Boolean = false,
-        val readReceipts: List<ReadReceiptData> = emptyList(),
         val referencesInfoData: ReferencesInfoData? = null,
         val sentByMe: Boolean,
         val e2eDecoration: E2EDecoration = E2EDecoration.NONE,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
index bcf170dc4d..b733d0ec32 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
@@ -36,16 +36,11 @@ abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>() {
     @EpoxyAttribute
     lateinit var attributes: Attributes
 
-    private val _readReceiptsClickListener = DebouncedClickListener({
-        attributes.readReceiptsCallback?.onReadReceiptsClicked(attributes.informationData.readReceipts)
-    })
-
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.noticeTextView.text = attributes.noticeText
         attributes.avatarRenderer.render(attributes.informationData.matrixItem, holder.avatarImageView)
         holder.view.setOnLongClickListener(attributes.itemLongClickListener)
-        holder.readReceiptsView.render(attributes.informationData.readReceipts, attributes.avatarRenderer, _readReceiptsClickListener)
         holder.avatarImageView.onClick(attributes.avatarClickListener)
 
         when (attributes.informationData.e2eDecoration) {
@@ -62,7 +57,6 @@ abstract class NoticeItem : BaseEventItem<NoticeItem.Holder>() {
 
     override fun unbind(holder: Holder) {
         attributes.avatarRenderer.clear(holder.avatarImageView)
-        holder.readReceiptsView.unbind(attributes.avatarRenderer)
         super.unbind(holder)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
new file mode 100644
index 0000000000..84b2662687
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.item
+
+import android.view.View
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.airbnb.epoxy.EpoxyModelWithHolder
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.ui.views.ReadReceiptsView
+import im.vector.app.features.home.AvatarRenderer
+
+@EpoxyModelClass(layout = R.layout.item_timeline_event_read_receipts)
+abstract class ReadReceiptsItem : EpoxyModelWithHolder<ReadReceiptsItem.Holder>(), ItemWithEvents {
+
+    @EpoxyAttribute lateinit var eventId: String
+    @EpoxyAttribute lateinit var readReceipts: List<ReadReceiptData>
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var clickListener: View.OnClickListener
+
+    override fun getEventIds(): List<String> = listOf(eventId)
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.readReceiptsView.render(readReceipts, avatarRenderer, clickListener)
+    }
+
+    override fun unbind(holder: Holder) {
+        holder.readReceiptsView.unbind(avatarRenderer)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val readReceiptsView by bind<ReadReceiptsView>(R.id.readReceiptsView)
+    }
+}
diff --git a/vector/src/main/res/layout/item_timeline_empty.xml b/vector/src/main/res/layout/item_timeline_empty.xml
index c8dee60cc7..562cbd39ba 100644
--- a/vector/src/main/res/layout/item_timeline_empty.xml
+++ b/vector/src/main/res/layout/item_timeline_empty.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <View xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="0dp" />
\ No newline at end of file
+    android:layout_height="0dp" />
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index ce3460a21c..f9562f65b0 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -188,15 +188,6 @@
                 android:layout_height="wrap_content" /-->
 
         </com.google.android.flexbox.FlexboxLayout>
-
-        <im.vector.app.core.ui.views.ReadReceiptsView
-            android:id="@+id/readReceiptsView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="4dp" />
-
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
index 6442f230d5..35e1b097d7 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_noinfo.xml
@@ -10,7 +10,7 @@
         android:id="@+id/messageSelectedBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/readReceiptsView"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentTop="true"
         android:background="@drawable/highlighted_message_background" />
 
@@ -80,14 +80,4 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-
-    <im.vector.app.core.ui.views.ReadReceiptsView
-        android:id="@+id/readReceiptsView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/viewStubContainer"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="4dp" />
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml
index db5ed052f3..98cea901da 100644
--- a/vector/src/main/res/layout/item_timeline_event_base_state.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml
@@ -120,14 +120,6 @@
 
         </com.google.android.flexbox.FlexboxLayout>
 
-        <im.vector.app.core.ui.views.ReadReceiptsView
-            android:id="@+id/readReceiptsView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="4dp" />
-
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_read_receipts.xml b/vector/src/main/res/layout/item_timeline_event_read_receipts.xml
new file mode 100644
index 0000000000..f741e434c7
--- /dev/null
+++ b/vector/src/main/res/layout/item_timeline_event_read_receipts.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <im.vector.app.core.ui.views.ReadReceiptsView
+        android:id="@+id/readReceiptsView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="4dp" />
+
+</FrameLayout>
\ No newline at end of file

From 13cb81b92f6b995a318f964df12351bfb23b9ae8 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 30 Mar 2021 18:07:05 +0200
Subject: [PATCH 450/578] Timeline: fix SendState decoration + some filtering
 issues

---
 .../app/core/epoxy/TimelineEmptyItem.kt       |  7 ++-
 .../timeline/TimelineEventController.kt       | 51 +++++++++++++++----
 .../timeline/factory/CallItemFactory.kt       | 24 ++++-----
 .../timeline/factory/DefaultItemFactory.kt    | 11 ++--
 .../timeline/factory/EncryptedItemFactory.kt  | 17 +++----
 .../timeline/factory/EncryptionItemFactory.kt | 13 ++---
 .../factory/MergedHeaderItemFactory.kt        |  2 +-
 .../timeline/factory/MessageItemFactory.kt    | 17 +++----
 .../timeline/factory/NoticeItemFactory.kt     | 17 +++----
 .../factory/ReadReceiptsItemFactory.kt        | 14 ++---
 .../timeline/factory/RoomCreateItemFactory.kt | 13 +++--
 .../timeline/factory/TimelineItemFactory.kt   | 46 ++++++++---------
 .../factory/TimelineItemFactoryParams.kt      | 33 ++++++++++++
 .../factory/VerificationItemFactory.kt        | 41 +++++++--------
 .../timeline/factory/WidgetItemFactory.kt     | 19 +++----
 .../helper/MessageInformationDataFactory.kt   | 22 ++++----
 .../TimelineControllerInterceptorHelper.kt    | 23 ++++-----
 .../helper/TimelineEventVisibilityHelper.kt   | 12 ++---
 .../detail/timeline/item/BaseEventItem.kt     |  1 +
 .../detail/timeline/item/ItemWithEvents.kt    |  5 ++
 .../detail/timeline/item/ReadReceiptsItem.kt  |  2 +
 21 files changed, 209 insertions(+), 181 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/TimelineEmptyItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/TimelineEmptyItem.kt
index 9c49a5d458..c51573bf21 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/TimelineEmptyItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/TimelineEmptyItem.kt
@@ -26,12 +26,15 @@ import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
 abstract class TimelineEmptyItem : VectorEpoxyModel<TimelineEmptyItem.Holder>(), ItemWithEvents {
 
     @EpoxyAttribute lateinit var eventId: String
-    @EpoxyAttribute var visible: Boolean = false
+    @EpoxyAttribute var notBlank: Boolean = false
+
+    override fun isVisible() = false
 
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.view.updateLayoutParams {
-            this.height = if (visible) 1 else 0
+            // Force height to 1px so scrolling works correctly
+            this.height = if (notBlank) 1 else 0
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 972736fb2a..aff94f7157 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -32,9 +32,7 @@ import im.vector.app.core.extensions.localDateTime
 import im.vector.app.core.extensions.nextOrNull
 import im.vector.app.core.extensions.prevOrNull
 import im.vector.app.core.resources.UserPreferencesProvider
-import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.call.webrtc.WebRtcCallManager
-import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.RoomDetailViewState
 import im.vector.app.features.home.room.detail.UnreadState
@@ -47,6 +45,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.TimelineControlle
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener
+import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem
@@ -55,7 +54,6 @@ import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem
-import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem_
 import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
 import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.media.ImageContentRenderer
@@ -337,13 +335,22 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             return
         }
         val receiptsByEvents = getReadReceiptsByShownEvent()
+        val lastSentEventWithoutReadReceipts = searchLastSentEventWithoutReadReceipts(receiptsByEvents)
         (0 until modelCache.size).forEach { position ->
             val event = currentSnapshot[position]
             val nextEvent = currentSnapshot.nextOrNull(position)
             val prevEvent = currentSnapshot.prevOrNull(position)
+            val params = TimelineItemFactoryParams(
+                    event = event,
+                    prevEvent = prevEvent,
+                    nextEvent = nextEvent,
+                    highlightedEventId = eventIdToHighlight,
+                    lastSentEventIdWithoutReadReceipts = lastSentEventWithoutReadReceipts,
+                    callback = callback
+            )
             // Should be build if not cached or if model should be refreshed
             if (modelCache[position] == null || modelCache[position]?.shouldTriggerBuild == true) {
-                modelCache[position] = buildCacheItem(event, nextEvent, prevEvent)
+                modelCache[position] = buildCacheItem(params)
             }
             val itemCachedData = modelCache[position] ?: return@forEach
             // Then update with additional models if needed
@@ -351,15 +358,13 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         }
     }
 
-    private fun buildCacheItem(event: TimelineEvent,
-                               nextEvent: TimelineEvent?,
-                               prevEvent: TimelineEvent?
-    ): CacheItemData {
+    private fun buildCacheItem(params: TimelineItemFactoryParams): CacheItemData {
+        val event = params.event
         if (hasReachedInvite && hasUTD) {
             return CacheItemData(event.localId, event.root.eventId)
         }
-        updateUTDStates(event, nextEvent)
-        val eventModel = timelineItemFactory.create(event, prevEvent, nextEvent, eventIdToHighlight, callback).also {
+        updateUTDStates(event, params.nextEvent)
+        val eventModel = timelineItemFactory.create(params).also {
             it.id(event.localId)
             it.setOnVisibilityStateChanged(TimelineEventVisibilityStateChangedListener(callback, event))
         }
@@ -399,13 +404,37 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         )
     }
 
+    private fun searchLastSentEventWithoutReadReceipts(receiptsByEvent: Map<String, List<ReadReceipt>>): String? {
+        if (timeline?.isLive == false) {
+            // If timeline is not live we don't want to show SentStatus
+            return null
+        }
+        for (event in currentSnapshot) {
+            // If there is any RR on the event, we stop searching for Sent event
+            if (receiptsByEvent[event.eventId]?.isNotEmpty() == true) {
+                return null
+            }
+            // If the event is not shown, we go to the next one
+            if (!timelineEventVisibilityHelper.shouldShowEvent(event, eventIdToHighlight)) {
+                continue
+            }
+            // If the event is sent by us, we update the holder with the eventId and stop the search
+            if (event.root.senderId == session.myUserId && event.root.sendState.isSent()) {
+                return event.eventId
+            }
+        }
+        return null
+    }
+
     private fun getReadReceiptsByShownEvent(): Map<String, List<ReadReceipt>> {
         val receiptsByEvent = HashMap<String, MutableList<ReadReceipt>>()
         var lastShownEventId: String? = null
         val itr = currentSnapshot.listIterator(currentSnapshot.size)
         while (itr.hasPrevious()) {
             val event = itr.previous()
-            val currentReadReceipts = ArrayList(event.readReceipts)
+            val currentReadReceipts = ArrayList(event.readReceipts).filter {
+                it.user.userId != session.myUserId
+            }
             if (timelineEventVisibilityHelper.shouldShowEvent(event, eventIdToHighlight)) {
                 lastShownEventId = event.eventId
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
index 548f7a3b1c..3df9898078 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/CallItemFactory.kt
@@ -46,13 +46,11 @@ class CallItemFactory @Inject constructor(
         private val callManager: WebRtcCallManager
 ) {
 
-    fun create(event: TimelineEvent,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?
-    ): VectorEpoxyModel<*>? {
+    fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
+        val event = params.event
         if (event.root.eventId == null) return null
         val roomId = event.roomId
-        val informationData = messageInformationDataFactory.create(event, null, null)
+        val informationData = messageInformationDataFactory.create(params)
         val callSignalingContent = event.getCallSignallingContent() ?: return null
         val callId = callSignalingContent.callId ?: return null
         val call = callManager.getCallById(callId)
@@ -68,8 +66,8 @@ class CallItemFactory @Inject constructor(
                         callId = callId,
                         callStatus = CallTileTimelineItem.CallStatus.IN_CALL,
                         callKind = callKind,
-                        callback = callback,
-                        highlight = highlight,
+                        callback = params.callback,
+                        highlight = params.isHighlighted,
                         informationData = informationData,
                         isStillActive = call != null
                 )
@@ -80,8 +78,8 @@ class CallItemFactory @Inject constructor(
                         callId = callId,
                         callStatus = CallTileTimelineItem.CallStatus.INVITED,
                         callKind = callKind,
-                        callback = callback,
-                        highlight = highlight,
+                        callback = params.callback,
+                        highlight = params.isHighlighted,
                         informationData = informationData,
                         isStillActive = call != null
                 )
@@ -92,8 +90,8 @@ class CallItemFactory @Inject constructor(
                         callId = callId,
                         callStatus = CallTileTimelineItem.CallStatus.REJECTED,
                         callKind = callKind,
-                        callback = callback,
-                        highlight = highlight,
+                        callback = params.callback,
+                        highlight = params.isHighlighted,
                         informationData = informationData,
                         isStillActive = false
                 )
@@ -104,8 +102,8 @@ class CallItemFactory @Inject constructor(
                         callId = callId,
                         callStatus = CallTileTimelineItem.CallStatus.ENDED,
                         callKind = callKind,
-                        callback = callback,
-                        highlight = highlight,
+                        callback = params.callback,
+                        highlight = params.isHighlighted,
                         informationData = informationData,
                         isStillActive = false
                 )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
index 5f5d3f5156..db7b84ed06 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt
@@ -25,7 +25,6 @@ import im.vector.app.features.home.room.detail.timeline.helper.MessageInformatio
 import im.vector.app.features.home.room.detail.timeline.item.DefaultItem
 import im.vector.app.features.home.room.detail.timeline.item.DefaultItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
 class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: AvatarSizeProvider,
@@ -51,16 +50,14 @@ class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: Ava
                 .attributes(attributes)
     }
 
-    fun create(event: TimelineEvent,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?,
-               throwable: Throwable? = null): DefaultItem {
+    fun create(params: TimelineItemFactoryParams, throwable: Throwable? = null): DefaultItem {
+        val event = params.event
         val text = if (throwable == null) {
             stringProvider.getString(R.string.rendering_event_error_type_of_event_not_handled, event.root.getClearType())
         } else {
             stringProvider.getString(R.string.rendering_event_error_exception, event.root.eventId)
         }
-        val informationData = informationDataFactory.create(event, null, null)
-        return create(text, informationData, highlight, callback)
+        val informationData = informationDataFactory.create(params)
+        return create(text, informationData, params.isHighlighted, params.callback)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
index b531e08359..82d3dea311 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
@@ -21,7 +21,6 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
@@ -33,7 +32,6 @@ import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import javax.inject.Inject
 
@@ -46,11 +44,8 @@ class EncryptedItemFactory @Inject constructor(private val messageInformationDat
                                                private val attributesFactory: MessageItemAttributesFactory,
                                                private val vectorPreferences: VectorPreferences) {
 
-    fun create(event: TimelineEvent,
-               prevEvent: TimelineEvent?,
-               nextEvent: TimelineEvent?,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?): VectorEpoxyModel<*>? {
+    fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
+        val event = params.event
         event.root.eventId ?: return null
 
         return when {
@@ -109,14 +104,14 @@ class EncryptedItemFactory @Inject constructor(private val messageInformationDat
                     }
                 }
 
-                val informationData = messageInformationDataFactory.create(event, prevEvent, nextEvent)
-                val attributes = attributesFactory.create(event.root.content.toModel<EncryptedEventContent>(), informationData, callback)
+                val informationData = messageInformationDataFactory.create(params)
+                val attributes = attributesFactory.create(event.root.content.toModel<EncryptedEventContent>(), informationData, params.callback)
                 return MessageTextItem_()
                         .leftGuideline(avatarSizeProvider.leftGuideline)
-                        .highlighted(highlight)
+                        .highlighted(params.isHighlighted)
                         .attributes(attributes)
                         .message(spannableStr)
-                        .movementMethod(createLinkMovementMethod(callback))
+                        .movementMethod(createLinkMovementMethod(params.callback))
             }
             else                                             -> null
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index 68716a3eba..1d30136f27 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.home.room.detail.timeline.factory
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
@@ -28,7 +27,6 @@ import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineI
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
 import javax.inject.Inject
@@ -41,15 +39,14 @@ class EncryptionItemFactory @Inject constructor(
         private val avatarSizeProvider: AvatarSizeProvider,
         private val session: Session) {
 
-    fun create(event: TimelineEvent,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?): StatusTileTimelineItem? {
+    fun create(params: TimelineItemFactoryParams): StatusTileTimelineItem? {
+        val event = params.event
         if (!event.root.isStateEvent()) {
             return null
         }
         val algorithm = event.root.getClearContent().toModel<EncryptionEventContent>()?.algorithm
-        val informationData = informationDataFactory.create(event, null, null)
-        val attributes = messageItemAttributesFactory.create(null, informationData, callback)
+        val informationData = informationDataFactory.create(params)
+        val attributes = messageItemAttributesFactory.create(null, informationData, params.callback)
 
         val isSafeAlgorithm = algorithm == MXCRYPTO_ALGORITHM_MEGOLM
         val title: String
@@ -86,7 +83,7 @@ class EncryptionItemFactory @Inject constructor(
                                 readReceiptsCallback = attributes.readReceiptsCallback
                         )
                 )
-                .highlighted(highlight)
+                .highlighted(params.isHighlighted)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index 4e4a7fce02..e9340feaca 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -86,7 +86,7 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
                                                    eventIdToHighlight: String?,
                                                    requestModelBuild: () -> Unit,
                                                    callback: TimelineEventController.Callback?): MergedMembershipEventsItem_? {
-        val prevSameTypeEvents = timelineEventVisibilityHelper.prevSameTypeEvents(items, currentPosition, 2)
+        val prevSameTypeEvents = timelineEventVisibilityHelper.prevSameTypeEvents(items, currentPosition, 2, eventIdToHighlight)
         return if (prevSameTypeEvents.isEmpty()) {
             null
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index e969998613..0f214ffb13 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -85,7 +85,6 @@ import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_BUTTONS
 import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_POLL
 import org.matrix.android.sdk.api.session.room.model.message.getFileName
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
@@ -118,15 +117,13 @@ class MessageItemFactory @Inject constructor(
         pillsPostProcessorFactory.create(roomId)
     }
 
-    fun create(event: TimelineEvent,
-               prevEvent: TimelineEvent?,
-               nextEvent: TimelineEvent?,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?
-    ): VectorEpoxyModel<*>? {
+    fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
+        val event = params.event
+        val highlight = params.isHighlighted
+        val callback = params.callback
         event.root.eventId ?: return null
         roomId = event.roomId
-        val informationData = messageInformationDataFactory.create(event, prevEvent, nextEvent)
+        val informationData = messageInformationDataFactory.create(params)
         if (event.root.isRedacted()) {
             // message is redacted
             val attributes = messageItemAttributesFactory.create(null, informationData, callback)
@@ -142,7 +139,7 @@ class MessageItemFactory @Inject constructor(
                 || event.isEncrypted() && event.root.content.toModel<EncryptedEventContent>()?.relatesTo?.type == RelationType.REPLACE
         ) {
             // This is an edit event, we should display it when debugging as a notice event
-            return noticeItemFactory.create(event, highlight, callback)
+            return noticeItemFactory.create(params)
         }
         val attributes = messageItemAttributesFactory.create(messageContent, informationData, callback)
 
@@ -158,7 +155,7 @@ class MessageItemFactory @Inject constructor(
             is MessageAudioContent               -> buildAudioMessageItem(messageContent, informationData, highlight, attributes)
             is MessageVerificationRequestContent -> buildVerificationRequestMessageItem(messageContent, informationData, highlight, callback, attributes)
             is MessageOptionsContent             -> buildOptionsMessageItem(messageContent, informationData, highlight, callback, attributes)
-            is MessagePollResponseContent        -> noticeItemFactory.create(event, highlight, callback)
+            is MessagePollResponseContent        -> noticeItemFactory.create(params)
             else                                 -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
index dfabf96199..e757b6b47b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
@@ -17,13 +17,11 @@
 package im.vector.app.features.home.room.detail.timeline.factory
 
 import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.item.NoticeItem
 import im.vector.app.features.home.room.detail.timeline.item.NoticeItem_
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
 class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEventFormatter,
@@ -31,24 +29,23 @@ class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEv
                                             private val informationDataFactory: MessageInformationDataFactory,
                                             private val avatarSizeProvider: AvatarSizeProvider) {
 
-    fun create(event: TimelineEvent,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?): NoticeItem? {
+    fun create(params: TimelineItemFactoryParams): NoticeItem? {
+        val event = params.event
         val formattedText = eventFormatter.format(event) ?: return null
-        val informationData = informationDataFactory.create(event, null, null)
+        val informationData = informationDataFactory.create(params)
         val attributes = NoticeItem.Attributes(
                 avatarRenderer = avatarRenderer,
                 informationData = informationData,
                 noticeText = formattedText,
                 itemLongClickListener = { view ->
-                    callback?.onEventLongClicked(informationData, null, view) ?: false
+                    params.callback?.onEventLongClicked(informationData, null, view) ?: false
                 },
-                readReceiptsCallback = callback,
-                avatarClickListener = { callback?.onAvatarClicked(informationData) }
+                readReceiptsCallback = params.callback,
+                avatarClickListener = { params.callback?.onAvatarClicked(informationData) }
         )
         return NoticeItem_()
                 .leftGuideline(avatarSizeProvider.leftGuideline)
-                .highlighted(highlight)
+                .highlighted(params.isHighlighted)
                 .attributes(attributes)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
index a3e8541b05..1d015d1bca 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
@@ -22,27 +22,21 @@ import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptsItem_
-import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import javax.inject.Inject
 
-class ReadReceiptsItemFactory @Inject constructor(private val session: Session,
-                                                  private val avatarRenderer: AvatarRenderer) {
+class ReadReceiptsItemFactory @Inject constructor(private val avatarRenderer: AvatarRenderer) {
 
     fun create(eventId: String, readReceipts: List<ReadReceipt>, callback: TimelineEventController.Callback?): ReadReceiptsItem? {
+        if (readReceipts.isEmpty()) {
+            return null
+        }
         val readReceiptsData = readReceipts
-                .asSequence()
-                .filter {
-                    it.user.userId != session.myUserId
-                }
                 .map {
                     ReadReceiptData(it.user.userId, it.user.avatarUrl, it.user.displayName, it.originServerTs)
                 }
                 .toList()
 
-        if (readReceiptsData.isEmpty()) {
-            return null
-        }
         return ReadReceiptsItem_()
                 .id("read_receipts_$eventId")
                 .eventId(eventId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
index 31adbdb8a6..382962f98d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
@@ -20,13 +20,11 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.resources.UserPreferencesProvider
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.item.RoomCreateItem_
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
 class RoomCreateItemFactory @Inject constructor(private val stringProvider: StringProvider,
@@ -34,25 +32,26 @@ class RoomCreateItemFactory @Inject constructor(private val stringProvider: Stri
                                                 private val session: Session,
                                                 private val noticeItemFactory: NoticeItemFactory) {
 
-    fun create(event: TimelineEvent, callback: TimelineEventController.Callback?): VectorEpoxyModel<*>? {
+    fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
+        val event = params.event
         val createRoomContent = event.root.getClearContent().toModel<RoomCreateContent>() ?: return null
-        val predecessorId = createRoomContent.predecessor?.roomId ?: return defaultRendering(event, callback)
+        val predecessorId = createRoomContent.predecessor?.roomId ?: return defaultRendering(params)
         val roomLink = session.permalinkService().createRoomPermalink(predecessorId) ?: return null
         val text = span {
             +stringProvider.getString(R.string.room_tombstone_continuation_description)
             +"\n"
             span(stringProvider.getString(R.string.room_tombstone_predecessor_link)) {
                 textDecorationLine = "underline"
-                onClick = { callback?.onRoomCreateLinkClicked(roomLink) }
+                onClick = { params.callback?.onRoomCreateLinkClicked(roomLink) }
             }
         }
         return RoomCreateItem_()
                 .text(text)
     }
 
-    private fun defaultRendering(event: TimelineEvent, callback: TimelineEventController.Callback?): VectorEpoxyModel<*>? {
+    private fun defaultRendering(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
         return if (userPreferencesProvider.shouldShowHiddenEvents()) {
-            noticeItemFactory.create(event, false, callback)
+            noticeItemFactory.create(params)
         } else {
             null
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index df4eab0efe..09b17eb901 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -19,8 +19,6 @@ package im.vector.app.features.home.room.detail.timeline.factory
 import im.vector.app.core.epoxy.TimelineEmptyItem
 import im.vector.app.core.epoxy.TimelineEmptyItem_
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.resources.UserPreferencesProvider
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
@@ -41,20 +39,16 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
     /**
      * Reminder: nextEvent is older and prevEvent is newer.
      */
-    fun create(event: TimelineEvent,
-               prevEvent: TimelineEvent?,
-               nextEvent: TimelineEvent?,
-               eventIdToHighlight: String?,
-               callback: TimelineEventController.Callback?): VectorEpoxyModel<*> {
-        val highlight = event.root.eventId == eventIdToHighlight
+    fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*> {
+        val event = params.event
         val computedModel = try {
-            if (!timelineEventVisibilityHelper.shouldShowEvent(event, eventIdToHighlight)) {
-                return buildEmptyItem(event, prevEvent, eventIdToHighlight)
+            if (!timelineEventVisibilityHelper.shouldShowEvent(event, params.highlightedEventId)) {
+                return buildEmptyItem(event, params.prevEvent, params.highlightedEventId)
             }
             when (event.root.getClearType()) {
-                // Message items
+                // Message itemsX
                 EventType.STICKER,
-                EventType.MESSAGE               -> messageItemFactory.create(event, prevEvent, nextEvent, highlight, callback)
+                EventType.MESSAGE               -> messageItemFactory.create(params)
                 EventType.STATE_ROOM_TOMBSTONE,
                 EventType.STATE_ROOM_NAME,
                 EventType.STATE_ROOM_TOPIC,
@@ -78,49 +72,49 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.CALL_SELECT_ANSWER,
                 EventType.CALL_NEGOTIATE,
                 EventType.REACTION,
-                EventType.STATE_ROOM_POWER_LEVELS -> noticeItemFactory.create(event, highlight, callback)
+                EventType.STATE_ROOM_POWER_LEVELS -> noticeItemFactory.create(params)
                 EventType.STATE_ROOM_WIDGET_LEGACY,
-                EventType.STATE_ROOM_WIDGET     -> widgetItemFactory.create(event, highlight, callback)
-                EventType.STATE_ROOM_ENCRYPTION -> encryptionItemFactory.create(event, highlight, callback)
+                EventType.STATE_ROOM_WIDGET     -> widgetItemFactory.create(params)
+                EventType.STATE_ROOM_ENCRYPTION -> encryptionItemFactory.create(params)
                 // State room create
-                EventType.STATE_ROOM_CREATE     -> roomCreateItemFactory.create(event, callback)
+                EventType.STATE_ROOM_CREATE     -> roomCreateItemFactory.create(params)
                 // Calls
                 EventType.CALL_INVITE,
                 EventType.CALL_HANGUP,
                 EventType.CALL_REJECT,
-                EventType.CALL_ANSWER           -> callItemFactory.create(event, highlight, callback)
+                EventType.CALL_ANSWER           -> callItemFactory.create(params)
                 // Crypto
                 EventType.ENCRYPTED             -> {
                     if (event.root.isRedacted()) {
                         // Redacted event, let the MessageItemFactory handle it
-                        messageItemFactory.create(event, prevEvent, nextEvent, highlight, callback)
+                        messageItemFactory.create(params)
                     } else {
-                        encryptedItemFactory.create(event, prevEvent, nextEvent, highlight, callback)
+                        encryptedItemFactory.create(params)
                     }
                 }
                 EventType.KEY_VERIFICATION_CANCEL,
                 EventType.KEY_VERIFICATION_DONE -> {
-                    verificationConclusionItemFactory.create(event, highlight, callback)
+                    verificationConclusionItemFactory.create(params)
                 }
                 // Unhandled event types
                 else                            -> {
                     // Should only happen when shouldShowHiddenEvents() settings is ON
                     Timber.v("Type ${event.root.getClearType()} not handled")
-                    defaultItemFactory.create(event, highlight, callback)
+                    defaultItemFactory.create(params)
                 }
             }
         } catch (throwable: Throwable) {
             Timber.e(throwable, "failed to create message item")
-            defaultItemFactory.create(event, highlight, callback, throwable)
+            defaultItemFactory.create(params, throwable)
         }
-        return computedModel ?: buildEmptyItem(event, prevEvent, eventIdToHighlight)
+        return computedModel ?: buildEmptyItem(event, params.prevEvent, params.highlightedEventId)
     }
 
-    private fun buildEmptyItem(timelineEvent: TimelineEvent, prevEvent: TimelineEvent?, eventIdToHighlight: String?): TimelineEmptyItem {
-        val makesEmptyItemVisible = prevEvent == null || timelineEventVisibilityHelper.shouldShowEvent(prevEvent, eventIdToHighlight)
+    private fun buildEmptyItem(timelineEvent: TimelineEvent, prevEvent: TimelineEvent?, highlightedEventId: String?): TimelineEmptyItem {
+        val isNotBlank = prevEvent == null || timelineEventVisibilityHelper.shouldShowEvent(prevEvent, highlightedEventId)
         return TimelineEmptyItem_()
                 .id(timelineEvent.localId)
                 .eventId(timelineEvent.eventId)
-                .visible(makesEmptyItemVisible)
+                .notBlank(isNotBlank)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
new file mode 100644
index 0000000000..dfd9fd2370
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.factory
+
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+
+data class TimelineItemFactoryParams(
+        val event: TimelineEvent,
+        val prevEvent: TimelineEvent? = null,
+        val nextEvent: TimelineEvent? = null,
+        val highlightedEventId: String? = null ,
+        val lastSentEventIdWithoutReadReceipts: String? = null ,
+        val callback: TimelineEventController.Callback? = null
+) {
+
+    val isHighlighted: Boolean
+        get() = highlightedEventId == event.eventId
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
index 960487140d..51951fdc8d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
@@ -20,7 +20,6 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
@@ -35,7 +34,6 @@ import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageRelationContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationCancelContent
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
 /**
@@ -54,37 +52,35 @@ class VerificationItemFactory @Inject constructor(
         private val session: Session
 ) {
 
-    fun create(event: TimelineEvent,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?
-    ): VectorEpoxyModel<*>? {
+    fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
+        val event = params.event
         if (event.root.eventId == null) return null
 
         val relContent: MessageRelationContent = event.root.content.toModel()
                 ?: event.root.getClearContent().toModel()
-                ?: return ignoredConclusion(event, highlight, callback)
+                ?: return ignoredConclusion(params)
 
-        if (relContent.relatesTo?.type != RelationType.REFERENCE) return ignoredConclusion(event, highlight, callback)
+        if (relContent.relatesTo?.type != RelationType.REFERENCE) return ignoredConclusion(params)
         val refEventId = relContent.relatesTo?.eventId
-                ?: return ignoredConclusion(event, highlight, callback)
+                ?: return ignoredConclusion(params)
 
         // If we cannot find the referenced request we do not display the done event
         val refEvent = session.getRoom(event.root.roomId ?: "")?.getTimeLineEvent(refEventId)
-                ?: return ignoredConclusion(event, highlight, callback)
+                ?: return ignoredConclusion(params)
 
         // If it's not a request ignore this event
         // if (refEvent.root.getClearContent().toModel<MessageVerificationRequestContent>() == null) return ignoredConclusion(event, highlight, callback)
 
-        val referenceInformationData = messageInformationDataFactory.create(refEvent, null, null)
+        val referenceInformationData = messageInformationDataFactory.create(TimelineItemFactoryParams(refEvent))
 
-        val informationData = messageInformationDataFactory.create(event, null, null)
-        val attributes = messageItemAttributesFactory.create(null, informationData, callback)
+        val informationData = messageInformationDataFactory.create(params)
+        val attributes = messageItemAttributesFactory.create(null, informationData,params.callback)
 
         when (event.root.getClearType()) {
             EventType.KEY_VERIFICATION_CANCEL -> {
                 // Is the request referenced is actually really cancelled?
                 val cancelContent = event.root.getClearContent().toModel<MessageVerificationCancelContent>()
-                        ?: return ignoredConclusion(event, highlight, callback)
+                        ?: return ignoredConclusion(params)
 
                 when (safeValueOf(cancelContent.code)) {
                     CancelCode.MismatchedCommitment,
@@ -107,22 +103,22 @@ class VerificationItemFactory @Inject constructor(
                                                 readReceiptsCallback = attributes.readReceiptsCallback
                                         )
                                 )
-                                .highlighted(highlight)
+                                .highlighted(params.isHighlighted)
                                 .leftGuideline(avatarSizeProvider.leftGuideline)
                     }
-                    else                     -> return ignoredConclusion(event, highlight, callback)
+                    else                     -> return ignoredConclusion(params)
                 }
             }
             EventType.KEY_VERIFICATION_DONE   -> {
                 // Is the request referenced is actually really completed?
                 if (referenceInformationData.referencesInfoData?.verificationStatus != VerificationState.DONE) {
-                    return ignoredConclusion(event, highlight, callback)
+                    return ignoredConclusion(params)
                 }
                 // We only tale the one sent by me
 
                 if (informationData.sentByMe) {
                     // We only display the done sent by the other user, the done send by me is ignored
-                    return ignoredConclusion(event, highlight, callback)
+                    return ignoredConclusion(params)
                 }
                 return StatusTileTimelineItem_()
                         .attributes(
@@ -140,18 +136,15 @@ class VerificationItemFactory @Inject constructor(
                                         readReceiptsCallback = attributes.readReceiptsCallback
                                 )
                         )
-                        .highlighted(highlight)
+                        .highlighted(params.isHighlighted)
                         .leftGuideline(avatarSizeProvider.leftGuideline)
             }
         }
         return null
     }
 
-    private fun ignoredConclusion(event: TimelineEvent,
-                                  highlight: Boolean,
-                                  callback: TimelineEventController.Callback?
-    ): VectorEpoxyModel<*>? {
-        if (userPreferencesProvider.shouldShowHiddenEvents()) return noticeItemFactory.create(event, highlight, callback)
+    private fun ignoredConclusion(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
+        if (userPreferencesProvider.shouldShowHiddenEvents()) return noticeItemFactory.create(params)
         return null
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
index a6a88a3444..1fc57489a5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/WidgetItemFactory.kt
@@ -20,7 +20,6 @@ import im.vector.app.ActiveSessionDataSource
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
@@ -29,7 +28,6 @@ import im.vector.app.features.home.room.detail.timeline.item.WidgetTileTimelineI
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import javax.inject.Inject
@@ -47,25 +45,24 @@ class WidgetItemFactory @Inject constructor(
 
     private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
 
-    fun create(event: TimelineEvent,
-               highlight: Boolean,
-               callback: TimelineEventController.Callback?): VectorEpoxyModel<*>? {
+    fun create(params: TimelineItemFactoryParams): VectorEpoxyModel<*>? {
+        val event = params.event
         val widgetContent: WidgetContent = event.root.getClearContent().toModel() ?: return null
         val previousWidgetContent: WidgetContent? = event.root.resolvedPrevContent().toModel()
 
         return when (WidgetType.fromString(widgetContent.type ?: previousWidgetContent?.type ?: "")) {
-            WidgetType.Jitsi -> createJitsiItem(event, callback, widgetContent, previousWidgetContent)
+            WidgetType.Jitsi -> createJitsiItem(params, widgetContent, previousWidgetContent)
             // There is lot of other widget types we could improve here
-            else             -> noticeItemFactory.create(event, highlight, callback)
+            else             -> noticeItemFactory.create(params)
         }
     }
 
-    private fun createJitsiItem(timelineEvent: TimelineEvent,
-                                callback: TimelineEventController.Callback?,
+    private fun createJitsiItem(params: TimelineItemFactoryParams,
                                 widgetContent: WidgetContent,
                                 previousWidgetContent: WidgetContent?): VectorEpoxyModel<*> {
-        val informationData = informationDataFactory.create(timelineEvent, null, null)
-        val attributes = messageItemAttributesFactory.create(null, informationData, callback)
+        val timelineEvent = params.event
+        val informationData = informationDataFactory.create(params)
+        val attributes = messageItemAttributesFactory.create(null, informationData, params.callback)
 
         val disambiguatedDisplayName = timelineEvent.senderInfo.disambiguatedDisplayName
         val message = if (widgetContent.isActive()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index abaa2ffa17..14dd311265 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -19,11 +19,11 @@ package im.vector.app.features.home.room.detail.timeline.helper
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
 import im.vector.app.core.extensions.localDateTime
+import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
 import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
 import im.vector.app.features.home.room.detail.timeline.item.PollResponseData
 import im.vector.app.features.home.room.detail.timeline.item.ReactionInfoData
-import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.ReferencesInfoData
 import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
 import im.vector.app.features.settings.VectorPreferences
@@ -51,9 +51,10 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                                                         private val dateFormatter: VectorDateFormatter,
                                                         private val vectorPreferences: VectorPreferences) {
 
-    fun create(event: TimelineEvent, prevEvent: TimelineEvent?, nextEvent: TimelineEvent?): MessageInformationData {
-        // Non nullability has been tested before
-        val eventId = event.root.eventId!!
+    fun create(params: TimelineItemFactoryParams): MessageInformationData {
+        val event = params.event
+        val nextEvent = params.nextEvent
+        val eventId = event.eventId
 
         val date = event.root.localDateTime()
         val nextDate = nextEvent?.root?.localDateTime()
@@ -76,9 +77,8 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         val isSentByMe = event.root.senderId == session.myUserId
         val sendStateDecoration = if (isSentByMe) {
             getSendStateDecoration(
-                    eventSendState = event.root.sendState,
-                    prevEventSendState = prevEvent?.root?.sendState,
-                    anyReadReceipts = event.readReceipts.any { it.user.userId != session.myUserId },
+                    event = event,
+                    lastSentEventWithoutReadReceipts = params.lastSentEventIdWithoutReadReceipts,
                     isMedia = event.root.isAttachmentMessage()
             )
         } else {
@@ -122,15 +122,15 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         )
     }
 
-    private fun getSendStateDecoration(eventSendState: SendState,
-                                       prevEventSendState: SendState?,
-                                       anyReadReceipts: Boolean,
+    private fun getSendStateDecoration(event: TimelineEvent,
+                                       lastSentEventWithoutReadReceipts: String?,
                                        isMedia: Boolean): SendStateDecoration {
+        val eventSendState = event.root.sendState
         return if (eventSendState.isSending()) {
             if (isMedia) SendStateDecoration.SENDING_MEDIA else SendStateDecoration.SENDING_NON_MEDIA
         } else if (eventSendState.hasFailed()) {
             SendStateDecoration.FAILED
-        } else if (eventSendState.isSent() && !prevEventSendState?.isSent().orFalse() && !anyReadReceipts) {
+        } else if (lastSentEventWithoutReadReceipts == event.eventId) {
             SendStateDecoration.SENT
         } else {
             SendStateDecoration.NONE
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
index 392cb0ae57..e8353ff264 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.home.room.detail.timeline.helper
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.VisibilityState
 import im.vector.app.core.epoxy.LoadingItem_
-import im.vector.app.core.epoxy.TimelineEmptyItem
 import im.vector.app.core.epoxy.TimelineEmptyItem_
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.features.call.webrtc.WebRtcCallManager
@@ -29,7 +28,6 @@ import im.vector.app.features.home.room.detail.timeline.item.CallTileTimelineIte
 import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem
 import im.vector.app.features.home.room.detail.timeline.item.ItemWithEvents
 import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
-import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import kotlin.reflect.KMutableProperty0
 
@@ -67,30 +65,29 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
 
         // Then iterate on models so we have the exact positions in the adapter
         modelsIterator.forEach { epoxyModel ->
-            if(epoxyModel !is TimelineEmptyItem){
-                atLeastOneVisibleItemSinceLastDaySeparator = true
-                atLeastOneVisibleItemsBeforeReadMarker = true
-            }
             if (epoxyModel is ItemWithEvents) {
+                if (epoxyModel.isVisible()) {
+                    atLeastOneVisibleItemSinceLastDaySeparator = true
+                    atLeastOneVisibleItemsBeforeReadMarker = true
+                }
                 epoxyModel.getEventIds().forEach { eventId ->
                     adapterPositionMapping[eventId] = index
-                    if (eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker) {
+                    if (eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker && epoxyModel.canAppendReadMarker()) {
                         modelsIterator.addReadMarkerItem(callback)
                         index++
                         positionOfReadMarker.set(index)
                     }
                 }
             }
-            if(epoxyModel is DaySeparatorItem){
-                if(!atLeastOneVisibleItemSinceLastDaySeparator){
+            if (epoxyModel is DaySeparatorItem) {
+                if (!atLeastOneVisibleItemSinceLastDaySeparator) {
                     modelsIterator.remove()
                     return@forEach
                 }
                 atLeastOneVisibleItemSinceLastDaySeparator = false
-            }
-            else if (epoxyModel is CallTileTimelineItem) {
+            } else if (epoxyModel is CallTileTimelineItem) {
                 val hasBeenRemoved = modelsIterator.removeCallItemIfNeeded(epoxyModel, callIds, showHiddenEvents)
-                if(!hasBeenRemoved){
+                if (!hasBeenRemoved) {
                     atLeastOneVisibleItemSinceLastDaySeparator = true
                 }
             }
@@ -126,7 +123,7 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
             val emptyItem = TimelineEmptyItem_()
                     .id(epoxyModel.id())
                     .eventId(epoxyModel.attributes.informationData.eventId)
-                    .visible(false)
+                    .notBlank(false)
             add(emptyItem)
         }
         callIds.add(callId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
index 54d76bc681..39c95a5915 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
 
 class TimelineEventVisibilityHelper @Inject constructor(private val userPreferencesProvider: UserPreferencesProvider) {
 
-    fun nextSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int): List<TimelineEvent> {
+    fun nextSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int, eventIdToHighlight: String?): List<TimelineEvent> {
         if (index >= timelineEvents.size - 1) {
             return emptyList()
         }
@@ -51,30 +51,30 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
         } else {
             nextSameDayEvents.subList(0, indexOfFirstDifferentEventType)
         }
-        val filteredSameTypeEvents = sameTypeEvents.filter { shouldShowEvent(it)}
+        val filteredSameTypeEvents = sameTypeEvents.filter { shouldShowEvent(it, eventIdToHighlight)}
         if (filteredSameTypeEvents.size < minSize) {
             return emptyList()
         }
         return  filteredSameTypeEvents
     }
 
-    fun prevSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int): List<TimelineEvent> {
+    fun prevSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int, eventIdToHighlight: String?): List<TimelineEvent> {
         val prevSub = timelineEvents.subList(0, index + 1)
         return prevSub
                 .reversed()
                 .let {
-                    nextSameTypeEvents(it, 0, minSize)
+                    nextSameTypeEvents(it, 0, minSize, eventIdToHighlight)
                 }
                 .reversed()
     }
 
-    fun shouldShowEvent(timelineEvent: TimelineEvent, highlightEventId: String? = null): Boolean {
+    fun shouldShowEvent(timelineEvent: TimelineEvent, highlightedEventId: String?): Boolean {
         // If show hidden events is true we should always display something
         if (userPreferencesProvider.shouldShowHiddenEvents()) {
             return true
         }
         // We always show highlighted event
-        if (timelineEvent.eventId == highlightEventId) {
+        if (timelineEvent.eventId == highlightedEventId) {
             return true
         }
         if (!timelineEvent.isDisplayable()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
index aae1edbed1..85fcc306f6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -44,6 +44,7 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     lateinit var dimensionConverter: DimensionConverter
 
+
     @CallSuper
     override fun bind(holder: H) {
         super.bind(holder)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
index cf4211bb2c..eeb3826ccd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
@@ -22,4 +22,9 @@ interface ItemWithEvents {
      * Will generally get only one, but it handles the merged items.
      */
     fun getEventIds(): List<String>
+
+    fun canAppendReadMarker(): Boolean = true
+
+    fun isVisible(): Boolean = true
+
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
index 84b2662687..b88afb0598 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ReadReceiptsItem.kt
@@ -33,6 +33,8 @@ abstract class ReadReceiptsItem : EpoxyModelWithHolder<ReadReceiptsItem.Holder>(
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var clickListener: View.OnClickListener
 
+    override fun canAppendReadMarker(): Boolean = false
+
     override fun getEventIds(): List<String> = listOf(eventId)
 
     override fun bind(holder: Holder) {

From 3686d8efadf619f3e63246c6692dae83f4ca66b6 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 29 Mar 2021 11:49:18 +0000
Subject: [PATCH 451/578] Translated using Weblate (Esperanto)

Currently translated at 92.2% (2179 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/eo/
---
 vector/src/main/res/values-eo/strings.xml | 90 ++++++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml
index 747511f745..4e506e1d59 100644
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@@ -1596,7 +1596,7 @@
     <string name="room_settings_room_access_warning">Por ligi al ĉambro, ĝi devas havi adreson.</string>
     <string name="room_settings_read_history_entry_members_only_joined">Nur anoj (ekde aliĝo)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Nur anoj (ekde sia aliĝo)</string>
-    <string name="room_settings_read_history_entry_members_only_option_time_shared">Nur anoj (ekde elekto de ĉi tiu elekteblo)</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Nur anoj (ekde ĉi tiu elekto)</string>
     <string name="room_settings_read_history_entry_anyone">Ĉiu ajn</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Kio povas aliri ĉi tiun ĉambron\?</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Kiu povas legi historion\?</string>
@@ -2393,4 +2393,92 @@
     <string name="action_add">Aldoni</string>
     <string name="start_chatting">Ekbabili</string>
     <string name="system_theme">Implicita de sistemo</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Ĉu forlasi la nunan grupan vokon kaj iri al la alia\?</string>
+    <string name="room_settings_room_version_title">Versio de ĉambro</string>
+    <string name="room_alias_publish_to_directory_error">Ne povis akiri la nunan videblecon en la katalogo de ĉambroj (%1$s).</string>
+    <string name="room_alias_publish_to_directory">Ĉu publikigi ĉi tiun ĉambron per la katalogo de ĉambroj de %1$s\?</string>
+    <string name="room_alias_action_unpublish">Malpublikigi ĉi tiun adreson</string>
+    <string name="room_alias_action_publish">Publikigi ĉi tiun adreson</string>
+    <string name="room_alias_local_address_add">Aldoni lokan adreson</string>
+    <string name="room_alias_local_address_empty">Ĉi tiu ĉambro ne havas lokajn adresojn</string>
+    <string name="room_alias_local_address_subtitle">Agordu adresojn por ĉi tiu ĉambro, por ke uzantoj ĝin facile trovu per via hejmservilo (%1$s)</string>
+    <string name="room_permissions_change_topic">Ŝanĝi la temon</string>
+    <string name="room_permissions_upgrade_the_room">Gradaltigi la ĉambron</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Sendi eventojn de la speco «m.room.server_acl»</string>
+    <string name="room_permissions_change_permissions">Ŝanĝi permesojn</string>
+    <string name="room_permissions_change_room_name">Ŝanĝi nomon de ĉambro</string>
+    <string name="room_permissions_change_history_visibility">Ŝanĝi videblecon de historio</string>
+    <string name="room_permissions_enable_room_encryption">Ŝalti tutvojan ĉifradon</string>
+    <string name="room_permissions_change_main_address_for_the_room">Ŝanĝi ĉefadreson de la ĉambro</string>
+    <string name="room_permissions_change_room_avatar">Ŝanĝi bildon de ĉambro</string>
+    <string name="room_permissions_modify_widgets">Ŝanĝi fenestraĵojn</string>
+    <string name="room_permissions_notify_everyone">Sciigi ĉiujn</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Forigi mesaĝojn senditajn de aliuloj</string>
+    <string name="room_permissions_ban_users">Forbari uzantojn</string>
+    <string name="room_permissions_kick_users">Forpeli uzantojn</string>
+    <string name="room_permissions_change_settings">Ŝanĝi agordojn</string>
+    <string name="room_permissions_invite_users">Inviti uzantojn</string>
+    <string name="room_permissions_send_messages">Sendi mesaĝon</string>
+    <string name="room_permissions_default_role">Ordinara rolo</string>
+    <string name="room_settings_permissions_title">Permesoj en ĉambro</string>
+    <string name="error_unauthorized">Nerajtigite, mankas validaj aŭtentikigiloj</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Montri ĉiujn ĉambrojn en la katalogo de ĉambro, inkluzive tiujn kun konsterna enhavo.</string>
+    <string name="settings_room_directory_show_all_rooms">Montri ĉambrojn kun konsterna enhavo</string>
+    <string name="settings_category_room_directory">Katalogo de ĉambroj</string>
+    <string name="dialog_edit_hint">Nova valoro</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Vi ŝanĝis la adresojn por ĉi tiu ĉambro.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s ŝanĝis la adresojn por ĉi tiu ĉambro.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Vi ŝanĝis la ĉefan kaj alternativajn adresojn por ĉi tiu ĉambro.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s ŝanĝis la ĉefan kaj alternativajn adresojn por ĉi tiu ĉambro.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Vi ŝanĝis la alternativajn adresojn por ĉi tiu ĉambro.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s ŝanĝis la alternativajn adresojn por ĉi tiu ĉambro.</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Vi forigis la alternativan adreson %1$s por ĉi tiu ĉambro.</item>
+        <item quantity="other">Vi forigis la alternativajn adresojn %1$s por ĉi tiu ĉambro.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s forigis la alternativan adreson %2$s por ĉi tiu ĉambro.</item>
+        <item quantity="other">%1$s forigis la alternativajn adresojn %2$s por ĉi tiu ĉambro.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Vi aldonis la alternativan adreson %1$s por ĉi tiu ĉambro.</item>
+        <item quantity="other">Vi aldonis la alternativajn adresojn %1$s por ĉi tiu ĉambro.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s aldonis la alternativan adreson %2$s por ĉi tiu ĉambro.</item>
+        <item quantity="other">%1$s aldonis la alternativajn adresojn %2$s por ĉi tiu ĉambro.</item>
+    </plurals>
+    <string name="initial_sync_start_downloading">Komenca spegulado:
+\nElŝutante datumojn…</string>
+    <string name="initial_sync_start_server_computing">Komenca spegulado:
+\nAtendante respondon de servilo…</string>
+    <string name="room_displayname_empty_room_was">Malplena ĉambro (estis %s)</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s, kaj %4$d alia</item>
+        <item quantity="other">%1$s, %2$s, %3$s, kaj %4$d aliaj</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s kaj %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s kaj %3$s</string>
+    <string name="notice_widget_jitsi_modified_by_you">Vi ŝanĝis grupan vidvokon</string>
+    <string name="notice_widget_jitsi_modified">Grupan vidvokon ŝanĝis %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Vi finis grupan vidvokon</string>
+    <string name="notice_widget_jitsi_removed">Grupan vidvokon finis %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Vi komencis grupan vidvokon</string>
+    <string name="notice_widget_jitsi_added">Grupan vidvokon komencis %1$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Partoprenado de ĉiuj serviloj estas malpermesita! Ĉi tiu ĉambro ne plu uzeblas.</string>
+    <string name="notice_room_server_acl_updated_no_change">Senŝanĝe.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Serviloj akordaj kun precizaj IP-adresoj nun estas forbaritaj.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Serviloj akordaj kun precizaj IP-adresoj nun estas permesitaj.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Serviloj akordaj kun %s foriĝis de la listo de forbaritaj.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Serviloj akordaj kun %s foriĝis de la listo de permesitaj.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Serviloj akordaj kun %s nun estas permesitaj.</string>
+    <string name="notice_room_server_acl_updated_banned">• Serviloj akordaj kun %s nun estas forbaritaj.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Vi ŝanĝis la alirpermesojn por serviloj por ĉi tiu ĉambro.</string>
+    <string name="notice_room_server_acl_updated_title">%s ŝanĝis la alirpermesojn por serviloj por ĉi tiu ĉambro.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Serviloj akordaj kun precizaj IP-adresoj estas forbaritaj.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Serviloj akordaj kun precizaj IP-adresoj estas permesitaj.</string>
+    <string name="notice_room_server_acl_set_allowed">• Serviloj akordaj kun %s estas permesitaj.</string>
+    <string name="notice_room_server_acl_set_banned">• Serviloj akordaj kun %s estas forbaritaj.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Vi agordis la alirpermesojn por serviloj por ĉi tiu ĉambro.</string>
+    <string name="notice_room_server_acl_set_title">%s agordis la alirpermesojn por serviloj por ĉi tiu ĉambro.</string>
 </resources>
\ No newline at end of file

From 9543a110a4f78ade95bfb6f744c5cfbd6e55b48f Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Mon, 29 Mar 2021 05:59:50 +0000
Subject: [PATCH 452/578] Translated using Weblate (Galician)

Currently translated at 32.9% (778 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/gl/
---
 vector/src/main/res/values-gl/strings.xml | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml
index bbfe838ca7..61beb07197 100644
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@@ -830,4 +830,28 @@
     <string name="title_activity_keys_backup_setup">Copia de apoio da chave</string>
     <string name="notification_sync_init">Iniciando o servizo</string>
     <string name="system_theme">Por defecto no sistema</string>
+    <string name="missing_permissions_error">Debido á falta de permisos, esta acción non é posible.</string>
+    <string name="start_chatting">Iniciar Chat</string>
+    <string name="reset">Restablecer</string>
+    <string name="dismiss">Desbotar</string>
+    <string name="pause_video">Deter</string>
+    <string name="play_video">Reproducir</string>
+    <string name="disconnect">Desconectar</string>
+    <string name="revoke">Revogar</string>
+    <string name="none">Nada</string>
+    <string name="stay">Permanecer</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Vas perder o acceso ás túas mensaxes cifradas a non ser que fagas unha copia de apoio das chaves antes de desconectar.</string>
+    <string name="backup">Copiar</string>
+    <string name="are_you_sure">Tes a certeza\?</string>
+    <string name="keys_backup_activate">Usa a Copia de apoio das Chaves</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Copiando as chaves…</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Non quero as miñas mensaxes cifradas</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">A Copia Segura das Chaves está activa para tódalas túas sesións para evitar perder o acceso ás mensaxes cifradas.</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Estase realizando a copia de apoio. Se desconectas agora perderás o acceso ás mensaxes cifradas.</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Vas perdelas mensaxes cifradas se desconectas agora</string>
+    <string name="keys_backup_is_not_finished_please_wait">Non rematou a copia das chaves, agarda…</string>
+    <string name="initial_sync_start_downloading">Sincr. inicial:
+\nDescargando datos…</string>
+    <string name="initial_sync_start_server_computing">Sincr. inicial:
+\nAgardando resposta do servidor…</string>
 </resources>
\ No newline at end of file

From 44db075015c5a4e09847cdacdb283d6aac7db52e Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Sun, 28 Mar 2021 18:06:15 +0000
Subject: [PATCH 453/578] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.0% (2316 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 vector/src/main/res/values-zh-rCN/strings.xml | 112 ++++++++++--------
 1 file changed, 63 insertions(+), 49 deletions(-)

diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 365b6827a9..82ec8fc36d 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -145,12 +145,12 @@
     <string name="notice_room_third_party_invite_by_you">您向 %1$s 发送了加入聊天室的邀请</string>
     <string name="notice_room_third_party_revoked_invite_by_you">您已撤回了对 %1$s 加入聊天室的邀请</string>
     <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀请</string>
-    <string name="notice_widget_added">%1$s 添加了 %2$s 小部件</string>
-    <string name="notice_widget_added_by_you">您添加了 %1$s 小部件</string>
-    <string name="notice_widget_removed">%1$s 移除了 %2$s 小部件</string>
-    <string name="notice_widget_removed_by_you">您移除了 %1$s 小部件</string>
-    <string name="notice_widget_modified">%1$s 修改了 %2$s 小部件</string>
-    <string name="notice_widget_modified_by_you">您修改了 %1$s 小部件</string>
+    <string name="notice_widget_added">%1$s 添加了 %2$s 挂件</string>
+    <string name="notice_widget_added_by_you">您添加了 %1$s 挂件</string>
+    <string name="notice_widget_removed">%1$s 移除了 %2$s 挂件</string>
+    <string name="notice_widget_removed_by_you">您移除了 %1$s 挂件</string>
+    <string name="notice_widget_modified">%1$s 修改了 %2$s 挂件</string>
+    <string name="notice_widget_modified_by_you">您修改了 %1$s 挂件</string>
     <string name="power_level_admin">管理员</string>
     <string name="power_level_moderator">审核员</string>
     <string name="power_level_default">默认</string>
@@ -395,11 +395,11 @@
     <string name="attachment_remaining_time_seconds">%d 秒</string>
     <string name="call_connected">通话已连接</string>
     <string name="call_connecting">通话正在连接…</string>
-    <string name="template_permissions_rationale_msg_storage">为了发送或保存附件，${app_name} 需要访问您的图片和视频库。
+    <string name="template_permissions_rationale_msg_storage">为发送或保存附件，${app_name} 需要权限以访问您的图片和视频库。
 \n
-\n请在接下来弹出的窗口中授权允许访问，以便应用能够从您的手机发送文件。</string>
-    <string name="template_permissions_rationale_msg_camera">为了拍照或进行视频通话，${app_name} 需要访问您的相机。</string>
-    <string name="template_permissions_rationale_msg_record_audio">为了进行语音通话，${app_name} 需要访问您的麦克风。</string>
+\n请在接下来的弹出窗口中授权允许访问，以便从此设备中发送文件。</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} 需要权限来访问您的相机，以拍摄照片或进行视频通话。</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} 需要权限以访问您的麦克风来进行语音通话。</string>
     <string name="room_preview_try_join_an_unknown_room">您试图访问聊天室 %s。您是否愿意加入这个聊天室？</string>
     <string name="room_participants_header_admin_tools">管理工具</string>
     <string name="room_participants_header_direct_chats">私聊</string>
@@ -582,9 +582,9 @@
     <string name="permissions_rationale_msg_record_audio_explanation">"
 \n
 \n请在接下来弹出的窗口中授权允许访问。"</string>
-    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name}需要许可才能访问您的摄像机和麦克风来执行视频通话。
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} 需要权限以访问您的摄像机和麦克风来进行视频通话。
 \n
-\n请在接下来弹出的窗口中授权允许访问。</string>
+\n请在接下来的弹出窗口中授权允许访问，以便进行通话。</string>
     <string name="permissions_action_not_performed_missing_permissions">对不起。因为权限不足，操作已取消</string>
     <string name="media_slider_saved_message">保存至下载？</string>
     <string name="remove">移除</string>
@@ -594,8 +594,8 @@
     <string name="room_participants_header_call">通话</string>
     <string name="room_participants_power_level_prompt">您将不能撤销这个修改，因为您正在让这个用户和您拥有相同的特权级别。 
 \n您确定吗？</string>
-    <string name="ssl_cert_not_trust">这可能意味着有人在恶意劫持您的通讯，或者您的手机不信任远程服务器的数字证书。</string>
-    <string name="ssl_cert_new_account_expl">如果服务器管理员说这是正常的，请确保以下的指纹与管理员提供的指纹相符。</string>
+    <string name="ssl_cert_not_trust">这可能意味着有人正在恶意劫持您的流量，或者您的手机不信任远程服务器提供的数字证书。</string>
+    <string name="ssl_cert_new_account_expl">如果服务器管理员说这是预期的情况，请确保下面的指纹与管理员提供的指纹相匹配。</string>
     <string name="room_event_action_report_prompt_reason">报告这个内容的原因</string>
     <string name="room_recents_directory">目录</string>
     <string name="room_recents_invites">邀请</string>
@@ -644,17 +644,15 @@
     <string name="send_files_in">发送至</string>
     <string name="read_receipts_list">已读标签清单</string>
     <string name="compression_options">发送为</string>
-    <string name="template_permissions_rationale_msg_contacts">${app_name} 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
-
-请在接下来的弹出窗口中授权允许访问。</string>
-    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name}可以检查您的通讯录，以根据电子邮件和电话号码找到其他Matrix用户。
+    <string name="template_permissions_rationale_msg_contacts">${app_name} 可以检查您的通讯录，并基于他们的邮箱地址和电话号码，来查找其他 Matrix 用户。若您同意本应用以此目的访问您的通讯录，请在接下来的弹出窗口中授权允许访问。</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} 可以检查您的通讯录，并基于他们的邮箱地址和电话号码，来查找其他 Matrix 用户。
 \n
-\n你同意为此目的分享你的通讯录吗\?</string>
+\n您是否同意本应用以此目的访问您的通讯录\?</string>
     <string name="room_participants_idle">空闲</string>
     <string name="people_search_filter_text">仅 Matrix 用户</string>
-    <string name="ssl_unexpected_existing_expl">证书已从某个您的手机所信任的证书更改为另一个。这<b>非常反常</b>。建议您<b>不要接受</b>此新证书。</string>
+    <string name="ssl_unexpected_existing_expl">证书已从一个先前受您的设备信任的证书更改为另一个。这<b>非常反常</b>！建议您<b>不要接受</b>此新证书。</string>
     <string name="ssl_expected_existing_expl">证书已从曾受信任的证书更改为不受信任的证书。服务器可能已更新其证书，请联系管理员并核对服务器的指纹。</string>
-    <string name="ssl_only_accept">请仅在服务器管理员已经发布了与上述指纹相匹配的指纹的情况下接受该证书。</string>
+    <string name="ssl_only_accept">请仅在服务器管理员发布了与上述指纹匹配的指纹的情况下接受该证书。</string>
     <string name="room_details_people">成员</string>
     <string name="malformed_id">ID 的格式不正确。应该是一个电子邮箱地址或 Matrix ID，如 “@localpart:domain”</string>
     <string name="tab_title_search_people">联系人</string>
@@ -760,12 +758,12 @@
     <string name="black_theme">黑色主题</string>
     <string name="settings_notification_ringtone">通知声音</string>
     <string name="settings_12_24_timestamps">使用12小时制显示时间戳</string>
-    <string name="widget_no_power_to_manage">您需要权限来管理这个聊天室的小部件</string>
-    <string name="widget_creation_failure">创建小部件失败</string>
+    <string name="widget_no_power_to_manage">您需要权限来管理这个聊天室的挂件</string>
+    <string name="widget_creation_failure">创建挂件失败</string>
     <string name="settings_labs_create_conference_with_jitsi">用 jitsi 创建会议通话</string>
-    <string name="widget_delete_message_confirmation">您确定要删除这个小部件吗？</string>
+    <string name="widget_delete_message_confirmation">您确定要删除这个挂件吗？</string>
     <!-- Widget Integration Manager -->
-    <string name="widget_integration_unable_to_create">无法创建小部件。</string>
+    <string name="widget_integration_unable_to_create">无法创建挂件。</string>
     <string name="widget_integration_failed_to_send_request">发送请求失败。</string>
     <string name="widget_integration_positive_power_level">特权级别必须是正整数。</string>
     <string name="widget_integration_must_be_in_room">您不在这个聊天室。</string>
@@ -859,7 +857,7 @@
         <item quantity="other">%d 个聊天室</item>
     </plurals>
     <plurals name="active_widgets">
-        <item quantity="other">已启用 %d 个小部件</item>
+        <item quantity="other">已启用 %d 个挂件</item>
     </plurals>
     <!-- Widget Integration Manager -->
     <string name="community_name">社区名称</string>
@@ -1478,24 +1476,24 @@
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="active_widget_view_action">查看</string>
-    <string name="active_widgets_title">活动小部件</string>
-    <string name="room_widget_activity_title">小部件</string>
-    <string name="room_widget_permission_title">载入小部件</string>
-    <string name="room_widget_permission_added_by">此小部件添加者：</string>
+    <string name="active_widgets_title">活动挂件</string>
+    <string name="room_widget_activity_title">挂件</string>
+    <string name="room_widget_permission_title">载入挂件</string>
+    <string name="room_widget_permission_added_by">此挂件添加者：</string>
     <string name="room_widget_permission_webview_shared_info_title">使用它会设置 cookie 并与 %s 分享数据：</string>
     <string name="room_widget_permission_shared_info_title">使用它会与 %s 分享数据：</string>
-    <string name="room_widget_failed_to_load">无法载入小部件。
+    <string name="room_widget_failed_to_load">无法载入挂件。
 \n%s</string>
-    <string name="room_widget_reload">重载小部件</string>
+    <string name="room_widget_reload">重载挂件</string>
     <string name="room_widget_open_in_browser">在浏览器中打开</string>
     <string name="room_widget_revoke_access">撤消我的访问权限</string>
     <string name="room_widget_permission_display_name">您的昵称</string>
     <string name="room_widget_permission_avatar_url">您的头像 URL</string>
     <string name="room_widget_permission_user_id">您的用户 ID</string>
     <string name="room_widget_permission_theme">您的主题</string>
-    <string name="room_widget_permission_widget_id">小部件 ID</string>
+    <string name="room_widget_permission_widget_id">挂件 ID</string>
     <string name="room_widget_permission_room_id">聊天室 ID</string>
-    <string name="room_widget_resource_permission_title">小部件想使用以下资源：</string>
+    <string name="room_widget_resource_permission_title">挂件想使用以下资源：</string>
     <string name="room_widget_resource_grant_permission">允许</string>
     <string name="room_widget_resource_decline_permission">阻止全部</string>
     <string name="room_widget_webview_access_camera">使用相机</string>
@@ -1594,7 +1592,7 @@
     <string name="terms_of_service">服务条款</string>
     <string name="review_terms">审核条款</string>
     <string name="terms_description_for_identity_server">可被其他人发现</string>
-    <string name="terms_description_for_integration_manager">使用机器人，小部件和贴纸包</string>
+    <string name="terms_description_for_integration_manager">使用机器人，挂件和贴纸包</string>
     <string name="read_at">已读于</string>
     <string name="identity_server">身份服务器</string>
     <string name="disconnect_identity_server">断开身份服务器</string>
@@ -1672,9 +1670,9 @@
     <string name="content_reported_as_inappropriate_content">此内容已报告为不合适。 
 \n 
 \n如果您不希望再看到此用户的更多内容，您可以忽略他们以隐藏他们的消息。</string>
-    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} 需要权限在磁盘上保存您的端对端密钥。
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} 需要权限以在磁盘上保存您的端对端密钥。
 \n
-\n请在下个弹窗中允许访问以便手动导出密钥。</string>
+\n请在接下来的弹出窗口中授权允许访问，以便您手动导出密钥。</string>
     <string name="no_network_indicator">目前没有网络连接</string>
     <string name="message_ignore_user">忽略用户</string>
     <string name="room_list_quick_actions_notifications_all_noisy">全部消息（嘈杂）</string>
@@ -2174,8 +2172,8 @@
     <string name="identity_server_error_terms_not_signed">请先在设置中接受身份服务器的条款。</string>
     <string name="template_identity_server_error_bulk_sha256_not_supported">为了您的隐私，${app_name} 仅支持发送用户电子邮件和电话号码的哈希值。</string>
     <string name="identity_server_error_binding_error">关联失败。</string>
-    <string name="identity_server_error_no_current_binding_error">此标识符无当前关联。</string>
-    <string name="identity_server_set_default_notice">您的主服务器 (%1$s) 建议使用 %2$s 作为您的身份服务器</string>
+    <string name="identity_server_error_no_current_binding_error">目前与此标识符没有关联。</string>
+    <string name="identity_server_set_default_notice">您的主服务器（%1$s）建议使用 %2$s 作为您的身份服务器</string>
     <string name="identity_server_set_default_submit">使用 %1$s</string>
     <string name="identity_server_set_alternative_notice">或者，您可以输入任何其他身份服务器 URL</string>
     <string name="identity_server_set_alternative_notice_no_default">输入身份服务器 URL</string>
@@ -2214,14 +2212,14 @@
     <string name="crypto_error_withheld_unverified">您无法访问此消息，因为您的会话不被发送者信任</string>
     <string name="crypto_error_withheld_generic">您无法访问此消息因为发送者有意不发送密钥</string>
     <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密历史</string>
-    <string name="disclaimer_title">Riot 现在是 Element！</string>
-    <string name="disclaimer_content">我们兴奋地宣布我们改名了！您的应用已经是最新的并且您已登录您的账号。</string>
+    <string name="disclaimer_title">Riot 现已成为 Element！</string>
+    <string name="disclaimer_content">我们很高兴地宣布我们改名了！您的应用已经更新到最新版本，并且您已登录您的账号。</string>
     <string name="disclaimer_negative_button">明白了</string>
     <string name="disclaimer_positive_button">了解更多</string>
     <string name="save_recovery_key_chooser_hint">将恢复密钥保存到</string>
-    <string name="add_from_phone_book">从我的电话簿添加</string>
-    <string name="empty_phone_book">您的电话簿是空的</string>
-    <string name="phone_book_title">电话簿</string>
+    <string name="add_from_phone_book">从我的通讯录添加</string>
+    <string name="empty_phone_book">您的通讯录是空的</string>
+    <string name="phone_book_title">通讯录</string>
     <string name="search_in_my_contacts">搜索我的联系人</string>
     <string name="loading_contact_book">正在获取您的联系人…</string>
     <string name="empty_contact_book">您的通讯录是空的</string>
@@ -2252,13 +2250,13 @@
     <string name="audio_video_meeting_description">会议使用 Jitsi 安全与许可政策。您的会议进行期间当前聊天室内的所有人将看到加入邀请。</string>
     <string name="cannot_call_yourself">您无法呼叫您自己</string>
     <string name="cannot_call_yourself_with_invite">您无法与自己通话，请等待参与者接受邀请</string>
-    <string name="failed_to_add_widget">添加小部件失败</string>
-    <string name="failed_to_remove_widget">移除小部件失败</string>
+    <string name="failed_to_add_widget">添加挂件失败</string>
+    <string name="failed_to_remove_widget">移除挂件失败</string>
     <plurals name="encryption_import_room_keys_success">
         <item quantity="other">成功导入 %1$d/%2$d 个密钥。</item>
     </plurals>
     <string name="room_manage_integrations">管理集成</string>
-    <string name="room_no_active_widgets">无活动小部件</string>
+    <string name="room_no_active_widgets">无活动挂件</string>
     <string name="create_room_federation_error">聊天室已创建，但由于以下原因一些邀请尚未发送：
 \n
 \n%s</string>
@@ -2454,7 +2452,7 @@
     <string name="room_permissions_enable_room_encryption">启用聊天室加密</string>
     <string name="room_permissions_change_main_address_for_the_room">更改聊天室主地址</string>
     <string name="room_permissions_change_room_avatar">更改聊天室头像</string>
-    <string name="room_permissions_modify_widgets">修改小部件</string>
+    <string name="room_permissions_modify_widgets">修改挂件</string>
     <string name="room_permissions_notify_everyone">通知每个人</string>
     <string name="room_permissions_remove_messages_sent_by_others">移除其他人发送的消息</string>
     <string name="room_permissions_ban_users">封禁用户</string>
@@ -2508,7 +2506,7 @@
     <string name="dev_tools_state_event">状态事件</string>
     <string name="dev_tools_send_state_event">发送状态事件</string>
     <string name="dev_tools_send_custom_event">发送自定义事件</string>
-    <string name="dev_tools_menu_name">开发工具</string>
+    <string name="dev_tools_menu_name">开发者工具</string>
     <string name="a11y_video">视频</string>
     <string name="authentication_error">验证失败</string>
     <string name="call_transfer_users_tab_title">用户</string>
@@ -2561,4 +2559,20 @@
     <string name="notice_room_server_acl_updated_title">%s 修改了此聊天室的服务器访问控制列表。</string>
     <string name="notice_room_server_acl_set_title">%s 为此聊天室设置了服务器访问控制列表。</string>
     <string name="notice_room_server_acl_set_title_by_you">您为此聊天室设置了服务器访问控制列表。</string>
+    <string name="phone_book_perform_lookup">在 Matrix 上查找联系人</string>
+    <string name="identity_server_user_consent_not_provided">用户尚未同意条款。</string>
+    <string name="user_code_info_text">分享此二维码，其他人扫描后即可添加您，并开始聊天。</string>
+    <string name="user_code_my_code">我的二维码</string>
+    <string name="user_code_share">分享我的二维码</string>
+    <string name="dev_tools_error_no_message_type">消息类型缺失</string>
+    <string name="dev_tools_explore_room_state">检查聊天室状态</string>
+    <string name="a11y_view_read_receipts">查看已读回执</string>
+    <string name="a11y_rule_notify_off">关闭通知</string>
+    <string name="a11y_rule_notify_silent">无声通知</string>
+    <string name="a11y_rule_notify_noisy">有声通知</string>
+    <string name="a11y_unsent_draft">此聊天室有未发送的草稿</string>
+    <string name="a11y_error_some_message_not_sent">有些消息未被发送</string>
+    <string name="a11y_import_key_from_file">从文件中导入密钥</string>
+    <string name="a11y_error_message_not_sent">发生错误，消息未能发送</string>
+    <string name="dev_tools_form_hint_state_key">状态键</string>
 </resources>
\ No newline at end of file

From 8c4a99390694ef8d040cf5983932e7d38e990590 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Mon, 29 Mar 2021 16:25:04 +0000
Subject: [PATCH 454/578] Translated using Weblate (French)

Currently translated at 100.0% (2362 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 7c1496a73e..31eb24371c 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -811,7 +811,7 @@
     <string name="option_take_photo">Prendre une photo</string>
     <string name="option_take_video">Prendre une vidéo</string>
     <string name="settings_analytics">Statistiques d’utilisation</string>
-    <string name="settings_labs_native_camera">Utiliser la caméra native</string>
+    <string name="settings_labs_native_camera">Utiliser la caméra de l’appareil</string>
     <!-- share keys -->
     <string name="title_activity_bug_report">Rapport d’anomalie</string>
     <string name="conference_call_warning_title">Attention !</string>
@@ -1481,7 +1481,7 @@
     <string name="room_filtering_footer_create_new_direct_message">Envoyer un nouveau message privé</string>
     <string name="room_filtering_footer_open_room_directory">Voir le répertoire des salons</string>
     <string name="room_directory_search_hint">Nom ou identifiant (#exemple:matrix.org)</string>
-    <string name="labs_swipe_to_reply_in_timeline">Activer le balayage pour répondre dans les l’historique</string>
+    <string name="labs_swipe_to_reply_in_timeline">Activer le balayage pour répondre dans l’historique</string>
     <string name="link_copied_to_clipboard">Lien copié dans le presse-papiers</string>
     <string name="settings_integration_manager">Gestionnaire d’intégrations</string>
     <string name="integration_manager_not_configured">Aucun gestionnaire d’intégrations n’est configuré.</string>

From 2c7c8b58597c4d474c35f27c93155c7780238560 Mon Sep 17 00:00:00 2001
From: Andrejs <tlpbu@droplar.com>
Date: Sun, 28 Mar 2021 21:45:44 +0000
Subject: [PATCH 455/578] Translated using Weblate (Latvian)

Currently translated at 66.8% (1580 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
---
 vector/src/main/res/values-lv/strings.xml | 616 ++++++++++++++++++++--
 1 file changed, 564 insertions(+), 52 deletions(-)

diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index b5226f43ce..01646013ff 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -246,13 +246,13 @@
     <string name="title_activity_member_details">Dalībnieka informācija</string>
     <string name="title_activity_historical">Bijušie</string>
     <string name="ok">Lai notiek</string>
-    <string name="cancel">Tomēr nē</string>
+    <string name="cancel">Atcelt</string>
     <string name="save">Saglabāt</string>
     <string name="leave">Pamest</string>
     <string name="send">Nosūtīt</string>
     <string name="resend">Sūtīt atkārtoti</string>
     <string name="redact">Rediģēt</string>
-    <string name="quote">Citāts</string>
+    <string name="quote">Citēt</string>
     <string name="share">Dalīties</string>
     <string name="later">Vēlāk</string>
     <string name="forward">Pārsūtīt</string>
@@ -293,10 +293,10 @@
     <string name="bottom_action_favourites">Izlase</string>
     <string name="bottom_action_people">Cilvēki</string>
     <string name="bottom_action_rooms">Istabas</string>
-    <string name="home_filter_placeholder_home">Meklēt istabas</string>
-    <string name="home_filter_placeholder_favorites">Meklēt favorītus</string>
-    <string name="home_filter_placeholder_people">Meklēt cilvēkus</string>
-    <string name="home_filter_placeholder_rooms">Meklēt istabas</string>
+    <string name="home_filter_placeholder_home">Filtrēt istabu nosaukumus</string>
+    <string name="home_filter_placeholder_favorites">Filtrēt izlasi</string>
+    <string name="home_filter_placeholder_people">Filtrēt cilvēkus</string>
+    <string name="home_filter_placeholder_rooms">Filtrēt istabu nosaukumus</string>
     <string name="invitations_header">Uzaicinājumi</string>
     <string name="low_priority_header">Zema prioritāte</string>
     <string name="direct_chats_header">Sarunas</string>
@@ -365,7 +365,7 @@
     <string name="loading">Ielādējas…</string>
     <string name="action_exit">Izslēgt</string>
     <string name="bottom_action_groups">Kopienas</string>
-    <string name="home_filter_placeholder_groups">Meklēt kopienas</string>
+    <string name="home_filter_placeholder_groups">Filtrēt kopienu nosaukumus</string>
     <string name="groups_invite_header">Uzaicināt</string>
     <string name="groups_header">Kopienas</string>
     <string name="no_group_placeholder">Nav grupu</string>
@@ -378,8 +378,8 @@
     <string name="auth_opt_email_placeholder">Epasta adrese (izvēles)</string>
     <string name="auth_phone_number_placeholder">Tālruņa numurs</string>
     <string name="auth_opt_phone_number_placeholder">Tālruņa numurs (izvēles)</string>
-    <string name="auth_repeat_password_placeholder">Parole (atkārtoti)</string>
-    <string name="auth_repeat_new_password_placeholder">Apstiprini savu jauno paroli</string>
+    <string name="auth_repeat_password_placeholder">Parole atkārtoti</string>
+    <string name="auth_repeat_new_password_placeholder">Apstipriniet savu jauno paroli</string>
     <string name="auth_invalid_login_param">Nepareizs lietotājvārds un/vai parole</string>
     <string name="auth_invalid_user_name">Lietotājvārdi var tikai saturēt burtus, ciparus, punktus, domuzīmes un apakšsvītras</string>
     <string name="auth_invalid_password">Parole par īsu (&lt; 6 simboliem)</string>
@@ -388,17 +388,17 @@
     <string name="auth_invalid_phone">Šķiet ievadīts nekorekts tālruņa numurs</string>
     <string name="auth_email_already_defined">Šī epasta adrese jau tiek izmantota.</string>
     <string name="auth_missing_email">Iztrūkst epasta adreses</string>
-    <string name="auth_missing_phone">Iztrūkst tālruņa #</string>
-    <string name="auth_missing_email_or_phone">Iztrūkst epasta adrese vai tālruņa #</string>
+    <string name="auth_missing_phone">Iztrūkst tālruņa numurs</string>
+    <string name="auth_missing_email_or_phone">Iztrūkst epasta adrese vai tālruņa numurs</string>
     <string name="auth_invalid_token">Nederīgs tokens</string>
     <string name="auth_password_dont_match">Paroles nesakrīt</string>
-    <string name="auth_forgot_password">Aizmirsi paroli?</string>
+    <string name="auth_forgot_password">Aizmirsāt paroli\?</string>
     <string name="auth_use_server_options">Izmantot servera īpašus parametrus</string>
     <string name="auth_email_validation_message">Pārbaudi epastu, lai turpinātu reģistrāciju</string>
     <string name="auth_threepid_warning_message">Reģistrēšanās ar epastu un tālruņa numuru vienlaicīgi pagaidām netiek atbalstīta. Ar kontu būs saistīts vienīgi tālruņa numuru.
 \n
 \nSavu epastu varat pievienot profilam iestatījumos.</string>
-    <string name="auth_recaptcha_message">Bāzes serveris vēlas pārbaudīt, vai neesi robots</string>
+    <string name="auth_recaptcha_message">Bāzes serveris vēlas pārbaudīt, vai neesat robots</string>
     <string name="auth_username_in_use">Šāds lietotājvārds jau ir aizņemts</string>
     <string name="auth_home_server">Bāzes serveris:</string>
     <string name="auth_identity_server">Identitāšu serveris:</string>
@@ -406,8 +406,8 @@
     <string name="auth_reset_password_message">Lai atiestatītu paroli, ievadiet epasta adresi, kura piesaistīta kontam:</string>
     <string name="auth_reset_password_missing_email">Ir jābūt ievadītai kontam piesaistītajai epasta adresei.</string>
     <string name="auth_reset_password_missing_password">Jāievada jauna parole.</string>
-    <string name="auth_reset_password_email_validation_message">Epasts ir nosūtīts uz %s. Pēc tam, kad nospiedīsi uz tajā ietverto tīmekļa saiti, noklikšķini zemāk.</string>
-    <string name="auth_reset_password_error_unauthorized">Neizdevās verificēt epasta adresi: pārbaudi vai esi noklikšķinājis(usi) uz saiti atsūtītajā epastā</string>
+    <string name="auth_reset_password_email_validation_message">Epasts ir nosūtīts uz %s. Kad nospiedīsiet uz tajā ietverto tīmekļa saiti, noklikšķiniet zemāk.</string>
+    <string name="auth_reset_password_error_unauthorized">Neizdevās verificēt epasta adresi: pārbaudiet, vai esi noklikšķinājis(usi) uz saiti atsūtītajā epastā</string>
     <string name="auth_reset_password_success_message">Jūsu parole ir atstatīta.
 \n
 \nJūs esat izrakstīts no visām sesijām un nesaņemsit push paziņojumus. Lai atkārtoti iespējotu paziņojumus, pierakstieties katrā savā ierīcē par jaunu.</string>
@@ -587,9 +587,9 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="room_recents_create_room">Izveidot istabu</string>
     <string name="room_recents_join_room">Ieiet istabā</string>
     <string name="room_recents_join_room_title">Ieiet istabā</string>
-    <string name="room_recents_join_room_prompt">Ievadiet istabas ID vai aliasi</string>
-    <string name="directory_search_results_title">Skatīt katalogu</string>
-    <string name="directory_searching_title">Meklēju katalogā…</string>
+    <string name="room_recents_join_room_prompt">Ievadiet istabas ID vai aliasu</string>
+    <string name="directory_search_results_title">Pārlūkot katalogu</string>
+    <string name="directory_searching_title">Meklē katalogā…</string>
     <string name="room_settings_all_messages_noisy">Visas ziņas (ar skaņu)</string>
     <string name="room_settings_all_messages">Visas ziņas</string>
     <string name="room_settings_mention_only">Tikai pieminējumi</string>
@@ -637,14 +637,14 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="settings_third_party_notices">Trešo pušu paziņojumi</string>
     <string name="settings_copyright">Autortiesības</string>
     <string name="settings_privacy_policy">Privātuma politika</string>
-    <string name="settings_clear_cache">Iztīrīt ķešu</string>
-    <string name="settings_clear_media_cache">Iztīrīt mēdija ķešu</string>
+    <string name="settings_clear_cache">Iztīrīt kešatmiņu</string>
+    <string name="settings_clear_media_cache">Iztīrīt mediju kešatmiņu</string>
     <string name="settings_keep_media">Turēt mēdiju (?)</string>
     <string name="settings_user_settings">Lietotāja iestatījumi</string>
     <string name="settings_notifications">Paziņojumi</string>
     <string name="settings_ignored_users">Ignorētie dalībnieki</string>
     <string name="settings_other">Citi</string>
-    <string name="settings_advanced">Papildus</string>
+    <string name="settings_advanced">Papildu</string>
     <string name="settings_cryptography">Kriptogrāfija</string>
     <string name="settings_notifications_targets">Paziņojumus nosūtīt uz</string>
     <string name="settings_contact">Lokālie kontakti</string>
@@ -653,7 +653,7 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="settings_home_display">Galvenais ekrāns</string>
     <string name="settings_pin_missed_notifications">Piestiprināt istabas ar garām palaistiem paziņojumiem</string>
     <string name="settings_pin_unread_messages">Piestiprināt istabas ar neizlasītām ziņām</string>
-    <string name="settings_devices_list">Ierīces</string>
+    <string name="settings_devices_list">Sesijas</string>
     <string name="settings_inline_url_preview">Iespējot URL priekšskatu pēc noklusējuma</string>
     <string name="settings_always_show_timestamps">Vienmēr rādīt ziņu laiku</string>
     <string name="settings_12_24_timestamps">Rādīt ziņu laiku 12 stundu formātā (piem. 12:12pm)</string>
@@ -697,12 +697,12 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="settings_select_country">Izvēlies valsti</string>
     <string name="settings_phone_number_country_label">Valsts</string>
     <string name="settings_phone_number_country_error">Lūdzu izvēlies valsti</string>
-    <string name="settings_phone_number_label">Tālruņa #</string>
-    <string name="settings_phone_number_error">Priekš šīs valsts nekorekts tālruņa #</string>
+    <string name="settings_phone_number_label">Tālruņa numurs</string>
+    <string name="settings_phone_number_error">Priekš šīs valsts nekorekts tālruņa numurs</string>
     <string name="settings_phone_number_verification">Tālruņa verifikācija</string>
     <string name="settings_phone_number_verification_instruction">Tika nosūtīts SMS ar aktivācijas kodu. Lūdzu ievadi šo kodu zemāk.</string>
     <string name="settings_phone_number_verification_error_empty_code">Ievadi aktivācijas kodu</string>
-    <string name="settings_phone_number_verification_error">Tālruņa # validācija nesekmīga</string>
+    <string name="settings_phone_number_verification_error">Klūda tālruņa numura validācijā</string>
     <string name="settings_phone_number_code">Kods</string>
     <string name="settings_flair">Gaidas</string>
     <string name="media_saving_period_3_days">3 dienas</string>
@@ -721,7 +721,7 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="room_settings_directory_visibility">Iekļaut šo istabu katalogā</string>
     <string name="room_settings_room_notifications_title">Paziņojumi</string>
     <string name="room_settings_room_access_rules_pref_title">Piekļuve istabai</string>
-    <string name="room_settings_room_read_history_rules_pref_title">Piekļuve Istabas vēsturei</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Piekļuve istabas vēsturei</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Kas var lasīt vēsturi?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Kas var piekļūt šai istabai?</string>
     <string name="room_settings_read_history_entry_anyone">Jebkurš</string>
@@ -730,10 +730,10 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="room_settings_read_history_entry_members_only_joined">Tikai dalībnieki (kopš tie pievienojušies)</string>
     <string name="room_settings_room_access_warning">Lai ģenerētu saiti uz istabu, ir jābūt dotai adresei.</string>
     <string name="room_settings_room_access_entry_only_invited">Tikai uzaicinātie</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Visi, kuri zin saiti uz istabu, izņemot viesus</string>
-    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Visi, kuri zin saiti uz istabu, ieskatot viesus</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Visi, kuri zina saiti uz istabu, izņemot viesus</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Visi, kuri zina saiti uz istabu, ieskatot viesus</string>
     <string name="room_settings_banned_users_title">Lietotāji, kuriem liegta pieeja</string>
-    <string name="room_settings_category_advanced_title">Papildus</string>
+    <string name="room_settings_category_advanced_title">Papildu</string>
     <string name="room_settings_room_internal_id">Šīs istabas iekšējais ID</string>
     <string name="room_settings_addresses_pref_title">Adreses</string>
     <string name="room_settings_labs_pref_title">Izmēģinājumu lauciņš</string>
@@ -818,23 +818,23 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="encryption_export_room_keys">Eksportēt istabas atslēgas</string>
     <string name="encryption_export_room_keys_summary">Eksportēt atslēgas vietējā failā</string>
     <string name="encryption_export_export">Eksportēt</string>
-    <string name="passphrase_enter_passphrase">Ievadi paroli (paroles frāzi)</string>
-    <string name="passphrase_confirm_passphrase">Apstiprināt paroli</string>
+    <string name="passphrase_enter_passphrase">Ievadiet frāzveida paroli</string>
+    <string name="passphrase_confirm_passphrase">Apstiprināt frāzveida paroli</string>
     <string name="encryption_export_saved_as">Istabas šifrēšanas atslēgas tika salabātas \'%s\'.
 \n
 \nBrīdinājums: fails var tikt izdzēsts, ja lietotne tiek atinstalēta.</string>
     <string name="encryption_import_e2e_room_keys">Importēt E2E istabas atslēgas</string>
     <string name="encryption_import_room_keys">Importēt istabas atslēgas</string>
     <string name="encryption_import_room_keys_summary">Importēt atslēgas no vietējā faila</string>
-    <string name="encryption_import_import">Imports</string>
+    <string name="encryption_import_import">Importēt</string>
     <string name="encryption_never_send_to_unverified_devices_title">Šifrēt vienīgi uz pārbaudītām ierīcēm</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Nekad nesūtīt šifrētas ziņas uz nepārbaudītām ierīcēm no šīs ierīces.</string>
     <string name="encryption_information_not_verified">Neverificēta</string>
     <string name="encryption_information_verified">Verificēta</string>
     <string name="encryption_information_blocked">Melnajā sarakstā</string>
-    <string name="encryption_information_unknown_device">nepazīstama ierīce</string>
+    <string name="encryption_information_unknown_device">nepazīstama sesija</string>
     <string name="encryption_information_none">nekā</string>
-    <string name="encryption_information_verify">Apstiprināt</string>
+    <string name="encryption_information_verify">Verificēt</string>
     <string name="encryption_information_unverify">Apstiprinājumu atcelt</string>
     <string name="encryption_information_block">Ietvert melnajā sarakstā</string>
     <string name="encryption_information_unblock">Izņemt no melnā saraksta</string>
@@ -872,7 +872,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s iekš %2$s</string>
     <string name="historical_placeholder">Meklēt vēsturē</string>
-    <string name="font_size">Šrifta izmērs</string>
+    <string name="font_size">Burtu izmērs</string>
     <string name="tiny">Sīks</string>
     <string name="small">Mazs</string>
     <string name="normal">Normāls</string>
@@ -959,7 +959,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="verify_other_sessions">Verificējiet visas savas sesijas, lai nodrošinātos, ka jūsu konts un ziņas ir drošībā</string>
     <string name="review_logins">Pārskatiet savas pierakstīšanās</string>
     <string name="unencrypted">Nešifrēts</string>
-    <string name="or_other_mx_capabale_client">vai kāda cita Matrix lietotne ar cross-signing atbalstu</string>
+    <string name="or_other_mx_capabale_client">vai kādu citu Matrix lietotni ar cross-signing atbalstu</string>
     <string name="auth_invalid_login_deactivated_account">Šis konts ir deaktivizēts.</string>
     <string name="settings_messages_in_e2e_group_chat">Šifrētas ziņas grupas čatos</string>
     <string name="settings_messages_in_e2e_one_to_one">Šifrētas ziņas viens-pret-vienu čatos</string>
@@ -968,17 +968,17 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="direct_room_encryption_enabled_tile_description">Ziņas šajā istabā ir nodrošinātas ar pilnīgu šifrēšanu.</string>
     <string name="encryption_enabled">Šifrēšana iespējota</string>
     <string name="new_session">Jauna pierakstīšanās. Vai tas bijāt jūs\?</string>
-    <string name="delete_event_dialog_content">Vai tiešām vēlies dzēst šo notikumu\? Ņem vērā, ka istabas nosaukuma vai tēmas nosaukuma maiņa var ietekmēt (atsaukt) izmaiņas.</string>
+    <string name="delete_event_dialog_content">Vai tiešām vēlaties dzēst šo notikumu\? Ņemiet vērā, ka istabas nosaukuma vai temata maiņa var atcelt izmaiņas.</string>
     <string name="delete_event_dialog_title">Apstipriniet dzēšanu</string>
     <string name="qr_code_scanned_by_other_no">Nē</string>
     <string name="qr_code_scanned_by_other_yes">Jā</string>
-    <string name="a11y_qr_code_for_verification">QA kods</string>
+    <string name="a11y_qr_code_for_verification">QR kods</string>
     <string name="not_trusted">Neuzticama</string>
     <string name="trusted">Uzticama</string>
     <string name="room_member_profile_sessions_section_title">Sesijas</string>
     <string name="room_member_profile_failed_to_get_devices">Neizdevās iegūt sesijas</string>
     <string name="verification_profile_warning">Brīdinājums</string>
-    <string name="verification_profile_verified">Pārbaudīta</string>
+    <string name="verification_profile_verified">Verificēta</string>
     <string name="verification_profile_verify">Apstiprināt</string>
     <string name="crosssigning_verify_this_session">Verificējiet šo sesiju</string>
     <string name="settings_hs_admin_e2e_disabled">Jūsu servera administrators privātajās telpās un tiešajās ziņās pēc noklusējuma ir atspējojis pilnīgu šifrēšanu.</string>
@@ -1005,10 +1005,10 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="room_profile_section_security">Drošība</string>
     <string name="direct_room_profile_encrypted_subtitle">Ziņas šeit ir nodrošinātas ar pilnīgu šifrēšanu.
 \n
-\nJūsu ziņas tiek nodrošināti ar slēdzenēm, un tikai jums un saņēmējam ir unikālas atslēgas, lai tās atbloķētu.</string>
+\nJūsu ziņas tiek nodrošinātas ar slēdzenēm, un tikai jums un saņēmējam ir unikālas atslēgas, lai tās atbloķētu.</string>
     <string name="room_profile_encrypted_subtitle">Ziņas šeit ir nodrošinātas ar pilnīgu šifrēšanu.
 \n
-\nJūsu ziņas tiek nodrošināti ar slēdzenēm, un tikai jums un saņēmējam ir unikālas atslēgas, lai tās atbloķētu.</string>
+\nJūsu ziņas tiek nodrošinātas ar slēdzenēm, un tikai jums un saņēmējam ir unikālas atslēgas, lai tās atbloķētu.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Ziņas šeit nav nodrošinātas ar pilnīgu šifrēšanu.</string>
     <string name="room_profile_not_encrypted_subtitle">Ziņām šajā istabā netiek piemērota pilnīga šifrēšana.</string>
     <string name="verification_request_you_accepted">Jūs akceptējāt</string>
@@ -1028,7 +1028,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="soft_logout_signin_password_hint">Parole</string>
     <string name="soft_logout_signin_submit">Pierakstīties</string>
     <string name="soft_logout_signin_title">Pierakstīties</string>
-    <string name="login_signin_matrix_id_hint">Matrix Id</string>
+    <string name="login_signin_matrix_id_hint">Matrix ID</string>
     <string name="login_signup_cancel_confirmation_title">Brīdinājums</string>
     <string name="login_signup_error_user_in_use">Šāds lietotājvārds jau ir aizņemts</string>
     <string name="login_signup_submit">Tālāk</string>
@@ -1054,16 +1054,16 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="login_reset_password_success_notice">Jūsu parole ir atiestatīta.</string>
     <string name="login_reset_password_mail_confirmation_submit">Esmu verificējis(usi) savu epasta adresi</string>
     <string name="login_reset_password_warning_submit">Turpināt</string>
-    <string name="login_reset_password_warning_content">Mainot paroli, tiks atiestatītas visas pilnīgas šifrēšanas atslēgas visās jūsu sesijās, padarot šifrēto tērzēšanas vēsturi neizlasāmu. Pirms paroles atiestatīšanas iestatiet atslēgu dublēšanu vai eksportējiet istabas atslēgas no citas sesijas.</string>
+    <string name="login_reset_password_warning_content">Mainot paroli, tiks atiestatītas visas pilnīgas šifrēšanas atslēgas visās jūsu sesijās, padarot šifrētās sarakstes vēsturi neizlasāmu. Pirms paroles atiestatīšanas iestatiet atslēgu dublēšanu vai eksportējiet istabas atslēgas no citas sesijas.</string>
     <string name="login_reset_password_warning_title">Uzmanību!</string>
     <string name="login_reset_password_password_hint">Jauna parole</string>
     <string name="login_reset_password_email_hint">Epasts</string>
     <string name="login_reset_password_submit">Tālāk</string>
-    <string name="login_reset_password_notice">Apstiprinājuma vēstule tiks nosūtīta uz tavu epasta adresi, lai apstiprinātu paroles nomaiņu.</string>
+    <string name="login_reset_password_notice">Apstiprinājuma vēstule tiks nosūtīta uz jūsu epasta adresi, lai apstiprinātu paroles nomaiņu.</string>
     <string name="login_signin">Pierakstīties</string>
     <string name="login_signup">Reģistrēties</string>
     <string name="login_continue">Turpināt</string>
-    <string name="login_server_other_title">Citi</string>
+    <string name="login_server_other_title">Cits</string>
     <string name="room_list_quick_actions_settings">Iestatījumi</string>
     <string name="room_list_quick_actions_notifications_mute">Izslēgt skaņu</string>
     <string name="room_list_quick_actions_notifications_mentions">Tikai pieminējumi</string>
@@ -1111,7 +1111,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="sas_verified">Verificēts!</string>
     <string name="keys_backup_info_title_algorithm">Algoritms</string>
     <string name="keys_backup_info_title_version">Versija</string>
-    <string name="secure_backup_banner_setup_line1">Droša reze</string>
+    <string name="secure_backup_banner_setup_line1">Droša rezerves kopija</string>
     <string name="keys_backup_setup_skip_title">Vai tiešām to vēlaties\?</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Dalīties</string>
     <string name="keys_backup_setup_step3_button_title">Gatavs</string>
@@ -1122,7 +1122,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="deactivate_account_title">Deaktivizēt kontu</string>
     <string name="command_description_nick">Nomaina jūsu parādāmo vārdu</string>
     <string name="command_description_kick_user">Padzen lietotāju ar norādīto id</string>
-    <string name="command_description_part_room">Atstāt istabu</string>
+    <string name="command_description_part_room">Atstāj istabu</string>
     <string name="command_description_invite_user">Uzaicina lietotāju ar norādīto id uz pašreizējo istabu</string>
     <string name="command_description_deop_user">Atceļ operatora statusu lietotājam ar norādīto Id</string>
     <string name="command_description_op_user">Definē lietotāja statusu</string>
@@ -1149,7 +1149,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="settings_deactivate_account_section">Deaktivizēt kontu</string>
     <string name="settings_secure_backup_section_info">Nodrošinieties pret piekļuves zaudēšanu šifrētām ziņām un datiem, dublējot šifrēšanas atslēgas savā serverī.</string>
     <string name="settings_secure_backup_setup">Iestatīt drošu rezerves dublēšanu</string>
-    <string name="settings_secure_backup_section_title">Droša reze</string>
+    <string name="settings_secure_backup_section_title">Droša rezerves kopija</string>
     <string name="settings_send_typing_notifs">Sūtīt paziņojumus par rakstīšanu</string>
     <string name="settings_notification_privacy_normal">Normāls</string>
     <string name="settings_troubleshoot_test_service_boot_title">Startēt pie ierīces ielādes</string>
@@ -1174,7 +1174,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="room_permissions_change_room_avatar">Mainīt istabas avataru</string>
     <string name="room_permissions_notify_everyone">Apziņot visus</string>
     <string name="room_permissions_remove_messages_sent_by_others">Dzēst citu sūtītas ziņas</string>
-    <string name="room_permissions_ban_users">Pieejas liegumi lietotājiem</string>
+    <string name="room_permissions_ban_users">Liegt pieeju lietotājiem</string>
     <string name="room_permissions_kick_users">Padzīt lietotājus</string>
     <string name="room_permissions_change_settings">Mainīt iestatījumus</string>
     <string name="room_permissions_invite_users">Uzaicināt lietotājus</string>
@@ -1244,9 +1244,9 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="title_activity_verify_device">Verificēt ierīci</string>
     <string name="system_theme">Sistēmas noklusējuma</string>
     <string name="room_member_power_level_custom_in">Pielāgots (%1$d) iekš %2$s</string>
-    <string name="room_member_power_level_default_in">Noklusējums iekš %1$s</string>
-    <string name="room_member_power_level_moderator_in">Moderators iekš %1$s</string>
-    <string name="room_member_power_level_admin_in">Administrators iekš %1$s</string>
+    <string name="room_member_power_level_default_in">%1$s noklusējums</string>
+    <string name="room_member_power_level_moderator_in">%1$s moderators</string>
+    <string name="room_member_power_level_admin_in">%1$s administrators</string>
     <string name="room_member_power_level_custom">Pielāgots</string>
     <string name="room_member_power_level_moderators">Moderators</string>
     <string name="room_member_power_level_admins">Administrators</string>
@@ -1261,4 +1261,516 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
         <item quantity="one">%d sekundes</item>
         <item quantity="other">%d sekundes</item>
     </plurals>
+    <string name="verification_profile_device_verified_because">Šī sesija ir uzticama drošai ziņojumapmaiņai, jo %1$s (%2$s) to verificēja:</string>
+    <string name="settings_active_sessions_unverified_device_desc">Verificējiet šo sesiju, lai atzīmētu to kā uzticamu un piešķirtu piekļuvi šifrētām ziņām. Ja neesat pierakstījies šajā sesijā, jūsu konts var būt kompromitēts:</string>
+    <string name="settings_active_sessions_verified_device_desc">Šī sesija ir uzticama drošai ziņojumapmaiņai, jo jūs to verificējāt:</string>
+    <string name="settings_active_sessions_signout_device">Izrakstīties no šīs sesijas</string>
+    <string name="settings_active_sessions_manage">Pārvaldīt sesijas</string>
+    <string name="settings_active_sessions_show_all">Parādīt visas sesijas</string>
+    <string name="settings_active_sessions_list">Aktīvās sesijas</string>
+    <string name="verification_code_notice">Salīdziniet kodu ar to, kas parādīts otra lietotāja ekrānā.</string>
+    <string name="verification_emoji_notice">Salīdziniet unikālās emocijzīmes, pārliecinoties tās ir vienādā secībā.</string>
+    <string name="verification_request_start_notice">Lai būtu droši, dariet to klātienē vai izmantojiet citu komunikācijas veidu.</string>
+    <string name="verification_request_notice">Lai būtu droši, verificējiet %s ar vienreizēja koda palīdzību.</string>
+    <string name="room_list_sharing_header_other_rooms">Citas istabas</string>
+    <string name="room_list_sharing_header_recent_rooms">Nesenās istabas</string>
+    <string name="sent_verification_conclusion">Verifikācijas slēdziens</string>
+    <string name="sent_a_bot_buttons">Bota pogas</string>
+    <string name="sent_a_poll">Aptauja</string>
+    <string name="send_a_sticker">Uzlīme</string>
+    <string name="verification_conclusion_compromised">Kāds no uzskaitītajiem var būt kompromitēts:
+\n
+\n - jūsu bāzes serveris
+\n - bāzes serveris, kuram pieslēdzies verificējamais lietotājs
+\n - jūsu vai otra lietotāja interneta pieslēgums
+\n - jūsu vai otra lietotāja ierīce</string>
+    <string name="verification_conclusion_not_secure">Nav droša</string>
+    <string name="verification_green_shield">Meklējiet zaļo vairogu, lai pārliecinātos, ka lietotājs ir uzticams. Visiem lietotājiem istabā jābūt uzticamiem, lai nodrošinātu, ka istaba ir droša.</string>
+    <string name="verification_sas_do_not_match">Tie nesakrīt</string>
+    <string name="verification_sas_match">Tie sakrīt</string>
+    <string name="verification_conclusion_warning">Neuzticama pieteikšanās</string>
+    <string name="create_room_in_progress">Izveido istabu…</string>
+    <string name="create_room_alias_invalid">Dažas rakstzīmes nav atļautas</string>
+    <string name="autocomplete_limited_results">Rāda tikai pirmos rezultātus, ierakstiet vairāk burtus…</string>
+    <string name="devices_other_devices">Citas sesijas</string>
+    <string name="devices_current_device">Pašreizējā sesija</string>
+    <string name="settings_advanced_settings">Papildu iestatījumi</string>
+    <string name="settings_show_devices_list">Apskatīt visas manas sesijas</string>
+    <string name="permalink_malformed">Jūsu matrix.to saite ir nepareizi veidota</string>
+    <string name="soft_logout_clear_data_dialog_submit">Dzēst datus</string>
+    <string name="soft_logout_clear_data_dialog_title">Dzēst datus</string>
+    <string name="soft_logout_clear_data_submit">Dzēst visus datus</string>
+    <string name="login_social_continue">Vai</string>
+    <string name="timeline_unread_messages">Nelasītas ziņas</string>
+    <string name="direct_room_join_rules_invite_by_you">Jūs padarījāt šo pieejamu tikai ar ielūgumiem.</string>
+    <string name="direct_room_join_rules_invite">%1$s padarīja šo pieejamu tikai ar ielūgumiem.</string>
+    <string name="room_join_rules_invite_by_you">Jūs padarījāt istabu pieejamu tikai ar ielūgumiem.</string>
+    <string name="room_join_rules_invite">%1$s padarīja istabu pieejamu tikai ar ielūgumiem.</string>
+    <string name="room_join_rules_public_by_you">Jūs padarījāt istabu publiski pieejamu visiem, kas zina saiti.</string>
+    <string name="room_join_rules_public">%1$s padarīja istabu publiski pieejamu visiem, kas zina saiti.</string>
+    <string name="no_ignored_users">Jūs neignorējat nevienu lietotāju</string>
+    <string name="message_ignore_user">Ignorēt lietotāju</string>
+    <string name="no_network_indicator">Šobrīd nav tīkla savienojuma</string>
+    <string name="report_content_custom_submit">ZIŅOT</string>
+    <string name="report_content_custom_title">Ziņot par šo saturu</string>
+    <string name="report_content_custom">Pielāgots ziņojums…</string>
+    <string name="report_content_inappropriate">Nepiemērots saturs</string>
+    <string name="report_content_spam">Tas ir spams</string>
+    <string name="uploads_files_no_result">Šajā istabā nav neviena faila</string>
+    <string name="attachment_viewer_item_x_of_y">%1$d no %2$d</string>
+    <string name="one_user_read">%s izlasīja</string>
+    <string name="two_users_read">%1$s un %2$s izlasīja</string>
+    <string name="three_users_read">%1$s, %2$s un %3$s izlasīja</string>
+    <string name="send_attachment">Sūtīt pielikumu</string>
+    <string name="settings_agree_to_terms">Piekrītiet identitāšu servera (%s) pakalpojumu sniegšanas noteikumiem, lai padarītu sevi atrodamu citiem, izmantojot epasta adresi vai tālruņa numuru.</string>
+    <string name="settings_text_message_sent_wrong_code">Verifikācijas kods nav pareizs.</string>
+    <string name="settings_text_message_sent">Teksta ziņojums ir nosūtīts uz %s. Lūdzu, verifikācijas kodu no ziņojuma.</string>
+    <string name="settings_discovery_bad_identity_server">Neizdevās pieslēgties identitāšu serverim</string>
+    <string name="add_identity_server">Konfigurēt identitāšu serveri</string>
+    <string name="disconnect_identity_server">Atvienot identitāšu serveri</string>
+    <string name="identity_server">Identitāšu serveris</string>
+    <string name="review_terms">Pārskatīt noteikumus</string>
+    <string name="joining_room">Pievienojas istabai…</string>
+    <string name="direct_room_user_list_suggestions_title">Ieteikumi</string>
+    <string name="direct_room_user_list_contacts_title">Kontakti</string>
+    <string name="direct_room_user_list_recent_title">Nesenie</string>
+    <string name="direct_room_filter_hint">Filtrēt pēc nosaukuma vai ID…</string>
+    <string name="direct_room_start_search">Sāciet rakstīt, lai parādītos rezultāti</string>
+    <string name="direct_room_no_known_users">Nekas nav atrasts, lietojiet Pievienot ar Matrix ID, lai meklētu serverī.</string>
+    <string name="creating_direct_room">Izveido istabu…</string>
+    <string name="add_by_qr_code">Pievienot ar QR kodu</string>
+    <string name="add_by_matrix_id">Pievienot ar Matrix ID</string>
+    <string name="link_copied_to_clipboard">Saite nokopēta starpliktuvē</string>
+    <string name="edited_suffix">(rediģēts)</string>
+    <string name="downloaded_file">Fails %1$s ir lejupielādēts!</string>
+    <string name="downloading_file">Lejupielādē failu %1$s…</string>
+    <string name="send_file_step_sending_file">Sūta failu (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Šifrē failu…</string>
+    <string name="send_file_step_sending_thumbnail">Sūta sīktēlu (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_thumbnail">Šifrē sīktēlu…</string>
+    <string name="preference_voice_and_video">Balss un video</string>
+    <string name="settings_expert">Eksperts</string>
+    <string name="settings_preferences">Preferences</string>
+    <string name="navigate_to_room_when_already_in_the_room">Jūs jau skataties šo istabu!</string>
+    <string name="settings_other_third_party_notices">Citi trešo pušu paziņojumi</string>
+    <string name="settings_sdk_version">Matrix SDK versija</string>
+    <string name="room_preview_no_preview_join">Šīs istabas priekšskatījums nav pieejams. Vai vēlaties tai pievienoties\?</string>
+    <string name="room_preview_not_found">Šī istaba šobrīd nav pieejama.
+\nMēģiniet vēlreiz vēlāk vai lūdziet istabas administratoru pārbaudīt, vai jums ir piekļuve.</string>
+    <string name="please_wait">Lūdzu, gaidiet…</string>
+    <string name="action_change">Mainīt</string>
+    <string name="last_edited_info_message">Pēdējo reiz rediģēja %1$s %2$s</string>
+    <string name="room_list_catchup_empty_body">Jums vairs nav nelasītu ziņu</string>
+    <string name="send_you_invite">Nosūtīja jums uzaicinājumu</string>
+    <string name="sas_error_m_timeout">Verifikācijas process beidzās dēļ noilguma</string>
+    <string name="sas_error_m_user">Lietotājs atcēla verifikāciju</string>
+    <string name="sas_incoming_request_notif_content">%s vēlas verificēt jūsu sesiju</string>
+    <string name="sas_incoming_request_notif_title">Verifikācijas pieprasījums</string>
+    <string name="sas_cancelled_by_me">Verifikācija atcelta.
+\nIemesls: %s</string>
+    <string name="sas_cancelled_by_other">Otra puse atcēla verifikāciju.
+\n%s</string>
+    <string name="sas_cancelled_dialog_title">Pieprasījums atcelts</string>
+    <string name="sas_verified_successful">Jūs veiksmīgi verificējāt šo sesiju.</string>
+    <string name="sas_waiting_for_partner">Gaida, kamēr partneris apstiprinās…</string>
+    <string name="sas_view_request_action">Apskatīt pieprasījumu</string>
+    <string name="sas_incoming_verification_request_dialog">Jūs saņēmāt ienākošu verifikācijas pieprasījumu.</string>
+    <string name="secure_backup_banner_setup_line2">Nodrošinieties pret piekļuves zaudēšanu šifrētām ziņām un datiem</string>
+    <string name="new_recovery_method_popup_was_me">Tas biju es</string>
+    <string name="unexpected_error">Neparedzēta kļūda</string>
+    <string name="passphrase_create_passphrase">Izveidot frāzveida paroli</string>
+    <string name="x_plus">%d+</string>
+    <string name="plus_x">+%d</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="generic_label">%1$s:</string>
+    <string name="show_info_area_only_errors">Tikai par kļūdām</string>
+    <string name="show_info_area_messages_and_errors">Par ziņām un kļūdām</string>
+    <string name="show_info_area_always">Vienmēr</string>
+    <string name="unknown_error">Atvainotie, notikusi kļūda</string>
+    <string name="room_tombstone_predecessor_link">Nospiediet šeit, lai redzētu vecākas ziņas</string>
+    <string name="room_tombstone_continuation_description">Šī istabas ir citas sarakstes turpinājums</string>
+    <string name="room_tombstone_continuation_link">Sarakste turpinās šeit</string>
+    <string name="room_tombstone_versioned_description">Šī istaba ir aizvietota un vairs nav aktīva</string>
+    <string name="dialog_user_consent_submit">Pārskatīt tagad</string>
+    <string name="dialog_user_consent_content">Lai turpinātu izmantot %1$s bāzes serveri, jums ir jāpārskata un jāpiekrīt noteikumiem un nosacījumiem.</string>
+    <string name="notification_silent">Kluss</string>
+    <string name="your_unverified_device_requesting_with_info">Neverificēta sesija pieprasa šifrēšanas atslēgas.
+\nSesijas nosaukums: %1$s
+\nRedzēta pēdējo reizi: %2$s
+\nJa neesat pierakstījies citā sesijā, ignorējiet šo pieprasījumu.</string>
+    <string name="you_added_a_new_device_with_info">Jauna sesija pieprasa šifrēšanas atslēgas.
+\nSesijas nosaukums: %1$s
+\nRedzēta pēdējo reizi: %2$s
+\nJa neesat pierakstījies citā sesijā, ignorējiet šo pieprasījumu.</string>
+    <string name="widget_integration_review_terms">Lai turpinātu, jums ir jāpieņem šī pakalpojuma noteikumi.</string>
+    <string name="settings_labs_enable_send_voice">Sūtit balss ziņas</string>
+    <string name="room_manage_integrations">Pārvaldīt integrācijas</string>
+    <string name="widget_integration_invalid_parameter">Parametrs nav derīgs.</string>
+    <string name="widget_integration_missing_parameter">Iztrūks obligāts parametrs.</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_inline_reply_failed">** Neizdevās nosūtīt - atveriet istabu</string>
+    <string name="notification_sender_me">Es</string>
+    <string name="notification_new_invitation">Jauns uzaicinājums</string>
+    <string name="notification_new_messages">Jaunas ziņas</string>
+    <string name="notification_unknown_new_event">Jauns notikums</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s un %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s iekš %2$s un %3$s</string>
+    <string name="lock_screen_hint">Rakstiet te…</string>
+    <string name="encryption_exported_successfully">Atslēgas ir veiksmīgi eksportētas</string>
+    <string name="encryption_export_notice">Lūdzu, izveidojiet frāzveida paroli eksportēto atslēgu šifrēšanai. Jums būs jaievada to pašu frāzveida paroli, lai varētu importēt atslēgas.</string>
+    <string name="room_settings_room_version_title">Istabas versija</string>
+    <string name="room_alias_local_address_add">Pievienot lokālo adresi</string>
+    <string name="room_alias_local_address_subtitle">Iestatiet šis istabas adreses, lai lietotāji var atrast šo istabu uz jūsu bāzes servera (%1$s)</string>
+    <string name="room_alias_delete_confirmation">Dzēst adresi \"%1$s\"\?</string>
+    <string name="room_alias_main_address_hint">Galvenā adrese</string>
+    <string name="room_settings_alias_subtitle">Skatiet un pārvaldiet šīs istabas adreses un tās redzamību istabu katalogā.</string>
+    <string name="room_settings_alias_title">Istabas adreses</string>
+    <string name="settings_play_shutter_sound">Atskaņot aizvara skaņu</string>
+    <string name="media_source_choose">Izvēlēties</string>
+    <string name="compression_opt_list_choose">Izvēlēties</string>
+    <string name="settings_default_compression">Noklusējuma kompresija</string>
+    <string name="account_additional_info">Papildinformācija: %s</string>
+    <string name="account_phone_number_error">Verificējot jūsu tālruņa numuru, radās kļūda.</string>
+    <string name="account_email_error">Verificējot jūsu epasta adresi, radās kļūda.</string>
+    <string name="disabled_integration_dialog_content">Lai to izdarītu, iespējojiet ‘Atļaut integrācijas’ iestatījumos.</string>
+    <string name="settings_data_save_mode_summary">Datu plāna taupīšanas režīms izmanto filtru, lai klātbūtnes atjauninājumi un rakstīšanas paziņojumi tiek izfiltrēti.</string>
+    <string name="settings_opt_in_of_analytics_ok">Jā, es vēlos palīdzēt!</string>
+    <string name="settings_inline_url_preview_summary">Priekšskatīt saites sarakstē, kad jūsu bāzes serveris atbalsta šo iespēju.</string>
+    <string name="settings_integrations">Integrācijas</string>
+    <string name="settings_background_sync_update_error">Neizdevās atjaunināt iestatījumus.</string>
+    <string name="open_settings">Atvērt iestatījumus</string>
+    <string name="room_permissions_upgrade_the_room">Atjaunināt istabu</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Sūtīt m.room.server_acl notikumus</string>
+    <string name="room_permissions_notice_read_only">Jums nav atļaujas atjaunināt lomas, kas nepieciešamas, lai mainītu dažādas istabas daļas</string>
+    <string name="room_settings_permissions_subtitle">Skatiet un atjauniniet lomas, kas nepieciešamas, lai mainītu dažādas istabas daļas.</string>
+    <string name="room_participants_unban_prompt_msg">Atceļot pieejas liegumu, lietotājam atkal būs iespēja pievienoties istabai.</string>
+    <string name="room_participants_unban_title">Atcelt pieejas liegumu lietotājam</string>
+    <string name="room_participants_ban_reason">Pieejas lieguma iemesls</string>
+    <string name="room_participants_ban_title">Liegt pieeju lietotājam</string>
+    <string name="room_participants_kick_prompt_msg">lietotāja padzīšanas gadījumā tas tiks dzēsts no šis istabas.
+\n
+\nLai novērstu atkārtotu pievienošanos, tā vietā jums vajadzētu liegt pieeju.</string>
+    <string name="room_participants_kick_reason">Padzīšanas iemesls</string>
+    <string name="room_participants_kick_title">Padzīt lietotāju</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Vai tiešām vēlaties atcelt uzaicinājumu šim lietotājam\?</string>
+    <string name="room_participants_action_unignore_prompt_msg">Atceļot ši lietotāja ignorēšanu, visas lietotāja ziņas atkal būs redzamas.</string>
+    <string name="room_participants_action_ignore_prompt_msg">Ignorējot šo lietotāju noņems viņa ziņas istabās, kuras ir jums kopīgas.
+\n
+\nJūs varat atcelt šo darbību jebkurā brīdī vispārīgajos iestatījumos.</string>
+    <string name="room_participants_power_level_demote">Pazemināt</string>
+    <string name="room_participants_power_level_demote_warning_title">Pazemināt sevi\?</string>
+    <string name="settings_call_category">Zvani</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">Pieprasījums nosūtīts</string>
+    <string name="e2e_re_request_encryption_key">Atkārtoti pieprasīt šifrēšanas atslēgas no citām jūsu sesijām.</string>
+    <string name="auth_msisdn_already_defined">Šis tālruņa numurs jau ir definēts.</string>
+    <string name="option_send_sticker">Sūtīt uzlīmi</string>
+    <string name="sound_device_wireless_headset">Bezvadu austiņas</string>
+    <string name="sound_device_headset">Austiņas</string>
+    <string name="sound_device_speaker">Skaļrunis</string>
+    <string name="settings_category_room_directory">Istabu katalogs</string>
+    <string name="people_no_identity_server">Identitāšu serveris nav sakonfigurēts.</string>
+    <string name="dialog_edit_hint">Jaunā vērtība</string>
+    <string name="action_return">Atgriezties</string>
+    <string name="action_switch">Pārslēgt</string>
+    <string name="cannot_call_yourself_with_invite">Jūs nevarat uzsākt zvanu ar sevi, pagaidiet, kamēr dalībnieki akceptēs uzaicinājumu</string>
+    <string name="cannot_call_yourself">Jūs nevarat uzsākt zvanu ar sevi</string>
+    <string name="dialog_title_third_party_licences">Trešo pušu licences</string>
+    <string name="title_activity_choose_sticker">Sūtīt uzlīmi</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Sakarā ar pilnīgu šifrēšanu, jums var būt nepieciešams sagaidīt ziņu no kāda, jo šifrēšanas atslēgas netika pareizi nosūtītas jums.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Gaida šo ziņu, tas var aizņemt ilgāku laiku</string>
+    <string name="notice_crypto_unable_to_decrypt_final">Jums nav piekļuves šai ziņai</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="zero">Parādīt ierīci, ar kuru jūs šobrīd varat veikt verifikāciju</item>
+        <item quantity="one">Parādīt %d ierīces, ar kurām jūs šobrīd varat veikt verifikāciju</item>
+        <item quantity="other">Parādīt %d ierīces, ar kurām jūs šobrīd varat veikt verifikāciju</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">Jums būs jāatsāk bez vēstures, ziņām, uzticamām ierīcēm un uzticamiem lietotājiem</string>
+    <string name="secure_backup_reset_if_you_reset_all">Ja jūs atiestatīsiet visu</string>
+    <string name="secure_backup_reset_all_no_other_devices">Veiciet atiestatīšanu tikai tad, ja jums vairs nav nevienas citas ierīces, ar kuru verificēt šo ierīci.</string>
+    <string name="secure_backup_reset_all">Pilna atiestatīšana</string>
+    <string name="bad_passphrase_key_reset_all_action">Aizmirsāt vai pazaudējāt visas atkopšanās iespējas\? Atiestatiet visu</string>
+    <string name="enter_secret_storage_passphrase_or_key">Izmantojiet savu %1$s vai savu %2$s, lai turpinātu.</string>
+    <string name="template_use_latest_app">Izmantojiet jaunāko ${app_name} citās savās ierīcēs:</string>
+    <string name="template_use_other_session_content_description">Izmantojiet jaunāko ${app_name} citās savās ierīcēs, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} Android, vai kādu citu Matrix lietotni ar cross-signing atbalstu</string>
+    <string name="change_password_summary">Iestatiet jaunu konta paroli…</string>
+    <string name="this_is_the_beginning_of_dm">Šis ir sākums jūsu tiešās sarakstes vēsturei ar %s.</string>
+    <string name="this_is_the_beginning_of_room_no_name">Šis ir šīs sarakstes pats sākums.</string>
+    <string name="this_is_the_beginning_of_room">Šis ir pats %s sākums.</string>
+    <string name="direct_room_created_summary_item_by_you">Jūs pievienojāties.</string>
+    <string name="direct_room_created_summary_item">%s pievienojās.</string>
+    <string name="room_created_summary_item_by_you">Jūs izveidojāt un sakonfigurējāt istabu.</string>
+    <string name="room_created_summary_item">%s izveidoja un sakonfigurēja istabu.</string>
+    <string name="encryption_unknown_algorithm_tile_description">Šajā istabā izmantotā šifrēšana netiek atbalstīta</string>
+    <string name="encryption_enabled_tile_description">Ziņas šajā istabā ir aizsargātas ar pilnīgu šifrēšanu. Uzziniet vairāk un verificējiet lietotājus viņu profilā.</string>
+    <string name="verification_cancelled">Verifikācija atcelta</string>
+    <string name="verify_new_session_compromized">Jūsu konts varētu būt kompromitēts</string>
+    <string name="verify_new_session_was_not_me">Tas nebiju es</string>
+    <string name="verify_new_session_notice">Izmantojiet šo sesiju jaunās sesijas verifikācijai, tādējādi dodot piekļuvi šifrētām ziņām.</string>
+    <string name="new_session_review">Pieskarieties, lai pārskatītu un verificētu</string>
+    <string name="delete_event_dialog_reason_hint">Rediģēšanas iemesls</string>
+    <string name="delete_event_dialog_reason_checkbox">Iekļaut iemeslu</string>
+    <string name="message_action_item_redact">Dzēst…</string>
+    <string name="verification_use_passphrase">Ja jūs nevarat piekļūt esošai sesijai</string>
+    <string name="verification_cannot_access_other_session">Izmantot atkopšanās frāzveida paroli vai atslēgu</string>
+    <string name="verification_open_other_to_verify">Izmantojiet citu sesiju šis sesijas verifikācijai, tādējādi dodot piekļuvi šifrētām ziņām.</string>
+    <string name="crosssigning_other_user_not_trust">Citi lietotāji var tai neuzticēties</string>
+    <string name="room_settings_enable_encryption_dialog_submit">Iespējot šifrēšanu</string>
+    <string name="room_settings_enable_encryption_dialog_content">Pēc iespējošanas šifrēšana istabai nevar tikt izslēgta. Šifrētā istabā sūtītas ziņas nav redzamas serverim, tikai istabas dalībniekiem. Šifrēšanas iespējošana var neļaut pareizi strādāt daudzus botiem un tiltiem.</string>
+    <string name="room_settings_enable_encryption_no_permission">Jums nav atļaujas, lai iespējotu šifrēšanu šajā istabā.</string>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="zero">Viena persona</item>
+        <item quantity="one">%1$d cilvēki</item>
+        <item quantity="other">%1$d cilvēki</item>
+    </plurals>
+    <string name="verification_request_alert_description">Papildu drošībai, verificējiet %s, pārbaudot vienreizēju kodu uz jūsu abu ierīcēm.
+\n
+\nMaksimālai drošībai, dariet to klātienē.</string>
+    <string name="verification_request_waiting_for">Gaida %s…</string>
+    <string name="verification_verified_user">Verificēts %s</string>
+    <string name="verification_verify_user">Verificē %s</string>
+    <string name="a13n_qr_code_description">QR koda attēls</string>
+    <string name="verify_by_emoji_description">Ja nevarat noskenēt kodu, veiciet verifikāciju, izmantojot unikālu emocijzīmju salīdzināšanu.</string>
+    <string name="verify_by_emoji_title">Verificēt ar emocijzīmēm</string>
+    <string name="verification_no_scan_emoji_title">Verifikācija, izmantojot emocijzīmju salīdzināšanu</string>
+    <string name="verification_scan_emoji_subtitle">Ja jūs neatrodaties klātienē, salīdziniet emocijzīmes</string>
+    <string name="verification_scan_emoji_title">Nevar skenēt</string>
+    <string name="verification_scan_their_code">Skenēt viņu kodu</string>
+    <string name="verification_scan_notice">Skenējiet kodu ar otra lietotāja ierīci, lai droši verificētu viens otru</string>
+    <string name="you">Jūs</string>
+    <string name="verification_verify_device_manually">Verificēt manuāli</string>
+    <string name="verification_verify_device">Verificējiet šo sesiju</string>
+    <string name="verification_request">Verifikācijas pieprasījums</string>
+    <string name="verification_sent">Verifikācija nosūtīta</string>
+    <string name="verification_request_other_accepted">%s akceptēja</string>
+    <string name="verification_request_you_cancelled">Jūs atcēlāt</string>
+    <string name="verification_request_other_cancelled">%s atcēla</string>
+    <string name="verification_request_waiting">Gaida…</string>
+    <string name="sent_a_reaction">Reaģēja ar %s</string>
+    <string name="create_room_disable_federation_title">Bloķēt pievienošanos šai istabai ikvienam, kas nav daļa no %s</string>
+    <string name="create_room_encryption_title">Iespējot šifrēšanu</string>
+    <string name="notification_initial_sync">Sākotnējā sinhronizācija…</string>
+    <string name="soft_logout_title">Jūs izrakstījāties</string>
+    <string name="signed_out_submit">Pierakstīties vēlreiz</string>
+    <string name="signed_out_title">Jūs izrakstījāties</string>
+    <string name="autodiscover_well_known_error">Neizdevās atrast derīgu bāzes serveri. Lūdzu, pārbaudiet savu identifikatoru</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Šis nav pareizs identifikators. Sagaidāmais formāts: \'@user:homeserver.org\'</string>
+    <string name="login_signin_matrix_id_password_notice">Ja jūs nezināt savu paroli, dodieties atpakaļ, lai to atiestatītu.</string>
+    <string name="login_signin_matrix_id_notice">Ja izveidojat kontu bāzes serverī, izmantojiet savu Matrix ID (paraugs: @user:domain.com) un paroli zemāk.</string>
+    <string name="login_signin_matrix_id_title">Pierakstīties ar Matrix ID</string>
+    <string name="login_connect_using_matrix_id_submit">Pierakstīties ar Matrix ID</string>
+    <string name="login_connect_using_matrix_id_notice">Alternatīvi, ja jums jau ir konts, un jūs zināt savu Matrix identifikatoru un paroli, varat izmantot šo metodi:</string>
+    <string name="login_error_outdated_homeserver_warning_content">Uz šī bāzes servera darbojas pārāk veca versija. Aiciniet sava bāzes servera administratoru veikt atjauninājumus. Jūs varat turpināt, tomēr atsevišķas iespējas var nedarboties pareizi.</string>
+    <string name="login_error_outdated_homeserver_content">Uz šī bāzes servera darbojas pārāk veca versija, lai izveidotu savienojumu ar to. Aiciniet sava bāzes servera administratoru veikt atjaunināšanu.</string>
+    <string name="login_error_outdated_homeserver_title">Novecojis bāzes serveris</string>
+    <string name="login_validation_code_is_not_correct">Ievadītais kods nav pareizs. Lūdzu, pārbaudiet.</string>
+    <string name="login_wait_for_email_notice">Mēs tikko nosūtījām epastu uz %1$s.
+\nLūdzu, noklikšķiniet uz saites epastā, lai turpinātu konta izveidi.</string>
+    <string name="login_wait_for_email_title">Lūdzu, pārbaudiet savu epastu</string>
+    <string name="login_terms_title">Pieņemt noteikumus, lai turpinātu</string>
+    <string name="login_a11y_captcha_container">Lūdzu, veiciet CAPTCHA izaicinājumu</string>
+    <string name="login_a11y_choose_other">Izvēlēties pielāgotu bāzes serveri</string>
+    <string name="login_a11y_choose_modular">Izvēlēties Element Matrix Services</string>
+    <string name="login_a11y_choose_matrix_org">Izvēlēties matrix.org</string>
+    <string name="login_signup_cancel_confirmation_content">Jūsu konts vēl nav izveidots..
+\n
+\nVai pārtraukt reģistrēšanos\?</string>
+    <string name="login_set_msisdn_notice2">Lūdzu, izmantojiet starptautisko formātu.</string>
+    <string name="login_set_msisdn_notice">Iestatiet tālruņa numuru,lai pēc izvēles ļaut jums zināmiem cilvēkiem atrast.</string>
+    <string name="login_set_msisdn_title">Iestatiet tālruņa numuru</string>
+    <string name="login_set_email_submit">Tālāk</string>
+    <string name="login_set_email_optional_hint">Epasts (izvēles)</string>
+    <string name="login_set_email_notice">Iestatiet epastu, lai atgūtu savu kontu. Vēlāk jūs varat pēc izvēles ļaut jums zināmiem cilvēkiem atrast sevi pēc epasta adreses.</string>
+    <string name="login_set_email_title">Iestatīt epasta adresi</string>
+    <string name="login_reset_password_cancel_confirmation_content">Jūsu parole vēl nav nomainīta.
+\n
+\nVai pārtraukt paroles nomaiņu\?</string>
+    <string name="login_reset_password_success_title">Gatavs!</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Nospiediet saiti, lai apstiprinātu savu jauno paroli. Kad esat sekojis saitei, noklikšķiniet zemāk.</string>
+    <string name="login_reset_password_mail_confirmation_notice">Apstiprinājuma epasts tika nosūtīts uz %1$s.</string>
+    <string name="login_reset_password_mail_confirmation_title">Pārbaudiet ienākošos epastus</string>
+    <string name="login_reset_password_error_not_found">Šis epasts nav piesaistīts nevienam kontam</string>
+    <string name="login_reset_password_on">Atiestatīt paroli uz %1$s</string>
+    <string name="login_login_with_email_error">Šis epasts nav piesaistīts nevienam kontam.</string>
+    <string name="login_registration_not_supported">Lietotnei neizdodas izveidot kontu uz šī bāzes servera.
+\n
+\nVai vēlaties reģistrēties, izmantojot tīmekļa klientu\?</string>
+    <string name="login_registration_disabled">Atvainojiet, šis serveris nepieņem jaunus kontus.</string>
+    <string name="login_mode_not_supported">Lietotnei neizdodas pierakstīties uz šī bāzes servera. Bāzes serveris atbalsta sekojošos pierakstīšanās veidus: %1$s.
+\n
+\nVai vēlaties pierakstīties, izmantojot tīmekļa klientu\?</string>
+    <string name="login_sso_error_message">Radās kļūda, ielādējot lapu: %1$s (%2$d)</string>
+    <string name="login_server_url_form_common_notice">Ievadiet servera adresi, kuru vēlaties izmantot</string>
+    <string name="login_server_url_form_modular_notice">Ievadiet Modular Element vai servera adresi, kuru vēlaties izmantot</string>
+    <string name="login_server_url_form_modular_text">Premium hostings organizācijām</string>
+    <string name="login_server_url_form_other_hint">Adrese</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services adrese</string>
+    <string name="login_clear_homeserver_history">Attīrīt vēsturi</string>
+    <string name="login_signin_sso">Turpināt, izmantojot SSO</string>
+    <string name="login_signin_to">Pierakstīties uz %1$s</string>
+    <string name="login_connect_to_a_custom_server">Pieslēgšanās pielāgotam serverim</string>
+    <string name="login_connect_to_modular">Pieslēgšanās Element Matrix Services</string>
+    <string name="login_connect_to">Pieslēgšanās %1$s</string>
+    <string name="login_social_sso">vienotā pierakstīšanās</string>
+    <string name="login_social_signin_with">Pierakstīties ar %s</string>
+    <string name="login_social_signup_with">Reģistrēties ar %s</string>
+    <string name="login_social_continue_with">Turpināt ar %s</string>
+    <string name="login_server_other_text">Pielāgoti un papildu iestatījumi</string>
+    <string name="login_server_modular_learn_more">Uzzināt vairāk</string>
+    <string name="login_server_modular_text">Premium hostings organizācijām</string>
+    <string name="login_server_matrix_org_text">Pievienojieties bez maksas miljoniem lietotāju lielākajā publiskajā serverī</string>
+    <string name="login_server_text">Tāpat kā ar epastu, kontiem ir sava mājvieta, lai gan jūs varat sazināties ar jebkuru citu</string>
+    <string name="login_server_title">Izvēlieties serveri</string>
+    <string name="login_splash_submit">Uzsākt</string>
+    <string name="login_splash_text3">Paplašiniet un pielāgojiet savam ērtumam</string>
+    <string name="login_splash_text2">Paturiet saraksti privātu ar šifrēšanas palīdzību</string>
+    <string name="login_splash_text1">Sarakstieties ar cilvēkiem pa tiešo vai grupās</string>
+    <string name="login_splash_title">Tā ir jūsu sarakste. Tā pieder jums.</string>
+    <string name="help_long_click_on_room_for_more_options">Paturiet ilgāk uz istabas, lai redzētu vairāk iespēju</string>
+    <string name="notice_member_no_changes_by_you">Jūs neveicāt nekādas izmaiņas</string>
+    <string name="notice_member_no_changes">%1$s neveica nekādas izmaiņas</string>
+    <string name="room_list_quick_actions_room_settings">Istabas iestatījumi</string>
+    <string name="room_list_quick_actions_leave">Pamest istabu</string>
+    <string name="room_list_quick_actions_low_priority_remove">Izņemt no zemas prioritātes saraksta</string>
+    <string name="room_list_quick_actions_low_priority_add">Pievienot zemas prioritātes sarakstam</string>
+    <string name="room_list_quick_actions_favorite_remove">Izņemt no izlases</string>
+    <string name="room_list_quick_actions_favorite_add">Pievienot izlasei</string>
+    <string name="attachment_type_sticker">Uzlīme</string>
+    <string name="attachment_type_gallery">Galerija</string>
+    <string name="attachment_type_audio">Audio</string>
+    <string name="attachment_type_contact">Kontakts</string>
+    <string name="attachment_type_file">Fails</string>
+    <string name="attachment_type_dialog_title">Pievienot attēlu no</string>
+    <string name="qr_code">QR kods</string>
+    <string name="room_directory_search_hint">Nosaukums vai ID (#piemers:matrix.org)</string>
+    <string name="room_filtering_footer_open_room_directory">Atvērt istabu katalogu</string>
+    <string name="room_filtering_footer_create_new_direct_message">Sūtīt jaunu tiešo ziņu</string>
+    <string name="room_filtering_footer_create_new_room">Izveidot jaunu istabu</string>
+    <string name="room_filtering_footer_title">Nevarat atrast meklēto\?</string>
+    <string name="room_filtering_filter_hint">Filtrēt sarakstes…</string>
+    <string name="create_room_federation_error">Istaba ir izveidota, bet daži ielūgumi nav nosūtīti šāda iemesla dēļ:
+\n
+\n%s</string>
+    <string name="create_room_directory_description">Pievienot šo istabu istabu katalogam</string>
+    <string name="create_room_public_description">Jebkurš varēs pievienoties istabai</string>
+    <string name="create_new_room">Izveidot jaunu istabu</string>
+    <string name="room_list_rooms_empty_body">Jūsu istabas parādīsies šeit. Pieskarieties + labajā apakšējā stūrī, lai atrastu esošās istabas vai izveidotu jaunu.</string>
+    <string name="global_retry">Atkārtot</string>
+    <string name="identity_server_not_defined">Jūs neizmantojat nevienu identitāšu serveri</string>
+    <string name="keys_backup_recovery_code_error_decrypt">Rezerves kopiju nevarēja atšifrēt ar šo atkopšanās atslēgu: lūdzu, pārbaudiet, vai ievadījāt pareizo atkopšanās atslēgu.</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Kalkulē atkopšanās atslēgu…</string>
+    <string name="passphrase_passphrase_too_weak">Frāzveida parole pārāk vāja</string>
+    <string name="command_snow">Nosūta doto ziņu ar sniegu</string>
+    <string name="command_confetti">Nosūta doto ziņu ar konfeti</string>
+    <string name="command_description_discard_session_not_handled">Atbastīta tikai šifrētās istabās</string>
+    <string name="command_description_plain">Nosūta ziņu vienkāršā tekstā, nepielietojot markdown</string>
+    <string name="command_description_poll">Izveido vienkāršu aptauju</string>
+    <string name="command_description_rainbow_emote">Nosūta doto ziņu uzsvērti izkrāsotu varavīksnes krāsās</string>
+    <string name="command_description_rainbow">Nosūta doto ziņu izkrāsotu varavīksnes krāsās</string>
+    <string name="command_description_shrug">Pievieno ¯\\_(ツ)_/¯ vienkārša teksta ziņas sākumā</string>
+    <string name="command_description_markdown">Iespējo/atspējo markdown</string>
+    <string name="command_description_topic">Iestata istabas tematu</string>
+    <string name="command_description_join_room">Pievienojas istabai ar norādīto aliasu</string>
+    <string name="command_description_unban_user">Atceļ pieejas liegumu lietotājam ar norādīto id</string>
+    <string name="command_problem_with_parameters">Komandai \"%s\" nepieciešami vairāk parametri vai arī kāds no parametriem ir nepareizs.</string>
+    <string name="event_status_delete_all_failed_dialog_message">Vai tiešām vēlaties dzēst visas nenosūtītas ziņas šajā istabā\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Dzēst nenosūtītās ziņas</string>
+    <string name="event_status_failed_messages_warning">Ziņas neizdevās nosūtīt</string>
+    <string name="event_status_cancel_sending_dialog_message">Vai vēlaties atcelt ziņu nosūtīšanu\?</string>
+    <string name="event_status_a11y_sent">Nosūtīta</string>
+    <string name="event_status_a11y_sending">Nosūta</string>
+    <string name="authentication_error">Neizdevās autentificēties</string>
+    <string name="warning_unsaved_change_discard">Atmest izmaiņas</string>
+    <string name="warning_unsaved_change">Te ir nesaglabātas izmaiņas. Atmest izmaiņas\?</string>
+    <string name="universal_link_malformed">Saite bija nepareizi veidota</string>
+    <string name="qr_code_not_scanned">QR kods nav noskenēts!</string>
+    <string name="invalid_qr_code_uri">Nederīgs QR kods (nederīgs URI)!</string>
+    <string name="room_error_not_found">Nevar atrast šo istabu. Pārliecinieties, ka tāda eksistē.</string>
+    <string name="wrong_pin_message_last_remaining_attempt">Brīdinājums! Pēdējais atlikušais mēģinājums pirms izrakstīšanās!</string>
+    <string name="three_pid_revoke_invite_dialog_content">Atsaukt uzaicinājumu uz %1$s\?</string>
+    <string name="three_pid_revoke_invite_dialog_title">Atsaukt uzaicinājumu</string>
+    <string name="phone_book_perform_lookup">Meklēt kontaktus Matrix</string>
+    <string name="loading_contact_book">Ielasa jūsu kontaktus…</string>
+    <string name="search_in_my_contacts">Meklēt manos kontaktos</string>
+    <string name="phone_book_title">Telefongrāmata</string>
+    <string name="add_from_phone_book">Pievienot no manas telefongrāmatas</string>
+    <string name="disclaimer_positive_button">UZZINĀT VAIRĀK</string>
+    <string name="disclaimer_negative_button">SAPRATU</string>
+    <string name="disclaimer_content">Esam priecīgi paziņot, ka mēs esam mainījuši nosaukumu! Jūsu lietotne ir atjaunināta un esat pierakstījies savā kontā.</string>
+    <string name="disclaimer_title">Riot tagad saucas Element!</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Gaida šifrēšanas vēsturi</string>
+    <string name="room_settings_save_success">Jūs veiksmīgi nomainījāt istabas iestatījumus</string>
+    <string name="power_level_title">Loma</string>
+    <string name="power_level_edit_title">Iestatīt lomu</string>
+    <string name="disconnect_identity_server_dialog_content">Atvienoties no identitāšu servera %s\?</string>
+    <string name="open_terms_of">Atvērt %s noteikumus</string>
+    <string name="user_code_info_text">Dalieties ar šo kodu, lai cilvēki varētu noskenēt to, konta pievienošanai un sarakstes uzsākšanai.</string>
+    <string name="user_code_my_code">Mans kods</string>
+    <string name="user_code_share">Dalīties ar manu kodu</string>
+    <string name="user_code_scan">Skenēt QR kodu</string>
+    <string name="not_a_valid_qr_code">Tas nav derīgs matrix QR kods</string>
+    <string name="invitation_sent_to_one_user">Uzaicinājums nosūtīts uz %1$s</string>
+    <string name="inviting_users_to_room">Uzaicina lietotājus…</string>
+    <string name="invite_users_to_room_action_invite">UZAICINĀT</string>
+    <string name="add_people">Pievienot cilvēkus</string>
+    <string name="add_members_to_room">Pievienot dalībniekus</string>
+    <string name="external_link_confirmation_message">Saite %1$s ved uz citu vietni: %2$s.
+\n
+\nVai tiešām vēlaties turpināt\?</string>
+    <string name="external_link_confirmation_title">Pārbaudiet šo saiti</string>
+    <string name="mark_as_verified">Atzīmēt kā uzticamu</string>
+    <string name="cross_signing_verify_by_emoji">Interaktīvi verificēt ar emocijzīmēm</string>
+    <string name="crosssigning_verify_session">Verificējiet sesiju</string>
+    <string name="verify_this_session">Verificējiet jauno pierakstīšanos no sava konta: %1$s</string>
+    <string name="encrypted_unverified">Šifrēts ar neverificētu sesiju</string>
+    <string name="default_message_emote_snow">sūta sniegu ❄️</string>
+    <string name="default_message_emote_confetti">sūta konfeti 🎉</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+    <string name="enter_backup_passphrase">Ievadiet %s</string>
+    <string name="upgrade_security">Pieejams šifrēšanas atjauninājums</string>
+    <string name="room_message_placeholder">Ziņa…</string>
+    <string name="auth_invalid_login_param_space_in_password">Nepareizs lietotājvārds un/vai parole. Ievadītā parole sākas vai beidzas ar atstarpēm. Lūdzu, pārbaudiet to.</string>
+    <string name="qr_code_scanned_verif_waiting">Gaida uz %s…</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Gandrīz galā! Gaida apstiprinājumu…</string>
+    <string name="qr_code_scanned_self_verif_notice">Gandrīz galā! Vai otrā ierīcē redzams tas pats vairogs\?</string>
+    <string name="topic_prefix">"Temats: "</string>
+    <string name="add_a_topic_link_text">Pievienot tematu</string>
+    <string name="finish">Pabeigt</string>
+    <string name="enter_account_password">Ievadiet savu %s, lai turpinātu.</string>
+    <string name="confirm_recovery_passphrase">Apstiprināt %s</string>
+    <string name="account_password">Konta parole</string>
+    <string name="verify_cancelled_notice">Verificējiet savas ierīces no iestatījumiem.</string>
+    <string name="verify_not_me_self_verification">Kāds no uzskaitītajiem var būt kompromitēts:
+\n
+\n- jūsu parole
+\n- jūsu bāzes serveris
+\n- šī vai cita ierīce
+\n- interneta savienojums kādai no ierīcēm
+\n
+\nMēs iesakām jums nekavējoties nomainīt paroli un atiestatīšanas atslēgu iestatījumos.</string>
+    <string name="refresh">Atsvaidzināt</string>
+    <string name="share_confirm_room">Vai vēlaties sūtīt šo pielikumu uz %1$s\?</string>
+    <string name="enter_secret_storage_passphrase_warning">Brīdinājums:</string>
+    <string name="new_signin">Jauna pierakstīšanās</string>
+    <string name="settings_account_data">Konta dati</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">Lidmašīnas režīms ir ieslēgts</string>
+    <string name="no_connectivity_to_the_server_indicator">Savienojums ar serveri ir zaudēts</string>
+    <string name="qr_code_scanned_by_other_notice">Gandrīz galā! Vai %s redzams tas pats vairogs\?</string>
+    <string name="verification_profile_device_untrust_info">Kamēr šis lietotājs nav padarījis šo sesiju uzticamu, ziņas uz un no tās ir marķētas ar brīdinājumiem. Alternatīvi, jūs varat manuāli verificēt šos sesiju.</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) pierakstījās, izmantojot jaunu sesiju:</string>
+    <string name="passphrase_empty_error_message">Lūdzu, ievadiet frāzveida paroli</string>
+    <string name="passphrase_passphrase_does_not_match">Frāzveida paroles nesakrīt</string>
+    <string name="room_settings_room_access_title">Piekļuve istabai</string>
+    <string name="settings_emails_and_phone_numbers_summary">Pārvaldiet epasta adreses un tālruņu numurus, kas saistīti ar jūsu Matrix kontu</string>
+    <string name="settings_emails_and_phone_numbers_title">Epasti un tālruņa numuri</string>
+    <string name="passwords_do_not_match">Paroles nesakrīt</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Parole nav derīga</string>
+    <string name="settings_change_password_submit">Atjaunināt paroli</string>
+    <string name="settings_integration_manager">Integrācija pārvaldnieks</string>
+    <string name="settings_integration_allow">Atļaut integrācijas</string>
+    <string name="settings_deactivate_my_account">Deaktivizēt manu kontu</string>
+    <string name="initial_sync_start_downloading">Sākotnējā sinhronizācija:
+\nLejupielādē datus…</string>
+    <string name="initial_sync_start_server_computing">Sākotnējā sinhronizācija:
+\nGaida servera atbildi…</string>
 </resources>
\ No newline at end of file

From 5d19cfff135d5fecab90e986fd7196aea64d5bb1 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 30 Mar 2021 19:59:25 +0200
Subject: [PATCH 456/578] Timeline: fix membership filtering

---
 .../core/resources/UserPreferencesProvider.kt | 11 ++++--
 .../timeline/TimelineEventController.kt       |  5 ++-
 .../factory/MergedHeaderItemFactory.kt        |  5 ++-
 .../TimelineControllerInterceptorHelper.kt    |  2 +-
 .../helper/TimelineEventVisibilityHelper.kt   | 34 +++++++++++++++----
 .../features/settings/VectorPreferences.kt    |  9 -----
 .../res/xml/vector_settings_preferences.xml   | 12 +++++--
 7 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
index f7d7b3864e..04da5394f2 100644
--- a/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
@@ -41,7 +41,14 @@ class UserPreferencesProvider @Inject constructor(private val vectorPreferences:
         vectorPreferences.neverShowLongClickOnRoomHelpAgain()
     }
 
-    fun shouldShowRoomMemberStateEvents(): Boolean {
-        return vectorPreferences.showRoomMemberStateEvents()
+    fun shouldShowJoinLeaves(): Boolean {
+        return vectorPreferences.showJoinLeaveMessages()
     }
+
+    fun shouldShowAvatarDisplayNameChanges(): Boolean {
+        return vectorPreferences.showAvatarDisplayNameChangeMessages()
+    }
+
+
+
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index aff94f7157..6c19f30cf0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -318,7 +318,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                         cacheItemData.eventModel
                     }
                     listOf(
-                            cacheItemData?.readReceiptsItem?.takeIf { cacheItemData.mergedHeaderModel == null },
+                            cacheItemData?.readReceiptsItem?.takeUnless { mergedHeaderItemFactory.isCollapsed(cacheItemData.localId) },
                             eventModel,
                             cacheItemData?.mergedHeaderModel,
                             cacheItemData?.formattedDayModel?.takeIf { eventModel != null || cacheItemData.mergedHeaderModel != null }
@@ -428,6 +428,9 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
 
     private fun getReadReceiptsByShownEvent(): Map<String, List<ReadReceipt>> {
         val receiptsByEvent = HashMap<String, MutableList<ReadReceipt>>()
+        if(!userPreferencesProvider.shouldShowReadReceipts()){
+            return receiptsByEvent
+        }
         var lastShownEventId: String? = null
         val itr = currentSnapshot.listIterator(currentSnapshot.size)
         while (itr.hasPrevious()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index e9340feaca..cb2a067540 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -86,12 +86,11 @@ private val timelineEventVisibilityHelper: TimelineEventVisibilityHelper) {
                                                    eventIdToHighlight: String?,
                                                    requestModelBuild: () -> Unit,
                                                    callback: TimelineEventController.Callback?): MergedMembershipEventsItem_? {
-        val prevSameTypeEvents = timelineEventVisibilityHelper.prevSameTypeEvents(items, currentPosition, 2, eventIdToHighlight)
-        return if (prevSameTypeEvents.isEmpty()) {
+        val mergedEvents = timelineEventVisibilityHelper.prevSameTypeEvents(items, currentPosition, 2, eventIdToHighlight)
+        return if (mergedEvents.isEmpty()) {
             null
         } else {
             var highlighted = false
-            val mergedEvents = (prevSameTypeEvents + listOf(event)).asReversed()
             val mergedData = ArrayList<BasedMergedItem.Data>(mergedEvents.size)
             mergedEvents.forEach { mergedEvent ->
                 if (!highlighted && mergedEvent.root.eventId == eventIdToHighlight) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
index e8353ff264..72fdef9f7d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
@@ -72,7 +72,7 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                 }
                 epoxyModel.getEventIds().forEach { eventId ->
                     adapterPositionMapping[eventId] = index
-                    if (eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker && epoxyModel.canAppendReadMarker()) {
+                    if (epoxyModel.canAppendReadMarker() && eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker) {
                         modelsIterator.addReadMarkerItem(callback)
                         index++
                         positionOfReadMarker.set(index)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
index 39c95a5915..e55b02fe85 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
@@ -29,12 +29,21 @@ import javax.inject.Inject
 
 class TimelineEventVisibilityHelper @Inject constructor(private val userPreferencesProvider: UserPreferencesProvider) {
 
+
+    /**
+     * @param timelineEvents the events to search in
+     * @param index the index to start computing (inclusive)
+     * @param minSize the minimum number of same type events to have sequentially, otherwise will return an empty list
+     * @param eventIdToHighlight used to compute visibility
+     *
+     * @return a list of timeline events which have sequentially the same type following the next direction. 
+     */
     fun nextSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int, eventIdToHighlight: String?): List<TimelineEvent> {
         if (index >= timelineEvents.size - 1) {
             return emptyList()
         }
         val timelineEvent = timelineEvents[index]
-        val nextSubList = timelineEvents.subList(index + 1, timelineEvents.size)
+        val nextSubList = timelineEvents.subList(index, timelineEvents.size)
         val indexOfNextDay = nextSubList.indexOfFirst {
             val date = it.root.localDateTime()
             val nextDate = timelineEvent.root.localDateTime()
@@ -58,6 +67,14 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
         return  filteredSameTypeEvents
     }
 
+    /**
+     * @param timelineEvents the events to search in
+     * @param index the index to start computing (inclusive)
+     * @param minSize the minimum number of same type events to have sequentially, otherwise will return an empty list
+     * @param eventIdToHighlight used to compute visibility
+     *
+     * @return a list of timeline events which have sequentially the same type following the prev direction.
+     */
     fun prevSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int, eventIdToHighlight: String?): List<TimelineEvent> {
         val prevSub = timelineEvents.subList(0, index + 1)
         return prevSub
@@ -65,9 +82,13 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
                 .let {
                     nextSameTypeEvents(it, 0, minSize, eventIdToHighlight)
                 }
-                .reversed()
     }
 
+    /**
+     * @param timelineEvent the event to check for visibility
+     * @param highlightedEventId can be checked to force visibility to true
+     * @return true if the event should be shown in the timeline.
+     */
     fun shouldShowEvent(timelineEvent: TimelineEvent, highlightedEventId: String?): Boolean {
         // If show hidden events is true we should always display something
         if (userPreferencesProvider.shouldShowHiddenEvents()) {
@@ -97,7 +118,8 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
         }
         if (root.getClearType() == EventType.STATE_ROOM_MEMBER) {
             val diff = computeMembershipDiff()
-            if ((diff.isJoin || diff.isPart) && !userPreferencesProvider.shouldShowRoomMemberStateEvents()) return true
+            if ((diff.isJoin || diff.isPart) && !userPreferencesProvider.shouldShowJoinLeaves()) return true
+            if ((diff.isAvatarChange || diff.isDisplaynameChange) && !userPreferencesProvider.shouldShowAvatarDisplayNameChanges()) return true
         }
         return false
     }
@@ -110,9 +132,9 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
         val isJoin = isMembershipChanged && content?.membership == Membership.JOIN
         val isPart = isMembershipChanged && content?.membership == Membership.LEAVE && root.stateKey == root.senderId
 
-        val isJoinToJoin = !isMembershipChanged && content?.membership == Membership.JOIN
-        val isDisplaynameChange = isJoinToJoin && content?.displayName != prevContent?.displayName;
-        val isAvatarChange = isJoinToJoin && content?.avatarUrl !== prevContent?.avatarUrl
+        val isProfileChanged = !isMembershipChanged && content?.membership == Membership.JOIN
+        val isDisplaynameChange = isProfileChanged && content?.displayName != prevContent?.displayName;
+        val isAvatarChange = isProfileChanged && content?.avatarUrl !== prevContent?.avatarUrl
 
         return MembershipDiff(
                 isJoin = isJoin,
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index a1151162c8..9b043cfc7c 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -357,15 +357,6 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_12_24_TIMESTAMPS_KEY, false)
     }
 
-    /**
-     * Tells if all room member state events should be shown in the messages list.
-     *
-     * @return true all room member state events should be shown in the messages list.
-     */
-    fun showRoomMemberStateEvents(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_SHOW_ROOM_MEMBER_STATE_EVENTS_KEY, true)
-    }
-
     /**
      * Tells if the join and leave membership events should be shown in the messages list.
      *
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 6a3c60a021..1d39791ad8 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -88,9 +88,15 @@
 
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"
-            android:key="SETTINGS_SHOW_ROOM_MEMBER_STATE_EVENTS_KEY"
-            android:summary="@string/settings_show_room_member_state_events_summary"
-            android:title="@string/settings_show_room_member_state_events" />
+            android:key="SETTINGS_SHOW_JOIN_LEAVE_MESSAGES_KEY"
+            android:summary="@string/settings_show_join_leave_messages_summary"
+            android:title="@string/settings_show_join_leave_messages" />
+
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="true"
+            android:key="SETTINGS_SHOW_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"
+            android:summary="@string/settings_show_avatar_display_name_changes_messages_summary"
+            android:title="@string/settings_show_avatar_display_name_changes_messages" />
 
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="true"

From c7c76d1e67ba7bcd561a3f47610386a2f6abaa3b Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 30 Mar 2021 20:04:26 +0200
Subject: [PATCH 457/578] Timeline: clean code and update CHANGES

---
 CHANGES.md                                               | 3 ++-
 .../sdk/internal/database/mapper/TimelineEventMapper.kt  | 1 -
 .../session/room/timeline/DefaultTimelineService.kt      | 1 -
 .../sdk/internal/session/room/timeline/UIEchoManager.kt  | 1 -
 .../vector/app/core/resources/UserPreferencesProvider.kt | 3 ---
 .../home/room/detail/ScrollOnHighlightedEventCallback.kt | 1 -
 .../home/room/detail/timeline/TimelineEventController.kt | 2 +-
 .../room/detail/timeline/factory/TimelineItemFactory.kt  | 2 +-
 .../detail/timeline/factory/TimelineItemFactoryParams.kt | 4 ++--
 .../detail/timeline/factory/VerificationItemFactory.kt   | 2 +-
 .../detail/timeline/helper/TimelineDisplayableEvents.kt  | 2 --
 .../timeline/helper/TimelineEventVisibilityHelper.kt     | 9 ++++-----
 .../home/room/detail/timeline/item/AbsBaseMessageItem.kt | 1 -
 .../home/room/detail/timeline/item/BaseEventItem.kt      | 2 --
 .../home/room/detail/timeline/item/BasedMergedItem.kt    | 2 --
 .../home/room/detail/timeline/item/DefaultItem.kt        | 4 +---
 .../home/room/detail/timeline/item/ItemWithEvents.kt     | 1 -
 .../detail/timeline/item/MergedMembershipEventsItem.kt   | 2 --
 .../home/room/detail/timeline/item/NoticeItem.kt         | 1 -
 19 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1a095d20be..1020401f91 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Improvements 🙌:
  - Api interceptor to allow app developers peek responses (#2986)
  - Update reactions to Unicode 13.1 (#2998)
  - Be more robust when parsing some enums
+ - Improve timeline filtering (dissociate membership and profile events, display hidden events when highlighted, fix hidden item/read receipts behavior)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
@@ -23,7 +24,7 @@ Translations 🗣:
  -
 
 SDK API changes ⚠️:
- -
+ - Removes filtering options on Timeline.
 
 Build 🧱:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
index 07954650b2..f3bea68c26 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.database.mapper
 
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.room.model.ReadReceipt
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index 6b50e2e8de..8de36d0427 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -31,7 +31,6 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.database.RealmSessionProvider
-import org.matrix.android.sdk.internal.database.mapper.ReadReceiptsSummaryMapper
 import org.matrix.android.sdk.internal.database.mapper.TimelineEventMapper
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
index 44326ce1ac..4804fbd731 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/UIEchoManager.kt
@@ -71,7 +71,6 @@ internal class UIEchoManager(
     }
 
     fun onLocalEchoCreated(timelineEvent: TimelineEvent)  {
-
         // Manage some ui echos (do it before filter because actual event could be filtered out)
         when (timelineEvent.root.getClearType()) {
             EventType.REDACTION -> {
diff --git a/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
index 04da5394f2..9ab3b9bf45 100644
--- a/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
@@ -48,7 +48,4 @@ class UserPreferencesProvider @Inject constructor(private val vectorPreferences:
     fun shouldShowAvatarDisplayNameChanges(): Boolean {
         return vectorPreferences.showAvatarDisplayNameChangeMessages()
     }
-
-
-
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
index 72f827e469..5d3a91f18d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt
@@ -20,7 +20,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import im.vector.app.core.platform.DefaultListUpdateCallback
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
-import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicReference
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 6c19f30cf0..b67527c24c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -428,7 +428,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
 
     private fun getReadReceiptsByShownEvent(): Map<String, List<ReadReceipt>> {
         val receiptsByEvent = HashMap<String, MutableList<ReadReceipt>>()
-        if(!userPreferencesProvider.shouldShowReadReceipts()){
+        if (!userPreferencesProvider.shouldShowReadReceipts()) {
             return receiptsByEvent
         }
         var lastShownEventId: String? = null
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 09b17eb901..47bc60eb75 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -60,7 +60,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.STATE_ROOM_HISTORY_VISIBILITY,
                 EventType.STATE_ROOM_SERVER_ACL,
                 EventType.STATE_ROOM_GUEST_ACCESS,
-                EventType.REDACTION            ,
+                EventType.REDACTION,
                 EventType.STATE_ROOM_ALIASES,
                 EventType.KEY_VERIFICATION_ACCEPT,
                 EventType.KEY_VERIFICATION_START,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
index dfd9fd2370..caf7204a01 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
@@ -23,8 +23,8 @@ data class TimelineItemFactoryParams(
         val event: TimelineEvent,
         val prevEvent: TimelineEvent? = null,
         val nextEvent: TimelineEvent? = null,
-        val highlightedEventId: String? = null ,
-        val lastSentEventIdWithoutReadReceipts: String? = null ,
+        val highlightedEventId: String? = null,
+        val lastSentEventIdWithoutReadReceipts: String? = null,
         val callback: TimelineEventController.Callback? = null
 ) {
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
index 51951fdc8d..e972ddcab5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
@@ -74,7 +74,7 @@ class VerificationItemFactory @Inject constructor(
         val referenceInformationData = messageInformationDataFactory.create(TimelineItemFactoryParams(refEvent))
 
         val informationData = messageInformationDataFactory.create(params)
-        val attributes = messageItemAttributesFactory.create(null, informationData,params.callback)
+        val attributes = messageItemAttributesFactory.create(null, informationData, params.callback)
 
         when (event.root.getClearType()) {
             EventType.KEY_VERIFICATION_CANCEL -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
index a597fb966e..053b804a82 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.home.room.detail.timeline.helper
 
-import im.vector.app.core.extensions.localDateTime
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
@@ -53,7 +52,6 @@ object TimelineDisplayableEvents {
             EventType.KEY_VERIFICATION_DONE,
             EventType.KEY_VERIFICATION_CANCEL
     )
-
 }
 
 fun TimelineEvent.canBeMerged(): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
index e55b02fe85..580d7d18cf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
@@ -29,14 +29,13 @@ import javax.inject.Inject
 
 class TimelineEventVisibilityHelper @Inject constructor(private val userPreferencesProvider: UserPreferencesProvider) {
 
-
     /**
      * @param timelineEvents the events to search in
      * @param index the index to start computing (inclusive)
      * @param minSize the minimum number of same type events to have sequentially, otherwise will return an empty list
      * @param eventIdToHighlight used to compute visibility
      *
-     * @return a list of timeline events which have sequentially the same type following the next direction. 
+     * @return a list of timeline events which have sequentially the same type following the next direction.
      */
     fun nextSameTypeEvents(timelineEvents: List<TimelineEvent>, index: Int, minSize: Int, eventIdToHighlight: String?): List<TimelineEvent> {
         if (index >= timelineEvents.size - 1) {
@@ -60,7 +59,7 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
         } else {
             nextSameDayEvents.subList(0, indexOfFirstDifferentEventType)
         }
-        val filteredSameTypeEvents = sameTypeEvents.filter { shouldShowEvent(it, eventIdToHighlight)}
+        val filteredSameTypeEvents = sameTypeEvents.filter { shouldShowEvent(it, eventIdToHighlight) }
         if (filteredSameTypeEvents.size < minSize) {
             return emptyList()
         }
@@ -128,12 +127,12 @@ class TimelineEventVisibilityHelper @Inject constructor(private val userPreferen
         val content = root.getClearContent().toModel<RoomMemberContent>()
         val prevContent = root.resolvedPrevContent().toModel<RoomMemberContent>()
 
-        val isMembershipChanged = content?.membership != prevContent?.membership;
+        val isMembershipChanged = content?.membership != prevContent?.membership
         val isJoin = isMembershipChanged && content?.membership == Membership.JOIN
         val isPart = isMembershipChanged && content?.membership == Membership.LEAVE && root.stateKey == root.senderId
 
         val isProfileChanged = !isMembershipChanged && content?.membership == Membership.JOIN
-        val isDisplaynameChange = isProfileChanged && content?.displayName != prevContent?.displayName;
+        val isDisplaynameChange = isProfileChanged && content?.displayName != prevContent?.displayName
         val isAvatarChange = isProfileChanged && content?.avatarUrl !== prevContent?.avatarUrl
 
         return MembershipDiff(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
index a5f3f7c547..39c04af089 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
@@ -24,7 +24,6 @@ import androidx.annotation.IdRes
 import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.ui.views.ShieldImageView
-import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
index 85fcc306f6..7d539f9df7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -26,7 +26,6 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.platform.CheckableView
-import im.vector.app.core.ui.views.ReadReceiptsView
 import im.vector.app.core.utils.DimensionConverter
 
 /**
@@ -44,7 +43,6 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     lateinit var dimensionConverter: DimensionConverter
 
-
     @CallSuper
     override fun bind(holder: H) {
         super.bind(holder)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
index 8a49bd6803..1c56a0809e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
@@ -19,10 +19,8 @@ package im.vector.app.features.home.room.detail.timeline.item
 import android.view.View
 import android.widget.TextView
 import androidx.annotation.IdRes
-import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import org.matrix.android.sdk.api.util.MatrixItem
 
 abstract class BasedMergedItem<H : BasedMergedItem.Holder> : BaseEventItem<H>() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
index 580a56bf05..e6c6e1d372 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt
@@ -22,9 +22,7 @@ import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
-import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
@@ -59,7 +57,7 @@ abstract class DefaultItem : BaseEventItem<DefaultItem.Holder>() {
             val avatarRenderer: AvatarRenderer,
             val informationData: MessageInformationData,
             val text: CharSequence,
-            val itemLongClickListener: View.OnLongClickListener? = null,
+            val itemLongClickListener: View.OnLongClickListener? = null
     )
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
index eeb3826ccd..050cba0d56 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/ItemWithEvents.kt
@@ -26,5 +26,4 @@ interface ItemWithEvents {
     fun canAppendReadMarker(): Boolean = true
 
     fun isVisible(): Boolean = true
-
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
index 70a6864a1f..a52ddf8336 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt
@@ -21,12 +21,10 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.children
-import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 
 @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
 abstract class MergedMembershipEventsItem : BasedMergedItem<MergedMembershipEventsItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
index b733d0ec32..4876e8e500 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt
@@ -25,7 +25,6 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.ui.views.ShieldImageView
-import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel

From 6226938c6f64a626f7e43cad7ccd472859c901b6 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Tue, 30 Mar 2021 19:13:16 +0100
Subject: [PATCH 458/578] Missing file

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../features/settings/troubleshoot/TestPushFromPushGateway.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index 6cf7d68561..6ce944d214 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -53,7 +53,7 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
                             status = TestStatus.RUNNING
                         },
                         {
-                            description = if (failure is PushGatewayFailure.PusherRejected) {
+                            description = if (it is PushGatewayFailure.PusherRejected) {
                                 stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
                             } else {
                                 errorFormatter.toHumanReadable(it)
@@ -70,6 +70,6 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
     }
 
     override fun cancel() {
-        job?.cancel()
+        action?.cancel()
     }
 }

From 145c9d2e4417522ea8175f5b02525db12a23bdd4 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Tue, 30 Mar 2021 19:18:40 +0100
Subject: [PATCH 459/578] Formatting

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../crypto/quads/SharedSecureStorageViewModel.kt   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
index 573a95a7dd..11a30b304e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
@@ -129,13 +129,13 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
     override fun handle(action: SharedSecureStorageAction) = withState {
         when (action) {
             is SharedSecureStorageAction.TogglePasswordVisibility -> handleTogglePasswordVisibility()
-            is SharedSecureStorageAction.Cancel -> handleCancel()
-            is SharedSecureStorageAction.SubmitPassphrase -> handleSubmitPassphrase(action)
-            SharedSecureStorageAction.UseKey -> handleUseKey()
-            is SharedSecureStorageAction.SubmitKey -> handleSubmitKey(action)
-            SharedSecureStorageAction.Back -> handleBack()
-            SharedSecureStorageAction.ForgotResetAll -> handleResetAll()
-            SharedSecureStorageAction.DoResetAll -> handleDoResetAll()
+            is SharedSecureStorageAction.Cancel                   -> handleCancel()
+            is SharedSecureStorageAction.SubmitPassphrase         -> handleSubmitPassphrase(action)
+            SharedSecureStorageAction.UseKey                      -> handleUseKey()
+            is SharedSecureStorageAction.SubmitKey                -> handleSubmitKey(action)
+            SharedSecureStorageAction.Back                        -> handleBack()
+            SharedSecureStorageAction.ForgotResetAll              -> handleResetAll()
+            SharedSecureStorageAction.DoResetAll                  -> handleDoResetAll()
         }.exhaustive
     }
 

From 57df510ecb09e6fdb1508fd0d204517553533065 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 06:58:20 +0000
Subject: [PATCH 460/578] Bump stetho from 1.5.1 to 1.6.0

Bumps [stetho](https://github.com/facebook/stetho) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/facebook/stetho/releases)
- [Changelog](https://github.com/facebook/stetho/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/stetho/compare/v1.5.1...v1.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index e3a7b090e3..b7ec0f76f4 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -339,7 +339,7 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
     // Debug
-    implementation 'com.facebook.stetho:stetho:1.5.1'
+    implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.20'

From e4e13aaa9790f154b6032b05e62907901d72d4a4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 09:25:35 +0200
Subject: [PATCH 461/578] ktlint and cleanup

---
 .../troubleshoot/TestPushFromPushGateway.kt   | 34 ++++++++++---------
 .../vector/app/core/pushers/PushersManager.kt |  2 --
 .../home/room/detail/RoomDetailViewModel.kt   |  1 -
 .../NotificationBroadcastReceiver.kt          |  1 -
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index 6ce944d214..015754145f 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -24,8 +24,10 @@ import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.FcmHelper
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.pushers.PushGatewayFailure
-import kotlinx.coroutines.*
 import javax.inject.Inject
 
 /**
@@ -45,22 +47,22 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
             return
         }
         action = GlobalScope.launch {
-            runCatching { pushersManager.testPush(fcmToken) }
-                .fold(
-                        {
-                            // Wait for the push to be received
-                            description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
-                            status = TestStatus.RUNNING
-                        },
-                        {
-                            description = if (it is PushGatewayFailure.PusherRejected) {
-                                stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
-                            } else {
-                                errorFormatter.toHumanReadable(it)
+            status = runCatching { pushersManager.testPush(fcmToken) }
+                    .fold(
+                            {
+                                // Wait for the push to be received
+                                description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
+                                TestStatus.RUNNING
+                            },
+                            {
+                                description = if (it is PushGatewayFailure.PusherRejected) {
+                                    stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
+                                } else {
+                                    errorFormatter.toHumanReadable(it)
+                                }
+                                TestStatus.FAILED
                             }
-                            status = TestStatus.FAILED
-                        }
-                )
+                    )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index dda8b70b08..5896122393 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -21,8 +21,6 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.AppNameProvider
 import im.vector.app.core.resources.LocaleProvider
 import im.vector.app.core.resources.StringProvider
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.abs
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index e859d001b7..a26d51d593 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -65,7 +65,6 @@ import org.commonmark.parser.Parser
 import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixPatterns
-import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.raw.RawService
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index 7b0707ad61..7125c22342 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -25,7 +25,6 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.vectorComponent
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.read.ReadService

From f49df59e1013b6d536ee4d0b613909f659d04952 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 10:33:12 +0200
Subject: [PATCH 462/578] Convert Room API to suspend (#24499)

---
 .../sdk/session/search/SearchMessagesTest.kt  | 59 +++++++------------
 .../android/sdk/api/session/room/Room.kt      |  5 +-
 .../sdk/internal/session/room/DefaultRoom.kt  | 29 ++++-----
 .../sdk/internal/session/room/RoomFactory.kt  |  3 -
 .../room/detail/search/SearchViewModel.kt     | 34 +++++------
 5 files changed, 50 insertions(+), 80 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index cadb83ca00..312516f486 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -17,30 +17,27 @@
 package org.matrix.android.sdk.session.search
 
 import org.junit.Assert.assertTrue
-import org.junit.Assert.fail
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
-import org.matrix.android.sdk.common.TestConstants
 import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 class SearchMessagesTest : InstrumentedTest {
 
-    private val MESSAGE = "Lorem ipsum dolor sit amet"
+    companion object {
+        private const val MESSAGE = "Lorem ipsum dolor sit amet"
+    }
 
     private val commonTestHelper = CommonTestHelper(context())
     private val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -115,7 +112,7 @@ class SearchMessagesTest : InstrumentedTest {
                 2)
 
         run {
-            var lock = CountDownLatch(1)
+            val lock = CountDownLatch(1)
 
             val eventListener = commonTestHelper.createEventListener(lock) { snapshot ->
                 snapshot.count { it.root.content.toModel<MessageContent>()?.body?.startsWith(MESSAGE).orFalse() } == 2
@@ -124,37 +121,25 @@ class SearchMessagesTest : InstrumentedTest {
             aliceTimeline.addListener(eventListener)
             commonTestHelper.await(lock)
 
-            lock = CountDownLatch(1)
-            roomFromAlicePOV
-                    .search(
-                            searchTerm = "lore",
-                            limit = 10,
-                            includeProfile = true,
-                            afterLimit = 0,
-                            beforeLimit = 10,
-                            orderByRecent = true,
-                            nextBatch = null,
-                            callback = object : MatrixCallback<SearchResult> {
-                                override fun onSuccess(data: SearchResult) {
-                                    super.onSuccess(data)
-                                    assertTrue(data.results?.size == 2)
-                                    assertTrue(
-                                            data.results
-                                                    ?.all {
-                                                        (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
-                                                    }.orFalse()
-                                    )
-                                    lock.countDown()
-                                }
+            val data = commonTestHelper.runBlockingTest {
+                roomFromAlicePOV.search(
+                        searchTerm = "lore",
+                        limit = 10,
+                        includeProfile = true,
+                        afterLimit = 0,
+                        beforeLimit = 10,
+                        orderByRecent = true,
+                        nextBatch = null
+                )
+            }
 
-                                override fun onFailure(failure: Throwable) {
-                                    super.onFailure(failure)
-                                    fail(failure.localizedMessage)
-                                    lock.countDown()
-                                }
-                            }
-                    )
-            lock.await(TestConstants.timeOutMillis, TimeUnit.MILLISECONDS)
+            assertTrue(data.results?.size == 2)
+            assertTrue(
+                    data.results
+                            ?.all {
+                                (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
+                            }.orFalse()
+            )
 
             aliceTimeline.removeAllListeners()
             cryptoTestData.cleanUp(commonTestHelper)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index cb6690b5c5..06c13d4256 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -86,12 +86,11 @@ interface Room :
      * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
      * @param callback Callback to get the search result
      */
-    fun search(searchTerm: String,
+    suspend fun search(searchTerm: String,
                nextBatch: String?,
                orderByRecent: Boolean,
                limit: Int,
                beforeLimit: Int,
                afterLimit: Int,
-               includeProfile: Boolean,
-               callback: MatrixCallback<SearchResult>): Cancelable
+               includeProfile: Boolean): SearchResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 8e817ec31a..1d8eb6c95e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.room
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.Room
@@ -37,14 +36,11 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
 import org.matrix.android.sdk.api.session.search.SearchResult
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.search.SearchTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.awaitCallback
 import java.security.InvalidParameterException
 import javax.inject.Inject
@@ -66,7 +62,6 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
                                                private val relationService: RelationService,
                                                private val roomMembersService: MembershipService,
                                                private val roomPushRuleService: RoomPushRuleService,
-                                               private val taskExecutor: TaskExecutor,
                                                private val sendStateTask: SendStateTask,
                                                private val searchTask: SearchTask) :
         Room,
@@ -133,16 +128,15 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
         }
     }
 
-    override fun search(searchTerm: String,
-                        nextBatch: String?,
-                        orderByRecent: Boolean,
-                        limit: Int,
-                        beforeLimit: Int,
-                        afterLimit: Int,
-                        includeProfile: Boolean,
-                        callback: MatrixCallback<SearchResult>): Cancelable {
-        return searchTask
-                .configureWith(SearchTask.Params(
+    override suspend fun search(searchTerm: String,
+                                nextBatch: String?,
+                                orderByRecent: Boolean,
+                                limit: Int,
+                                beforeLimit: Int,
+                                afterLimit: Int,
+                                includeProfile: Boolean): SearchResult {
+        return searchTask.execute(
+                SearchTask.Params(
                         searchTerm = searchTerm,
                         roomId = roomId,
                         nextBatch = nextBatch,
@@ -151,8 +145,7 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
                         beforeLimit = beforeLimit,
                         afterLimit = afterLimit,
                         includeProfile = includeProfile
-                )) {
-                    this.callback = callback
-                }.executeBy(taskExecutor)
+                )
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index 63370a1ad8..90640b4700 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -36,7 +36,6 @@ import org.matrix.android.sdk.internal.session.room.timeline.DefaultTimelineServ
 import org.matrix.android.sdk.internal.session.room.typing.DefaultTypingService
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultUploadsService
 import org.matrix.android.sdk.internal.session.search.SearchTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
 internal interface RoomFactory {
@@ -60,7 +59,6 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                                                       private val relationServiceFactory: DefaultRelationService.Factory,
                                                       private val membershipServiceFactory: DefaultMembershipService.Factory,
                                                       private val roomPushRuleServiceFactory: DefaultRoomPushRuleService.Factory,
-                                                      private val taskExecutor: TaskExecutor,
                                                       private val sendStateTask: SendStateTask,
                                                       private val searchTask: SearchTask) :
         RoomFactory {
@@ -84,7 +82,6 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                 relationService = relationServiceFactory.create(roomId),
                 roomMembersService = membershipServiceFactory.create(roomId),
                 roomPushRuleService = roomPushRuleServiceFactory.create(roomId),
-                taskExecutor = taskExecutor,
                 sendStateTask = sendStateTask,
                 searchTask = searchTask
         )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index cb93cf95d2..fb3abf002e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -24,26 +24,24 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.search.SearchResult
-import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.util.awaitCallback
 
 class SearchViewModel @AssistedInject constructor(
         @Assisted private val initialState: SearchViewState,
         session: Session
 ) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) {
 
-    private var room: Room? = session.getRoom(initialState.roomId)
+    private val room = session.getRoom(initialState.roomId)
 
-    private var currentTask: Cancelable? = null
+    private var currentTask: Job? = null
 
     private var nextBatch: String? = null
 
@@ -92,6 +90,7 @@ class SearchViewModel @AssistedInject constructor(
     }
 
     private fun startSearching(isNextBatch: Boolean) = withState { state ->
+        if (room == null) return@withState
         if (state.searchTerm == null) return@withState
 
         // There is no batch to retrieve
@@ -108,20 +107,17 @@ class SearchViewModel @AssistedInject constructor(
 
         currentTask?.cancel()
 
-        viewModelScope.launch {
+        currentTask = viewModelScope.launch {
             try {
-                val result = awaitCallback<SearchResult> {
-                    currentTask = room?.search(
-                            searchTerm = state.searchTerm,
-                            nextBatch = nextBatch,
-                            orderByRecent = true,
-                            beforeLimit = 0,
-                            afterLimit = 0,
-                            includeProfile = true,
-                            limit = 20,
-                            callback = it
-                    )
-                }
+                val result = room.search(
+                        searchTerm = state.searchTerm,
+                        nextBatch = nextBatch,
+                        orderByRecent = true,
+                        beforeLimit = 0,
+                        afterLimit = 0,
+                        includeProfile = true,
+                        limit = 20
+                )
                 onSearchResultSuccess(result)
             } catch (failure: Throwable) {
                 if (failure is Failure.Cancelled) return@launch

From 0a0c8cde34fd5fced070fcf0af4e210ec89865c1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 10:51:12 +0200
Subject: [PATCH 463/578] Cleanup the test

---
 .../sdk/session/search/SearchMessagesTest.kt  | 136 +++++++-----------
 1 file changed, 53 insertions(+), 83 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index 312516f486..1baf490dfc 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -27,7 +27,9 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestData
 import org.matrix.android.sdk.common.CryptoTestHelper
 import java.util.concurrent.CountDownLatch
 
@@ -44,107 +46,75 @@ class SearchMessagesTest : InstrumentedTest {
 
     @Test
     fun sendTextMessageAndSearchPartOfItUsingSession() {
-        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
-        val aliceSession = cryptoTestData.firstSession
-        val aliceRoomId = cryptoTestData.roomId
-        aliceSession.cryptoService().setWarnOnUnknownDevices(false)
-        val roomFromAlicePOV = aliceSession.getRoom(aliceRoomId)!!
-        val aliceTimeline = roomFromAlicePOV.createTimeline(null, TimelineSettings(10))
-        aliceTimeline.start()
-
-        commonTestHelper.sendTextMessage(
-                roomFromAlicePOV,
-                MESSAGE,
-                2)
-
-        run {
-            val lock = CountDownLatch(1)
-
-            val eventListener = commonTestHelper.createEventListener(lock) { snapshot ->
-                snapshot.count { it.root.content.toModel<MessageContent>()?.body?.startsWith(MESSAGE).orFalse() } == 2
-            }
-
-            aliceTimeline.addListener(eventListener)
-            commonTestHelper.await(lock)
-
-            val data = commonTestHelper.runBlockingTest {
-                aliceSession
-                        .searchService()
-                        .search(
-                                searchTerm = "lore",
-                                limit = 10,
-                                includeProfile = true,
-                                afterLimit = 0,
-                                beforeLimit = 10,
-                                orderByRecent = true,
-                                nextBatch = null,
-                                roomId = aliceRoomId
-                        )
-            }
-            assertTrue(data.results?.size == 2)
-            assertTrue(
-                    data.results
-                            ?.all {
-                                (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
-                            }.orFalse()
-            )
-
-            aliceTimeline.removeAllListeners()
-            cryptoTestData.cleanUp(commonTestHelper)
+        doTest { cryptoTestData ->
+            cryptoTestData.firstSession
+                    .searchService()
+                    .search(
+                            searchTerm = "lore",
+                            limit = 10,
+                            includeProfile = true,
+                            afterLimit = 0,
+                            beforeLimit = 10,
+                            orderByRecent = true,
+                            nextBatch = null,
+                            roomId = cryptoTestData.roomId
+                    )
         }
-
-        aliceSession.startSync(true)
     }
 
     @Test
     fun sendTextMessageAndSearchPartOfItUsingRoom() {
-        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
+        doTest { cryptoTestData ->
+            cryptoTestData.firstSession
+                    .getRoom(cryptoTestData.roomId)!!
+                    .search(
+                            searchTerm = "lore",
+                            limit = 10,
+                            includeProfile = true,
+                            afterLimit = 0,
+                            beforeLimit = 10,
+                            orderByRecent = true,
+                            nextBatch = null
+                    )
+        }
+    }
+
+    private fun doTest(block: suspend (CryptoTestData) -> SearchResult) {
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceInARoom(false)
         val aliceSession = cryptoTestData.firstSession
         val aliceRoomId = cryptoTestData.roomId
-        aliceSession.cryptoService().setWarnOnUnknownDevices(false)
         val roomFromAlicePOV = aliceSession.getRoom(aliceRoomId)!!
         val aliceTimeline = roomFromAlicePOV.createTimeline(null, TimelineSettings(10))
         aliceTimeline.start()
 
+        val lock = CountDownLatch(1)
+
+        val eventListener = commonTestHelper.createEventListener(lock) { snapshot ->
+            snapshot.count { it.root.content.toModel<MessageContent>()?.body?.startsWith(MESSAGE).orFalse() } == 2
+        }
+
+        aliceTimeline.addListener(eventListener)
+
         commonTestHelper.sendTextMessage(
                 roomFromAlicePOV,
                 MESSAGE,
                 2)
 
-        run {
-            val lock = CountDownLatch(1)
+        commonTestHelper.await(lock)
 
-            val eventListener = commonTestHelper.createEventListener(lock) { snapshot ->
-                snapshot.count { it.root.content.toModel<MessageContent>()?.body?.startsWith(MESSAGE).orFalse() } == 2
-            }
-
-            aliceTimeline.addListener(eventListener)
-            commonTestHelper.await(lock)
-
-            val data = commonTestHelper.runBlockingTest {
-                roomFromAlicePOV.search(
-                        searchTerm = "lore",
-                        limit = 10,
-                        includeProfile = true,
-                        afterLimit = 0,
-                        beforeLimit = 10,
-                        orderByRecent = true,
-                        nextBatch = null
-                )
-            }
-
-            assertTrue(data.results?.size == 2)
-            assertTrue(
-                    data.results
-                            ?.all {
-                                (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
-                            }.orFalse()
-            )
-
-            aliceTimeline.removeAllListeners()
-            cryptoTestData.cleanUp(commonTestHelper)
+        val data = commonTestHelper.runBlockingTest {
+            block.invoke(cryptoTestData)
         }
 
-        aliceSession.startSync(true)
+        assertTrue(data.results?.size == 2)
+        assertTrue(
+                data.results
+                        ?.all {
+                            (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
+                        }.orFalse()
+        )
+
+        aliceTimeline.removeAllListeners()
+        cryptoTestData.cleanUp(commonTestHelper)
     }
 }

From bf65531268d8fb72d48af36114d9712a6ae5eb79 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 11:31:02 +0200
Subject: [PATCH 464/578] Remove dead code

---
 .../app/features/widgets/WidgetAPICallback.kt | 36 -------------------
 .../features/widgets/WidgetPostAPIHandler.kt  |  4 ---
 2 files changed, 40 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt

diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt
deleted file mode 100644
index ad17a5ae87..0000000000
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.widgets
-
-import im.vector.app.R
-import im.vector.app.core.resources.StringProvider
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
-import org.matrix.android.sdk.api.util.JsonDict
-
-class WidgetAPICallback(private val postAPIMediator: WidgetPostAPIMediator,
-                        private val eventData: JsonDict,
-                        private val stringProvider: StringProvider) : MatrixCallback<Any> {
-
-    override fun onFailure(failure: Throwable) {
-        postAPIMediator.sendError(stringProvider.getString(R.string.widget_integration_failed_to_send_request), eventData)
-    }
-
-    override fun onSuccess(data: Any) {
-        postAPIMediator.sendSuccess(eventData)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index f5b2c7e4a8..9fa04aabbb 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -464,10 +464,6 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo
         return false
     }
 
-    private fun createWidgetAPICallback(widgetPostAPIMediator: WidgetPostAPIMediator, eventData: JsonDict): WidgetAPICallback {
-        return WidgetAPICallback(widgetPostAPIMediator, eventData, stringProvider)
-    }
-
     private fun launchWidgetAPIAction(widgetPostAPIMediator: WidgetPostAPIMediator, eventData: JsonDict, block: suspend () -> Unit): Job {
         return GlobalScope.launch {
             kotlin.runCatching {

From af9fa44e8c4e690b6aec236fff58fac07eb039f3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 11:36:02 +0200
Subject: [PATCH 465/578] Remove dead code

---
 .../sdk/api/util/MatrixCallbackDelegate.kt    | 24 -------------
 .../crypto/model/MXQueuedEncryption.kt        | 34 -------------------
 .../android/sdk/internal/extensions/Try.kt    |  5 ---
 3 files changed, 63 deletions(-)
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
 delete mode 100755 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
deleted file mode 100644
index 63d37f409f..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.api.util
-
-import org.matrix.android.sdk.api.MatrixCallback
-
-/**
- * Simple MatrixCallback implementation which delegate its calls to another callback
- */
-open class MatrixCallbackDelegate<T>(private val callback: MatrixCallback<T>) : MatrixCallback<T> by callback
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt
deleted file mode 100755
index fe6b3a74bb..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.crypto.model
-
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.events.model.Content
-
-class MXQueuedEncryption {
-
-    /**
-     * The data to encrypt.
-     */
-    var eventContent: Content? = null
-    var eventType: String? = null
-
-    /**
-     * the asynchronous callback
-     */
-    var apiCallback: MatrixCallback<Content>? = null
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
index 8786321464..2ce0534b49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
@@ -21,7 +21,6 @@ import arrow.core.Success
 import arrow.core.Try
 import arrow.core.TryOf
 import arrow.core.fix
-import org.matrix.android.sdk.api.MatrixCallback
 
 inline fun <A> TryOf<A>.onError(f: (Throwable) -> Unit): Try<A> = fix()
         .fold(
@@ -32,10 +31,6 @@ inline fun <A> TryOf<A>.onError(f: (Throwable) -> Unit): Try<A> = fix()
                 { Success(it) }
         )
 
-fun <A> Try<A>.foldToCallback(callback: MatrixCallback<A>): Unit = fold(
-        { callback.onFailure(it) },
-        { callback.onSuccess(it) })
-
 /**
  * Same as doOnNext for Observables
  */

From f4c84d599fc133c8499a5ac8291b515da384fbf9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 11:39:06 +0200
Subject: [PATCH 466/578] Add changelog for the next release.

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1a095d20be..0559c31b90 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,7 +23,7 @@ Translations 🗣:
  -
 
 SDK API changes ⚠️:
- -
+ - Several Services have been migrated to coroutines (#2449)
 
 Build 🧱:
  -

From cb96a9059e0290bc35349d0a917e396bf82975fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 13:48:01 +0000
Subject: [PATCH 467/578] Bump stetho-okhttp3 from 1.5.1 to 1.6.0

Bumps [stetho-okhttp3](https://github.com/facebook/stetho) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/facebook/stetho/releases)
- [Changelog](https://github.com/facebook/stetho/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/stetho/compare/v1.5.1...v1.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index d74678ae55..0ca605dc8b 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -163,7 +163,7 @@ dependencies {
 
     // Logging
     implementation 'com.jakewharton.timber:timber:4.7.1'
-    implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
+    implementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.20'

From 741100e1aa7bc4770012e75cec4408269bc7ede6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 17:49:04 +0200
Subject: [PATCH 468/578] static val

---
 .../room/detail/timeline/factory/TimelineItemFactoryParams.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
index caf7204a01..f92cd2800a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
@@ -27,7 +27,5 @@ data class TimelineItemFactoryParams(
         val lastSentEventIdWithoutReadReceipts: String? = null,
         val callback: TimelineEventController.Callback? = null
 ) {
-
-    val isHighlighted: Boolean
-        get() = highlightedEventId == event.eventId
+    val isHighlighted = highlightedEventId == event.eventId
 }

From 42f6adf2e2a1f8e6cbdd5f2bfa05138537d35708 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 17:55:25 +0200
Subject: [PATCH 469/578] ktlint

---
 .../main/java/org/matrix/android/sdk/api/session/room/Room.kt   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 06c13d4256..257c83564e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.alias.AliasService
 import org.matrix.android.sdk.api.session.room.call.RoomCallService
 import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
@@ -35,7 +34,6 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
 import org.matrix.android.sdk.api.session.search.SearchResult
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 
 /**

From 6a91c2b355a6e621e91c8831ae204c27360811aa Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 14:21:47 +0200
Subject: [PATCH 470/578] Migrate Retrofit interface to coroutine calls

---
 CHANGES.md                                    |   1 +
 .../android/sdk/internal/auth/AuthAPI.kt      |  27 ++-
 .../auth/DefaultAuthenticationService.kt      |  25 ++-
 .../auth/IsValidClientServerApiTask.kt        |   5 +-
 .../internal/auth/login/DefaultLoginWizard.kt |  18 +-
 .../internal/auth/login/DirectLoginTask.kt    |  20 +--
 .../registration/RegisterAddThreePidTask.kt   |   2 +-
 .../auth/registration/RegisterTask.kt         |   2 +-
 .../auth/registration/ValidateCodeTask.kt     |   2 +-
 .../sdk/internal/crypto/api/CryptoApi.kt      |  33 ++--
 .../crypto/keysbackup/api/RoomKeysApi.kt      |  55 +++---
 .../tasks/CreateKeysBackupVersionTask.kt      |   2 +-
 .../keysbackup/tasks/DeleteBackupTask.kt      |   2 +-
 .../tasks/DeleteRoomSessionDataTask.kt        |   2 +-
 .../tasks/DeleteRoomSessionsDataTask.kt       |   2 +-
 .../tasks/DeleteSessionsDataTask.kt           |   2 +-
 .../tasks/GetKeysBackupLastVersionTask.kt     |   2 +-
 .../tasks/GetKeysBackupVersionTask.kt         |   2 +-
 .../tasks/GetRoomSessionDataTask.kt           |   2 +-
 .../tasks/GetRoomSessionsDataTask.kt          |   2 +-
 .../keysbackup/tasks/GetSessionsDataTask.kt   |   2 +-
 .../tasks/StoreRoomSessionDataTask.kt         |   2 +-
 .../tasks/StoreRoomSessionsDataTask.kt        |   2 +-
 .../keysbackup/tasks/StoreSessionsDataTask.kt |   2 +-
 .../tasks/UpdateKeysBackupVersionTask.kt      |   2 +-
 .../ClaimOneTimeKeysForUsersDeviceTask.kt     |   5 +-
 .../internal/crypto/tasks/DeleteDeviceTask.kt |   4 +-
 .../crypto/tasks/DownloadKeysForUsersTask.kt  |   6 +-
 .../crypto/tasks/GetDeviceInfoTask.kt         |   2 +-
 .../internal/crypto/tasks/GetDevicesTask.kt   |   2 +-
 .../crypto/tasks/GetKeyChangesTask.kt         |   2 +-
 .../internal/crypto/tasks/RedactEventTask.kt  |   7 +-
 .../internal/crypto/tasks/SendEventTask.kt    |   7 +-
 .../internal/crypto/tasks/SendToDeviceTask.kt |  23 ++-
 .../tasks/SendVerificationMessageTask.kt      |   7 +-
 .../crypto/tasks/SetDeviceNameTask.kt         |   2 +-
 .../internal/crypto/tasks/UploadKeysTask.kt   |   2 +-
 .../crypto/tasks/UploadSignaturesTask.kt      |  14 +-
 .../crypto/tasks/UploadSigningKeysTask.kt     |   5 +-
 .../sdk/internal/federation/FederationAPI.kt  |   3 +-
 .../federation/GetFederationVersionTask.kt    |   4 +-
 .../android/sdk/internal/network/Request.kt   |  41 +++--
 .../internal/network/RetrofitExtensions.kt    |   8 +
 .../android/sdk/internal/raw/GetUrlTask.kt    |   5 +-
 .../matrix/android/sdk/internal/raw/RawAPI.kt |   3 +-
 .../internal/session/account/AccountAPI.kt    |   5 +-
 .../session/account/ChangePasswordTask.kt     |   8 +-
 .../session/account/DeactivateAccountTask.kt  |   4 +-
 .../session/call/GetTurnServerTask.kt         |   2 +-
 .../sdk/internal/session/call/VoipApi.kt      |   3 +-
 .../session/directory/DirectoryAPI.kt         |  15 +-
 .../sdk/internal/session/filter/FilterApi.kt  |   9 +-
 .../internal/session/filter/SaveFilterTask.kt |   4 +-
 .../session/group/GetGroupDataTask.kt         |  12 +-
 .../sdk/internal/session/group/GroupAPI.kt    |   7 +-
 .../session/homeserver/CapabilitiesAPI.kt     |   7 +-
 .../GetHomeServerCapabilitiesTask.kt          |  12 +-
 .../session/homeserver/HomeServerPinger.kt    |   4 +-
 .../internal/session/identity/IdentityAPI.kt  |  17 +-
 .../session/identity/IdentityAuthAPI.kt       |   7 +-
 .../identity/IdentityBulkLookupTask.kt        |   4 +-
 .../identity/IdentityDisconnectTask.kt        |   4 +-
 .../session/identity/IdentityPingTask.kt      |   8 +-
 .../session/identity/IdentityRegisterTask.kt  |   2 +-
 .../IdentityRequestTokenForBindingTask.kt     |   5 +-
 .../IdentitySubmitTokenForBindingTask.kt      |   5 +-
 .../session/identity/IdentityTaskHelper.kt    |   5 +-
 .../session/media/GetPreviewUrlTask.kt        |   4 +-
 .../session/media/GetRawPreviewUrlTask.kt     |   2 +-
 .../sdk/internal/session/media/MediaAPI.kt    |   5 +-
 .../session/openid/GetOpenIdTokenTask.kt      |   2 +-
 .../sdk/internal/session/openid/OpenIdAPI.kt  |   5 +-
 .../session/profile/AddThreePidTask.kt        |  32 ++--
 .../session/profile/BindThreePidsTask.kt      |   4 +-
 .../session/profile/DeleteThreePidTask.kt     |  12 +-
 .../profile/FinalizeAddingThreePidTask.kt     |   4 +-
 .../session/profile/GetProfileInfoTask.kt     |   2 +-
 .../internal/session/profile/ProfileAPI.kt    |  29 ++--
 .../profile/RefreshUserThreePidsTask.kt       |   4 +-
 .../session/profile/SetAvatarUrlTask.kt       |   8 +-
 .../session/profile/SetDisplayNameTask.kt     |   8 +-
 .../session/profile/UnbindThreePidsTask.kt    |   4 +-
 .../session/profile/ValidateSmsCodeTask.kt    |   5 +-
 .../session/pushers/AddHttpPusherWorker.kt    |   4 +-
 .../session/pushers/AddPushRuleTask.kt        |   2 +-
 .../session/pushers/GetPushRulesTask.kt       |   5 +-
 .../session/pushers/GetPushersTask.kt         |   4 +-
 .../internal/session/pushers/PushRulesApi.kt  |  29 ++--
 .../internal/session/pushers/PushersAPI.kt    |   5 +-
 .../session/pushers/RemovePushRuleTask.kt     |   2 +-
 .../session/pushers/RemovePusherTask.kt       |   4 +-
 .../pushers/UpdatePushRuleActionsTask.kt      |   8 +-
 .../pushers/UpdatePushRuleEnableStatusTask.kt |   2 +-
 .../session/pushers/gateway/PushGatewayAPI.kt |   3 +-
 .../pushers/gateway/PushGatewayNotifyTask.kt  |   4 +-
 .../sdk/internal/session/room/RoomAPI.kt      | 157 +++++++++---------
 .../session/room/alias/AddRoomAliasTask.kt    |   4 +-
 .../session/room/alias/DeleteRoomAliasTask.kt |   4 +-
 .../room/alias/GetRoomIdByAliasTask.kt        |   4 +-
 .../room/alias/GetRoomLocalAliasesTask.kt     |   4 +-
 .../alias/RoomAliasAvailabilityChecker.kt     |   4 +-
 .../session/room/create/CreateRoomTask.kt     |   4 +-
 .../room/directory/GetPublicRoomTask.kt       |   2 +-
 .../GetRoomDirectoryVisibilityTask.kt         |   5 +-
 .../SetRoomDirectoryVisibilityTask.kt         |   4 +-
 .../room/membership/LoadRoomMembersTask.kt    |   4 +-
 .../membership/admin/MembershipAdminTask.kt   |   4 +-
 .../room/membership/joining/InviteTask.kt     |  14 +-
 .../room/membership/joining/JoinRoomTask.kt   |   5 +-
 .../room/membership/leaving/LeaveRoomTask.kt  |   4 +-
 .../membership/threepid/InviteThreePidTask.kt |   2 +-
 .../room/peeking/ResolveRoomStateTask.kt      |   2 +-
 .../session/room/read/SetReadMarkersTask.kt   |   8 +-
 .../room/relation/FetchEditHistoryTask.kt     |   4 +-
 .../room/relation/SendRelationWorker.kt       |   5 +-
 .../room/reporting/ReportContentTask.kt       |   2 +-
 .../session/room/send/RedactEventWorker.kt    |   4 +-
 .../session/room/state/SendStateTask.kt       |   2 +-
 .../session/room/tags/AddTagToRoomTask.kt     |   4 +-
 .../room/tags/DeleteTagFromRoomTask.kt        |   4 +-
 .../timeline/FetchTokenAndPaginateTask.kt     |   4 +-
 .../room/timeline/GetContextOfEventTask.kt    |   4 +-
 .../session/room/timeline/GetEventTask.kt     |   2 +-
 .../session/room/timeline/PaginationTask.kt   |   8 +-
 .../session/room/typing/SendTypingTask.kt     |   4 +-
 .../session/room/uploads/GetUploadsTask.kt    |   5 +-
 .../sdk/internal/session/search/SearchAPI.kt  |   5 +-
 .../sdk/internal/session/search/SearchTask.kt |  38 ++---
 .../session/signout/SignInAgainTask.kt        |   5 +-
 .../internal/session/signout/SignOutAPI.kt    |   5 +-
 .../internal/session/signout/SignOutTask.kt   |   4 +-
 .../sdk/internal/session/sync/SyncAPI.kt      |  10 +-
 .../sdk/internal/session/sync/SyncTask.kt     |   9 +-
 .../session/terms/DefaultTermsService.kt      |  14 +-
 .../sdk/internal/session/terms/TermsAPI.kt    |   9 +-
 .../thirdparty/GetThirdPartyProtocolsTask.kt  |   2 +-
 .../thirdparty/GetThirdPartyUserTask.kt       |   2 +-
 .../session/thirdparty/ThirdPartyAPI.kt       |   6 +-
 .../internal/session/user/SearchUserAPI.kt    |   3 +-
 .../user/accountdata/AccountDataAPI.kt        |   7 +-
 .../accountdata/UpdateIgnoredUserIdsTask.kt   |   4 +-
 .../accountdata/UpdateUserAccountDataTask.kt  |   2 +-
 .../session/user/model/SearchUserTask.kt      |   4 +-
 .../session/widgets/CreateWidgetTask.kt       |   4 +-
 .../internal/session/widgets/WidgetsAPI.kt    |   9 +-
 .../widgets/token/GetScalarTokenTask.kt       |   9 +-
 .../internal/wellknown/GetWellknownTask.kt    |  12 +-
 .../sdk/internal/wellknown/WellKnownAPI.kt    |   3 +-
 148 files changed, 576 insertions(+), 598 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ed549c918f..a97430eff9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -35,6 +35,7 @@ Test:
 
 Other changes:
  - Add version details on the login screen, in debug or developer mode
+ - Migrate Retrofit interface to coroutine calls
 
 Changes in Element 1.1.3 (2021-03-18)
 ===================================================
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index f92ae7e0ee..2ce5c67a94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -29,7 +29,6 @@ import org.matrix.android.sdk.internal.auth.registration.SuccessResult
 import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Headers
@@ -45,26 +44,26 @@ internal interface AuthAPI {
      * Get a Riot config file, using the name including the domain
      */
     @GET("config.{domain}.json")
-    fun getRiotConfigDomain(@Path("domain") domain: String): Call<RiotConfig>
+    suspend fun getRiotConfigDomain(@Path("domain") domain: String): RiotConfig
 
     /**
      * Get a Riot config file
      */
     @GET("config.json")
-    fun getRiotConfig(): Call<RiotConfig>
+    suspend fun getRiotConfig(): RiotConfig
 
     /**
      * Get the version information of the homeserver
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_ + "versions")
-    fun versions(): Call<Versions>
+    suspend fun versions(): Versions
 
     /**
      * Register to the homeserver, or get error 401 with a RegistrationFlowResponse object if registration is incomplete
      * Ref: https://matrix.org/docs/spec/client_server/latest#account-registration-and-management
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register")
-    fun register(@Body registrationParams: RegistrationParams): Call<Credentials>
+    suspend fun register(@Body registrationParams: RegistrationParams): Credentials
 
     /**
      * Add 3Pid during registration
@@ -72,22 +71,22 @@ internal interface AuthAPI {
      * https://github.com/matrix-org/matrix-doc/pull/2290
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register/{threePid}/requestToken")
-    fun add3Pid(@Path("threePid") threePid: String,
-                @Body params: AddThreePidRegistrationParams): Call<AddThreePidRegistrationResponse>
+    suspend fun add3Pid(@Path("threePid") threePid: String,
+                        @Body params: AddThreePidRegistrationParams): AddThreePidRegistrationResponse
 
     /**
      * Validate 3pid
      */
     @POST
-    fun validate3Pid(@Url url: String,
-                     @Body params: ValidationCodeBody): Call<SuccessResult>
+    suspend fun validate3Pid(@Url url: String,
+                             @Body params: ValidationCodeBody): SuccessResult
 
     /**
      * Get the supported login flow
      * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-login
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "login")
-    fun getLoginFlows(): Call<LoginFlowResponse>
+    suspend fun getLoginFlows(): LoginFlowResponse
 
     /**
      * Pass params to the server for the current login phase.
@@ -97,22 +96,22 @@ internal interface AuthAPI {
      */
     @Headers("CONNECT_TIMEOUT:60000", "READ_TIMEOUT:60000", "WRITE_TIMEOUT:60000")
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "login")
-    fun login(@Body loginParams: PasswordLoginParams): Call<Credentials>
+    suspend fun login(@Body loginParams: PasswordLoginParams): Credentials
 
     // Unfortunately we cannot use interface for @Body parameter, so I duplicate the method for the type TokenLoginParams
     @Headers("CONNECT_TIMEOUT:60000", "READ_TIMEOUT:60000", "WRITE_TIMEOUT:60000")
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "login")
-    fun login(@Body loginParams: TokenLoginParams): Call<Credentials>
+    suspend fun login(@Body loginParams: TokenLoginParams): Credentials
 
     /**
      * Ask the homeserver to reset the password associated with the provided email.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/password/email/requestToken")
-    fun resetPassword(@Body params: AddThreePidRegistrationParams): Call<AddThreePidRegistrationResponse>
+    suspend fun resetPassword(@Body params: AddThreePidRegistrationParams): AddThreePidRegistrationResponse
 
     /**
      * Ask the homeserver to reset the password with the provided new password once the email is validated.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/password")
-    fun resetPasswordMailConfirmed(@Body params: ResetPasswordMailConfirmed): Call<Unit>
+    suspend fun resetPasswordMailConfirmed(@Body params: ResetPasswordMailConfirmed)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 4f3451cf30..e26286ad2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -31,7 +31,6 @@ import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.util.appendParamToUrl
 import org.matrix.android.sdk.internal.SessionManager
-import org.matrix.android.sdk.internal.auth.data.LoginFlowResponse
 import org.matrix.android.sdk.internal.auth.data.RiotConfig
 import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 import org.matrix.android.sdk.internal.auth.login.DefaultLoginWizard
@@ -172,8 +171,8 @@ internal class DefaultAuthenticationService @Inject constructor(
 
         // First check the homeserver version
         return runCatching {
-            executeRequest<Versions>(null) {
-                apiCall = authAPI.versions()
+            executeRequest(null) {
+                authAPI.versions()
             }
         }
                 .map { versions ->
@@ -204,8 +203,8 @@ internal class DefaultAuthenticationService @Inject constructor(
 
         // Ok, try to get the config.domain.json file of a RiotWeb client
         return runCatching {
-            executeRequest<RiotConfig>(null) {
-                apiCall = authAPI.getRiotConfigDomain(domain)
+            executeRequest(null) {
+                authAPI.getRiotConfigDomain(domain)
             }
         }
                 .map { riotConfig ->
@@ -232,8 +231,8 @@ internal class DefaultAuthenticationService @Inject constructor(
 
         // Ok, try to get the config.json file of a RiotWeb client
         return runCatching {
-            executeRequest<RiotConfig>(null) {
-                apiCall = authAPI.getRiotConfig()
+            executeRequest(null) {
+                authAPI.getRiotConfig()
             }
         }
                 .map { riotConfig ->
@@ -265,8 +264,8 @@ internal class DefaultAuthenticationService @Inject constructor(
 
             val newAuthAPI = buildAuthAPI(newHomeServerConnectionConfig)
 
-            val versions = executeRequest<Versions>(null) {
-                apiCall = newAuthAPI.versions()
+            val versions = executeRequest(null) {
+                newAuthAPI.versions()
             }
 
             return getLoginFlowResult(newAuthAPI, versions, defaultHomeServerUrl)
@@ -293,8 +292,8 @@ internal class DefaultAuthenticationService @Inject constructor(
 
                 val newAuthAPI = buildAuthAPI(newHomeServerConnectionConfig)
 
-                val versions = executeRequest<Versions>(null) {
-                    apiCall = newAuthAPI.versions()
+                val versions = executeRequest(null) {
+                    newAuthAPI.versions()
                 }
 
                 getLoginFlowResult(newAuthAPI, versions, wellknownResult.homeServerUrl)
@@ -305,8 +304,8 @@ internal class DefaultAuthenticationService @Inject constructor(
 
     private suspend fun getLoginFlowResult(authAPI: AuthAPI, versions: Versions, homeServerUrl: String): LoginFlowResult {
         // Get the login flow
-        val loginFlowResponse = executeRequest<LoginFlowResponse>(null) {
-            apiCall = authAPI.getLoginFlows()
+        val loginFlowResponse = executeRequest(null) {
+            authAPI.getLoginFlows()
         }
         return LoginFlowResult.Success(
                 loginFlowResponse.flows.orEmpty().mapNotNull { it.type },
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/IsValidClientServerApiTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/IsValidClientServerApiTask.kt
index b8416d69bf..867cf46b8d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/IsValidClientServerApiTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/IsValidClientServerApiTask.kt
@@ -20,7 +20,6 @@ import dagger.Lazy
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.internal.auth.data.LoginFlowResponse
 import org.matrix.android.sdk.internal.di.Unauthenticated
 import org.matrix.android.sdk.internal.network.RetrofitFactory
 import org.matrix.android.sdk.internal.network.executeRequest
@@ -49,8 +48,8 @@ internal class DefaultIsValidClientServerApiTask @Inject constructor(
                 .create(AuthAPI::class.java)
 
         return try {
-            executeRequest<LoginFlowResponse>(null) {
-                apiCall = authAPI.getLoginFlows()
+            executeRequest(null) {
+                authAPI.getLoginFlows()
             }
             // We get a response, so the API is valid
             true
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
index 4167875849..8b81f42e03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.auth.login
 
 import android.util.Patterns
-import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.auth.login.LoginWizard
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import org.matrix.android.sdk.api.session.Session
@@ -29,7 +28,6 @@ import org.matrix.android.sdk.internal.auth.data.ThreePidMedium
 import org.matrix.android.sdk.internal.auth.data.TokenLoginParams
 import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationParams
-import org.matrix.android.sdk.internal.auth.registration.AddThreePidRegistrationResponse
 import org.matrix.android.sdk.internal.auth.registration.RegisterAddThreePidTask
 import org.matrix.android.sdk.internal.network.executeRequest
 
@@ -49,8 +47,8 @@ internal class DefaultLoginWizard(
         } else {
             PasswordLoginParams.userIdentifier(login, password, deviceName)
         }
-        val credentials = executeRequest<Credentials>(null) {
-            apiCall = authAPI.login(loginParams)
+        val credentials = executeRequest(null) {
+            authAPI.login(loginParams)
         }
 
         return sessionCreator.createSession(credentials, pendingSessionData.homeServerConnectionConfig)
@@ -63,8 +61,8 @@ internal class DefaultLoginWizard(
         val loginParams = TokenLoginParams(
                 token = loginToken
         )
-        val credentials = executeRequest<Credentials>(null) {
-            apiCall = authAPI.login(loginParams)
+        val credentials = executeRequest(null) {
+            authAPI.login(loginParams)
         }
 
         return sessionCreator.createSession(credentials, pendingSessionData.homeServerConnectionConfig)
@@ -80,8 +78,8 @@ internal class DefaultLoginWizard(
         pendingSessionData = pendingSessionData.copy(sendAttempt = pendingSessionData.sendAttempt + 1)
                 .also { pendingSessionStore.savePendingSessionData(it) }
 
-        val result = executeRequest<AddThreePidRegistrationResponse>(null) {
-            apiCall = authAPI.resetPassword(AddThreePidRegistrationParams.from(param))
+        val result = executeRequest(null) {
+            authAPI.resetPassword(AddThreePidRegistrationParams.from(param))
         }
 
         pendingSessionData = pendingSessionData.copy(resetPasswordData = ResetPasswordData(newPassword, result))
@@ -98,8 +96,8 @@ internal class DefaultLoginWizard(
                 safeResetPasswordData.newPassword
         )
 
-        executeRequest<Unit>(null) {
-            apiCall = authAPI.resetPasswordMailConfirmed(param)
+        executeRequest(null) {
+            authAPI.resetPasswordMailConfirmed(param)
         }
 
         // Set to null?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
index be6ff38931..77bbb8096f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.auth.login
 
 import dagger.Lazy
-import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
@@ -59,19 +58,16 @@ internal class DefaultDirectLoginTask @Inject constructor(
         val loginParams = PasswordLoginParams.userIdentifier(params.userId, params.password, params.deviceName)
 
         val credentials = try {
-            executeRequest<Credentials>(null) {
-                apiCall = authAPI.login(loginParams)
+            executeRequest(null) {
+                authAPI.login(loginParams)
             }
         } catch (throwable: Throwable) {
-            when (throwable) {
-                is UnrecognizedCertificateException -> {
-                    throw Failure.UnrecognizedCertificateFailure(
-                            homeServerUrl,
-                            throwable.fingerprint
-                    )
-                }
-                else                                ->
-                    throw throwable
+            throw when (throwable) {
+                is UnrecognizedCertificateException -> Failure.UnrecognizedCertificateFailure(
+                        homeServerUrl,
+                        throwable.fingerprint
+                )
+                else                                -> throwable
             }
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
index 57c4b72b8a..54a8ba0e6c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
@@ -35,7 +35,7 @@ internal class DefaultRegisterAddThreePidTask(
 
     override suspend fun execute(params: RegisterAddThreePidTask.Params): AddThreePidRegistrationResponse {
         return executeRequest(null) {
-            apiCall = authAPI.add3Pid(params.threePid.toPath(), AddThreePidRegistrationParams.from(params))
+            authAPI.add3Pid(params.threePid.toPath(), AddThreePidRegistrationParams.from(params))
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
index bf5d899276..45668cb8ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
@@ -36,7 +36,7 @@ internal class DefaultRegisterTask(
     override suspend fun execute(params: RegisterTask.Params): Credentials {
         try {
             return executeRequest(null) {
-                apiCall = authAPI.register(params.registrationParams)
+                authAPI.register(params.registrationParams)
             }
         } catch (throwable: Throwable) {
             throw throwable.toRegistrationFlowResponse()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
index b297c9849d..d68b7cd9eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
@@ -33,7 +33,7 @@ internal class DefaultValidateCodeTask(
 
     override suspend fun execute(params: ValidateCodeTask.Params): SuccessResult {
         return executeRequest(null) {
-            apiCall = authAPI.validate3Pid(params.url, params.body)
+            authAPI.validate3Pid(params.url, params.body)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
index 5604e97152..cef86e8b5e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
@@ -30,7 +30,6 @@ import org.matrix.android.sdk.internal.crypto.model.rest.SignatureUploadResponse
 import org.matrix.android.sdk.internal.crypto.model.rest.UpdateDeviceInfoBody
 import org.matrix.android.sdk.internal.crypto.model.rest.UploadSigningKeysBody
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.HTTP
@@ -46,14 +45,14 @@ internal interface CryptoApi {
      * Doc: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-devices
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices")
-    fun getDevices(): Call<DevicesListResponse>
+    suspend fun getDevices(): DevicesListResponse
 
     /**
      * Get the device info by id
      * Doc: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-devices-deviceid
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{deviceId}")
-    fun getDeviceInfo(@Path("deviceId") deviceId: String): Call<DeviceInfo>
+    suspend fun getDeviceInfo(@Path("deviceId") deviceId: String): DeviceInfo
 
     /**
      * Upload device and/or one-time keys.
@@ -62,7 +61,7 @@ internal interface CryptoApi {
      * @param body the keys to be sent.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/upload")
-    fun uploadKeys(@Body body: KeysUploadBody): Call<KeysUploadResponse>
+    suspend fun uploadKeys(@Body body: KeysUploadBody): KeysUploadResponse
 
     /**
      * Download device keys.
@@ -71,7 +70,7 @@ internal interface CryptoApi {
      * @param params the params.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/query")
-    fun downloadKeysForUsers(@Body params: KeysQueryBody): Call<KeysQueryResponse>
+    suspend fun downloadKeysForUsers(@Body params: KeysQueryBody): KeysQueryResponse
 
     /**
      * CrossSigning - Uploading signing keys
@@ -79,7 +78,7 @@ internal interface CryptoApi {
      * This endpoint requires UI Auth.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "keys/device_signing/upload")
-    fun uploadSigningKeys(@Body params: UploadSigningKeysBody): Call<KeysQueryResponse>
+    suspend fun uploadSigningKeys(@Body params: UploadSigningKeysBody): KeysQueryResponse
 
     /**
      *  CrossSigning - Uploading signatures
@@ -98,7 +97,7 @@ internal interface CryptoApi {
      * However, signatures made for other users' keys, made by her user-signing key, will not be included.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "keys/signatures/upload")
-    fun uploadSignatures(@Body params: Map<String, @JvmSuppressWildcards Any>?): Call<SignatureUploadResponse>
+    suspend fun uploadSignatures(@Body params: Map<String, @JvmSuppressWildcards Any>?): SignatureUploadResponse
 
     /**
      * Claim one-time keys.
@@ -107,7 +106,7 @@ internal interface CryptoApi {
      * @param params the params.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/claim")
-    fun claimOneTimeKeysForUsersDevices(@Body body: KeysClaimBody): Call<KeysClaimResponse>
+    suspend fun claimOneTimeKeysForUsersDevices(@Body body: KeysClaimBody): KeysClaimResponse
 
     /**
      * Send an event to a specific list of devices
@@ -118,9 +117,9 @@ internal interface CryptoApi {
      * @param body          the body
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sendToDevice/{eventType}/{txnId}")
-    fun sendToDevice(@Path("eventType") eventType: String,
-                     @Path("txnId") transactionId: String,
-                     @Body body: SendToDeviceBody): Call<Unit>
+    suspend fun sendToDevice(@Path("eventType") eventType: String,
+                             @Path("txnId") transactionId: String,
+                             @Body body: SendToDeviceBody)
 
     /**
      * Delete a device.
@@ -130,8 +129,8 @@ internal interface CryptoApi {
      * @param params   the deletion parameters
      */
     @HTTP(path = NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{device_id}", method = "DELETE", hasBody = true)
-    fun deleteDevice(@Path("device_id") deviceId: String,
-                     @Body params: DeleteDeviceParams): Call<Unit>
+    suspend fun deleteDevice(@Path("device_id") deviceId: String,
+                             @Body params: DeleteDeviceParams)
 
     /**
      * Update the device information.
@@ -141,8 +140,8 @@ internal interface CryptoApi {
      * @param params   the params
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "devices/{device_id}")
-    fun updateDeviceInfo(@Path("device_id") deviceId: String,
-                         @Body params: UpdateDeviceInfoBody): Call<Unit>
+    suspend fun updateDeviceInfo(@Path("device_id") deviceId: String,
+                                 @Body params: UpdateDeviceInfoBody)
 
     /**
      * Get the update devices list from two sync token.
@@ -152,6 +151,6 @@ internal interface CryptoApi {
      * @param newToken the up-to token.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "keys/changes")
-    fun getKeyChanges(@Query("from") oldToken: String,
-                      @Query("to") newToken: String): Call<KeyChangesResponse>
+    suspend fun getKeyChanges(@Query("from") oldToken: String,
+                              @Query("to") newToken: String): KeyChangesResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
index 3f8333528f..eb4c55a3e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
@@ -25,7 +25,6 @@ import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionR
 import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
 import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.UpdateKeysBackupVersionBody
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -48,14 +47,14 @@ internal interface RoomKeysApi {
      * @param createKeysBackupVersionBody the body
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version")
-    fun createKeysBackupVersion(@Body createKeysBackupVersionBody: CreateKeysBackupVersionBody): Call<KeysVersion>
+    suspend fun createKeysBackupVersion(@Body createKeysBackupVersionBody: CreateKeysBackupVersionBody): KeysVersion
 
     /**
      * Get the key backup last version
      * If not supported by the server, an error is returned: {"errcode":"M_NOT_FOUND","error":"No backup found"}
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version")
-    fun getKeysBackupLastVersion(): Call<KeysVersionResult>
+    suspend fun getKeysBackupLastVersion(): KeysVersionResult
 
     /**
      * Get information about the given version.
@@ -64,7 +63,7 @@ internal interface RoomKeysApi {
      * @param version  version
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version/{version}")
-    fun getKeysBackupVersion(@Path("version") version: String): Call<KeysVersionResult>
+    suspend fun getKeysBackupVersion(@Path("version") version: String): KeysVersionResult
 
     /**
      * Update information about the given version.
@@ -72,8 +71,8 @@ internal interface RoomKeysApi {
      * @param updateKeysBackupVersionBody the body
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version/{version}")
-    fun updateKeysBackupVersion(@Path("version") version: String,
-                                @Body keysBackupVersionBody: UpdateKeysBackupVersionBody): Call<Unit>
+    suspend fun updateKeysBackupVersion(@Path("version") version: String,
+                                        @Body keysBackupVersionBody: UpdateKeysBackupVersionBody)
 
     /* ==========================================================================================
      * Storing keys
@@ -94,10 +93,10 @@ internal interface RoomKeysApi {
      * @param keyBackupData the data to send
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}")
-    fun storeRoomSessionData(@Path("roomId") roomId: String,
-                             @Path("sessionId") sessionId: String,
-                             @Query("version") version: String,
-                             @Body keyBackupData: KeyBackupData): Call<BackupKeysResult>
+    suspend fun storeRoomSessionData(@Path("roomId") roomId: String,
+                                     @Path("sessionId") sessionId: String,
+                                     @Query("version") version: String,
+                                     @Body keyBackupData: KeyBackupData): BackupKeysResult
 
     /**
      * Store several keys for the given room, using the given backup version.
@@ -107,9 +106,9 @@ internal interface RoomKeysApi {
      * @param roomKeysBackupData the data to send
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}")
-    fun storeRoomSessionsData(@Path("roomId") roomId: String,
-                              @Query("version") version: String,
-                              @Body roomKeysBackupData: RoomKeysBackupData): Call<BackupKeysResult>
+    suspend fun storeRoomSessionsData(@Path("roomId") roomId: String,
+                                      @Query("version") version: String,
+                                      @Body roomKeysBackupData: RoomKeysBackupData): BackupKeysResult
 
     /**
      * Store several keys, using the given backup version.
@@ -118,8 +117,8 @@ internal interface RoomKeysApi {
      * @param keysBackupData the data to send
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys")
-    fun storeSessionsData(@Query("version") version: String,
-                          @Body keysBackupData: KeysBackupData): Call<BackupKeysResult>
+    suspend fun storeSessionsData(@Query("version") version: String,
+                                  @Body keysBackupData: KeysBackupData): BackupKeysResult
 
     /* ==========================================================================================
      * Retrieving keys
@@ -133,9 +132,9 @@ internal interface RoomKeysApi {
      * @param version   the version of the backup, or empty String to retrieve the last version
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}")
-    fun getRoomSessionData(@Path("roomId") roomId: String,
-                           @Path("sessionId") sessionId: String,
-                           @Query("version") version: String): Call<KeyBackupData>
+    suspend fun getRoomSessionData(@Path("roomId") roomId: String,
+                                   @Path("sessionId") sessionId: String,
+                                   @Query("version") version: String): KeyBackupData
 
     /**
      * Retrieve all the keys for the given room from the backup.
@@ -144,8 +143,8 @@ internal interface RoomKeysApi {
      * @param version  the version of the backup, or empty String to retrieve the last version
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}")
-    fun getRoomSessionsData(@Path("roomId") roomId: String,
-                            @Query("version") version: String): Call<RoomKeysBackupData>
+    suspend fun getRoomSessionsData(@Path("roomId") roomId: String,
+                                    @Query("version") version: String): RoomKeysBackupData
 
     /**
      * Retrieve all the keys from the backup.
@@ -153,7 +152,7 @@ internal interface RoomKeysApi {
      * @param version  the version of the backup, or empty String to retrieve the last version
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys")
-    fun getSessionsData(@Query("version") version: String): Call<KeysBackupData>
+    suspend fun getSessionsData(@Query("version") version: String): KeysBackupData
 
     /* ==========================================================================================
      * Deleting keys
@@ -163,22 +162,22 @@ internal interface RoomKeysApi {
      * Deletes keys from the backup.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}/{sessionId}")
-    fun deleteRoomSessionData(@Path("roomId") roomId: String,
-                              @Path("sessionId") sessionId: String,
-                              @Query("version") version: String): Call<Unit>
+    suspend fun deleteRoomSessionData(@Path("roomId") roomId: String,
+                                      @Path("sessionId") sessionId: String,
+                                      @Query("version") version: String)
 
     /**
      * Deletes keys from the backup.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys/{roomId}")
-    fun deleteRoomSessionsData(@Path("roomId") roomId: String,
-                               @Query("version") version: String): Call<Unit>
+    suspend fun deleteRoomSessionsData(@Path("roomId") roomId: String,
+                                       @Query("version") version: String)
 
     /**
      * Deletes keys from the backup.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/keys")
-    fun deleteSessionsData(@Query("version") version: String): Call<Unit>
+    suspend fun deleteSessionsData(@Query("version") version: String)
 
     /* ==========================================================================================
      * Deleting backup
@@ -188,5 +187,5 @@ internal interface RoomKeysApi {
      * Deletes a backup.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "room_keys/version/{version}")
-    fun deleteBackup(@Path("version") version: String): Call<Unit>
+    suspend fun deleteBackup(@Path("version") version: String)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
index 5c59cfd80e..62610a0b7b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
@@ -33,7 +33,7 @@ internal class DefaultCreateKeysBackupVersionTask @Inject constructor(
 
     override suspend fun execute(params: CreateKeysBackupVersionBody): KeysVersion {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.createKeysBackupVersion(params)
+            roomKeysApi.createKeysBackupVersion(params)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
index ec09da7240..7ee6f2358d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
@@ -35,7 +35,7 @@ internal class DefaultDeleteBackupTask @Inject constructor(
 
     override suspend fun execute(params: DeleteBackupTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.deleteBackup(params.version)
+            roomKeysApi.deleteBackup(params.version)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
index 9c477efb78..7f1b03b932 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
@@ -37,7 +37,7 @@ internal class DefaultDeleteRoomSessionDataTask @Inject constructor(
 
     override suspend fun execute(params: DeleteRoomSessionDataTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.deleteRoomSessionData(
+            roomKeysApi.deleteRoomSessionData(
                     params.roomId,
                     params.sessionId,
                     params.version)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
index 82d022f3ab..394cc861d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
@@ -36,7 +36,7 @@ internal class DefaultDeleteRoomSessionsDataTask @Inject constructor(
 
     override suspend fun execute(params: DeleteRoomSessionsDataTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.deleteRoomSessionsData(
+            roomKeysApi.deleteRoomSessionsData(
                     params.roomId,
                     params.version)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
index e4df379963..808c6c9956 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
@@ -35,7 +35,7 @@ internal class DefaultDeleteSessionsDataTask @Inject constructor(
 
     override suspend fun execute(params: DeleteSessionsDataTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.deleteSessionsData(params.version)
+            roomKeysApi.deleteSessionsData(params.version)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
index 3566ff0e68..54dbf85e30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
@@ -32,7 +32,7 @@ internal class DefaultGetKeysBackupLastVersionTask @Inject constructor(
 
     override suspend fun execute(params: Unit): KeysVersionResult {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.getKeysBackupLastVersion()
+            roomKeysApi.getKeysBackupLastVersion()
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
index 13c99fb0f4..390873eb68 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
@@ -32,7 +32,7 @@ internal class DefaultGetKeysBackupVersionTask @Inject constructor(
 
     override suspend fun execute(params: String): KeysVersionResult {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.getKeysBackupVersion(params)
+            roomKeysApi.getKeysBackupVersion(params)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
index 168020d9cd..ff515ed80f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
@@ -38,7 +38,7 @@ internal class DefaultGetRoomSessionDataTask @Inject constructor(
 
     override suspend fun execute(params: GetRoomSessionDataTask.Params): KeyBackupData {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.getRoomSessionData(
+            roomKeysApi.getRoomSessionData(
                     params.roomId,
                     params.sessionId,
                     params.version)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
index 95d5ef2e53..1b4fe2d966 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
@@ -37,7 +37,7 @@ internal class DefaultGetRoomSessionsDataTask @Inject constructor(
 
     override suspend fun execute(params: GetRoomSessionsDataTask.Params): RoomKeysBackupData {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.getRoomSessionsData(
+            roomKeysApi.getRoomSessionsData(
                     params.roomId,
                     params.version)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
index e41a13e3eb..707125f4cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
@@ -36,7 +36,7 @@ internal class DefaultGetSessionsDataTask @Inject constructor(
 
     override suspend fun execute(params: GetSessionsDataTask.Params): KeysBackupData {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.getSessionsData(params.version)
+            roomKeysApi.getSessionsData(params.version)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
index 3954277e39..180aaecf82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
@@ -40,7 +40,7 @@ internal class DefaultStoreRoomSessionDataTask @Inject constructor(
 
     override suspend fun execute(params: StoreRoomSessionDataTask.Params): BackupKeysResult {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.storeRoomSessionData(
+            roomKeysApi.storeRoomSessionData(
                     params.roomId,
                     params.sessionId,
                     params.version,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
index 4e209b4abc..d1aa9d2eb0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
@@ -39,7 +39,7 @@ internal class DefaultStoreRoomSessionsDataTask @Inject constructor(
 
     override suspend fun execute(params: StoreRoomSessionsDataTask.Params): BackupKeysResult {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.storeRoomSessionsData(
+            roomKeysApi.storeRoomSessionsData(
                     params.roomId,
                     params.version,
                     params.roomKeysBackupData)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
index a607477d21..3dbeafe9de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
@@ -38,7 +38,7 @@ internal class DefaultStoreSessionsDataTask @Inject constructor(
 
     override suspend fun execute(params: StoreSessionsDataTask.Params): BackupKeysResult {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.storeSessionsData(
+            roomKeysApi.storeSessionsData(
                     params.version,
                     params.keysBackupData)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
index f012cd13eb..2b3d044ab7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
@@ -37,7 +37,7 @@ internal class DefaultUpdateKeysBackupVersionTask @Inject constructor(
 
     override suspend fun execute(params: UpdateKeysBackupVersionTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomKeysApi.updateKeysBackupVersion(params.version, params.keysBackupVersionBody)
+            roomKeysApi.updateKeysBackupVersion(params.version, params.keysBackupVersionBody)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
index 3df6312adb..d5cf749db7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
@@ -20,7 +20,6 @@ import org.matrix.android.sdk.internal.crypto.api.CryptoApi
 import org.matrix.android.sdk.internal.crypto.model.MXKey
 import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimBody
-import org.matrix.android.sdk.internal.crypto.model.rest.KeysClaimResponse
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
@@ -42,8 +41,8 @@ internal class DefaultClaimOneTimeKeysForUsersDevice @Inject constructor(
     override suspend fun execute(params: ClaimOneTimeKeysForUsersDeviceTask.Params): MXUsersDevicesMap<MXKey> {
         val body = KeysClaimBody(oneTimeKeys = params.usersDevicesKeyTypesMap.map)
 
-        val keysClaimResponse = executeRequest<KeysClaimResponse>(globalErrorReceiver) {
-            apiCall = cryptoApi.claimOneTimeKeysForUsersDevices(body)
+        val keysClaimResponse = executeRequest(globalErrorReceiver) {
+            cryptoApi.claimOneTimeKeysForUsersDevices(body)
         }
         val map = MXUsersDevicesMap<MXKey>()
         keysClaimResponse.oneTimeKeys?.let { oneTimeKeys ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
index 61596bb5b6..bdb8e8d137 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
@@ -42,8 +42,8 @@ internal class DefaultDeleteDeviceTask @Inject constructor(
 
     override suspend fun execute(params: DeleteDeviceTask.Params) {
         try {
-            executeRequest<Unit>(globalErrorReceiver) {
-                apiCall = cryptoApi.deleteDevice(params.deviceId, DeleteDeviceParams(params.userAuthParam?.asMap()))
+            executeRequest(globalErrorReceiver) {
+                cryptoApi.deleteDevice(params.deviceId, DeleteDeviceParams(params.userAuthParam?.asMap()))
             }
         } catch (throwable: Throwable) {
             if (params.userInteractiveAuthInterceptor == null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
index 0c17cbb43a..86f02866ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
@@ -72,8 +72,8 @@ internal class DefaultDownloadKeysForUsers @Inject constructor(
                         }
                         .map { body ->
                             async {
-                                val result = executeRequest<KeysQueryResponse>(globalErrorReceiver) {
-                                    apiCall = cryptoApi.downloadKeysForUsers(body)
+                                val result = executeRequest(globalErrorReceiver) {
+                                    cryptoApi.downloadKeysForUsers(body)
                                 }
 
                                 mutex.withLock {
@@ -98,7 +98,7 @@ internal class DefaultDownloadKeysForUsers @Inject constructor(
         } else {
             // No need to chunk, direct request
             executeRequest(globalErrorReceiver) {
-                apiCall = cryptoApi.downloadKeysForUsers(
+                cryptoApi.downloadKeysForUsers(
                         KeysQueryBody(
                                 deviceKeys = params.userIds.associateWith { emptyList() },
                                 token = token
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
index 5f6d2e344f..9f20ea598d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
@@ -34,7 +34,7 @@ internal class DefaultGetDeviceInfoTask @Inject constructor(
 
     override suspend fun execute(params: GetDeviceInfoTask.Params): DeviceInfo {
         return executeRequest(globalErrorReceiver) {
-            apiCall = cryptoApi.getDeviceInfo(params.deviceId)
+            cryptoApi.getDeviceInfo(params.deviceId)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
index ea33a918bc..52f9f73299 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
@@ -32,7 +32,7 @@ internal class DefaultGetDevicesTask @Inject constructor(
 
     override suspend fun execute(params: Unit): DevicesListResponse {
         return executeRequest(globalErrorReceiver) {
-            apiCall = cryptoApi.getDevices()
+            cryptoApi.getDevices()
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
index 4cc9ab2fcb..6e524c7fbe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
@@ -39,7 +39,7 @@ internal class DefaultGetKeyChangesTask @Inject constructor(
 
     override suspend fun execute(params: GetKeyChangesTask.Params): KeyChangesResponse {
         return executeRequest(globalErrorReceiver) {
-            apiCall = cryptoApi.getKeyChanges(params.from, params.to)
+            cryptoApi.getKeyChanges(params.from, params.to)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
index 5226e52b33..d6a7f3c6a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.crypto.tasks
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
-import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
@@ -36,14 +35,14 @@ internal class DefaultRedactEventTask @Inject constructor(
         private val globalErrorReceiver: GlobalErrorReceiver) : RedactEventTask {
 
     override suspend fun execute(params: RedactEventTask.Params): String {
-        val executeRequest = executeRequest<SendResponse>(globalErrorReceiver) {
-            apiCall = roomAPI.redactEvent(
+        val response = executeRequest(globalErrorReceiver) {
+            roomAPI.redactEvent(
                     txId = params.txID,
                     roomId = params.roomId,
                     eventId = params.eventId,
                     reason = if (params.reason == null) emptyMap() else mapOf("reason" to params.reason)
             )
         }
-        return executeRequest.eventId
+        return response.eventId
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index 573f2c3a54..e1e297767b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.membership.LoadRoomMembersTask
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
-import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
@@ -52,8 +51,8 @@ internal class DefaultSendEventTask @Inject constructor(
             val event = handleEncryption(params)
             val localId = event.eventId!!
             localEchoRepository.updateSendState(localId, params.event.roomId, SendState.SENDING)
-            val executeRequest = executeRequest<SendResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.send(
+            val response = executeRequest(globalErrorReceiver) {
+                roomAPI.send(
                         localId,
                         roomId = event.roomId ?: "",
                         content = event.content,
@@ -61,7 +60,7 @@ internal class DefaultSendEventTask @Inject constructor(
                 )
             }
             localEchoRepository.updateSendState(localId, params.event.roomId, SendState.SENT)
-            return executeRequest.eventId
+            return response.eventId
         } catch (e: Throwable) {
 //            localEchoRepository.updateSendState(params.event.eventId!!, SendState.UNDELIVERED)
             throw e
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
index d2af91601b..fe6868968b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
@@ -46,14 +46,19 @@ internal class DefaultSendToDeviceTask @Inject constructor(
                 messages = params.contentMap.map
         )
 
-        return executeRequest(globalErrorReceiver) {
-            apiCall = cryptoApi.sendToDevice(
-                    params.eventType,
-                    params.transactionId ?: Random.nextInt(Integer.MAX_VALUE).toString(),
-                    sendToDeviceBody
-            )
-            isRetryable = true
-            maxRetryCount = 3
-        }
+        return executeRequest(
+                globalErrorReceiver,
+                {
+                    cryptoApi.sendToDevice(
+                            params.eventType,
+                            params.transactionId ?: Random.nextInt(Integer.MAX_VALUE).toString(),
+                            sendToDeviceBody
+                    )
+                },
+                {
+                    isRetryable = true
+                    maxRetryCount = 3
+                }
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
index ab125135bb..d8b9d3cd86 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
-import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
@@ -45,8 +44,8 @@ internal class DefaultSendVerificationMessageTask @Inject constructor(
 
         try {
             localEchoRepository.updateSendState(localId, event.roomId, SendState.SENDING)
-            val executeRequest = executeRequest<SendResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.send(
+            val response = executeRequest(globalErrorReceiver) {
+                roomAPI.send(
                         localId,
                         roomId = event.roomId ?: "",
                         content = event.content,
@@ -54,7 +53,7 @@ internal class DefaultSendVerificationMessageTask @Inject constructor(
                 )
             }
             localEchoRepository.updateSendState(localId, event.roomId, SendState.SENT)
-            return executeRequest.eventId
+            return response.eventId
         } catch (e: Throwable) {
             localEchoRepository.updateSendState(localId, event.roomId, SendState.UNDELIVERED)
             throw e
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
index b835d46236..4bedb1f393 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
@@ -42,7 +42,7 @@ internal class DefaultSetDeviceNameTask @Inject constructor(
                 displayName = params.deviceName
         )
         return executeRequest(globalErrorReceiver) {
-            apiCall = cryptoApi.updateDeviceInfo(params.deviceId, body)
+            cryptoApi.updateDeviceInfo(params.deviceId, body)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
index eb53bbbf8d..cac4dadd93 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
@@ -50,7 +50,7 @@ internal class DefaultUploadKeysTask @Inject constructor(
         Timber.i("## Uploading device keys -> $body")
 
         return executeRequest(globalErrorReceiver) {
-            apiCall = cryptoApi.uploadKeys(body)
+            cryptoApi.uploadKeys(body)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
index c50faf37b1..bac886cafc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
@@ -17,7 +17,6 @@ package org.matrix.android.sdk.internal.crypto.tasks
 
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.internal.crypto.api.CryptoApi
-import org.matrix.android.sdk.internal.crypto.model.rest.SignatureUploadResponse
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
@@ -36,11 +35,14 @@ internal class DefaultUploadSignaturesTask @Inject constructor(
 
     override suspend fun execute(params: UploadSignaturesTask.Params) {
         try {
-            val response = executeRequest<SignatureUploadResponse>(globalErrorReceiver) {
-                this.isRetryable = true
-                this.maxRetryCount = 10
-                this.apiCall = cryptoApi.uploadSignatures(params.signatures)
-            }
+            val response = executeRequest(
+                    globalErrorReceiver,
+                    { cryptoApi.uploadSignatures(params.signatures) },
+                    {
+                        isRetryable = true
+                        maxRetryCount = 10
+                    }
+            )
             if (response.failures?.isNotEmpty() == true) {
                 throw Throwable(response.failures.toString())
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
index 14fad2ea38..08c767ba34 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.crypto.tasks
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.internal.crypto.api.CryptoApi
 import org.matrix.android.sdk.internal.crypto.model.CryptoCrossSigningKey
-import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryResponse
 import org.matrix.android.sdk.api.auth.UIABaseAuth
 import org.matrix.android.sdk.internal.crypto.model.rest.UploadSigningKeysBody
 import org.matrix.android.sdk.internal.crypto.model.toRest
@@ -61,8 +60,8 @@ internal class DefaultUploadSigningKeysTask @Inject constructor(
     }
 
     private suspend fun doRequest(uploadQuery: UploadSigningKeysBody) {
-        val keysQueryResponse = executeRequest<KeysQueryResponse>(globalErrorReceiver) {
-            apiCall = cryptoApi.uploadSigningKeys(uploadQuery)
+        val keysQueryResponse = executeRequest(globalErrorReceiver) {
+            cryptoApi.uploadSigningKeys(uploadQuery)
         }
         if (keysQueryResponse.failures?.isNotEmpty() == true) {
             throw UploadSigningKeys(keysQueryResponse.failures)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationAPI.kt
index 1816616336..c37392494f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/FederationAPI.kt
@@ -18,10 +18,9 @@
 package org.matrix.android.sdk.internal.federation
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.GET
 
 internal interface FederationAPI {
     @GET(NetworkConstants.URI_FEDERATION_PATH + "version")
-    fun getVersion(): Call<FederationGetVersionResult>
+    suspend fun getVersion(): FederationGetVersionResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt
index ce35e48f6b..b7f73a606c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/federation/GetFederationVersionTask.kt
@@ -28,8 +28,8 @@ internal class DefaultGetFederationVersionTask @Inject constructor(
 ) : GetFederationVersionTask {
 
     override suspend fun execute(params: Unit): FederationVersion {
-        val result = executeRequest<FederationGetVersionResult>(null) {
-            apiCall = federationAPI.getVersion()
+        val result = executeRequest(null) {
+            federationAPI.getVersion()
         }
 
         return FederationVersion(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 442029127d..9f3000ce18 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -21,15 +21,28 @@ import kotlinx.coroutines.delay
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.shouldBeRetried
 import org.matrix.android.sdk.internal.network.ssl.CertUtil
-import retrofit2.Call
-import retrofit2.awaitResponse
+import retrofit2.HttpException
 import timber.log.Timber
 import java.io.IOException
 
+// To use when there is no init block to provide
 internal suspend inline fun <DATA : Any> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
-                                                        block: Request<DATA>.() -> Unit) = Request<DATA>(globalErrorReceiver).apply(block).execute()
+                                                        noinline requestBlock: suspend () -> DATA): DATA {
+    return executeRequest(globalErrorReceiver, requestBlock, {})
+}
 
-internal class Request<DATA : Any>(private val globalErrorReceiver: GlobalErrorReceiver?) {
+internal suspend inline fun <DATA : Any> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
+                                                        noinline requestBlock: suspend () -> DATA,
+                                                        initBlock: Request<DATA>.() -> Unit): DATA {
+    return Request(globalErrorReceiver, requestBlock)
+            .apply(initBlock)
+            .execute()
+}
+
+internal class Request<DATA : Any>(
+        private val globalErrorReceiver: GlobalErrorReceiver?,
+        private val requestBlock: suspend () -> DATA
+) {
 
     var isRetryable = false
     var initialDelay: Long = 100L
@@ -37,20 +50,22 @@ internal class Request<DATA : Any>(private val globalErrorReceiver: GlobalErrorR
     var maxRetryCount = Int.MAX_VALUE
     private var currentRetryCount = 0
     private var currentDelay = initialDelay
-    lateinit var apiCall: Call<DATA>
 
     suspend fun execute(): DATA {
         return try {
-            val response = apiCall.clone().awaitResponse()
-            if (response.isSuccessful) {
-                response.body()
-                        ?: throw IllegalStateException("The request returned a null body")
-            } else {
-                throw response.toFailure(globalErrorReceiver)
+            try {
+                requestBlock()
+            } catch (exception: Throwable) {
+                throw when (exception) {
+                    is KotlinNullPointerException -> IllegalStateException("The request returned a null body")
+                    is HttpException              -> exception.toFailure(globalErrorReceiver)
+                    else                          -> exception
+                }
             }
         } catch (exception: Throwable) {
-            // Log some details about the request which has failed
-            Timber.e("Exception when executing request ${apiCall.request().method} ${apiCall.request().url.toString().substringBefore("?")}")
+            // Log some details about the request which has failed. This is less useful than before...
+            // Timber.e("Exception when executing request ${apiCall.request().method} ${apiCall.request().url.toString().substringBefore("?")}")
+            Timber.e("Exception when executing request")
 
             // Check if this is a certificateException
             CertUtil.getCertificateException(exception)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
index dd5a69dd3c..7132b4ff7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.ResponseBody
+import retrofit2.HttpException
 import retrofit2.Response
 import timber.log.Timber
 import java.io.IOException
@@ -57,6 +58,13 @@ internal fun <T> Response<T>.toFailure(globalErrorReceiver: GlobalErrorReceiver?
     return toFailure(errorBody(), code(), globalErrorReceiver)
 }
 
+/**
+ * Convert a HttpException to a Failure, and eventually parse errorBody to convert it to a MatrixError
+ */
+internal fun HttpException.toFailure(globalErrorReceiver: GlobalErrorReceiver?): Failure {
+    return toFailure(response()?.errorBody(), code(), globalErrorReceiver)
+}
+
 /**
  * Convert a okhttp3 Response to a Failure, and eventually parse errorBody to convert it to a MatrixError
  */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GetUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GetUrlTask.kt
index 16633d90ef..d0e2534e7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GetUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GetUrlTask.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.raw
 
 import com.zhuinden.monarchy.Monarchy
-import okhttp3.ResponseBody
 import org.matrix.android.sdk.api.cache.CacheStrategy
 import org.matrix.android.sdk.internal.database.model.RawCacheEntity
 import org.matrix.android.sdk.internal.database.query.get
@@ -58,8 +57,8 @@ internal class DefaultGetUrlTask @Inject constructor(
     }
 
     private suspend fun doRequest(url: String): String {
-        return executeRequest<ResponseBody>(null) {
-            apiCall = rawAPI.getUrl(url)
+        return executeRequest(null) {
+            rawAPI.getUrl(url)
         }
                 .string()
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt
index 4b08afd711..338d94781b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt
@@ -18,11 +18,10 @@
 package org.matrix.android.sdk.internal.raw
 
 import okhttp3.ResponseBody
-import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Url
 
 internal interface RawAPI {
     @GET
-    fun getUrl(@Url url: String): Call<ResponseBody>
+    suspend fun getUrl(@Url url: String): ResponseBody
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
index 1db9d121a6..a04d0f2686 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.account
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
 
@@ -28,7 +27,7 @@ internal interface AccountAPI {
      * @param params parameters to change password.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/password")
-    fun changePassword(@Body params: ChangePasswordParams): Call<Unit>
+    suspend fun changePassword(@Body params: ChangePasswordParams)
 
     /**
      * Deactivate the user account
@@ -36,5 +35,5 @@ internal interface AccountAPI {
      * @param params the deactivate account params
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/deactivate")
-    fun deactivate(@Body params: DeactivateAccountParams): Call<Unit>
+    suspend fun deactivate(@Body params: DeactivateAccountParams)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
index 1f043b0a9d..02c3735998 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
@@ -39,8 +39,8 @@ internal class DefaultChangePasswordTask @Inject constructor(
     override suspend fun execute(params: ChangePasswordTask.Params) {
         val changePasswordParams = ChangePasswordParams.create(userId, params.password, params.newPassword)
         try {
-            executeRequest<Unit>(globalErrorReceiver) {
-                apiCall = accountAPI.changePassword(changePasswordParams)
+            executeRequest(globalErrorReceiver) {
+                accountAPI.changePassword(changePasswordParams)
             }
         } catch (throwable: Throwable) {
             val registrationFlowResponse = throwable.toRegistrationFlowResponse()
@@ -49,8 +49,8 @@ internal class DefaultChangePasswordTask @Inject constructor(
                     /* Avoid infinite loop */
                     && changePasswordParams.auth?.session == null) {
                 // Retry with authentication
-                executeRequest<Unit>(globalErrorReceiver) {
-                    apiCall = accountAPI.changePassword(
+                executeRequest(globalErrorReceiver) {
+                    accountAPI.changePassword(
                             changePasswordParams.copy(auth = changePasswordParams.auth?.copy(session = registrationFlowResponse.session))
                     )
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
index ca6b0554a9..1a8e80ab68 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
@@ -46,8 +46,8 @@ internal class DefaultDeactivateAccountTask @Inject constructor(
         val deactivateAccountParams = DeactivateAccountParams.create(params.userAuthParam, params.eraseAllData)
 
         val canCleanup = try {
-            executeRequest<Unit>(globalErrorReceiver) {
-                apiCall = accountAPI.deactivate(deactivateAccountParams)
+            executeRequest(globalErrorReceiver) {
+                accountAPI.deactivate(deactivateAccountParams)
             }
             true
         } catch (throwable: Throwable) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
index b21ec1113a..d53ddb7371 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
@@ -31,7 +31,7 @@ internal class DefaultGetTurnServerTask @Inject constructor(private val voipAPI:
 
     override suspend fun execute(params: Params): TurnServerResponse {
         return executeRequest(globalErrorReceiver) {
-            apiCall = voipAPI.getTurnServer()
+            voipAPI.getTurnServer()
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
index 72c6c58f27..469faaae74 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
@@ -18,11 +18,10 @@ package org.matrix.android.sdk.internal.session.call
 
 import org.matrix.android.sdk.api.session.call.TurnServerResponse
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.GET
 
 internal interface VoipApi {
 
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "voip/turnServer")
-    fun getTurnServer(): Call<TurnServerResponse>
+    suspend fun getTurnServer(): TurnServerResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt
index 6a50f3ee37..19bc7e1908 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/directory/DirectoryAPI.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.directory
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasBody
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -33,7 +32,7 @@ internal interface DirectoryAPI {
      * @param roomAlias the room alias.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}")
-    fun getRoomIdByAlias(@Path("roomAlias") roomAlias: String): Call<RoomAliasDescription>
+    suspend fun getRoomIdByAlias(@Path("roomAlias") roomAlias: String): RoomAliasDescription
 
     /**
      * Get the room directory visibility.
@@ -41,7 +40,7 @@ internal interface DirectoryAPI {
      * @param roomId the room id.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/list/room/{roomId}")
-    fun getRoomDirectoryVisibility(@Path("roomId") roomId: String): Call<RoomDirectoryVisibilityJson>
+    suspend fun getRoomDirectoryVisibility(@Path("roomId") roomId: String): RoomDirectoryVisibilityJson
 
     /**
      * Set the room directory visibility.
@@ -50,21 +49,21 @@ internal interface DirectoryAPI {
      * @param body the body containing the new directory visibility
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/list/room/{roomId}")
-    fun setRoomDirectoryVisibility(@Path("roomId") roomId: String,
-                                   @Body body: RoomDirectoryVisibilityJson): Call<Unit>
+    suspend fun setRoomDirectoryVisibility(@Path("roomId") roomId: String,
+                                           @Body body: RoomDirectoryVisibilityJson)
 
     /**
      * Add alias to the room.
      * @param roomAlias the room alias.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}")
-    fun addRoomAlias(@Path("roomAlias") roomAlias: String,
-                     @Body body: AddRoomAliasBody): Call<Unit>
+    suspend fun addRoomAlias(@Path("roomAlias") roomAlias: String,
+                             @Body body: AddRoomAliasBody)
 
     /**
      * Delete a room alias
      * @param roomAlias the room alias.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "directory/room/{roomAlias}")
-    fun deleteRoomAlias(@Path("roomAlias") roomAlias: String): Call<Unit>
+    suspend fun deleteRoomAlias(@Path("roomAlias") roomAlias: String)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
index 285bd51d38..2809dea23b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.filter
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -32,8 +31,8 @@ internal interface FilterApi {
      * @param body   the Json representation of a FilterBody object
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/filter")
-    fun uploadFilter(@Path("userId") userId: String,
-                     @Body body: Filter): Call<FilterResponse>
+    suspend fun uploadFilter(@Path("userId") userId: String,
+                             @Body body: Filter): FilterResponse
 
     /**
      * Gets a filter with a given filterId from the homeserver
@@ -43,6 +42,6 @@ internal interface FilterApi {
      * @return Filter
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/filter/{filterId}")
-    fun getFilterById(@Path("userId") userId: String,
-                      @Path("filterId") filterId: String): Call<Filter>
+    suspend fun getFilterById(@Path("userId") userId: String,
+                              @Path("filterId") filterId: String): Filter
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
index d42962d54a..3cac89ce28 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
@@ -59,9 +59,9 @@ internal class DefaultSaveFilterTask @Inject constructor(
         }
         val updated = filterRepository.storeFilter(filterBody, roomFilter)
         if (updated) {
-            val filterResponse = executeRequest<FilterResponse>(globalErrorReceiver) {
+            val filterResponse = executeRequest(globalErrorReceiver) {
                 // TODO auto retry
-                apiCall = filterAPI.uploadFilter(userId, filterBody)
+                filterAPI.uploadFilter(userId, filterBody)
             }
             filterRepository.storeFilterId(filterBody, filterResponse.filterId)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataTask.kt
index 9836164aec..4e0ee3422b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataTask.kt
@@ -64,14 +64,14 @@ internal class DefaultGetGroupDataTask @Inject constructor(
         }
         Timber.v("Fetch data for group with ids: ${groupIds.joinToString(";")}")
         val data = groupIds.map { groupId ->
-            val groupSummary = executeRequest<GroupSummaryResponse>(globalErrorReceiver) {
-                apiCall = groupAPI.getSummary(groupId)
+            val groupSummary = executeRequest(globalErrorReceiver) {
+                groupAPI.getSummary(groupId)
             }
-            val groupRooms = executeRequest<GroupRooms>(globalErrorReceiver) {
-                apiCall = groupAPI.getRooms(groupId)
+            val groupRooms = executeRequest(globalErrorReceiver) {
+                groupAPI.getRooms(groupId)
             }
-            val groupUsers = executeRequest<GroupUsers>(globalErrorReceiver) {
-                apiCall = groupAPI.getUsers(groupId)
+            val groupUsers = executeRequest(globalErrorReceiver) {
+                groupAPI.getUsers(groupId)
             }
             GroupData(groupId, groupSummary, groupRooms, groupUsers)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
index 004112578c..58dcc57dd6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
@@ -20,7 +20,6 @@ import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.session.group.model.GroupRooms
 import org.matrix.android.sdk.internal.session.group.model.GroupSummaryResponse
 import org.matrix.android.sdk.internal.session.group.model.GroupUsers
-import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
 
@@ -32,7 +31,7 @@ internal interface GroupAPI {
      * @param groupId the group id
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "groups/{groupId}/summary")
-    fun getSummary(@Path("groupId") groupId: String): Call<GroupSummaryResponse>
+    suspend fun getSummary(@Path("groupId") groupId: String): GroupSummaryResponse
 
     /**
      * Request the rooms list.
@@ -40,7 +39,7 @@ internal interface GroupAPI {
      * @param groupId the group id
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "groups/{groupId}/rooms")
-    fun getRooms(@Path("groupId") groupId: String): Call<GroupRooms>
+    suspend fun getRooms(@Path("groupId") groupId: String): GroupRooms
 
     /**
      * Request the users list.
@@ -48,5 +47,5 @@ internal interface GroupAPI {
      * @param groupId the group id
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "groups/{groupId}/users")
-    fun getUsers(@Path("groupId") groupId: String): Call<GroupUsers>
+    suspend fun getUsers(@Path("groupId") groupId: String): GroupUsers
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
index 8242edac84..7de0cc9592 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.session.homeserver
 
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.GET
 
 internal interface CapabilitiesAPI {
@@ -26,17 +25,17 @@ internal interface CapabilitiesAPI {
      * Request the homeserver capabilities
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "capabilities")
-    fun getCapabilities(): Call<GetCapabilitiesResult>
+    suspend fun getCapabilities(): GetCapabilitiesResult
 
     /**
      * Request the versions
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_ + "versions")
-    fun getVersions(): Call<Versions>
+    suspend fun getVersions(): Versions
 
     /**
      * Ping the homeserver. We do not care about the returned data, so there is no use to parse them
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_ + "versions")
-    fun ping(): Call<Unit>
+    suspend fun ping()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 84c9132d61..740370123f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -71,20 +71,20 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
         }
 
         val capabilities = runCatching {
-            executeRequest<GetCapabilitiesResult>(globalErrorReceiver) {
-                apiCall = capabilitiesAPI.getCapabilities()
+            executeRequest(globalErrorReceiver) {
+                capabilitiesAPI.getCapabilities()
             }
         }.getOrNull()
 
         val mediaConfig = runCatching {
-            executeRequest<GetMediaConfigResult>(globalErrorReceiver) {
-                apiCall = mediaAPI.getMediaConfig()
+            executeRequest(globalErrorReceiver) {
+                mediaAPI.getMediaConfig()
             }
         }.getOrNull()
 
         val versions = runCatching {
-            executeRequest<Versions>(null) {
-                apiCall = capabilitiesAPI.getVersions()
+            executeRequest(null) {
+                capabilitiesAPI.getVersions()
             }
         }.getOrNull()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
index 522097acbf..bb526adf4a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
@@ -34,8 +34,8 @@ internal class HomeServerPinger @Inject constructor(private val taskExecutor: Ta
 
     suspend fun canReachHomeServer(): Boolean {
         return try {
-            executeRequest<Unit>(null) {
-                apiCall = capabilitiesAPI.ping()
+            executeRequest(null) {
+                capabilitiesAPI.ping()
             }
             true
         } catch (throwable: Throwable) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
index 7e2702e70d..e9e4d17e3a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
@@ -26,7 +26,6 @@ import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestOwn
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForEmailBody
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForMsisdnBody
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenResponse
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -43,20 +42,20 @@ internal interface IdentityAPI {
      * Ref: https://matrix.org/docs/spec/identity_service/latest#get-matrix-identity-v2-account
      */
     @GET(NetworkConstants.URI_IDENTITY_PATH_V2 + "account")
-    fun getAccount(): Call<IdentityAccountResponse>
+    suspend fun getAccount(): IdentityAccountResponse
 
     /**
      * Logs out the access token, preventing it from being used to authenticate future requests to the server.
      */
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "account/logout")
-    fun logout(): Call<Unit>
+    suspend fun logout()
 
     /**
      * Request the hash detail to request a bunch of 3PIDs
      * Ref: https://matrix.org/docs/spec/identity_service/latest#get-matrix-identity-v2-hash-details
      */
     @GET(NetworkConstants.URI_IDENTITY_PATH_V2 + "hash_details")
-    fun hashDetails(): Call<IdentityHashDetailResponse>
+    suspend fun hashDetails(): IdentityHashDetailResponse
 
     /**
      * Request a bunch of 3PIDs
@@ -65,7 +64,7 @@ internal interface IdentityAPI {
      * @param body the body request
      */
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "lookup")
-    fun lookup(@Body body: IdentityLookUpParams): Call<IdentityLookUpResponse>
+    suspend fun lookup(@Body body: IdentityLookUpParams): IdentityLookUpResponse
 
     /**
      * Create a session to change the bind status of an email to an identity server
@@ -75,7 +74,7 @@ internal interface IdentityAPI {
      * @return the sid
      */
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/email/requestToken")
-    fun requestTokenToBindEmail(@Body body: IdentityRequestTokenForEmailBody): Call<IdentityRequestTokenResponse>
+    suspend fun requestTokenToBindEmail(@Body body: IdentityRequestTokenForEmailBody): IdentityRequestTokenResponse
 
     /**
      * Create a session to change the bind status of an phone number to an identity server
@@ -85,7 +84,7 @@ internal interface IdentityAPI {
      * @return the sid
      */
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/msisdn/requestToken")
-    fun requestTokenToBindMsisdn(@Body body: IdentityRequestTokenForMsisdnBody): Call<IdentityRequestTokenResponse>
+    suspend fun requestTokenToBindMsisdn(@Body body: IdentityRequestTokenForMsisdnBody): IdentityRequestTokenResponse
 
     /**
      * Validate ownership of an email address, or a phone number.
@@ -94,6 +93,6 @@ internal interface IdentityAPI {
      * - https://matrix.org/docs/spec/identity_service/latest#post-matrix-identity-v2-validate-email-submittoken
      */
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "validate/{medium}/submitToken")
-    fun submitToken(@Path("medium") medium: String,
-                    @Body body: IdentityRequestOwnershipParams): Call<SuccessResult>
+    suspend fun submitToken(@Path("medium") medium: String,
+                            @Body body: IdentityRequestOwnershipParams): SuccessResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
index fd6e1163ef..1671859585 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.identity
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRegisterResponse
 import org.matrix.android.sdk.internal.session.openid.RequestOpenIdTokenResponse
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -40,18 +39,18 @@ internal interface IdentityAuthAPI {
      * @return 200 in case of success
      */
     @GET(NetworkConstants.URI_IDENTITY_PREFIX_PATH)
-    fun ping(): Call<Unit>
+    suspend fun ping()
 
     /**
      * Ping v1 will be used to check outdated Identity server
      */
     @GET("_matrix/identity/api/v1")
-    fun pingV1(): Call<Unit>
+    suspend fun pingV1()
 
     /**
      * Exchanges an OpenID token from the homeserver for an access token to access the identity server.
      * The request body is the same as the values returned by /openid/request_token in the Client-Server API.
      */
     @POST(NetworkConstants.URI_IDENTITY_PATH_V2 + "account/register")
-    fun register(@Body openIdToken: RequestOpenIdTokenResponse): Call<IdentityRegisterResponse>
+    suspend fun register(@Body openIdToken: RequestOpenIdTokenResponse): IdentityRegisterResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
index 67f3b2aa56..4f6e906766 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
@@ -83,7 +83,7 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
         return try {
             LookUpData(hashedAddresses,
                     executeRequest(null) {
-                        apiCall = identityAPI.lookup(IdentityLookUpParams(
+                        identityAPI.lookup(IdentityLookUpParams(
                                 hashedAddresses,
                                 IdentityHashDetailResponse.ALGORITHM_SHA256,
                                 hashDetailResponse.pepper
@@ -126,7 +126,7 @@ internal class DefaultIdentityBulkLookupTask @Inject constructor(
 
     private suspend fun fetchHashDetails(identityAPI: IdentityAPI): IdentityHashDetailResponse {
         return executeRequest(null) {
-            apiCall = identityAPI.hashDetails()
+            identityAPI.hashDetails()
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
index 50e24f1245..fc84a144fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
@@ -42,8 +42,8 @@ internal class DefaultIdentityDisconnectTask @Inject constructor(
             return
         }
 
-        executeRequest<Unit>(null) {
-            apiCall = identityAPI.logout()
+        executeRequest(null) {
+            identityAPI.logout()
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
index b0d33811bd..fca9408d9c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
@@ -33,14 +33,14 @@ internal class DefaultIdentityPingTask @Inject constructor() : IdentityPingTask
 
     override suspend fun execute(params: IdentityPingTask.Params) {
         try {
-            executeRequest<Unit>(null) {
-                apiCall = params.identityAuthAPI.ping()
+            executeRequest(null) {
+                params.identityAuthAPI.ping()
             }
         } catch (throwable: Throwable) {
             if (throwable is Failure.ServerError && throwable.httpCode == HttpsURLConnection.HTTP_NOT_FOUND /* 404 */) {
                 // Check if API v1 is available
-                executeRequest<Unit>(null) {
-                    apiCall = params.identityAuthAPI.pingV1()
+                executeRequest(null) {
+                    params.identityAuthAPI.pingV1()
                 }
                 // API V1 is responding, but not V2 -> Outdated
                 throw IdentityServiceError.OutdatedIdentityServer
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
index 19215f353a..8cc854bd94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
@@ -33,7 +33,7 @@ internal class DefaultIdentityRegisterTask @Inject constructor() : IdentityRegis
 
     override suspend fun execute(params: IdentityRegisterTask.Params): IdentityRegisterResponse {
         return executeRequest(null) {
-            apiCall = params.identityAuthAPI.register(params.openIdTokenResponse)
+            params.identityAuthAPI.register(params.openIdTokenResponse)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
index bd4cd763f0..9c89048176 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
@@ -25,7 +25,6 @@ import org.matrix.android.sdk.internal.session.identity.data.IdentityPendingBind
 import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForEmailBody
 import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenForMsisdnBody
-import org.matrix.android.sdk.internal.session.identity.model.IdentityRequestTokenResponse
 import org.matrix.android.sdk.internal.task.Task
 import java.util.UUID
 import javax.inject.Inject
@@ -56,8 +55,8 @@ internal class DefaultIdentityRequestTokenForBindingTask @Inject constructor(
         val clientSecret = identityPendingBinding?.clientSecret ?: UUID.randomUUID().toString()
         val sendAttempt = identityPendingBinding?.sendAttempt?.inc() ?: 1
 
-        val tokenResponse = executeRequest<IdentityRequestTokenResponse>(null) {
-            apiCall = when (params.threePid) {
+        val tokenResponse = executeRequest(null) {
+            when (params.threePid) {
                 is ThreePid.Email  -> identityAPI.requestTokenToBindEmail(IdentityRequestTokenForEmailBody(
                         clientSecret = clientSecret,
                         sendAttempt = sendAttempt,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
index ebc71c715d..f884e2816d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.identity
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.identity.toMedium
-import org.matrix.android.sdk.internal.auth.registration.SuccessResult
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
@@ -44,8 +43,8 @@ internal class DefaultIdentitySubmitTokenForBindingTask @Inject constructor(
         val identityAPI = getIdentityApiAndEnsureTerms(identityApiProvider, userId)
         val identityPendingBinding = identityStore.getPendingBinding(params.threePid) ?: throw IdentityServiceError.NoCurrentBindingError
 
-        val tokenResponse = executeRequest<SuccessResult>(null) {
-            apiCall = identityAPI.submitToken(
+        val tokenResponse = executeRequest(null) {
+            identityAPI.submitToken(
                     params.threePid.toMedium(),
                     IdentityRequestOwnershipParams(
                             clientSecret = identityPendingBinding.clientSecret,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
index d3aecce381..d06b157f22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
@@ -18,14 +18,13 @@ package org.matrix.android.sdk.internal.session.identity
 
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.internal.network.executeRequest
-import org.matrix.android.sdk.internal.session.identity.model.IdentityAccountResponse
 
 internal suspend fun getIdentityApiAndEnsureTerms(identityApiProvider: IdentityApiProvider, userId: String): IdentityAPI {
     val identityAPI = identityApiProvider.identityApi ?: throw IdentityServiceError.NoIdentityServerConfigured
 
     // Always check that we have access to the service (regarding terms)
-    val identityAccountResponse = executeRequest<IdentityAccountResponse>(null) {
-        apiCall = identityAPI.getAccount()
+    val identityAccountResponse = executeRequest(null) {
+        identityAPI.getAccount()
     }
 
     assert(userId == identityAccountResponse.userId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt
index d85e471f1d..e707c2351c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetPreviewUrlTask.kt
@@ -65,8 +65,8 @@ internal class DefaultGetPreviewUrlTask @Inject constructor(
     }
 
     private suspend fun doRequest(url: String, timestamp: Long?): PreviewUrlData {
-        return executeRequest<JsonDict>(globalErrorReceiver) {
-            apiCall = mediaAPI.getPreviewUrlData(url, timestamp)
+        return executeRequest(globalErrorReceiver) {
+            mediaAPI.getPreviewUrlData(url, timestamp)
         }
                 .toPreviewUrlData(url)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetRawPreviewUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetRawPreviewUrlTask.kt
index 32305cd4e4..fd906f0dc8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetRawPreviewUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/GetRawPreviewUrlTask.kt
@@ -36,7 +36,7 @@ internal class DefaultGetRawPreviewUrlTask @Inject constructor(
 
     override suspend fun execute(params: GetRawPreviewUrlTask.Params): JsonDict {
         return executeRequest(globalErrorReceiver) {
-            apiCall = mediaAPI.getPreviewUrlData(params.url, params.timestamp)
+            mediaAPI.getPreviewUrlData(params.url, params.timestamp)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaAPI.kt
index bbb4f1e06a..9ee1d26cdc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/media/MediaAPI.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.session.media
 
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
 
@@ -28,7 +27,7 @@ internal interface MediaAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-media-r0-config
      */
     @GET(NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "config")
-    fun getMediaConfig(): Call<GetMediaConfigResult>
+    suspend fun getMediaConfig(): GetMediaConfigResult
 
     /**
      * Get information about a URL for the client. Typically this is called when a client
@@ -39,5 +38,5 @@ internal interface MediaAPI {
      * if it does not have the requested version available.
      */
     @GET(NetworkConstants.URI_API_MEDIA_PREFIX_PATH_R0 + "preview_url")
-    fun getPreviewUrlData(@Query("url") url: String, @Query("ts") ts: Long?): Call<JsonDict>
+    suspend fun getPreviewUrlData(@Query("url") url: String, @Query("ts") ts: Long?): JsonDict
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
index f83c6b770a..8481a6ab93 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
@@ -31,7 +31,7 @@ internal class DefaultGetOpenIdTokenTask @Inject constructor(
 
     override suspend fun execute(params: Unit): RequestOpenIdTokenResponse {
         return executeRequest(globalErrorReceiver) {
-            apiCall = openIdAPI.openIdToken(userId)
+            openIdAPI.openIdToken(userId)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
index 4614d82453..ed090b845d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.session.openid
 
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
 import retrofit2.http.Path
@@ -34,6 +33,6 @@ internal interface OpenIdAPI {
      * @param userId the user id
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/openid/request_token")
-    fun openIdToken(@Path("userId") userId: String,
-                    @Body body: JsonDict = emptyMap()): Call<RequestOpenIdTokenResponse>
+    suspend fun openIdToken(@Path("userId") userId: String,
+                            @Body body: JsonDict = emptyMap()): RequestOpenIdTokenResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
index 6d6d70bb0d..678d399428 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -50,13 +50,14 @@ internal class DefaultAddThreePidTask @Inject constructor(
         val clientSecret = UUID.randomUUID().toString()
         val sendAttempt = 1
 
-        val result = executeRequest<AddEmailResponse>(globalErrorReceiver) {
-            val body = AddEmailBody(
-                    clientSecret = clientSecret,
-                    email = threePid.email,
-                    sendAttempt = sendAttempt
-            )
-            apiCall = profileAPI.addEmail(body)
+        val body = AddEmailBody(
+                clientSecret = clientSecret,
+                email = threePid.email,
+                sendAttempt = sendAttempt
+        )
+
+        val result = executeRequest(globalErrorReceiver) {
+            profileAPI.addEmail(body)
         }
 
         // Store as a pending three pid
@@ -84,14 +85,15 @@ internal class DefaultAddThreePidTask @Inject constructor(
         val countryCode = parsedNumber.countryCode
         val country = phoneNumberUtil.getRegionCodeForCountryCode(countryCode)
 
-        val result = executeRequest<AddMsisdnResponse>(globalErrorReceiver) {
-            val body = AddMsisdnBody(
-                    clientSecret = clientSecret,
-                    country = country,
-                    phoneNumber = parsedNumber.nationalNumber.toString(),
-                    sendAttempt = sendAttempt
-            )
-            apiCall = profileAPI.addMsisdn(body)
+        val body = AddMsisdnBody(
+                clientSecret = clientSecret,
+                country = country,
+                phoneNumber = parsedNumber.nationalNumber.toString(),
+                sendAttempt = sendAttempt
+        )
+
+        val result = executeRequest(globalErrorReceiver) {
+            profileAPI.addMsisdn(body)
         }
 
         // Store as a pending three pid
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
index a37e5380bc..87e51181e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
@@ -43,8 +43,8 @@ internal class DefaultBindThreePidsTask @Inject constructor(private val profileA
         val identityServerAccessToken = accessTokenProvider.getToken() ?: throw IdentityServiceError.NoIdentityServerConfigured
         val identityPendingBinding = identityStore.getPendingBinding(params.threePid) ?: throw IdentityServiceError.NoCurrentBindingError
 
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = profileAPI.bindThreePid(
+        executeRequest(globalErrorReceiver) {
+            profileAPI.bindThreePid(
                     BindThreePidBody(
                             clientSecret = identityPendingBinding.clientSecret,
                             identityServerUrlWithoutProtocol = identityServerUrlWithoutProtocol,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
index 3549f3613f..7b7617aa80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
@@ -34,12 +34,12 @@ internal class DefaultDeleteThreePidTask @Inject constructor(
         private val globalErrorReceiver: GlobalErrorReceiver) : DeleteThreePidTask() {
 
     override suspend fun execute(params: Params) {
-        executeRequest<DeleteThreePidResponse>(globalErrorReceiver) {
-            val body = DeleteThreePidBody(
-                    medium = params.threePid.toMedium(),
-                    address = params.threePid.value
-            )
-            apiCall = profileAPI.deleteThreePid(body)
+        val body = DeleteThreePidBody(
+                medium = params.threePid.toMedium(),
+                address = params.threePid.value
+        )
+        executeRequest(globalErrorReceiver) {
+            profileAPI.deleteThreePid(body)
         }
 
         // We do not really care about the result for the moment
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
index c2a38af093..5f063365e0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
@@ -61,13 +61,13 @@ internal class DefaultFinalizeAddingThreePidTask @Inject constructor(
                     ?: throw IllegalArgumentException("unknown threepid")
 
             try {
-                executeRequest<Unit>(globalErrorReceiver) {
+                executeRequest(globalErrorReceiver) {
                     val body = FinalizeAddThreePidBody(
                             clientSecret = pendingThreePids.clientSecret,
                             sid = pendingThreePids.sid,
                             auth = params.userAuthParam?.asMap()
                     )
-                    apiCall = profileAPI.finalizeAddThreePid(body)
+                    profileAPI.finalizeAddThreePid(body)
                 }
                 true
             } catch (throwable: Throwable) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
index ed60c4a368..fed4288f84 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
@@ -34,7 +34,7 @@ internal class DefaultGetProfileInfoTask @Inject constructor(private val profile
 
     override suspend fun execute(params: Params): JsonDict {
         return executeRequest(globalErrorReceiver) {
-            apiCall = profileAPI.getProfile(params.userId)
+            profileAPI.getProfile(params.userId)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 7794f578b0..5113b821e8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -21,7 +21,6 @@ import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.internal.auth.registration.SuccessResult
 import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -37,70 +36,70 @@ internal interface ProfileAPI {
      * @param userId the user id to fetch profile info
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}")
-    fun getProfile(@Path("userId") userId: String): Call<JsonDict>
+    suspend fun getProfile(@Path("userId") userId: String): JsonDict
 
     /**
      * List all 3PIDs linked to the Matrix user account.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid")
-    fun getThreePIDs(): Call<AccountThreePidsResponse>
+    suspend fun getThreePIDs(): AccountThreePidsResponse
 
     /**
      * Change user display name
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/displayname")
-    fun setDisplayName(@Path("userId") userId: String,
-                       @Body body: SetDisplayNameBody): Call<Unit>
+    suspend fun setDisplayName(@Path("userId") userId: String,
+                               @Body body: SetDisplayNameBody)
 
     /**
      * Change user avatar url.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/avatar_url")
-    fun setAvatarUrl(@Path("userId") userId: String,
-                     @Body body: SetAvatarUrlBody): Call<Unit>
+    suspend fun setAvatarUrl(@Path("userId") userId: String,
+                             @Body body: SetAvatarUrlBody)
 
     /**
      * Bind a threePid
      * Ref: https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-account-3pid-bind
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "account/3pid/bind")
-    fun bindThreePid(@Body body: BindThreePidBody): Call<Unit>
+    suspend fun bindThreePid(@Body body: BindThreePidBody)
 
     /**
      * Unbind a threePid
      * Ref: https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-account-3pid-unbind
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "account/3pid/unbind")
-    fun unbindThreePid(@Body body: UnbindThreePidBody): Call<UnbindThreePidResponse>
+    suspend fun unbindThreePid(@Body body: UnbindThreePidBody): UnbindThreePidResponse
 
     /**
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-email-requesttoken
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/email/requestToken")
-    fun addEmail(@Body body: AddEmailBody): Call<AddEmailResponse>
+    suspend fun addEmail(@Body body: AddEmailBody): AddEmailResponse
 
     /**
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-msisdn-requesttoken
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/msisdn/requestToken")
-    fun addMsisdn(@Body body: AddMsisdnBody): Call<AddMsisdnResponse>
+    suspend fun addMsisdn(@Body body: AddMsisdnBody): AddMsisdnResponse
 
     /**
      * Validate Msisdn code (same model than for Identity server API)
      */
     @POST
-    fun validateMsisdn(@Url url: String,
-                       @Body params: ValidationCodeBody): Call<SuccessResult>
+    suspend fun validateMsisdn(@Url url: String,
+                               @Body params: ValidationCodeBody): SuccessResult
 
     /**
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-add
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/add")
-    fun finalizeAddThreePid(@Body body: FinalizeAddThreePidBody): Call<Unit>
+    suspend fun finalizeAddThreePid(@Body body: FinalizeAddThreePidBody)
 
     /**
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-account-3pid-delete
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid/delete")
-    fun deleteThreePid(@Body body: DeleteThreePidBody): Call<DeleteThreePidResponse>
+    suspend fun deleteThreePid(@Body body: DeleteThreePidBody): DeleteThreePidResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
index 552ad874ee..8a064b4fd1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
@@ -33,8 +33,8 @@ internal class DefaultRefreshUserThreePidsTask @Inject constructor(private val p
                                                                    private val globalErrorReceiver: GlobalErrorReceiver) : RefreshUserThreePidsTask() {
 
     override suspend fun execute(params: Unit) {
-        val accountThreePidsResponse = executeRequest<AccountThreePidsResponse>(globalErrorReceiver) {
-            apiCall = profileAPI.getThreePIDs()
+        val accountThreePidsResponse = executeRequest(globalErrorReceiver) {
+            profileAPI.getThreePIDs()
         }
 
         Timber.d("Get ${accountThreePidsResponse.threePids?.size} threePids")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
index b29153d665..a7d116d919 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
@@ -33,11 +33,11 @@ internal class DefaultSetAvatarUrlTask @Inject constructor(
         private val globalErrorReceiver: GlobalErrorReceiver) : SetAvatarUrlTask() {
 
     override suspend fun execute(params: Params) {
+        val body = SetAvatarUrlBody(
+                avatarUrl = params.newAvatarUrl
+        )
         return executeRequest(globalErrorReceiver) {
-            val body = SetAvatarUrlBody(
-                    avatarUrl = params.newAvatarUrl
-            )
-            apiCall = profileAPI.setAvatarUrl(params.userId, body)
+            profileAPI.setAvatarUrl(params.userId, body)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
index 3f236bc589..61d3042310 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
@@ -33,11 +33,11 @@ internal class DefaultSetDisplayNameTask @Inject constructor(
         private val globalErrorReceiver: GlobalErrorReceiver) : SetDisplayNameTask() {
 
     override suspend fun execute(params: Params) {
+        val body = SetDisplayNameBody(
+                displayName = params.newDisplayName
+        )
         return executeRequest(globalErrorReceiver) {
-            val body = SetDisplayNameBody(
-                    displayName = params.newDisplayName
-            )
-            apiCall = profileAPI.setDisplayName(params.userId, body)
+            profileAPI.setDisplayName(params.userId, body)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
index 3439f6f840..df8a1c97ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
@@ -39,8 +39,8 @@ internal class DefaultUnbindThreePidsTask @Inject constructor(private val profil
         val identityServerUrlWithoutProtocol = identityStore.getIdentityServerUrlWithoutProtocol()
                 ?: throw IdentityServiceError.NoIdentityServerConfigured
 
-        return executeRequest<UnbindThreePidResponse>(globalErrorReceiver) {
-            apiCall = profileAPI.unbindThreePid(
+        return executeRequest(globalErrorReceiver) {
+            profileAPI.unbindThreePid(
                     UnbindThreePidBody(
                             identityServerUrlWithoutProtocol,
                             params.threePid.toMedium(),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
index efb6c6e836..c898fc6c5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.profile
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.identity.ThreePid
-import org.matrix.android.sdk.internal.auth.registration.SuccessResult
 import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
 import org.matrix.android.sdk.internal.database.model.PendingThreePidEntity
 import org.matrix.android.sdk.internal.di.SessionDatabase
@@ -58,8 +57,8 @@ internal class DefaultValidateSmsCodeTask @Inject constructor(
                 sid = pendingThreePids.sid,
                 code = params.code
         )
-        val result = executeRequest<SuccessResult>(globalErrorReceiver) {
-            apiCall = profileAPI.validateMsisdn(url, body)
+        val result = executeRequest(globalErrorReceiver) {
+            profileAPI.validateMsisdn(url, body)
         }
 
         if (!result.isSuccess()) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
index d0f7cbfca3..c9d7ad2193 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
@@ -81,8 +81,8 @@ internal class AddHttpPusherWorker(context: Context, params: WorkerParameters)
     }
 
     private suspend fun setPusher(pusher: JsonPusher) {
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = pushersAPI.setPusher(pusher)
+        executeRequest(globalErrorReceiver) {
+            pushersAPI.setPusher(pusher)
         }
         monarchy.awaitTransaction { realm ->
             val echo = PusherEntity.where(realm, pusher.pushKey).findFirst()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
index 03748b1528..b217687168 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
@@ -36,7 +36,7 @@ internal class DefaultAddPushRuleTask @Inject constructor(
 
     override suspend fun execute(params: AddPushRuleTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = pushRulesApi.addRule(params.kind.value, params.pushRule.ruleId, params.pushRule)
+            pushRulesApi.addRule(params.kind.value, params.pushRule.ruleId, params.pushRule)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
index 9fb2d51664..8cf861d285 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
@@ -15,7 +15,6 @@
  */
 package org.matrix.android.sdk.internal.session.pushers
 
-import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
@@ -35,8 +34,8 @@ internal class DefaultGetPushRulesTask @Inject constructor(
 ) : GetPushRulesTask {
 
     override suspend fun execute(params: GetPushRulesTask.Params) {
-        val response = executeRequest<GetPushRulesResponse>(globalErrorReceiver) {
-            apiCall = pushRulesApi.getAllRules()
+        val response = executeRequest(globalErrorReceiver) {
+            pushRulesApi.getAllRules()
         }
 
         savePushRulesTask.execute(SavePushRulesTask.Params(response))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
index 125c8f0022..ba413a34db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
@@ -36,8 +36,8 @@ internal class DefaultGetPushersTask @Inject constructor(
 ) : GetPushersTask {
 
     override suspend fun execute(params: Unit) {
-        val response = executeRequest<GetPushersResponse>(globalErrorReceiver) {
-            apiCall = pushersAPI.getPushers()
+        val response = executeRequest(globalErrorReceiver) {
+            pushersAPI.getPushers()
         }
         monarchy.awaitTransaction { realm ->
             // clear existings?
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
index cbcb7d2b37..daf9397ce8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.session.pushers
 import org.matrix.android.sdk.api.pushrules.rest.GetPushRulesResponse
 import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -30,7 +29,7 @@ internal interface PushRulesApi {
      * Get all push rules
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/")
-    fun getAllRules(): Call<GetPushRulesResponse>
+    suspend fun getAllRules(): GetPushRulesResponse
 
     /**
      * Update the ruleID enable status
@@ -40,10 +39,9 @@ internal interface PushRulesApi {
      * @param enable the new enable status
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}/enabled")
-    fun updateEnableRuleStatus(@Path("kind") kind: String,
-                               @Path("ruleId") ruleId: String,
-                               @Body enable: Boolean?)
-            : Call<Unit>
+    suspend fun updateEnableRuleStatus(@Path("kind") kind: String,
+                                       @Path("ruleId") ruleId: String,
+                                       @Body enable: Boolean?)
 
     /**
      * Update the ruleID action
@@ -54,10 +52,9 @@ internal interface PushRulesApi {
      * @param actions the actions
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}/actions")
-    fun updateRuleActions(@Path("kind") kind: String,
-                          @Path("ruleId") ruleId: String,
-                          @Body actions: Any)
-            : Call<Unit>
+    suspend fun updateRuleActions(@Path("kind") kind: String,
+                                  @Path("ruleId") ruleId: String,
+                                  @Body actions: Any)
 
     /**
      * Delete a rule
@@ -66,9 +63,8 @@ internal interface PushRulesApi {
      * @param ruleId the ruleId
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}")
-    fun deleteRule(@Path("kind") kind: String,
-                   @Path("ruleId") ruleId: String)
-            : Call<Unit>
+    suspend fun deleteRule(@Path("kind") kind: String,
+                           @Path("ruleId") ruleId: String)
 
     /**
      * Add the ruleID enable status
@@ -78,8 +74,7 @@ internal interface PushRulesApi {
      * @param rule   the rule to add.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}")
-    fun addRule(@Path("kind") kind: String,
-                @Path("ruleId") ruleId: String,
-                @Body rule: PushRule)
-            : Call<Unit>
+    suspend fun addRule(@Path("kind") kind: String,
+                        @Path("ruleId") ruleId: String,
+                        @Body rule: PushRule)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
index ed4fb73e1b..0afea6996d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
@@ -16,7 +16,6 @@
 package org.matrix.android.sdk.internal.session.pushers
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -29,7 +28,7 @@ internal interface PushersAPI {
      * Ref: https://matrix.org/docs/spec/client_server/latest#get-matrix-client-r0-pushers
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushers")
-    fun getPushers(): Call<GetPushersResponse>
+    suspend fun getPushers(): GetPushersResponse
 
     /**
      * This endpoint allows the creation, modification and deletion of pushers for this user ID.
@@ -38,5 +37,5 @@ internal interface PushersAPI {
      * Ref: https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-pushers-set
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushers/set")
-    fun setPusher(@Body jsonPusher: JsonPusher): Call<Unit>
+    suspend fun setPusher(@Body jsonPusher: JsonPusher)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
index ff3122f566..23d0515f41 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
@@ -36,7 +36,7 @@ internal class DefaultRemovePushRuleTask @Inject constructor(
 
     override suspend fun execute(params: RemovePushRuleTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = pushRulesApi.deleteRule(params.kind.value, params.pushRule.ruleId)
+            pushRulesApi.deleteRule(params.kind.value, params.pushRule.ruleId)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
index e3f4fdb789..3a2ebf40c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
@@ -62,8 +62,8 @@ internal class DefaultRemovePusherTask @Inject constructor(
                 data = JsonPusherData(existing.data.url, existing.data.format),
                 append = false
         )
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = pushersAPI.setPusher(deleteBody)
+        executeRequest(globalErrorReceiver) {
+            pushersAPI.setPusher(deleteBody)
         }
         monarchy.awaitTransaction {
             PusherEntity.where(it, params.pushKey).findFirst()?.deleteFromRealm()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
index a5c220e662..2a24aee892 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
@@ -38,8 +38,8 @@ internal class DefaultUpdatePushRuleActionsTask @Inject constructor(
     override suspend fun execute(params: UpdatePushRuleActionsTask.Params) {
         if (params.oldPushRule.enabled != params.newPushRule.enabled) {
             // First change enabled state
-            executeRequest<Unit>(globalErrorReceiver) {
-                apiCall = pushRulesApi.updateEnableRuleStatus(params.kind.value, params.newPushRule.ruleId, params.newPushRule.enabled)
+            executeRequest(globalErrorReceiver) {
+                pushRulesApi.updateEnableRuleStatus(params.kind.value, params.newPushRule.ruleId, params.newPushRule.enabled)
             }
         }
 
@@ -47,8 +47,8 @@ internal class DefaultUpdatePushRuleActionsTask @Inject constructor(
             // Also ensure the actions are up to date
             val body = mapOf("actions" to params.newPushRule.actions)
 
-            executeRequest<Unit>(globalErrorReceiver) {
-                apiCall = pushRulesApi.updateRuleActions(params.kind.value, params.newPushRule.ruleId, body)
+            executeRequest(globalErrorReceiver) {
+                pushRulesApi.updateRuleActions(params.kind.value, params.newPushRule.ruleId, body)
             }
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
index f36b5c55fb..9d7a46bede 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
@@ -35,7 +35,7 @@ internal class DefaultUpdatePushRuleEnableStatusTask @Inject constructor(
 
     override suspend fun execute(params: UpdatePushRuleEnableStatusTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = pushRulesApi.updateEnableRuleStatus(params.kind.value, params.pushRule.ruleId, params.enabled)
+            pushRulesApi.updateEnableRuleStatus(params.kind.value, params.pushRule.ruleId, params.enabled)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
index d95587fc22..4333d6c7b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
@@ -16,7 +16,6 @@
 package org.matrix.android.sdk.internal.session.pushers.gateway
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
 
@@ -27,5 +26,5 @@ internal interface PushGatewayAPI {
      * Ref: https://matrix.org/docs/spec/push_gateway/r0.1.1#post-matrix-push-v1-notify
      */
     @POST(NetworkConstants.URI_PUSH_GATEWAY_PREFIX_PATH + "notify")
-    fun notify(@Body body: PushGatewayNotifyBody): Call<PushGatewayNotifyResponse>
+    suspend fun notify(@Body body: PushGatewayNotifyBody): PushGatewayNotifyResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
index df6f46fa81..316e221b32 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
@@ -45,8 +45,8 @@ internal class DefaultPushGatewayNotifyTask @Inject constructor(
         )
                 .create(PushGatewayAPI::class.java)
 
-        val response = executeRequest<PushGatewayNotifyResponse>(null) {
-            apiCall = sygnalApi.notify(
+        val response = executeRequest(null) {
+            sygnalApi.notify(
                     PushGatewayNotifyBody(
                             PushGatewayNotification(
                                     eventId = params.eventId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index b065a30fc9..ad699af6f4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -38,7 +38,6 @@ import org.matrix.android.sdk.internal.session.room.tags.TagBody
 import org.matrix.android.sdk.internal.session.room.timeline.EventContextResponse
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationResponse
 import org.matrix.android.sdk.internal.session.room.typing.TypingBody
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -57,9 +56,9 @@ internal interface RoomAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-publicrooms
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "publicRooms")
-    fun publicRooms(@Query("server") server: String?,
-                    @Body publicRoomsParams: PublicRoomsParams
-    ): Call<PublicRoomsResponse>
+    suspend fun publicRooms(@Query("server") server: String?,
+                            @Body publicRoomsParams: PublicRoomsParams
+    ): PublicRoomsResponse
 
     /**
      * Create a room.
@@ -71,7 +70,7 @@ internal interface RoomAPI {
      */
     @Headers("CONNECT_TIMEOUT:60000", "READ_TIMEOUT:60000", "WRITE_TIMEOUT:60000")
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "createRoom")
-    fun createRoom(@Body param: CreateRoomBody): Call<CreateRoomResponse>
+    suspend fun createRoom(@Body param: CreateRoomBody): CreateRoomResponse
 
     /**
      * Get a list of messages starting from a reference.
@@ -83,12 +82,12 @@ internal interface RoomAPI {
      * @param filter A JSON RoomEventFilter to filter returned events with. Optional.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/messages")
-    fun getRoomMessagesFrom(@Path("roomId") roomId: String,
-                            @Query("from") from: String,
-                            @Query("dir") dir: String,
-                            @Query("limit") limit: Int,
-                            @Query("filter") filter: String?
-    ): Call<PaginationResponse>
+    suspend fun getRoomMessagesFrom(@Path("roomId") roomId: String,
+                                    @Query("from") from: String,
+                                    @Query("dir") dir: String,
+                                    @Query("limit") limit: Int,
+                                    @Query("filter") filter: String?
+    ): PaginationResponse
 
     /**
      * Get all members of a room
@@ -99,11 +98,11 @@ internal interface RoomAPI {
      * @param notMembership to exclude one type of membership (optional)
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/members")
-    fun getMembers(@Path("roomId") roomId: String,
-                   @Query("at") syncToken: String?,
-                   @Query("membership") membership: Membership?,
-                   @Query("not_membership") notMembership: Membership?
-    ): Call<RoomMembersResponse>
+    suspend fun getMembers(@Path("roomId") roomId: String,
+                           @Query("at") syncToken: String?,
+                           @Query("membership") membership: Membership?,
+                           @Query("not_membership") notMembership: Membership?
+    ): RoomMembersResponse
 
     /**
      * Send an event to a room.
@@ -114,11 +113,11 @@ internal interface RoomAPI {
      * @param content   the event content
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/send/{eventType}/{txId}")
-    fun send(@Path("txId") txId: String,
-             @Path("roomId") roomId: String,
-             @Path("eventType") eventType: String,
-             @Body content: Content?
-    ): Call<SendResponse>
+    suspend fun send(@Path("txId") txId: String,
+                     @Path("roomId") roomId: String,
+                     @Path("eventType") eventType: String,
+                     @Body content: Content?
+    ): SendResponse
 
     /**
      * Get the context surrounding an event.
@@ -129,10 +128,10 @@ internal interface RoomAPI {
      * @param filter  A JSON RoomEventFilter to filter returned events with. Optional.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/context/{eventId}")
-    fun getContextOfEvent(@Path("roomId") roomId: String,
-                          @Path("eventId") eventId: String,
-                          @Query("limit") limit: Int,
-                          @Query("filter") filter: String? = null): Call<EventContextResponse>
+    suspend fun getContextOfEvent(@Path("roomId") roomId: String,
+                                  @Path("eventId") eventId: String,
+                                  @Query("limit") limit: Int,
+                                  @Query("filter") filter: String? = null): EventContextResponse
 
     /**
      * Retrieve an event from its room id / events id
@@ -141,8 +140,8 @@ internal interface RoomAPI {
      * @param eventId the event Id
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/event/{eventId}")
-    fun getEvent(@Path("roomId") roomId: String,
-                 @Path("eventId") eventId: String): Call<Event>
+    suspend fun getEvent(@Path("roomId") roomId: String,
+                         @Path("eventId") eventId: String): Event
 
     /**
      * Send read markers.
@@ -151,8 +150,8 @@ internal interface RoomAPI {
      * @param markers the read markers
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/read_markers")
-    fun sendReadMarker(@Path("roomId") roomId: String,
-                       @Body markers: Map<String, String>): Call<Unit>
+    suspend fun sendReadMarker(@Path("roomId") roomId: String,
+                               @Body markers: Map<String, String>)
 
     /**
      * Invite a user to the given room.
@@ -162,8 +161,8 @@ internal interface RoomAPI {
      * @param body   a object that just contains a user id
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/invite")
-    fun invite(@Path("roomId") roomId: String,
-               @Body body: InviteBody): Call<Unit>
+    suspend fun invite(@Path("roomId") roomId: String,
+                       @Body body: InviteBody)
 
     /**
      * Invite a user to a room, using a ThreePid
@@ -171,8 +170,8 @@ internal interface RoomAPI {
      * @param roomId Required. The room identifier (not alias) to which to invite the user.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/invite")
-    fun invite3pid(@Path("roomId") roomId: String,
-                   @Body body: ThreePidInviteBody): Call<Unit>
+    suspend fun invite3pid(@Path("roomId") roomId: String,
+                           @Body body: ThreePidInviteBody)
 
     /**
      * Send a generic state event
@@ -182,9 +181,9 @@ internal interface RoomAPI {
      * @param params         the request parameters
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state/{state_event_type}")
-    fun sendStateEvent(@Path("roomId") roomId: String,
-                       @Path("state_event_type") stateEventType: String,
-                       @Body params: JsonDict): Call<Unit>
+    suspend fun sendStateEvent(@Path("roomId") roomId: String,
+                               @Path("state_event_type") stateEventType: String,
+                               @Body params: JsonDict)
 
     /**
      * Send a generic state event
@@ -195,17 +194,17 @@ internal interface RoomAPI {
      * @param params         the request parameters
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state/{state_event_type}/{state_key}")
-    fun sendStateEvent(@Path("roomId") roomId: String,
-                       @Path("state_event_type") stateEventType: String,
-                       @Path("state_key") stateKey: String,
-                       @Body params: JsonDict): Call<Unit>
+    suspend fun sendStateEvent(@Path("roomId") roomId: String,
+                               @Path("state_event_type") stateEventType: String,
+                               @Path("state_key") stateKey: String,
+                               @Body params: JsonDict)
 
     /**
      * Get state events of a room
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-rooms-roomid-state
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/state")
-    fun getRoomState(@Path("roomId") roomId: String) : Call<List<Event>>
+    suspend fun getRoomState(@Path("roomId") roomId: String): List<Event>
 
     /**
      * Send a relation event to a room.
@@ -216,12 +215,12 @@ internal interface RoomAPI {
      * @param content   the event content
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/send_relation/{parent_id}/{relation_type}/{event_type}")
-    fun sendRelation(@Path("roomId") roomId: String,
-                     @Path("parent_id") parentId: String,
-                     @Path("relation_type") relationType: String,
-                     @Path("event_type") eventType: String,
-                     @Body content: Content?
-    ): Call<SendResponse>
+    suspend fun sendRelation(@Path("roomId") roomId: String,
+                             @Path("parent_id") parentId: String,
+                             @Path("relation_type") relationType: String,
+                             @Path("event_type") eventType: String,
+                             @Body content: Content?
+    ): SendResponse
 
     /**
      * Paginate relations for event based in normal topological order
@@ -230,11 +229,11 @@ internal interface RoomAPI {
      * @param eventType filter for this event type
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "rooms/{roomId}/relations/{eventId}/{relationType}/{eventType}")
-    fun getRelations(@Path("roomId") roomId: String,
-                     @Path("eventId") eventId: String,
-                     @Path("relationType") relationType: String,
-                     @Path("eventType") eventType: String
-    ): Call<RelationsResponse>
+    suspend fun getRelations(@Path("roomId") roomId: String,
+                             @Path("eventId") eventId: String,
+                             @Path("relationType") relationType: String,
+                             @Path("eventType") eventType: String
+    ): RelationsResponse
 
     /**
      * Join the given room.
@@ -244,9 +243,9 @@ internal interface RoomAPI {
      * @param params the request body
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "join/{roomIdOrAlias}")
-    fun join(@Path("roomIdOrAlias") roomIdOrAlias: String,
-             @Query("server_name") viaServers: List<String>,
-             @Body params: Map<String, String?>): Call<JoinRoomResponse>
+    suspend fun join(@Path("roomIdOrAlias") roomIdOrAlias: String,
+                     @Query("server_name") viaServers: List<String>,
+                     @Body params: Map<String, String?>): JoinRoomResponse
 
     /**
      * Leave the given room.
@@ -255,8 +254,8 @@ internal interface RoomAPI {
      * @param params the request body
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/leave")
-    fun leave(@Path("roomId") roomId: String,
-              @Body params: Map<String, String?>): Call<Unit>
+    suspend fun leave(@Path("roomId") roomId: String,
+                      @Body params: Map<String, String?>)
 
     /**
      * Ban a user from the given room.
@@ -265,8 +264,8 @@ internal interface RoomAPI {
      * @param userIdAndReason the banned user object (userId and reason for ban)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/ban")
-    fun ban(@Path("roomId") roomId: String,
-            @Body userIdAndReason: UserIdAndReason): Call<Unit>
+    suspend fun ban(@Path("roomId") roomId: String,
+                    @Body userIdAndReason: UserIdAndReason)
 
     /**
      * unban a user from the given room.
@@ -275,8 +274,8 @@ internal interface RoomAPI {
      * @param userIdAndReason the unbanned user object (userId and reason for unban)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/unban")
-    fun unban(@Path("roomId") roomId: String,
-              @Body userIdAndReason: UserIdAndReason): Call<Unit>
+    suspend fun unban(@Path("roomId") roomId: String,
+                      @Body userIdAndReason: UserIdAndReason)
 
     /**
      * Kick a user from the given room.
@@ -285,8 +284,8 @@ internal interface RoomAPI {
      * @param userIdAndReason the kicked user object (userId and reason for kicking)
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/kick")
-    fun kick(@Path("roomId") roomId: String,
-             @Body userIdAndReason: UserIdAndReason): Call<Unit>
+    suspend fun kick(@Path("roomId") roomId: String,
+                     @Body userIdAndReason: UserIdAndReason)
 
     /**
      * Strips all information out of an event which isn't critical to the integrity of the server-side representation of the room.
@@ -299,12 +298,12 @@ internal interface RoomAPI {
      * @param reason   json containing reason key {"reason": "Indecent material"}
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/redact/{eventId}/{txnId}")
-    fun redactEvent(
+    suspend fun redactEvent(
             @Path("txnId") txId: String,
             @Path("roomId") roomId: String,
             @Path("eventId") eventId: String,
             @Body reason: Map<String, String>
-    ): Call<SendResponse>
+    ): SendResponse
 
     /**
      * Reports an event as inappropriate to the server, which may then notify the appropriate people.
@@ -314,24 +313,24 @@ internal interface RoomAPI {
      * @param body    body containing score and reason
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/report/{eventId}")
-    fun reportContent(@Path("roomId") roomId: String,
-                      @Path("eventId") eventId: String,
-                      @Body body: ReportContentBody): Call<Unit>
+    suspend fun reportContent(@Path("roomId") roomId: String,
+                              @Path("eventId") eventId: String,
+                              @Body body: ReportContentBody)
 
     /**
      * Get a list of aliases maintained by the local server for the given room.
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-rooms-roomid-aliases
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc2432/rooms/{roomId}/aliases")
-    fun getAliases(@Path("roomId") roomId: String): Call<GetAliasesResponse>
+    suspend fun getAliases(@Path("roomId") roomId: String): GetAliasesResponse
 
     /**
      * Inform that the user is starting to type or has stopped typing
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/typing/{userId}")
-    fun sendTypingState(@Path("roomId") roomId: String,
-                        @Path("userId") userId: String,
-                        @Body body: TypingBody): Call<Unit>
+    suspend fun sendTypingState(@Path("roomId") roomId: String,
+                                @Path("userId") userId: String,
+                                @Body body: TypingBody)
 
     /**
      * Room tagging
@@ -341,16 +340,16 @@ internal interface RoomAPI {
      * Add a tag to a room.
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/rooms/{roomId}/tags/{tag}")
-    fun putTag(@Path("userId") userId: String,
-               @Path("roomId") roomId: String,
-               @Path("tag") tag: String,
-               @Body body: TagBody): Call<Unit>
+    suspend fun putTag(@Path("userId") userId: String,
+                       @Path("roomId") roomId: String,
+                       @Path("tag") tag: String,
+                       @Body body: TagBody)
 
     /**
      * Delete a tag from a room.
      */
     @DELETE(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/rooms/{roomId}/tags/{tag}")
-    fun deleteTag(@Path("userId") userId: String,
-                  @Path("roomId") roomId: String,
-                  @Path("tag") tag: String): Call<Unit>
+    suspend fun deleteTag(@Path("userId") userId: String,
+                          @Path("roomId") roomId: String,
+                          @Path("tag") tag: String)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
index 9e4ec6f777..97ea1d6ad1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
@@ -45,8 +45,8 @@ internal class DefaultAddRoomAliasTask @Inject constructor(
     override suspend fun execute(params: AddRoomAliasTask.Params) {
         aliasAvailabilityChecker.check(params.aliasLocalPart)
 
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = directoryAPI.addRoomAlias(
+        executeRequest(globalErrorReceiver) {
+            directoryAPI.addRoomAlias(
                     roomAlias = params.aliasLocalPart.toFullLocalAlias(userId),
                     body = AddRoomAliasBody(
                             roomId = params.roomId
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/DeleteRoomAliasTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/DeleteRoomAliasTask.kt
index 6ad3db90a9..01ac3fcec8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/DeleteRoomAliasTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/DeleteRoomAliasTask.kt
@@ -34,8 +34,8 @@ internal class DefaultDeleteRoomAliasTask @Inject constructor(
 ) : DeleteRoomAliasTask {
 
     override suspend fun execute(params: DeleteRoomAliasTask.Params) {
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = directoryAPI.deleteRoomAlias(
+        executeRequest(globalErrorReceiver) {
+            directoryAPI.deleteRoomAlias(
                     roomAlias = params.roomAlias
             )
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
index a53ffc4fcd..71c8c9cd38 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
@@ -52,8 +52,8 @@ internal class DefaultGetRoomIdByAliasTask @Inject constructor(
             Optional.from(null)
         } else {
             val description  = tryOrNull("## Failed to get roomId from alias") {
-                executeRequest<RoomAliasDescription>(globalErrorReceiver) {
-                    apiCall = directoryAPI.getRoomIdByAlias(params.roomAlias)
+                executeRequest(globalErrorReceiver) {
+                    directoryAPI.getRoomIdByAlias(params.roomAlias)
                 }
             }
             Optional.from(description)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomLocalAliasesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomLocalAliasesTask.kt
index 202cb1f6de..1ff4156ed3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomLocalAliasesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomLocalAliasesTask.kt
@@ -35,8 +35,8 @@ internal class DefaultGetRoomLocalAliasesTask @Inject constructor(
 
     override suspend fun execute(params: GetRoomLocalAliasesTask.Params): List<String> {
         // We do not check for "org.matrix.msc2432", so the API may be missing
-        val response = executeRequest<GetAliasesResponse>(globalErrorReceiver) {
-            apiCall = roomAPI.getAliases(roomId = params.roomId)
+        val response = executeRequest(globalErrorReceiver) {
+            roomAPI.getAliases(roomId = params.roomId)
         }
 
         return response.aliases
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasAvailabilityChecker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasAvailabilityChecker.kt
index 51a849a35e..9faf50dd8b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasAvailabilityChecker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasAvailabilityChecker.kt
@@ -41,8 +41,8 @@ internal class RoomAliasAvailabilityChecker @Inject constructor(
         // Check alias availability
         val fullAlias = aliasLocalPart.toFullLocalAlias(userId)
         try {
-            executeRequest<RoomAliasDescription>(globalErrorReceiver) {
-                apiCall = directoryAPI.getRoomIdByAlias(fullAlias)
+            executeRequest(globalErrorReceiver) {
+                directoryAPI.getRoomIdByAlias(fullAlias)
             }
         } catch (throwable: Throwable) {
             if (throwable is Failure.ServerError && throwable.httpCode == 404) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
index 9c16bd1b0f..fb3182d28b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
@@ -75,8 +75,8 @@ internal class DefaultCreateRoomTask @Inject constructor(
         val createRoomBody = createRoomBodyBuilder.build(params)
 
         val createRoomResponse = try {
-            executeRequest<CreateRoomResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.createRoom(createRoomBody)
+            executeRequest(globalErrorReceiver) {
+                roomAPI.createRoom(createRoomBody)
             }
         } catch (throwable: Throwable) {
             if (throwable is Failure.ServerError) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
index edd8ae9b0d..4a6b0703c5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
@@ -38,7 +38,7 @@ internal class DefaultGetPublicRoomTask @Inject constructor(
 
     override suspend fun execute(params: GetPublicRoomTask.Params): PublicRoomsResponse {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomAPI.publicRooms(params.server, params.publicRoomsParams)
+            roomAPI.publicRooms(params.server, params.publicRoomsParams)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetRoomDirectoryVisibilityTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetRoomDirectoryVisibilityTask.kt
index 8d71001ef9..77492e429f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetRoomDirectoryVisibilityTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetRoomDirectoryVisibilityTask.kt
@@ -20,7 +20,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.directory.DirectoryAPI
-import org.matrix.android.sdk.internal.session.directory.RoomDirectoryVisibilityJson
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
@@ -36,8 +35,8 @@ internal class DefaultGetRoomDirectoryVisibilityTask @Inject constructor(
 ) : GetRoomDirectoryVisibilityTask {
 
     override suspend fun execute(params: GetRoomDirectoryVisibilityTask.Params): RoomDirectoryVisibility {
-        return executeRequest<RoomDirectoryVisibilityJson>(globalErrorReceiver) {
-            apiCall = directoryAPI.getRoomDirectoryVisibility(params.roomId)
+        return executeRequest(globalErrorReceiver) {
+            directoryAPI.getRoomDirectoryVisibility(params.roomId)
         }
                 .visibility
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/SetRoomDirectoryVisibilityTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/SetRoomDirectoryVisibilityTask.kt
index cbb0b6d5d1..f46d06bd5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/SetRoomDirectoryVisibilityTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/SetRoomDirectoryVisibilityTask.kt
@@ -37,8 +37,8 @@ internal class DefaultSetRoomDirectoryVisibilityTask @Inject constructor(
 ) : SetRoomDirectoryVisibilityTask {
 
     override suspend fun execute(params: SetRoomDirectoryVisibilityTask.Params) {
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = directoryAPI.setRoomDirectoryVisibility(
+        executeRequest(globalErrorReceiver) {
+            directoryAPI.setRoomDirectoryVisibility(
                     params.roomId,
                     RoomDirectoryVisibilityJson(visibility = params.roomDirectoryVisibility)
             )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
index 6adf3c59d1..3d0f51b831 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
@@ -90,8 +90,8 @@ internal class DefaultLoadRoomMembersTask @Inject constructor(
 
         val lastToken = syncTokenStore.getLastToken()
         val response = try {
-            executeRequest<RoomMembersResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.getMembers(params.roomId, lastToken, null, params.excludeMembership)
+            executeRequest(globalErrorReceiver) {
+                roomAPI.getMembers(params.roomId, lastToken, null, params.excludeMembership)
             }
         } catch (throwable: Throwable) {
             // Revert status to NONE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
index 4654a28536..d2c21f3520 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
@@ -41,8 +41,8 @@ internal class DefaultMembershipAdminTask @Inject constructor(private val roomAP
 
     override suspend fun execute(params: MembershipAdminTask.Params) {
         val userIdAndReason = UserIdAndReason(params.userId, params.reason)
-        executeRequest<Unit>(null) {
-            apiCall = when (params.type) {
+        executeRequest(null) {
+            when (params.type) {
                 MembershipAdminTask.Type.BAN   -> roomAPI.ban(params.roomId, userIdAndReason)
                 MembershipAdminTask.Type.UNBAN -> roomAPI.unban(params.roomId, userIdAndReason)
                 MembershipAdminTask.Type.KICK  -> roomAPI.kick(params.roomId, userIdAndReason)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
index 05503bd643..0f141c344a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
@@ -36,11 +36,13 @@ internal class DefaultInviteTask @Inject constructor(
 ) : InviteTask {
 
     override suspend fun execute(params: InviteTask.Params) {
-        return executeRequest(globalErrorReceiver) {
-            val body = InviteBody(params.userId, params.reason)
-            apiCall = roomAPI.invite(params.roomId, body)
-            isRetryable = true
-            maxRetryCount = 3
-        }
+        val body = InviteBody(params.userId, params.reason)
+        return executeRequest(globalErrorReceiver,
+                { roomAPI.invite(params.roomId, body) },
+                {
+                    isRetryable = true
+                    maxRetryCount = 3
+                }
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
index 3b7639d42f..9fd4d95d9e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
@@ -24,7 +24,6 @@ import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
-import org.matrix.android.sdk.internal.session.room.create.JoinRoomResponse
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.read.SetReadMarkersTask
 import org.matrix.android.sdk.internal.task.Task
@@ -54,8 +53,8 @@ internal class DefaultJoinRoomTask @Inject constructor(
     override suspend fun execute(params: JoinRoomTask.Params) {
         roomChangeMembershipStateDataSource.updateState(params.roomIdOrAlias, ChangeMembershipState.Joining)
         val joinRoomResponse = try {
-            executeRequest<JoinRoomResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.join(
+            executeRequest(globalErrorReceiver) {
+                roomAPI.join(
                         roomIdOrAlias = params.roomIdOrAlias,
                         viaServers = params.viaServers.take(3),
                         params = mapOf("reason" to params.reason)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
index 37bb7570d1..1b836e36a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
@@ -68,8 +68,8 @@ internal class DefaultLeaveRoomTask @Inject constructor(
             leaveRoom(predecessorRoomId, reason)
         }
         try {
-            executeRequest<Unit>(globalErrorReceiver) {
-                apiCall = roomAPI.leave(roomId, mapOf("reason" to reason))
+            executeRequest(globalErrorReceiver) {
+                roomAPI.leave(roomId, mapOf("reason" to reason))
             }
         } catch (failure: Throwable) {
             roomChangeMembershipStateDataSource.updateState(roomId, ChangeMembershipState.FailedLeaving(failure))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
index d237ec795e..fa0a2d608a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
@@ -59,7 +59,7 @@ internal class DefaultInviteThreePidTask @Inject constructor(
                     medium = params.threePid.toMedium(),
                     address = params.threePid.value
             )
-            apiCall = roomAPI.invite3pid(params.roomId, body)
+            roomAPI.invite3pid(params.roomId, body)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/ResolveRoomStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/ResolveRoomStateTask.kt
index dbec6b555c..64cbef23ec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/ResolveRoomStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/ResolveRoomStateTask.kt
@@ -36,7 +36,7 @@ internal class DefaultResolveRoomStateTask @Inject constructor(
 
     override suspend fun execute(params: ResolveRoomStateTask.Params): List<Event> {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomAPI.getRoomState(params.roomId)
+            roomAPI.getRoomState(params.roomId)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index 54d2307dd4..23a3f2d36c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -96,10 +96,10 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
             updateDatabase(params.roomId, markers, shouldUpdateRoomSummary)
         }
         if (markers.isNotEmpty()) {
-            executeRequest<Unit>(globalErrorReceiver) {
-                isRetryable = true
-                apiCall = roomAPI.sendReadMarker(params.roomId, markers)
-            }
+            executeRequest(globalErrorReceiver,
+                    { roomAPI.sendReadMarker(params.roomId, markers) },
+                    { isRetryable = true }
+            )
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
index f9fd5f9348..5f5c000171 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
@@ -40,8 +40,8 @@ internal class DefaultFetchEditHistoryTask @Inject constructor(
 
     override suspend fun execute(params: FetchEditHistoryTask.Params): List<Event> {
         val isRoomEncrypted = cryptoSessionInfoProvider.isRoomEncrypted(params.roomId)
-        val response = executeRequest<RelationsResponse>(globalErrorReceiver) {
-            apiCall = roomAPI.getRelations(
+        val response = executeRequest(globalErrorReceiver) {
+            roomAPI.getRelations(
                     roomId = params.roomId,
                     eventId = params.eventId,
                     relationType = RelationType.REPLACE,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
index 403aa274fe..5d0879d706 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
@@ -28,7 +28,6 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.SessionComponent
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
-import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import javax.inject.Inject
@@ -84,8 +83,8 @@ internal class SendRelationWorker(context: Context, params: WorkerParameters)
     }
 
     private suspend fun sendRelation(roomId: String, relationType: String, relatedEventId: String, localEvent: Event) {
-        executeRequest<SendResponse>(globalErrorReceiver) {
-            apiCall = roomAPI.sendRelation(
+        executeRequest(globalErrorReceiver) {
+            roomAPI.sendRelation(
                     roomId = roomId,
                     parentId = relatedEventId,
                     relationType = relationType,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
index 9c6e9907a4..29d507dfc5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
@@ -38,7 +38,7 @@ internal class DefaultReportContentTask @Inject constructor(
 
     override suspend fun execute(params: ReportContentTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomAPI.reportContent(params.roomId, params.eventId, ReportContentBody(params.score, params.reason))
+            roomAPI.reportContent(params.roomId, params.eventId, ReportContentBody(params.score, params.reason))
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
index c901c7e18e..306f865408 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
@@ -55,8 +55,8 @@ internal class RedactEventWorker(context: Context, params: WorkerParameters)
     override suspend fun doSafeWork(params: Params): Result {
         val eventId = params.eventId
         return runCatching {
-            executeRequest<SendResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.redactEvent(
+            executeRequest(globalErrorReceiver) {
+                roomAPI.redactEvent(
                         params.txID,
                         params.roomId,
                         eventId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
index 63691d9207..998e116a0e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
@@ -39,7 +39,7 @@ internal class DefaultSendStateTask @Inject constructor(
 
     override suspend fun execute(params: SendStateTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = if (params.stateKey == null) {
+            if (params.stateKey == null) {
                 roomAPI.sendStateEvent(
                         roomId = params.roomId,
                         stateEventType = params.eventType,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
index c3b5c3f78f..3e82d674ce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
@@ -39,8 +39,8 @@ internal class DefaultAddTagToRoomTask @Inject constructor(
 ) : AddTagToRoomTask {
 
     override suspend fun execute(params: AddTagToRoomTask.Params) {
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = roomAPI.putTag(
+        executeRequest(globalErrorReceiver) {
+            roomAPI.putTag(
                     userId = userId,
                     roomId = params.roomId,
                     tag = params.tag,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
index d578d21fde..ae2a050659 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
@@ -38,8 +38,8 @@ internal class DefaultDeleteTagFromRoomTask @Inject constructor(
 ) : DeleteTagFromRoomTask {
 
     override suspend fun execute(params: DeleteTagFromRoomTask.Params) {
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = roomAPI.deleteTag(
+        executeRequest(globalErrorReceiver) {
+            roomAPI.deleteTag(
                     userId = userId,
                     roomId = params.roomId,
                     tag = params.tag
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
index 76c4b3812c..96646b42ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
@@ -48,8 +48,8 @@ internal class DefaultFetchTokenAndPaginateTask @Inject constructor(
 
     override suspend fun execute(params: FetchTokenAndPaginateTask.Params): TokenChunkEventPersistor.Result {
         val filter = filterRepository.getRoomFilter()
-        val response = executeRequest<EventContextResponse>(globalErrorReceiver) {
-            apiCall = roomAPI.getContextOfEvent(params.roomId, params.lastKnownEventId, 0, filter)
+        val response = executeRequest(globalErrorReceiver) {
+            roomAPI.getContextOfEvent(params.roomId, params.lastKnownEventId, 0, filter)
         }
         val fromToken = if (params.direction == PaginationDirection.FORWARDS) {
             response.end
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetContextOfEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetContextOfEventTask.kt
index d02a7bafe9..015e55f070 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetContextOfEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetContextOfEventTask.kt
@@ -40,9 +40,9 @@ internal class DefaultGetContextOfEventTask @Inject constructor(
 
     override suspend fun execute(params: GetContextOfEventTask.Params): TokenChunkEventPersistor.Result {
         val filter = filterRepository.getRoomFilter()
-        val response = executeRequest<EventContextResponse>(globalErrorReceiver) {
+        val response = executeRequest(globalErrorReceiver) {
             // We are limiting the response to the event with eventId to be sure we don't have any issue with potential merging process.
-            apiCall = roomAPI.getContextOfEvent(params.roomId, params.eventId, 0, filter)
+            roomAPI.getContextOfEvent(params.roomId, params.eventId, 0, filter)
         }
         return tokenChunkEventPersistor.insertInDb(response, params.roomId, PaginationDirection.FORWARDS)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
index b8585b1e74..a9b8683a28 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
@@ -37,7 +37,7 @@ internal class GetEventTask @Inject constructor(
 
     override suspend fun execute(params: Params): Event {
         return executeRequest(globalErrorReceiver) {
-            apiCall = roomAPI.getEvent(params.roomId, params.eventId)
+            roomAPI.getEvent(params.roomId, params.eventId)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
index 1f99893e17..b1ce5c1f26 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
@@ -42,10 +42,10 @@ internal class DefaultPaginationTask @Inject constructor(
 
     override suspend fun execute(params: PaginationTask.Params): TokenChunkEventPersistor.Result {
         val filter = filterRepository.getRoomFilter()
-        val chunk = executeRequest<PaginationResponse>(globalErrorReceiver) {
-            isRetryable = true
-            apiCall = roomAPI.getRoomMessagesFrom(params.roomId, params.from, params.direction.value, params.limit, filter)
-        }
+        val chunk = executeRequest(globalErrorReceiver,
+                { roomAPI.getRoomMessagesFrom(params.roomId, params.from, params.direction.value, params.limit, filter) },
+                { isRetryable = true }
+        )
         return tokenChunkEventPersistor.insertInDb(chunk, params.roomId, params.direction)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
index 3b56d04872..0b0df74311 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
@@ -44,8 +44,8 @@ internal class DefaultSendTypingTask @Inject constructor(
     override suspend fun execute(params: SendTypingTask.Params) {
         delay(params.delay ?: -1)
 
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = roomAPI.sendTypingState(
+        executeRequest(globalErrorReceiver) {
+            roomAPI.sendTypingState(
                     params.roomId,
                     userId,
                     TypingBody(params.isTyping, params.typingTimeoutMillis?.takeIf { params.isTyping })
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
index b3e4a5aa05..028c3e9193 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
@@ -37,7 +37,6 @@ import org.matrix.android.sdk.internal.session.filter.FilterFactory
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
-import org.matrix.android.sdk.internal.session.room.timeline.PaginationResponse
 import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
@@ -86,8 +85,8 @@ internal class DefaultGetUploadsTask @Inject constructor(
             val since = params.since ?: tokenStore.getLastToken() ?: throw IllegalStateException("No token available")
 
             val filter = FilterFactory.createUploadsFilter(params.numberOfEvents).toJSONString()
-            val chunk = executeRequest<PaginationResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.getRoomMessagesFrom(params.roomId, since, PaginationDirection.BACKWARDS.value, params.numberOfEvents, filter)
+            val chunk = executeRequest(globalErrorReceiver) {
+                roomAPI.getRoomMessagesFrom(params.roomId, since, PaginationDirection.BACKWARDS.value, params.numberOfEvents, filter)
             }
 
             result = GetUploadsResult(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
index 4a74b0a023..b5099e7238 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.search
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
 import org.matrix.android.sdk.internal.session.search.response.SearchResponse
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
 import retrofit2.http.Query
@@ -31,6 +30,6 @@ internal interface SearchAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-search
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "search")
-    fun search(@Query("next_batch") nextBatch: String?,
-               @Body body: SearchRequestBody): Call<SearchResponse>
+    suspend fun search(@Query("next_batch") nextBatch: String?,
+                       @Body body: SearchRequestBody): SearchResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 402602e4d5..8de762ee1b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -51,25 +51,25 @@ internal class DefaultSearchTask @Inject constructor(
 ) : SearchTask {
 
     override suspend fun execute(params: SearchTask.Params): SearchResult {
-        return executeRequest<SearchResponse>(globalErrorReceiver) {
-            val searchRequestBody = SearchRequestBody(
-                    searchCategories = SearchRequestCategories(
-                            roomEvents = SearchRequestRoomEvents(
-                                    searchTerm = params.searchTerm,
-                                    orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT else SearchRequestOrder.RANK,
-                                    filter = SearchRequestFilter(
-                                            limit = params.limit,
-                                            rooms = listOf(params.roomId)
-                                    ),
-                                    eventContext = SearchRequestEventContext(
-                                            beforeLimit = params.beforeLimit,
-                                            afterLimit = params.afterLimit,
-                                            includeProfile = params.includeProfile
-                                    )
-                            )
-                    )
-            )
-            apiCall = searchAPI.search(params.nextBatch, searchRequestBody)
+        val searchRequestBody = SearchRequestBody(
+                searchCategories = SearchRequestCategories(
+                        roomEvents = SearchRequestRoomEvents(
+                                searchTerm = params.searchTerm,
+                                orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT else SearchRequestOrder.RANK,
+                                filter = SearchRequestFilter(
+                                        limit = params.limit,
+                                        rooms = listOf(params.roomId)
+                                ),
+                                eventContext = SearchRequestEventContext(
+                                        beforeLimit = params.beforeLimit,
+                                        afterLimit = params.afterLimit,
+                                        includeProfile = params.includeProfile
+                                )
+                        )
+                )
+        )
+        return executeRequest(globalErrorReceiver) {
+            searchAPI.search(params.nextBatch, searchRequestBody)
         }.toDomain()
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
index 2c3cd5d270..563e85aefc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.session.signout
 
-import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.internal.auth.SessionParamsStore
 import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
@@ -39,8 +38,8 @@ internal class DefaultSignInAgainTask @Inject constructor(
 ) : SignInAgainTask {
 
     override suspend fun execute(params: SignInAgainTask.Params) {
-        val newCredentials = executeRequest<Credentials>(globalErrorReceiver) {
-            apiCall = signOutAPI.loginAgain(
+        val newCredentials = executeRequest(globalErrorReceiver) {
+            signOutAPI.loginAgain(
                     PasswordLoginParams.userIdentifier(
                             // Reuse the same userId
                             sessionParams.userId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
index 4c92938b77..a56362e587 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.signout
 import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.Headers
 import retrofit2.http.POST
@@ -35,11 +34,11 @@ internal interface SignOutAPI {
      */
     @Headers("CONNECT_TIMEOUT:60000", "READ_TIMEOUT:60000", "WRITE_TIMEOUT:60000")
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "login")
-    fun loginAgain(@Body loginParams: PasswordLoginParams): Call<Credentials>
+    suspend fun loginAgain(@Body loginParams: PasswordLoginParams): Credentials
 
     /**
      * Invalidate the access token, so that it can no longer be used for authorization.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "logout")
-    fun signOut(): Call<Unit>
+    suspend fun signOut()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
index 0cb8704782..9c25eccb3a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
@@ -45,8 +45,8 @@ internal class DefaultSignOutTask @Inject constructor(
         if (params.signOutFromHomeserver) {
             Timber.d("SignOut: send request...")
             try {
-                executeRequest<Unit>(globalErrorReceiver) {
-                    apiCall = signOutAPI.signOut()
+                executeRequest(globalErrorReceiver) {
+                    signOutAPI.signOut()
                 }
             } catch (throwable: Throwable) {
                 // Maybe due to https://github.com/matrix-org/synapse/issues/5756
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
index 8e3523bc57..2616803463 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
@@ -31,11 +31,11 @@ internal interface SyncAPI {
      * Set all the timeouts to 1 minute by default
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "sync")
-    fun sync(@QueryMap params: Map<String, String>,
-             @Header(TimeOutInterceptor.CONNECT_TIMEOUT) connectTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
-             @Header(TimeOutInterceptor.READ_TIMEOUT) readTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
-             @Header(TimeOutInterceptor.WRITE_TIMEOUT) writeTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT
-    ): Call<SyncResponse>
+    suspend fun sync(@QueryMap params: Map<String, String>,
+                     @Header(TimeOutInterceptor.CONNECT_TIMEOUT) connectTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
+                     @Header(TimeOutInterceptor.READ_TIMEOUT) readTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT,
+                     @Header(TimeOutInterceptor.WRITE_TIMEOUT) writeTimeOut: Long = TimeOutInterceptor.DEFAULT_LONG_TIMEOUT
+    ): SyncResponse
 
     /**
      * Set all the timeouts to 1 minute by default
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 8d8d69be1e..83a2ffc446 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -29,7 +29,6 @@ import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilit
 import org.matrix.android.sdk.internal.session.initsync.DefaultInitialSyncProgressService
 import org.matrix.android.sdk.internal.session.initsync.reportSubtask
 import org.matrix.android.sdk.internal.session.sync.model.LazyRoomSyncEphemeral
-import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.session.sync.parsing.InitialSyncResponseParser
 import org.matrix.android.sdk.internal.session.user.UserStore
 import org.matrix.android.sdk.internal.task.Task
@@ -115,8 +114,8 @@ internal class DefaultSyncTask @Inject constructor(
                     workingDir.deleteRecursively()
                 } else {
                     val syncResponse = logDuration("INIT_SYNC Request") {
-                        executeRequest<SyncResponse>(globalErrorReceiver) {
-                            apiCall = syncAPI.sync(
+                        executeRequest(globalErrorReceiver) {
+                            syncAPI.sync(
                                     params = requestParams,
                                     readTimeOut = readTimeOut
                             )
@@ -130,8 +129,8 @@ internal class DefaultSyncTask @Inject constructor(
             }
             initialSyncProgressService.endAll()
         } else {
-            val syncResponse = executeRequest<SyncResponse>(globalErrorReceiver) {
-                apiCall = syncAPI.sync(
+            val syncResponse = executeRequest(globalErrorReceiver) {
+                syncAPI.sync(
                         params = requestParams,
                         readTimeOut = readTimeOut
                 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
index 41914cc799..73545205d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
@@ -24,7 +24,6 @@ import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.network.RetrofitFactory
-import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.identity.IdentityAuthAPI
 import org.matrix.android.sdk.internal.session.identity.IdentityRegisterTask
 import org.matrix.android.sdk.internal.session.openid.GetOpenIdTokenTask
@@ -35,6 +34,7 @@ import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccoun
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.internal.util.ensureTrailingSlash
 import okhttp3.OkHttpClient
+import org.matrix.android.sdk.internal.network.executeRequest
 import javax.inject.Inject
 
 internal class DefaultTermsService @Inject constructor(
@@ -50,10 +50,10 @@ internal class DefaultTermsService @Inject constructor(
 ) : TermsService {
     override suspend fun getTerms(serviceType: TermsService.ServiceType,
                                  baseUrl: String): GetTermsResponse {
-        return withContext(coroutineDispatchers.main) {
+        return withContext(coroutineDispatchers.io) {
             val url = buildUrl(baseUrl, serviceType)
-            val termsResponse = executeRequest<TermsResponse>(null) {
-                apiCall = termsAPI.getTerms("${url}terms")
+            val termsResponse = executeRequest(null) {
+                termsAPI.getTerms("${url}terms")
             }
             GetTermsResponse(termsResponse, getAlreadyAcceptedTermUrlsFromAccountData())
         }
@@ -63,12 +63,12 @@ internal class DefaultTermsService @Inject constructor(
                                       baseUrl: String,
                                       agreedUrls: List<String>,
                                       token: String?) {
-        withContext(coroutineDispatchers.main) {
+        withContext(coroutineDispatchers.io) {
             val url = buildUrl(baseUrl, serviceType)
             val tokenToUse = token?.takeIf { it.isNotEmpty() } ?: getToken(baseUrl)
 
-            executeRequest<Unit>(null) {
-                apiCall = termsAPI.agreeToTerms("${url}terms", AcceptTermsBody(agreedUrls), "Bearer $tokenToUse")
+            executeRequest(null) {
+                termsAPI.agreeToTerms("${url}terms", AcceptTermsBody(agreedUrls), "Bearer $tokenToUse")
             }
 
             // client SHOULD update this account data section adding any the URLs
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
index 4c97f462eb..91d27030de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.terms
 
 import org.matrix.android.sdk.internal.network.HttpHeaders
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
@@ -29,13 +28,13 @@ internal interface TermsAPI {
      * This request does not require authentication
      */
     @GET
-    fun getTerms(@Url url: String): Call<TermsResponse>
+    suspend fun getTerms(@Url url: String): TermsResponse
 
     /**
      * This request requires authentication
      */
     @POST
-    fun agreeToTerms(@Url url: String,
-                     @Body params: AcceptTermsBody,
-                     @Header(HttpHeaders.Authorization) token: String): Call<Unit>
+    suspend fun agreeToTerms(@Url url: String,
+                             @Body params: AcceptTermsBody,
+                             @Header(HttpHeaders.Authorization) token: String)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/GetThirdPartyProtocolsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/GetThirdPartyProtocolsTask.kt
index fd1ed741e9..026e17b513 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/GetThirdPartyProtocolsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/GetThirdPartyProtocolsTask.kt
@@ -31,7 +31,7 @@ internal class DefaultGetThirdPartyProtocolsTask @Inject constructor(
 
     override suspend fun execute(params: Unit): Map<String, ThirdPartyProtocol> {
         return executeRequest(globalErrorReceiver) {
-            apiCall = thirdPartyAPI.thirdPartyProtocols()
+            thirdPartyAPI.thirdPartyProtocols()
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/GetThirdPartyUserTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/GetThirdPartyUserTask.kt
index 01a8b57678..f541dcb814 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/GetThirdPartyUserTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/GetThirdPartyUserTask.kt
@@ -37,7 +37,7 @@ internal class DefaultGetThirdPartyUserTask @Inject constructor(
 
     override suspend fun execute(params: GetThirdPartyUserTask.Params): List<ThirdPartyUser> {
         return executeRequest(globalErrorReceiver) {
-            apiCall = thirdPartyAPI.getThirdPartyUser(params.protocol, params.fields)
+            thirdPartyAPI.getThirdPartyUser(params.protocol, params.fields)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/ThirdPartyAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/ThirdPartyAPI.kt
index 0c60a27341..2e03bc7a86 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/ThirdPartyAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/thirdparty/ThirdPartyAPI.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.thirdparty
 import org.matrix.android.sdk.api.session.room.model.thirdparty.ThirdPartyProtocol
 import org.matrix.android.sdk.api.session.thirdparty.model.ThirdPartyUser
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.QueryMap
@@ -32,7 +31,7 @@ internal interface ThirdPartyAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1.html#get-matrix-client-r0-thirdparty-protocols
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "thirdparty/protocols")
-    fun thirdPartyProtocols(): Call<Map<String, ThirdPartyProtocol>>
+    suspend fun thirdPartyProtocols(): Map<String, ThirdPartyProtocol>
 
     /**
      * Retrieve a Matrix User ID linked to a user on the third party service, given a set of user parameters.
@@ -40,5 +39,6 @@ internal interface ThirdPartyAPI {
      * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-thirdparty-user-protocol
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "thirdparty/protocols/user/{protocol}")
-    fun getThirdPartyUser(@Path("protocol") protocol: String, @QueryMap params: Map<String, String>?): Call<List<ThirdPartyUser>>
+    suspend fun getThirdPartyUser(@Path("protocol") protocol: String,
+                                  @QueryMap params: Map<String, String>?): List<ThirdPartyUser>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
index c5c546bbed..e03d406639 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.user
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.session.user.model.SearchUsersParams
 import org.matrix.android.sdk.internal.session.user.model.SearchUsersResponse
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
 
@@ -31,5 +30,5 @@ internal interface SearchUserAPI {
      * @param searchUsersParams the search params.
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user_directory/search")
-    fun searchUsers(@Body searchUsersParams: SearchUsersParams): Call<SearchUsersResponse>
+    suspend fun searchUsers(@Body searchUsersParams: SearchUsersParams): SearchUsersResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
index 3de484fab3..cc5625b255 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.user.accountdata
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.PUT
 import retrofit2.http.Path
@@ -32,7 +31,7 @@ interface AccountDataAPI {
      * @param params the put params
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "user/{userId}/account_data/{type}")
-    fun setAccountData(@Path("userId") userId: String,
-                       @Path("type") type: String,
-                       @Body params: Any): Call<Unit>
+    suspend fun setAccountData(@Path("userId") userId: String,
+                               @Path("type") type: String,
+                               @Body params: Any)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
index 26e8d3380a..445b78104c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
@@ -63,8 +63,8 @@ internal class DefaultUpdateIgnoredUserIdsTask @Inject constructor(
         val list = ignoredUserIds.toList()
         val body = IgnoredUsersContent.createWithUserIds(list)
 
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = accountDataApi.setAccountData(userId, UserAccountDataTypes.TYPE_IGNORED_USER_LIST, body)
+        executeRequest(globalErrorReceiver) {
+            accountDataApi.setAccountData(userId, UserAccountDataTypes.TYPE_IGNORED_USER_LIST, body)
         }
 
         // Update the DB right now (do not wait for the sync to come back with updated data, for a faster UI update)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
index dba28253a7..1a588d2245 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
@@ -105,7 +105,7 @@ internal class DefaultUpdateUserAccountDataTask @Inject constructor(
 
     override suspend fun execute(params: UpdateUserAccountDataTask.Params) {
         return executeRequest(globalErrorReceiver) {
-            apiCall = accountDataApi.setAccountData(userId, params.type, params.getData())
+            accountDataApi.setAccountData(userId, params.type, params.getData())
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
index 380fa6e209..5a8779f40f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
@@ -38,8 +38,8 @@ internal class DefaultSearchUserTask @Inject constructor(
 ) : SearchUserTask {
 
     override suspend fun execute(params: SearchUserTask.Params): List<User> {
-        val response = executeRequest<SearchUsersResponse>(globalErrorReceiver) {
-            apiCall = searchUserAPI.searchUsers(SearchUsersParams(params.search, params.limit))
+        val response = executeRequest(globalErrorReceiver) {
+            searchUserAPI.searchUsers(SearchUsersParams(params.search, params.limit))
         }
         return response.users.map {
             User(it.userId, it.displayName, it.avatarUrl)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
index ae807ce30f..18a043be45 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
@@ -46,8 +46,8 @@ internal class DefaultCreateWidgetTask @Inject constructor(@SessionDatabase priv
                                                            private val globalErrorReceiver: GlobalErrorReceiver) : CreateWidgetTask {
 
     override suspend fun execute(params: CreateWidgetTask.Params) {
-        executeRequest<Unit>(globalErrorReceiver) {
-            apiCall = roomAPI.sendStateEvent(
+        executeRequest(globalErrorReceiver) {
+            roomAPI.sendStateEvent(
                     roomId = params.roomId,
                     stateEventType = EventType.STATE_ROOM_WIDGET_LEGACY,
                     stateKey = params.widgetId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
index 1fece8b580..6652628026 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
@@ -16,7 +16,6 @@
 package org.matrix.android.sdk.internal.session.widgets
 
 import org.matrix.android.sdk.internal.session.openid.RequestOpenIdTokenResponse
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -30,10 +29,10 @@ internal interface WidgetsAPI {
      * @param body the body content (Ref: https://github.com/matrix-org/matrix-doc/pull/1961)
      */
     @POST("register")
-    fun register(@Body body: RequestOpenIdTokenResponse,
-                 @Query("v") version: String?): Call<RegisterWidgetResponse>
+    suspend fun register(@Body body: RequestOpenIdTokenResponse,
+                         @Query("v") version: String?): RegisterWidgetResponse
 
     @GET("account")
-    fun validateToken(@Query("scalar_token") scalarToken: String?,
-                      @Query("v") version: String?): Call<Unit>
+    suspend fun validateToken(@Query("scalar_token") scalarToken: String?,
+                              @Query("v") version: String?)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
index 6db79da35f..78a40d1977 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
@@ -20,7 +20,6 @@ import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.openid.GetOpenIdTokenTask
-import org.matrix.android.sdk.internal.session.widgets.RegisterWidgetResponse
 import org.matrix.android.sdk.api.session.widgets.WidgetManagementFailure
 import org.matrix.android.sdk.internal.session.widgets.WidgetsAPI
 import org.matrix.android.sdk.internal.session.widgets.WidgetsAPIProvider
@@ -59,8 +58,8 @@ internal class DefaultGetScalarTokenTask @Inject constructor(private val widgets
 
     private suspend fun getNewScalarToken(widgetsAPI: WidgetsAPI, serverUrl: String): String {
         val openId = getOpenIdTokenTask.execute(Unit)
-        val registerWidgetResponse = executeRequest<RegisterWidgetResponse>(null) {
-            apiCall = widgetsAPI.register(openId, WIDGET_API_VERSION)
+        val registerWidgetResponse = executeRequest(null) {
+            widgetsAPI.register(openId, WIDGET_API_VERSION)
         }
         if (registerWidgetResponse.scalarToken == null) {
             // Should not happen
@@ -72,8 +71,8 @@ internal class DefaultGetScalarTokenTask @Inject constructor(private val widgets
 
     private suspend fun validateToken(widgetsAPI: WidgetsAPI, serverUrl: String, scalarToken: String): String {
         return try {
-            executeRequest<Unit>(null) {
-                apiCall = widgetsAPI.validateToken(scalarToken, WIDGET_API_VERSION)
+            executeRequest(null) {
+                widgetsAPI.validateToken(scalarToken, WIDGET_API_VERSION)
             }
             scalarToken
         } catch (failure: Throwable) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
index 3f0e27f410..7a9beac8c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
@@ -89,8 +89,8 @@ internal class DefaultGetWellknownTask @Inject constructor(
                 .create(WellKnownAPI::class.java)
 
         return try {
-            val wellKnown = executeRequest<WellKnown>(null) {
-                apiCall = wellKnownAPI.getWellKnown(domain)
+            val wellKnown = executeRequest(null) {
+                wellKnownAPI.getWellKnown(domain)
             }
 
             // Success
@@ -140,8 +140,8 @@ internal class DefaultGetWellknownTask @Inject constructor(
                 .create(CapabilitiesAPI::class.java)
 
         try {
-            executeRequest<Unit>(null) {
-                apiCall = capabilitiesAPI.ping()
+            executeRequest(null) {
+                capabilitiesAPI.ping()
             }
         } catch (throwable: Throwable) {
             return WellknownResult.FailError
@@ -178,8 +178,8 @@ internal class DefaultGetWellknownTask @Inject constructor(
                 .create(IdentityAuthAPI::class.java)
 
         return try {
-            executeRequest<Unit>(null) {
-                apiCall = identityPingApi.ping()
+            executeRequest(null) {
+                identityPingApi.ping()
             }
 
             true
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
index 981d013f49..428f7f65c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
@@ -16,11 +16,10 @@
 package org.matrix.android.sdk.internal.wellknown
 
 import org.matrix.android.sdk.api.auth.data.WellKnown
-import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
 
 internal interface WellKnownAPI {
     @GET("https://{domain}/.well-known/matrix/client")
-    fun getWellKnown(@Path("domain") domain: String): Call<WellKnown>
+    suspend fun getWellKnown(@Path("domain") domain: String): WellKnown
 }

From cf868f885f1225b54d8c7f5ec1997fc59b0807fe Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 10:26:37 +0200
Subject: [PATCH 471/578] Room summary paged initial commit

---
 .../android/sdk/api/query/QueryStringValue.kt |   1 +
 .../sdk/api/query/RoomTagQueryFilter.kt       |  23 ++
 .../sdk/api/session/room/RoomService.kt       |   8 +
 .../session/room/RoomSummaryQueryParams.kt    |  17 +-
 .../summary/RoomAggregateNotificationCount.kt |  26 ++
 .../database/RealmSessionStoreMigration.kt    |  47 +++-
 .../SessionRealmConfigurationFactory.kt       |   1 +
 .../database/mapper/RoomSummaryMapper.kt      |   2 +-
 .../database/model/RoomSummaryEntity.kt       | 230 +++++++++++++---
 .../session/room/DefaultRoomService.kt        |  19 ++
 .../room/summary/RoomSummaryDataSource.kt     |  96 ++++++-
 .../room/summary/RoomSummaryUpdater.kt        |  10 +-
 .../internal/session/sync/RoomTagHandler.kt   |  10 +-
 .../java/im/vector/app/AppStateHandler.kt     |   2 +-
 .../app/core/platform/VectorBaseFragment.kt   |   6 +
 .../features/home/room/list/RoomListAction.kt |   2 +-
 .../room/list/RoomListFooterController.kt     |  54 ++++
 .../home/room/list/RoomListFragment.kt        | 249 +++++++++++-------
 .../home/room/list/RoomListListener.kt        |  27 ++
 .../home/room/list/RoomListViewModel.kt       | 224 ++++++++++------
 .../room/list/RoomListViewModelFactory.kt     |   6 +-
 .../home/room/list/RoomListViewState.kt       |  47 +---
 .../home/room/list/RoomSummaryController.kt   | 170 ------------
 .../home/room/list/RoomSummaryItemFactory.kt  |   4 +-
 .../room/list/RoomSummaryPagedController.kt   |  71 +++++
 .../home/room/list/SectionHeaderAdapter.kt    | 100 +++++++
 26 files changed, 1007 insertions(+), 445 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomTagQueryFilter.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomListListener.kt
 delete mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
index 8f83beface..99a86e185b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
@@ -33,3 +33,4 @@ sealed class QueryStringValue {
         INSENSITIVE
     }
 }
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomTagQueryFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomTagQueryFilter.kt
new file mode 100644
index 0000000000..613916bc18
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomTagQueryFilter.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.query
+
+data class RoomTagQueryFilter(
+        val isFavorite: Boolean?,
+        val isLowPriority: Boolean?,
+        val isServerNotice: Boolean?
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 5f02b77a1e..4814805dd8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
+import androidx.paging.PagedList
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
@@ -26,7 +27,9 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 
 /**
  * This interface defines methods to get rooms. It's implemented at the session level.
@@ -178,4 +181,9 @@ interface RoomService {
      * This call will try to gather some information on this room, but it could fail and get nothing more
      */
     fun peekRoom(roomIdOrAlias: String, callback: MatrixCallback<PeekResult>)
+
+    fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams): LiveData<PagedList<RoomSummary>>
+
+    fun getNotificationCountForRooms(queryParams: RoomSummaryQueryParams): RoomAggregateNotificationCount
+    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams): UpdatableFilterLivePageResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index f859d74a6f..a57514023b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -17,12 +17,19 @@
 package org.matrix.android.sdk.api.session.room
 
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.room.model.Membership
 
 fun roomSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {}): RoomSummaryQueryParams {
     return RoomSummaryQueryParams.Builder().apply(init).build()
 }
 
+enum class RoomCategoryFilter {
+    ONLY_DM,
+    ONLY_ROOMS,
+    ALL
+}
+
 /**
  * This class can be used to filter room summaries to use with:
  * [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
@@ -31,7 +38,9 @@ data class RoomSummaryQueryParams(
         val roomId: QueryStringValue,
         val displayName: QueryStringValue,
         val canonicalAlias: QueryStringValue,
-        val memberships: List<Membership>
+        val memberships: List<Membership>,
+        val roomCategoryFilter: RoomCategoryFilter?,
+        val roomTagQueryFilter: RoomTagQueryFilter?
 ) {
 
     class Builder {
@@ -40,12 +49,16 @@ data class RoomSummaryQueryParams(
         var displayName: QueryStringValue = QueryStringValue.IsNotEmpty
         var canonicalAlias: QueryStringValue = QueryStringValue.NoCondition
         var memberships: List<Membership> = Membership.all()
+        var roomCategoryFilter: RoomCategoryFilter? = RoomCategoryFilter.ALL
+        var roomTagQueryFilter: RoomTagQueryFilter? = null
 
         fun build() = RoomSummaryQueryParams(
                 roomId = roomId,
                 displayName = displayName,
                 canonicalAlias = canonicalAlias,
-                memberships = memberships
+                memberships = memberships,
+                roomCategoryFilter = roomCategoryFilter,
+                roomTagQueryFilter = roomTagQueryFilter
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
new file mode 100644
index 0000000000..2aa122c84e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.summary
+
+data class RoomAggregateNotificationCount(
+        val notificationCount: Int,
+        val highlightCount: Int
+) {
+    fun totalCount()   = notificationCount + highlightCount
+
+    fun isHighlight() = highlightCount > 0
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index c7fe7ab447..1daae906f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -17,22 +17,27 @@
 package org.matrix.android.sdk.internal.database
 
 import io.realm.DynamicRealm
+import io.realm.FieldAttribute
 import io.realm.RealmMigration
+import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.EditionOfEventFields
+import org.matrix.android.sdk.internal.database.model.EventEntityFields
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntityFields
 import org.matrix.android.sdk.internal.database.model.PendingThreePidEntityFields
 import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import timber.log.Timber
 import javax.inject.Inject
 
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 8L
+        const val SESSION_STORE_SCHEMA_VERSION = 9L
     }
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -46,6 +51,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 5) migrateTo6(realm)
         if (oldVersion <= 6) migrateTo7(realm)
         if (oldVersion <= 7) migrateTo8(realm)
+        if (oldVersion <= 8) migrateTo9(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -149,4 +155,43 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.removeField("sourceLocalEchoEvents")
                 ?.addRealmListField(EditAggregatedSummaryEntityFields.EDITIONS.`$`, editionOfEventSchema)
     }
+
+    fun migrateTo9(realm: DynamicRealm) {
+        Timber.d("Step 8 -> 9")
+
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Long::class.java, FieldAttribute.INDEXED)
+                ?.setNullable(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, true)
+                ?.addIndex(RoomSummaryEntityFields.MEMBERSHIP_STR)
+                ?.addIndex(RoomSummaryEntityFields.IS_DIRECT)
+                ?.addIndex(RoomSummaryEntityFields.VERSIONING_STATE_STR)
+
+                ?.addField(RoomSummaryEntityFields.IS_FAVOURITE, Boolean::class.java)
+                ?.addIndex(RoomSummaryEntityFields.IS_FAVOURITE)
+                ?.addField(RoomSummaryEntityFields.IS_LOW_PRIORITY, Boolean::class.java)
+                ?.addIndex(RoomSummaryEntityFields.IS_LOW_PRIORITY)
+                ?.addField(RoomSummaryEntityFields.IS_SERVER_NOTICE, Boolean::class.java)
+                ?.addIndex(RoomSummaryEntityFields.IS_SERVER_NOTICE)
+
+                ?.transform { obj ->
+
+                    val isFavorite = obj.getList(RoomSummaryEntityFields.TAGS.`$`).any {
+                        it.getString(RoomTagEntityFields.TAG_NAME) == RoomTag.ROOM_TAG_FAVOURITE
+                    }
+                    obj.setBoolean(RoomSummaryEntityFields.IS_FAVOURITE, isFavorite)
+
+                    val isLowPriority = obj.getList(RoomSummaryEntityFields.TAGS.`$`).any {
+                        it.getString(RoomTagEntityFields.TAG_NAME) == RoomTag.ROOM_TAG_LOW_PRIORITY
+                    }
+
+                    obj.setBoolean(RoomSummaryEntityFields.IS_LOW_PRIORITY, isLowPriority)
+
+//                    XXX migrate last message origin server ts
+                    obj.getObject(RoomSummaryEntityFields.LATEST_PREVIEWABLE_EVENT.`$`)
+                            ?.getObject(TimelineEventEntityFields.ROOT.`$`)
+                            ?.getLong(EventEntityFields.ORIGIN_SERVER_TS)?.let {
+                                obj.setLong(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, it)
+                            }
+                }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 244fe3432a..770ef46080 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -72,6 +72,7 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
                 .allowWritesOnUiThread(true)
                 .modules(SessionRealmModule())
                 .schemaVersion(RealmSessionStoreMigration.SESSION_STORE_SCHEMA_VERSION)
+//                .deleteRealmIfMigrationNeeded()
                 .migration(migration)
                 .build()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 2e54a4cd52..6dc70b60fc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -26,7 +26,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                                                      private val typingUsersTracker: DefaultTypingUsersTracker) {
 
     fun map(roomSummaryEntity: RoomSummaryEntity): RoomSummary {
-        val tags = roomSummaryEntity.tags.map {
+        val tags = roomSummaryEntity.tags().map {
             RoomTag(it.tagName, it.tagOrder)
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 37696c9082..6007ae504a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -16,61 +16,221 @@
 
 package org.matrix.android.sdk.internal.database.model
 
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.Index
+import io.realm.annotations.PrimaryKey
 import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.VersioningState
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
+import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
+import timber.log.Timber
 
 internal open class RoomSummaryEntity(
-        @PrimaryKey var roomId: String = "",
-        var displayName: String? = "",
-        var avatarUrl: String? = "",
-        var name: String? = "",
-        var topic: String? = "",
-        var latestPreviewableEvent: TimelineEventEntity? = null,
-        var heroes: RealmList<String> = RealmList(),
-        var joinedMembersCount: Int? = 0,
-        var invitedMembersCount: Int? = 0,
-        var isDirect: Boolean = false,
-        var directUserId: String? = null,
-        var otherMemberIds: RealmList<String> = RealmList(),
-        var notificationCount: Int = 0,
-        var highlightCount: Int = 0,
-        var readMarkerId: String? = null,
-        var hasUnreadMessages: Boolean = false,
-        var tags: RealmList<RoomTagEntity> = RealmList(),
-        var userDrafts: UserDraftsEntity? = null,
-        var breadcrumbsIndex: Int = RoomSummary.NOT_IN_BREADCRUMBS,
-        var canonicalAlias: String? = null,
-        var aliases: RealmList<String> = RealmList(),
-        // this is required for querying
-        var flatAliases: String = "",
-        var isEncrypted: Boolean = false,
-        var encryptionEventTs: Long? = 0,
-        var roomEncryptionTrustLevelStr: String? = null,
-        var inviterId: String? = null,
-        var hasFailedSending: Boolean = false
+        @PrimaryKey var roomId: String = ""
 ) : RealmObject() {
 
+    var displayName: String? = ""
+        set(value) {
+            if (value != field) field = value
+        }
+    var avatarUrl: String? = ""
+        set(value) {
+            if (value != field) field = value
+        }
+    var name: String? = ""
+        set(value) {
+            if (value != field) field = value
+        }
+    var topic: String? = ""
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var latestPreviewableEvent: TimelineEventEntity? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
+    @Index
+    var lastActivityTime: Long? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var heroes: RealmList<String> = RealmList()
+
+    var joinedMembersCount: Int? = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var invitedMembersCount: Int? = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
+    @Index
+    var isDirect: Boolean = false
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var directUserId: String? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var otherMemberIds: RealmList<String> = RealmList()
+
+    var notificationCount: Int = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var highlightCount: Int = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var readMarkerId: String? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var hasUnreadMessages: Boolean = false
+        set(value) {
+            if (value != field) field = value
+        }
+
+    private var tags: RealmList<RoomTagEntity> = RealmList()
+
+    fun tags(): RealmList<RoomTagEntity> = tags
+
+    fun updateTags(newTags: List<Pair<String, Double?>>) {
+        val toDelete = mutableListOf<RoomTagEntity>()
+        tags.forEach { existingTag ->
+            val updatedTag = newTags.firstOrNull { it.first == existingTag.tagName }
+            if (updatedTag == null) {
+                toDelete.add(existingTag)
+            } else {
+                existingTag.tagOrder = updatedTag.second
+            }
+        }
+        toDelete.onEach { it.deleteFromRealm() }
+        newTags.forEach { newTag ->
+            if (tags.indexOfFirst { it.tagName == newTag.first } == -1) {
+                // we must add it
+                tags.add(
+                        RoomTagEntity(newTag.first, newTag.second)
+                )
+            }
+        }
+
+        isFavourite = newTags.indexOfFirst { it.first == RoomTag.ROOM_TAG_FAVOURITE } != -1
+        isLowPriority = newTags.indexOfFirst { it.first == RoomTag.ROOM_TAG_LOW_PRIORITY } != -1
+        isServerNotice = newTags.indexOfFirst { it.first == RoomTag.ROOM_TAG_SERVER_NOTICE } != -1
+    }
+
+    @Index
+    var isFavourite: Boolean = false
+        set(value) {
+            if (value != field) field = value
+        }
+
+    @Index
+    var isLowPriority: Boolean = false
+        set(value) {
+            if (value != field) field = value
+        }
+
+    @Index
+    var isServerNotice: Boolean = false
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var userDrafts: UserDraftsEntity? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var breadcrumbsIndex: Int = RoomSummary.NOT_IN_BREADCRUMBS
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var canonicalAlias: String? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var aliases: RealmList<String> = RealmList()
+
+    fun updateAliases(newAliases: List<String>) {
+        // only update underlying field if there is a diff
+        if (newAliases.toSet() != aliases.toSet()) {
+            Timber.w("VAL: aliases updated")
+            aliases.clear()
+            aliases.addAll(newAliases)
+        }
+    }
+
+    // this is required for querying
+    var flatAliases: String = ""
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var isEncrypted: Boolean = false
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var encryptionEventTs: Long? = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var roomEncryptionTrustLevelStr: String? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var inviterId: String? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var hasFailedSending: Boolean = false
+        set(value) {
+            if (value != field) field = value
+        }
+
+    @Index
     private var membershipStr: String = Membership.NONE.name
+
     var membership: Membership
         get() {
             return Membership.valueOf(membershipStr)
         }
         set(value) {
-            membershipStr = value.name
+            if (value.name != membershipStr) {
+                membershipStr = value.name
+            }
         }
 
+    @Index
     private var versioningStateStr: String = VersioningState.NONE.name
     var versioningState: VersioningState
         get() {
             return VersioningState.valueOf(versioningStateStr)
         }
         set(value) {
-            versioningStateStr = value.name
+            if (value.name != versioningStateStr) {
+                versioningStateStr = value.name
+            }
         }
 
     var roomEncryptionTrustLevel: RoomEncryptionTrustLevel?
@@ -84,7 +244,9 @@ internal open class RoomSummaryEntity(
             }
         }
         set(value) {
-            roomEncryptionTrustLevelStr = value?.name
+            if (value?.name != roomEncryptionTrustLevelStr) {
+                roomEncryptionTrustLevelStr = value?.name
+            }
         }
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 383dd876d3..5feb9c9d5a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.session.room
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
+import androidx.paging.PagedList
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -45,6 +46,7 @@ import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomT
 import org.matrix.android.sdk.internal.session.room.peeking.PeekRoomTask
 import org.matrix.android.sdk.internal.session.room.peeking.ResolveRoomStateTask
 import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateBreadcrumbsTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
@@ -96,6 +98,18 @@ internal class DefaultRoomService @Inject constructor(
         return roomSummaryDataSource.getRoomSummariesLive(queryParams)
     }
 
+    override fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams) : LiveData<PagedList<RoomSummary>> {
+        return roomSummaryDataSource.getSortedPagedRoomSummariesLive(queryParams)
+    }
+
+    override fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams) : UpdatableFilterLivePageResult {
+        return roomSummaryDataSource.getFilteredPagedRoomSummariesLive(queryParams)
+    }
+
+    override fun getNotificationCountForRooms(queryParams: RoomSummaryQueryParams): RoomAggregateNotificationCount {
+        return roomSummaryDataSource.getNotificationCountForRooms(queryParams)
+    }
+
     override fun getBreadcrumbs(queryParams: RoomSummaryQueryParams): List<RoomSummary> {
         return roomSummaryDataSource.getBreadcrumbs(queryParams)
     }
@@ -178,3 +192,8 @@ internal class DefaultRoomService @Inject constructor(
                 .executeBy(taskExecutor)
     }
 }
+
+interface UpdatableFilterLivePageResult {
+    val livePagedList: LiveData<PagedList<RoomSummary>>
+    fun updateQuery(queryParams: RoomSummaryQueryParams)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 107055b8c3..a806123237 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -18,10 +18,17 @@ package org.matrix.android.sdk.internal.session.room.summary
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
+import androidx.paging.LivePagedListBuilder
+import androidx.paging.PagedList
 import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
+import io.realm.RealmQuery
+import io.realm.Sort
+import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.VersioningState
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.RoomSummaryMapper
@@ -31,9 +38,8 @@ import org.matrix.android.sdk.internal.database.query.findByAlias
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.query.process
+import org.matrix.android.sdk.internal.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.internal.util.fetchCopyMap
-import io.realm.Realm
-import io.realm.RealmQuery
 import javax.inject.Inject
 
 internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
@@ -98,6 +104,71 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                 .sort(RoomSummaryEntityFields.BREADCRUMBS_INDEX)
     }
 
+    fun getSortedPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams): LiveData<PagedList<RoomSummary>> {
+        val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
+            roomSummariesQuery(realm, queryParams)
+                    .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+        }
+        val dataSourceFactory = realmDataSourceFactory.map {
+            roomSummaryMapper.map(it)
+        }
+        return monarchy.findAllPagedWithChanges(realmDataSourceFactory,
+                LivePagedListBuilder(dataSourceFactory,
+                        PagedList.Config.Builder()
+                                .setPageSize(10)
+                                .setInitialLoadSizeHint(20)
+                                .setEnablePlaceholders(false)
+                                .setPrefetchDistance(10)
+                                .build())
+        )
+    }
+
+    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams): UpdatableFilterLivePageResult {
+        val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
+            roomSummariesQuery(realm, queryParams)
+                    .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+        }
+        val dataSourceFactory = realmDataSourceFactory.map {
+            roomSummaryMapper.map(it)
+        }
+
+        val mapped = monarchy.findAllPagedWithChanges(realmDataSourceFactory,
+                LivePagedListBuilder(dataSourceFactory,
+                        PagedList.Config.Builder()
+                                .setPageSize(10)
+                                .setInitialLoadSizeHint(20)
+                                .setEnablePlaceholders(false)
+                                .setPrefetchDistance(10)
+                                .build())
+        )
+
+        return object : UpdatableFilterLivePageResult {
+            override val livePagedList: LiveData<PagedList<RoomSummary>>
+                get() = mapped
+
+            override fun updateQuery(queryParams: RoomSummaryQueryParams) {
+                realmDataSourceFactory.updateQuery {
+                    roomSummariesQuery(it, queryParams)
+                            .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                }
+            }
+        }
+    }
+
+    fun getNotificationCountForRooms(queryParams: RoomSummaryQueryParams): RoomAggregateNotificationCount {
+        var notificationCount: RoomAggregateNotificationCount? = null
+        monarchy.doWithRealm { realm ->
+            val roomSummariesQuery = roomSummariesQuery(realm, queryParams)
+            val notifCount = roomSummariesQuery.sum(RoomSummaryEntityFields.NOTIFICATION_COUNT).toInt()
+            val highlightCount = roomSummariesQuery.sum(RoomSummaryEntityFields.HIGHLIGHT_COUNT).toInt()
+            notificationCount = RoomAggregateNotificationCount(
+                    notifCount,
+                    highlightCount
+            )
+        }
+        return notificationCount!!
+    }
+
     private fun roomSummariesQuery(realm: Realm, queryParams: RoomSummaryQueryParams): RealmQuery<RoomSummaryEntity> {
         val query = RoomSummaryEntity.where(realm)
         query.process(RoomSummaryEntityFields.ROOM_ID, queryParams.roomId)
@@ -105,6 +176,27 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         query.process(RoomSummaryEntityFields.CANONICAL_ALIAS, queryParams.canonicalAlias)
         query.process(RoomSummaryEntityFields.MEMBERSHIP_STR, queryParams.memberships)
         query.notEqualTo(RoomSummaryEntityFields.VERSIONING_STATE_STR, VersioningState.UPGRADED_ROOM_JOINED.name)
+
+        queryParams.roomCategoryFilter?.let {
+            when (it) {
+                RoomCategoryFilter.ONLY_DM -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+                RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+                RoomCategoryFilter.ALL -> {
+                    // nop
+                }
+            }
+        }
+        queryParams.roomTagQueryFilter?.let {
+            it.isFavorite?.let { fav ->
+                query.equalTo(RoomSummaryEntityFields.IS_FAVOURITE, fav)
+            }
+            it.isLowPriority?.let { lp ->
+                query.equalTo(RoomSummaryEntityFields.IS_LOW_PRIORITY, lp)
+            }
+            it.isServerNotice?.let { lp ->
+                query.equalTo(RoomSummaryEntityFields.IS_SERVER_NOTICE, lp)
+            }
+        }
         return query
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index cd1bb69612..69e1332dab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -98,6 +98,11 @@ internal class RoomSummaryUpdater @Inject constructor(
 
         val latestPreviewableEvent = RoomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
 
+        val lastActivityFromEvent = latestPreviewableEvent?.root?.originServerTs
+        if (lastActivityFromEvent != null) {
+            roomSummaryEntity.lastActivityTime = lastActivityFromEvent
+        }
+
         roomSummaryEntity.hasUnreadMessages = roomSummaryEntity.notificationCount > 0
                 // avoid this call if we are sure there are unread events
                 || !isEventRead(realm.configuration, userId, roomId, latestPreviewableEvent?.eventId)
@@ -112,8 +117,9 @@ internal class RoomSummaryUpdater @Inject constructor(
 
         val roomAliases = ContentMapper.map(lastAliasesEvent?.content).toModel<RoomAliasesContent>()?.aliases
                 .orEmpty()
-        roomSummaryEntity.aliases.clear()
-        roomSummaryEntity.aliases.addAll(roomAliases)
+//        roomSummaryEntity.aliases.clear()
+//        roomSummaryEntity.aliases.addAll(roomAliases)
+        roomSummaryEntity.updateAliases(roomAliases)
         roomSummaryEntity.flatAliases = roomAliases.joinToString(separator = "|", prefix = "|")
         roomSummaryEntity.isEncrypted = encryptionEvent != null
         roomSummaryEntity.encryptionEventTs = encryptionEvent?.originServerTs
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
index f9ae41bc94..add5d841d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
@@ -19,8 +19,8 @@ package org.matrix.android.sdk.internal.session.sync
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTagContent
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomTagEntity
-import org.matrix.android.sdk.internal.database.query.where
 import io.realm.Realm
+import org.matrix.android.sdk.internal.database.query.getOrCreate
 import javax.inject.Inject
 
 internal class RoomTagHandler @Inject constructor() {
@@ -31,12 +31,8 @@ internal class RoomTagHandler @Inject constructor() {
         }
         val tags = content.tags.entries.map { (tagName, params) ->
             RoomTagEntity(tagName, params["order"] as? Double)
+            Pair(tagName, params["order"] as? Double)
         }
-        val roomSummaryEntity = RoomSummaryEntity.where(realm, roomId).findFirst()
-                ?: RoomSummaryEntity(roomId)
-
-        roomSummaryEntity.tags.clear()
-        roomSummaryEntity.tags.addAll(tags)
-        realm.insertOrUpdate(roomSummaryEntity)
+        RoomSummaryEntity.getOrCreate(realm, roomId).updateTags(tags)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 1e92f7bc67..d2b59e5513 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -52,7 +52,7 @@ class AppStateHandler @Inject constructor(
 
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun entersForeground() {
-        observeRoomsAndGroup()
+//        observeRoomsAndGroup()
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index f515060db6..e3a3b7b29c 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -127,6 +127,11 @@ abstract class VectorBaseFragment<VB: ViewBinding> : BaseMvRxFragment(), HasScre
         Timber.i("onResume Fragment ${javaClass.simpleName}")
     }
 
+    override fun onPause() {
+        super.onPause()
+        Timber.i("onPause Fragment ${javaClass.simpleName}")
+    }
+
     @CallSuper
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -150,6 +155,7 @@ abstract class VectorBaseFragment<VB: ViewBinding> : BaseMvRxFragment(), HasScre
     }
 
     override fun onDestroy() {
+        Timber.i("onDestroy Fragment ${javaClass.simpleName}")
         uiDisposables.dispose()
         super.onDestroy()
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
index 4a6c1c16fc..0d70f99b3a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
@@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.session.room.notification.RoomNotificationStat
 
 sealed class RoomListAction : VectorViewModelAction {
     data class SelectRoom(val roomSummary: RoomSummary) : RoomListAction()
-    data class ToggleCategory(val category: RoomCategory) : RoomListAction()
+    data class ToggleSection(val section: RoomListViewModel.RoomsSection) : RoomListAction()
     data class AcceptInvitation(val roomSummary: RoomSummary) : RoomListAction()
     data class RejectInvitation(val roomSummary: RoomSummary) : RoomListAction()
     data class FilterWith(val filter: String) : RoomListAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt
new file mode 100644
index 0000000000..d4e062d1e4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFooterController.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.epoxy.helpFooterItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.features.home.room.filtered.filteredRoomFooterItem
+import javax.inject.Inject
+
+class RoomListFooterController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val userPreferencesProvider: UserPreferencesProvider
+) : TypedEpoxyController<RoomListViewState>() {
+
+    var listener: RoomListListener? = null
+
+    override fun buildModels(data: RoomListViewState?) {
+        when (data?.displayMode) {
+            RoomListDisplayMode.FILTERED -> {
+                filteredRoomFooterItem {
+                    id("filter_footer")
+                    listener(listener)
+                    currentFilter(data.roomFilter)
+                }
+            }
+            else                         -> {
+                if (userPreferencesProvider.shouldShowLongClickOnRoomHelp()) {
+                    helpFooterItem {
+                        id("long_click_help")
+                        text(stringProvider.getString(R.string.help_long_click_on_room_for_more_options))
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 30cb360a9d..0e7e35654c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -27,12 +27,10 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.OnModelBuildFinishedListener
-import com.airbnb.mvrx.Fail
-import com.airbnb.mvrx.Incomplete
-import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -44,6 +42,7 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.databinding.FragmentRoomListBinding
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.home.room.list.actions.RoomListActionsArgs
@@ -53,8 +52,7 @@ import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedA
 import im.vector.app.features.home.room.list.widget.NotifsFabMenuView
 import im.vector.app.features.notifications.NotificationDrawerManager
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.failure.Failure
-import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
@@ -66,12 +64,13 @@ data class RoomListParams(
 ) : Parcelable
 
 class RoomListFragment @Inject constructor(
-        private val roomController: RoomSummaryController,
+        private val pagedControllerFactory: RoomSummaryPagedControllerFactory,
         val roomListViewModelFactory: RoomListViewModel.Factory,
         private val notificationDrawerManager: NotificationDrawerManager,
-        private val sharedViewPool: RecyclerView.RecycledViewPool
+        private val footerController: RoomListFooterController,
+        private val userPreferencesProvider: UserPreferencesProvider
 ) : VectorBaseFragment<FragmentRoomListBinding>(),
-        RoomSummaryController.Listener,
+        RoomListListener,
         OnBackPressed,
         NotifsFabMenuView.Listener {
 
@@ -87,6 +86,20 @@ class RoomListFragment @Inject constructor(
 
     private var hasUnreadRooms = false
 
+    data class SectionKey(
+            val name: String,
+            val isExpanded: Boolean
+    )
+
+    data class SectionAdapterInfo(
+            var section: SectionKey,
+            val headerHeaderAdapter: SectionHeaderAdapter,
+            val contentAdapter: RoomSummaryPagedController
+    )
+
+    private val adapterInfosList = mutableListOf<SectionAdapterInfo>()
+    private var concatAdapter: ConcatAdapter? = null
+
     override fun getMenuRes() = R.menu.room_list
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -112,10 +125,10 @@ class RoomListFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java)
         roomListViewModel.observeViewEvents {
             when (it) {
-                is RoomListViewEvents.Loading    -> showLoading(it.message)
-                is RoomListViewEvents.Failure    -> showFailure(it.throwable)
+                is RoomListViewEvents.Loading -> showLoading(it.message)
+                is RoomListViewEvents.Failure -> showFailure(it.throwable)
                 is RoomListViewEvents.SelectRoom -> handleSelectRoom(it)
-                is RoomListViewEvents.Done       -> Unit
+                is RoomListViewEvents.Done -> Unit
             }.exhaustive
         }
 
@@ -127,15 +140,49 @@ class RoomListFragment @Inject constructor(
                 .disposeOnDestroyView()
     }
 
+    private fun refreshCollapseStates() {
+        var contentInsertIndex = 1
+        roomListViewModel.sections.forEachIndexed { index, roomsSection ->
+            val actualBlock = adapterInfosList[index]
+            val isRoomSectionExpanded = roomsSection.isExpanded.value.orTrue()
+            if (actualBlock.section.isExpanded && !isRoomSectionExpanded) {
+                // we have to remove the content adapter
+                concatAdapter?.removeAdapter(actualBlock.contentAdapter.adapter)
+            } else if (!actualBlock.section.isExpanded && isRoomSectionExpanded) {
+                // we must add it back!
+                concatAdapter?.addAdapter(contentInsertIndex, actualBlock.contentAdapter.adapter)
+            }
+            contentInsertIndex = if (isRoomSectionExpanded) {
+                contentInsertIndex + 2
+            } else {
+                contentInsertIndex + 1
+            }
+            actualBlock.section = actualBlock.section.copy(
+                    isExpanded = isRoomSectionExpanded
+            )
+            actualBlock.headerHeaderAdapter.updateSection(
+                    actualBlock.headerHeaderAdapter.section.copy(isExpanded = isRoomSectionExpanded)
+            )
+        }
+    }
+
     override fun showFailure(throwable: Throwable) {
         showErrorInSnackbar(throwable)
     }
 
     override fun onDestroyView() {
-        roomController.removeModelBuildListener(modelBuildListener)
+        adapterInfosList.onEach { it.contentAdapter.removeModelBuildListener(modelBuildListener) }
+        adapterInfosList.clear()
+//        roomController.removeModelBuildListener(modelBuildListener)
         modelBuildListener = null
         views.roomListView.cleanup()
-        roomController.listener = null
+//        controllers.onEach {
+//            it.listener = null
+// //            concatAdapter.removeAdapter(it.adapter)
+//        }
+//        controllers.clear()
+//        roomController.listener = null
+//        favRoomController.listener = null
         stateRestorer.clear()
         views.createChatFabMenu.listener = null
         super.onDestroyView()
@@ -148,8 +195,8 @@ class RoomListFragment @Inject constructor(
     private fun setupCreateRoomButton() {
         when (roomListParams.displayMode) {
             RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.isVisible = true
-            RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.isVisible = true
-            RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.isVisible = true
+            RoomListDisplayMode.PEOPLE -> views.createChatRoomButton.isVisible = true
+            RoomListDisplayMode.ROOMS -> views.createGroupRoomButton.isVisible = true
             else                              -> Unit // No button in this mode
         }
 
@@ -204,21 +251,68 @@ class RoomListFragment @Inject constructor(
         stateRestorer = LayoutManagerStateRestorer(layoutManager).register()
         views.roomListView.layoutManager = layoutManager
         views.roomListView.itemAnimator = RoomListAnimator()
-        views.roomListView.setRecycledViewPool(sharedViewPool)
+//        views.roomListView.setRecycledViewPool(sharedViewPool)
         layoutManager.recycleChildrenOnDetach = true
-        roomController.listener = this
+
         modelBuildListener = OnModelBuildFinishedListener { it.dispatchTo(stateRestorer) }
-        roomController.addModelBuildListener(modelBuildListener)
-        views.roomListView.adapter = roomController.adapter
-        views.stateView.contentView = views.roomListView
+
+        val concatAdapter = ConcatAdapter()
+        val hasOnlyOneSection = roomListViewModel.sections.size == 1
+        roomListViewModel.sections.forEach { section ->
+
+            val sectionAdapter = SectionHeaderAdapter {
+                roomListViewModel.handle(RoomListAction.ToggleSection(section))
+            }.also {
+                it.updateSection(SectionHeaderAdapter.SectionViewModel(
+                        section.sectionName
+                ))
+            }
+
+            val contentAdapter = pagedControllerFactory.createRoomSummaryPagedController().also {
+                section.livePages.observe(viewLifecycleOwner) { pl ->
+                    it.submitList(pl)
+                    sectionAdapter.updateSection(sectionAdapter.section.copy(isHidden = pl.isEmpty() || hasOnlyOneSection))
+                    checkEmptyState()
+                }
+                section.notificationCount.observe(viewLifecycleOwner) { counts ->
+                    sectionAdapter.updateSection(sectionAdapter.section.copy(
+                            notificationCount = counts.totalCount(),
+                            isHighlighted = counts.isHighlight()
+                    ))
+                }
+                section.isExpanded.observe(viewLifecycleOwner) { _ ->
+                    refreshCollapseStates()
+                }
+                it.listener = this
+            }
+            adapterInfosList.add(
+                    SectionAdapterInfo(
+                            SectionKey(
+                                    name = section.sectionName,
+                                    isExpanded = section.isExpanded.value.orTrue()
+                            ),
+                            sectionAdapter,
+                            contentAdapter
+                    )
+            )
+            concatAdapter.addAdapter(sectionAdapter)
+            concatAdapter.addAdapter(contentAdapter.adapter)
+        }
+
+        // Add the footer controller
+        this.footerController.listener = this
+        concatAdapter.addAdapter(footerController.adapter)
+
+        this.concatAdapter = concatAdapter
+        views.roomListView.adapter = concatAdapter
     }
 
     private val showFabRunnable = Runnable {
         if (isAdded) {
             when (roomListParams.displayMode) {
                 RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.show()
-                RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.show()
-                RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.show()
+                RoomListDisplayMode.PEOPLE -> views.createChatRoomButton.show()
+                RoomListDisplayMode.ROOMS -> views.createGroupRoomButton.show()
                 else                              -> Unit
             }
         }
@@ -226,28 +320,28 @@ class RoomListFragment @Inject constructor(
 
     private fun handleQuickActions(quickAction: RoomListQuickActionsSharedAction) {
         when (quickAction) {
-            is RoomListQuickActionsSharedAction.NotificationsAllNoisy     -> {
+            is RoomListQuickActionsSharedAction.NotificationsAllNoisy -> {
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.ALL_MESSAGES_NOISY))
             }
-            is RoomListQuickActionsSharedAction.NotificationsAll          -> {
+            is RoomListQuickActionsSharedAction.NotificationsAll -> {
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.ALL_MESSAGES))
             }
             is RoomListQuickActionsSharedAction.NotificationsMentionsOnly -> {
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.MENTIONS_ONLY))
             }
-            is RoomListQuickActionsSharedAction.NotificationsMute         -> {
+            is RoomListQuickActionsSharedAction.NotificationsMute -> {
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.MUTE))
             }
-            is RoomListQuickActionsSharedAction.Settings                  -> {
+            is RoomListQuickActionsSharedAction.Settings -> {
                 navigator.openRoomProfile(requireActivity(), quickAction.roomId)
             }
-            is RoomListQuickActionsSharedAction.Favorite                  -> {
+            is RoomListQuickActionsSharedAction.Favorite -> {
                 roomListViewModel.handle(RoomListAction.ToggleTag(quickAction.roomId, RoomTag.ROOM_TAG_FAVOURITE))
             }
-            is RoomListQuickActionsSharedAction.LowPriority               -> {
+            is RoomListQuickActionsSharedAction.LowPriority -> {
                 roomListViewModel.handle(RoomListAction.ToggleTag(quickAction.roomId, RoomTag.ROOM_TAG_LOW_PRIORITY))
             }
-            is RoomListQuickActionsSharedAction.Leave                     -> {
+            is RoomListQuickActionsSharedAction.Leave -> {
                 promptLeaveRoom(quickAction.roomId)
             }
         }.exhaustive
@@ -278,12 +372,7 @@ class RoomListFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(roomListViewModel) { state ->
-        when (state.asyncFilteredRooms) {
-            is Incomplete -> renderLoading()
-            is Success    -> renderSuccess(state)
-            is Fail       -> renderFailure(state.asyncFilteredRooms.error)
-        }
-        roomController.update(state)
+        footerController.setData(state)
         // Mark all as read menu
         when (roomListParams.displayMode) {
             RoomListDisplayMode.NOTIFICATIONS,
@@ -299,68 +388,38 @@ class RoomListFragment @Inject constructor(
         }
     }
 
-    private fun renderSuccess(state: RoomListViewState) {
-        val allRooms = state.asyncRooms()
-        val filteredRooms = state.asyncFilteredRooms()
-        if (filteredRooms.isNullOrEmpty()) {
-            renderEmptyState(allRooms)
-        } else {
-            views.stateView.state = StateView.State.Content
-        }
-    }
-
-    private fun renderEmptyState(allRooms: List<RoomSummary>?) {
-        val hasNoRoom = allRooms
-                ?.filter {
-                    it.membership == Membership.JOIN || it.membership == Membership.INVITE
-                }
-                .isNullOrEmpty()
-        val emptyState = when (roomListParams.displayMode) {
-            RoomListDisplayMode.NOTIFICATIONS -> {
-                if (hasNoRoom) {
-                    StateView.State.Empty(
-                            title = getString(R.string.room_list_catchup_welcome_title),
-                            image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_home_bottom_catchup),
-                            message = getString(R.string.room_list_catchup_welcome_body)
-                    )
-                } else {
+    private fun checkEmptyState() {
+        val hasNoRoom = adapterInfosList.all { it.headerHeaderAdapter.section.isHidden }
+        if (hasNoRoom) {
+            val emptyState = when (roomListParams.displayMode) {
+                RoomListDisplayMode.NOTIFICATIONS -> {
                     StateView.State.Empty(
                             title = getString(R.string.room_list_catchup_empty_title),
                             image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_noun_party_popper),
                             message = getString(R.string.room_list_catchup_empty_body))
                 }
+                RoomListDisplayMode.PEOPLE ->
+                    StateView.State.Empty(
+                            title = getString(R.string.room_list_people_empty_title),
+                            image = ContextCompat.getDrawable(requireContext(), R.drawable.empty_state_dm),
+                            isBigImage = true,
+                            message = getString(R.string.room_list_people_empty_body)
+                    )
+                RoomListDisplayMode.ROOMS ->
+                    StateView.State.Empty(
+                            title = getString(R.string.room_list_rooms_empty_title),
+                            image = ContextCompat.getDrawable(requireContext(), R.drawable.empty_state_room),
+                            isBigImage = true,
+                            message = getString(R.string.room_list_rooms_empty_body)
+                    )
+                else                              ->
+                    // Always display the content in this mode, because if the footer
+                    StateView.State.Content
             }
-            RoomListDisplayMode.PEOPLE        ->
-                StateView.State.Empty(
-                        title = getString(R.string.room_list_people_empty_title),
-                        image = ContextCompat.getDrawable(requireContext(), R.drawable.empty_state_dm),
-                        isBigImage = true,
-                        message = getString(R.string.room_list_people_empty_body)
-                )
-            RoomListDisplayMode.ROOMS         ->
-                StateView.State.Empty(
-                        title = getString(R.string.room_list_rooms_empty_title),
-                        image = ContextCompat.getDrawable(requireContext(), R.drawable.empty_state_room),
-                        isBigImage = true,
-                        message = getString(R.string.room_list_rooms_empty_body)
-                )
-            else                              ->
-                // Always display the content in this mode, because if the footer
-                StateView.State.Content
+            views.stateView.state = emptyState
+        } else {
+            views.stateView.state = StateView.State.Content
         }
-        views.stateView.state = emptyState
-    }
-
-    private fun renderLoading() {
-        views.stateView.state = StateView.State.Loading
-    }
-
-    private fun renderFailure(error: Throwable) {
-        val message = when (error) {
-            is Failure.NetworkConnection -> getString(R.string.network_error_please_check_and_retry)
-            else                         -> getString(R.string.unknown_error)
-        }
-        views.stateView.state = StateView.State.Error(message)
     }
 
     override fun onBackPressed(toolbarButton: Boolean): Boolean {
@@ -377,7 +436,11 @@ class RoomListFragment @Inject constructor(
     }
 
     override fun onRoomLongClicked(room: RoomSummary): Boolean {
-        roomController.onRoomLongClicked()
+        userPreferencesProvider.neverShowLongClickOnRoomHelpAgain()
+        withState(roomListViewModel) {
+            // refresh footer
+            footerController.setData(it)
+        }
         RoomListQuickActionsBottomSheet
                 .newInstance(room.roomId, RoomListActionsArgs.Mode.FULL)
                 .show(childFragmentManager, "ROOM_LIST_QUICK_ACTIONS")
@@ -394,10 +457,6 @@ class RoomListFragment @Inject constructor(
         roomListViewModel.handle(RoomListAction.RejectInvitation(room))
     }
 
-    override fun onToggleRoomCategory(roomCategory: RoomCategory) {
-        roomListViewModel.handle(RoomListAction.ToggleCategory(roomCategory))
-    }
-
     override fun createRoom(initialName: String) {
         navigator.openCreateRoom(requireActivity(), initialName)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListListener.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListListener.kt
new file mode 100644
index 0000000000..e9833d1560
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListListener.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import im.vector.app.features.home.room.filtered.FilteredRoomFooterItem
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+interface RoomListListener : FilteredRoomFooterItem.FilteredRoomFooterItemListener {
+    fun onRoomClicked(room: RoomSummary)
+    fun onRoomLongClicked(room: RoomSummary): Boolean
+    fun onRejectRoomInvitation(room: RoomSummary)
+    fun onAcceptRoomInvitation(room: RoomSummary)
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 3a5e797f98..36551dece7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -16,37 +16,50 @@
 
 package im.vector.app.features.home.room.list
 
+import androidx.annotation.StringRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import androidx.paging.PagedList
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
+import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.utils.DataSource
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.RoomListDisplayMode
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
-import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
+import org.matrix.android.sdk.internal.session.room.UpdatableFilterLivePageResult
+import org.matrix.android.sdk.rx.asObservable
 import timber.log.Timber
-import java.lang.Exception
 import javax.inject.Inject
 
 class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                                             private val session: Session,
-                                            private val roomSummariesSource: DataSource<List<RoomSummary>>)
+                                            private val stringProvider: StringProvider)
     : VectorViewModel<RoomListViewState, RoomListAction, RoomListViewEvents>(initialState) {
 
     interface Factory {
         fun create(initialState: RoomListViewState): RoomListViewModel
     }
 
+    private var updatableQuery: UpdatableFilterLivePageResult? = null
+
     companion object : MvRxViewModelFactory<RoomListViewModel, RoomListViewState> {
 
         @JvmStatic
@@ -56,28 +69,121 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         }
     }
 
-    private val displayMode = initialState.displayMode
-    private val roomListDisplayModeFilter = RoomListDisplayModeFilter(displayMode)
+    data class RoomsSection(
+            val sectionName: String,
+            val livePages: LiveData<PagedList<RoomSummary>>,
+            val isExpanded: MutableLiveData<Boolean> = MutableLiveData(true),
+            val notificationCount: MutableLiveData<RoomAggregateNotificationCount> =
+                    MutableLiveData(RoomAggregateNotificationCount(0, 0))
+    )
+
+    val sections: List<RoomsSection> by lazy {
+        val sections = mutableListOf<RoomsSection>()
+        if (initialState.displayMode == RoomListDisplayMode.PEOPLE) {
+
+            addSection(sections, R.string.invitations_header) {
+                it.memberships = listOf(Membership.INVITE)
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+            }
+
+            addSection(sections, R.string.bottom_action_people_x) {
+                it.memberships = listOf(Membership.JOIN)
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+            }
+        } else if (initialState.displayMode == RoomListDisplayMode.ROOMS) {
+
+            addSection(sections, R.string.invitations_header) {
+                it.memberships = listOf(Membership.INVITE)
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            }
+
+            addSection(sections, R.string.bottom_action_favourites) {
+                it.memberships = listOf(Membership.JOIN)
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
+            }
+
+            addSection(sections, R.string.bottom_action_rooms) {
+                it.memberships = listOf(Membership.JOIN)
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                it.roomTagQueryFilter = RoomTagQueryFilter(false, false, false)
+            }
+
+            addSection(sections, R.string.low_priority_header) {
+                it.memberships = listOf(Membership.JOIN)
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                it.roomTagQueryFilter = RoomTagQueryFilter(null, true, null)
+            }
+
+            addSection(sections, R.string.system_alerts_header) {
+                it.memberships = listOf(Membership.JOIN)
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                it.roomTagQueryFilter = RoomTagQueryFilter(null, null, true)
+            }
+        } else if (initialState.displayMode == RoomListDisplayMode.FILTERED) {
+            withQueryParams({
+                it.memberships = Membership.activeMemberships()
+//                it.displayName = QueryStringValue.Contains("")
+            }) { qpm ->
+                val name = stringProvider.getString(R.string.bottom_action_rooms)
+                session.getFilteredPagedRoomSummariesLive(qpm)
+                        .let { livePagedList ->
+                            updatableQuery = livePagedList
+                            sections.add(RoomsSection(name, livePagedList.livePagedList))
+                        }
+            }
+        }
+        sections
+    }
 
     init {
-        observeRoomSummaries()
-        observeMembershipChanges()
     }
 
     override fun handle(action: RoomListAction) {
         when (action) {
-            is RoomListAction.SelectRoom                  -> handleSelectRoom(action)
-            is RoomListAction.ToggleCategory              -> handleToggleCategory(action)
-            is RoomListAction.AcceptInvitation            -> handleAcceptInvitation(action)
-            is RoomListAction.RejectInvitation            -> handleRejectInvitation(action)
-            is RoomListAction.FilterWith                  -> handleFilter(action)
-            is RoomListAction.MarkAllRoomsRead            -> handleMarkAllRoomsRead()
-            is RoomListAction.LeaveRoom                   -> handleLeaveRoom(action)
+            is RoomListAction.SelectRoom -> handleSelectRoom(action)
+            is RoomListAction.AcceptInvitation -> handleAcceptInvitation(action)
+            is RoomListAction.RejectInvitation -> handleRejectInvitation(action)
+            is RoomListAction.FilterWith -> handleFilter(action)
+            is RoomListAction.MarkAllRoomsRead -> handleMarkAllRoomsRead()
+            is RoomListAction.LeaveRoom -> handleLeaveRoom(action)
             is RoomListAction.ChangeRoomNotificationState -> handleChangeNotificationMode(action)
-            is RoomListAction.ToggleTag                   -> handleToggleTag(action)
+            is RoomListAction.ToggleTag -> handleToggleTag(action)
+            is RoomListAction.ToggleSection -> handleToggleSection(action.section)
         }.exhaustive
     }
 
+    private fun addSection(sections: MutableList<RoomsSection>, @StringRes nameRes: Int, query: (RoomSummaryQueryParams.Builder) -> Unit) {
+        withQueryParams({
+            query.invoke(it)
+        }) { roomQueryParams ->
+
+            val name = stringProvider.getString(nameRes)
+            session.getPagedRoomSummariesLive(roomQueryParams)
+                    .let { livePagedList ->
+
+                        // use it also as a source to update count
+                        livePagedList.asObservable()
+                                .observeOn(Schedulers.computation())
+                                .subscribe {
+                                    sections.find { it.sectionName == name }
+                                            ?.notificationCount
+                                            ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
+                                }.disposeOnClear()
+
+                        sections.add(RoomsSection(name, livePagedList))
+                    }
+        }
+    }
+
+    private fun withQueryParams(builder: (RoomSummaryQueryParams.Builder) -> Unit, block: (RoomSummaryQueryParams) -> Unit) {
+        RoomSummaryQueryParams.Builder().apply {
+            builder.invoke(this)
+        }.build().let {
+            block(it)
+        }
+    }
+
     fun isPublicRoom(roomId: String): Boolean {
         return session.getRoom(roomId)?.isPublic().orFalse()
     }
@@ -88,8 +194,11 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         _viewEvents.post(RoomListViewEvents.SelectRoom(action.roomSummary))
     }
 
-    private fun handleToggleCategory(action: RoomListAction.ToggleCategory) = setState {
-        this.toggle(action.category)
+    private fun handleToggleSection(section: RoomsSection) {
+        sections.find { it.sectionName == section.sectionName }
+                ?.let { section ->
+                    section.isExpanded.postValue(!section.isExpanded.value.orFalse())
+                }
     }
 
     private fun handleFilter(action: RoomListAction.FilterWith) {
@@ -98,23 +207,12 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                     roomFilter = action.filter
             )
         }
-    }
-
-    private fun observeRoomSummaries() {
-        roomSummariesSource
-                .observe()
-                .observeOn(Schedulers.computation())
-                .execute { asyncRooms ->
-                    copy(asyncRooms = asyncRooms)
-                }
-
-        roomSummariesSource
-                .observe()
-                .observeOn(Schedulers.computation())
-                .map { buildRoomSummaries(it) }
-                .execute { async ->
-                    copy(asyncFilteredRooms = async)
+        updatableQuery?.updateQuery(
+                roomSummaryQueryParams {
+                    this.memberships = Membership.activeMemberships()
+                    this.displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
                 }
+        )
     }
 
     private fun handleAcceptInvitation(action: RoomListAction.AcceptInvitation) = withState { state ->
@@ -164,12 +262,12 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
     }
 
     private fun handleMarkAllRoomsRead() = withState { state ->
-        state.asyncFilteredRooms.invoke()
-                ?.flatMap { it.value }
-                ?.filter { it.membership == Membership.JOIN }
-                ?.map { it.roomId }
-                ?.toList()
-                ?.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
+//        state.asyncFilteredRooms.invoke()
+//                ?.flatMap { it.value }
+//                ?.filter { it.membership == Membership.JOIN }
+//                ?.map { it.roomId }
+//                ?.toList()
+//                ?.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
     }
 
     private fun handleChangeNotificationMode(action: RoomListAction.ChangeRoomNotificationState) {
@@ -211,7 +309,7 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
 
     private fun String.otherTag(): String? {
         return when (this) {
-            RoomTag.ROOM_TAG_FAVOURITE    -> RoomTag.ROOM_TAG_LOW_PRIORITY
+            RoomTag.ROOM_TAG_FAVOURITE -> RoomTag.ROOM_TAG_LOW_PRIORITY
             RoomTag.ROOM_TAG_LOW_PRIORITY -> RoomTag.ROOM_TAG_FAVOURITE
             else                          -> null
         }
@@ -226,46 +324,4 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
             _viewEvents.post(value)
         }
     }
-
-    private fun observeMembershipChanges() {
-        session.rx()
-                .liveRoomChangeMembershipState()
-                .subscribe {
-                    Timber.v("ChangeMembership states: $it")
-                    setState { copy(roomMembershipChanges = it) }
-                }
-                .disposeOnClear()
-    }
-
-    private fun buildRoomSummaries(rooms: List<RoomSummary>): RoomSummaries {
-        // Set up init size on directChats and groupRooms as they are the biggest ones
-        val invites = ArrayList<RoomSummary>()
-        val favourites = ArrayList<RoomSummary>()
-        val directChats = ArrayList<RoomSummary>(rooms.size)
-        val groupRooms = ArrayList<RoomSummary>(rooms.size)
-        val lowPriorities = ArrayList<RoomSummary>()
-        val serverNotices = ArrayList<RoomSummary>()
-
-        rooms
-                .filter { roomListDisplayModeFilter.test(it) }
-                .forEach { room ->
-                    val tags = room.tags.map { it.name }
-                    when {
-                        room.membership == Membership.INVITE          -> invites.add(room)
-                        tags.contains(RoomTag.ROOM_TAG_SERVER_NOTICE) -> serverNotices.add(room)
-                        tags.contains(RoomTag.ROOM_TAG_FAVOURITE)     -> favourites.add(room)
-                        tags.contains(RoomTag.ROOM_TAG_LOW_PRIORITY)  -> lowPriorities.add(room)
-                        room.isDirect                                 -> directChats.add(room)
-                        else                                          -> groupRooms.add(room)
-                    }
-                }
-        return RoomSummaries().apply {
-            put(RoomCategory.INVITE, invites)
-            put(RoomCategory.FAVOURITE, favourites)
-            put(RoomCategory.DIRECT, directChats)
-            put(RoomCategory.GROUP, groupRooms)
-            put(RoomCategory.LOW_PRIORITY, lowPriorities)
-            put(RoomCategory.SERVER_NOTICE, serverNotices)
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
index 44ca8cefda..d36bc45ab6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
@@ -16,20 +16,20 @@
 
 package im.vector.app.features.home.room.list
 
-import im.vector.app.features.home.HomeRoomListDataSource
+import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 import javax.inject.Provider
 
 class RoomListViewModelFactory @Inject constructor(private val session: Provider<Session>,
-                                                   private val homeRoomListDataSource: Provider<HomeRoomListDataSource>)
+                                                   private val stringProvider: StringProvider)
     : RoomListViewModel.Factory {
 
     override fun create(initialState: RoomListViewState): RoomListViewModel {
         return RoomListViewModel(
                 initialState,
                 session.get(),
-                homeRoomListDataSource.get()
+                stringProvider
         )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index 095262d74b..be4eae05db 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -17,59 +17,26 @@
 package im.vector.app.features.home.room.list
 
 import androidx.annotation.StringRes
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
-import com.airbnb.mvrx.Uninitialized
 import im.vector.app.R
 import im.vector.app.features.home.RoomListDisplayMode
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
-import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 data class RoomListViewState(
         val displayMode: RoomListDisplayMode,
-        val asyncRooms: Async<List<RoomSummary>> = Uninitialized,
         val roomFilter: String = "",
-        val asyncFilteredRooms: Async<RoomSummaries> = Uninitialized,
-        val roomMembershipChanges: Map<String, ChangeMembershipState> = emptyMap(),
-        val isInviteExpanded: Boolean = true,
-        val isFavouriteRoomsExpanded: Boolean = true,
-        val isDirectRoomsExpanded: Boolean = true,
-        val isGroupRoomsExpanded: Boolean = true,
-        val isLowPriorityRoomsExpanded: Boolean = true,
-        val isServerNoticeRoomsExpanded: Boolean = true
+        val roomMembershipChanges: Map<String, ChangeMembershipState> = emptyMap()
 ) : MvRxState {
 
     constructor(args: RoomListParams) : this(displayMode = args.displayMode)
 
-    fun isCategoryExpanded(roomCategory: RoomCategory): Boolean {
-        return when (roomCategory) {
-            RoomCategory.INVITE        -> isInviteExpanded
-            RoomCategory.FAVOURITE     -> isFavouriteRoomsExpanded
-            RoomCategory.DIRECT        -> isDirectRoomsExpanded
-            RoomCategory.GROUP         -> isGroupRoomsExpanded
-            RoomCategory.LOW_PRIORITY  -> isLowPriorityRoomsExpanded
-            RoomCategory.SERVER_NOTICE -> isServerNoticeRoomsExpanded
-        }
-    }
-
-    fun toggle(roomCategory: RoomCategory): RoomListViewState {
-        return when (roomCategory) {
-            RoomCategory.INVITE        -> copy(isInviteExpanded = !isInviteExpanded)
-            RoomCategory.FAVOURITE     -> copy(isFavouriteRoomsExpanded = !isFavouriteRoomsExpanded)
-            RoomCategory.DIRECT        -> copy(isDirectRoomsExpanded = !isDirectRoomsExpanded)
-            RoomCategory.GROUP         -> copy(isGroupRoomsExpanded = !isGroupRoomsExpanded)
-            RoomCategory.LOW_PRIORITY  -> copy(isLowPriorityRoomsExpanded = !isLowPriorityRoomsExpanded)
-            RoomCategory.SERVER_NOTICE -> copy(isServerNoticeRoomsExpanded = !isServerNoticeRoomsExpanded)
-        }
-    }
-
-    val hasUnread: Boolean
-        get() = asyncFilteredRooms.invoke()
-                ?.flatMap { it.value }
-                ?.filter { it.membership == Membership.JOIN }
-                ?.any { it.hasUnreadMessages }
-                ?: false
+    val hasUnread: Boolean = false
+//        get() = asyncFilteredRooms.invoke()
+//                ?.flatMap { it.value }
+//                ?.filter { it.membership == Membership.JOIN }
+//                ?.any { it.hasUnreadMessages }
+//                ?: false
 }
 
 typealias RoomSummaries = LinkedHashMap<RoomCategory, List<RoomSummary>>
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
deleted file mode 100644
index d7cace9edb..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.home.room.list
-
-import androidx.annotation.StringRes
-import com.airbnb.epoxy.EpoxyController
-import im.vector.app.R
-import im.vector.app.core.epoxy.helpFooterItem
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.resources.UserPreferencesProvider
-import im.vector.app.features.home.RoomListDisplayMode
-import im.vector.app.features.home.room.filtered.FilteredRoomFooterItem
-import im.vector.app.features.home.room.filtered.filteredRoomFooterItem
-import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import javax.inject.Inject
-
-class RoomSummaryController @Inject constructor(private val stringProvider: StringProvider,
-                                                private val roomSummaryItemFactory: RoomSummaryItemFactory,
-                                                private val roomListNameFilter: RoomListNameFilter,
-                                                private val userPreferencesProvider: UserPreferencesProvider
-) : EpoxyController() {
-
-    var listener: Listener? = null
-
-    private var viewState: RoomListViewState? = null
-
-    init {
-        // We are requesting a model build directly as the first build of epoxy is on the main thread.
-        // It avoids to build the whole list of rooms on the main thread.
-        requestModelBuild()
-    }
-
-    fun update(viewState: RoomListViewState) {
-        this.viewState = viewState
-        requestModelBuild()
-    }
-
-    fun onRoomLongClicked() {
-        userPreferencesProvider.neverShowLongClickOnRoomHelpAgain()
-        requestModelBuild()
-    }
-
-    override fun buildModels() {
-        val nonNullViewState = viewState ?: return
-        when (nonNullViewState.displayMode) {
-            RoomListDisplayMode.FILTERED -> buildFilteredRooms(nonNullViewState)
-            else                         -> buildRooms(nonNullViewState)
-        }
-    }
-
-    private fun buildFilteredRooms(viewState: RoomListViewState) {
-        val summaries = viewState.asyncRooms() ?: return
-
-        roomListNameFilter.filter = viewState.roomFilter
-
-        val filteredSummaries = summaries
-                .filter { it.membership == Membership.JOIN && roomListNameFilter.test(it) }
-
-        buildRoomModels(filteredSummaries,
-                viewState.roomMembershipChanges,
-                emptySet())
-
-        addFilterFooter(viewState)
-    }
-
-    private fun buildRooms(viewState: RoomListViewState) {
-        var showHelp = false
-        val roomSummaries = viewState.asyncFilteredRooms()
-        roomSummaries?.forEach { (category, summaries) ->
-            if (summaries.isEmpty()) {
-                return@forEach
-            } else {
-                val isExpanded = viewState.isCategoryExpanded(category)
-                buildRoomCategory(viewState, summaries, category.titleRes, viewState.isCategoryExpanded(category)) {
-                    listener?.onToggleRoomCategory(category)
-                }
-                if (isExpanded) {
-                    buildRoomModels(summaries,
-                            viewState.roomMembershipChanges,
-                            emptySet())
-                    // Never set showHelp to true for invitation
-                    if (category != RoomCategory.INVITE) {
-                        showHelp = userPreferencesProvider.shouldShowLongClickOnRoomHelp()
-                    }
-                }
-            }
-        }
-
-        if (showHelp) {
-            buildLongClickHelp()
-        }
-    }
-
-    private fun buildLongClickHelp() {
-        helpFooterItem {
-            id("long_click_help")
-            text(stringProvider.getString(R.string.help_long_click_on_room_for_more_options))
-        }
-    }
-
-    private fun addFilterFooter(viewState: RoomListViewState) {
-        filteredRoomFooterItem {
-            id("filter_footer")
-            listener(listener)
-            currentFilter(viewState.roomFilter)
-        }
-    }
-
-    private fun buildRoomCategory(viewState: RoomListViewState,
-                                  summaries: List<RoomSummary>,
-                                  @StringRes titleRes: Int,
-                                  isExpanded: Boolean,
-                                  mutateExpandedState: () -> Unit) {
-        // TODO should add some business logic later
-        val unreadCount = if (summaries.isEmpty()) {
-            0
-        } else {
-            summaries.map { it.notificationCount }.sumBy { i -> i }
-        }
-        val showHighlighted = summaries.any { it.highlightCount > 0 }
-        roomCategoryItem {
-            id(titleRes)
-            title(stringProvider.getString(titleRes))
-            expanded(isExpanded)
-            unreadNotificationCount(unreadCount)
-            showHighlighted(showHighlighted)
-            listener {
-                mutateExpandedState()
-                update(viewState)
-            }
-        }
-    }
-
-    private fun buildRoomModels(summaries: List<RoomSummary>,
-                                roomChangedMembershipStates: Map<String, ChangeMembershipState>,
-                                selectedRoomIds: Set<String>) {
-        summaries.forEach { roomSummary ->
-            roomSummaryItemFactory
-                    .create(roomSummary,
-                            roomChangedMembershipStates,
-                            selectedRoomIds,
-                            listener)
-                    .addTo(this)
-        }
-    }
-
-    interface Listener : FilteredRoomFooterItem.FilteredRoomFooterItemListener {
-        fun onToggleRoomCategory(roomCategory: RoomCategory)
-        fun onRoomClicked(room: RoomSummary)
-        fun onRoomLongClicked(room: RoomSummary): Boolean
-        fun onRejectRoomInvitation(room: RoomSummary)
-        fun onAcceptRoomInvitation(room: RoomSummary)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 7d7ed1637f..fa6c970d8a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -40,7 +40,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
     fun create(roomSummary: RoomSummary,
                roomChangeMembershipStates: Map<String, ChangeMembershipState>,
                selectedRoomIds: Set<String>,
-               listener: RoomSummaryController.Listener?): VectorEpoxyModel<*> {
+               listener: RoomListListener?): VectorEpoxyModel<*> {
         return when (roomSummary.membership) {
             Membership.INVITE -> {
                 val changeMembershipState = roomChangeMembershipStates[roomSummary.roomId] ?: ChangeMembershipState.Unknown
@@ -52,7 +52,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
 
     private fun createInvitationItem(roomSummary: RoomSummary,
                                      changeMembershipState: ChangeMembershipState,
-                                     listener: RoomSummaryController.Listener?): VectorEpoxyModel<*> {
+                                     listener: RoomListListener?): VectorEpoxyModel<*> {
         val secondLine = if (roomSummary.isDirect) {
             roomSummary.inviterId
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
new file mode 100644
index 0000000000..75171dad39
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.EpoxyModel
+import com.airbnb.epoxy.paging.PagedListEpoxyController
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.resources.UserPreferencesProvider
+import im.vector.app.core.utils.createUIHandler
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import javax.inject.Inject
+
+class RoomSummaryPagedControllerFactory @Inject constructor(private val stringProvider: StringProvider,
+                                                            private val userPreferencesProvider: UserPreferencesProvider,
+                                                            private val roomSummaryItemFactory: RoomSummaryItemFactory) {
+
+    fun createRoomSummaryPagedController(): RoomSummaryPagedController {
+        return RoomSummaryPagedController(stringProvider, userPreferencesProvider, roomSummaryItemFactory)
+    }
+}
+
+class RoomSummaryPagedController constructor(private val stringProvider: StringProvider,
+                                             private val userPreferencesProvider: UserPreferencesProvider,
+                                             private val roomSummaryItemFactory: RoomSummaryItemFactory)
+    : PagedListEpoxyController<RoomSummary>(
+// Important it must match the PageList builder notify Looper
+        modelBuildingHandler = createUIHandler()
+) {
+
+    var listener: RoomListListener? = null
+
+    override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
+        val unwrappedItem = item
+                // for place holder if enabled
+                ?: return roomSummaryItemFactory.createRoomItem(
+                        RoomSummary(
+                                roomId = "null_item_pos_$currentPosition",
+                                name = "",
+                                encryptionEventTs = null,
+                                isEncrypted = false,
+                                typingUsers = emptyList()
+                        ), emptySet(), null, null)
+
+//        GenericItem_().apply { id("null_item_pos_$currentPosition") }
+
+        return roomSummaryItemFactory.create(unwrappedItem, emptyMap(), emptySet(), listener)
+    }
+
+//    override fun onModelBound(holder: EpoxyViewHolder, boundModel: EpoxyModel<*>, position: Int, previouslyBoundModel: EpoxyModel<*>?) {
+//        Timber.w("VAL: Will load around $position")
+//        super.onModelBound(holder, boundModel, position, previouslyBoundModel)
+//    }
+//    fun onRoomLongClicked() {
+//        userPreferencesProvider.neverShowLongClickOnRoomHelpAgain()
+//        requestModelBuild()
+//    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
new file mode 100644
index 0000000000..30f0e671f9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import androidx.recyclerview.widget.RecyclerView
+import im.vector.app.R
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.databinding.ItemRoomCategoryBinding
+import im.vector.app.features.themes.ThemeUtils
+
+class SectionHeaderAdapter constructor(
+        private val onClickAction: (() -> Unit)
+) : RecyclerView.Adapter<SectionHeaderAdapter.VH>() {
+
+    data class SectionViewModel(
+            val name: String,
+            val isExpanded: Boolean = true,
+            val notificationCount: Int = 0,
+            val isHighlighted: Boolean = false,
+            val isHidden: Boolean = true
+    )
+
+    lateinit var section: SectionViewModel
+        private set
+
+    fun updateSection(newSection: SectionViewModel) {
+        if (!::section.isInitialized || newSection != section) {
+            section = newSection
+            notifyDataSetChanged()
+        }
+    }
+
+    init {
+        setHasStableIds(true)
+    }
+
+    override fun getItemId(position: Int) = section.hashCode().toLong()
+
+    override fun getItemViewType(position: Int) = R.layout.item_room_category
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
+        return VH.create(parent, this.onClickAction)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int) {
+        holder.bind(section)
+    }
+
+    override fun getItemCount(): Int = 1.takeIf { section.isHidden.not() } ?: 0
+
+    class VH constructor(
+            private val binding: ItemRoomCategoryBinding,
+            onClickAction: (() -> Unit)
+    ) : RecyclerView.ViewHolder(binding.root) {
+
+        init {
+            binding.root.setOnClickListener(DebouncedClickListener({
+                onClickAction.invoke()
+            }))
+        }
+
+        fun bind(section: SectionViewModel) {
+            binding.roomCategoryTitleView.text = section.name
+            val tintColor = ThemeUtils.getColor(binding.root.context, R.attr.riotx_text_secondary)
+            val expandedArrowDrawableRes = if (section.isExpanded) R.drawable.ic_expand_more_white else R.drawable.ic_expand_less_white
+            val expandedArrowDrawable = ContextCompat.getDrawable(binding.root.context, expandedArrowDrawableRes)?.also {
+                DrawableCompat.setTint(it, tintColor)
+            }
+            binding.roomCategoryUnreadCounterBadgeView.render(UnreadCounterBadgeView.State(section.notificationCount, section.isHighlighted))
+            binding.roomCategoryTitleView.setCompoundDrawablesWithIntrinsicBounds(null, null, expandedArrowDrawable, null)
+        }
+
+        companion object {
+            fun create(parent: ViewGroup, onClickAction: () -> Unit): VH {
+                val view = LayoutInflater.from(parent.context)
+                        .inflate(R.layout.item_room_category, parent, false)
+                val binding = ItemRoomCategoryBinding.bind(view)
+                return VH(binding, onClickAction)
+            }
+        }
+    }
+}

From 38af0caa3fe3f0cc4ac432ab2e393abe82c42b79 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 11:51:04 +0200
Subject: [PATCH 472/578] Fix / missing DM favorites

---
 .../vector/app/features/home/room/list/RoomListViewModel.kt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 36551dece7..b8dc3282b7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -86,6 +86,12 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
             }
 
+            addSection(sections, R.string.bottom_action_favourites) {
+                it.memberships = listOf(Membership.JOIN)
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
+            }
+
             addSection(sections, R.string.bottom_action_people_x) {
                 it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM

From 52f98dc40547ba79969d2481768ec1dcf0763b50 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 11:51:44 +0200
Subject: [PATCH 473/578] Remove HomeListDataSource

---
 .../android/sdk/api/query/QueryStringValue.kt |  1 -
 .../java/im/vector/app/AppStateHandler.kt     | 50 +-------------
 .../im/vector/app/core/di/VectorComponent.kt  |  3 -
 .../app/features/home/HomeDetailViewModel.kt  | 67 +++++++++----------
 .../features/home/HomeRoomListDataSource.kt   | 25 -------
 .../app/features/home/ShortcutsHandler.kt     | 24 ++++---
 6 files changed, 49 insertions(+), 121 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
index 99a86e185b..8f83beface 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
@@ -33,4 +33,3 @@ sealed class QueryStringValue {
         INSENSITIVE
     }
 }
-
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index d2b59e5513..81d1fdb636 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -19,32 +19,19 @@ package im.vector.app
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import arrow.core.Option
-import im.vector.app.features.grouplist.ALL_COMMUNITIES_GROUP_ID
 import im.vector.app.features.grouplist.SelectedGroupDataSource
-import im.vector.app.features.home.HomeRoomListDataSource
 import im.vector.app.features.home.room.list.ChronologicalRoomComparator
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.functions.BiFunction
-import io.reactivex.rxkotlin.addTo
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.rx.rx
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * This class handles the global app state. At the moment, it only manages room list.
+ * This class handles the global app state.
  * It requires to be added to ProcessLifecycleOwner.get().lifecycle
  */
 @Singleton
 class AppStateHandler @Inject constructor(
         private val sessionDataSource: ActiveSessionDataSource,
-        private val homeRoomListDataSource: HomeRoomListDataSource,
         private val selectedGroupDataSource: SelectedGroupDataSource,
         private val chronologicalRoomComparator: ChronologicalRoomComparator) : LifecycleObserver {
 
@@ -52,45 +39,10 @@ class AppStateHandler @Inject constructor(
 
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun entersForeground() {
-//        observeRoomsAndGroup()
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     fun entersBackground() {
         compositeDisposable.clear()
     }
-
-    private fun observeRoomsAndGroup() {
-        Observable
-                .combineLatest<List<RoomSummary>, Option<GroupSummary>, List<RoomSummary>>(
-                        sessionDataSource.observe()
-                                .observeOn(AndroidSchedulers.mainThread())
-                                .switchMap {
-                                    val query = roomSummaryQueryParams {}
-                                    it.orNull()?.rx()?.liveRoomSummaries(query)
-                                            ?: Observable.just(emptyList())
-                                }
-                                .throttleLast(300, TimeUnit.MILLISECONDS),
-                        selectedGroupDataSource.observe(),
-                        BiFunction { rooms, selectedGroupOption ->
-                            val selectedGroup = selectedGroupOption.orNull()
-                            val filteredRooms = rooms.filter {
-                                if (selectedGroup == null || selectedGroup.groupId == ALL_COMMUNITIES_GROUP_ID) {
-                                    true
-                                } else if (it.isDirect) {
-                                    it.otherMemberIds
-                                            .intersect(selectedGroup.userIds)
-                                            .isNotEmpty()
-                                } else {
-                                    selectedGroup.roomIds.contains(it.roomId)
-                                }
-                            }
-                            filteredRooms.sortedWith(chronologicalRoomComparator)
-                        }
-                )
-                .subscribe {
-                    homeRoomListDataSource.post(it)
-                }
-                .addTo(compositeDisposable)
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index 23d6b618fe..cae7a2ece6 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -35,7 +35,6 @@ import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
 import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
 import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.HomeRoomListDataSource
 import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
 import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
@@ -113,8 +112,6 @@ interface VectorComponent {
 
     fun errorFormatter(): ErrorFormatter
 
-    fun homeRoomListObservableStore(): HomeRoomListDataSource
-
     fun selectedGroupStore(): SelectedGroupDataSource
 
     fun roomDetailPendingActionStore(): RoomDetailPendingActionStore
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index c261081055..f4c66212b9 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -20,18 +20,21 @@ import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.di.HasScreenInjector
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.ui.UiStateRepository
-import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
+import java.util.concurrent.TimeUnit
 
 /**
  * View model used to update the home bottom bar notification counts, observe the sync state and
@@ -41,7 +44,6 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                                       private val session: Session,
                                                       private val uiStateRepository: UiStateRepository,
                                                       private val selectedGroupStore: SelectedGroupDataSource,
-                                                      private val homeRoomListStore: HomeRoomListDataSource,
                                                       private val stringProvider: StringProvider)
     : VectorViewModel<HomeDetailViewState, HomeDetailAction, EmptyViewEvents>(initialState) {
 
@@ -113,43 +115,40 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     }
 
     private fun observeRoomSummaries() {
-        homeRoomListStore
-                .observe()
-                .observeOn(Schedulers.computation())
-                .map { it.asSequence() }
-                .subscribe { summaries ->
-                    val invitesDm = summaries
-                            .filter { it.membership == Membership.INVITE && it.isDirect }
-                            .count()
+        session.getPagedRoomSummariesLive(roomSummaryQueryParams {
+            memberships = Membership.activeMemberships()
+        })
+                .asObservable()
+                .throttleFirst(300, TimeUnit.MILLISECONDS)
+                .subscribe {
+                    val dmInvites = session.getRoomSummaries(roomSummaryQueryParams {
+                        memberships = listOf(Membership.INVITE)
+                        roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                    }).size
 
-                    val invitesRoom = summaries
-                            .filter { it.membership == Membership.INVITE && it.isDirect.not() }
-                            .count()
+                    val roomsInvite = session.getRoomSummaries(roomSummaryQueryParams {
+                        memberships = listOf(Membership.INVITE)
+                        roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                    }).size
 
-                    val peopleNotifications = summaries
-                            .filter { it.isDirect }
-                            .map { it.notificationCount }
-                            .sum()
-                    val peopleHasHighlight = summaries
-                            .filter { it.isDirect }
-                            .any { it.highlightCount > 0 }
+                    val dmRooms = session.getNotificationCountForRooms(roomSummaryQueryParams {
+                        memberships = listOf(Membership.JOIN)
+                        roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                    })
 
-                    val roomsNotifications = summaries
-                            .filter { !it.isDirect }
-                            .map { it.notificationCount }
-                            .sum()
-                    val roomsHasHighlight = summaries
-                            .filter { !it.isDirect }
-                            .any { it.highlightCount > 0 }
+                    val otherRooms = session.getNotificationCountForRooms(roomSummaryQueryParams {
+                        memberships = listOf(Membership.JOIN)
+                        roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                    })
 
                     setState {
                         copy(
-                                notificationCountCatchup = peopleNotifications + roomsNotifications + invitesDm + invitesRoom,
-                                notificationHighlightCatchup = peopleHasHighlight || roomsHasHighlight,
-                                notificationCountPeople = peopleNotifications + invitesDm,
-                                notificationHighlightPeople = peopleHasHighlight || invitesDm > 0,
-                                notificationCountRooms = roomsNotifications + invitesRoom,
-                                notificationHighlightRooms = roomsHasHighlight || invitesRoom > 0
+                                notificationCountCatchup = dmRooms.totalCount() + otherRooms.totalCount() + roomsInvite + dmInvites,
+                                notificationHighlightCatchup = dmRooms.isHighlight() || otherRooms.isHighlight(),
+                                notificationCountPeople = dmRooms.totalCount() + dmInvites,
+                                notificationHighlightPeople = dmRooms.isHighlight() || dmInvites > 0,
+                                notificationCountRooms = otherRooms.totalCount() + roomsInvite,
+                                notificationHighlightRooms = otherRooms.isHighlight() || roomsInvite > 0
                         )
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt b/vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt
deleted file mode 100644
index 6bcd6f01eb..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.home
-
-import im.vector.app.core.utils.BehaviorDataSource
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class HomeRoomListDataSource @Inject constructor() : BehaviorDataSource<List<RoomSummary>>()
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
index 3684a8b3f8..99cc56bd99 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
@@ -21,15 +21,20 @@ import android.content.pm.ShortcutManager
 import android.os.Build
 import androidx.core.content.getSystemService
 import androidx.core.content.pm.ShortcutManagerCompat
+import im.vector.app.core.di.ActiveSessionHolder
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.disposables.Disposables
+import org.matrix.android.sdk.api.query.RoomTagQueryFilter
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.rx.asObservable
 import javax.inject.Inject
 
 class ShortcutsHandler @Inject constructor(
         private val context: Context,
-        private val homeRoomListStore: HomeRoomListDataSource,
-        private val shortcutCreator: ShortcutCreator
+        private val shortcutCreator: ShortcutCreator,
+        private val activeSessionHolder: ActiveSessionHolder
 ) {
 
     fun observeRoomsAndBuildShortcuts(): Disposable {
@@ -38,19 +43,20 @@ class ShortcutsHandler @Inject constructor(
             return Observable.empty<Unit>().subscribe()
         }
 
-        return homeRoomListStore
-                .observe()
-                .distinctUntilChanged()
-                .observeOn(Schedulers.computation())
-                .subscribe { rooms ->
+        return activeSessionHolder.getSafeActiveSession()?.getPagedRoomSummariesLive(roomSummaryQueryParams {
+            this.memberships = listOf(Membership.JOIN)
+            this.roomTagQueryFilter = RoomTagQueryFilter(isFavorite = true, null, null)
+        })?.asObservable()
+                ?.subscribe { rooms ->
                     val shortcuts = rooms
-                            .filter { room -> room.isFavorite }
                             .take(n = 4) // Android only allows us to create 4 shortcuts
                             .map { shortcutCreator.create(it) }
 
                     ShortcutManagerCompat.removeAllDynamicShortcuts(context)
                     ShortcutManagerCompat.addDynamicShortcuts(context, shortcuts)
                 }
+
+                ?: Disposables.empty()
     }
 
     fun clearShortcuts() {

From 41176c3e2667f0d498259f9eb0e7a3234a2b61aa Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 12:31:02 +0200
Subject: [PATCH 474/578] Support only notif display mode

+ code quality fixes
---
 .../api/session/room/RoomSummaryQueryParams.kt |  1 +
 .../room/summary/RoomSummaryDataSource.kt      |  1 +
 tools/check/forbidden_strings_in_code.txt      |  2 +-
 .../app/features/home/HomeDetailViewModel.kt   |  9 +++++----
 .../home/room/list/RoomListViewModel.kt        | 18 ++++++++++++++----
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index a57514023b..e0862f229a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -27,6 +27,7 @@ fun roomSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {
 enum class RoomCategoryFilter {
     ONLY_DM,
     ONLY_ROOMS,
+    ONLY_WITH_NOTIFICATIONS,
     ALL
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index a806123237..769321cb8c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -181,6 +181,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             when (it) {
                 RoomCategoryFilter.ONLY_DM -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
                 RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+                RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS -> query.greaterThan(RoomSummaryEntityFields.NOTIFICATION_COUNT, 0)
                 RoomCategoryFilter.ALL -> {
                     // nop
                 }
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 7b7c44b9fd..5a53ececec 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===93
+enum class===94
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index f4c66212b9..4810abe08b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -115,10 +115,11 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     }
 
     private fun observeRoomSummaries() {
-        session.getPagedRoomSummariesLive(roomSummaryQueryParams {
-            memberships = Membership.activeMemberships()
-        })
-                .asObservable()
+        session.getPagedRoomSummariesLive(
+                roomSummaryQueryParams {
+                    memberships = Membership.activeMemberships()
+                }
+        ).asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
                 .subscribe {
                     val dmInvites = session.getRoomSummaries(roomSummaryQueryParams {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index b8dc3282b7..e02a7b8979 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -129,7 +129,6 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         } else if (initialState.displayMode == RoomListDisplayMode.FILTERED) {
             withQueryParams({
                 it.memberships = Membership.activeMemberships()
-//                it.displayName = QueryStringValue.Contains("")
             }) { qpm ->
                 val name = stringProvider.getString(R.string.bottom_action_rooms)
                 session.getFilteredPagedRoomSummariesLive(qpm)
@@ -139,10 +138,21 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                         }
             }
         }
-        sections
-    }
+        else if (initialState.displayMode == RoomListDisplayMode.NOTIFICATIONS) {
+            withQueryParams({
+                it.memberships = Membership.activeMemberships()
+                it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
+            }) { qpm ->
+                val name = stringProvider.getString(R.string.bottom_action_rooms)
+                session.getFilteredPagedRoomSummariesLive(qpm)
+                        .let { livePagedList ->
+                            updatableQuery = livePagedList
+                            sections.add(RoomsSection(name, livePagedList.livePagedList))
+                        }
+            }
+        }
 
-    init {
+        sections
     }
 
     override fun handle(action: RoomListAction) {

From cf581ecfcf5d9a27534f812aebd251b317119498 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 13:00:20 +0200
Subject: [PATCH 475/578] Make pagedList config as part of API

---
 .../sdk/api/session/room/RoomService.kt       | 23 ++++++++++++++++---
 .../session/room/DefaultRoomService.kt        | 12 ++++++----
 .../room/summary/RoomSummaryDataSource.kt     | 20 ++++------------
 .../home/room/list/RoomListViewModel.kt       |  3 +--
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 4814805dd8..7509c2d975 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -25,11 +25,11 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
-import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 
 /**
  * This interface defines methods to get rooms. It's implemented at the session level.
@@ -182,8 +182,25 @@ interface RoomService {
      */
     fun peekRoom(roomIdOrAlias: String, callback: MatrixCallback<PeekResult>)
 
-    fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams): LiveData<PagedList<RoomSummary>>
+    fun getPagedRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            pagedListConfig: PagedList.Config = PagedList.Config.Builder()
+                    .setPageSize(10)
+                    .setInitialLoadSizeHint(20)
+                    .setEnablePlaceholders(false)
+                    .setPrefetchDistance(10)
+                    .build()
+    ): LiveData<PagedList<RoomSummary>>
 
     fun getNotificationCountForRooms(queryParams: RoomSummaryQueryParams): RoomAggregateNotificationCount
-    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams): UpdatableFilterLivePageResult
+
+    fun getFilteredPagedRoomSummariesLive(
+            queryParams: RoomSummaryQueryParams,
+            pagedListConfig: PagedList.Config = PagedList.Config.Builder()
+                    .setPageSize(10)
+                    .setInitialLoadSizeHint(20)
+                    .setEnablePlaceholders(false)
+                    .setPrefetchDistance(10)
+                    .build()
+    ): UpdatableFilterLivePageResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 5feb9c9d5a..34904110a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
@@ -46,7 +47,6 @@ import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomT
 import org.matrix.android.sdk.internal.session.room.peeking.PeekRoomTask
 import org.matrix.android.sdk.internal.session.room.peeking.ResolveRoomStateTask
 import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
-import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateBreadcrumbsTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
@@ -98,12 +98,14 @@ internal class DefaultRoomService @Inject constructor(
         return roomSummaryDataSource.getRoomSummariesLive(queryParams)
     }
 
-    override fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams) : LiveData<PagedList<RoomSummary>> {
-        return roomSummaryDataSource.getSortedPagedRoomSummariesLive(queryParams)
+    override fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config)
+            : LiveData<PagedList<RoomSummary>> {
+        return roomSummaryDataSource.getSortedPagedRoomSummariesLive(queryParams, pagedListConfig)
     }
 
-    override fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams) : UpdatableFilterLivePageResult {
-        return roomSummaryDataSource.getFilteredPagedRoomSummariesLive(queryParams)
+    override fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config)
+            : UpdatableFilterLivePageResult {
+        return roomSummaryDataSource.getFilteredPagedRoomSummariesLive(queryParams, pagedListConfig)
     }
 
     override fun getNotificationCountForRooms(queryParams: RoomSummaryQueryParams): RoomAggregateNotificationCount {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 769321cb8c..a62d82782a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -104,7 +104,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                 .sort(RoomSummaryEntityFields.BREADCRUMBS_INDEX)
     }
 
-    fun getSortedPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams): LiveData<PagedList<RoomSummary>> {
+    fun getSortedPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config): LiveData<PagedList<RoomSummary>> {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams)
                     .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
@@ -113,17 +113,11 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             roomSummaryMapper.map(it)
         }
         return monarchy.findAllPagedWithChanges(realmDataSourceFactory,
-                LivePagedListBuilder(dataSourceFactory,
-                        PagedList.Config.Builder()
-                                .setPageSize(10)
-                                .setInitialLoadSizeHint(20)
-                                .setEnablePlaceholders(false)
-                                .setPrefetchDistance(10)
-                                .build())
+                LivePagedListBuilder(dataSourceFactory, pagedListConfig)
         )
     }
 
-    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams): UpdatableFilterLivePageResult {
+    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config): UpdatableFilterLivePageResult {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams)
                     .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
@@ -133,13 +127,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         }
 
         val mapped = monarchy.findAllPagedWithChanges(realmDataSourceFactory,
-                LivePagedListBuilder(dataSourceFactory,
-                        PagedList.Config.Builder()
-                                .setPageSize(10)
-                                .setInitialLoadSizeHint(20)
-                                .setEnablePlaceholders(false)
-                                .setPrefetchDistance(10)
-                                .build())
+                LivePagedListBuilder(dataSourceFactory, pagedListConfig)
         )
 
         return object : UpdatableFilterLivePageResult {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index e02a7b8979..626d058c65 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -137,8 +137,7 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                             sections.add(RoomsSection(name, livePagedList.livePagedList))
                         }
             }
-        }
-        else if (initialState.displayMode == RoomListDisplayMode.NOTIFICATIONS) {
+        } else if (initialState.displayMode == RoomListDisplayMode.NOTIFICATIONS) {
             withQueryParams({
                 it.memberships = Membership.activeMemberships()
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS

From b6f0f12515b3cf64a47c6965a81e609e387f07af Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 13:01:25 +0200
Subject: [PATCH 476/578] lint

---
 .../vector/app/features/home/room/list/RoomListViewModel.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 626d058c65..4b1af3cbaf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -209,8 +209,8 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         _viewEvents.post(RoomListViewEvents.SelectRoom(action.roomSummary))
     }
 
-    private fun handleToggleSection(section: RoomsSection) {
-        sections.find { it.sectionName == section.sectionName }
+    private fun handleToggleSection(roomSection: RoomsSection) {
+        sections.find { it.sectionName == roomSection.sectionName }
                 ?.let { section ->
                     section.isExpanded.postValue(!section.isExpanded.value.orFalse())
                 }
@@ -276,7 +276,7 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         }
     }
 
-    private fun handleMarkAllRoomsRead() = withState { state ->
+    private fun handleMarkAllRoomsRead() = withState { _ ->
 //        state.asyncFilteredRooms.invoke()
 //                ?.flatMap { it.value }
 //                ?.filter { it.membership == Membership.JOIN }

From c23437d45afc9b17c5017a8b3ac3718ac2223c1c Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 13:57:31 +0200
Subject: [PATCH 477/578] Code quality

---
 .../summary/RoomAggregateNotificationCount.kt |  2 +-
 .../app/features/home/HomeDetailViewModel.kt  | 40 +++++++++++--------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
index 2aa122c84e..0c581508b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 4810abe08b..07e2426200 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -122,25 +122,33 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
         ).asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
                 .subscribe {
-                    val dmInvites = session.getRoomSummaries(roomSummaryQueryParams {
-                        memberships = listOf(Membership.INVITE)
-                        roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                    }).size
+                    val dmInvites = session.getRoomSummaries(
+                            roomSummaryQueryParams {
+                                memberships = listOf(Membership.INVITE)
+                                roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                            }
+                    ).size
 
-                    val roomsInvite = session.getRoomSummaries(roomSummaryQueryParams {
-                        memberships = listOf(Membership.INVITE)
-                        roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                    }).size
+                    val roomsInvite = session.getRoomSummaries(
+                            roomSummaryQueryParams {
+                                memberships = listOf(Membership.INVITE)
+                                roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                            }
+                    ).size
 
-                    val dmRooms = session.getNotificationCountForRooms(roomSummaryQueryParams {
-                        memberships = listOf(Membership.JOIN)
-                        roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                    })
+                    val dmRooms = session.getNotificationCountForRooms(
+                            roomSummaryQueryParams {
+                                memberships = listOf(Membership.JOIN)
+                                roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                            }
+                    )
 
-                    val otherRooms = session.getNotificationCountForRooms(roomSummaryQueryParams {
-                        memberships = listOf(Membership.JOIN)
-                        roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                    })
+                    val otherRooms = session.getNotificationCountForRooms(
+                            roomSummaryQueryParams {
+                                memberships = listOf(Membership.JOIN)
+                                roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                            }
+                    )
 
                     setState {
                         copy(

From b390980ca2cb70d221529faa0b8202642d9bef4f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 16:51:32 +0200
Subject: [PATCH 478/578] Resurrect mark all as read

---
 .../app/features/home/HomeDetailAction.kt     |  1 +
 .../app/features/home/HomeDetailFragment.kt   | 33 +++++++++++++++--
 .../app/features/home/HomeDetailViewModel.kt  | 30 +++++++++++++++-
 .../app/features/home/HomeDetailViewState.kt  |  1 +
 .../features/home/room/list/RoomListAction.kt |  1 -
 .../home/room/list/RoomListFragment.kt        | 35 -------------------
 .../home/room/list/RoomListViewModel.kt       | 10 ------
 7 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt
index 447820ed7b..c64f9d453d 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt
@@ -20,4 +20,5 @@ import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class HomeDetailAction : VectorViewModelAction {
     data class SwitchDisplayMode(val displayMode: RoomListDisplayMode) : HomeDetailAction()
+    object MarkAllRoomsRead : HomeDetailAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 4c7b7aa991..5def43b60b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -18,6 +18,8 @@ package im.vector.app.features.home
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
@@ -33,8 +35,8 @@ import im.vector.app.core.platform.ToolbarConfigurable
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.ui.views.CurrentCallsView
-import im.vector.app.core.ui.views.KnownCallsViewHolder
 import im.vector.app.core.ui.views.KeysBackupBanner
+import im.vector.app.core.ui.views.KnownCallsViewHolder
 import im.vector.app.databinding.FragmentHomeDetailBinding
 import im.vector.app.features.call.SharedKnownCallsViewModel
 import im.vector.app.features.call.VectorCallActivity
@@ -49,7 +51,6 @@ import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.BannerState
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
-
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
@@ -79,6 +80,32 @@ class HomeDetailFragment @Inject constructor(
     private lateinit var sharedActionViewModel: HomeSharedActionViewModel
     private lateinit var sharedCallActionViewModel: SharedKnownCallsViewModel
 
+    private var hasUnreadRooms = false
+        set(value) {
+            if (value != field) {
+                field = value
+                invalidateOptionsMenu()
+            }
+        }
+
+    override fun getMenuRes() = R.menu.room_list
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.menu_home_mark_all_as_read -> {
+                viewModel.handle(HomeDetailAction.MarkAllRoomsRead)
+                return true
+            }
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        menu.findItem(R.id.menu_home_mark_all_as_read).isVisible = hasUnreadRooms
+        super.onPrepareOptionsMenu(menu)
+    }
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentHomeDetailBinding {
         return FragmentHomeDetailBinding.inflate(inflater, container, false)
     }
@@ -314,6 +341,8 @@ class HomeDetailFragment @Inject constructor(
         views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_rooms).render(it.notificationCountRooms, it.notificationHighlightRooms)
         views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_notification).render(it.notificationCountCatchup, it.notificationHighlightCatchup)
         views.syncStateView.render(it.syncState)
+
+        hasUnreadRooms = it.hasUnreadMessages
     }
 
     private fun BadgeDrawable.render(count: Int, highlight: Boolean) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 07e2426200..8a73b2e0f9 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home
 
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
@@ -28,12 +29,16 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.ui.UiStateRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
+import timber.log.Timber
 import java.util.concurrent.TimeUnit
 
 /**
@@ -77,6 +82,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     override fun handle(action: HomeDetailAction) {
         when (action) {
             is HomeDetailAction.SwitchDisplayMode -> handleSwitchDisplayMode(action)
+            HomeDetailAction.MarkAllRoomsRead -> handleMarkAllRoomsRead()
         }
     }
 
@@ -92,6 +98,27 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
 
     // PRIVATE METHODS *****************************************************************************
 
+    private fun handleMarkAllRoomsRead() = withState { _ ->
+        // questionable to use viewmodelscope
+        viewModelScope.launch(Dispatchers.Default) {
+            val roomIds = session.getRoomSummaries(
+                    roomSummaryQueryParams {
+                        this.memberships = listOf(Membership.JOIN)
+                        this.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
+                    }
+            ).map {
+                it.roomId
+            }
+            try {
+                awaitCallback<Unit> {
+                    session.markAllAsRead(roomIds, it)
+                }
+            } catch (failure: Throwable) {
+                Timber.d(failure, "Failed to mark all as read")
+            }
+        }
+    }
+
     private fun observeSyncState() {
         session.rx()
                 .liveSyncState()
@@ -157,7 +184,8 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                 notificationCountPeople = dmRooms.totalCount() + dmInvites,
                                 notificationHighlightPeople = dmRooms.isHighlight() || dmInvites > 0,
                                 notificationCountRooms = otherRooms.totalCount() + roomsInvite,
-                                notificationHighlightRooms = otherRooms.isHighlight() || roomsInvite > 0
+                                notificationHighlightRooms = otherRooms.isHighlight() || roomsInvite > 0,
+                                hasUnreadMessages = dmRooms.totalCount() + otherRooms.totalCount() > 0
                         )
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index f5e4bc9fa3..533c9166f9 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -34,5 +34,6 @@ data class HomeDetailViewState(
         val notificationHighlightPeople: Boolean = false,
         val notificationCountRooms: Int = 0,
         val notificationHighlightRooms: Boolean = false,
+        val hasUnreadMessages: Boolean = false,
         val syncState: SyncState = SyncState.Idle
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
index 0d70f99b3a..a5c071680d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
@@ -29,5 +29,4 @@ sealed class RoomListAction : VectorViewModelAction {
     data class ChangeRoomNotificationState(val roomId: String, val notificationState: RoomNotificationState) : RoomListAction()
     data class ToggleTag(val roomId: String, val tag: String) : RoomListAction()
     data class LeaveRoom(val roomId: String) : RoomListAction()
-    object MarkAllRoomsRead : RoomListAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 0e7e35654c..ac59283e7a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -20,8 +20,6 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
@@ -84,8 +82,6 @@ class RoomListFragment @Inject constructor(
         return FragmentRoomListBinding.inflate(inflater, container, false)
     }
 
-    private var hasUnreadRooms = false
-
     data class SectionKey(
             val name: String,
             val isExpanded: Boolean
@@ -100,24 +96,6 @@ class RoomListFragment @Inject constructor(
     private val adapterInfosList = mutableListOf<SectionAdapterInfo>()
     private var concatAdapter: ConcatAdapter? = null
 
-    override fun getMenuRes() = R.menu.room_list
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_home_mark_all_as_read -> {
-                roomListViewModel.handle(RoomListAction.MarkAllRoomsRead)
-                return true
-            }
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        menu.findItem(R.id.menu_home_mark_all_as_read).isVisible = hasUnreadRooms
-        super.onPrepareOptionsMenu(menu)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupCreateRoomButton()
@@ -373,19 +351,6 @@ class RoomListFragment @Inject constructor(
 
     override fun invalidate() = withState(roomListViewModel) { state ->
         footerController.setData(state)
-        // Mark all as read menu
-        when (roomListParams.displayMode) {
-            RoomListDisplayMode.NOTIFICATIONS,
-            RoomListDisplayMode.PEOPLE,
-            RoomListDisplayMode.ROOMS -> {
-                val newValue = state.hasUnread
-                if (hasUnreadRooms != newValue) {
-                    hasUnreadRooms = newValue
-                    invalidateOptionsMenu()
-                }
-            }
-            else                      -> Unit
-        }
     }
 
     private fun checkEmptyState() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 4b1af3cbaf..76e8b1adaf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -160,7 +160,6 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
             is RoomListAction.AcceptInvitation -> handleAcceptInvitation(action)
             is RoomListAction.RejectInvitation -> handleRejectInvitation(action)
             is RoomListAction.FilterWith -> handleFilter(action)
-            is RoomListAction.MarkAllRoomsRead -> handleMarkAllRoomsRead()
             is RoomListAction.LeaveRoom -> handleLeaveRoom(action)
             is RoomListAction.ChangeRoomNotificationState -> handleChangeNotificationMode(action)
             is RoomListAction.ToggleTag -> handleToggleTag(action)
@@ -276,15 +275,6 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         }
     }
 
-    private fun handleMarkAllRoomsRead() = withState { _ ->
-//        state.asyncFilteredRooms.invoke()
-//                ?.flatMap { it.value }
-//                ?.filter { it.membership == Membership.JOIN }
-//                ?.map { it.roomId }
-//                ?.toList()
-//                ?.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
-    }
-
     private fun handleChangeNotificationMode(action: RoomListAction.ChangeRoomNotificationState) {
         val room = session.getRoom(action.roomId)
         if (room != null) {

From cd6fab0e2d35a0a5d92f563acf35188bea84aaa8 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 31 Mar 2021 17:36:24 +0200
Subject: [PATCH 479/578] Fix empty state + cleaning + changelog

---
 CHANGES.md                                                      | 1 +
 .../im/vector/app/features/home/room/list/RoomListFragment.kt   | 2 +-
 .../vector/app/features/home/room/list/SectionHeaderAdapter.kt  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ed549c918f..45b3905375 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Improvements 🙌:
  - Update reactions to Unicode 13.1 (#2998)
  - Be more robust when parsing some enums
  - Improve timeline filtering (dissociate membership and profile events, display hidden events when highlighted, fix hidden item/read receipts behavior)
+ - Room list improvements (paging)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index ac59283e7a..cf74cae37c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -249,7 +249,7 @@ class RoomListFragment @Inject constructor(
             val contentAdapter = pagedControllerFactory.createRoomSummaryPagedController().also {
                 section.livePages.observe(viewLifecycleOwner) { pl ->
                     it.submitList(pl)
-                    sectionAdapter.updateSection(sectionAdapter.section.copy(isHidden = pl.isEmpty() || hasOnlyOneSection))
+                    sectionAdapter.updateSection(sectionAdapter.section.copy(isHidden = pl.isEmpty()))
                     checkEmptyState()
                 }
                 section.notificationCount.observe(viewLifecycleOwner) { counts ->
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
index 30f0e671f9..b137947ef7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
@@ -64,7 +64,7 @@ class SectionHeaderAdapter constructor(
         holder.bind(section)
     }
 
-    override fun getItemCount(): Int = 1.takeIf { section.isHidden.not() } ?: 0
+    override fun getItemCount(): Int = if (section.isHidden) 0 else 1
 
     class VH constructor(
             private val binding: ItemRoomCategoryBinding,

From f998c2f945b40d6d373778da61d566bf5b2b3ef8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 22:53:29 +0200
Subject: [PATCH 480/578] Fix avatar rendering for DMs, after initial sync
 (#2693) Also better handling of previous DMs management

---
 CHANGES.md                                    |  1 +
 .../query/RoomSummaryEntityQueries.kt         |  8 +++++-
 .../session/room/RoomAvatarResolver.kt        |  8 +++---
 .../sync/UserAccountDataSyncHandler.kt        | 27 ++++++++++++-------
 .../accountdata/DirectMessagesContent.kt      |  5 +++-
 5 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ed549c918f..1601e0ec85 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ Bugfix 🐛:
  - Fix bad theme change for the MainActivity
  - Handle encrypted reactions (#2509)
  - Disable URL preview for some domains (#2995)
+ - Fix avatar rendering for DMs, after initial sync (#2693)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
index 7430b7822f..2af5dcf0ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
@@ -48,9 +48,15 @@ internal fun RoomSummaryEntity.Companion.getOrCreate(realm: Realm, roomId: Strin
     return where(realm, roomId).findFirst() ?: realm.createObject(roomId)
 }
 
-internal fun RoomSummaryEntity.Companion.getDirectRooms(realm: Realm): RealmResults<RoomSummaryEntity> {
+internal fun RoomSummaryEntity.Companion.getDirectRooms(realm: Realm,
+                                                        excludeRoomIds: Set<String>? = null): RealmResults<RoomSummaryEntity> {
     return RoomSummaryEntity.where(realm)
             .equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+            .apply {
+                if (!excludeRoomIds.isNullOrEmpty()) {
+                    not().`in`(RoomSummaryEntityFields.ROOM_ID, excludeRoomIds.toTypedArray())
+                }
+            }
             .findAll()
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
index 99f9d3644d..9bcb1eb196 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
@@ -16,18 +16,18 @@
 
 package org.matrix.android.sdk.internal.session.room
 
+import io.realm.Realm
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.RoomAvatarContent
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.query.getOrNull
+import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
-import io.realm.Realm
-import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
-import org.matrix.android.sdk.internal.database.query.where
 import javax.inject.Inject
 
 internal class RoomAvatarResolver @Inject constructor(@UserId private val userId: String) {
@@ -48,7 +48,7 @@ internal class RoomAvatarResolver @Inject constructor(@UserId private val userId
         val roomMembers = RoomMemberHelper(realm, roomId)
         val members = roomMembers.queryActiveRoomMembersEvent().findAll()
         // detect if it is a room with no more than 2 members (i.e. an alone or a 1:1 chat)
-        val isDirectRoom =  RoomSummaryEntity.where(realm, roomId).findFirst()?.isDirect ?: false
+        val isDirectRoom = RoomSummaryEntity.where(realm, roomId).findFirst()?.isDirect ?: false
         if (isDirectRoom) {
             if (members.size == 1) {
                 res = members.firstOrNull()?.avatarUrl
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
index 449d47abe5..907c1187fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
@@ -45,6 +45,7 @@ import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.RoomAvatarResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.sync.model.InvitedRoomSync
 import org.matrix.android.sdk.internal.session.sync.model.accountdata.BreadcrumbsContent
@@ -60,7 +61,9 @@ internal class UserAccountDataSyncHandler @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         @UserId private val userId: String,
         private val directChatsHelper: DirectChatsHelper,
-        private val updateUserAccountDataTask: UpdateUserAccountDataTask) {
+        private val updateUserAccountDataTask: UpdateUserAccountDataTask,
+        private val roomAvatarResolver: RoomAvatarResolver
+) {
 
     fun handle(realm: Realm, accountData: UserAccountDataSync?) {
         accountData?.list?.forEach { event ->
@@ -151,23 +154,27 @@ internal class UserAccountDataSyncHandler @Inject constructor(
     }
 
     private fun handleDirectChatRooms(realm: Realm, event: UserAccountDataEvent) {
-        val oldDirectRooms = RoomSummaryEntity.getDirectRooms(realm)
-        oldDirectRooms.forEach {
-            it.isDirect = false
-            it.directUserId = null
-        }
         val content = event.content.toModel<DirectMessagesContent>() ?: return
-        content.forEach {
-            val userId = it.key
-            it.value.forEach { roomId ->
+        content.forEach { (userId, roomIds) ->
+            roomIds.forEach { roomId ->
                 val roomSummaryEntity = RoomSummaryEntity.where(realm, roomId).findFirst()
                 if (roomSummaryEntity != null) {
                     roomSummaryEntity.isDirect = true
                     roomSummaryEntity.directUserId = userId
-                    realm.insertOrUpdate(roomSummaryEntity)
+                    // Also update the avatar, there is a specific treatment for DMs
+                    roomSummaryEntity.avatarUrl = roomAvatarResolver.resolve(realm, roomId)
                 }
             }
         }
+
+        // Handle previous direct rooms
+        RoomSummaryEntity.getDirectRooms(realm, excludeRoomIds = content.values.flatten().toSet())
+                .forEach {
+                    it.isDirect = false
+                    it.directUserId = null
+                    // Also update the avatar, there was a specific treatment for DMs
+                    it.avatarUrl = roomAvatarResolver.resolve(realm, it.roomId)
+                }
     }
 
     private fun handleIgnoredUsers(realm: Realm, event: UserAccountDataEvent) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
index c406f3acf1..41173dea96 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
@@ -16,4 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.sync.model.accountdata
 
-typealias DirectMessagesContent = Map<String, List<String>>
+/**
+ * Keys are userIds, values are list of roomIds
+ */
+internal typealias DirectMessagesContent = Map<String, List<String>>

From fe80b7bd6a3b6d899e4fbf22b4ef42e88a7b2cd0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 31 Mar 2021 23:16:32 +0200
Subject: [PATCH 481/578] Dominaezzz' review: remove withContext usage

---
 .../session/terms/DefaultTermsService.kt      | 58 +++++++++----------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
index 73545205d1..bac725fad2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
@@ -17,24 +17,22 @@
 package org.matrix.android.sdk.internal.session.terms
 
 import dagger.Lazy
-import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.terms.GetTermsResponse
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.identity.IdentityAuthAPI
 import org.matrix.android.sdk.internal.session.identity.IdentityRegisterTask
 import org.matrix.android.sdk.internal.session.openid.GetOpenIdTokenTask
 import org.matrix.android.sdk.internal.session.sync.model.accountdata.AcceptedTermsContent
-import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.internal.session.user.accountdata.AccountDataDataSource
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
-import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.internal.util.ensureTrailingSlash
-import okhttp3.OkHttpClient
-import org.matrix.android.sdk.internal.network.executeRequest
 import javax.inject.Inject
 
 internal class DefaultTermsService @Inject constructor(
@@ -45,43 +43,39 @@ internal class DefaultTermsService @Inject constructor(
         private val retrofitFactory: RetrofitFactory,
         private val getOpenIdTokenTask: GetOpenIdTokenTask,
         private val identityRegisterTask: IdentityRegisterTask,
-        private val updateUserAccountDataTask: UpdateUserAccountDataTask,
-        private val coroutineDispatchers: MatrixCoroutineDispatchers
+        private val updateUserAccountDataTask: UpdateUserAccountDataTask
 ) : TermsService {
+
     override suspend fun getTerms(serviceType: TermsService.ServiceType,
-                                 baseUrl: String): GetTermsResponse {
-        return withContext(coroutineDispatchers.io) {
-            val url = buildUrl(baseUrl, serviceType)
-            val termsResponse = executeRequest(null) {
-                termsAPI.getTerms("${url}terms")
-            }
-            GetTermsResponse(termsResponse, getAlreadyAcceptedTermUrlsFromAccountData())
+                                  baseUrl: String): GetTermsResponse {
+        val url = buildUrl(baseUrl, serviceType)
+        val termsResponse = executeRequest(null) {
+            termsAPI.getTerms("${url}terms")
         }
+        return GetTermsResponse(termsResponse, getAlreadyAcceptedTermUrlsFromAccountData())
     }
 
     override suspend fun agreeToTerms(serviceType: TermsService.ServiceType,
                                       baseUrl: String,
                                       agreedUrls: List<String>,
                                       token: String?) {
-        withContext(coroutineDispatchers.io) {
-            val url = buildUrl(baseUrl, serviceType)
-            val tokenToUse = token?.takeIf { it.isNotEmpty() } ?: getToken(baseUrl)
+        val url = buildUrl(baseUrl, serviceType)
+        val tokenToUse = token?.takeIf { it.isNotEmpty() } ?: getToken(baseUrl)
 
-            executeRequest(null) {
-                termsAPI.agreeToTerms("${url}terms", AcceptTermsBody(agreedUrls), "Bearer $tokenToUse")
-            }
-
-            // client SHOULD update this account data section adding any the URLs
-            // of any additional documents that the user agreed to this list.
-            // Get current m.accepted_terms append new ones and update account data
-            val listOfAcceptedTerms = getAlreadyAcceptedTermUrlsFromAccountData()
-
-            val newList = listOfAcceptedTerms.toMutableSet().apply { addAll(agreedUrls) }.toList()
-
-            updateUserAccountDataTask.execute(UpdateUserAccountDataTask.AcceptedTermsParams(
-                    acceptedTermsContent = AcceptedTermsContent(newList)
-            ))
+        executeRequest(null) {
+            termsAPI.agreeToTerms("${url}terms", AcceptTermsBody(agreedUrls), "Bearer $tokenToUse")
         }
+
+        // client SHOULD update this account data section adding any the URLs
+        // of any additional documents that the user agreed to this list.
+        // Get current m.accepted_terms append new ones and update account data
+        val listOfAcceptedTerms = getAlreadyAcceptedTermUrlsFromAccountData()
+
+        val newList = listOfAcceptedTerms.toMutableSet().apply { addAll(agreedUrls) }.toList()
+
+        updateUserAccountDataTask.execute(UpdateUserAccountDataTask.AcceptedTermsParams(
+                acceptedTermsContent = AcceptedTermsContent(newList)
+        ))
     }
 
     private suspend fun getToken(url: String): String {
@@ -97,7 +91,7 @@ internal class DefaultTermsService @Inject constructor(
     private fun buildUrl(baseUrl: String, serviceType: TermsService.ServiceType): String {
         val servicePath = when (serviceType) {
             TermsService.ServiceType.IntegrationManager -> NetworkConstants.URI_INTEGRATION_MANAGER_PATH
-            TermsService.ServiceType.IdentityService    -> NetworkConstants.URI_IDENTITY_PATH_V2
+            TermsService.ServiceType.IdentityService -> NetworkConstants.URI_IDENTITY_PATH_V2
         }
         return "${baseUrl.ensureTrailingSlash()}$servicePath"
     }

From 52ba67c9c04c9de52d2b9f98b34ba878d20c588b Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 1 Apr 2021 09:12:18 +0200
Subject: [PATCH 482/578] unused val

---
 .../im/vector/app/features/home/room/list/RoomListFragment.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index cf74cae37c..05bf9a8a84 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -235,7 +235,7 @@ class RoomListFragment @Inject constructor(
         modelBuildListener = OnModelBuildFinishedListener { it.dispatchTo(stateRestorer) }
 
         val concatAdapter = ConcatAdapter()
-        val hasOnlyOneSection = roomListViewModel.sections.size == 1
+//        val hasOnlyOneSection = roomListViewModel.sections.size == 1
         roomListViewModel.sections.forEach { section ->
 
             val sectionAdapter = SectionHeaderAdapter {

From ba27a601dd6a03ec468b0a629247e2d7ab9a41b2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 1 Apr 2021 11:44:53 +0200
Subject: [PATCH 483/578] Dominaezzz' review: remove Request class, just use
 executeRequest()

---
 .../internal/crypto/tasks/SendToDeviceTask.kt | 21 +++---
 .../crypto/tasks/UploadSignaturesTask.kt      | 11 ++--
 .../android/sdk/internal/network/Request.kt   | 65 ++++++++-----------
 .../room/membership/joining/InviteTask.kt     | 14 ++--
 .../session/room/read/SetReadMarkersTask.kt   | 10 +--
 .../session/room/timeline/PaginationTask.kt   | 10 +--
 6 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
index fe6868968b..b3fb704131 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
@@ -48,17 +48,14 @@ internal class DefaultSendToDeviceTask @Inject constructor(
 
         return executeRequest(
                 globalErrorReceiver,
-                {
-                    cryptoApi.sendToDevice(
-                            params.eventType,
-                            params.transactionId ?: Random.nextInt(Integer.MAX_VALUE).toString(),
-                            sendToDeviceBody
-                    )
-                },
-                {
-                    isRetryable = true
-                    maxRetryCount = 3
-                }
-        )
+                isRetryable = true,
+                maxRetryCount = 3
+        ) {
+            cryptoApi.sendToDevice(
+                    params.eventType,
+                    params.transactionId ?: Random.nextInt(Integer.MAX_VALUE).toString(),
+                    sendToDeviceBody
+            )
+        }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
index bac886cafc..15cf017dc9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
@@ -37,12 +37,11 @@ internal class DefaultUploadSignaturesTask @Inject constructor(
         try {
             val response = executeRequest(
                     globalErrorReceiver,
-                    { cryptoApi.uploadSignatures(params.signatures) },
-                    {
-                        isRetryable = true
-                        maxRetryCount = 10
-                    }
-            )
+                    isRetryable = true,
+                    maxRetryCount = 10
+            ) {
+                cryptoApi.uploadSignatures(params.signatures)
+            }
             if (response.failures?.isNotEmpty() == true) {
                 throw Throwable(response.failures.toString())
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 9f3000ce18..9aa242aecf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -25,44 +25,35 @@ import retrofit2.HttpException
 import timber.log.Timber
 import java.io.IOException
 
-// To use when there is no init block to provide
-internal suspend inline fun <DATA : Any> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
-                                                        noinline requestBlock: suspend () -> DATA): DATA {
-    return executeRequest(globalErrorReceiver, requestBlock, {})
-}
+/**
+ * Execute a request from the requestBlock and handle some of the Exception it could generate
+ *
+ * @param globalErrorReceiver will be use to notify error such as invalid token error. See [GlobalError]
+ * @param isRetryable if set to true, the request will be executed again in case of error, after a delay
+ * @param initialDelay the first delay to wait before a request is retried. Will be doubled after each retry
+ * @param maxDelay the max delay to wait before a retry
+ * @param maxRetryCount the max number of retries
+ * @param requestBlock a suspend lambda to perform the network request
+ */
+internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
+                                                  isRetryable: Boolean = false,
+                                                  initialDelay: Long = 100L,
+                                                  maxDelay: Long = 10_000L,
+                                                  maxRetryCount: Int = Int.MAX_VALUE,
+                                                  noinline requestBlock: suspend () -> DATA): DATA {
+    var currentRetryCount = 0
+    var currentDelay = initialDelay
 
-internal suspend inline fun <DATA : Any> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
-                                                        noinline requestBlock: suspend () -> DATA,
-                                                        initBlock: Request<DATA>.() -> Unit): DATA {
-    return Request(globalErrorReceiver, requestBlock)
-            .apply(initBlock)
-            .execute()
-}
-
-internal class Request<DATA : Any>(
-        private val globalErrorReceiver: GlobalErrorReceiver?,
-        private val requestBlock: suspend () -> DATA
-) {
-
-    var isRetryable = false
-    var initialDelay: Long = 100L
-    var maxDelay: Long = 10_000L
-    var maxRetryCount = Int.MAX_VALUE
-    private var currentRetryCount = 0
-    private var currentDelay = initialDelay
-
-    suspend fun execute(): DATA {
-        return try {
-            try {
-                requestBlock()
-            } catch (exception: Throwable) {
-                throw when (exception) {
-                    is KotlinNullPointerException -> IllegalStateException("The request returned a null body")
-                    is HttpException              -> exception.toFailure(globalErrorReceiver)
-                    else                          -> exception
-                }
+    while (true) {
+        try {
+            return requestBlock()
+        } catch (throwable: Throwable) {
+            val exception = when (throwable) {
+                is KotlinNullPointerException -> IllegalStateException("The request returned a null body")
+                is HttpException              -> throwable.toFailure(globalErrorReceiver)
+                else                          -> throwable
             }
-        } catch (exception: Throwable) {
+
             // Log some details about the request which has failed. This is less useful than before...
             // Timber.e("Exception when executing request ${apiCall.request().method} ${apiCall.request().url.toString().substringBefore("?")}")
             Timber.e("Exception when executing request")
@@ -79,7 +70,7 @@ internal class Request<DATA : Any>(
             if (isRetryable && currentRetryCount++ < maxRetryCount && exception.shouldBeRetried()) {
                 delay(currentDelay)
                 currentDelay = (currentDelay * 2L).coerceAtMost(maxDelay)
-                return execute()
+                // Try again (loop)
             } else {
                 throw when (exception) {
                     is IOException              -> Failure.NetworkConnection(exception)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
index 0f141c344a..ab1299c34a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
@@ -37,12 +37,12 @@ internal class DefaultInviteTask @Inject constructor(
 
     override suspend fun execute(params: InviteTask.Params) {
         val body = InviteBody(params.userId, params.reason)
-        return executeRequest(globalErrorReceiver,
-                { roomAPI.invite(params.roomId, body) },
-                {
-                    isRetryable = true
-                    maxRetryCount = 3
-                }
-        )
+        return executeRequest(
+                globalErrorReceiver,
+                isRetryable = true,
+                maxRetryCount = 3
+        ) {
+            roomAPI.invite(params.roomId, body)
+        }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index 23a3f2d36c..aa1eaff119 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -96,10 +96,12 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
             updateDatabase(params.roomId, markers, shouldUpdateRoomSummary)
         }
         if (markers.isNotEmpty()) {
-            executeRequest(globalErrorReceiver,
-                    { roomAPI.sendReadMarker(params.roomId, markers) },
-                    { isRetryable = true }
-            )
+            executeRequest(
+                    globalErrorReceiver,
+                    isRetryable = true
+            ) {
+                roomAPI.sendReadMarker(params.roomId, markers)
+            }
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
index b1ce5c1f26..ac46c9c9ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
@@ -42,10 +42,12 @@ internal class DefaultPaginationTask @Inject constructor(
 
     override suspend fun execute(params: PaginationTask.Params): TokenChunkEventPersistor.Result {
         val filter = filterRepository.getRoomFilter()
-        val chunk = executeRequest(globalErrorReceiver,
-                { roomAPI.getRoomMessagesFrom(params.roomId, params.from, params.direction.value, params.limit, filter) },
-                { isRetryable = true }
-        )
+        val chunk = executeRequest(
+                globalErrorReceiver,
+                isRetryable = true
+        ) {
+            roomAPI.getRoomMessagesFrom(params.roomId, params.from, params.direction.value, params.limit, filter)
+        }
         return tokenChunkEventPersistor.insertInDb(chunk, params.roomId, params.direction)
     }
 }

From 1f2d6bea21b79512ca5414c291e3ba3acf25d409 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Apr 2021 12:11:49 +0200
Subject: [PATCH 484/578] Do some renaming

---
 .../internal/crypto/tasks/SendToDeviceTask.kt |  4 ++--
 .../crypto/tasks/UploadSignaturesTask.kt      |  4 ++--
 .../android/sdk/internal/network/Request.kt   | 22 +++++++++----------
 .../room/membership/joining/InviteTask.kt     |  4 ++--
 .../session/room/read/SetReadMarkersTask.kt   |  2 +-
 .../session/room/timeline/PaginationTask.kt   |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
index b3fb704131..41a5118be0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
@@ -48,8 +48,8 @@ internal class DefaultSendToDeviceTask @Inject constructor(
 
         return executeRequest(
                 globalErrorReceiver,
-                isRetryable = true,
-                maxRetryCount = 3
+                canRetry = true,
+                maxRetriesCount = 3
         ) {
             cryptoApi.sendToDevice(
                     params.eventType,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
index 15cf017dc9..e03e353cb1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
@@ -37,8 +37,8 @@ internal class DefaultUploadSignaturesTask @Inject constructor(
         try {
             val response = executeRequest(
                     globalErrorReceiver,
-                    isRetryable = true,
-                    maxRetryCount = 10
+                    canRetry = true,
+                    maxRetriesCount = 10
             ) {
                 cryptoApi.uploadSignatures(params.signatures)
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 9aa242aecf..24b9b83f75 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -29,20 +29,20 @@ import java.io.IOException
  * Execute a request from the requestBlock and handle some of the Exception it could generate
  *
  * @param globalErrorReceiver will be use to notify error such as invalid token error. See [GlobalError]
- * @param isRetryable if set to true, the request will be executed again in case of error, after a delay
- * @param initialDelay the first delay to wait before a request is retried. Will be doubled after each retry
- * @param maxDelay the max delay to wait before a retry
- * @param maxRetryCount the max number of retries
+ * @param canRetry if set to true, the request will be executed again in case of error, after a delay
+ * @param initialDelayBeforeRetry the first delay to wait before a request is retried. Will be doubled after each retry
+ * @param maxDelayBeforeRetry the max delay to wait before a retry
+ * @param maxRetriesCount the max number of retries
  * @param requestBlock a suspend lambda to perform the network request
  */
 internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
-                                                  isRetryable: Boolean = false,
-                                                  initialDelay: Long = 100L,
-                                                  maxDelay: Long = 10_000L,
-                                                  maxRetryCount: Int = Int.MAX_VALUE,
+                                                  canRetry: Boolean = false,
+                                                  initialDelayBeforeRetry: Long = 100L,
+                                                  maxDelayBeforeRetry: Long = 10_000L,
+                                                  maxRetriesCount: Int = Int.MAX_VALUE,
                                                   noinline requestBlock: suspend () -> DATA): DATA {
     var currentRetryCount = 0
-    var currentDelay = initialDelay
+    var currentDelay = initialDelayBeforeRetry
 
     while (true) {
         try {
@@ -67,9 +67,9 @@ internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErr
                     // }
                     ?.also { unrecognizedCertificateException -> throw unrecognizedCertificateException }
 
-            if (isRetryable && currentRetryCount++ < maxRetryCount && exception.shouldBeRetried()) {
+            if (canRetry && currentRetryCount++ < maxRetriesCount && exception.shouldBeRetried()) {
                 delay(currentDelay)
-                currentDelay = (currentDelay * 2L).coerceAtMost(maxDelay)
+                currentDelay = (currentDelay * 2L).coerceAtMost(maxDelayBeforeRetry)
                 // Try again (loop)
             } else {
                 throw when (exception) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
index ab1299c34a..7e7b80baaf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
@@ -39,8 +39,8 @@ internal class DefaultInviteTask @Inject constructor(
         val body = InviteBody(params.userId, params.reason)
         return executeRequest(
                 globalErrorReceiver,
-                isRetryable = true,
-                maxRetryCount = 3
+                canRetry = true,
+                maxRetriesCount = 3
         ) {
             roomAPI.invite(params.roomId, body)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index aa1eaff119..35dc6a4f0c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -98,7 +98,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
         if (markers.isNotEmpty()) {
             executeRequest(
                     globalErrorReceiver,
-                    isRetryable = true
+                    canRetry = true
             ) {
                 roomAPI.sendReadMarker(params.roomId, markers)
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
index ac46c9c9ff..8aeccb66c8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationTask.kt
@@ -44,7 +44,7 @@ internal class DefaultPaginationTask @Inject constructor(
         val filter = filterRepository.getRoomFilter()
         val chunk = executeRequest(
                 globalErrorReceiver,
-                isRetryable = true
+                canRetry = true
         ) {
             roomAPI.getRoomMessagesFrom(params.roomId, params.from, params.direction.value, params.limit, filter)
         }

From 0bc864fc37cc6b5ec5cd9f31bcedec1f4b1938a5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Apr 2021 13:51:16 +0200
Subject: [PATCH 485/578] Better handling on 429

---
 .../org/matrix/android/sdk/api/failure/Extensions.kt | 12 ++++++++++++
 .../matrix/android/sdk/internal/network/Request.kt   |  6 ++++--
 .../room/send/queue/EventSenderProcessorCoroutine.kt |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index e0ee9f36ba..17362ff8d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -37,6 +37,18 @@ fun Throwable.shouldBeRetried(): Boolean {
             || (this is Failure.ServerError && error.code == MatrixError.M_LIMIT_EXCEEDED)
 }
 
+/**
+ * Get the retry delay in case of rate limit exceeded error, adding 100 ms, of defaultValue otherwise
+ */
+fun Throwable.getRetryDelay(defaultValue: Long): Long {
+    return (this as? Failure.ServerError)
+            ?.error
+            ?.takeIf { it.code == MatrixError.M_LIMIT_EXCEEDED }
+            ?.retryAfterMillis
+            ?.plus(100L)
+            ?: defaultValue
+}
+
 fun Throwable.isInvalidPassword(): Boolean {
     return this is Failure.ServerError
             && error.code == MatrixError.M_FORBIDDEN
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 24b9b83f75..d9f102c7e0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.network
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.getRetryDelay
 import org.matrix.android.sdk.api.failure.shouldBeRetried
 import org.matrix.android.sdk.internal.network.ssl.CertUtil
 import retrofit2.HttpException
@@ -68,8 +69,9 @@ internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErr
                     ?.also { unrecognizedCertificateException -> throw unrecognizedCertificateException }
 
             if (canRetry && currentRetryCount++ < maxRetriesCount && exception.shouldBeRetried()) {
-                delay(currentDelay)
-                currentDelay = (currentDelay * 2L).coerceAtMost(maxDelayBeforeRetry)
+                // In case of 429, ensure we wait enough
+                delay(currentDelay.coerceAtLeast(exception.getRetryDelay(0)))
+                currentDelay = currentDelay.times(2L).coerceAtMost(maxDelayBeforeRetry)
                 // Try again (loop)
             } else {
                 throw when (exception) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
index 2972332989..a5c09f5ff6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
@@ -24,6 +24,7 @@ import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.failure.getRetryDelay
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.util.Cancelable
@@ -148,8 +149,7 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
                     task.markAsFailedOrRetry(exception, 0)
                 }
                 (exception is Failure.ServerError && exception.error.code == MatrixError.M_LIMIT_EXCEEDED) -> {
-                    val delay = exception.error.retryAfterMillis?.plus(100) ?: 3_000
-                    task.markAsFailedOrRetry(exception, delay)
+                    task.markAsFailedOrRetry(exception, exception.getRetryDelay(3_000))
                 }
                 exception is CancellationException                                                         -> {
                     Timber.v("## $task has been cancelled, try next task")

From ec3266f7e8cfe30e339db16888d4ac89f15e71a3 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 1 Apr 2021 15:47:58 +0200
Subject: [PATCH 486/578] remove dead code

---
 .../home/room/list/RoomListViewState.kt       | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index be4eae05db..104a3710f7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -16,12 +16,9 @@
 
 package im.vector.app.features.home.room.list
 
-import androidx.annotation.StringRes
 import com.airbnb.mvrx.MvRxState
-import im.vector.app.R
 import im.vector.app.features.home.RoomListDisplayMode
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 data class RoomListViewState(
         val displayMode: RoomListDisplayMode,
@@ -30,26 +27,4 @@ data class RoomListViewState(
 ) : MvRxState {
 
     constructor(args: RoomListParams) : this(displayMode = args.displayMode)
-
-    val hasUnread: Boolean = false
-//        get() = asyncFilteredRooms.invoke()
-//                ?.flatMap { it.value }
-//                ?.filter { it.membership == Membership.JOIN }
-//                ?.any { it.hasUnreadMessages }
-//                ?: false
-}
-
-typealias RoomSummaries = LinkedHashMap<RoomCategory, List<RoomSummary>>
-
-enum class RoomCategory(@StringRes val titleRes: Int) {
-    INVITE(R.string.invitations_header),
-    FAVOURITE(R.string.bottom_action_favourites),
-    DIRECT(R.string.bottom_action_people_x),
-    GROUP(R.string.bottom_action_rooms),
-    LOW_PRIORITY(R.string.low_priority_header),
-    SERVER_NOTICE(R.string.system_alerts_header)
-}
-
-fun RoomSummaries?.isNullOrEmpty(): Boolean {
-    return this == null || this.values.flatten().isEmpty()
 }

From bf6058dc32b24ca6b36eec90883dc02fe5753a97 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 1 Apr 2021 15:55:42 +0200
Subject: [PATCH 487/578] Show local echo of joining action

---
 .../home/room/list/RoomListFragment.kt        | 14 +++-
 .../home/room/list/RoomListViewModel.kt       | 65 +++++++++++++++----
 .../room/list/RoomSummaryPagedController.kt   | 24 +++----
 3 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 05bf9a8a84..8323c3b155 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -84,7 +84,8 @@ class RoomListFragment @Inject constructor(
 
     data class SectionKey(
             val name: String,
-            val isExpanded: Boolean
+            val isExpanded: Boolean,
+            val notifyOfLocalEcho: Boolean
     )
 
     data class SectionAdapterInfo(
@@ -116,6 +117,14 @@ class RoomListFragment @Inject constructor(
                 .observe()
                 .subscribe { handleQuickActions(it) }
                 .disposeOnDestroyView()
+
+        roomListViewModel.selectSubscribe(viewLifecycleOwner, RoomListViewState::roomMembershipChanges) { ms ->
+            // it's for invites local echo
+            adapterInfosList.filter { it.section.notifyOfLocalEcho }
+                    .onEach {
+                        it.contentAdapter.roomChangeMembershipStates = ms
+                    }
+        }
     }
 
     private fun refreshCollapseStates() {
@@ -267,7 +276,8 @@ class RoomListFragment @Inject constructor(
                     SectionAdapterInfo(
                             SectionKey(
                                     name = section.sectionName,
-                                    isExpanded = section.isExpanded.value.orTrue()
+                                    isExpanded = section.isExpanded.value.orTrue(),
+                                    notifyOfLocalEcho = section.notifyOfLocalEcho
                             ),
                             sectionAdapter,
                             contentAdapter
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 76e8b1adaf..21e4e5830c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
@@ -46,6 +47,7 @@ import org.matrix.android.sdk.api.session.room.state.isPublic
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.internal.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.rx.asObservable
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -60,6 +62,19 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
 
     private var updatableQuery: UpdatableFilterLivePageResult? = null
 
+    init {
+        observeMembershipChanges()
+    }
+
+    private fun observeMembershipChanges() {
+        session.rx()
+                .liveRoomChangeMembershipState()
+                .subscribe {
+                    setState { copy(roomMembershipChanges = it) }
+                }
+                .disposeOnClear()
+    }
+
     companion object : MvRxViewModelFactory<RoomListViewModel, RoomListViewState> {
 
         @JvmStatic
@@ -74,14 +89,15 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
             val livePages: LiveData<PagedList<RoomSummary>>,
             val isExpanded: MutableLiveData<Boolean> = MutableLiveData(true),
             val notificationCount: MutableLiveData<RoomAggregateNotificationCount> =
-                    MutableLiveData(RoomAggregateNotificationCount(0, 0))
+                    MutableLiveData(RoomAggregateNotificationCount(0, 0)),
+            val notifyOfLocalEcho: Boolean = false
     )
 
     val sections: List<RoomsSection> by lazy {
         val sections = mutableListOf<RoomsSection>()
         if (initialState.displayMode == RoomListDisplayMode.PEOPLE) {
 
-            addSection(sections, R.string.invitations_header) {
+            addSection(sections, R.string.invitations_header, true) {
                 it.memberships = listOf(Membership.INVITE)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
             }
@@ -98,7 +114,7 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
             }
         } else if (initialState.displayMode == RoomListDisplayMode.ROOMS) {
 
-            addSection(sections, R.string.invitations_header) {
+            addSection(sections, R.string.invitations_header, true) {
                 it.memberships = listOf(Membership.INVITE)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
             }
@@ -138,16 +154,15 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                         }
             }
         } else if (initialState.displayMode == RoomListDisplayMode.NOTIFICATIONS) {
-            withQueryParams({
-                it.memberships = Membership.activeMemberships()
+
+            addSection(sections, R.string.invitations_header, true) {
+                it.memberships = listOf(Membership.INVITE)
+                it.roomCategoryFilter = RoomCategoryFilter.ALL
+            }
+
+            addSection(sections, R.string.bottom_action_rooms, true) {
+                it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
-            }) { qpm ->
-                val name = stringProvider.getString(R.string.bottom_action_rooms)
-                session.getFilteredPagedRoomSummariesLive(qpm)
-                        .let { livePagedList ->
-                            updatableQuery = livePagedList
-                            sections.add(RoomsSection(name, livePagedList.livePagedList))
-                        }
             }
         }
 
@@ -167,7 +182,10 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         }.exhaustive
     }
 
-    private fun addSection(sections: MutableList<RoomsSection>, @StringRes nameRes: Int, query: (RoomSummaryQueryParams.Builder) -> Unit) {
+    private fun addSection(sections: MutableList<RoomsSection>,
+                           @StringRes nameRes: Int,
+                           notifyOfLocalEcho: Boolean = false,
+                           query: (RoomSummaryQueryParams.Builder) -> Unit) {
         withQueryParams({
             query.invoke(it)
         }) { roomQueryParams ->
@@ -185,7 +203,13 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                                             ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
                                 }.disposeOnClear()
 
-                        sections.add(RoomsSection(name, livePagedList))
+                        sections.add(
+                                RoomsSection(
+                                        sectionName = name,
+                                        livePages = livePagedList,
+                                        notifyOfLocalEcho = notifyOfLocalEcho
+                                )
+                        )
                     }
         }
     }
@@ -238,6 +262,19 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
             return@withState
         }
 
+        // quick echo
+        setState {
+            copy(
+                    roomMembershipChanges = roomMembershipChanges.mapValues {
+                        if (it.key == roomId) {
+                            ChangeMembershipState.Joining
+                        } else {
+                            it.value
+                        }
+                    }
+            )
+        }
+
         val room = session.getRoom(roomId) ?: return@withState
         viewModelScope.launch {
             try {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
index 75171dad39..38137e0033 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
@@ -18,24 +18,19 @@ package im.vector.app.features.home.room.list
 
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.paging.PagedListEpoxyController
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.core.utils.createUIHandler
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
-class RoomSummaryPagedControllerFactory @Inject constructor(private val stringProvider: StringProvider,
-                                                            private val userPreferencesProvider: UserPreferencesProvider,
-                                                            private val roomSummaryItemFactory: RoomSummaryItemFactory) {
+class RoomSummaryPagedControllerFactory @Inject constructor(private val roomSummaryItemFactory: RoomSummaryItemFactory) {
 
     fun createRoomSummaryPagedController(): RoomSummaryPagedController {
-        return RoomSummaryPagedController(stringProvider, userPreferencesProvider, roomSummaryItemFactory)
+        return RoomSummaryPagedController(roomSummaryItemFactory)
     }
 }
 
-class RoomSummaryPagedController constructor(private val stringProvider: StringProvider,
-                                             private val userPreferencesProvider: UserPreferencesProvider,
-                                             private val roomSummaryItemFactory: RoomSummaryItemFactory)
+class RoomSummaryPagedController constructor(private val roomSummaryItemFactory: RoomSummaryItemFactory)
     : PagedListEpoxyController<RoomSummary>(
 // Important it must match the PageList builder notify Looper
         modelBuildingHandler = createUIHandler()
@@ -43,9 +38,16 @@ class RoomSummaryPagedController constructor(private val stringProvider: StringP
 
     var listener: RoomListListener? = null
 
+    var roomChangeMembershipStates: Map<String, ChangeMembershipState>? = null
+        set(value) {
+            field = value
+            // ideally we could search for visible models and update only those
+            requestForcedModelBuild()
+        }
+
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
         val unwrappedItem = item
-                // for place holder if enabled
+        // for place holder if enabled
                 ?: return roomSummaryItemFactory.createRoomItem(
                         RoomSummary(
                                 roomId = "null_item_pos_$currentPosition",
@@ -57,7 +59,7 @@ class RoomSummaryPagedController constructor(private val stringProvider: StringP
 
 //        GenericItem_().apply { id("null_item_pos_$currentPosition") }
 
-        return roomSummaryItemFactory.create(unwrappedItem, emptyMap(), emptySet(), listener)
+        return roomSummaryItemFactory.create(unwrappedItem, roomChangeMembershipStates ?: emptyMap(), emptySet(), listener)
     }
 
 //    override fun onModelBound(holder: EpoxyViewHolder, boundModel: EpoxyModel<*>, position: Int, previouslyBoundModel: EpoxyModel<*>?) {

From f60e649d76b2402a7d7ca0079165744ed50fa49a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 1 Apr 2021 15:56:03 +0200
Subject: [PATCH 488/578] Fix / newly joined or created are at the bottom of
 room list

---
 .../session/room/create/CreateRoomTask.kt     | 15 ++++++++----
 .../room/membership/joining/JoinRoomTask.kt   | 23 +++++++++++++------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
index 9c16bd1b0f..cf5e4d64cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
@@ -17,18 +17,19 @@
 package org.matrix.android.sdk.internal.session.room.create
 
 import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.session.room.alias.RoomAliasError
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
-import org.matrix.android.sdk.internal.database.model.RoomEntity
-import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
@@ -96,12 +97,18 @@ internal class DefaultCreateRoomTask @Inject constructor(
         // Wait for room to come back from the sync (but it can maybe be in the DB if the sync response is received before)
         try {
             awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
-                realm.where(RoomEntity::class.java)
-                        .equalTo(RoomEntityFields.ROOM_ID, roomId)
+                realm.where(RoomSummaryEntity::class.java)
+                        .equalTo(RoomSummaryEntityFields.ROOM_ID, roomId)
+                        .equalTo(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.JOIN.name)
             }
         } catch (exception: TimeoutCancellationException) {
             throw CreateRoomFailure.CreatedWithTimeout
         }
+
+        Realm.getInstance(realmConfiguration).executeTransactionAsync {
+            RoomSummaryEntity.where(it, roomId).findFirst()?.lastActivityTime = System.currentTimeMillis()
+        }
+
         if (otherUserId != null) {
             handleDirectChatCreation(roomId, otherUserId)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
index 3b7639d42f..efb20863b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
@@ -16,21 +16,24 @@
 
 package org.matrix.android.sdk.internal.session.room.membership.joining
 
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import kotlinx.coroutines.TimeoutCancellationException
 import org.matrix.android.sdk.api.session.room.failure.JoinRoomFailure
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
-import org.matrix.android.sdk.internal.database.model.RoomEntity
-import org.matrix.android.sdk.internal.database.model.RoomEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.create.JoinRoomResponse
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.read.SetReadMarkersTask
 import org.matrix.android.sdk.internal.task.Task
-import io.realm.RealmConfiguration
-import kotlinx.coroutines.TimeoutCancellationException
-import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -69,12 +72,18 @@ internal class DefaultJoinRoomTask @Inject constructor(
         val roomId = joinRoomResponse.roomId
         try {
             awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
-                realm.where(RoomEntity::class.java)
-                        .equalTo(RoomEntityFields.ROOM_ID, roomId)
+                realm.where(RoomSummaryEntity::class.java)
+                        .equalTo(RoomSummaryEntityFields.ROOM_ID, roomId)
+                        .equalTo(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.JOIN.name)
             }
         } catch (exception: TimeoutCancellationException) {
             throw JoinRoomFailure.JoinedWithTimeout
         }
+
+        Realm.getInstance(realmConfiguration).executeTransactionAsync {
+            RoomSummaryEntity.where(it, roomId).findFirst()?.lastActivityTime = System.currentTimeMillis()
+        }
+
         setReadMarkers(roomId)
     }
 

From b47ced68b5296bd90fc656c94d1fafb808137583 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Apr 2021 14:39:02 +0200
Subject: [PATCH 489/578] Move UpdatableFilterLivePageResult to the correct
 package

---
 .../sdk/api/session/room/RoomService.kt       |  1 -
 .../room/UpdatableFilterLivePageResult.kt     | 27 +++++++++++++++++++
 .../session/room/DefaultRoomService.kt        |  5 +---
 .../room/summary/RoomSummaryDataSource.kt     |  2 +-
 .../home/room/list/RoomListViewModel.kt       |  2 +-
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 7509c2d975..819ba054ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -28,7 +28,6 @@ import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
-import org.matrix.android.sdk.internal.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 
 /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt
new file mode 100644
index 0000000000..38462d5ac6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room
+
+import androidx.lifecycle.LiveData
+import androidx.paging.PagedList
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+interface UpdatableFilterLivePageResult {
+    val livePagedList: LiveData<PagedList<RoomSummary>>
+
+    fun updateQuery(queryParams: RoomSummaryQueryParams)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 34904110a1..f1d4bfca3f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.RoomService
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -195,7 +196,3 @@ internal class DefaultRoomService @Inject constructor(
     }
 }
 
-interface UpdatableFilterLivePageResult {
-    val livePagedList: LiveData<PagedList<RoomSummary>>
-    fun updateQuery(queryParams: RoomSummaryQueryParams)
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index a62d82782a..02ecce6afa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -26,6 +26,7 @@ import io.realm.RealmQuery
 import io.realm.Sort
 import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
@@ -38,7 +39,6 @@ import org.matrix.android.sdk.internal.database.query.findByAlias
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.query.process
-import org.matrix.android.sdk.internal.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.internal.util.fetchCopyMap
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 21e4e5830c..2a214e6e90 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -45,7 +46,6 @@ import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
-import org.matrix.android.sdk.internal.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber

From b9f73c6cc3056706fda07a586a8ce39c1c129d4c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Apr 2021 18:19:05 +0200
Subject: [PATCH 490/578] BMA's cleanup

---
 .../sdk/api/query/RoomCategoryFilter.kt       |  24 ++++
 .../sdk/api/session/room/RoomService.kt       |  39 +++---
 .../session/room/RoomSummaryQueryParams.kt    |   8 +-
 .../summary/RoomAggregateNotificationCount.kt |   5 +-
 .../SessionRealmConfigurationFactory.kt       |   1 -
 .../database/model/RoomSummaryEntity.kt       |  19 ++-
 .../room/summary/RoomSummaryDataSource.kt     |  27 ++--
 .../room/summary/RoomSummaryUpdater.kt        |   3 -
 .../java/im/vector/app/AppStateHandler.kt     |   7 +-
 .../app/core/platform/VectorBaseFragment.kt   |   2 +
 .../app/features/home/HomeDetailViewModel.kt  |  30 ++--
 .../app/features/home/ShortcutsHandler.kt     |  15 +-
 .../features/home/room/list/RoomListAction.kt |   2 +-
 .../home/room/list/RoomListFragment.kt        |  98 ++++++-------
 .../home/room/list/RoomListViewModel.kt       | 129 ++++++++----------
 .../room/list/RoomSummaryPagedController.kt   |  45 +++---
 .../features/home/room/list/RoomsSection.kt   |  31 +++++
 .../home/room/list/SectionHeaderAdapter.kt    |  24 ++--
 18 files changed, 266 insertions(+), 243 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomCategoryFilter.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomCategoryFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomCategoryFilter.kt
new file mode 100644
index 0000000000..c8ccc4c8a3
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/RoomCategoryFilter.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.query
+
+enum class RoomCategoryFilter {
+    ONLY_DM,
+    ONLY_ROOMS,
+    ONLY_WITH_NOTIFICATIONS,
+    ALL
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 819ba054ea..8c833644ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -181,25 +181,28 @@ interface RoomService {
      */
     fun peekRoom(roomIdOrAlias: String, callback: MatrixCallback<PeekResult>)
 
-    fun getPagedRoomSummariesLive(
-            queryParams: RoomSummaryQueryParams,
-            pagedListConfig: PagedList.Config = PagedList.Config.Builder()
-                    .setPageSize(10)
-                    .setInitialLoadSizeHint(20)
-                    .setEnablePlaceholders(false)
-                    .setPrefetchDistance(10)
-                    .build()
-    ): LiveData<PagedList<RoomSummary>>
+    /**
+     * TODO Doc
+     */
+    fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
+                                  pagedListConfig: PagedList.Config = defaultPagedListConfig): LiveData<PagedList<RoomSummary>>
 
+    /**
+     * TODO Doc
+     */
+    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
+                                          pagedListConfig: PagedList.Config = defaultPagedListConfig): UpdatableFilterLivePageResult
+
+    /**
+     * TODO Doc
+     */
     fun getNotificationCountForRooms(queryParams: RoomSummaryQueryParams): RoomAggregateNotificationCount
 
-    fun getFilteredPagedRoomSummariesLive(
-            queryParams: RoomSummaryQueryParams,
-            pagedListConfig: PagedList.Config = PagedList.Config.Builder()
-                    .setPageSize(10)
-                    .setInitialLoadSizeHint(20)
-                    .setEnablePlaceholders(false)
-                    .setPrefetchDistance(10)
-                    .build()
-    ): UpdatableFilterLivePageResult
+    private val defaultPagedListConfig
+        get() = PagedList.Config.Builder()
+                .setPageSize(10)
+                .setInitialLoadSizeHint(20)
+                .setEnablePlaceholders(false)
+                .setPrefetchDistance(10)
+                .build()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index e0862f229a..7e04ebb5f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.api.session.room
 
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.room.model.Membership
 
@@ -24,13 +25,6 @@ fun roomSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {
     return RoomSummaryQueryParams.Builder().apply(init).build()
 }
 
-enum class RoomCategoryFilter {
-    ONLY_DM,
-    ONLY_ROOMS,
-    ONLY_WITH_NOTIFICATIONS,
-    ALL
-}
-
 /**
  * This class can be used to filter room summaries to use with:
  * [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
index 0c581508b8..066178b1ec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
@@ -20,7 +20,6 @@ data class RoomAggregateNotificationCount(
         val notificationCount: Int,
         val highlightCount: Int
 ) {
-    fun totalCount()   = notificationCount + highlightCount
-
-    fun isHighlight() = highlightCount > 0
+    val totalCount = notificationCount + highlightCount
+    val isHighlight = highlightCount > 0
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 770ef46080..244fe3432a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -72,7 +72,6 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
                 .allowWritesOnUiThread(true)
                 .modules(SessionRealmModule())
                 .schemaVersion(RealmSessionStoreMigration.SESSION_STORE_SCHEMA_VERSION)
-//                .deleteRealmIfMigrationNeeded()
                 .migration(migration)
                 .build()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 6007ae504a..669074ffd2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -106,7 +106,7 @@ internal open class RoomSummaryEntity(
 
     private var tags: RealmList<RoomTagEntity> = RealmList()
 
-    fun tags(): RealmList<RoomTagEntity> = tags
+    fun tags(): List<RoomTagEntity> = tags
 
     fun updateTags(newTags: List<Pair<String, Double?>>) {
         val toDelete = mutableListOf<RoomTagEntity>()
@@ -118,9 +118,9 @@ internal open class RoomSummaryEntity(
                 existingTag.tagOrder = updatedTag.second
             }
         }
-        toDelete.onEach { it.deleteFromRealm() }
+        toDelete.forEach { it.deleteFromRealm() }
         newTags.forEach { newTag ->
-            if (tags.indexOfFirst { it.tagName == newTag.first } == -1) {
+            if (tags.all { it.tagName != newTag.first }) {
                 // we must add it
                 tags.add(
                         RoomTagEntity(newTag.first, newTag.second)
@@ -128,9 +128,9 @@ internal open class RoomSummaryEntity(
             }
         }
 
-        isFavourite = newTags.indexOfFirst { it.first == RoomTag.ROOM_TAG_FAVOURITE } != -1
-        isLowPriority = newTags.indexOfFirst { it.first == RoomTag.ROOM_TAG_LOW_PRIORITY } != -1
-        isServerNotice = newTags.indexOfFirst { it.first == RoomTag.ROOM_TAG_SERVER_NOTICE } != -1
+        isFavourite = newTags.any { it.first == RoomTag.ROOM_TAG_FAVOURITE }
+        isLowPriority = newTags.any { it.first == RoomTag.ROOM_TAG_LOW_PRIORITY }
+        isServerNotice = newTags.any { it.first == RoomTag.ROOM_TAG_SERVER_NOTICE }
     }
 
     @Index
@@ -170,18 +170,15 @@ internal open class RoomSummaryEntity(
 
     fun updateAliases(newAliases: List<String>) {
         // only update underlying field if there is a diff
-        if (newAliases.toSet() != aliases.toSet()) {
-            Timber.w("VAL: aliases updated")
+        if (newAliases.distinct().sorted() != aliases.distinct().sorted()) {
             aliases.clear()
             aliases.addAll(newAliases)
+            flatAliases = newAliases.joinToString(separator = "|", prefix = "|")
         }
     }
 
     // this is required for querying
     var flatAliases: String = ""
-        set(value) {
-            if (value != field) field = value
-        }
 
     var isEncrypted: Boolean = false
         set(value) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 02ecce6afa..dd3fbe04b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -24,7 +24,7 @@ import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.Sort
-import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
+import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -104,7 +104,8 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                 .sort(RoomSummaryEntityFields.BREADCRUMBS_INDEX)
     }
 
-    fun getSortedPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config): LiveData<PagedList<RoomSummary>> {
+    fun getSortedPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
+                                        pagedListConfig: PagedList.Config): LiveData<PagedList<RoomSummary>> {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams)
                     .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
@@ -112,12 +113,14 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         val dataSourceFactory = realmDataSourceFactory.map {
             roomSummaryMapper.map(it)
         }
-        return monarchy.findAllPagedWithChanges(realmDataSourceFactory,
+        return monarchy.findAllPagedWithChanges(
+                realmDataSourceFactory,
                 LivePagedListBuilder(dataSourceFactory, pagedListConfig)
         )
     }
 
-    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config): UpdatableFilterLivePageResult {
+    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
+                                          pagedListConfig: PagedList.Config): UpdatableFilterLivePageResult {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams)
                     .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
@@ -126,13 +129,13 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             roomSummaryMapper.map(it)
         }
 
-        val mapped = monarchy.findAllPagedWithChanges(realmDataSourceFactory,
+        val mapped = monarchy.findAllPagedWithChanges(
+                realmDataSourceFactory,
                 LivePagedListBuilder(dataSourceFactory, pagedListConfig)
         )
 
         return object : UpdatableFilterLivePageResult {
-            override val livePagedList: LiveData<PagedList<RoomSummary>>
-                get() = mapped
+            override val livePagedList: LiveData<PagedList<RoomSummary>> = mapped
 
             override fun updateQuery(queryParams: RoomSummaryQueryParams) {
                 realmDataSourceFactory.updateQuery {
@@ -167,10 +170,10 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
 
         queryParams.roomCategoryFilter?.let {
             when (it) {
-                RoomCategoryFilter.ONLY_DM -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
-                RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+                RoomCategoryFilter.ONLY_DM                 -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+                RoomCategoryFilter.ONLY_ROOMS              -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
                 RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS -> query.greaterThan(RoomSummaryEntityFields.NOTIFICATION_COUNT, 0)
-                RoomCategoryFilter.ALL -> {
+                RoomCategoryFilter.ALL                     -> {
                     // nop
                 }
             }
@@ -182,8 +185,8 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             it.isLowPriority?.let { lp ->
                 query.equalTo(RoomSummaryEntityFields.IS_LOW_PRIORITY, lp)
             }
-            it.isServerNotice?.let { lp ->
-                query.equalTo(RoomSummaryEntityFields.IS_SERVER_NOTICE, lp)
+            it.isServerNotice?.let { sn ->
+                query.equalTo(RoomSummaryEntityFields.IS_SERVER_NOTICE, sn)
             }
         }
         return query
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 69e1332dab..f254c44fda 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -117,10 +117,7 @@ internal class RoomSummaryUpdater @Inject constructor(
 
         val roomAliases = ContentMapper.map(lastAliasesEvent?.content).toModel<RoomAliasesContent>()?.aliases
                 .orEmpty()
-//        roomSummaryEntity.aliases.clear()
-//        roomSummaryEntity.aliases.addAll(roomAliases)
         roomSummaryEntity.updateAliases(roomAliases)
-        roomSummaryEntity.flatAliases = roomAliases.joinToString(separator = "|", prefix = "|")
         roomSummaryEntity.isEncrypted = encryptionEvent != null
         roomSummaryEntity.encryptionEventTs = encryptionEvent?.originServerTs
 
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 81d1fdb636..b3b18d4adc 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -19,8 +19,6 @@ package im.vector.app
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import im.vector.app.features.grouplist.SelectedGroupDataSource
-import im.vector.app.features.home.room.list.ChronologicalRoomComparator
 import io.reactivex.disposables.CompositeDisposable
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -29,11 +27,10 @@ import javax.inject.Singleton
  * This class handles the global app state.
  * It requires to be added to ProcessLifecycleOwner.get().lifecycle
  */
+// TODO Keep this class for now, will maybe be used fro Space
 @Singleton
 class AppStateHandler @Inject constructor(
-        private val sessionDataSource: ActiveSessionDataSource,
-        private val selectedGroupDataSource: SelectedGroupDataSource,
-        private val chronologicalRoomComparator: ChronologicalRoomComparator) : LifecycleObserver {
+) : LifecycleObserver {
 
     private val compositeDisposable = CompositeDisposable()
 
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index e3a3b7b29c..258517aa39 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -127,6 +127,7 @@ abstract class VectorBaseFragment<VB: ViewBinding> : BaseMvRxFragment(), HasScre
         Timber.i("onResume Fragment ${javaClass.simpleName}")
     }
 
+    @CallSuper
     override fun onPause() {
         super.onPause()
         Timber.i("onPause Fragment ${javaClass.simpleName}")
@@ -154,6 +155,7 @@ abstract class VectorBaseFragment<VB: ViewBinding> : BaseMvRxFragment(), HasScre
         super.onDestroyView()
     }
 
+    @CallSuper
     override fun onDestroy() {
         Timber.i("onDestroy Fragment ${javaClass.simpleName}")
         uiDisposables.dispose()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 8a73b2e0f9..c87b19f0e6 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -31,8 +31,8 @@ import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.ui.UiStateRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.internal.util.awaitCallback
@@ -82,7 +82,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     override fun handle(action: HomeDetailAction) {
         when (action) {
             is HomeDetailAction.SwitchDisplayMode -> handleSwitchDisplayMode(action)
-            HomeDetailAction.MarkAllRoomsRead -> handleMarkAllRoomsRead()
+            HomeDetailAction.MarkAllRoomsRead     -> handleMarkAllRoomsRead()
         }
     }
 
@@ -103,12 +103,11 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
         viewModelScope.launch(Dispatchers.Default) {
             val roomIds = session.getRoomSummaries(
                     roomSummaryQueryParams {
-                        this.memberships = listOf(Membership.JOIN)
-                        this.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
+                        memberships = listOf(Membership.JOIN)
+                        roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
                     }
-            ).map {
-                it.roomId
-            }
+            )
+                    .map { it.roomId }
             try {
                 awaitCallback<Unit> {
                     session.markAllAsRead(roomIds, it)
@@ -146,7 +145,8 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                 roomSummaryQueryParams {
                     memberships = Membership.activeMemberships()
                 }
-        ).asObservable()
+        )
+                .asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
                 .subscribe {
                     val dmInvites = session.getRoomSummaries(
@@ -179,13 +179,13 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
 
                     setState {
                         copy(
-                                notificationCountCatchup = dmRooms.totalCount() + otherRooms.totalCount() + roomsInvite + dmInvites,
-                                notificationHighlightCatchup = dmRooms.isHighlight() || otherRooms.isHighlight(),
-                                notificationCountPeople = dmRooms.totalCount() + dmInvites,
-                                notificationHighlightPeople = dmRooms.isHighlight() || dmInvites > 0,
-                                notificationCountRooms = otherRooms.totalCount() + roomsInvite,
-                                notificationHighlightRooms = otherRooms.isHighlight() || roomsInvite > 0,
-                                hasUnreadMessages = dmRooms.totalCount() + otherRooms.totalCount() > 0
+                                notificationCountCatchup = dmRooms.totalCount + otherRooms.totalCount + roomsInvite + dmInvites,
+                                notificationHighlightCatchup = dmRooms.isHighlight || otherRooms.isHighlight,
+                                notificationCountPeople = dmRooms.totalCount + dmInvites,
+                                notificationHighlightPeople = dmRooms.isHighlight || dmInvites > 0,
+                                notificationCountRooms = otherRooms.totalCount + roomsInvite,
+                                notificationHighlightRooms = otherRooms.isHighlight || roomsInvite > 0,
+                                hasUnreadMessages = dmRooms.totalCount + otherRooms.totalCount > 0
                         )
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
index 99cc56bd99..00ec8b43f9 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
@@ -40,13 +40,17 @@ class ShortcutsHandler @Inject constructor(
     fun observeRoomsAndBuildShortcuts(): Disposable {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
             // No op
-            return Observable.empty<Unit>().subscribe()
+            return Disposables.empty()
         }
 
-        return activeSessionHolder.getSafeActiveSession()?.getPagedRoomSummariesLive(roomSummaryQueryParams {
-            this.memberships = listOf(Membership.JOIN)
-            this.roomTagQueryFilter = RoomTagQueryFilter(isFavorite = true, null, null)
-        })?.asObservable()
+        return activeSessionHolder.getSafeActiveSession()
+                ?.getPagedRoomSummariesLive(
+                        roomSummaryQueryParams {
+                            memberships = listOf(Membership.JOIN)
+                            roomTagQueryFilter = RoomTagQueryFilter(isFavorite = true, null, null)
+                        }
+                )
+                ?.asObservable()
                 ?.subscribe { rooms ->
                     val shortcuts = rooms
                             .take(n = 4) // Android only allows us to create 4 shortcuts
@@ -55,7 +59,6 @@ class ShortcutsHandler @Inject constructor(
                     ShortcutManagerCompat.removeAllDynamicShortcuts(context)
                     ShortcutManagerCompat.addDynamicShortcuts(context, shortcuts)
                 }
-
                 ?: Disposables.empty()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
index a5c071680d..883efb2e60 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
@@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.session.room.notification.RoomNotificationStat
 
 sealed class RoomListAction : VectorViewModelAction {
     data class SelectRoom(val roomSummary: RoomSummary) : RoomListAction()
-    data class ToggleSection(val section: RoomListViewModel.RoomsSection) : RoomListAction()
+    data class ToggleSection(val section: RoomsSection) : RoomListAction()
     data class AcceptInvitation(val roomSummary: RoomSummary) : RoomListAction()
     data class RejectInvitation(val roomSummary: RoomSummary) : RoomListAction()
     data class FilterWith(val filter: String) : RoomListAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 8323c3b155..8e837e85c6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -95,7 +95,7 @@ class RoomListFragment @Inject constructor(
     )
 
     private val adapterInfosList = mutableListOf<SectionAdapterInfo>()
-    private var concatAdapter: ConcatAdapter? = null
+    private val concatAdapter = ConcatAdapter()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -104,10 +104,10 @@ class RoomListFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java)
         roomListViewModel.observeViewEvents {
             when (it) {
-                is RoomListViewEvents.Loading -> showLoading(it.message)
-                is RoomListViewEvents.Failure -> showFailure(it.throwable)
+                is RoomListViewEvents.Loading    -> showLoading(it.message)
+                is RoomListViewEvents.Failure    -> showFailure(it.throwable)
                 is RoomListViewEvents.SelectRoom -> handleSelectRoom(it)
-                is RoomListViewEvents.Done -> Unit
+                is RoomListViewEvents.Done       -> Unit
             }.exhaustive
         }
 
@@ -134,10 +134,10 @@ class RoomListFragment @Inject constructor(
             val isRoomSectionExpanded = roomsSection.isExpanded.value.orTrue()
             if (actualBlock.section.isExpanded && !isRoomSectionExpanded) {
                 // we have to remove the content adapter
-                concatAdapter?.removeAdapter(actualBlock.contentAdapter.adapter)
+                concatAdapter.removeAdapter(actualBlock.contentAdapter.adapter)
             } else if (!actualBlock.section.isExpanded && isRoomSectionExpanded) {
                 // we must add it back!
-                concatAdapter?.addAdapter(contentInsertIndex, actualBlock.contentAdapter.adapter)
+                concatAdapter.addAdapter(contentInsertIndex, actualBlock.contentAdapter.adapter)
             }
             contentInsertIndex = if (isRoomSectionExpanded) {
                 contentInsertIndex + 2
@@ -148,7 +148,7 @@ class RoomListFragment @Inject constructor(
                     isExpanded = isRoomSectionExpanded
             )
             actualBlock.headerHeaderAdapter.updateSection(
-                    actualBlock.headerHeaderAdapter.section.copy(isExpanded = isRoomSectionExpanded)
+                    actualBlock.headerHeaderAdapter.roomsSectionData.copy(isExpanded = isRoomSectionExpanded)
             )
         }
     }
@@ -160,16 +160,10 @@ class RoomListFragment @Inject constructor(
     override fun onDestroyView() {
         adapterInfosList.onEach { it.contentAdapter.removeModelBuildListener(modelBuildListener) }
         adapterInfosList.clear()
-//        roomController.removeModelBuildListener(modelBuildListener)
         modelBuildListener = null
         views.roomListView.cleanup()
-//        controllers.onEach {
-//            it.listener = null
-// //            concatAdapter.removeAdapter(it.adapter)
-//        }
-//        controllers.clear()
-//        roomController.listener = null
-//        favRoomController.listener = null
+        footerController.listener = null
+        // TODO Cleanup listener on the ConcatAdapter's adapters?
         stateRestorer.clear()
         views.createChatFabMenu.listener = null
         super.onDestroyView()
@@ -182,8 +176,8 @@ class RoomListFragment @Inject constructor(
     private fun setupCreateRoomButton() {
         when (roomListParams.displayMode) {
             RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.isVisible = true
-            RoomListDisplayMode.PEOPLE -> views.createChatRoomButton.isVisible = true
-            RoomListDisplayMode.ROOMS -> views.createGroupRoomButton.isVisible = true
+            RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.isVisible = true
+            RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.isVisible = true
             else                              -> Unit // No button in this mode
         }
 
@@ -238,40 +232,35 @@ class RoomListFragment @Inject constructor(
         stateRestorer = LayoutManagerStateRestorer(layoutManager).register()
         views.roomListView.layoutManager = layoutManager
         views.roomListView.itemAnimator = RoomListAnimator()
-//        views.roomListView.setRecycledViewPool(sharedViewPool)
         layoutManager.recycleChildrenOnDetach = true
 
         modelBuildListener = OnModelBuildFinishedListener { it.dispatchTo(stateRestorer) }
 
-        val concatAdapter = ConcatAdapter()
-//        val hasOnlyOneSection = roomListViewModel.sections.size == 1
         roomListViewModel.sections.forEach { section ->
-
             val sectionAdapter = SectionHeaderAdapter {
                 roomListViewModel.handle(RoomListAction.ToggleSection(section))
             }.also {
-                it.updateSection(SectionHeaderAdapter.SectionViewModel(
-                        section.sectionName
-                ))
+                it.updateSection(SectionHeaderAdapter.RoomsSectionData(section.sectionName))
             }
 
-            val contentAdapter = pagedControllerFactory.createRoomSummaryPagedController().also {
-                section.livePages.observe(viewLifecycleOwner) { pl ->
-                    it.submitList(pl)
-                    sectionAdapter.updateSection(sectionAdapter.section.copy(isHidden = pl.isEmpty()))
-                    checkEmptyState()
-                }
-                section.notificationCount.observe(viewLifecycleOwner) { counts ->
-                    sectionAdapter.updateSection(sectionAdapter.section.copy(
-                            notificationCount = counts.totalCount(),
-                            isHighlighted = counts.isHighlight()
-                    ))
-                }
-                section.isExpanded.observe(viewLifecycleOwner) { _ ->
-                    refreshCollapseStates()
-                }
-                it.listener = this
-            }
+            val contentAdapter = pagedControllerFactory.createRoomSummaryPagedController()
+                    .also { controller ->
+                        section.livePages.observe(viewLifecycleOwner) { pl ->
+                            controller.submitList(pl)
+                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = pl.isEmpty()))
+                            checkEmptyState()
+                        }
+                        section.notificationCount.observe(viewLifecycleOwner) { counts ->
+                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
+                                    notificationCount = counts.totalCount,
+                                    isHighlighted = counts.isHighlight
+                            ))
+                        }
+                        section.isExpanded.observe(viewLifecycleOwner) { _ ->
+                            refreshCollapseStates()
+                        }
+                        controller.listener = this
+                    }
             adapterInfosList.add(
                     SectionAdapterInfo(
                             SectionKey(
@@ -288,10 +277,9 @@ class RoomListFragment @Inject constructor(
         }
 
         // Add the footer controller
-        this.footerController.listener = this
+        footerController.listener = this
         concatAdapter.addAdapter(footerController.adapter)
 
-        this.concatAdapter = concatAdapter
         views.roomListView.adapter = concatAdapter
     }
 
@@ -299,8 +287,8 @@ class RoomListFragment @Inject constructor(
         if (isAdded) {
             when (roomListParams.displayMode) {
                 RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.show()
-                RoomListDisplayMode.PEOPLE -> views.createChatRoomButton.show()
-                RoomListDisplayMode.ROOMS -> views.createGroupRoomButton.show()
+                RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.show()
+                RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.show()
                 else                              -> Unit
             }
         }
@@ -308,28 +296,28 @@ class RoomListFragment @Inject constructor(
 
     private fun handleQuickActions(quickAction: RoomListQuickActionsSharedAction) {
         when (quickAction) {
-            is RoomListQuickActionsSharedAction.NotificationsAllNoisy -> {
+            is RoomListQuickActionsSharedAction.NotificationsAllNoisy     -> {
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.ALL_MESSAGES_NOISY))
             }
-            is RoomListQuickActionsSharedAction.NotificationsAll -> {
+            is RoomListQuickActionsSharedAction.NotificationsAll          -> {
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.ALL_MESSAGES))
             }
             is RoomListQuickActionsSharedAction.NotificationsMentionsOnly -> {
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.MENTIONS_ONLY))
             }
-            is RoomListQuickActionsSharedAction.NotificationsMute -> {
+            is RoomListQuickActionsSharedAction.NotificationsMute         -> {
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.MUTE))
             }
-            is RoomListQuickActionsSharedAction.Settings -> {
+            is RoomListQuickActionsSharedAction.Settings                  -> {
                 navigator.openRoomProfile(requireActivity(), quickAction.roomId)
             }
-            is RoomListQuickActionsSharedAction.Favorite -> {
+            is RoomListQuickActionsSharedAction.Favorite                  -> {
                 roomListViewModel.handle(RoomListAction.ToggleTag(quickAction.roomId, RoomTag.ROOM_TAG_FAVOURITE))
             }
-            is RoomListQuickActionsSharedAction.LowPriority -> {
+            is RoomListQuickActionsSharedAction.LowPriority               -> {
                 roomListViewModel.handle(RoomListAction.ToggleTag(quickAction.roomId, RoomTag.ROOM_TAG_LOW_PRIORITY))
             }
-            is RoomListQuickActionsSharedAction.Leave -> {
+            is RoomListQuickActionsSharedAction.Leave                     -> {
                 promptLeaveRoom(quickAction.roomId)
             }
         }.exhaustive
@@ -364,7 +352,7 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun checkEmptyState() {
-        val hasNoRoom = adapterInfosList.all { it.headerHeaderAdapter.section.isHidden }
+        val hasNoRoom = adapterInfosList.all { it.headerHeaderAdapter.roomsSectionData.isHidden }
         if (hasNoRoom) {
             val emptyState = when (roomListParams.displayMode) {
                 RoomListDisplayMode.NOTIFICATIONS -> {
@@ -373,14 +361,14 @@ class RoomListFragment @Inject constructor(
                             image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_noun_party_popper),
                             message = getString(R.string.room_list_catchup_empty_body))
                 }
-                RoomListDisplayMode.PEOPLE ->
+                RoomListDisplayMode.PEOPLE        ->
                     StateView.State.Empty(
                             title = getString(R.string.room_list_people_empty_title),
                             image = ContextCompat.getDrawable(requireContext(), R.drawable.empty_state_dm),
                             isBigImage = true,
                             message = getString(R.string.room_list_people_empty_body)
                     )
-                RoomListDisplayMode.ROOMS ->
+                RoomListDisplayMode.ROOMS         ->
                     StateView.State.Empty(
                             title = getString(R.string.room_list_rooms_empty_title),
                             image = ContextCompat.getDrawable(requireContext(), R.drawable.empty_state_room),
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 2a214e6e90..423a950591 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -17,10 +17,7 @@
 package im.vector.app.features.home.room.list
 
 import androidx.annotation.StringRes
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import androidx.paging.PagedList
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
@@ -34,27 +31,26 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
-import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import javax.inject.Inject
 
-class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
-                                            private val session: Session,
-                                            private val stringProvider: StringProvider)
-    : VectorViewModel<RoomListViewState, RoomListAction, RoomListViewEvents>(initialState) {
+class RoomListViewModel @Inject constructor(
+        initialState: RoomListViewState,
+        private val session: Session,
+        private val stringProvider: StringProvider
+) : VectorViewModel<RoomListViewState, RoomListAction, RoomListViewEvents>(initialState) {
 
     interface Factory {
         fun create(initialState: RoomListViewState): RoomListViewModel
@@ -84,19 +80,9 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         }
     }
 
-    data class RoomsSection(
-            val sectionName: String,
-            val livePages: LiveData<PagedList<RoomSummary>>,
-            val isExpanded: MutableLiveData<Boolean> = MutableLiveData(true),
-            val notificationCount: MutableLiveData<RoomAggregateNotificationCount> =
-                    MutableLiveData(RoomAggregateNotificationCount(0, 0)),
-            val notifyOfLocalEcho: Boolean = false
-    )
-
     val sections: List<RoomsSection> by lazy {
         val sections = mutableListOf<RoomsSection>()
         if (initialState.displayMode == RoomListDisplayMode.PEOPLE) {
-
             addSection(sections, R.string.invitations_header, true) {
                 it.memberships = listOf(Membership.INVITE)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -113,7 +99,6 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
             }
         } else if (initialState.displayMode == RoomListDisplayMode.ROOMS) {
-
             addSection(sections, R.string.invitations_header, true) {
                 it.memberships = listOf(Membership.INVITE)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -143,18 +128,20 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                 it.roomTagQueryFilter = RoomTagQueryFilter(null, null, true)
             }
         } else if (initialState.displayMode == RoomListDisplayMode.FILTERED) {
-            withQueryParams({
-                it.memberships = Membership.activeMemberships()
-            }) { qpm ->
-                val name = stringProvider.getString(R.string.bottom_action_rooms)
-                session.getFilteredPagedRoomSummariesLive(qpm)
-                        .let { livePagedList ->
-                            updatableQuery = livePagedList
-                            sections.add(RoomsSection(name, livePagedList.livePagedList))
-                        }
-            }
+            withQueryParams(
+                    {
+                        it.memberships = Membership.activeMemberships()
+                    },
+                    { qpm ->
+                        val name = stringProvider.getString(R.string.bottom_action_rooms)
+                        session.getFilteredPagedRoomSummariesLive(qpm)
+                                .let { updatableFilterLivePageResult ->
+                                    updatableQuery = updatableFilterLivePageResult
+                                    sections.add(RoomsSection(name, updatableFilterLivePageResult.livePagedList))
+                                }
+                    }
+            )
         } else if (initialState.displayMode == RoomListDisplayMode.NOTIFICATIONS) {
-
             addSection(sections, R.string.invitations_header, true) {
                 it.memberships = listOf(Membership.INVITE)
                 it.roomCategoryFilter = RoomCategoryFilter.ALL
@@ -171,14 +158,14 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
 
     override fun handle(action: RoomListAction) {
         when (action) {
-            is RoomListAction.SelectRoom -> handleSelectRoom(action)
-            is RoomListAction.AcceptInvitation -> handleAcceptInvitation(action)
-            is RoomListAction.RejectInvitation -> handleRejectInvitation(action)
-            is RoomListAction.FilterWith -> handleFilter(action)
-            is RoomListAction.LeaveRoom -> handleLeaveRoom(action)
+            is RoomListAction.SelectRoom                  -> handleSelectRoom(action)
+            is RoomListAction.AcceptInvitation            -> handleAcceptInvitation(action)
+            is RoomListAction.RejectInvitation            -> handleRejectInvitation(action)
+            is RoomListAction.FilterWith                  -> handleFilter(action)
+            is RoomListAction.LeaveRoom                   -> handleLeaveRoom(action)
             is RoomListAction.ChangeRoomNotificationState -> handleChangeNotificationMode(action)
-            is RoomListAction.ToggleTag -> handleToggleTag(action)
-            is RoomListAction.ToggleSection -> handleToggleSection(action.section)
+            is RoomListAction.ToggleTag                   -> handleToggleTag(action)
+            is RoomListAction.ToggleSection               -> handleToggleSection(action.section)
         }.exhaustive
     }
 
@@ -186,40 +173,41 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                            @StringRes nameRes: Int,
                            notifyOfLocalEcho: Boolean = false,
                            query: (RoomSummaryQueryParams.Builder) -> Unit) {
-        withQueryParams({
-            query.invoke(it)
-        }) { roomQueryParams ->
+        withQueryParams(
+                { query.invoke(it) },
+                { roomQueryParams ->
 
-            val name = stringProvider.getString(nameRes)
-            session.getPagedRoomSummariesLive(roomQueryParams)
-                    .let { livePagedList ->
+                    val name = stringProvider.getString(nameRes)
+                    session.getPagedRoomSummariesLive(roomQueryParams)
+                            .let { livePagedList ->
 
-                        // use it also as a source to update count
-                        livePagedList.asObservable()
-                                .observeOn(Schedulers.computation())
-                                .subscribe {
-                                    sections.find { it.sectionName == name }
-                                            ?.notificationCount
-                                            ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
-                                }.disposeOnClear()
+                                // use it also as a source to update count
+                                livePagedList.asObservable()
+                                        .observeOn(Schedulers.computation())
+                                        .subscribe {
+                                            sections.find { it.sectionName == name }
+                                                    ?.notificationCount
+                                                    ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
+                                        }
+                                        .disposeOnClear()
 
-                        sections.add(
-                                RoomsSection(
-                                        sectionName = name,
-                                        livePages = livePagedList,
-                                        notifyOfLocalEcho = notifyOfLocalEcho
+                                sections.add(
+                                        RoomsSection(
+                                                sectionName = name,
+                                                livePages = livePagedList,
+                                                notifyOfLocalEcho = notifyOfLocalEcho
+                                        )
                                 )
-                        )
-                    }
-        }
+                            }
+                }
+        )
     }
 
     private fun withQueryParams(builder: (RoomSummaryQueryParams.Builder) -> Unit, block: (RoomSummaryQueryParams) -> Unit) {
-        RoomSummaryQueryParams.Builder().apply {
-            builder.invoke(this)
-        }.build().let {
-            block(it)
-        }
+        RoomSummaryQueryParams.Builder()
+                .apply { builder.invoke(this) }
+                .build()
+                .let { block(it) }
     }
 
     fun isPublicRoom(roomId: String): Boolean {
@@ -233,10 +221,13 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
     }
 
     private fun handleToggleSection(roomSection: RoomsSection) {
+        roomSection.isExpanded.postValue(!roomSection.isExpanded.value.orFalse())
+        /* TODO Cleanup if it is working
         sections.find { it.sectionName == roomSection.sectionName }
                 ?.let { section ->
                     section.isExpanded.postValue(!section.isExpanded.value.orFalse())
                 }
+         */
     }
 
     private fun handleFilter(action: RoomListAction.FilterWith) {
@@ -247,8 +238,8 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
         }
         updatableQuery?.updateQuery(
                 roomSummaryQueryParams {
-                    this.memberships = Membership.activeMemberships()
-                    this.displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
+                    memberships = Membership.activeMemberships()
+                    displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
                 }
         )
     }
@@ -351,7 +342,7 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
 
     private fun String.otherTag(): String? {
         return when (this) {
-            RoomTag.ROOM_TAG_FAVOURITE -> RoomTag.ROOM_TAG_LOW_PRIORITY
+            RoomTag.ROOM_TAG_FAVOURITE    -> RoomTag.ROOM_TAG_LOW_PRIORITY
             RoomTag.ROOM_TAG_LOW_PRIORITY -> RoomTag.ROOM_TAG_FAVOURITE
             else                          -> null
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
index 38137e0033..20386d739a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
@@ -23,16 +23,19 @@ import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
-class RoomSummaryPagedControllerFactory @Inject constructor(private val roomSummaryItemFactory: RoomSummaryItemFactory) {
+class RoomSummaryPagedControllerFactory @Inject constructor(
+        private val roomSummaryItemFactory: RoomSummaryItemFactory
+) {
 
     fun createRoomSummaryPagedController(): RoomSummaryPagedController {
         return RoomSummaryPagedController(roomSummaryItemFactory)
     }
 }
 
-class RoomSummaryPagedController constructor(private val roomSummaryItemFactory: RoomSummaryItemFactory)
-    : PagedListEpoxyController<RoomSummary>(
-// Important it must match the PageList builder notify Looper
+class RoomSummaryPagedController(
+        private val roomSummaryItemFactory: RoomSummaryItemFactory
+) : PagedListEpoxyController<RoomSummary>(
+        // Important it must match the PageList builder notify Looper
         modelBuildingHandler = createUIHandler()
 ) {
 
@@ -46,28 +49,20 @@ class RoomSummaryPagedController constructor(private val roomSummaryItemFactory:
         }
 
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
-        val unwrappedItem = item
         // for place holder if enabled
-                ?: return roomSummaryItemFactory.createRoomItem(
-                        RoomSummary(
-                                roomId = "null_item_pos_$currentPosition",
-                                name = "",
-                                encryptionEventTs = null,
-                                isEncrypted = false,
-                                typingUsers = emptyList()
-                        ), emptySet(), null, null)
+        item ?: return roomSummaryItemFactory.createRoomItem(
+                roomSummary = RoomSummary(
+                        roomId = "null_item_pos_$currentPosition",
+                        name = "",
+                        encryptionEventTs = null,
+                        isEncrypted = false,
+                        typingUsers = emptyList()
+                ),
+                selectedRoomIds = emptySet(),
+                onClick = null,
+                onLongClick = null
+        )
 
-//        GenericItem_().apply { id("null_item_pos_$currentPosition") }
-
-        return roomSummaryItemFactory.create(unwrappedItem, roomChangeMembershipStates ?: emptyMap(), emptySet(), listener)
+        return roomSummaryItemFactory.create(item, roomChangeMembershipStates.orEmpty(), emptySet(), listener)
     }
-
-//    override fun onModelBound(holder: EpoxyViewHolder, boundModel: EpoxyModel<*>, position: Int, previouslyBoundModel: EpoxyModel<*>?) {
-//        Timber.w("VAL: Will load around $position")
-//        super.onModelBound(holder, boundModel, position, previouslyBoundModel)
-//    }
-//    fun onRoomLongClicked() {
-//        userPreferencesProvider.neverShowLongClickOnRoomHelpAgain()
-//        requestModelBuild()
-//    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
new file mode 100644
index 0000000000..71b7169814
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.paging.PagedList
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
+
+data class RoomsSection(
+        val sectionName: String,
+        val livePages: LiveData<PagedList<RoomSummary>>,
+        val isExpanded: MutableLiveData<Boolean> = MutableLiveData(true),
+        val notificationCount: MutableLiveData<RoomAggregateNotificationCount> = MutableLiveData(RoomAggregateNotificationCount(0, 0)),
+        val notifyOfLocalEcho: Boolean = false
+)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
index b137947ef7..f9c5766821 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
@@ -30,7 +30,7 @@ class SectionHeaderAdapter constructor(
         private val onClickAction: (() -> Unit)
 ) : RecyclerView.Adapter<SectionHeaderAdapter.VH>() {
 
-    data class SectionViewModel(
+    data class RoomsSectionData(
             val name: String,
             val isExpanded: Boolean = true,
             val notificationCount: Int = 0,
@@ -38,12 +38,12 @@ class SectionHeaderAdapter constructor(
             val isHidden: Boolean = true
     )
 
-    lateinit var section: SectionViewModel
+    lateinit var roomsSectionData: RoomsSectionData
         private set
 
-    fun updateSection(newSection: SectionViewModel) {
-        if (!::section.isInitialized || newSection != section) {
-            section = newSection
+    fun updateSection(newRoomsSectionData: RoomsSectionData) {
+        if (!::roomsSectionData.isInitialized || newRoomsSectionData != roomsSectionData) {
+            roomsSectionData = newRoomsSectionData
             notifyDataSetChanged()
         }
     }
@@ -52,7 +52,7 @@ class SectionHeaderAdapter constructor(
         setHasStableIds(true)
     }
 
-    override fun getItemId(position: Int) = section.hashCode().toLong()
+    override fun getItemId(position: Int) = roomsSectionData.hashCode().toLong()
 
     override fun getItemViewType(position: Int) = R.layout.item_room_category
 
@@ -61,10 +61,10 @@ class SectionHeaderAdapter constructor(
     }
 
     override fun onBindViewHolder(holder: VH, position: Int) {
-        holder.bind(section)
+        holder.bind(roomsSectionData)
     }
 
-    override fun getItemCount(): Int = if (section.isHidden) 0 else 1
+    override fun getItemCount(): Int = if (roomsSectionData.isHidden) 0 else 1
 
     class VH constructor(
             private val binding: ItemRoomCategoryBinding,
@@ -77,14 +77,14 @@ class SectionHeaderAdapter constructor(
             }))
         }
 
-        fun bind(section: SectionViewModel) {
-            binding.roomCategoryTitleView.text = section.name
+        fun bind(roomsSectionData: RoomsSectionData) {
+            binding.roomCategoryTitleView.text = roomsSectionData.name
             val tintColor = ThemeUtils.getColor(binding.root.context, R.attr.riotx_text_secondary)
-            val expandedArrowDrawableRes = if (section.isExpanded) R.drawable.ic_expand_more_white else R.drawable.ic_expand_less_white
+            val expandedArrowDrawableRes = if (roomsSectionData.isExpanded) R.drawable.ic_expand_more_white else R.drawable.ic_expand_less_white
             val expandedArrowDrawable = ContextCompat.getDrawable(binding.root.context, expandedArrowDrawableRes)?.also {
                 DrawableCompat.setTint(it, tintColor)
             }
-            binding.roomCategoryUnreadCounterBadgeView.render(UnreadCounterBadgeView.State(section.notificationCount, section.isHighlighted))
+            binding.roomCategoryUnreadCounterBadgeView.render(UnreadCounterBadgeView.State(roomsSectionData.notificationCount, roomsSectionData.isHighlighted))
             binding.roomCategoryTitleView.setCompoundDrawablesWithIntrinsicBounds(null, null, expandedArrowDrawable, null)
         }
 

From fcc635ac8f845a2abc8b031304cb8037afa86dbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Apr 2021 07:19:53 +0000
Subject: [PATCH 491/578] Bump moshi_version from 1.11.0 to 1.12.0

Bumps `moshi_version` from 1.11.0 to 1.12.0.

Updates `moshi-adapters` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Updates `moshi-kotlin-codegen` from 1.11.0 to 1.12.0
- [Release notes](https://github.com/square/moshi/releases)
- [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/moshi/compare/moshi-parent-1.11.0...parent-1.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 0ca605dc8b..f9f7b2e4e4 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -108,7 +108,7 @@ static def gitRevisionDate() {
 dependencies {
 
     def arrow_version = "0.8.2"
-    def moshi_version = '1.11.0'
+    def moshi_version = '1.12.0'
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
diff --git a/vector/build.gradle b/vector/build.gradle
index bf164facee..6e662d35f8 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -296,7 +296,7 @@ dependencies {
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.7.1'
     def glide_version = '4.12.0'
-    def moshi_version = '1.11.0'
+    def moshi_version = '1.12.0'
     def daggerVersion = '2.33'
     def autofill_version = "1.1.0"
     def work_version = '2.5.0'

From 100b187be37ba8cefe49d2cca2feb7f3f014df8e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 2 Apr 2021 11:43:56 +0200
Subject: [PATCH 492/578] Fix / loading initial state, duplicate sections and
 footer on empty

---
 .../app/features/home/room/list/RoomListFragment.kt | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 8e837e85c6..ede3df2c18 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -95,11 +95,12 @@ class RoomListFragment @Inject constructor(
     )
 
     private val adapterInfosList = mutableListOf<SectionAdapterInfo>()
-    private val concatAdapter = ConcatAdapter()
+    private var concatAdapter : ConcatAdapter? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupCreateRoomButton()
+        views.stateView.contentView = views.roomListView
+        views.stateView.state = StateView.State.Loading
         setupRecyclerView()
         sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java)
         roomListViewModel.observeViewEvents {
@@ -134,10 +135,10 @@ class RoomListFragment @Inject constructor(
             val isRoomSectionExpanded = roomsSection.isExpanded.value.orTrue()
             if (actualBlock.section.isExpanded && !isRoomSectionExpanded) {
                 // we have to remove the content adapter
-                concatAdapter.removeAdapter(actualBlock.contentAdapter.adapter)
+                concatAdapter?.removeAdapter(actualBlock.contentAdapter.adapter)
             } else if (!actualBlock.section.isExpanded && isRoomSectionExpanded) {
                 // we must add it back!
-                concatAdapter.addAdapter(contentInsertIndex, actualBlock.contentAdapter.adapter)
+                concatAdapter?.addAdapter(contentInsertIndex, actualBlock.contentAdapter.adapter)
             }
             contentInsertIndex = if (isRoomSectionExpanded) {
                 contentInsertIndex + 2
@@ -166,6 +167,7 @@ class RoomListFragment @Inject constructor(
         // TODO Cleanup listener on the ConcatAdapter's adapters?
         stateRestorer.clear()
         views.createChatFabMenu.listener = null
+        concatAdapter = null
         super.onDestroyView()
     }
 
@@ -236,6 +238,8 @@ class RoomListFragment @Inject constructor(
 
         modelBuildListener = OnModelBuildFinishedListener { it.dispatchTo(stateRestorer) }
 
+        val concatAdapter = ConcatAdapter()
+
         roomListViewModel.sections.forEach { section ->
             val sectionAdapter = SectionHeaderAdapter {
                 roomListViewModel.handle(RoomListAction.ToggleSection(section))
@@ -280,6 +284,7 @@ class RoomListFragment @Inject constructor(
         footerController.listener = this
         concatAdapter.addAdapter(footerController.adapter)
 
+        this.concatAdapter = concatAdapter
         views.roomListView.adapter = concatAdapter
     }
 

From 48292982555a8f84bae42ac6b45d6c88419c6a48 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 2 Apr 2021 11:44:10 +0200
Subject: [PATCH 493/578] ktlint

---
 .../android/sdk/internal/database/model/RoomSummaryEntity.kt   | 1 -
 .../android/sdk/internal/session/room/DefaultRoomService.kt    | 1 -
 vector/src/main/java/im/vector/app/AppStateHandler.kt          | 3 +--
 .../main/java/im/vector/app/features/home/ShortcutsHandler.kt  | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 669074ffd2..c87ac15a78 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -25,7 +25,6 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
-import timber.log.Timber
 
 internal open class RoomSummaryEntity(
         @PrimaryKey var roomId: String = ""
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index f1d4bfca3f..bd63ba480e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -195,4 +195,3 @@ internal class DefaultRoomService @Inject constructor(
                 .executeBy(taskExecutor)
     }
 }
-
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index b3b18d4adc..edec704f18 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -29,8 +29,7 @@ import javax.inject.Singleton
  */
 // TODO Keep this class for now, will maybe be used fro Space
 @Singleton
-class AppStateHandler @Inject constructor(
-) : LifecycleObserver {
+class AppStateHandler @Inject constructor() : LifecycleObserver {
 
     private val compositeDisposable = CompositeDisposable()
 
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
index 00ec8b43f9..4a2d001e1d 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
@@ -22,7 +22,6 @@ import android.os.Build
 import androidx.core.content.getSystemService
 import androidx.core.content.pm.ShortcutManagerCompat
 import im.vector.app.core.di.ActiveSessionHolder
-import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import io.reactivex.disposables.Disposables
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter

From d49ed63f1d2e17beb8bb53b189d7cad71223d268 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 2 Apr 2021 11:56:38 +0200
Subject: [PATCH 494/578] fix / put back setup button

---
 .../im/vector/app/features/home/room/list/RoomListFragment.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index ede3df2c18..aaa5bbcde5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -101,6 +101,7 @@ class RoomListFragment @Inject constructor(
         super.onViewCreated(view, savedInstanceState)
         views.stateView.contentView = views.roomListView
         views.stateView.state = StateView.State.Loading
+        setupCreateRoomButton()
         setupRecyclerView()
         sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java)
         roomListViewModel.observeViewEvents {

From 55e8f519dfb638081f19ac7c98a641b74c5d9cfa Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Fri, 2 Apr 2021 11:02:32 +0100
Subject: [PATCH 495/578] Convert RoomService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../org/matrix/android/sdk/rx/RxSession.kt    |  8 +--
 .../android/sdk/common/CryptoTestHelper.kt    | 22 +++----
 .../crypto/gossiping/KeyShareTests.kt         | 14 ++---
 .../sdk/api/session/room/RoomService.kt       | 32 ++++------
 .../session/room/DefaultRoomService.kt        | 61 +++++--------------
 .../features/createdirect/DirectRoomHelper.kt |  5 +-
 .../VerificationBottomSheetViewModel.kt       | 52 ++++++++--------
 .../home/room/detail/RoomDetailViewModel.kt   | 29 +++++----
 .../home/room/list/RoomListViewModel.kt       | 10 ++-
 .../roomdirectory/RoomDirectoryViewModel.kt   | 12 ++--
 .../createroom/CreateRoomViewModel.kt         | 32 +++++-----
 .../roompreview/RoomPreviewViewModel.kt       | 17 ++----
 12 files changed, 129 insertions(+), 165 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 0d5b5ed821..cac0a32232 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -124,8 +124,8 @@ class RxSession(private val session: Session) {
                 .startWithCallable { session.getPendingThreePids() }
     }
 
-    fun createRoom(roomParams: CreateRoomParams): Single<String> = singleBuilder {
-        session.createRoom(roomParams, it)
+    fun createRoom(roomParams: CreateRoomParams): Single<String> = rxSingle {
+        session.createRoom(roomParams)
     }
 
     fun searchUsersDirectory(search: String,
@@ -136,8 +136,8 @@ class RxSession(private val session: Session) {
 
     fun joinRoom(roomIdOrAlias: String,
                  reason: String? = null,
-                 viaServers: List<String> = emptyList()): Single<Unit> = singleBuilder {
-        session.joinRoom(roomIdOrAlias, reason, viaServers, it)
+                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
+        session.joinRoom(roomIdOrAlias, reason, viaServers)
     }
 
     fun getRoomIdByAlias(roomAlias: String,
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index 5815b23c06..da176491c6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -66,8 +66,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
     fun doE2ETestWithAliceInARoom(encryptedRoom: Boolean = true): CryptoTestData {
         val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
 
-        val roomId = mTestHelper.doSync<String> {
-            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" }, it)
+        val roomId = mTestHelper.runBlockingTest {
+            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" })
         }
 
         if (encryptedRoom) {
@@ -135,7 +135,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             bobRoomSummariesLive.observeForever(roomJoinedObserver)
         }
 
-        mTestHelper.doSync<Unit> { bobSession.joinRoom(aliceRoomId, callback = it) }
+        mTestHelper.runBlockingTest { bobSession.joinRoom(aliceRoomId) }
 
         mTestHelper.await(lock)
 
@@ -176,8 +176,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             room.invite(samSession.myUserId, null)
         }
 
-        mTestHelper.doSync<Unit> {
-            samSession.joinRoom(room.roomId, null, emptyList(), it)
+        mTestHelper.runBlockingTest {
+            samSession.joinRoom(room.roomId, null, emptyList())
         }
 
         return samSession
@@ -256,8 +256,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
     }
 
     fun createDM(alice: Session, bob: Session): String {
-        val roomId = mTestHelper.doSync<String> {
-            alice.createDirectRoom(bob.myUserId, it)
+        val roomId = mTestHelper.runBlockingTest {
+            alice.createDirectRoom(bob.myUserId)
         }
 
         mTestHelper.waitWithLatch { latch ->
@@ -300,7 +300,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
                 bobRoomSummariesLive.observeForever(newRoomObserver)
             }
 
-            mTestHelper.doSync<Unit> { bob.joinRoom(roomId, callback = it) }
+            mTestHelper.runBlockingTest { bob.joinRoom(roomId) }
         }
 
         return roomId
@@ -398,8 +398,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
         val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
         aliceSession.cryptoService().setWarnOnUnknownDevices(false)
 
-        val roomId = mTestHelper.doSync<String> {
-            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" }, it)
+        val roomId = mTestHelper.runBlockingTest {
+            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" })
         }
         val room = aliceSession.getRoom(roomId)!!
 
@@ -412,7 +412,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             val session = mTestHelper.createAccount("User_$index", defaultSessionParams)
             mTestHelper.runBlockingTest(timeout = 600_000) { room.invite(session.myUserId, null) }
             println("TEST -> " + session.myUserId + " invited")
-            mTestHelper.doSync<Unit> { session.joinRoom(room.roomId, null, emptyList(), it) }
+            mTestHelper.runBlockingTest { session.joinRoom(room.roomId, null, emptyList()) }
             println("TEST -> " + session.myUserId + " joined")
             sessions.add(session)
         }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index e6b364f3fb..40659cef11 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -71,13 +71,12 @@ class KeyShareTests : InstrumentedTest {
         val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
         // Create an encrypted room and add a message
-        val roomId = mTestHelper.doSync<String> {
+        val roomId = mTestHelper.runBlockingTest {
             aliceSession.createRoom(
                     CreateRoomParams().apply {
                         visibility = RoomDirectoryVisibility.PRIVATE
                         enableEncryption()
-                    },
-                    it
+                    }
             )
         }
         val room = aliceSession.getRoom(roomId)
@@ -332,13 +331,12 @@ class KeyShareTests : InstrumentedTest {
         }
 
         // Create an encrypted room and send a couple of messages
-        val roomId = mTestHelper.doSync<String> {
+        val roomId = mTestHelper.runBlockingTest {
             aliceSession.createRoom(
                     CreateRoomParams().apply {
                         visibility = RoomDirectoryVisibility.PRIVATE
                         enableEncryption()
-                    },
-                    it
+                    }
             )
         }
         val roomAlicePov = aliceSession.getRoom(roomId)
@@ -371,8 +369,8 @@ class KeyShareTests : InstrumentedTest {
             roomAlicePov.invite(bobSession.myUserId, null)
         }
 
-        mTestHelper.doSync<Unit> {
-            bobSession.joinRoom(roomAlicePov.roomId, null, emptyList(), it)
+        mTestHelper.runBlockingTest {
+            bobSession.joinRoom(roomAlicePov.roomId, null, emptyList())
         }
 
         // we want to discard alice outbound session
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 5f02b77a1e..bc5cb3c8f4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -17,14 +17,12 @@
 package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 
@@ -36,22 +34,19 @@ interface RoomService {
     /**
      * Create a room asynchronously
      */
-    fun createRoom(createRoomParams: CreateRoomParams,
-                   callback: MatrixCallback<String>): Cancelable
+    suspend fun createRoom(createRoomParams: CreateRoomParams): String
 
     /**
      * Create a direct room asynchronously. This is a facility method to create a direct room with the necessary parameters
      */
-    fun createDirectRoom(otherUserId: String,
-                         callback: MatrixCallback<String>): Cancelable {
+    suspend fun createDirectRoom(otherUserId: String): String {
         return createRoom(
                 CreateRoomParams()
                         .apply {
                             invitedUserIds.add(otherUserId)
                             setDirectMessage()
                             enableEncryptionIfInvitedUsersSupportIt = true
-                        },
-                callback
+                        }
         )
     }
 
@@ -61,10 +56,9 @@ interface RoomService {
      * @param reason optional reason for joining the room
      * @param viaServers the servers to attempt to join the room through. One of the servers must be participating in the room.
      */
-    fun joinRoom(roomIdOrAlias: String,
-                 reason: String? = null,
-                 viaServers: List<String> = emptyList(),
-                 callback: MatrixCallback<Unit>): Cancelable
+    suspend fun joinRoom(roomIdOrAlias: String,
+                         reason: String? = null,
+                         viaServers: List<String> = emptyList())
 
     /**
      * Get a room from a roomId
@@ -110,20 +104,18 @@ interface RoomService {
      * Inform the Matrix SDK that a room is displayed.
      * The SDK will update the breadcrumbs in the user account data
      */
-    fun onRoomDisplayed(roomId: String): Cancelable
+    suspend fun onRoomDisplayed(roomId: String)
 
     /**
      * Mark all rooms as read
      */
-    fun markAllAsRead(roomIds: List<String>,
-                      callback: MatrixCallback<Unit>): Cancelable
+    suspend fun markAllAsRead(roomIds: List<String>)
 
     /**
      * Resolve a room alias to a room ID.
      */
-    fun getRoomIdByAlias(roomAlias: String,
-                         searchOnServer: Boolean,
-                         callback: MatrixCallback<Optional<RoomAliasDescription>>): Cancelable
+    suspend fun getRoomIdByAlias(roomAlias: String,
+                                 searchOnServer: Boolean): Optional<RoomAliasDescription>
 
     /**
      * Delete a room alias
@@ -170,12 +162,12 @@ interface RoomService {
     /**
      * Get some state events about a room
      */
-    fun getRoomState(roomId: String, callback: MatrixCallback<List<Event>>)
+    suspend fun getRoomState(roomId: String): List<Event>
 
     /**
      * Use this if you want to get information from a room that you are not yet in (or invited)
      * It might be possible to get some information on this room if it is public or if guest access is allowed
      * This call will try to gather some information on this room, but it could fail and get nothing more
      */
-    fun peekRoom(roomIdOrAlias: String, callback: MatrixCallback<PeekResult>)
+    suspend fun peekRoom(roomIdOrAlias: String): PeekResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 383dd876d3..f510b3c997 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.room
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.RoomService
@@ -29,7 +28,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.asDomain
@@ -47,8 +45,6 @@ import org.matrix.android.sdk.internal.session.room.peeking.ResolveRoomStateTask
 import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateBreadcrumbsTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.fetchCopied
 import javax.inject.Inject
 
@@ -64,16 +60,11 @@ internal class DefaultRoomService @Inject constructor(
         private val peekRoomTask: PeekRoomTask,
         private val roomGetter: RoomGetter,
         private val roomSummaryDataSource: RoomSummaryDataSource,
-        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-        private val taskExecutor: TaskExecutor
+        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource
 ) : RoomService {
 
-    override fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback<String>): Cancelable {
-        return createRoomTask
-                .configureWith(createRoomParams) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun createRoom(createRoomParams: CreateRoomParams): String {
+        return createRoomTask.execute(createRoomParams)
     }
 
     override fun getRoom(roomId: String): Room? {
@@ -104,34 +95,20 @@ internal class DefaultRoomService @Inject constructor(
         return roomSummaryDataSource.getBreadcrumbsLive(queryParams)
     }
 
-    override fun onRoomDisplayed(roomId: String): Cancelable {
-        return updateBreadcrumbsTask
-                .configureWith(UpdateBreadcrumbsTask.Params(roomId))
-                .executeBy(taskExecutor)
+    override suspend fun onRoomDisplayed(roomId: String) {
+        updateBreadcrumbsTask.execute(UpdateBreadcrumbsTask.Params(roomId))
     }
 
-    override fun joinRoom(roomIdOrAlias: String, reason: String?, viaServers: List<String>, callback: MatrixCallback<Unit>): Cancelable {
-        return joinRoomTask
-                .configureWith(JoinRoomTask.Params(roomIdOrAlias, reason, viaServers)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun joinRoom(roomIdOrAlias: String, reason: String?, viaServers: List<String>) {
+        joinRoomTask.execute(JoinRoomTask.Params(roomIdOrAlias, reason, viaServers))
     }
 
-    override fun markAllAsRead(roomIds: List<String>, callback: MatrixCallback<Unit>): Cancelable {
-        return markAllRoomsReadTask
-                .configureWith(MarkAllRoomsReadTask.Params(roomIds)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun markAllAsRead(roomIds: List<String>) {
+        markAllRoomsReadTask.execute(MarkAllRoomsReadTask.Params(roomIds))
     }
 
-    override fun getRoomIdByAlias(roomAlias: String, searchOnServer: Boolean, callback: MatrixCallback<Optional<RoomAliasDescription>>): Cancelable {
-        return roomIdByAliasTask
-                .configureWith(GetRoomIdByAliasTask.Params(roomAlias, searchOnServer)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun getRoomIdByAlias(roomAlias: String, searchOnServer: Boolean): Optional<RoomAliasDescription> {
+        return roomIdByAliasTask.execute(GetRoomIdByAliasTask.Params(roomAlias, searchOnServer))
     }
 
     override suspend fun deleteRoomAlias(roomAlias: String) {
@@ -162,19 +139,11 @@ internal class DefaultRoomService @Inject constructor(
         }
     }
 
-    override fun getRoomState(roomId: String, callback: MatrixCallback<List<Event>>) {
-        resolveRoomStateTask
-                .configureWith(ResolveRoomStateTask.Params(roomId)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun getRoomState(roomId: String): List<Event> {
+        return resolveRoomStateTask.execute(ResolveRoomStateTask.Params(roomId))
     }
 
-    override fun peekRoom(roomIdOrAlias: String, callback: MatrixCallback<PeekResult>) {
-        peekRoomTask
-                .configureWith(PeekRoomTask.Params(roomIdOrAlias)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun peekRoom(roomIdOrAlias: String): PeekResult {
+        return peekRoomTask.execute(PeekRoomTask.Params(roomIdOrAlias))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt b/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
index 171970ec1e..bfa56cfb9e 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import javax.inject.Inject
 
 class DirectRoomHelper @Inject constructor(
@@ -45,9 +44,7 @@ class DirectRoomHelper @Inject constructor(
                 setDirectMessage()
                 enableEncryptionIfInvitedUsersSupportIt = adminE2EByDefault
             }
-            roomId = awaitCallback {
-                session.createRoom(roomParams, it)
-            }
+            roomId = session.createRoom(roomParams)
         }
         return roomId
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index 0e230c6727..a67cb96d37 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -249,32 +249,34 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                                 pendingRequest = Loading()
                         )
                     }
-                    session.createDirectRoom(otherUserId, object : MatrixCallback<String> {
-                        override fun onSuccess(data: String) {
-                            setState {
-                                copy(
-                                        roomId = data,
-                                        pendingRequest = Success(
-                                                session
-                                                        .cryptoService()
-                                                        .verificationService()
-                                                        .requestKeyVerificationInDMs(
-                                                                supportedVerificationMethodsProvider.provide(),
-                                                                otherUserId,
-                                                                data,
-                                                                pendingLocalId
-                                                        )
+                    viewModelScope.launch {
+                        val result = runCatching { session.createDirectRoom(otherUserId) }
+                        result.fold(
+                                { data ->
+                                    setState {
+                                        copy(
+                                                roomId = data,
+                                                pendingRequest = Success(
+                                                        session
+                                                                .cryptoService()
+                                                                .verificationService()
+                                                                .requestKeyVerificationInDMs(
+                                                                        supportedVerificationMethodsProvider.provide(),
+                                                                        otherUserId,
+                                                                        data,
+                                                                        pendingLocalId
+                                                                )
+                                                )
                                         )
-                                )
-                            }
-                        }
-
-                        override fun onFailure(failure: Throwable) {
-                            setState {
-                                copy(pendingRequest = Fail(failure))
-                            }
-                        }
-                    })
+                                    }
+                                },
+                                { failure ->
+                                    setState {
+                                        copy(pendingRequest = Fail(failure))
+                                    }
+                                }
+                        )
+                    }
                 } else {
                     setState {
                         copy(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 6152562850..ce53c72376 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -184,7 +184,12 @@ class RoomDetailViewModel @AssistedInject constructor(
             }
         }
         // Inform the SDK that the room is displayed
-        session.onRoomDisplayed(initialState.roomId)
+        viewModelScope.launch {
+            try {
+                session.onRoomDisplayed(initialState.roomId)
+            } catch (_: Exception) {
+            }
+        }
         callManager.addPstnSupportListener(this)
         callManager.checkForPSTNSupportIfNeeded()
         chatEffectManager.delegate = this
@@ -902,19 +907,19 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleJoinToAnotherRoomSlashCommand(command: ParsedCommand.JoinRoom) {
-        session.joinRoom(command.roomAlias, command.reason, emptyList(), object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
-                session.getRoomSummary(command.roomAlias)
-                        ?.roomId
-                        ?.let {
-                            _viewEvents.post(RoomDetailViewEvents.JoinRoomCommandSuccess(it))
-                        }
-            }
-
-            override fun onFailure(failure: Throwable) {
+        viewModelScope.launch {
+            try {
+                session.joinRoom(command.roomAlias, command.reason, emptyList())
+            } catch (failure: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
+                return@launch
             }
-        })
+            session.getRoomSummary(command.roomAlias)
+                    ?.roomId
+                    ?.let {
+                        _viewEvents.post(RoomDetailViewEvents.JoinRoomCommandSuccess(it))
+                    }
+        }
     }
 
     private fun legacyRiotQuoteText(quotedText: String?, myText: String): String {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 3a5e797f98..f4cfbe94d0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -26,7 +26,6 @@ import im.vector.app.core.utils.DataSource
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -169,7 +168,14 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                 ?.filter { it.membership == Membership.JOIN }
                 ?.map { it.roomId }
                 ?.toList()
-                ?.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
+                ?.let {
+                    viewModelScope.launch {
+                        try {
+                            session.markAllAsRead(it)
+                        } catch (_: Exception) {
+                        }
+                    }
+                }
     }
 
     private fun handleChangeNotificationMode(action: RoomListAction.ChangeRoomNotificationState) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 4ef38758c7..5012243e96 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -31,7 +31,6 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
@@ -232,17 +231,16 @@ class RoomDirectoryViewModel @AssistedInject constructor(
         val viaServers = state.roomDirectoryData.homeServer
                 ?.let { listOf(it) }
                 .orEmpty()
-        session.joinRoom(action.roomId, viaServers = viaServers, callback = object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
+        viewModelScope.launch {
+            try {
+                session.joinRoom(action.roomId, viaServers = viaServers)
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
-            }
-
-            override fun onFailure(failure: Throwable) {
+            } catch (failure: Throwable) {
                 // Notify the user
                 _viewEvents.post(RoomDirectoryViewEvents.Failure(failure))
             }
-        })
+        }
     }
 
     override fun onCleared() {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 3c027c4845..af63f23a8c 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -34,7 +34,6 @@ import im.vector.app.features.raw.wellknown.getElementWellknown
 import im.vector.app.features.raw.wellknown.isE2EByDefault
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
@@ -216,19 +215,22 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
                     }
                 }
 
-        session.createRoom(createRoomParams, object : MatrixCallback<String> {
-            override fun onSuccess(data: String) {
-                setState {
-                    copy(asyncCreateRoomRequest = Success(data))
-                }
-            }
-
-            override fun onFailure(failure: Throwable) {
-                setState {
-                    copy(asyncCreateRoomRequest = Fail(failure))
-                }
-                _viewEvents.post(CreateRoomViewEvents.Failure(failure))
-            }
-        })
+        // TODO: Should this be non-cancellable?
+        viewModelScope.launch {
+            val result = runCatching { session.createRoom(createRoomParams) }
+            result.fold(
+                    { roomId ->
+                        setState {
+                            copy(asyncCreateRoomRequest = Success(roomId))
+                        }
+                    },
+                    { failure ->
+                        setState {
+                            copy(asyncCreateRoomRequest = Fail(failure))
+                        }
+                        _viewEvents.post(CreateRoomViewEvents.Failure(failure))
+                    }
+            )
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
index c99213d890..c4d479374b 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
@@ -31,7 +31,6 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.roomdirectory.JoinState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
@@ -39,7 +38,6 @@ import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
@@ -77,9 +75,7 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
         }
         viewModelScope.launch(Dispatchers.IO) {
             val peekResult = tryOrNull {
-                awaitCallback<PeekResult> {
-                    session.peekRoom(initialState.roomAlias ?: initialState.roomId, it)
-                }
+                session.peekRoom(initialState.roomAlias ?: initialState.roomId)
             }
 
             when (peekResult) {
@@ -177,15 +173,14 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
             Timber.w("Try to join an already joining room. Should not happen")
             return@withState
         }
-        session.joinRoom(state.roomId, viaServers = state.homeServers, callback = object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
+        viewModelScope.launch {
+            try {
+                session.joinRoom(state.roomId, viaServers = state.homeServers)
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
-            }
-
-            override fun onFailure(failure: Throwable) {
+            } catch (failure: Throwable) {
                 setState { copy(lastError = failure) }
             }
-        })
+        }
     }
 }

From bd14c77ff08c8940cdd2d77b39c88f81d55ac16a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Apr 2021 11:43:52 +0200
Subject: [PATCH 496/578] Improve room name for invitation

---
 .../database/model/RoomMemberSummaryEntity.kt  |  2 ++
 .../room/membership/RoomDisplayNameResolver.kt | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
index a48b081f02..e970fab397 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
@@ -39,5 +39,7 @@ internal open class RoomMemberSummaryEntity(@PrimaryKey var primaryKey: String =
             membershipStr = value.name
         }
 
+    fun getBestName() = displayName?.takeIf { it.isNotBlank() } ?: userId
+
     companion object
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 0e18e30b13..f19862b397 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -77,14 +77,14 @@ internal class RoomDisplayNameResolver @Inject constructor(
         if (roomEntity?.membership == Membership.INVITE) {
             val inviteMeEvent = roomMembers.getLastStateEvent(userId)
             val inviterId = inviteMeEvent?.sender
-            name = if (inviterId != null) {
-                activeMembers.where()
-                        .equalTo(RoomMemberSummaryEntityFields.USER_ID, inviterId)
-                        .findFirst()
-                        ?.displayName
-            } else {
-                roomDisplayNameFallbackProvider.getNameForRoomInvite()
-            }
+            name = inviterId
+                    ?.let {
+                        activeMembers.where()
+                                .equalTo(RoomMemberSummaryEntityFields.USER_ID, it)
+                                .findFirst()
+                                ?.getBestName()
+                    }
+                    ?: roomDisplayNameFallbackProvider.getNameForRoomInvite()
         } else if (roomEntity?.membership == Membership.JOIN) {
             val roomSummary = RoomSummaryEntity.where(realm, roomId).findFirst()
             val invitedCount = roomSummary?.invitedMembersCount ?: 0
@@ -150,7 +150,7 @@ internal class RoomDisplayNameResolver @Inject constructor(
         if (roomMemberSummary == null) return null
         val isUnique = roomMemberHelper.isUniqueDisplayName(roomMemberSummary.displayName)
         return if (isUnique) {
-            roomMemberSummary.displayName
+            roomMemberSummary.getBestName()
         } else {
             "${roomMemberSummary.displayName} (${roomMemberSummary.userId})"
         }

From a4348b8194951a48c9d12bbd9ef49e4524334ee1 Mon Sep 17 00:00:00 2001
From: Yuriy Bulka <setthemfree@privacyrequired.com>
Date: Fri, 2 Apr 2021 19:24:21 +0000
Subject: [PATCH 497/578] Translated using Weblate (Ukrainian)

Currently translated at 73.7% (1743 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
---
 vector/src/main/res/values-uk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index a9ad29004f..0a4c3b9d19 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -1769,4 +1769,5 @@
     <string name="room_participants_leave_private_warning">Це не загальнодоступна кімната. Ви не зможете знову приєднатися без запрошення.</string>
     <string name="room_settings_enable_encryption_no_permission">У вас немає дозволу на ввімкнення шифрування в цій кімнаті.</string>
     <string name="room_settings_permissions_title">Дозволи кімнати</string>
+    <string name="room_list_catchup_welcome_body">Ознайомтеся з непрочитаними повідомленнями тут</string>
 </resources>
\ No newline at end of file

From 1ebcafd920dcdf58e28ddc09747ab8cb2c767396 Mon Sep 17 00:00:00 2001
From: strix aluco <strixaluco@rocketmail.com>
Date: Fri, 2 Apr 2021 15:55:08 +0000
Subject: [PATCH 498/578] Translated using Weblate (Ukrainian)

Currently translated at 73.7% (1743 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
---
 vector/src/main/res/values-uk/strings.xml | 476 +++++++++++++++++-----
 1 file changed, 382 insertions(+), 94 deletions(-)

diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 0a4c3b9d19..f3a9be7023 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -94,10 +94,10 @@
     <string name="power_level_default">Типово</string>
     <string name="power_level_moderator">Модератор</string>
     <string name="power_level_admin">Адміністратор</string>
-    <string name="notice_widget_removed_by_you">Ви вилучили %1$s віджет</string>
-    <string name="notice_widget_removed">%1$s вилучає %2$s віджет</string>
-    <string name="notice_widget_added_by_you">Ви додали %1$s віджет</string>
-    <string name="notice_widget_added">%1$s додає %2$s віджет</string>
+    <string name="notice_widget_removed_by_you">Ви вилучили %1$s знадіб</string>
+    <string name="notice_widget_removed">%1$s вилучає %2$s знадіб</string>
+    <string name="notice_widget_added_by_you">Ви додали %1$s знадіб</string>
+    <string name="notice_widget_added">%1$s додає %2$s знадіб</string>
     <string name="notice_room_third_party_registered_invite_by_you">Ви прийняли запрошення до %1$s</string>
     <string name="notice_room_third_party_invite_by_you">Ви надіслали запрошення для %1$s приєднатися до кімнати</string>
     <string name="notice_profile_change_redacted_by_you">Ви оновили свій профіль %1$s</string>
@@ -158,8 +158,8 @@
     <string name="room_displayname_empty_room_was">Порожня кімната (була %s)</string>
     <string name="power_level_custom_no_value">Власний</string>
     <string name="power_level_custom">Власний (%1$d)</string>
-    <string name="notice_widget_modified_by_you">Ви змінили віджет %1$s</string>
-    <string name="notice_widget_modified">%1$s змінює віджет %2$s</string>
+    <string name="notice_widget_modified_by_you">Ви змінили знадіб %1$s</string>
+    <string name="notice_widget_modified">%1$s змінює знадіб %2$s</string>
     <string name="notice_direct_room_update_by_you">Ви оновили кімнату.</string>
     <string name="notice_made_future_room_visibility_by_you">Ви зробили майбутню історію кімнати видимою для %1$s</string>
     <string name="notice_made_future_direct_room_visibility_by_you">Ви зробили майбутні повідомлення видимими для %1$s</string>
@@ -194,7 +194,7 @@
     <string name="send">Надіслати</string>
     <string name="resend">Надіслати ще раз</string>
     <string name="redact">Прибрати</string>
-    <string name="quote">Цитата</string>
+    <string name="quote">Цитувати</string>
     <string name="share">Поділитися</string>
     <string name="later">Пізніше</string>
     <string name="forward">Переслати</string>
@@ -246,7 +246,7 @@
     <string name="home_filter_placeholder_rooms">Пошук кімнат</string>
     <!-- Home fragment -->
     <string name="invitations_header">Запрошення</string>
-    <string name="low_priority_header">Низький пріоритет</string>
+    <string name="low_priority_header">Неважливі</string>
     <!-- People fragment -->
     <string name="direct_chats_header">Бесіди</string>
     <string name="local_address_book_header">Локальні контакти</string>
@@ -285,7 +285,7 @@
     <string name="login">Увійти</string>
     <string name="logout">Вийти</string>
     <string name="hs_url">URL сервера</string>
-    <string name="identity_url">URL сервера аутентифікації</string>
+    <string name="identity_url">URL сервера ідентифікації</string>
     <string name="search">Пошук</string>
     <string name="start_new_chat">Почати новий чат</string>
     <string name="start_voice_call">Здійснити голосовий виклик</string>
@@ -328,7 +328,7 @@
     <string name="auth_recaptcha_message">Цей сервер хоче переконатися, що ви не робот</string>
     <string name="auth_username_in_use">Логін вже використовується</string>
     <string name="auth_home_server">Сервер:</string>
-    <string name="auth_identity_server">Сервер аутентифікації:</string>
+    <string name="auth_identity_server">Сервер ідентифікації:</string>
     <string name="auth_reset_password_next_step_button">Я перевірив(ла) свою email адресу</string>
     <string name="auth_reset_password_message">Для скидання паролю введіть email прив\'язаний до облікового запису:</string>
     <string name="auth_reset_password_missing_email">Необхідно ввести email прив\'язаний до вашого облікового запису\'.</string>
@@ -426,8 +426,8 @@
     <string name="room_title_one_member">1 учасник</string>
     <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Залишити кімнату</string>
-    <string name="room_participants_leave_prompt_msg">Ви впевнені, що хочете залишити кімнату?</string>
-    <string name="room_participants_remove_prompt_msg">Ви впевнені, що хочете вилучити %s з цієї кімнати?</string>
+    <string name="room_participants_leave_prompt_msg">Ви впевнені, що бажаєте залишити кімнату\?</string>
+    <string name="room_participants_remove_prompt_msg">Ви впевнені, що бажаєте вилучити %s з цієї кімнати\?</string>
     <string name="room_participants_create">Створити</string>
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
@@ -435,7 +435,7 @@
     <string name="room_participants_header_admin_tools">АДМІНІСТРУВАННЯ</string>
     <string name="room_participants_header_call">ВИКЛИК</string>
     <string name="room_participants_header_direct_chats">ПРЯМІ ЧАТИ</string>
-    <string name="room_participants_header_devices">ПРИСТРОЇ</string>
+    <string name="room_participants_header_devices">СЕАНСИ</string>
     <string name="room_participants_action_invite">Запросити</string>
     <string name="room_participants_action_leave">Залишити цю кімнату</string>
     <string name="room_participants_action_remove">Вилучити з цієї кімнати</string>
@@ -444,13 +444,13 @@
     <string name="room_participants_action_set_default_power_level">Зробити звичайним користувачем</string>
     <string name="room_participants_action_set_moderator">Зробити модератором</string>
     <string name="room_participants_action_set_admin">Зробити адміністратором</string>
-    <string name="room_participants_action_ignore">Ігнорувати користувача</string>
+    <string name="room_participants_action_ignore">Нехтувати</string>
     <string name="room_participants_action_unignore">Перестати ігнорувати</string>
     <string name="room_participants_invite_search_another_user">ID користувача, ім\'я або email</string>
     <string name="room_participants_action_mention">Згадати</string>
     <string name="room_participants_action_devices_list">Показати Список Пристроїв</string>
     <string name="room_participants_power_level_prompt">Ви не зможете скасувати цю дію, оскільки надаєте користувачу той же рівень доступу, що й у вас.\nВи впевнені?</string>
-    <string name="room_participants_invite_prompt_msg">"Впевнені, що хочете запросити %s до цієї кімнати?"</string>
+    <string name="room_participants_invite_prompt_msg">Ви впевнені, що бажаєте запросити %s до цієї кімнати\?</string>
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Запросити за ID</u></string>
     <string name="people_search_local_contacts">Локальні Контакти (%d)</string>
@@ -468,7 +468,7 @@
     <string name="room_message_placeholder_not_encrypted">Надіслати повідомлення (нешифроване)…</string>
     <string name="room_offline_notification">Зв\'язок із сервером втрачено.</string>
     <string name="room_unsent_messages_notification">Повідомлення не надіслані. %1$s або %2$s зараз?</string>
-    <string name="room_unknown_devices_messages_notification">Повідомлення не надіслані через присутність невідомих пристроїв. %1$s або %2$s зараз?</string>
+    <string name="room_unknown_devices_messages_notification">Повідомлення не надіслані через присутність невідомих сеансів. %1$s або %2$s зараз\?</string>
     <string name="room_prompt_resend">Повторити надсилання</string>
     <string name="room_prompt_cancel">скасувати все</string>
     <string name="room_resend_unsent_messages">Надіслати ненадіслані повідомлення знову</string>
@@ -515,7 +515,7 @@
     <string name="room_recents_directory">КАТАЛОГ</string>
     <string name="room_recents_favourites">ОБРАНІ</string>
     <string name="room_recents_conversations">КІМНАТИ</string>
-    <string name="room_recents_low_priority">НИЗЬКИЙ ПРІОРИТЕТ</string>
+    <string name="room_recents_low_priority">НЕВАЖЛИВІ</string>
     <string name="room_recents_invites">ЗАПРОШЕННЯ</string>
     <string name="room_recents_start_chat">Почати чат</string>
     <string name="room_recents_create_room">Створити кімнату</string>
@@ -575,7 +575,7 @@
     <string name="settings_keep_media">Зберігати медіа</string>
     <string name="settings_user_settings">Налаштування користувача</string>
     <string name="settings_notifications">Сповіщення</string>
-    <string name="settings_ignored_users">Ігноровані користувачі</string>
+    <string name="settings_ignored_users">Нехтувані користувачі</string>
     <string name="settings_other">Інше</string>
     <string name="settings_advanced">Розширені</string>
     <string name="settings_cryptography">Криптографія</string>
@@ -586,7 +586,7 @@
     <string name="settings_home_display">Домашній екран</string>
     <string name="settings_pin_missed_notifications">Закріплювати кімнати з пропущеними сповіщеннями</string>
     <string name="settings_pin_unread_messages">Закріплювати кімнати з новими повідомленнями</string>
-    <string name="settings_devices_list">Пристрої</string>
+    <string name="settings_devices_list">Сеанси</string>
     <string name="settings_always_show_timestamps">Показувати час надсилання для всіх повідомлень</string>
     <string name="settings_12_24_timestamps">Показувати час надсилання у 12-годинному форматі</string>
     <!-- analytics -->
@@ -604,7 +604,7 @@
     <string name="devices_delete_submit_button_label">Надіслати</string>
     <string name="settings_logged_in">Залоговано як</string>
     <string name="settings_home_server">Cервер</string>
-    <string name="settings_identity_server">Сервер Аутентифікації</string>
+    <string name="settings_identity_server">Сервер ідентифікації</string>
     <string name="settings_user_interface">Інтерфейс користувача</string>
     <string name="settings_interface_language">Мова</string>
     <string name="settings_select_language">Оберіть мову</string>
@@ -623,8 +623,8 @@
     <string name="settings_unignore_user">Показувати всі повідомлення %s\?
 \n
 \nЗауважте, що це перезавантажить застосунок та може тривати деякий час.</string>
-    <string name="settings_delete_notification_targets_confirmation">Ви справді бажаєте видалити цю ціль сповіщень?</string>
-    <string name="settings_delete_threepid_confirmation">Справді бажаєте видалити %1$s %2$s?</string>
+    <string name="settings_delete_notification_targets_confirmation">Ви впевнені, що бажаєте видалити цю ціль сповіщень\?</string>
+    <string name="settings_delete_threepid_confirmation">Ви впевнені, що бажаєте видалити %1$s %2$s\?</string>
     <string name="settings_select_country">Оберіть країну</string>
     <string name="settings_phone_number_country_label">Країна</string>
     <string name="settings_phone_number_country_error">Будь ласка, оберіть країну</string>
@@ -649,13 +649,13 @@
     <string name="room_settings_tag_pref_dialog_title">Позначено як:</string>
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Улюблені</string>
-    <string name="room_settings_tag_pref_entry_low_priority">Низький пріоритет</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Неважливі</string>
     <string name="room_settings_tag_pref_entry_none">Жодного</string>
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Доступ та видимість</string>
     <string name="room_settings_directory_visibility">Показувати кімнату при пошуку</string>
     <string name="room_settings_room_access_rules_pref_title">Доступ</string>
-    <string name="room_settings_room_read_history_rules_pref_title">Читабельність історії</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Прочитність історії</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Хто може читати історію повідомлень?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Хто має доступ до кімнати?</string>
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
@@ -679,8 +679,8 @@
     <string name="room_settings_labs_end_to_end">Наскрізне шифрування</string>
     <string name="room_settings_labs_end_to_end_is_active">Наскрізне шифрування увімкнено</string>
     <string name="room_settings_labs_end_to_end_warnings">Вийдіть з облікового запису, щоб отримати змогу увімкнути шифрування.</string>
-    <string name="room_settings_never_send_to_unverified_devices_title">Шифрувати лише до перевірених пристроїв</string>
-    <string name="room_settings_never_send_to_unverified_devices_summary">Ніколи не надсилати шифровані повідомлення з цього пристрою неперевіреним пристроям у цій кімнаті.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Шифрувати лише до звірених сеансів</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">Ніколи не надсилати зашифровані повідомлення з цього сеансу незвіреним сеансам у цій кімнаті.</string>
     <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Кімната не має локальної адреси</string>
     <string name="room_settings_addresses_add_new_address">Нова адреса (e.g #foo:matrix.org")</string>
@@ -728,10 +728,10 @@
     <string name="encryption_import_room_keys">Імпортувати ключі кімнати</string>
     <string name="encryption_import_room_keys_summary">Імпортувати ключі з локального файлу</string>
     <string name="encryption_import_import">Імпортувати</string>
-    <string name="encryption_never_send_to_unverified_devices_title">Шифрувати лише для перевірених пристроїв</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Ніколи не надсилати шифровані повідомлення з цього пристрою неперевіреним пристроям.</string>
-    <string name="encryption_information_not_verified">НЕ перевірено</string>
-    <string name="encryption_information_verified">Перевірено</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Шифрувати лише для звірених сеансів</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Ніколи не надсилати зашифровані повідомлення з цього сеансу на незвірені сеанси.</string>
+    <string name="encryption_information_not_verified">НЕ звірено</string>
+    <string name="encryption_information_verified">Звірено</string>
     <string name="encryption_information_blocked">У чорному списку</string>
     <string name="encryption_information_unknown_device">невідомий пристрій</string>
     <string name="encryption_information_none">порожньо</string>
@@ -746,8 +746,12 @@
 У майбутньому цей процес верифікації стане більш складним.</string>
     <string name="encryption_information_verify_key_match">Я підтверджую, що ключі співпадають</string>
     <!-- unknown devices management -->
-    <string name="unknown_devices_alert_title">Кімната містить невідомі пристрої</string>
-    <string name="unknown_devices_alert_message">Кімната містить неперевірені невідомі пристрої.\nThis means there is no guarantee that the devices belong to the users they claim to.\nWe recommend you go through the verification process for each device before continuing, but you can resend the message without verifying if you prefer.\n\nUnknown devices:</string>
+    <string name="unknown_devices_alert_title">Кімната містить невідомі сеанси</string>
+    <string name="unknown_devices_alert_message">Кімната містить незвірені невідомі сеанси.
+\nЦе означає відсутність будь-яких гарантій у тому, що сеанси належать тим користувачам, які заявляють про належність цих сеансів їм.
+\nМи радимо вам звірити кожен сеанс перед тим, як продовжити, проте ви можете перенадіслати повідомлення без звірки, якщо цього бажаєте.
+\n
+\nНевідомі сеанси:</string>
     <!-- directory activity  -->
     <string name="select_room_directory">Вибір каталогу кімнат</string>
     <string name="directory_server_fail_to_retrieve_server">Можливо сервер недоступний чи перевантажений</string>
@@ -767,12 +771,12 @@
     <string name="largest">Найбільший</string>
     <string name="huge">Величезний</string>
     <!-- Widget-->
-    <string name="widget_no_power_to_manage">Для керування віджетами у цій кімнаті потрібен дозвіл</string>
-    <string name="widget_creation_failure">Помилка створення віджету</string>
+    <string name="widget_no_power_to_manage">Для керування знадобами у цій кімнаті потрібен дозвіл</string>
+    <string name="widget_creation_failure">Помилка створення знадобу</string>
     <string name="settings_labs_create_conference_with_jitsi">Здійснювати конференц дзвінки через Jitsi</string>
-    <string name="widget_delete_message_confirmation">Справді бажаєте видалити віджет?</string>
+    <string name="widget_delete_message_confirmation">Ви впевнені, що бажаєте видалити знадіб з цієї кімнати\?</string>
     <!-- Widget Integration Manager -->
-    <string name="widget_integration_unable_to_create">Не вдалося створити віджет.</string>
+    <string name="widget_integration_unable_to_create">Не вдалося створити знадіб.</string>
     <string name="widget_integration_failed_to_send_request">Не вдалося надіслати запит.</string>
     <string name="widget_integration_positive_power_level">Рівень доступу має бути більше 0.</string>
     <string name="widget_integration_must_be_in_room">Ви не перебуваєте в цій кімнаті.</string>
@@ -795,10 +799,10 @@
     <string name="settings_labs_native_camera">Використовувати рідну камеру</string>
     <!-- share keys -->
     <string name="you_added_a_new_device">Щойно доданий вами пристрій \'%s\' править ключі шифрування.</string>
-    <string name="your_unverified_device_requesting">Ваш неперевірений пристрій  \'%s\' править ключі шифрування.</string>
+    <string name="your_unverified_device_requesting">Ваш незвірений пристрій \'%s\' вимагає ключі шифрування.</string>
     <string name="start_verification">Почати перевірку</string>
     <string name="share_without_verifying">Поділитись без перевірки</string>
-    <string name="ignore_request">Знехтувати запитом</string>
+    <string name="ignore_request">Знехтувати запит</string>
     <!-- slash commands -->
     <string name="command_error">Помилка виконання команди</string>
     <string name="unrecognized_command">Команду %s не розпізнано</string>
@@ -812,9 +816,9 @@
     <string name="groups_header">Спільноти</string>
     <string name="no_group_placeholder">Нема груп</string>
     <string name="send_bug_report_rage_shake">Струснути пристрій, щоб повідомити про помилку</string>
-    <string name="start_new_chat_prompt_msg">Ви дійсно хочете почати новий чат з %s?</string>
-    <string name="start_voice_call_prompt_msg">Ви впевнені, що бажаєте почати голосовий виклик?</string>
-    <string name="start_video_call_prompt_msg">Ви впевнені, що бажаєте почати відео виклик?</string>
+    <string name="start_new_chat_prompt_msg">Ви впевнені, що бажаєте розпочати новий чат з %s\?</string>
+    <string name="start_voice_call_prompt_msg">Ви впевнені, що бажаєте розпочати голосовий виклик\?</string>
+    <string name="start_video_call_prompt_msg">Ви впевнені, що бажаєте розпочати відео виклик\?</string>
     <string name="groups_list">Список груп</string>
     <plurals name="membership_changes">
         <item quantity="one">%d зміна  членства</item>
@@ -832,9 +836,9 @@
     <string name="room_settings_add_homescreen_shortcut">Додати ярлик на головний екран</string>
     <string name="settings_notification_privacy">Приватність сповіщень</string>
     <string name="settings_notification_privacy_normal">Нормальний</string>
-    <string name="title_activity_choose_sticker">Відправити наліпку</string>
-    <string name="option_send_sticker">Відправити стікер</string>
-    <string name="no_sticker_application_dialog_content">У вас зараз не має стікерів.
+    <string name="title_activity_choose_sticker">Надіслати наліпку</string>
+    <string name="option_send_sticker">Надіслати наліпку</string>
+    <string name="no_sticker_application_dialog_content">У вас поки що не має наліпок.
 \n
 \nДодати зараз\?</string>
     <plurals name="room_header_active_members_count">
@@ -865,7 +869,7 @@
     <string name="download">Завантажити</string>
     <string name="speak">Говорити</string>
     <string name="clear">Очистити</string>
-    <string name="e2e_re_request_encryption_key"><u>Вдруге запитати ключі шифрування</u> з інших ваших пристроїв.</string>
+    <string name="e2e_re_request_encryption_key">Вдруге запитати ключі шифрування з інших ваших сеансів.</string>
     <string name="e2e_re_request_encryption_key_sent">Запит ключа відправлений.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Запит відправлений</string>
     <string name="settings_vibrate_on_mention">Вібрація при згадуванні користувача</string>
@@ -972,10 +976,10 @@
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s у %2$s</string>
     <plurals name="active_widgets">
-        <item quantity="one">%d активний віджет</item>
-        <item quantity="few">%d активні віджети</item>
-        <item quantity="many">%d активних віджетів</item>
-        <item quantity="other"/>
+        <item quantity="one">%d активний знадіб</item>
+        <item quantity="few">%d активні знадоби</item>
+        <item quantity="many">%d активних знадобів</item>
+        <item quantity="other">%d активних знадобів</item>
     </plurals>
     <string name="widget_integration_missing_parameter">Пропущено обов’язковий параметр.</string>
     <string name="widget_integration_invalid_parameter">Недійсний параметр.</string>
@@ -1047,14 +1051,14 @@
     <string name="room_tombstone_continuation_link">Продовження розмови тут</string>
     <string name="room_tombstone_continuation_description">Ця кімната є продовженням іншої розмови</string>
     <string name="room_tombstone_predecessor_link">Натисніть сюди, щоб побачити старіші повідомлення</string>
-    <string name="resource_limit_exceeded_title">Перевищено ресурсний ліміт</string>
+    <string name="resource_limit_exceeded_title">Перевищено ресурсне обмеження</string>
     <string name="resource_limit_contact_action">Зв’язатися з адміністратором</string>
     <string name="resource_limit_contact_admin">зв’яжіться з Вашим адміністратором</string>
     <string name="resource_limit_soft_default">Цей сервер перевищив один із ресурсних лімітів, тому <b>деякі користувачі не зможуть увійти в систему</b>.</string>
-    <string name="resource_limit_hard_default">Цей сервер перевищив один із ресурсних лімітів.</string>
-    <string name="resource_limit_soft_mau"> Цей сервер досяг свого місячного ліміту активних користувачів, тому <b>деякі з них не зможуть увійти в систему</b>.</string>
-    <string name="resource_limit_hard_mau">Цей сервер досяг свого місячного ліміту активних користувачів.</string>
-    <string name="resource_limit_soft_contact">Будь ласка, %s для збільшення цього ліміту.</string>
+    <string name="resource_limit_hard_default">Цей домашній сервер досяг одного зі своїх ресурсних обмежень.</string>
+    <string name="resource_limit_soft_mau"> Цей сервер досяг свого місячного обмеження на активних користувачів, тому <b>деякі з них не зможуть увійти в систему</b>.</string>
+    <string name="resource_limit_hard_mau">Цей сервер досяг свого місячного обмеження на активних користувачів.</string>
+    <string name="resource_limit_soft_contact">Будь ласка, %s для збільшення цього обмеження.</string>
     <string name="resource_limit_hard_contact">Будь ласка, %s для продовження використання цього сервісу.</string>
     <string name="settings_lazy_loading_title">Поступове завантаження співрозмовників</string>
     <string name="settings_lazy_loading_description">Підвищити продуктивність, завантажуючи співрозмовників лише при першому перегляді.</string>
@@ -1122,8 +1126,8 @@
     <string name="call_format_turn_hd_on">Увімкнути HD</string>
     <string name="call_format_turn_hd_off">Вимкнути HD</string>
     <string name="call_camera_back">Основна</string>
-    <string name="call_camera_front">Фронтальна</string>
-    <string name="call_switch_camera">Переключити камеру</string>
+    <string name="call_camera_front">Передня</string>
+    <string name="call_switch_camera">Перемкнути камеру</string>
     <string name="sound_device_wireless_headset">Бездротова гарнітура</string>
     <string name="sound_device_headset">Гарнітура</string>
     <string name="sound_device_speaker">Динамік</string>
@@ -1139,15 +1143,15 @@
     <string name="action_sign_out_confirmation_simple">Ви впевнені, що бажаєте вийти\?</string>
     <string name="call_notification_hangup">Покласти слухавку</string>
     <string name="call_notification_reject">Відхилити</string>
-    <string name="call_notification_answer">Прийняти</string>
+    <string name="call_notification_answer">Відповісти</string>
     <string name="decline">Відмовити</string>
     <string name="review">Огляд</string>
     <string name="ignore">Знехтувати</string>
     <string name="abort">Перервати</string>
     <string name="done">Готово</string>
     <string name="skip">Пропустити</string>
-    <string name="failed_to_remove_widget">Не вдалося видалити віджет</string>
-    <string name="failed_to_add_widget">Не вдалося додати віджет</string>
+    <string name="failed_to_remove_widget">Не вдалося видалити знадіб</string>
+    <string name="failed_to_add_widget">Не вдалося додати знадіб</string>
     <string name="cannot_call_yourself">Ви не можете здійснити дзвінок із самим собою</string>
     <string name="audio_meeting">Почати аудіо-зустріч</string>
     <string name="video_meeting">Почати відеозустріч</string>
@@ -1168,7 +1172,7 @@
     <string name="sign_out_bottom_sheet_backing_up_keys">Резервне копіювання ключів…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Якщо вийти зараз, ви втратите свої зашифровані повідомлення</string>
     <string name="title_activity_verify_device">Перевірка сеансу</string>
-    <string name="attachment_type_sticker">Стікер</string>
+    <string name="attachment_type_sticker">Наліпка</string>
     <string name="attachment_type_gallery">Галерея</string>
     <string name="attachment_type_file">Файл</string>
     <string name="attachment_type_dialog_title">Додати зображення з</string>
@@ -1216,10 +1220,10 @@
     <string name="power_level_edit_title">Призначити роль</string>
     <string name="identity_server_set_alternative_submit">Надіслати</string>
     <string name="settings_phone_numbers">Номери телефонів</string>
-    <string name="settings_emails">Email адреси</string>
+    <string name="settings_emails">Електронні адреси</string>
     <string name="room_participants_action_cancel_invite">Скасувати запрошення</string>
     <string name="template_invite_friends_rich_title">🔐️ Приєднуйтесь до мене в ${app_name}</string>
-    <string name="template_invite_friends_text">Привіт, поспілкуйся зі мною в ${app_name}: %s</string>
+    <string name="template_invite_friends_text">Привіт! Спілкуймося в ${app_name}: %s</string>
     <string name="invite_friends">Запросити друзів</string>
     <string name="group_all_communities">Всі спільноти</string>
     <string name="settings_show_redacted_summary">Показувати заглушку на місці видалених повідомлень</string>
@@ -1243,7 +1247,7 @@
     <string name="identity_server_consent_dialog_title">Надіслати електронні адреси та номери телефонів</string>
     <string name="settings_discovery_consent_title">Надіслати електронні адреси та номери телефонів</string>
     <string name="settings_emails_and_phone_numbers_summary">Керування електронними адресами та номерами телефонів, пов’язаними з вашим обліковим записом Matrix</string>
-    <string name="settings_emails_and_phone_numbers_title">Електорнні адреси та номери телефонів</string>
+    <string name="settings_emails_and_phone_numbers_title">Електронні адреси та номери телефонів</string>
     <string name="send_bug_report_include_key_share_history">Надіслати історію запитів спільного доступу до ключів</string>
     <string name="settings_category_timeline">Стрічка подій</string>
     <string name="timeline_unread_messages">Непрочитані повідомлення</string>
@@ -1290,9 +1294,9 @@
     <string name="settings_call_notifications_preferences">Налаштування сповіщень викликів</string>
     <string name="settings_noisy_notifications_preferences">Налаштування гучних сповіщень</string>
     <string name="notification_initial_sync">Початкова синхронізація…</string>
-    <string name="settings_discovery_emails_title">Видимі електронні адреси</string>
+    <string name="settings_discovery_emails_title">Виявні електронні адреси</string>
     <string name="autodiscover_invalid_response">Недійсна відповідь виявлення домашнього сервера</string>
-    <string name="settings_discovery_manage">Налаштуйте свою видимість.</string>
+    <string name="settings_discovery_manage">Налаштуйте свою виявність.</string>
     <string name="settings_discovery_category">Видимість</string>
     <string name="call_failed_no_connection_description">Не вдалося встановити зв’язок у режимі реального часу.
 \nПопросіть адміністратора вашого домашнього сервера налаштувати сервер TURN для надійної роботи викликів.</string>
@@ -1316,7 +1320,7 @@
     <string name="login_server_modular_learn_more">Дізнатись більше</string>
     <string name="room_profile_section_security">Безпека</string>
     <string name="settings_security_and_privacy">Безпека та приватність</string>
-    <string name="disclaimer_content">Ми раді повідомити, що змінили назву! Ваш застосунок оновлено й ви ввійшли у свій обліковий запис.</string>
+    <string name="disclaimer_content">Ми раді повідомити вас, що ми змінили назву! Ваш застосунок оновлено й ви увійшли у свій обліковий запис.</string>
     <string name="login_reset_password_cancel_confirmation_content">Зміну параля ще не завершено.
 \n
 \nЗупинити змінювання пароля\?</string>
@@ -1325,7 +1329,7 @@
     <string name="keys_backup_setup_backup_started_title">Резервне копіювання розпочато</string>
     <string name="unexpected_error">Неочікувана помилка</string>
     <string name="recovery_key">Ключ відновлення</string>
-    <string name="keys_backup_setup_step3_generating_key_status">Створення ключа відновлення за допомогою парольної фрази, цей процес може тривати кілька секунд.</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Створення відновлювального ключа за допомогою парольної фрази, цей процес може тривати кілька секунд.</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Поділитися ключем відновлення з…</string>
     <string name="keys_backup_setup_step3_please_make_copy">Будь ласка, створіть копію</string>
     <string name="keys_backup_setup_override_stop">Стоп</string>
@@ -1341,9 +1345,9 @@
     <string name="keys_backup_setup_step3_copy_button_title">Зберегти ключ відновлення</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Я створив копію</string>
     <string name="keys_backup_setup_step3_button_title">Готово</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Зберігайте ключ відновлення десь дуже надійно, наприклад, у менеджері паролів (або сейфі)</string>
-    <string name="keys_backup_setup_step3_text_line2">Ваш ключ відновлення — це мережа безпеки — ви можете використовувати його для відновлення доступу до ваших зашифрованих повідомлень, якщо ви забудете свою парольну фразу.
-\nТримайте ключ відновлення десь дуже надійно, наприклад, у менеджері паролів (або сейфі)</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Тримайте відновлювальний ключ у якомусь дуже надійному місці, наприклад, у менеджері паролів (або сейфі)</string>
+    <string name="keys_backup_setup_step3_text_line2">Ваш відновлювальний ключ — це мережа безпеки — ви можете використовувати його для відновлення доступу до ваших зашифрованих повідомлень, якщо ви забудете свою парольну фразу.
+\nТримайте відновлювальний ключ у якомусь дуже надійному місці, наприклад, у менеджері паролів (або сейфі)</string>
     <string name="keys_backup_setup_step3_text_line1">Створюється резервна копія ключів.</string>
     <string name="keys_backup_setup_step3_success_title">Успішно !</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Додатково) Налаштування за допомогою ключа відновлення</string>
@@ -1371,7 +1375,7 @@
     <string name="key_share_request">Запит на розподіл ключів</string>
     <string name="share_without_verifying_short_label">Поділитися</string>
     <string name="start_verification_short_label">Перевірити</string>
-    <string name="your_unverified_device_requesting_with_info">Неперевірений сеанс запитує ключі шифрування.
+    <string name="your_unverified_device_requesting_with_info">Незвірений сеанс запитує ключі шифрування.
 \nНазва сеансу: %1$s
 \nОстанні відвідини: %2$s
 \nЯкщо ви не ввійшли в інший сеанс, знехтуйте цим запитом.</string>
@@ -1380,7 +1384,7 @@
 \nОстанні відвідини: %2$s
 \nЯкщо ви не ввійшли в інший сеанс, знехтуйте цим запитом.</string>
     <string name="widget_integration_review_terms">Для продовження потрібно прийняти Умови користування цією службою.</string>
-    <string name="room_no_active_widgets">Немає активних віджетів</string>
+    <string name="room_no_active_widgets">Немає активних знадобів</string>
     <string name="room_manage_integrations">Керувати інтеграціями</string>
     <string name="integration_manager_not_configured">Менеджер інтеграції не налаштовано.</string>
     <string name="room_widget_webview_read_protected_media">Читати захищені DRM засоби масової інформації</string>
@@ -1388,25 +1392,25 @@
     <string name="room_widget_webview_access_camera">Використовувати камеру</string>
     <string name="room_widget_resource_decline_permission">Заблокувати все</string>
     <string name="room_widget_resource_grant_permission">Дозволити</string>
-    <string name="room_widget_resource_permission_title">Цей віджет хоче використовувати такі ресурси:</string>
+    <string name="room_widget_resource_permission_title">Цей знадіб хоче використовувати такі ресурси:</string>
     <string name="error_jitsi_not_supported_on_old_device">На жаль, конференц-дзвінки з Jitsi не підтримуються на старих пристроях (пристрої з ОС Android нижче 6.0)</string>
     <string name="room_widget_permission_room_id">Ідентифікатор кімнати</string>
-    <string name="room_widget_permission_widget_id">Ідентифікатор віджета</string>
+    <string name="room_widget_permission_widget_id">Ідентифікатор знадобу</string>
     <string name="room_widget_permission_theme">Ваша тема</string>
     <string name="room_widget_permission_user_id">Ваш ідентифікатор користувача</string>
     <string name="room_widget_permission_avatar_url">URL-адреса зображення профілю</string>
     <string name="room_widget_permission_display_name">Ваше видиме ім\'я</string>
     <string name="room_widget_revoke_access">Скасувати доступ для мене</string>
     <string name="room_widget_open_in_browser">Відкрити в браузері</string>
-    <string name="room_widget_reload">Перезавантажити віджет</string>
-    <string name="room_widget_failed_to_load">Не вдалося завантажити віджет.
+    <string name="room_widget_reload">Перезавантажити знадіб</string>
+    <string name="room_widget_failed_to_load">Не вдалося завантажити знадіб.
 \n%s</string>
     <string name="room_widget_permission_shared_info_title">Використання може спричинити обмін даними з %s:</string>
     <string name="room_widget_permission_webview_shared_info_title">За його використання може бути встановлено файли cookie та відбуватися обмін даними з %s:</string>
-    <string name="room_widget_permission_added_by">Цей віджет додав:</string>
-    <string name="room_widget_permission_title">Завантажити віджет</string>
-    <string name="room_widget_activity_title">Віджет</string>
-    <string name="active_widgets_title">Активні віджети</string>
+    <string name="room_widget_permission_added_by">Цей знадіб додав:</string>
+    <string name="room_widget_permission_title">Завантажити знадіб</string>
+    <string name="room_widget_activity_title">Знадіб</string>
+    <string name="active_widgets_title">Активні знадоби</string>
     <string name="active_widget_view_action">ПОДАННЯ</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
@@ -1512,8 +1516,8 @@
     <string name="settings_show_room_member_state_events_summary">Включає події запрошення/приєднання/виходу/видалення/заборони та зміни зображень профілю/видимих імен.</string>
     <string name="settings_show_room_member_state_events">Показати стан подій учасників кімнати</string>
     <string name="settings_cryptography_manage_keys">Керування криптографічними ключами</string>
-    <string name="settings_integrations_summary">Використовуйте Менеджер інтеграції для керування ботами, мостами, віджетами та пакетами наклейок.
-\nМенеджери інтеграції отримують дані конфігурації та можуть змінювати віджети, надсилати запрошення до кімнати та надавати права від вашого імені.</string>
+    <string name="settings_integrations_summary">Використовуйте Менеджер інтеграції для керування ботами, мостами, знадобами та пакунками наліпок.
+\nМенеджери інтеграції отримують дані конфігурації та можуть змінювати знадоби, надсилати запрошення до кімнати та надавати права від вашого імені.</string>
     <string name="settings_integrations">Інтеграції</string>
     <plurals name="seconds">
         <item quantity="one">%d секунда</item>
@@ -1607,14 +1611,14 @@
 \nЩоб запобігти їх повторному приєднанню, замість цього слід заблокувати їх.</string>
     <string name="room_participants_kick_reason">Причина викидання</string>
     <string name="room_participants_kick_title">Викинути користувача</string>
-    <string name="room_participants_action_cancel_invite_prompt_msg">Дійсно скасувати запрошення для цього користувача\?</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Ви впевнені, що бажаєте скасувати запрошення для цього користувача\?</string>
     <string name="room_participants_action_cancel_invite_title">Скасувати запрошення</string>
     <string name="room_participants_action_unignore_prompt_msg">Зняття ігнорування з цього користувача знову покаже всі повідомлення від нього.</string>
-    <string name="room_participants_action_unignore_title">Не ігнорувати користувача</string>
-    <string name="room_participants_action_ignore_prompt_msg">Ігнорування цього користувача призведе до видалення його повідомлень з кімнат, якими ви ділитесь.
+    <string name="room_participants_action_unignore_title">Рознехтувати користувача</string>
+    <string name="room_participants_action_ignore_prompt_msg">Нехтування цього користувача призведе до видалення його повідомлень з усіх кімнат, де ви обидва є учасниками.
 \n
 \nВи можете будь-коли змінити цю дію в загальних налаштуваннях.</string>
-    <string name="room_participants_action_ignore_title">Ігнорувати користувача</string>
+    <string name="room_participants_action_ignore_title">Нехтувати користувача</string>
     <string name="room_participants_power_level_demote">Понизити</string>
     <string name="room_participants_power_level_demote_warning_prompt">Ви не зможете скасувати цю зміну, оскільки понижуєте свої права, якщо ви останній привілейований користувач у кімнаті, неможливо буде повернути собі привілеї.</string>
     <string name="room_participants_power_level_demote_warning_title">Понизитися\?</string>
@@ -1637,8 +1641,8 @@
     <string name="room_list_quick_actions_notifications_mentions">Лише згадки</string>
     <string name="room_list_quick_actions_notifications_all">Всі повідомлення</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Всі повідомлення (гучно)</string>
-    <string name="message_ignore_user">Ігнорувати користувача</string>
-    <string name="unignore">Перестати ігнорувати</string>
+    <string name="message_ignore_user">Нехтувати користувача</string>
+    <string name="unignore">Рознехтувати</string>
     <string name="keys_backup_info_title_signature">Підпис</string>
     <string name="keys_backup_info_title_algorithm">Алгоритм</string>
     <string name="keys_backup_info_title_version">Версія</string>
@@ -1673,7 +1677,7 @@
     <string name="settings_security_application_protection_screen_title">Налаштування захисту</string>
     <string name="settings_security_application_protection_summary">Захистіть доступ PIN-кодом та біометричними даними.</string>
     <string name="settings_security_application_protection_title">Захист доступу</string>
-    <string name="settings_active_sessions_verified_device_desc">Цей сеанс довірений для безпечного обміну повідомленнями, оскільки ви його підтвердили:</string>
+    <string name="settings_active_sessions_verified_device_desc">Цей сеанс довірений для безпечного обміну повідомленнями, оскільки ви його звірили:</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d активний сеанс</item>
         <item quantity="few">%d активні сеанси</item>
@@ -1687,7 +1691,7 @@
     <string name="re_authentication_activity_title">Потрібна повторна автентифікація</string>
     <string name="template_re_authentication_default_confirm_text">Для виконання цієї дії ${app_name} вимагає ввести свої облікові дані.</string>
     <string name="verify_cancel_self_verification_from_trusted">Якщо скасувати, ви не зможете читати зашифровані повідомлення на новому пристрої, а інші користувачі не довірятимуть йому</string>
-    <string name="verify_cancel_self_verification_from_untrusted">Якщо скасувати, ви не зможете читати зашифровані повідомлення на цьому пристрої, а інші користувачі довірятимуть йому</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Якщо скасувати, ви не зможете читати зашифровані повідомлення на цьому пристрої, а інші користувачі не довірятимуть йому</string>
     <string name="settings_active_sessions_manage">Керування сеансами</string>
     <string name="please_wait">Просимо зачекати…</string>
     <string name="crosssigning_verify_session">Перевірка входу</string>
@@ -1697,11 +1701,11 @@
     <string name="direct_room_profile_not_encrypted_subtitle">Повідомлення тут не захищено наскрізним шифруванням.</string>
     <string name="room_settings_enable_encryption">Увімкнути наскрізне шифрування…</string>
     <string name="direct_room_encryption_enabled_tile_description">Повідомлення в цій кімнаті наскрізно зашифровані.</string>
-    <string name="verification_verify_device">Перевірити цей сеанс</string>
+    <string name="verification_verify_device">Звірити цей сеанс</string>
     <string name="sas_decimal_description">Перевірте цей сеанс, підтвердивши, що на екрані партнера з’являються такі цифри</string>
     <string name="sas_emoji_description">Перевірте цей сеанс, підтвердивши, що на екрані партнера з’являються ці емоджі</string>
-    <string name="sas_incoming_request_description">Перевірте цей сеанс, щоб позначити його надійним. Довірені сеанси партнерів дають вам додаткову впевненість під час використання наскрізно зашифрованих повідомлень.</string>
-    <string name="settings_active_sessions_unverified_device_desc">Перевірте цей сеанс, щоб позначити його надійним та надати йому доступ до зашифрованих повідомлень. Якщо ви не входили в цей сеанс, ваш обліковий запис може бути зламано:</string>
+    <string name="sas_incoming_request_description">Звірте цей сеанс, щоб позначити його надійним. Довірені сеанси партнерів дають вам додаткову впевненість під час використання наскрізно зашифрованих повідомлень.</string>
+    <string name="settings_active_sessions_unverified_device_desc">Звірте цей сеанс, щоб позначити його надійним та надати йому доступ до зашифрованих повідомлень. Якщо ви не входили в цей сеанс, ваш обліковий запис може бути зламано:</string>
     <string name="room_directory_search_hint">Назва або ID (#example:matrix.org)</string>
     <string name="create_room_name_hint">Назва</string>
     <string name="direct_room_filter_hint">Фільтрувати за іменем користувача або ID…</string>
@@ -1749,7 +1753,7 @@
     <string name="room_permissions_enable_room_encryption">Вмикати шифрування кімнати</string>
     <string name="room_permissions_change_main_address_for_the_room">Змінювати основну адресу кімнати</string>
     <string name="room_permissions_change_room_avatar">Змінювати аватар кімнати</string>
-    <string name="room_permissions_modify_widgets">Змінювати віджети</string>
+    <string name="room_permissions_modify_widgets">Змінювати знадоби</string>
     <string name="room_permissions_notify_everyone">Сповіщати всіх</string>
     <string name="room_permissions_remove_messages_sent_by_others">Вилучати повідомлення, надіслані іншими</string>
     <string name="room_permissions_ban_users">Блокувати користувачів</string>
@@ -1770,4 +1774,288 @@
     <string name="room_settings_enable_encryption_no_permission">У вас немає дозволу на ввімкнення шифрування в цій кімнаті.</string>
     <string name="room_settings_permissions_title">Дозволи кімнати</string>
     <string name="room_list_catchup_welcome_body">Ознайомтеся з непрочитаними повідомленнями тут</string>
+    <string name="event_status_delete_all_failed_dialog_message">Ви впевнені, що бажаєте видалити усі не надіслані повідомлення з цієї кімнати\?</string>
+    <string name="external_link_confirmation_message">Посилання %1$s спрямовує вас на інший сайт: %2$s.
+\n
+\nВи впевнені, що бажаєте продовжити\?</string>
+    <string name="signed_out_title">Ви вийшли</string>
+    <string name="message_action_item_redact">Видалити…</string>
+    <string name="send_a_sticker">Наліпка</string>
+    <string name="terms_description_for_integration_manager">Використовувати ботів, мости, знадоби та пакунки наліпок</string>
+    <string name="no_connectivity_to_the_server_indicator">Зв\'язок із сервером втрачено</string>
+    <string name="no_message_edits_found">Не знайдено жодної правки</string>
+    <string name="message_edits">Історія правок</string>
+    <string name="a11y_trust_level_trusted">Рівень довіри</string>
+    <string name="not_trusted">Не довірений</string>
+    <string name="trusted">Довірений</string>
+    <string name="verification_green_shield">Шукайте зелений щит аби переконатись, що користувач є довіреним. Довіртесь усім користувачам у кімнаті аби переконатись, що кімната є безпечною та захищеною.</string>
+    <string name="verify_user_sas_emoji_security_tip">Для максимальної безпеки використовуйте інші довірені засоби зв\'язку або робіть це під час особистої зустрічі.</string>
+    <string name="verification_conclusion_warning">Не довірений вхід</string>
+    <string name="sas_incoming_request_description_2">Звірення цього сеансу позначить його довіреним для вас і для партнера.</string>
+    <string name="sas_security_advise">Задля максимальної безпеки ми радимо зробити це під час особистої зустрічі або з використанням інших довірених засобів зв\'язку.</string>
+    <string name="confirm_your_identity">Підтвердьте вашу тотожність, звіривши цей вхід з одного з ваших інших сеансів та надавши йому доступ до зашифрованих повідомлень.</string>
+    <string name="verify_other_sessions">Звірте усі свої сеанси, щоб переконатись у безпечності вашого облікового запису та повідомлень</string>
+    <string name="room_member_profile_sessions_section_title">Сеанси</string>
+    <string name="room_member_profile_failed_to_get_devices">Не вдалось отримати сеанси</string>
+    <string name="crypto_error_withheld_unverified">Ви не маєте доступу до цього повідомлення, бо відправник не довіряє вашому сеансу</string>
+    <string name="mark_as_verified">Позначити довіреним</string>
+    <string name="encrypted_unverified">Зашифроване незвіреним пристроєм</string>
+    <string name="verification_profile_device_verified_because">Цей сеанс є довіреним для безпечного обміну повідомленням тому що його було звірено %1$s (%2$s):</string>
+    <string name="verification_profile_verified">Звірено</string>
+    <string name="verification_conclusion_ok_self_notice">Ваш новий сеанс тепер звірений. В нього є доступ до ваших зашифрованих повідомлень, а інші користувачі бачитимуть його, як довірений.</string>
+    <string name="verification_verified_user">Звірено %s</string>
+    <string name="sas_verified_successful_description">Захищені повідомлення з цим користувачем є наскрізно зашифрованими та є непрочитними для сторонніх осіб.</string>
+    <string name="sas_verified_successful">Ви успішно звірили цей сеанс.</string>
+    <string name="sas_verified">Звірено!</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Резервна копія має недійсний підпис з незвіреного сеансу %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Резервна копія має недійсний підпис зі звіреного сеансу %s</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Резервна копія має дійсний підпис з незвіреного сеансу %s</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Резервна копія має дійсний підпис зі звіреного сеансу %s.</string>
+    <string name="create_room_action_create">СТВОРИТИ</string>
+    <string name="content_reported_title">На вміст надіслано скаргу</string>
+    <string name="content_reported_as_spam_title">Надіслано скаргу, як на спам</string>
+    <string name="content_reported_as_inappropriate_title">Надіслано скаргу, як на неприйнятне</string>
+    <string name="too_many_pin_failures">Забагато помилок, вам довелось вийти</string>
+    <string name="unencrypted">Незашифроване</string>
+    <string name="default_message_emote_snow">надсилає сніг ❄️</string>
+    <string name="default_message_emote_confetti">надсилає конфетті 🎉</string>
+    <string name="command_snow">Надсилає вказане повідомлення зі снігом</string>
+    <string name="command_confetti">Надсилає вказане повідомлення з конфетті</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="one">Показати пристрій, з якого ви можете звірити цю сесію просто зараз</item>
+        <item quantity="few">Показати %d пристрої, з яких ви можете звірити цю сесію просто зараз</item>
+        <item quantity="many">Показати %d пристроїв, з яких ви можете звірити цю сесію просто зараз</item>
+        <item quantity="other">Показати %d пристроїв, з яких ви можете звірити цю сесію просто зараз</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">Ви розпочнете знову, але без історії повідомлень, без довірених пристроїв та користувачів</string>
+    <string name="secure_backup_reset_all_no_other_devices">Вдавайтесь до цього лише за умов відсутності жодного пристрою, з якого ви можете звірити поточний пристрій.</string>
+    <string name="secure_backup_reset_if_you_reset_all">Якщо ви скинете все</string>
+    <string name="secure_backup_reset_all">Скинути все</string>
+    <string name="keys_backup_passphrase_error_decrypt">Резервна копія не може бути дешифрована цією парольною фразою: переконайтесь, будь ласка, що відновлювальна парольна фраза зазначена правильно.</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Не знаєте вашої відновлювальної парольної фрази\? Ви можете %s.</string>
+    <string name="backup_recovery_passphrase">Відновлювальна парольна фраза</string>
+    <string name="bad_passphrase_key_reset_all_action">Забули або втратили усі можливості для відновлення\? Скинути все</string>
+    <string name="use_file">Використати файл</string>
+    <string name="verification_cannot_access_other_session">Скористатись відновлювальними парольною фразою або ключем</string>
+    <string name="keys_backup_restore_with_passphrase">Скористатись відновлювальними парольною фразою або ключем</string>
+    <string name="template_use_other_session_content_description">Використовуйте найостаннішій ${app_name} на ваших інших пристроях, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} для Android, або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
+    <string name="template_use_latest_app">Використовуйте найостаннішій ${app_name} на ваших інших пристроях:</string>
+    <string name="verification_use_passphrase">Якщо ви не можете доступитись до чинної сесії</string>
+    <string name="verification_open_other_to_verify">Використайте чинну сесію задля звірки цієї сесії, надавши їй таким чином доступ до зашифрованих повідомлень.</string>
+    <string name="confirm_your_identity_quad_s">Підтвердьте вашу тотожність, звіривши цей вхід та надавши йому доступ до зашифрованих повідомлень.</string>
+    <string name="verify_this_session">Звірте новий вхід, що доступається до вашого облікового запису: %1$s</string>
+    <string name="crosssigning_verify_this_session">Звірте цей вхід</string>
+    <string name="verification_request_waiting">Очікування…</string>
+    <string name="new_session_review">Тицьніть, щоб переглянути та звірити</string>
+    <string name="new_session">Новий вхід. Це були ви\?</string>
+    <string name="refresh">Оновити</string>
+    <string name="reset_cross_signing">Скинути ключі</string>
+    <string name="or_other_mx_capabale_client">або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
+    <string name="encryption_information_dg_xsigning_disabled">Перехресне підписування не ввімкнене</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">Перехресне підписування увімкнено.
+\nКлючі не є довіреними</string>
+    <string name="encryption_information_dg_xsigning_trusted">Перехресне підписування увімкнено
+\nКлючі є довіреними.
+\nЗакриті ключі невідомі</string>
+    <string name="encryption_information_dg_xsigning_complete">Перехресне підписування увімкнено
+\nЗакриті ключі на пристрої.</string>
+    <string name="encryption_information_cross_signing_state">Перехресне підписування</string>
+    <string name="direct_room_created_summary_item">%s приєднується.</string>
+    <string name="encryption_enabled">Шифрування увімкнено</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Ви прийняли запрошення для %1$s. Причина: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s приймає запрошення для %2$s. Причина: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Ви відкликали запрошення для %1$s приєднатись до кімнати. Причина: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s відкликає запрошення для %2$s приєднатись до кімнати. Причина: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s надсилає %2$s запрошення приєднатись до кімнати. Причина: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Ви надіслали %1$s запрошення приєднатись до кімнати. Причина: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Ви заблокували %1$s. Причина: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s заблоковує %2$s. Причина: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Ви розблокували %1$s. Причина: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s розблоковує %2$s. Причина: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Ви викинули %1$s. Причина: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s викидає %2$s. Причина: %3$s</string>
+    <string name="call_tile_in_call">Ви берете участь в цьому виклику зараз</string>
+    <string name="this_is_the_beginning_of_dm">Це початок вашої історії листування з %s.</string>
+    <string name="room_profile_encrypted_subtitle">Повідомлення тут є наскрізно зашифрованими.
+\n
+\nВаші повідомлення захищені замками, тож лише ви та отримувачі мають унікальні ключі для їхнього відмикання.</string>
+    <string name="direct_room_profile_encrypted_subtitle">Повідомлення тут є наскрізно зашифрованими.
+\n
+\nВаші повідомлення захищені замками, тож лише ви та отримувачі мають унікальні ключі для їхнього відмикання.</string>
+    <string name="this_is_the_beginning_of_room">Це початок %s.</string>
+    <string name="call_tile_other_declined">%1$s відхилили цей виклик</string>
+    <string name="call_tile_you_declined">Ви відхилили цей виклик %1$s</string>
+    <string name="call_tile_other_started_call">%1$s розпочали виклик</string>
+    <string name="call_tile_you_started_call">Ви розпочали виклик</string>
+    <string name="quick_reactions">Швидкі реакції</string>
+    <string name="call_transfer_users_tab_title">Користувачі</string>
+    <string name="call_transfer_failure">Під час переадресації трапилась помилка</string>
+    <string name="call_transfer_title">Переадресувати</string>
+    <string name="call_transfer_connect_action">З\'єднати</string>
+    <string name="call_tile_call_back">Перетелефонувати</string>
+    <string name="call_resume_action">Відновити</string>
+    <string name="call_dial_pad_title">Клавіатура</string>
+    <string name="call_held_by_you">Ви утримали виклик</string>
+    <string name="call_held_by_user">%s утримали виклик</string>
+    <string name="call_hold_action">Утримати</string>
+    <plurals name="call_only_paused">
+        <item quantity="one">Поточний виклик</item>
+        <item quantity="few">%1$d поточні виклики</item>
+        <item quantity="many">%1$d поточних викликів</item>
+        <item quantity="other">%1$d поточних викликів</item>
+    </plurals>
+    <string name="call_only_active">Поточний виклик (%1$s)</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 поточний виклик (%1$s) · 1 призупинений виклик</item>
+        <item quantity="few">1 поточний виклик (%1$s) · %2$d призупинені виклики</item>
+        <item quantity="many">1 поточний виклик (%1$s) · %2$d призупинених викликів</item>
+        <item quantity="other">1 поточний виклик (%1$s) · %2$d призупинених викликів</item>
+    </plurals>
+    <string name="change_room_directory_network">Змінити мережу</string>
+    <string name="action_change">Змінити</string>
+    <string name="add_by_matrix_id">Додати за matrix ID</string>
+    <string name="alert_push_are_disabled_title">Push-сповіщення вимкнено</string>
+    <string name="failed_to_unban">Не вдалось розблокувати користувача</string>
+    <string name="member_banned_by">Заблоковано від %1$s</string>
+    <string name="three_pid_revoke_invite_dialog_content">Відкликати запрошення для %1$s\?</string>
+    <string name="three_pid_revoke_invite_dialog_title">Відкликати запрошення</string>
+    <string name="enter_account_password">Введіть ваш %s, щоб продовжити.</string>
+    <string name="confirm_recovery_passphrase">Підтвердити %s</string>
+    <string name="generate_message_key">Згенерувати ключ повідомлення</string>
+    <string name="set_recovery_passphrase">Зазначити %s</string>
+    <string name="account_password">Пароль облікового запису</string>
+    <string name="message_key">Ключ повідомлення</string>
+    <string name="reactions_like">Подобається</string>
+    <string name="reactions_agree">Гаразд</string>
+    <string name="title_activity_emoji_reaction_picker">Реакції</string>
+    <string name="direct_room_created_summary_item_by_you">Ви приєднались.</string>
+    <string name="inviting_users_to_room">Запрошування користувачів…</string>
+    <string name="review_terms">Переглянути умови</string>
+    <string name="terms_of_service">Умови використання</string>
+    <string name="message_view_edit_history">Переглянути історію редагувань</string>
+    <string name="joining_room">Входження до кімнати…</string>
+    <string name="invited_by">Запрошення отримано від %s</string>
+    <string name="invitations_sent_to_two_users">Запрошення надіслано до %1$s та %2$s</string>
+    <string name="invitation_sent_to_one_user">Запрошення надіслано до %1$s</string>
+    <string name="identity_server_user_consent_not_provided">Згоду користувача не було надано.</string>
+    <string name="identity_server_set_default_submit">Використовувати %1$s</string>
+    <string name="initial_sync_start_downloading">Початкова синхронізація:
+\nЗвантаження даних…</string>
+    <string name="initial_sync_start_server_computing">Початкова синхронізація:
+\nОчікування на відповідь сервера…</string>
+    <string name="invite_users_to_room_title">Запросити користувачів</string>
+    <string name="invite_users_to_room_action_invite">ЗАПРОСИТИ</string>
+    <string name="direct_room_start_search">Розпочніть друкувати, щоб отримати результати</string>
+    <string name="direct_room_user_list_recent_title">Нещодавні</string>
+    <string name="direct_room_user_list_known_title">Відомі користувачі</string>
+    <string name="direct_room_user_list_suggestions_title">Пропозиції</string>
+    <string name="direct_room_user_list_contacts_title">Контакти</string>
+    <string name="phone_book_perform_lookup">Пошук контактів у Matrix</string>
+    <string name="contacts_book_title">Контакти</string>
+    <string name="loading_contact_book">Отримання контактів…</string>
+    <string name="qr_code_not_scanned">QR-код не відскановано!</string>
+    <string name="invalid_qr_code_uri">QR-код не є дійсним (недійсний URI)!</string>
+    <string name="not_a_valid_qr_code">Цей QR-код не є дійсним</string>
+    <string name="qr_code_scanned_verif_waiting">Чекаємо на %s…</string>
+    <string name="qr_code_scanned_verif_waiting_notice">Майже все! Чекаємо на підтвердження…</string>
+    <string name="qr_code_scanned_self_verif_notice">Майже все! Чи показує інший пристрій такий самий щит\?</string>
+    <string name="qr_code_scanned_by_other_no">Ні</string>
+    <string name="qr_code_scanned_by_other_yes">Так</string>
+    <string name="qr_code_scanned_by_other_notice">Майже все! Чи показує %s такий самий щит\?</string>
+    <string name="a11y_qr_code_for_verification">QR-код</string>
+    <string name="a13n_qr_code_description">Зображення QR-коду</string>
+    <string name="qr_code">QR-код</string>
+    <string name="user_directory_search_hint">Пошук за іменем або ID</string>
+    <string name="add_by_qr_code">Додати за QR-кодом</string>
+    <string name="settings_discovery_mail_pending">Чекання</string>
+    <string name="identity_server_set_alternative_notice_no_default">Зазначте адресу сервера ідентифікації</string>
+    <string name="identity_server_set_alternative_notice">В іншому разі, ви можете зазначити адресу будь-якого іншого сервера ідентифікації</string>
+    <string name="identity_server_set_default_notice">Ваш домашній сервер (%1$s) пропонує використовувати %2$s як ваш сервер ідентифікації</string>
+    <string name="identity_server_error_terms_not_signed">Будь ласка, погодьтесь спочатку з умовами використання сервера ідентифікації у налаштуваннях.</string>
+    <string name="identity_server_error_no_identity_server_configured">Будь ласка, налаштуйте спочатку сервер ідентифікації.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Цей сервер ідентифікації є застарілим. ${app_name} підтримує лише API V2.</string>
+    <string name="disconnect_identity_server_dialog_content">Від\'єднатись від сервера ідентифікації %s\?</string>
+    <string name="settings_agree_to_terms">Погодьтесь з умовами використання сервера ідентифікації (%s), щоб дозволити вашу виявність за електронною адресою та номером телефону.</string>
+    <string name="no_ignored_users">Ви не нехтуєте жодних користувачів</string>
+    <string name="content_reported_as_inappropriate_content">Скаргу на неприйнятний вміст було надіслано.
+\n
+\nЯкщо ви більше не бажаєте бачити жодного вмісту від цього користувача, ви можете знехтувати його, щоб приховати його повідомлення.</string>
+    <string name="content_reported_as_spam_content">Скаргу на спам було надіслано.
+\n
+\nЯкщо ви більше не бажаєте бачити жодного вмісту від цього користувача, ви можете знехтувати його, щоб приховати його повідомлення.</string>
+    <string name="content_reported_content">Скаргу на вміст було надіслано.
+\n
+\nЯкщо ви більше не бажаєте бачити жодного вмісту від цього користувача, ви можете знехтувати його, щоб приховати його повідомлення.</string>
+    <string name="block_user">ЗНЕХТУВАТИ КОРИСТУВАЧА</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Ви зараз оприлюднюєте електронні адреси та номери телефонів для сервера ідентифікації %1$s. Вам необхідно буде перепід\'єднатись до %2$s, щоб припинити оприлюднення.</string>
+    <string name="labs_allow_extended_logging">Увімкнути детальні звіти.</string>
+    <string name="keys_backup_unlock_button">Розблокувати історію</string>
+    <string name="labs_allow_extended_logging_summary">Надіслані лютострусом детальні звіти допоможуть розробникам отримати більше інформації. Навіть якщо цю функцію увімкнено, застосунок не зберігає ані вмісту повідомлень, ані будь-якої іншої особистої інформації.</string>
+    <string name="event_redacted_by_user_reason_with_reason">Користувач видалив подію через %1$s</string>
+    <string name="event_redacted_by_user_reason">Подію видалено користувачем</string>
+    <string name="report_content_custom">Інша причина…</string>
+    <string name="report_content_inappropriate">Неприйнятний вміст</string>
+    <string name="report_content_spam">Спам</string>
+    <string name="report_content_custom_title">Поскаржитись на цей вміст</string>
+    <string name="report_content_custom_submit">ПОСКАРЖИТИСЬ</string>
+    <string name="report_content_custom_hint">Причина скарги</string>
+    <string name="sent_a_reaction">Зреагували: %s</string>
+    <string name="message_add_reaction">Зреагувати</string>
+    <string name="finish">Завершити</string>
+    <string name="reply">Відповісти</string>
+    <string name="edit">Відредагувати</string>
+    <string name="disclaimer_negative_button">Зрозуміло</string>
+    <string name="disclaimer_title">Riot тепер називається Element!</string>
+    <string name="downloaded_file">Файл %1$s було звантажено!</string>
+    <string name="downloading_file">Звантаження файлу %1$s…</string>
+    <string name="send_file_step_sending_file">Надсилання файлу (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Шифрування файлу…</string>
+    <string name="rageshake_detected">Струс виявлено!</string>
+    <string name="settings_rageshake_detection_threshold_summary">Потрясіть вашим пристроєм, щоб перевірити поріг чутливості</string>
+    <string name="settings_rageshake_detection_threshold">Поріг чутливості</string>
+    <string name="settings_rageshake">Лютоcтрус</string>
+    <string name="settings_developer_mode_summary">Режим розробника вмикає приховані функції та може зробити застосунок менш стабільним. Лише для розробників!</string>
+    <string name="settings_discovery_consent_action_revoke">Відкликати згоду</string>
+    <string name="settings_discovery_consent_action_give_consent">Надати згоду</string>
+    <string name="settings_discovery_no_terms">Обраний вами сервер ідентифікації не має жодних умов використання. Продовжуйте лише якщо довіряєте власнику сервісу</string>
+    <string name="settings_discovery_no_terms_title">Сервер ідентифікації не має умов використання</string>
+    <string name="settings_discovery_please_enter_server">Зазначте, будь ласка, адресу сервера ідентифікації</string>
+    <string name="settings_discovery_bad_identity_server">Неможливо під\'єднатись до сервера ідентифікації</string>
+    <string name="settings_discovery_enter_identity_server">Зазначте адресу сервера ідентифікації</string>
+    <string name="identity_server_consent_dialog_content">Чи погоджуєтесь ви надіслати дані ваших контактів (номери телефонів та/або електронні адреси) на налаштований сервер ідентифікації(%1$s) задля виявлення відомих вам наявних контактів\?
+\n
+\nДля поліпшення приватності дані буде захешовано перед надсиланням.</string>
+    <string name="room_list_catchup_welcome_title">Ласкаво просимо!</string>
+    <string name="global_retry">Повторити</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Від\'єднання від вашого сервера ідентифікації означатиме, що ви не будете виявними для інших користувачів та не зможете запрошувати інших через електронну пошту або номер телефону.</string>
+    <string name="settings_discovery_identity_server_info_none">Ви наразі не використовуєте жодного сервера ідентифікації. Для того, щоб виявляти інших та бути виявним для знайомих вам наявних контактів, налаштуйте такий сервер нижче.</string>
+    <string name="settings_discovery_identity_server_info">Ви зараз використовуєте %1$s для того, щоб виявляти інших та бути виявним для знайомих вам наявних контактів.</string>
+    <string name="change_identity_server">Змінити сервер ідентифікації</string>
+    <string name="add_identity_server">Налаштувати сервер ідентифікації</string>
+    <string name="disconnect_identity_server">Від\'єднати сервер ідентифікації</string>
+    <string name="identity_server">Сервер ідентифікації</string>
+    <string name="terms_description_for_identity_server">Бути виявним для інших</string>
+    <string name="identity_server_not_defined_for_password_reset">Жодного сервера ідентифікації не налаштовано. Вам необхідно скинути ваш пароль.</string>
+    <string name="identity_server_not_defined">Ви не використовуєте жодного сервера ідентифікації</string>
+    <string name="settings_failed_to_get_crypto_device_info">Криптографічна інформація недоступна</string>
+    <string name="settings_server_upload_size_unknown">Обмеження невідомі.</string>
+    <string name="settings_server_upload_size_content">Ваш домашній сервер дозволяє надсилати файли розміром до %s.</string>
+    <string name="settings_server_upload_size_title">Обмеження сервера на розмір файлів</string>
+    <string name="settings_server_version">Версія сервера</string>
+    <string name="settings_server_name">Назва сервера</string>
+    <string name="change_password_summary">Встановити новий пароль облікового запису…</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Попередній перегляд відкритих кімнат поки що не підтримується в ${app_name}</string>
+    <string name="edited_suffix">(відредаговано)</string>
+    <string name="last_edited_info_message">Востаннє відредаговано %1$s %2$s</string>
+    <string name="call_tile_ended">Цей виклик було завершено</string>
+    <string name="new_signin">Новий вхід</string>
+    <string name="soft_logout_signin_submit">Увійти</string>
+    <string name="soft_logout_signin_title">Увійти</string>
+    <string name="signed_out_submit">Увійти знову</string>
+    <string name="login_signin_matrix_id_title">Увійти з Matrix ID</string>
+    <string name="login_connect_using_matrix_id_submit">Увійти з Matrix ID</string>
+    <string name="login_reset_password_success_submit">Увійти знову</string>
+    <string name="login_signin">Увійти</string>
+    <string name="login_signin_to">Увійти до %1$s</string>
+    <string name="login_social_signin_with">Увійти через %s</string>
 </resources>
\ No newline at end of file

From d5d397d5ff9f7fb837ab87db6401c2b194561477 Mon Sep 17 00:00:00 2001
From: Vivek K J <VIVEKKJ2004@gmail.com>
Date: Fri, 2 Apr 2021 12:10:17 +0000
Subject: [PATCH 499/578] Translated using Weblate (Malayalam)

Currently translated at 20.9% (494 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 84 +++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 17e8c5cf7b..34d67270b3 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -430,4 +430,88 @@
     <string name="notice_room_invite_no_invitee_by_you">നിങ്ങളുടെ ക്ഷണം</string>
     <string name="notice_room_invite_no_invitee">%s-ന്റെ ക്ഷണം</string>
     <string name="summary_you_sent_sticker">നിങ്ങൾ ഒരു സ്റ്റിക്കർ അയച്ചു.</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s സന്ദേശം നീക്കം ചെയ്തു [കാരണം: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">സന്ദേശം നീക്കം ചെയ്തു [കാരണം: %1$s]</string>
+    <string name="notice_event_redacted_by">സന്ദേശം %1$s നീക്കംചെയ്തു</string>
+    <string name="notice_event_redacted">സന്ദേശം നീക്കംചെയ്‌തു</string>
+    <string name="notice_room_avatar_removed_by_you">നിങ്ങൾ മുറിയുടെ അവതാർ നീക്കംചെയ്‌തു</string>
+    <string name="notice_room_avatar_removed">%1$s മുറിയുടെ അവതാർ നീക്കം ചെയ്‌തു</string>
+    <string name="notice_room_topic_removed_by_you">നിങ്ങൾ മുറിയുടെ വിഷയം നീക്കംചെയ്‌തു</string>
+    <string name="notice_room_topic_removed">%1$s മുറിയുടെ വിഷയം നീക്കം ചെയ്‌തു</string>
+    <string name="notice_room_name_removed_by_you">നിങ്ങൾ മുറിയുടെ പേര് നീക്കംചെയ്‌തു</string>
+    <string name="notice_room_name_removed">%1$s മുറിയുടെ പേര് നീക്കംചെയ്‌തു</string>
+    <string name="notice_avatar_changed_too">(അവതാറും മാറ്റി)</string>
+    <string name="notice_voip_finished">VoIP കോൺഫറൻസ് പൂർത്തിയായി</string>
+    <string name="notice_voip_started">VoIP കോൺഫറൻസ് ആരംഭിച്ചു</string>
+    <string name="notice_requested_voip_conference_by_you">നിങ്ങൾ ഒരു VoIP കൊൺഫറൻസ് അഭ്യർത്ഥിച്ചു</string>
+    <string name="notice_requested_voip_conference">%1$s ഒരു VoIP കോൺഫറൻസ് അഭ്യർത്ഥിച്ചു</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 എല്ലാ സെർവറുകളും പങ്കെടുക്കുന്നതിൽ നിന്ന് വിലക്കി! ഈ മുറി ഇനി ഉപയോഗിക്കാനാവില്ല.</string>
+    <string name="notice_room_server_acl_updated_no_change">മാറ്റമൊന്നുമില്ല.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• ഐപി ലിറ്ററലുകളുമായി പൊരുത്തപ്പെടുന്ന സെർവർ ഇപ്പോൾ നിരോധിച്ചു.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• ഐപി ലിറ്ററലുകളുമായി പൊരുത്തപ്പെടുന്ന സെർവർ ഇപ്പോൾ അനുവദനീയമാണ്.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• അനുവദനീയ പട്ടികയിൽ നിന്നും %sമായി പൊരുത്തപ്പെടുന്ന സെർവർ നീക്കം ചെയ്തു.</string>
+    <string name="notice_room_server_acl_updated_allowed">• %sമായി പൊരുത്തപ്പെടുന്ന സെർവർ ഇപ്പോൾ അനുവദനീയമാണ്.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• %sമായി പൊരുത്തപ്പെടുന്ന സെർവർ നിരോധന പട്ടികയിൽ നിന്ന് നീക്കംചെയ്‌തു.</string>
+    <string name="notice_room_server_acl_updated_banned">• %s മായി പൊരുത്തപ്പെടുന്ന സെർവർ ഇപ്പോൾ നിരോധിച്ചിരിക്കുന്നു.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">ഈ റൂമിനായി നിങ്ങൾ സെർവർ ACL-കൾ മാറ്റി.</string>
+    <string name="notice_room_server_acl_updated_title">%s ഈ മുറിക്കായി സെർവർ ACL-കൾ മാറ്റി.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• ഐപി ലിറ്ററലുകളുമായി പൊരുത്തപ്പെടുന്ന സെർവർ അനുവദനീയമാണ്.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• ഐപി ലിറ്ററലുകളുമായി പൊരുത്തപ്പെടുന്ന സെർവർ നിരോധിച്ചിരിക്കുന്നു.</string>
+    <string name="notice_room_server_acl_set_banned">• %s മായി പൊരുത്തപ്പെടുന്ന സെർവർ നിരോധിച്ചിരിക്കുന്നു.</string>
+    <string name="notice_room_server_acl_set_allowed">• %s മായി പൊരുത്തപ്പെടുന്ന സെർവർ അനുവദനീയമാണ്.</string>
+    <string name="notice_room_server_acl_set_title_by_you">ഈ മുറിക്കായി നിങ്ങൾ സെർവർ ACL-കൾ സജ്ജമാക്കി.</string>
+    <string name="notice_room_server_acl_set_title">%s ഈ മുറിക്കായി സെർവർ ACL-കൾ സജ്ജമാക്കി.</string>
+    <string name="notice_direct_room_update_by_you">നിങ്ങൾ ഇവിടെ നവീകരിച്ചു.</string>
+    <string name="notice_direct_room_update">%s ഇവിടെ നവീകരിച്ചു.</string>
+    <string name="notice_room_update_by_you">നിങ്ങൾ ഈ മുറി നവീകരിച്ചു.</string>
+    <string name="notice_room_update">%s ഈ മുറി നവീകരിച്ചു.</string>
+    <string name="notice_end_to_end_by_you">നിങ്ങൾ എൻഡ്-ടു-എൻഡ് എൻ‌ക്രിപ്ഷൻ ഓണാക്കി (%1$s)</string>
+    <string name="notice_end_to_end">%1$s എൻഡ്-ടു-എൻഡ് എൻ‌ക്രിപ്ഷൻ ഓണാക്കി (%2$s)</string>
+    <string name="notice_room_visibility_unknown">അജ്ഞാതം (%s).</string>
+    <string name="notice_room_visibility_world_readable">ആർക്കും.</string>
+    <string name="notice_room_visibility_shared">എല്ലാ മുറി അംഗങ്ങളും.</string>
+    <string name="notice_room_visibility_joined">എല്ലാ മുറി അംഗങ്ങളും, അവർ ചേർന്ന സമയം മുതൽ.</string>
+    <string name="notice_room_visibility_invited">എല്ലാ മുറി അംഗങ്ങളും, അവരെ ക്ഷണിച്ച സമയം മുതൽ.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">ഭാവിയിലെ സന്ദേശങ്ങൾ %1$s ന് നിങ്ങൾ ദൃശ്യമാക്കി</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s ഭാവി സന്ദേശങ്ങൾ %2$s ന് ദൃശ്യമാക്കി</string>
+    <string name="notice_made_future_room_visibility_by_you">നിങ്ങൾ ഭാവിയിലെ മുറിയുടെ ചരിത്രം %1$s ന് ദൃശ്യമാക്കി</string>
+    <string name="notice_made_future_room_visibility">%1$s ഭാവിയിലെ മുറിയുടെ ചരിത്രം %2$s ന് ദൃശ്യമാക്കി</string>
+    <string name="notice_ended_call_by_you">നിങ്ങൾ കോൾ അവസാനിപ്പിച്ചു.</string>
+    <string name="notice_ended_call">%s കോൾ അവസാനിപ്പിച്ചു.</string>
+    <string name="notice_answered_call_by_you">നിങ്ങൾ കോളിന് മറുപടി നൽകി.</string>
+    <string name="notice_answered_call">%s കോളിന് മറുപടി നൽകി.</string>
+    <string name="notice_call_candidates_by_you">കോൾ സജ്ജീകരിക്കുന്നതിന് നിങ്ങൾ ഡാറ്റ അയച്ചു.</string>
+    <string name="notice_call_candidates">കോൾ സജ്ജീകരിക്കുന്നതിന് %s ഡാറ്റ അയച്ചു.</string>
+    <string name="notice_placed_voice_call_by_you">നിങ്ങൾ ഒരു വോയ്സ് കോൾ നടത്തി.</string>
+    <string name="notice_placed_voice_call">%s ഒരു വോയ്സ് കോൾ നടത്തി.</string>
+    <string name="notice_placed_video_call_by_you">നിങ്ങൾ ഒരു വീഡിയോ കോൾ നടത്തി.</string>
+    <string name="notice_placed_video_call">%s ഒരു വീഡിയോ കോൾ നടത്തി.</string>
+    <string name="notice_room_name_changed_by_you">നിങ്ങൾ മുറിയുടെ പേര് ഇതിലേക്ക് മാറ്റി: %1$s</string>
+    <string name="notice_room_name_changed">%1$s മുറിയുടെ പേര് ഇതിലേക്ക് മാറ്റി: %2$s</string>
+    <string name="notice_room_avatar_changed_by_you">നിങ്ങൾ മുറിയുടെ അവതാർ മാറ്റി</string>
+    <string name="notice_room_avatar_changed">%1$s മുറിയുടെ അവതാർ മാറ്റി</string>
+    <string name="notice_room_topic_changed_by_you">നിങ്ങൾ വിഷയം ഇതിലേക്ക് മാറ്റി: %1$s</string>
+    <string name="notice_room_topic_changed">%1$s വിഷയം ഇതിലേക്ക് മാറ്റി: %2$s</string>
+    <string name="notice_display_name_removed_by_you">നിങ്ങൾ നിങ്ങളുടെ പ്രദർശന നാമം നീക്കം ചെയ്തു (ഇത് %1$s ആയിരുന്നു)</string>
+    <string name="notice_display_name_removed">%1$s അവരുടെ പ്രദർശന നാമം നീക്കം ചെയ്തു (ഇത് %2$s ആയിരുന്നു)</string>
+    <string name="notice_display_name_changed_from_by_you">നിങ്ങൾ നിങ്ങളുടെ പ്രദർശന നാമം %1$sൽ നിന്നും %2$s ലേക്ക് മാറ്റി</string>
+    <string name="notice_display_name_changed_from">%1$s അവരുടെ പ്രദർശന നാമം %2$s ൽ നിന്നും %3$s ആക്കി മാറ്റി</string>
+    <string name="notice_display_name_set_by_you">നിങ്ങൾ നിങ്ങളുടെ പ്രദർശന നാമം %1$s ആയി സജ്ജമാക്കി</string>
+    <string name="notice_display_name_set">%1$s അവരുടെ പ്രദർശന നാമം %2$s ആയി സജ്ജമാക്കി</string>
+    <string name="notice_avatar_url_changed_by_you">നിങ്ങൾ നിങ്ങളുടെ അവതാർ മാറ്റി</string>
+    <string name="notice_avatar_url_changed">%1$s അവരുടെ അവതാർ മാറ്റി</string>
+    <string name="notice_room_withdraw_by_you">നിങ്ങൾ %1$s ന്റെ ക്ഷണം പിൻവലിച്ചു</string>
+    <string name="notice_room_withdraw">%1$s %2$s ന്റെ ക്ഷണം പിൻവലിച്ചു</string>
+    <string name="notice_room_ban_by_you">നിങ്ങൾ %1$s നെ നിരോധിച്ചു</string>
+    <string name="notice_room_ban">%1$s %2$s നെ നിരോധിച്ചു</string>
+    <string name="notice_room_unban_by_you">നിങ്ങൾ %1$s ന്റെ നിരോധനം മാറ്റി</string>
+    <string name="notice_room_unban">%1$s %2$s ന്റെ നിരോധനം മാറ്റി</string>
+    <string name="notice_room_reject_by_you">നിങ്ങൾ ക്ഷണം നിരസിച്ചു</string>
+    <string name="notice_room_reject">%1$s ക്ഷണം നിരസിച്ചു</string>
+    <string name="notice_direct_room_leave_by_you">നിങ്ങൾ മുറി വിട്ടു</string>
+    <string name="notice_direct_room_leave">%1$s മുറി വിട്ടു</string>
+    <string name="notice_room_leave_by_you">നിങ്ങൾ മുറി വിട്ടു</string>
+    <string name="notice_room_leave">%1$s മുറി വിട്ടു</string>
+    <string name="notice_direct_room_created_by_you">നിങ്ങൾ ചർച്ച സൃഷ്ടിച്ചു</string>
+    <string name="notice_direct_room_created">%1$s ചർച്ച സൃഷ്ടിച്ചു</string>
 </resources>
\ No newline at end of file

From 99eb5bd533bc315ea34134483dfa681fee475bb4 Mon Sep 17 00:00:00 2001
From: Safa Alfulaij <safa1996alfulaij@gmail.com>
Date: Thu, 1 Apr 2021 19:20:56 +0000
Subject: [PATCH 500/578] Translated using Weblate (Arabic)

Currently translated at 38.6% (913 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
---
 vector/src/main/res/values-ar/strings.xml | 66 +++++++++++------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index aac9d1b6cd..bc0738643f 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="summary_user_sent_image">أرسلَ %1$s صُّورة.</string>
-    <string name="notice_room_invite_no_invitee">دعوة مِن %s</string>
-    <string name="notice_room_invite">%1$s دَعى %2$s</string>
-    <string name="notice_room_invite_you">دعاكَ %1$s</string>
-    <string name="notice_room_join">إنضّم %1$s إلى الغُرفة</string>
-    <string name="notice_room_leave">غادر %1$s الغرفة</string>
-    <string name="notice_room_reject">رفضَ %1$s الدعوة</string>
-    <string name="notice_room_kick">%1$s طردَ %2$s</string>
-    <string name="notice_room_unban">إنَّ %1$s قد رفعَ الحظر عن %2$s</string>
-    <string name="notice_room_ban">إنَّ %1$s قد حظرَ %2$s</string>
-    <string name="notice_avatar_url_changed">إنَّ %1$s قد غيَّرَ صورته الشخصية</string>
-    <string name="notice_display_name_set">إنَّ %1$s قد عيَّنَ اسمه الظاهر إلى %2$s</string>
+    <string name="summary_user_sent_image">أرسلَ ⁨%1$s⁩ صورةً.</string>
+    <string name="notice_room_invite_no_invitee">دعوة من ⁨%s⁩</string>
+    <string name="notice_room_invite">دعا ⁨%1$s⁩ ⁨%2$s⁩</string>
+    <string name="notice_room_invite_you">دعاكَ ⁨%1$s⁩</string>
+    <string name="notice_room_join">انضمّ ⁨%1$s⁩ إلى الغرفة</string>
+    <string name="notice_room_leave">غادرَ ⁨%1$s⁩ الغرفة</string>
+    <string name="notice_room_reject">رفضَ ⁨%1$s⁩ الدعوة</string>
+    <string name="notice_room_kick">طردَ ⁨%1$s⁩ ⁨%2$s⁩</string>
+    <string name="notice_room_unban">رفعَ ⁨%1$s⁩ المنع عن ⁨%2$s⁩</string>
+    <string name="notice_room_ban">منعَ ⁨%1$s⁩ ⁨%2$s⁩</string>
+    <string name="notice_avatar_url_changed">غيّر ⁨%1$s⁩ صورته الشخصية</string>
+    <string name="notice_display_name_set">ضبطَ ⁨%1$s⁩ اسم العرض على</string>
     <string name="notice_display_name_changed_from">إنَّ %1$s قد غيَّرَ اسمه الظاهر من %2$s إلى %3$s</string>
     <string name="notice_display_name_removed">إنَّ %1$s قد أزالَ اسمه الظاهر (لقد كان %2$s)</string>
     <string name="notice_room_topic_changed">إنَّ %1$s قد غيَّرَ الموضوع إلى: %2$s</string>
@@ -42,12 +42,12 @@
     <string name="medium_email">عُنوان البريد الإلكتروني</string>
     <string name="medium_phone_number">رقم الهاتف</string>
     <string name="summary_message">‏‏⁨%1$s⁩: ‏⁨%2$s⁩</string>
-    <string name="notice_room_withdraw">إنَّ %1$s قد سحبَ دعوة %2$s</string>
+    <string name="notice_room_withdraw">سحبَ ⁨%1$s⁩ الدعوة الموجّهة إلى ⁨%2$s</string>
     <string name="notice_placed_video_call">إنَّ %s قد أجرى مُكالمة مرئية.</string>
     <string name="notice_placed_voice_call">إنَّ %s قد أجرى مُكالمة صوتية.</string>
     <string name="notice_room_third_party_registered_invite">إنَّ %1$s قد قَبَل دعوة %2$s</string>
     <string name="could_not_redact">يتعذَّر التنقيح</string>
-    <string name="summary_user_sent_sticker">أرسلَ %1$s مُلصقًا.</string>
+    <string name="summary_user_sent_sticker">أرسلَ ⁨%1$s⁩ ملصقًا.</string>
     <string name="notice_avatar_changed_too">(تمَّ تغيِّير الصُّورة أيضًا)</string>
     <string name="room_displayname_invite_from">دَعوة مِن ⁨%s⁩</string>
     <string name="room_displayname_empty_room">غُرفة فارِغة</string>
@@ -61,20 +61,20 @@
         <item quantity="many">%1$s و%2$d آخرون</item>
         <item quantity="other">%1$s و%2$d آخرون</item>
     </plurals>
-    <string name="summary_you_sent_image">أرسلتَ صُّورة.</string>
-    <string name="summary_you_sent_sticker">أرسلتَ مُلصقًا.</string>
-    <string name="notice_room_invite_no_invitee_by_you">دعوة مِنكَ</string>
-    <string name="notice_room_created">أنشأ %1$s الغُرفة</string>
-    <string name="notice_room_created_by_you">أنتَ أنشأتَ الغُرفة</string>
-    <string name="notice_room_invite_by_you">أنتَ دعوتَ %1$s</string>
-    <string name="notice_room_join_by_you">أنتَ انضممت إلى الغُرفة</string>
-    <string name="notice_room_leave_by_you">أنتَ غادرتَ الغُرفة</string>
+    <string name="summary_you_sent_image">أرسلتَ صورةً.</string>
+    <string name="summary_you_sent_sticker">أرسلتَ ملصقًا.</string>
+    <string name="notice_room_invite_no_invitee_by_you">دعوة منك</string>
+    <string name="notice_room_created">أنشأ ⁨%1$s⁩ الغرفة</string>
+    <string name="notice_room_created_by_you">أنشأتَ الغرفة</string>
+    <string name="notice_room_invite_by_you">دعوتَ ⁨%1$s⁩</string>
+    <string name="notice_room_join_by_you">انضممتَ إلى الغرفة</string>
+    <string name="notice_room_leave_by_you">غادرتَ الغرفة</string>
     <string name="notice_room_reject_by_you">رفضتَ الدعوة</string>
-    <string name="notice_room_kick_by_you">طردتَ %1$s</string>
-    <string name="notice_room_unban_by_you">أنتَ قد رفعتَ الحظر عن %1$s</string>
-    <string name="notice_room_ban_by_you">أنتَ قد حظرتَ %1$s</string>
-    <string name="notice_room_withdraw_by_you">أنتَ قد سحبتَ دعوة %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">أنتَ قد غيّرتَ صورتك الشخصية</string>
+    <string name="notice_room_kick_by_you">طردتَ ⁨%1$s⁩</string>
+    <string name="notice_room_unban_by_you">رفعتَ المنع عن ⁨%1$s⁩</string>
+    <string name="notice_room_ban_by_you">منعتَ ⁨%1$s⁩</string>
+    <string name="notice_room_withdraw_by_you">سحبتَ الدعوة الموجّهة إلى ⁨%1$s⁩</string>
+    <string name="notice_avatar_url_changed_by_you">غيّرتَ صورتك الشخصية</string>
     <string name="notice_display_name_set_by_you">أنتَ قد عيَّنتَ اسمك الظاهر إلى %1$s</string>
     <string name="notice_display_name_changed_from_by_you">أنتَ قد غيّرتَ اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
     <string name="notice_display_name_removed_by_you">أنتَ قد أزلتَ اسمك الظاهر (لقد كان ⁨%1$s⁩)</string>
@@ -140,12 +140,12 @@
     <string name="notice_direct_room_update">إنَّ %s قد قامَ بالترقية هُنا.</string>
     <string name="notice_made_future_direct_room_visibility_by_you">أنتَ قد جعلتَ الرسائل المُستقبلية مرئية لـ %1$s</string>
     <string name="notice_made_future_direct_room_visibility">إنَّ %1$s قد جعلَ الرسائل المُستقبلية مرئية لـ %2$s</string>
-    <string name="notice_direct_room_leave_by_you">غادرت الغرفة</string>
-    <string name="notice_direct_room_leave">غادر ⁨%1$s⁩ الغرفة</string>
-    <string name="notice_direct_room_join_by_you">أنت انضممت</string>
-    <string name="notice_direct_room_join">انضم %1$s</string>
-    <string name="notice_direct_room_created_by_you">أنتَ أنشأتَ المُناقشة</string>
-    <string name="notice_direct_room_created">أنشأ %1$s المُناقشة</string>
+    <string name="notice_direct_room_leave_by_you">غادرتَ الغرفة</string>
+    <string name="notice_direct_room_leave">غادرَ ⁨%1$s⁩ الغرفة</string>
+    <string name="notice_direct_room_join_by_you">انضممت</string>
+    <string name="notice_direct_room_join">انضمّ ⁨%1$s⁩</string>
+    <string name="notice_direct_room_created_by_you">أنشأتَ النقاش</string>
+    <string name="notice_direct_room_created">أنشأ ⁨%1$s⁩ النقاش</string>
     <string name="notice_room_withdraw_with_reason_by_you">أنتَ قد سحبتَ دعوة %1$s. السبب: %2$s</string>
     <string name="notice_room_withdraw_with_reason">إنَّ %1$s قد سحبَ دعوة %2$s. السبب: %3$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">أنتَ قد ألغيتَ دعوة %1$s للإنضمام إلى الغُرفة. السبب: %2$s</string>

From d492569539f30d24d3cc5286d9f9c8d3b4e9d11a Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Thu, 1 Apr 2021 09:56:22 +0000
Subject: [PATCH 501/578] Translated using Weblate (German)

Currently translated at 99.9% (2361 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 6ad2fe92f7..52e67eb460 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -886,7 +886,7 @@
     <string name="black_theme">Schwarzes Design</string>
     <string name="notification_sync_in_progress">Synchronisiere…</string>
     <string name="notification_listening_for_events">Auf Ereignisse lauschen</string>
-    <string name="settings_containing_my_display_name">Nachrichten, die meinen Anzeigenamen enthalten</string>
+    <string name="settings_containing_my_display_name">Nachrichten mit meinem Anzeigenamen</string>
     <string name="settings_containing_my_user_name">Nachrichten, die meinen Benutzernamen enthalten</string>
     <string name="you_added_a_new_device">Du hast die neue Sitzung \'%s\' hinzugefügt, die jetzt Verschlüsselungs-Schlüssel anfordert.</string>
     <string name="your_unverified_device_requesting">Deine bislang nicht verifiziertes Sitzung \'%s\' fordert Verschlüsselungs-Schlüssel an.</string>
@@ -2729,7 +2729,7 @@
     <string name="settings_room_directory_show_all_rooms">Zeige Räume mit anstößigen Inhalten</string>
     <string name="event_status_delete_all_failed_dialog_message">Bist du dir sicher, dass du alle nicht gesendete Nachrichten in diesem Raum löschen willst\?</string>
     <string name="event_status_delete_all_failed_dialog_title">Nicht gesendete Nachrichten löschen</string>
-    <string name="event_status_a11y_failed">Schlug fehl</string>
+    <string name="event_status_a11y_failed">Fehlgeschlagen</string>
     <string name="event_status_cancel_sending_dialog_message">Willst du zu sendende Nachrichten zurückziehen\?</string>
     <string name="event_status_a11y_delete_all">Alle fehgeschlagene Nachrichten löschen</string>
     <string name="event_status_failed_messages_warning">Senden der Nachricht gescheitert</string>

From 77fb8de71ff9270c5108ed7866261f3262c78461 Mon Sep 17 00:00:00 2001
From: Safa Alfulaij <safa1996alfulaij@gmail.com>
Date: Thu, 1 Apr 2021 19:00:23 +0000
Subject: [PATCH 502/578] Translated using Weblate (Arabic)

Currently translated at 92.3% (12 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ar/
---
 fastlane/metadata/android/ar/changelogs/40101010.txt | 2 ++
 fastlane/metadata/android/ar/title.txt               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 fastlane/metadata/android/ar/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/ar/changelogs/40101010.txt b/fastlane/metadata/android/ar/changelogs/40101010.txt
new file mode 100644
index 0000000000..329fffeb3c
--- /dev/null
+++ b/fastlane/metadata/android/ar/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+التغييرات الرئيسة في هذه النسخة: تحسينات على الأداء وإصلاح للعلل!
+اطّلع على سجل التغييرات الكامل هنا: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/ar/title.txt b/fastlane/metadata/android/ar/title.txt
index 9b382729c8..11992d355d 100644
--- a/fastlane/metadata/android/ar/title.txt
+++ b/fastlane/metadata/android/ar/title.txt
@@ -1 +1 @@
-Element (سابقاً Riot.im)
+‏Element (‏Riot.im سابقًا)

From 472e7b8246326df6ceae1a3e2a506144c3914132 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Fri, 2 Apr 2021 20:58:52 +0000
Subject: [PATCH 503/578] Translated using Weblate (Ukrainian)

Currently translated at 73.7% (1743 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
---
 vector/src/main/res/values-uk/strings.xml | 54 +++++++++++------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index f3a9be7023..4d8cd05f6e 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -46,7 +46,7 @@
     <string name="notice_room_third_party_registered_invite">%1$s приймає запрошення до %2$s</string>
     <string name="notice_crypto_unable_to_decrypt">** Неможливо розшифрувати: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Пристрій відправника не надіслав нам ключ для цього повідомлення.</string>
-    <string name="could_not_redact">Неможливо відредагувати</string>
+    <string name="could_not_redact">Не вдається редагувати</string>
     <string name="unable_to_send_message">Не вдалося надіслати повідомлення</string>
     <string name="message_failed_to_upload">Не вдалося завантажити зображення</string>
     <string name="network_error">Помилка мережі</string>
@@ -1779,7 +1779,7 @@
 \n
 \nВи впевнені, що бажаєте продовжити\?</string>
     <string name="signed_out_title">Ви вийшли</string>
-    <string name="message_action_item_redact">Видалити…</string>
+    <string name="message_action_item_redact">Вилучити…</string>
     <string name="send_a_sticker">Наліпка</string>
     <string name="terms_description_for_integration_manager">Використовувати ботів, мости, знадоби та пакунки наліпок</string>
     <string name="no_connectivity_to_the_server_indicator">Зв\'язок із сервером втрачено</string>
@@ -1822,31 +1822,31 @@
     <string name="command_snow">Надсилає вказане повідомлення зі снігом</string>
     <string name="command_confetti">Надсилає вказане повідомлення з конфетті</string>
     <plurals name="secure_backup_reset_devices_you_can_verify">
-        <item quantity="one">Показати пристрій, з якого ви можете звірити цю сесію просто зараз</item>
-        <item quantity="few">Показати %d пристрої, з яких ви можете звірити цю сесію просто зараз</item>
-        <item quantity="many">Показати %d пристроїв, з яких ви можете звірити цю сесію просто зараз</item>
-        <item quantity="other">Показати %d пристроїв, з яких ви можете звірити цю сесію просто зараз</item>
+        <item quantity="one">Показати пристрій, з якого ви можете звірити цей сеанс просто зараз</item>
+        <item quantity="few">Показати %d пристрої, з яких ви можете звірити цей сеанс просто зараз</item>
+        <item quantity="many">Показати %d пристроїв, з яких ви можете звірити цей сеанс просто зараз</item>
+        <item quantity="other">Показати %d пристроїв, з яких ви можете звірити цей сеанс просто зараз</item>
     </plurals>
     <string name="secure_backup_reset_no_history">Ви розпочнете знову, але без історії повідомлень, без довірених пристроїв та користувачів</string>
     <string name="secure_backup_reset_all_no_other_devices">Вдавайтесь до цього лише за умов відсутності жодного пристрою, з якого ви можете звірити поточний пристрій.</string>
     <string name="secure_backup_reset_if_you_reset_all">Якщо ви скинете все</string>
     <string name="secure_backup_reset_all">Скинути все</string>
-    <string name="keys_backup_passphrase_error_decrypt">Резервна копія не може бути дешифрована цією парольною фразою: переконайтесь, будь ласка, що відновлювальна парольна фраза зазначена правильно.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Резервна копія не може бути дешифрована цією парольною фразою: переконайтесь, що відновлювальна парольна фраза зазначена правильно.</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Не знаєте вашої відновлювальної парольної фрази\? Ви можете %s.</string>
     <string name="backup_recovery_passphrase">Відновлювальна парольна фраза</string>
     <string name="bad_passphrase_key_reset_all_action">Забули або втратили усі можливості для відновлення\? Скинути все</string>
     <string name="use_file">Використати файл</string>
     <string name="verification_cannot_access_other_session">Скористатись відновлювальними парольною фразою або ключем</string>
     <string name="keys_backup_restore_with_passphrase">Скористатись відновлювальними парольною фразою або ключем</string>
-    <string name="template_use_other_session_content_description">Використовуйте найостаннішій ${app_name} на ваших інших пристроях, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} для Android, або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
+    <string name="template_use_other_session_content_description">Використовуйте найостаннішій ${app_name} на ваших інших пристроях, ${app_name} Web, ${app_name} для комп\'ютерів, ${app_name} iOS, ${app_name} для Android, або будь-який інший, здатний до перехресного підписування, Matrix-клієнт</string>
     <string name="template_use_latest_app">Використовуйте найостаннішій ${app_name} на ваших інших пристроях:</string>
-    <string name="verification_use_passphrase">Якщо ви не можете доступитись до чинної сесії</string>
-    <string name="verification_open_other_to_verify">Використайте чинну сесію задля звірки цієї сесії, надавши їй таким чином доступ до зашифрованих повідомлень.</string>
+    <string name="verification_use_passphrase">Якщо ви не можете доступитись до чинного сеансу</string>
+    <string name="verification_open_other_to_verify">Використайте чинний сеанс, щоб звірити цей сеанс, таким чином надавши йому доступ до зашифрованих повідомлень.</string>
     <string name="confirm_your_identity_quad_s">Підтвердьте вашу тотожність, звіривши цей вхід та надавши йому доступ до зашифрованих повідомлень.</string>
     <string name="verify_this_session">Звірте новий вхід, що доступається до вашого облікового запису: %1$s</string>
     <string name="crosssigning_verify_this_session">Звірте цей вхід</string>
     <string name="verification_request_waiting">Очікування…</string>
-    <string name="new_session_review">Тицьніть, щоб переглянути та звірити</string>
+    <string name="new_session_review">Торкніться, щоб переглянути та звірити</string>
     <string name="new_session">Новий вхід. Це були ви\?</string>
     <string name="refresh">Оновити</string>
     <string name="reset_cross_signing">Скинути ключі</string>
@@ -1869,7 +1869,7 @@
     <string name="notice_room_third_party_invite_with_reason">%1$s надсилає %2$s запрошення приєднатись до кімнати. Причина: %3$s</string>
     <string name="notice_room_third_party_invite_with_reason_by_you">Ви надіслали %1$s запрошення приєднатись до кімнати. Причина: %2$s</string>
     <string name="notice_room_ban_with_reason_by_you">Ви заблокували %1$s. Причина: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s заблоковує %2$s. Причина: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s заблоковано %2$s. Причина: %3$s</string>
     <string name="notice_room_unban_with_reason_by_you">Ви розблокували %1$s. Причина: %2$s</string>
     <string name="notice_room_unban_with_reason">%1$s розблоковує %2$s. Причина: %3$s</string>
     <string name="notice_room_kick_with_reason_by_you">Ви викинули %1$s. Причина: %2$s</string>
@@ -1883,9 +1883,9 @@
 \n
 \nВаші повідомлення захищені замками, тож лише ви та отримувачі мають унікальні ключі для їхнього відмикання.</string>
     <string name="this_is_the_beginning_of_room">Це початок %s.</string>
-    <string name="call_tile_other_declined">%1$s відхилили цей виклик</string>
+    <string name="call_tile_other_declined">%1$s відхиляє цей виклик</string>
     <string name="call_tile_you_declined">Ви відхилили цей виклик %1$s</string>
-    <string name="call_tile_other_started_call">%1$s розпочали виклик</string>
+    <string name="call_tile_other_started_call">%1$s розпочинає виклик</string>
     <string name="call_tile_you_started_call">Ви розпочали виклик</string>
     <string name="quick_reactions">Швидкі реакції</string>
     <string name="call_transfer_users_tab_title">Користувачі</string>
@@ -1899,10 +1899,10 @@
     <string name="call_held_by_user">%s утримали виклик</string>
     <string name="call_hold_action">Утримати</string>
     <plurals name="call_only_paused">
-        <item quantity="one">Поточний виклик</item>
-        <item quantity="few">%1$d поточні виклики</item>
-        <item quantity="many">%1$d поточних викликів</item>
-        <item quantity="other">%1$d поточних викликів</item>
+        <item quantity="one">Призупинений виклик</item>
+        <item quantity="few">%1$d призупинені виклики</item>
+        <item quantity="many">%1$d призупинених викликів</item>
+        <item quantity="other">%1$d призупинених викликів</item>
     </plurals>
     <string name="call_only_active">Поточний виклик (%1$s)</string>
     <plurals name="call_one_active_and_other_paused">
@@ -1916,7 +1916,7 @@
     <string name="add_by_matrix_id">Додати за matrix ID</string>
     <string name="alert_push_are_disabled_title">Push-сповіщення вимкнено</string>
     <string name="failed_to_unban">Не вдалось розблокувати користувача</string>
-    <string name="member_banned_by">Заблоковано від %1$s</string>
+    <string name="member_banned_by">Блокування від %1$s</string>
     <string name="three_pid_revoke_invite_dialog_content">Відкликати запрошення для %1$s\?</string>
     <string name="three_pid_revoke_invite_dialog_title">Відкликати запрошення</string>
     <string name="enter_account_password">Введіть ваш %s, щоб продовжити.</string>
@@ -1942,7 +1942,7 @@
     <string name="initial_sync_start_downloading">Початкова синхронізація:
 \nЗвантаження даних…</string>
     <string name="initial_sync_start_server_computing">Початкова синхронізація:
-\nОчікування на відповідь сервера…</string>
+\nОчікування відповіді сервера…</string>
     <string name="invite_users_to_room_title">Запросити користувачів</string>
     <string name="invite_users_to_room_action_invite">ЗАПРОСИТИ</string>
     <string name="direct_room_start_search">Розпочніть друкувати, щоб отримати результати</string>
@@ -1953,9 +1953,9 @@
     <string name="phone_book_perform_lookup">Пошук контактів у Matrix</string>
     <string name="contacts_book_title">Контакти</string>
     <string name="loading_contact_book">Отримання контактів…</string>
-    <string name="qr_code_not_scanned">QR-код не відскановано!</string>
-    <string name="invalid_qr_code_uri">QR-код не є дійсним (недійсний URI)!</string>
-    <string name="not_a_valid_qr_code">Цей QR-код не є дійсним</string>
+    <string name="qr_code_not_scanned">QR-код не зіскановано!</string>
+    <string name="invalid_qr_code_uri">QR-код не дійсний (недійсний URI)!</string>
+    <string name="not_a_valid_qr_code">Цей QR-код не дійсний</string>
     <string name="qr_code_scanned_verif_waiting">Чекаємо на %s…</string>
     <string name="qr_code_scanned_verif_waiting_notice">Майже все! Чекаємо на підтвердження…</string>
     <string name="qr_code_scanned_self_verif_notice">Майже все! Чи показує інший пристрій такий самий щит\?</string>
@@ -1967,12 +1967,12 @@
     <string name="qr_code">QR-код</string>
     <string name="user_directory_search_hint">Пошук за іменем або ID</string>
     <string name="add_by_qr_code">Додати за QR-кодом</string>
-    <string name="settings_discovery_mail_pending">Чекання</string>
+    <string name="settings_discovery_mail_pending">Очікування</string>
     <string name="identity_server_set_alternative_notice_no_default">Зазначте адресу сервера ідентифікації</string>
     <string name="identity_server_set_alternative_notice">В іншому разі, ви можете зазначити адресу будь-якого іншого сервера ідентифікації</string>
     <string name="identity_server_set_default_notice">Ваш домашній сервер (%1$s) пропонує використовувати %2$s як ваш сервер ідентифікації</string>
-    <string name="identity_server_error_terms_not_signed">Будь ласка, погодьтесь спочатку з умовами використання сервера ідентифікації у налаштуваннях.</string>
-    <string name="identity_server_error_no_identity_server_configured">Будь ласка, налаштуйте спочатку сервер ідентифікації.</string>
+    <string name="identity_server_error_terms_not_signed">Спочатку погодьтесь з умовами користування сервером ідентифікації в налаштуваннях.</string>
+    <string name="identity_server_error_no_identity_server_configured">Спочатку налаштуйте сервер ідентифікації.</string>
     <string name="template_identity_server_error_outdated_identity_server">Цей сервер ідентифікації є застарілим. ${app_name} підтримує лише API V2.</string>
     <string name="disconnect_identity_server_dialog_content">Від\'єднатись від сервера ідентифікації %s\?</string>
     <string name="settings_agree_to_terms">Погодьтесь з умовами використання сервера ідентифікації (%s), щоб дозволити вашу виявність за електронною адресою та номером телефону.</string>
@@ -2003,7 +2003,7 @@
     <string name="message_add_reaction">Зреагувати</string>
     <string name="finish">Завершити</string>
     <string name="reply">Відповісти</string>
-    <string name="edit">Відредагувати</string>
+    <string name="edit">Редагувати</string>
     <string name="disclaimer_negative_button">Зрозуміло</string>
     <string name="disclaimer_title">Riot тепер називається Element!</string>
     <string name="downloaded_file">Файл %1$s було звантажено!</string>

From 1612d57aab5c52ee408275aecc3318e8d5b7cff4 Mon Sep 17 00:00:00 2001
From: Vivek K J <VIVEKKJ2004@gmail.com>
Date: Sat, 3 Apr 2021 12:04:49 +0000
Subject: [PATCH 504/578] Translated using Weblate (Malayalam)

Currently translated at 25.0% (592 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 126 ++++++++++++++++++++++
 1 file changed, 126 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 34d67270b3..e11aaa7639 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -514,4 +514,130 @@
     <string name="notice_room_leave">%1$s മുറി വിട്ടു</string>
     <string name="notice_direct_room_created_by_you">നിങ്ങൾ ചർച്ച സൃഷ്ടിച്ചു</string>
     <string name="notice_direct_room_created">%1$s ചർച്ച സൃഷ്ടിച്ചു</string>
+    <string name="notice_room_canonical_alias_set">%1$s ഈ മുറിയുടെ പ്രധാന വിലാസമായി %2$s സജ്ജമാക്കി.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">നിങ്ങൾ %1$s ചേർത്ത് ഈ മുറിയുടെ വിലാസങ്ങളായിരുന്ന %2$s നീക്കം ചെയ്‌തു.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s %2$s ചേർത്ത് ഈ മുറിയുടെ വിലാസങ്ങളായിരുന്ന %3$s നീക്കം ചെയ്‌തു.</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">നിങ്ങൾ ഈ മുറിയുടെ വിലാസമായിരുന്ന %1$s നീക്കംചെയ്‌തു.</item>
+        <item quantity="other">നിങ്ങൾ ഈ മുറിയുടെ വിലാസങ്ങളായിരുന്ന %1$s നീക്കംചെയ്‌തു.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s ഈ മുറിയുടെ വിലാസമായിരുന്ന %2$s നീക്കംചെയ്‌തു.</item>
+        <item quantity="other">%1$s ഈ മുറിയുടെ വിലാസങ്ങളായിരുന്ന %2$s നീക്കംചെയ്‌തു.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">ഈ മുറിയുടെ വിലാസമായി നിങ്ങൾ %1$s ചേർത്തു.</item>
+        <item quantity="other">ഈ മുറിയുടെ വിലാസങ്ങളായി നിങ്ങൾ %1$s ചേർത്തു.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">ഈ മുറിയുടെ വിലാസമായി %1$s %2$s ചേർത്തു.</item>
+        <item quantity="other">ഈ മുറിയുടെ വിലാസങ്ങളായി %1$s %2$s ചേർത്തു.</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">%1$sന്റെ ക്ഷണം നിങ്ങൾ പിൻവലിച്ചു. കാരണം: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s %2$sന്റെ ക്ഷണം പിൻവലിച്ചു. കാരണം: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">%1$sനുള്ള ക്ഷണം നിങ്ങൾ സ്വീകരിച്ചു. കാരണം: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$sനുള്ള ക്ഷണം സ്വീകരിച്ചു. കാരണം: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">%1$sന് മുറിയിൽ ചേരുന്നതിനുള്ള ക്ഷണം നിങ്ങൾ റദ്ദാക്കി. കാരണം: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%2$sന് മുറിയിൽ ചേരുന്നതിനുള്ള ക്ഷണം %1$s റദ്ദാക്കി. കാരണം: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">മുറിയിൽ ചേരാൻ നിങ്ങൾ %1$sന് ഒരു ക്ഷണം അയച്ചു. കാരണം: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s മുറിയിൽ ചേരാൻ %2$sന്ക്ഷണം അയച്ചു. കാരണം:%3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">നിങ്ങൾ %1$sനെ വിലക്കി. കാരണം: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s %2$s ന്റെ വിലക്ക് നീക്കി. കാരണം: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">നിങ്ങൾ %1$sന്റെ വിലക്ക് നീക്കി. കാരണം: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s %2$sന്റെ വിലക്ക് നീക്കി. കാരണം: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">നിങ്ങൾ %1$sനെ പുറത്താക്കി. കാരണം:%2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s %2$sനെ പുറത്താക്കി. കാരണം: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">നിങ്ങൾ ക്ഷണം നിരസിച്ചു. കാരണം: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s ക്ഷണം നിരസിച്ചു. കാരണം: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">നിങ്ങൾ ഉപേക്ഷിച്ചു. കാരണം: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s ഉപേക്ഷിച്ചു. കാരണം: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">നിങ്ങൾ മുറി വിട്ടു. കാരണം: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s മുറി വിട്ടു. കാരണം: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">നിങ്ങൾ ചേർന്നു. കാരണം: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s ചേർന്നു. കാരണം: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">നിങ്ങൾ മുറിയിൽ ചേർന്നു. കാരണം: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s മുറിയിൽ ചേർന്നു. കാരണം: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s നിങ്ങളെ ക്ഷണിച്ചു. കാരണം: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">നിങ്ങൾ %1$sനെ ക്ഷണിച്ചു. കാരണം: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s %2$sനെ ക്ഷണിച്ചു. കാരണം: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">നിങ്ങളുടെ ക്ഷണം. കാരണം: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s ന്റെ ക്ഷണം. കാരണം: %2$s</string>
+    <string name="clear_timeline_send_queue">അയയ്‌ക്കാനുള്ള ശ്രേണി മായ്‌ക്കുക</string>
+    <string name="event_status_sending_message">സന്ദേശം അയയ്ക്കുന്നു…</string>
+    <string name="initial_sync_start_importing_account_data">പ്രാരംഭ സമന്വയം:
+\nഅക്കൗണ്ട് ഡാറ്റ ഇറക്കുമതി ചെയ്യുന്നു</string>
+    <string name="initial_sync_start_importing_account_groups">പ്രാരംഭ സമന്വയം:
+\nജനസമൂഹങ്ങൾ ഇറക്കുമതി ചെയ്യുന്നു</string>
+    <string name="initial_sync_start_importing_account_left_rooms">പ്രാരംഭ സമന്വയം:
+\nഉപേക്ഷിച്ച മുറികൾ ഇറക്കുമതി ചെയ്യുന്നു</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">പ്രാരംഭ സമന്വയം:
+\nക്ഷണിക്കപ്പെട്ട മുറികൾ ഇറക്കുമതി ചെയ്യുന്നു</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">പ്രാരംഭ സമന്വയം:
+\nചേർന്ന മുറികൾ ഇറക്കുമതി ചെയ്യുന്നു</string>
+    <string name="initial_sync_start_importing_account_rooms">പ്രാരംഭ സമന്വയം:
+\nമുറികൾ ഇറക്കുമതി ചെയ്യുന്നു</string>
+    <string name="initial_sync_start_importing_account_crypto">പ്രാരംഭ സമന്വയം:
+\nക്രിപ്‌റ്റോ ഇറക്കുമതി ചെയ്യുന്നു</string>
+    <string name="initial_sync_start_importing_account">പ്രാരംഭ സമന്വയം:
+\nഅക്കൗണ്ട് ഇറക്കുമതി ചെയ്യുന്നു…</string>
+    <string name="initial_sync_start_downloading">പ്രാരംഭ സമന്വയം:
+\nഡാറ്റ ഡൗൺലോഡുചെയ്യുന്നു…</string>
+    <string name="initial_sync_start_server_computing">പ്രാരംഭ സമന്വയം:
+\nസെർവർ പ്രതികരണത്തിനായി കാത്തിരിക്കുന്നു…</string>
+    <string name="room_displayname_empty_room_was">ശൂന്യമായ മുറി ( %s ആയിരുന്നു)</string>
+    <string name="room_displayname_empty_room">ശൂന്യമായ മുറി</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s ഉം വേറെ 1 ആളും</item>
+        <item quantity="other">%1$s ഉം വേറെ %2$d പേരും</item>
+    </plurals>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s കൂടാതെ %4$d പേർ</item>
+        <item quantity="other">%1$s, %2$s, %3$s കൂടാതെ %4$d പേരും</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s പിന്നെ %4$sഉം</string>
+    <string name="room_displayname_3_members">%1$s, %2$s പിന്നെ %3$sഉം</string>
+    <string name="room_displayname_two_members">%1$s ഉം %2$s ഉം</string>
+    <string name="room_displayname_room_invite">മുറി ക്ഷണം</string>
+    <string name="room_displayname_invite_from">%sൽ നിന്നുമുള്ള ക്ഷണം</string>
+    <string name="medium_phone_number">ഫോൺ നമ്പർ</string>
+    <string name="medium_email">ഈ - മെയിൽ വിലാസം</string>
+    <string name="room_error_join_failed_empty_room">ഒരു ശൂന്യമായ മുറിയിൽ വീണ്ടും ചേരാൻ നിലവിൽ സാധ്യമല്ല.</string>
+    <string name="matrix_error">മേട്രിക്സ് പിശക്</string>
+    <string name="network_error">നെറ്റ്‌വർക്ക് പിശക്</string>
+    <string name="message_failed_to_upload">ചിത്രം അപ്‌ലോഡുചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു</string>
+    <string name="unable_to_send_message">സന്ദേശം അയയ്‌ക്കാനായില്ല</string>
+    <string name="could_not_redact">പുനഃക്രമീകരിക്കാൻ കഴിഞ്ഞില്ല</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">അയച്ചയാളുടെ ഉപകരണം ഈ സന്ദേശത്തിനുള്ള കീകൾ ഞങ്ങൾക്ക് അയച്ചിട്ടില്ല.</string>
+    <string name="notice_crypto_unable_to_decrypt">** ഡീക്രിപ്റ്റ് ചെയ്യാൻ കഴിഞ്ഞില്ല: %s **</string>
+    <string name="notice_power_level_changed">%1$s %2$s ന്റെ അധികാര നില മാറ്റി.</string>
+    <string name="notice_power_level_changed_by_you">നിങ്ങൾ %1$s ന്റെ അധികാര നില മാറ്റി.</string>
+    <string name="power_level_custom_no_value">ഇച്ഛാനുസൃതം</string>
+    <string name="power_level_custom">ഇച്ഛാനുസൃതം (%1$d)</string>
+    <string name="power_level_default">തനത്</string>
+    <string name="power_level_moderator">മോഡറേറ്റർ</string>
+    <string name="power_level_admin">അഡ്മിൻ</string>
+    <string name="notice_widget_jitsi_modified_by_you">നിങ്ങൾ വീഡിയോ കോൺഫറൻസ് പരിഷ്ക്കരിച്ചു</string>
+    <string name="notice_widget_jitsi_modified">%1$s വീഡിയോ കോൺഫറൻസ് പരിഷ്ക്കരിച്ചു</string>
+    <string name="notice_widget_jitsi_removed_by_you">നിങ്ങൾ വീഡിയോ കോൺഫറൻസ് അവസാനിപ്പിച്ചു</string>
+    <string name="notice_widget_jitsi_removed">%1$s വീഡിയോ കോൺഫറൻസ് അവസാനിച്ചു</string>
+    <string name="notice_widget_jitsi_added_by_you">നിങ്ങൾ വീഡിയോ കോൺഫറൻസ് ആരംഭിച്ചു</string>
+    <string name="notice_widget_jitsi_added">%1$s വീഡിയോ കോൺഫറൻസ് ആരംഭിച്ചു</string>
+    <string name="notice_widget_modified_by_you">നിങ്ങൾ %1$s വിജറ്റ് പരിഷ്ക്കരിച്ചു</string>
+    <string name="notice_widget_modified">%1$s %2$s വിജറ്റ് പരിഷ്ക്കരിച്ചു</string>
+    <string name="notice_widget_removed_by_you">നിങ്ങൾ %1$s വിജറ്റ് നീക്കം ചെയ്തു</string>
+    <string name="notice_widget_removed">%1$s %2$s വിജറ്റ് നീക്കം ചെയ്തു</string>
+    <string name="notice_widget_added_by_you">നിങ്ങൾ %1$s വിജറ്റ് ചേർത്തു</string>
+    <string name="notice_widget_added">%1$s %2$s വിജറ്റ് ചേർത്തു</string>
+    <string name="notice_room_third_party_registered_invite_by_you">%1$s നുള്ള ക്ഷണം നിങ്ങൾ സ്വീകരിച്ചു</string>
+    <string name="notice_room_third_party_registered_invite">%1$s %2$sനുള്ള ക്ഷണം സ്വീകരിച്ചു</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">%1$sനുള്ള ക്ഷണം നിങ്ങൾ റദ്ദാക്കി</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s %2$sനുള്ള ക്ഷണം റദ്ദാക്കി</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">%1$sന് മുറിയിൽ ചേരുന്നതിനുള്ള ക്ഷണം നിങ്ങൾ റദ്ദാക്കി</string>
+    <string name="notice_room_third_party_revoked_invite">%2$sന് മുറിയിൽ ചേരുന്നതിനുള്ള ക്ഷണം %1$s റദ്ദാക്കി</string>
+    <string name="notice_direct_room_third_party_invite_by_you">നിങ്ങൾ %1$s നെ ക്ഷണിച്ചു</string>
+    <string name="notice_direct_room_third_party_invite">%1$s %2$sനെ ക്ഷണിച്ചു</string>
+    <string name="notice_room_third_party_invite_by_you">മുറിയിൽ ചേരാൻ നിങ്ങൾ %1$s ന് ഒരു ക്ഷണം അയച്ചു</string>
+    <string name="notice_room_third_party_invite">%1$s മുറിയിൽ ചേരാൻ %2$s ന് ക്ഷണം അയച്ചു</string>
+    <string name="notice_profile_change_redacted_by_you">നിങ്ങളുടെ പ്രൊഫൈൽ %1$s നവീകരിച്ചു</string>
+    <string name="notice_profile_change_redacted">%1$s അവരുടെ പ്രൊഫൈൽ %2$s നവീകരിച്ചു</string>
 </resources>
\ No newline at end of file

From ef1265fe3893d293cce9c042d0054499c0100a22 Mon Sep 17 00:00:00 2001
From: Andrejs <tlpbu@droplar.com>
Date: Sat, 3 Apr 2021 19:41:19 +0000
Subject: [PATCH 505/578] Translated using Weblate (Latvian)

Currently translated at 66.8% (1580 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
---
 vector/src/main/res/values-lv/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 01646013ff..ee98765a7c 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -567,7 +567,7 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="room_event_action_report_prompt_reason">Iemesls ziņojumam par šo saturu</string>
     <string name="room_event_action_report_prompt_ignore_user">Vai vēlaties paslēpt visas ziņas no šī lietotāja\?
 \n
-\nŅemiet vērā, ka ar šo darbību tiks restartēta lietotne, un tas var aizņemt kādu laiku.</string>
+\nŅemiet vērā, ka ar šo darbību tiks pārstartēta lietotne, un tas var aizņemt kādu laiku.</string>
     <string name="room_event_action_cancel_upload">Atcelt augšupielādi</string>
     <string name="room_event_action_cancel_download">Atcelt lejupielādi</string>
     <string name="search_hint">Meklēšana</string>
@@ -691,7 +691,7 @@ Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespē
     <string name="settings_password_updated">Parole nomainīta</string>
     <string name="settings_unignore_user">Rādīt visas ziņas no %s\?
 \n
-\nŅemiet vērā, ka ar šo darbību tiks restartēta lietotne, un tas var aizņemt kādu laiku.</string>
+\nŅemiet vērā, ka ar šo darbību tiks pārstartēta lietotne, un tas var aizņemt kādu laiku.</string>
     <string name="settings_delete_notification_targets_confirmation">Vai tiešām vēlies turpmāk paziņojumus uz šo ierīci nesūtīt?</string>
     <string name="settings_delete_threepid_confirmation">Vai tiešām vēlies dzēst %1$s %2$s?</string>
     <string name="settings_select_country">Izvēlies valsti</string>

From ee77ed134bdd17839034e69f02ee5d6f7df0c05d Mon Sep 17 00:00:00 2001
From: Hakim Oubouali <hakim.oubouali@protonmail.com>
Date: Sun, 4 Apr 2021 01:02:11 +0000
Subject: [PATCH 506/578] Translated using Weblate (Central Atlas Tamazight)

Currently translated at 3.5% (83 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tzm/
---
 vector/src/main/res/values-tzm/strings.xml | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/vector/src/main/res/values-tzm/strings.xml b/vector/src/main/res/values-tzm/strings.xml
index befe8dd878..b8688a3c6b 100644
--- a/vector/src/main/res/values-tzm/strings.xml
+++ b/vector/src/main/res/values-tzm/strings.xml
@@ -31,4 +31,59 @@
     <string name="room_sliding_menu_settings">Tisɣal</string>
     <string name="room_details_settings">Tisɣal</string>
     <string name="room_permissions_change_settings">Ssenfel Tisɣal</string>
+    <string name="global_retry">Rar</string>
+    <string name="encryption_information_algorithm">Talgoritmet</string>
+    <string name="room_settings_addresses_pref_title">Tansa</string>
+    <string name="media_saving_period_forever">Abda</string>
+    <string name="media_source_choose">Dɣer</string>
+    <string name="compression_opt_list_choose">Dɣer</string>
+    <string name="devices_delete_submit_button_label">Azen</string>
+    <string name="room_sliding_menu_messages">Tuzinin</string>
+    <string name="room_recents_join">LKM</string>
+    <string name="tab_title_search_files">IFUYLA</string>
+    <string name="search_hint">Rzu</string>
+    <string name="room_details_files">Ifuyla</string>
+    <string name="room_menu_search">Rzu</string>
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="room_participants_header_call">ƔER</string>
+    <plurals name="format_time_d">
+        <item quantity="one">%das</item>
+        <item quantity="other">%das</item>
+    </plurals>
+    <string name="reject">Agey</string>
+    <string name="join">Lkem</string>
+    <string name="no">UHU</string>
+    <string name="yes">YAH</string>
+    <string name="call_ring">Aɣuri…</string>
+    <string name="call">Ɣer</string>
+    <string name="today">Assa</string>
+    <string name="sound_device_phone">Atilifun</string>
+    <string name="search">Rzu</string>
+    <string name="read_receipt">Ɣer</string>
+    <string name="bottom_action_notification">Tineɣmisin</string>
+    <string name="dialog_title_error">Azgal</string>
+    <string name="action_close">Rgel</string>
+    <string name="action_open">Ṛẓem</string>
+    <string name="actions">Tigawin</string>
+    <string name="action_exit">Ffeɣ</string>
+    <string name="decline">Agey</string>
+    <string name="invite">Ɣer</string>
+    <string name="or">neɣ</string>
+    <string name="ongoing_conference_call_video">Avidyu</string>
+    <string name="play_video">Ɣer</string>
+    <string name="delete">Kkes</string>
+    <string name="clear">Sfeḍ</string>
+    <string name="speak">Ssiwel</string>
+    <string name="share">Bḍu</string>
+    <string name="download">Agem</string>
+    <string name="resend">Ssifeḍ</string>
+    <string name="send">Azen</string>
+    <string name="leave">Ffel</string>
+    <string name="save">Ḥḍu</string>
+    <string name="cancel">Sser</string>
+    <string name="ok">WAX</string>
+    <string name="loading">Azdam…</string>
+    <string name="summary_you_sent_image">Tuzend yat twellaft.</string>
+    <string name="summary_user_sent_image">yuzen %1$s yat twellafet.</string>
+    <string name="summary_message">%1$s: %2$s</string>
 </resources>
\ No newline at end of file

From 0addb3aeeeec1bfc1b17c6ee9bf7967fb066c2e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 07:20:12 +0000
Subject: [PATCH 507/578] Bump libphonenumber from 8.12.20 to 8.12.21

Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.20 to 8.12.21.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.20...v8.12.21)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 0ca605dc8b..2b3f727d9b 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -166,7 +166,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.20'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.21'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.5.1'
diff --git a/vector/build.gradle b/vector/build.gradle
index bf164facee..89d8757803 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -342,7 +342,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.20'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.21'
 
     // rx
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'

From 49c79ceb74670d71bdcbcea6a2bd98c9bb13c4ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 07:22:36 +0000
Subject: [PATCH 508/578] Bump oss-licenses-plugin from 0.10.2 to 0.10.3

Bumps oss-licenses-plugin from 0.10.2 to 0.10.3.

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 637b1de7cb..b8da6c3864 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1'
-        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
+        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.3'
         classpath "com.likethesalad.android:string-reference:1.2.1"
 
         // NOTE: Do not place your application dependencies here; they belong

From 2d4866cdc57508ed03f6e662ac40d4847b9b4b59 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Apr 2021 09:56:12 +0200
Subject: [PATCH 509/578] Add better support for empty room name fallback

---
 CHANGES.md                                          |  1 +
 .../common/TestRoomDisplayNameFallbackProvider.kt   |  4 ++--
 .../sdk/api/RoomDisplayNameFallbackProvider.kt      |  2 +-
 .../room/membership/RoomDisplayNameResolver.kt      | 13 +++++++++----
 .../session/room/summary/RoomSummaryUpdater.kt      |  2 +-
 .../session/sync/UserAccountDataSyncHandler.kt      | 10 +++++++---
 .../room/VectorRoomDisplayNameFallbackProvider.kt   |  8 ++++++--
 7 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1601e0ec85..78c67092c4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Improvements 🙌:
  - Update reactions to Unicode 13.1 (#2998)
  - Be more robust when parsing some enums
  - Improve timeline filtering (dissociate membership and profile events, display hidden events when highlighted, fix hidden item/read receipts behavior)
+ - Add better support for empty room name fallback (#3106)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
index 7a1d4604f0..c98bca42b9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
@@ -18,12 +18,12 @@ package org.matrix.android.sdk.common
 
 import org.matrix.android.sdk.api.RoomDisplayNameFallbackProvider
 
-class TestRoomDisplayNameFallbackProvider() : RoomDisplayNameFallbackProvider {
+class TestRoomDisplayNameFallbackProvider : RoomDisplayNameFallbackProvider {
 
     override fun getNameForRoomInvite() =
             "Room invite"
 
-    override fun getNameForEmptyRoom() =
+    override fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>) =
             "Empty room"
 
     override fun getNameFor2members(name1: String?, name2: String?) =
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
index 4ac14d5f63..b16d29c997 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
@@ -18,7 +18,7 @@ package org.matrix.android.sdk.api
 
 interface RoomDisplayNameFallbackProvider {
     fun getNameForRoomInvite(): String
-    fun getNameForEmptyRoom(): String
+    fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>): String
     fun getNameFor2members(name1: String?, name2: String?): String
     fun getNameFor3members(name1: String?, name2: String?, name3: String?): String
     fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?): String
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index f19862b397..2785ffe4cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.session.room.membership
 
 import io.realm.Realm
 import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -51,14 +52,14 @@ internal class RoomDisplayNameResolver @Inject constructor(
      * @param roomId: the roomId to resolve the name of.
      * @return the room display name
      */
-    fun resolve(realm: Realm, roomId: String): CharSequence {
+    fun resolve(realm: Realm, roomId: String): String {
         // this algorithm is the one defined in
         // https://github.com/matrix-org/matrix-js-sdk/blob/develop/lib/models/room.js#L617
         // calculateRoomName(room, userId)
 
         // For Lazy Loaded room, see algorithm here:
         // https://docs.google.com/document/d/11i14UI1cUz-OJ0knD5BFu7fmT6Fo327zvMYqfSAR7xs/edit#heading=h.qif6pkqyjgzn
-        var name: CharSequence?
+        var name: String?
         val roomEntity = RoomEntity.where(realm, roomId = roomId).findFirst()
         val roomName = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_NAME, stateKey = "")?.root
         name = ContentMapper.map(roomName?.content).toModel<RoomNameContent>()?.name
@@ -105,8 +106,12 @@ internal class RoomDisplayNameResolver @Inject constructor(
             val otherMembersCount = otherMembersSubset.count()
             name = when (otherMembersCount) {
                 0    -> {
-                    roomDisplayNameFallbackProvider.getNameForEmptyRoom()
-                    // TODO (was xx and yyy) ...
+                    // Get left members if any
+                    val leftMembersNames = roomMembers.queryRoomMembersEvent()
+                            .findAll()
+                            .filter { it.membership == Membership.LEAVE }
+                            .map { it.getBestName() }
+                    roomDisplayNameFallbackProvider.getNameForEmptyRoom(roomSummary?.isDirect.orFalse(), leftMembersNames)
                 }
                 1    -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
                 2    -> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index cd1bb69612..02a9d4c1e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -102,7 +102,7 @@ internal class RoomSummaryUpdater @Inject constructor(
                 // avoid this call if we are sure there are unread events
                 || !isEventRead(realm.configuration, userId, roomId, latestPreviewableEvent?.eventId)
 
-        roomSummaryEntity.displayName = roomDisplayNameResolver.resolve(realm, roomId).toString()
+        roomSummaryEntity.displayName = roomDisplayNameResolver.resolve(realm, roomId)
         roomSummaryEntity.avatarUrl = roomAvatarResolver.resolve(realm, roomId)
         roomSummaryEntity.name = ContentMapper.map(lastNameEvent?.content).toModel<RoomNameContent>()?.name
         roomSummaryEntity.topic = ContentMapper.map(lastTopicEvent?.content).toModel<RoomTopicContent>()?.topic
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
index 907c1187fe..b8d987d500 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
@@ -46,6 +46,7 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.room.RoomAvatarResolver
+import org.matrix.android.sdk.internal.session.room.membership.RoomDisplayNameResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
 import org.matrix.android.sdk.internal.session.sync.model.InvitedRoomSync
 import org.matrix.android.sdk.internal.session.sync.model.accountdata.BreadcrumbsContent
@@ -62,7 +63,8 @@ internal class UserAccountDataSyncHandler @Inject constructor(
         @UserId private val userId: String,
         private val directChatsHelper: DirectChatsHelper,
         private val updateUserAccountDataTask: UpdateUserAccountDataTask,
-        private val roomAvatarResolver: RoomAvatarResolver
+        private val roomAvatarResolver: RoomAvatarResolver,
+        private val roomDisplayNameResolver: RoomDisplayNameResolver
 ) {
 
     fun handle(realm: Realm, accountData: UserAccountDataSync?) {
@@ -161,8 +163,9 @@ internal class UserAccountDataSyncHandler @Inject constructor(
                 if (roomSummaryEntity != null) {
                     roomSummaryEntity.isDirect = true
                     roomSummaryEntity.directUserId = userId
-                    // Also update the avatar, there is a specific treatment for DMs
+                    // Also update the avatar and displayname, there is a specific treatment for DMs
                     roomSummaryEntity.avatarUrl = roomAvatarResolver.resolve(realm, roomId)
+                    roomSummaryEntity.displayName = roomDisplayNameResolver.resolve(realm, roomId)
                 }
             }
         }
@@ -172,8 +175,9 @@ internal class UserAccountDataSyncHandler @Inject constructor(
                 .forEach {
                     it.isDirect = false
                     it.directUserId = null
-                    // Also update the avatar, there was a specific treatment for DMs
+                    // Also update the avatar and displayname, there was a specific treatment for DMs
                     it.avatarUrl = roomAvatarResolver.resolve(realm, it.roomId)
+                    it.displayName = roomDisplayNameResolver.resolve(realm, it.roomId)
                 }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
index 92408d59f4..fe1d4e0f2f 100644
--- a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
@@ -28,8 +28,12 @@ class VectorRoomDisplayNameFallbackProvider(
         return context.getString(R.string.room_displayname_room_invite)
     }
 
-    override fun getNameForEmptyRoom(): String {
-        return context.getString(R.string.room_displayname_empty_room)
+    override fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>): String {
+        return if (leftMemberNames.isEmpty()) {
+            context.getString(R.string.room_displayname_empty_room)
+        } else {
+            context.getString(R.string.room_displayname_empty_room_was, leftMemberNames.joinToString())
+        }
     }
 
     override fun getNameFor2members(name1: String?, name2: String?): String {

From 7e74e6a6f4b2ae267fc85fe42467d6e05ca5d981 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Apr 2021 18:03:58 +0200
Subject: [PATCH 510/578] Call getFixedRoomMemberContent() when loading room
 members of a room

It fixes bad names for Empty room
---
 .../sdk/internal/session/events/EventExt.kt   | 35 +++++++++++++++++++
 .../room/membership/RoomMemberEventHandler.kt |  6 ++--
 .../internal/session/sync/RoomSyncHandler.kt  | 15 +-------
 3 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/EventExt.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/EventExt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/EventExt.kt
new file mode 100644
index 0000000000..91e709e464
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/EventExt.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.events
+
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+
+internal fun Event.getFixedRoomMemberContent(): RoomMemberContent? {
+    val content = content.toModel<RoomMemberContent>()
+    // if user is leaving, we should grab his last name and avatar from prevContent
+    return if (content?.membership?.isLeft() == true) {
+        val prevContent = resolvedPrevContent().toModel<RoomMemberContent>()
+        content.copy(
+                displayName = prevContent?.displayName,
+                avatarUrl = prevContent?.avatarUrl
+        )
+    } else {
+        content
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
index 89fe2901c0..2ecacf335b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
@@ -16,12 +16,12 @@
 
 package org.matrix.android.sdk.internal.session.room.membership
 
+import io.realm.Realm
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.internal.session.events.getFixedRoomMemberContent
 import org.matrix.android.sdk.internal.session.user.UserEntityFactory
-import io.realm.Realm
 import javax.inject.Inject
 
 internal class RoomMemberEventHandler @Inject constructor() {
@@ -31,7 +31,7 @@ internal class RoomMemberEventHandler @Inject constructor() {
             return false
         }
         val userId = event.stateKey ?: return false
-        val roomMember = event.content.toModel<RoomMemberContent>()
+        val roomMember = event.getFixedRoomMemberContent()
         return handle(realm, roomId, userId, roomMember)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index e938d54903..3ea32b3bb4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -49,6 +49,7 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.extensions.clearWith
+import org.matrix.android.sdk.internal.session.events.getFixedRoomMemberContent
 import org.matrix.android.sdk.internal.session.initsync.ProgressReporter
 import org.matrix.android.sdk.internal.session.initsync.mapWithProgress
 import org.matrix.android.sdk.internal.session.initsync.reportSubtask
@@ -464,18 +465,4 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
             }
         }
     }
-
-    private fun Event.getFixedRoomMemberContent(): RoomMemberContent? {
-        val content = content.toModel<RoomMemberContent>()
-        // if user is leaving, we should grab his last name and avatar from prevContent
-        return if (content?.membership?.isLeft() == true) {
-            val prevContent = resolvedPrevContent().toModel<RoomMemberContent>()
-            content.copy(
-                    displayName = prevContent?.displayName,
-                    avatarUrl = prevContent?.avatarUrl
-            )
-        } else {
-            content
-        }
-    }
 }

From 15a463d748215d346c1426d20779ba8c4c9b1ca1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Apr 2021 18:12:13 +0200
Subject: [PATCH 511/578] Small rework

---
 .../session/room/RoomAvatarResolver.kt        | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
index 9bcb1eb196..0de8d6347a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
@@ -17,10 +17,11 @@
 package org.matrix.android.sdk.internal.session.room
 
 import io.realm.Realm
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.RoomAvatarContent
-import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
@@ -39,24 +40,29 @@ internal class RoomAvatarResolver @Inject constructor(@UserId private val userId
      * @return the room avatar url, can be a fallback to a room member avatar or null
      */
     fun resolve(realm: Realm, roomId: String): String? {
-        var res: String?
-        val roomName = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_AVATAR, stateKey = "")?.root
-        res = ContentMapper.map(roomName?.content).toModel<RoomAvatarContent>()?.avatarUrl
-        if (!res.isNullOrEmpty()) {
-            return res
+        val roomName = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_AVATAR, stateKey = "")
+                ?.root
+                ?.asDomain()
+                ?.content
+                ?.toModel<RoomAvatarContent>()
+                ?.avatarUrl
+        if (!roomName.isNullOrEmpty()) {
+            return roomName
         }
         val roomMembers = RoomMemberHelper(realm, roomId)
         val members = roomMembers.queryActiveRoomMembersEvent().findAll()
         // detect if it is a room with no more than 2 members (i.e. an alone or a 1:1 chat)
-        val isDirectRoom = RoomSummaryEntity.where(realm, roomId).findFirst()?.isDirect ?: false
+        val isDirectRoom = RoomSummaryEntity.where(realm, roomId).findFirst()?.isDirect.orFalse()
+
         if (isDirectRoom) {
             if (members.size == 1) {
-                res = members.firstOrNull()?.avatarUrl
+                return members.firstOrNull()?.avatarUrl
             } else if (members.size == 2) {
                 val firstOtherMember = members.where().notEqualTo(RoomMemberSummaryEntityFields.USER_ID, userId).findFirst()
-                res = firstOtherMember?.avatarUrl
+                return firstOtherMember?.avatarUrl
             }
         }
-        return res
+
+        return null
     }
 }

From 5dc28c0564e0f672e7517c0774143f67c29f2e95 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Apr 2021 18:20:12 +0200
Subject: [PATCH 512/578] Fix avatar for DM when other user has left

---
 .../sdk/internal/session/room/RoomAvatarResolver.kt       | 8 +++++++-
 .../session/room/membership/RoomDisplayNameResolver.kt    | 3 +--
 .../internal/session/room/membership/RoomMemberHelper.kt  | 5 +++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
index 0de8d6347a..60ad83ee05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
@@ -56,7 +56,13 @@ internal class RoomAvatarResolver @Inject constructor(@UserId private val userId
 
         if (isDirectRoom) {
             if (members.size == 1) {
-                return members.firstOrNull()?.avatarUrl
+                // Use avatar of a left user
+                val firstLeftAvatarUrl = roomMembers.queryLeftRoomMembersEvent()
+                        .findAll()
+                        .firstOrNull { !it.avatarUrl.isNullOrEmpty() }
+                        ?.avatarUrl
+
+                return firstLeftAvatarUrl ?: members.firstOrNull()?.avatarUrl
             } else if (members.size == 2) {
                 val firstOtherMember = members.where().notEqualTo(RoomMemberSummaryEntityFields.USER_ID, userId).findFirst()
                 return firstOtherMember?.avatarUrl
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 2785ffe4cb..194134f45d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -107,9 +107,8 @@ internal class RoomDisplayNameResolver @Inject constructor(
             name = when (otherMembersCount) {
                 0    -> {
                     // Get left members if any
-                    val leftMembersNames = roomMembers.queryRoomMembersEvent()
+                    val leftMembersNames = roomMembers.queryLeftRoomMembersEvent()
                             .findAll()
-                            .filter { it.membership == Membership.LEAVE }
                             .map { it.getBestName() }
                     roomDisplayNameFallbackProvider.getNameForEmptyRoom(roomSummary?.isDirect.orFalse(), leftMembersNames)
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
index 2a7c46bd42..9ce8db25a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
@@ -75,6 +75,11 @@ internal class RoomMemberHelper(private val realm: Realm,
                 .equalTo(RoomMemberSummaryEntityFields.MEMBERSHIP_STR, Membership.INVITE.name)
     }
 
+    fun queryLeftRoomMembersEvent(): RealmQuery<RoomMemberSummaryEntity> {
+        return queryRoomMembersEvent()
+                .equalTo(RoomMemberSummaryEntityFields.MEMBERSHIP_STR, Membership.LEAVE.name)
+    }
+
     fun queryActiveRoomMembersEvent(): RealmQuery<RoomMemberSummaryEntity> {
         return queryRoomMembersEvent()
                 .beginGroup()

From 33c1da5aa1c00495d3f901cce287439161be5bff Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 6 Apr 2021 14:15:05 +0200
Subject: [PATCH 513/578] Fix copyright

---
 .../sdk/api/session/room/UpdatableFilterLivePageResult.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt
index 38462d5ac6..71b3c665e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From e3cd91610524ab49e4592f66f70110156979c182 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Apr 2021 16:25:16 +0200
Subject: [PATCH 514/578] Fix mandatory parameter in API (#3065)

---
 CHANGES.md                                          |  1 +
 .../android/sdk/internal/session/room/RoomAPI.kt    |  8 ++++++++
 .../session/room/read/SetReadMarkersTask.kt         | 13 ++++++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f9b05a32a7..a6f4c7e287 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@ Bugfix 🐛:
  - Handle encrypted reactions (#2509)
  - Disable URL preview for some domains (#2995)
  - Fix avatar rendering for DMs, after initial sync (#2693)
+ - Fix mandatory parameter in API (#3065)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index ad699af6f4..6fee630510 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -153,6 +153,14 @@ internal interface RoomAPI {
     suspend fun sendReadMarker(@Path("roomId") roomId: String,
                                @Body markers: Map<String, String>)
 
+    /**
+     * Send receipt to a room
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/receipt/{receiptType}/{eventId}")
+    suspend fun sendReceipt(@Path("roomId") roomId: String,
+                            @Path("receiptType") receiptType: String,
+                            @Path("eventId") eventId: String)
+
     /**
      * Invite a user to the given room.
      * Ref: https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-rooms-roomid-invite
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index 35dc6a4f0c..e4147d55b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -62,7 +62,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
 ) : SetReadMarkersTask {
 
     override suspend fun execute(params: SetReadMarkersTask.Params) {
-        val markers = HashMap<String, String>()
+        val markers = mutableMapOf<String, String>()
         Timber.v("Execute set read marker with params: $params")
         val latestSyncedEventId = latestSyncedEventId(params.roomId)
         val fullyReadEventId = if (params.forceReadMarker) {
@@ -100,7 +100,14 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
                     globalErrorReceiver,
                     canRetry = true
             ) {
-                roomAPI.sendReadMarker(params.roomId, markers)
+                if (markers[READ_MARKER] == null) {
+                    if (readReceiptEventId != null) {
+                        roomAPI.sendReceipt(params.roomId, READ_RECEIPT, readReceiptEventId)
+                    }
+                } else {
+                    // "m.fully_read" value is mandatory to make this call
+                    roomAPI.sendReadMarker(params.roomId, markers)
+                }
             }
         }
     }
@@ -110,7 +117,7 @@ internal class DefaultSetReadMarkersTask @Inject constructor(
                 TimelineEventEntity.latestEvent(realm, roomId = roomId, includesSending = false)?.eventId
             }
 
-    private suspend fun updateDatabase(roomId: String, markers: HashMap<String, String>, shouldUpdateRoomSummary: Boolean) {
+    private suspend fun updateDatabase(roomId: String, markers: Map<String, String>, shouldUpdateRoomSummary: Boolean) {
         monarchy.awaitTransaction { realm ->
             val readMarkerId = markers[READ_MARKER]
             val readReceiptId = markers[READ_RECEIPT]

From 62038e8a898d351064623bc7677bf275d05f66c1 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Tue, 6 Apr 2021 20:50:43 +0200
Subject: [PATCH 515/578] propagate jitsi LIBRE_BUILD exclusion rules to not
 pull in gms libs

Previously jitsi only had optional dependencies being disabled by the
LIBRE build flag but a while ago they introduced optional exclusion
rules which don't transitively propagate to consumers of the library, so
instead we need to mirror the exclusion rules from the jitsi gradle file:
See: https://github.com/jitsi/jitsi-meet/blob/7a64bf006ea027b77564d8847570e1ac46ff0ec0/android/sdk/build.gradle#L53

Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
---
 vector/build.gradle | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 3ee11450cc..d5a105d893 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -442,7 +442,11 @@ dependencies {
     implementation('com.facebook.react:react-native-webrtc:1.87.3-jitsi-6624067@aar')
 
     // Jitsi
-    implementation('org.jitsi.react:jitsi-meet-sdk:3.1.0')
+    implementation('org.jitsi.react:jitsi-meet-sdk:3.1.0') {
+       exclude group: 'com.google.firebase'
+       exclude group: 'com.google.android.gms'
+       exclude group: 'com.android.installreferrer'
+    }
 
     // QR-code
     // Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170

From 28897f76792301e242aa9050efaf9dc31f071589 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Tue, 6 Apr 2021 20:56:39 +0200
Subject: [PATCH 516/578] changes

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f9b05a32a7..9a65297beb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,7 +31,7 @@ SDK API changes ⚠️:
  - Removes filtering options on Timeline.
 
 Build 🧱:
- -
+ - Properly exclude gms dependencies in fdroid build flavour which were pulled in through the jitsi SDK (#3125)
 
 Test:
  -

From 3a81521eabf75565a516f46b0ec0d9e2194c0213 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 10:55:43 +0200
Subject: [PATCH 517/578] Restore previous log when a request fails

---
 .../org/matrix/android/sdk/internal/network/Request.kt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index d9f102c7e0..e39bce6c67 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -55,9 +55,13 @@ internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErr
                 else                          -> throwable
             }
 
-            // Log some details about the request which has failed. This is less useful than before...
-            // Timber.e("Exception when executing request ${apiCall.request().method} ${apiCall.request().url.toString().substringBefore("?")}")
-            Timber.e("Exception when executing request")
+            // Log some details about the request which has failed.
+            val request = (throwable as? HttpException)?.response()?.raw()?.request
+            if (request == null) {
+                Timber.e("Exception when executing request")
+            } else {
+                Timber.e("Exception when executing request ${request.method} ${request.url.toString().substringBefore("?")}")
+            }
 
             // Check if this is a certificateException
             CertUtil.getCertificateException(exception)

From c459c4f90cc45a3bd51ca35e23e15034e6de2207 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 10:59:41 +0200
Subject: [PATCH 518/578] Change snow chat effect message type from
 "nic.custom.snow" to "io.element.effect.snowfall"

---
 .../android/sdk/api/session/room/model/message/MessageType.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
index a2b4e135d1..c96a800ee5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
@@ -35,5 +35,5 @@ object MessageType {
     const val MSGTYPE_STICKER_LOCAL = "org.matrix.android.sdk.sticker"
 
     const val MSGTYPE_CONFETTI = "nic.custom.confetti"
-    const val MSGTYPE_SNOW = "nic.custom.snow"
+    const val MSGTYPE_SNOW = "io.element.effect.snowfall"
 }

From 2495fa49f393f1dbeb7dbd3e4315f0af35900cb8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 12:39:36 +0200
Subject: [PATCH 519/578] Improve code clarity

---
 .../session/room/timeline/DefaultTimeline.kt  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 1ed142ce23..e230599f8f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -386,14 +386,14 @@ internal class DefaultTimeline(
 
     private fun getState(direction: Timeline.Direction): TimelineState {
         return when (direction) {
-            Timeline.Direction.FORWARDS -> forwardsState.get()
+            Timeline.Direction.FORWARDS  -> forwardsState.get()
             Timeline.Direction.BACKWARDS -> backwardsState.get()
         }
     }
 
     private fun updateState(direction: Timeline.Direction, update: (TimelineState) -> TimelineState) {
         val stateReference = when (direction) {
-            Timeline.Direction.FORWARDS -> forwardsState
+            Timeline.Direction.FORWARDS  -> forwardsState
             Timeline.Direction.BACKWARDS -> backwardsState
         }
         val currentValue = stateReference.get()
@@ -604,12 +604,14 @@ internal class DefaultTimeline(
         return offsetResults.size
     }
 
-    private fun buildTimelineEvent(eventEntity: TimelineEventEntity) = timelineEventMapper.map(
-            timelineEventEntity = eventEntity,
-            buildReadReceipts = settings.buildReadReceipts
-    ).let {
-        // eventually enhance with ui echo?
-        (uiEchoManager.decorateEventWithReactionUiEcho(it) ?: it)
+    private fun buildTimelineEvent(eventEntity: TimelineEventEntity): TimelineEvent {
+        return timelineEventMapper.map(
+                timelineEventEntity = eventEntity,
+                buildReadReceipts = settings.buildReadReceipts
+        ).let { timelineEvent ->
+            // eventually enhance with ui echo?
+            uiEchoManager.decorateEventWithReactionUiEcho(timelineEvent) ?: timelineEvent
+        }
     }
 
     /**
@@ -702,10 +704,10 @@ internal class DefaultTimeline(
         return object : MatrixCallback<TokenChunkEventPersistor.Result> {
             override fun onSuccess(data: TokenChunkEventPersistor.Result) {
                 when (data) {
-                    TokenChunkEventPersistor.Result.SUCCESS -> {
+                    TokenChunkEventPersistor.Result.SUCCESS           -> {
                         Timber.v("Success fetching $limit items $direction from pagination request")
                     }
-                    TokenChunkEventPersistor.Result.REACHED_END -> {
+                    TokenChunkEventPersistor.Result.REACHED_END       -> {
                         postSnapshot()
                     }
                     TokenChunkEventPersistor.Result.SHOULD_FETCH_MORE ->

From 511a0c22e245e1431dc0f2f5690538621be437a1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 13:45:43 +0200
Subject: [PATCH 520/578] Protect calls to FileService.downloadFile()

---
 .../home/room/detail/RoomDetailFragment.kt    | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index b2e7004d0f..b7e2e189d3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1675,10 +1675,12 @@ class RoomDetailFragment @Inject constructor(
             shareText(requireContext(), action.messageContent.body)
         } else if (action.messageContent is MessageWithAttachmentContent) {
             lifecycleScope.launch {
-                val data = session.fileService().downloadFile(messageContent = action.messageContent)
-                if (isAdded) {
-                    shareMedia(requireContext(), data, getMimeTypeFromUri(requireContext(), data.toUri()))
-                }
+                val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
+                if (!isAdded) return@launch
+                result.fold(
+                        { shareMedia(requireContext(), it, getMimeTypeFromUri(requireContext(), it.toUri())) },
+                        { showErrorInSnackbar(it) }
+                )
             }
         }
     }
@@ -1701,16 +1703,22 @@ class RoomDetailFragment @Inject constructor(
             return
         }
         lifecycleScope.launch {
-            val data = session.fileService().downloadFile(messageContent = action.messageContent)
-            if (isAdded) {
-                saveMedia(
-                        context = requireContext(),
-                        file = data,
-                        title = action.messageContent.body,
-                        mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), data.toUri()),
-                        notificationUtils = notificationUtils
-                )
-            }
+            val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
+            if (!isAdded) return@launch
+            result.fold(
+                    {
+                        saveMedia(
+                                context = requireContext(),
+                                file = it,
+                                title = action.messageContent.body,
+                                mediaMimeType = action.messageContent.mimeType ?: getMimeTypeFromUri(requireContext(), it.toUri()),
+                                notificationUtils = notificationUtils
+                        )
+                    },
+                    {
+                        showErrorInSnackbar(it)
+                    }
+            )
         }
     }
 

From 884358b374702597cf2111ab5788479fd0b408c5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 13:47:20 +0200
Subject: [PATCH 521/578] Small cleanup

---
 .../roomprofile/uploads/RoomUploadsViewModel.kt    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
index bae4847f7e..1d6b056816 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@@ -127,25 +127,27 @@ class RoomUploadsViewModel @AssistedInject constructor(
 
     private fun handleShare(action: RoomUploadsAction.Share) {
         viewModelScope.launch {
-            try {
+            val event = try {
                 val file = session.fileService().downloadFile(
                         messageContent = action.uploadEvent.contentWithAttachmentContent)
-                _viewEvents.post(RoomUploadsViewEvents.FileReadyForSharing(file))
+                RoomUploadsViewEvents.FileReadyForSharing(file)
             } catch (failure: Throwable) {
-                _viewEvents.post(RoomUploadsViewEvents.Failure(failure))
+                RoomUploadsViewEvents.Failure(failure)
             }
+            _viewEvents.post(event)
         }
     }
 
     private fun handleDownload(action: RoomUploadsAction.Download) {
         viewModelScope.launch {
-            try {
+            val event = try {
                 val file = session.fileService().downloadFile(
                         messageContent = action.uploadEvent.contentWithAttachmentContent)
-                _viewEvents.post(RoomUploadsViewEvents.FileReadyForSaving(file, action.uploadEvent.contentWithAttachmentContent.body))
+                RoomUploadsViewEvents.FileReadyForSaving(file, action.uploadEvent.contentWithAttachmentContent.body)
             } catch (failure: Throwable) {
-                _viewEvents.post(RoomUploadsViewEvents.Failure(failure))
+                RoomUploadsViewEvents.Failure(failure)
             }
+            _viewEvents.post(event)
         }
     }
 }

From b8d01c4577ecaa30dd7ad82c05b89744dd06ea68 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 14:08:43 +0200
Subject: [PATCH 522/578] Fix quick click action (#3127)

---
 CHANGES.md                                                 | 1 +
 .../main/java/im/vector/app/core/utils/FirstThrottler.kt   | 4 +++-
 .../features/settings/VectorSettingsHelpAboutFragment.kt   | 7 ++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4802f1bb12..c07d23fe9f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ Improvements 🙌:
  - Improve timeline filtering (dissociate membership and profile events, display hidden events when highlighted, fix hidden item/read receipts behavior)
  - Add better support for empty room name fallback (#3106)
  - Room list improvements (paging)
+ - Fix quick click action (#3127)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
diff --git a/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt b/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
index 915e955fa6..3d52ca99db 100644
--- a/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.core.utils
 
+import android.os.SystemClock
+
 /**
  * Simple ThrottleFirst
  * See https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.png
@@ -23,7 +25,7 @@ class FirstThrottler(private val minimumInterval: Long = 800) {
     private var lastDate = 0L
 
     fun canHandle(): Boolean {
-        val now = System.currentTimeMillis()
+        val now = SystemClock.elapsedRealtime()
         if (now > lastDate + minimumInterval) {
             lastDate = now
             return true
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
index c9160b8ebc..17c5cad1c2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -20,6 +20,7 @@ import androidx.preference.Preference
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.utils.FirstThrottler
 import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.displayInWebView
 import im.vector.app.core.utils.openAppSettingsPage
@@ -36,6 +37,8 @@ class VectorSettingsHelpAboutFragment @Inject constructor(
     override var titleRes = R.string.preference_root_help_about
     override val preferenceXmlRes = R.xml.vector_settings_help_about
 
+    private val firstThrottler = FirstThrottler(1000)
+
     override fun bindPref() {
         // preference to start the App info screen, to facilitate App permissions access
         findPreference<VectorPreference>(APP_INFO_LINK_PREFERENCE_KEY)!!
@@ -98,7 +101,9 @@ class VectorSettingsHelpAboutFragment @Inject constructor(
         // third party notice
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY)!!
                 .onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            activity?.displayInWebView(VectorSettingsUrls.THIRD_PARTY_LICENSES)
+            if (firstThrottler.canHandle()) {
+                activity?.displayInWebView(VectorSettingsUrls.THIRD_PARTY_LICENSES)
+            }
             false
         }
 

From 1ac17b3aee69ed5f17e6e51aa51532a6072227e3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 14:34:06 +0200
Subject: [PATCH 523/578] Exclude instruction from try catch block

---
 .../im/vector/app/features/MainActivity.kt    | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index e6c5abe20c..fd032c1d35 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -161,25 +161,22 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
                 lifecycleScope.launch {
                     try {
                         session.signOut(!args.isUserLoggedOut)
-                        Timber.w("SIGN_OUT: success, start app")
-                        sessionHolder.clearActiveSession()
-                        doLocalCleanup(clearPreferences = true)
-                        startNextActivityAndFinish()
                     } catch (failure: Throwable) {
                         displayError(failure)
+                        return@launch
                     }
+                    Timber.w("SIGN_OUT: success, start app")
+                    sessionHolder.clearActiveSession()
+                    doLocalCleanup(clearPreferences = true)
+                    startNextActivityAndFinish()
                 }
             }
             args.clearCache           -> {
                 lifecycleScope.launch {
-                    try {
-                        session.clearCache()
-                        doLocalCleanup(clearPreferences = false)
-                        session.startSyncing(applicationContext)
-                        startNextActivityAndFinish()
-                    } catch (failure: Throwable) {
-                        displayError(failure)
-                    }
+                    session.clearCache()
+                    doLocalCleanup(clearPreferences = false)
+                    session.startSyncing(applicationContext)
+                    startNextActivityAndFinish()
                 }
             }
         }

From 835eb95aa15b9bc76e5614d370d70876ed3d20ee Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 14:52:27 +0200
Subject: [PATCH 524/578] If signout request fails, do not start LoginActivity,
 but restart the app (#3099)

---
 CHANGES.md                                                  | 1 +
 vector/src/main/java/im/vector/app/features/MainActivity.kt | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c07d23fe9f..13385123e6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ Bugfix 🐛:
  - Disable URL preview for some domains (#2995)
  - Fix avatar rendering for DMs, after initial sync (#2693)
  - Fix mandatory parameter in API (#3065)
+ - If signout request fails, do not start LoginActivity, but restart the app (#3099)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index fd032c1d35..34e73c8702 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -212,15 +212,16 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
                     .setTitle(R.string.dialog_title_error)
                     .setMessage(errorFormatter.toHumanReadable(failure))
                     .setPositiveButton(R.string.global_retry) { _, _ -> doCleanUp() }
-                    .setNegativeButton(R.string.cancel) { _, _ -> startNextActivityAndFinish() }
+                    .setNegativeButton(R.string.cancel) { _, _ -> startNextActivityAndFinish(ignoreClearCredentials = true) }
                     .setCancelable(false)
                     .show()
         }
     }
 
-    private fun startNextActivityAndFinish() {
+    private fun startNextActivityAndFinish(ignoreClearCredentials: Boolean = false) {
         val intent = when {
             args.clearCredentials
+                    && !ignoreClearCredentials
                     && (!args.isUserLoggedOut || args.isAccountDeactivated) ->
                 // User has explicitly asked to log out or deactivated his account
                 LoginActivity.newIntent(this, null)

From 15c51cad1788ca3939d98f87dc9db9ff284c6188 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 15:17:02 +0200
Subject: [PATCH 525/578] Improve interface, name are not nullable

---
 .../sdk/common/TestRoomDisplayNameFallbackProvider.kt     | 8 ++++----
 .../android/sdk/api/RoomDisplayNameFallbackProvider.kt    | 8 ++++----
 .../session/room/membership/RoomDisplayNameResolver.kt    | 5 ++---
 .../room/VectorRoomDisplayNameFallbackProvider.kt         | 8 ++++----
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
index c98bca42b9..3f440a7d7b 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
@@ -26,15 +26,15 @@ class TestRoomDisplayNameFallbackProvider : RoomDisplayNameFallbackProvider {
     override fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>) =
             "Empty room"
 
-    override fun getNameFor2members(name1: String?, name2: String?) =
+    override fun getNameFor2members(name1: String, name2: String) =
             "$name1 and $name2"
 
-    override fun getNameFor3members(name1: String?, name2: String?, name3: String?) =
+    override fun getNameFor3members(name1: String, name2: String, name3: String) =
             "$name1, $name2 and $name3"
 
-    override fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?) =
+    override fun getNameFor4members(name1: String, name2: String, name3: String, name4: String) =
             "$name1, $name2, $name3 and $name4"
 
-    override fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int) =
+    override fun getNameFor4membersAndMore(name1: String, name2: String, name3: String, remainingCount: Int) =
             "$name1, $name2, $name3 and $remainingCount others"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
index b16d29c997..6028bc837d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
@@ -19,8 +19,8 @@ package org.matrix.android.sdk.api
 interface RoomDisplayNameFallbackProvider {
     fun getNameForRoomInvite(): String
     fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>): String
-    fun getNameFor2members(name1: String?, name2: String?): String
-    fun getNameFor3members(name1: String?, name2: String?, name3: String?): String
-    fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?): String
-    fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int): String
+    fun getNameFor2members(name1: String, name2: String): String
+    fun getNameFor3members(name1: String, name2: String, name3: String): String
+    fun getNameFor4members(name1: String, name2: String, name3: String, name4: String): String
+    fun getNameFor4membersAndMore(name1: String, name2: String, name3: String, remainingCount: Int): String
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 194134f45d..219ef694a4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -149,9 +149,8 @@ internal class RoomDisplayNameResolver @Inject constructor(
     }
 
     /** See [org.matrix.android.sdk.api.session.room.sender.SenderInfo.disambiguatedDisplayName] */
-    private fun resolveRoomMemberName(roomMemberSummary: RoomMemberSummaryEntity?,
-                                      roomMemberHelper: RoomMemberHelper): String? {
-        if (roomMemberSummary == null) return null
+    private fun resolveRoomMemberName(roomMemberSummary: RoomMemberSummaryEntity,
+                                      roomMemberHelper: RoomMemberHelper): String {
         val isUnique = roomMemberHelper.isUniqueDisplayName(roomMemberSummary.displayName)
         return if (isUnique) {
             roomMemberSummary.getBestName()
diff --git a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
index fe1d4e0f2f..57257dd597 100644
--- a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
@@ -36,19 +36,19 @@ class VectorRoomDisplayNameFallbackProvider(
         }
     }
 
-    override fun getNameFor2members(name1: String?, name2: String?): String {
+    override fun getNameFor2members(name1: String, name2: String): String {
         return context.getString(R.string.room_displayname_two_members, name1, name2)
     }
 
-    override fun getNameFor3members(name1: String?, name2: String?, name3: String?): String {
+    override fun getNameFor3members(name1: String, name2: String, name3: String): String {
         return context.getString(R.string.room_displayname_3_members, name1, name2, name3)
     }
 
-    override fun getNameFor4members(name1: String?, name2: String?, name3: String?, name4: String?): String {
+    override fun getNameFor4members(name1: String, name2: String, name3: String, name4: String): String {
         return context.getString(R.string.room_displayname_4_members, name1, name2, name3, name4)
     }
 
-    override fun getNameFor4membersAndMore(name1: String?, name2: String?, name3: String?, remainingCount: Int): String {
+    override fun getNameFor4membersAndMore(name1: String, name2: String, name3: String, remainingCount: Int): String {
         return context.resources.getQuantityString(
                 R.plurals.room_displayname_four_and_more_members,
                 remainingCount,

From 923715aeb313edfdd075640a593a87b4853e8584 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 15:19:33 +0200
Subject: [PATCH 526/578] Add method for name fallback when there is only one
 member

---
 .../sdk/common/TestRoomDisplayNameFallbackProvider.kt       | 3 +++
 .../android/sdk/api/RoomDisplayNameFallbackProvider.kt      | 1 +
 .../session/room/membership/RoomDisplayNameResolver.kt      | 6 +++++-
 .../features/room/VectorRoomDisplayNameFallbackProvider.kt  | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
index 3f440a7d7b..af2d57f9ce 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestRoomDisplayNameFallbackProvider.kt
@@ -26,6 +26,9 @@ class TestRoomDisplayNameFallbackProvider : RoomDisplayNameFallbackProvider {
     override fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>) =
             "Empty room"
 
+    override fun getNameFor1member(name: String) =
+            name
+
     override fun getNameFor2members(name1: String, name2: String) =
             "$name1 and $name2"
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
index 6028bc837d..a34dbcc196 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/RoomDisplayNameFallbackProvider.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.api
 interface RoomDisplayNameFallbackProvider {
     fun getNameForRoomInvite(): String
     fun getNameForEmptyRoom(isDirect: Boolean, leftMemberNames: List<String>): String
+    fun getNameFor1member(name: String): String
     fun getNameFor2members(name1: String, name2: String): String
     fun getNameFor3members(name1: String, name2: String, name3: String): String
     fun getNameFor4members(name1: String, name2: String, name3: String, name4: String): String
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 219ef694a4..3aa812d93d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -112,7 +112,11 @@ internal class RoomDisplayNameResolver @Inject constructor(
                             .map { it.getBestName() }
                     roomDisplayNameFallbackProvider.getNameForEmptyRoom(roomSummary?.isDirect.orFalse(), leftMembersNames)
                 }
-                1    -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
+                1    -> {
+                    roomDisplayNameFallbackProvider.getNameFor1member(
+                            resolveRoomMemberName(otherMembersSubset[0], roomMembers)
+                    )
+                }
                 2    -> {
                     roomDisplayNameFallbackProvider.getNameFor2members(
                             resolveRoomMemberName(otherMembersSubset[0], roomMembers),
diff --git a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
index 57257dd597..a5f1ff58d6 100644
--- a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
@@ -36,6 +36,8 @@ class VectorRoomDisplayNameFallbackProvider(
         }
     }
 
+    override fun getNameFor1member(name: String) = name
+
     override fun getNameFor2members(name1: String, name2: String): String {
         return context.getString(R.string.room_displayname_two_members, name1, name2)
     }

From e811c53c44d9b108e0a062c3498b952677a79427 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 15:24:00 +0200
Subject: [PATCH 527/578] Improve "was" fallback for Empty rooms.

---
 .../room/VectorRoomDisplayNameFallbackProvider.kt        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
index a5f1ff58d6..33e63434ce 100644
--- a/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/room/VectorRoomDisplayNameFallbackProvider.kt
@@ -32,7 +32,14 @@ class VectorRoomDisplayNameFallbackProvider(
         return if (leftMemberNames.isEmpty()) {
             context.getString(R.string.room_displayname_empty_room)
         } else {
-            context.getString(R.string.room_displayname_empty_room_was, leftMemberNames.joinToString())
+            val was = when (val size = leftMemberNames.size) {
+                1    -> getNameFor1member(leftMemberNames[0])
+                2    -> getNameFor2members(leftMemberNames[0], leftMemberNames[1])
+                3    -> getNameFor3members(leftMemberNames[0], leftMemberNames[1], leftMemberNames[2])
+                4    -> getNameFor4members(leftMemberNames[0], leftMemberNames[1], leftMemberNames[2], leftMemberNames[3])
+                else -> getNameFor4membersAndMore(leftMemberNames[0], leftMemberNames[1], leftMemberNames[2], size - 3)
+            }
+            context.getString(R.string.room_displayname_empty_room_was, was)
         }
     }
 

From af023669baded41cc3d21a5e76be832a04675008 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 24 Mar 2021 12:09:06 +0100
Subject: [PATCH 528/578] Implement FirstThrottler, to gain 200 ms for first
 refresh

---
 .../im/vector/app/core/extensions/LiveData.kt |  2 +-
 .../vector/app/core/utils/FirstThrottler.kt   | 21 +++++++++++++++----
 .../NotificationDrawerManager.kt              | 10 +++++++--
 .../VectorSettingsHelpAboutFragment.kt        |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/LiveData.kt b/vector/src/main/java/im/vector/app/core/extensions/LiveData.kt
index 588063e2a4..5a6599acff 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/LiveData.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/LiveData.kt
@@ -39,7 +39,7 @@ inline fun <T> LiveData<LiveEvent<T>>.observeEventFirstThrottle(owner: Lifecycle
     val firstThrottler = FirstThrottler(minimumInterval)
 
     this.observe(owner, EventObserver {
-        if (firstThrottler.canHandle()) {
+        if (firstThrottler.canHandle() is FirstThrottler.CanHandlerResult.Yes) {
             it.run(observer)
         }
     })
diff --git a/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt b/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
index 3d52ca99db..004f500c4e 100644
--- a/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt
@@ -24,14 +24,27 @@ import android.os.SystemClock
 class FirstThrottler(private val minimumInterval: Long = 800) {
     private var lastDate = 0L
 
-    fun canHandle(): Boolean {
+    sealed class CanHandlerResult {
+        object Yes : CanHandlerResult()
+        data class No(val shouldWaitMillis: Long) : CanHandlerResult()
+
+        fun waitMillis(): Long {
+            return when (this) {
+                Yes   -> 0
+                is No -> shouldWaitMillis
+            }
+        }
+    }
+
+    fun canHandle(): CanHandlerResult {
         val now = SystemClock.elapsedRealtime()
-        if (now > lastDate + minimumInterval) {
+        val delaySinceLast = now - lastDate
+        if (delaySinceLast > minimumInterval) {
             lastDate = now
-            return true
+            return CanHandlerResult.Yes
         }
 
         // Too soon
-        return false
+        return CanHandlerResult.No(minimumInterval - delaySinceLast)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 7f3c0a5beb..36b69a7958 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -26,6 +26,7 @@ import im.vector.app.ActiveSessionDataSource
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.FirstThrottler
 import im.vector.app.features.settings.VectorPreferences
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.Session
@@ -194,10 +195,14 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
         notificationUtils.cancelNotificationMessage(roomId, ROOM_INVITATION_NOTIFICATION_ID)
     }
 
+    private var firstThrottler = FirstThrottler(200)
+
     fun refreshNotificationDrawer() {
         // Implement last throttler
-        Timber.v("refreshNotificationDrawer()")
+        val canHandle = firstThrottler.canHandle()
+        Timber.v("refreshNotificationDrawer(), delay: ${canHandle.waitMillis()} ms")
         backgroundHandler.removeCallbacksAndMessages(null)
+
         backgroundHandler.postDelayed(
                 {
                     try {
@@ -206,7 +211,8 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
                         // It can happen if for instance session has been destroyed. It's a bit ugly to try catch like this, but it's safer
                         Timber.w(throwable, "refreshNotificationDrawerBg failure")
                     }
-                }, 200)
+                },
+                canHandle.waitMillis())
     }
 
     @WorkerThread
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
index 17c5cad1c2..03b7c16274 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -101,7 +101,7 @@ class VectorSettingsHelpAboutFragment @Inject constructor(
         // third party notice
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY)!!
                 .onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            if (firstThrottler.canHandle()) {
+            if (firstThrottler.canHandle() is FirstThrottler.CanHandlerResult.Yes) {
                 activity?.displayInWebView(VectorSettingsUrls.THIRD_PARTY_LICENSES)
             }
             false

From 96153fe92a3e865ecdb8164609ddd0400fcb36ef Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 24 Mar 2021 18:48:25 +0100
Subject: [PATCH 529/578] Get Event after a Push for a faster notification
 display in some conditions

---
 CHANGES.md                                    |  1 +
 .../matrix/android/sdk/api/session/Session.kt |  2 +
 .../sdk/api/session/events/EventService.kt    | 28 ++++++++++
 .../internal/database/query/ReadQueries.kt    | 23 ++++----
 .../sdk/internal/session/DefaultSession.kt    |  3 ++
 .../sdk/internal/session/SessionModule.kt     |  7 ++-
 .../session/call/CallEventProcessor.kt        | 13 ++++-
 .../session/call/CallSignalingHandler.kt      | 20 ++++---
 .../session/events/DefaultEventService.kt     | 40 ++++++++++++++
 .../sdk/internal/session/room/RoomModule.kt   |  5 ++
 .../session/room/timeline/GetEventTask.kt     | 43 +++++++++++----
 .../fcm/VectorFirebaseMessagingService.kt     | 54 ++++++++++++++++---
 .../notifications/NotifiableEventResolver.kt  | 30 +++++++++--
 .../NotificationDrawerManager.kt              |  6 ++-
 14 files changed, 234 insertions(+), 41 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt

diff --git a/CHANGES.md b/CHANGES.md
index 13385123e6..86ba91c9df 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Improvements 🙌:
  - Add better support for empty room name fallback (#3106)
  - Room list improvements (paging)
  - Fix quick click action (#3127)
+ - Get Event after a Push for a faster notification display in some conditions
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 7a24ccac11..a15799d862 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.session.call.CallSignalingService
 import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.EventService
 import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.group.GroupService
@@ -68,6 +69,7 @@ interface Session :
         SignOutService,
         FilterService,
         TermsService,
+        EventService,
         ProfileService,
         PushRuleService,
         PushersService,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
new file mode 100644
index 0000000000..41bc0a1a62
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.events
+
+import org.matrix.android.sdk.api.session.events.model.Event
+
+interface EventService {
+
+    /**
+     * Ask the homeserver for an event content. The SDK will try to decrypt it if it is possible
+     * The result will not be stored into cache
+     */
+    suspend fun getEvent(roomId: String, eventId: String): Event
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
index a3c741ad55..5423025823 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
@@ -38,16 +38,21 @@ internal fun isEventRead(realmConfiguration: RealmConfiguration,
     Realm.getInstance(realmConfiguration).use { realm ->
         val liveChunk = ChunkEntity.findLastForwardChunkOfRoom(realm, roomId) ?: return@use
         val eventToCheck = liveChunk.timelineEvents.find(eventId)
-        isEventRead = if (eventToCheck == null || eventToCheck.root?.sender == userId) {
-            true
-        } else {
-            val readReceipt = ReadReceiptEntity.where(realm, roomId, userId).findFirst()
-                    ?: return@use
-            val readReceiptIndex = liveChunk.timelineEvents.find(readReceipt.eventId)?.displayIndex
-                    ?: Int.MIN_VALUE
-            val eventToCheckIndex = eventToCheck.displayIndex
+        isEventRead = when {
+            eventToCheck == null                -> {
+                // This can happen in case of fast lane Event
+                false
+            }
+            eventToCheck.root?.sender == userId -> true
+            else                                -> {
+                val readReceipt = ReadReceiptEntity.where(realm, roomId, userId).findFirst()
+                        ?: return@use
+                val readReceiptIndex = liveChunk.timelineEvents.find(readReceipt.eventId)?.displayIndex
+                        ?: Int.MIN_VALUE
+                val eventToCheckIndex = eventToCheck.displayIndex
 
-            eventToCheckIndex <= readReceiptIndex
+                eventToCheckIndex <= readReceiptIndex
+            }
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 45fcc5af2d..821a9cba8c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -33,6 +33,7 @@ import org.matrix.android.sdk.api.session.call.CallSignalingService
 import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.session.crypto.CryptoService
+import org.matrix.android.sdk.api.session.events.EventService
 import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.group.GroupService
@@ -114,6 +115,7 @@ internal class DefaultSession @Inject constructor(
         private val accountDataService: Lazy<AccountDataService>,
         private val _sharedSecretStorageService: Lazy<SharedSecretStorageService>,
         private val accountService: Lazy<AccountService>,
+        private val eventService: Lazy<EventService>,
         private val defaultIdentityService: DefaultIdentityService,
         private val integrationManagerService: IntegrationManagerService,
         private val thirdPartyService: Lazy<ThirdPartyService>,
@@ -129,6 +131,7 @@ internal class DefaultSession @Inject constructor(
         FilterService by filterService.get(),
         PushRuleService by pushRuleService.get(),
         PushersService by pushersService.get(),
+        EventService by eventService.get(),
         TermsService by termsService.get(),
         InitialSyncProgressService by initialSyncProgressService.get(),
         SecureStorageService by secureStorageService.get(),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index f10eb67921..e61e4ecd89 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -32,10 +32,11 @@ import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.auth.data.sessionId
 import org.matrix.android.sdk.api.crypto.MXCryptoConfig
-import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
+import org.matrix.android.sdk.api.session.events.EventService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
 import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
@@ -75,6 +76,7 @@ import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
 import org.matrix.android.sdk.internal.network.token.HomeserverAccessTokenProvider
 import org.matrix.android.sdk.internal.session.call.CallEventProcessor
 import org.matrix.android.sdk.internal.session.download.DownloadProgressInterceptor
+import org.matrix.android.sdk.internal.session.events.DefaultEventService
 import org.matrix.android.sdk.internal.session.homeserver.DefaultHomeServerCapabilitiesService
 import org.matrix.android.sdk.internal.session.identity.DefaultIdentityService
 import org.matrix.android.sdk.internal.session.initsync.DefaultInitialSyncProgressService
@@ -357,6 +359,9 @@ internal abstract class SessionModule {
     @Binds
     abstract fun bindAccountDataService(service: DefaultAccountDataService): AccountDataService
 
+    @Binds
+    abstract fun bindEventService(service: DefaultEventService): EventService
+
     @Binds
     abstract fun bindSharedSecretStorageService(service: DefaultSharedSecretStorageService): SharedSecretStorageService
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
index 4887351709..a190ff62ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
@@ -21,9 +21,11 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.internal.database.model.EventInsertType
 import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor
+import org.matrix.android.sdk.internal.session.SessionScope
 import timber.log.Timber
 import javax.inject.Inject
 
+@SessionScope
 internal class CallEventProcessor @Inject constructor(private val callSignalingHandler: CallSignalingHandler)
     : EventInsertLiveProcessor {
 
@@ -51,6 +53,15 @@ internal class CallEventProcessor @Inject constructor(private val callSignalingH
         eventsToPostProcess.add(event)
     }
 
+    fun shouldProcessFastLane(eventType: String): Boolean {
+        return eventType == EventType.CALL_INVITE
+    }
+
+    suspend fun processFastLane(event: Event) {
+        eventsToPostProcess.add(event)
+        onPostProcess()
+    }
+
     override suspend fun onPostProcess() {
         eventsToPostProcess.forEach {
             dispatchToCallSignalingHandlerIfNeeded(it)
@@ -60,7 +71,7 @@ internal class CallEventProcessor @Inject constructor(private val callSignalingH
 
     private fun dispatchToCallSignalingHandlerIfNeeded(event: Event) {
         val now = System.currentTimeMillis()
-        // TODO might check if an invite is not closed (hangup/answsered) in the same event batch?
+        // TODO might check if an invite is not closed (hangup/answered) in the same event batch?
         event.roomId ?: return Unit.also {
             Timber.w("Event with no room id ${event.eventId}")
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
index 7e54301f63..8d7e9e819a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
@@ -56,25 +56,25 @@ internal class CallSignalingHandler @Inject constructor(private val activeCallHa
 
     fun onCallEvent(event: Event) {
         when (event.getClearType()) {
-            EventType.CALL_ANSWER -> {
+            EventType.CALL_ANSWER        -> {
                 handleCallAnswerEvent(event)
             }
-            EventType.CALL_INVITE -> {
+            EventType.CALL_INVITE        -> {
                 handleCallInviteEvent(event)
             }
-            EventType.CALL_HANGUP -> {
+            EventType.CALL_HANGUP        -> {
                 handleCallHangupEvent(event)
             }
-            EventType.CALL_REJECT -> {
+            EventType.CALL_REJECT        -> {
                 handleCallRejectEvent(event)
             }
-            EventType.CALL_CANDIDATES -> {
+            EventType.CALL_CANDIDATES    -> {
                 handleCallCandidatesEvent(event)
             }
             EventType.CALL_SELECT_ANSWER -> {
                 handleCallSelectAnswerEvent(event)
             }
-            EventType.CALL_NEGOTIATE -> {
+            EventType.CALL_NEGOTIATE     -> {
                 handleCallNegotiateEvent(event)
             }
         }
@@ -168,6 +168,14 @@ internal class CallSignalingHandler @Inject constructor(private val activeCallHa
             return
         }
         val content = event.getClearContent().toModel<CallInviteContent>() ?: return
+
+        content.callId ?: return
+        if (activeCallHandler.getCallWithId(content.callId) != null) {
+            // Call is already known, maybe due to fast lane. Ignore
+            Timber.d("Ignoring already known call invite")
+            return
+        }
+
         val incomingCall = mxCallFactory.createIncomingCall(
                 roomId = event.roomId,
                 opponentUserId = event.senderId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt
new file mode 100644
index 0000000000..d7e9ef2ee0
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.events
+
+import org.matrix.android.sdk.api.session.events.EventService
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.session.call.CallEventProcessor
+import org.matrix.android.sdk.internal.session.room.timeline.GetEventTask
+import javax.inject.Inject
+
+internal class DefaultEventService @Inject constructor(
+        private val getEventTask: GetEventTask,
+        private val callEventProcessor: CallEventProcessor
+) : EventService {
+
+    override suspend fun getEvent(roomId: String, eventId: String): Event {
+        val event = getEventTask.execute(GetEventTask.Params(roomId, eventId))
+
+        // Fast lane to the call event processors: try to make the incoming call ring faster
+        if (callEventProcessor.shouldProcessFastLane(event.getClearType())) {
+            callEventProcessor.processFastLane(event)
+        }
+
+        return event
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 66b7272360..5133f72932 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -79,9 +79,11 @@ import org.matrix.android.sdk.internal.session.room.tags.DefaultDeleteTagFromRoo
 import org.matrix.android.sdk.internal.session.room.tags.DeleteTagFromRoomTask
 import org.matrix.android.sdk.internal.session.room.timeline.DefaultFetchTokenAndPaginateTask
 import org.matrix.android.sdk.internal.session.room.timeline.DefaultGetContextOfEventTask
+import org.matrix.android.sdk.internal.session.room.timeline.DefaultGetEventTask
 import org.matrix.android.sdk.internal.session.room.timeline.DefaultPaginationTask
 import org.matrix.android.sdk.internal.session.room.timeline.FetchTokenAndPaginateTask
 import org.matrix.android.sdk.internal.session.room.timeline.GetContextOfEventTask
+import org.matrix.android.sdk.internal.session.room.timeline.GetEventTask
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationTask
 import org.matrix.android.sdk.internal.session.room.typing.DefaultSendTypingTask
 import org.matrix.android.sdk.internal.session.room.typing.SendTypingTask
@@ -228,4 +230,7 @@ internal abstract class RoomModule {
 
     @Binds
     abstract fun bindPeekRoomTask(task: DefaultPeekRoomTask): PeekRoomTask
+
+    @Binds
+    abstract fun bindGetEventTask(task: DefaultGetEventTask): GetEventTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
index a9b8683a28..f1a20e8057 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
@@ -16,28 +16,49 @@
 
 package org.matrix.android.sdk.internal.session.room.timeline
 
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.crypto.EventDecryptor
+import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
-// TODO Add parent task
-
-internal class GetEventTask @Inject constructor(
-        private val roomAPI: RoomAPI,
-        private val globalErrorReceiver: GlobalErrorReceiver
-) : Task<GetEventTask.Params, Event> {
-
-    internal data class Params(
+internal interface GetEventTask : Task<GetEventTask.Params, Event> {
+    data class Params(
             val roomId: String,
-            val eventId: String
+            val eventId: String,
     )
+}
 
-    override suspend fun execute(params: Params): Event {
-        return executeRequest(globalErrorReceiver) {
+internal class DefaultGetEventTask @Inject constructor(
+        private val roomAPI: RoomAPI,
+        private val globalErrorReceiver: GlobalErrorReceiver,
+        private val eventDecryptor: EventDecryptor
+) : GetEventTask {
+
+    override suspend fun execute(params: GetEventTask.Params): Event {
+        val event = executeRequest(globalErrorReceiver) {
             roomAPI.getEvent(params.roomId, params.eventId)
         }
+
+        // Try to decrypt the Event
+        if (event.isEncrypted()) {
+            tryOrNull(message = "Unable to decrypt the event") {
+                eventDecryptor.decryptEvent(event, "")
+            }
+                    ?.let { result ->
+                        event.mxDecryptionResult = OlmDecryptionResult(
+                                payload = result.clearEvent,
+                                senderKey = result.senderCurve25519Key,
+                                keysClaimed = result.claimedEd25519Key?.let { mapOf("ed25519" to it) },
+                                forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                        )
+                    }
+        }
+
+        return event
     }
 }
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 4d2cbecfe4..7f54be56fb 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -40,6 +40,9 @@ import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.notifications.SimpleNotifiableEvent
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.push.fcm.FcmHelper
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.pushrules.Action
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -56,6 +59,8 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
     private lateinit var activeSessionHolder: ActiveSessionHolder
     private lateinit var vectorPreferences: VectorPreferences
 
+    private val coroutineScope = CoroutineScope(SupervisorJob())
+
     // UI handler
     private val mUIHandler by lazy {
         Handler(Looper.getMainLooper())
@@ -78,6 +83,11 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
      * @param message the message
      */
     override fun onMessageReceived(message: RemoteMessage) {
+        if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
+            Timber.d("## onMessageReceived() %s", message.data.toString())
+        }
+        Timber.d("## onMessageReceived() from FCM with priority %s", message.priority)
+
         // Diagnostic Push
         if (message.data["event_id"] == PushersManager.TEST_EVENT_ID) {
             val intent = Intent(NotificationUtils.PUSH_ACTION)
@@ -90,14 +100,10 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
             return
         }
 
-        if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
-            Timber.i("## onMessageReceived() %s", message.data.toString())
-            Timber.i("## onMessageReceived() from FCM with priority %s", message.priority)
-        }
         mUIHandler.post {
             if (ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
                 // we are in foreground, let the sync do the things?
-                Timber.v("PUSH received in a foreground state, ignore")
+                Timber.d("PUSH received in a foreground state, ignore")
             } else {
                 onMessageReceivedInternal(message.data)
             }
@@ -140,7 +146,9 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
     private fun onMessageReceivedInternal(data: Map<String, String>) {
         try {
             if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
-                Timber.i("## onMessageReceivedInternal() : $data")
+                Timber.d("## onMessageReceivedInternal() : $data")
+            } else {
+                Timber.d("## onMessageReceivedInternal() : $data")
             }
 
             // update the badge counter
@@ -156,9 +164,13 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
                 val roomId = data["room_id"]
 
                 if (isEventAlreadyKnown(eventId, roomId)) {
-                    Timber.i("Ignoring push, event already known")
+                    Timber.d("Ignoring push, event already known")
                 } else {
-                    Timber.v("Requesting background sync")
+                    // Try to get the Event content faster
+                    Timber.d("Requesting event in fast lane")
+                    getEventFastLane(session, roomId, eventId)
+
+                    Timber.d("Requesting background sync")
                     session.requireBackgroundSync()
                 }
             }
@@ -167,6 +179,32 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
         }
     }
 
+    private fun getEventFastLane(session: Session, roomId: String?, eventId: String?) {
+        roomId?.takeIf { it.isNotEmpty() } ?: return
+        eventId?.takeIf { it.isNotEmpty() } ?: return
+
+        // If the room is currently displayed, we will not show a notification, so no need to get the Event faster
+        if (notificationDrawerManager.shouldIgnoreMessageEventInRoom(roomId)) {
+            return
+        }
+
+        coroutineScope.launch {
+            Timber.d("Fast lane: start request")
+            val event = session.getEvent(roomId, eventId)
+
+            val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event)
+
+            // TODO Test the Event against the push rules
+            resolvedEvent
+                    ?.also { Timber.d("Fast lane: notify drawer") }
+                    ?.let {
+                        it.isPushGatewayEvent = true
+                        notificationDrawerManager.onNotifiableEventReceived(it)
+                        notificationDrawerManager.refreshNotificationDrawer()
+                    }
+        }
+    }
+
     // check if the event was not yet received
     // a previous catchup might have already retrieved the notified event
     private fun isEventAlreadyKnown(eventId: String?, roomId: String?): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index a4f617bf5b..d5862f3a85 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -29,6 +29,7 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
+import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getEditedEventId
 import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
@@ -42,9 +43,10 @@ import javax.inject.Inject
  * The NotifiableEventResolver is the only aware of session/store, the NotificationDrawerManager has no knowledge of that,
  * this pattern allow decoupling between the object responsible of displaying notifications and the matrix sdk.
  */
-class NotifiableEventResolver @Inject constructor(private val stringProvider: StringProvider,
-                                                  private val noticeEventFormatter: NoticeEventFormatter,
-                                                  private val displayableEventFormatter: DisplayableEventFormatter) {
+class NotifiableEventResolver @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val noticeEventFormatter: NoticeEventFormatter,
+        private val displayableEventFormatter: DisplayableEventFormatter) {
 
     // private val eventDisplay = RiotEventDisplay(context)
 
@@ -84,6 +86,28 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
         }
     }
 
+    fun resolveInMemoryEvent(session: Session, event: Event): NotifiableEvent? {
+        if (event.getClearType() != EventType.MESSAGE) return null
+
+        // TODO Ignore message edition
+        val user = session.getUser(event.senderId!!) ?: return null
+
+        val timelineEvent = TimelineEvent(
+                root = event,
+                localId = -1,
+                eventId = event.eventId!!,
+                displayIndex = 0,
+                senderInfo = SenderInfo(
+                        userId = user.userId,
+                        displayName = user.getBestName(),
+                        isUniqueDisplayName = true,
+                        avatarUrl = user.avatarUrl
+                )
+        )
+
+        return resolveMessageEvent(timelineEvent, session)
+    }
+
     private fun resolveMessageEvent(event: TimelineEvent, session: Session): NotifiableEvent? {
         // The event only contains an eventId, and roomId (type is m.room.*) , we need to get the displayable content (names, avatar, text, etc...)
         val room = session.getRoom(event.root.roomId!! /*roomID cannot be null*/)
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 36b69a7958..7ac9b28b9a 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -89,7 +89,9 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
         // If we support multi session, event list should be per userId
         // Currently only manage single session
         if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
-            Timber.v("%%%%%%%% onNotifiableEventReceived $notifiableEvent")
+            Timber.d("onNotifiableEventReceived(): $notifiableEvent")
+        } else {
+            Timber.d("onNotifiableEventReceived(): is push: ${notifiableEvent.isPushGatewayEvent}")
         }
         synchronized(eventList) {
             val existing = eventList.firstOrNull { it.eventId == notifiableEvent.eventId }
@@ -550,7 +552,7 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
         return bitmapLoader.getRoomBitmap(roomAvatarPath)
     }
 
-    private fun shouldIgnoreMessageEventInRoom(roomId: String?): Boolean {
+    fun shouldIgnoreMessageEventInRoom(roomId: String?): Boolean {
         return currentRoomId != null && roomId == currentRoomId
     }
 

From 7f7f90f89e28340c7e02d153d98fbac35a802036 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 25 Mar 2021 14:11:22 +0100
Subject: [PATCH 530/578] ktlint

---
 .../android/sdk/internal/session/room/timeline/GetEventTask.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
index f1a20e8057..cbbc54e90d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
@@ -29,7 +29,7 @@ import javax.inject.Inject
 internal interface GetEventTask : Task<GetEventTask.Params, Event> {
     data class Params(
             val roomId: String,
-            val eventId: String,
+            val eventId: String
     )
 }
 

From 4a0a6e9f01d665505851fbb27221239c3223bc38 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 25 Mar 2021 14:42:15 +0100
Subject: [PATCH 531/578] FastLane: Ignore message edition

---
 .../org/matrix/android/sdk/api/session/events/model/Event.kt | 4 ++++
 .../app/features/notifications/NotifiableEventResolver.kt    | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 844e8dbbab..89b873febb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -289,3 +289,7 @@ fun Event.getRelationContent(): RelationDefaultContent? {
 fun Event.isReply(): Boolean {
     return getRelationContent()?.inReplyTo?.eventId != null
 }
+
+fun Event.isEdition(): Boolean {
+    return getRelationContent()?.takeIf { it.type == RelationType.REPLACE }?.eventId != null
+}
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index d5862f3a85..477534eda5 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.isEdition
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
@@ -89,7 +90,9 @@ class NotifiableEventResolver @Inject constructor(
     fun resolveInMemoryEvent(session: Session, event: Event): NotifiableEvent? {
         if (event.getClearType() != EventType.MESSAGE) return null
 
-        // TODO Ignore message edition
+        // Ignore message edition
+        if (event.isEdition()) return null
+
         val user = session.getUser(event.senderId!!) ?: return null
 
         val timelineEvent = TimelineEvent(

From f0f66cbd0e687f7bdc219a2e1926ae4177fc3db6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 25 Mar 2021 14:57:32 +0100
Subject: [PATCH 532/578] Add comment

---
 .../matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 3ea32b3bb4..2bb606e921 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -408,6 +408,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
 
     private fun decryptIfNeeded(event: Event, roomId: String) {
         try {
+            // Event from sync does not have roomId, so add it to the event first
             val result = cryptoService.decryptEvent(event.copy(roomId = roomId), "")
             event.mxDecryptionResult = OlmDecryptionResult(
                     payload = result.clearEvent,

From 3a1b8bc33df89b6c89017091d0f27ba7629c6ed3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 25 Mar 2021 15:30:00 +0100
Subject: [PATCH 533/578] FastLane: handle push rules

---
 .../sdk/api/pushrules/PushRuleService.kt      |  2 +
 .../notification/DefaultPushRuleService.kt    | 20 +++++++++
 .../notifications/NotifiableEventResolver.kt  | 45 +++++++++++++------
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
index 4da1662681..d9bf5cfd13 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
@@ -39,6 +39,8 @@ interface PushRuleService {
 
     fun removePushRuleListener(listener: PushRuleListener)
 
+    fun getActions(event: Event): List<Action>
+
 //    fun fulfilledBingRule(event: Event, rules: List<PushRule>): PushRule?
 
     interface PushRuleListener {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
index e00d2ff26c..8ee230192c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
@@ -16,8 +16,11 @@
 package org.matrix.android.sdk.internal.session.notification
 
 import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.api.pushrules.Action
+import org.matrix.android.sdk.api.pushrules.ConditionResolver
 import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.pushrules.RuleKind
+import org.matrix.android.sdk.api.pushrules.RuleScope
 import org.matrix.android.sdk.api.pushrules.RuleSetKey
 import org.matrix.android.sdk.api.pushrules.getActions
 import org.matrix.android.sdk.api.pushrules.rest.PushRule
@@ -45,6 +48,7 @@ internal class DefaultPushRuleService @Inject constructor(
         private val addPushRuleTask: AddPushRuleTask,
         private val updatePushRuleActionsTask: UpdatePushRuleActionsTask,
         private val removePushRuleTask: RemovePushRuleTask,
+        private val conditionResolver: ConditionResolver,
         private val taskExecutor: TaskExecutor,
         @SessionDatabase private val monarchy: Monarchy
 ) : PushRuleService {
@@ -130,6 +134,22 @@ internal class DefaultPushRuleService @Inject constructor(
         }
     }
 
+    override fun getActions(event: Event): List<Action> {
+        val rules = getPushRules(RuleScope.GLOBAL).getAllRules()
+
+        return fulfilledBingRule(event, rules)?.getActions().orEmpty()
+    }
+
+    // TODO This is a copy paste, try to have only once this code
+    private fun fulfilledBingRule(event: Event, rules: List<PushRule>): PushRule? {
+        return rules.firstOrNull { rule ->
+            // All conditions must hold true for an event in order to apply the action for the event.
+            rule.enabled && rule.conditions?.all {
+                it.asExecutableCondition(rule)?.isSatisfied(event, conditionResolver) ?: false
+            } ?: false
+        }
+    }
+
 //    fun processEvents(events: List<Event>) {
 //        var hasDoneSomething = false
 //        events.forEach { event ->
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index 477534eda5..494c30aab9 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -93,22 +93,39 @@ class NotifiableEventResolver @Inject constructor(
         // Ignore message edition
         if (event.isEdition()) return null
 
-        val user = session.getUser(event.senderId!!) ?: return null
+        val actions = session.getActions(event)
+        val notificationAction = actions.toNotificationAction()
 
-        val timelineEvent = TimelineEvent(
-                root = event,
-                localId = -1,
-                eventId = event.eventId!!,
-                displayIndex = 0,
-                senderInfo = SenderInfo(
-                        userId = user.userId,
-                        displayName = user.getBestName(),
-                        isUniqueDisplayName = true,
-                        avatarUrl = user.avatarUrl
-                )
-        )
+        return if (notificationAction.shouldNotify) {
+            val user = session.getUser(event.senderId!!) ?: return null
 
-        return resolveMessageEvent(timelineEvent, session)
+            val timelineEvent = TimelineEvent(
+                    root = event,
+                    localId = -1,
+                    eventId = event.eventId!!,
+                    displayIndex = 0,
+                    senderInfo = SenderInfo(
+                            userId = user.userId,
+                            displayName = user.getBestName(),
+                            isUniqueDisplayName = true,
+                            avatarUrl = user.avatarUrl
+                    )
+            )
+
+            val notifiableEvent = resolveMessageEvent(timelineEvent, session)
+
+            if (notifiableEvent == null) {
+                Timber.d("## Failed to resolve event")
+                // TODO
+                null
+            } else {
+                notifiableEvent.noisy = !notificationAction.soundName.isNullOrBlank()
+                notifiableEvent
+            }
+        } else {
+            Timber.d("Matched push rule is set to not notify")
+            null
+        }
     }
 
     private fun resolveMessageEvent(event: TimelineEvent, session: Session): NotifiableEvent? {

From c46f7fed5fc8374af2d2fc1e1c39977db91e7d69 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 25 Mar 2021 16:58:00 +0100
Subject: [PATCH 534/578] Avoid code duplication

---
 .../notification/DefaultPushRuleService.kt    | 15 ++------
 .../notification/ProcessEventForPushTask.kt   | 15 ++------
 .../session/notification/PushRuleFinder.kt    | 35 +++++++++++++++++++
 3 files changed, 39 insertions(+), 26 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/PushRuleFinder.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
index 8ee230192c..38f6b08b43 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
@@ -17,7 +17,6 @@ package org.matrix.android.sdk.internal.session.notification
 
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.pushrules.Action
-import org.matrix.android.sdk.api.pushrules.ConditionResolver
 import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.pushrules.RuleKind
 import org.matrix.android.sdk.api.pushrules.RuleScope
@@ -48,7 +47,7 @@ internal class DefaultPushRuleService @Inject constructor(
         private val addPushRuleTask: AddPushRuleTask,
         private val updatePushRuleActionsTask: UpdatePushRuleActionsTask,
         private val removePushRuleTask: RemovePushRuleTask,
-        private val conditionResolver: ConditionResolver,
+        private val pushRuleFinder: PushRuleFinder,
         private val taskExecutor: TaskExecutor,
         @SessionDatabase private val monarchy: Monarchy
 ) : PushRuleService {
@@ -137,17 +136,7 @@ internal class DefaultPushRuleService @Inject constructor(
     override fun getActions(event: Event): List<Action> {
         val rules = getPushRules(RuleScope.GLOBAL).getAllRules()
 
-        return fulfilledBingRule(event, rules)?.getActions().orEmpty()
-    }
-
-    // TODO This is a copy paste, try to have only once this code
-    private fun fulfilledBingRule(event: Event, rules: List<PushRule>): PushRule? {
-        return rules.firstOrNull { rule ->
-            // All conditions must hold true for an event in order to apply the action for the event.
-            rule.enabled && rule.conditions?.all {
-                it.asExecutableCondition(rule)?.isSatisfied(event, conditionResolver) ?: false
-            } ?: false
-        }
+        return pushRuleFinder.fulfilledBingRule(event, rules)?.getActions().orEmpty()
     }
 
 //    fun processEvents(events: List<Event>) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
index 54883b51e6..0ece07fc15 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
@@ -16,9 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.notification
 
-import org.matrix.android.sdk.api.pushrules.ConditionResolver
 import org.matrix.android.sdk.api.pushrules.rest.PushRule
-import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.sync.model.RoomsSyncResponse
@@ -35,7 +33,7 @@ internal interface ProcessEventForPushTask : Task<ProcessEventForPushTask.Params
 
 internal class DefaultProcessEventForPushTask @Inject constructor(
         private val defaultPushRuleService: DefaultPushRuleService,
-        private val conditionResolver: ConditionResolver,
+        private val pushRuleFinder: PushRuleFinder,
         @UserId private val userId: String
 ) : ProcessEventForPushTask {
 
@@ -72,7 +70,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
         Timber.v("[PushRules] Found ${allEvents.size} out of ${(newJoinEvents + inviteEvents).size}" +
                 " to check for push rules with ${params.rules.size} rules")
         allEvents.forEach { event ->
-            fulfilledBingRule(event, params.rules)?.let {
+            pushRuleFinder.fulfilledBingRule(event, params.rules)?.let {
                 Timber.v("[PushRules] Rule $it match for event ${event.eventId}")
                 defaultPushRuleService.dispatchBing(event, it)
             }
@@ -94,13 +92,4 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
 
         defaultPushRuleService.dispatchFinish()
     }
-
-    private fun fulfilledBingRule(event: Event, rules: List<PushRule>): PushRule? {
-        return rules.firstOrNull { rule ->
-            // All conditions must hold true for an event in order to apply the action for the event.
-            rule.enabled && rule.conditions?.all {
-                it.asExecutableCondition(rule)?.isSatisfied(event, conditionResolver) ?: false
-            } ?: false
-        }
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/PushRuleFinder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/PushRuleFinder.kt
new file mode 100644
index 0000000000..6e302d373d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/PushRuleFinder.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.notification
+
+import org.matrix.android.sdk.api.pushrules.ConditionResolver
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
+import org.matrix.android.sdk.api.session.events.model.Event
+import javax.inject.Inject
+
+internal class PushRuleFinder @Inject constructor(
+        private val conditionResolver: ConditionResolver
+) {
+    fun fulfilledBingRule(event: Event, rules: List<PushRule>): PushRule? {
+        return rules.firstOrNull { rule ->
+            // All conditions must hold true for an event in order to apply the action for the event.
+            rule.enabled && rule.conditions?.all {
+                it.asExecutableCondition(rule)?.isSatisfied(event, conditionResolver) ?: false
+            } ?: false
+        }
+    }
+}

From 9a124f7630609e9c08358eb100c5c3c349009b07 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 25 Mar 2021 17:06:43 +0100
Subject: [PATCH 535/578] Done TODO

---
 .../vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 7f54be56fb..6bb28a9d77 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -194,7 +194,6 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
 
             val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event)
 
-            // TODO Test the Event against the push rules
             resolvedEvent
                     ?.also { Timber.d("Fast lane: notify drawer") }
                     ?.let {

From b89a258fdf84938cd5e7f81139b30fd9e5221193 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 25 Mar 2021 18:30:54 +0100
Subject: [PATCH 536/578] FastLane: Only is Wifi is detected

---
 .../sdk/api/session/events/EventService.kt    |  6 ++-
 .../sdk/internal/network/WifiDetector.kt      | 45 +++++++++++++++++++
 .../session/events/DefaultEventService.kt     | 12 ++++-
 .../fcm/VectorFirebaseMessagingService.kt     |  2 +-
 4 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
index 41bc0a1a62..3169c8107c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
@@ -23,6 +23,10 @@ interface EventService {
     /**
      * Ask the homeserver for an event content. The SDK will try to decrypt it if it is possible
      * The result will not be stored into cache
+     * @param onlyOnWifi if true and if WiFi is not available, no request will be done,
+     * and null will be returned
      */
-    suspend fun getEvent(roomId: String, eventId: String): Event
+    suspend fun getEvent(roomId: String,
+                         eventId: String,
+                         onlyOnWifi: Boolean): Event?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt
new file mode 100644
index 0000000000..2159627a0b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.network
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.os.Build
+import androidx.core.content.getSystemService
+import org.matrix.android.sdk.api.extensions.orFalse
+import timber.log.Timber
+import javax.inject.Inject
+
+internal class WifiDetector @Inject constructor(
+        context: Context
+) {
+    private val connectivityManager = context.getSystemService<ConnectivityManager>()!!
+
+    fun isConnectedToWifi(): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            connectivityManager.activeNetwork
+                    ?.let { connectivityManager.getNetworkCapabilities(it) }
+                    ?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+                    .orFalse()
+        } else {
+            @Suppress("DEPRECATION")
+            connectivityManager.activeNetworkInfo?.type == ConnectivityManager.TYPE_WIFI
+        }
+                .also { Timber.d("isConnected to WiFi: $it") }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt
index d7e9ef2ee0..45b772f138 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt
@@ -18,16 +18,24 @@ package org.matrix.android.sdk.internal.session.events
 
 import org.matrix.android.sdk.api.session.events.EventService
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.internal.network.WifiDetector
 import org.matrix.android.sdk.internal.session.call.CallEventProcessor
 import org.matrix.android.sdk.internal.session.room.timeline.GetEventTask
+import timber.log.Timber
 import javax.inject.Inject
 
 internal class DefaultEventService @Inject constructor(
         private val getEventTask: GetEventTask,
-        private val callEventProcessor: CallEventProcessor
+        private val callEventProcessor: CallEventProcessor,
+        private val wifiDetector: WifiDetector
 ) : EventService {
 
-    override suspend fun getEvent(roomId: String, eventId: String): Event {
+    override suspend fun getEvent(roomId: String, eventId: String, onlyOnWifi: Boolean): Event? {
+        if (onlyOnWifi && !wifiDetector.isConnectedToWifi()) {
+            Timber.d("No WiFi network, do not get Event")
+            return null
+        }
+
         val event = getEventTask.execute(GetEventTask.Params(roomId, eventId))
 
         // Fast lane to the call event processors: try to make the incoming call ring faster
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 6bb28a9d77..d421fc97e8 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -190,7 +190,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
 
         coroutineScope.launch {
             Timber.d("Fast lane: start request")
-            val event = session.getEvent(roomId, eventId)
+            val event = session.getEvent(roomId, eventId, onlyOnWifi = true)?: return@launch
 
             val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event)
 

From dead57b9feb78352b78b6988689f8b7e4490ebba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 26 Mar 2021 10:47:03 +0100
Subject: [PATCH 537/578] Cleanup

---
 .../org/matrix/android/sdk/internal/network/WifiDetector.kt     | 2 +-
 .../vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt
index 2159627a0b..b1ae4e3b94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index d421fc97e8..edde8e69b9 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -190,7 +190,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
 
         coroutineScope.launch {
             Timber.d("Fast lane: start request")
-            val event = session.getEvent(roomId, eventId, onlyOnWifi = true)?: return@launch
+            val event = session.getEvent(roomId, eventId, onlyOnWifi = true) ?: return@launch
 
             val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event)
 

From 7309c1066ce052de65d7d23f0b47d9b62de01051 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 15:07:22 +0200
Subject: [PATCH 538/578] Move WifiDetector to the app side And protect the
 call to getEvent()

---
 .../android/sdk/api/session/events/EventService.kt   |  5 +----
 .../internal/session/events/DefaultEventService.kt   | 12 ++----------
 .../gplay/push/fcm/VectorFirebaseMessagingService.kt | 11 ++++++++++-
 .../java/im/vector/app/core/di/VectorComponent.kt    |  3 +++
 .../java/im/vector/app/core}/network/WifiDetector.kt |  6 +++---
 5 files changed, 19 insertions(+), 18 deletions(-)
 rename {matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal => vector/src/main/java/im/vector/app/core}/network/WifiDetector.kt (90%)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
index 3169c8107c..297f277497 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/EventService.kt
@@ -23,10 +23,7 @@ interface EventService {
     /**
      * Ask the homeserver for an event content. The SDK will try to decrypt it if it is possible
      * The result will not be stored into cache
-     * @param onlyOnWifi if true and if WiFi is not available, no request will be done,
-     * and null will be returned
      */
     suspend fun getEvent(roomId: String,
-                         eventId: String,
-                         onlyOnWifi: Boolean): Event?
+                         eventId: String): Event
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt
index 45b772f138..d7e9ef2ee0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/events/DefaultEventService.kt
@@ -18,24 +18,16 @@ package org.matrix.android.sdk.internal.session.events
 
 import org.matrix.android.sdk.api.session.events.EventService
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.internal.network.WifiDetector
 import org.matrix.android.sdk.internal.session.call.CallEventProcessor
 import org.matrix.android.sdk.internal.session.room.timeline.GetEventTask
-import timber.log.Timber
 import javax.inject.Inject
 
 internal class DefaultEventService @Inject constructor(
         private val getEventTask: GetEventTask,
-        private val callEventProcessor: CallEventProcessor,
-        private val wifiDetector: WifiDetector
+        private val callEventProcessor: CallEventProcessor
 ) : EventService {
 
-    override suspend fun getEvent(roomId: String, eventId: String, onlyOnWifi: Boolean): Event? {
-        if (onlyOnWifi && !wifiDetector.isConnectedToWifi()) {
-            Timber.d("No WiFi network, do not get Event")
-            return null
-        }
-
+    override suspend fun getEvent(roomId: String, eventId: String): Event {
         val event = getEventTask.execute(GetEventTask.Params(roomId, eventId))
 
         // Fast lane to the call event processors: try to make the incoming call ring faster
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index edde8e69b9..4cefeadb62 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -31,6 +31,7 @@ import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.core.network.WifiDetector
 import im.vector.app.core.pushers.PushersManager
 import im.vector.app.features.badge.BadgeProxy
 import im.vector.app.features.notifications.NotifiableEventResolver
@@ -43,6 +44,7 @@ import im.vector.app.push.fcm.FcmHelper
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.Action
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -58,6 +60,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
     private lateinit var pusherManager: PushersManager
     private lateinit var activeSessionHolder: ActiveSessionHolder
     private lateinit var vectorPreferences: VectorPreferences
+    private lateinit var wifiDetector: WifiDetector
 
     private val coroutineScope = CoroutineScope(SupervisorJob())
 
@@ -74,6 +77,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
             pusherManager = pusherManager()
             activeSessionHolder = activeSessionHolder()
             vectorPreferences = vectorPreferences()
+            wifiDetector = wifiDetector()
         }
     }
 
@@ -188,9 +192,14 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
             return
         }
 
+        if (wifiDetector.isConnectedToWifi().not()) {
+            Timber.d("No WiFi network, do not get Event")
+            return
+        }
+
         coroutineScope.launch {
             Timber.d("Fast lane: start request")
-            val event = session.getEvent(roomId, eventId, onlyOnWifi = true) ?: return@launch
+            val event = tryOrNull { session.getEvent(roomId, eventId) } ?: return@launch
 
             val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event)
 
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index cae7a2ece6..4b88ff6767 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -26,6 +26,7 @@ import im.vector.app.EmojiCompatWrapper
 import im.vector.app.VectorApplication
 import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
 import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.network.WifiDetector
 import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.utils.AssetReader
 import im.vector.app.core.utils.DimensionConverter
@@ -140,6 +141,8 @@ interface VectorComponent {
 
     fun vectorPreferences(): VectorPreferences
 
+    fun wifiDetector(): WifiDetector
+
     fun vectorFileLogger(): VectorFileLogger
 
     fun uiStateRepository(): UiStateRepository
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt b/vector/src/main/java/im/vector/app/core/network/WifiDetector.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt
rename to vector/src/main/java/im/vector/app/core/network/WifiDetector.kt
index b1ae4e3b94..34b2a7590d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/WifiDetector.kt
+++ b/vector/src/main/java/im/vector/app/core/network/WifiDetector.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.network
+package im.vector.app.core.network
 
 import android.content.Context
 import android.net.ConnectivityManager
@@ -25,7 +25,7 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class WifiDetector @Inject constructor(
+class WifiDetector @Inject constructor(
         context: Context
 ) {
     private val connectivityManager = context.getSystemService<ConnectivityManager>()!!

From 39c0c5401f59234db6433b2ce2dd5ab7cadd6125 Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Mon, 5 Apr 2021 07:13:08 +0000
Subject: [PATCH 539/578] Translated using Weblate (Finnish)

Currently translated at 79.2% (1873 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
---
 vector/src/main/res/values-fi/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 1661178b50..33f19760af 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -102,7 +102,7 @@
     </plurals>
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s poisti tältä huoneelta osoitteen %2$s.</item>
-        <item quantity="other">%1$s poisti tältä huoneelta osoitteet %3$s.</item>
+        <item quantity="other">%1$s poisti tältä huoneelta osoitteet %2$s.</item>
     </plurals>
     <string name="notice_room_aliases_added_and_removed">%1$s lisäsi tälle huoneelle osoitteen %2$s ja poisti osoitteen %3$s.</string>
     <string name="notice_room_canonical_alias_set">%1$s asetti tämän huoneen pääosoitteeksi %2$s.</string>
@@ -2096,7 +2096,7 @@
     <string name="settings_show_emoji_keyboard">Näytä emoji-näppäimistö</string>
     <string name="settings_emails_empty">Tiliisi ei ole lisätty sähköpostiosoitetta</string>
     <string name="settings_phone_number_empty">Tiliisi ei ole lisätty puhelinnumeroa</string>
-    <string name="room_permissions_notify_everyone">Ilmoittaa kaikille</string>
+    <string name="room_permissions_notify_everyone">Ilmoita kaikille</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Haluatko peruuttaa tämän käyttäjän kutsun\?</string>
     <string name="room_participants_leave_private_warning">Tämä huone ei ole julkinen. Jos poistut, et voi liittyä takaisin ilman kutsua.</string>
     <string name="settings_security_prevent_screenshots_summary">Tämän asetuksen käyttöön ottaminen lisää FLAG_SECURE kaikkiin toimintoihin. Käynnistä sovellus uudestaan, jotta muutos tulee voimaan.</string>
@@ -2122,7 +2122,7 @@
     <string name="settings_emails_and_phone_numbers_summary">Hallitse Matrix-tiliisi linkitettyjä sähköpostiosoitteita ja puhelinnumeroita</string>
     <string name="change_password_summary">Aseta tilille uusi salasana…</string>
     <string name="settings_troubleshoot_test_push_notification_content">Katselet ilmoitusta! Napsauta minua!</string>
-    <string name="settings_troubleshoot_test_notification_notice">Napsauta ilmoitusta. Jos ilmoitusta ei näy, tarkista järjestelmäasetukset.</string>
+    <string name="settings_troubleshoot_test_notification_notice">Napsauta ilmoitusta. Jos ilmoitusta ei näy, tarkasta järjestelmäasetukset.</string>
     <string name="settings_troubleshoot_test_notification_title">Ilmoitusnäyttö</string>
     <string name="settings_troubleshoot_title">Vianmääritys</string>
     <string name="settings_notification_configuration">Ilmoitustapa</string>

From 3250f3bc0e1a09f3f102be3313b59cd4c8df2dba Mon Sep 17 00:00:00 2001
From: Magnus <magnus+github@nymo.xyz>
Date: Tue, 6 Apr 2021 00:52:31 +0000
Subject: [PATCH 540/578] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 62.9% (1486 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index fc16bd5ca0..f036ec7cd3 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1027,7 +1027,7 @@
     <string name="room_recents_start_chat">Start chat</string>
     <string name="room_recents_low_priority">LAV PRIORITET</string>
     <string name="room_recents_favourites">FAVORITTER</string>
-    <string name="room_recents_directory">DIREKTIV</string>
+    <string name="room_recents_directory">KATALOG</string>
     <string name="room_recents_join">BLI MED</string>
     <string name="search_is_not_supported_in_e2e_room">Søking i krypterte rom støttes ikke ennå.</string>
     <string name="tab_title_search_people">FOLK</string>
@@ -1564,15 +1564,15 @@
     <string name="search_banned_user_hint">Filtrer utestengte brukere</string>
     <string name="room_permissions_modify_widgets">Endre widgets</string>
     <string name="template_settings_opt_in_of_analytics_prompt">Aktiver analyse for å hjelpe med å forbedre ${app_name}.</string>
-    <string name="startup_notification_privacy_title">Varsel Personvern</string>
-    <string name="settings_show_avatar_display_name_changes_messages_summary">Inkluderer avatar og visningsnavnendringer.</string>
+    <string name="startup_notification_privacy_title">Varselpersonvern</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Inkluderer avatar- og visningsnavnendringer.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Vis kontohendelser</string>
     <string name="settings_show_join_leave_messages_summary">Invitasjoner, spark og utestengelser er ikke påvirket.</string>
     <string name="settings_show_join_leave_messages">Vis delta og forlate arrangementer</string>
     <string name="settings_show_room_member_state_events_summary">Inkluderer invitasjoner/delta/forlot/spark/utesteng hendelser og avatar/visningsnavnendringer.</string>
     <string name="settings_chat_effects_title">Vis chateffekter</string>
-    <string name="settings_show_room_member_state_events">Vis statens medlemsarrangementer</string>
-    <string name="settings_12_24_timestamps">Vis tidsstempler i 12-timers format</string>
+    <string name="settings_show_room_member_state_events">Vis statushendelser angående rommedlemmer</string>
+    <string name="settings_12_24_timestamps">Vis tidsstempler i 12-timersformat</string>
     <string name="settings_send_markdown">Markdown formatering</string>
     <string name="settings_inline_url_preview_summary">Forhåndsvis lenker i chatten når hjemmeserveren din støtter denne funksjonen.</string>
     <string name="settings_inline_url_preview">Forhåndsvisning av innebygd URL</string>
@@ -1581,14 +1581,14 @@
     <string name="settings_home_display">Hjemmeskjerm</string>
     <string name="settings_notifications_targets">Varslingsmål</string>
     <string name="settings_cryptography_manage_keys">Administrer kryptografinøkler</string>
-    <string name="settings_integrations_summary">Bruk en Integration Manager til å administrere roboter, broer, widgets og klistremerkepakker.
-\nIntegration Managers mottar konfigurasjonsdata, og kan endre moduler, sende rominvitasjoner og angi strømnivåer på dine vegne.</string>
+    <string name="settings_integrations_summary">Bruk en integrasjonshåndterer til å administrere botter, broer, widgets og klistremerkepakker.
+\nIntegrasjonshåndterere mottar konfigurasjonsdata, og kan endre moduler, sende rominvitasjoner og angi maktnivåer på dine vegne.</string>
     <string name="settings_set_sync_delay">Forsinkelse mellom hver synkronisering</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nSynkroniseringen kan bli utsatt avhengig av ressursene (batteriet) eller enhetens tilstand (hvilemodus).</string>
     <string name="settings_set_workmanager_delay">Foretrukket synkroniseringsintervall</string>
-    <string name="settings_set_sync_timeout">Tidsavbrudd for synkronisering forespørsel</string>
-    <string name="settings_enable_background_sync">Aktiver synkronisering i bakgrunnen</string>
+    <string name="settings_set_sync_timeout">Tidsavbrudd for synkroniseringsforespørsel</string>
+    <string name="settings_enable_background_sync">Aktiver bakgrunnssynkronisering</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Du vil ikke bli varslet om innkommende meldinger når appen er i bakgrunnen.</string>
     <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} vil synkroniseres i bakgrunnen med jevne mellomrom på presis tid (konfigurerbar).
 \nDette vil påvirke radio og batteribruk, det vises en permanent melding om at ${app_name} lytter etter hendelser.</string>
@@ -1599,15 +1599,15 @@
     <string name="settings_containing_my_display_name">Msgs som inneholder visningsnavnet mitt</string>
     <string name="settings_silent_notifications_preferences">Konfigurer stille varsler</string>
     <string name="settings_call_notifications_preferences">Konfigurer anropsvarsler</string>
-    <string name="settings_noisy_notifications_preferences">Konfigurer lyd varsler</string>
-    <string name="settings_notification_privacy_message_content_not_shown">• Varsler vil &lt;b&gt;ikke vise meldingsinnhold&lt;b&gt;</string>
+    <string name="settings_noisy_notifications_preferences">Konfigurer høylytte varsler</string>
+    <string name="settings_notification_privacy_message_content_not_shown">• Varsler vil <b>ikke vise meldingsinnhold</b></string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorer optimalisering</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktiver Start ved oppstart</string>
     <string name="settings_troubleshoot_test_service_boot_success">Tjenesten starter når enheten startes på nytt.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Tjenesten kunne ikke startes på nytt</string>
-    <string name="settings_troubleshoot_test_service_restart_success">Tjenesten stoppet og startet på nytt automatisk.</string>
-    <string name="settings_troubleshoot_test_service_restart_title">Varslingstjeneste automatisk omstart</string>
-    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Start Tjeneste</string>
+    <string name="settings_troubleshoot_test_service_restart_success">Tjenesten ble stoppet og startet på nytt automatisk.</string>
+    <string name="settings_troubleshoot_test_service_restart_title">Automatisk omstart av varslingstjenesten</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Start tjeneste</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Varslingstjenesten kjører ikke.
 \nPrøv å starte programmet på nytt.</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Varslingstjenesten kjører.</string>

From cc1d52171c2382cf7a4454c2fb1e9bb6e45179d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99+GitHub@gmail.com>
Date: Mon, 5 Apr 2021 19:58:13 +0000
Subject: [PATCH 541/578] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 62.9% (1486 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index f036ec7cd3..1b4628c913 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -967,7 +967,7 @@
     <string name="warning_unsaved_change_discard">Forkaste endringer</string>
     <string name="read_receipts_list">Les kvitteringsliste</string>
     <string name="e2e_re_request_encryption_key">Be om krypteringsnøkler fra andre økter.</string>
-    <string name="login_error_must_start_http">URL må starte med http[s]://</string>
+    <string name="login_error_must_start_http">URLen må starte med http[s]://</string>
     <string name="settings_troubleshoot_test_push_notification_content">Du ser på varselet! Klikk på meg!</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Kunne ikke motta push. Løsningen kan være å installere applikasjonen på nytt.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Legg til konto</string>
@@ -1154,11 +1154,11 @@
     <string name="template_e2e_re_request_encryption_key_dialog_content">Start ${app_name} på en annen enhet som kan dekryptere meldingen, slik at den kan sende nøklene til denne økten.</string>
     <string name="e2e_re_request_encryption_key_dialog_title">Forespørsel sendt</string>
     <string name="e2e_re_request_encryption_key_sent">Nøkkelforespørsel sendt.</string>
-    <string name="login_error_ssl_peer_unverified">SSL-feil: identiteten til jevnaldrende er ikke bekreftet.</string>
-    <string name="login_error_homeserver_not_found">Kan ikke nå en hjemmeserver på denne URL-en, sjekk den</string>
+    <string name="login_error_ssl_peer_unverified">SSL Feil: Denne partnerns identitet har ikke blitt verifisert.</string>
+    <string name="login_error_homeserver_not_found">Kan ikke nå hjemmetjeneren på denne URLen, vennligst sjekk den</string>
     <string name="login_error_no_homeserver_found">Dette er ikke en gyldig adresse for en Matrix tjener</string>
-    <string name="login_error_unknown_host">Denne URL-en er ikke tilgjengelig, sjekk den</string>
-    <string name="login_error_unable_register_mail_ownership">Kan ikke registrere: e-post eierskap feil</string>
+    <string name="login_error_unknown_host">Denne URLen kunne ikke nås, vennligst sjekk den</string>
+    <string name="login_error_unable_register_mail_ownership">Klarte ikke registrere: e-posteierskapsfeil</string>
     <string name="action_unpublish">Fjern publiseringen</string>
     <string name="action_add">Legg til</string>
     <string name="start_chatting">Begynn å chatte</string>

From e9838f6db1c5ac3fe1f5e8e509367575a9161bcc Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Wed, 7 Apr 2021 10:06:20 +0000
Subject: [PATCH 542/578] Translated using Weblate (Russian)

Currently translated at 99.4% (2350 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
---
 vector/src/main/res/values-ru/strings.xml | 68 +++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index e401e856ce..1ed1b17734 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2752,4 +2752,72 @@
     </plurals>
     <string name="error_unauthorized">Нет учётных данных, неправильная учётная запись пользователя и/или пароль</string>
     <string name="action_return">Вернуть</string>
+    <string name="event_status_delete_all_failed_dialog_message">Вы уверены, что хотите удалить все неотправленные сообщения в этой комнате\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Удалить неотправленные сообщения</string>
+    <string name="event_status_failed_messages_warning">Сообщения не удалось отправить</string>
+    <string name="event_status_cancel_sending_dialog_message">Вы хотите отменить отправку сообщения\?</string>
+    <string name="event_status_a11y_delete_all">Удалить все неудачные сообщения</string>
+    <string name="event_status_a11y_failed">Не удалось</string>
+    <string name="event_status_a11y_sent">Отправлено</string>
+    <string name="event_status_a11y_sending">Отправка</string>
+    <string name="dev_tools_event_content_hint">Содержание события</string>
+    <string name="dev_tools_success_state_event">Событие статуса отправлено!</string>
+    <string name="dev_tools_success_event">Событие отправлено!</string>
+    <string name="dev_tools_error_malformed_event">Неисправное событие</string>
+    <string name="dev_tools_error_no_message_type">Отсутствует тип сообщения</string>
+    <string name="dev_tools_error_no_content">Нет содержания</string>
+    <string name="dev_tools_form_hint_event_content">Содержание события</string>
+    <string name="dev_tools_form_hint_state_key">Ключ статуса</string>
+    <string name="dev_tools_form_hint_type">Тип</string>
+    <string name="dev_tools_send_custom_state_event">Отправить пользовательское событие статуса</string>
+    <string name="dev_tools_edit_content">Редактировать содержание</string>
+    <string name="dev_tools_state_event">События статуса</string>
+    <string name="dev_tools_explore_room_state">Исследовать статус комнаты</string>
+    <string name="dev_tools_send_state_event">Отправить событие статуса</string>
+    <string name="dev_tools_send_custom_event">Отправить пользовательское событие</string>
+    <string name="dev_tools_menu_name">Инструменты для разработчиков</string>
+    <string name="a11y_view_read_receipts">См. подтверждение получения</string>
+    <string name="a11y_rule_notify_off">Не уведомлять</string>
+    <string name="a11y_rule_notify_silent">Уведомить без звука</string>
+    <string name="a11y_rule_notify_noisy">Уведомить со звуком</string>
+    <string name="a11y_error_message_not_sent">Сообщение не отправлено из-за ошибки</string>
+    <string name="a11y_checked">Проверено</string>
+    <string name="a11y_close_emoji_picker">Закрыть выбор эмодзи</string>
+    <string name="a11y_open_emoji_picker">Открыть выбор эмодзи</string>
+    <string name="a11y_trust_level_trusted">Доверенный уровень доверия</string>
+    <string name="a11y_trust_level_warning">Предупреждающий уровень доверия</string>
+    <string name="a11y_trust_level_default">Уровень доверия по умолчанию</string>
+    <string name="a11y_selected">Выбрано</string>
+    <string name="a11y_video">Видео</string>
+    <string name="a11y_unsent_draft">В этой комнате есть неотправленный черновик</string>
+    <string name="a11y_error_some_message_not_sent">Некоторые сообщения не были отправлены</string>
+    <string name="a11y_delete_avatar">Удалить аватар</string>
+    <string name="a11y_change_avatar">Сменить аватар</string>
+    <string name="a11y_image">Изображение</string>
+    <string name="a11y_import_key_from_file">Импорт ключа из файла</string>
+    <string name="a11y_open_widget">Открытые виджеты</string>
+    <string name="a11y_screenshot">Скриншот</string>
+    <plurals name="entries">
+        <item quantity="one">%d запись</item>
+        <item quantity="few">%d записи</item>
+        <item quantity="many">%d записей</item>
+        <item quantity="other">%d записей</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">Лимит неизвестен.</string>
+    <string name="settings_server_upload_size_content">Ваш домашний сервер принимает вложения (файлы, медиа и т.д.) размером до %s.</string>
+    <string name="settings_server_upload_size_title">Лимит загрузки файла сервера</string>
+    <string name="settings_server_version">Версия сервера</string>
+    <string name="settings_server_name">Название сервера</string>
+    <string name="room_list_quick_actions_room_settings">Настройки комнаты</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Покинуть текущую конференцию и перейти к другой\?</string>
+    <string name="room_settings_room_version_title">Версия комнаты</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Показать все команты в списке комнат, в том числе с чувствительным содержанием.</string>
+    <string name="settings_room_directory_show_all_rooms">Показать комнаты с чувствительным содержанием</string>
+    <string name="settings_category_room_directory">Список комнат</string>
+    <string name="dialog_edit_hint">Новое значение</string>
+    <string name="action_switch">Сменить</string>
+    <string name="initial_sync_start_downloading">Начальная синхронизация:
+\nЗагрузка данных…</string>
+    <string name="initial_sync_start_server_computing">Начальная синхронизация:
+\nОжидание ответа сервера…</string>
 </resources>
\ No newline at end of file

From 3efd35e27a249e60d1025e336115b16df0962bf6 Mon Sep 17 00:00:00 2001
From: ozzii <ozzii.translate@gmail.com>
Date: Tue, 6 Apr 2021 11:36:14 +0000
Subject: [PATCH 543/578] Translated using Weblate (Serbian)

Currently translated at 28.1% (666 of 2362 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sr/
---
 vector/src/main/res/values-sr/strings.xml | 47 +++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml
index 5e56ffcad5..065fd3154b 100644
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@@ -711,4 +711,51 @@
     <string name="join">Придружи се</string>
     <string name="remove">Избриши</string>
     <string name="_continue">Настави</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">Послати одговор (НЕшифрован)…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">Послати шифрован дговор…</string>
+    <string name="room_message_placeholder_not_encrypted">Послати поруку (НЕшифровану)…</string>
+    <string name="room_message_placeholder_encrypted">Послати шифровану поруку…</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; други пишу…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s пишу…</string>
+    <string name="room_one_user_is_typing">%s пише…</string>
+    <string name="room_menu_search">Тражи</string>
+    <string name="people_search_invite_by_id_dialog_hint">Е-пошта или Matrix ИД</string>
+    <string name="people_search_filter_text">Само Matrix кориснике</string>
+    <string name="people_search_user_directory">КОРИСНИЧКИ ДИРЕКТОРИЈУМ (%s)</string>
+    <string name="people_search_local_contacts">ЛОКАЛНИ КОНТАКТИ (%d)</string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+    <string name="room_participants_invite_join_names_and">%1$s и %2$s</string>
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="reason_hint">Разлог</string>
+    <string name="room_participants_unban_prompt_msg">Склањање забране корисника ће му омогућити да се поново придружи соби.</string>
+    <string name="room_participants_ban_prompt_msg">Забрањен корисник ће бити избачен из ове собе и спречити ига да се поново придружи.</string>
+    <string name="room_participants_unban_title">Склони забрану корисника</string>
+    <string name="room_participants_ban_reason">Разлог забране</string>
+    <string name="room_participants_ban_title">Забрани корисника</string>
+    <string name="room_participants_kick_reason">Разлог одбацивања</string>
+    <string name="room_participants_kick_title">Одбацити корисник</string>
+    <string name="no">НЕ</string>
+    <string name="yes">ДА</string>
+    <string name="media_slider_saved_message">Сачувати у преузимања\?</string>
+    <string name="media_slider_saved">Сачувано</string>
+    <string name="permissions_denied_add_contact">Дозволите приступ вашим контактима.</string>
+    <string name="permissions_denied_qr_code">Да бисте скенирали QR кôд, морате дозволити приступ камеру.</string>
+    <string name="permissions_action_not_performed_missing_permissions">Извињавам се. Акција није извршена, због недостајућих дозвола</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">"
+\n
+\nМолимо вас да дозволите приступ у следећем прозору да бисте могли да урадите позив."</string>
+    <string name="permissions_rationale_msg_camera_explanation">"
+\n
+\nМолимо вас да дозволите приступ у следећем прозору да бисте могли да урадите позив."</string>
+    <string name="permissions_rationale_popup_title">Информација</string>
+    <string name="media_picker_cannot_record_video">Не може да се сними видео</string>
+    <string name="media_picker_both_capture_title">Узми слику или видео</string>
+    <string name="call_error_answered_elsewhere">Позив одговорен на друго место</string>
+    <string name="compression_options">Пошаљи као</string>
+    <string name="groups_list">Листа група</string>
+    <string name="read_receipts_list">Листа потврђивања за читање</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">Послат је захтев</string>
+    <string name="e2e_re_request_encryption_key_sent">Послат је захтев за кључ.</string>
+    <string name="login_error_login_email_not_yet">Нисте још кликнули у везу из послате е-поште</string>
+    <string name="login_error_user_in_use">Ово корисничко име је већ коришћено</string>
 </resources>
\ No newline at end of file

From 5a988d6f4af52aeeb091f3dc11ed794a32562354 Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Mon, 5 Apr 2021 07:08:26 +0000
Subject: [PATCH 544/578] Translated using Weblate (Finnish)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fi/
---
 fastlane/metadata/android/fi/changelogs/40101000.txt | 2 ++
 fastlane/metadata/android/fi/changelogs/40101010.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/fi/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/fi/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/fi/changelogs/40101000.txt b/fastlane/metadata/android/fi/changelogs/40101000.txt
new file mode 100644
index 0000000000..1b85b6d00d
--- /dev/null
+++ b/fastlane/metadata/android/fi/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Suurimmat muutokset tässä versiossa: VoIP-parannuksia ja korjauksia (ääni- ja videopuhelut yksityiskeskusteluissa)
+Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/fi/changelogs/40101010.txt b/fastlane/metadata/android/fi/changelogs/40101010.txt
new file mode 100644
index 0000000000..c79023c148
--- /dev/null
+++ b/fastlane/metadata/android/fi/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Suurimmat muutokset tässä versiossa: suorituskykyparannuksia ja bugikorjauksia!
+Täysi muutosloki: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From 57d94c549465b174273a9b3fa24ff52c8b43fb02 Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Wed, 7 Apr 2021 10:08:50 +0000
Subject: [PATCH 545/578] Translated using Weblate (Russian)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
---
 fastlane/metadata/android/ru/changelogs/40101000.txt | 2 ++
 fastlane/metadata/android/ru/changelogs/40101010.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/ru/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/ru/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/ru/changelogs/40101000.txt b/fastlane/metadata/android/ru/changelogs/40101000.txt
new file mode 100644
index 0000000000..8ec344a85a
--- /dev/null
+++ b/fastlane/metadata/android/ru/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: VoIP (аудио и видео звонки в ЛС) Улучшение и исправления ошибок!
+Полный список изменений: https://github.com/vector-im/element-android/release/tag/v1.1.0
diff --git a/fastlane/metadata/android/ru/changelogs/40101010.txt b/fastlane/metadata/android/ru/changelogs/40101010.txt
new file mode 100644
index 0000000000..7295e0df60
--- /dev/null
+++ b/fastlane/metadata/android/ru/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: улучшение производительности и исправления ошибок!
+Полный список изменений: https://github.com/vector-im/element-android/release/tag/v1.1.1

From 5971edee147b5deae2ce4cdf46f49a81501dd21f Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Tue, 6 Apr 2021 12:21:58 +0000
Subject: [PATCH 546/578] Translated using Weblate (Persian)

Currently translated at 100.0% (13 of 13 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
---
 fastlane/metadata/android/fa/changelogs/40100120.txt | 2 ++
 fastlane/metadata/android/fa/changelogs/40100130.txt | 2 ++
 fastlane/metadata/android/fa/changelogs/40100140.txt | 2 ++
 fastlane/metadata/android/fa/changelogs/40100150.txt | 2 ++
 fastlane/metadata/android/fa/changelogs/40100160.txt | 2 ++
 fastlane/metadata/android/fa/changelogs/40100170.txt | 2 ++
 fastlane/metadata/android/fa/changelogs/40101000.txt | 2 ++
 fastlane/metadata/android/fa/changelogs/40101010.txt | 2 ++
 8 files changed, 16 insertions(+)
 create mode 100644 fastlane/metadata/android/fa/changelogs/40100120.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/40100130.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/40100150.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/40100160.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/40100170.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/fa/changelogs/40100120.txt b/fastlane/metadata/android/fa/changelogs/40100120.txt
new file mode 100644
index 0000000000..511cdb49fa
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40100120.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: پیش‌نمایش نشانی، صفحه‌کلید اموجی جدید، تنظیم‌های اتاق جدید و برف برای کریسمس!
+گزارش تغییر کامل: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/fa/changelogs/40100130.txt b/fastlane/metadata/android/fa/changelogs/40100130.txt
new file mode 100644
index 0000000000..d78c76e041
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40100130.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: پیش‌نمایش نشانی، صفحه‌کلید اموجی جدید، تنظیم‌های اتاق جدید و برف برای کریسمس!
+گزارش تغییر کامل: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/fa/changelogs/40100140.txt b/fastlane/metadata/android/fa/changelogs/40100140.txt
new file mode 100644
index 0000000000..5defa284aa
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: ویرایش اجازه‌های اتاق، زمینهٔ تاریک/روشن خودکار و رفع دسته‌ای از مشکل‌ها.
+گزارش تغییر کامل: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/fa/changelogs/40100150.txt b/fastlane/metadata/android/fa/changelogs/40100150.txt
new file mode 100644
index 0000000000..d856b3a252
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: پشتیبانی از ورود اجتماعی.
+گزارش تغییر کامل: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/fa/changelogs/40100160.txt b/fastlane/metadata/android/fa/changelogs/40100160.txt
new file mode 100644
index 0000000000..4d8aea0cb6
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: پشتیبانی از ورود اجتماعی.
+گزارش تغییر کامل: https://github.com/vector-im/element-android/releases/tag/v1.0.15 و https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/fa/changelogs/40100170.txt b/fastlane/metadata/android/fa/changelogs/40100170.txt
new file mode 100644
index 0000000000..6de164e57f
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: رفع مشکل‌ها!
+گزارش تغییر کامل: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/fa/changelogs/40101000.txt b/fastlane/metadata/android/fa/changelogs/40101000.txt
new file mode 100644
index 0000000000..6a3c154ae4
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: بهبود ویپ (تماس‌های صوتی و تصویری در پیام‌های مستقیم) و رفع مشکل‌ها!
+گزارش تغییر کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/fa/changelogs/40101010.txt b/fastlane/metadata/android/fa/changelogs/40101010.txt
new file mode 100644
index 0000000000..8e29373452
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نگارش: بهبود عملکرد و رفع مشکل‌ها!
+گزارش تغییر کامل: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From fc202437e85535185056736361d65168e58a604f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 18:31:46 +0200
Subject: [PATCH 547/578] Fix lint issues

---
 vector/src/main/res/values-ar/strings.xml |  1 -
 vector/src/main/res/values-tr/strings.xml | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index bc0738643f..4e74426e9a 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -11,7 +11,6 @@
     <string name="notice_room_unban">رفعَ ⁨%1$s⁩ المنع عن ⁨%2$s⁩</string>
     <string name="notice_room_ban">منعَ ⁨%1$s⁩ ⁨%2$s⁩</string>
     <string name="notice_avatar_url_changed">غيّر ⁨%1$s⁩ صورته الشخصية</string>
-    <string name="notice_display_name_set">ضبطَ ⁨%1$s⁩ اسم العرض على</string>
     <string name="notice_display_name_changed_from">إنَّ %1$s قد غيَّرَ اسمه الظاهر من %2$s إلى %3$s</string>
     <string name="notice_display_name_removed">إنَّ %1$s قد أزالَ اسمه الظاهر (لقد كان %2$s)</string>
     <string name="notice_room_topic_changed">إنَّ %1$s قد غيَّرَ الموضوع إلى: %2$s</string>
diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index aa234ac78c..4739830ea4 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -1761,8 +1761,6 @@
     <string name="notice_ended_call">%s aramayı sonlandırdı.</string>
     <string name="notice_answered_call_by_you">Aramayı cevapladınız.</string>
     <string name="notice_answered_call">%s aramayı cevapladı.</string>
-    <string name="notice_call_candidates">"
-\n"</string>
     <string name="notice_placed_voice_call_by_you">Bir sesli arama başlattınız.</string>
     <string name="notice_placed_voice_call">%s bir sesli arama başlattı.</string>
     <string name="notice_placed_video_call_by_you">Görüntülü arama başlattınız.</string>
@@ -1784,15 +1782,11 @@
     <string name="room_settings_room_version_title">Oda sürümü</string>
     <string name="event_status_sending_message">Mesaj gönderiliyor…</string>
     <string name="room_displayname_empty_room">Boş oda</string>
-    <plurals name="room_displayname_four_and_more_members">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="room_displayname_3_members">%1$s, %2$s ve</string>
+    <string name="room_displayname_3_members">%1$s, %2$s ve %3$s</string>
     <string name="power_level_custom_no_value">Özel</string>
     <string name="notice_widget_removed_by_you">%1$s widgetını kaldırdınız</string>
     <string name="notice_widget_added_by_you">%1$s widgetını eklediniz</string>
-    <string name="notice_profile_change_redacted_by_you">Profilinizi güncellediniz</string>
+    <string name="notice_profile_change_redacted_by_you">Profilinizi güncellediniz %1$s</string>
     <string name="room_displayname_room_invite">Oda daveti</string>
     <string name="medium_phone_number">Telefon numarası</string>
     <string name="medium_email">E-posta adresi</string>
@@ -1801,7 +1795,6 @@
     <string name="message_failed_to_upload">Görüntü yüklenemedi</string>
     <string name="unable_to_send_message">Mesaj gönderilemedi</string>
     <string name="power_level_default">Varsayılan</string>
-    <string name="power_level_admin"></string>
     <string name="notice_widget_jitsi_modified_by_you">Video konferansı düzenlediniz</string>
     <string name="notice_widget_jitsi_modified">Video konferans %1$s tarafından düzenlendi</string>
     <string name="notice_widget_jitsi_removed_by_you">Video konferansı sonlandırdınız</string>

From 47aeadef7c0313ec315b19b976f0597083d2b354 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 18:34:54 +0200
Subject: [PATCH 548/578] Add configuration for new Irish language

---
 vector/src/main/res/values-ga/strings_no_weblate.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 vector/src/main/res/values-ga/strings_no_weblate.xml

diff --git a/vector/src/main/res/values-ga/strings_no_weblate.xml b/vector/src/main/res/values-ga/strings_no_weblate.xml
new file mode 100644
index 0000000000..ec03f726fd
--- /dev/null
+++ b/vector/src/main/res/values-ga/strings_no_weblate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="resources_language">ga</string>
+    <string name="resources_country_code">IE</string>
+    <string name="resources_script">Latn</string>
+
+</resources>
\ No newline at end of file

From e7608469ca16269ac45d5dcd8ad2aadd033fe7b5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 18:42:52 +0200
Subject: [PATCH 549/578] Import SAS strings

---
 .../src/main/res/values-fi/strings_sas.xml    |  2 +-
 .../src/main/res/values-ja/strings_sas.xml    | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml b/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml
index b690fee4ed..12edb39070 100644
--- a/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml
+++ b/matrix-sdk-android/src/main/res/values-fi/strings_sas.xml
@@ -35,7 +35,7 @@
     <string name="verification_emoji_robot">Robotti</string>
     <string name="verification_emoji_hat">Hattu</string>
     <string name="verification_emoji_glasses">Silmälasit</string>
-    <string name="verification_emoji_spanner">Mutteriavain</string>
+    <string name="verification_emoji_spanner">Kiintoavain</string>
     <string name="verification_emoji_santa">Joulupukki</string>
     <string name="verification_emoji_thumbs_up">Peukalo ylös</string>
     <string name="verification_emoji_umbrella">Sateenvarjo</string>
diff --git a/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml b/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml
index 618302eb4f..12f90e316d 100644
--- a/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml
+++ b/matrix-sdk-android/src/main/res/values-ja/strings_sas.xml
@@ -3,18 +3,66 @@
     <!-- Generated file, do not edit -->
     <string name="verification_emoji_dog">犬</string>
     <string name="verification_emoji_cat">猫</string>
+    <string name="verification_emoji_lion">ライオン</string>
     <string name="verification_emoji_horse">馬</string>
+    <string name="verification_emoji_unicorn">ユニコーン</string>
+    <string name="verification_emoji_pig">ブタ</string>
+    <string name="verification_emoji_elephant">ゾウ</string>
+    <string name="verification_emoji_rabbit">うさぎ</string>
+    <string name="verification_emoji_panda">パンダ</string>
+    <string name="verification_emoji_rooster">ニワトリ</string>
+    <string name="verification_emoji_penguin">ペンギン</string>
+    <string name="verification_emoji_turtle">亀</string>
+    <string name="verification_emoji_fish">魚</string>
     <string name="verification_emoji_octopus">たこ</string>
+    <string name="verification_emoji_butterfly">ちょうちょ</string>
     <string name="verification_emoji_flower">花</string>
     <string name="verification_emoji_tree">木</string>
+    <string name="verification_emoji_cactus">サボテン</string>
     <string name="verification_emoji_mushroom">きのこ</string>
+    <string name="verification_emoji_globe">地球</string>
     <string name="verification_emoji_moon">月</string>
+    <string name="verification_emoji_cloud">雲</string>
+    <string name="verification_emoji_fire">炎</string>
+    <string name="verification_emoji_banana">バナナ</string>
     <string name="verification_emoji_apple">リンゴ</string>
+    <string name="verification_emoji_strawberry">いちご</string>
+    <string name="verification_emoji_corn">とうもろこし</string>
+    <string name="verification_emoji_pizza">ピザ</string>
     <string name="verification_emoji_cake">ケーキ</string>
+    <string name="verification_emoji_heart">ハート</string>
+    <string name="verification_emoji_smiley">スマイル</string>
     <string name="verification_emoji_robot">ロボと</string>
+    <string name="verification_emoji_hat">帽子</string>
     <string name="verification_emoji_glasses">めがね</string>
+    <string name="verification_emoji_spanner">スパナ</string>
+    <string name="verification_emoji_santa">サンタ</string>
+    <string name="verification_emoji_thumbs_up">いいね</string>
+    <string name="verification_emoji_umbrella">傘</string>
+    <string name="verification_emoji_hourglass">砂時計</string>
+    <string name="verification_emoji_clock">時計</string>
+    <string name="verification_emoji_gift">ギフト</string>
+    <string name="verification_emoji_light_bulb">電球</string>
     <string name="verification_emoji_book">本</string>
+    <string name="verification_emoji_pencil">鉛筆</string>
+    <string name="verification_emoji_paperclip">クリップ</string>
+    <string name="verification_emoji_scissors">はさみ</string>
+    <string name="verification_emoji_lock">錠前</string>
+    <string name="verification_emoji_key">鍵</string>
+    <string name="verification_emoji_hammer">金槌</string>
     <string name="verification_emoji_telephone">電話機</string>
+    <string name="verification_emoji_flag">旗</string>
     <string name="verification_emoji_train">電車</string>
     <string name="verification_emoji_bicycle">自転車</string>
+    <string name="verification_emoji_aeroplane">飛行機</string>
+    <string name="verification_emoji_rocket">ロケット</string>
+    <string name="verification_emoji_trophy">トロフィー</string>
+    <string name="verification_emoji_ball">ボール</string>
+    <string name="verification_emoji_guitar">ギター</string>
+    <string name="verification_emoji_trumpet">トランペット</string>
+    <string name="verification_emoji_bell">ベル</string>
+    <string name="verification_emoji_anchor">いかり</string>
+    <string name="verification_emoji_headphones">ヘッドホン</string>
+    <string name="verification_emoji_folder">フォルダ</string>
+    <string name="verification_emoji_pin">ピン</string>
 </resources>

From b423d5da4c9f24bc46abe55e810ec496e30bb14b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Apr 2021 19:00:02 +0200
Subject: [PATCH 550/578] typo

---
 tools/import_emojis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/import_emojis.py b/tools/import_emojis.py
index f5638175a9..a626a5a260 100755
--- a/tools/import_emojis.py
+++ b/tools/import_emojis.py
@@ -22,7 +22,7 @@ emoji_picker_datasource_emojis = emoji_picker_datasource["emojis"]
 
 
 # Get official emoji list from unicode.org (Emoji List, v13.1 at time of writing)
-print("Fetching emoji list from Unicode.org...",)
+print("Fetching emoji list from Unicode.org...")
 req = requests.get("https://unicode.org/emoji/charts/emoji-list.html")
 soup = BeautifulSoup(req.content, 'html.parser')
 

From 505b01ad97a141288738f17ca779037bcff0b4d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 07:19:20 +0000
Subject: [PATCH 551/578] Bump daggerVersion from 2.33 to 2.34

Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 34460c6ab5..669444d563 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -112,7 +112,7 @@ dependencies {
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
-    def daggerVersion = '2.33'
+    def daggerVersion = '2.34'
     def work_version = '2.5.0'
     def retrofit_version = '2.9.0'
 
diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..38d3a4abbc 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -297,7 +297,7 @@ dependencies {
     def big_image_viewer_version = '1.7.1'
     def glide_version = '4.12.0'
     def moshi_version = '1.12.0'
-    def daggerVersion = '2.33'
+    def daggerVersion = '2.34'
     def autofill_version = "1.1.0"
     def work_version = '2.5.0'
     def arch_version = '2.1.0'

From 3ca00969c53cc84f0497d094968fd45bf6a10f70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 07:22:02 +0000
Subject: [PATCH 552/578] Bump media from 1.2.1 to 1.3.0

Bumps media from 1.2.1 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..511e2f7561 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -326,7 +326,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.sharetarget:sharetarget:1.1.0"
     implementation 'androidx.core:core-ktx:1.3.2'
-    implementation "androidx.media:media:1.2.1"
+    implementation "androidx.media:media:1.3.0"
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
     implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.9.0"

From 68efa63de4cde655b6fd0b82834129c567e655ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 07:22:33 +0000
Subject: [PATCH 553/578] Bump recyclerview from 1.2.0-rc01 to 1.2.0

Bumps recyclerview from 1.2.0-rc01 to 1.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 attachment-viewer/build.gradle | 2 +-
 vector/build.gradle            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 5a8cce92e8..8db57a59af 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.recyclerview:recyclerview:1.2.0-rc01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
 
     implementation 'com.google.android.material:material:1.3.0'
 }
\ No newline at end of file
diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..2da7349a5e 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -320,7 +320,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0-rc01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

From 9b5bc60fa9674523c2de1eadd31ab5d17f8b57ab Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 09:54:51 +0200
Subject: [PATCH 554/578] Remove unused parameter and use same value than the
 JS SDK

---
 .../org/matrix/android/sdk/internal/network/Request.kt   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index e39bce6c67..170ce09149 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -28,22 +28,21 @@ import java.io.IOException
 
 /**
  * Execute a request from the requestBlock and handle some of the Exception it could generate
+ * Ref: https://github.com/matrix-org/matrix-js-sdk/blob/develop/src/scheduler.js#L138-L175
  *
  * @param globalErrorReceiver will be use to notify error such as invalid token error. See [GlobalError]
  * @param canRetry if set to true, the request will be executed again in case of error, after a delay
- * @param initialDelayBeforeRetry the first delay to wait before a request is retried. Will be doubled after each retry
  * @param maxDelayBeforeRetry the max delay to wait before a retry
  * @param maxRetriesCount the max number of retries
  * @param requestBlock a suspend lambda to perform the network request
  */
 internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErrorReceiver?,
                                                   canRetry: Boolean = false,
-                                                  initialDelayBeforeRetry: Long = 100L,
-                                                  maxDelayBeforeRetry: Long = 10_000L,
-                                                  maxRetriesCount: Int = Int.MAX_VALUE,
+                                                  maxDelayBeforeRetry: Long = 32_000L,
+                                                  maxRetriesCount: Int = 4,
                                                   noinline requestBlock: suspend () -> DATA): DATA {
     var currentRetryCount = 0
-    var currentDelay = initialDelayBeforeRetry
+    var currentDelay = 1_000L
 
     while (true) {
         try {

From 8dead986a5c5d6d7febb5729e68623f4a9dbc764 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 10:59:51 +0200
Subject: [PATCH 555/578] Always try to retry Http requests in case of 429
 (#1300)

---
 CHANGES.md                                         |  1 +
 .../matrix/android/sdk/internal/network/Request.kt | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 86ba91c9df..1a684ee56f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ Improvements 🙌:
  - Room list improvements (paging)
  - Fix quick click action (#3127)
  - Get Event after a Push for a faster notification display in some conditions
+ - Always try to retry Http requests in case of 429 (#1300)
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 170ce09149..0246bae024 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.network
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.failure.getRetryDelay
 import org.matrix.android.sdk.api.failure.shouldBeRetried
 import org.matrix.android.sdk.internal.network.ssl.CertUtil
@@ -71,9 +72,16 @@ internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErr
                     // }
                     ?.also { unrecognizedCertificateException -> throw unrecognizedCertificateException }
 
-            if (canRetry && currentRetryCount++ < maxRetriesCount && exception.shouldBeRetried()) {
-                // In case of 429, ensure we wait enough
-                delay(currentDelay.coerceAtLeast(exception.getRetryDelay(0)))
+            currentRetryCount++
+
+            if (exception is Failure.ServerError
+                    && exception.httpCode == 429
+                    && exception.error.code == MatrixError.M_LIMIT_EXCEEDED
+                    && currentRetryCount < maxRetriesCount) {
+                // 429, we can retry
+                delay(exception.getRetryDelay(1_000))
+            } else if (canRetry && currentRetryCount < maxRetriesCount && exception.shouldBeRetried()) {
+                delay(currentDelay)
                 currentDelay = currentDelay.times(2L).coerceAtMost(maxDelayBeforeRetry)
                 // Try again (loop)
             } else {

From 760e14531f31bc4bd6a61ae931c94eddc750bf6e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 8 Apr 2021 12:09:35 +0200
Subject: [PATCH 556/578] Fix EW-EA compatibility for verification

---
 .../verification/IncomingVerificationRequestHandler.kt | 10 +++++++++-
 .../vector/app/features/home/HomeActivityViewModel.kt  |  5 ++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index fc526b5322..45feaa47c3 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -60,7 +60,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
         // TODO maybe check also if
         val uid = "kvr_${tx.transactionId}"
         when (tx.state) {
-            is VerificationTxState.OnStarted       -> {
+            is VerificationTxState.OnStarted -> {
                 // Add a notification for every incoming request
                 val user = session?.getUser(tx.otherUserId)
                 val name = user?.getBestName() ?: tx.otherUserId
@@ -119,6 +119,14 @@ class IncomingVerificationRequestHandler @Inject constructor(
         Timber.v("## SAS verificationRequestCreated ${pr.transactionId}")
         // For incoming request we should prompt (if not in activity where this request apply)
         if (pr.isIncoming) {
+
+            // if it's a self verification for my devices, we can discard the review login alert
+            // if not this request will be underneath and not visible by the user...
+            // it will re-appear later
+            if (pr.otherUserId == session?.myUserId) {
+                // XXX this is a bit hard coded :/
+                popupAlertManager.cancelAlert("review_login")
+            }
             val user = session?.getUser(pr.otherUserId)?.toMatrixItem()
             val name = user?.getBestName() ?: pr.otherUserId
             val description = if (name == pr.otherUserId) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index ad61928509..523898e0f5 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -203,9 +203,8 @@ class HomeActivityViewModel @AssistedInject constructor(
                     _viewEvents.post(
                             HomeActivityViewEvents.OnNewSession(
                                     session.getUser(session.myUserId)?.toMatrixItem(),
-                                    // If it's an old unverified, we should send requests
-                                    // instead of waiting for an incoming one
-                                    reAuthHelper.data != null
+                                    //Always send request instead of waiting for an incoming as per recent EW changes
+                                    false
                             )
                     )
                 }

From c6bd37810457c93a6605a2d65d86579a227dd4bf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 12:44:28 +0200
Subject: [PATCH 557/578] Test is passing

---
 .../androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index 6f8056de13..53e1645f09 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -78,6 +78,7 @@ class UiAllScreensSanityTest {
     // Last passing:
     // 2020-11-09
     // 2020-12-16 After ViewBinding huge change
+    // 2021-04-08 Testing 429 change
     @Test
     fun allScreensTest() {
         // Create an account

From 7b1d313e8ee2e56406f8285aaf8ec4a766ff7788 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 12:46:55 +0200
Subject: [PATCH 558/578] Small cleanup

---
 .../android/sdk/internal/session/room/send/SendEventWorker.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
index c1fc2fd9fe..d55dce57af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
@@ -91,7 +91,7 @@ internal class SendEventWorker(context: Context,
             if (/*currentAttemptCount >= MAX_NUMBER_OF_RETRY_BEFORE_FAILING ||**/ !exception.shouldBeRetried()) {
                 Timber.e("## SendEvent: [${System.currentTimeMillis()}]  Send event Failed cannot retry ${params.eventId} > ${exception.localizedMessage}")
                 localEchoRepository.updateSendState(event.eventId, event.roomId, SendState.UNDELIVERED)
-                return Result.success()
+                Result.success()
             } else {
                 Timber.e("## SendEvent: [${System.currentTimeMillis()}]  Send event Failed schedule retry ${params.eventId} > ${exception.localizedMessage}")
                 Result.retry()

From 1715143b85175993625acac274eda2cd6cb50b46 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 16:18:58 +0200
Subject: [PATCH 559/578] Filter some other words Cannot filter canonical alias
 anymore, as we now use word boundaries

---
 .../roomdirectory/ExplicitTermFilterTest.kt   | 118 ++++++++++++++++++
 vector/src/main/assets/forbidden_terms.txt    |  71 +++++++++++
 .../roomdirectory/ExplicitTermFilter.kt       |  39 ++++++
 .../roomdirectory/RoomDirectoryViewModel.kt   |  15 +--
 4 files changed, 231 insertions(+), 12 deletions(-)
 create mode 100644 vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
 create mode 100644 vector/src/main/assets/forbidden_terms.txt
 create mode 100644 vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt

diff --git a/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt b/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
new file mode 100644
index 0000000000..a5d8108ae9
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.roomdirectory
+
+import im.vector.app.InstrumentedTest
+import im.vector.app.core.utils.AssetReader
+import org.amshove.kluent.shouldBe
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class ExplicitTermFilterTest : InstrumentedTest {
+
+    private val explicitTermFilter = ExplicitTermFilter(AssetReader(context()))
+
+    @Test
+    fun isValidEmptyTrue() {
+        explicitTermFilter.isValid("") shouldBe true
+    }
+
+    @Test
+    fun isValidTrue() {
+        explicitTermFilter.isValid("Hello") shouldBe true
+    }
+
+    @Test
+    fun isValidFalse() {
+        explicitTermFilter.isValid("nsfw") shouldBe false
+    }
+
+    @Test
+    fun isValidUpCaseFalse() {
+        explicitTermFilter.isValid("Nsfw") shouldBe false
+    }
+
+    @Test
+    fun isValidMultilineTrue() {
+        explicitTermFilter.isValid("Hello\nWorld") shouldBe true
+    }
+
+    @Test
+    fun isValidMultilineFalse() {
+        explicitTermFilter.isValid("Hello\nnsfw") shouldBe false
+    }
+
+    @Test
+    fun isValidMultilineFalse2() {
+        explicitTermFilter.isValid("nsfw\nHello") shouldBe false
+    }
+
+    @Test
+    fun isValidAnalFalse() {
+        explicitTermFilter.isValid("anal") shouldBe false
+    }
+
+    @Test
+    fun isValidAnal2False() {
+        explicitTermFilter.isValid("There is some anal in this room") shouldBe false
+    }
+
+    @Test
+    fun isValidAnalysisTrue() {
+        explicitTermFilter.isValid("analysis") shouldBe true
+    }
+
+    @Test
+    fun isValidAnalysis2True() {
+        explicitTermFilter.isValid("There is some analysis in the room") shouldBe true
+    }
+
+    @Test
+    fun isValidSpecialCharFalse() {
+        explicitTermFilter.isValid("18+") shouldBe false
+    }
+
+    @Test
+    fun isValidSpecialChar2False() {
+        explicitTermFilter.isValid("This is a room with 18+ content") shouldBe false
+    }
+
+    @Test
+    fun isValidOtherSpecialCharFalse() {
+        explicitTermFilter.isValid("strap-on") shouldBe false
+    }
+
+    @Test
+    fun isValidOtherSpecialChar2False() {
+        explicitTermFilter.isValid("This is a room with strap-on content") shouldBe false
+    }
+
+    @Test
+    fun isValid18True() {
+        explicitTermFilter.isValid("18") shouldBe true
+    }
+
+    @Test
+    fun isValidLastFalse() {
+        explicitTermFilter.isValid("zoo") shouldBe false
+    }
+}
\ No newline at end of file
diff --git a/vector/src/main/assets/forbidden_terms.txt b/vector/src/main/assets/forbidden_terms.txt
new file mode 100644
index 0000000000..693da9c520
--- /dev/null
+++ b/vector/src/main/assets/forbidden_terms.txt
@@ -0,0 +1,71 @@
+anal
+bbc
+bbw
+bdsm
+beast
+bestiality
+blowjob
+bondage
+boobs
+clit
+cock
+cuck
+cum
+cunt
+daddy
+dick
+dildo
+erotic
+exhibitionism
+faggot
+feet
+femboy
+fisting
+flogging
+fmf
+foursome
+futa
+gangbang
+gore
+h3ntai
+handjob
+hentai
+incest
+jizz
+kink
+loli
+m4f
+masturbation
+mfm
+mfm
+milf
+moresome
+naked
+neet
+nipple
+nsfw
+nude
+nudity
+orgy
+pedo
+pegging
+penis
+petplay
+porn
+pussy
+rape
+rimming
+sadism
+sadomasochism
+sexy
+shota
+spank
+squirt
+strap-on
+threesome
+vagina
+vibrator
+voyeur
+watersports
+xxx
+zoo
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
new file mode 100644
index 0000000000..addc04ed96
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.roomdirectory
+
+import im.vector.app.core.utils.AssetReader
+import javax.inject.Inject
+
+class ExplicitTermFilter @Inject constructor(
+        assetReader: AssetReader
+) {
+    // List of forbidden terms is in file asset forbidden_terms.txt, in lower case
+    private val explicitContentRegex = assetReader.readAssetFile("forbidden_terms.txt")
+            .orEmpty()
+            .split("\n")
+            .map { it.trim() }
+            .filter { it.isNotEmpty() }
+            .joinToString(prefix = ".*\\b(", separator = "|", postfix = ")\\b.*")
+            .toRegex(RegexOption.IGNORE_CASE)
+
+    fun isValid(str: String): Boolean {
+        return explicitContentRegex.matches(str.replace("\n", " ")).not()
+                // Special treatment for "18+" since word boundaries does not work here
+                && str.contains("18+").not()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 4ef38758c7..9932fdb551 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -42,12 +42,12 @@ import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryDat
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
-import java.util.Locale
 
 class RoomDirectoryViewModel @AssistedInject constructor(
         @Assisted initialState: PublicRoomsViewState,
         vectorPreferences: VectorPreferences,
-        private val session: Session
+        private val session: Session,
+        private val explicitTermFilter: ExplicitTermFilter
 ) : VectorViewModel<PublicRoomsViewState, RoomDirectoryAction, RoomDirectoryViewEvents>(initialState) {
 
     @AssistedFactory
@@ -58,11 +58,6 @@ class RoomDirectoryViewModel @AssistedInject constructor(
     companion object : MvRxViewModelFactory<RoomDirectoryViewModel, PublicRoomsViewState> {
         private const val PUBLIC_ROOMS_LIMIT = 20
 
-        // List of forbidden terms, in lower case
-        private val explicitContentTerms = listOf(
-                "nsfw"
-        )
-
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: PublicRoomsViewState): RoomDirectoryViewModel? {
             val activity: RoomDirectoryActivity = (viewModelContext as ActivityViewModelContext).activity()
@@ -202,11 +197,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(
             // Filter
             val newPublicRooms = data.chunk.orEmpty()
                     .filter {
-                        showAllRooms
-                                || "${it.name.orEmpty()} ${it.topic.orEmpty()} ${it.canonicalAlias.orEmpty()}".toLowerCase(Locale.ROOT)
-                                .let { str ->
-                                    explicitContentTerms.all { term -> term !in str }
-                                }
+                        showAllRooms || explicitTermFilter.isValid("${it.name.orEmpty()} ${it.topic.orEmpty()}")
                     }
 
             setState {

From 153d393bf1a9a33316bd7fd7a22da653f6279a87 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 17:28:47 +0200
Subject: [PATCH 560/578] Prevent searching for forbidden terms

---
 .../features/roomdirectory/ExplicitTermFilterTest.kt  | 10 ++++++++++
 .../app/features/roomdirectory/ExplicitTermFilter.kt  |  8 +++++++-
 .../features/roomdirectory/RoomDirectoryViewModel.kt  | 11 +++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt b/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
index a5d8108ae9..7c66ad7462 100644
--- a/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
@@ -115,4 +115,14 @@ class ExplicitTermFilterTest : InstrumentedTest {
     fun isValidLastFalse() {
         explicitTermFilter.isValid("zoo") shouldBe false
     }
+
+    @Test
+    fun canSearchForFalse() {
+        explicitTermFilter.canSearchFor("zoo") shouldBe false
+    }
+
+    @Test
+    fun canSearchForTrue() {
+        explicitTermFilter.canSearchFor("android") shouldBe true
+    }
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
index addc04ed96..8abccbbe5e 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
@@ -23,14 +23,20 @@ class ExplicitTermFilter @Inject constructor(
         assetReader: AssetReader
 ) {
     // List of forbidden terms is in file asset forbidden_terms.txt, in lower case
-    private val explicitContentRegex = assetReader.readAssetFile("forbidden_terms.txt")
+    private val explicitTerms = assetReader.readAssetFile("forbidden_terms.txt")
             .orEmpty()
             .split("\n")
             .map { it.trim() }
             .filter { it.isNotEmpty() }
+
+    private val explicitContentRegex = explicitTerms
             .joinToString(prefix = ".*\\b(", separator = "|", postfix = ")\\b.*")
             .toRegex(RegexOption.IGNORE_CASE)
 
+    fun canSearchFor(term: String): Boolean {
+        return term !in explicitTerms  && term != "18+"
+    }
+
     fun isValid(str: String): Boolean {
         return explicitContentRegex.matches(str.replace("\n", " ")).not()
                 // Special treatment for "18+" since word boundaries does not work here
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 9932fdb551..a6c4646f8c 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -161,6 +161,17 @@ class RoomDirectoryViewModel @AssistedInject constructor(
     }
 
     private fun load(filter: String, roomDirectoryData: RoomDirectoryData) {
+        if (!showAllRooms && !explicitTermFilter.canSearchFor(filter)) {
+            setState {
+                copy(
+                        asyncPublicRoomsRequest = Success(Unit),
+                        publicRooms = emptyList(),
+                        hasMore = false
+                )
+            }
+            return
+        }
+
         currentJob = viewModelScope.launch {
             val data = try {
                 session.getPublicRooms(roomDirectoryData.homeServer,

From 2e9f8ae6ae728a1d2a279d455cf2fdabf154ef8a Mon Sep 17 00:00:00 2001
From: Aleks <oleksii.perets@globekeeper.com>
Date: Mon, 29 Mar 2021 09:20:22 +0200
Subject: [PATCH 561/578] registration availability endpoint added

---
 .../android/sdk/api/auth/data/Availability.kt | 26 ++++++++++++++++
 .../registration/RegistrationAvailability.kt  | 24 +++++++++++++++
 .../auth/registration/RegistrationWizard.kt   |  2 ++
 .../android/sdk/api/failure/Extensions.kt     |  8 +++++
 .../android/sdk/internal/auth/AuthAPI.kt      | 15 ++++++----
 .../registration/DefaultRegistrationWizard.kt | 21 ++++++++++---
 .../registration/RegisterAvailableTask.kt     | 30 +++++++++++++++++++
 7 files changed, 116 insertions(+), 10 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt
new file mode 100644
index 0000000000..3fbbdd161f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.auth.data
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class Availability(
+    @Json(name = "available")
+    val available: Boolean
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
new file mode 100644
index 0000000000..7c7d769a35
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.auth.registration
+
+import org.matrix.android.sdk.api.failure.Failure
+
+sealed class RegistrationAvailability {
+    data class Available(val available: Boolean): RegistrationAvailability()
+    data class NotAvailable(val failure: Failure.ServerError): RegistrationAvailability()
+}
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
index d00c9a0c82..38a5a77291 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
@@ -36,6 +36,8 @@ interface RegistrationWizard {
 
     suspend fun checkIfEmailHasBeenValidated(delayMillis: Long): RegistrationResult
 
+    suspend fun registrationAvailable(userName: String): RegistrationAvailability
+
     val currentThreePid: String?
 
     // True when login and password has been sent with success to the homeserver
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index 17362ff8d7..7f25eedb23 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -87,3 +87,11 @@ fun Throwable.toRegistrationFlowResponse(): RegistrationFlowResponse? {
         null
     }
 }
+
+fun Throwable.isRegistrationAvailabilityError(): Boolean {
+    return this is Failure.ServerError
+            && (error.code == MatrixError.M_USER_IN_USE
+                    || error.code == MatrixError.M_INVALID_USERNAME
+                    || error.code == MatrixError.M_EXCLUSIVE)
+            && httpCode == 400
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index 2ce5c67a94..6566aae5fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.auth
 
+import org.matrix.android.sdk.api.auth.data.Availability
 import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.internal.auth.data.LoginFlowResponse
 import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
@@ -29,12 +30,8 @@ import org.matrix.android.sdk.internal.auth.registration.SuccessResult
 import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Headers
-import retrofit2.http.POST
-import retrofit2.http.Path
-import retrofit2.http.Url
+import retrofit2.Call
+import retrofit2.http.*
 
 /**
  * The login REST API.
@@ -65,6 +62,12 @@ internal interface AuthAPI {
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register")
     suspend fun register(@Body registrationParams: RegistrationParams): Credentials
 
+    /**
+     * Checks to see if a username is available, and valid, for the server.
+     */
+    @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register/available")
+    fun registerAvailable(@Query("username") username: String): Call<Availability>
+
     /**
      * Add 3Pid during registration
      * Ref: https://gist.github.com/jryans/839a09bf0c5a70e2f36ed990d50ed928
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 91e414e689..3be95f6a4a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -18,12 +18,10 @@ package org.matrix.android.sdk.internal.auth.registration
 
 import kotlinx.coroutines.delay
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
-import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
-import org.matrix.android.sdk.api.auth.registration.RegistrationResult
-import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
-import org.matrix.android.sdk.api.auth.registration.toFlowResult
+import org.matrix.android.sdk.api.auth.registration.*
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.Failure.RegistrationFlowError
+import org.matrix.android.sdk.api.failure.isRegistrationAvailabilityError
 import org.matrix.android.sdk.internal.auth.AuthAPI
 import org.matrix.android.sdk.internal.auth.PendingSessionStore
 import org.matrix.android.sdk.internal.auth.SessionCreator
@@ -41,6 +39,7 @@ internal class DefaultRegistrationWizard(
     private var pendingSessionData: PendingSessionData = pendingSessionStore.getPendingSessionData() ?: error("Pending session data should exist here")
 
     private val registerTask = DefaultRegisterTask(authAPI)
+    private val registerAvailableTask = RegisterAvailableTask(authAPI)
     private val registerAddThreePidTask = DefaultRegisterAddThreePidTask(authAPI)
     private val validateCodeTask = DefaultValidateCodeTask(authAPI)
 
@@ -203,4 +202,18 @@ internal class DefaultRegistrationWizard(
         val session = sessionCreator.createSession(credentials, pendingSessionData.homeServerConnectionConfig)
         return RegistrationResult.Success(session)
     }
+
+    override suspend fun registrationAvailable(userName: String): RegistrationAvailability {
+        val availability = try {
+            registerAvailableTask.execute(userName)
+        } catch (exception: Throwable) {
+            if(exception.isRegistrationAvailabilityError()) {
+                return RegistrationAvailability.NotAvailable(exception as Failure.ServerError)
+            } else {
+                throw exception
+            }
+        }
+
+        return RegistrationAvailability.Available(availability.available)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
new file mode 100644
index 0000000000..aa2bb767f9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.auth.registration
+
+import org.matrix.android.sdk.api.auth.data.Availability
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+
+internal class RegisterAvailableTask(private val authAPI: AuthAPI) : Task<String, Availability> {
+    override suspend fun execute(params: String): Availability {
+        return executeRequest(null) {
+            apiCall = authAPI.registerAvailable(params)
+        }
+    }
+}
\ No newline at end of file

From 9ce9d1e5491b800bc3291bd575f45ad5742959cb Mon Sep 17 00:00:00 2001
From: Aleks <oleksii.perets@globekeeper.com>
Date: Mon, 29 Mar 2021 15:31:53 +0200
Subject: [PATCH 562/578] CHANGES.md updated

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 1a684ee56f..3362588cf8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ Improvements 🙌:
  - Fix quick click action (#3127)
  - Get Event after a Push for a faster notification display in some conditions
  - Always try to retry Http requests in case of 429 (#1300)
+ - registration availability endpoint added to matrix-sdk
 
 Bugfix 🐛:
  - Fix bad theme change for the MainActivity

From 4451b682b17ba9d4cb6a853a747fad94e93f5d6a Mon Sep 17 00:00:00 2001
From: Aleks <oleksii.perets@globekeeper.com>
Date: Thu, 8 Apr 2021 11:30:41 +0200
Subject: [PATCH 563/578] merge + register/available endpoint corrections

---
 .../android/sdk/api/auth/data/Availability.kt |  2 +-
 .../registration/RegistrationAvailability.kt  |  4 ++--
 .../android/sdk/internal/auth/AuthAPI.kt      |  2 +-
 .../registration/DefaultRegistrationWizard.kt | 15 +-----------
 .../registration/RegisterAvailableTask.kt     | 24 ++++++++++++++-----
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt
index 3fbbdd161f..93e0ac4e44 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt
@@ -20,7 +20,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class Availability(
+internal data class Availability(
     @Json(name = "available")
     val available: Boolean
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
index 7c7d769a35..5f944a86d9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
@@ -19,6 +19,6 @@ package org.matrix.android.sdk.api.auth.registration
 import org.matrix.android.sdk.api.failure.Failure
 
 sealed class RegistrationAvailability {
-    data class Available(val available: Boolean): RegistrationAvailability()
+    object Available : RegistrationAvailability()
     data class NotAvailable(val failure: Failure.ServerError): RegistrationAvailability()
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index 6566aae5fe..216be83ea3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -66,7 +66,7 @@ internal interface AuthAPI {
      * Checks to see if a username is available, and valid, for the server.
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "register/available")
-    fun registerAvailable(@Query("username") username: String): Call<Availability>
+    suspend fun registerAvailable(@Query("username") username: String): Availability
 
     /**
      * Add 3Pid during registration
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 3be95f6a4a..ace2e62043 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -21,7 +21,6 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.registration.*
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.Failure.RegistrationFlowError
-import org.matrix.android.sdk.api.failure.isRegistrationAvailabilityError
 import org.matrix.android.sdk.internal.auth.AuthAPI
 import org.matrix.android.sdk.internal.auth.PendingSessionStore
 import org.matrix.android.sdk.internal.auth.SessionCreator
@@ -203,17 +202,5 @@ internal class DefaultRegistrationWizard(
         return RegistrationResult.Success(session)
     }
 
-    override suspend fun registrationAvailable(userName: String): RegistrationAvailability {
-        val availability = try {
-            registerAvailableTask.execute(userName)
-        } catch (exception: Throwable) {
-            if(exception.isRegistrationAvailabilityError()) {
-                return RegistrationAvailability.NotAvailable(exception as Failure.ServerError)
-            } else {
-                throw exception
-            }
-        }
-
-        return RegistrationAvailability.Available(availability.available)
-    }
+    override suspend fun registrationAvailable(userName: String): RegistrationAvailability = registerAvailableTask.execute(userName)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
index aa2bb767f9..791b725357 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
@@ -16,15 +16,27 @@
 
 package org.matrix.android.sdk.internal.auth.registration
 
-import org.matrix.android.sdk.api.auth.data.Availability
+import org.matrix.android.sdk.api.auth.registration.RegistrationAvailability
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.isRegistrationAvailabilityError
 import org.matrix.android.sdk.internal.auth.AuthAPI
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
 
-internal class RegisterAvailableTask(private val authAPI: AuthAPI) : Task<String, Availability> {
-    override suspend fun execute(params: String): Availability {
-        return executeRequest(null) {
-            apiCall = authAPI.registerAvailable(params)
+internal class RegisterAvailableTask(private val authAPI: AuthAPI) : Task<String, RegistrationAvailability> {
+    override suspend fun execute(params: String): RegistrationAvailability {
+        try {
+            executeRequest(null) {
+                authAPI.registerAvailable(params)
+            }
+        } catch (exception: Throwable) {
+            if(exception.isRegistrationAvailabilityError()) {
+                return RegistrationAvailability.NotAvailable(exception as Failure.ServerError)
+            } else {
+                throw exception
+            }
         }
+
+        return RegistrationAvailability.Available
     }
-}
\ No newline at end of file
+}

From 9d96f90e49dcd05319b06ae6457989add0578b0e Mon Sep 17 00:00:00 2001
From: Aleks <oleksii.perets@globekeeper.com>
Date: Thu, 8 Apr 2021 12:15:19 +0200
Subject: [PATCH 564/578] keyword-spacing fix + wildcard-imports fix

---
 .../internal/auth/registration/DefaultRegistrationWizard.kt | 6 +++++-
 .../sdk/internal/auth/registration/RegisterAvailableTask.kt | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index ace2e62043..16c05dd8a9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -18,7 +18,11 @@ package org.matrix.android.sdk.internal.auth.registration
 
 import kotlinx.coroutines.delay
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
-import org.matrix.android.sdk.api.auth.registration.*
+import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
+import org.matrix.android.sdk.api.auth.registration.RegistrationAvailability
+import org.matrix.android.sdk.api.auth.registration.RegistrationResult
+import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
+import org.matrix.android.sdk.api.auth.registration.toFlowResult
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.Failure.RegistrationFlowError
 import org.matrix.android.sdk.internal.auth.AuthAPI
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
index 791b725357..d1aa265636 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
@@ -30,7 +30,7 @@ internal class RegisterAvailableTask(private val authAPI: AuthAPI) : Task<String
                 authAPI.registerAvailable(params)
             }
         } catch (exception: Throwable) {
-            if(exception.isRegistrationAvailabilityError()) {
+            if (exception.isRegistrationAvailabilityError()) {
                 return RegistrationAvailability.NotAvailable(exception as Failure.ServerError)
             } else {
                 throw exception

From 2a1e52745fe8ea14468abcba9d3521b14af41b38 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 18:48:43 +0200
Subject: [PATCH 565/578] Some cleanup after merge of #3084

---
 .../registration/RegistrationAvailability.kt  |  4 ++--
 .../android/sdk/api/failure/Extensions.kt     | 13 +++++++-----
 .../android/sdk/internal/auth/AuthAPI.kt      |  2 +-
 .../auth/data/Availability.kt                 | 11 ++++++----
 .../registration/DefaultRegistrationWizard.kt | 12 ++++++-----
 .../registration/RegisterAvailableTask.kt     | 21 ++++++++++++-------
 6 files changed, 38 insertions(+), 25 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{api => internal}/auth/data/Availability.kt (68%)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
index 5f944a86d9..f9a7ace7ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationAvailability.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,5 +20,5 @@ import org.matrix.android.sdk.api.failure.Failure
 
 sealed class RegistrationAvailability {
     object Available : RegistrationAvailability()
-    data class NotAvailable(val failure: Failure.ServerError): RegistrationAvailability()
+    data class NotAvailable(val failure: Failure.ServerError) : RegistrationAvailability()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index 7f25eedb23..0ba61e5890 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -65,13 +65,16 @@ fun Throwable.isInvalidUIAAuth(): Boolean {
  * Try to convert to a RegistrationFlowResponse. Return null in the cases it's not possible
  */
 fun Throwable.toRegistrationFlowResponse(): RegistrationFlowResponse? {
-    return if (this is Failure.OtherServerError && httpCode == 401) {
+    return if (this is Failure.OtherServerError
+            && httpCode == HttpsURLConnection.HTTP_UNAUTHORIZED /* 401 */) {
         tryOrNull {
             MoshiProvider.providesMoshi()
                     .adapter(RegistrationFlowResponse::class.java)
                     .fromJson(errorBody)
         }
-    } else if (this is Failure.ServerError && httpCode == 401 && error.code == MatrixError.M_FORBIDDEN) {
+    } else if (this is Failure.ServerError
+            && httpCode == HttpsURLConnection.HTTP_UNAUTHORIZED /* 401 */
+            && error.code == MatrixError.M_FORBIDDEN) {
         // This happens when the submission for this stage was bad (like bad password)
         if (error.session != null && error.flows != null) {
             RegistrationFlowResponse(
@@ -90,8 +93,8 @@ fun Throwable.toRegistrationFlowResponse(): RegistrationFlowResponse? {
 
 fun Throwable.isRegistrationAvailabilityError(): Boolean {
     return this is Failure.ServerError
+            && httpCode == HttpsURLConnection.HTTP_BAD_REQUEST /* 400 */
             && (error.code == MatrixError.M_USER_IN_USE
-                    || error.code == MatrixError.M_INVALID_USERNAME
-                    || error.code == MatrixError.M_EXCLUSIVE)
-            && httpCode == 400
+            || error.code == MatrixError.M_INVALID_USERNAME
+            || error.code == MatrixError.M_EXCLUSIVE)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index 216be83ea3..d6a197b06b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -16,8 +16,8 @@
 
 package org.matrix.android.sdk.internal.auth
 
-import org.matrix.android.sdk.api.auth.data.Availability
 import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.internal.auth.data.Availability
 import org.matrix.android.sdk.internal.auth.data.LoginFlowResponse
 import org.matrix.android.sdk.internal.auth.data.PasswordLoginParams
 import org.matrix.android.sdk.internal.auth.data.RiotConfig
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/Availability.kt
similarity index 68%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/Availability.kt
index 93e0ac4e44..5ef3c0d06a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Availability.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/Availability.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.auth.data
+package org.matrix.android.sdk.internal.auth.data
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 internal data class Availability(
-    @Json(name = "available")
-    val available: Boolean
+        /**
+         * A flag to indicate that the username is available. This should always be true when the server replies with 200 OK.
+         */
+        @Json(name = "available")
+        val available: Boolean? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 16c05dd8a9..4a3d53a8fc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -41,10 +41,10 @@ internal class DefaultRegistrationWizard(
 
     private var pendingSessionData: PendingSessionData = pendingSessionStore.getPendingSessionData() ?: error("Pending session data should exist here")
 
-    private val registerTask = DefaultRegisterTask(authAPI)
-    private val registerAvailableTask = RegisterAvailableTask(authAPI)
-    private val registerAddThreePidTask = DefaultRegisterAddThreePidTask(authAPI)
-    private val validateCodeTask = DefaultValidateCodeTask(authAPI)
+    private val registerTask: RegisterTask = DefaultRegisterTask(authAPI)
+    private val registerAvailableTask: RegisterAvailableTask = DefaultRegisterAvailableTask(authAPI)
+    private val registerAddThreePidTask: RegisterAddThreePidTask = DefaultRegisterAddThreePidTask(authAPI)
+    private val validateCodeTask: ValidateCodeTask = DefaultValidateCodeTask(authAPI)
 
     override val currentThreePid: String?
         get() {
@@ -206,5 +206,7 @@ internal class DefaultRegistrationWizard(
         return RegistrationResult.Success(session)
     }
 
-    override suspend fun registrationAvailable(userName: String): RegistrationAvailability = registerAvailableTask.execute(userName)
+    override suspend fun registrationAvailable(userName: String): RegistrationAvailability {
+        return registerAvailableTask.execute(RegisterAvailableTask.Params(userName))
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
index d1aa265636..314a24dad4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAvailableTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,20 +23,25 @@ import org.matrix.android.sdk.internal.auth.AuthAPI
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
 
-internal class RegisterAvailableTask(private val authAPI: AuthAPI) : Task<String, RegistrationAvailability> {
-    override suspend fun execute(params: String): RegistrationAvailability {
-        try {
+internal interface RegisterAvailableTask : Task<RegisterAvailableTask.Params, RegistrationAvailability> {
+    data class Params(
+            val userName: String
+    )
+}
+
+internal class DefaultRegisterAvailableTask(private val authAPI: AuthAPI) : RegisterAvailableTask {
+    override suspend fun execute(params: RegisterAvailableTask.Params): RegistrationAvailability {
+        return try {
             executeRequest(null) {
-                authAPI.registerAvailable(params)
+                authAPI.registerAvailable(params.userName)
             }
+            RegistrationAvailability.Available
         } catch (exception: Throwable) {
             if (exception.isRegistrationAvailabilityError()) {
-                return RegistrationAvailability.NotAvailable(exception as Failure.ServerError)
+                RegistrationAvailability.NotAvailable(exception as Failure.ServerError)
             } else {
                 throw exception
             }
         }
-
-        return RegistrationAvailability.Available
     }
 }

From ee3eb8e1d6744049e524f8e55342506437cc019d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 18:52:53 +0200
Subject: [PATCH 566/578] Cleanup

---
 .../java/org/matrix/android/sdk/internal/auth/AuthAPI.kt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index d6a197b06b..f93f285c6e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -30,8 +30,13 @@ import org.matrix.android.sdk.internal.auth.registration.SuccessResult
 import org.matrix.android.sdk.internal.auth.registration.ValidationCodeBody
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
-import retrofit2.http.*
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.POST
+import retrofit2.http.Path
+import retrofit2.http.Query
+import retrofit2.http.Url
 
 /**
  * The login REST API.

From 1233fde2617ceaf40dc52e79514d2c0660e6c83f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 8 Apr 2021 18:26:55 +0100
Subject: [PATCH 567/578] Update forbidden_terms.txt

---
 vector/src/main/assets/forbidden_terms.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/assets/forbidden_terms.txt b/vector/src/main/assets/forbidden_terms.txt
index 693da9c520..84e7fe1d28 100644
--- a/vector/src/main/assets/forbidden_terms.txt
+++ b/vector/src/main/assets/forbidden_terms.txt
@@ -1,5 +1,4 @@
 anal
-bbc
 bbw
 bdsm
 beast
@@ -18,7 +17,6 @@ dildo
 erotic
 exhibitionism
 faggot
-feet
 femboy
 fisting
 flogging
@@ -35,14 +33,13 @@ jizz
 kink
 loli
 m4f
+masturbate
 masturbation
 mfm
-mfm
 milf
 moresome
 naked
 neet
-nipple
 nsfw
 nude
 nudity
@@ -68,4 +65,4 @@ vibrator
 voyeur
 watersports
 xxx
-zoo
\ No newline at end of file
+zoo

From f1e280827de7043d3c1a5a77d001bbf0e545b9f0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Apr 2021 19:39:49 +0200
Subject: [PATCH 568/578] Ensure there is no dup and cleanup

---
 .../vector/app/features/roomdirectory/ExplicitTermFilterTest.kt | 2 +-
 .../im/vector/app/features/roomdirectory/ExplicitTermFilter.kt  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt b/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
index 7c66ad7462..b2beec5b66 100644
--- a/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/roomdirectory/ExplicitTermFilterTest.kt
@@ -125,4 +125,4 @@ class ExplicitTermFilterTest : InstrumentedTest {
     fun canSearchForTrue() {
         explicitTermFilter.canSearchFor("android") shouldBe true
     }
-}
\ No newline at end of file
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
index 8abccbbe5e..0d1f55485c 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/ExplicitTermFilter.kt
@@ -27,6 +27,7 @@ class ExplicitTermFilter @Inject constructor(
             .orEmpty()
             .split("\n")
             .map { it.trim() }
+            .distinct()
             .filter { it.isNotEmpty() }
 
     private val explicitContentRegex = explicitTerms

From a4a37777229fd4fe6afd6e5beeba4f9342850699 Mon Sep 17 00:00:00 2001
From: oogm <ga84dom@mytum.de>
Date: Thu, 8 Apr 2021 22:14:41 +0200
Subject: [PATCH 569/578] Update import_emojis.py to retain keyword order

---
 tools/import_emojis.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/import_emojis.py b/tools/import_emojis.py
index a626a5a260..30db3b0b13 100755
--- a/tools/import_emojis.py
+++ b/tools/import_emojis.py
@@ -114,11 +114,13 @@ for emoji in emoji_picker_datasource_emojis:
 
     # If additional keywords exist, add them to emoji_picker_datasource_emojis
     # Avoid duplicates and keep order. Put official unicode.com keywords first and extend up with emojilib ones.
-    new_keywords = OrderedDict.fromkeys(emoji_picker_datasource_emojis[emoji]["j"] + emoji_additional_keywords).keys()
+    new_keywords = OrderedDict.fromkeys(emoji_picker_datasource_emojis[emoji]["j"] + emoji_additional_keywords)
     # Remove the ones derived from the unicode name
-    new_keywords = new_keywords - {emoji.replace("-", "_")} - {emoji.replace("-", " ")} - {emoji_name}
+    for keyword in [emoji.replace("-", "_")] + [emoji.replace("-", " ")] + [emoji_name]:
+        if keyword in new_keywords:
+            new_keywords.pop(keyword)
     # Write new keywords back
-    emoji_picker_datasource_emojis[emoji]["j"] = list(new_keywords)
+    emoji_picker_datasource_emojis[emoji]["j"] = list(new_keywords.keys())
 
 # Filter out components from unicode 13.1 (as they are not suitable for single-emoji reactions)
 emoji_picker_datasource['categories'] = [x for x in emoji_picker_datasource['categories'] if x['id'] != 'component']

From 327e75e8e59cdcbbf628ff0e262def8606b6cf7c Mon Sep 17 00:00:00 2001
From: oogm <ga84dom@mytum.de>
Date: Thu, 8 Apr 2021 22:26:31 +0200
Subject: [PATCH 570/578] Update CHANGES.md

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3362588cf8..e419cccba7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,7 @@ Bugfix 🐛:
  - Fix avatar rendering for DMs, after initial sync (#2693)
  - Fix mandatory parameter in API (#3065)
  - If signout request fails, do not start LoginActivity, but restart the app (#3099)
+ - Retain keyword order in emoji import script (#3147)
 
 Translations 🗣:
  -

From b5b651244b8af586eb7a57aa039781fdb2c0a857 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 07:25:53 +0000
Subject: [PATCH 571/578] Bump firebase-messaging from 21.0.1 to 21.1.0

Bumps firebase-messaging from 21.0.1 to 21.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..393db17033 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -423,7 +423,7 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
 
     // gplay flavor only
-    gplayImplementation('com.google.firebase:firebase-messaging:21.0.1') {
+    gplayImplementation('com.google.firebase:firebase-messaging:21.1.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'

From 5311bacfff8eb5464a8032e8967f883b067f1a57 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 9 Apr 2021 10:26:28 +0200
Subject: [PATCH 572/578] ktlint

---
 .../crypto/verification/IncomingVerificationRequestHandler.kt   | 1 -
 .../java/im/vector/app/features/home/HomeActivityViewModel.kt   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
index 45feaa47c3..0b93120b52 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
@@ -119,7 +119,6 @@ class IncomingVerificationRequestHandler @Inject constructor(
         Timber.v("## SAS verificationRequestCreated ${pr.transactionId}")
         // For incoming request we should prompt (if not in activity where this request apply)
         if (pr.isIncoming) {
-
             // if it's a self verification for my devices, we can discard the review login alert
             // if not this request will be underneath and not visible by the user...
             // it will re-appear later
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index 523898e0f5..447a567cf4 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -203,7 +203,7 @@ class HomeActivityViewModel @AssistedInject constructor(
                     _viewEvents.post(
                             HomeActivityViewEvents.OnNewSession(
                                     session.getUser(session.myUserId)?.toMatrixItem(),
-                                    //Always send request instead of waiting for an incoming as per recent EW changes
+                                    // Always send request instead of waiting for an incoming as per recent EW changes
                                     false
                             )
                     )

From 93bc5abcb58f47b7574c7395cbd0bebf1b24d0cd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Apr 2021 10:32:11 +0200
Subject: [PATCH 573/578] Update the Emoji source file

---
 CHANGES.md                                           | 2 +-
 vector/src/main/res/raw/emoji_picker_datasource.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e419cccba7..996e59a00c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,7 +28,7 @@ Bugfix 🐛:
  - Fix avatar rendering for DMs, after initial sync (#2693)
  - Fix mandatory parameter in API (#3065)
  - If signout request fails, do not start LoginActivity, but restart the app (#3099)
- - Retain keyword order in emoji import script (#3147)
+ - Retain keyword order in emoji import script, and update the generated file (#3147)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/raw/emoji_picker_datasource.json b/vector/src/main/res/raw/emoji_picker_datasource.json
index cc676a4dd0..6aa3799cf0 100644
--- a/vector/src/main/res/raw/emoji_picker_datasource.json
+++ b/vector/src/main/res/raw/emoji_picker_datasource.json
@@ -1 +1 @@
-{"compressed":true,"categories":[{"id":"smileys_&_emotion","name":"Smileys & Emotion","emojis":["grinning-face","grinning-face-with-big-eyes","grinning-face-with-smiling-eyes","beaming-face-with-smiling-eyes","grinning-squinting-face","grinning-face-with-sweat","rolling-on-the-floor-laughing","face-with-tears-of-joy","slightly-smiling-face","upsidedown-face","winking-face","smiling-face-with-smiling-eyes","smiling-face-with-halo","smiling-face-with-hearts","smiling-face-with-hearteyes","starstruck","face-blowing-a-kiss","kissing-face","smiling-face","kissing-face-with-closed-eyes","kissing-face-with-smiling-eyes","smiling-face-with-tear","face-savoring-food","face-with-tongue","winking-face-with-tongue","zany-face","squinting-face-with-tongue","moneymouth-face","hugging-face","face-with-hand-over-mouth","shushing-face","thinking-face","zippermouth-face","face-with-raised-eyebrow","neutral-face","expressionless-face","face-without-mouth","face-in-clouds","smirking-face","unamused-face","face-with-rolling-eyes","grimacing-face","face-exhaling","lying-face","relieved-face","pensive-face","sleepy-face","drooling-face","sleeping-face","face-with-medical-mask","face-with-thermometer","face-with-headbandage","nauseated-face","face-vomiting","sneezing-face","hot-face","cold-face","woozy-face","knockedout-face","face-with-spiral-eyes","exploding-head","cowboy-hat-face","partying-face","disguised-face","smiling-face-with-sunglasses","nerd-face","face-with-monocle","confused-face","worried-face","slightly-frowning-face","frowning-face","face-with-open-mouth","hushed-face","astonished-face","flushed-face","pleading-face","frowning-face-with-open-mouth","anguished-face","fearful-face","anxious-face-with-sweat","sad-but-relieved-face","crying-face","loudly-crying-face","face-screaming-in-fear","confounded-face","persevering-face","disappointed-face","downcast-face-with-sweat","weary-face","tired-face","yawning-face","face-with-steam-from-nose","pouting-face","angry-face","face-with-symbols-on-mouth","smiling-face-with-horns","angry-face-with-horns","skull","skull-and-crossbones","pile-of-poo","clown-face","ogre","goblin","ghost","alien","alien-monster","robot","grinning-cat","grinning-cat-with-smiling-eyes","cat-with-tears-of-joy","smiling-cat-with-hearteyes","cat-with-wry-smile","kissing-cat","weary-cat","crying-cat","pouting-cat","seenoevil-monkey","hearnoevil-monkey","speaknoevil-monkey","kiss-mark","love-letter","heart-with-arrow","heart-with-ribbon","sparkling-heart","growing-heart","beating-heart","revolving-hearts","two-hearts","heart-decoration","heart-exclamation","broken-heart","heart-on-fire","mending-heart","red-heart","orange-heart","yellow-heart","green-heart","blue-heart","purple-heart","brown-heart","black-heart","white-heart","hundred-points","anger-symbol","collision","dizzy","sweat-droplets","dashing-away","hole","bomb","speech-balloon","eye-in-speech-bubble","left-speech-bubble","right-anger-bubble","thought-balloon","zzz"]},{"id":"people_&_body","name":"People & Body","emojis":["waving-hand","raised-back-of-hand","hand-with-fingers-splayed","raised-hand","vulcan-salute","ok-hand","pinched-fingers","pinching-hand","victory-hand","crossed-fingers","loveyou-gesture","sign-of-the-horns","call-me-hand","backhand-index-pointing-left","backhand-index-pointing-right","backhand-index-pointing-up","middle-finger","backhand-index-pointing-down","index-pointing-up","thumbs-up","thumbs-down","raised-fist","oncoming-fist","leftfacing-fist","rightfacing-fist","clapping-hands","raising-hands","open-hands","palms-up-together","handshake","folded-hands","writing-hand","nail-polish","selfie","flexed-biceps","mechanical-arm","mechanical-leg","leg","foot","ear","ear-with-hearing-aid","nose","brain","anatomical-heart","lungs","tooth","bone","eyes","eye","tongue","mouth","baby","child","boy","girl","person","person-blond-hair","man","person-beard","man-beard","woman-beard","man-red-hair","man-curly-hair","man-white-hair","man-bald","woman","woman-red-hair","person-red-hair","woman-curly-hair","person-curly-hair","woman-white-hair","person-white-hair","woman-bald","person-bald","woman-blond-hair","man-blond-hair","older-person","old-man","old-woman","person-frowning","man-frowning","woman-frowning","person-pouting","man-pouting","woman-pouting","person-gesturing-no","man-gesturing-no","woman-gesturing-no","person-gesturing-ok","man-gesturing-ok","woman-gesturing-ok","person-tipping-hand","man-tipping-hand","woman-tipping-hand","person-raising-hand","man-raising-hand","woman-raising-hand","deaf-person","deaf-man","deaf-woman","person-bowing","man-bowing","woman-bowing","person-facepalming","man-facepalming","woman-facepalming","person-shrugging","man-shrugging","woman-shrugging","health-worker","man-health-worker","woman-health-worker","student","man-student","woman-student","teacher","man-teacher","woman-teacher","judge","man-judge","woman-judge","farmer","man-farmer","woman-farmer","cook","man-cook","woman-cook","mechanic","man-mechanic","woman-mechanic","factory-worker","man-factory-worker","woman-factory-worker","office-worker","man-office-worker","woman-office-worker","scientist","man-scientist","woman-scientist","technologist","man-technologist","woman-technologist","singer","man-singer","woman-singer","artist","man-artist","woman-artist","pilot","man-pilot","woman-pilot","astronaut","man-astronaut","woman-astronaut","firefighter","man-firefighter","woman-firefighter","police-officer","man-police-officer","woman-police-officer","detective","man-detective","woman-detective","guard","man-guard","woman-guard","ninja","construction-worker","man-construction-worker","woman-construction-worker","prince","princess","person-wearing-turban","man-wearing-turban","woman-wearing-turban","person-with-skullcap","woman-with-headscarf","person-in-tuxedo","man-in-tuxedo","woman-in-tuxedo","person-with-veil","man-with-veil","woman-with-veil","pregnant-woman","breastfeeding","woman-feeding-baby","man-feeding-baby","person-feeding-baby","baby-angel","santa-claus","mrs-claus","mx-claus","superhero","man-superhero","woman-superhero","supervillain","man-supervillain","woman-supervillain","mage","man-mage","woman-mage","fairy","man-fairy","woman-fairy","vampire","man-vampire","woman-vampire","merperson","merman","mermaid","elf","man-elf","woman-elf","genie","man-genie","woman-genie","zombie","man-zombie","woman-zombie","person-getting-massage","man-getting-massage","woman-getting-massage","person-getting-haircut","man-getting-haircut","woman-getting-haircut","person-walking","man-walking","woman-walking","person-standing","man-standing","woman-standing","person-kneeling","man-kneeling","woman-kneeling","person-with-white-cane","man-with-white-cane","woman-with-white-cane","person-in-motorized-wheelchair","man-in-motorized-wheelchair","woman-in-motorized-wheelchair","person-in-manual-wheelchair","man-in-manual-wheelchair","woman-in-manual-wheelchair","person-running","man-running","woman-running","woman-dancing","man-dancing","person-in-suit-levitating","people-with-bunny-ears","men-with-bunny-ears","women-with-bunny-ears","person-in-steamy-room","man-in-steamy-room","woman-in-steamy-room","person-climbing","man-climbing","woman-climbing","person-fencing","horse-racing","skier","snowboarder","person-golfing","man-golfing","woman-golfing","person-surfing","man-surfing","woman-surfing","person-rowing-boat","man-rowing-boat","woman-rowing-boat","person-swimming","man-swimming","woman-swimming","person-bouncing-ball","man-bouncing-ball","woman-bouncing-ball","person-lifting-weights","man-lifting-weights","woman-lifting-weights","person-biking","man-biking","woman-biking","person-mountain-biking","man-mountain-biking","woman-mountain-biking","person-cartwheeling","man-cartwheeling","woman-cartwheeling","people-wrestling","men-wrestling","women-wrestling","person-playing-water-polo","man-playing-water-polo","woman-playing-water-polo","person-playing-handball","man-playing-handball","woman-playing-handball","person-juggling","man-juggling","woman-juggling","person-in-lotus-position","man-in-lotus-position","woman-in-lotus-position","person-taking-bath","person-in-bed","people-holding-hands","women-holding-hands","woman-and-man-holding-hands","men-holding-hands","kiss","kiss-woman-man","kiss-man-man","kiss-woman-woman","couple-with-heart","couple-with-heart-woman-man","couple-with-heart-man-man","couple-with-heart-woman-woman","family","family-man-woman-boy","family-man-woman-girl","family-man-woman-girl-boy","family-man-woman-boy-boy","family-man-woman-girl-girl","family-man-man-boy","family-man-man-girl","family-man-man-girl-boy","family-man-man-boy-boy","family-man-man-girl-girl","family-woman-woman-boy","family-woman-woman-girl","family-woman-woman-girl-boy","family-woman-woman-boy-boy","family-woman-woman-girl-girl","family-man-boy","family-man-boy-boy","family-man-girl","family-man-girl-boy","family-man-girl-girl","family-woman-boy","family-woman-boy-boy","family-woman-girl","family-woman-girl-boy","family-woman-girl-girl","speaking-head","bust-in-silhouette","busts-in-silhouette","people-hugging","footprints"]},{"id":"animals_&_nature","name":"Animals & Nature","emojis":["monkey-face","monkey","gorilla","orangutan","dog-face","dog","guide-dog","service-dog","poodle","wolf","fox","raccoon","cat-face","cat","black-cat","lion","tiger-face","tiger","leopard","horse-face","horse","unicorn","zebra","deer","bison","cow-face","ox","water-buffalo","cow","pig-face","pig","boar","pig-nose","ram","ewe","goat","camel","twohump-camel","llama","giraffe","elephant","mammoth","rhinoceros","hippopotamus","mouse-face","mouse","rat","hamster","rabbit-face","rabbit","chipmunk","beaver","hedgehog","bat","bear","polar-bear","koala","panda","sloth","otter","skunk","kangaroo","badger","paw-prints","turkey","chicken","rooster","hatching-chick","baby-chick","frontfacing-baby-chick","bird","penguin","dove","eagle","duck","swan","owl","dodo","feather","flamingo","peacock","parrot","frog","crocodile","turtle","lizard","snake","dragon-face","dragon","sauropod","trex","spouting-whale","whale","dolphin","seal","fish","tropical-fish","blowfish","shark","octopus","spiral-shell","snail","butterfly","bug","ant","honeybee","beetle","lady-beetle","cricket","cockroach","spider","spider-web","scorpion","mosquito","fly","worm","microbe","bouquet","cherry-blossom","white-flower","rosette","rose","wilted-flower","hibiscus","sunflower","blossom","tulip","seedling","potted-plant","evergreen-tree","deciduous-tree","palm-tree","cactus","sheaf-of-rice","herb","shamrock","four-leaf-clover","maple-leaf","fallen-leaf","leaf-fluttering-in-wind"]},{"id":"food_&_drink","name":"Food & Drink","emojis":["grapes","melon","watermelon","tangerine","lemon","banana","pineapple","mango","red-apple","green-apple","pear","peach","cherries","strawberry","blueberries","kiwi-fruit","tomato","olive","coconut","avocado","eggplant","potato","carrot","ear-of-corn","hot-pepper","bell-pepper","cucumber","leafy-green","broccoli","garlic","onion","mushroom","peanuts","chestnut","bread","croissant","baguette-bread","flatbread","pretzel","bagel","pancakes","waffle","cheese-wedge","meat-on-bone","poultry-leg","cut-of-meat","bacon","hamburger","french-fries","pizza","hot-dog","sandwich","taco","burrito","tamale","stuffed-flatbread","falafel","egg","cooking","shallow-pan-of-food","pot-of-food","fondue","bowl-with-spoon","green-salad","popcorn","butter","salt","canned-food","bento-box","rice-cracker","rice-ball","cooked-rice","curry-rice","steaming-bowl","spaghetti","roasted-sweet-potato","oden","sushi","fried-shrimp","fish-cake-with-swirl","moon-cake","dango","dumpling","fortune-cookie","takeout-box","crab","lobster","shrimp","squid","oyster","soft-ice-cream","shaved-ice","ice-cream","doughnut","cookie","birthday-cake","shortcake","cupcake","pie","chocolate-bar","candy","lollipop","custard","honey-pot","baby-bottle","glass-of-milk","hot-beverage","teapot","teacup-without-handle","sake","bottle-with-popping-cork","wine-glass","cocktail-glass","tropical-drink","beer-mug","clinking-beer-mugs","clinking-glasses","tumbler-glass","cup-with-straw","bubble-tea","beverage-box","mate","ice","chopsticks","fork-and-knife-with-plate","fork-and-knife","spoon","kitchen-knife","amphora"]},{"id":"travel_&_places","name":"Travel & Places","emojis":["globe-showing-europeafrica","globe-showing-americas","globe-showing-asiaaustralia","globe-with-meridians","world-map","map-of-japan","compass","snowcapped-mountain","mountain","volcano","mount-fuji","camping","beach-with-umbrella","desert","desert-island","national-park","stadium","classical-building","building-construction","brick","rock","wood","hut","houses","derelict-house","house","house-with-garden","office-building","japanese-post-office","post-office","hospital","bank","hotel","love-hotel","convenience-store","school","department-store","factory","japanese-castle","castle","wedding","tokyo-tower","statue-of-liberty","church","mosque","hindu-temple","synagogue","shinto-shrine","kaaba","fountain","tent","foggy","night-with-stars","cityscape","sunrise-over-mountains","sunrise","cityscape-at-dusk","sunset","bridge-at-night","hot-springs","carousel-horse","ferris-wheel","roller-coaster","barber-pole","circus-tent","locomotive","railway-car","highspeed-train","bullet-train","train","metro","light-rail","station","tram","monorail","mountain-railway","tram-car","bus","oncoming-bus","trolleybus","minibus","ambulance","fire-engine","police-car","oncoming-police-car","taxi","oncoming-taxi","automobile","oncoming-automobile","sport-utility-vehicle","pickup-truck","delivery-truck","articulated-lorry","tractor","racing-car","motorcycle","motor-scooter","manual-wheelchair","motorized-wheelchair","auto-rickshaw","bicycle","kick-scooter","skateboard","roller-skate","bus-stop","motorway","railway-track","oil-drum","fuel-pump","police-car-light","horizontal-traffic-light","vertical-traffic-light","stop-sign","construction","anchor","sailboat","canoe","speedboat","passenger-ship","ferry","motor-boat","ship","airplane","small-airplane","airplane-departure","airplane-arrival","parachute","seat","helicopter","suspension-railway","mountain-cableway","aerial-tramway","satellite","rocket","flying-saucer","bellhop-bell","luggage","hourglass-done","hourglass-not-done","watch","alarm-clock","stopwatch","timer-clock","mantelpiece-clock","twelve-oclock","twelvethirty","one-oclock","onethirty","two-oclock","twothirty","three-oclock","threethirty","four-oclock","fourthirty","five-oclock","fivethirty","six-oclock","sixthirty","seven-oclock","seventhirty","eight-oclock","eightthirty","nine-oclock","ninethirty","ten-oclock","tenthirty","eleven-oclock","eleventhirty","new-moon","waxing-crescent-moon","first-quarter-moon","waxing-gibbous-moon","full-moon","waning-gibbous-moon","last-quarter-moon","waning-crescent-moon","crescent-moon","new-moon-face","first-quarter-moon-face","last-quarter-moon-face","thermometer","sun","full-moon-face","sun-with-face","ringed-planet","star","glowing-star","shooting-star","milky-way","cloud","sun-behind-cloud","cloud-with-lightning-and-rain","sun-behind-small-cloud","sun-behind-large-cloud","sun-behind-rain-cloud","cloud-with-rain","cloud-with-snow","cloud-with-lightning","tornado","fog","wind-face","cyclone","rainbow","closed-umbrella","umbrella","umbrella-with-rain-drops","umbrella-on-ground","high-voltage","snowflake","snowman","snowman-without-snow","comet","fire","droplet","water-wave"]},{"id":"activities","name":"Activities","emojis":["jackolantern","christmas-tree","fireworks","sparkler","firecracker","sparkles","balloon","party-popper","confetti-ball","tanabata-tree","pine-decoration","japanese-dolls","carp-streamer","wind-chime","moon-viewing-ceremony","red-envelope","ribbon","wrapped-gift","reminder-ribbon","admission-tickets","ticket","military-medal","trophy","sports-medal","1st-place-medal","2nd-place-medal","3rd-place-medal","soccer-ball","baseball","softball","basketball","volleyball","american-football","rugby-football","tennis","flying-disc","bowling","cricket-game","field-hockey","ice-hockey","lacrosse","ping-pong","badminton","boxing-glove","martial-arts-uniform","goal-net","flag-in-hole","ice-skate","fishing-pole","diving-mask","running-shirt","skis","sled","curling-stone","bullseye","yoyo","kite","pool-8-ball","crystal-ball","magic-wand","nazar-amulet","video-game","joystick","slot-machine","game-die","puzzle-piece","teddy-bear","piata","nesting-dolls","spade-suit","heart-suit","diamond-suit","club-suit","chess-pawn","joker","mahjong-red-dragon","flower-playing-cards","performing-arts","framed-picture","artist-palette","thread","sewing-needle","yarn","knot"]},{"id":"objects","name":"Objects","emojis":["glasses","sunglasses","goggles","lab-coat","safety-vest","necktie","tshirt","jeans","scarf","gloves","coat","socks","dress","kimono","sari","onepiece-swimsuit","briefs","shorts","bikini","womans-clothes","purse","handbag","clutch-bag","shopping-bags","backpack","thong-sandal","mans-shoe","running-shoe","hiking-boot","flat-shoe","highheeled-shoe","womans-sandal","ballet-shoes","womans-boot","crown","womans-hat","top-hat","graduation-cap","billed-cap","military-helmet","rescue-workers-helmet","prayer-beads","lipstick","ring","gem-stone","muted-speaker","speaker-low-volume","speaker-medium-volume","speaker-high-volume","loudspeaker","megaphone","postal-horn","bell","bell-with-slash","musical-score","musical-note","musical-notes","studio-microphone","level-slider","control-knobs","microphone","headphone","radio","saxophone","accordion","guitar","musical-keyboard","trumpet","violin","banjo","drum","long-drum","mobile-phone","mobile-phone-with-arrow","telephone","telephone-receiver","pager","fax-machine","battery","electric-plug","laptop","desktop-computer","printer","keyboard","computer-mouse","trackball","computer-disk","floppy-disk","optical-disk","dvd","abacus","movie-camera","film-frames","film-projector","clapper-board","television","camera","camera-with-flash","video-camera","videocassette","magnifying-glass-tilted-left","magnifying-glass-tilted-right","candle","light-bulb","flashlight","red-paper-lantern","diya-lamp","notebook-with-decorative-cover","closed-book","open-book","green-book","blue-book","orange-book","books","notebook","ledger","page-with-curl","scroll","page-facing-up","newspaper","rolledup-newspaper","bookmark-tabs","bookmark","label","money-bag","coin","yen-banknote","dollar-banknote","euro-banknote","pound-banknote","money-with-wings","credit-card","receipt","chart-increasing-with-yen","envelope","email","incoming-envelope","envelope-with-arrow","outbox-tray","inbox-tray","package","closed-mailbox-with-raised-flag","closed-mailbox-with-lowered-flag","open-mailbox-with-raised-flag","open-mailbox-with-lowered-flag","postbox","ballot-box-with-ballot","pencil","black-nib","fountain-pen","pen","paintbrush","crayon","memo","briefcase","file-folder","open-file-folder","card-index-dividers","calendar","tearoff-calendar","spiral-notepad","spiral-calendar","card-index","chart-increasing","chart-decreasing","bar-chart","clipboard","pushpin","round-pushpin","paperclip","linked-paperclips","straight-ruler","triangular-ruler","scissors","card-file-box","file-cabinet","wastebasket","locked","unlocked","locked-with-pen","locked-with-key","key","old-key","hammer","axe","pick","hammer-and-pick","hammer-and-wrench","dagger","crossed-swords","water-pistol","boomerang","bow-and-arrow","shield","carpentry-saw","wrench","screwdriver","nut-and-bolt","gear","clamp","balance-scale","white-cane","link","chains","hook","toolbox","magnet","ladder","alembic","test-tube","petri-dish","dna","microscope","telescope","satellite-antenna","syringe","drop-of-blood","pill","adhesive-bandage","stethoscope","door","elevator","mirror","window","bed","couch-and-lamp","chair","toilet","plunger","shower","bathtub","mouse-trap","razor","lotion-bottle","safety-pin","broom","basket","roll-of-paper","bucket","soap","toothbrush","sponge","fire-extinguisher","shopping-cart","cigarette","coffin","headstone","funeral-urn","moai","placard"]},{"id":"symbols","name":"Symbols","emojis":["atm-sign","litter-in-bin-sign","potable-water","wheelchair-symbol","mens-room","womens-room","restroom","baby-symbol","water-closet","passport-control","customs","baggage-claim","left-luggage","warning","children-crossing","no-entry","prohibited","no-bicycles","no-smoking","no-littering","nonpotable-water","no-pedestrians","no-mobile-phones","no-one-under-eighteen","radioactive","biohazard","up-arrow","upright-arrow","right-arrow","downright-arrow","down-arrow","downleft-arrow","left-arrow","upleft-arrow","updown-arrow","leftright-arrow","right-arrow-curving-left","left-arrow-curving-right","right-arrow-curving-up","right-arrow-curving-down","clockwise-vertical-arrows","counterclockwise-arrows-button","back-arrow","end-arrow","on-arrow","soon-arrow","top-arrow","place-of-worship","atom-symbol","om","star-of-david","wheel-of-dharma","yin-yang","latin-cross","orthodox-cross","star-and-crescent","peace-symbol","menorah","dotted-sixpointed-star","aries","taurus","gemini","cancer","leo","virgo","libra","scorpio","sagittarius","capricorn","aquarius","pisces","ophiuchus","shuffle-tracks-button","repeat-button","repeat-single-button","play-button","fastforward-button","next-track-button","play-or-pause-button","reverse-button","fast-reverse-button","last-track-button","upwards-button","fast-up-button","downwards-button","fast-down-button","pause-button","stop-button","record-button","eject-button","cinema","dim-button","bright-button","antenna-bars","vibration-mode","mobile-phone-off","female-sign","male-sign","transgender-symbol","multiply","plus","minus","divide","infinity","double-exclamation-mark","exclamation-question-mark","red-question-mark","white-question-mark","white-exclamation-mark","red-exclamation-mark","wavy-dash","currency-exchange","heavy-dollar-sign","medical-symbol","recycling-symbol","fleurdelis","trident-emblem","name-badge","japanese-symbol-for-beginner","hollow-red-circle","check-mark-button","check-box-with-check","check-mark","cross-mark","cross-mark-button","curly-loop","double-curly-loop","part-alternation-mark","eightspoked-asterisk","eightpointed-star","sparkle","copyright","registered","trade-mark","keycap","keycap","keycap-0","keycap-1","keycap-2","keycap-3","keycap-4","keycap-5","keycap-6","keycap-7","keycap-8","keycap-9","keycap-10","input-latin-uppercase","input-latin-lowercase","input-numbers","input-symbols","input-latin-letters","a-button-blood-type","ab-button-blood-type","b-button-blood-type","cl-button","cool-button","free-button","information","id-button","circled-m","new-button","ng-button","o-button-blood-type","ok-button","p-button","sos-button","up-button","vs-button","japanese-here-button","japanese-service-charge-button","japanese-monthly-amount-button","japanese-not-free-of-charge-button","japanese-reserved-button","japanese-bargain-button","japanese-discount-button","japanese-free-of-charge-button","japanese-prohibited-button","japanese-acceptable-button","japanese-application-button","japanese-passing-grade-button","japanese-vacancy-button","japanese-congratulations-button","japanese-secret-button","japanese-open-for-business-button","japanese-no-vacancy-button","red-circle","orange-circle","yellow-circle","green-circle","blue-circle","purple-circle","brown-circle","black-circle","white-circle","red-square","orange-square","yellow-square","green-square","blue-square","purple-square","brown-square","black-large-square","white-large-square","black-medium-square","white-medium-square","black-mediumsmall-square","white-mediumsmall-square","black-small-square","white-small-square","large-orange-diamond","large-blue-diamond","small-orange-diamond","small-blue-diamond","red-triangle-pointed-up","red-triangle-pointed-down","diamond-with-a-dot","radio-button","white-square-button","black-square-button"]},{"id":"flags","name":"Flags","emojis":["chequered-flag","triangular-flag","crossed-flags","black-flag","white-flag","rainbow-flag","transgender-flag","pirate-flag","flag-ascension-island","flag-andorra","flag-united-arab-emirates","flag-afghanistan","flag-antigua--barbuda","flag-anguilla","flag-albania","flag-armenia","flag-angola","flag-antarctica","flag-argentina","flag-american-samoa","flag-austria","flag-australia","flag-aruba","flag-land-islands","flag-azerbaijan","flag-bosnia--herzegovina","flag-barbados","flag-bangladesh","flag-belgium","flag-burkina-faso","flag-bulgaria","flag-bahrain","flag-burundi","flag-benin","flag-st-barthlemy","flag-bermuda","flag-brunei","flag-bolivia","flag-caribbean-netherlands","flag-brazil","flag-bahamas","flag-bhutan","flag-bouvet-island","flag-botswana","flag-belarus","flag-belize","flag-canada","flag-cocos-keeling-islands","flag-congo--kinshasa","flag-central-african-republic","flag-congo--brazzaville","flag-switzerland","flag-cte-divoire","flag-cook-islands","flag-chile","flag-cameroon","flag-china","flag-colombia","flag-clipperton-island","flag-costa-rica","flag-cuba","flag-cape-verde","flag-curaao","flag-christmas-island","flag-cyprus","flag-czechia","flag-germany","flag-diego-garcia","flag-djibouti","flag-denmark","flag-dominica","flag-dominican-republic","flag-algeria","flag-ceuta--melilla","flag-ecuador","flag-estonia","flag-egypt","flag-western-sahara","flag-eritrea","flag-spain","flag-ethiopia","flag-european-union","flag-finland","flag-fiji","flag-falkland-islands","flag-micronesia","flag-faroe-islands","flag-france","flag-gabon","flag-united-kingdom","flag-grenada","flag-georgia","flag-french-guiana","flag-guernsey","flag-ghana","flag-gibraltar","flag-greenland","flag-gambia","flag-guinea","flag-guadeloupe","flag-equatorial-guinea","flag-greece","flag-south-georgia--south-sandwich-islands","flag-guatemala","flag-guam","flag-guineabissau","flag-guyana","flag-hong-kong-sar-china","flag-heard--mcdonald-islands","flag-honduras","flag-croatia","flag-haiti","flag-hungary","flag-canary-islands","flag-indonesia","flag-ireland","flag-israel","flag-isle-of-man","flag-india","flag-british-indian-ocean-territory","flag-iraq","flag-iran","flag-iceland","flag-italy","flag-jersey","flag-jamaica","flag-jordan","flag-japan","flag-kenya","flag-kyrgyzstan","flag-cambodia","flag-kiribati","flag-comoros","flag-st-kitts--nevis","flag-north-korea","flag-south-korea","flag-kuwait","flag-cayman-islands","flag-kazakhstan","flag-laos","flag-lebanon","flag-st-lucia","flag-liechtenstein","flag-sri-lanka","flag-liberia","flag-lesotho","flag-lithuania","flag-luxembourg","flag-latvia","flag-libya","flag-morocco","flag-monaco","flag-moldova","flag-montenegro","flag-st-martin","flag-madagascar","flag-marshall-islands","flag-north-macedonia","flag-mali","flag-myanmar-burma","flag-mongolia","flag-macao-sar-china","flag-northern-mariana-islands","flag-martinique","flag-mauritania","flag-montserrat","flag-malta","flag-mauritius","flag-maldives","flag-malawi","flag-mexico","flag-malaysia","flag-mozambique","flag-namibia","flag-new-caledonia","flag-niger","flag-norfolk-island","flag-nigeria","flag-nicaragua","flag-netherlands","flag-norway","flag-nepal","flag-nauru","flag-niue","flag-new-zealand","flag-oman","flag-panama","flag-peru","flag-french-polynesia","flag-papua-new-guinea","flag-philippines","flag-pakistan","flag-poland","flag-st-pierre--miquelon","flag-pitcairn-islands","flag-puerto-rico","flag-palestinian-territories","flag-portugal","flag-palau","flag-paraguay","flag-qatar","flag-runion","flag-romania","flag-serbia","flag-russia","flag-rwanda","flag-saudi-arabia","flag-solomon-islands","flag-seychelles","flag-sudan","flag-sweden","flag-singapore","flag-st-helena","flag-slovenia","flag-svalbard--jan-mayen","flag-slovakia","flag-sierra-leone","flag-san-marino","flag-senegal","flag-somalia","flag-suriname","flag-south-sudan","flag-so-tom--prncipe","flag-el-salvador","flag-sint-maarten","flag-syria","flag-eswatini","flag-tristan-da-cunha","flag-turks--caicos-islands","flag-chad","flag-french-southern-territories","flag-togo","flag-thailand","flag-tajikistan","flag-tokelau","flag-timorleste","flag-turkmenistan","flag-tunisia","flag-tonga","flag-turkey","flag-trinidad--tobago","flag-tuvalu","flag-taiwan","flag-tanzania","flag-ukraine","flag-uganda","flag-us-outlying-islands","flag-united-nations","flag-united-states","flag-uruguay","flag-uzbekistan","flag-vatican-city","flag-st-vincent--grenadines","flag-venezuela","flag-british-virgin-islands","flag-us-virgin-islands","flag-vietnam","flag-vanuatu","flag-wallis--futuna","flag-samoa","flag-kosovo","flag-yemen","flag-mayotte","flag-south-africa","flag-zambia","flag-zimbabwe","flag-england","flag-scotland","flag-wales"]}],"emojis":{"grinning-face":{"a":"Grinning Face","b":"1F600","j":["grin","joy",":D","smile","happy","face"]},"grinning-face-with-big-eyes":{"a":"Grinning Face with Big Eyes","b":"1F603","j":["mouth","open","joy",":)",":D","funny","smile","happy","face","haha"]},"grinning-face-with-smiling-eyes":{"a":"Grinning Face with Smiling Eyes","b":"1F604","j":["mouth","open","eye","joy",":)","like",":D","funny","smile","happy","laugh","face","haha"]},"beaming-face-with-smiling-eyes":{"a":"Beaming Face with Smiling Eyes","b":"1F601","j":["grin","joy","eye","smile","kawaii","happy","face"]},"grinning-squinting-face":{"a":"Grinning Squinting Face","b":"1F606","j":["mouth","lol","joy","glad","XD","haha","smile","happy","laugh","face","satisfied"]},"grinning-face-with-sweat":{"a":"Grinning Face with Sweat","b":"1F605","j":["relief","open","sweat","hot","smile","cold","happy","laugh","face"]},"rolling-on-the-floor-laughing":{"a":"Rolling on the Floor Laughing","b":"1F923","j":["floor","lol","rolling","rotfl","rofl","laughing","laugh","face","haha"]},"face-with-tears-of-joy":{"a":"Face with Tears of Joy","b":"1F602","j":["tears","weep","tear","cry","joy","happytears","happy","laugh","face","haha"]},"slightly-smiling-face":{"a":"Slightly Smiling Face","b":"1F642","j":["smile","face"]},"upsidedown-face":{"a":"Upside-Down Face","b":"1F643","j":["upside_down_face","flipped","upside-down","smile","face","silly"]},"winking-face":{"a":"Winking Face","b":"1F609","j":["mischievous",";)","wink","eye","smile","secret","happy","face"]},"smiling-face-with-smiling-eyes":{"a":"Smiling Face with Smiling Eyes","b":"1F60A","j":["blush","eye","joy","smile","embarrassed","shy","crush","happy","flushed","face"]},"smiling-face-with-halo":{"a":"Smiling Face with Halo","b":"1F607","j":["halo","fantasy","innocent","angel","face","heaven"]},"smiling-face-with-hearts":{"a":"Smiling Face with Hearts","b":"1F970","j":["infatuation","hearts","love","like","valentines","affection","in love","crush","adore","face"]},"smiling-face-with-hearteyes":{"a":"Smiling Face with Heart-Eyes","b":"1F60D","j":["heart","smiling face with heart-eyes","eye","love","infatuation","like","affection","smile","valentines","smiling_face_with_heart_eyes","crush","face"]},"starstruck":{"a":"Star-Struck","b":"1F929","j":["starry-eyed","eyes","star_struck","grinning","smile","star-struck","starry","face","star"]},"face-blowing-a-kiss":{"a":"Face Blowing a Kiss","b":"1F618","j":["infatuation","love","kiss","like","valentines","affection","face"]},"kissing-face":{"a":"Kissing Face","b":"1F617","j":["3","infatuation","kiss","love","like","valentines","face"]},"smiling-face":{"a":"Smiling Face","b":"263A","j":["massage","outlined","blush","smile","happiness","relaxed","face"]},"kissing-face-with-closed-eyes":{"a":"Kissing Face with Closed Eyes","b":"1F61A","j":["closed","infatuation","eye","kiss","love","like","valentines","affection","face"]},"kissing-face-with-smiling-eyes":{"a":"Kissing Face with Smiling Eyes","b":"1F619","j":["infatuation","eye","kiss","valentines","smile","affection","face"]},"smiling-face-with-tear":{"a":"Smiling Face with Tear","b":"1F972","j":["touched","sad","grateful","tear","relieved","cry","smiling","proud","pretend"]},"face-savoring-food":{"a":"Face Savoring Food","b":"1F60B","j":["joy","nom","tongue","savouring","smile","delicious","yummy","yum","happy","face","silly"]},"face-with-tongue":{"a":"Face with Tongue","b":"1F61B","j":["prank","mischievous","playful","childish","tongue","smile","face"]},"winking-face-with-tongue":{"a":"Winking Face with Tongue","b":"1F61C","j":["prank","mischievous","playful","childish","wink","eye","tongue","smile","joke","face"]},"zany-face":{"a":"Zany Face","b":"1F92A","j":["eye","small","large","crazy","goofy","face"]},"squinting-face-with-tongue":{"a":"Squinting Face with Tongue","b":"1F61D","j":["prank","mischievous","taste","playful","eye","tongue","horrible","smile","face"]},"moneymouth-face":{"a":"Money-Mouth Face","b":"1F911","j":["mouth","dollar","money-mouth face","money","rich","face","money_mouth_face"]},"hugging-face":{"a":"Hugging Face","b":"1F917","j":["hugging","smile","hug","face"]},"face-with-hand-over-mouth":{"a":"Face with Hand over Mouth","b":"1F92D","j":["surprise","whoops","shock","face","sudden realization"]},"shushing-face":{"a":"Shushing Face","b":"1F92B","j":["shhh","shush","quiet","face"]},"thinking-face":{"a":"Thinking Face","b":"1F914","j":["consider","face","thinking","think","hmmm"]},"zippermouth-face":{"a":"Zipper-Mouth Face","b":"1F910","j":["zipper-mouth face","mouth","sealed","zipper_mouth_face","zipper","secret","face"]},"face-with-raised-eyebrow":{"a":"Face with Raised Eyebrow","b":"1F928","j":["disbelief","surprise","mild surprise","scepticism","disapproval","distrust","face","skeptic"]},"neutral-face":{"a":"Neutral Face","b":"1F610","j":["deadpan",":|","neutral","meh","face","indifference"]},"expressionless-face":{"a":"Expressionless Face","b":"1F611","j":["unexpressive","expressionless","-_-","deadpan","indifferent","meh","face","inexpressive"]},"face-without-mouth":{"a":"Face Without Mouth","b":"1F636","j":["mouth","silent","hellokitty","quiet","face"]},"face-in-clouds":{"a":"⊛ Face in Clouds","b":"1F636-200D-1F32B-FE0F","j":["absentminded","face in clouds","face in the fog","head in clouds"]},"smirking-face":{"a":"Smirking Face","b":"1F60F","j":["prank","smug","mean","sarcasm","smirk","smile","face"]},"unamused-face":{"a":"Unamused Face","b":"1F612","j":["unhappy","straight face","bored","side_eye","skeptical","dubious","sarcasm","unamused","serious","unimpressed","face","indifference"]},"face-with-rolling-eyes":{"a":"Face with Rolling Eyes","b":"1F644","j":["eyeroll","frustrated","rolling","eyes","face"]},"grimacing-face":{"a":"Grimacing Face","b":"1F62C","j":["teeth","grimace","face"]},"face-exhaling":{"a":"⊛ Face Exhaling","b":"1F62E-200D-1F4A8","j":["exhale","face exhaling","gasp","groan","relief","whisper","whistle"]},"lying-face":{"a":"Lying Face","b":"1F925","j":["lie","face","pinocchio"]},"relieved-face":{"a":"Relieved Face","b":"1F60C","j":["massage","relieved","phew","happiness","relaxed","face"]},"pensive-face":{"a":"Pensive Face","b":"1F614","j":["dejected","sad","pensive","depressed","upset","face"]},"sleepy-face":{"a":"Sleepy Face","b":"1F62A","j":["tired","rest","nap","face","sleep"]},"drooling-face":{"a":"Drooling Face","b":"1F924","j":["face","drooling"]},"sleeping-face":{"a":"Sleeping Face","b":"1F634","j":["night","sleepy","zzz","tired","face","sleep"]},"face-with-medical-mask":{"a":"Face with Medical Mask","b":"1F637","j":["sick","doctor","ill","disease","mask","cold","face"]},"face-with-thermometer":{"a":"Face with Thermometer","b":"1F912","j":["sick","thermometer","temperature","fever","ill","cold","face"]},"face-with-headbandage":{"a":"Face with Head-Bandage","b":"1F915","j":["face_with_head_bandage","injured","injury","clumsy","face with head-bandage","bandage","face","hurt"]},"nauseated-face":{"a":"Nauseated Face","b":"1F922","j":["sick","throw up","nauseated","ill","green","vomit","gross","face"]},"face-vomiting":{"a":"Face Vomiting","b":"1F92E","j":["puke","vomit","face","sick"]},"sneezing-face":{"a":"Sneezing Face","b":"1F927","j":["sick","allergy","sneeze","gesundheit","face"]},"hot-face":{"a":"Hot Face","b":"1F975","j":["red","hot","heat","feverish","heat stroke","sweating","face","red-faced"]},"cold-face":{"a":"Cold Face","b":"1F976","j":["icicles","freezing","frozen","blue-faced","frostbite","cold","face","blue"]},"woozy-face":{"a":"Woozy Face","b":"1F974","j":["dizzy","face","wavy mouth","tipsy","wavy","uneven eyes","intoxicated"]},"knockedout-face":{"a":"Knocked-out Face","b":"1F635","j":["knocked-out face","dizzy_face","dizzy","knocked out","xox","spent","unconscious","face","dead"]},"face-with-spiral-eyes":{"a":"⊛ Face with Spiral Eyes","b":"1F635-200D-1F4AB","j":["dizzy","face with spiral eyes","hypnotized","spiral","trouble","whoa"]},"exploding-head":{"a":"Exploding Head","b":"1F92F","j":["shocked","mind","blown","mind blown","face"]},"cowboy-hat-face":{"a":"Cowboy Hat Face","b":"1F920","j":["cowboy","cowgirl","face","hat"]},"partying-face":{"a":"Partying Face","b":"1F973","j":["hat","celebration","horn","woohoo","face","party"]},"disguised-face":{"a":"Disguised Face","b":"1F978","j":["brows","glasses","incognito","moustache","disguise","nose","face","pretent"]},"smiling-face-with-sunglasses":{"a":"Smiling Face with Sunglasses","b":"1F60E","j":["cool","sunglass","sun","smile","bright","beach","summer","sunglasses","face"]},"nerd-face":{"a":"Nerd Face","b":"1F913","j":["nerdy","dork","nerd","geek","face"]},"face-with-monocle":{"a":"Face with Monocle","b":"1F9D0","j":["wealthy","stuffy","face"]},"confused-face":{"a":"Confused Face","b":"1F615","j":[":/","face","meh","confused","huh","hmmm","weird","indifference"]},"worried-face":{"a":"Worried Face","b":"1F61F","j":[":(","worried","nervous","concern","face"]},"slightly-frowning-face":{"a":"Slightly Frowning Face","b":"1F641","j":["sad","frowning","frown","disappointed","upset","face"]},"frowning-face":{"a":"Frowning Face","b":"2639","j":["sad","upset","face","frown"]},"face-with-open-mouth":{"a":"Face with Open Mouth","b":"1F62E","j":["surprise","mouth","wow","whoa","open","sympathy","impressed",":O","face"]},"hushed-face":{"a":"Hushed Face","b":"1F62F","j":["shh","woo","surprised","hushed","stunned","face"]},"astonished-face":{"a":"Astonished Face","b":"1F632","j":["shocked","poisoned","totally","surprised","astonished","xox","face"]},"flushed-face":{"a":"Flushed Face","b":"1F633","j":["blush","flattered","shy","dazed","flushed","face"]},"pleading-face":{"a":"Pleading Face","b":"1F97A","j":["begging","mercy","face","puppy eyes"]},"frowning-face-with-open-mouth":{"a":"Frowning Face with Open Mouth","b":"1F626","j":["mouth","aw","what","open","frown","face"]},"anguished-face":{"a":"Anguished Face","b":"1F627","j":["stunned","anguished","face","nervous"]},"fearful-face":{"a":"Fearful Face","b":"1F628","j":["fearful","terrified","oops","scared","fear","nervous","huh","face"]},"anxious-face-with-sweat":{"a":"Anxious Face with Sweat","b":"1F630","j":["sweat","nervous","cold","rushed","face","blue"]},"sad-but-relieved-face":{"a":"Sad but Relieved Face","b":"1F625","j":["whew","relieved","sweat","phew","disappointed","nervous","face"]},"crying-face":{"a":"Crying Face","b":"1F622","j":["sad","tears","tear",":'(","cry","depressed","upset","face"]},"loudly-crying-face":{"a":"Loudly Crying Face","b":"1F62D","j":["sad","tears","tear","cry","depressed","sob","upset","face"]},"face-screaming-in-fear":{"a":"Face Screaming in Fear","b":"1F631","j":["munch","scared","scream","omg","fear","face"]},"confounded-face":{"a":"Confounded Face","b":"1F616","j":["unwell","sick","confounded","oops",":S","confused","face"]},"persevering-face":{"a":"Persevering Face","b":"1F623","j":["sick","no","oops","upset","face","persevere"]},"disappointed-face":{"a":"Disappointed Face","b":"1F61E","j":["sad","depressed","disappointed",":(","upset","face"]},"downcast-face-with-sweat":{"a":"Downcast Face with Sweat","b":"1F613","j":["sad","exercise","sweat","hot","tired","cold","face"]},"weary-face":{"a":"Weary Face","b":"1F629","j":["sad","weary","sleepy","frustrated","tired","upset","face"]},"tired-face":{"a":"Tired Face","b":"1F62B","j":["sick","frustrated","tired","upset","whine","face"]},"yawning-face":{"a":"Yawning Face","b":"1F971","j":["","bored","yawn","tired","sleepy"]},"face-with-steam-from-nose":{"a":"Face with Steam From Nose","b":"1F624","j":["gas","won","pride","phew","proud","face","triumph"]},"pouting-face":{"a":"Pouting Face","b":"1F621","j":["despise","red","mad","hate","angry","pouting","face","rage"]},"angry-face":{"a":"Angry Face","b":"1F620","j":["annoyed","mad","frustrated","angry","anger","face"]},"face-with-symbols-on-mouth":{"a":"Face with Symbols on Mouth","b":"1F92C","j":["swearing","profanity","cursing","expletive","cussing","face"]},"smiling-face-with-horns":{"a":"Smiling Face with Horns","b":"1F608","j":["devil","horns","fairy tale","fantasy","smile","face"]},"angry-face-with-horns":{"a":"Angry Face with Horns","b":"1F47F","j":["demon","imp","devil","horns","fantasy","angry","face"]},"skull":{"a":"Skull","b":"1F480","j":["monster","skeleton","fairy tale","creepy","death","face","dead"]},"skull-and-crossbones":{"a":"Skull and Crossbones","b":"2620","j":["monster","scary","poison","skull","crossbones","deadly","evil","danger","death","face","pirate"]},"pile-of-poo":{"a":"Pile of Poo","b":"1F4A9","j":["monster","poop","dung","shitface","hankey","poo","shit","turd","face","fail"]},"clown-face":{"a":"Clown Face","b":"1F921","j":["face","clown"]},"ogre":{"a":"Ogre","b":"1F479","j":["monster","demon","devil","red","fairy tale","fantasy","troll","halloween","creepy","creature","mask","japanese","scary","face"]},"goblin":{"a":"Goblin","b":"1F47A","j":["monster","red","fairy tale","fantasy","creature","creepy","mask","japanese","scary","evil","face"]},"ghost":{"a":"Ghost","b":"1F47B","j":["monster","fairy tale","fantasy","halloween","spooky","creature","scary","face"]},"alien":{"a":"Alien","b":"1F47D","j":["paul","ufo","outer_space","UFO","extraterrestrial","fantasy","creature","face","weird"]},"alien-monster":{"a":"Alien Monster","b":"1F47E","j":["monster","ufo","arcade","alien","extraterrestrial","creature","game","face","play"]},"robot":{"a":"Robot","b":"1F916","j":["monster","machine","bot","computer","face"]},"grinning-cat":{"a":"Grinning Cat","b":"1F63A","j":["mouth","open","animal","grinning","smile","cats","happy","cat","face"]},"grinning-cat-with-smiling-eyes":{"a":"Grinning Cat with Smiling Eyes","b":"1F638","j":["grin","animal","eye","cats","smile","cat","face"]},"cat-with-tears-of-joy":{"a":"Cat with Tears of Joy","b":"1F639","j":["tears","tear","joy","animal","cats","happy","cat","face","haha"]},"smiling-cat-with-hearteyes":{"a":"Smiling Cat with Heart-Eyes","b":"1F63B","j":["heart","smiling cat with heart-eyes","smiling_cat_with_heart_eyes","eye","love","animal","like","affection","smile","cats","valentines","cat","face"]},"cat-with-wry-smile":{"a":"Cat with Wry Smile","b":"1F63C","j":["animal","ironic","smirk","smile","cats","wry","cat","face"]},"kissing-cat":{"a":"Kissing Cat","b":"1F63D","j":["animal","kiss","eye","cats","cat","face"]},"weary-cat":{"a":"Weary Cat","b":"1F640","j":["weary","cat","animal","munch","scared","surprised","scream","cats","oh","face"]},"crying-cat":{"a":"Crying Cat","b":"1F63F","j":["sad","tears","tear","weep","cry","animal","cats","upset","cat","face"]},"pouting-cat":{"a":"Pouting Cat","b":"1F63E","j":["animal","cats","pouting","cat","face"]},"seenoevil-monkey":{"a":"See-No-Evil Monkey","b":"1F648","j":["animal","see","see-no-evil monkey","face","see_no_evil_monkey","nature","forbidden","evil","monkey","haha"]},"hearnoevil-monkey":{"a":"Hear-No-Evil Monkey","b":"1F649","j":["hear-no-evil monkey","hear","monkey","animal","hear_no_evil_monkey","nature","forbidden","evil","face"]},"speaknoevil-monkey":{"a":"Speak-No-Evil Monkey","b":"1F64A","j":["speak","speak-no-evil monkey","animal","face","omg","speak_no_evil_monkey","nature","forbidden","evil","monkey"]},"kiss-mark":{"a":"Kiss Mark","b":"1F48B","j":["lips","love","kiss","like","valentines","affection","face"]},"love-letter":{"a":"Love Letter","b":"1F48C","j":["heart","letter","envelope","email","love","like","valentines","mail","affection"]},"heart-with-arrow":{"a":"Heart with Arrow","b":"1F498","j":["cupid","heart","arrow","love","like","valentines","affection"]},"heart-with-ribbon":{"a":"Heart with Ribbon","b":"1F49D","j":["ribbon","love","valentines","valentine"]},"sparkling-heart":{"a":"Sparkling Heart","b":"1F496","j":["sparkle","love","like","valentines","excited","affection"]},"growing-heart":{"a":"Growing Heart","b":"1F497","j":["pink","pulse","growing","love","like","valentines","nervous","excited","affection"]},"beating-heart":{"a":"Beating Heart","b":"1F493","j":["heartbeat","pink","heart","love","like","valentines","beating","affection","pulsating"]},"revolving-hearts":{"a":"Revolving Hearts","b":"1F49E","j":["love","like","valentines","revolving","affection"]},"two-hearts":{"a":"Two Hearts","b":"1F495","j":["heart","love","like","valentines","affection"]},"heart-decoration":{"a":"Heart Decoration","b":"1F49F","j":["purple-square","heart","love","like"]},"heart-exclamation":{"a":"Heart Exclamation","b":"2763","j":["exclamation","decoration","punctuation","love","mark"]},"broken-heart":{"a":"Broken Heart","b":"1F494","j":["sad","heart","heartbreak","break","sorry","broken"]},"heart-on-fire":{"a":"⊛ Heart on Fire","b":"2764-FE0F-200D-1F525","j":["burn","heart","heart on fire","love","lust","sacred heart"]},"mending-heart":{"a":"⊛ Mending Heart","b":"2764-FE0F-200D-1FA79","j":["healthier","improving","mending","mending heart","recovering","recuperating","well"]},"red-heart":{"a":"Red Heart","b":"2764","j":["heart","love","valentines","like"]},"orange-heart":{"a":"Orange Heart","b":"1F9E1","j":["love","like","orange","valentines","affection"]},"yellow-heart":{"a":"Yellow Heart","b":"1F49B","j":["yellow","love","like","valentines","affection"]},"green-heart":{"a":"Green Heart","b":"1F49A","j":["love","like","green","valentines","affection"]},"blue-heart":{"a":"Blue Heart","b":"1F499","j":["love","like","valentines","affection","blue"]},"purple-heart":{"a":"Purple Heart","b":"1F49C","j":["love","like","purple","valentines","affection"]},"brown-heart":{"a":"Brown Heart","b":"1F90E","j":["brown","coffee","heart"]},"black-heart":{"a":"Black Heart","b":"1F5A4","j":["black","wicked","evil"]},"white-heart":{"a":"White Heart","b":"1F90D","j":["heart","pure","white"]},"hundred-points":{"a":"Hundred Points","b":"1F4AF","j":["test","100","exam","score","numbers","full","quiz","hundred","century","pass","perfect"]},"anger-symbol":{"a":"Anger Symbol","b":"1F4A2","j":["mad","comic","angry"]},"collision":{"a":"Collision","b":"1F4A5","j":["explode","boom","bomb","comic","blown","explosion"]},"dizzy":{"a":"Dizzy","b":"1F4AB","j":["sparkle","magic","shoot","comic","star"]},"sweat-droplets":{"a":"Sweat Droplets","b":"1F4A6","j":["sweat","oops","water","drip","comic","splashing"]},"dashing-away":{"a":"Dashing Away","b":"1F4A8","j":["running","air","fart","shoo","wind","smoke","comic","fast","puff","dash"]},"hole":{"a":"Hole","b":"1F573","j":["embarrassing"]},"bomb":{"a":"Bomb","b":"1F4A3","j":["explode","terrorism","boom","comic","explosion"]},"speech-balloon":{"a":"Speech Balloon","b":"1F4AC","j":["chatting","dialog","speech","bubble","words","message","balloon","comic","talk"]},"eye-in-speech-bubble":{"a":"Eye in Speech Bubble","b":"1F441-FE0F-200D-1F5E8-FE0F","j":["speech bubble","info","eye","witness"]},"left-speech-bubble":{"a":"Left Speech Bubble","b":"1F5E8","j":["chatting","dialog","speech","words","message","talk"]},"right-anger-bubble":{"a":"Right Anger Bubble","b":"1F5EF","j":["mad","speech","bubble","thinking","balloon","angry","caption"]},"thought-balloon":{"a":"Thought Balloon","b":"1F4AD","j":["thought","dream","cloud","bubble","speech","thinking","balloon","comic"]},"zzz":{"a":"Zzz","b":"1F4A4","j":["dream","tired","comic","sleepy","sleep"]},"waving-hand":{"a":"Waving Hand","b":"1F44B","j":["palm","gesture","farewell","wave","hands","hello","hi","solong","waving","hand","goodbye"]},"raised-back-of-hand":{"a":"Raised Back of Hand","b":"1F91A","j":["raised","fingers","backhand"]},"hand-with-fingers-splayed":{"a":"Hand with Fingers Splayed","b":"1F590","j":["splayed","palm","finger","hand","fingers"]},"raised-hand":{"a":"Raised Hand","b":"270B","j":["stop","palm","high 5","highfive","high five","hand","fingers","ban"]},"vulcan-salute":{"a":"Vulcan Salute","b":"1F596","j":["spock","finger","hand","star trek","fingers","vulcan"]},"ok-hand":{"a":"Ok Hand","b":"1F44C","j":["ok","perfect","limbs","hand","OK","okay","fingers"]},"pinched-fingers":{"a":"Pinched Fingers","b":"1F90C","j":["pinched","small","interrogation","hand gesture","sarcastic","size","fingers","tiny"]},"pinching-hand":{"a":"Pinching Hand","b":"1F90F","j":["small","size","small amount","tiny"]},"victory-hand":{"a":"Victory Hand","b":"270C","j":["victory","ohyeah","peace","two","v","hand","fingers"]},"crossed-fingers":{"a":"Crossed Fingers","b":"1F91E","j":["lucky","cross","luck","finger","good","hand"]},"loveyou-gesture":{"a":"Love-You Gesture","b":"1F91F","j":["gesture","love-you gesture","hand","ILY","fingers","love_you_gesture"]},"sign-of-the-horns":{"a":"Sign of the Horns","b":"1F918","j":["evil_eye","sign_of_horns","horns","finger","rock_on","hand","fingers","rock-on"]},"call-me-hand":{"a":"Call Me Hand","b":"1F919","j":["hand","gesture","call","hands"]},"backhand-index-pointing-left":{"a":"Backhand Index Pointing Left","b":"1F448","j":["point","backhand","index","left","direction","finger","hand","fingers"]},"backhand-index-pointing-right":{"a":"Backhand Index Pointing Right","b":"1F449","j":["point","backhand","index","direction","right","finger","hand","fingers"]},"backhand-index-pointing-up":{"a":"Backhand Index Pointing Up","b":"1F446","j":["up","point","backhand","direction","finger","hand","fingers"]},"middle-finger":{"a":"Middle Finger","b":"1F595","j":["flipping","rude","middle","finger","hand","fingers"]},"backhand-index-pointing-down":{"a":"Backhand Index Pointing Down","b":"1F447","j":["point","backhand","direction","down","finger","hand","fingers"]},"index-pointing-up":{"a":"Index Pointing Up","b":"261D","j":["up","point","index","direction","finger","hand","fingers"]},"thumbs-up":{"a":"Thumbs Up","b":"1F44D","j":["up","cool","thumb","+1","thumbsup","awesome","like","good","accept","hand","yes","agree"]},"thumbs-down":{"a":"Thumbs Down","b":"1F44E","j":["-1","thumb","no","dislike","down","thumbsdown","hand"]},"raised-fist":{"a":"Raised Fist","b":"270A","j":["punch","fist","grasp","clenched","hand","fingers"]},"oncoming-fist":{"a":"Oncoming Fist","b":"1F44A","j":["punch","attack","fist","hit","clenched","angry","hand","violence"]},"leftfacing-fist":{"a":"Left-Facing Fist","b":"1F91B","j":["fist","left-facing fist","leftwards","left_facing_fist","hand","fistbump"]},"rightfacing-fist":{"a":"Right-Facing Fist","b":"1F91C","j":["rightwards","fist","right-facing fist","right_facing_fist","hand","fistbump"]},"clapping-hands":{"a":"Clapping Hands","b":"1F44F","j":["congrats","praise","applause","yay","hands","hand","clap"]},"raising-hands":{"a":"Raising Hands","b":"1F64C","j":["hooray","gesture","celebration","raised","yea","hands","hand"]},"open-hands":{"a":"Open Hands","b":"1F450","j":["open","butterfly","hands","hand","fingers"]},"palms-up-together":{"a":"Palms Up Together","b":"1F932","j":["gesture","hands","cupped hands","cupped","prayer"]},"handshake":{"a":"Handshake","b":"1F91D","j":["agreement","hand","meeting","shake"]},"folded-hands":{"a":"Folded Hands","b":"1F64F","j":["thanks","wish","please","high 5","hope","namaste","pray","highfive","high five","hand","ask"]},"writing-hand":{"a":"Writing Hand","b":"270D","j":["lower_left_ballpoint_pen","write","stationery","compose","hand"]},"nail-polish":{"a":"Nail Polish","b":"1F485","j":["manicure","polish","beauty","finger","fashion","nail","cosmetics","care"]},"selfie":{"a":"Selfie","b":"1F933","j":["camera","phone"]},"flexed-biceps":{"a":"Flexed Biceps","b":"1F4AA","j":["strong","hand","flex","biceps","comic","arm","summer","muscle"]},"mechanical-arm":{"a":"Mechanical Arm","b":"1F9BE","j":["accessibility","prosthetic"]},"mechanical-leg":{"a":"Mechanical Leg","b":"1F9BF","j":["accessibility","prosthetic"]},"leg":{"a":"Leg","b":"1F9B5","j":["limb","kick"]},"foot":{"a":"Foot","b":"1F9B6","j":["stomp","kick"]},"ear":{"a":"Ear","b":"1F442","j":["listen","hear","body","sound","face"]},"ear-with-hearing-aid":{"a":"Ear with Hearing Aid","b":"1F9BB","j":["accessibility","hard of hearing"]},"nose":{"a":"Nose","b":"1F443","j":["body","smell","sniff"]},"brain":{"a":"Brain","b":"1F9E0","j":["smart","intelligent"]},"anatomical-heart":{"a":"Anatomical Heart","b":"1FAC0","j":["heartbeat","heart","pulse","health","organ","anatomical","cardiology"]},"lungs":{"a":"Lungs","b":"1FAC1","j":["organ","respiration","breathe","exhalation","breath","inhalation"]},"tooth":{"a":"Tooth","b":"1F9B7","j":["teeth","dentist"]},"bone":{"a":"Bone","b":"1F9B4","j":["skeleton"]},"eyes":{"a":"Eyes","b":"1F440","j":["stalk","eye","see","peek","watch","look","face"]},"eye":{"a":"Eye","b":"1F441","j":["body","stare","see","watch","look","face"]},"tongue":{"a":"Tongue","b":"1F445","j":["body","mouth","playful"]},"mouth":{"a":"Mouth","b":"1F444","j":["lips","kiss"]},"baby":{"a":"Baby","b":"1F476","j":["young","child","girl","boy","toddler"]},"child":{"a":"Child","b":"1F9D2","j":["gender-neutral","unspecified gender","young"]},"boy":{"a":"Boy","b":"1F466","j":["male","man","teenager","young","guy"]},"girl":{"a":"Girl","b":"1F467","j":["Virgo","woman","teenager","young","female","zodiac"]},"person":{"a":"Person","b":"1F9D1","j":["gender-neutral","unspecified gender","adult"]},"person-blond-hair":{"a":"Person: Blond Hair","b":"1F471","j":["blond","blond-haired person","hair","person: blond hair","hairstyle"]},"man":{"a":"Man","b":"1F468","j":["dad","classy","adult","mustache","guy","moustache","father","sir"]},"person-beard":{"a":"Person: Beard","b":"1F9D4","j":["man_beard","beard","bewhiskered","person: beard","person"]},"man-beard":{"a":"⊛ Man: Beard","b":"1F9D4-200D-2642-FE0F","j":["beard","man","man: beard"]},"woman-beard":{"a":"⊛ Woman: Beard","b":"1F9D4-200D-2640-FE0F","j":["beard","woman","woman: beard"]},"man-red-hair":{"a":"Man: Red Hair","b":"1F468-200D-1F9B0","j":["man","hairstyle","adult","red hair"]},"man-curly-hair":{"a":"Man: Curly Hair","b":"1F468-200D-1F9B1","j":["man","curly hair","hairstyle","adult"]},"man-white-hair":{"a":"Man: White Hair","b":"1F468-200D-1F9B3","j":["man","old","adult","white hair","elder"]},"man-bald":{"a":"Man: Bald","b":"1F468-200D-1F9B2","j":["man","hairless","bald","adult"]},"woman":{"a":"Woman","b":"1F469","j":["female","lady","adult","girls"]},"woman-red-hair":{"a":"Woman: Red Hair","b":"1F469-200D-1F9B0","j":["woman","hairstyle","adult","red hair"]},"person-red-hair":{"a":"Person: Red Hair","b":"1F9D1-200D-1F9B0","j":["gender-neutral","unspecified gender","adult","red hair","hairstyle","person"]},"woman-curly-hair":{"a":"Woman: Curly Hair","b":"1F469-200D-1F9B1","j":["curly hair","hairstyle","woman","adult"]},"person-curly-hair":{"a":"Person: Curly Hair","b":"1F9D1-200D-1F9B1","j":["gender-neutral","unspecified gender","adult","curly hair","hairstyle","person"]},"woman-white-hair":{"a":"Woman: White Hair","b":"1F469-200D-1F9B3","j":["woman","old","adult","white hair","elder"]},"person-white-hair":{"a":"Person: White Hair","b":"1F9D1-200D-1F9B3","j":["gender-neutral","unspecified gender","old","adult","white hair","person","elder"]},"woman-bald":{"a":"Woman: Bald","b":"1F469-200D-1F9B2","j":["woman","bald","hairless","adult"]},"person-bald":{"a":"Person: Bald","b":"1F9D1-200D-1F9B2","j":["gender-neutral","bald","unspecified gender","adult","hairless","person"]},"woman-blond-hair":{"a":"Woman: Blond Hair","b":"1F471-200D-2640-FE0F","j":["blond-haired woman","woman","female","hair","girl","woman: blond hair","person","blonde"]},"man-blond-hair":{"a":"Man: Blond Hair","b":"1F471-200D-2642-FE0F","j":["blond","male","man","blond-haired man","man: blond hair","hair","guy","boy","person","blonde"]},"older-person":{"a":"Older Person","b":"1F9D3","j":["gender-neutral","unspecified gender","old","adult","senior","human","elder"]},"old-man":{"a":"Old Man","b":"1F474","j":["male","men","man","old","adult","senior","human","elder"]},"old-woman":{"a":"Old Woman","b":"1F475","j":["old","woman","adult","female","lady","senior","women","human","elder"]},"person-frowning":{"a":"Person Frowning","b":"1F64D","j":["frown","gesture","worried"]},"man-frowning":{"a":"Man Frowning","b":"1F64D-200D-2642-FE0F","j":["sad","unhappy","frowning","male","man","gesture","depressed","boy","discouraged"]},"woman-frowning":{"a":"Woman Frowning","b":"1F64D-200D-2640-FE0F","j":["sad","unhappy","frowning","gesture","woman","depressed","female","girl","discouraged"]},"person-pouting":{"a":"Person Pouting","b":"1F64E","j":["gesture","upset","pouting"]},"man-pouting":{"a":"Man Pouting","b":"1F64E-200D-2642-FE0F","j":["male","man","gesture","pouting","boy"]},"woman-pouting":{"a":"Woman Pouting","b":"1F64E-200D-2640-FE0F","j":["gesture","woman","female","girl","pouting"]},"person-gesturing-no":{"a":"Person Gesturing No","b":"1F645","j":["prohibited","gesture","hand","forbidden","decline","person gesturing NO"]},"man-gesturing-no":{"a":"Man Gesturing No","b":"1F645-200D-2642-FE0F","j":["male","nope","man","gesture","prohibited","hand","forbidden","boy","man gesturing NO"]},"woman-gesturing-no":{"a":"Woman Gesturing No","b":"1F645-200D-2640-FE0F","j":["nope","prohibited","gesture","woman","woman gesturing NO","female","girl","hand","forbidden"]},"person-gesturing-ok":{"a":"Person Gesturing Ok","b":"1F646","j":["person gesturing OK","gesture","hand","OK","agree"]},"man-gesturing-ok":{"a":"Man Gesturing Ok","b":"1F646-200D-2642-FE0F","j":["male","men","OK","man","gesture","man gesturing OK","hand","boy","human","blue"]},"woman-gesturing-ok":{"a":"Woman Gesturing Ok","b":"1F646-200D-2640-FE0F","j":["pink","OK","gesture","woman","female","woman gesturing OK","girl","hand","women","human"]},"person-tipping-hand":{"a":"Person Tipping Hand","b":"1F481","j":["information","tipping","sassy","help","hand"]},"man-tipping-hand":{"a":"Man Tipping Hand","b":"1F481-200D-2642-FE0F","j":["male","information","man","sassy","tipping hand","boy","human"]},"woman-tipping-hand":{"a":"Woman Tipping Hand","b":"1F481-200D-2640-FE0F","j":["information","woman","sassy","female","girl","tipping hand","human"]},"person-raising-hand":{"a":"Person Raising Hand","b":"1F64B","j":["gesture","raised","question","hand","happy"]},"man-raising-hand":{"a":"Man Raising Hand","b":"1F64B-200D-2642-FE0F","j":["male","man","gesture","raising hand","boy"]},"woman-raising-hand":{"a":"Woman Raising Hand","b":"1F64B-200D-2640-FE0F","j":["gesture","woman","female","raising hand","girl"]},"deaf-person":{"a":"Deaf Person","b":"1F9CF","j":["accessibility","ear","deaf","hear"]},"deaf-man":{"a":"Deaf Man","b":"1F9CF-200D-2642-FE0F","j":["man","accessibility","deaf"]},"deaf-woman":{"a":"Deaf Woman","b":"1F9CF-200D-2640-FE0F","j":["woman","deaf","accessibility"]},"person-bowing":{"a":"Person Bowing","b":"1F647","j":["bow","gesture","sorry","respectiful","apology"]},"man-bowing":{"a":"Man Bowing","b":"1F647-200D-2642-FE0F","j":["favor","male","man","gesture","sorry","apology","boy","bowing"]},"woman-bowing":{"a":"Woman Bowing","b":"1F647-200D-2640-FE0F","j":["favor","gesture","woman","sorry","apology","female","girl","bowing"]},"person-facepalming":{"a":"Person Facepalming","b":"1F926","j":["disbelief","palm","exasperation","disappointed","face"]},"man-facepalming":{"a":"Man Facepalming","b":"1F926-200D-2642-FE0F","j":["disbelief","male","exasperation","man","facepalm","boy"]},"woman-facepalming":{"a":"Woman Facepalming","b":"1F926-200D-2640-FE0F","j":["disbelief","exasperation","woman","facepalm","female","girl"]},"person-shrugging":{"a":"Person Shrugging","b":"1F937","j":["shrug","ignorance","regardless","doubt","indifference"]},"man-shrugging":{"a":"Man Shrugging","b":"1F937-200D-2642-FE0F","j":["male","shrug","ignorance","man","indifferent","confused","boy","doubt","indifference"]},"woman-shrugging":{"a":"Woman Shrugging","b":"1F937-200D-2640-FE0F","j":["shrug","ignorance","woman","indifferent","female","girl","confused","doubt","indifference"]},"health-worker":{"a":"Health Worker","b":"1F9D1-200D-2695-FE0F","j":["nurse","doctor","healthcare","hospital","therapist"]},"man-health-worker":{"a":"Man Health Worker","b":"1F468-200D-2695-FE0F","j":["nurse","man","doctor","healthcare","human","therapist"]},"woman-health-worker":{"a":"Woman Health Worker","b":"1F469-200D-2695-FE0F","j":["nurse","woman","doctor","healthcare","human","therapist"]},"student":{"a":"Student","b":"1F9D1-200D-1F393","j":["graduate","learn"]},"man-student":{"a":"Man Student","b":"1F468-200D-1F393","j":["man","student","human","graduate"]},"woman-student":{"a":"Woman Student","b":"1F469-200D-1F393","j":["woman","student","human","graduate"]},"teacher":{"a":"Teacher","b":"1F9D1-200D-1F3EB","j":["instructor","professor"]},"man-teacher":{"a":"Man Teacher","b":"1F468-200D-1F3EB","j":["man","teacher","professor","instructor","human"]},"woman-teacher":{"a":"Woman Teacher","b":"1F469-200D-1F3EB","j":["woman","teacher","professor","instructor","human"]},"judge":{"a":"Judge","b":"1F9D1-200D-2696-FE0F","j":["law","scales","justice"]},"man-judge":{"a":"Man Judge","b":"1F468-200D-2696-FE0F","j":["man","scales","court","judge","human","justice"]},"woman-judge":{"a":"Woman Judge","b":"1F469-200D-2696-FE0F","j":["woman","scales","court","judge","human","justice"]},"farmer":{"a":"Farmer","b":"1F9D1-200D-1F33E","j":["rancher","crops","gardener"]},"man-farmer":{"a":"Man Farmer","b":"1F468-200D-1F33E","j":["man","rancher","farmer","gardener","human"]},"woman-farmer":{"a":"Woman Farmer","b":"1F469-200D-1F33E","j":["rancher","woman","farmer","gardener","human"]},"cook":{"a":"Cook","b":"1F9D1-200D-1F373","j":["culinary","kitchen","chef","food"]},"man-cook":{"a":"Man Cook","b":"1F468-200D-1F373","j":["cook","human","chef","man"]},"woman-cook":{"a":"Woman Cook","b":"1F469-200D-1F373","j":["cook","woman","human","chef"]},"mechanic":{"a":"Mechanic","b":"1F9D1-200D-1F527","j":["tradesperson","plumber","electrician","worker","technician"]},"man-mechanic":{"a":"Man Mechanic","b":"1F468-200D-1F527","j":["plumber","tradesperson","wrench","man","electrician","mechanic","human"]},"woman-mechanic":{"a":"Woman Mechanic","b":"1F469-200D-1F527","j":["tradesperson","plumber","wrench","woman","electrician","mechanic","human"]},"factory-worker":{"a":"Factory Worker","b":"1F9D1-200D-1F3ED","j":["industrial","assembly","worker","factory","labor"]},"man-factory-worker":{"a":"Man Factory Worker","b":"1F468-200D-1F3ED","j":["man","industrial","assembly","worker","factory","human"]},"woman-factory-worker":{"a":"Woman Factory Worker","b":"1F469-200D-1F3ED","j":["woman","industrial","assembly","worker","factory","human"]},"office-worker":{"a":"Office Worker","b":"1F9D1-200D-1F4BC","j":["business","white-collar","architect","manager"]},"man-office-worker":{"a":"Man Office Worker","b":"1F468-200D-1F4BC","j":["business","architect","man","white-collar","human","manager"]},"woman-office-worker":{"a":"Woman Office Worker","b":"1F469-200D-1F4BC","j":["business","architect","woman","white-collar","human","manager"]},"scientist":{"a":"Scientist","b":"1F9D1-200D-1F52C","j":["chemist","chemistry","biologist","physicist","engineer"]},"man-scientist":{"a":"Man Scientist","b":"1F468-200D-1F52C","j":["man","chemist","biologist","physicist","human","engineer","scientist"]},"woman-scientist":{"a":"Woman Scientist","b":"1F469-200D-1F52C","j":["woman","chemist","biologist","physicist","human","engineer","scientist"]},"technologist":{"a":"Technologist","b":"1F9D1-200D-1F4BB","j":["inventor","software","computer","developer","coder"]},"man-technologist":{"a":"Man Technologist","b":"1F468-200D-1F4BB","j":["inventor","man","engineer","software","laptop","computer","developer","coder","technologist","human","programmer"]},"woman-technologist":{"a":"Woman Technologist","b":"1F469-200D-1F4BB","j":["inventor","woman","engineer","software","laptop","computer","developer","coder","technologist","human","programmer"]},"singer":{"a":"Singer","b":"1F9D1-200D-1F3A4","j":["actor","entertainer","performer","rock","song","artist","star"]},"man-singer":{"a":"Man Singer","b":"1F468-200D-1F3A4","j":["actor","entertainer","singer","rockstar","man","rock","human","star"]},"woman-singer":{"a":"Woman Singer","b":"1F469-200D-1F3A4","j":["actor","entertainer","singer","rockstar","woman","rock","human","star"]},"artist":{"a":"Artist","b":"1F9D1-200D-1F3A8","j":["palette","creativity","draw","painting"]},"man-artist":{"a":"Man Artist","b":"1F468-200D-1F3A8","j":["man","painter","palette","artist","human"]},"woman-artist":{"a":"Woman Artist","b":"1F469-200D-1F3A8","j":["woman","painter","palette","artist","human"]},"pilot":{"a":"Pilot","b":"1F9D1-200D-2708-FE0F","j":["airplane","plane","fly"]},"man-pilot":{"a":"Man Pilot","b":"1F468-200D-2708-FE0F","j":["man","plane","pilot","human","aviator"]},"woman-pilot":{"a":"Woman Pilot","b":"1F469-200D-2708-FE0F","j":["woman","plane","pilot","human","aviator"]},"astronaut":{"a":"Astronaut","b":"1F9D1-200D-1F680","j":["outerspace","rocket"]},"man-astronaut":{"a":"Man Astronaut","b":"1F468-200D-1F680","j":["man","space","astronaut","rocket","human"]},"woman-astronaut":{"a":"Woman Astronaut","b":"1F469-200D-1F680","j":["woman","space","astronaut","rocket","human"]},"firefighter":{"a":"Firefighter","b":"1F9D1-200D-1F692","j":["fire","firetruck"]},"man-firefighter":{"a":"Man Firefighter","b":"1F468-200D-1F692","j":["man","firetruck","firefighter","human","fireman"]},"woman-firefighter":{"a":"Woman Firefighter","b":"1F469-200D-1F692","j":["firetruck","woman","firefighter","human","fireman"]},"police-officer":{"a":"Police Officer","b":"1F46E","j":["cop","officer","police"]},"man-police-officer":{"a":"Man Police Officer","b":"1F46E-200D-2642-FE0F","j":["arrest","cop","man","911","officer","police","enforcement","legal","law"]},"woman-police-officer":{"a":"Woman Police Officer","b":"1F46E-200D-2640-FE0F","j":["arrest","cop","woman","911","female","officer","police","enforcement","legal","law"]},"detective":{"a":"Detective","b":"1F575","j":["spy","sleuth","human"]},"man-detective":{"a":"Man Detective","b":"1F575-FE0F-200D-2642-FE0F","j":["sleuth","man","spy","crime","detective"]},"woman-detective":{"a":"Woman Detective","b":"1F575-FE0F-200D-2640-FE0F","j":["sleuth","spy","woman","detective","female","human"]},"guard":{"a":"Guard","b":"1F482","j":["protect"]},"man-guard":{"a":"Man Guard","b":"1F482-200D-2642-FE0F","j":["uk","male","british","man","royal","guy","gb","guard"]},"woman-guard":{"a":"Woman Guard","b":"1F482-200D-2640-FE0F","j":["uk","british","royal","woman","female","gb","guard"]},"ninja":{"a":"Ninja","b":"1F977","j":["fighter","ninjutsu","stealth","skills","hidden","japanese"]},"construction-worker":{"a":"Construction Worker","b":"1F477","j":["hat","construction","build","worker","labor"]},"man-construction-worker":{"a":"Man Construction Worker","b":"1F477-200D-2642-FE0F","j":["male","wip","man","construction","build","guy","worker","human","labor"]},"woman-construction-worker":{"a":"Woman Construction Worker","b":"1F477-200D-2640-FE0F","j":["wip","woman","construction","build","female","worker","human","labor"]},"prince":{"a":"Prince","b":"1F934","j":["male","man","royal","crown","boy","king"]},"princess":{"a":"Princess","b":"1F478","j":["blond","queen","fairy tale","royal","woman","crown","fantasy","female","girl"]},"person-wearing-turban":{"a":"Person Wearing Turban","b":"1F473","j":["headdress","turban"]},"man-wearing-turban":{"a":"Man Wearing Turban","b":"1F473-200D-2642-FE0F","j":["male","turban","hinduism","man","indian","arabs"]},"woman-wearing-turban":{"a":"Woman Wearing Turban","b":"1F473-200D-2640-FE0F","j":["turban","hinduism","woman","female","indian","arabs"]},"person-with-skullcap":{"a":"Person with Skullcap","b":"1F472","j":["male","hat","cap","man_with_skullcap","skullcap","chinese","gua pi mao","boy","person"]},"woman-with-headscarf":{"a":"Woman with Headscarf","b":"1F9D5","j":["hijab","head kerchief","mantilla","bandana","female","tichel","headscarf"]},"person-in-tuxedo":{"a":"Person in Tuxedo","b":"1F935","j":["wedding","marriage","couple","groom","tuxedo","person","man_in_tuxedo"]},"man-in-tuxedo":{"a":"Man in Tuxedo","b":"1F935-200D-2642-FE0F","j":["man","tuxedo","fashion","formal"]},"woman-in-tuxedo":{"a":"Woman in Tuxedo","b":"1F935-200D-2640-FE0F","j":["woman","tuxedo","fashion","formal"]},"person-with-veil":{"a":"Person with Veil","b":"1F470","j":["bride","wedding","veil","marriage","woman","couple","bride_with_veil","person"]},"man-with-veil":{"a":"Man with Veil","b":"1F470-200D-2642-FE0F","j":["man","marriage","wedding","veil"]},"woman-with-veil":{"a":"Woman with Veil","b":"1F470-200D-2640-FE0F","j":["woman","marriage","wedding","veil"]},"pregnant-woman":{"a":"Pregnant Woman","b":"1F930","j":["woman","pregnant","baby"]},"breastfeeding":{"a":"Breast-Feeding","b":"1F931","j":["breast","breast-feeding","breast_feeding","nursing","baby"]},"woman-feeding-baby":{"a":"Woman Feeding Baby","b":"1F469-200D-1F37C","j":["food","birth","woman","feeding","nursing","baby"]},"man-feeding-baby":{"a":"Man Feeding Baby","b":"1F468-200D-1F37C","j":["food","birth","man","feeding","nursing","baby"]},"person-feeding-baby":{"a":"Person Feeding Baby","b":"1F9D1-200D-1F37C","j":["food","birth","feeding","nursing","baby","person"]},"baby-angel":{"a":"Baby Angel","b":"1F47C","j":["fairy tale","halo","fantasy","wings","baby","angel","face","heaven"]},"santa-claus":{"a":"Santa Claus","b":"1F385","j":["xmas","male","festival","man","father christmas","celebration","santa","Christmas","claus","father"]},"mrs-claus":{"a":"Mrs. Claus","b":"1F936","j":["xmas","mother","Mrs.","woman","celebration","female","mother christmas","Christmas","claus"]},"mx-claus":{"a":"Mx Claus","b":"1F9D1-200D-1F384","j":["Claus, christmas","christmas"]},"superhero":{"a":"Superhero","b":"1F9B8","j":["heroine","marvel","good","superpower","hero"]},"man-superhero":{"a":"Man Superhero","b":"1F9B8-200D-2642-FE0F","j":["male","man","superpowers","good","superpower","hero"]},"woman-superhero":{"a":"Woman Superhero","b":"1F9B8-200D-2640-FE0F","j":["woman","heroine","superpowers","female","good","superpower","hero"]},"supervillain":{"a":"Supervillain","b":"1F9B9","j":["villain","marvel","criminal","superpower","evil"]},"man-supervillain":{"a":"Man Supervillain","b":"1F9B9-200D-2642-FE0F","j":["villain","male","man","criminal","superpowers","bad","superpower","evil","hero"]},"woman-supervillain":{"a":"Woman Supervillain","b":"1F9B9-200D-2640-FE0F","j":["villain","woman","heroine","criminal","female","superpowers","bad","superpower","evil"]},"mage":{"a":"Mage","b":"1F9D9","j":["sorcerer","wizard","witch","sorceress","magic"]},"man-mage":{"a":"Man Mage","b":"1F9D9-200D-2642-FE0F","j":["sorcerer","male","wizard","man","mage"]},"woman-mage":{"a":"Woman Mage","b":"1F9D9-200D-2640-FE0F","j":["woman","witch","sorceress","mage","female"]},"fairy":{"a":"Fairy","b":"1F9DA","j":["Titania","wings","Oberon","Puck","magical"]},"man-fairy":{"a":"Man Fairy","b":"1F9DA-200D-2642-FE0F","j":["man","Puck","male","Oberon"]},"woman-fairy":{"a":"Woman Fairy","b":"1F9DA-200D-2640-FE0F","j":["Titania","female","woman"]},"vampire":{"a":"Vampire","b":"1F9DB","j":["undead","blood","twilight","Dracula"]},"man-vampire":{"a":"Man Vampire","b":"1F9DB-200D-2642-FE0F","j":["male","Dracula","man","dracula","undead"]},"woman-vampire":{"a":"Woman Vampire","b":"1F9DB-200D-2640-FE0F","j":["woman","female","undead"]},"merperson":{"a":"Merperson","b":"1F9DC","j":["mermaid","sea","merman","merwoman"]},"merman":{"a":"Merman","b":"1F9DC-200D-2642-FE0F","j":["man","male","Triton","triton"]},"mermaid":{"a":"Mermaid","b":"1F9DC-200D-2640-FE0F","j":["woman","female","merwoman","ariel"]},"elf":{"a":"Elf","b":"1F9DD","j":["LOTR style","magical"]},"man-elf":{"a":"Man Elf","b":"1F9DD-200D-2642-FE0F","j":["man","male","magical"]},"woman-elf":{"a":"Woman Elf","b":"1F9DD-200D-2640-FE0F","j":["woman","female","magical"]},"genie":{"a":"Genie","b":"1F9DE","j":["(non-human color)","djinn","wishes","magical"]},"man-genie":{"a":"Man Genie","b":"1F9DE-200D-2642-FE0F","j":["man","male","djinn"]},"woman-genie":{"a":"Woman Genie","b":"1F9DE-200D-2640-FE0F","j":["woman","female","djinn"]},"zombie":{"a":"Zombie","b":"1F9DF","j":["(non-human color)","undead","walking dead","dead"]},"man-zombie":{"a":"Man Zombie","b":"1F9DF-200D-2642-FE0F","j":["walking dead","male","man","dracula","undead"]},"woman-zombie":{"a":"Woman Zombie","b":"1F9DF-200D-2640-FE0F","j":["woman","female","walking dead","undead"]},"person-getting-massage":{"a":"Person Getting Massage","b":"1F486","j":["relax","massage","face","salon"]},"man-getting-massage":{"a":"Man Getting Massage","b":"1F486-200D-2642-FE0F","j":["massage","male","man","head","boy","face"]},"woman-getting-massage":{"a":"Woman Getting Massage","b":"1F486-200D-2640-FE0F","j":["massage","woman","female","head","girl","face"]},"person-getting-haircut":{"a":"Person Getting Haircut","b":"1F487","j":["parlor","haircut","beauty","barber","hairstyle"]},"man-getting-haircut":{"a":"Man Getting Haircut","b":"1F487-200D-2642-FE0F","j":["man","boy","haircut","male"]},"woman-getting-haircut":{"a":"Woman Getting Haircut","b":"1F487-200D-2640-FE0F","j":["woman","female","haircut","girl"]},"person-walking":{"a":"Person Walking","b":"1F6B6","j":["walk","move","walking","hike"]},"man-walking":{"a":"Man Walking","b":"1F6B6-200D-2642-FE0F","j":["feet","walk","man","hike","human","steps"]},"woman-walking":{"a":"Woman Walking","b":"1F6B6-200D-2640-FE0F","j":["feet","walk","woman","hike","female","human","steps"]},"person-standing":{"a":"Person Standing","b":"1F9CD","j":["standing","stand","still"]},"man-standing":{"a":"Man Standing","b":"1F9CD-200D-2642-FE0F","j":["man","standing","still"]},"woman-standing":{"a":"Woman Standing","b":"1F9CD-200D-2640-FE0F","j":["standing","woman","still"]},"person-kneeling":{"a":"Person Kneeling","b":"1F9CE","j":["kneel","kneeling","pray","respectful"]},"man-kneeling":{"a":"Man Kneeling","b":"1F9CE-200D-2642-FE0F","j":["man","kneeling","pray","respectful"]},"woman-kneeling":{"a":"Woman Kneeling","b":"1F9CE-200D-2640-FE0F","j":["woman","pray","kneeling","respectful"]},"person-with-white-cane":{"a":"Person with White Cane","b":"1F9D1-200D-1F9AF","j":["accessibility","blind","person_with_probing_cane"]},"man-with-white-cane":{"a":"Man with White Cane","b":"1F468-200D-1F9AF","j":["man","accessibility","blind","man_with_probing_cane"]},"woman-with-white-cane":{"a":"Woman with White Cane","b":"1F469-200D-1F9AF","j":["woman","blind","woman_with_probing_cane","accessibility"]},"person-in-motorized-wheelchair":{"a":"Person in Motorized Wheelchair","b":"1F9D1-200D-1F9BC","j":["accessibility","disability","wheelchair"]},"man-in-motorized-wheelchair":{"a":"Man in Motorized Wheelchair","b":"1F468-200D-1F9BC","j":["man","accessibility","disability","wheelchair"]},"woman-in-motorized-wheelchair":{"a":"Woman in Motorized Wheelchair","b":"1F469-200D-1F9BC","j":["wheelchair","woman","disability","accessibility"]},"person-in-manual-wheelchair":{"a":"Person in Manual Wheelchair","b":"1F9D1-200D-1F9BD","j":["accessibility","disability","wheelchair"]},"man-in-manual-wheelchair":{"a":"Man in Manual Wheelchair","b":"1F468-200D-1F9BD","j":["man","accessibility","disability","wheelchair"]},"woman-in-manual-wheelchair":{"a":"Woman in Manual Wheelchair","b":"1F469-200D-1F9BD","j":["wheelchair","woman","disability","accessibility"]},"person-running":{"a":"Person Running","b":"1F3C3","j":["running","move","marathon"]},"man-running":{"a":"Man Running","b":"1F3C3-200D-2642-FE0F","j":["exercise","running","man","racing","race","marathon","walking"]},"woman-running":{"a":"Woman Running","b":"1F3C3-200D-2640-FE0F","j":["exercise","running","woman","racing","race","marathon","female","walking"]},"woman-dancing":{"a":"Woman Dancing","b":"1F483","j":["dance","woman","female","dancing","girl","fun"]},"man-dancing":{"a":"Man Dancing","b":"1F57A","j":["dancer","male","dance","man","dancing","boy","fun"]},"person-in-suit-levitating":{"a":"Person in Suit Levitating","b":"1F574","j":["business","jump","hover","levitate","suit","man_in_suit_levitating","person"]},"people-with-bunny-ears":{"a":"People with Bunny Ears","b":"1F46F","j":["dancer","partying","bunny ear","costume","perform"]},"men-with-bunny-ears":{"a":"Men with Bunny Ears","b":"1F46F-200D-2642-FE0F","j":["dancer","male","bunny","men","boys","partying","bunny ear"]},"women-with-bunny-ears":{"a":"Women with Bunny Ears","b":"1F46F-200D-2640-FE0F","j":["dancer","bunny","partying","female","bunny ear","women","girls"]},"person-in-steamy-room":{"a":"Person in Steamy Room","b":"1F9D6","j":["relax","sauna","spa","steambath","hamam","steam room"]},"man-in-steamy-room":{"a":"Man in Steamy Room","b":"1F9D6-200D-2642-FE0F","j":["sauna","male","spa","man","steamroom","steam room"]},"woman-in-steamy-room":{"a":"Woman in Steamy Room","b":"1F9D6-200D-2640-FE0F","j":["sauna","spa","woman","steamroom","female","steam room"]},"person-climbing":{"a":"Person Climbing","b":"1F9D7","j":["sport","climber"]},"man-climbing":{"a":"Man Climbing","b":"1F9D7-200D-2642-FE0F","j":["male","sports","man","rock","hobby","climber"]},"woman-climbing":{"a":"Woman Climbing","b":"1F9D7-200D-2640-FE0F","j":["sports","woman","rock","hobby","female","climber"]},"person-fencing":{"a":"Person Fencing","b":"1F93A","j":["sword","fencing","sports","fencer"]},"horse-racing":{"a":"Horse Racing","b":"1F3C7","j":["racehorse","racing","animal","competition","horse","luck","betting","gambling","jockey"]},"skier":{"a":"Skier","b":"26F7","j":["ski","winter","sports","snow"]},"snowboarder":{"a":"Snowboarder","b":"1F3C2","j":["sports","snow","winter","snowboard","ski"]},"person-golfing":{"a":"Person Golfing","b":"1F3CC","j":["business","golf","sports","ball"]},"man-golfing":{"a":"Man Golfing","b":"1F3CC-FE0F-200D-2642-FE0F","j":["golf","sport","man"]},"woman-golfing":{"a":"Woman Golfing","b":"1F3CC-FE0F-200D-2640-FE0F","j":["business","sports","golf","woman","female"]},"person-surfing":{"a":"Person Surfing","b":"1F3C4","j":["sport","sea","surfing"]},"man-surfing":{"a":"Man Surfing","b":"1F3C4-200D-2642-FE0F","j":["sports","man","sea","ocean","surfing","beach","summer"]},"woman-surfing":{"a":"Woman Surfing","b":"1F3C4-200D-2640-FE0F","j":["sports","woman","ocean","sea","female","surfing","beach","summer"]},"person-rowing-boat":{"a":"Person Rowing Boat","b":"1F6A3","j":["sport","rowboat","boat","move"]},"man-rowing-boat":{"a":"Man Rowing Boat","b":"1F6A3-200D-2642-FE0F","j":["rowboat","boat","sports","man","ship","water","hobby"]},"woman-rowing-boat":{"a":"Woman Rowing Boat","b":"1F6A3-200D-2640-FE0F","j":["rowboat","boat","sports","woman","water","ship","hobby","female"]},"person-swimming":{"a":"Person Swimming","b":"1F3CA","j":["swim","sport","pool"]},"man-swimming":{"a":"Man Swimming","b":"1F3CA-200D-2642-FE0F","j":["swim","exercise","athlete","sports","man","water","summer","human"]},"woman-swimming":{"a":"Woman Swimming","b":"1F3CA-200D-2640-FE0F","j":["swim","exercise","athlete","sports","woman","water","female","summer","human"]},"person-bouncing-ball":{"a":"Person Bouncing Ball","b":"26F9","j":["human","sports","ball"]},"man-bouncing-ball":{"a":"Man Bouncing Ball","b":"26F9-FE0F-200D-2642-FE0F","j":["man","sport","ball"]},"woman-bouncing-ball":{"a":"Woman Bouncing Ball","b":"26F9-FE0F-200D-2640-FE0F","j":["sports","woman","female","ball","human"]},"person-lifting-weights":{"a":"Person Lifting Weights","b":"1F3CB","j":["exercise","sports","lifter","training","weight"]},"man-lifting-weights":{"a":"Man Lifting Weights","b":"1F3CB-FE0F-200D-2642-FE0F","j":["man","sport","weight lifter"]},"woman-lifting-weights":{"a":"Woman Lifting Weights","b":"1F3CB-FE0F-200D-2640-FE0F","j":["exercise","sports","woman","female","training","weight lifter"]},"person-biking":{"a":"Person Biking","b":"1F6B4","j":["cyclist","sport","move","biking","bicycle"]},"man-biking":{"a":"Man Biking","b":"1F6B4-200D-2642-FE0F","j":["exercise","sports","cyclist","man","bike","bicycle","biking","hipster"]},"woman-biking":{"a":"Woman Biking","b":"1F6B4-200D-2640-FE0F","j":["exercise","sports","cyclist","woman","bike","bicycle","biking","hipster","female"]},"person-mountain-biking":{"a":"Person Mountain Biking","b":"1F6B5","j":["cyclist","sport","bike","move","bicycle","mountain","bicyclist"]},"man-mountain-biking":{"a":"Man Mountain Biking","b":"1F6B5-200D-2642-FE0F","j":["transportation","cyclist","man","bike","sports","race","bicycle","mountain","human"]},"woman-mountain-biking":{"a":"Woman Mountain Biking","b":"1F6B5-200D-2640-FE0F","j":["transportation","cyclist","sports","bike","woman","race","bicycle","biking","female","mountain","human"]},"person-cartwheeling":{"a":"Person Cartwheeling","b":"1F938","j":["cartwheel","gymnastic","gymnastics","sport"]},"man-cartwheeling":{"a":"Man Cartwheeling","b":"1F938-200D-2642-FE0F","j":["cartwheel","gymnastics","man"]},"woman-cartwheeling":{"a":"Woman Cartwheeling","b":"1F938-200D-2640-FE0F","j":["cartwheel","woman","gymnastics"]},"people-wrestling":{"a":"People Wrestling","b":"1F93C","j":["sport","wrestle","wrestler"]},"men-wrestling":{"a":"Men Wrestling","b":"1F93C-200D-2642-FE0F","j":["wrestle","men","sports","wrestlers"]},"women-wrestling":{"a":"Women Wrestling","b":"1F93C-200D-2640-FE0F","j":["wrestle","women","sports","wrestlers"]},"person-playing-water-polo":{"a":"Person Playing Water Polo","b":"1F93D","j":["sport","water","polo"]},"man-playing-water-polo":{"a":"Man Playing Water Polo","b":"1F93D-200D-2642-FE0F","j":["man","water polo","sports","pool"]},"woman-playing-water-polo":{"a":"Woman Playing Water Polo","b":"1F93D-200D-2640-FE0F","j":["woman","water polo","sports","pool"]},"person-playing-handball":{"a":"Person Playing Handball","b":"1F93E","j":["sport","handball","ball"]},"man-playing-handball":{"a":"Man Playing Handball","b":"1F93E-200D-2642-FE0F","j":["man","handball","sports"]},"woman-playing-handball":{"a":"Woman Playing Handball","b":"1F93E-200D-2640-FE0F","j":["woman","handball","sports"]},"person-juggling":{"a":"Person Juggling","b":"1F939","j":["balance","juggle","skill","multitask","performance"]},"man-juggling":{"a":"Man Juggling","b":"1F939-200D-2642-FE0F","j":["balance","man","juggle","juggling","skill","multitask"]},"woman-juggling":{"a":"Woman Juggling","b":"1F939-200D-2640-FE0F","j":["balance","woman","juggle","juggling","skill","multitask"]},"person-in-lotus-position":{"a":"Person in Lotus Position","b":"1F9D8","j":["meditation","yoga","serenity","meditate"]},"man-in-lotus-position":{"a":"Man in Lotus Position","b":"1F9D8-200D-2642-FE0F","j":["meditation","yoga","male","man","mindfulness","serenity","zen"]},"woman-in-lotus-position":{"a":"Woman in Lotus Position","b":"1F9D8-200D-2640-FE0F","j":["meditation","yoga","woman","female","mindfulness","serenity","zen"]},"person-taking-bath":{"a":"Person Taking Bath","b":"1F6C0","j":["bath","bathtub","bathroom","clean","shower"]},"person-in-bed":{"a":"Person in Bed","b":"1F6CC","j":["rest","hotel","bed","sleep"]},"people-holding-hands":{"a":"People Holding Hands","b":"1F9D1-200D-1F91D-200D-1F9D1","j":["friendship","couple","hold","holding hands","hand","person"]},"women-holding-hands":{"a":"Women Holding Hands","b":"1F46D","j":["hand","pair","friendship","couple","love","like","female","holding hands","people","women","human"]},"woman-and-man-holding-hands":{"a":"Woman and Man Holding Hands","b":"1F46B","j":["dating","man","marriage","couple","love","like","valentines","hold","people","hand","human","affection","pair","woman","holding hands","date"]},"men-holding-hands":{"a":"Men Holding Hands","b":"1F46C","j":["Gemini","men","pair","man","twins","friendship","couple","love","like","holding hands","people","human","zodiac","bromance"]},"kiss":{"a":"Kiss","b":"1F48F","j":["pair","marriage","love","couple","like","valentines","dating"]},"kiss-woman-man":{"a":"Kiss: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["man","woman","kiss","love","couple"]},"kiss-man-man":{"a":"Kiss: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["pair","man","marriage","kiss","couple","love","like","valentines","dating"]},"kiss-woman-woman":{"a":"Kiss: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F469","j":["pair","woman","marriage","kiss","couple","love","like","valentines","dating"]},"couple-with-heart":{"a":"Couple with Heart","b":"1F491","j":["pair","marriage","love","couple","like","valentines","dating","human","affection"]},"couple-with-heart-woman-man":{"a":"Couple with Heart: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F468","j":["man","woman","love","couple with heart","couple"]},"couple-with-heart-man-man":{"a":"Couple with Heart: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F468","j":["pair","man","marriage","love","couple","couple with heart","like","valentines","dating","human","affection"]},"couple-with-heart-woman-woman":{"a":"Couple with Heart: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F469","j":["pair","woman","marriage","love","couple","couple with heart","like","valentines","dating","human","affection"]},"family":{"a":"Family","b":"1F46A","j":["mom","mother","dad","father","parents","child","home","people","human"]},"family-man-woman-boy":{"a":"Family: Man, Woman, Boy","b":"1F468-200D-1F469-200D-1F466","j":["man","woman","family","love","boy"]},"family-man-woman-girl":{"a":"Family: Man, Woman, Girl","b":"1F468-200D-1F469-200D-1F467","j":["parents","man","woman","family","child","girl","home","people","human"]},"family-man-woman-girl-boy":{"a":"Family: Man, Woman, Girl, Boy","b":"1F468-200D-1F469-200D-1F467-200D-1F466","j":["children","parents","man","woman","family","girl","home","people","boy","human"]},"family-man-woman-boy-boy":{"a":"Family: Man, Woman, Boy, Boy","b":"1F468-200D-1F469-200D-1F466-200D-1F466","j":["children","parents","man","woman","family","home","people","boy","human"]},"family-man-woman-girl-girl":{"a":"Family: Man, Woman, Girl, Girl","b":"1F468-200D-1F469-200D-1F467-200D-1F467","j":["children","parents","man","woman","family","girl","home","people","human"]},"family-man-man-boy":{"a":"Family: Man, Man, Boy","b":"1F468-200D-1F468-200D-1F466","j":["children","parents","man","family","home","people","boy","human"]},"family-man-man-girl":{"a":"Family: Man, Man, Girl","b":"1F468-200D-1F468-200D-1F467","j":["children","parents","man","family","girl","home","people","human"]},"family-man-man-girl-boy":{"a":"Family: Man, Man, Girl, Boy","b":"1F468-200D-1F468-200D-1F467-200D-1F466","j":["children","parents","man","family","girl","home","people","boy","human"]},"family-man-man-boy-boy":{"a":"Family: Man, Man, Boy, Boy","b":"1F468-200D-1F468-200D-1F466-200D-1F466","j":["children","parents","man","family","home","people","boy","human"]},"family-man-man-girl-girl":{"a":"Family: Man, Man, Girl, Girl","b":"1F468-200D-1F468-200D-1F467-200D-1F467","j":["children","parents","man","family","girl","home","people","human"]},"family-woman-woman-boy":{"a":"Family: Woman, Woman, Boy","b":"1F469-200D-1F469-200D-1F466","j":["children","parents","woman","family","home","people","boy","human"]},"family-woman-woman-girl":{"a":"Family: Woman, Woman, Girl","b":"1F469-200D-1F469-200D-1F467","j":["children","parents","woman","family","girl","home","people","human"]},"family-woman-woman-girl-boy":{"a":"Family: Woman, Woman, Girl, Boy","b":"1F469-200D-1F469-200D-1F467-200D-1F466","j":["children","parents","woman","family","girl","home","people","boy","human"]},"family-woman-woman-boy-boy":{"a":"Family: Woman, Woman, Boy, Boy","b":"1F469-200D-1F469-200D-1F466-200D-1F466","j":["children","parents","woman","family","home","people","boy","human"]},"family-woman-woman-girl-girl":{"a":"Family: Woman, Woman, Girl, Girl","b":"1F469-200D-1F469-200D-1F467-200D-1F467","j":["children","parents","woman","family","girl","home","people","human"]},"family-man-boy":{"a":"Family: Man, Boy","b":"1F468-200D-1F466","j":["man","parent","family","child","home","people","boy","human"]},"family-man-boy-boy":{"a":"Family: Man, Boy, Boy","b":"1F468-200D-1F466-200D-1F466","j":["children","man","parent","family","home","people","boy","human"]},"family-man-girl":{"a":"Family: Man, Girl","b":"1F468-200D-1F467","j":["man","parent","family","child","girl","home","people","human"]},"family-man-girl-boy":{"a":"Family: Man, Girl, Boy","b":"1F468-200D-1F467-200D-1F466","j":["children","man","parent","family","girl","home","people","boy","human"]},"family-man-girl-girl":{"a":"Family: Man, Girl, Girl","b":"1F468-200D-1F467-200D-1F467","j":["children","man","parent","family","girl","home","people","human"]},"family-woman-boy":{"a":"Family: Woman, Boy","b":"1F469-200D-1F466","j":["woman","family","parent","child","home","people","boy","human"]},"family-woman-boy-boy":{"a":"Family: Woman, Boy, Boy","b":"1F469-200D-1F466-200D-1F466","j":["children","woman","family","parent","home","people","boy","human"]},"family-woman-girl":{"a":"Family: Woman, Girl","b":"1F469-200D-1F467","j":["woman","family","parent","child","girl","home","people","human"]},"family-woman-girl-boy":{"a":"Family: Woman, Girl, Boy","b":"1F469-200D-1F467-200D-1F466","j":["children","woman","family","parent","girl","home","people","boy","human"]},"family-woman-girl-girl":{"a":"Family: Woman, Girl, Girl","b":"1F469-200D-1F467-200D-1F467","j":["children","woman","family","parent","girl","home","people","human"]},"speaking-head":{"a":"Speaking Head","b":"1F5E3","j":["speak","talk","say","sing","user","face","head","silhouette","speaking","human","person"]},"bust-in-silhouette":{"a":"Bust in Silhouette","b":"1F464","j":["bust","user","silhouette","human","person"]},"busts-in-silhouette":{"a":"Busts in Silhouette","b":"1F465","j":["group","bust","user","team","silhouette","human","person"]},"people-hugging":{"a":"People Hugging","b":"1FAC2","j":["thanks","hug","goodbye","hello","care"]},"footprints":{"a":"Footprints","b":"1F463","j":["clothing","print","tracking","feet","footprint","walking","beach"]},"red-hair":{"a":"Red Hair","b":"1F9B0","j":["ginger","red hair","redhead"]},"curly-hair":{"a":"Curly Hair","b":"1F9B1","j":["afro","curly","curly hair","ringlets"]},"white-hair":{"a":"White Hair","b":"1F9B3","j":["gray","hair","old","white"]},"bald":{"a":"Bald","b":"1F9B2","j":["bald","chemotherapy","hairless","no hair","shaven"]},"monkey-face":{"a":"Monkey Face","b":"1F435","j":["animal","circus","face","nature","monkey"]},"monkey":{"a":"Monkey","b":"1F412","j":["banana","animal","circus","nature"]},"gorilla":{"a":"Gorilla","b":"1F98D","j":["animal","circus","nature"]},"orangutan":{"a":"Orangutan","b":"1F9A7","j":["ape","animal"]},"dog-face":{"a":"Dog Face","b":"1F436","j":["animal","dog","pet","friend","nature","puppy","faithful","face","woof"]},"dog":{"a":"Dog","b":"1F415","j":["animal","pet","friend","nature","doge","faithful"]},"guide-dog":{"a":"Guide Dog","b":"1F9AE","j":["accessibility","animal","blind","guide"]},"service-dog":{"a":"Service Dog","b":"1F415-200D-1F9BA","j":["blind","animal","assistance","dog","accessibility","service"]},"poodle":{"a":"Poodle","b":"1F429","j":["animal","dog","pet","nature","101"]},"wolf":{"a":"Wolf","b":"1F43A","j":["animal","face","wild","nature"]},"fox":{"a":"Fox","b":"1F98A","j":["animal","face","nature"]},"raccoon":{"a":"Raccoon","b":"1F99D","j":["curious","animal","sly","nature"]},"cat-face":{"a":"Cat Face","b":"1F431","j":["meow","animal","pet","nature","kitten","cat","face"]},"cat":{"a":"Cat","b":"1F408","j":["animal","pet","cats","meow"]},"black-cat":{"a":"Black Cat","b":"1F408-200D-2B1B","j":["black","unlucky","luck","cat","superstition"]},"lion":{"a":"Lion","b":"1F981","j":["animal","Leo","nature","face","zodiac"]},"tiger-face":{"a":"Tiger Face","b":"1F42F","j":["tiger","animal","roar","wild","nature","danger","cat","face"]},"tiger":{"a":"Tiger","b":"1F405","j":["roar","animal","nature"]},"leopard":{"a":"Leopard","b":"1F406","j":["animal","nature"]},"horse-face":{"a":"Horse Face","b":"1F434","j":["brown","animal","horse","nature","face"]},"horse":{"a":"Horse","b":"1F40E","j":["racehorse","equestrian","animal","racing","luck","gamble"]},"unicorn":{"a":"Unicorn","b":"1F984","j":["nature","animal","mystical","face"]},"zebra":{"a":"Zebra","b":"1F993","j":["safari","stripes","animal","stripe","nature"]},"deer":{"a":"Deer","b":"1F98C","j":["venison","animal","horns","nature"]},"bison":{"a":"Bison","b":"1F9AC","j":["ox","herd","buffalo","wisent"]},"cow-face":{"a":"Cow Face","b":"1F42E","j":["nature","ox","cow","animal","beef","milk","moo","face"]},"ox":{"a":"Ox","b":"1F402","j":["Taurus","animal","cow","beef","bull","zodiac"]},"water-buffalo":{"a":"Water Buffalo","b":"1F403","j":["ox","water","animal","cow","buffalo","nature"]},"cow":{"a":"Cow","b":"1F404","j":["ox","animal","moo","beef","milk","nature"]},"pig-face":{"a":"Pig Face","b":"1F437","j":["pig","animal","nature","face","oink"]},"pig":{"a":"Pig","b":"1F416","j":["animal","sow","nature"]},"boar":{"a":"Boar","b":"1F417","j":["pig","animal","nature"]},"pig-nose":{"a":"Pig Nose","b":"1F43D","j":["pig","animal","nose","face","oink"]},"ram":{"a":"Ram","b":"1F40F","j":["Aries","sheep","male","animal","nature","zodiac"]},"ewe":{"a":"Ewe","b":"1F411","j":["sheep","shipit","animal","wool","female","nature"]},"goat":{"a":"Goat","b":"1F410","j":["Capricorn","animal","zodiac","nature"]},"camel":{"a":"Camel","b":"1F42A","j":["dromedary","hot","animal","desert","hump"]},"twohump-camel":{"a":"Two-Hump Camel","b":"1F42B","j":["camel","two_hump_camel","hot","animal","two-hump camel","desert","nature","bactrian","hump"]},"llama":{"a":"Llama","b":"1F999","j":["alpaca","nature","animal","wool","vicuña","guanaco"]},"giraffe":{"a":"Giraffe","b":"1F992","j":["nature","spots","animal","safari"]},"elephant":{"a":"Elephant","b":"1F418","j":["animal","nature","th","nose","circus"]},"mammoth":{"a":"Mammoth","b":"1F9A3","j":["tusk","extinction","large","woolly","elephant","tusks"]},"rhinoceros":{"a":"Rhinoceros","b":"1F98F","j":["nature","animal","horn"]},"hippopotamus":{"a":"Hippopotamus","b":"1F99B","j":["hippo","animal","nature"]},"mouse-face":{"a":"Mouse Face","b":"1F42D","j":["mouse","animal","cheese_wedge","nature","face","rodent"]},"mouse":{"a":"Mouse","b":"1F401","j":["animal","rodent","nature"]},"rat":{"a":"Rat","b":"1F400","j":["mouse","animal","rodent"]},"hamster":{"a":"Hamster","b":"1F439","j":["pet","animal","face","nature"]},"rabbit-face":{"a":"Rabbit Face","b":"1F430","j":["bunny","animal","spring","magic","pet","rabbit","nature","face"]},"rabbit":{"a":"Rabbit","b":"1F407","j":["bunny","animal","spring","magic","pet","nature"]},"chipmunk":{"a":"Chipmunk","b":"1F43F","j":["animal","squirrel","rodent","nature"]},"beaver":{"a":"Beaver","b":"1F9AB","j":["animal","dam","rodent"]},"hedgehog":{"a":"Hedgehog","b":"1F994","j":["animal","spiny","nature"]},"bat":{"a":"Bat","b":"1F987","j":["blind","vampire","animal","nature"]},"bear":{"a":"Bear","b":"1F43B","j":["animal","face","wild","nature"]},"polar-bear":{"a":"Polar Bear","b":"1F43B-200D-2744-FE0F","j":["bear","animal","white","arctic"]},"koala":{"a":"Koala","b":"1F428","j":["bear","animal","nature"]},"panda":{"a":"Panda","b":"1F43C","j":["animal","face","nature"]},"sloth":{"a":"Sloth","b":"1F9A5","j":["slow","lazy","animal"]},"otter":{"a":"Otter","b":"1F9A6","j":["fishing","animal","playful"]},"skunk":{"a":"Skunk","b":"1F9A8","j":["stink","animal"]},"kangaroo":{"a":"Kangaroo","b":"1F998","j":["jump","hop","australia","marsupial","animal","Australia","nature","joey"]},"badger":{"a":"Badger","b":"1F9A1","j":["animal","pester","nature","honey","honey badger"]},"paw-prints":{"a":"Paw Prints","b":"1F43E","j":["print","tracking","feet","cat","animal","paw","dog","pet","footprints"]},"turkey":{"a":"Turkey","b":"1F983","j":["animal","bird"]},"chicken":{"a":"Chicken","b":"1F414","j":["animal","cluck","bird","nature"]},"rooster":{"a":"Rooster","b":"1F413","j":["nature","animal","chicken","bird"]},"hatching-chick":{"a":"Hatching Chick","b":"1F423","j":["animal","chick","egg","born","baby","bird","hatching","chicken"]},"baby-chick":{"a":"Baby Chick","b":"1F424","j":["animal","chick","baby","bird","chicken"]},"frontfacing-baby-chick":{"a":"Front-Facing Baby Chick","b":"1F425","j":["chicken","animal","front_facing_baby_chick","chick","front-facing baby chick","baby","bird"]},"bird":{"a":"Bird","b":"1F426","j":["fly","animal","spring","tweet","nature"]},"penguin":{"a":"Penguin","b":"1F427","j":["nature","animal","bird"]},"dove":{"a":"Dove","b":"1F54A","j":["animal","fly","peace","bird"]},"eagle":{"a":"Eagle","b":"1F985","j":["nature","animal","bird"]},"duck":{"a":"Duck","b":"1F986","j":["nature","animal","mallard","bird"]},"swan":{"a":"Swan","b":"1F9A2","j":["nature","animal","ugly duckling","cygnet","bird"]},"owl":{"a":"Owl","b":"1F989","j":["wise","nature","animal","bird","hoot"]},"dodo":{"a":"Dodo","b":"1F9A4","j":["extinction","Mauritius","animal","large","bird"]},"feather":{"a":"Feather","b":"1FAB6","j":["fly","flight","plumage","light","bird"]},"flamingo":{"a":"Flamingo","b":"1F9A9","j":["animal","flamboyant","tropical"]},"peacock":{"a":"Peacock","b":"1F99A","j":["ostentatious","animal","peahen","proud","nature","bird"]},"parrot":{"a":"Parrot","b":"1F99C","j":["nature","animal","bird","talk","pirate"]},"frog":{"a":"Frog","b":"1F438","j":["animal","toad","croak","nature","face"]},"crocodile":{"a":"Crocodile","b":"1F40A","j":["alligator","animal","nature","reptile","lizard"]},"turtle":{"a":"Turtle","b":"1F422","j":["slow","animal","tortoise","terrapin","nature"]},"lizard":{"a":"Lizard","b":"1F98E","j":["reptile","animal","nature"]},"snake":{"a":"Snake","b":"1F40D","j":["python","animal","bearer","Ophiuchus","hiss","nature","serpent","evil","zodiac"]},"dragon-face":{"a":"Dragon Face","b":"1F432","j":["dragon","fairy tale","myth","animal","green","chinese","nature","face"]},"dragon":{"a":"Dragon","b":"1F409","j":["fairy tale","myth","animal","green","chinese","nature"]},"sauropod":{"a":"Sauropod","b":"1F995","j":["dinosaur","brontosaurus","animal","brachiosaurus","diplodocus","nature","extinct"]},"trex":{"a":"T-Rex","b":"1F996","j":["dinosaur","t_rex","animal","Tyrannosaurus Rex","tyrannosaurus","nature","extinct"]},"spouting-whale":{"a":"Spouting Whale","b":"1F433","j":["nature","sea","ocean","animal","spouting","whale","face"]},"whale":{"a":"Whale","b":"1F40B","j":["sea","ocean","animal","nature"]},"dolphin":{"a":"Dolphin","b":"1F42C","j":["fish","sea","ocean","animal","flipper","fins","beach","nature"]},"seal":{"a":"Seal","b":"1F9AD","j":["sea","animal","sea lion","creature"]},"fish":{"a":"Fish","b":"1F41F","j":["Pisces","food","animal","nature","zodiac"]},"tropical-fish":{"a":"Tropical Fish","b":"1F420","j":["swim","fish","nemo","ocean","animal","beach","tropical"]},"blowfish":{"a":"Blowfish","b":"1F421","j":["fish","food","sea","ocean","animal","nature"]},"shark":{"a":"Shark","b":"1F988","j":["fish","sea","ocean","animal","fins","beach","nature","jaws"]},"octopus":{"a":"Octopus","b":"1F419","j":["sea","ocean","animal","beach","nature","creature"]},"spiral-shell":{"a":"Spiral Shell","b":"1F41A","j":["sea","beach","nature","spiral","shell"]},"snail":{"a":"Snail","b":"1F40C","j":["slow","animal","shell"]},"butterfly":{"a":"Butterfly","b":"1F98B","j":["pretty","animal","caterpillar","nature","insect"]},"bug":{"a":"Bug","b":"1F41B","j":["nature","animal","worm","insect"]},"ant":{"a":"Ant","b":"1F41C","j":["nature","bug","animal","insect"]},"honeybee":{"a":"Honeybee","b":"1F41D","j":["bee","animal","spring","nature","honey","bug","insect"]},"beetle":{"a":"Beetle","b":"1FAB2","j":["bug","insect"]},"lady-beetle":{"a":"Lady Beetle","b":"1F41E","j":["ladybird","beetle","animal","ladybug","nature","insect"]},"cricket":{"a":"Cricket","b":"1F997","j":["chirp","animal","grasshopper","Orthoptera"]},"cockroach":{"a":"Cockroach","b":"1FAB3","j":["pest","roach","pests","insect"]},"spider":{"a":"Spider","b":"1F577","j":["arachnid","animal","insect"]},"spider-web":{"a":"Spider Web","b":"1F578","j":["spider","web","animal","arachnid","silk","insect"]},"scorpion":{"a":"Scorpion","b":"1F982","j":["Scorpio","animal","scorpio","arachnid","zodiac"]},"mosquito":{"a":"Mosquito","b":"1F99F","j":["virus","animal","fever","disease","malaria","nature","pest","insect"]},"fly":{"a":"Fly","b":"1FAB0","j":["maggot","disease","pest","rotting","insect"]},"worm":{"a":"Worm","b":"1FAB1","j":["annelid","earthworm","animal","parasite"]},"microbe":{"a":"Microbe","b":"1F9A0","j":["amoeba","virus","bacteria","germs"]},"bouquet":{"a":"Bouquet","b":"1F490","j":["flowers","spring","flower","nature"]},"cherry-blossom":{"a":"Cherry Blossom","b":"1F338","j":["blossom","spring","flower","nature","plant","cherry"]},"white-flower":{"a":"White Flower","b":"1F4AE","j":["japanese","spring","flower"]},"rosette":{"a":"Rosette","b":"1F3F5","j":["plant","military","flower","decoration"]},"rose":{"a":"Rose","b":"1F339","j":["flowers","spring","love","valentines","flower"]},"wilted-flower":{"a":"Wilted Flower","b":"1F940","j":["plant","wilted","flower","nature"]},"hibiscus":{"a":"Hibiscus","b":"1F33A","j":["flowers","vegetable","beach","flower","plant"]},"sunflower":{"a":"Sunflower","b":"1F33B","j":["sun","flower","nature","plant","fall"]},"blossom":{"a":"Blossom","b":"1F33C","j":["flowers","yellow","flower","nature"]},"tulip":{"a":"Tulip","b":"1F337","j":["flowers","spring","flower","nature","summer","plant"]},"seedling":{"a":"Seedling","b":"1F331","j":["lawn","spring","young","nature","plant","grass"]},"potted-plant":{"a":"Potted Plant","b":"1FAB4","j":["useless","boring","greenery","house","nurturing","plant","grow"]},"evergreen-tree":{"a":"Evergreen Tree","b":"1F332","j":["plant","tree","nature"]},"deciduous-tree":{"a":"Deciduous Tree","b":"1F333","j":["deciduous","shedding","tree","nature","plant"]},"palm-tree":{"a":"Palm Tree","b":"1F334","j":["mojito","vegetable","palm","beach","tree","nature","summer","plant","tropical"]},"cactus":{"a":"Cactus","b":"1F335","j":["plant","vegetable","nature"]},"sheaf-of-rice":{"a":"Sheaf of Rice","b":"1F33E","j":["rice","grain","nature","ear","plant"]},"herb":{"a":"Herb","b":"1F33F","j":["lawn","vegetable","medicine","leaf","plant","weed","grass"]},"shamrock":{"a":"Shamrock","b":"2618","j":["irish","vegetable","clover","nature","plant"]},"four-leaf-clover":{"a":"Four Leaf Clover","b":"1F340","j":["lucky","irish","four","vegetable","clover","four-leaf clover","leaf","4","nature","plant"]},"maple-leaf":{"a":"Maple Leaf","b":"1F341","j":["ca","vegetable","leaf","falling","nature","plant","maple","fall"]},"fallen-leaf":{"a":"Fallen Leaf","b":"1F342","j":["vegetable","leaf","leaves","falling","nature","plant"]},"leaf-fluttering-in-wind":{"a":"Leaf Fluttering in Wind","b":"1F343","j":["grass","lawn","vegetable","leaf","spring","flutter","wind","tree","nature","plant","blow"]},"grapes":{"a":"Grapes","b":"1F347","j":["wine","food","grape","fruit"]},"melon":{"a":"Melon","b":"1F348","j":["food","fruit","nature"]},"watermelon":{"a":"Watermelon","b":"1F349","j":["summer","food","picnic","fruit"]},"tangerine":{"a":"Tangerine","b":"1F34A","j":["food","orange","fruit","nature"]},"lemon":{"a":"Lemon","b":"1F34B","j":["fruit","citrus","nature"]},"banana":{"a":"Banana","b":"1F34C","j":["food","monkey","fruit"]},"pineapple":{"a":"Pineapple","b":"1F34D","j":["food","fruit","nature"]},"mango":{"a":"Mango","b":"1F96D","j":["food","fruit","tropical"]},"red-apple":{"a":"Red Apple","b":"1F34E","j":["red","fruit","school","mac","apple"]},"green-apple":{"a":"Green Apple","b":"1F34F","j":["green","fruit","apple","nature"]},"pear":{"a":"Pear","b":"1F350","j":["food","fruit","nature"]},"peach":{"a":"Peach","b":"1F351","j":["food","fruit","nature"]},"cherries":{"a":"Cherries","b":"1F352","j":["food","red","fruit","berries","cherry"]},"strawberry":{"a":"Strawberry","b":"1F353","j":["food","nature","berry","fruit"]},"blueberries":{"a":"Blueberries","b":"1FAD0","j":["fruit","berry","blue","bilberry","blueberry"]},"kiwi-fruit":{"a":"Kiwi Fruit","b":"1F95D","j":["food","kiwi","fruit"]},"tomato":{"a":"Tomato","b":"1F345","j":["food","fruit","vegetable","nature"]},"olive":{"a":"Olive","b":"1FAD2","j":["food","fruit"]},"coconut":{"a":"Coconut","b":"1F965","j":["food","fruit","palm","nature","piña colada"]},"avocado":{"a":"Avocado","b":"1F951","j":["food","fruit"]},"eggplant":{"a":"Eggplant","b":"1F346","j":["food","aubergine","vegetable","nature"]},"potato":{"a":"Potato","b":"1F954","j":["food","tuber","vegetable","vegatable","starch"]},"carrot":{"a":"Carrot","b":"1F955","j":["food","vegetable","orange"]},"ear-of-corn":{"a":"Ear of Corn","b":"1F33D","j":["food","vegetable","corn","maize","maze","ear","plant"]},"hot-pepper":{"a":"Hot Pepper","b":"1F336","j":["food","hot","spicy","chili","pepper","chilli"]},"bell-pepper":{"a":"Bell Pepper","b":"1FAD1","j":["fruit","vegetable","capsicum","pepper","plant"]},"cucumber":{"a":"Cucumber","b":"1F952","j":["food","pickle","vegetable","fruit"]},"leafy-green":{"a":"Leafy Green","b":"1F96C","j":["food","vegetable","cabbage","kale","plant","lettuce","bok choy"]},"broccoli":{"a":"Broccoli","b":"1F966","j":["food","wild cabbage","fruit","vegetable"]},"garlic":{"a":"Garlic","b":"1F9C4","j":["cook","food","spice","flavoring"]},"onion":{"a":"Onion","b":"1F9C5","j":["cook","food","spice","flavoring"]},"mushroom":{"a":"Mushroom","b":"1F344","j":["toadstool","plant","vegetable"]},"peanuts":{"a":"Peanuts","b":"1F95C","j":["nut","food","peanut","vegetable"]},"chestnut":{"a":"Chestnut","b":"1F330","j":["plant","squirrel","food"]},"bread":{"a":"Bread","b":"1F35E","j":["food","wheat","loaf","breakfast","toast"]},"croissant":{"a":"Croissant","b":"1F950","j":["food","bread","breakfast","french","roll"]},"baguette-bread":{"a":"Baguette Bread","b":"1F956","j":["food","bread","french","baguette"]},"flatbread":{"a":"Flatbread","b":"1FAD3","j":["food","pita","naan","arepa","lavash","flour"]},"pretzel":{"a":"Pretzel","b":"1F968","j":["twisted","food","bread","convoluted"]},"bagel":{"a":"Bagel","b":"1F96F","j":["food","bread","breakfast","schmear","bakery"]},"pancakes":{"a":"Pancakes","b":"1F95E","j":["flapjacks","food","pancake","hotcakes","breakfast","crêpe","hotcake"]},"waffle":{"a":"Waffle","b":"1F9C7","j":["food","breakfast","indecisive","iron"]},"cheese-wedge":{"a":"Cheese Wedge","b":"1F9C0","j":["food","chadder","cheese"]},"meat-on-bone":{"a":"Meat on Bone","b":"1F356","j":["food","drumstick","bone","good","meat"]},"poultry-leg":{"a":"Poultry Leg","b":"1F357","j":["food","turkey","drumstick","bone","leg","poultry","bird","meat","chicken"]},"cut-of-meat":{"a":"Cut of Meat","b":"1F969","j":["food","porkchop","chop","cow","cut","lambchop","steak","meat"]},"bacon":{"a":"Bacon","b":"1F953","j":["pig","food","pork","breakfast","meat"]},"hamburger":{"a":"Hamburger","b":"1F354","j":["burger","cheeseburger","beef","fast food","burger king","meat","mcdonalds"]},"french-fries":{"a":"French Fries","b":"1F35F","j":["fries","fast food","french","chips","snack"]},"pizza":{"a":"Pizza","b":"1F355","j":["food","cheese","party","slice"]},"hot-dog":{"a":"Hot Dog","b":"1F32D","j":["hotdog","food","sausage","frankfurter"]},"sandwich":{"a":"Sandwich","b":"1F96A","j":["lunch","bread","food"]},"taco":{"a":"Taco","b":"1F32E","j":["mexican","food"]},"burrito":{"a":"Burrito","b":"1F32F","j":["wrap","mexican","food"]},"tamale":{"a":"Tamale","b":"1FAD4","j":["mexican","food","wrapped","masa"]},"stuffed-flatbread":{"a":"Stuffed Flatbread","b":"1F959","j":["food","kebab","stuffed","gyro","falafel","flatbread"]},"falafel":{"a":"Falafel","b":"1F9C6","j":["chickpea","food","meatball"]},"egg":{"a":"Egg","b":"1F95A","j":["food","chicken","breakfast"]},"cooking":{"a":"Cooking","b":"1F373","j":["food","frying","kitchen","breakfast","egg","pan"]},"shallow-pan-of-food":{"a":"Shallow Pan of Food","b":"1F958","j":["food","casserole","cooking","paella","pan","shallow"]},"pot-of-food":{"a":"Pot of Food","b":"1F372","j":["food","stew","pot","soup","meat"]},"fondue":{"a":"Fondue","b":"1FAD5","j":["food","pot","chocolate","melted","Swiss","cheese"]},"bowl-with-spoon":{"a":"Bowl with Spoon","b":"1F963","j":["food","congee","porridge","breakfast","cereal","oatmeal"]},"green-salad":{"a":"Green Salad","b":"1F957","j":["food","healthy","green","lettuce","salad"]},"popcorn":{"a":"Popcorn","b":"1F37F","j":["movie theater","food","films","snack"]},"butter":{"a":"Butter","b":"1F9C8","j":["cook","food","dairy"]},"salt":{"a":"Salt","b":"1F9C2","j":["shaker","condiment"]},"canned-food":{"a":"Canned Food","b":"1F96B","j":["soup","food","can"]},"bento-box":{"a":"Bento Box","b":"1F371","j":["bento","food","japanese","box"]},"rice-cracker":{"a":"Rice Cracker","b":"1F358","j":["rice","japanese","food","cracker"]},"rice-ball":{"a":"Rice Ball","b":"1F359","j":["food","Japanese","rice","ball","japanese"]},"cooked-rice":{"a":"Cooked Rice","b":"1F35A","j":["food","china","rice","asian","cooked"]},"curry-rice":{"a":"Curry Rice","b":"1F35B","j":["food","hot","spicy","curry","rice","indian"]},"steaming-bowl":{"a":"Steaming Bowl","b":"1F35C","j":["food","noodle","steaming","bowl","chopsticks","japanese","ramen"]},"spaghetti":{"a":"Spaghetti","b":"1F35D","j":["pasta","italian","noodle","food"]},"roasted-sweet-potato":{"a":"Roasted Sweet Potato","b":"1F360","j":["food","potato","roasted","nature","sweet"]},"oden":{"a":"Oden","b":"1F362","j":["food","kebab","seafood","skewer","japanese","stick"]},"sushi":{"a":"Sushi","b":"1F363","j":["rice","fish","food","japanese"]},"fried-shrimp":{"a":"Fried Shrimp","b":"1F364","j":["tempura","food","shrimp","animal","prawn","appetizer","summer","fried"]},"fish-cake-with-swirl":{"a":"Fish Cake with Swirl","b":"1F365","j":["fish","food","pink","kamaboko","sea","pastry","narutomaki","cake","swirl","beach","japan","ramen","surimi"]},"moon-cake":{"a":"Moon Cake","b":"1F96E","j":["yuèbǐng","autumn","food","festival"]},"dango":{"a":"Dango","b":"1F361","j":["food","stick","Japanese","skewer","japanese","dessert","sweet","barbecue","meat"]},"dumpling":{"a":"Dumpling","b":"1F95F","j":["food","empanada","jiaozi","potsticker","gyōza","pierogi"]},"fortune-cookie":{"a":"Fortune Cookie","b":"1F960","j":["food","prophecy"]},"takeout-box":{"a":"Takeout Box","b":"1F961","j":["leftovers","food","oyster pail"]},"crab":{"a":"Crab","b":"1F980","j":["Cancer","animal","crustacean","zodiac"]},"lobster":{"a":"Lobster","b":"1F99E","j":["bisque","animal","seafood","claws","nature"]},"shrimp":{"a":"Shrimp","b":"1F990","j":["food","shellfish","ocean","animal","small","seafood","nature"]},"squid":{"a":"Squid","b":"1F991","j":["food","sea","ocean","animal","nature","molusc"]},"oyster":{"a":"Oyster","b":"1F9AA","j":["diving","food","pearl"]},"soft-ice-cream":{"a":"Soft Ice Cream","b":"1F366","j":["food","soft","icecream","ice","hot","dessert","summer","sweet","cream"]},"shaved-ice":{"a":"Shaved Ice","b":"1F367","j":["ice","shaved","hot","dessert","summer","sweet"]},"ice-cream":{"a":"Ice Cream","b":"1F368","j":["food","ice","hot","dessert","sweet","cream"]},"doughnut":{"a":"Doughnut","b":"1F369","j":["food","breakfast","donut","dessert","sweet","snack"]},"cookie":{"a":"Cookie","b":"1F36A","j":["food","oreo","chocolate","dessert","sweet","snack"]},"birthday-cake":{"a":"Birthday Cake","b":"1F382","j":["food","birthday","celebration","pastry","cake","dessert","sweet"]},"shortcake":{"a":"Shortcake","b":"1F370","j":["food","pastry","cake","dessert","sweet","slice"]},"cupcake":{"a":"Cupcake","b":"1F9C1","j":["bakery","food","sweet","dessert"]},"pie":{"a":"Pie","b":"1F967","j":["food","fruit","pastry","filling","dessert","meat"]},"chocolate-bar":{"a":"Chocolate Bar","b":"1F36B","j":["food","chocolate","bar","dessert","sweet","snack"]},"candy":{"a":"Candy","b":"1F36C","j":["sweet","snack","lolly","dessert"]},"lollipop":{"a":"Lollipop","b":"1F36D","j":["candy","food","dessert","sweet","snack"]},"custard":{"a":"Custard","b":"1F36E","j":["sweet","food","dessert","pudding"]},"honey-pot":{"a":"Honey Pot","b":"1F36F","j":["honeypot","pot","kitchen","bees","honey","sweet"]},"baby-bottle":{"a":"Baby Bottle","b":"1F37C","j":["bottle","food","container","milk","drink","baby"]},"glass-of-milk":{"a":"Glass of Milk","b":"1F95B","j":["cow","milk","beverage","drink","glass"]},"hot-beverage":{"a":"Hot Beverage","b":"2615","j":["latte","tea","steaming","coffee","caffeine","hot","espresso","beverage","drink"]},"teapot":{"a":"Teapot","b":"1FAD6","j":["tea","hot","drink","pot"]},"teacup-without-handle":{"a":"Teacup Without Handle","b":"1F375","j":["tea","teacup","british","breakfast","green","beverage","drink","bowl","cup"]},"sake":{"a":"Sake","b":"1F376","j":["bottle","drunk","wine","booze","beverage","bar","drink","japanese","alcohol","cup"]},"bottle-with-popping-cork":{"a":"Bottle with Popping Cork","b":"1F37E","j":["bottle","wine","celebration","cork","bar","drink","popping"]},"wine-glass":{"a":"Wine Glass","b":"1F377","j":["wine","booze","beverage","bar","drink","drunk","alcohol","glass"]},"cocktail-glass":{"a":"Cocktail Glass","b":"1F378","j":["mojito","booze","beverage","bar","cocktail","drink","drunk","alcohol","glass"]},"tropical-drink":{"a":"Tropical Drink","b":"1F379","j":["mojito","booze","beverage","bar","drink","cocktail","beach","summer","alcohol","tropical"]},"beer-mug":{"a":"Beer Mug","b":"1F37A","j":["relax","beer","booze","beverage","bar","drink","summer","drunk","alcohol","pub","mug","party"]},"clinking-beer-mugs":{"a":"Clinking Beer Mugs","b":"1F37B","j":["relax","beer","booze","beverage","bar","drink","summer","drunk","alcohol","pub","mug","clink","party"]},"clinking-glasses":{"a":"Clinking Glasses","b":"1F942","j":["wine","champagne","cheers","toast","beverage","drink","celebrate","alcohol","glass","clink","party"]},"tumbler-glass":{"a":"Tumbler Glass","b":"1F943","j":["whisky","booze","liquor","bourbon","shot","beverage","drink","scotch","drunk","alcohol","glass","tumbler"]},"cup-with-straw":{"a":"Cup with Straw","b":"1F964","j":["soda","soft drink","water","juice","malt","drink"]},"bubble-tea":{"a":"Bubble Tea","b":"1F9CB","j":["tea","boba","milk tea","bubble","straw","milk","taiwan","pearl"]},"beverage-box":{"a":"Beverage Box","b":"1F9C3","j":["straw","juice","beverage","drink","box","sweet"]},"mate":{"a":"Mate","b":"1F9C9","j":["beverage","tea","drink"]},"ice":{"a":"Ice","b":"1F9CA","j":["cold","water","ice cube","iceberg"]},"chopsticks":{"a":"Chopsticks","b":"1F962","j":["jeotgarak","food","hashi","kuaizi"]},"fork-and-knife-with-plate":{"a":"Fork and Knife with Plate","b":"1F37D","j":["food","dinner","knife","cooking","restaurant","plate","meal","lunch","fork","eat"]},"fork-and-knife":{"a":"Fork and Knife","b":"1F374","j":["cooking","knife","kitchen","cutlery","fork"]},"spoon":{"a":"Spoon","b":"1F944","j":["tableware","kitchen","cutlery"]},"kitchen-knife":{"a":"Kitchen Knife","b":"1F52A","j":["blade","cooking","knife","hocho","tool","kitchen","cutlery","weapon"]},"amphora":{"a":"Amphora","b":"1F3FA","j":["jar","cooking","Aquarius","jug","drink","vase","zodiac"]},"globe-showing-europeafrica":{"a":"Globe Showing Europe-Africa","b":"1F30D","j":["Europe","globe showing Europe-Africa","world","international","Africa","globe_showing_europe_africa","earth","globe"]},"globe-showing-americas":{"a":"Globe Showing Americas","b":"1F30E","j":["USA","world","international","globe showing Americas","earth","Americas","globe"]},"globe-showing-asiaaustralia":{"a":"Globe Showing Asia-Australia","b":"1F30F","j":["globe showing Asia-Australia","world","international","Asia","earth","globe_showing_asia_australia","east","Australia","globe"]},"globe-with-meridians":{"a":"Globe with Meridians","b":"1F310","j":["world","international","meridians","internet","earth","interweb","globe","i18n"]},"world-map":{"a":"World Map","b":"1F5FA","j":["location","direction","map","world"]},"map-of-japan":{"a":"Map of Japan","b":"1F5FE","j":["map of Japan","Japan","asia","japanese","country","map","nation"]},"compass":{"a":"Compass","b":"1F9ED","j":["magnetic","orienteering","navigation"]},"snowcapped-mountain":{"a":"Snow-Capped Mountain","b":"1F3D4","j":["snow-capped mountain","snow_capped_mountain","snow","photo","winter","mountain","nature","cold","environment"]},"mountain":{"a":"Mountain","b":"26F0","j":["photo","environment","nature"]},"volcano":{"a":"Volcano","b":"1F30B","j":["photo","eruption","disaster","mountain","nature"]},"mount-fuji":{"a":"Mount Fuji","b":"1F5FB","j":["fuji","photo","mountain","nature","japanese"]},"camping":{"a":"Camping","b":"1F3D5","j":["photo","outdoors","tent"]},"beach-with-umbrella":{"a":"Beach with Umbrella","b":"1F3D6","j":["mojito","sand","umbrella","sunny","beach","summer","weather"]},"desert":{"a":"Desert","b":"1F3DC","j":["photo","saharah","warm"]},"desert-island":{"a":"Desert Island","b":"1F3DD","j":["mojito","photo","desert","island","tropical"]},"national-park":{"a":"National Park","b":"1F3DE","j":["photo","park","environment","nature"]},"stadium":{"a":"Stadium","b":"1F3DF","j":["sports","photo","concert","venue","place"]},"classical-building":{"a":"Classical Building","b":"1F3DB","j":["history","classical","art","culture"]},"building-construction":{"a":"Building Construction","b":"1F3D7","j":["working","construction","progress","wip"]},"brick":{"a":"Brick","b":"1F9F1","j":["clay","bricks","mortar","wall"]},"rock":{"a":"Rock","b":"1FAA8","j":["heavy","solid","boulder","stone"]},"wood":{"a":"Wood","b":"1FAB5","j":["log","trunk","timber","nature","lumber"]},"hut":{"a":"Hut","b":"1F6D6","j":["yurt","roundhouse","structure","house"]},"houses":{"a":"Houses","b":"1F3D8","j":["photo","buildings"]},"derelict-house":{"a":"Derelict House","b":"1F3DA","j":["evict","house","broken","derelict","building","abandon"]},"house":{"a":"House","b":"1F3E0","j":["building","home"]},"house-with-garden":{"a":"House with Garden","b":"1F3E1","j":["nature","house","home","plant","garden"]},"office-building":{"a":"Office Building","b":"1F3E2","j":["building","work","bureau"]},"japanese-post-office":{"a":"Japanese Post Office","b":"1F3E3","j":["communication","envelope","Japanese post office","Japanese","building","post"]},"post-office":{"a":"Post Office","b":"1F3E4","j":["email","building","European","post"]},"hospital":{"a":"Hospital","b":"1F3E5","j":["health","medicine","surgery","doctor","building"]},"bank":{"a":"Bank","b":"1F3E6","j":["business","enterprise","cash","money","building","sales"]},"hotel":{"a":"Hotel","b":"1F3E8","j":["accomodation","building","checkin"]},"love-hotel":{"a":"Love Hotel","b":"1F3E9","j":["love","like","dating","hotel","affection"]},"convenience-store":{"a":"Convenience Store","b":"1F3EA","j":["store","building","groceries","convenience","shopping"]},"school":{"a":"School","b":"1F3EB","j":["student","learn","teach","education","building"]},"department-store":{"a":"Department Store","b":"1F3EC","j":["store","building","department","mall","shopping"]},"factory":{"a":"Factory","b":"1F3ED","j":["smoke","building","pollution","industry"]},"japanese-castle":{"a":"Japanese Castle","b":"1F3EF","j":["castle","building","Japanese","photo"]},"castle":{"a":"Castle","b":"1F3F0","j":["building","royalty","history","European"]},"wedding":{"a":"Wedding","b":"1F492","j":["romance","bride","marriage","love","couple","like","chapel","groom","affection"]},"tokyo-tower":{"a":"Tokyo Tower","b":"1F5FC","j":["photo","japanese","tower","Tokyo"]},"statue-of-liberty":{"a":"Statue of Liberty","b":"1F5FD","j":["statue","newyork","liberty","american"]},"church":{"a":"Church","b":"26EA","j":["religion","cross","building","Christian","christ"]},"mosque":{"a":"Mosque","b":"1F54C","j":["islam","worship","minaret","religion","Muslim"]},"hindu-temple":{"a":"Hindu Temple","b":"1F6D5","j":["temple","religion","hindu"]},"synagogue":{"a":"Synagogue","b":"1F54D","j":["Jew","worship","religion","jewish","temple","Jewish","judaism"]},"shinto-shrine":{"a":"Shinto Shrine","b":"26E9","j":["kyoto","shrine","religion","temple","japan","shinto"]},"kaaba":{"a":"Kaaba","b":"1F54B","j":["islam","religion","mosque","mecca","Muslim"]},"fountain":{"a":"Fountain","b":"26F2","j":["photo","water","fresh","summer"]},"tent":{"a":"Tent","b":"26FA","j":["photo","outdoors","camping"]},"foggy":{"a":"Foggy","b":"1F301","j":["photo","fog","mountain"]},"night-with-stars":{"a":"Night with Stars","b":"1F303","j":["night","downtown","city","evening","star"]},"cityscape":{"a":"Cityscape","b":"1F3D9","j":["photo","night life","urban","city"]},"sunrise-over-mountains":{"a":"Sunrise over Mountains","b":"1F304","j":["morning","photo","sunrise","sun","mountain","view","vacation"]},"sunrise":{"a":"Sunrise","b":"1F305","j":["morning","photo","sun","view","vacation"]},"cityscape-at-dusk":{"a":"Cityscape at Dusk","b":"1F306","j":["dusk","photo","sunset","city","sky","evening","landscape","buildings"]},"sunset":{"a":"Sunset","b":"1F307","j":["dusk","photo","good morning","dawn","sun"]},"bridge-at-night":{"a":"Bridge at Night","b":"1F309","j":["photo","night","bridge","sanfrancisco"]},"hot-springs":{"a":"Hot Springs","b":"2668","j":["relax","steaming","bath","springs","hot","warm","hotsprings"]},"carousel-horse":{"a":"Carousel Horse","b":"1F3A0","j":["photo","carnival","carousel","horse"]},"ferris-wheel":{"a":"Ferris Wheel","b":"1F3A1","j":["photo","wheel","londoneye","amusement park","ferris","carnival"]},"roller-coaster":{"a":"Roller Coaster","b":"1F3A2","j":["roller","photo","playground","amusement park","carnival","coaster","fun"]},"barber-pole":{"a":"Barber Pole","b":"1F488","j":["pole","style","haircut","barber","hair","salon"]},"circus-tent":{"a":"Circus Tent","b":"1F3AA","j":["festival","circus","carnival","party","tent"]},"locomotive":{"a":"Locomotive","b":"1F682","j":["vehicle","train","transportation","steam","railway","engine"]},"railway-car":{"a":"Railway Car","b":"1F683","j":["car","electric","vehicle","train","trolleybus","transportation","railway","tram"]},"highspeed-train":{"a":"High-Speed Train","b":"1F684","j":["vehicle","high_speed_train","train","speed","transportation","shinkansen","railway","high-speed train"]},"bullet-train":{"a":"Bullet Train","b":"1F685","j":["vehicle","train","speed","transportation","bullet","shinkansen","railway","travel","fast","public"]},"train":{"a":"Train","b":"1F686","j":["vehicle","railway","transportation"]},"metro":{"a":"Metro","b":"1F687","j":["transportation","subway","tube","blue-square","mrt","underground"]},"light-rail":{"a":"Light Rail","b":"1F688","j":["vehicle","railway","transportation"]},"station":{"a":"Station","b":"1F689","j":["vehicle","train","transportation","railway","public"]},"tram":{"a":"Tram","b":"1F68A","j":["vehicle","trolleybus","transportation"]},"monorail":{"a":"Monorail","b":"1F69D","j":["vehicle","transportation"]},"mountain-railway":{"a":"Mountain Railway","b":"1F69E","j":["car","vehicle","transportation","railway","mountain"]},"tram-car":{"a":"Tram Car","b":"1F68B","j":["car","vehicle","trolleybus","transportation","carriage","travel","public","tram"]},"bus":{"a":"Bus","b":"1F68C","j":["car","vehicle","transportation"]},"oncoming-bus":{"a":"Oncoming Bus","b":"1F68D","j":["bus","vehicle","transportation","oncoming"]},"trolleybus":{"a":"Trolleybus","b":"1F68E","j":["bus","vehicle","transportation","trolley","bart","tram"]},"minibus":{"a":"Minibus","b":"1F690","j":["bus","vehicle","transportation","car"]},"ambulance":{"a":"Ambulance","b":"1F691","j":["911","vehicle","health","hospital"]},"fire-engine":{"a":"Fire Engine","b":"1F692","j":["cars","truck","vehicle","transportation","fire","engine"]},"police-car":{"a":"Police Car","b":"1F693","j":["cars","car","vehicle","transportation","patrol","police","enforcement","legal","law"]},"oncoming-police-car":{"a":"Oncoming Police Car","b":"1F694","j":["car","vehicle","oncoming","911","police","enforcement","legal","law"]},"taxi":{"a":"Taxi","b":"1F695","j":["cars","vehicle","uber","transportation"]},"oncoming-taxi":{"a":"Oncoming Taxi","b":"1F696","j":["cars","vehicle","oncoming","taxi","uber"]},"automobile":{"a":"Automobile","b":"1F697","j":["car","vehicle","red","transportation"]},"oncoming-automobile":{"a":"Oncoming Automobile","b":"1F698","j":["car","vehicle","automobile","transportation","oncoming"]},"sport-utility-vehicle":{"a":"Sport Utility Vehicle","b":"1F699","j":["vehicle","recreational","transportation","sport utility"]},"pickup-truck":{"a":"Pickup Truck","b":"1F6FB","j":["car","truck","transportation","pickup","pick-up"]},"delivery-truck":{"a":"Delivery Truck","b":"1F69A","j":["cars","truck","transportation","delivery"]},"articulated-lorry":{"a":"Articulated Lorry","b":"1F69B","j":["cars","truck","vehicle","transportation","semi","lorry","express"]},"tractor":{"a":"Tractor","b":"1F69C","j":["car","vehicle","farming","agriculture"]},"racing-car":{"a":"Racing Car","b":"1F3CE","j":["car","sports","racing","race","f1","fast","formula"]},"motorcycle":{"a":"Motorcycle","b":"1F3CD","j":["racing","fast","sports","race"]},"motor-scooter":{"a":"Motor Scooter","b":"1F6F5","j":["vehicle","vespa","sasha","motor","scooter"]},"manual-wheelchair":{"a":"Manual Wheelchair","b":"1F9BD","j":["accessibility"]},"motorized-wheelchair":{"a":"Motorized Wheelchair","b":"1F9BC","j":["accessibility"]},"auto-rickshaw":{"a":"Auto Rickshaw","b":"1F6FA","j":["move","tuk tuk","transportation"]},"bicycle":{"a":"Bicycle","b":"1F6B2","j":["exercise","bike","sports","hipster"]},"kick-scooter":{"a":"Kick Scooter","b":"1F6F4","j":["vehicle","razor","scooter","kick"]},"skateboard":{"a":"Skateboard","b":"1F6F9","j":["board"]},"roller-skate":{"a":"Roller Skate","b":"1F6FC","j":["roller","skate","sports","footwear"]},"bus-stop":{"a":"Bus Stop","b":"1F68F","j":["bus","stop","busstop","transportation","wait"]},"motorway":{"a":"Motorway","b":"1F6E3","j":["highway","road","cupertino","interstate"]},"railway-track":{"a":"Railway Track","b":"1F6E4","j":["railway","train","transportation"]},"oil-drum":{"a":"Oil Drum","b":"1F6E2","j":["oil","barrell","drum"]},"fuel-pump":{"a":"Fuel Pump","b":"26FD","j":["gas","fuel","diesel","pump","fuelpump","station","petroleum","gas station"]},"police-car-light":{"a":"Police Car Light","b":"1F6A8","j":["car","ambulance","911","beacon","light","error","emergency","pinged","police","revolving","legal","law","alert"]},"horizontal-traffic-light":{"a":"Horizontal Traffic Light","b":"1F6A5","j":["light","traffic","signal","transportation"]},"vertical-traffic-light":{"a":"Vertical Traffic Light","b":"1F6A6","j":["traffic","transportation","driving","light","signal"]},"stop-sign":{"a":"Stop Sign","b":"1F6D1","j":["octagonal","stop","sign"]},"construction":{"a":"Construction","b":"1F6A7","j":["progress","caution","wip","barrier","warning"]},"anchor":{"a":"Anchor","b":"2693","j":["boat","ship","sea","tool","ferry"]},"sailboat":{"a":"Sailboat","b":"26F5","j":["boat","yacht","transportation","sea","ship","resort","water","summer","sailing"]},"canoe":{"a":"Canoe","b":"1F6F6","j":["ship","water","boat","paddle"]},"speedboat":{"a":"Speedboat","b":"1F6A4","j":["vehicle","boat","transportation","ship","summer"]},"passenger-ship":{"a":"Passenger Ship","b":"1F6F3","j":["yacht","ship","cruise","ferry","passenger"]},"ferry":{"a":"Ferry","b":"26F4","j":["ship","yacht","boat","passenger"]},"motor-boat":{"a":"Motor Boat","b":"1F6E5","j":["motorboat","ship","boat"]},"ship":{"a":"Ship","b":"1F6A2","j":["boat","transportation","titanic","deploy","passenger"]},"airplane":{"a":"Airplane","b":"2708","j":["vehicle","transportation","flight","aeroplane","fly"]},"small-airplane":{"a":"Small Airplane","b":"1F6E9","j":["vehicle","transportation","flight","aeroplane","fly","airplane"]},"airplane-departure":{"a":"Airplane Departure","b":"1F6EB","j":["check-in","departures","departure","flight","airport","aeroplane","airplane","landing"]},"airplane-arrival":{"a":"Airplane Arrival","b":"1F6EC","j":["flight","airport","arrivals","aeroplane","boarding","arriving","airplane","landing"]},"parachute":{"a":"Parachute","b":"1FA82","j":["hang-glide","parasail","skydive","fly","glide"]},"seat":{"a":"Seat","b":"1F4BA","j":["bus","chair","flight","transport","sit","fly","airplane"]},"helicopter":{"a":"Helicopter","b":"1F681","j":["vehicle","transportation","fly"]},"suspension-railway":{"a":"Suspension Railway","b":"1F69F","j":["vehicle","railway","suspension","transportation"]},"mountain-cableway":{"a":"Mountain Cableway","b":"1F6A0","j":["vehicle","transportation","gondola","cable","mountain","ski"]},"aerial-tramway":{"a":"Aerial Tramway","b":"1F6A1","j":["car","vehicle","transportation","gondola","cable","aerial","ski","tramway"]},"satellite":{"a":"Satellite","b":"1F6F0","j":["communication","gps","spaceflight","ISS","NASA","space","orbit"]},"rocket":{"a":"Rocket","b":"1F680","j":["staffmode","outer_space","NASA","ship","space","fly","outer space","launch"]},"flying-saucer":{"a":"Flying Saucer","b":"1F6F8","j":["vehicle","ufo","transportation","UFO"]},"bellhop-bell":{"a":"Bellhop Bell","b":"1F6CE","j":["bell","bellhop","hotel","service"]},"luggage":{"a":"Luggage","b":"1F9F3","j":["travel","packing"]},"hourglass-done":{"a":"Hourglass Done","b":"231B","j":["test","clock","exam","sand","limit","time","quiz","timer","oldschool"]},"hourglass-not-done":{"a":"Hourglass Not Done","b":"23F3","j":["sand","hourglass","time","countdown","timer","oldschool"]},"watch":{"a":"Watch","b":"231A","j":["time","clock","accessories"]},"alarm-clock":{"a":"Alarm Clock","b":"23F0","j":["time","clock","alarm","wake"]},"stopwatch":{"a":"Stopwatch","b":"23F1","j":["time","clock","deadline"]},"timer-clock":{"a":"Timer Clock","b":"23F2","j":["clock","timer","alarm"]},"mantelpiece-clock":{"a":"Mantelpiece Clock","b":"1F570","j":["time","clock"]},"twelve-oclock":{"a":"Twelve O’Clock","b":"1F55B","j":["o’clock","clock","twelve_o_clock","noon","12","00","late","time","early","twelve","midnight","12:00","midday","schedule"]},"twelvethirty":{"a":"Twelve-Thirty","b":"1F567","j":["clock","late","12","time","schedule","early","twelve_thirty","twelve","twelve-thirty","thirty","12:30"]},"one-oclock":{"a":"One O’Clock","b":"1F550","j":["o’clock","clock","late","00","time","early","one","1","1:00","one_o_clock","schedule"]},"onethirty":{"a":"One-Thirty","b":"1F55C","j":["clock","late","time","schedule","early","one","1","1:30","one_thirty","thirty","one-thirty"]},"two-oclock":{"a":"Two O’Clock","b":"1F551","j":["o’clock","clock","late","00","time","early","two","two_o_clock","2:00","2","schedule"]},"twothirty":{"a":"Two-Thirty","b":"1F55D","j":["2:30","clock","late","two_thirty","time","early","two","two-thirty","2","thirty","schedule"]},"three-oclock":{"a":"Three O’Clock","b":"1F552","j":["o’clock","clock","late","00","three","3","time","early","3:00","three_o_clock","schedule"]},"threethirty":{"a":"Three-Thirty","b":"1F55E","j":["clock","late","three","3","time","early","three_thirty","schedule","three-thirty","thirty","3:30"]},"four-oclock":{"a":"Four O’Clock","b":"1F553","j":["o’clock","clock","four","00","late","time","early","four_o_clock","4","4:00","schedule"]},"fourthirty":{"a":"Four-Thirty","b":"1F55F","j":["clock","four","four-thirty","late","time","4:30","early","four_thirty","4","thirty","schedule"]},"five-oclock":{"a":"Five O’Clock","b":"1F554","j":["o’clock","clock","5:00","00","late","five_o_clock","five","time","early","5","schedule"]},"fivethirty":{"a":"Five-Thirty","b":"1F560","j":["clock","5:30","late","five","time","early","five_thirty","5","five-thirty","thirty","schedule"]},"six-oclock":{"a":"Six O’Clock","b":"1F555","j":["o’clock","clock","late","00","dusk","time","six_o_clock","six","early","dawn","6","6:00","schedule"]},"sixthirty":{"a":"Six-Thirty","b":"1F561","j":["clock","late","six_thirty","time","six","early","6","six-thirty","6:30","thirty","schedule"]},"seven-oclock":{"a":"Seven O’Clock","b":"1F556","j":["o’clock","clock","seven","late","00","7","time","early","seven_o_clock","7:00","schedule"]},"seventhirty":{"a":"Seven-Thirty","b":"1F562","j":["seven_thirty","clock","seven","late","7","time","7:30","early","seven-thirty","thirty","schedule"]},"eight-oclock":{"a":"Eight O’Clock","b":"1F557","j":["o’clock","clock","late","00","8:00","time","early","eight","8","eight_o_clock","schedule"]},"eightthirty":{"a":"Eight-Thirty","b":"1F563","j":["clock","late","eight_thirty","time","8:30","early","eight-thirty","eight","8","thirty","schedule"]},"nine-oclock":{"a":"Nine O’Clock","b":"1F558","j":["o’clock","clock","late","00","nine","nine_o_clock","time","early","9:00","9","schedule"]},"ninethirty":{"a":"Nine-Thirty","b":"1F564","j":["clock","late","nine","time","early","nine-thirty","nine_thirty","9:30","9","thirty","schedule"]},"ten-oclock":{"a":"Ten O’Clock","b":"1F559","j":["o’clock","clock","10","late","00","ten_o_clock","time","early","ten","10:00","schedule"]},"tenthirty":{"a":"Ten-Thirty","b":"1F565","j":["ten-thirty","clock","10","late","time","ten_thirty","early","10:30","ten","thirty","schedule"]},"eleven-oclock":{"a":"Eleven O’Clock","b":"1F55A","j":["o’clock","clock","late","00","time","eleven","11","early","11:00","eleven_o_clock","schedule"]},"eleventhirty":{"a":"Eleven-Thirty","b":"1F566","j":["clock","late","eleven-thirty","time","schedule","eleven","11","early","eleven_thirty","thirty","11:30"]},"new-moon":{"a":"New Moon","b":"1F311","j":["planet","night","space","evening","twilight","nature","dark","moon","sleep"]},"waxing-crescent-moon":{"a":"Waxing Crescent Moon","b":"1F312","j":["planet","night","waxing","space","evening","crescent","twilight","nature","moon","sleep"]},"first-quarter-moon":{"a":"First Quarter Moon","b":"1F313","j":["quarter","planet","night","space","evening","twilight","nature","moon","sleep"]},"waxing-gibbous-moon":{"a":"Waxing Gibbous Moon","b":"1F314","j":["planet","night","waxing","gibbous","gray","space","sky","evening","twilight","nature","moon","sleep"]},"full-moon":{"a":"Full Moon","b":"1F315","j":["yellow","planet","night","full","space","evening","twilight","nature","moon","sleep"]},"waning-gibbous-moon":{"a":"Waning Gibbous Moon","b":"1F316","j":["waning","planet","night","gibbous","space","waxing_gibbous_moon","evening","twilight","nature","moon","sleep"]},"last-quarter-moon":{"a":"Last Quarter Moon","b":"1F317","j":["quarter","planet","night","space","evening","twilight","nature","moon","sleep"]},"waning-crescent-moon":{"a":"Waning Crescent Moon","b":"1F318","j":["waning","planet","night","space","evening","crescent","twilight","nature","moon","sleep"]},"crescent-moon":{"a":"Crescent Moon","b":"1F319","j":["night","magic","sky","evening","crescent","moon","sleep"]},"new-moon-face":{"a":"New Moon Face","b":"1F31A","j":["planet","night","space","evening","twilight","nature","moon","face","sleep"]},"first-quarter-moon-face":{"a":"First Quarter Moon Face","b":"1F31B","j":["quarter","planet","night","space","evening","twilight","nature","moon","face","sleep"]},"last-quarter-moon-face":{"a":"Last Quarter Moon Face","b":"1F31C","j":["quarter","planet","night","space","evening","twilight","nature","moon","face","sleep"]},"thermometer":{"a":"Thermometer","b":"1F321","j":["cold","hot","temperature","weather"]},"sun":{"a":"Sun","b":"2600","j":["rays","spring","sunny","bright","nature","summer","beach","brightness","weather"]},"full-moon-face":{"a":"Full Moon Face","b":"1F31D","j":["planet","night","full","space","evening","bright","twilight","nature","moon","face","sleep"]},"sun-with-face":{"a":"Sun with Face","b":"1F31E","j":["morning","sun","sky","bright","nature","face"]},"ringed-planet":{"a":"Ringed Planet","b":"1FA90","j":["saturn","outerspace","saturnine"]},"star":{"a":"Star","b":"2B50","j":["yellow","night"]},"glowing-star":{"a":"Glowing Star","b":"1F31F","j":["sparkle","night","glow","awesome","glittery","magic","good","star","shining"]},"shooting-star":{"a":"Shooting Star","b":"1F320","j":["night","shooting","photo","falling","star"]},"milky-way":{"a":"Milky Way","b":"1F30C","j":["photo","space","stars"]},"cloud":{"a":"Cloud","b":"2601","j":["sky","weather"]},"sun-behind-cloud":{"a":"Sun Behind Cloud","b":"26C5","j":["morning","cloud","spring","cloudy","sun","nature","fall","weather"]},"cloud-with-lightning-and-rain":{"a":"Cloud with Lightning and Rain","b":"26C8","j":["rain","lightning","thunder","cloud","weather"]},"sun-behind-small-cloud":{"a":"Sun Behind Small Cloud","b":"1F324","j":["sun","cloud","weather"]},"sun-behind-large-cloud":{"a":"Sun Behind Large Cloud","b":"1F325","j":["sun","cloud","weather"]},"sun-behind-rain-cloud":{"a":"Sun Behind Rain Cloud","b":"1F326","j":["rain","sun","cloud","weather"]},"cloud-with-rain":{"a":"Cloud with Rain","b":"1F327","j":["rain","cloud","weather"]},"cloud-with-snow":{"a":"Cloud with Snow","b":"1F328","j":["cold","cloud","snow","weather"]},"cloud-with-lightning":{"a":"Cloud with Lightning","b":"1F329","j":["lightning","cloud","thunder","weather"]},"tornado":{"a":"Tornado","b":"1F32A","j":["whirlwind","twister","cyclone","cloud","weather"]},"fog":{"a":"Fog","b":"1F32B","j":["cloud","weather"]},"wind-face":{"a":"Wind Face","b":"1F32C","j":["air","gust","cloud","wind","blow","face"]},"cyclone":{"a":"Cyclone","b":"1F300","j":["vortex","dizzy","tornado","twister","cloud","hurricane","typhoon","spin","weather","swirl","whirlpool","spiral","blue"]},"rainbow":{"a":"Rainbow","b":"1F308","j":["rain","photo","spring","sky","nature","unicorn_face","happy"]},"closed-umbrella":{"a":"Closed Umbrella","b":"1F302","j":["clothing","drizzle","umbrella","rain","weather"]},"umbrella":{"a":"Umbrella","b":"2602","j":["rain","clothing","spring","weather"]},"umbrella-with-rain-drops":{"a":"Umbrella with Rain Drops","b":"2614","j":["clothing","umbrella","drop","rain","spring","rainy","weather"]},"umbrella-on-ground":{"a":"Umbrella on Ground","b":"26F1","j":["umbrella","rain","sun","summer","weather"]},"high-voltage":{"a":"High Voltage","b":"26A1","j":["electric","zap","lightning","thunder","lightning bolt","fast","voltage","danger","weather"]},"snowflake":{"a":"Snowflake","b":"2744","j":["xmas","snow","christmas","season","winter","cold","weather"]},"snowman":{"a":"Snowman","b":"2603","j":["xmas","snow","christmas","season","winter","weather","cold","frozen"]},"snowman-without-snow":{"a":"Snowman Without Snow","b":"26C4","j":["xmas","snow","christmas","winter","season","frozen","cold","without_snow","snowman","weather"]},"comet":{"a":"Comet","b":"2604","j":["space"]},"fire":{"a":"Fire","b":"1F525","j":["cook","hot","tool","flame"]},"droplet":{"a":"Droplet","b":"1F4A7","j":["sweat","drop","water","spring","drip","comic","cold","faucet"]},"water-wave":{"a":"Water Wave","b":"1F30A","j":["sea","water","ocean","tsunami","disaster","nature","wave"]},"jackolantern":{"a":"Jack-O-Lantern","b":"1F383","j":["jack_o_lantern","pumpkin","jack-o-lantern","celebration","halloween","creepy","light","jack","fall","lantern"]},"christmas-tree":{"a":"Christmas Tree","b":"1F384","j":["xmas","festival","celebration","Christmas","december","tree","vacation"]},"fireworks":{"a":"Fireworks","b":"1F386","j":["festival","photo","celebration","carnival","congratulations"]},"sparkler":{"a":"Sparkler","b":"1F387","j":["stars","night","sparkle","fireworks","celebration","shine"]},"firecracker":{"a":"Firecracker","b":"1F9E8","j":["explode","explosive","fireworks","boom","dynamite","explosion"]},"sparkles":{"a":"Sparkles","b":"2728","j":["*","stars","sparkle","cool","awesome","magic","shiny","good","shine","star"]},"balloon":{"a":"Balloon","b":"1F388","j":["birthday","celebration","circus","party"]},"party-popper":{"a":"Party Popper","b":"1F389","j":["birthday","celebration","tada","magic","popper","congratulations","circus","party"]},"confetti-ball":{"a":"Confetti Ball","b":"1F38A","j":["festival","birthday","celebration","ball","confetti","circus","party"]},"tanabata-tree":{"a":"Tanabata Tree","b":"1F38B","j":["branch","celebration","Japanese","banner","tree","nature","summer","plant"]},"pine-decoration":{"a":"Pine Decoration","b":"1F38D","j":["pine","panda","vegetable","bamboo","celebration","Japanese","nature","plant"]},"japanese-dolls":{"a":"Japanese Dolls","b":"1F38E","j":["Japanese dolls","festival","toy","celebration","Japanese","kimono","japanese","doll"]},"carp-streamer":{"a":"Carp Streamer","b":"1F38F","j":["fish","celebration","carp","banner","streamer","japanese","koinobori"]},"wind-chime":{"a":"Wind Chime","b":"1F390","j":["spring","celebration","ding","chime","bell","wind","nature"]},"moon-viewing-ceremony":{"a":"Moon Viewing Ceremony","b":"1F391","j":["ceremony","photo","celebration","tsukimi","asia","japan","moon"]},"red-envelope":{"a":"Red Envelope","b":"1F9E7","j":["good luck","hóngbāo","lai see","gift","money"]},"ribbon":{"a":"Ribbon","b":"1F380","j":["pink","decoration","celebration","girl","bowtie"]},"wrapped-gift":{"a":"Wrapped Gift","b":"1F381","j":["xmas","wrapped","christmas","birthday","celebration","present","gift","box"]},"reminder-ribbon":{"a":"Reminder Ribbon","b":"1F397","j":["cause","ribbon","sports","support","celebration","reminder","awareness"]},"admission-tickets":{"a":"Admission Tickets","b":"1F39F","j":["entrance","sports","admission","concert","ticket"]},"ticket":{"a":"Ticket","b":"1F3AB","j":["concert","admission","pass","event"]},"military-medal":{"a":"Military Medal","b":"1F396","j":["winning","military","award","celebration","army","medal"]},"trophy":{"a":"Trophy","b":"1F3C6","j":["ftw","win","prize","award","ceremony","contest","place"]},"sports-medal":{"a":"Sports Medal","b":"1F3C5","j":["medal","winning","award"]},"1st-place-medal":{"a":"1st Place Medal","b":"1F947","j":["winning","gold","award","first","medal"]},"2nd-place-medal":{"a":"2nd Place Medal","b":"1F948","j":["medal","second","silver","award"]},"3rd-place-medal":{"a":"3rd Place Medal","b":"1F949","j":["medal","third","bronze","award"]},"soccer-ball":{"a":"Soccer Ball","b":"26BD","j":["football","soccer","sports","ball"]},"baseball":{"a":"Baseball","b":"26BE","j":["balls","sports","ball"]},"softball":{"a":"Softball","b":"1F94E","j":["sports","balls","underarm","glove","ball"]},"basketball":{"a":"Basketball","b":"1F3C0","j":["sports","balls","ball","NBA","hoop"]},"volleyball":{"a":"Volleyball","b":"1F3D0","j":["game","balls","sports","ball"]},"american-football":{"a":"American Football","b":"1F3C8","j":["NFL","sports","balls","ball","football","american"]},"rugby-football":{"a":"Rugby Football","b":"1F3C9","j":["sports","team","rugby","ball","football"]},"tennis":{"a":"Tennis","b":"1F3BE","j":["sports","balls","green","racquet","ball"]},"flying-disc":{"a":"Flying Disc","b":"1F94F","j":["ultimate","sports","frisbee"]},"bowling":{"a":"Bowling","b":"1F3B3","j":["sports","ball","game","play","fun"]},"cricket-game":{"a":"Cricket Game","b":"1F3CF","j":["game","bat","sports","ball"]},"field-hockey":{"a":"Field Hockey","b":"1F3D1","j":["sports","hockey","ball","stick","game","field"]},"ice-hockey":{"a":"Ice Hockey","b":"1F3D2","j":["ice","sports","hockey","puck","stick","game"]},"lacrosse":{"a":"Lacrosse","b":"1F94D","j":["stick","sports","goal","ball"]},"ping-pong":{"a":"Ping Pong","b":"1F3D3","j":["bat","pingpong","sports","paddle","table tennis","ball","game"]},"badminton":{"a":"Badminton","b":"1F3F8","j":["birdie","sports","racquet","game","shuttlecock"]},"boxing-glove":{"a":"Boxing Glove","b":"1F94A","j":["boxing","glove","sports","fighting"]},"martial-arts-uniform":{"a":"Martial Arts Uniform","b":"1F94B","j":["taekwondo","karate","uniform","martial arts","judo"]},"goal-net":{"a":"Goal Net","b":"1F945","j":["net","sports","goal"]},"flag-in-hole":{"a":"Flag in Hole","b":"26F3","j":["business","hole","sports","golf","flag","summer"]},"ice-skate":{"a":"Ice Skate","b":"26F8","j":["skate","sports","ice"]},"fishing-pole":{"a":"Fishing Pole","b":"1F3A3","j":["pole","fish","food","hobby","summer"]},"diving-mask":{"a":"Diving Mask","b":"1F93F","j":["scuba","sport","ocean","diving","snorkeling"]},"running-shirt":{"a":"Running Shirt","b":"1F3BD","j":["running","sash","pageant","shirt","athletics","play"]},"skis":{"a":"Skis","b":"1F3BF","j":["sports","snow","winter","cold","ski"]},"sled":{"a":"Sled","b":"1F6F7","j":["luge","sledge","sleigh","toboggan"]},"curling-stone":{"a":"Curling Stone","b":"1F94C","j":["game","sports","rock"]},"bullseye":{"a":"Bullseye","b":"1F3AF","j":["dart","direct hit","target","bar","hit","game","direct_hit","play"]},"yoyo":{"a":"Yo-Yo","b":"1FA80","j":["toy","yo-yo","fluctuate","yo_yo"]},"kite":{"a":"Kite","b":"1FA81","j":["wind","soar","fly"]},"pool-8-ball":{"a":"Pool 8 Ball","b":"1F3B1","j":["8","billiard","pool","hobby","luck","magic","eight","ball","game"]},"crystal-ball":{"a":"Crystal Ball","b":"1F52E","j":["fairy tale","tool","fantasy","magic","crystal","fortune_teller","ball","fortune","disco","circus","party"]},"magic-wand":{"a":"Magic Wand","b":"1FA84","j":["wizard","witch","magic","supernature","power"]},"nazar-amulet":{"a":"Nazar Amulet","b":"1F9FF","j":["nazar","talisman","evil-eye","bead","charm"]},"video-game":{"a":"Video Game","b":"1F3AE","j":["console","PS4","controller","game","play"]},"joystick":{"a":"Joystick","b":"1F579","j":["game","video game","play"]},"slot-machine":{"a":"Slot Machine","b":"1F3B0","j":["casino","bet","vegas","luck","slot","gamble","game","fruit machine"]},"game-die":{"a":"Game Die","b":"1F3B2","j":["random","tabletop","luck","die","game","dice","play"]},"puzzle-piece":{"a":"Puzzle Piece","b":"1F9E9","j":["puzzle","piece","jigsaw","interlocking","clue"]},"teddy-bear":{"a":"Teddy Bear","b":"1F9F8","j":["toy","plaything","plush","stuffed"]},"piata":{"a":"Piñata","b":"1FA85","j":["candy","celebration","mexico","pinata","piñata","party"]},"nesting-dolls":{"a":"Nesting Dolls","b":"1FA86","j":["matryoshka","toy","nesting","doll","russia"]},"spade-suit":{"a":"Spade Suit","b":"2660","j":["cards","suits","card","magic","game","poker"]},"heart-suit":{"a":"Heart Suit","b":"2665","j":["cards","suits","card","magic","game","poker"]},"diamond-suit":{"a":"Diamond Suit","b":"2666","j":["cards","suits","card","magic","game","poker"]},"club-suit":{"a":"Club Suit","b":"2663","j":["cards","suits","card","magic","game","poker"]},"chess-pawn":{"a":"Chess Pawn","b":"265F","j":["chess","dupe","expendable"]},"joker":{"a":"Joker","b":"1F0CF","j":["cards","card","magic","wildcard","game","poker","play"]},"mahjong-red-dragon":{"a":"Mahjong Red Dragon","b":"1F004","j":["red","mahjong","chinese","kanji","game","play"]},"flower-playing-cards":{"a":"Flower Playing Cards","b":"1F3B4","j":["card","red","sunset","Japanese","playing","flower","game"]},"performing-arts":{"a":"Performing Arts","b":"1F3AD","j":["theatre","drama","acting","mask","performing","art","theater"]},"framed-picture":{"a":"Framed Picture","b":"1F5BC","j":["frame","photography","museum","art","picture","painting"]},"artist-palette":{"a":"Artist Palette","b":"1F3A8","j":["draw","paint","museum","palette","design","colors","art","painting"]},"thread":{"a":"Thread","b":"1F9F5","j":["needle","spool","sewing","string"]},"sewing-needle":{"a":"Sewing Needle","b":"1FAA1","j":["needle","sewing","embroidery","sutures","stitches","tailoring"]},"yarn":{"a":"Yarn","b":"1F9F6","j":["knit","crochet","ball"]},"knot":{"a":"Knot","b":"1FAA2","j":["rope","twist","tangled","tie","twine","scout"]},"glasses":{"a":"Glasses","b":"1F453","j":["eyeglasses","nerdy","clothing","dork","eye","accessories","eyesight","fashion","geek","eyewear"]},"sunglasses":{"a":"Sunglasses","b":"1F576","j":["cool","glasses","eye","accessories","dark","eyewear","face"]},"goggles":{"a":"Goggles","b":"1F97D","j":["swimming","eyes","eye protection","welding","safety","protection"]},"lab-coat":{"a":"Lab Coat","b":"1F97C","j":["chemist","doctor","scientist","experiment"]},"safety-vest":{"a":"Safety Vest","b":"1F9BA","j":["vest","emergency","safety","protection"]},"necktie":{"a":"Necktie","b":"1F454","j":["business","clothing","suitup","shirt","tie","fashion","formal","cloth"]},"tshirt":{"a":"T-Shirt","b":"1F455","j":["casual","clothing","t_shirt","shirt","fashion","tee","t-shirt","cloth"]},"jeans":{"a":"Jeans","b":"1F456","j":["clothing","trousers","fashion","pants","shopping"]},"scarf":{"a":"Scarf","b":"1F9E3","j":["clothes","neck","winter"]},"gloves":{"a":"Gloves","b":"1F9E4","j":["clothes","hand","winter","hands"]},"coat":{"a":"Coat","b":"1F9E5","j":["jacket"]},"socks":{"a":"Socks","b":"1F9E6","j":["clothes","stockings","stocking"]},"dress":{"a":"Dress","b":"1F457","j":["clothes","clothing","fashion","shopping"]},"kimono":{"a":"Kimono","b":"1F458","j":["clothing","dress","female","fashion","japanese","women"]},"sari":{"a":"Sari","b":"1F97B","j":["clothing","dress"]},"onepiece-swimsuit":{"a":"One-Piece Swimsuit","b":"1FA71","j":["bathing suit","fashion","one-piece swimsuit","one_piece_swimsuit"]},"briefs":{"a":"Briefs","b":"1FA72","j":["clothing","swimsuit","one-piece","bathing suit","underwear"]},"shorts":{"a":"Shorts","b":"1FA73","j":["underwear","clothing","pants","bathing suit"]},"bikini":{"a":"Bikini","b":"1F459","j":["swim","clothing","woman","swimming","female","girl","fashion","beach","summer"]},"womans-clothes":{"a":"Woman’S Clothes","b":"1F45A","j":["clothing","shopping_bags","woman","woman_s_clothes","female","woman’s clothes","fashion"]},"purse":{"a":"Purse","b":"1F45B","j":["clothing","accessories","shopping","money","sales","fashion","coin"]},"handbag":{"a":"Handbag","b":"1F45C","j":["clothing","purse","accessory","accessories","fashion","bag","shopping"]},"clutch-bag":{"a":"Clutch Bag","b":"1F45D","j":["clothing","accessories","shopping","bag","pouch"]},"shopping-bags":{"a":"Shopping Bags","b":"1F6CD","j":["purchase","buy","bag","hotel","mall","shopping"]},"backpack":{"a":"Backpack","b":"1F392","j":["satchel","school","student","education","bag","rucksack"]},"thong-sandal":{"a":"Thong Sandal","b":"1FA74","j":["zōri","thongs","sandals","thong sandals","footwear","summer","beach sandals"]},"mans-shoe":{"a":"Man’S Shoe","b":"1F45E","j":["shoe","clothing","male","man","fashion","man_s_shoe","man’s shoe"]},"running-shoe":{"a":"Running Shoe","b":"1F45F","j":["shoe","clothing","sports","shoes","sneakers","athletic","sneaker"]},"hiking-boot":{"a":"Hiking Boot","b":"1F97E","j":["hiking","backpacking","camping","boot"]},"flat-shoe":{"a":"Flat Shoe","b":"1F97F","j":["slipper","slip-on","ballet flat","ballet"]},"highheeled-shoe":{"a":"High-Heeled Shoe","b":"1F460","j":["shoe","clothing","shoes","woman","stiletto","female","heel","pumps","fashion","high_heeled_shoe","high-heeled shoe"]},"womans-sandal":{"a":"Woman’S Sandal","b":"1F461","j":["shoe","flip flops","clothing","shoes","woman","woman_s_sandal","sandal","fashion","woman’s sandal"]},"ballet-shoes":{"a":"Ballet Shoes","b":"1FA70","j":["ballet","dance"]},"womans-boot":{"a":"Woman’S Boot","b":"1F462","j":["shoe","clothing","shoes","woman","woman’s boot","fashion","boot","woman_s_boot"]},"crown":{"a":"Crown","b":"1F451","j":["clothing","royalty","queen","leader","lord","kod","king"]},"womans-hat":{"a":"Woman’S Hat","b":"1F452","j":["clothing","hat","woman’s hat","woman","spring","woman_s_hat","accessories","female","fashion","lady"]},"top-hat":{"a":"Top Hat","b":"1F3A9","j":["clothing","hat","tophat","classy","top","magic","gentleman","circus"]},"graduation-cap":{"a":"Graduation Cap","b":"1F393","j":["clothing","hat","school","cap","celebration","degree","learn","education","university","graduation","legal","college"]},"billed-cap":{"a":"Billed Cap","b":"1F9E2","j":["cap","baseball","baseball cap"]},"military-helmet":{"a":"Military Helmet","b":"1FA96","j":["military","army","helmet","protection","warrior","soldier"]},"rescue-workers-helmet":{"a":"Rescue Worker’S Helmet","b":"26D1","j":["hat","rescue worker’s helmet","construction","build","cross","aid","helmet","rescue_worker_s_helmet","face"]},"prayer-beads":{"a":"Prayer Beads","b":"1F4FF","j":["beads","clothing","religion","religious","dhikr","necklace","prayer"]},"lipstick":{"a":"Lipstick","b":"1F484","j":["woman","female","makeup","girl","fashion","cosmetics"]},"ring":{"a":"Ring","b":"1F48D","j":["wedding","gem","marriage","jewelry","valentines","propose","fashion","diamond","engagement"]},"gem-stone":{"a":"Gem Stone","b":"1F48E","j":["gem","ruby","jewel","jewelry","diamond","blue"]},"muted-speaker":{"a":"Muted Speaker","b":"1F507","j":["speaker","sound","silent","mute","silence","volume","quiet"]},"speaker-low-volume":{"a":"Speaker Low Volume","b":"1F508","j":["broadcast","soft","silence","volume","sound"]},"speaker-medium-volume":{"a":"Speaker Medium Volume","b":"1F509","j":["speaker","volume","medium","broadcast"]},"speaker-high-volume":{"a":"Speaker High Volume","b":"1F50A","j":["speaker","broadcast","noise","loud","volume","noisy"]},"loudspeaker":{"a":"Loudspeaker","b":"1F4E2","j":["volume","public address","sound","loud"]},"megaphone":{"a":"Megaphone","b":"1F4E3","j":["speaker","cheering","sound","volume"]},"postal-horn":{"a":"Postal Horn","b":"1F4EF","j":["postal","horn","music","post","instrument"]},"bell":{"a":"Bell","b":"1F514","j":["xmas","christmas","chime","notification","sound"]},"bell-with-slash":{"a":"Bell with Slash","b":"1F515","j":["silent","mute","bell","volume","sound","forbidden","quiet"]},"musical-score":{"a":"Musical Score","b":"1F3BC","j":["score","treble","clef","compose","music"]},"musical-note":{"a":"Musical Note","b":"1F3B5","j":["score","note","music","tone","sound"]},"musical-notes":{"a":"Musical Notes","b":"1F3B6","j":["note","score","music","notes"]},"studio-microphone":{"a":"Studio Microphone","b":"1F399","j":["mic","recording","microphone","sing","talkshow","music","artist","studio"]},"level-slider":{"a":"Level Slider","b":"1F39A","j":["scale","slider","music","level"]},"control-knobs":{"a":"Control Knobs","b":"1F39B","j":["control","dial","music","knobs"]},"microphone":{"a":"Microphone","b":"1F3A4","j":["mic","karaoke","sing","PA","talkshow","music","sound"]},"headphone":{"a":"Headphone","b":"1F3A7","j":["gadgets","earbud","music","score"]},"radio":{"a":"Radio","b":"1F4FB","j":["podcast","communication","video","program","music"]},"saxophone":{"a":"Saxophone","b":"1F3B7","j":["sax","jazz","blues","music","instrument"]},"accordion":{"a":"Accordion","b":"1FA97","j":["concertina","music","squeeze box"]},"guitar":{"a":"Guitar","b":"1F3B8","j":["instrument","music"]},"musical-keyboard":{"a":"Musical Keyboard","b":"1F3B9","j":["piano","keyboard","compose","music","instrument"]},"trumpet":{"a":"Trumpet","b":"1F3BA","j":["brass","instrument","music"]},"violin":{"a":"Violin","b":"1F3BB","j":["orchestra","instrument","music","symphony"]},"banjo":{"a":"Banjo","b":"1FA95","j":["instructment","stringed","music"]},"drum":{"a":"Drum","b":"1F941","j":["drumsticks","instrument","music","snare"]},"long-drum":{"a":"Long Drum","b":"1FA98","j":["beat","rhythm","drum","music","conga"]},"mobile-phone":{"a":"Mobile Phone","b":"1F4F1","j":["gadgets","dial","mobile","cell","phone","telephone","technology","apple"]},"mobile-phone-with-arrow":{"a":"Mobile Phone with Arrow","b":"1F4F2","j":["mobile","receive","arrow","cell","incoming","iphone","phone"]},"telephone":{"a":"Telephone","b":"260E","j":["dial","communication","phone","technology"]},"telephone-receiver":{"a":"Telephone Receiver","b":"1F4DE","j":["communication","dial","receiver","telephone","technology","phone"]},"pager":{"a":"Pager","b":"1F4DF","j":["bbcall","90s","oldschool"]},"fax-machine":{"a":"Fax Machine","b":"1F4E0","j":["communication","fax","technology"]},"battery":{"a":"Battery","b":"1F50B","j":["sustain","energy","power"]},"electric-plug":{"a":"Electric Plug","b":"1F50C","j":["electric","electricity","plug","charger","power"]},"laptop":{"a":"Laptop","b":"1F4BB","j":["screen","personal","display","technology","computer","pc","monitor"]},"desktop-computer":{"a":"Desktop Computer","b":"1F5A5","j":["screen","desktop","technology","computer","computing"]},"printer":{"a":"Printer","b":"1F5A8","j":["paper","ink","computer"]},"keyboard":{"a":"Keyboard","b":"2328","j":["type","text","technology","computer","input"]},"computer-mouse":{"a":"Computer Mouse","b":"1F5B1","j":["click","computer"]},"trackball":{"a":"Trackball","b":"1F5B2","j":["trackpad","technology","computer"]},"computer-disk":{"a":"Computer Disk","b":"1F4BD","j":["90s","optical","minidisk","technology","computer","record","data","disk"]},"floppy-disk":{"a":"Floppy Disk","b":"1F4BE","j":["oldschool","80s","90s","floppy","technology","computer","save","disk"]},"optical-disk":{"a":"Optical Disk","b":"1F4BF","j":["90s","disc","optical","cd","technology","computer","dvd","disk"]},"dvd":{"a":"Dvd","b":"1F4C0","j":["blu-ray","disc","optical","cd","computer","disk"]},"abacus":{"a":"Abacus","b":"1F9EE","j":["calculation"]},"movie-camera":{"a":"Movie Camera","b":"1F3A5","j":["movie","camera","cinema","film","record"]},"film-frames":{"a":"Film Frames","b":"1F39E","j":["cinema","frames","movie","film"]},"film-projector":{"a":"Film Projector","b":"1F4FD","j":["movie","cinema","projector","video","film","record","tape"]},"clapper-board":{"a":"Clapper Board","b":"1F3AC","j":["clapper","movie","record","film"]},"television":{"a":"Television","b":"1F4FA","j":["video","program","tv","technology","oldschool","show"]},"camera":{"a":"Camera","b":"1F4F7","j":["gadgets","video","photography"]},"camera-with-flash":{"a":"Camera with Flash","b":"1F4F8","j":["gadgets","camera","photography","flash","video"]},"video-camera":{"a":"Video Camera","b":"1F4F9","j":["record","camera","video","film"]},"videocassette":{"a":"Videocassette","b":"1F4FC","j":["vhs","80s","90s","video","oldschool","record","tape"]},"magnifying-glass-tilted-left":{"a":"Magnifying Glass Tilted Left","b":"1F50D","j":["find","zoom","detective","search","tool","magnifying","glass"]},"magnifying-glass-tilted-right":{"a":"Magnifying Glass Tilted Right","b":"1F50E","j":["find","zoom","detective","search","tool","magnifying","glass"]},"candle":{"a":"Candle","b":"1F56F","j":["light","fire","wax"]},"light-bulb":{"a":"Light Bulb","b":"1F4A1","j":["electric","electricity","idea","light","comic","bulb"]},"flashlight":{"a":"Flashlight","b":"1F526","j":["electric","torch","sight","night","tool","light","dark","camping"]},"red-paper-lantern":{"a":"Red Paper Lantern","b":"1F3EE","j":["red","paper","halloween","spooky","light","bar","lantern"]},"diya-lamp":{"a":"Diya Lamp","b":"1FA94","j":["oil","lamp","diya","lighting"]},"notebook-with-decorative-cover":{"a":"Notebook with Decorative Cover","b":"1F4D4","j":["decorated","notebook","cover","paper","book","record","study","notes","classroom"]},"closed-book":{"a":"Closed Book","b":"1F4D5","j":["closed","read","learn","textbook","book","knowledge","library"]},"open-book":{"a":"Open Book","b":"1F4D6","j":["open","read","learn","book","literature","knowledge","library","study"]},"green-book":{"a":"Green Book","b":"1F4D7","j":["read","green","book","knowledge","library","study"]},"blue-book":{"a":"Blue Book","b":"1F4D8","j":["read","learn","book","knowledge","library","study","blue"]},"orange-book":{"a":"Orange Book","b":"1F4D9","j":["read","orange","textbook","book","knowledge","library","study"]},"books":{"a":"Books","b":"1F4DA","j":["library","book","study","literature"]},"notebook":{"a":"Notebook","b":"1F4D3","j":["paper","stationery","record","study","notes"]},"ledger":{"a":"Ledger","b":"1F4D2","j":["paper","notes","notebook"]},"page-with-curl":{"a":"Page with Curl","b":"1F4C3","j":["document","paper","documents","page","office","curl"]},"scroll":{"a":"Scroll","b":"1F4DC","j":["paper","documents","ancient","history"]},"page-facing-up":{"a":"Page Facing Up","b":"1F4C4","j":["document","information","paper","documents","page","office"]},"newspaper":{"a":"Newspaper","b":"1F4F0","j":["paper","news","press","headline"]},"rolledup-newspaper":{"a":"Rolled-Up Newspaper","b":"1F5DE","j":["rolled","paper","press","newspaper","news","rolled-up newspaper","rolled_up_newspaper","headline"]},"bookmark-tabs":{"a":"Bookmark Tabs","b":"1F4D1","j":["order","bookmark","tidy","mark","marker","save","favorite","tabs"]},"bookmark":{"a":"Bookmark","b":"1F516","j":["save","label","mark","favorite"]},"label":{"a":"Label","b":"1F3F7","j":["tag","sale"]},"money-bag":{"a":"Money Bag","b":"1F4B0","j":["sale","payment","coins","dollar","moneybag","money","bag"]},"coin":{"a":"Coin","b":"1FA99","j":["gold","currency","money","treasure","silver","metal"]},"yen-banknote":{"a":"Yen Banknote","b":"1F4B4","j":["banknote","currency","bill","note","dollar","money","sales","yen","japanese"]},"dollar-banknote":{"a":"Dollar Banknote","b":"1F4B5","j":["banknote","currency","bill","dollar","note","money","sales"]},"euro-banknote":{"a":"Euro Banknote","b":"1F4B6","j":["banknote","currency","bill","euro","note","dollar","money","sales"]},"pound-banknote":{"a":"Pound Banknote","b":"1F4B7","j":["banknote","uk","currency","bill","british","sterling","note","money","sales","bills","england","pound"]},"money-with-wings":{"a":"Money with Wings","b":"1F4B8","j":["banknote","bill","sale","wings","payment","dollar","money","bills","fly"]},"credit-card":{"a":"Credit Card","b":"1F4B3","j":["credit","card","bill","payment","dollar","money","sales","shopping"]},"receipt":{"a":"Receipt","b":"1F9FE","j":["evidence","proof","accounting","expenses","bookkeeping"]},"chart-increasing-with-yen":{"a":"Chart Increasing with Yen","b":"1F4B9","j":["stats","presentation","growth","green-square","money","chart","yen","graph"]},"envelope":{"a":"Envelope","b":"2709","j":["postal","letter","communication","email","inbox"]},"email":{"a":"E-Mail","b":"1F4E7","j":["letter","communication","e_mail","inbox","e-mail","mail"]},"incoming-envelope":{"a":"Incoming Envelope","b":"1F4E8","j":["letter","envelope","receive","email","incoming","e-mail","inbox"]},"envelope-with-arrow":{"a":"Envelope with Arrow","b":"1F4E9","j":["communication","envelope","email","arrow","outgoing","e-mail"]},"outbox-tray":{"a":"Outbox Tray","b":"1F4E4","j":["letter","sent","email","outbox","tray","box","mail","inbox"]},"inbox-tray":{"a":"Inbox Tray","b":"1F4E5","j":["letter","receive","email","documents","tray","box","mail","inbox"]},"package":{"a":"Package","b":"1F4E6","j":["cardboard","gift","moving","box","parcel","mail"]},"closed-mailbox-with-raised-flag":{"a":"Closed Mailbox with Raised Flag","b":"1F4EB","j":["communication","closed","email","inbox","mailbox","mail","postbox"]},"closed-mailbox-with-lowered-flag":{"a":"Closed Mailbox with Lowered Flag","b":"1F4EA","j":["communication","closed","email","lowered","inbox","mailbox","mail","postbox"]},"open-mailbox-with-raised-flag":{"a":"Open Mailbox with Raised Flag","b":"1F4EC","j":["communication","open","email","inbox","mailbox","mail","postbox"]},"open-mailbox-with-lowered-flag":{"a":"Open Mailbox with Lowered Flag","b":"1F4ED","j":["open","email","lowered","inbox","mailbox","mail","postbox"]},"postbox":{"a":"Postbox","b":"1F4EE","j":["letter","envelope","email","mailbox","mail"]},"ballot-box-with-ballot":{"a":"Ballot Box with Ballot","b":"1F5F3","j":["election","ballot","box","vote"]},"pencil":{"a":"Pencil","b":"270F","j":["paper","school","write","stationery","writing","study"]},"black-nib":{"a":"Black Nib","b":"2712","j":["pen","write","stationery","writing","nib"]},"fountain-pen":{"a":"Fountain Pen","b":"1F58B","j":["pen","write","stationery","fountain","writing"]},"pen":{"a":"Pen","b":"1F58A","j":["stationery","ballpoint","writing","write"]},"paintbrush":{"a":"Paintbrush","b":"1F58C","j":["drawing","art","creativity","painting"]},"crayon":{"a":"Crayon","b":"1F58D","j":["drawing","creativity"]},"memo":{"a":"Memo","b":"1F4DD","j":["test","exam","paper","quiz","write","pencil","stationery","documents","compose","legal","writing","study"]},"briefcase":{"a":"Briefcase","b":"1F4BC","j":["business","documents","work","legal","job","law","career"]},"file-folder":{"a":"File Folder","b":"1F4C1","j":["business","file","folder","documents","office"]},"open-file-folder":{"a":"Open File Folder","b":"1F4C2","j":["open","file","load","folder","documents"]},"card-index-dividers":{"a":"Card Index Dividers","b":"1F5C2","j":["business","card","index","dividers","stationery","organizing"]},"calendar":{"a":"Calendar","b":"1F4C5","j":["date","schedule"]},"tearoff-calendar":{"a":"Tear-off Calendar","b":"1F4C6","j":["tear-off calendar","tear_off_calendar","planning","calendar","date","schedule"]},"spiral-notepad":{"a":"Spiral Notepad","b":"1F5D2","j":["memo","stationery","note","pad","spiral"]},"spiral-calendar":{"a":"Spiral Calendar","b":"1F5D3","j":["pad","planning","calendar","date","spiral","schedule"]},"card-index":{"a":"Card Index","b":"1F4C7","j":["business","card","index","rolodex","stationery"]},"chart-increasing":{"a":"Chart Increasing","b":"1F4C8","j":["business","stats","presentation","growth","success","money","chart","sales","good","recovery","graph","trend","upward","economics"]},"chart-decreasing":{"a":"Chart Decreasing","b":"1F4C9","j":["business","stats","failure","presentation","down","money","chart","recession","sales","bad","graph","trend","economics"]},"bar-chart":{"a":"Bar Chart","b":"1F4CA","j":["stats","presentation","bar","chart","graph"]},"clipboard":{"a":"Clipboard","b":"1F4CB","j":["stationery","documents"]},"pushpin":{"a":"Pushpin","b":"1F4CC","j":["stationery","mark","here","pin"]},"round-pushpin":{"a":"Round Pushpin","b":"1F4CD","j":["pushpin","location","stationery","map","here","pin"]},"paperclip":{"a":"Paperclip","b":"1F4CE","j":["stationery","documents"]},"linked-paperclips":{"a":"Linked Paperclips","b":"1F587","j":["stationery","link","documents","paperclip"]},"straight-ruler":{"a":"Straight Ruler","b":"1F4CF","j":["drawing","architect","sketch","school","math","stationery","calculate","straight edge","ruler","length"]},"triangular-ruler":{"a":"Triangular Ruler","b":"1F4D0","j":["sketch","architect","math","triangle","stationery","ruler","set"]},"scissors":{"a":"Scissors","b":"2702","j":["stationery","tool","cut","cutting"]},"card-file-box":{"a":"Card File Box","b":"1F5C3","j":["business","card","file","stationery","box"]},"file-cabinet":{"a":"File Cabinet","b":"1F5C4","j":["cabinet","file","filing","organizing"]},"wastebasket":{"a":"Wastebasket","b":"1F5D1","j":["rubbish","trash","garbage","bin","toss"]},"locked":{"a":"Locked","b":"1F512","j":["padlock","closed","password","security"]},"unlocked":{"a":"Unlocked","b":"1F513","j":["privacy","unlock","open","lock","security"]},"locked-with-pen":{"a":"Locked with Pen","b":"1F50F","j":["privacy","pen","lock","ink","security","secret","nib"]},"locked-with-key":{"a":"Locked with Key","b":"1F510","j":["privacy","closed","lock","key","security","secure"]},"key":{"a":"Key","b":"1F511","j":["door","password","lock"]},"old-key":{"a":"Old Key","b":"1F5DD","j":["password","lock","old","door","key","clue"]},"hammer":{"a":"Hammer","b":"1F528","j":["create","tools","tool","build"]},"axe":{"a":"Axe","b":"1FA93","j":["chop","hatchet","wood","tool","split","cut"]},"pick":{"a":"Pick","b":"26CF","j":["dig","tools","tool","mining"]},"hammer-and-pick":{"a":"Hammer and Pick","b":"2692","j":["hammer","build","tool","pick","create","tools"]},"hammer-and-wrench":{"a":"Hammer and Wrench","b":"1F6E0","j":["spanner","wrench","hammer","build","tool","create","tools"]},"dagger":{"a":"Dagger","b":"1F5E1","j":["knife","weapon"]},"crossed-swords":{"a":"Crossed Swords","b":"2694","j":["crossed","weapon","swords"]},"water-pistol":{"a":"Water Pistol","b":"1F52B","j":["gun","water","revolver","tool","weapon","handgun","pistol","violence"]},"boomerang":{"a":"Boomerang","b":"1FA83","j":["repercussion","rebound","australia","weapon"]},"bow-and-arrow":{"a":"Bow and Arrow","b":"1F3F9","j":["archer","sports","bow","Sagittarius","arrow","zodiac"]},"shield":{"a":"Shield","b":"1F6E1","j":["protection","security","weapon"]},"carpentry-saw":{"a":"Carpentry Saw","b":"1FA9A","j":["chop","carpenter","tool","cut","lumber","saw"]},"wrench":{"a":"Wrench","b":"1F527","j":["spanner","fix","tool","diy","ikea","maintainer","tools"]},"screwdriver":{"a":"Screwdriver","b":"1FA9B","j":["screw","tools","tool"]},"nut-and-bolt":{"a":"Nut and Bolt","b":"1F529","j":["fix","nut","bolt","tool","handy","tools"]},"gear":{"a":"Gear","b":"2699","j":["cogwheel","tool","cog"]},"clamp":{"a":"Clamp","b":"1F5DC","j":["compress","vice","tool"]},"balance-scale":{"a":"Balance Scale","b":"2696","j":["balance","scale","Libra","weight","law","justice","zodiac","fairness"]},"white-cane":{"a":"White Cane","b":"1F9AF","j":["accessibility","blind","probing_cane"]},"link":{"a":"Link","b":"1F517","j":["rings","url"]},"chains":{"a":"Chains","b":"26D3","j":["arrest","chain","lock"]},"hook":{"a":"Hook","b":"1FA9D","j":["crook","catch","ensnare","curve","selling point","tools"]},"toolbox":{"a":"Toolbox","b":"1F9F0","j":["fix","chest","tool","diy","mechanic","maintainer","tools"]},"magnet":{"a":"Magnet","b":"1F9F2","j":["magnetic","attraction","horseshoe"]},"ladder":{"a":"Ladder","b":"1FA9C","j":["rung","tools","climb","step"]},"alembic":{"a":"Alembic","b":"2697","j":["tool","chemistry","experiment","distilling","science"]},"test-tube":{"a":"Test Tube","b":"1F9EA","j":["chemist","experiment","chemistry","lab","science"]},"petri-dish":{"a":"Petri Dish","b":"1F9EB","j":["bacteria","culture","biology","lab","biologist"]},"dna":{"a":"Dna","b":"1F9EC","j":["genetics","gene","biologist","life","evolution"]},"microscope":{"a":"Microscope","b":"1F52C","j":["tool","experiment","zoomin","laboratory","study","science"]},"telescope":{"a":"Telescope","b":"1F52D","j":["stars","zoom","space","tool","astronomy","science"]},"satellite-antenna":{"a":"Satellite Antenna","b":"1F4E1","j":["communication","space","satellite","future","antenna","radio","dish"]},"syringe":{"a":"Syringe","b":"1F489","j":["sick","needle","drugs","blood","health","nurse","medicine","doctor","shot","hospital"]},"drop-of-blood":{"a":"Drop of Blood","b":"1FA78","j":["period","harm","injury","medicine","menstruation","wound","bleed","blood donation","hurt"]},"pill":{"a":"Pill","b":"1F48A","j":["sick","health","medicine","doctor","drug","pharmacy"]},"adhesive-bandage":{"a":"Adhesive Bandage","b":"1FA79","j":["bandage","heal"]},"stethoscope":{"a":"Stethoscope","b":"1FA7A","j":["medicine","heart","doctor","health"]},"door":{"a":"Door","b":"1F6AA","j":["entry","exit","house"]},"elevator":{"a":"Elevator","b":"1F6D7","j":["accessibility","hoist","lift"]},"mirror":{"a":"Mirror","b":"1FA9E","j":["speculum","reflection","reflector"]},"window":{"a":"Window","b":"1FA9F","j":["frame","transparent","scenery","fresh air","opening","view"]},"bed":{"a":"Bed","b":"1F6CF","j":["rest","hotel","sleep"]},"couch-and-lamp":{"a":"Couch and Lamp","b":"1F6CB","j":["lamp","read","chill","couch","hotel"]},"chair":{"a":"Chair","b":"1FA91","j":["furniture","sit","seat"]},"toilet":{"a":"Toilet","b":"1F6BD","j":["washroom","bathroom","potty","restroom","wc"]},"plunger":{"a":"Plunger","b":"1FAA0","j":["suction","plumber","toilet","force cup"]},"shower":{"a":"Shower","b":"1F6BF","j":["water","bathroom","clean"]},"bathtub":{"a":"Bathtub","b":"1F6C1","j":["shower","bath","bathroom","clean"]},"mouse-trap":{"a":"Mouse Trap","b":"1FAA4","j":["trap","bait","snare","cheese","mousetrap"]},"razor":{"a":"Razor","b":"1FA92","j":["cut","sharp","shave"]},"lotion-bottle":{"a":"Lotion Bottle","b":"1F9F4","j":["moisturizer","lotion","sunscreen","shampoo"]},"safety-pin":{"a":"Safety Pin","b":"1F9F7","j":["diaper","punk rock"]},"broom":{"a":"Broom","b":"1F9F9","j":["cleaning","sweeping","witch"]},"basket":{"a":"Basket","b":"1F9FA","j":["picnic","farming","laundry"]},"roll-of-paper":{"a":"Roll of Paper","b":"1F9FB","j":["roll","paper towels","toilet paper"]},"bucket":{"a":"Bucket","b":"1FAA3","j":["vat","water","container","cask","pail"]},"soap":{"a":"Soap","b":"1F9FC","j":["soapdish","lather","bar","bathing","cleaning"]},"toothbrush":{"a":"Toothbrush","b":"1FAA5","j":["hygiene","teeth","dental","bathroom","clean","brush"]},"sponge":{"a":"Sponge","b":"1F9FD","j":["porous","cleaning","absorbing"]},"fire-extinguisher":{"a":"Fire Extinguisher","b":"1F9EF","j":["fire","extinguish","quench"]},"shopping-cart":{"a":"Shopping Cart","b":"1F6D2","j":["trolley","cart","shopping"]},"cigarette":{"a":"Cigarette","b":"1F6AC","j":["kills","smoking","smoke","joint","tobacco"]},"coffin":{"a":"Coffin","b":"26B0","j":["funeral","cemetery","vampire","rip","die","graveyard","box","death","casket","dead"]},"headstone":{"a":"Headstone","b":"1FAA6","j":["cemetery","rip","graveyard","grave","tombstone","death"]},"funeral-urn":{"a":"Funeral Urn","b":"26B1","j":["funeral","rip","ashes","die","urn","death","dead"]},"moai":{"a":"Moai","b":"1F5FF","j":["moyai","rock","statue","face","easter island"]},"placard":{"a":"Placard","b":"1FAA7","j":["demonstration","picket","sign","announcement","protest"]},"atm-sign":{"a":"Atm Sign","b":"1F3E7","j":["teller","cash","payment","ATM sign","money","sales","automated","blue-square","atm","bank"]},"litter-in-bin-sign":{"a":"Litter in Bin Sign","b":"1F6AE","j":["info","litter bin","sign","blue-square","litter","human"]},"potable-water":{"a":"Potable Water","b":"1F6B0","j":["cleaning","water","restroom","potable","blue-square","drinking","faucet","liquid"]},"wheelchair-symbol":{"a":"Wheelchair Symbol","b":"267F","j":["accessibility","disabled","blue-square","access"]},"mens-room":{"a":"Men’S Room","b":"1F6B9","j":["lavatory","men_s_room","male","man","toilet","gender","restroom","blue-square","men’s room","wc"]},"womens-room":{"a":"Women’S Room","b":"1F6BA","j":["lavatory","purple-square","loo","women_s_room","woman","toilet","gender","female","restroom","women’s room","wc"]},"restroom":{"a":"Restroom","b":"1F6BB","j":["lavatory","toilet","gender","refresh","WC","blue-square","wc"]},"baby-symbol":{"a":"Baby Symbol","b":"1F6BC","j":["orange-square","child","changing","baby"]},"water-closet":{"a":"Water Closet","b":"1F6BE","j":["lavatory","water","toilet","closet","restroom","blue-square","wc"]},"passport-control":{"a":"Passport Control","b":"1F6C2","j":["control","passport","blue-square","custom"]},"customs":{"a":"Customs","b":"1F6C3","j":["border","blue-square","passport"]},"baggage-claim":{"a":"Baggage Claim","b":"1F6C4","j":["baggage","claim","transport","airport","blue-square"]},"left-luggage":{"a":"Left Luggage","b":"1F6C5","j":["baggage","luggage","travel","blue-square","locker"]},"warning":{"a":"Warning","b":"26A0","j":["exclamation","wip","issue","error","problem","alert"]},"children-crossing":{"a":"Children Crossing","b":"1F6B8","j":["traffic","driving","school","sign","child","pedestrian","crossing","warning","danger","yellow-diamond"]},"no-entry":{"a":"No Entry","b":"26D4","j":["privacy","traffic","limit","stop","no","not","prohibited","denied","entry","circle","bad","security","forbidden"]},"prohibited":{"a":"Prohibited","b":"1F6AB","j":["limit","stop","disallow","no","not","denied","forbid","entry","circle","forbidden"]},"no-bicycles":{"a":"No Bicycles","b":"1F6B3","j":["cyclist","no","bike","prohibited","bicycle","circle","forbidden"]},"no-smoking":{"a":"No Smoking","b":"1F6AD","j":["cigarette","no","prohibited","not","smoking","smell","smoke","blue-square","forbidden"]},"no-littering":{"a":"No Littering","b":"1F6AF","j":["trash","not","no","prohibited","garbage","bin","circle","litter","forbidden"]},"nonpotable-water":{"a":"Non-Potable Water","b":"1F6B1","j":["non_potable_water","faucet","water","drink","circle","tap","non-drinking","non-potable"]},"no-pedestrians":{"a":"No Pedestrians","b":"1F6B7","j":["no","not","prohibited","rules","circle","walking","pedestrian","crossing","forbidden"]},"no-mobile-phones":{"a":"No Mobile Phones","b":"1F4F5","j":["mobile","no","mute","cell","circle","iphone","forbidden","phone"]},"no-one-under-eighteen":{"a":"No One Under Eighteen","b":"1F51E","j":["night","prohibited","underage","eighteen","drink","circle","18","minor","pub","age restriction"]},"radioactive":{"a":"Radioactive","b":"2622","j":["nuclear","danger","sign"]},"biohazard":{"a":"Biohazard","b":"2623","j":["danger","sign"]},"up-arrow":{"a":"Up Arrow","b":"2B06","j":["north","arrow","direction","cardinal","continue","top","blue-square"]},"upright-arrow":{"a":"Up-Right Arrow","b":"2197","j":["point","up_right_arrow","arrow","direction","northeast","diagonal","blue-square","intercardinal","up-right arrow"]},"right-arrow":{"a":"Right Arrow","b":"27A1","j":["arrow","direction","cardinal","east","next","blue-square"]},"downright-arrow":{"a":"Down-Right Arrow","b":"2198","j":["down_right_arrow","arrow","direction","southeast","diagonal","blue-square","down-right arrow","intercardinal"]},"down-arrow":{"a":"Down Arrow","b":"2B07","j":["south","arrow","direction","cardinal","down","blue-square","bottom"]},"downleft-arrow":{"a":"Down-Left Arrow","b":"2199","j":["arrow","direction","down_left_arrow","down-left arrow","southwest","diagonal","blue-square","intercardinal"]},"left-arrow":{"a":"Left Arrow","b":"2B05","j":["previous","arrow","cardinal","direction","west","blue-square","back"]},"upleft-arrow":{"a":"Up-Left Arrow","b":"2196","j":["point","arrow","direction","northwest","diagonal","blue-square","intercardinal","up_left_arrow","up-left arrow"]},"updown-arrow":{"a":"Up-Down Arrow","b":"2195","j":["arrow","direction","way","up_down_arrow","blue-square","vertical","up-down arrow"]},"leftright-arrow":{"a":"Left-Right Arrow","b":"2194","j":["sideways","horizontal","left-right arrow","arrow","direction","shape","left_right_arrow"]},"right-arrow-curving-left":{"a":"Right Arrow Curving Left","b":"21A9","j":["enter","arrow","return","blue-square","undo","back"]},"left-arrow-curving-right":{"a":"Left Arrow Curving Right","b":"21AA","j":["arrow","direction","rotate","return","blue-square"]},"right-arrow-curving-up":{"a":"Right Arrow Curving Up","b":"2934","j":["top","arrow","direction","blue-square"]},"right-arrow-curving-down":{"a":"Right Arrow Curving Down","b":"2935","j":["arrow","direction","down","blue-square","bottom"]},"clockwise-vertical-arrows":{"a":"Clockwise Vertical Arrows","b":"1F503","j":["reload","clockwise","arrow","cycle","repeat","sync","round"]},"counterclockwise-arrows-button":{"a":"Counterclockwise Arrows Button","b":"1F504","j":["withershins","arrow","cycle","sync","blue-square","anticlockwise","counterclockwise"]},"back-arrow":{"a":"Back Arrow","b":"1F519","j":["arrow","return","words","BACK arrow","back"]},"end-arrow":{"a":"End Arrow","b":"1F51A","j":["words","arrow","END arrow","end"]},"on-arrow":{"a":"On! Arrow","b":"1F51B","j":["on","arrow","words","ON! arrow","mark"]},"soon-arrow":{"a":"Soon Arrow","b":"1F51C","j":["words","arrow","SOON arrow","soon"]},"top-arrow":{"a":"Top Arrow","b":"1F51D","j":["up","TOP arrow","top","arrow","words","blue-square"]},"place-of-worship":{"a":"Place of Worship","b":"1F6D0","j":["church","worship","religion","temple","prayer"]},"atom-symbol":{"a":"Atom Symbol","b":"269B","j":["atheist","atom","chemistry","physics","science"]},"om":{"a":"Om","b":"1F549","j":["hinduism","religion","sikhism","jainism","Hindu","buddhism"]},"star-of-david":{"a":"Star of David","b":"2721","j":["Jew","star of David","religion","Jewish","David","judaism","star"]},"wheel-of-dharma":{"a":"Wheel of Dharma","b":"2638","j":["dharma","hinduism","Buddhist","wheel","religion","sikhism","jainism","buddhism"]},"yin-yang":{"a":"Yin Yang","b":"262F","j":["taoist","balance","religion","yang","yin","tao"]},"latin-cross":{"a":"Latin Cross","b":"271D","j":["religion","Christian","christianity","cross"]},"orthodox-cross":{"a":"Orthodox Cross","b":"2626","j":["religion","suppedaneum","Christian","cross"]},"star-and-crescent":{"a":"Star and Crescent","b":"262A","j":["religion","islam","Muslim"]},"peace-symbol":{"a":"Peace Symbol","b":"262E","j":["peace","hippie"]},"menorah":{"a":"Menorah","b":"1F54E","j":["religion","candelabrum","jewish","candlestick","hanukkah","candles"]},"dotted-sixpointed-star":{"a":"Dotted Six-Pointed Star","b":"1F52F","j":["purple-square","dotted six-pointed star","dotted_six_pointed_star","religion","jewish","hexagram","fortune","star"]},"aries":{"a":"Aries","b":"2648","j":["purple-square","sign","ram","astrology","zodiac"]},"taurus":{"a":"Taurus","b":"2649","j":["purple-square","ox","sign","bull","astrology","zodiac"]},"gemini":{"a":"Gemini","b":"264A","j":["purple-square","twins","sign","astrology","zodiac"]},"cancer":{"a":"Cancer","b":"264B","j":["purple-square","sign","astrology","crab","zodiac"]},"leo":{"a":"Leo","b":"264C","j":["purple-square","lion","sign","astrology","zodiac"]},"virgo":{"a":"Virgo","b":"264D","j":["zodiac","purple-square","sign","astrology"]},"libra":{"a":"Libra","b":"264E","j":["balance","purple-square","scales","sign","astrology","justice","zodiac"]},"scorpio":{"a":"Scorpio","b":"264F","j":["purple-square","scorpius","sign","astrology","zodiac","scorpion"]},"sagittarius":{"a":"Sagittarius","b":"2650","j":["purple-square","archer","sign","astrology","zodiac"]},"capricorn":{"a":"Capricorn","b":"2651","j":["purple-square","sign","goat","astrology","zodiac"]},"aquarius":{"a":"Aquarius","b":"2652","j":["purple-square","water","sign","astrology","bearer","zodiac"]},"pisces":{"a":"Pisces","b":"2653","j":["fish","purple-square","sign","astrology","zodiac"]},"ophiuchus":{"a":"Ophiuchus","b":"26CE","j":["purple-square","constellation","sign","astrology","snake","bearer","serpent","zodiac"]},"shuffle-tracks-button":{"a":"Shuffle Tracks Button","b":"1F500","j":["shuffle","random","arrow","music","blue-square","crossed"]},"repeat-button":{"a":"Repeat Button","b":"1F501","j":["loop","clockwise","arrow","repeat","record"]},"repeat-single-button":{"a":"Repeat Single Button","b":"1F502","j":["loop","clockwise","arrow","once","blue-square"]},"play-button":{"a":"Play Button","b":"25B6","j":["right","arrow","direction","triangle","blue-square","play"]},"fastforward-button":{"a":"Fast-Forward Button","b":"23E9","j":["speed","forward","arrow","fast_forward_button","continue","double","fast","blue-square","fast-forward button","play"]},"next-track-button":{"a":"Next Track Button","b":"23ED","j":["next scene","forward","arrow","triangle","next","blue-square","next track"]},"play-or-pause-button":{"a":"Play or Pause Button","b":"23EF","j":["right","arrow","triangle","blue-square","pause","play"]},"reverse-button":{"a":"Reverse Button","b":"25C0","j":["left","arrow","direction","triangle","reverse","blue-square"]},"fast-reverse-button":{"a":"Fast Reverse Button","b":"23EA","j":["arrow","double","blue-square","rewind","play"]},"last-track-button":{"a":"Last Track Button","b":"23EE","j":["previous track","arrow","triangle","backward","previous scene"]},"upwards-button":{"a":"Upwards Button","b":"1F53C","j":["point","red","forward","arrow","direction","top","triangle","button","blue-square"]},"fast-up-button":{"a":"Fast Up Button","b":"23EB","j":["top","arrow","direction","double","blue-square"]},"downwards-button":{"a":"Downwards Button","b":"1F53D","j":["red","arrow","direction","down","button","blue-square","bottom"]},"fast-down-button":{"a":"Fast Down Button","b":"23EC","j":["arrow","direction","down","double","blue-square","bottom"]},"pause-button":{"a":"Pause Button","b":"23F8","j":["double","bar","blue-square","pause","vertical"]},"stop-button":{"a":"Stop Button","b":"23F9","j":["square","stop","blue-square"]},"record-button":{"a":"Record Button","b":"23FA","j":["record","circle","blue-square"]},"eject-button":{"a":"Eject Button","b":"23CF","j":["eject","blue-square"]},"cinema":{"a":"Cinema","b":"1F3A6","j":["movie","camera","film","stage","curtain","blue-square","record","theater"]},"dim-button":{"a":"Dim Button","b":"1F505","j":["dim","low","warm","sun","summer","afternoon","brightness"]},"bright-button":{"a":"Bright Button","b":"1F506","j":["light","sun","brightness","bright"]},"antenna-bars":{"a":"Antenna Bars","b":"1F4F6","j":["mobile","internet","connection","wifi","cell","bar","bars","reception","blue-square","antenna","bluetooth","phone"]},"vibration-mode":{"a":"Vibration Mode","b":"1F4F3","j":["orange-square","mobile","mode","vibration","cell","telephone","phone"]},"mobile-phone-off":{"a":"Mobile Phone off","b":"1F4F4","j":["orange-square","mobile","mute","cell","off","telephone","silence","quiet","phone"]},"female-sign":{"a":"Female Sign","b":"2640","j":["woman","women","girl","lady"]},"male-sign":{"a":"Male Sign","b":"2642","j":["man","boy","men"]},"transgender-symbol":{"a":"Transgender Symbol","b":"26A7","j":["lgbtq","transgender"]},"multiply":{"a":"Multiply","b":"2716","j":["cancel","multiplication_sign","x","math","sign","multiplication","calculation","×"]},"plus":{"a":"Plus","b":"2795","j":["+","addition","math","more","sign","increase","calculation","plus_sign"]},"minus":{"a":"Minus","b":"2796","j":["-","math","less","sign","−","minus_sign","subtract","calculation"]},"divide":{"a":"Divide","b":"2797","j":["÷","math","division","sign","calculation","division_sign"]},"infinity":{"a":"Infinity","b":"267E","j":["universal","forever","unbounded"]},"double-exclamation-mark":{"a":"Double Exclamation Mark","b":"203C","j":["exclamation","surprise","!","mark","!!","bangbang"]},"exclamation-question-mark":{"a":"Exclamation Question Mark","b":"2049","j":["exclamation","surprise","wat","punctuation","!","?","mark","question","interrobang","!?"]},"red-question-mark":{"a":"Red Question Mark","b":"2753","j":["punctuation","question_mark","confused","question","?","mark","doubt"]},"white-question-mark":{"a":"White Question Mark","b":"2754","j":["outlined","gray","punctuation","doubts","confused","question","?","huh","mark"]},"white-exclamation-mark":{"a":"White Exclamation Mark","b":"2755","j":["exclamation","surprise","wow","outlined","gray","punctuation","!","mark","warning"]},"red-exclamation-mark":{"a":"Red Exclamation Mark","b":"2757","j":["exclamation","surprise","wow","punctuation","exclamation_mark","!","mark","warning","danger","heavy_exclamation_mark"]},"wavy-dash":{"a":"Wavy Dash","b":"3030","j":["draw","punctuation","mustache","line","moustache","squiggle","wavy","scribble","dash"]},"currency-exchange":{"a":"Currency Exchange","b":"1F4B1","j":["exchange","currency","dollar","money","sales","travel","bank"]},"heavy-dollar-sign":{"a":"Heavy Dollar Sign","b":"1F4B2","j":["currency","buck","payment","dollar","money","sales"]},"medical-symbol":{"a":"Medical Symbol","b":"2695","j":["health","medicine","staff","aesculapius","hospital"]},"recycling-symbol":{"a":"Recycling Symbol","b":"267B","j":["recycle","trash","garbage","arrow","environment"]},"fleurdelis":{"a":"Fleur-De-Lis","b":"269C","j":["scout","fleur-de-lis","decorative","fleur_de_lis"]},"trident-emblem":{"a":"Trident Emblem","b":"1F531","j":["trident","ship","spear","tool","emblem","weapon","anchor"]},"name-badge":{"a":"Name Badge","b":"1F4DB","j":["name","fire","badge","forbid"]},"japanese-symbol-for-beginner":{"a":"Japanese Symbol for Beginner","b":"1F530","j":["shield","badge","leaf","Japanese","chevron","Japanese symbol for beginner","beginner"]},"hollow-red-circle":{"a":"Hollow Red Circle","b":"2B55","j":["red","o","large","circle","round"]},"check-mark-button":{"a":"Check Mark Button","b":"2705","j":["ok","answer","check","green-square","tick","election","✓","button","mark","vote","agree"]},"check-box-with-check":{"a":"Check Box with Check","b":"2611","j":["confirm","ok","black-square","check","tick","election","✓","box","vote","yes","agree"]},"check-mark":{"a":"Check Mark","b":"2714","j":["ok","answer","check","nike","tick","✓","mark","yes"]},"cross-mark":{"a":"Cross Mark","b":"274C","j":["cancel","multiply","red","no","x","cross","delete","remove","multiplication","mark","×"]},"cross-mark-button":{"a":"Cross Mark Button","b":"274E","j":["no","x","green-square","mark","×","square","deny"]},"curly-loop":{"a":"Curly Loop","b":"27B0","j":["loop","draw","shape","squiggle","scribble","curl"]},"double-curly-loop":{"a":"Double Curly Loop","b":"27BF","j":["loop","cassette","double","tape","curl"]},"part-alternation-mark":{"a":"Part Alternation Mark","b":"303D","j":["business","stats","presentation","bad","mark","graph","part","economics"]},"eightspoked-asterisk":{"a":"Eight-Spoked Asterisk","b":"2733","j":["*","sparkle","green-square","eight_spoked_asterisk","asterisk","eight-spoked asterisk","star"]},"eightpointed-star":{"a":"Eight-Pointed Star","b":"2734","j":["*","orange-square","polygon","eight_pointed_star","eight-pointed star","shape","star"]},"sparkle":{"a":"Sparkle","b":"2747","j":["*","stars","fireworks","awesome","green-square","good"]},"copyright":{"a":"Copyright","b":"00A9","j":["license","ip","circle","c","legal","law"]},"registered":{"a":"Registered","b":"00AE","j":["alphabet","circle","r"]},"trade-mark":{"a":"Trade Mark","b":"2122","j":["trademark","brand","tm","mark","legal","law"]},"keycap":{"a":"Keycap: *","b":"002A-FE0F-20E3","j":["star","keycap_"]},"keycap-0":{"a":"Keycap: 0","b":"0030-FE0F-20E3","j":["null","numbers","0","blue-square","keycap"]},"keycap-1":{"a":"Keycap: 1","b":"0031-FE0F-20E3","j":["1","numbers","keycap","blue-square"]},"keycap-2":{"a":"Keycap: 2","b":"0032-FE0F-20E3","j":["numbers","prime","blue-square","keycap","2"]},"keycap-3":{"a":"Keycap: 3","b":"0033-FE0F-20E3","j":["numbers","3","prime","blue-square","keycap"]},"keycap-4":{"a":"Keycap: 4","b":"0034-FE0F-20E3","j":["numbers","keycap","4","blue-square"]},"keycap-5":{"a":"Keycap: 5","b":"0035-FE0F-20E3","j":["numbers","5","prime","blue-square","keycap"]},"keycap-6":{"a":"Keycap: 6","b":"0036-FE0F-20E3","j":["6","numbers","keycap","blue-square"]},"keycap-7":{"a":"Keycap: 7","b":"0037-FE0F-20E3","j":["numbers","7","prime","blue-square","keycap"]},"keycap-8":{"a":"Keycap: 8","b":"0038-FE0F-20E3","j":["numbers","keycap","8","blue-square"]},"keycap-9":{"a":"Keycap: 9","b":"0039-FE0F-20E3","j":["numbers","keycap","9","blue-square"]},"keycap-10":{"a":"Keycap: 10","b":"1F51F","j":["10","numbers","keycap","blue-square"]},"input-latin-uppercase":{"a":"Input Latin Uppercase","b":"1F520","j":["alphabet","ABCD","uppercase","words","blue-square","letters","latin","input"]},"input-latin-lowercase":{"a":"Input Latin Lowercase","b":"1F521","j":["alphabet","abcd","blue-square","letters","latin","input","lowercase"]},"input-numbers":{"a":"Input Numbers","b":"1F522","j":["numbers","1234","input","blue-square"]},"input-symbols":{"a":"Input Symbols","b":"1F523","j":["〒♪&%","characters","glyphs","note","music","blue-square","percent","ampersand","input"]},"input-latin-letters":{"a":"Input Latin Letters","b":"1F524","j":["alphabet","abc","blue-square","letters","latin","input"]},"a-button-blood-type":{"a":"A Button (Blood Type)","b":"1F170","j":["a","letter","alphabet","a_button","red-square","A button (blood type)","blood type"]},"ab-button-blood-type":{"a":"Ab Button (Blood Type)","b":"1F18E","j":["ab","alphabet","ab_button","red-square","AB button (blood type)","blood type"]},"b-button-blood-type":{"a":"B Button (Blood Type)","b":"1F171","j":["letter","alphabet","b","B button (blood type)","red-square","b_button","blood type"]},"cl-button":{"a":"Cl Button","b":"1F191","j":["cl","alphabet","CL button","words","red-square"]},"cool-button":{"a":"Cool Button","b":"1F192","j":["words","cool","COOL button","blue-square"]},"free-button":{"a":"Free Button","b":"1F193","j":["words","FREE button","free","blue-square"]},"information":{"a":"Information","b":"2139","j":["alphabet","letter","i","blue-square"]},"id-button":{"a":"Id Button","b":"1F194","j":["purple-square","id","ID button","words","identity"]},"circled-m":{"a":"Circled M","b":"24C2","j":["blue-circle","letter","alphabet","circle","circled M","m"]},"new-button":{"a":"New Button","b":"1F195","j":["start","words","NEW button","blue-square","new"]},"ng-button":{"a":"Ng Button","b":"1F196","j":["NG button","ng","icon","words","shape","blue-square"]},"o-button-blood-type":{"a":"O Button (Blood Type)","b":"1F17E","j":["letter","O button (blood type)","o","alphabet","o_button","red-square","blood type"]},"ok-button":{"a":"Ok Button","b":"1F197","j":["OK button","good","blue-square","OK","yes","agree"]},"p-button":{"a":"P Button","b":"1F17F","j":["cars","letter","alphabet","blue-square","parking","P button"]},"sos-button":{"a":"Sos Button","b":"1F198","j":["SOS button","911","help","words","emergency","red-square","sos"]},"up-button":{"a":"Up! Button","b":"1F199","j":["up","high","above","mark","blue-square","UP! button"]},"vs-button":{"a":"Vs Button","b":"1F19A","j":["orange-square","vs","words","VS button","versus"]},"japanese-here-button":{"a":"Japanese “Here” Button","b":"1F201","j":["Japanese “here” button","Japanese","destination","katakana","“here”","blue-square","japanese","ココ","here"]},"japanese-service-charge-button":{"a":"Japanese “Service Charge” Button","b":"1F202","j":["“service charge”","Japanese","katakana","Japanese “service charge” button","サ","blue-square","japanese"]},"japanese-monthly-amount-button":{"a":"Japanese “Monthly Amount” Button","b":"1F237","j":["orange-square","month","Japanese","Japanese “monthly amount” button","“monthly amount”","chinese","月","kanji","japanese","ideograph","moon"]},"japanese-not-free-of-charge-button":{"a":"Japanese “Not Free of Charge” Button","b":"1F236","j":["orange-square","有","“not free of charge”","Japanese","Japanese “not free of charge” button","chinese","kanji","ideograph","have"]},"japanese-reserved-button":{"a":"Japanese “Reserved” Button","b":"1F22F","j":["point","Japanese “reserved” button","green-square","Japanese","chinese","指","kanji","ideograph","“reserved”"]},"japanese-bargain-button":{"a":"Japanese “Bargain” Button","b":"1F250","j":["“bargain”","得","Japanese “bargain” button","Japanese","get","circle","chinese","kanji","ideograph","obtain"]},"japanese-discount-button":{"a":"Japanese “Discount” Button","b":"1F239","j":["“discount”","Japanese","Japanese “discount” button","divide","chinese","kanji","ideograph","pink-square","cut","割"]},"japanese-free-of-charge-button":{"a":"Japanese “Free of Charge” Button","b":"1F21A","j":["“free of charge”","orange-square","無","Japanese","Japanese “free of charge” button","chinese","kanji","japanese","ideograph","nothing"]},"japanese-prohibited-button":{"a":"Japanese “Prohibited” Button","b":"1F232","j":["禁","limit","forbidden","“prohibited”","Japanese “prohibited” button","Japanese","restricted","kanji","chinese","japanese","red-square","ideograph"]},"japanese-acceptable-button":{"a":"Japanese “Acceptable” Button","b":"1F251","j":["ok","Japanese “acceptable” button","Japanese","可","chinese","good","kanji","ideograph","orange-circle","yes","“acceptable”","agree"]},"japanese-application-button":{"a":"Japanese “Application” Button","b":"1F238","j":["orange-square","申","“application”","Japanese","chinese","kanji","japanese","Japanese “application” button","ideograph"]},"japanese-passing-grade-button":{"a":"Japanese “Passing Grade” Button","b":"1F234","j":["“passing grade”","Japanese “passing grade” button","Japanese","join","chinese","kanji","合","japanese","red-square","ideograph"]},"japanese-vacancy-button":{"a":"Japanese “Vacancy” Button","b":"1F233","j":["Japanese “vacancy” button","Japanese","sky","japanese","kanji","chinese","empty","blue-square","“vacancy”","空","ideograph"]},"japanese-congratulations-button":{"a":"Japanese “Congratulations” Button","b":"3297","j":["Japanese","祝","Japanese “congratulations” button","chinese","kanji","“congratulations”","japanese","ideograph","red-circle"]},"japanese-secret-button":{"a":"Japanese “Secret” Button","b":"3299","j":["Japanese “secret” button","privacy","sshh","秘","Japanese","chinese","kanji","ideograph","“secret”","red-circle"]},"japanese-open-for-business-button":{"a":"Japanese “Open for Business” Button","b":"1F23A","j":["“open for business”","orange-square","opening hours","Japanese “open for business” button","Japanese","営","japanese","ideograph"]},"japanese-no-vacancy-button":{"a":"Japanese “No Vacancy” Button","b":"1F235","j":["full","満","Japanese","“no vacancy”","chinese","kanji","japanese","red-square","ideograph","Japanese “no vacancy” button"]},"red-circle":{"a":"Red Circle","b":"1F534","j":["geometric","red","shape","error","circle","danger"]},"orange-circle":{"a":"Orange Circle","b":"1F7E0","j":["circle","round","orange"]},"yellow-circle":{"a":"Yellow Circle","b":"1F7E1","j":["yellow","circle","round"]},"green-circle":{"a":"Green Circle","b":"1F7E2","j":["green","circle","round"]},"blue-circle":{"a":"Blue Circle","b":"1F535","j":["geometric","icon","shape","button","circle","blue"]},"purple-circle":{"a":"Purple Circle","b":"1F7E3","j":["circle","round","purple"]},"brown-circle":{"a":"Brown Circle","b":"1F7E4","j":["brown","circle","round"]},"black-circle":{"a":"Black Circle","b":"26AB","j":["geometric","shape","button","circle","round"]},"white-circle":{"a":"White Circle","b":"26AA","j":["shape","geometric","round","circle"]},"red-square":{"a":"Red Square","b":"1F7E5","j":["square","red"]},"orange-square":{"a":"Orange Square","b":"1F7E7","j":["square","orange"]},"yellow-square":{"a":"Yellow Square","b":"1F7E8","j":["yellow","square"]},"green-square":{"a":"Green Square","b":"1F7E9","j":["green","square"]},"blue-square":{"a":"Blue Square","b":"1F7E6","j":["square","blue"]},"purple-square":{"a":"Purple Square","b":"1F7EA","j":["square","purple"]},"brown-square":{"a":"Brown Square","b":"1F7EB","j":["brown","square"]},"black-large-square":{"a":"Black Large Square","b":"2B1B","j":["geometric","icon","shape","button","square"]},"white-large-square":{"a":"White Large Square","b":"2B1C","j":["geometric","icon","stone","shape","button","square"]},"black-medium-square":{"a":"Black Medium Square","b":"25FC","j":["geometric","icon","shape","button","square"]},"white-medium-square":{"a":"White Medium Square","b":"25FB","j":["geometric","icon","stone","shape","square"]},"black-mediumsmall-square":{"a":"Black Medium-Small Square","b":"25FE","j":["black medium-small square","geometric","icon","black_medium_small_square","shape","button","square"]},"white-mediumsmall-square":{"a":"White Medium-Small Square","b":"25FD","j":["geometric","white medium-small square","white_medium_small_square","icon","stone","shape","button","square"]},"black-small-square":{"a":"Black Small Square","b":"25AA","j":["icon","shape","square","geometric"]},"white-small-square":{"a":"White Small Square","b":"25AB","j":["icon","shape","square","geometric"]},"large-orange-diamond":{"a":"Large Orange Diamond","b":"1F536","j":["geometric","gem","jewel","orange","shape","diamond"]},"large-blue-diamond":{"a":"Large Blue Diamond","b":"1F537","j":["geometric","gem","jewel","shape","diamond","blue"]},"small-orange-diamond":{"a":"Small Orange Diamond","b":"1F538","j":["geometric","gem","jewel","orange","shape","diamond"]},"small-blue-diamond":{"a":"Small Blue Diamond","b":"1F539","j":["geometric","gem","jewel","shape","diamond","blue"]},"red-triangle-pointed-up":{"a":"Red Triangle Pointed Up","b":"1F53A","j":["up","geometric","red","top","direction","shape"]},"red-triangle-pointed-down":{"a":"Red Triangle Pointed Down","b":"1F53B","j":["geometric","red","direction","down","shape","bottom"]},"diamond-with-a-dot":{"a":"Diamond with a Dot","b":"1F4A0","j":["geometric","gem","fancy","jewel","inside","comic","diamond","crystal","blue"]},"radio-button":{"a":"Radio Button","b":"1F518","j":["geometric","old","button","circle","music","radio","input"]},"white-square-button":{"a":"White Square Button","b":"1F533","j":["geometric","outlined","shape","button","square","input"]},"black-square-button":{"a":"Black Square Button","b":"1F532","j":["frame","geometric","shape","button","square","input"]},"chequered-flag":{"a":"Chequered Flag","b":"1F3C1","j":["chequered","checkered","race","racing","gokart","finishline","contest"]},"triangular-flag":{"a":"Triangular Flag","b":"1F6A9","j":["milestone","place","mark","post"]},"crossed-flags":{"a":"Crossed Flags","b":"1F38C","j":["nation","celebration","cross","Japanese","border","japanese","country","crossed"]},"black-flag":{"a":"Black Flag","b":"1F3F4","j":["waving","pirate"]},"white-flag":{"a":"White Flag","b":"1F3F3","j":["loser","give up","surrender","lost","waving","losing","fail"]},"rainbow-flag":{"a":"Rainbow Flag","b":"1F3F3-FE0F-200D-1F308","j":["gay","glbt","pride","lesbian","homosexual","flag","lgbt","bisexual","rainbow","queer","transgender"]},"transgender-flag":{"a":"Transgender Flag","b":"1F3F3-FE0F-200D-26A7-FE0F","j":["pink","lgbtq","light blue","flag","white","transgender"]},"pirate-flag":{"a":"Pirate Flag","b":"1F3F4-200D-2620-FE0F","j":["skull","crossbones","plunder","flag","Jolly Roger","treasure","banner","pirate"]},"flag-ascension-island":{"a":"Flag: Ascension Island","b":"1F1E6-1F1E8","j":["flag"]},"flag-andorra":{"a":"Flag: Andorra","b":"1F1E6-1F1E9","j":["flag","ad","banner","country","nation"]},"flag-united-arab-emirates":{"a":"Flag: United Arab Emirates","b":"1F1E6-1F1EA","j":["united","flag","emirates","banner","arab","country","nation"]},"flag-afghanistan":{"a":"Flag: Afghanistan","b":"1F1E6-1F1EB","j":["af","flag","banner","country","nation"]},"flag-antigua--barbuda":{"a":"Flag: Antigua & Barbuda","b":"1F1E6-1F1EC","j":["barbuda","antigua","flag","banner","country","nation","flag_antigua_barbuda"]},"flag-anguilla":{"a":"Flag: Anguilla","b":"1F1E6-1F1EE","j":["ai","flag","banner","country","nation"]},"flag-albania":{"a":"Flag: Albania","b":"1F1E6-1F1F1","j":["al","flag","banner","country","nation"]},"flag-armenia":{"a":"Flag: Armenia","b":"1F1E6-1F1F2","j":["country","flag","banner","am","nation"]},"flag-angola":{"a":"Flag: Angola","b":"1F1E6-1F1F4","j":["ao","flag","banner","country","nation"]},"flag-antarctica":{"a":"Flag: Antarctica","b":"1F1E6-1F1F6","j":["aq","flag","banner","country","nation"]},"flag-argentina":{"a":"Flag: Argentina","b":"1F1E6-1F1F7","j":["ar","flag","banner","country","nation"]},"flag-american-samoa":{"a":"Flag: American Samoa","b":"1F1E6-1F1F8","j":["ws","flag","banner","country","nation","american"]},"flag-austria":{"a":"Flag: Austria","b":"1F1E6-1F1F9","j":["at","flag","banner","country","nation"]},"flag-australia":{"a":"Flag: Australia","b":"1F1E6-1F1FA","j":["flag","banner","au","country","nation"]},"flag-aruba":{"a":"Flag: Aruba","b":"1F1E6-1F1FC","j":["aw","flag","banner","country","nation"]},"flag-land-islands":{"a":"Flag: Åland Islands","b":"1F1E6-1F1FD","j":["islands","flag","flag_aland_islands","Åland","banner","country","nation"]},"flag-azerbaijan":{"a":"Flag: Azerbaijan","b":"1F1E6-1F1FF","j":["az","flag","banner","country","nation"]},"flag-bosnia--herzegovina":{"a":"Flag: Bosnia & Herzegovina","b":"1F1E7-1F1E6","j":["bosnia","flag_bosnia_herzegovina","flag","herzegovina","banner","country","nation"]},"flag-barbados":{"a":"Flag: Barbados","b":"1F1E7-1F1E7","j":["bb","flag","banner","country","nation"]},"flag-bangladesh":{"a":"Flag: Bangladesh","b":"1F1E7-1F1E9","j":["bd","flag","banner","country","nation"]},"flag-belgium":{"a":"Flag: Belgium","b":"1F1E7-1F1EA","j":["country","flag","banner","be","nation"]},"flag-burkina-faso":{"a":"Flag: Burkina Faso","b":"1F1E7-1F1EB","j":["flag","burkina","banner","faso","country","nation"]},"flag-bulgaria":{"a":"Flag: Bulgaria","b":"1F1E7-1F1EC","j":["flag","banner","bg","country","nation"]},"flag-bahrain":{"a":"Flag: Bahrain","b":"1F1E7-1F1ED","j":["bh","flag","banner","country","nation"]},"flag-burundi":{"a":"Flag: Burundi","b":"1F1E7-1F1EE","j":["flag","banner","bi","country","nation"]},"flag-benin":{"a":"Flag: Benin","b":"1F1E7-1F1EF","j":["country","flag","banner","bj","nation"]},"flag-st-barthlemy":{"a":"Flag: St. Barthélemy","b":"1F1E7-1F1F1","j":["flag_st_barthelemy","saint","flag","banner","country","barthélemy","nation"]},"flag-bermuda":{"a":"Flag: Bermuda","b":"1F1E7-1F1F2","j":["bm","flag","banner","country","nation"]},"flag-brunei":{"a":"Flag: Brunei","b":"1F1E7-1F1F3","j":["darussalam","bn","flag","banner","country","nation"]},"flag-bolivia":{"a":"Flag: Bolivia","b":"1F1E7-1F1F4","j":["country","flag","banner","bo","nation"]},"flag-caribbean-netherlands":{"a":"Flag: Caribbean Netherlands","b":"1F1E7-1F1F6","j":["flag","banner","country","bonaire","nation"]},"flag-brazil":{"a":"Flag: Brazil","b":"1F1E7-1F1F7","j":["flag","banner","br","country","nation"]},"flag-bahamas":{"a":"Flag: Bahamas","b":"1F1E7-1F1F8","j":["bs","flag","banner","country","nation"]},"flag-bhutan":{"a":"Flag: Bhutan","b":"1F1E7-1F1F9","j":["bt","flag","banner","country","nation"]},"flag-bouvet-island":{"a":"Flag: Bouvet Island","b":"1F1E7-1F1FB","j":["flag","norway"]},"flag-botswana":{"a":"Flag: Botswana","b":"1F1E7-1F1FC","j":["flag","bw","banner","country","nation"]},"flag-belarus":{"a":"Flag: Belarus","b":"1F1E7-1F1FE","j":["country","flag","banner","by","nation"]},"flag-belize":{"a":"Flag: Belize","b":"1F1E7-1F1FF","j":["flag","banner","bz","country","nation"]},"flag-canada":{"a":"Flag: Canada","b":"1F1E8-1F1E6","j":["ca","flag","banner","country","nation"]},"flag-cocos-keeling-islands":{"a":"Flag: Cocos (Keeling) Islands","b":"1F1E8-1F1E8","j":["islands","cocos","flag","keeling","banner","flag_cocos_islands","country","nation"]},"flag-congo--kinshasa":{"a":"Flag: Congo - Kinshasa","b":"1F1E8-1F1E9","j":["democratic","congo","flag","banner","flag_congo_kinshasa","republic","country","nation"]},"flag-central-african-republic":{"a":"Flag: Central African Republic","b":"1F1E8-1F1EB","j":["african","central","flag","banner","republic","country","nation"]},"flag-congo--brazzaville":{"a":"Flag: Congo - Brazzaville","b":"1F1E8-1F1EC","j":["flag_congo_brazzaville","congo","flag","banner","country","nation"]},"flag-switzerland":{"a":"Flag: Switzerland","b":"1F1E8-1F1ED","j":["ch","flag","banner","country","nation"]},"flag-cte-divoire":{"a":"Flag: Côte D’Ivoire","b":"1F1E8-1F1EE","j":["flag","flag_cote_d_ivoire","banner","ivory","coast","country","nation"]},"flag-cook-islands":{"a":"Flag: Cook Islands","b":"1F1E8-1F1F0","j":["islands","cook","flag","banner","country","nation"]},"flag-chile":{"a":"Flag: Chile","b":"1F1E8-1F1F1","j":["flag","country","banner","nation"]},"flag-cameroon":{"a":"Flag: Cameroon","b":"1F1E8-1F1F2","j":["cm","flag","banner","country","nation"]},"flag-china":{"a":"Flag: China","b":"1F1E8-1F1F3","j":["china","flag","chinese","banner","country","prc","nation"]},"flag-colombia":{"a":"Flag: Colombia","b":"1F1E8-1F1F4","j":["co","flag","banner","country","nation"]},"flag-clipperton-island":{"a":"Flag: Clipperton Island","b":"1F1E8-1F1F5","j":["flag"]},"flag-costa-rica":{"a":"Flag: Costa Rica","b":"1F1E8-1F1F7","j":["rica","costa","flag","banner","country","nation"]},"flag-cuba":{"a":"Flag: Cuba","b":"1F1E8-1F1FA","j":["cu","flag","banner","country","nation"]},"flag-cape-verde":{"a":"Flag: Cape Verde","b":"1F1E8-1F1FB","j":["cabo","flag","banner","verde","country","nation"]},"flag-curaao":{"a":"Flag: Curaçao","b":"1F1E8-1F1FC","j":["flag_curacao","curaçao","flag","banner","country","nation"]},"flag-christmas-island":{"a":"Flag: Christmas Island","b":"1F1E8-1F1FD","j":["christmas","flag","banner","country","island","nation"]},"flag-cyprus":{"a":"Flag: Cyprus","b":"1F1E8-1F1FE","j":["flag","banner","country","nation","cy"]},"flag-czechia":{"a":"Flag: Czechia","b":"1F1E8-1F1FF","j":["cz","flag","banner","country","nation"]},"flag-germany":{"a":"Flag: Germany","b":"1F1E9-1F1EA","j":["country","flag","banner","german","nation"]},"flag-diego-garcia":{"a":"Flag: Diego Garcia","b":"1F1E9-1F1EC","j":["flag"]},"flag-djibouti":{"a":"Flag: Djibouti","b":"1F1E9-1F1EF","j":["dj","flag","banner","country","nation"]},"flag-denmark":{"a":"Flag: Denmark","b":"1F1E9-1F1F0","j":["flag","banner","dk","country","nation"]},"flag-dominica":{"a":"Flag: Dominica","b":"1F1E9-1F1F2","j":["flag","dm","banner","country","nation"]},"flag-dominican-republic":{"a":"Flag: Dominican Republic","b":"1F1E9-1F1F4","j":["flag","banner","republic","country","dominican","nation"]},"flag-algeria":{"a":"Flag: Algeria","b":"1F1E9-1F1FF","j":["flag","banner","dz","country","nation"]},"flag-ceuta--melilla":{"a":"Flag: Ceuta & Melilla","b":"1F1EA-1F1E6","j":["flag_ceuta_melilla","flag"]},"flag-ecuador":{"a":"Flag: Ecuador","b":"1F1EA-1F1E8","j":["nation","flag","banner","country","ec"]},"flag-estonia":{"a":"Flag: Estonia","b":"1F1EA-1F1EA","j":["ee","flag","banner","country","nation"]},"flag-egypt":{"a":"Flag: Egypt","b":"1F1EA-1F1EC","j":["flag","eg","banner","country","nation"]},"flag-western-sahara":{"a":"Flag: Western Sahara","b":"1F1EA-1F1ED","j":["sahara","flag","western","banner","country","nation"]},"flag-eritrea":{"a":"Flag: Eritrea","b":"1F1EA-1F1F7","j":["flag","banner","country","nation","er"]},"flag-spain":{"a":"Flag: Spain","b":"1F1EA-1F1F8","j":["spain","flag","banner","country","nation"]},"flag-ethiopia":{"a":"Flag: Ethiopia","b":"1F1EA-1F1F9","j":["et","flag","banner","country","nation"]},"flag-european-union":{"a":"Flag: European Union","b":"1F1EA-1F1FA","j":["european","flag","banner","union"]},"flag-finland":{"a":"Flag: Finland","b":"1F1EB-1F1EE","j":["flag","banner","fi","country","nation"]},"flag-fiji":{"a":"Flag: Fiji","b":"1F1EB-1F1EF","j":["flag","banner","fj","country","nation"]},"flag-falkland-islands":{"a":"Flag: Falkland Islands","b":"1F1EB-1F1F0","j":["islands","falkland","flag","banner","malvinas","country","nation"]},"flag-micronesia":{"a":"Flag: Micronesia","b":"1F1EB-1F1F2","j":["federated","country","states","flag","banner","micronesia","nation"]},"flag-faroe-islands":{"a":"Flag: Faroe Islands","b":"1F1EB-1F1F4","j":["faroe","islands","flag","banner","country","nation"]},"flag-france":{"a":"Flag: France","b":"1F1EB-1F1F7","j":["flag","banner","french","france","country","nation"]},"flag-gabon":{"a":"Flag: Gabon","b":"1F1EC-1F1E6","j":["flag","ga","banner","country","nation"]},"flag-united-kingdom":{"a":"Flag: United Kingdom","b":"1F1EC-1F1E7","j":["northern","great","british","UK","english","kingdom","united","flag","banner","england","britain","ireland","country","union jack","nation"]},"flag-grenada":{"a":"Flag: Grenada","b":"1F1EC-1F1E9","j":["gd","flag","banner","country","nation"]},"flag-georgia":{"a":"Flag: Georgia","b":"1F1EC-1F1EA","j":["ge","flag","banner","country","nation"]},"flag-french-guiana":{"a":"Flag: French Guiana","b":"1F1EC-1F1EB","j":["guiana","flag","banner","french","country","nation"]},"flag-guernsey":{"a":"Flag: Guernsey","b":"1F1EC-1F1EC","j":["gg","flag","banner","country","nation"]},"flag-ghana":{"a":"Flag: Ghana","b":"1F1EC-1F1ED","j":["gh","flag","banner","country","nation"]},"flag-gibraltar":{"a":"Flag: Gibraltar","b":"1F1EC-1F1EE","j":["flag","banner","country","nation","gi"]},"flag-greenland":{"a":"Flag: Greenland","b":"1F1EC-1F1F1","j":["gl","flag","banner","country","nation"]},"flag-gambia":{"a":"Flag: Gambia","b":"1F1EC-1F1F2","j":["gm","flag","banner","country","nation"]},"flag-guinea":{"a":"Flag: Guinea","b":"1F1EC-1F1F3","j":["gn","flag","banner","country","nation"]},"flag-guadeloupe":{"a":"Flag: Guadeloupe","b":"1F1EC-1F1F5","j":["gp","flag","banner","country","nation"]},"flag-equatorial-guinea":{"a":"Flag: Equatorial Guinea","b":"1F1EC-1F1F6","j":["equatorial","gn","flag","banner","country","nation"]},"flag-greece":{"a":"Flag: Greece","b":"1F1EC-1F1F7","j":["gr","flag","banner","country","nation"]},"flag-south-georgia--south-sandwich-islands":{"a":"Flag: South Georgia & South Sandwich Islands","b":"1F1EC-1F1F8","j":["georgia","islands","south","flag_south_georgia_south_sandwich_islands","flag","sandwich","banner","country","nation"]},"flag-guatemala":{"a":"Flag: Guatemala","b":"1F1EC-1F1F9","j":["flag","gt","banner","country","nation"]},"flag-guam":{"a":"Flag: Guam","b":"1F1EC-1F1FA","j":["gu","flag","banner","country","nation"]},"flag-guineabissau":{"a":"Flag: Guinea-Bissau","b":"1F1EC-1F1FC","j":["bissau","nation","gw","flag","banner","country","flag_guinea_bissau"]},"flag-guyana":{"a":"Flag: Guyana","b":"1F1EC-1F1FE","j":["gy","flag","banner","country","nation"]},"flag-hong-kong-sar-china":{"a":"Flag: Hong Kong Sar China","b":"1F1ED-1F1F0","j":["flag","banner","hong","kong","country","nation"]},"flag-heard--mcdonald-islands":{"a":"Flag: Heard & Mcdonald Islands","b":"1F1ED-1F1F2","j":["flag","flag_heard_mcdonald_islands"]},"flag-honduras":{"a":"Flag: Honduras","b":"1F1ED-1F1F3","j":["country","flag","banner","hn","nation"]},"flag-croatia":{"a":"Flag: Croatia","b":"1F1ED-1F1F7","j":["flag","banner","hr","country","nation"]},"flag-haiti":{"a":"Flag: Haiti","b":"1F1ED-1F1F9","j":["ht","flag","banner","country","nation"]},"flag-hungary":{"a":"Flag: Hungary","b":"1F1ED-1F1FA","j":["flag","banner","hu","country","nation"]},"flag-canary-islands":{"a":"Flag: Canary Islands","b":"1F1EE-1F1E8","j":["islands","canary","flag","banner","country","nation"]},"flag-indonesia":{"a":"Flag: Indonesia","b":"1F1EE-1F1E9","j":["flag","country","banner","nation"]},"flag-ireland":{"a":"Flag: Ireland","b":"1F1EE-1F1EA","j":["ie","flag","banner","country","nation"]},"flag-israel":{"a":"Flag: Israel","b":"1F1EE-1F1F1","j":["il","flag","banner","country","nation"]},"flag-isle-of-man":{"a":"Flag: Isle of Man","b":"1F1EE-1F1F2","j":["man","isle","flag","banner","country","nation"]},"flag-india":{"a":"Flag: India","b":"1F1EE-1F1F3","j":["country","flag","banner","in","nation"]},"flag-british-indian-ocean-territory":{"a":"Flag: British Indian Ocean Territory","b":"1F1EE-1F1F4","j":["british","ocean","flag","banner","territory","indian","country","nation"]},"flag-iraq":{"a":"Flag: Iraq","b":"1F1EE-1F1F6","j":["iq","flag","banner","country","nation"]},"flag-iran":{"a":"Flag: Iran","b":"1F1EE-1F1F7","j":["iran","islamic","flag","banner","republic","country","nation"]},"flag-iceland":{"a":"Flag: Iceland","b":"1F1EE-1F1F8","j":["flag","banner","country","is","nation"]},"flag-italy":{"a":"Flag: Italy","b":"1F1EE-1F1F9","j":["italy","flag","banner","country","nation"]},"flag-jersey":{"a":"Flag: Jersey","b":"1F1EF-1F1EA","j":["je","flag","banner","country","nation"]},"flag-jamaica":{"a":"Flag: Jamaica","b":"1F1EF-1F1F2","j":["flag","banner","jm","country","nation"]},"flag-jordan":{"a":"Flag: Jordan","b":"1F1EF-1F1F4","j":["jo","flag","banner","country","nation"]},"flag-japan":{"a":"Flag: Japan","b":"1F1EF-1F1F5","j":["flag","banner","japanese","country","nation"]},"flag-kenya":{"a":"Flag: Kenya","b":"1F1F0-1F1EA","j":["flag","banner","ke","country","nation"]},"flag-kyrgyzstan":{"a":"Flag: Kyrgyzstan","b":"1F1F0-1F1EC","j":["kg","flag","banner","country","nation"]},"flag-cambodia":{"a":"Flag: Cambodia","b":"1F1F0-1F1ED","j":["kh","flag","banner","country","nation"]},"flag-kiribati":{"a":"Flag: Kiribati","b":"1F1F0-1F1EE","j":["ki","flag","banner","country","nation"]},"flag-comoros":{"a":"Flag: Comoros","b":"1F1F0-1F1F2","j":["km","flag","banner","country","nation"]},"flag-st-kitts--nevis":{"a":"Flag: St. Kitts & Nevis","b":"1F1F0-1F1F3","j":["nation","nevis","flag","kitts","flag_st_kitts_nevis","banner","country","saint"]},"flag-north-korea":{"a":"Flag: North Korea","b":"1F1F0-1F1F5","j":["north","flag","banner","korea","country","nation"]},"flag-south-korea":{"a":"Flag: South Korea","b":"1F1F0-1F1F7","j":["south","flag","banner","korea","country","nation"]},"flag-kuwait":{"a":"Flag: Kuwait","b":"1F1F0-1F1FC","j":["kw","flag","banner","country","nation"]},"flag-cayman-islands":{"a":"Flag: Cayman Islands","b":"1F1F0-1F1FE","j":["islands","flag","banner","cayman","country","nation"]},"flag-kazakhstan":{"a":"Flag: Kazakhstan","b":"1F1F0-1F1FF","j":["kz","flag","banner","country","nation"]},"flag-laos":{"a":"Flag: Laos","b":"1F1F1-1F1E6","j":["democratic","flag","banner","lao","republic","country","nation"]},"flag-lebanon":{"a":"Flag: Lebanon","b":"1F1F1-1F1E7","j":["lb","flag","banner","country","nation"]},"flag-st-lucia":{"a":"Flag: St. Lucia","b":"1F1F1-1F1E8","j":["nation","saint","flag","banner","country","lucia"]},"flag-liechtenstein":{"a":"Flag: Liechtenstein","b":"1F1F1-1F1EE","j":["flag","li","banner","country","nation"]},"flag-sri-lanka":{"a":"Flag: Sri Lanka","b":"1F1F1-1F1F0","j":["lanka","sri","flag","banner","country","nation"]},"flag-liberia":{"a":"Flag: Liberia","b":"1F1F1-1F1F7","j":["flag","lr","banner","country","nation"]},"flag-lesotho":{"a":"Flag: Lesotho","b":"1F1F1-1F1F8","j":["ls","flag","banner","country","nation"]},"flag-lithuania":{"a":"Flag: Lithuania","b":"1F1F1-1F1F9","j":["flag","banner","country","nation","lt"]},"flag-luxembourg":{"a":"Flag: Luxembourg","b":"1F1F1-1F1FA","j":["lu","flag","banner","country","nation"]},"flag-latvia":{"a":"Flag: Latvia","b":"1F1F1-1F1FB","j":["flag","banner","lv","country","nation"]},"flag-libya":{"a":"Flag: Libya","b":"1F1F1-1F1FE","j":["ly","flag","banner","country","nation"]},"flag-morocco":{"a":"Flag: Morocco","b":"1F1F2-1F1E6","j":["ma","flag","banner","country","nation"]},"flag-monaco":{"a":"Flag: Monaco","b":"1F1F2-1F1E8","j":["mc","flag","banner","country","nation"]},"flag-moldova":{"a":"Flag: Moldova","b":"1F1F2-1F1E9","j":["flag","banner","republic","country","moldova","nation"]},"flag-montenegro":{"a":"Flag: Montenegro","b":"1F1F2-1F1EA","j":["me","flag","banner","country","nation"]},"flag-st-martin":{"a":"Flag: St. Martin","b":"1F1F2-1F1EB","j":["flag"]},"flag-madagascar":{"a":"Flag: Madagascar","b":"1F1F2-1F1EC","j":["mg","flag","banner","country","nation"]},"flag-marshall-islands":{"a":"Flag: Marshall Islands","b":"1F1F2-1F1ED","j":["islands","marshall","flag","banner","country","nation"]},"flag-north-macedonia":{"a":"Flag: North Macedonia","b":"1F1F2-1F1F0","j":["macedonia","flag","banner","country","nation"]},"flag-mali":{"a":"Flag: Mali","b":"1F1F2-1F1F1","j":["ml","flag","banner","country","nation"]},"flag-myanmar-burma":{"a":"Flag: Myanmar (Burma)","b":"1F1F2-1F1F2","j":["mm","country","flag","banner","flag_myanmar","nation"]},"flag-mongolia":{"a":"Flag: Mongolia","b":"1F1F2-1F1F3","j":["country","flag","banner","mn","nation"]},"flag-macao-sar-china":{"a":"Flag: Macao Sar China","b":"1F1F2-1F1F4","j":["flag","banner","country","nation","macao"]},"flag-northern-mariana-islands":{"a":"Flag: Northern Mariana Islands","b":"1F1F2-1F1F5","j":["northern","islands","flag","mariana","banner","country","nation"]},"flag-martinique":{"a":"Flag: Martinique","b":"1F1F2-1F1F6","j":["mq","flag","banner","country","nation"]},"flag-mauritania":{"a":"Flag: Mauritania","b":"1F1F2-1F1F7","j":["flag","banner","mr","country","nation"]},"flag-montserrat":{"a":"Flag: Montserrat","b":"1F1F2-1F1F8","j":["flag","banner","ms","country","nation"]},"flag-malta":{"a":"Flag: Malta","b":"1F1F2-1F1F9","j":["mt","flag","banner","country","nation"]},"flag-mauritius":{"a":"Flag: Mauritius","b":"1F1F2-1F1FA","j":["mu","flag","banner","country","nation"]},"flag-maldives":{"a":"Flag: Maldives","b":"1F1F2-1F1FB","j":["flag","banner","mv","country","nation"]},"flag-malawi":{"a":"Flag: Malawi","b":"1F1F2-1F1FC","j":["mw","flag","banner","country","nation"]},"flag-mexico":{"a":"Flag: Mexico","b":"1F1F2-1F1FD","j":["mx","flag","banner","country","nation"]},"flag-malaysia":{"a":"Flag: Malaysia","b":"1F1F2-1F1FE","j":["flag","my","banner","country","nation"]},"flag-mozambique":{"a":"Flag: Mozambique","b":"1F1F2-1F1FF","j":["flag","banner","mz","country","nation"]},"flag-namibia":{"a":"Flag: Namibia","b":"1F1F3-1F1E6","j":["na","flag","banner","country","nation"]},"flag-new-caledonia":{"a":"Flag: New Caledonia","b":"1F1F3-1F1E8","j":["country","flag","banner","caledonia","nation","new"]},"flag-niger":{"a":"Flag: Niger","b":"1F1F3-1F1EA","j":["flag","banner","ne","country","nation"]},"flag-norfolk-island":{"a":"Flag: Norfolk Island","b":"1F1F3-1F1EB","j":["norfolk","flag","banner","country","island","nation"]},"flag-nigeria":{"a":"Flag: Nigeria","b":"1F1F3-1F1EC","j":["flag","country","banner","nation"]},"flag-nicaragua":{"a":"Flag: Nicaragua","b":"1F1F3-1F1EE","j":["flag","banner","country","nation","ni"]},"flag-netherlands":{"a":"Flag: Netherlands","b":"1F1F3-1F1F1","j":["flag","banner","nl","country","nation"]},"flag-norway":{"a":"Flag: Norway","b":"1F1F3-1F1F4","j":["no","flag","banner","country","nation"]},"flag-nepal":{"a":"Flag: Nepal","b":"1F1F3-1F1F5","j":["flag","np","banner","country","nation"]},"flag-nauru":{"a":"Flag: Nauru","b":"1F1F3-1F1F7","j":["nr","flag","banner","country","nation"]},"flag-niue":{"a":"Flag: Niue","b":"1F1F3-1F1FA","j":["nu","flag","banner","country","nation"]},"flag-new-zealand":{"a":"Flag: New Zealand","b":"1F1F3-1F1FF","j":["flag","banner","country","zealand","nation","new"]},"flag-oman":{"a":"Flag: Oman","b":"1F1F4-1F1F2","j":["om_symbol","flag","banner","country","nation"]},"flag-panama":{"a":"Flag: Panama","b":"1F1F5-1F1E6","j":["flag","banner","country","nation","pa"]},"flag-peru":{"a":"Flag: Peru","b":"1F1F5-1F1EA","j":["flag","banner","pe","country","nation"]},"flag-french-polynesia":{"a":"Flag: French Polynesia","b":"1F1F5-1F1EB","j":["flag","banner","french","country","nation","polynesia"]},"flag-papua-new-guinea":{"a":"Flag: Papua New Guinea","b":"1F1F5-1F1EC","j":["flag","banner","guinea","country","nation","papua","new"]},"flag-philippines":{"a":"Flag: Philippines","b":"1F1F5-1F1ED","j":["ph","flag","banner","country","nation"]},"flag-pakistan":{"a":"Flag: Pakistan","b":"1F1F5-1F1F0","j":["pk","flag","banner","country","nation"]},"flag-poland":{"a":"Flag: Poland","b":"1F1F5-1F1F1","j":["flag","pl","banner","country","nation"]},"flag-st-pierre--miquelon":{"a":"Flag: St. Pierre & Miquelon","b":"1F1F5-1F1F2","j":["pierre","nation","flag_st_pierre_miquelon","flag","miquelon","banner","country","saint"]},"flag-pitcairn-islands":{"a":"Flag: Pitcairn Islands","b":"1F1F5-1F1F3","j":["country","flag","banner","pitcairn","nation"]},"flag-puerto-rico":{"a":"Flag: Puerto Rico","b":"1F1F5-1F1F7","j":["flag","banner","rico","country","puerto","nation"]},"flag-palestinian-territories":{"a":"Flag: Palestinian Territories","b":"1F1F5-1F1F8","j":["palestine","nation","territories","flag","banner","country","palestinian"]},"flag-portugal":{"a":"Flag: Portugal","b":"1F1F5-1F1F9","j":["flag","pt","banner","country","nation"]},"flag-palau":{"a":"Flag: Palau","b":"1F1F5-1F1FC","j":["flag","banner","pw","country","nation"]},"flag-paraguay":{"a":"Flag: Paraguay","b":"1F1F5-1F1FE","j":["py","flag","banner","country","nation"]},"flag-qatar":{"a":"Flag: Qatar","b":"1F1F6-1F1E6","j":["flag","qa","banner","country","nation"]},"flag-runion":{"a":"Flag: Réunion","b":"1F1F7-1F1EA","j":["flag_reunion","réunion","flag","banner","country","nation"]},"flag-romania":{"a":"Flag: Romania","b":"1F1F7-1F1F4","j":["ro","flag","banner","country","nation"]},"flag-serbia":{"a":"Flag: Serbia","b":"1F1F7-1F1F8","j":["flag","banner","rs","country","nation"]},"flag-russia":{"a":"Flag: Russia","b":"1F1F7-1F1FA","j":["russian","federation","flag","banner","country","nation"]},"flag-rwanda":{"a":"Flag: Rwanda","b":"1F1F7-1F1FC","j":["rw","flag","banner","country","nation"]},"flag-saudi-arabia":{"a":"Flag: Saudi Arabia","b":"1F1F8-1F1E6","j":["flag","country","banner","nation"]},"flag-solomon-islands":{"a":"Flag: Solomon Islands","b":"1F1F8-1F1E7","j":["islands","flag","banner","country","nation","solomon"]},"flag-seychelles":{"a":"Flag: Seychelles","b":"1F1F8-1F1E8","j":["flag","banner","sc","country","nation"]},"flag-sudan":{"a":"Flag: Sudan","b":"1F1F8-1F1E9","j":["sd","flag","banner","country","nation"]},"flag-sweden":{"a":"Flag: Sweden","b":"1F1F8-1F1EA","j":["flag","banner","country","nation","se"]},"flag-singapore":{"a":"Flag: Singapore","b":"1F1F8-1F1EC","j":["flag","banner","sg","country","nation"]},"flag-st-helena":{"a":"Flag: St. Helena","b":"1F1F8-1F1ED","j":["cunha","saint","flag","tristan","banner","helena","ascension","country","nation"]},"flag-slovenia":{"a":"Flag: Slovenia","b":"1F1F8-1F1EE","j":["flag","si","banner","country","nation"]},"flag-svalbard--jan-mayen":{"a":"Flag: Svalbard & Jan Mayen","b":"1F1F8-1F1EF","j":["flag_svalbard_jan_mayen","flag"]},"flag-slovakia":{"a":"Flag: Slovakia","b":"1F1F8-1F1F0","j":["flag","sk","banner","country","nation"]},"flag-sierra-leone":{"a":"Flag: Sierra Leone","b":"1F1F8-1F1F1","j":["sierra","leone","flag","banner","country","nation"]},"flag-san-marino":{"a":"Flag: San Marino","b":"1F1F8-1F1F2","j":["san","marino","flag","banner","country","nation"]},"flag-senegal":{"a":"Flag: Senegal","b":"1F1F8-1F1F3","j":["sn","flag","banner","country","nation"]},"flag-somalia":{"a":"Flag: Somalia","b":"1F1F8-1F1F4","j":["flag","banner","so","country","nation"]},"flag-suriname":{"a":"Flag: Suriname","b":"1F1F8-1F1F7","j":["sr","flag","banner","country","nation"]},"flag-south-sudan":{"a":"Flag: South Sudan","b":"1F1F8-1F1F8","j":["sd","south","flag","banner","country","nation"]},"flag-so-tom--prncipe":{"a":"Flag: São Tomé & Príncipe","b":"1F1F8-1F1F9","j":["principe","tome","flag","flag_sao_tome_principe","banner","country","nation","sao"]},"flag-el-salvador":{"a":"Flag: El Salvador","b":"1F1F8-1F1FB","j":["el","flag","banner","salvador","country","nation"]},"flag-sint-maarten":{"a":"Flag: Sint Maarten","b":"1F1F8-1F1FD","j":["maarten","sint","dutch","flag","banner","country","nation"]},"flag-syria":{"a":"Flag: Syria","b":"1F1F8-1F1FE","j":["syrian","flag","banner","arab","republic","country","nation"]},"flag-eswatini":{"a":"Flag: Eswatini","b":"1F1F8-1F1FF","j":["sz","flag","banner","country","nation"]},"flag-tristan-da-cunha":{"a":"Flag: Tristan Da Cunha","b":"1F1F9-1F1E6","j":["flag"]},"flag-turks--caicos-islands":{"a":"Flag: Turks & Caicos Islands","b":"1F1F9-1F1E8","j":["islands","turks","flag","flag_turks_caicos_islands","banner","caicos","country","nation"]},"flag-chad":{"a":"Flag: Chad","b":"1F1F9-1F1E9","j":["td","flag","banner","country","nation"]},"flag-french-southern-territories":{"a":"Flag: French Southern Territories","b":"1F1F9-1F1EB","j":["territories","southern","flag","banner","french","country","nation"]},"flag-togo":{"a":"Flag: Togo","b":"1F1F9-1F1EC","j":["tg","flag","banner","country","nation"]},"flag-thailand":{"a":"Flag: Thailand","b":"1F1F9-1F1ED","j":["flag","banner","th","country","nation"]},"flag-tajikistan":{"a":"Flag: Tajikistan","b":"1F1F9-1F1EF","j":["tj","flag","banner","country","nation"]},"flag-tokelau":{"a":"Flag: Tokelau","b":"1F1F9-1F1F0","j":["tk","flag","banner","country","nation"]},"flag-timorleste":{"a":"Flag: Timor-Leste","b":"1F1F9-1F1F1","j":["timor","flag_timor_leste","flag","banner","leste","country","nation"]},"flag-turkmenistan":{"a":"Flag: Turkmenistan","b":"1F1F9-1F1F2","j":["flag","country","banner","nation"]},"flag-tunisia":{"a":"Flag: Tunisia","b":"1F1F9-1F1F3","j":["tn","flag","banner","country","nation"]},"flag-tonga":{"a":"Flag: Tonga","b":"1F1F9-1F1F4","j":["to","flag","banner","country","nation"]},"flag-turkey":{"a":"Flag: Turkey","b":"1F1F9-1F1F7","j":["turkey","flag","banner","country","nation"]},"flag-trinidad--tobago":{"a":"Flag: Trinidad & Tobago","b":"1F1F9-1F1F9","j":["flag_trinidad_tobago","flag","banner","trinidad","tobago","country","nation"]},"flag-tuvalu":{"a":"Flag: Tuvalu","b":"1F1F9-1F1FB","j":["flag","country","banner","nation"]},"flag-taiwan":{"a":"Flag: Taiwan","b":"1F1F9-1F1FC","j":["tw","flag","banner","country","nation"]},"flag-tanzania":{"a":"Flag: Tanzania","b":"1F1F9-1F1FF","j":["tanzania","united","flag","banner","republic","country","nation"]},"flag-ukraine":{"a":"Flag: Ukraine","b":"1F1FA-1F1E6","j":["flag","banner","country","nation","ua"]},"flag-uganda":{"a":"Flag: Uganda","b":"1F1FA-1F1EC","j":["ug","flag","banner","country","nation"]},"flag-us-outlying-islands":{"a":"Flag: U.S. Outlying Islands","b":"1F1FA-1F1F2","j":["flag","flag_u_s_outlying_islands"]},"flag-united-nations":{"a":"Flag: United Nations","b":"1F1FA-1F1F3","j":["flag","un","banner"]},"flag-united-states":{"a":"Flag: United States","b":"1F1FA-1F1F8","j":["america","united","flag","states","banner","country","nation"]},"flag-uruguay":{"a":"Flag: Uruguay","b":"1F1FA-1F1FE","j":["flag","uy","banner","country","nation"]},"flag-uzbekistan":{"a":"Flag: Uzbekistan","b":"1F1FA-1F1FF","j":["uz","flag","banner","country","nation"]},"flag-vatican-city":{"a":"Flag: Vatican City","b":"1F1FB-1F1E6","j":["vatican","city","flag","banner","country","nation"]},"flag-st-vincent--grenadines":{"a":"Flag: St. Vincent & Grenadines","b":"1F1FB-1F1E8","j":["nation","flag_st_vincent_grenadines","vincent","grenadines","flag","banner","country","saint"]},"flag-venezuela":{"a":"Flag: Venezuela","b":"1F1FB-1F1EA","j":["bolivarian","ve","flag","banner","republic","country","nation"]},"flag-british-virgin-islands":{"a":"Flag: British Virgin Islands","b":"1F1FB-1F1EC","j":["virgin","bvi","islands","british","flag","banner","country","nation"]},"flag-us-virgin-islands":{"a":"Flag: U.S. Virgin Islands","b":"1F1FB-1F1EE","j":["virgin","islands","us","flag","banner","country","nation","flag_u_s_virgin_islands"]},"flag-vietnam":{"a":"Flag: Vietnam","b":"1F1FB-1F1F3","j":["nam","flag","banner","viet","country","nation"]},"flag-vanuatu":{"a":"Flag: Vanuatu","b":"1F1FB-1F1FA","j":["flag","banner","vu","country","nation"]},"flag-wallis--futuna":{"a":"Flag: Wallis & Futuna","b":"1F1FC-1F1EB","j":["flag_wallis_futuna","flag","wallis","futuna","banner","country","nation"]},"flag-samoa":{"a":"Flag: Samoa","b":"1F1FC-1F1F8","j":["ws","flag","banner","country","nation"]},"flag-kosovo":{"a":"Flag: Kosovo","b":"1F1FD-1F1F0","j":["flag","banner","country","nation","xk"]},"flag-yemen":{"a":"Flag: Yemen","b":"1F1FE-1F1EA","j":["flag","banner","ye","country","nation"]},"flag-mayotte":{"a":"Flag: Mayotte","b":"1F1FE-1F1F9","j":["flag","banner","country","yt","nation"]},"flag-south-africa":{"a":"Flag: South Africa","b":"1F1FF-1F1E6","j":["south","africa","flag","banner","country","nation"]},"flag-zambia":{"a":"Flag: Zambia","b":"1F1FF-1F1F2","j":["zm","flag","banner","country","nation"]},"flag-zimbabwe":{"a":"Flag: Zimbabwe","b":"1F1FF-1F1FC","j":["zw","flag","banner","country","nation"]},"flag-england":{"a":"Flag: England","b":"1F3F4-E0067-E0062-E0065-E006E-E0067-E007F","j":["flag","english"]},"flag-scotland":{"a":"Flag: Scotland","b":"1F3F4-E0067-E0062-E0073-E0063-E0074-E007F","j":["scottish","flag"]},"flag-wales":{"a":"Flag: Wales","b":"1F3F4-E0067-E0062-E0077-E006C-E0073-E007F","j":["flag","welsh"]}},"aliases":{}}
\ No newline at end of file
+{"compressed":true,"categories":[{"id":"smileys_&_emotion","name":"Smileys & Emotion","emojis":["grinning-face","grinning-face-with-big-eyes","grinning-face-with-smiling-eyes","beaming-face-with-smiling-eyes","grinning-squinting-face","grinning-face-with-sweat","rolling-on-the-floor-laughing","face-with-tears-of-joy","slightly-smiling-face","upsidedown-face","winking-face","smiling-face-with-smiling-eyes","smiling-face-with-halo","smiling-face-with-hearts","smiling-face-with-hearteyes","starstruck","face-blowing-a-kiss","kissing-face","smiling-face","kissing-face-with-closed-eyes","kissing-face-with-smiling-eyes","smiling-face-with-tear","face-savoring-food","face-with-tongue","winking-face-with-tongue","zany-face","squinting-face-with-tongue","moneymouth-face","hugging-face","face-with-hand-over-mouth","shushing-face","thinking-face","zippermouth-face","face-with-raised-eyebrow","neutral-face","expressionless-face","face-without-mouth","face-in-clouds","smirking-face","unamused-face","face-with-rolling-eyes","grimacing-face","face-exhaling","lying-face","relieved-face","pensive-face","sleepy-face","drooling-face","sleeping-face","face-with-medical-mask","face-with-thermometer","face-with-headbandage","nauseated-face","face-vomiting","sneezing-face","hot-face","cold-face","woozy-face","knockedout-face","face-with-spiral-eyes","exploding-head","cowboy-hat-face","partying-face","disguised-face","smiling-face-with-sunglasses","nerd-face","face-with-monocle","confused-face","worried-face","slightly-frowning-face","frowning-face","face-with-open-mouth","hushed-face","astonished-face","flushed-face","pleading-face","frowning-face-with-open-mouth","anguished-face","fearful-face","anxious-face-with-sweat","sad-but-relieved-face","crying-face","loudly-crying-face","face-screaming-in-fear","confounded-face","persevering-face","disappointed-face","downcast-face-with-sweat","weary-face","tired-face","yawning-face","face-with-steam-from-nose","pouting-face","angry-face","face-with-symbols-on-mouth","smiling-face-with-horns","angry-face-with-horns","skull","skull-and-crossbones","pile-of-poo","clown-face","ogre","goblin","ghost","alien","alien-monster","robot","grinning-cat","grinning-cat-with-smiling-eyes","cat-with-tears-of-joy","smiling-cat-with-hearteyes","cat-with-wry-smile","kissing-cat","weary-cat","crying-cat","pouting-cat","seenoevil-monkey","hearnoevil-monkey","speaknoevil-monkey","kiss-mark","love-letter","heart-with-arrow","heart-with-ribbon","sparkling-heart","growing-heart","beating-heart","revolving-hearts","two-hearts","heart-decoration","heart-exclamation","broken-heart","heart-on-fire","mending-heart","red-heart","orange-heart","yellow-heart","green-heart","blue-heart","purple-heart","brown-heart","black-heart","white-heart","hundred-points","anger-symbol","collision","dizzy","sweat-droplets","dashing-away","hole","bomb","speech-balloon","eye-in-speech-bubble","left-speech-bubble","right-anger-bubble","thought-balloon","zzz"]},{"id":"people_&_body","name":"People & Body","emojis":["waving-hand","raised-back-of-hand","hand-with-fingers-splayed","raised-hand","vulcan-salute","ok-hand","pinched-fingers","pinching-hand","victory-hand","crossed-fingers","loveyou-gesture","sign-of-the-horns","call-me-hand","backhand-index-pointing-left","backhand-index-pointing-right","backhand-index-pointing-up","middle-finger","backhand-index-pointing-down","index-pointing-up","thumbs-up","thumbs-down","raised-fist","oncoming-fist","leftfacing-fist","rightfacing-fist","clapping-hands","raising-hands","open-hands","palms-up-together","handshake","folded-hands","writing-hand","nail-polish","selfie","flexed-biceps","mechanical-arm","mechanical-leg","leg","foot","ear","ear-with-hearing-aid","nose","brain","anatomical-heart","lungs","tooth","bone","eyes","eye","tongue","mouth","baby","child","boy","girl","person","person-blond-hair","man","person-beard","man-beard","woman-beard","man-red-hair","man-curly-hair","man-white-hair","man-bald","woman","woman-red-hair","person-red-hair","woman-curly-hair","person-curly-hair","woman-white-hair","person-white-hair","woman-bald","person-bald","woman-blond-hair","man-blond-hair","older-person","old-man","old-woman","person-frowning","man-frowning","woman-frowning","person-pouting","man-pouting","woman-pouting","person-gesturing-no","man-gesturing-no","woman-gesturing-no","person-gesturing-ok","man-gesturing-ok","woman-gesturing-ok","person-tipping-hand","man-tipping-hand","woman-tipping-hand","person-raising-hand","man-raising-hand","woman-raising-hand","deaf-person","deaf-man","deaf-woman","person-bowing","man-bowing","woman-bowing","person-facepalming","man-facepalming","woman-facepalming","person-shrugging","man-shrugging","woman-shrugging","health-worker","man-health-worker","woman-health-worker","student","man-student","woman-student","teacher","man-teacher","woman-teacher","judge","man-judge","woman-judge","farmer","man-farmer","woman-farmer","cook","man-cook","woman-cook","mechanic","man-mechanic","woman-mechanic","factory-worker","man-factory-worker","woman-factory-worker","office-worker","man-office-worker","woman-office-worker","scientist","man-scientist","woman-scientist","technologist","man-technologist","woman-technologist","singer","man-singer","woman-singer","artist","man-artist","woman-artist","pilot","man-pilot","woman-pilot","astronaut","man-astronaut","woman-astronaut","firefighter","man-firefighter","woman-firefighter","police-officer","man-police-officer","woman-police-officer","detective","man-detective","woman-detective","guard","man-guard","woman-guard","ninja","construction-worker","man-construction-worker","woman-construction-worker","prince","princess","person-wearing-turban","man-wearing-turban","woman-wearing-turban","person-with-skullcap","woman-with-headscarf","person-in-tuxedo","man-in-tuxedo","woman-in-tuxedo","person-with-veil","man-with-veil","woman-with-veil","pregnant-woman","breastfeeding","woman-feeding-baby","man-feeding-baby","person-feeding-baby","baby-angel","santa-claus","mrs-claus","mx-claus","superhero","man-superhero","woman-superhero","supervillain","man-supervillain","woman-supervillain","mage","man-mage","woman-mage","fairy","man-fairy","woman-fairy","vampire","man-vampire","woman-vampire","merperson","merman","mermaid","elf","man-elf","woman-elf","genie","man-genie","woman-genie","zombie","man-zombie","woman-zombie","person-getting-massage","man-getting-massage","woman-getting-massage","person-getting-haircut","man-getting-haircut","woman-getting-haircut","person-walking","man-walking","woman-walking","person-standing","man-standing","woman-standing","person-kneeling","man-kneeling","woman-kneeling","person-with-white-cane","man-with-white-cane","woman-with-white-cane","person-in-motorized-wheelchair","man-in-motorized-wheelchair","woman-in-motorized-wheelchair","person-in-manual-wheelchair","man-in-manual-wheelchair","woman-in-manual-wheelchair","person-running","man-running","woman-running","woman-dancing","man-dancing","person-in-suit-levitating","people-with-bunny-ears","men-with-bunny-ears","women-with-bunny-ears","person-in-steamy-room","man-in-steamy-room","woman-in-steamy-room","person-climbing","man-climbing","woman-climbing","person-fencing","horse-racing","skier","snowboarder","person-golfing","man-golfing","woman-golfing","person-surfing","man-surfing","woman-surfing","person-rowing-boat","man-rowing-boat","woman-rowing-boat","person-swimming","man-swimming","woman-swimming","person-bouncing-ball","man-bouncing-ball","woman-bouncing-ball","person-lifting-weights","man-lifting-weights","woman-lifting-weights","person-biking","man-biking","woman-biking","person-mountain-biking","man-mountain-biking","woman-mountain-biking","person-cartwheeling","man-cartwheeling","woman-cartwheeling","people-wrestling","men-wrestling","women-wrestling","person-playing-water-polo","man-playing-water-polo","woman-playing-water-polo","person-playing-handball","man-playing-handball","woman-playing-handball","person-juggling","man-juggling","woman-juggling","person-in-lotus-position","man-in-lotus-position","woman-in-lotus-position","person-taking-bath","person-in-bed","people-holding-hands","women-holding-hands","woman-and-man-holding-hands","men-holding-hands","kiss","kiss-woman-man","kiss-man-man","kiss-woman-woman","couple-with-heart","couple-with-heart-woman-man","couple-with-heart-man-man","couple-with-heart-woman-woman","family","family-man-woman-boy","family-man-woman-girl","family-man-woman-girl-boy","family-man-woman-boy-boy","family-man-woman-girl-girl","family-man-man-boy","family-man-man-girl","family-man-man-girl-boy","family-man-man-boy-boy","family-man-man-girl-girl","family-woman-woman-boy","family-woman-woman-girl","family-woman-woman-girl-boy","family-woman-woman-boy-boy","family-woman-woman-girl-girl","family-man-boy","family-man-boy-boy","family-man-girl","family-man-girl-boy","family-man-girl-girl","family-woman-boy","family-woman-boy-boy","family-woman-girl","family-woman-girl-boy","family-woman-girl-girl","speaking-head","bust-in-silhouette","busts-in-silhouette","people-hugging","footprints"]},{"id":"animals_&_nature","name":"Animals & Nature","emojis":["monkey-face","monkey","gorilla","orangutan","dog-face","dog","guide-dog","service-dog","poodle","wolf","fox","raccoon","cat-face","cat","black-cat","lion","tiger-face","tiger","leopard","horse-face","horse","unicorn","zebra","deer","bison","cow-face","ox","water-buffalo","cow","pig-face","pig","boar","pig-nose","ram","ewe","goat","camel","twohump-camel","llama","giraffe","elephant","mammoth","rhinoceros","hippopotamus","mouse-face","mouse","rat","hamster","rabbit-face","rabbit","chipmunk","beaver","hedgehog","bat","bear","polar-bear","koala","panda","sloth","otter","skunk","kangaroo","badger","paw-prints","turkey","chicken","rooster","hatching-chick","baby-chick","frontfacing-baby-chick","bird","penguin","dove","eagle","duck","swan","owl","dodo","feather","flamingo","peacock","parrot","frog","crocodile","turtle","lizard","snake","dragon-face","dragon","sauropod","trex","spouting-whale","whale","dolphin","seal","fish","tropical-fish","blowfish","shark","octopus","spiral-shell","snail","butterfly","bug","ant","honeybee","beetle","lady-beetle","cricket","cockroach","spider","spider-web","scorpion","mosquito","fly","worm","microbe","bouquet","cherry-blossom","white-flower","rosette","rose","wilted-flower","hibiscus","sunflower","blossom","tulip","seedling","potted-plant","evergreen-tree","deciduous-tree","palm-tree","cactus","sheaf-of-rice","herb","shamrock","four-leaf-clover","maple-leaf","fallen-leaf","leaf-fluttering-in-wind"]},{"id":"food_&_drink","name":"Food & Drink","emojis":["grapes","melon","watermelon","tangerine","lemon","banana","pineapple","mango","red-apple","green-apple","pear","peach","cherries","strawberry","blueberries","kiwi-fruit","tomato","olive","coconut","avocado","eggplant","potato","carrot","ear-of-corn","hot-pepper","bell-pepper","cucumber","leafy-green","broccoli","garlic","onion","mushroom","peanuts","chestnut","bread","croissant","baguette-bread","flatbread","pretzel","bagel","pancakes","waffle","cheese-wedge","meat-on-bone","poultry-leg","cut-of-meat","bacon","hamburger","french-fries","pizza","hot-dog","sandwich","taco","burrito","tamale","stuffed-flatbread","falafel","egg","cooking","shallow-pan-of-food","pot-of-food","fondue","bowl-with-spoon","green-salad","popcorn","butter","salt","canned-food","bento-box","rice-cracker","rice-ball","cooked-rice","curry-rice","steaming-bowl","spaghetti","roasted-sweet-potato","oden","sushi","fried-shrimp","fish-cake-with-swirl","moon-cake","dango","dumpling","fortune-cookie","takeout-box","crab","lobster","shrimp","squid","oyster","soft-ice-cream","shaved-ice","ice-cream","doughnut","cookie","birthday-cake","shortcake","cupcake","pie","chocolate-bar","candy","lollipop","custard","honey-pot","baby-bottle","glass-of-milk","hot-beverage","teapot","teacup-without-handle","sake","bottle-with-popping-cork","wine-glass","cocktail-glass","tropical-drink","beer-mug","clinking-beer-mugs","clinking-glasses","tumbler-glass","cup-with-straw","bubble-tea","beverage-box","mate","ice","chopsticks","fork-and-knife-with-plate","fork-and-knife","spoon","kitchen-knife","amphora"]},{"id":"travel_&_places","name":"Travel & Places","emojis":["globe-showing-europeafrica","globe-showing-americas","globe-showing-asiaaustralia","globe-with-meridians","world-map","map-of-japan","compass","snowcapped-mountain","mountain","volcano","mount-fuji","camping","beach-with-umbrella","desert","desert-island","national-park","stadium","classical-building","building-construction","brick","rock","wood","hut","houses","derelict-house","house","house-with-garden","office-building","japanese-post-office","post-office","hospital","bank","hotel","love-hotel","convenience-store","school","department-store","factory","japanese-castle","castle","wedding","tokyo-tower","statue-of-liberty","church","mosque","hindu-temple","synagogue","shinto-shrine","kaaba","fountain","tent","foggy","night-with-stars","cityscape","sunrise-over-mountains","sunrise","cityscape-at-dusk","sunset","bridge-at-night","hot-springs","carousel-horse","ferris-wheel","roller-coaster","barber-pole","circus-tent","locomotive","railway-car","highspeed-train","bullet-train","train","metro","light-rail","station","tram","monorail","mountain-railway","tram-car","bus","oncoming-bus","trolleybus","minibus","ambulance","fire-engine","police-car","oncoming-police-car","taxi","oncoming-taxi","automobile","oncoming-automobile","sport-utility-vehicle","pickup-truck","delivery-truck","articulated-lorry","tractor","racing-car","motorcycle","motor-scooter","manual-wheelchair","motorized-wheelchair","auto-rickshaw","bicycle","kick-scooter","skateboard","roller-skate","bus-stop","motorway","railway-track","oil-drum","fuel-pump","police-car-light","horizontal-traffic-light","vertical-traffic-light","stop-sign","construction","anchor","sailboat","canoe","speedboat","passenger-ship","ferry","motor-boat","ship","airplane","small-airplane","airplane-departure","airplane-arrival","parachute","seat","helicopter","suspension-railway","mountain-cableway","aerial-tramway","satellite","rocket","flying-saucer","bellhop-bell","luggage","hourglass-done","hourglass-not-done","watch","alarm-clock","stopwatch","timer-clock","mantelpiece-clock","twelve-oclock","twelvethirty","one-oclock","onethirty","two-oclock","twothirty","three-oclock","threethirty","four-oclock","fourthirty","five-oclock","fivethirty","six-oclock","sixthirty","seven-oclock","seventhirty","eight-oclock","eightthirty","nine-oclock","ninethirty","ten-oclock","tenthirty","eleven-oclock","eleventhirty","new-moon","waxing-crescent-moon","first-quarter-moon","waxing-gibbous-moon","full-moon","waning-gibbous-moon","last-quarter-moon","waning-crescent-moon","crescent-moon","new-moon-face","first-quarter-moon-face","last-quarter-moon-face","thermometer","sun","full-moon-face","sun-with-face","ringed-planet","star","glowing-star","shooting-star","milky-way","cloud","sun-behind-cloud","cloud-with-lightning-and-rain","sun-behind-small-cloud","sun-behind-large-cloud","sun-behind-rain-cloud","cloud-with-rain","cloud-with-snow","cloud-with-lightning","tornado","fog","wind-face","cyclone","rainbow","closed-umbrella","umbrella","umbrella-with-rain-drops","umbrella-on-ground","high-voltage","snowflake","snowman","snowman-without-snow","comet","fire","droplet","water-wave"]},{"id":"activities","name":"Activities","emojis":["jackolantern","christmas-tree","fireworks","sparkler","firecracker","sparkles","balloon","party-popper","confetti-ball","tanabata-tree","pine-decoration","japanese-dolls","carp-streamer","wind-chime","moon-viewing-ceremony","red-envelope","ribbon","wrapped-gift","reminder-ribbon","admission-tickets","ticket","military-medal","trophy","sports-medal","1st-place-medal","2nd-place-medal","3rd-place-medal","soccer-ball","baseball","softball","basketball","volleyball","american-football","rugby-football","tennis","flying-disc","bowling","cricket-game","field-hockey","ice-hockey","lacrosse","ping-pong","badminton","boxing-glove","martial-arts-uniform","goal-net","flag-in-hole","ice-skate","fishing-pole","diving-mask","running-shirt","skis","sled","curling-stone","bullseye","yoyo","kite","pool-8-ball","crystal-ball","magic-wand","nazar-amulet","video-game","joystick","slot-machine","game-die","puzzle-piece","teddy-bear","piata","nesting-dolls","spade-suit","heart-suit","diamond-suit","club-suit","chess-pawn","joker","mahjong-red-dragon","flower-playing-cards","performing-arts","framed-picture","artist-palette","thread","sewing-needle","yarn","knot"]},{"id":"objects","name":"Objects","emojis":["glasses","sunglasses","goggles","lab-coat","safety-vest","necktie","tshirt","jeans","scarf","gloves","coat","socks","dress","kimono","sari","onepiece-swimsuit","briefs","shorts","bikini","womans-clothes","purse","handbag","clutch-bag","shopping-bags","backpack","thong-sandal","mans-shoe","running-shoe","hiking-boot","flat-shoe","highheeled-shoe","womans-sandal","ballet-shoes","womans-boot","crown","womans-hat","top-hat","graduation-cap","billed-cap","military-helmet","rescue-workers-helmet","prayer-beads","lipstick","ring","gem-stone","muted-speaker","speaker-low-volume","speaker-medium-volume","speaker-high-volume","loudspeaker","megaphone","postal-horn","bell","bell-with-slash","musical-score","musical-note","musical-notes","studio-microphone","level-slider","control-knobs","microphone","headphone","radio","saxophone","accordion","guitar","musical-keyboard","trumpet","violin","banjo","drum","long-drum","mobile-phone","mobile-phone-with-arrow","telephone","telephone-receiver","pager","fax-machine","battery","electric-plug","laptop","desktop-computer","printer","keyboard","computer-mouse","trackball","computer-disk","floppy-disk","optical-disk","dvd","abacus","movie-camera","film-frames","film-projector","clapper-board","television","camera","camera-with-flash","video-camera","videocassette","magnifying-glass-tilted-left","magnifying-glass-tilted-right","candle","light-bulb","flashlight","red-paper-lantern","diya-lamp","notebook-with-decorative-cover","closed-book","open-book","green-book","blue-book","orange-book","books","notebook","ledger","page-with-curl","scroll","page-facing-up","newspaper","rolledup-newspaper","bookmark-tabs","bookmark","label","money-bag","coin","yen-banknote","dollar-banknote","euro-banknote","pound-banknote","money-with-wings","credit-card","receipt","chart-increasing-with-yen","envelope","email","incoming-envelope","envelope-with-arrow","outbox-tray","inbox-tray","package","closed-mailbox-with-raised-flag","closed-mailbox-with-lowered-flag","open-mailbox-with-raised-flag","open-mailbox-with-lowered-flag","postbox","ballot-box-with-ballot","pencil","black-nib","fountain-pen","pen","paintbrush","crayon","memo","briefcase","file-folder","open-file-folder","card-index-dividers","calendar","tearoff-calendar","spiral-notepad","spiral-calendar","card-index","chart-increasing","chart-decreasing","bar-chart","clipboard","pushpin","round-pushpin","paperclip","linked-paperclips","straight-ruler","triangular-ruler","scissors","card-file-box","file-cabinet","wastebasket","locked","unlocked","locked-with-pen","locked-with-key","key","old-key","hammer","axe","pick","hammer-and-pick","hammer-and-wrench","dagger","crossed-swords","water-pistol","boomerang","bow-and-arrow","shield","carpentry-saw","wrench","screwdriver","nut-and-bolt","gear","clamp","balance-scale","white-cane","link","chains","hook","toolbox","magnet","ladder","alembic","test-tube","petri-dish","dna","microscope","telescope","satellite-antenna","syringe","drop-of-blood","pill","adhesive-bandage","stethoscope","door","elevator","mirror","window","bed","couch-and-lamp","chair","toilet","plunger","shower","bathtub","mouse-trap","razor","lotion-bottle","safety-pin","broom","basket","roll-of-paper","bucket","soap","toothbrush","sponge","fire-extinguisher","shopping-cart","cigarette","coffin","headstone","funeral-urn","moai","placard"]},{"id":"symbols","name":"Symbols","emojis":["atm-sign","litter-in-bin-sign","potable-water","wheelchair-symbol","mens-room","womens-room","restroom","baby-symbol","water-closet","passport-control","customs","baggage-claim","left-luggage","warning","children-crossing","no-entry","prohibited","no-bicycles","no-smoking","no-littering","nonpotable-water","no-pedestrians","no-mobile-phones","no-one-under-eighteen","radioactive","biohazard","up-arrow","upright-arrow","right-arrow","downright-arrow","down-arrow","downleft-arrow","left-arrow","upleft-arrow","updown-arrow","leftright-arrow","right-arrow-curving-left","left-arrow-curving-right","right-arrow-curving-up","right-arrow-curving-down","clockwise-vertical-arrows","counterclockwise-arrows-button","back-arrow","end-arrow","on-arrow","soon-arrow","top-arrow","place-of-worship","atom-symbol","om","star-of-david","wheel-of-dharma","yin-yang","latin-cross","orthodox-cross","star-and-crescent","peace-symbol","menorah","dotted-sixpointed-star","aries","taurus","gemini","cancer","leo","virgo","libra","scorpio","sagittarius","capricorn","aquarius","pisces","ophiuchus","shuffle-tracks-button","repeat-button","repeat-single-button","play-button","fastforward-button","next-track-button","play-or-pause-button","reverse-button","fast-reverse-button","last-track-button","upwards-button","fast-up-button","downwards-button","fast-down-button","pause-button","stop-button","record-button","eject-button","cinema","dim-button","bright-button","antenna-bars","vibration-mode","mobile-phone-off","female-sign","male-sign","transgender-symbol","multiply","plus","minus","divide","infinity","double-exclamation-mark","exclamation-question-mark","red-question-mark","white-question-mark","white-exclamation-mark","red-exclamation-mark","wavy-dash","currency-exchange","heavy-dollar-sign","medical-symbol","recycling-symbol","fleurdelis","trident-emblem","name-badge","japanese-symbol-for-beginner","hollow-red-circle","check-mark-button","check-box-with-check","check-mark","cross-mark","cross-mark-button","curly-loop","double-curly-loop","part-alternation-mark","eightspoked-asterisk","eightpointed-star","sparkle","copyright","registered","trade-mark","keycap","keycap","keycap-0","keycap-1","keycap-2","keycap-3","keycap-4","keycap-5","keycap-6","keycap-7","keycap-8","keycap-9","keycap-10","input-latin-uppercase","input-latin-lowercase","input-numbers","input-symbols","input-latin-letters","a-button-blood-type","ab-button-blood-type","b-button-blood-type","cl-button","cool-button","free-button","information","id-button","circled-m","new-button","ng-button","o-button-blood-type","ok-button","p-button","sos-button","up-button","vs-button","japanese-here-button","japanese-service-charge-button","japanese-monthly-amount-button","japanese-not-free-of-charge-button","japanese-reserved-button","japanese-bargain-button","japanese-discount-button","japanese-free-of-charge-button","japanese-prohibited-button","japanese-acceptable-button","japanese-application-button","japanese-passing-grade-button","japanese-vacancy-button","japanese-congratulations-button","japanese-secret-button","japanese-open-for-business-button","japanese-no-vacancy-button","red-circle","orange-circle","yellow-circle","green-circle","blue-circle","purple-circle","brown-circle","black-circle","white-circle","red-square","orange-square","yellow-square","green-square","blue-square","purple-square","brown-square","black-large-square","white-large-square","black-medium-square","white-medium-square","black-mediumsmall-square","white-mediumsmall-square","black-small-square","white-small-square","large-orange-diamond","large-blue-diamond","small-orange-diamond","small-blue-diamond","red-triangle-pointed-up","red-triangle-pointed-down","diamond-with-a-dot","radio-button","white-square-button","black-square-button"]},{"id":"flags","name":"Flags","emojis":["chequered-flag","triangular-flag","crossed-flags","black-flag","white-flag","rainbow-flag","transgender-flag","pirate-flag","flag-ascension-island","flag-andorra","flag-united-arab-emirates","flag-afghanistan","flag-antigua--barbuda","flag-anguilla","flag-albania","flag-armenia","flag-angola","flag-antarctica","flag-argentina","flag-american-samoa","flag-austria","flag-australia","flag-aruba","flag-land-islands","flag-azerbaijan","flag-bosnia--herzegovina","flag-barbados","flag-bangladesh","flag-belgium","flag-burkina-faso","flag-bulgaria","flag-bahrain","flag-burundi","flag-benin","flag-st-barthlemy","flag-bermuda","flag-brunei","flag-bolivia","flag-caribbean-netherlands","flag-brazil","flag-bahamas","flag-bhutan","flag-bouvet-island","flag-botswana","flag-belarus","flag-belize","flag-canada","flag-cocos-keeling-islands","flag-congo--kinshasa","flag-central-african-republic","flag-congo--brazzaville","flag-switzerland","flag-cte-divoire","flag-cook-islands","flag-chile","flag-cameroon","flag-china","flag-colombia","flag-clipperton-island","flag-costa-rica","flag-cuba","flag-cape-verde","flag-curaao","flag-christmas-island","flag-cyprus","flag-czechia","flag-germany","flag-diego-garcia","flag-djibouti","flag-denmark","flag-dominica","flag-dominican-republic","flag-algeria","flag-ceuta--melilla","flag-ecuador","flag-estonia","flag-egypt","flag-western-sahara","flag-eritrea","flag-spain","flag-ethiopia","flag-european-union","flag-finland","flag-fiji","flag-falkland-islands","flag-micronesia","flag-faroe-islands","flag-france","flag-gabon","flag-united-kingdom","flag-grenada","flag-georgia","flag-french-guiana","flag-guernsey","flag-ghana","flag-gibraltar","flag-greenland","flag-gambia","flag-guinea","flag-guadeloupe","flag-equatorial-guinea","flag-greece","flag-south-georgia--south-sandwich-islands","flag-guatemala","flag-guam","flag-guineabissau","flag-guyana","flag-hong-kong-sar-china","flag-heard--mcdonald-islands","flag-honduras","flag-croatia","flag-haiti","flag-hungary","flag-canary-islands","flag-indonesia","flag-ireland","flag-israel","flag-isle-of-man","flag-india","flag-british-indian-ocean-territory","flag-iraq","flag-iran","flag-iceland","flag-italy","flag-jersey","flag-jamaica","flag-jordan","flag-japan","flag-kenya","flag-kyrgyzstan","flag-cambodia","flag-kiribati","flag-comoros","flag-st-kitts--nevis","flag-north-korea","flag-south-korea","flag-kuwait","flag-cayman-islands","flag-kazakhstan","flag-laos","flag-lebanon","flag-st-lucia","flag-liechtenstein","flag-sri-lanka","flag-liberia","flag-lesotho","flag-lithuania","flag-luxembourg","flag-latvia","flag-libya","flag-morocco","flag-monaco","flag-moldova","flag-montenegro","flag-st-martin","flag-madagascar","flag-marshall-islands","flag-north-macedonia","flag-mali","flag-myanmar-burma","flag-mongolia","flag-macao-sar-china","flag-northern-mariana-islands","flag-martinique","flag-mauritania","flag-montserrat","flag-malta","flag-mauritius","flag-maldives","flag-malawi","flag-mexico","flag-malaysia","flag-mozambique","flag-namibia","flag-new-caledonia","flag-niger","flag-norfolk-island","flag-nigeria","flag-nicaragua","flag-netherlands","flag-norway","flag-nepal","flag-nauru","flag-niue","flag-new-zealand","flag-oman","flag-panama","flag-peru","flag-french-polynesia","flag-papua-new-guinea","flag-philippines","flag-pakistan","flag-poland","flag-st-pierre--miquelon","flag-pitcairn-islands","flag-puerto-rico","flag-palestinian-territories","flag-portugal","flag-palau","flag-paraguay","flag-qatar","flag-runion","flag-romania","flag-serbia","flag-russia","flag-rwanda","flag-saudi-arabia","flag-solomon-islands","flag-seychelles","flag-sudan","flag-sweden","flag-singapore","flag-st-helena","flag-slovenia","flag-svalbard--jan-mayen","flag-slovakia","flag-sierra-leone","flag-san-marino","flag-senegal","flag-somalia","flag-suriname","flag-south-sudan","flag-so-tom--prncipe","flag-el-salvador","flag-sint-maarten","flag-syria","flag-eswatini","flag-tristan-da-cunha","flag-turks--caicos-islands","flag-chad","flag-french-southern-territories","flag-togo","flag-thailand","flag-tajikistan","flag-tokelau","flag-timorleste","flag-turkmenistan","flag-tunisia","flag-tonga","flag-turkey","flag-trinidad--tobago","flag-tuvalu","flag-taiwan","flag-tanzania","flag-ukraine","flag-uganda","flag-us-outlying-islands","flag-united-nations","flag-united-states","flag-uruguay","flag-uzbekistan","flag-vatican-city","flag-st-vincent--grenadines","flag-venezuela","flag-british-virgin-islands","flag-us-virgin-islands","flag-vietnam","flag-vanuatu","flag-wallis--futuna","flag-samoa","flag-kosovo","flag-yemen","flag-mayotte","flag-south-africa","flag-zambia","flag-zimbabwe","flag-england","flag-scotland","flag-wales"]}],"emojis":{"grinning-face":{"a":"Grinning Face","b":"1F600","j":["face","grin","smile","happy","joy",":D"]},"grinning-face-with-big-eyes":{"a":"Grinning Face with Big Eyes","b":"1F603","j":["face","mouth","open","smile","happy","joy","haha",":D",":)","funny"]},"grinning-face-with-smiling-eyes":{"a":"Grinning Face with Smiling Eyes","b":"1F604","j":["eye","face","mouth","open","smile","happy","joy","funny","haha","laugh","like",":D",":)"]},"beaming-face-with-smiling-eyes":{"a":"Beaming Face with Smiling Eyes","b":"1F601","j":["eye","face","grin","smile","happy","joy","kawaii"]},"grinning-squinting-face":{"a":"Grinning Squinting Face","b":"1F606","j":["face","laugh","mouth","satisfied","smile","happy","joy","lol","haha","glad","XD"]},"grinning-face-with-sweat":{"a":"Grinning Face with Sweat","b":"1F605","j":["cold","face","open","smile","sweat","hot","happy","laugh","relief"]},"rolling-on-the-floor-laughing":{"a":"Rolling on the Floor Laughing","b":"1F923","j":["face","floor","laugh","rofl","rolling","rotfl","laughing","lol","haha"]},"face-with-tears-of-joy":{"a":"Face with Tears of Joy","b":"1F602","j":["face","joy","laugh","tear","cry","tears","weep","happy","happytears","haha"]},"slightly-smiling-face":{"a":"Slightly Smiling Face","b":"1F642","j":["face","smile"]},"upsidedown-face":{"a":"Upside-Down Face","b":"1F643","j":["face","upside-down","upside_down_face","flipped","silly","smile"]},"winking-face":{"a":"Winking Face","b":"1F609","j":["face","wink","happy","mischievous","secret",";)","smile","eye"]},"smiling-face-with-smiling-eyes":{"a":"Smiling Face with Smiling Eyes","b":"1F60A","j":["blush","eye","face","smile","happy","flushed","crush","embarrassed","shy","joy"]},"smiling-face-with-halo":{"a":"Smiling Face with Halo","b":"1F607","j":["angel","face","fantasy","halo","innocent","heaven"]},"smiling-face-with-hearts":{"a":"Smiling Face with Hearts","b":"1F970","j":["adore","crush","hearts","in love","face","love","like","affection","valentines","infatuation"]},"smiling-face-with-hearteyes":{"a":"Smiling Face with Heart-Eyes","b":"1F60D","j":["eye","face","love","smile","smiling face with heart-eyes","smiling_face_with_heart_eyes","like","affection","valentines","infatuation","crush","heart"]},"starstruck":{"a":"Star-Struck","b":"1F929","j":["eyes","face","grinning","star","star-struck","starry-eyed","star_struck","smile","starry"]},"face-blowing-a-kiss":{"a":"Face Blowing a Kiss","b":"1F618","j":["face","kiss","love","like","affection","valentines","infatuation"]},"kissing-face":{"a":"Kissing Face","b":"1F617","j":["face","kiss","love","like","3","valentines","infatuation"]},"smiling-face":{"a":"Smiling Face","b":"263A","j":["face","outlined","relaxed","smile","blush","massage","happiness"]},"kissing-face-with-closed-eyes":{"a":"Kissing Face with Closed Eyes","b":"1F61A","j":["closed","eye","face","kiss","love","like","affection","valentines","infatuation"]},"kissing-face-with-smiling-eyes":{"a":"Kissing Face with Smiling Eyes","b":"1F619","j":["eye","face","kiss","smile","affection","valentines","infatuation"]},"smiling-face-with-tear":{"a":"Smiling Face with Tear","b":"1F972","j":["grateful","proud","relieved","smiling","tear","touched","sad","cry","pretend"]},"face-savoring-food":{"a":"Face Savoring Food","b":"1F60B","j":["delicious","face","savouring","smile","yum","happy","joy","tongue","silly","yummy","nom"]},"face-with-tongue":{"a":"Face with Tongue","b":"1F61B","j":["face","tongue","prank","childish","playful","mischievous","smile"]},"winking-face-with-tongue":{"a":"Winking Face with Tongue","b":"1F61C","j":["eye","face","joke","tongue","wink","prank","childish","playful","mischievous","smile"]},"zany-face":{"a":"Zany Face","b":"1F92A","j":["eye","goofy","large","small","face","crazy"]},"squinting-face-with-tongue":{"a":"Squinting Face with Tongue","b":"1F61D","j":["eye","face","horrible","taste","tongue","prank","playful","mischievous","smile"]},"moneymouth-face":{"a":"Money-Mouth Face","b":"1F911","j":["face","money","money-mouth face","mouth","money_mouth_face","rich","dollar"]},"hugging-face":{"a":"Hugging Face","b":"1F917","j":["face","hug","hugging","smile"]},"face-with-hand-over-mouth":{"a":"Face with Hand over Mouth","b":"1F92D","j":["whoops","shock","sudden realization","surprise","face"]},"shushing-face":{"a":"Shushing Face","b":"1F92B","j":["quiet","shush","face","shhh"]},"thinking-face":{"a":"Thinking Face","b":"1F914","j":["face","thinking","hmmm","think","consider"]},"zippermouth-face":{"a":"Zipper-Mouth Face","b":"1F910","j":["face","mouth","zipper","zipper-mouth face","zipper_mouth_face","sealed","secret"]},"face-with-raised-eyebrow":{"a":"Face with Raised Eyebrow","b":"1F928","j":["distrust","skeptic","disapproval","disbelief","mild surprise","scepticism","face","surprise"]},"neutral-face":{"a":"Neutral Face","b":"1F610","j":["deadpan","face","meh","neutral","indifference",":|"]},"expressionless-face":{"a":"Expressionless Face","b":"1F611","j":["expressionless","face","inexpressive","meh","unexpressive","indifferent","-_-","deadpan"]},"face-without-mouth":{"a":"Face Without Mouth","b":"1F636","j":["face","mouth","quiet","silent","hellokitty"]},"face-in-clouds":{"a":"⊛ Face in Clouds","b":"1F636-200D-1F32B-FE0F","j":["absentminded","face in clouds","face in the fog","head in clouds"]},"smirking-face":{"a":"Smirking Face","b":"1F60F","j":["face","smirk","smile","mean","prank","smug","sarcasm"]},"unamused-face":{"a":"Unamused Face","b":"1F612","j":["face","unamused","unhappy","indifference","bored","straight face","serious","sarcasm","unimpressed","skeptical","dubious","side_eye"]},"face-with-rolling-eyes":{"a":"Face with Rolling Eyes","b":"1F644","j":["eyeroll","eyes","face","rolling","frustrated"]},"grimacing-face":{"a":"Grimacing Face","b":"1F62C","j":["face","grimace","teeth"]},"face-exhaling":{"a":"⊛ Face Exhaling","b":"1F62E-200D-1F4A8","j":["exhale","face exhaling","gasp","groan","relief","whisper","whistle"]},"lying-face":{"a":"Lying Face","b":"1F925","j":["face","lie","pinocchio"]},"relieved-face":{"a":"Relieved Face","b":"1F60C","j":["face","relieved","relaxed","phew","massage","happiness"]},"pensive-face":{"a":"Pensive Face","b":"1F614","j":["dejected","face","pensive","sad","depressed","upset"]},"sleepy-face":{"a":"Sleepy Face","b":"1F62A","j":["face","sleep","tired","rest","nap"]},"drooling-face":{"a":"Drooling Face","b":"1F924","j":["drooling","face"]},"sleeping-face":{"a":"Sleeping Face","b":"1F634","j":["face","sleep","zzz","tired","sleepy","night"]},"face-with-medical-mask":{"a":"Face with Medical Mask","b":"1F637","j":["cold","doctor","face","mask","sick","ill","disease"]},"face-with-thermometer":{"a":"Face with Thermometer","b":"1F912","j":["face","ill","sick","thermometer","temperature","cold","fever"]},"face-with-headbandage":{"a":"Face with Head-Bandage","b":"1F915","j":["bandage","face","face with head-bandage","hurt","injury","face_with_head_bandage","injured","clumsy"]},"nauseated-face":{"a":"Nauseated Face","b":"1F922","j":["face","nauseated","vomit","gross","green","sick","throw up","ill"]},"face-vomiting":{"a":"Face Vomiting","b":"1F92E","j":["puke","sick","vomit","face"]},"sneezing-face":{"a":"Sneezing Face","b":"1F927","j":["face","gesundheit","sneeze","sick","allergy"]},"hot-face":{"a":"Hot Face","b":"1F975","j":["feverish","heat stroke","hot","red-faced","sweating","face","heat","red"]},"cold-face":{"a":"Cold Face","b":"1F976","j":["blue-faced","cold","freezing","frostbite","icicles","face","blue","frozen"]},"woozy-face":{"a":"Woozy Face","b":"1F974","j":["dizzy","intoxicated","tipsy","uneven eyes","wavy mouth","face","wavy"]},"knockedout-face":{"a":"Knocked-out Face","b":"1F635","j":["dead","face","knocked out","knocked-out face","dizzy_face","spent","unconscious","xox","dizzy"]},"face-with-spiral-eyes":{"a":"⊛ Face with Spiral Eyes","b":"1F635-200D-1F4AB","j":["dizzy","face with spiral eyes","hypnotized","spiral","trouble","whoa"]},"exploding-head":{"a":"Exploding Head","b":"1F92F","j":["mind blown","shocked","face","mind","blown"]},"cowboy-hat-face":{"a":"Cowboy Hat Face","b":"1F920","j":["cowboy","cowgirl","face","hat"]},"partying-face":{"a":"Partying Face","b":"1F973","j":["celebration","hat","horn","party","face","woohoo"]},"disguised-face":{"a":"Disguised Face","b":"1F978","j":["disguise","face","glasses","incognito","nose","pretent","brows","moustache"]},"smiling-face-with-sunglasses":{"a":"Smiling Face with Sunglasses","b":"1F60E","j":["bright","cool","face","sun","sunglasses","smile","summer","beach","sunglass"]},"nerd-face":{"a":"Nerd Face","b":"1F913","j":["face","geek","nerd","nerdy","dork"]},"face-with-monocle":{"a":"Face with Monocle","b":"1F9D0","j":["stuffy","wealthy","face"]},"confused-face":{"a":"Confused Face","b":"1F615","j":["confused","face","meh","indifference","huh","weird","hmmm",":/"]},"worried-face":{"a":"Worried Face","b":"1F61F","j":["face","worried","concern","nervous",":("]},"slightly-frowning-face":{"a":"Slightly Frowning Face","b":"1F641","j":["face","frown","frowning","disappointed","sad","upset"]},"frowning-face":{"a":"Frowning Face","b":"2639","j":["face","frown","sad","upset"]},"face-with-open-mouth":{"a":"Face with Open Mouth","b":"1F62E","j":["face","mouth","open","sympathy","surprise","impressed","wow","whoa",":O"]},"hushed-face":{"a":"Hushed Face","b":"1F62F","j":["face","hushed","stunned","surprised","woo","shh"]},"astonished-face":{"a":"Astonished Face","b":"1F632","j":["astonished","face","shocked","totally","xox","surprised","poisoned"]},"flushed-face":{"a":"Flushed Face","b":"1F633","j":["dazed","face","flushed","blush","shy","flattered"]},"pleading-face":{"a":"Pleading Face","b":"1F97A","j":["begging","mercy","puppy eyes","face"]},"frowning-face-with-open-mouth":{"a":"Frowning Face with Open Mouth","b":"1F626","j":["face","frown","mouth","open","aw","what"]},"anguished-face":{"a":"Anguished Face","b":"1F627","j":["anguished","face","stunned","nervous"]},"fearful-face":{"a":"Fearful Face","b":"1F628","j":["face","fear","fearful","scared","terrified","nervous","oops","huh"]},"anxious-face-with-sweat":{"a":"Anxious Face with Sweat","b":"1F630","j":["blue","cold","face","rushed","sweat","nervous"]},"sad-but-relieved-face":{"a":"Sad but Relieved Face","b":"1F625","j":["disappointed","face","relieved","whew","phew","sweat","nervous"]},"crying-face":{"a":"Crying Face","b":"1F622","j":["cry","face","sad","tear","tears","depressed","upset",":'("]},"loudly-crying-face":{"a":"Loudly Crying Face","b":"1F62D","j":["cry","face","sad","sob","tear","tears","upset","depressed"]},"face-screaming-in-fear":{"a":"Face Screaming in Fear","b":"1F631","j":["face","fear","munch","scared","scream","omg"]},"confounded-face":{"a":"Confounded Face","b":"1F616","j":["confounded","face","confused","sick","unwell","oops",":S"]},"persevering-face":{"a":"Persevering Face","b":"1F623","j":["face","persevere","sick","no","upset","oops"]},"disappointed-face":{"a":"Disappointed Face","b":"1F61E","j":["disappointed","face","sad","upset","depressed",":("]},"downcast-face-with-sweat":{"a":"Downcast Face with Sweat","b":"1F613","j":["cold","face","sweat","hot","sad","tired","exercise"]},"weary-face":{"a":"Weary Face","b":"1F629","j":["face","tired","weary","sleepy","sad","frustrated","upset"]},"tired-face":{"a":"Tired Face","b":"1F62B","j":["face","tired","sick","whine","upset","frustrated"]},"yawning-face":{"a":"Yawning Face","b":"1F971","j":["bored","tired","yawn","sleepy",""]},"face-with-steam-from-nose":{"a":"Face with Steam From Nose","b":"1F624","j":["face","triumph","won","gas","phew","proud","pride"]},"pouting-face":{"a":"Pouting Face","b":"1F621","j":["angry","face","mad","pouting","rage","red","hate","despise"]},"angry-face":{"a":"Angry Face","b":"1F620","j":["anger","angry","face","mad","annoyed","frustrated"]},"face-with-symbols-on-mouth":{"a":"Face with Symbols on Mouth","b":"1F92C","j":["swearing","cursing","face","cussing","profanity","expletive"]},"smiling-face-with-horns":{"a":"Smiling Face with Horns","b":"1F608","j":["face","fairy tale","fantasy","horns","smile","devil"]},"angry-face-with-horns":{"a":"Angry Face with Horns","b":"1F47F","j":["demon","devil","face","fantasy","imp","angry","horns"]},"skull":{"a":"Skull","b":"1F480","j":["death","face","fairy tale","monster","dead","skeleton","creepy"]},"skull-and-crossbones":{"a":"Skull and Crossbones","b":"2620","j":["crossbones","death","face","monster","skull","poison","danger","deadly","scary","pirate","evil"]},"pile-of-poo":{"a":"Pile of Poo","b":"1F4A9","j":["dung","face","monster","poo","poop","hankey","shitface","fail","turd","shit"]},"clown-face":{"a":"Clown Face","b":"1F921","j":["clown","face"]},"ogre":{"a":"Ogre","b":"1F479","j":["creature","face","fairy tale","fantasy","monster","troll","red","mask","halloween","scary","creepy","devil","demon","japanese"]},"goblin":{"a":"Goblin","b":"1F47A","j":["creature","face","fairy tale","fantasy","monster","red","evil","mask","scary","creepy","japanese"]},"ghost":{"a":"Ghost","b":"1F47B","j":["creature","face","fairy tale","fantasy","monster","halloween","spooky","scary"]},"alien":{"a":"Alien","b":"1F47D","j":["creature","extraterrestrial","face","fantasy","ufo","UFO","paul","weird","outer_space"]},"alien-monster":{"a":"Alien Monster","b":"1F47E","j":["alien","creature","extraterrestrial","face","monster","ufo","game","arcade","play"]},"robot":{"a":"Robot","b":"1F916","j":["face","monster","computer","machine","bot"]},"grinning-cat":{"a":"Grinning Cat","b":"1F63A","j":["cat","face","grinning","mouth","open","smile","animal","cats","happy"]},"grinning-cat-with-smiling-eyes":{"a":"Grinning Cat with Smiling Eyes","b":"1F638","j":["cat","eye","face","grin","smile","animal","cats"]},"cat-with-tears-of-joy":{"a":"Cat with Tears of Joy","b":"1F639","j":["cat","face","joy","tear","animal","cats","haha","happy","tears"]},"smiling-cat-with-hearteyes":{"a":"Smiling Cat with Heart-Eyes","b":"1F63B","j":["cat","eye","face","heart","love","smile","smiling cat with heart-eyes","smiling_cat_with_heart_eyes","animal","like","affection","cats","valentines"]},"cat-with-wry-smile":{"a":"Cat with Wry Smile","b":"1F63C","j":["cat","face","ironic","smile","wry","animal","cats","smirk"]},"kissing-cat":{"a":"Kissing Cat","b":"1F63D","j":["cat","eye","face","kiss","animal","cats"]},"weary-cat":{"a":"Weary Cat","b":"1F640","j":["cat","face","oh","surprised","weary","animal","cats","munch","scared","scream"]},"crying-cat":{"a":"Crying Cat","b":"1F63F","j":["cat","cry","face","sad","tear","animal","tears","weep","cats","upset"]},"pouting-cat":{"a":"Pouting Cat","b":"1F63E","j":["cat","face","pouting","animal","cats"]},"seenoevil-monkey":{"a":"See-No-Evil Monkey","b":"1F648","j":["evil","face","forbidden","monkey","see","see-no-evil monkey","see_no_evil_monkey","animal","nature","haha"]},"hearnoevil-monkey":{"a":"Hear-No-Evil Monkey","b":"1F649","j":["evil","face","forbidden","hear","hear-no-evil monkey","monkey","hear_no_evil_monkey","animal","nature"]},"speaknoevil-monkey":{"a":"Speak-No-Evil Monkey","b":"1F64A","j":["evil","face","forbidden","monkey","speak","speak-no-evil monkey","speak_no_evil_monkey","animal","nature","omg"]},"kiss-mark":{"a":"Kiss Mark","b":"1F48B","j":["kiss","lips","face","love","like","affection","valentines"]},"love-letter":{"a":"Love Letter","b":"1F48C","j":["heart","letter","love","mail","email","like","affection","envelope","valentines"]},"heart-with-arrow":{"a":"Heart with Arrow","b":"1F498","j":["arrow","cupid","love","like","heart","affection","valentines"]},"heart-with-ribbon":{"a":"Heart with Ribbon","b":"1F49D","j":["ribbon","valentine","love","valentines"]},"sparkling-heart":{"a":"Sparkling Heart","b":"1F496","j":["excited","sparkle","love","like","affection","valentines"]},"growing-heart":{"a":"Growing Heart","b":"1F497","j":["excited","growing","nervous","pulse","like","love","affection","valentines","pink"]},"beating-heart":{"a":"Beating Heart","b":"1F493","j":["beating","heartbeat","pulsating","love","like","affection","valentines","pink","heart"]},"revolving-hearts":{"a":"Revolving Hearts","b":"1F49E","j":["revolving","love","like","affection","valentines"]},"two-hearts":{"a":"Two Hearts","b":"1F495","j":["love","like","affection","valentines","heart"]},"heart-decoration":{"a":"Heart Decoration","b":"1F49F","j":["heart","purple-square","love","like"]},"heart-exclamation":{"a":"Heart Exclamation","b":"2763","j":["exclamation","mark","punctuation","decoration","love"]},"broken-heart":{"a":"Broken Heart","b":"1F494","j":["break","broken","sad","sorry","heart","heartbreak"]},"heart-on-fire":{"a":"⊛ Heart on Fire","b":"2764-FE0F-200D-1F525","j":["burn","heart","heart on fire","love","lust","sacred heart"]},"mending-heart":{"a":"⊛ Mending Heart","b":"2764-FE0F-200D-1FA79","j":["healthier","improving","mending","mending heart","recovering","recuperating","well"]},"red-heart":{"a":"Red Heart","b":"2764","j":["heart","love","like","valentines"]},"orange-heart":{"a":"Orange Heart","b":"1F9E1","j":["orange","love","like","affection","valentines"]},"yellow-heart":{"a":"Yellow Heart","b":"1F49B","j":["yellow","love","like","affection","valentines"]},"green-heart":{"a":"Green Heart","b":"1F49A","j":["green","love","like","affection","valentines"]},"blue-heart":{"a":"Blue Heart","b":"1F499","j":["blue","love","like","affection","valentines"]},"purple-heart":{"a":"Purple Heart","b":"1F49C","j":["purple","love","like","affection","valentines"]},"brown-heart":{"a":"Brown Heart","b":"1F90E","j":["brown","heart","coffee"]},"black-heart":{"a":"Black Heart","b":"1F5A4","j":["black","evil","wicked"]},"white-heart":{"a":"White Heart","b":"1F90D","j":["heart","white","pure"]},"hundred-points":{"a":"Hundred Points","b":"1F4AF","j":["100","full","hundred","score","perfect","numbers","century","exam","quiz","test","pass"]},"anger-symbol":{"a":"Anger Symbol","b":"1F4A2","j":["angry","comic","mad"]},"collision":{"a":"Collision","b":"1F4A5","j":["boom","comic","bomb","explode","explosion","blown"]},"dizzy":{"a":"Dizzy","b":"1F4AB","j":["comic","star","sparkle","shoot","magic"]},"sweat-droplets":{"a":"Sweat Droplets","b":"1F4A6","j":["comic","splashing","sweat","water","drip","oops"]},"dashing-away":{"a":"Dashing Away","b":"1F4A8","j":["comic","dash","running","wind","air","fast","shoo","fart","smoke","puff"]},"hole":{"a":"Hole","b":"1F573","j":["embarrassing"]},"bomb":{"a":"Bomb","b":"1F4A3","j":["comic","boom","explode","explosion","terrorism"]},"speech-balloon":{"a":"Speech Balloon","b":"1F4AC","j":["balloon","bubble","comic","dialog","speech","words","message","talk","chatting"]},"eye-in-speech-bubble":{"a":"Eye in Speech Bubble","b":"1F441-FE0F-200D-1F5E8-FE0F","j":["eye","speech bubble","witness","info"]},"left-speech-bubble":{"a":"Left Speech Bubble","b":"1F5E8","j":["dialog","speech","words","message","talk","chatting"]},"right-anger-bubble":{"a":"Right Anger Bubble","b":"1F5EF","j":["angry","balloon","bubble","mad","caption","speech","thinking"]},"thought-balloon":{"a":"Thought Balloon","b":"1F4AD","j":["balloon","bubble","comic","thought","cloud","speech","thinking","dream"]},"zzz":{"a":"Zzz","b":"1F4A4","j":["comic","sleep","sleepy","tired","dream"]},"waving-hand":{"a":"Waving Hand","b":"1F44B","j":["hand","wave","waving","hands","gesture","goodbye","solong","farewell","hello","hi","palm"]},"raised-back-of-hand":{"a":"Raised Back of Hand","b":"1F91A","j":["backhand","raised","fingers"]},"hand-with-fingers-splayed":{"a":"Hand with Fingers Splayed","b":"1F590","j":["finger","hand","splayed","fingers","palm"]},"raised-hand":{"a":"Raised Hand","b":"270B","j":["hand","high 5","high five","fingers","stop","highfive","palm","ban"]},"vulcan-salute":{"a":"Vulcan Salute","b":"1F596","j":["finger","hand","spock","vulcan","fingers","star trek"]},"ok-hand":{"a":"Ok Hand","b":"1F44C","j":["hand","OK","fingers","limbs","perfect","ok","okay"]},"pinched-fingers":{"a":"Pinched Fingers","b":"1F90C","j":["fingers","hand gesture","interrogation","pinched","sarcastic","size","tiny","small"]},"pinching-hand":{"a":"Pinching Hand","b":"1F90F","j":["small amount","tiny","small","size"]},"victory-hand":{"a":"Victory Hand","b":"270C","j":["hand","v","victory","fingers","ohyeah","peace","two"]},"crossed-fingers":{"a":"Crossed Fingers","b":"1F91E","j":["cross","finger","hand","luck","good","lucky"]},"loveyou-gesture":{"a":"Love-You Gesture","b":"1F91F","j":["hand","ILY","love-you gesture","love_you_gesture","fingers","gesture"]},"sign-of-the-horns":{"a":"Sign of the Horns","b":"1F918","j":["finger","hand","horns","rock-on","fingers","evil_eye","sign_of_horns","rock_on"]},"call-me-hand":{"a":"Call Me Hand","b":"1F919","j":["call","hand","hands","gesture"]},"backhand-index-pointing-left":{"a":"Backhand Index Pointing Left","b":"1F448","j":["backhand","finger","hand","index","point","direction","fingers","left"]},"backhand-index-pointing-right":{"a":"Backhand Index Pointing Right","b":"1F449","j":["backhand","finger","hand","index","point","fingers","direction","right"]},"backhand-index-pointing-up":{"a":"Backhand Index Pointing Up","b":"1F446","j":["backhand","finger","hand","point","up","fingers","direction"]},"middle-finger":{"a":"Middle Finger","b":"1F595","j":["finger","hand","fingers","rude","middle","flipping"]},"backhand-index-pointing-down":{"a":"Backhand Index Pointing Down","b":"1F447","j":["backhand","down","finger","hand","point","fingers","direction"]},"index-pointing-up":{"a":"Index Pointing Up","b":"261D","j":["finger","hand","index","point","up","fingers","direction"]},"thumbs-up":{"a":"Thumbs Up","b":"1F44D","j":["+1","hand","thumb","up","thumbsup","yes","awesome","good","agree","accept","cool","like"]},"thumbs-down":{"a":"Thumbs Down","b":"1F44E","j":["-1","down","hand","thumb","thumbsdown","no","dislike"]},"raised-fist":{"a":"Raised Fist","b":"270A","j":["clenched","fist","hand","punch","fingers","grasp"]},"oncoming-fist":{"a":"Oncoming Fist","b":"1F44A","j":["clenched","fist","hand","punch","angry","violence","hit","attack"]},"leftfacing-fist":{"a":"Left-Facing Fist","b":"1F91B","j":["fist","left-facing fist","leftwards","left_facing_fist","hand","fistbump"]},"rightfacing-fist":{"a":"Right-Facing Fist","b":"1F91C","j":["fist","right-facing fist","rightwards","right_facing_fist","hand","fistbump"]},"clapping-hands":{"a":"Clapping Hands","b":"1F44F","j":["clap","hand","hands","praise","applause","congrats","yay"]},"raising-hands":{"a":"Raising Hands","b":"1F64C","j":["celebration","gesture","hand","hooray","raised","yea","hands"]},"open-hands":{"a":"Open Hands","b":"1F450","j":["hand","open","fingers","butterfly","hands"]},"palms-up-together":{"a":"Palms Up Together","b":"1F932","j":["prayer","cupped hands","hands","gesture","cupped"]},"handshake":{"a":"Handshake","b":"1F91D","j":["agreement","hand","meeting","shake"]},"folded-hands":{"a":"Folded Hands","b":"1F64F","j":["ask","hand","high 5","high five","please","pray","thanks","hope","wish","namaste","highfive"]},"writing-hand":{"a":"Writing Hand","b":"270D","j":["hand","write","lower_left_ballpoint_pen","stationery","compose"]},"nail-polish":{"a":"Nail Polish","b":"1F485","j":["care","cosmetics","manicure","nail","polish","beauty","finger","fashion"]},"selfie":{"a":"Selfie","b":"1F933","j":["camera","phone"]},"flexed-biceps":{"a":"Flexed Biceps","b":"1F4AA","j":["biceps","comic","flex","muscle","arm","hand","summer","strong"]},"mechanical-arm":{"a":"Mechanical Arm","b":"1F9BE","j":["accessibility","prosthetic"]},"mechanical-leg":{"a":"Mechanical Leg","b":"1F9BF","j":["accessibility","prosthetic"]},"leg":{"a":"Leg","b":"1F9B5","j":["kick","limb"]},"foot":{"a":"Foot","b":"1F9B6","j":["kick","stomp"]},"ear":{"a":"Ear","b":"1F442","j":["body","face","hear","sound","listen"]},"ear-with-hearing-aid":{"a":"Ear with Hearing Aid","b":"1F9BB","j":["accessibility","hard of hearing"]},"nose":{"a":"Nose","b":"1F443","j":["body","smell","sniff"]},"brain":{"a":"Brain","b":"1F9E0","j":["intelligent","smart"]},"anatomical-heart":{"a":"Anatomical Heart","b":"1FAC0","j":["anatomical","cardiology","heart","organ","pulse","health","heartbeat"]},"lungs":{"a":"Lungs","b":"1FAC1","j":["breath","exhalation","inhalation","organ","respiration","breathe"]},"tooth":{"a":"Tooth","b":"1F9B7","j":["dentist","teeth"]},"bone":{"a":"Bone","b":"1F9B4","j":["skeleton"]},"eyes":{"a":"Eyes","b":"1F440","j":["eye","face","look","watch","stalk","peek","see"]},"eye":{"a":"Eye","b":"1F441","j":["body","face","look","see","watch","stare"]},"tongue":{"a":"Tongue","b":"1F445","j":["body","mouth","playful"]},"mouth":{"a":"Mouth","b":"1F444","j":["lips","kiss"]},"baby":{"a":"Baby","b":"1F476","j":["young","child","boy","girl","toddler"]},"child":{"a":"Child","b":"1F9D2","j":["gender-neutral","unspecified gender","young"]},"boy":{"a":"Boy","b":"1F466","j":["young","man","male","guy","teenager"]},"girl":{"a":"Girl","b":"1F467","j":["Virgo","young","zodiac","female","woman","teenager"]},"person":{"a":"Person","b":"1F9D1","j":["adult","gender-neutral","unspecified gender"]},"person-blond-hair":{"a":"Person: Blond Hair","b":"1F471","j":["blond","blond-haired person","hair","person: blond hair","hairstyle"]},"man":{"a":"Man","b":"1F468","j":["adult","mustache","father","dad","guy","classy","sir","moustache"]},"person-beard":{"a":"Person: Beard","b":"1F9D4","j":["beard","person","person: beard","bewhiskered","man_beard"]},"man-beard":{"a":"⊛ Man: Beard","b":"1F9D4-200D-2642-FE0F","j":["beard","man","man: beard"]},"woman-beard":{"a":"⊛ Woman: Beard","b":"1F9D4-200D-2640-FE0F","j":["beard","woman","woman: beard"]},"man-red-hair":{"a":"Man: Red Hair","b":"1F468-200D-1F9B0","j":["adult","man","red hair","hairstyle"]},"man-curly-hair":{"a":"Man: Curly Hair","b":"1F468-200D-1F9B1","j":["adult","curly hair","man","hairstyle"]},"man-white-hair":{"a":"Man: White Hair","b":"1F468-200D-1F9B3","j":["adult","man","white hair","old","elder"]},"man-bald":{"a":"Man: Bald","b":"1F468-200D-1F9B2","j":["adult","bald","man","hairless"]},"woman":{"a":"Woman","b":"1F469","j":["adult","female","girls","lady"]},"woman-red-hair":{"a":"Woman: Red Hair","b":"1F469-200D-1F9B0","j":["adult","red hair","woman","hairstyle"]},"person-red-hair":{"a":"Person: Red Hair","b":"1F9D1-200D-1F9B0","j":["adult","gender-neutral","person","red hair","unspecified gender","hairstyle"]},"woman-curly-hair":{"a":"Woman: Curly Hair","b":"1F469-200D-1F9B1","j":["adult","curly hair","woman","hairstyle"]},"person-curly-hair":{"a":"Person: Curly Hair","b":"1F9D1-200D-1F9B1","j":["adult","curly hair","gender-neutral","person","unspecified gender","hairstyle"]},"woman-white-hair":{"a":"Woman: White Hair","b":"1F469-200D-1F9B3","j":["adult","white hair","woman","old","elder"]},"person-white-hair":{"a":"Person: White Hair","b":"1F9D1-200D-1F9B3","j":["adult","gender-neutral","person","unspecified gender","white hair","elder","old"]},"woman-bald":{"a":"Woman: Bald","b":"1F469-200D-1F9B2","j":["adult","bald","woman","hairless"]},"person-bald":{"a":"Person: Bald","b":"1F9D1-200D-1F9B2","j":["adult","bald","gender-neutral","person","unspecified gender","hairless"]},"woman-blond-hair":{"a":"Woman: Blond Hair","b":"1F471-200D-2640-FE0F","j":["blond-haired woman","blonde","hair","woman","woman: blond hair","female","girl","person"]},"man-blond-hair":{"a":"Man: Blond Hair","b":"1F471-200D-2642-FE0F","j":["blond","blond-haired man","hair","man","man: blond hair","male","boy","blonde","guy","person"]},"older-person":{"a":"Older Person","b":"1F9D3","j":["adult","gender-neutral","old","unspecified gender","human","elder","senior"]},"old-man":{"a":"Old Man","b":"1F474","j":["adult","man","old","human","male","men","elder","senior"]},"old-woman":{"a":"Old Woman","b":"1F475","j":["adult","old","woman","human","female","women","lady","elder","senior"]},"person-frowning":{"a":"Person Frowning","b":"1F64D","j":["frown","gesture","worried"]},"man-frowning":{"a":"Man Frowning","b":"1F64D-200D-2642-FE0F","j":["frowning","gesture","man","male","boy","sad","depressed","discouraged","unhappy"]},"woman-frowning":{"a":"Woman Frowning","b":"1F64D-200D-2640-FE0F","j":["frowning","gesture","woman","female","girl","sad","depressed","discouraged","unhappy"]},"person-pouting":{"a":"Person Pouting","b":"1F64E","j":["gesture","pouting","upset"]},"man-pouting":{"a":"Man Pouting","b":"1F64E-200D-2642-FE0F","j":["gesture","man","pouting","male","boy"]},"woman-pouting":{"a":"Woman Pouting","b":"1F64E-200D-2640-FE0F","j":["gesture","pouting","woman","female","girl"]},"person-gesturing-no":{"a":"Person Gesturing No","b":"1F645","j":["forbidden","gesture","hand","person gesturing NO","prohibited","decline"]},"man-gesturing-no":{"a":"Man Gesturing No","b":"1F645-200D-2642-FE0F","j":["forbidden","gesture","hand","man","man gesturing NO","prohibited","male","boy","nope"]},"woman-gesturing-no":{"a":"Woman Gesturing No","b":"1F645-200D-2640-FE0F","j":["forbidden","gesture","hand","prohibited","woman","woman gesturing NO","female","girl","nope"]},"person-gesturing-ok":{"a":"Person Gesturing Ok","b":"1F646","j":["gesture","hand","OK","person gesturing OK","agree"]},"man-gesturing-ok":{"a":"Man Gesturing Ok","b":"1F646-200D-2642-FE0F","j":["gesture","hand","man","man gesturing OK","OK","men","boy","male","blue","human"]},"woman-gesturing-ok":{"a":"Woman Gesturing Ok","b":"1F646-200D-2640-FE0F","j":["gesture","hand","OK","woman","woman gesturing OK","women","girl","female","pink","human"]},"person-tipping-hand":{"a":"Person Tipping Hand","b":"1F481","j":["hand","help","information","sassy","tipping"]},"man-tipping-hand":{"a":"Man Tipping Hand","b":"1F481-200D-2642-FE0F","j":["man","sassy","tipping hand","male","boy","human","information"]},"woman-tipping-hand":{"a":"Woman Tipping Hand","b":"1F481-200D-2640-FE0F","j":["sassy","tipping hand","woman","female","girl","human","information"]},"person-raising-hand":{"a":"Person Raising Hand","b":"1F64B","j":["gesture","hand","happy","raised","question"]},"man-raising-hand":{"a":"Man Raising Hand","b":"1F64B-200D-2642-FE0F","j":["gesture","man","raising hand","male","boy"]},"woman-raising-hand":{"a":"Woman Raising Hand","b":"1F64B-200D-2640-FE0F","j":["gesture","raising hand","woman","female","girl"]},"deaf-person":{"a":"Deaf Person","b":"1F9CF","j":["accessibility","deaf","ear","hear"]},"deaf-man":{"a":"Deaf Man","b":"1F9CF-200D-2642-FE0F","j":["deaf","man","accessibility"]},"deaf-woman":{"a":"Deaf Woman","b":"1F9CF-200D-2640-FE0F","j":["deaf","woman","accessibility"]},"person-bowing":{"a":"Person Bowing","b":"1F647","j":["apology","bow","gesture","sorry","respectiful"]},"man-bowing":{"a":"Man Bowing","b":"1F647-200D-2642-FE0F","j":["apology","bowing","favor","gesture","man","sorry","male","boy"]},"woman-bowing":{"a":"Woman Bowing","b":"1F647-200D-2640-FE0F","j":["apology","bowing","favor","gesture","sorry","woman","female","girl"]},"person-facepalming":{"a":"Person Facepalming","b":"1F926","j":["disbelief","exasperation","face","palm","disappointed"]},"man-facepalming":{"a":"Man Facepalming","b":"1F926-200D-2642-FE0F","j":["disbelief","exasperation","facepalm","man","male","boy"]},"woman-facepalming":{"a":"Woman Facepalming","b":"1F926-200D-2640-FE0F","j":["disbelief","exasperation","facepalm","woman","female","girl"]},"person-shrugging":{"a":"Person Shrugging","b":"1F937","j":["doubt","ignorance","indifference","shrug","regardless"]},"man-shrugging":{"a":"Man Shrugging","b":"1F937-200D-2642-FE0F","j":["doubt","ignorance","indifference","man","shrug","male","boy","confused","indifferent"]},"woman-shrugging":{"a":"Woman Shrugging","b":"1F937-200D-2640-FE0F","j":["doubt","ignorance","indifference","shrug","woman","female","girl","confused","indifferent"]},"health-worker":{"a":"Health Worker","b":"1F9D1-200D-2695-FE0F","j":["doctor","healthcare","nurse","therapist","hospital"]},"man-health-worker":{"a":"Man Health Worker","b":"1F468-200D-2695-FE0F","j":["doctor","healthcare","man","nurse","therapist","human"]},"woman-health-worker":{"a":"Woman Health Worker","b":"1F469-200D-2695-FE0F","j":["doctor","healthcare","nurse","therapist","woman","human"]},"student":{"a":"Student","b":"1F9D1-200D-1F393","j":["graduate","learn"]},"man-student":{"a":"Man Student","b":"1F468-200D-1F393","j":["graduate","man","student","human"]},"woman-student":{"a":"Woman Student","b":"1F469-200D-1F393","j":["graduate","student","woman","human"]},"teacher":{"a":"Teacher","b":"1F9D1-200D-1F3EB","j":["instructor","professor"]},"man-teacher":{"a":"Man Teacher","b":"1F468-200D-1F3EB","j":["instructor","man","professor","teacher","human"]},"woman-teacher":{"a":"Woman Teacher","b":"1F469-200D-1F3EB","j":["instructor","professor","teacher","woman","human"]},"judge":{"a":"Judge","b":"1F9D1-200D-2696-FE0F","j":["justice","scales","law"]},"man-judge":{"a":"Man Judge","b":"1F468-200D-2696-FE0F","j":["judge","justice","man","scales","court","human"]},"woman-judge":{"a":"Woman Judge","b":"1F469-200D-2696-FE0F","j":["judge","justice","scales","woman","court","human"]},"farmer":{"a":"Farmer","b":"1F9D1-200D-1F33E","j":["gardener","rancher","crops"]},"man-farmer":{"a":"Man Farmer","b":"1F468-200D-1F33E","j":["farmer","gardener","man","rancher","human"]},"woman-farmer":{"a":"Woman Farmer","b":"1F469-200D-1F33E","j":["farmer","gardener","rancher","woman","human"]},"cook":{"a":"Cook","b":"1F9D1-200D-1F373","j":["chef","food","kitchen","culinary"]},"man-cook":{"a":"Man Cook","b":"1F468-200D-1F373","j":["chef","cook","man","human"]},"woman-cook":{"a":"Woman Cook","b":"1F469-200D-1F373","j":["chef","cook","woman","human"]},"mechanic":{"a":"Mechanic","b":"1F9D1-200D-1F527","j":["electrician","plumber","tradesperson","worker","technician"]},"man-mechanic":{"a":"Man Mechanic","b":"1F468-200D-1F527","j":["electrician","man","mechanic","plumber","tradesperson","human","wrench"]},"woman-mechanic":{"a":"Woman Mechanic","b":"1F469-200D-1F527","j":["electrician","mechanic","plumber","tradesperson","woman","human","wrench"]},"factory-worker":{"a":"Factory Worker","b":"1F9D1-200D-1F3ED","j":["assembly","factory","industrial","worker","labor"]},"man-factory-worker":{"a":"Man Factory Worker","b":"1F468-200D-1F3ED","j":["assembly","factory","industrial","man","worker","human"]},"woman-factory-worker":{"a":"Woman Factory Worker","b":"1F469-200D-1F3ED","j":["assembly","factory","industrial","woman","worker","human"]},"office-worker":{"a":"Office Worker","b":"1F9D1-200D-1F4BC","j":["architect","business","manager","white-collar"]},"man-office-worker":{"a":"Man Office Worker","b":"1F468-200D-1F4BC","j":["architect","business","man","manager","white-collar","human"]},"woman-office-worker":{"a":"Woman Office Worker","b":"1F469-200D-1F4BC","j":["architect","business","manager","white-collar","woman","human"]},"scientist":{"a":"Scientist","b":"1F9D1-200D-1F52C","j":["biologist","chemist","engineer","physicist","chemistry"]},"man-scientist":{"a":"Man Scientist","b":"1F468-200D-1F52C","j":["biologist","chemist","engineer","man","physicist","scientist","human"]},"woman-scientist":{"a":"Woman Scientist","b":"1F469-200D-1F52C","j":["biologist","chemist","engineer","physicist","scientist","woman","human"]},"technologist":{"a":"Technologist","b":"1F9D1-200D-1F4BB","j":["coder","developer","inventor","software","computer"]},"man-technologist":{"a":"Man Technologist","b":"1F468-200D-1F4BB","j":["coder","developer","inventor","man","software","technologist","engineer","programmer","human","laptop","computer"]},"woman-technologist":{"a":"Woman Technologist","b":"1F469-200D-1F4BB","j":["coder","developer","inventor","software","technologist","woman","engineer","programmer","human","laptop","computer"]},"singer":{"a":"Singer","b":"1F9D1-200D-1F3A4","j":["actor","entertainer","rock","star","song","artist","performer"]},"man-singer":{"a":"Man Singer","b":"1F468-200D-1F3A4","j":["actor","entertainer","man","rock","singer","star","rockstar","human"]},"woman-singer":{"a":"Woman Singer","b":"1F469-200D-1F3A4","j":["actor","entertainer","rock","singer","star","woman","rockstar","human"]},"artist":{"a":"Artist","b":"1F9D1-200D-1F3A8","j":["palette","painting","draw","creativity"]},"man-artist":{"a":"Man Artist","b":"1F468-200D-1F3A8","j":["artist","man","palette","painter","human"]},"woman-artist":{"a":"Woman Artist","b":"1F469-200D-1F3A8","j":["artist","palette","woman","painter","human"]},"pilot":{"a":"Pilot","b":"1F9D1-200D-2708-FE0F","j":["plane","fly","airplane"]},"man-pilot":{"a":"Man Pilot","b":"1F468-200D-2708-FE0F","j":["man","pilot","plane","aviator","human"]},"woman-pilot":{"a":"Woman Pilot","b":"1F469-200D-2708-FE0F","j":["pilot","plane","woman","aviator","human"]},"astronaut":{"a":"Astronaut","b":"1F9D1-200D-1F680","j":["rocket","outerspace"]},"man-astronaut":{"a":"Man Astronaut","b":"1F468-200D-1F680","j":["astronaut","man","rocket","space","human"]},"woman-astronaut":{"a":"Woman Astronaut","b":"1F469-200D-1F680","j":["astronaut","rocket","woman","space","human"]},"firefighter":{"a":"Firefighter","b":"1F9D1-200D-1F692","j":["firetruck","fire"]},"man-firefighter":{"a":"Man Firefighter","b":"1F468-200D-1F692","j":["firefighter","firetruck","man","fireman","human"]},"woman-firefighter":{"a":"Woman Firefighter","b":"1F469-200D-1F692","j":["firefighter","firetruck","woman","fireman","human"]},"police-officer":{"a":"Police Officer","b":"1F46E","j":["cop","officer","police"]},"man-police-officer":{"a":"Man Police Officer","b":"1F46E-200D-2642-FE0F","j":["cop","man","officer","police","law","legal","enforcement","arrest","911"]},"woman-police-officer":{"a":"Woman Police Officer","b":"1F46E-200D-2640-FE0F","j":["cop","officer","police","woman","law","legal","enforcement","arrest","911","female"]},"detective":{"a":"Detective","b":"1F575","j":["sleuth","spy","human"]},"man-detective":{"a":"Man Detective","b":"1F575-FE0F-200D-2642-FE0F","j":["detective","man","sleuth","spy","crime"]},"woman-detective":{"a":"Woman Detective","b":"1F575-FE0F-200D-2640-FE0F","j":["detective","sleuth","spy","woman","human","female"]},"guard":{"a":"Guard","b":"1F482","j":["protect"]},"man-guard":{"a":"Man Guard","b":"1F482-200D-2642-FE0F","j":["guard","man","uk","gb","british","male","guy","royal"]},"woman-guard":{"a":"Woman Guard","b":"1F482-200D-2640-FE0F","j":["guard","woman","uk","gb","british","female","royal"]},"ninja":{"a":"Ninja","b":"1F977","j":["fighter","hidden","stealth","ninjutsu","skills","japanese"]},"construction-worker":{"a":"Construction Worker","b":"1F477","j":["construction","hat","worker","labor","build"]},"man-construction-worker":{"a":"Man Construction Worker","b":"1F477-200D-2642-FE0F","j":["construction","man","worker","male","human","wip","guy","build","labor"]},"woman-construction-worker":{"a":"Woman Construction Worker","b":"1F477-200D-2640-FE0F","j":["construction","woman","worker","female","human","wip","build","labor"]},"prince":{"a":"Prince","b":"1F934","j":["boy","man","male","crown","royal","king"]},"princess":{"a":"Princess","b":"1F478","j":["fairy tale","fantasy","girl","woman","female","blond","crown","royal","queen"]},"person-wearing-turban":{"a":"Person Wearing Turban","b":"1F473","j":["turban","headdress"]},"man-wearing-turban":{"a":"Man Wearing Turban","b":"1F473-200D-2642-FE0F","j":["man","turban","male","indian","hinduism","arabs"]},"woman-wearing-turban":{"a":"Woman Wearing Turban","b":"1F473-200D-2640-FE0F","j":["turban","woman","female","indian","hinduism","arabs"]},"person-with-skullcap":{"a":"Person with Skullcap","b":"1F472","j":["cap","gua pi mao","hat","person","skullcap","man_with_skullcap","male","boy","chinese"]},"woman-with-headscarf":{"a":"Woman with Headscarf","b":"1F9D5","j":["headscarf","hijab","mantilla","tichel","bandana","head kerchief","female"]},"person-in-tuxedo":{"a":"Person in Tuxedo","b":"1F935","j":["groom","person","tuxedo","man_in_tuxedo","couple","marriage","wedding"]},"man-in-tuxedo":{"a":"Man in Tuxedo","b":"1F935-200D-2642-FE0F","j":["man","tuxedo","formal","fashion"]},"woman-in-tuxedo":{"a":"Woman in Tuxedo","b":"1F935-200D-2640-FE0F","j":["tuxedo","woman","formal","fashion"]},"person-with-veil":{"a":"Person with Veil","b":"1F470","j":["bride","person","veil","wedding","bride_with_veil","couple","marriage","woman"]},"man-with-veil":{"a":"Man with Veil","b":"1F470-200D-2642-FE0F","j":["man","veil","wedding","marriage"]},"woman-with-veil":{"a":"Woman with Veil","b":"1F470-200D-2640-FE0F","j":["veil","woman","wedding","marriage"]},"pregnant-woman":{"a":"Pregnant Woman","b":"1F930","j":["pregnant","woman","baby"]},"breastfeeding":{"a":"Breast-Feeding","b":"1F931","j":["baby","breast","breast-feeding","nursing","breast_feeding"]},"woman-feeding-baby":{"a":"Woman Feeding Baby","b":"1F469-200D-1F37C","j":["baby","feeding","nursing","woman","birth","food"]},"man-feeding-baby":{"a":"Man Feeding Baby","b":"1F468-200D-1F37C","j":["baby","feeding","man","nursing","birth","food"]},"person-feeding-baby":{"a":"Person Feeding Baby","b":"1F9D1-200D-1F37C","j":["baby","feeding","nursing","person","birth","food"]},"baby-angel":{"a":"Baby Angel","b":"1F47C","j":["angel","baby","face","fairy tale","fantasy","heaven","wings","halo"]},"santa-claus":{"a":"Santa Claus","b":"1F385","j":["celebration","Christmas","claus","father","santa","festival","man","male","xmas","father christmas"]},"mrs-claus":{"a":"Mrs. Claus","b":"1F936","j":["celebration","Christmas","claus","mother","Mrs.","woman","female","xmas","mother christmas"]},"mx-claus":{"a":"Mx Claus","b":"1F9D1-200D-1F384","j":["Claus, christmas","christmas"]},"superhero":{"a":"Superhero","b":"1F9B8","j":["good","hero","heroine","superpower","marvel"]},"man-superhero":{"a":"Man Superhero","b":"1F9B8-200D-2642-FE0F","j":["good","hero","man","superpower","male","superpowers"]},"woman-superhero":{"a":"Woman Superhero","b":"1F9B8-200D-2640-FE0F","j":["good","hero","heroine","superpower","woman","female","superpowers"]},"supervillain":{"a":"Supervillain","b":"1F9B9","j":["criminal","evil","superpower","villain","marvel"]},"man-supervillain":{"a":"Man Supervillain","b":"1F9B9-200D-2642-FE0F","j":["criminal","evil","man","superpower","villain","male","bad","hero","superpowers"]},"woman-supervillain":{"a":"Woman Supervillain","b":"1F9B9-200D-2640-FE0F","j":["criminal","evil","superpower","villain","woman","female","bad","heroine","superpowers"]},"mage":{"a":"Mage","b":"1F9D9","j":["sorcerer","sorceress","witch","wizard","magic"]},"man-mage":{"a":"Man Mage","b":"1F9D9-200D-2642-FE0F","j":["sorcerer","wizard","man","male","mage"]},"woman-mage":{"a":"Woman Mage","b":"1F9D9-200D-2640-FE0F","j":["sorceress","witch","woman","female","mage"]},"fairy":{"a":"Fairy","b":"1F9DA","j":["Oberon","Puck","Titania","wings","magical"]},"man-fairy":{"a":"Man Fairy","b":"1F9DA-200D-2642-FE0F","j":["Oberon","Puck","man","male"]},"woman-fairy":{"a":"Woman Fairy","b":"1F9DA-200D-2640-FE0F","j":["Titania","woman","female"]},"vampire":{"a":"Vampire","b":"1F9DB","j":["Dracula","undead","blood","twilight"]},"man-vampire":{"a":"Man Vampire","b":"1F9DB-200D-2642-FE0F","j":["Dracula","undead","man","male","dracula"]},"woman-vampire":{"a":"Woman Vampire","b":"1F9DB-200D-2640-FE0F","j":["undead","woman","female"]},"merperson":{"a":"Merperson","b":"1F9DC","j":["mermaid","merman","merwoman","sea"]},"merman":{"a":"Merman","b":"1F9DC-200D-2642-FE0F","j":["Triton","man","male","triton"]},"mermaid":{"a":"Mermaid","b":"1F9DC-200D-2640-FE0F","j":["merwoman","woman","female","ariel"]},"elf":{"a":"Elf","b":"1F9DD","j":["magical","LOTR style"]},"man-elf":{"a":"Man Elf","b":"1F9DD-200D-2642-FE0F","j":["magical","man","male"]},"woman-elf":{"a":"Woman Elf","b":"1F9DD-200D-2640-FE0F","j":["magical","woman","female"]},"genie":{"a":"Genie","b":"1F9DE","j":["djinn","(non-human color)","magical","wishes"]},"man-genie":{"a":"Man Genie","b":"1F9DE-200D-2642-FE0F","j":["djinn","man","male"]},"woman-genie":{"a":"Woman Genie","b":"1F9DE-200D-2640-FE0F","j":["djinn","woman","female"]},"zombie":{"a":"Zombie","b":"1F9DF","j":["undead","walking dead","(non-human color)","dead"]},"man-zombie":{"a":"Man Zombie","b":"1F9DF-200D-2642-FE0F","j":["undead","walking dead","man","male","dracula"]},"woman-zombie":{"a":"Woman Zombie","b":"1F9DF-200D-2640-FE0F","j":["undead","walking dead","woman","female"]},"person-getting-massage":{"a":"Person Getting Massage","b":"1F486","j":["face","massage","salon","relax"]},"man-getting-massage":{"a":"Man Getting Massage","b":"1F486-200D-2642-FE0F","j":["face","man","massage","male","boy","head"]},"woman-getting-massage":{"a":"Woman Getting Massage","b":"1F486-200D-2640-FE0F","j":["face","massage","woman","female","girl","head"]},"person-getting-haircut":{"a":"Person Getting Haircut","b":"1F487","j":["barber","beauty","haircut","parlor","hairstyle"]},"man-getting-haircut":{"a":"Man Getting Haircut","b":"1F487-200D-2642-FE0F","j":["haircut","man","male","boy"]},"woman-getting-haircut":{"a":"Woman Getting Haircut","b":"1F487-200D-2640-FE0F","j":["haircut","woman","female","girl"]},"person-walking":{"a":"Person Walking","b":"1F6B6","j":["hike","walk","walking","move"]},"man-walking":{"a":"Man Walking","b":"1F6B6-200D-2642-FE0F","j":["hike","man","walk","human","feet","steps"]},"woman-walking":{"a":"Woman Walking","b":"1F6B6-200D-2640-FE0F","j":["hike","walk","woman","human","feet","steps","female"]},"person-standing":{"a":"Person Standing","b":"1F9CD","j":["stand","standing","still"]},"man-standing":{"a":"Man Standing","b":"1F9CD-200D-2642-FE0F","j":["man","standing","still"]},"woman-standing":{"a":"Woman Standing","b":"1F9CD-200D-2640-FE0F","j":["standing","woman","still"]},"person-kneeling":{"a":"Person Kneeling","b":"1F9CE","j":["kneel","kneeling","pray","respectful"]},"man-kneeling":{"a":"Man Kneeling","b":"1F9CE-200D-2642-FE0F","j":["kneeling","man","pray","respectful"]},"woman-kneeling":{"a":"Woman Kneeling","b":"1F9CE-200D-2640-FE0F","j":["kneeling","woman","respectful","pray"]},"person-with-white-cane":{"a":"Person with White Cane","b":"1F9D1-200D-1F9AF","j":["accessibility","blind","person_with_probing_cane"]},"man-with-white-cane":{"a":"Man with White Cane","b":"1F468-200D-1F9AF","j":["accessibility","blind","man","man_with_probing_cane"]},"woman-with-white-cane":{"a":"Woman with White Cane","b":"1F469-200D-1F9AF","j":["accessibility","blind","woman","woman_with_probing_cane"]},"person-in-motorized-wheelchair":{"a":"Person in Motorized Wheelchair","b":"1F9D1-200D-1F9BC","j":["accessibility","wheelchair","disability"]},"man-in-motorized-wheelchair":{"a":"Man in Motorized Wheelchair","b":"1F468-200D-1F9BC","j":["accessibility","man","wheelchair","disability"]},"woman-in-motorized-wheelchair":{"a":"Woman in Motorized Wheelchair","b":"1F469-200D-1F9BC","j":["accessibility","wheelchair","woman","disability"]},"person-in-manual-wheelchair":{"a":"Person in Manual Wheelchair","b":"1F9D1-200D-1F9BD","j":["accessibility","wheelchair","disability"]},"man-in-manual-wheelchair":{"a":"Man in Manual Wheelchair","b":"1F468-200D-1F9BD","j":["accessibility","man","wheelchair","disability"]},"woman-in-manual-wheelchair":{"a":"Woman in Manual Wheelchair","b":"1F469-200D-1F9BD","j":["accessibility","wheelchair","woman","disability"]},"person-running":{"a":"Person Running","b":"1F3C3","j":["marathon","running","move"]},"man-running":{"a":"Man Running","b":"1F3C3-200D-2642-FE0F","j":["man","marathon","racing","running","walking","exercise","race"]},"woman-running":{"a":"Woman Running","b":"1F3C3-200D-2640-FE0F","j":["marathon","racing","running","woman","walking","exercise","race","female"]},"woman-dancing":{"a":"Woman Dancing","b":"1F483","j":["dance","dancing","woman","female","girl","fun"]},"man-dancing":{"a":"Man Dancing","b":"1F57A","j":["dance","dancing","man","male","boy","fun","dancer"]},"person-in-suit-levitating":{"a":"Person in Suit Levitating","b":"1F574","j":["business","person","suit","man_in_suit_levitating","levitate","hover","jump"]},"people-with-bunny-ears":{"a":"People with Bunny Ears","b":"1F46F","j":["bunny ear","dancer","partying","perform","costume"]},"men-with-bunny-ears":{"a":"Men with Bunny Ears","b":"1F46F-200D-2642-FE0F","j":["bunny ear","dancer","men","partying","male","bunny","boys"]},"women-with-bunny-ears":{"a":"Women with Bunny Ears","b":"1F46F-200D-2640-FE0F","j":["bunny ear","dancer","partying","women","female","bunny","girls"]},"person-in-steamy-room":{"a":"Person in Steamy Room","b":"1F9D6","j":["sauna","steam room","hamam","steambath","relax","spa"]},"man-in-steamy-room":{"a":"Man in Steamy Room","b":"1F9D6-200D-2642-FE0F","j":["sauna","steam room","male","man","spa","steamroom"]},"woman-in-steamy-room":{"a":"Woman in Steamy Room","b":"1F9D6-200D-2640-FE0F","j":["sauna","steam room","female","woman","spa","steamroom"]},"person-climbing":{"a":"Person Climbing","b":"1F9D7","j":["climber","sport"]},"man-climbing":{"a":"Man Climbing","b":"1F9D7-200D-2642-FE0F","j":["climber","sports","hobby","man","male","rock"]},"woman-climbing":{"a":"Woman Climbing","b":"1F9D7-200D-2640-FE0F","j":["climber","sports","hobby","woman","female","rock"]},"person-fencing":{"a":"Person Fencing","b":"1F93A","j":["fencer","fencing","sword","sports"]},"horse-racing":{"a":"Horse Racing","b":"1F3C7","j":["horse","jockey","racehorse","racing","animal","betting","competition","gambling","luck"]},"skier":{"a":"Skier","b":"26F7","j":["ski","snow","sports","winter"]},"snowboarder":{"a":"Snowboarder","b":"1F3C2","j":["ski","snow","snowboard","sports","winter"]},"person-golfing":{"a":"Person Golfing","b":"1F3CC","j":["ball","golf","sports","business"]},"man-golfing":{"a":"Man Golfing","b":"1F3CC-FE0F-200D-2642-FE0F","j":["golf","man","sport"]},"woman-golfing":{"a":"Woman Golfing","b":"1F3CC-FE0F-200D-2640-FE0F","j":["golf","woman","sports","business","female"]},"person-surfing":{"a":"Person Surfing","b":"1F3C4","j":["surfing","sport","sea"]},"man-surfing":{"a":"Man Surfing","b":"1F3C4-200D-2642-FE0F","j":["man","surfing","sports","ocean","sea","summer","beach"]},"woman-surfing":{"a":"Woman Surfing","b":"1F3C4-200D-2640-FE0F","j":["surfing","woman","sports","ocean","sea","summer","beach","female"]},"person-rowing-boat":{"a":"Person Rowing Boat","b":"1F6A3","j":["boat","rowboat","sport","move"]},"man-rowing-boat":{"a":"Man Rowing Boat","b":"1F6A3-200D-2642-FE0F","j":["boat","man","rowboat","sports","hobby","water","ship"]},"woman-rowing-boat":{"a":"Woman Rowing Boat","b":"1F6A3-200D-2640-FE0F","j":["boat","rowboat","woman","sports","hobby","water","ship","female"]},"person-swimming":{"a":"Person Swimming","b":"1F3CA","j":["swim","sport","pool"]},"man-swimming":{"a":"Man Swimming","b":"1F3CA-200D-2642-FE0F","j":["man","swim","sports","exercise","human","athlete","water","summer"]},"woman-swimming":{"a":"Woman Swimming","b":"1F3CA-200D-2640-FE0F","j":["swim","woman","sports","exercise","human","athlete","water","summer","female"]},"person-bouncing-ball":{"a":"Person Bouncing Ball","b":"26F9","j":["ball","sports","human"]},"man-bouncing-ball":{"a":"Man Bouncing Ball","b":"26F9-FE0F-200D-2642-FE0F","j":["ball","man","sport"]},"woman-bouncing-ball":{"a":"Woman Bouncing Ball","b":"26F9-FE0F-200D-2640-FE0F","j":["ball","woman","sports","human","female"]},"person-lifting-weights":{"a":"Person Lifting Weights","b":"1F3CB","j":["lifter","weight","sports","training","exercise"]},"man-lifting-weights":{"a":"Man Lifting Weights","b":"1F3CB-FE0F-200D-2642-FE0F","j":["man","weight lifter","sport"]},"woman-lifting-weights":{"a":"Woman Lifting Weights","b":"1F3CB-FE0F-200D-2640-FE0F","j":["weight lifter","woman","sports","training","exercise","female"]},"person-biking":{"a":"Person Biking","b":"1F6B4","j":["bicycle","biking","cyclist","sport","move"]},"man-biking":{"a":"Man Biking","b":"1F6B4-200D-2642-FE0F","j":["bicycle","biking","cyclist","man","sports","bike","exercise","hipster"]},"woman-biking":{"a":"Woman Biking","b":"1F6B4-200D-2640-FE0F","j":["bicycle","biking","cyclist","woman","sports","bike","exercise","hipster","female"]},"person-mountain-biking":{"a":"Person Mountain Biking","b":"1F6B5","j":["bicycle","bicyclist","bike","cyclist","mountain","sport","move"]},"man-mountain-biking":{"a":"Man Mountain Biking","b":"1F6B5-200D-2642-FE0F","j":["bicycle","bike","cyclist","man","mountain","transportation","sports","human","race"]},"woman-mountain-biking":{"a":"Woman Mountain Biking","b":"1F6B5-200D-2640-FE0F","j":["bicycle","bike","biking","cyclist","mountain","woman","transportation","sports","human","race","female"]},"person-cartwheeling":{"a":"Person Cartwheeling","b":"1F938","j":["cartwheel","gymnastics","sport","gymnastic"]},"man-cartwheeling":{"a":"Man Cartwheeling","b":"1F938-200D-2642-FE0F","j":["cartwheel","gymnastics","man"]},"woman-cartwheeling":{"a":"Woman Cartwheeling","b":"1F938-200D-2640-FE0F","j":["cartwheel","gymnastics","woman"]},"people-wrestling":{"a":"People Wrestling","b":"1F93C","j":["wrestle","wrestler","sport"]},"men-wrestling":{"a":"Men Wrestling","b":"1F93C-200D-2642-FE0F","j":["men","wrestle","sports","wrestlers"]},"women-wrestling":{"a":"Women Wrestling","b":"1F93C-200D-2640-FE0F","j":["women","wrestle","sports","wrestlers"]},"person-playing-water-polo":{"a":"Person Playing Water Polo","b":"1F93D","j":["polo","water","sport"]},"man-playing-water-polo":{"a":"Man Playing Water Polo","b":"1F93D-200D-2642-FE0F","j":["man","water polo","sports","pool"]},"woman-playing-water-polo":{"a":"Woman Playing Water Polo","b":"1F93D-200D-2640-FE0F","j":["water polo","woman","sports","pool"]},"person-playing-handball":{"a":"Person Playing Handball","b":"1F93E","j":["ball","handball","sport"]},"man-playing-handball":{"a":"Man Playing Handball","b":"1F93E-200D-2642-FE0F","j":["handball","man","sports"]},"woman-playing-handball":{"a":"Woman Playing Handball","b":"1F93E-200D-2640-FE0F","j":["handball","woman","sports"]},"person-juggling":{"a":"Person Juggling","b":"1F939","j":["balance","juggle","multitask","skill","performance"]},"man-juggling":{"a":"Man Juggling","b":"1F939-200D-2642-FE0F","j":["juggling","man","multitask","juggle","balance","skill"]},"woman-juggling":{"a":"Woman Juggling","b":"1F939-200D-2640-FE0F","j":["juggling","multitask","woman","juggle","balance","skill"]},"person-in-lotus-position":{"a":"Person in Lotus Position","b":"1F9D8","j":["meditation","yoga","serenity","meditate"]},"man-in-lotus-position":{"a":"Man in Lotus Position","b":"1F9D8-200D-2642-FE0F","j":["meditation","yoga","man","male","serenity","zen","mindfulness"]},"woman-in-lotus-position":{"a":"Woman in Lotus Position","b":"1F9D8-200D-2640-FE0F","j":["meditation","yoga","woman","female","serenity","zen","mindfulness"]},"person-taking-bath":{"a":"Person Taking Bath","b":"1F6C0","j":["bath","bathtub","clean","shower","bathroom"]},"person-in-bed":{"a":"Person in Bed","b":"1F6CC","j":["hotel","sleep","bed","rest"]},"people-holding-hands":{"a":"People Holding Hands","b":"1F9D1-200D-1F91D-200D-1F9D1","j":["couple","hand","hold","holding hands","person","friendship"]},"women-holding-hands":{"a":"Women Holding Hands","b":"1F46D","j":["couple","hand","holding hands","women","pair","friendship","love","like","female","people","human"]},"woman-and-man-holding-hands":{"a":"Woman and Man Holding Hands","b":"1F46B","j":["couple","hand","hold","holding hands","man","woman","pair","people","human","love","date","dating","like","affection","valentines","marriage"]},"men-holding-hands":{"a":"Men Holding Hands","b":"1F46C","j":["couple","Gemini","holding hands","man","men","twins","zodiac","pair","love","like","bromance","friendship","people","human"]},"kiss":{"a":"Kiss","b":"1F48F","j":["couple","pair","valentines","love","like","dating","marriage"]},"kiss-woman-man":{"a":"Kiss: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["couple","kiss","man","woman","love"]},"kiss-man-man":{"a":"Kiss: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F48B-200D-1F468","j":["couple","kiss","man","pair","valentines","love","like","dating","marriage"]},"kiss-woman-woman":{"a":"Kiss: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F48B-200D-1F469","j":["couple","kiss","woman","pair","valentines","love","like","dating","marriage"]},"couple-with-heart":{"a":"Couple with Heart","b":"1F491","j":["couple","love","pair","like","affection","human","dating","valentines","marriage"]},"couple-with-heart-woman-man":{"a":"Couple with Heart: Woman, Man","b":"1F469-200D-2764-FE0F-200D-1F468","j":["couple","couple with heart","love","man","woman"]},"couple-with-heart-man-man":{"a":"Couple with Heart: Man, Man","b":"1F468-200D-2764-FE0F-200D-1F468","j":["couple","couple with heart","love","man","pair","like","affection","human","dating","valentines","marriage"]},"couple-with-heart-woman-woman":{"a":"Couple with Heart: Woman, Woman","b":"1F469-200D-2764-FE0F-200D-1F469","j":["couple","couple with heart","love","woman","pair","like","affection","human","dating","valentines","marriage"]},"family":{"a":"Family","b":"1F46A","j":["home","parents","child","mom","dad","father","mother","people","human"]},"family-man-woman-boy":{"a":"Family: Man, Woman, Boy","b":"1F468-200D-1F469-200D-1F466","j":["boy","family","man","woman","love"]},"family-man-woman-girl":{"a":"Family: Man, Woman, Girl","b":"1F468-200D-1F469-200D-1F467","j":["family","girl","man","woman","home","parents","people","human","child"]},"family-man-woman-girl-boy":{"a":"Family: Man, Woman, Girl, Boy","b":"1F468-200D-1F469-200D-1F467-200D-1F466","j":["boy","family","girl","man","woman","home","parents","people","human","children"]},"family-man-woman-boy-boy":{"a":"Family: Man, Woman, Boy, Boy","b":"1F468-200D-1F469-200D-1F466-200D-1F466","j":["boy","family","man","woman","home","parents","people","human","children"]},"family-man-woman-girl-girl":{"a":"Family: Man, Woman, Girl, Girl","b":"1F468-200D-1F469-200D-1F467-200D-1F467","j":["family","girl","man","woman","home","parents","people","human","children"]},"family-man-man-boy":{"a":"Family: Man, Man, Boy","b":"1F468-200D-1F468-200D-1F466","j":["boy","family","man","home","parents","people","human","children"]},"family-man-man-girl":{"a":"Family: Man, Man, Girl","b":"1F468-200D-1F468-200D-1F467","j":["family","girl","man","home","parents","people","human","children"]},"family-man-man-girl-boy":{"a":"Family: Man, Man, Girl, Boy","b":"1F468-200D-1F468-200D-1F467-200D-1F466","j":["boy","family","girl","man","home","parents","people","human","children"]},"family-man-man-boy-boy":{"a":"Family: Man, Man, Boy, Boy","b":"1F468-200D-1F468-200D-1F466-200D-1F466","j":["boy","family","man","home","parents","people","human","children"]},"family-man-man-girl-girl":{"a":"Family: Man, Man, Girl, Girl","b":"1F468-200D-1F468-200D-1F467-200D-1F467","j":["family","girl","man","home","parents","people","human","children"]},"family-woman-woman-boy":{"a":"Family: Woman, Woman, Boy","b":"1F469-200D-1F469-200D-1F466","j":["boy","family","woman","home","parents","people","human","children"]},"family-woman-woman-girl":{"a":"Family: Woman, Woman, Girl","b":"1F469-200D-1F469-200D-1F467","j":["family","girl","woman","home","parents","people","human","children"]},"family-woman-woman-girl-boy":{"a":"Family: Woman, Woman, Girl, Boy","b":"1F469-200D-1F469-200D-1F467-200D-1F466","j":["boy","family","girl","woman","home","parents","people","human","children"]},"family-woman-woman-boy-boy":{"a":"Family: Woman, Woman, Boy, Boy","b":"1F469-200D-1F469-200D-1F466-200D-1F466","j":["boy","family","woman","home","parents","people","human","children"]},"family-woman-woman-girl-girl":{"a":"Family: Woman, Woman, Girl, Girl","b":"1F469-200D-1F469-200D-1F467-200D-1F467","j":["family","girl","woman","home","parents","people","human","children"]},"family-man-boy":{"a":"Family: Man, Boy","b":"1F468-200D-1F466","j":["boy","family","man","home","parent","people","human","child"]},"family-man-boy-boy":{"a":"Family: Man, Boy, Boy","b":"1F468-200D-1F466-200D-1F466","j":["boy","family","man","home","parent","people","human","children"]},"family-man-girl":{"a":"Family: Man, Girl","b":"1F468-200D-1F467","j":["family","girl","man","home","parent","people","human","child"]},"family-man-girl-boy":{"a":"Family: Man, Girl, Boy","b":"1F468-200D-1F467-200D-1F466","j":["boy","family","girl","man","home","parent","people","human","children"]},"family-man-girl-girl":{"a":"Family: Man, Girl, Girl","b":"1F468-200D-1F467-200D-1F467","j":["family","girl","man","home","parent","people","human","children"]},"family-woman-boy":{"a":"Family: Woman, Boy","b":"1F469-200D-1F466","j":["boy","family","woman","home","parent","people","human","child"]},"family-woman-boy-boy":{"a":"Family: Woman, Boy, Boy","b":"1F469-200D-1F466-200D-1F466","j":["boy","family","woman","home","parent","people","human","children"]},"family-woman-girl":{"a":"Family: Woman, Girl","b":"1F469-200D-1F467","j":["family","girl","woman","home","parent","people","human","child"]},"family-woman-girl-boy":{"a":"Family: Woman, Girl, Boy","b":"1F469-200D-1F467-200D-1F466","j":["boy","family","girl","woman","home","parent","people","human","children"]},"family-woman-girl-girl":{"a":"Family: Woman, Girl, Girl","b":"1F469-200D-1F467-200D-1F467","j":["family","girl","woman","home","parent","people","human","children"]},"speaking-head":{"a":"Speaking Head","b":"1F5E3","j":["face","head","silhouette","speak","speaking","user","person","human","sing","say","talk"]},"bust-in-silhouette":{"a":"Bust in Silhouette","b":"1F464","j":["bust","silhouette","user","person","human"]},"busts-in-silhouette":{"a":"Busts in Silhouette","b":"1F465","j":["bust","silhouette","user","person","human","group","team"]},"people-hugging":{"a":"People Hugging","b":"1FAC2","j":["goodbye","hello","hug","thanks","care"]},"footprints":{"a":"Footprints","b":"1F463","j":["clothing","footprint","print","feet","tracking","walking","beach"]},"red-hair":{"a":"Red Hair","b":"1F9B0","j":["ginger","red hair","redhead"]},"curly-hair":{"a":"Curly Hair","b":"1F9B1","j":["afro","curly","curly hair","ringlets"]},"white-hair":{"a":"White Hair","b":"1F9B3","j":["gray","hair","old","white"]},"bald":{"a":"Bald","b":"1F9B2","j":["bald","chemotherapy","hairless","no hair","shaven"]},"monkey-face":{"a":"Monkey Face","b":"1F435","j":["face","monkey","animal","nature","circus"]},"monkey":{"a":"Monkey","b":"1F412","j":["animal","nature","banana","circus"]},"gorilla":{"a":"Gorilla","b":"1F98D","j":["animal","nature","circus"]},"orangutan":{"a":"Orangutan","b":"1F9A7","j":["ape","animal"]},"dog-face":{"a":"Dog Face","b":"1F436","j":["dog","face","pet","animal","friend","nature","woof","puppy","faithful"]},"dog":{"a":"Dog","b":"1F415","j":["pet","animal","nature","friend","doge","faithful"]},"guide-dog":{"a":"Guide Dog","b":"1F9AE","j":["accessibility","blind","guide","animal"]},"service-dog":{"a":"Service Dog","b":"1F415-200D-1F9BA","j":["accessibility","assistance","dog","service","blind","animal"]},"poodle":{"a":"Poodle","b":"1F429","j":["dog","animal","101","nature","pet"]},"wolf":{"a":"Wolf","b":"1F43A","j":["face","animal","nature","wild"]},"fox":{"a":"Fox","b":"1F98A","j":["face","animal","nature"]},"raccoon":{"a":"Raccoon","b":"1F99D","j":["curious","sly","animal","nature"]},"cat-face":{"a":"Cat Face","b":"1F431","j":["cat","face","pet","animal","meow","nature","kitten"]},"cat":{"a":"Cat","b":"1F408","j":["pet","animal","meow","cats"]},"black-cat":{"a":"Black Cat","b":"1F408-200D-2B1B","j":["black","cat","unlucky","superstition","luck"]},"lion":{"a":"Lion","b":"1F981","j":["face","Leo","zodiac","animal","nature"]},"tiger-face":{"a":"Tiger Face","b":"1F42F","j":["face","tiger","animal","cat","danger","wild","nature","roar"]},"tiger":{"a":"Tiger","b":"1F405","j":["animal","nature","roar"]},"leopard":{"a":"Leopard","b":"1F406","j":["animal","nature"]},"horse-face":{"a":"Horse Face","b":"1F434","j":["face","horse","animal","brown","nature"]},"horse":{"a":"Horse","b":"1F40E","j":["equestrian","racehorse","racing","animal","gamble","luck"]},"unicorn":{"a":"Unicorn","b":"1F984","j":["face","animal","nature","mystical"]},"zebra":{"a":"Zebra","b":"1F993","j":["stripe","animal","nature","stripes","safari"]},"deer":{"a":"Deer","b":"1F98C","j":["animal","nature","horns","venison"]},"bison":{"a":"Bison","b":"1F9AC","j":["buffalo","herd","wisent","ox"]},"cow-face":{"a":"Cow Face","b":"1F42E","j":["cow","face","beef","ox","animal","nature","moo","milk"]},"ox":{"a":"Ox","b":"1F402","j":["bull","Taurus","zodiac","animal","cow","beef"]},"water-buffalo":{"a":"Water Buffalo","b":"1F403","j":["buffalo","water","animal","nature","ox","cow"]},"cow":{"a":"Cow","b":"1F404","j":["beef","ox","animal","nature","moo","milk"]},"pig-face":{"a":"Pig Face","b":"1F437","j":["face","pig","animal","oink","nature"]},"pig":{"a":"Pig","b":"1F416","j":["sow","animal","nature"]},"boar":{"a":"Boar","b":"1F417","j":["pig","animal","nature"]},"pig-nose":{"a":"Pig Nose","b":"1F43D","j":["face","nose","pig","animal","oink"]},"ram":{"a":"Ram","b":"1F40F","j":["Aries","male","sheep","zodiac","animal","nature"]},"ewe":{"a":"Ewe","b":"1F411","j":["female","sheep","animal","nature","wool","shipit"]},"goat":{"a":"Goat","b":"1F410","j":["Capricorn","zodiac","animal","nature"]},"camel":{"a":"Camel","b":"1F42A","j":["dromedary","hump","animal","hot","desert"]},"twohump-camel":{"a":"Two-Hump Camel","b":"1F42B","j":["bactrian","camel","hump","two-hump camel","two_hump_camel","animal","nature","hot","desert"]},"llama":{"a":"Llama","b":"1F999","j":["alpaca","guanaco","vicuña","wool","animal","nature"]},"giraffe":{"a":"Giraffe","b":"1F992","j":["spots","animal","nature","safari"]},"elephant":{"a":"Elephant","b":"1F418","j":["animal","nature","nose","th","circus"]},"mammoth":{"a":"Mammoth","b":"1F9A3","j":["extinction","large","tusk","woolly","elephant","tusks"]},"rhinoceros":{"a":"Rhinoceros","b":"1F98F","j":["animal","nature","horn"]},"hippopotamus":{"a":"Hippopotamus","b":"1F99B","j":["hippo","animal","nature"]},"mouse-face":{"a":"Mouse Face","b":"1F42D","j":["face","mouse","animal","nature","cheese_wedge","rodent"]},"mouse":{"a":"Mouse","b":"1F401","j":["animal","nature","rodent"]},"rat":{"a":"Rat","b":"1F400","j":["animal","mouse","rodent"]},"hamster":{"a":"Hamster","b":"1F439","j":["face","pet","animal","nature"]},"rabbit-face":{"a":"Rabbit Face","b":"1F430","j":["bunny","face","pet","rabbit","animal","nature","spring","magic"]},"rabbit":{"a":"Rabbit","b":"1F407","j":["bunny","pet","animal","nature","magic","spring"]},"chipmunk":{"a":"Chipmunk","b":"1F43F","j":["squirrel","animal","nature","rodent"]},"beaver":{"a":"Beaver","b":"1F9AB","j":["dam","animal","rodent"]},"hedgehog":{"a":"Hedgehog","b":"1F994","j":["spiny","animal","nature"]},"bat":{"a":"Bat","b":"1F987","j":["vampire","animal","nature","blind"]},"bear":{"a":"Bear","b":"1F43B","j":["face","animal","nature","wild"]},"polar-bear":{"a":"Polar Bear","b":"1F43B-200D-2744-FE0F","j":["arctic","bear","white","animal"]},"koala":{"a":"Koala","b":"1F428","j":["bear","animal","nature"]},"panda":{"a":"Panda","b":"1F43C","j":["face","animal","nature"]},"sloth":{"a":"Sloth","b":"1F9A5","j":["lazy","slow","animal"]},"otter":{"a":"Otter","b":"1F9A6","j":["fishing","playful","animal"]},"skunk":{"a":"Skunk","b":"1F9A8","j":["stink","animal"]},"kangaroo":{"a":"Kangaroo","b":"1F998","j":["Australia","joey","jump","marsupial","animal","nature","australia","hop"]},"badger":{"a":"Badger","b":"1F9A1","j":["honey badger","pester","animal","nature","honey"]},"paw-prints":{"a":"Paw Prints","b":"1F43E","j":["feet","paw","print","animal","tracking","footprints","dog","cat","pet"]},"turkey":{"a":"Turkey","b":"1F983","j":["bird","animal"]},"chicken":{"a":"Chicken","b":"1F414","j":["bird","animal","cluck","nature"]},"rooster":{"a":"Rooster","b":"1F413","j":["bird","animal","nature","chicken"]},"hatching-chick":{"a":"Hatching Chick","b":"1F423","j":["baby","bird","chick","hatching","animal","chicken","egg","born"]},"baby-chick":{"a":"Baby Chick","b":"1F424","j":["baby","bird","chick","animal","chicken"]},"frontfacing-baby-chick":{"a":"Front-Facing Baby Chick","b":"1F425","j":["baby","bird","chick","front-facing baby chick","front_facing_baby_chick","animal","chicken"]},"bird":{"a":"Bird","b":"1F426","j":["animal","nature","fly","tweet","spring"]},"penguin":{"a":"Penguin","b":"1F427","j":["bird","animal","nature"]},"dove":{"a":"Dove","b":"1F54A","j":["bird","fly","peace","animal"]},"eagle":{"a":"Eagle","b":"1F985","j":["bird","animal","nature"]},"duck":{"a":"Duck","b":"1F986","j":["bird","animal","nature","mallard"]},"swan":{"a":"Swan","b":"1F9A2","j":["bird","cygnet","ugly duckling","animal","nature"]},"owl":{"a":"Owl","b":"1F989","j":["bird","wise","animal","nature","hoot"]},"dodo":{"a":"Dodo","b":"1F9A4","j":["extinction","large","Mauritius","animal","bird"]},"feather":{"a":"Feather","b":"1FAB6","j":["bird","flight","light","plumage","fly"]},"flamingo":{"a":"Flamingo","b":"1F9A9","j":["flamboyant","tropical","animal"]},"peacock":{"a":"Peacock","b":"1F99A","j":["bird","ostentatious","peahen","proud","animal","nature"]},"parrot":{"a":"Parrot","b":"1F99C","j":["bird","pirate","talk","animal","nature"]},"frog":{"a":"Frog","b":"1F438","j":["face","animal","nature","croak","toad"]},"crocodile":{"a":"Crocodile","b":"1F40A","j":["animal","nature","reptile","lizard","alligator"]},"turtle":{"a":"Turtle","b":"1F422","j":["terrapin","tortoise","animal","slow","nature"]},"lizard":{"a":"Lizard","b":"1F98E","j":["reptile","animal","nature"]},"snake":{"a":"Snake","b":"1F40D","j":["bearer","Ophiuchus","serpent","zodiac","animal","evil","nature","hiss","python"]},"dragon-face":{"a":"Dragon Face","b":"1F432","j":["dragon","face","fairy tale","animal","myth","nature","chinese","green"]},"dragon":{"a":"Dragon","b":"1F409","j":["fairy tale","animal","myth","nature","chinese","green"]},"sauropod":{"a":"Sauropod","b":"1F995","j":["brachiosaurus","brontosaurus","diplodocus","animal","nature","dinosaur","extinct"]},"trex":{"a":"T-Rex","b":"1F996","j":["Tyrannosaurus Rex","t_rex","animal","nature","dinosaur","tyrannosaurus","extinct"]},"spouting-whale":{"a":"Spouting Whale","b":"1F433","j":["face","spouting","whale","animal","nature","sea","ocean"]},"whale":{"a":"Whale","b":"1F40B","j":["animal","nature","sea","ocean"]},"dolphin":{"a":"Dolphin","b":"1F42C","j":["flipper","animal","nature","fish","sea","ocean","fins","beach"]},"seal":{"a":"Seal","b":"1F9AD","j":["sea lion","animal","creature","sea"]},"fish":{"a":"Fish","b":"1F41F","j":["Pisces","zodiac","animal","food","nature"]},"tropical-fish":{"a":"Tropical Fish","b":"1F420","j":["fish","tropical","animal","swim","ocean","beach","nemo"]},"blowfish":{"a":"Blowfish","b":"1F421","j":["fish","animal","nature","food","sea","ocean"]},"shark":{"a":"Shark","b":"1F988","j":["fish","animal","nature","sea","ocean","jaws","fins","beach"]},"octopus":{"a":"Octopus","b":"1F419","j":["animal","creature","ocean","sea","nature","beach"]},"spiral-shell":{"a":"Spiral Shell","b":"1F41A","j":["shell","spiral","nature","sea","beach"]},"snail":{"a":"Snail","b":"1F40C","j":["slow","animal","shell"]},"butterfly":{"a":"Butterfly","b":"1F98B","j":["insect","pretty","animal","nature","caterpillar"]},"bug":{"a":"Bug","b":"1F41B","j":["insect","animal","nature","worm"]},"ant":{"a":"Ant","b":"1F41C","j":["insect","animal","nature","bug"]},"honeybee":{"a":"Honeybee","b":"1F41D","j":["bee","insect","animal","nature","bug","spring","honey"]},"beetle":{"a":"Beetle","b":"1FAB2","j":["bug","insect"]},"lady-beetle":{"a":"Lady Beetle","b":"1F41E","j":["beetle","insect","ladybird","ladybug","animal","nature"]},"cricket":{"a":"Cricket","b":"1F997","j":["grasshopper","Orthoptera","animal","chirp"]},"cockroach":{"a":"Cockroach","b":"1FAB3","j":["insect","pest","roach","pests"]},"spider":{"a":"Spider","b":"1F577","j":["insect","animal","arachnid"]},"spider-web":{"a":"Spider Web","b":"1F578","j":["spider","web","animal","insect","arachnid","silk"]},"scorpion":{"a":"Scorpion","b":"1F982","j":["scorpio","Scorpio","zodiac","animal","arachnid"]},"mosquito":{"a":"Mosquito","b":"1F99F","j":["disease","fever","malaria","pest","virus","animal","nature","insect"]},"fly":{"a":"Fly","b":"1FAB0","j":["disease","maggot","pest","rotting","insect"]},"worm":{"a":"Worm","b":"1FAB1","j":["annelid","earthworm","parasite","animal"]},"microbe":{"a":"Microbe","b":"1F9A0","j":["amoeba","bacteria","virus","germs"]},"bouquet":{"a":"Bouquet","b":"1F490","j":["flower","flowers","nature","spring"]},"cherry-blossom":{"a":"Cherry Blossom","b":"1F338","j":["blossom","cherry","flower","nature","plant","spring"]},"white-flower":{"a":"White Flower","b":"1F4AE","j":["flower","japanese","spring"]},"rosette":{"a":"Rosette","b":"1F3F5","j":["plant","flower","decoration","military"]},"rose":{"a":"Rose","b":"1F339","j":["flower","flowers","valentines","love","spring"]},"wilted-flower":{"a":"Wilted Flower","b":"1F940","j":["flower","wilted","plant","nature"]},"hibiscus":{"a":"Hibiscus","b":"1F33A","j":["flower","plant","vegetable","flowers","beach"]},"sunflower":{"a":"Sunflower","b":"1F33B","j":["flower","sun","nature","plant","fall"]},"blossom":{"a":"Blossom","b":"1F33C","j":["flower","nature","flowers","yellow"]},"tulip":{"a":"Tulip","b":"1F337","j":["flower","flowers","plant","nature","summer","spring"]},"seedling":{"a":"Seedling","b":"1F331","j":["young","plant","nature","grass","lawn","spring"]},"potted-plant":{"a":"Potted Plant","b":"1FAB4","j":["boring","grow","house","nurturing","plant","useless","greenery"]},"evergreen-tree":{"a":"Evergreen Tree","b":"1F332","j":["tree","plant","nature"]},"deciduous-tree":{"a":"Deciduous Tree","b":"1F333","j":["deciduous","shedding","tree","plant","nature"]},"palm-tree":{"a":"Palm Tree","b":"1F334","j":["palm","tree","plant","vegetable","nature","summer","beach","mojito","tropical"]},"cactus":{"a":"Cactus","b":"1F335","j":["plant","vegetable","nature"]},"sheaf-of-rice":{"a":"Sheaf of Rice","b":"1F33E","j":["ear","grain","rice","nature","plant"]},"herb":{"a":"Herb","b":"1F33F","j":["leaf","vegetable","plant","medicine","weed","grass","lawn"]},"shamrock":{"a":"Shamrock","b":"2618","j":["plant","vegetable","nature","irish","clover"]},"four-leaf-clover":{"a":"Four Leaf Clover","b":"1F340","j":["4","clover","four","four-leaf clover","leaf","vegetable","plant","nature","lucky","irish"]},"maple-leaf":{"a":"Maple Leaf","b":"1F341","j":["falling","leaf","maple","nature","plant","vegetable","ca","fall"]},"fallen-leaf":{"a":"Fallen Leaf","b":"1F342","j":["falling","leaf","nature","plant","vegetable","leaves"]},"leaf-fluttering-in-wind":{"a":"Leaf Fluttering in Wind","b":"1F343","j":["blow","flutter","leaf","wind","nature","plant","tree","vegetable","grass","lawn","spring"]},"grapes":{"a":"Grapes","b":"1F347","j":["fruit","grape","food","wine"]},"melon":{"a":"Melon","b":"1F348","j":["fruit","nature","food"]},"watermelon":{"a":"Watermelon","b":"1F349","j":["fruit","food","picnic","summer"]},"tangerine":{"a":"Tangerine","b":"1F34A","j":["fruit","orange","food","nature"]},"lemon":{"a":"Lemon","b":"1F34B","j":["citrus","fruit","nature"]},"banana":{"a":"Banana","b":"1F34C","j":["fruit","food","monkey"]},"pineapple":{"a":"Pineapple","b":"1F34D","j":["fruit","nature","food"]},"mango":{"a":"Mango","b":"1F96D","j":["fruit","tropical","food"]},"red-apple":{"a":"Red Apple","b":"1F34E","j":["apple","fruit","red","mac","school"]},"green-apple":{"a":"Green Apple","b":"1F34F","j":["apple","fruit","green","nature"]},"pear":{"a":"Pear","b":"1F350","j":["fruit","nature","food"]},"peach":{"a":"Peach","b":"1F351","j":["fruit","nature","food"]},"cherries":{"a":"Cherries","b":"1F352","j":["berries","cherry","fruit","red","food"]},"strawberry":{"a":"Strawberry","b":"1F353","j":["berry","fruit","food","nature"]},"blueberries":{"a":"Blueberries","b":"1FAD0","j":["berry","bilberry","blue","blueberry","fruit"]},"kiwi-fruit":{"a":"Kiwi Fruit","b":"1F95D","j":["food","fruit","kiwi"]},"tomato":{"a":"Tomato","b":"1F345","j":["fruit","vegetable","nature","food"]},"olive":{"a":"Olive","b":"1FAD2","j":["food","fruit"]},"coconut":{"a":"Coconut","b":"1F965","j":["palm","piña colada","fruit","nature","food"]},"avocado":{"a":"Avocado","b":"1F951","j":["food","fruit"]},"eggplant":{"a":"Eggplant","b":"1F346","j":["aubergine","vegetable","nature","food"]},"potato":{"a":"Potato","b":"1F954","j":["food","vegetable","tuber","vegatable","starch"]},"carrot":{"a":"Carrot","b":"1F955","j":["food","vegetable","orange"]},"ear-of-corn":{"a":"Ear of Corn","b":"1F33D","j":["corn","ear","maize","maze","food","vegetable","plant"]},"hot-pepper":{"a":"Hot Pepper","b":"1F336","j":["hot","pepper","food","spicy","chilli","chili"]},"bell-pepper":{"a":"Bell Pepper","b":"1FAD1","j":["capsicum","pepper","vegetable","fruit","plant"]},"cucumber":{"a":"Cucumber","b":"1F952","j":["food","pickle","vegetable","fruit"]},"leafy-green":{"a":"Leafy Green","b":"1F96C","j":["bok choy","cabbage","kale","lettuce","food","vegetable","plant"]},"broccoli":{"a":"Broccoli","b":"1F966","j":["wild cabbage","fruit","food","vegetable"]},"garlic":{"a":"Garlic","b":"1F9C4","j":["flavoring","food","spice","cook"]},"onion":{"a":"Onion","b":"1F9C5","j":["flavoring","cook","food","spice"]},"mushroom":{"a":"Mushroom","b":"1F344","j":["toadstool","plant","vegetable"]},"peanuts":{"a":"Peanuts","b":"1F95C","j":["food","nut","peanut","vegetable"]},"chestnut":{"a":"Chestnut","b":"1F330","j":["plant","food","squirrel"]},"bread":{"a":"Bread","b":"1F35E","j":["loaf","food","wheat","breakfast","toast"]},"croissant":{"a":"Croissant","b":"1F950","j":["bread","breakfast","food","french","roll"]},"baguette-bread":{"a":"Baguette Bread","b":"1F956","j":["baguette","bread","food","french"]},"flatbread":{"a":"Flatbread","b":"1FAD3","j":["arepa","lavash","naan","pita","flour","food"]},"pretzel":{"a":"Pretzel","b":"1F968","j":["twisted","convoluted","food","bread"]},"bagel":{"a":"Bagel","b":"1F96F","j":["bakery","breakfast","schmear","food","bread"]},"pancakes":{"a":"Pancakes","b":"1F95E","j":["breakfast","crêpe","food","hotcake","pancake","flapjacks","hotcakes"]},"waffle":{"a":"Waffle","b":"1F9C7","j":["breakfast","indecisive","iron","food"]},"cheese-wedge":{"a":"Cheese Wedge","b":"1F9C0","j":["cheese","food","chadder"]},"meat-on-bone":{"a":"Meat on Bone","b":"1F356","j":["bone","meat","good","food","drumstick"]},"poultry-leg":{"a":"Poultry Leg","b":"1F357","j":["bone","chicken","drumstick","leg","poultry","food","meat","bird","turkey"]},"cut-of-meat":{"a":"Cut of Meat","b":"1F969","j":["chop","lambchop","porkchop","steak","food","cow","meat","cut"]},"bacon":{"a":"Bacon","b":"1F953","j":["breakfast","food","meat","pork","pig"]},"hamburger":{"a":"Hamburger","b":"1F354","j":["burger","meat","fast food","beef","cheeseburger","mcdonalds","burger king"]},"french-fries":{"a":"French Fries","b":"1F35F","j":["french","fries","chips","snack","fast food"]},"pizza":{"a":"Pizza","b":"1F355","j":["cheese","slice","food","party"]},"hot-dog":{"a":"Hot Dog","b":"1F32D","j":["frankfurter","hotdog","sausage","food"]},"sandwich":{"a":"Sandwich","b":"1F96A","j":["bread","food","lunch"]},"taco":{"a":"Taco","b":"1F32E","j":["mexican","food"]},"burrito":{"a":"Burrito","b":"1F32F","j":["mexican","wrap","food"]},"tamale":{"a":"Tamale","b":"1FAD4","j":["mexican","wrapped","food","masa"]},"stuffed-flatbread":{"a":"Stuffed Flatbread","b":"1F959","j":["falafel","flatbread","food","gyro","kebab","stuffed"]},"falafel":{"a":"Falafel","b":"1F9C6","j":["chickpea","meatball","food"]},"egg":{"a":"Egg","b":"1F95A","j":["breakfast","food","chicken"]},"cooking":{"a":"Cooking","b":"1F373","j":["breakfast","egg","frying","pan","food","kitchen"]},"shallow-pan-of-food":{"a":"Shallow Pan of Food","b":"1F958","j":["casserole","food","paella","pan","shallow","cooking"]},"pot-of-food":{"a":"Pot of Food","b":"1F372","j":["pot","stew","food","meat","soup"]},"fondue":{"a":"Fondue","b":"1FAD5","j":["cheese","chocolate","melted","pot","Swiss","food"]},"bowl-with-spoon":{"a":"Bowl with Spoon","b":"1F963","j":["breakfast","cereal","congee","oatmeal","porridge","food"]},"green-salad":{"a":"Green Salad","b":"1F957","j":["food","green","salad","healthy","lettuce"]},"popcorn":{"a":"Popcorn","b":"1F37F","j":["food","movie theater","films","snack"]},"butter":{"a":"Butter","b":"1F9C8","j":["dairy","food","cook"]},"salt":{"a":"Salt","b":"1F9C2","j":["condiment","shaker"]},"canned-food":{"a":"Canned Food","b":"1F96B","j":["can","food","soup"]},"bento-box":{"a":"Bento Box","b":"1F371","j":["bento","box","food","japanese"]},"rice-cracker":{"a":"Rice Cracker","b":"1F358","j":["cracker","rice","food","japanese"]},"rice-ball":{"a":"Rice Ball","b":"1F359","j":["ball","Japanese","rice","food","japanese"]},"cooked-rice":{"a":"Cooked Rice","b":"1F35A","j":["cooked","rice","food","china","asian"]},"curry-rice":{"a":"Curry Rice","b":"1F35B","j":["curry","rice","food","spicy","hot","indian"]},"steaming-bowl":{"a":"Steaming Bowl","b":"1F35C","j":["bowl","noodle","ramen","steaming","food","japanese","chopsticks"]},"spaghetti":{"a":"Spaghetti","b":"1F35D","j":["pasta","food","italian","noodle"]},"roasted-sweet-potato":{"a":"Roasted Sweet Potato","b":"1F360","j":["potato","roasted","sweet","food","nature"]},"oden":{"a":"Oden","b":"1F362","j":["kebab","seafood","skewer","stick","food","japanese"]},"sushi":{"a":"Sushi","b":"1F363","j":["food","fish","japanese","rice"]},"fried-shrimp":{"a":"Fried Shrimp","b":"1F364","j":["fried","prawn","shrimp","tempura","food","animal","appetizer","summer"]},"fish-cake-with-swirl":{"a":"Fish Cake with Swirl","b":"1F365","j":["cake","fish","pastry","swirl","food","japan","sea","beach","narutomaki","pink","kamaboko","surimi","ramen"]},"moon-cake":{"a":"Moon Cake","b":"1F96E","j":["autumn","festival","yuèbǐng","food"]},"dango":{"a":"Dango","b":"1F361","j":["dessert","Japanese","skewer","stick","sweet","food","japanese","barbecue","meat"]},"dumpling":{"a":"Dumpling","b":"1F95F","j":["empanada","gyōza","jiaozi","pierogi","potsticker","food"]},"fortune-cookie":{"a":"Fortune Cookie","b":"1F960","j":["prophecy","food"]},"takeout-box":{"a":"Takeout Box","b":"1F961","j":["oyster pail","food","leftovers"]},"crab":{"a":"Crab","b":"1F980","j":["Cancer","zodiac","animal","crustacean"]},"lobster":{"a":"Lobster","b":"1F99E","j":["bisque","claws","seafood","animal","nature"]},"shrimp":{"a":"Shrimp","b":"1F990","j":["food","shellfish","small","animal","ocean","nature","seafood"]},"squid":{"a":"Squid","b":"1F991","j":["food","molusc","animal","nature","ocean","sea"]},"oyster":{"a":"Oyster","b":"1F9AA","j":["diving","pearl","food"]},"soft-ice-cream":{"a":"Soft Ice Cream","b":"1F366","j":["cream","dessert","ice","icecream","soft","sweet","food","hot","summer"]},"shaved-ice":{"a":"Shaved Ice","b":"1F367","j":["dessert","ice","shaved","sweet","hot","summer"]},"ice-cream":{"a":"Ice Cream","b":"1F368","j":["cream","dessert","ice","sweet","food","hot"]},"doughnut":{"a":"Doughnut","b":"1F369","j":["breakfast","dessert","donut","sweet","food","snack"]},"cookie":{"a":"Cookie","b":"1F36A","j":["dessert","sweet","food","snack","oreo","chocolate"]},"birthday-cake":{"a":"Birthday Cake","b":"1F382","j":["birthday","cake","celebration","dessert","pastry","sweet","food"]},"shortcake":{"a":"Shortcake","b":"1F370","j":["cake","dessert","pastry","slice","sweet","food"]},"cupcake":{"a":"Cupcake","b":"1F9C1","j":["bakery","sweet","food","dessert"]},"pie":{"a":"Pie","b":"1F967","j":["filling","pastry","fruit","meat","food","dessert"]},"chocolate-bar":{"a":"Chocolate Bar","b":"1F36B","j":["bar","chocolate","dessert","sweet","food","snack"]},"candy":{"a":"Candy","b":"1F36C","j":["dessert","sweet","snack","lolly"]},"lollipop":{"a":"Lollipop","b":"1F36D","j":["candy","dessert","sweet","food","snack"]},"custard":{"a":"Custard","b":"1F36E","j":["dessert","pudding","sweet","food"]},"honey-pot":{"a":"Honey Pot","b":"1F36F","j":["honey","honeypot","pot","sweet","bees","kitchen"]},"baby-bottle":{"a":"Baby Bottle","b":"1F37C","j":["baby","bottle","drink","milk","food","container"]},"glass-of-milk":{"a":"Glass of Milk","b":"1F95B","j":["drink","glass","milk","beverage","cow"]},"hot-beverage":{"a":"Hot Beverage","b":"2615","j":["beverage","coffee","drink","hot","steaming","tea","caffeine","latte","espresso"]},"teapot":{"a":"Teapot","b":"1FAD6","j":["drink","pot","tea","hot"]},"teacup-without-handle":{"a":"Teacup Without Handle","b":"1F375","j":["beverage","cup","drink","tea","teacup","bowl","breakfast","green","british"]},"sake":{"a":"Sake","b":"1F376","j":["bar","beverage","bottle","cup","drink","wine","drunk","japanese","alcohol","booze"]},"bottle-with-popping-cork":{"a":"Bottle with Popping Cork","b":"1F37E","j":["bar","bottle","cork","drink","popping","wine","celebration"]},"wine-glass":{"a":"Wine Glass","b":"1F377","j":["bar","beverage","drink","glass","wine","drunk","alcohol","booze"]},"cocktail-glass":{"a":"Cocktail Glass","b":"1F378","j":["bar","cocktail","drink","glass","drunk","alcohol","beverage","booze","mojito"]},"tropical-drink":{"a":"Tropical Drink","b":"1F379","j":["bar","drink","tropical","beverage","cocktail","summer","beach","alcohol","booze","mojito"]},"beer-mug":{"a":"Beer Mug","b":"1F37A","j":["bar","beer","drink","mug","relax","beverage","drunk","party","pub","summer","alcohol","booze"]},"clinking-beer-mugs":{"a":"Clinking Beer Mugs","b":"1F37B","j":["bar","beer","clink","drink","mug","relax","beverage","drunk","party","pub","summer","alcohol","booze"]},"clinking-glasses":{"a":"Clinking Glasses","b":"1F942","j":["celebrate","clink","drink","glass","beverage","party","alcohol","cheers","wine","champagne","toast"]},"tumbler-glass":{"a":"Tumbler Glass","b":"1F943","j":["glass","liquor","shot","tumbler","whisky","drink","beverage","drunk","alcohol","booze","bourbon","scotch"]},"cup-with-straw":{"a":"Cup with Straw","b":"1F964","j":["juice","soda","malt","soft drink","water","drink"]},"bubble-tea":{"a":"Bubble Tea","b":"1F9CB","j":["bubble","milk","pearl","tea","taiwan","boba","milk tea","straw"]},"beverage-box":{"a":"Beverage Box","b":"1F9C3","j":["beverage","box","juice","straw","sweet","drink"]},"mate":{"a":"Mate","b":"1F9C9","j":["drink","tea","beverage"]},"ice":{"a":"Ice","b":"1F9CA","j":["cold","ice cube","iceberg","water"]},"chopsticks":{"a":"Chopsticks","b":"1F962","j":["hashi","jeotgarak","kuaizi","food"]},"fork-and-knife-with-plate":{"a":"Fork and Knife with Plate","b":"1F37D","j":["cooking","fork","knife","plate","food","eat","meal","lunch","dinner","restaurant"]},"fork-and-knife":{"a":"Fork and Knife","b":"1F374","j":["cooking","cutlery","fork","knife","kitchen"]},"spoon":{"a":"Spoon","b":"1F944","j":["tableware","cutlery","kitchen"]},"kitchen-knife":{"a":"Kitchen Knife","b":"1F52A","j":["cooking","hocho","knife","tool","weapon","blade","cutlery","kitchen"]},"amphora":{"a":"Amphora","b":"1F3FA","j":["Aquarius","cooking","drink","jug","zodiac","vase","jar"]},"globe-showing-europeafrica":{"a":"Globe Showing Europe-Africa","b":"1F30D","j":["Africa","earth","Europe","globe","globe showing Europe-Africa","world","globe_showing_europe_africa","international"]},"globe-showing-americas":{"a":"Globe Showing Americas","b":"1F30E","j":["Americas","earth","globe","globe showing Americas","world","USA","international"]},"globe-showing-asiaaustralia":{"a":"Globe Showing Asia-Australia","b":"1F30F","j":["Asia","Australia","earth","globe","globe showing Asia-Australia","world","globe_showing_asia_australia","east","international"]},"globe-with-meridians":{"a":"Globe with Meridians","b":"1F310","j":["earth","globe","meridians","world","international","internet","interweb","i18n"]},"world-map":{"a":"World Map","b":"1F5FA","j":["map","world","location","direction"]},"map-of-japan":{"a":"Map of Japan","b":"1F5FE","j":["Japan","map","map of Japan","nation","country","japanese","asia"]},"compass":{"a":"Compass","b":"1F9ED","j":["magnetic","navigation","orienteering"]},"snowcapped-mountain":{"a":"Snow-Capped Mountain","b":"1F3D4","j":["cold","mountain","snow","snow-capped mountain","snow_capped_mountain","photo","nature","environment","winter"]},"mountain":{"a":"Mountain","b":"26F0","j":["photo","nature","environment"]},"volcano":{"a":"Volcano","b":"1F30B","j":["eruption","mountain","photo","nature","disaster"]},"mount-fuji":{"a":"Mount Fuji","b":"1F5FB","j":["fuji","mountain","photo","nature","japanese"]},"camping":{"a":"Camping","b":"1F3D5","j":["photo","outdoors","tent"]},"beach-with-umbrella":{"a":"Beach with Umbrella","b":"1F3D6","j":["beach","umbrella","weather","summer","sunny","sand","mojito"]},"desert":{"a":"Desert","b":"1F3DC","j":["photo","warm","saharah"]},"desert-island":{"a":"Desert Island","b":"1F3DD","j":["desert","island","photo","tropical","mojito"]},"national-park":{"a":"National Park","b":"1F3DE","j":["park","photo","environment","nature"]},"stadium":{"a":"Stadium","b":"1F3DF","j":["photo","place","sports","concert","venue"]},"classical-building":{"a":"Classical Building","b":"1F3DB","j":["classical","art","culture","history"]},"building-construction":{"a":"Building Construction","b":"1F3D7","j":["construction","wip","working","progress"]},"brick":{"a":"Brick","b":"1F9F1","j":["bricks","clay","mortar","wall"]},"rock":{"a":"Rock","b":"1FAA8","j":["boulder","heavy","solid","stone"]},"wood":{"a":"Wood","b":"1FAB5","j":["log","lumber","timber","nature","trunk"]},"hut":{"a":"Hut","b":"1F6D6","j":["house","roundhouse","yurt","structure"]},"houses":{"a":"Houses","b":"1F3D8","j":["buildings","photo"]},"derelict-house":{"a":"Derelict House","b":"1F3DA","j":["derelict","house","abandon","evict","broken","building"]},"house":{"a":"House","b":"1F3E0","j":["home","building"]},"house-with-garden":{"a":"House with Garden","b":"1F3E1","j":["garden","home","house","plant","nature"]},"office-building":{"a":"Office Building","b":"1F3E2","j":["building","bureau","work"]},"japanese-post-office":{"a":"Japanese Post Office","b":"1F3E3","j":["Japanese","Japanese post office","post","building","envelope","communication"]},"post-office":{"a":"Post Office","b":"1F3E4","j":["European","post","building","email"]},"hospital":{"a":"Hospital","b":"1F3E5","j":["doctor","medicine","building","health","surgery"]},"bank":{"a":"Bank","b":"1F3E6","j":["building","money","sales","cash","business","enterprise"]},"hotel":{"a":"Hotel","b":"1F3E8","j":["building","accomodation","checkin"]},"love-hotel":{"a":"Love Hotel","b":"1F3E9","j":["hotel","love","like","affection","dating"]},"convenience-store":{"a":"Convenience Store","b":"1F3EA","j":["convenience","store","building","shopping","groceries"]},"school":{"a":"School","b":"1F3EB","j":["building","student","education","learn","teach"]},"department-store":{"a":"Department Store","b":"1F3EC","j":["department","store","building","shopping","mall"]},"factory":{"a":"Factory","b":"1F3ED","j":["building","industry","pollution","smoke"]},"japanese-castle":{"a":"Japanese Castle","b":"1F3EF","j":["castle","Japanese","photo","building"]},"castle":{"a":"Castle","b":"1F3F0","j":["European","building","royalty","history"]},"wedding":{"a":"Wedding","b":"1F492","j":["chapel","romance","love","like","affection","couple","marriage","bride","groom"]},"tokyo-tower":{"a":"Tokyo Tower","b":"1F5FC","j":["Tokyo","tower","photo","japanese"]},"statue-of-liberty":{"a":"Statue of Liberty","b":"1F5FD","j":["liberty","statue","american","newyork"]},"church":{"a":"Church","b":"26EA","j":["Christian","cross","religion","building","christ"]},"mosque":{"a":"Mosque","b":"1F54C","j":["islam","Muslim","religion","worship","minaret"]},"hindu-temple":{"a":"Hindu Temple","b":"1F6D5","j":["hindu","temple","religion"]},"synagogue":{"a":"Synagogue","b":"1F54D","j":["Jew","Jewish","religion","temple","judaism","worship","jewish"]},"shinto-shrine":{"a":"Shinto Shrine","b":"26E9","j":["religion","shinto","shrine","temple","japan","kyoto"]},"kaaba":{"a":"Kaaba","b":"1F54B","j":["islam","Muslim","religion","mecca","mosque"]},"fountain":{"a":"Fountain","b":"26F2","j":["photo","summer","water","fresh"]},"tent":{"a":"Tent","b":"26FA","j":["camping","photo","outdoors"]},"foggy":{"a":"Foggy","b":"1F301","j":["fog","photo","mountain"]},"night-with-stars":{"a":"Night with Stars","b":"1F303","j":["night","star","evening","city","downtown"]},"cityscape":{"a":"Cityscape","b":"1F3D9","j":["city","photo","night life","urban"]},"sunrise-over-mountains":{"a":"Sunrise over Mountains","b":"1F304","j":["morning","mountain","sun","sunrise","view","vacation","photo"]},"sunrise":{"a":"Sunrise","b":"1F305","j":["morning","sun","view","vacation","photo"]},"cityscape-at-dusk":{"a":"Cityscape at Dusk","b":"1F306","j":["city","dusk","evening","landscape","sunset","photo","sky","buildings"]},"sunset":{"a":"Sunset","b":"1F307","j":["dusk","sun","photo","good morning","dawn"]},"bridge-at-night":{"a":"Bridge at Night","b":"1F309","j":["bridge","night","photo","sanfrancisco"]},"hot-springs":{"a":"Hot Springs","b":"2668","j":["hot","hotsprings","springs","steaming","bath","warm","relax"]},"carousel-horse":{"a":"Carousel Horse","b":"1F3A0","j":["carousel","horse","photo","carnival"]},"ferris-wheel":{"a":"Ferris Wheel","b":"1F3A1","j":["amusement park","ferris","wheel","photo","carnival","londoneye"]},"roller-coaster":{"a":"Roller Coaster","b":"1F3A2","j":["amusement park","coaster","roller","carnival","playground","photo","fun"]},"barber-pole":{"a":"Barber Pole","b":"1F488","j":["barber","haircut","pole","hair","salon","style"]},"circus-tent":{"a":"Circus Tent","b":"1F3AA","j":["circus","tent","festival","carnival","party"]},"locomotive":{"a":"Locomotive","b":"1F682","j":["engine","railway","steam","train","transportation","vehicle"]},"railway-car":{"a":"Railway Car","b":"1F683","j":["car","electric","railway","train","tram","trolleybus","transportation","vehicle"]},"highspeed-train":{"a":"High-Speed Train","b":"1F684","j":["high-speed train","railway","shinkansen","speed","train","high_speed_train","transportation","vehicle"]},"bullet-train":{"a":"Bullet Train","b":"1F685","j":["bullet","railway","shinkansen","speed","train","transportation","vehicle","fast","public","travel"]},"train":{"a":"Train","b":"1F686","j":["railway","transportation","vehicle"]},"metro":{"a":"Metro","b":"1F687","j":["subway","transportation","blue-square","mrt","underground","tube"]},"light-rail":{"a":"Light Rail","b":"1F688","j":["railway","transportation","vehicle"]},"station":{"a":"Station","b":"1F689","j":["railway","train","transportation","vehicle","public"]},"tram":{"a":"Tram","b":"1F68A","j":["trolleybus","transportation","vehicle"]},"monorail":{"a":"Monorail","b":"1F69D","j":["vehicle","transportation"]},"mountain-railway":{"a":"Mountain Railway","b":"1F69E","j":["car","mountain","railway","transportation","vehicle"]},"tram-car":{"a":"Tram Car","b":"1F68B","j":["car","tram","trolleybus","transportation","vehicle","carriage","public","travel"]},"bus":{"a":"Bus","b":"1F68C","j":["vehicle","car","transportation"]},"oncoming-bus":{"a":"Oncoming Bus","b":"1F68D","j":["bus","oncoming","vehicle","transportation"]},"trolleybus":{"a":"Trolleybus","b":"1F68E","j":["bus","tram","trolley","bart","transportation","vehicle"]},"minibus":{"a":"Minibus","b":"1F690","j":["bus","vehicle","car","transportation"]},"ambulance":{"a":"Ambulance","b":"1F691","j":["vehicle","health","911","hospital"]},"fire-engine":{"a":"Fire Engine","b":"1F692","j":["engine","fire","truck","transportation","cars","vehicle"]},"police-car":{"a":"Police Car","b":"1F693","j":["car","patrol","police","vehicle","cars","transportation","law","legal","enforcement"]},"oncoming-police-car":{"a":"Oncoming Police Car","b":"1F694","j":["car","oncoming","police","vehicle","law","legal","enforcement","911"]},"taxi":{"a":"Taxi","b":"1F695","j":["vehicle","uber","cars","transportation"]},"oncoming-taxi":{"a":"Oncoming Taxi","b":"1F696","j":["oncoming","taxi","vehicle","cars","uber"]},"automobile":{"a":"Automobile","b":"1F697","j":["car","red","transportation","vehicle"]},"oncoming-automobile":{"a":"Oncoming Automobile","b":"1F698","j":["automobile","car","oncoming","vehicle","transportation"]},"sport-utility-vehicle":{"a":"Sport Utility Vehicle","b":"1F699","j":["recreational","sport utility","transportation","vehicle"]},"pickup-truck":{"a":"Pickup Truck","b":"1F6FB","j":["pick-up","pickup","truck","car","transportation"]},"delivery-truck":{"a":"Delivery Truck","b":"1F69A","j":["delivery","truck","cars","transportation"]},"articulated-lorry":{"a":"Articulated Lorry","b":"1F69B","j":["lorry","semi","truck","vehicle","cars","transportation","express"]},"tractor":{"a":"Tractor","b":"1F69C","j":["vehicle","car","farming","agriculture"]},"racing-car":{"a":"Racing Car","b":"1F3CE","j":["car","racing","sports","race","fast","formula","f1"]},"motorcycle":{"a":"Motorcycle","b":"1F3CD","j":["racing","race","sports","fast"]},"motor-scooter":{"a":"Motor Scooter","b":"1F6F5","j":["motor","scooter","vehicle","vespa","sasha"]},"manual-wheelchair":{"a":"Manual Wheelchair","b":"1F9BD","j":["accessibility"]},"motorized-wheelchair":{"a":"Motorized Wheelchair","b":"1F9BC","j":["accessibility"]},"auto-rickshaw":{"a":"Auto Rickshaw","b":"1F6FA","j":["tuk tuk","move","transportation"]},"bicycle":{"a":"Bicycle","b":"1F6B2","j":["bike","sports","exercise","hipster"]},"kick-scooter":{"a":"Kick Scooter","b":"1F6F4","j":["kick","scooter","vehicle","razor"]},"skateboard":{"a":"Skateboard","b":"1F6F9","j":["board"]},"roller-skate":{"a":"Roller Skate","b":"1F6FC","j":["roller","skate","footwear","sports"]},"bus-stop":{"a":"Bus Stop","b":"1F68F","j":["bus","busstop","stop","transportation","wait"]},"motorway":{"a":"Motorway","b":"1F6E3","j":["highway","road","cupertino","interstate"]},"railway-track":{"a":"Railway Track","b":"1F6E4","j":["railway","train","transportation"]},"oil-drum":{"a":"Oil Drum","b":"1F6E2","j":["drum","oil","barrell"]},"fuel-pump":{"a":"Fuel Pump","b":"26FD","j":["diesel","fuel","fuelpump","gas","pump","station","gas station","petroleum"]},"police-car-light":{"a":"Police Car Light","b":"1F6A8","j":["beacon","car","light","police","revolving","ambulance","911","emergency","alert","error","pinged","law","legal"]},"horizontal-traffic-light":{"a":"Horizontal Traffic Light","b":"1F6A5","j":["light","signal","traffic","transportation"]},"vertical-traffic-light":{"a":"Vertical Traffic Light","b":"1F6A6","j":["light","signal","traffic","transportation","driving"]},"stop-sign":{"a":"Stop Sign","b":"1F6D1","j":["octagonal","sign","stop"]},"construction":{"a":"Construction","b":"1F6A7","j":["barrier","wip","progress","caution","warning"]},"anchor":{"a":"Anchor","b":"2693","j":["ship","tool","ferry","sea","boat"]},"sailboat":{"a":"Sailboat","b":"26F5","j":["boat","resort","sea","yacht","ship","summer","transportation","water","sailing"]},"canoe":{"a":"Canoe","b":"1F6F6","j":["boat","paddle","water","ship"]},"speedboat":{"a":"Speedboat","b":"1F6A4","j":["boat","ship","transportation","vehicle","summer"]},"passenger-ship":{"a":"Passenger Ship","b":"1F6F3","j":["passenger","ship","yacht","cruise","ferry"]},"ferry":{"a":"Ferry","b":"26F4","j":["boat","passenger","ship","yacht"]},"motor-boat":{"a":"Motor Boat","b":"1F6E5","j":["boat","motorboat","ship"]},"ship":{"a":"Ship","b":"1F6A2","j":["boat","passenger","transportation","titanic","deploy"]},"airplane":{"a":"Airplane","b":"2708","j":["aeroplane","vehicle","transportation","flight","fly"]},"small-airplane":{"a":"Small Airplane","b":"1F6E9","j":["aeroplane","airplane","flight","transportation","fly","vehicle"]},"airplane-departure":{"a":"Airplane Departure","b":"1F6EB","j":["aeroplane","airplane","check-in","departure","departures","airport","flight","landing"]},"airplane-arrival":{"a":"Airplane Arrival","b":"1F6EC","j":["aeroplane","airplane","arrivals","arriving","landing","airport","flight","boarding"]},"parachute":{"a":"Parachute","b":"1FA82","j":["hang-glide","parasail","skydive","fly","glide"]},"seat":{"a":"Seat","b":"1F4BA","j":["chair","sit","airplane","transport","bus","flight","fly"]},"helicopter":{"a":"Helicopter","b":"1F681","j":["vehicle","transportation","fly"]},"suspension-railway":{"a":"Suspension Railway","b":"1F69F","j":["railway","suspension","vehicle","transportation"]},"mountain-cableway":{"a":"Mountain Cableway","b":"1F6A0","j":["cable","gondola","mountain","transportation","vehicle","ski"]},"aerial-tramway":{"a":"Aerial Tramway","b":"1F6A1","j":["aerial","cable","car","gondola","tramway","transportation","vehicle","ski"]},"satellite":{"a":"Satellite","b":"1F6F0","j":["space","communication","gps","orbit","spaceflight","NASA","ISS"]},"rocket":{"a":"Rocket","b":"1F680","j":["space","launch","ship","staffmode","NASA","outer space","outer_space","fly"]},"flying-saucer":{"a":"Flying Saucer","b":"1F6F8","j":["UFO","transportation","vehicle","ufo"]},"bellhop-bell":{"a":"Bellhop Bell","b":"1F6CE","j":["bell","bellhop","hotel","service"]},"luggage":{"a":"Luggage","b":"1F9F3","j":["packing","travel"]},"hourglass-done":{"a":"Hourglass Done","b":"231B","j":["sand","timer","time","clock","oldschool","limit","exam","quiz","test"]},"hourglass-not-done":{"a":"Hourglass Not Done","b":"23F3","j":["hourglass","sand","timer","oldschool","time","countdown"]},"watch":{"a":"Watch","b":"231A","j":["clock","time","accessories"]},"alarm-clock":{"a":"Alarm Clock","b":"23F0","j":["alarm","clock","time","wake"]},"stopwatch":{"a":"Stopwatch","b":"23F1","j":["clock","time","deadline"]},"timer-clock":{"a":"Timer Clock","b":"23F2","j":["clock","timer","alarm"]},"mantelpiece-clock":{"a":"Mantelpiece Clock","b":"1F570","j":["clock","time"]},"twelve-oclock":{"a":"Twelve O’Clock","b":"1F55B","j":["00","12","12:00","clock","o’clock","twelve","twelve_o_clock","time","noon","midnight","midday","late","early","schedule"]},"twelvethirty":{"a":"Twelve-Thirty","b":"1F567","j":["12","12:30","clock","thirty","twelve","twelve-thirty","twelve_thirty","time","late","early","schedule"]},"one-oclock":{"a":"One O’Clock","b":"1F550","j":["00","1","1:00","clock","o’clock","one","one_o_clock","time","late","early","schedule"]},"onethirty":{"a":"One-Thirty","b":"1F55C","j":["1","1:30","clock","one","one-thirty","thirty","one_thirty","time","late","early","schedule"]},"two-oclock":{"a":"Two O’Clock","b":"1F551","j":["00","2","2:00","clock","o’clock","two","two_o_clock","time","late","early","schedule"]},"twothirty":{"a":"Two-Thirty","b":"1F55D","j":["2","2:30","clock","thirty","two","two-thirty","two_thirty","time","late","early","schedule"]},"three-oclock":{"a":"Three O’Clock","b":"1F552","j":["00","3","3:00","clock","o’clock","three","three_o_clock","time","late","early","schedule"]},"threethirty":{"a":"Three-Thirty","b":"1F55E","j":["3","3:30","clock","thirty","three","three-thirty","three_thirty","time","late","early","schedule"]},"four-oclock":{"a":"Four O’Clock","b":"1F553","j":["00","4","4:00","clock","four","o’clock","four_o_clock","time","late","early","schedule"]},"fourthirty":{"a":"Four-Thirty","b":"1F55F","j":["4","4:30","clock","four","four-thirty","thirty","four_thirty","time","late","early","schedule"]},"five-oclock":{"a":"Five O’Clock","b":"1F554","j":["00","5","5:00","clock","five","o’clock","five_o_clock","time","late","early","schedule"]},"fivethirty":{"a":"Five-Thirty","b":"1F560","j":["5","5:30","clock","five","five-thirty","thirty","five_thirty","time","late","early","schedule"]},"six-oclock":{"a":"Six O’Clock","b":"1F555","j":["00","6","6:00","clock","o’clock","six","six_o_clock","time","late","early","schedule","dawn","dusk"]},"sixthirty":{"a":"Six-Thirty","b":"1F561","j":["6","6:30","clock","six","six-thirty","thirty","six_thirty","time","late","early","schedule"]},"seven-oclock":{"a":"Seven O’Clock","b":"1F556","j":["00","7","7:00","clock","o’clock","seven","seven_o_clock","time","late","early","schedule"]},"seventhirty":{"a":"Seven-Thirty","b":"1F562","j":["7","7:30","clock","seven","seven-thirty","thirty","seven_thirty","time","late","early","schedule"]},"eight-oclock":{"a":"Eight O’Clock","b":"1F557","j":["00","8","8:00","clock","eight","o’clock","eight_o_clock","time","late","early","schedule"]},"eightthirty":{"a":"Eight-Thirty","b":"1F563","j":["8","8:30","clock","eight","eight-thirty","thirty","eight_thirty","time","late","early","schedule"]},"nine-oclock":{"a":"Nine O’Clock","b":"1F558","j":["00","9","9:00","clock","nine","o’clock","nine_o_clock","time","late","early","schedule"]},"ninethirty":{"a":"Nine-Thirty","b":"1F564","j":["9","9:30","clock","nine","nine-thirty","thirty","nine_thirty","time","late","early","schedule"]},"ten-oclock":{"a":"Ten O’Clock","b":"1F559","j":["00","10","10:00","clock","o’clock","ten","ten_o_clock","time","late","early","schedule"]},"tenthirty":{"a":"Ten-Thirty","b":"1F565","j":["10","10:30","clock","ten","ten-thirty","thirty","ten_thirty","time","late","early","schedule"]},"eleven-oclock":{"a":"Eleven O’Clock","b":"1F55A","j":["00","11","11:00","clock","eleven","o’clock","eleven_o_clock","time","late","early","schedule"]},"eleventhirty":{"a":"Eleven-Thirty","b":"1F566","j":["11","11:30","clock","eleven","eleven-thirty","thirty","eleven_thirty","time","late","early","schedule"]},"new-moon":{"a":"New Moon","b":"1F311","j":["dark","moon","nature","twilight","planet","space","night","evening","sleep"]},"waxing-crescent-moon":{"a":"Waxing Crescent Moon","b":"1F312","j":["crescent","moon","waxing","nature","twilight","planet","space","night","evening","sleep"]},"first-quarter-moon":{"a":"First Quarter Moon","b":"1F313","j":["moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"waxing-gibbous-moon":{"a":"Waxing Gibbous Moon","b":"1F314","j":["gibbous","moon","waxing","nature","night","sky","gray","twilight","planet","space","evening","sleep"]},"full-moon":{"a":"Full Moon","b":"1F315","j":["full","moon","nature","yellow","twilight","planet","space","night","evening","sleep"]},"waning-gibbous-moon":{"a":"Waning Gibbous Moon","b":"1F316","j":["gibbous","moon","waning","nature","twilight","planet","space","night","evening","sleep","waxing_gibbous_moon"]},"last-quarter-moon":{"a":"Last Quarter Moon","b":"1F317","j":["moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"waning-crescent-moon":{"a":"Waning Crescent Moon","b":"1F318","j":["crescent","moon","waning","nature","twilight","planet","space","night","evening","sleep"]},"crescent-moon":{"a":"Crescent Moon","b":"1F319","j":["crescent","moon","night","sleep","sky","evening","magic"]},"new-moon-face":{"a":"New Moon Face","b":"1F31A","j":["face","moon","nature","twilight","planet","space","night","evening","sleep"]},"first-quarter-moon-face":{"a":"First Quarter Moon Face","b":"1F31B","j":["face","moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"last-quarter-moon-face":{"a":"Last Quarter Moon Face","b":"1F31C","j":["face","moon","quarter","nature","twilight","planet","space","night","evening","sleep"]},"thermometer":{"a":"Thermometer","b":"1F321","j":["weather","temperature","hot","cold"]},"sun":{"a":"Sun","b":"2600","j":["bright","rays","sunny","weather","nature","brightness","summer","beach","spring"]},"full-moon-face":{"a":"Full Moon Face","b":"1F31D","j":["bright","face","full","moon","nature","twilight","planet","space","night","evening","sleep"]},"sun-with-face":{"a":"Sun with Face","b":"1F31E","j":["bright","face","sun","nature","morning","sky"]},"ringed-planet":{"a":"Ringed Planet","b":"1FA90","j":["saturn","saturnine","outerspace"]},"star":{"a":"Star","b":"2B50","j":["night","yellow"]},"glowing-star":{"a":"Glowing Star","b":"1F31F","j":["glittery","glow","shining","sparkle","star","night","awesome","good","magic"]},"shooting-star":{"a":"Shooting Star","b":"1F320","j":["falling","shooting","star","night","photo"]},"milky-way":{"a":"Milky Way","b":"1F30C","j":["space","photo","stars"]},"cloud":{"a":"Cloud","b":"2601","j":["weather","sky"]},"sun-behind-cloud":{"a":"Sun Behind Cloud","b":"26C5","j":["cloud","sun","weather","nature","cloudy","morning","fall","spring"]},"cloud-with-lightning-and-rain":{"a":"Cloud with Lightning and Rain","b":"26C8","j":["cloud","rain","thunder","weather","lightning"]},"sun-behind-small-cloud":{"a":"Sun Behind Small Cloud","b":"1F324","j":["cloud","sun","weather"]},"sun-behind-large-cloud":{"a":"Sun Behind Large Cloud","b":"1F325","j":["cloud","sun","weather"]},"sun-behind-rain-cloud":{"a":"Sun Behind Rain Cloud","b":"1F326","j":["cloud","rain","sun","weather"]},"cloud-with-rain":{"a":"Cloud with Rain","b":"1F327","j":["cloud","rain","weather"]},"cloud-with-snow":{"a":"Cloud with Snow","b":"1F328","j":["cloud","cold","snow","weather"]},"cloud-with-lightning":{"a":"Cloud with Lightning","b":"1F329","j":["cloud","lightning","weather","thunder"]},"tornado":{"a":"Tornado","b":"1F32A","j":["cloud","whirlwind","weather","cyclone","twister"]},"fog":{"a":"Fog","b":"1F32B","j":["cloud","weather"]},"wind-face":{"a":"Wind Face","b":"1F32C","j":["blow","cloud","face","wind","gust","air"]},"cyclone":{"a":"Cyclone","b":"1F300","j":["dizzy","hurricane","twister","typhoon","weather","swirl","blue","cloud","vortex","spiral","whirlpool","spin","tornado"]},"rainbow":{"a":"Rainbow","b":"1F308","j":["rain","nature","happy","unicorn_face","photo","sky","spring"]},"closed-umbrella":{"a":"Closed Umbrella","b":"1F302","j":["clothing","rain","umbrella","weather","drizzle"]},"umbrella":{"a":"Umbrella","b":"2602","j":["clothing","rain","weather","spring"]},"umbrella-with-rain-drops":{"a":"Umbrella with Rain Drops","b":"2614","j":["clothing","drop","rain","umbrella","rainy","weather","spring"]},"umbrella-on-ground":{"a":"Umbrella on Ground","b":"26F1","j":["rain","sun","umbrella","weather","summer"]},"high-voltage":{"a":"High Voltage","b":"26A1","j":["danger","electric","lightning","voltage","zap","thunder","weather","lightning bolt","fast"]},"snowflake":{"a":"Snowflake","b":"2744","j":["cold","snow","winter","season","weather","christmas","xmas"]},"snowman":{"a":"Snowman","b":"2603","j":["cold","snow","winter","season","weather","christmas","xmas","frozen"]},"snowman-without-snow":{"a":"Snowman Without Snow","b":"26C4","j":["cold","snow","snowman","winter","season","weather","christmas","xmas","frozen","without_snow"]},"comet":{"a":"Comet","b":"2604","j":["space"]},"fire":{"a":"Fire","b":"1F525","j":["flame","tool","hot","cook"]},"droplet":{"a":"Droplet","b":"1F4A7","j":["cold","comic","drop","sweat","water","drip","faucet","spring"]},"water-wave":{"a":"Water Wave","b":"1F30A","j":["ocean","water","wave","sea","nature","tsunami","disaster"]},"jackolantern":{"a":"Jack-O-Lantern","b":"1F383","j":["celebration","halloween","jack","jack-o-lantern","lantern","jack_o_lantern","light","pumpkin","creepy","fall"]},"christmas-tree":{"a":"Christmas Tree","b":"1F384","j":["celebration","Christmas","tree","festival","vacation","december","xmas"]},"fireworks":{"a":"Fireworks","b":"1F386","j":["celebration","photo","festival","carnival","congratulations"]},"sparkler":{"a":"Sparkler","b":"1F387","j":["celebration","fireworks","sparkle","stars","night","shine"]},"firecracker":{"a":"Firecracker","b":"1F9E8","j":["dynamite","explosive","fireworks","boom","explode","explosion"]},"sparkles":{"a":"Sparkles","b":"2728","j":["*","sparkle","star","stars","shine","shiny","cool","awesome","good","magic"]},"balloon":{"a":"Balloon","b":"1F388","j":["celebration","party","birthday","circus"]},"party-popper":{"a":"Party Popper","b":"1F389","j":["celebration","party","popper","tada","congratulations","birthday","magic","circus"]},"confetti-ball":{"a":"Confetti Ball","b":"1F38A","j":["ball","celebration","confetti","festival","party","birthday","circus"]},"tanabata-tree":{"a":"Tanabata Tree","b":"1F38B","j":["banner","celebration","Japanese","tree","plant","nature","branch","summer"]},"pine-decoration":{"a":"Pine Decoration","b":"1F38D","j":["bamboo","celebration","Japanese","pine","plant","nature","vegetable","panda"]},"japanese-dolls":{"a":"Japanese Dolls","b":"1F38E","j":["celebration","doll","festival","Japanese","Japanese dolls","japanese","toy","kimono"]},"carp-streamer":{"a":"Carp Streamer","b":"1F38F","j":["carp","celebration","streamer","fish","japanese","koinobori","banner"]},"wind-chime":{"a":"Wind Chime","b":"1F390","j":["bell","celebration","chime","wind","nature","ding","spring"]},"moon-viewing-ceremony":{"a":"Moon Viewing Ceremony","b":"1F391","j":["celebration","ceremony","moon","photo","japan","asia","tsukimi"]},"red-envelope":{"a":"Red Envelope","b":"1F9E7","j":["gift","good luck","hóngbāo","lai see","money"]},"ribbon":{"a":"Ribbon","b":"1F380","j":["celebration","decoration","pink","girl","bowtie"]},"wrapped-gift":{"a":"Wrapped Gift","b":"1F381","j":["box","celebration","gift","present","wrapped","birthday","christmas","xmas"]},"reminder-ribbon":{"a":"Reminder Ribbon","b":"1F397","j":["celebration","reminder","ribbon","sports","cause","support","awareness"]},"admission-tickets":{"a":"Admission Tickets","b":"1F39F","j":["admission","ticket","sports","concert","entrance"]},"ticket":{"a":"Ticket","b":"1F3AB","j":["admission","event","concert","pass"]},"military-medal":{"a":"Military Medal","b":"1F396","j":["celebration","medal","military","award","winning","army"]},"trophy":{"a":"Trophy","b":"1F3C6","j":["prize","win","award","contest","place","ftw","ceremony"]},"sports-medal":{"a":"Sports Medal","b":"1F3C5","j":["medal","award","winning"]},"1st-place-medal":{"a":"1st Place Medal","b":"1F947","j":["first","gold","medal","award","winning"]},"2nd-place-medal":{"a":"2nd Place Medal","b":"1F948","j":["medal","second","silver","award"]},"3rd-place-medal":{"a":"3rd Place Medal","b":"1F949","j":["bronze","medal","third","award"]},"soccer-ball":{"a":"Soccer Ball","b":"26BD","j":["ball","football","soccer","sports"]},"baseball":{"a":"Baseball","b":"26BE","j":["ball","sports","balls"]},"softball":{"a":"Softball","b":"1F94E","j":["ball","glove","underarm","sports","balls"]},"basketball":{"a":"Basketball","b":"1F3C0","j":["ball","hoop","sports","balls","NBA"]},"volleyball":{"a":"Volleyball","b":"1F3D0","j":["ball","game","sports","balls"]},"american-football":{"a":"American Football","b":"1F3C8","j":["american","ball","football","sports","balls","NFL"]},"rugby-football":{"a":"Rugby Football","b":"1F3C9","j":["ball","football","rugby","sports","team"]},"tennis":{"a":"Tennis","b":"1F3BE","j":["ball","racquet","sports","balls","green"]},"flying-disc":{"a":"Flying Disc","b":"1F94F","j":["ultimate","sports","frisbee"]},"bowling":{"a":"Bowling","b":"1F3B3","j":["ball","game","sports","fun","play"]},"cricket-game":{"a":"Cricket Game","b":"1F3CF","j":["ball","bat","game","sports"]},"field-hockey":{"a":"Field Hockey","b":"1F3D1","j":["ball","field","game","hockey","stick","sports"]},"ice-hockey":{"a":"Ice Hockey","b":"1F3D2","j":["game","hockey","ice","puck","stick","sports"]},"lacrosse":{"a":"Lacrosse","b":"1F94D","j":["ball","goal","stick","sports"]},"ping-pong":{"a":"Ping Pong","b":"1F3D3","j":["ball","bat","game","paddle","table tennis","sports","pingpong"]},"badminton":{"a":"Badminton","b":"1F3F8","j":["birdie","game","racquet","shuttlecock","sports"]},"boxing-glove":{"a":"Boxing Glove","b":"1F94A","j":["boxing","glove","sports","fighting"]},"martial-arts-uniform":{"a":"Martial Arts Uniform","b":"1F94B","j":["judo","karate","martial arts","taekwondo","uniform"]},"goal-net":{"a":"Goal Net","b":"1F945","j":["goal","net","sports"]},"flag-in-hole":{"a":"Flag in Hole","b":"26F3","j":["golf","hole","sports","business","flag","summer"]},"ice-skate":{"a":"Ice Skate","b":"26F8","j":["ice","skate","sports"]},"fishing-pole":{"a":"Fishing Pole","b":"1F3A3","j":["fish","pole","food","hobby","summer"]},"diving-mask":{"a":"Diving Mask","b":"1F93F","j":["diving","scuba","snorkeling","sport","ocean"]},"running-shirt":{"a":"Running Shirt","b":"1F3BD","j":["athletics","running","sash","shirt","play","pageant"]},"skis":{"a":"Skis","b":"1F3BF","j":["ski","snow","sports","winter","cold"]},"sled":{"a":"Sled","b":"1F6F7","j":["sledge","sleigh","luge","toboggan"]},"curling-stone":{"a":"Curling Stone","b":"1F94C","j":["game","rock","sports"]},"bullseye":{"a":"Bullseye","b":"1F3AF","j":["dart","direct hit","game","hit","target","direct_hit","play","bar"]},"yoyo":{"a":"Yo-Yo","b":"1FA80","j":["fluctuate","toy","yo-yo","yo_yo"]},"kite":{"a":"Kite","b":"1FA81","j":["fly","soar","wind"]},"pool-8-ball":{"a":"Pool 8 Ball","b":"1F3B1","j":["8","ball","billiard","eight","game","pool","hobby","luck","magic"]},"crystal-ball":{"a":"Crystal Ball","b":"1F52E","j":["ball","crystal","fairy tale","fantasy","fortune","tool","disco","party","magic","circus","fortune_teller"]},"magic-wand":{"a":"Magic Wand","b":"1FA84","j":["magic","witch","wizard","supernature","power"]},"nazar-amulet":{"a":"Nazar Amulet","b":"1F9FF","j":["bead","charm","evil-eye","nazar","talisman"]},"video-game":{"a":"Video Game","b":"1F3AE","j":["controller","game","play","console","PS4"]},"joystick":{"a":"Joystick","b":"1F579","j":["game","video game","play"]},"slot-machine":{"a":"Slot Machine","b":"1F3B0","j":["game","slot","bet","gamble","vegas","fruit machine","luck","casino"]},"game-die":{"a":"Game Die","b":"1F3B2","j":["dice","die","game","random","tabletop","play","luck"]},"puzzle-piece":{"a":"Puzzle Piece","b":"1F9E9","j":["clue","interlocking","jigsaw","piece","puzzle"]},"teddy-bear":{"a":"Teddy Bear","b":"1F9F8","j":["plaything","plush","stuffed","toy"]},"piata":{"a":"Piñata","b":"1FA85","j":["celebration","party","piñata","pinata","mexico","candy"]},"nesting-dolls":{"a":"Nesting Dolls","b":"1FA86","j":["doll","nesting","russia","matryoshka","toy"]},"spade-suit":{"a":"Spade Suit","b":"2660","j":["card","game","poker","cards","suits","magic"]},"heart-suit":{"a":"Heart Suit","b":"2665","j":["card","game","poker","cards","magic","suits"]},"diamond-suit":{"a":"Diamond Suit","b":"2666","j":["card","game","poker","cards","magic","suits"]},"club-suit":{"a":"Club Suit","b":"2663","j":["card","game","poker","cards","magic","suits"]},"chess-pawn":{"a":"Chess Pawn","b":"265F","j":["chess","dupe","expendable"]},"joker":{"a":"Joker","b":"1F0CF","j":["card","game","wildcard","poker","cards","play","magic"]},"mahjong-red-dragon":{"a":"Mahjong Red Dragon","b":"1F004","j":["game","mahjong","red","play","chinese","kanji"]},"flower-playing-cards":{"a":"Flower Playing Cards","b":"1F3B4","j":["card","flower","game","Japanese","playing","sunset","red"]},"performing-arts":{"a":"Performing Arts","b":"1F3AD","j":["art","mask","performing","theater","theatre","acting","drama"]},"framed-picture":{"a":"Framed Picture","b":"1F5BC","j":["art","frame","museum","painting","picture","photography"]},"artist-palette":{"a":"Artist Palette","b":"1F3A8","j":["art","museum","painting","palette","design","paint","draw","colors"]},"thread":{"a":"Thread","b":"1F9F5","j":["needle","sewing","spool","string"]},"sewing-needle":{"a":"Sewing Needle","b":"1FAA1","j":["embroidery","needle","sewing","stitches","sutures","tailoring"]},"yarn":{"a":"Yarn","b":"1F9F6","j":["ball","crochet","knit"]},"knot":{"a":"Knot","b":"1FAA2","j":["rope","tangled","tie","twine","twist","scout"]},"glasses":{"a":"Glasses","b":"1F453","j":["clothing","eye","eyeglasses","eyewear","fashion","accessories","eyesight","nerdy","dork","geek"]},"sunglasses":{"a":"Sunglasses","b":"1F576","j":["dark","eye","eyewear","glasses","face","cool","accessories"]},"goggles":{"a":"Goggles","b":"1F97D","j":["eye protection","swimming","welding","eyes","protection","safety"]},"lab-coat":{"a":"Lab Coat","b":"1F97C","j":["doctor","experiment","scientist","chemist"]},"safety-vest":{"a":"Safety Vest","b":"1F9BA","j":["emergency","safety","vest","protection"]},"necktie":{"a":"Necktie","b":"1F454","j":["clothing","tie","shirt","suitup","formal","fashion","cloth","business"]},"tshirt":{"a":"T-Shirt","b":"1F455","j":["clothing","shirt","t-shirt","t_shirt","fashion","cloth","casual","tee"]},"jeans":{"a":"Jeans","b":"1F456","j":["clothing","pants","trousers","fashion","shopping"]},"scarf":{"a":"Scarf","b":"1F9E3","j":["neck","winter","clothes"]},"gloves":{"a":"Gloves","b":"1F9E4","j":["hand","hands","winter","clothes"]},"coat":{"a":"Coat","b":"1F9E5","j":["jacket"]},"socks":{"a":"Socks","b":"1F9E6","j":["stocking","stockings","clothes"]},"dress":{"a":"Dress","b":"1F457","j":["clothing","clothes","fashion","shopping"]},"kimono":{"a":"Kimono","b":"1F458","j":["clothing","dress","fashion","women","female","japanese"]},"sari":{"a":"Sari","b":"1F97B","j":["clothing","dress"]},"onepiece-swimsuit":{"a":"One-Piece Swimsuit","b":"1FA71","j":["bathing suit","one-piece swimsuit","one_piece_swimsuit","fashion"]},"briefs":{"a":"Briefs","b":"1FA72","j":["bathing suit","one-piece","swimsuit","underwear","clothing"]},"shorts":{"a":"Shorts","b":"1FA73","j":["bathing suit","pants","underwear","clothing"]},"bikini":{"a":"Bikini","b":"1F459","j":["clothing","swim","swimming","female","woman","girl","fashion","beach","summer"]},"womans-clothes":{"a":"Woman’S Clothes","b":"1F45A","j":["clothing","woman","woman’s clothes","woman_s_clothes","fashion","shopping_bags","female"]},"purse":{"a":"Purse","b":"1F45B","j":["clothing","coin","fashion","accessories","money","sales","shopping"]},"handbag":{"a":"Handbag","b":"1F45C","j":["bag","clothing","purse","fashion","accessory","accessories","shopping"]},"clutch-bag":{"a":"Clutch Bag","b":"1F45D","j":["bag","clothing","pouch","accessories","shopping"]},"shopping-bags":{"a":"Shopping Bags","b":"1F6CD","j":["bag","hotel","shopping","mall","buy","purchase"]},"backpack":{"a":"Backpack","b":"1F392","j":["bag","rucksack","satchel","school","student","education"]},"thong-sandal":{"a":"Thong Sandal","b":"1FA74","j":["beach sandals","sandals","thong sandals","thongs","zōri","footwear","summer"]},"mans-shoe":{"a":"Man’S Shoe","b":"1F45E","j":["clothing","man","man’s shoe","shoe","man_s_shoe","fashion","male"]},"running-shoe":{"a":"Running Shoe","b":"1F45F","j":["athletic","clothing","shoe","sneaker","shoes","sports","sneakers"]},"hiking-boot":{"a":"Hiking Boot","b":"1F97E","j":["backpacking","boot","camping","hiking"]},"flat-shoe":{"a":"Flat Shoe","b":"1F97F","j":["ballet flat","slip-on","slipper","ballet"]},"highheeled-shoe":{"a":"High-Heeled Shoe","b":"1F460","j":["clothing","heel","high-heeled shoe","shoe","woman","high_heeled_shoe","fashion","shoes","female","pumps","stiletto"]},"womans-sandal":{"a":"Woman’S Sandal","b":"1F461","j":["clothing","sandal","shoe","woman","woman’s sandal","woman_s_sandal","shoes","fashion","flip flops"]},"ballet-shoes":{"a":"Ballet Shoes","b":"1FA70","j":["ballet","dance"]},"womans-boot":{"a":"Woman’S Boot","b":"1F462","j":["boot","clothing","shoe","woman","woman’s boot","woman_s_boot","shoes","fashion"]},"crown":{"a":"Crown","b":"1F451","j":["clothing","king","queen","kod","leader","royalty","lord"]},"womans-hat":{"a":"Woman’S Hat","b":"1F452","j":["clothing","hat","woman","woman’s hat","woman_s_hat","fashion","accessories","female","lady","spring"]},"top-hat":{"a":"Top Hat","b":"1F3A9","j":["clothing","hat","top","tophat","magic","gentleman","classy","circus"]},"graduation-cap":{"a":"Graduation Cap","b":"1F393","j":["cap","celebration","clothing","graduation","hat","school","college","degree","university","legal","learn","education"]},"billed-cap":{"a":"Billed Cap","b":"1F9E2","j":["baseball cap","cap","baseball"]},"military-helmet":{"a":"Military Helmet","b":"1FA96","j":["army","helmet","military","soldier","warrior","protection"]},"rescue-workers-helmet":{"a":"Rescue Worker’S Helmet","b":"26D1","j":["aid","cross","face","hat","helmet","rescue worker’s helmet","rescue_worker_s_helmet","construction","build"]},"prayer-beads":{"a":"Prayer Beads","b":"1F4FF","j":["beads","clothing","necklace","prayer","religion","dhikr","religious"]},"lipstick":{"a":"Lipstick","b":"1F484","j":["cosmetics","makeup","female","girl","fashion","woman"]},"ring":{"a":"Ring","b":"1F48D","j":["diamond","wedding","propose","marriage","valentines","fashion","jewelry","gem","engagement"]},"gem-stone":{"a":"Gem Stone","b":"1F48E","j":["diamond","gem","jewel","blue","ruby","jewelry"]},"muted-speaker":{"a":"Muted Speaker","b":"1F507","j":["mute","quiet","silent","speaker","sound","volume","silence"]},"speaker-low-volume":{"a":"Speaker Low Volume","b":"1F508","j":["soft","sound","volume","silence","broadcast"]},"speaker-medium-volume":{"a":"Speaker Medium Volume","b":"1F509","j":["medium","volume","speaker","broadcast"]},"speaker-high-volume":{"a":"Speaker High Volume","b":"1F50A","j":["loud","volume","noise","noisy","speaker","broadcast"]},"loudspeaker":{"a":"Loudspeaker","b":"1F4E2","j":["loud","public address","volume","sound"]},"megaphone":{"a":"Megaphone","b":"1F4E3","j":["cheering","sound","speaker","volume"]},"postal-horn":{"a":"Postal Horn","b":"1F4EF","j":["horn","post","postal","instrument","music"]},"bell":{"a":"Bell","b":"1F514","j":["sound","notification","christmas","xmas","chime"]},"bell-with-slash":{"a":"Bell with Slash","b":"1F515","j":["bell","forbidden","mute","quiet","silent","sound","volume"]},"musical-score":{"a":"Musical Score","b":"1F3BC","j":["music","score","treble","clef","compose"]},"musical-note":{"a":"Musical Note","b":"1F3B5","j":["music","note","score","tone","sound"]},"musical-notes":{"a":"Musical Notes","b":"1F3B6","j":["music","note","notes","score"]},"studio-microphone":{"a":"Studio Microphone","b":"1F399","j":["mic","microphone","music","studio","sing","recording","artist","talkshow"]},"level-slider":{"a":"Level Slider","b":"1F39A","j":["level","music","slider","scale"]},"control-knobs":{"a":"Control Knobs","b":"1F39B","j":["control","knobs","music","dial"]},"microphone":{"a":"Microphone","b":"1F3A4","j":["karaoke","mic","sound","music","PA","sing","talkshow"]},"headphone":{"a":"Headphone","b":"1F3A7","j":["earbud","music","score","gadgets"]},"radio":{"a":"Radio","b":"1F4FB","j":["video","communication","music","podcast","program"]},"saxophone":{"a":"Saxophone","b":"1F3B7","j":["instrument","music","sax","jazz","blues"]},"accordion":{"a":"Accordion","b":"1FA97","j":["concertina","squeeze box","music"]},"guitar":{"a":"Guitar","b":"1F3B8","j":["instrument","music"]},"musical-keyboard":{"a":"Musical Keyboard","b":"1F3B9","j":["instrument","keyboard","music","piano","compose"]},"trumpet":{"a":"Trumpet","b":"1F3BA","j":["instrument","music","brass"]},"violin":{"a":"Violin","b":"1F3BB","j":["instrument","music","orchestra","symphony"]},"banjo":{"a":"Banjo","b":"1FA95","j":["music","stringed","instructment"]},"drum":{"a":"Drum","b":"1F941","j":["drumsticks","music","instrument","snare"]},"long-drum":{"a":"Long Drum","b":"1FA98","j":["beat","conga","drum","rhythm","music"]},"mobile-phone":{"a":"Mobile Phone","b":"1F4F1","j":["cell","mobile","phone","telephone","technology","apple","gadgets","dial"]},"mobile-phone-with-arrow":{"a":"Mobile Phone with Arrow","b":"1F4F2","j":["arrow","cell","mobile","phone","receive","iphone","incoming"]},"telephone":{"a":"Telephone","b":"260E","j":["phone","technology","communication","dial"]},"telephone-receiver":{"a":"Telephone Receiver","b":"1F4DE","j":["phone","receiver","telephone","technology","communication","dial"]},"pager":{"a":"Pager","b":"1F4DF","j":["bbcall","oldschool","90s"]},"fax-machine":{"a":"Fax Machine","b":"1F4E0","j":["fax","communication","technology"]},"battery":{"a":"Battery","b":"1F50B","j":["power","energy","sustain"]},"electric-plug":{"a":"Electric Plug","b":"1F50C","j":["electric","electricity","plug","charger","power"]},"laptop":{"a":"Laptop","b":"1F4BB","j":["computer","pc","personal","technology","screen","display","monitor"]},"desktop-computer":{"a":"Desktop Computer","b":"1F5A5","j":["computer","desktop","technology","computing","screen"]},"printer":{"a":"Printer","b":"1F5A8","j":["computer","paper","ink"]},"keyboard":{"a":"Keyboard","b":"2328","j":["computer","technology","type","input","text"]},"computer-mouse":{"a":"Computer Mouse","b":"1F5B1","j":["computer","click"]},"trackball":{"a":"Trackball","b":"1F5B2","j":["computer","technology","trackpad"]},"computer-disk":{"a":"Computer Disk","b":"1F4BD","j":["computer","disk","minidisk","optical","technology","record","data","90s"]},"floppy-disk":{"a":"Floppy Disk","b":"1F4BE","j":["computer","disk","floppy","oldschool","technology","save","90s","80s"]},"optical-disk":{"a":"Optical Disk","b":"1F4BF","j":["cd","computer","disk","optical","technology","dvd","disc","90s"]},"dvd":{"a":"Dvd","b":"1F4C0","j":["blu-ray","computer","disk","optical","cd","disc"]},"abacus":{"a":"Abacus","b":"1F9EE","j":["calculation"]},"movie-camera":{"a":"Movie Camera","b":"1F3A5","j":["camera","cinema","movie","film","record"]},"film-frames":{"a":"Film Frames","b":"1F39E","j":["cinema","film","frames","movie"]},"film-projector":{"a":"Film Projector","b":"1F4FD","j":["cinema","film","movie","projector","video","tape","record"]},"clapper-board":{"a":"Clapper Board","b":"1F3AC","j":["clapper","movie","film","record"]},"television":{"a":"Television","b":"1F4FA","j":["tv","video","technology","program","oldschool","show"]},"camera":{"a":"Camera","b":"1F4F7","j":["video","gadgets","photography"]},"camera-with-flash":{"a":"Camera with Flash","b":"1F4F8","j":["camera","flash","video","photography","gadgets"]},"video-camera":{"a":"Video Camera","b":"1F4F9","j":["camera","video","film","record"]},"videocassette":{"a":"Videocassette","b":"1F4FC","j":["tape","vhs","video","record","oldschool","90s","80s"]},"magnifying-glass-tilted-left":{"a":"Magnifying Glass Tilted Left","b":"1F50D","j":["glass","magnifying","search","tool","zoom","find","detective"]},"magnifying-glass-tilted-right":{"a":"Magnifying Glass Tilted Right","b":"1F50E","j":["glass","magnifying","search","tool","zoom","find","detective"]},"candle":{"a":"Candle","b":"1F56F","j":["light","fire","wax"]},"light-bulb":{"a":"Light Bulb","b":"1F4A1","j":["bulb","comic","electric","idea","light","electricity"]},"flashlight":{"a":"Flashlight","b":"1F526","j":["electric","light","tool","torch","dark","camping","sight","night"]},"red-paper-lantern":{"a":"Red Paper Lantern","b":"1F3EE","j":["bar","lantern","light","red","paper","halloween","spooky"]},"diya-lamp":{"a":"Diya Lamp","b":"1FA94","j":["diya","lamp","oil","lighting"]},"notebook-with-decorative-cover":{"a":"Notebook with Decorative Cover","b":"1F4D4","j":["book","cover","decorated","notebook","classroom","notes","record","paper","study"]},"closed-book":{"a":"Closed Book","b":"1F4D5","j":["book","closed","read","library","knowledge","textbook","learn"]},"open-book":{"a":"Open Book","b":"1F4D6","j":["book","open","read","library","knowledge","literature","learn","study"]},"green-book":{"a":"Green Book","b":"1F4D7","j":["book","green","read","library","knowledge","study"]},"blue-book":{"a":"Blue Book","b":"1F4D8","j":["blue","book","read","library","knowledge","learn","study"]},"orange-book":{"a":"Orange Book","b":"1F4D9","j":["book","orange","read","library","knowledge","textbook","study"]},"books":{"a":"Books","b":"1F4DA","j":["book","literature","library","study"]},"notebook":{"a":"Notebook","b":"1F4D3","j":["stationery","record","notes","paper","study"]},"ledger":{"a":"Ledger","b":"1F4D2","j":["notebook","notes","paper"]},"page-with-curl":{"a":"Page with Curl","b":"1F4C3","j":["curl","document","page","documents","office","paper"]},"scroll":{"a":"Scroll","b":"1F4DC","j":["paper","documents","ancient","history"]},"page-facing-up":{"a":"Page Facing Up","b":"1F4C4","j":["document","page","documents","office","paper","information"]},"newspaper":{"a":"Newspaper","b":"1F4F0","j":["news","paper","press","headline"]},"rolledup-newspaper":{"a":"Rolled-Up Newspaper","b":"1F5DE","j":["news","newspaper","paper","rolled","rolled-up newspaper","rolled_up_newspaper","press","headline"]},"bookmark-tabs":{"a":"Bookmark Tabs","b":"1F4D1","j":["bookmark","mark","marker","tabs","favorite","save","order","tidy"]},"bookmark":{"a":"Bookmark","b":"1F516","j":["mark","favorite","label","save"]},"label":{"a":"Label","b":"1F3F7","j":["sale","tag"]},"money-bag":{"a":"Money Bag","b":"1F4B0","j":["bag","dollar","money","moneybag","payment","coins","sale"]},"coin":{"a":"Coin","b":"1FA99","j":["gold","metal","money","silver","treasure","currency"]},"yen-banknote":{"a":"Yen Banknote","b":"1F4B4","j":["banknote","bill","currency","money","note","yen","sales","japanese","dollar"]},"dollar-banknote":{"a":"Dollar Banknote","b":"1F4B5","j":["banknote","bill","currency","dollar","money","note","sales"]},"euro-banknote":{"a":"Euro Banknote","b":"1F4B6","j":["banknote","bill","currency","euro","money","note","sales","dollar"]},"pound-banknote":{"a":"Pound Banknote","b":"1F4B7","j":["banknote","bill","currency","money","note","pound","british","sterling","sales","bills","uk","england"]},"money-with-wings":{"a":"Money with Wings","b":"1F4B8","j":["banknote","bill","fly","money","wings","dollar","bills","payment","sale"]},"credit-card":{"a":"Credit Card","b":"1F4B3","j":["card","credit","money","sales","dollar","bill","payment","shopping"]},"receipt":{"a":"Receipt","b":"1F9FE","j":["accounting","bookkeeping","evidence","proof","expenses"]},"chart-increasing-with-yen":{"a":"Chart Increasing with Yen","b":"1F4B9","j":["chart","graph","growth","money","yen","green-square","presentation","stats"]},"envelope":{"a":"Envelope","b":"2709","j":["email","letter","postal","inbox","communication"]},"email":{"a":"E-Mail","b":"1F4E7","j":["e-mail","letter","mail","e_mail","communication","inbox"]},"incoming-envelope":{"a":"Incoming Envelope","b":"1F4E8","j":["e-mail","email","envelope","incoming","letter","receive","inbox"]},"envelope-with-arrow":{"a":"Envelope with Arrow","b":"1F4E9","j":["arrow","e-mail","email","envelope","outgoing","communication"]},"outbox-tray":{"a":"Outbox Tray","b":"1F4E4","j":["box","letter","mail","outbox","sent","tray","inbox","email"]},"inbox-tray":{"a":"Inbox Tray","b":"1F4E5","j":["box","inbox","letter","mail","receive","tray","email","documents"]},"package":{"a":"Package","b":"1F4E6","j":["box","parcel","mail","gift","cardboard","moving"]},"closed-mailbox-with-raised-flag":{"a":"Closed Mailbox with Raised Flag","b":"1F4EB","j":["closed","mail","mailbox","postbox","email","inbox","communication"]},"closed-mailbox-with-lowered-flag":{"a":"Closed Mailbox with Lowered Flag","b":"1F4EA","j":["closed","lowered","mail","mailbox","postbox","email","communication","inbox"]},"open-mailbox-with-raised-flag":{"a":"Open Mailbox with Raised Flag","b":"1F4EC","j":["mail","mailbox","open","postbox","email","inbox","communication"]},"open-mailbox-with-lowered-flag":{"a":"Open Mailbox with Lowered Flag","b":"1F4ED","j":["lowered","mail","mailbox","open","postbox","email","inbox"]},"postbox":{"a":"Postbox","b":"1F4EE","j":["mail","mailbox","email","letter","envelope"]},"ballot-box-with-ballot":{"a":"Ballot Box with Ballot","b":"1F5F3","j":["ballot","box","election","vote"]},"pencil":{"a":"Pencil","b":"270F","j":["stationery","write","paper","writing","school","study"]},"black-nib":{"a":"Black Nib","b":"2712","j":["nib","pen","stationery","writing","write"]},"fountain-pen":{"a":"Fountain Pen","b":"1F58B","j":["fountain","pen","stationery","writing","write"]},"pen":{"a":"Pen","b":"1F58A","j":["ballpoint","stationery","writing","write"]},"paintbrush":{"a":"Paintbrush","b":"1F58C","j":["painting","drawing","creativity","art"]},"crayon":{"a":"Crayon","b":"1F58D","j":["drawing","creativity"]},"memo":{"a":"Memo","b":"1F4DD","j":["pencil","write","documents","stationery","paper","writing","legal","exam","quiz","test","study","compose"]},"briefcase":{"a":"Briefcase","b":"1F4BC","j":["business","documents","work","law","legal","job","career"]},"file-folder":{"a":"File Folder","b":"1F4C1","j":["file","folder","documents","business","office"]},"open-file-folder":{"a":"Open File Folder","b":"1F4C2","j":["file","folder","open","documents","load"]},"card-index-dividers":{"a":"Card Index Dividers","b":"1F5C2","j":["card","dividers","index","organizing","business","stationery"]},"calendar":{"a":"Calendar","b":"1F4C5","j":["date","schedule"]},"tearoff-calendar":{"a":"Tear-off Calendar","b":"1F4C6","j":["calendar","tear-off calendar","tear_off_calendar","schedule","date","planning"]},"spiral-notepad":{"a":"Spiral Notepad","b":"1F5D2","j":["note","pad","spiral","memo","stationery"]},"spiral-calendar":{"a":"Spiral Calendar","b":"1F5D3","j":["calendar","pad","spiral","date","schedule","planning"]},"card-index":{"a":"Card Index","b":"1F4C7","j":["card","index","rolodex","business","stationery"]},"chart-increasing":{"a":"Chart Increasing","b":"1F4C8","j":["chart","graph","growth","trend","upward","presentation","stats","recovery","business","economics","money","sales","good","success"]},"chart-decreasing":{"a":"Chart Decreasing","b":"1F4C9","j":["chart","down","graph","trend","presentation","stats","recession","business","economics","money","sales","bad","failure"]},"bar-chart":{"a":"Bar Chart","b":"1F4CA","j":["bar","chart","graph","presentation","stats"]},"clipboard":{"a":"Clipboard","b":"1F4CB","j":["stationery","documents"]},"pushpin":{"a":"Pushpin","b":"1F4CC","j":["pin","stationery","mark","here"]},"round-pushpin":{"a":"Round Pushpin","b":"1F4CD","j":["pin","pushpin","stationery","location","map","here"]},"paperclip":{"a":"Paperclip","b":"1F4CE","j":["documents","stationery"]},"linked-paperclips":{"a":"Linked Paperclips","b":"1F587","j":["link","paperclip","documents","stationery"]},"straight-ruler":{"a":"Straight Ruler","b":"1F4CF","j":["ruler","straight edge","stationery","calculate","length","math","school","drawing","architect","sketch"]},"triangular-ruler":{"a":"Triangular Ruler","b":"1F4D0","j":["ruler","set","triangle","stationery","math","architect","sketch"]},"scissors":{"a":"Scissors","b":"2702","j":["cutting","tool","stationery","cut"]},"card-file-box":{"a":"Card File Box","b":"1F5C3","j":["box","card","file","business","stationery"]},"file-cabinet":{"a":"File Cabinet","b":"1F5C4","j":["cabinet","file","filing","organizing"]},"wastebasket":{"a":"Wastebasket","b":"1F5D1","j":["bin","trash","rubbish","garbage","toss"]},"locked":{"a":"Locked","b":"1F512","j":["closed","security","password","padlock"]},"unlocked":{"a":"Unlocked","b":"1F513","j":["lock","open","unlock","privacy","security"]},"locked-with-pen":{"a":"Locked with Pen","b":"1F50F","j":["ink","lock","nib","pen","privacy","security","secret"]},"locked-with-key":{"a":"Locked with Key","b":"1F510","j":["closed","key","lock","secure","security","privacy"]},"key":{"a":"Key","b":"1F511","j":["lock","password","door"]},"old-key":{"a":"Old Key","b":"1F5DD","j":["clue","key","lock","old","door","password"]},"hammer":{"a":"Hammer","b":"1F528","j":["tool","tools","build","create"]},"axe":{"a":"Axe","b":"1FA93","j":["chop","hatchet","split","wood","tool","cut"]},"pick":{"a":"Pick","b":"26CF","j":["mining","tool","tools","dig"]},"hammer-and-pick":{"a":"Hammer and Pick","b":"2692","j":["hammer","pick","tool","tools","build","create"]},"hammer-and-wrench":{"a":"Hammer and Wrench","b":"1F6E0","j":["hammer","spanner","tool","wrench","tools","build","create"]},"dagger":{"a":"Dagger","b":"1F5E1","j":["knife","weapon"]},"crossed-swords":{"a":"Crossed Swords","b":"2694","j":["crossed","swords","weapon"]},"water-pistol":{"a":"Water Pistol","b":"1F52B","j":["gun","handgun","pistol","revolver","tool","water","weapon","violence"]},"boomerang":{"a":"Boomerang","b":"1FA83","j":["australia","rebound","repercussion","weapon"]},"bow-and-arrow":{"a":"Bow and Arrow","b":"1F3F9","j":["archer","arrow","bow","Sagittarius","zodiac","sports"]},"shield":{"a":"Shield","b":"1F6E1","j":["weapon","protection","security"]},"carpentry-saw":{"a":"Carpentry Saw","b":"1FA9A","j":["carpenter","lumber","saw","tool","cut","chop"]},"wrench":{"a":"Wrench","b":"1F527","j":["spanner","tool","tools","diy","ikea","fix","maintainer"]},"screwdriver":{"a":"Screwdriver","b":"1FA9B","j":["screw","tool","tools"]},"nut-and-bolt":{"a":"Nut and Bolt","b":"1F529","j":["bolt","nut","tool","handy","tools","fix"]},"gear":{"a":"Gear","b":"2699","j":["cog","cogwheel","tool"]},"clamp":{"a":"Clamp","b":"1F5DC","j":["compress","tool","vice"]},"balance-scale":{"a":"Balance Scale","b":"2696","j":["balance","justice","Libra","scale","zodiac","law","fairness","weight"]},"white-cane":{"a":"White Cane","b":"1F9AF","j":["accessibility","blind","probing_cane"]},"link":{"a":"Link","b":"1F517","j":["rings","url"]},"chains":{"a":"Chains","b":"26D3","j":["chain","lock","arrest"]},"hook":{"a":"Hook","b":"1FA9D","j":["catch","crook","curve","ensnare","selling point","tools"]},"toolbox":{"a":"Toolbox","b":"1F9F0","j":["chest","mechanic","tool","tools","diy","fix","maintainer"]},"magnet":{"a":"Magnet","b":"1F9F2","j":["attraction","horseshoe","magnetic"]},"ladder":{"a":"Ladder","b":"1FA9C","j":["climb","rung","step","tools"]},"alembic":{"a":"Alembic","b":"2697","j":["chemistry","tool","distilling","science","experiment"]},"test-tube":{"a":"Test Tube","b":"1F9EA","j":["chemist","chemistry","experiment","lab","science"]},"petri-dish":{"a":"Petri Dish","b":"1F9EB","j":["bacteria","biologist","biology","culture","lab"]},"dna":{"a":"Dna","b":"1F9EC","j":["biologist","evolution","gene","genetics","life"]},"microscope":{"a":"Microscope","b":"1F52C","j":["science","tool","laboratory","experiment","zoomin","study"]},"telescope":{"a":"Telescope","b":"1F52D","j":["science","tool","stars","space","zoom","astronomy"]},"satellite-antenna":{"a":"Satellite Antenna","b":"1F4E1","j":["antenna","dish","satellite","communication","future","radio","space"]},"syringe":{"a":"Syringe","b":"1F489","j":["medicine","needle","shot","sick","health","hospital","drugs","blood","doctor","nurse"]},"drop-of-blood":{"a":"Drop of Blood","b":"1FA78","j":["bleed","blood donation","injury","medicine","menstruation","period","hurt","harm","wound"]},"pill":{"a":"Pill","b":"1F48A","j":["doctor","medicine","sick","health","pharmacy","drug"]},"adhesive-bandage":{"a":"Adhesive Bandage","b":"1FA79","j":["bandage","heal"]},"stethoscope":{"a":"Stethoscope","b":"1FA7A","j":["doctor","heart","medicine","health"]},"door":{"a":"Door","b":"1F6AA","j":["house","entry","exit"]},"elevator":{"a":"Elevator","b":"1F6D7","j":["accessibility","hoist","lift"]},"mirror":{"a":"Mirror","b":"1FA9E","j":["reflection","reflector","speculum"]},"window":{"a":"Window","b":"1FA9F","j":["frame","fresh air","opening","transparent","view","scenery"]},"bed":{"a":"Bed","b":"1F6CF","j":["hotel","sleep","rest"]},"couch-and-lamp":{"a":"Couch and Lamp","b":"1F6CB","j":["couch","hotel","lamp","read","chill"]},"chair":{"a":"Chair","b":"1FA91","j":["seat","sit","furniture"]},"toilet":{"a":"Toilet","b":"1F6BD","j":["restroom","wc","washroom","bathroom","potty"]},"plunger":{"a":"Plunger","b":"1FAA0","j":["force cup","plumber","suction","toilet"]},"shower":{"a":"Shower","b":"1F6BF","j":["water","clean","bathroom"]},"bathtub":{"a":"Bathtub","b":"1F6C1","j":["bath","clean","shower","bathroom"]},"mouse-trap":{"a":"Mouse Trap","b":"1FAA4","j":["bait","mousetrap","snare","trap","cheese"]},"razor":{"a":"Razor","b":"1FA92","j":["sharp","shave","cut"]},"lotion-bottle":{"a":"Lotion Bottle","b":"1F9F4","j":["lotion","moisturizer","shampoo","sunscreen"]},"safety-pin":{"a":"Safety Pin","b":"1F9F7","j":["diaper","punk rock"]},"broom":{"a":"Broom","b":"1F9F9","j":["cleaning","sweeping","witch"]},"basket":{"a":"Basket","b":"1F9FA","j":["farming","laundry","picnic"]},"roll-of-paper":{"a":"Roll of Paper","b":"1F9FB","j":["paper towels","toilet paper","roll"]},"bucket":{"a":"Bucket","b":"1FAA3","j":["cask","pail","vat","water","container"]},"soap":{"a":"Soap","b":"1F9FC","j":["bar","bathing","cleaning","lather","soapdish"]},"toothbrush":{"a":"Toothbrush","b":"1FAA5","j":["bathroom","brush","clean","dental","hygiene","teeth"]},"sponge":{"a":"Sponge","b":"1F9FD","j":["absorbing","cleaning","porous"]},"fire-extinguisher":{"a":"Fire Extinguisher","b":"1F9EF","j":["extinguish","fire","quench"]},"shopping-cart":{"a":"Shopping Cart","b":"1F6D2","j":["cart","shopping","trolley"]},"cigarette":{"a":"Cigarette","b":"1F6AC","j":["smoking","kills","tobacco","joint","smoke"]},"coffin":{"a":"Coffin","b":"26B0","j":["death","vampire","dead","die","rip","graveyard","cemetery","casket","funeral","box"]},"headstone":{"a":"Headstone","b":"1FAA6","j":["cemetery","grave","graveyard","tombstone","death","rip"]},"funeral-urn":{"a":"Funeral Urn","b":"26B1","j":["ashes","death","funeral","urn","dead","die","rip"]},"moai":{"a":"Moai","b":"1F5FF","j":["face","moyai","statue","rock","easter island"]},"placard":{"a":"Placard","b":"1FAA7","j":["demonstration","picket","protest","sign","announcement"]},"atm-sign":{"a":"Atm Sign","b":"1F3E7","j":["atm","ATM sign","automated","bank","teller","money","sales","cash","blue-square","payment"]},"litter-in-bin-sign":{"a":"Litter in Bin Sign","b":"1F6AE","j":["litter","litter bin","blue-square","sign","human","info"]},"potable-water":{"a":"Potable Water","b":"1F6B0","j":["drinking","potable","water","blue-square","liquid","restroom","cleaning","faucet"]},"wheelchair-symbol":{"a":"Wheelchair Symbol","b":"267F","j":["access","blue-square","disabled","accessibility"]},"mens-room":{"a":"Men’S Room","b":"1F6B9","j":["lavatory","man","men’s room","restroom","wc","men_s_room","toilet","blue-square","gender","male"]},"womens-room":{"a":"Women’S Room","b":"1F6BA","j":["lavatory","restroom","wc","woman","women’s room","women_s_room","purple-square","female","toilet","loo","gender"]},"restroom":{"a":"Restroom","b":"1F6BB","j":["lavatory","WC","blue-square","toilet","refresh","wc","gender"]},"baby-symbol":{"a":"Baby Symbol","b":"1F6BC","j":["baby","changing","orange-square","child"]},"water-closet":{"a":"Water Closet","b":"1F6BE","j":["closet","lavatory","restroom","water","wc","toilet","blue-square"]},"passport-control":{"a":"Passport Control","b":"1F6C2","j":["control","passport","custom","blue-square"]},"customs":{"a":"Customs","b":"1F6C3","j":["passport","border","blue-square"]},"baggage-claim":{"a":"Baggage Claim","b":"1F6C4","j":["baggage","claim","blue-square","airport","transport"]},"left-luggage":{"a":"Left Luggage","b":"1F6C5","j":["baggage","locker","luggage","blue-square","travel"]},"warning":{"a":"Warning","b":"26A0","j":["exclamation","wip","alert","error","problem","issue"]},"children-crossing":{"a":"Children Crossing","b":"1F6B8","j":["child","crossing","pedestrian","traffic","school","warning","danger","sign","driving","yellow-diamond"]},"no-entry":{"a":"No Entry","b":"26D4","j":["entry","forbidden","no","not","prohibited","traffic","limit","security","privacy","bad","denied","stop","circle"]},"prohibited":{"a":"Prohibited","b":"1F6AB","j":["entry","forbidden","no","not","forbid","stop","limit","denied","disallow","circle"]},"no-bicycles":{"a":"No Bicycles","b":"1F6B3","j":["bicycle","bike","forbidden","no","prohibited","cyclist","circle"]},"no-smoking":{"a":"No Smoking","b":"1F6AD","j":["forbidden","no","not","prohibited","smoking","cigarette","blue-square","smell","smoke"]},"no-littering":{"a":"No Littering","b":"1F6AF","j":["forbidden","litter","no","not","prohibited","trash","bin","garbage","circle"]},"nonpotable-water":{"a":"Non-Potable Water","b":"1F6B1","j":["non-drinking","non-potable","water","non_potable_water","drink","faucet","tap","circle"]},"no-pedestrians":{"a":"No Pedestrians","b":"1F6B7","j":["forbidden","no","not","pedestrian","prohibited","rules","crossing","walking","circle"]},"no-mobile-phones":{"a":"No Mobile Phones","b":"1F4F5","j":["cell","forbidden","mobile","no","phone","iphone","mute","circle"]},"no-one-under-eighteen":{"a":"No One Under Eighteen","b":"1F51E","j":["18","age restriction","eighteen","prohibited","underage","drink","pub","night","minor","circle"]},"radioactive":{"a":"Radioactive","b":"2622","j":["sign","nuclear","danger"]},"biohazard":{"a":"Biohazard","b":"2623","j":["sign","danger"]},"up-arrow":{"a":"Up Arrow","b":"2B06","j":["arrow","cardinal","direction","north","blue-square","continue","top"]},"upright-arrow":{"a":"Up-Right Arrow","b":"2197","j":["arrow","direction","intercardinal","northeast","up-right arrow","up_right_arrow","blue-square","point","diagonal"]},"right-arrow":{"a":"Right Arrow","b":"27A1","j":["arrow","cardinal","direction","east","blue-square","next"]},"downright-arrow":{"a":"Down-Right Arrow","b":"2198","j":["arrow","direction","down-right arrow","intercardinal","southeast","down_right_arrow","blue-square","diagonal"]},"down-arrow":{"a":"Down Arrow","b":"2B07","j":["arrow","cardinal","direction","down","south","blue-square","bottom"]},"downleft-arrow":{"a":"Down-Left Arrow","b":"2199","j":["arrow","direction","down-left arrow","intercardinal","southwest","down_left_arrow","blue-square","diagonal"]},"left-arrow":{"a":"Left Arrow","b":"2B05","j":["arrow","cardinal","direction","west","blue-square","previous","back"]},"upleft-arrow":{"a":"Up-Left Arrow","b":"2196","j":["arrow","direction","intercardinal","northwest","up-left arrow","up_left_arrow","blue-square","point","diagonal"]},"updown-arrow":{"a":"Up-Down Arrow","b":"2195","j":["arrow","up-down arrow","up_down_arrow","blue-square","direction","way","vertical"]},"leftright-arrow":{"a":"Left-Right Arrow","b":"2194","j":["arrow","left-right arrow","left_right_arrow","shape","direction","horizontal","sideways"]},"right-arrow-curving-left":{"a":"Right Arrow Curving Left","b":"21A9","j":["arrow","back","return","blue-square","undo","enter"]},"left-arrow-curving-right":{"a":"Left Arrow Curving Right","b":"21AA","j":["arrow","blue-square","return","rotate","direction"]},"right-arrow-curving-up":{"a":"Right Arrow Curving Up","b":"2934","j":["arrow","blue-square","direction","top"]},"right-arrow-curving-down":{"a":"Right Arrow Curving Down","b":"2935","j":["arrow","down","blue-square","direction","bottom"]},"clockwise-vertical-arrows":{"a":"Clockwise Vertical Arrows","b":"1F503","j":["arrow","clockwise","reload","sync","cycle","round","repeat"]},"counterclockwise-arrows-button":{"a":"Counterclockwise Arrows Button","b":"1F504","j":["anticlockwise","arrow","counterclockwise","withershins","blue-square","sync","cycle"]},"back-arrow":{"a":"Back Arrow","b":"1F519","j":["arrow","back","BACK arrow","words","return"]},"end-arrow":{"a":"End Arrow","b":"1F51A","j":["arrow","end","END arrow","words"]},"on-arrow":{"a":"On! Arrow","b":"1F51B","j":["arrow","mark","on","ON! arrow","words"]},"soon-arrow":{"a":"Soon Arrow","b":"1F51C","j":["arrow","soon","SOON arrow","words"]},"top-arrow":{"a":"Top Arrow","b":"1F51D","j":["arrow","top","TOP arrow","up","words","blue-square"]},"place-of-worship":{"a":"Place of Worship","b":"1F6D0","j":["religion","worship","church","temple","prayer"]},"atom-symbol":{"a":"Atom Symbol","b":"269B","j":["atheist","atom","science","physics","chemistry"]},"om":{"a":"Om","b":"1F549","j":["Hindu","religion","hinduism","buddhism","sikhism","jainism"]},"star-of-david":{"a":"Star of David","b":"2721","j":["David","Jew","Jewish","religion","star","star of David","judaism"]},"wheel-of-dharma":{"a":"Wheel of Dharma","b":"2638","j":["Buddhist","dharma","religion","wheel","hinduism","buddhism","sikhism","jainism"]},"yin-yang":{"a":"Yin Yang","b":"262F","j":["religion","tao","taoist","yang","yin","balance"]},"latin-cross":{"a":"Latin Cross","b":"271D","j":["Christian","cross","religion","christianity"]},"orthodox-cross":{"a":"Orthodox Cross","b":"2626","j":["Christian","cross","religion","suppedaneum"]},"star-and-crescent":{"a":"Star and Crescent","b":"262A","j":["islam","Muslim","religion"]},"peace-symbol":{"a":"Peace Symbol","b":"262E","j":["peace","hippie"]},"menorah":{"a":"Menorah","b":"1F54E","j":["candelabrum","candlestick","religion","hanukkah","candles","jewish"]},"dotted-sixpointed-star":{"a":"Dotted Six-Pointed Star","b":"1F52F","j":["dotted six-pointed star","fortune","star","dotted_six_pointed_star","purple-square","religion","jewish","hexagram"]},"aries":{"a":"Aries","b":"2648","j":["ram","zodiac","sign","purple-square","astrology"]},"taurus":{"a":"Taurus","b":"2649","j":["bull","ox","zodiac","purple-square","sign","astrology"]},"gemini":{"a":"Gemini","b":"264A","j":["twins","zodiac","sign","purple-square","astrology"]},"cancer":{"a":"Cancer","b":"264B","j":["crab","zodiac","sign","purple-square","astrology"]},"leo":{"a":"Leo","b":"264C","j":["lion","zodiac","sign","purple-square","astrology"]},"virgo":{"a":"Virgo","b":"264D","j":["zodiac","sign","purple-square","astrology"]},"libra":{"a":"Libra","b":"264E","j":["balance","justice","scales","zodiac","sign","purple-square","astrology"]},"scorpio":{"a":"Scorpio","b":"264F","j":["scorpion","scorpius","zodiac","sign","purple-square","astrology"]},"sagittarius":{"a":"Sagittarius","b":"2650","j":["archer","zodiac","sign","purple-square","astrology"]},"capricorn":{"a":"Capricorn","b":"2651","j":["goat","zodiac","sign","purple-square","astrology"]},"aquarius":{"a":"Aquarius","b":"2652","j":["bearer","water","zodiac","sign","purple-square","astrology"]},"pisces":{"a":"Pisces","b":"2653","j":["fish","zodiac","purple-square","sign","astrology"]},"ophiuchus":{"a":"Ophiuchus","b":"26CE","j":["bearer","serpent","snake","zodiac","sign","purple-square","constellation","astrology"]},"shuffle-tracks-button":{"a":"Shuffle Tracks Button","b":"1F500","j":["arrow","crossed","blue-square","shuffle","music","random"]},"repeat-button":{"a":"Repeat Button","b":"1F501","j":["arrow","clockwise","repeat","loop","record"]},"repeat-single-button":{"a":"Repeat Single Button","b":"1F502","j":["arrow","clockwise","once","blue-square","loop"]},"play-button":{"a":"Play Button","b":"25B6","j":["arrow","play","right","triangle","blue-square","direction"]},"fastforward-button":{"a":"Fast-Forward Button","b":"23E9","j":["arrow","double","fast","fast-forward button","forward","fast_forward_button","blue-square","play","speed","continue"]},"next-track-button":{"a":"Next Track Button","b":"23ED","j":["arrow","next scene","next track","triangle","forward","next","blue-square"]},"play-or-pause-button":{"a":"Play or Pause Button","b":"23EF","j":["arrow","pause","play","right","triangle","blue-square"]},"reverse-button":{"a":"Reverse Button","b":"25C0","j":["arrow","left","reverse","triangle","blue-square","direction"]},"fast-reverse-button":{"a":"Fast Reverse Button","b":"23EA","j":["arrow","double","rewind","play","blue-square"]},"last-track-button":{"a":"Last Track Button","b":"23EE","j":["arrow","previous scene","previous track","triangle","backward"]},"upwards-button":{"a":"Upwards Button","b":"1F53C","j":["arrow","button","red","blue-square","triangle","direction","point","forward","top"]},"fast-up-button":{"a":"Fast Up Button","b":"23EB","j":["arrow","double","blue-square","direction","top"]},"downwards-button":{"a":"Downwards Button","b":"1F53D","j":["arrow","button","down","red","blue-square","direction","bottom"]},"fast-down-button":{"a":"Fast Down Button","b":"23EC","j":["arrow","double","down","blue-square","direction","bottom"]},"pause-button":{"a":"Pause Button","b":"23F8","j":["bar","double","pause","vertical","blue-square"]},"stop-button":{"a":"Stop Button","b":"23F9","j":["square","stop","blue-square"]},"record-button":{"a":"Record Button","b":"23FA","j":["circle","record","blue-square"]},"eject-button":{"a":"Eject Button","b":"23CF","j":["eject","blue-square"]},"cinema":{"a":"Cinema","b":"1F3A6","j":["camera","film","movie","blue-square","record","curtain","stage","theater"]},"dim-button":{"a":"Dim Button","b":"1F505","j":["brightness","dim","low","sun","afternoon","warm","summer"]},"bright-button":{"a":"Bright Button","b":"1F506","j":["bright","brightness","sun","light"]},"antenna-bars":{"a":"Antenna Bars","b":"1F4F6","j":["antenna","bar","cell","mobile","phone","blue-square","reception","internet","connection","wifi","bluetooth","bars"]},"vibration-mode":{"a":"Vibration Mode","b":"1F4F3","j":["cell","mobile","mode","phone","telephone","vibration","orange-square"]},"mobile-phone-off":{"a":"Mobile Phone off","b":"1F4F4","j":["cell","mobile","off","phone","telephone","mute","orange-square","silence","quiet"]},"female-sign":{"a":"Female Sign","b":"2640","j":["woman","women","lady","girl"]},"male-sign":{"a":"Male Sign","b":"2642","j":["man","boy","men"]},"transgender-symbol":{"a":"Transgender Symbol","b":"26A7","j":["transgender","lgbtq"]},"multiply":{"a":"Multiply","b":"2716","j":["×","cancel","multiplication","sign","x","multiplication_sign","math","calculation"]},"plus":{"a":"Plus","b":"2795","j":["+","math","sign","plus_sign","calculation","addition","more","increase"]},"minus":{"a":"Minus","b":"2796","j":["-","−","math","sign","minus_sign","calculation","subtract","less"]},"divide":{"a":"Divide","b":"2797","j":["÷","division","math","sign","division_sign","calculation"]},"infinity":{"a":"Infinity","b":"267E","j":["forever","unbounded","universal"]},"double-exclamation-mark":{"a":"Double Exclamation Mark","b":"203C","j":["!","!!","bangbang","exclamation","mark","surprise"]},"exclamation-question-mark":{"a":"Exclamation Question Mark","b":"2049","j":["!","!?","?","exclamation","interrobang","mark","punctuation","question","wat","surprise"]},"red-question-mark":{"a":"Red Question Mark","b":"2753","j":["?","mark","punctuation","question","question_mark","doubt","confused"]},"white-question-mark":{"a":"White Question Mark","b":"2754","j":["?","mark","outlined","punctuation","question","doubts","gray","huh","confused"]},"white-exclamation-mark":{"a":"White Exclamation Mark","b":"2755","j":["!","exclamation","mark","outlined","punctuation","surprise","gray","wow","warning"]},"red-exclamation-mark":{"a":"Red Exclamation Mark","b":"2757","j":["!","exclamation","mark","punctuation","exclamation_mark","heavy_exclamation_mark","danger","surprise","wow","warning"]},"wavy-dash":{"a":"Wavy Dash","b":"3030","j":["dash","punctuation","wavy","draw","line","moustache","mustache","squiggle","scribble"]},"currency-exchange":{"a":"Currency Exchange","b":"1F4B1","j":["bank","currency","exchange","money","sales","dollar","travel"]},"heavy-dollar-sign":{"a":"Heavy Dollar Sign","b":"1F4B2","j":["currency","dollar","money","sales","payment","buck"]},"medical-symbol":{"a":"Medical Symbol","b":"2695","j":["aesculapius","medicine","staff","health","hospital"]},"recycling-symbol":{"a":"Recycling Symbol","b":"267B","j":["recycle","arrow","environment","garbage","trash"]},"fleurdelis":{"a":"Fleur-De-Lis","b":"269C","j":["fleur-de-lis","fleur_de_lis","decorative","scout"]},"trident-emblem":{"a":"Trident Emblem","b":"1F531","j":["anchor","emblem","ship","tool","trident","weapon","spear"]},"name-badge":{"a":"Name Badge","b":"1F4DB","j":["badge","name","fire","forbid"]},"japanese-symbol-for-beginner":{"a":"Japanese Symbol for Beginner","b":"1F530","j":["beginner","chevron","Japanese","Japanese symbol for beginner","leaf","badge","shield"]},"hollow-red-circle":{"a":"Hollow Red Circle","b":"2B55","j":["circle","large","o","red","round"]},"check-mark-button":{"a":"Check Mark Button","b":"2705","j":["✓","button","check","mark","green-square","ok","agree","vote","election","answer","tick"]},"check-box-with-check":{"a":"Check Box with Check","b":"2611","j":["✓","box","check","ok","agree","confirm","black-square","vote","election","yes","tick"]},"check-mark":{"a":"Check Mark","b":"2714","j":["✓","check","mark","ok","nike","answer","yes","tick"]},"cross-mark":{"a":"Cross Mark","b":"274C","j":["×","cancel","cross","mark","multiplication","multiply","x","no","delete","remove","red"]},"cross-mark-button":{"a":"Cross Mark Button","b":"274E","j":["×","mark","square","x","green-square","no","deny"]},"curly-loop":{"a":"Curly Loop","b":"27B0","j":["curl","loop","scribble","draw","shape","squiggle"]},"double-curly-loop":{"a":"Double Curly Loop","b":"27BF","j":["curl","double","loop","tape","cassette"]},"part-alternation-mark":{"a":"Part Alternation Mark","b":"303D","j":["mark","part","graph","presentation","stats","business","economics","bad"]},"eightspoked-asterisk":{"a":"Eight-Spoked Asterisk","b":"2733","j":["*","asterisk","eight-spoked asterisk","eight_spoked_asterisk","star","sparkle","green-square"]},"eightpointed-star":{"a":"Eight-Pointed Star","b":"2734","j":["*","eight-pointed star","star","eight_pointed_star","orange-square","shape","polygon"]},"sparkle":{"a":"Sparkle","b":"2747","j":["*","stars","green-square","awesome","good","fireworks"]},"copyright":{"a":"Copyright","b":"00A9","j":["c","ip","license","circle","law","legal"]},"registered":{"a":"Registered","b":"00AE","j":["r","alphabet","circle"]},"trade-mark":{"a":"Trade Mark","b":"2122","j":["mark","tm","trademark","brand","law","legal"]},"keycap":{"a":"Keycap: *","b":"002A-FE0F-20E3","j":["keycap_","star"]},"keycap-0":{"a":"Keycap: 0","b":"0030-FE0F-20E3","j":["keycap","0","numbers","blue-square","null"]},"keycap-1":{"a":"Keycap: 1","b":"0031-FE0F-20E3","j":["keycap","blue-square","numbers","1"]},"keycap-2":{"a":"Keycap: 2","b":"0032-FE0F-20E3","j":["keycap","numbers","2","prime","blue-square"]},"keycap-3":{"a":"Keycap: 3","b":"0033-FE0F-20E3","j":["keycap","3","numbers","prime","blue-square"]},"keycap-4":{"a":"Keycap: 4","b":"0034-FE0F-20E3","j":["keycap","4","numbers","blue-square"]},"keycap-5":{"a":"Keycap: 5","b":"0035-FE0F-20E3","j":["keycap","5","numbers","blue-square","prime"]},"keycap-6":{"a":"Keycap: 6","b":"0036-FE0F-20E3","j":["keycap","6","numbers","blue-square"]},"keycap-7":{"a":"Keycap: 7","b":"0037-FE0F-20E3","j":["keycap","7","numbers","blue-square","prime"]},"keycap-8":{"a":"Keycap: 8","b":"0038-FE0F-20E3","j":["keycap","8","blue-square","numbers"]},"keycap-9":{"a":"Keycap: 9","b":"0039-FE0F-20E3","j":["keycap","blue-square","numbers","9"]},"keycap-10":{"a":"Keycap: 10","b":"1F51F","j":["keycap","numbers","10","blue-square"]},"input-latin-uppercase":{"a":"Input Latin Uppercase","b":"1F520","j":["ABCD","input","latin","letters","uppercase","alphabet","words","blue-square"]},"input-latin-lowercase":{"a":"Input Latin Lowercase","b":"1F521","j":["abcd","input","latin","letters","lowercase","blue-square","alphabet"]},"input-numbers":{"a":"Input Numbers","b":"1F522","j":["1234","input","numbers","blue-square"]},"input-symbols":{"a":"Input Symbols","b":"1F523","j":["〒♪&%","input","blue-square","music","note","ampersand","percent","glyphs","characters"]},"input-latin-letters":{"a":"Input Latin Letters","b":"1F524","j":["abc","alphabet","input","latin","letters","blue-square"]},"a-button-blood-type":{"a":"A Button (Blood Type)","b":"1F170","j":["a","A button (blood type)","blood type","a_button","red-square","alphabet","letter"]},"ab-button-blood-type":{"a":"Ab Button (Blood Type)","b":"1F18E","j":["ab","AB button (blood type)","blood type","ab_button","red-square","alphabet"]},"b-button-blood-type":{"a":"B Button (Blood Type)","b":"1F171","j":["b","B button (blood type)","blood type","b_button","red-square","alphabet","letter"]},"cl-button":{"a":"Cl Button","b":"1F191","j":["cl","CL button","alphabet","words","red-square"]},"cool-button":{"a":"Cool Button","b":"1F192","j":["cool","COOL button","words","blue-square"]},"free-button":{"a":"Free Button","b":"1F193","j":["free","FREE button","blue-square","words"]},"information":{"a":"Information","b":"2139","j":["i","blue-square","alphabet","letter"]},"id-button":{"a":"Id Button","b":"1F194","j":["id","ID button","identity","purple-square","words"]},"circled-m":{"a":"Circled M","b":"24C2","j":["circle","circled M","m","alphabet","blue-circle","letter"]},"new-button":{"a":"New Button","b":"1F195","j":["new","NEW button","blue-square","words","start"]},"ng-button":{"a":"Ng Button","b":"1F196","j":["ng","NG button","blue-square","words","shape","icon"]},"o-button-blood-type":{"a":"O Button (Blood Type)","b":"1F17E","j":["blood type","o","O button (blood type)","o_button","alphabet","red-square","letter"]},"ok-button":{"a":"Ok Button","b":"1F197","j":["OK","OK button","good","agree","yes","blue-square"]},"p-button":{"a":"P Button","b":"1F17F","j":["P button","parking","cars","blue-square","alphabet","letter"]},"sos-button":{"a":"Sos Button","b":"1F198","j":["help","sos","SOS button","red-square","words","emergency","911"]},"up-button":{"a":"Up! Button","b":"1F199","j":["mark","up","UP! button","blue-square","above","high"]},"vs-button":{"a":"Vs Button","b":"1F19A","j":["versus","vs","VS button","words","orange-square"]},"japanese-here-button":{"a":"Japanese “Here” Button","b":"1F201","j":["“here”","Japanese","Japanese “here” button","katakana","ココ","blue-square","here","japanese","destination"]},"japanese-service-charge-button":{"a":"Japanese “Service Charge” Button","b":"1F202","j":["“service charge”","Japanese","Japanese “service charge” button","katakana","サ","japanese","blue-square"]},"japanese-monthly-amount-button":{"a":"Japanese “Monthly Amount” Button","b":"1F237","j":["“monthly amount”","ideograph","Japanese","Japanese “monthly amount” button","月","chinese","month","moon","japanese","orange-square","kanji"]},"japanese-not-free-of-charge-button":{"a":"Japanese “Not Free of Charge” Button","b":"1F236","j":["“not free of charge”","ideograph","Japanese","Japanese “not free of charge” button","有","orange-square","chinese","have","kanji"]},"japanese-reserved-button":{"a":"Japanese “Reserved” Button","b":"1F22F","j":["“reserved”","ideograph","Japanese","Japanese “reserved” button","指","chinese","point","green-square","kanji"]},"japanese-bargain-button":{"a":"Japanese “Bargain” Button","b":"1F250","j":["“bargain”","ideograph","Japanese","Japanese “bargain” button","得","chinese","kanji","obtain","get","circle"]},"japanese-discount-button":{"a":"Japanese “Discount” Button","b":"1F239","j":["“discount”","ideograph","Japanese","Japanese “discount” button","割","cut","divide","chinese","kanji","pink-square"]},"japanese-free-of-charge-button":{"a":"Japanese “Free of Charge” Button","b":"1F21A","j":["“free of charge”","ideograph","Japanese","Japanese “free of charge” button","無","nothing","chinese","kanji","japanese","orange-square"]},"japanese-prohibited-button":{"a":"Japanese “Prohibited” Button","b":"1F232","j":["“prohibited”","ideograph","Japanese","Japanese “prohibited” button","禁","kanji","japanese","chinese","forbidden","limit","restricted","red-square"]},"japanese-acceptable-button":{"a":"Japanese “Acceptable” Button","b":"1F251","j":["“acceptable”","ideograph","Japanese","Japanese “acceptable” button","可","ok","good","chinese","kanji","agree","yes","orange-circle"]},"japanese-application-button":{"a":"Japanese “Application” Button","b":"1F238","j":["“application”","ideograph","Japanese","Japanese “application” button","申","chinese","japanese","kanji","orange-square"]},"japanese-passing-grade-button":{"a":"Japanese “Passing Grade” Button","b":"1F234","j":["“passing grade”","ideograph","Japanese","Japanese “passing grade” button","合","japanese","chinese","join","kanji","red-square"]},"japanese-vacancy-button":{"a":"Japanese “Vacancy” Button","b":"1F233","j":["“vacancy”","ideograph","Japanese","Japanese “vacancy” button","空","kanji","japanese","chinese","empty","sky","blue-square"]},"japanese-congratulations-button":{"a":"Japanese “Congratulations” Button","b":"3297","j":["“congratulations”","ideograph","Japanese","Japanese “congratulations” button","祝","chinese","kanji","japanese","red-circle"]},"japanese-secret-button":{"a":"Japanese “Secret” Button","b":"3299","j":["“secret”","ideograph","Japanese","Japanese “secret” button","秘","privacy","chinese","sshh","kanji","red-circle"]},"japanese-open-for-business-button":{"a":"Japanese “Open for Business” Button","b":"1F23A","j":["“open for business”","ideograph","Japanese","Japanese “open for business” button","営","japanese","opening hours","orange-square"]},"japanese-no-vacancy-button":{"a":"Japanese “No Vacancy” Button","b":"1F235","j":["“no vacancy”","ideograph","Japanese","Japanese “no vacancy” button","満","full","chinese","japanese","red-square","kanji"]},"red-circle":{"a":"Red Circle","b":"1F534","j":["circle","geometric","red","shape","error","danger"]},"orange-circle":{"a":"Orange Circle","b":"1F7E0","j":["circle","orange","round"]},"yellow-circle":{"a":"Yellow Circle","b":"1F7E1","j":["circle","yellow","round"]},"green-circle":{"a":"Green Circle","b":"1F7E2","j":["circle","green","round"]},"blue-circle":{"a":"Blue Circle","b":"1F535","j":["blue","circle","geometric","shape","icon","button"]},"purple-circle":{"a":"Purple Circle","b":"1F7E3","j":["circle","purple","round"]},"brown-circle":{"a":"Brown Circle","b":"1F7E4","j":["brown","circle","round"]},"black-circle":{"a":"Black Circle","b":"26AB","j":["circle","geometric","shape","button","round"]},"white-circle":{"a":"White Circle","b":"26AA","j":["circle","geometric","shape","round"]},"red-square":{"a":"Red Square","b":"1F7E5","j":["red","square"]},"orange-square":{"a":"Orange Square","b":"1F7E7","j":["orange","square"]},"yellow-square":{"a":"Yellow Square","b":"1F7E8","j":["square","yellow"]},"green-square":{"a":"Green Square","b":"1F7E9","j":["green","square"]},"blue-square":{"a":"Blue Square","b":"1F7E6","j":["blue","square"]},"purple-square":{"a":"Purple Square","b":"1F7EA","j":["purple","square"]},"brown-square":{"a":"Brown Square","b":"1F7EB","j":["brown","square"]},"black-large-square":{"a":"Black Large Square","b":"2B1B","j":["geometric","square","shape","icon","button"]},"white-large-square":{"a":"White Large Square","b":"2B1C","j":["geometric","square","shape","icon","stone","button"]},"black-medium-square":{"a":"Black Medium Square","b":"25FC","j":["geometric","square","shape","button","icon"]},"white-medium-square":{"a":"White Medium Square","b":"25FB","j":["geometric","square","shape","stone","icon"]},"black-mediumsmall-square":{"a":"Black Medium-Small Square","b":"25FE","j":["black medium-small square","geometric","square","black_medium_small_square","icon","shape","button"]},"white-mediumsmall-square":{"a":"White Medium-Small Square","b":"25FD","j":["geometric","square","white medium-small square","white_medium_small_square","shape","stone","icon","button"]},"black-small-square":{"a":"Black Small Square","b":"25AA","j":["geometric","square","shape","icon"]},"white-small-square":{"a":"White Small Square","b":"25AB","j":["geometric","square","shape","icon"]},"large-orange-diamond":{"a":"Large Orange Diamond","b":"1F536","j":["diamond","geometric","orange","shape","jewel","gem"]},"large-blue-diamond":{"a":"Large Blue Diamond","b":"1F537","j":["blue","diamond","geometric","shape","jewel","gem"]},"small-orange-diamond":{"a":"Small Orange Diamond","b":"1F538","j":["diamond","geometric","orange","shape","jewel","gem"]},"small-blue-diamond":{"a":"Small Blue Diamond","b":"1F539","j":["blue","diamond","geometric","shape","jewel","gem"]},"red-triangle-pointed-up":{"a":"Red Triangle Pointed Up","b":"1F53A","j":["geometric","red","shape","direction","up","top"]},"red-triangle-pointed-down":{"a":"Red Triangle Pointed Down","b":"1F53B","j":["down","geometric","red","shape","direction","bottom"]},"diamond-with-a-dot":{"a":"Diamond with a Dot","b":"1F4A0","j":["comic","diamond","geometric","inside","jewel","blue","gem","crystal","fancy"]},"radio-button":{"a":"Radio Button","b":"1F518","j":["button","geometric","radio","input","old","music","circle"]},"white-square-button":{"a":"White Square Button","b":"1F533","j":["button","geometric","outlined","square","shape","input"]},"black-square-button":{"a":"Black Square Button","b":"1F532","j":["button","geometric","square","shape","input","frame"]},"chequered-flag":{"a":"Chequered Flag","b":"1F3C1","j":["checkered","chequered","racing","contest","finishline","race","gokart"]},"triangular-flag":{"a":"Triangular Flag","b":"1F6A9","j":["post","mark","milestone","place"]},"crossed-flags":{"a":"Crossed Flags","b":"1F38C","j":["celebration","cross","crossed","Japanese","japanese","nation","country","border"]},"black-flag":{"a":"Black Flag","b":"1F3F4","j":["waving","pirate"]},"white-flag":{"a":"White Flag","b":"1F3F3","j":["waving","losing","loser","lost","surrender","give up","fail"]},"rainbow-flag":{"a":"Rainbow Flag","b":"1F3F3-FE0F-200D-1F308","j":["pride","rainbow","flag","gay","lgbt","glbt","queer","homosexual","lesbian","bisexual","transgender"]},"transgender-flag":{"a":"Transgender Flag","b":"1F3F3-FE0F-200D-26A7-FE0F","j":["flag","light blue","pink","transgender","white","lgbtq"]},"pirate-flag":{"a":"Pirate Flag","b":"1F3F4-200D-2620-FE0F","j":["Jolly Roger","pirate","plunder","treasure","skull","crossbones","flag","banner"]},"flag-ascension-island":{"a":"Flag: Ascension Island","b":"1F1E6-1F1E8","j":["flag"]},"flag-andorra":{"a":"Flag: Andorra","b":"1F1E6-1F1E9","j":["flag","ad","nation","country","banner"]},"flag-united-arab-emirates":{"a":"Flag: United Arab Emirates","b":"1F1E6-1F1EA","j":["flag","united","arab","emirates","nation","country","banner"]},"flag-afghanistan":{"a":"Flag: Afghanistan","b":"1F1E6-1F1EB","j":["flag","af","nation","country","banner"]},"flag-antigua--barbuda":{"a":"Flag: Antigua & Barbuda","b":"1F1E6-1F1EC","j":["flag","flag_antigua_barbuda","antigua","barbuda","nation","country","banner"]},"flag-anguilla":{"a":"Flag: Anguilla","b":"1F1E6-1F1EE","j":["flag","ai","nation","country","banner"]},"flag-albania":{"a":"Flag: Albania","b":"1F1E6-1F1F1","j":["flag","al","nation","country","banner"]},"flag-armenia":{"a":"Flag: Armenia","b":"1F1E6-1F1F2","j":["flag","am","nation","country","banner"]},"flag-angola":{"a":"Flag: Angola","b":"1F1E6-1F1F4","j":["flag","ao","nation","country","banner"]},"flag-antarctica":{"a":"Flag: Antarctica","b":"1F1E6-1F1F6","j":["flag","aq","nation","country","banner"]},"flag-argentina":{"a":"Flag: Argentina","b":"1F1E6-1F1F7","j":["flag","ar","nation","country","banner"]},"flag-american-samoa":{"a":"Flag: American Samoa","b":"1F1E6-1F1F8","j":["flag","american","ws","nation","country","banner"]},"flag-austria":{"a":"Flag: Austria","b":"1F1E6-1F1F9","j":["flag","at","nation","country","banner"]},"flag-australia":{"a":"Flag: Australia","b":"1F1E6-1F1FA","j":["flag","au","nation","country","banner"]},"flag-aruba":{"a":"Flag: Aruba","b":"1F1E6-1F1FC","j":["flag","aw","nation","country","banner"]},"flag-land-islands":{"a":"Flag: Åland Islands","b":"1F1E6-1F1FD","j":["flag","flag_aland_islands","Åland","islands","nation","country","banner"]},"flag-azerbaijan":{"a":"Flag: Azerbaijan","b":"1F1E6-1F1FF","j":["flag","az","nation","country","banner"]},"flag-bosnia--herzegovina":{"a":"Flag: Bosnia & Herzegovina","b":"1F1E7-1F1E6","j":["flag","flag_bosnia_herzegovina","bosnia","herzegovina","nation","country","banner"]},"flag-barbados":{"a":"Flag: Barbados","b":"1F1E7-1F1E7","j":["flag","bb","nation","country","banner"]},"flag-bangladesh":{"a":"Flag: Bangladesh","b":"1F1E7-1F1E9","j":["flag","bd","nation","country","banner"]},"flag-belgium":{"a":"Flag: Belgium","b":"1F1E7-1F1EA","j":["flag","be","nation","country","banner"]},"flag-burkina-faso":{"a":"Flag: Burkina Faso","b":"1F1E7-1F1EB","j":["flag","burkina","faso","nation","country","banner"]},"flag-bulgaria":{"a":"Flag: Bulgaria","b":"1F1E7-1F1EC","j":["flag","bg","nation","country","banner"]},"flag-bahrain":{"a":"Flag: Bahrain","b":"1F1E7-1F1ED","j":["flag","bh","nation","country","banner"]},"flag-burundi":{"a":"Flag: Burundi","b":"1F1E7-1F1EE","j":["flag","bi","nation","country","banner"]},"flag-benin":{"a":"Flag: Benin","b":"1F1E7-1F1EF","j":["flag","bj","nation","country","banner"]},"flag-st-barthlemy":{"a":"Flag: St. Barthélemy","b":"1F1E7-1F1F1","j":["flag","flag_st_barthelemy","saint","barthélemy","nation","country","banner"]},"flag-bermuda":{"a":"Flag: Bermuda","b":"1F1E7-1F1F2","j":["flag","bm","nation","country","banner"]},"flag-brunei":{"a":"Flag: Brunei","b":"1F1E7-1F1F3","j":["flag","bn","darussalam","nation","country","banner"]},"flag-bolivia":{"a":"Flag: Bolivia","b":"1F1E7-1F1F4","j":["flag","bo","nation","country","banner"]},"flag-caribbean-netherlands":{"a":"Flag: Caribbean Netherlands","b":"1F1E7-1F1F6","j":["flag","bonaire","nation","country","banner"]},"flag-brazil":{"a":"Flag: Brazil","b":"1F1E7-1F1F7","j":["flag","br","nation","country","banner"]},"flag-bahamas":{"a":"Flag: Bahamas","b":"1F1E7-1F1F8","j":["flag","bs","nation","country","banner"]},"flag-bhutan":{"a":"Flag: Bhutan","b":"1F1E7-1F1F9","j":["flag","bt","nation","country","banner"]},"flag-bouvet-island":{"a":"Flag: Bouvet Island","b":"1F1E7-1F1FB","j":["flag","norway"]},"flag-botswana":{"a":"Flag: Botswana","b":"1F1E7-1F1FC","j":["flag","bw","nation","country","banner"]},"flag-belarus":{"a":"Flag: Belarus","b":"1F1E7-1F1FE","j":["flag","by","nation","country","banner"]},"flag-belize":{"a":"Flag: Belize","b":"1F1E7-1F1FF","j":["flag","bz","nation","country","banner"]},"flag-canada":{"a":"Flag: Canada","b":"1F1E8-1F1E6","j":["flag","ca","nation","country","banner"]},"flag-cocos-keeling-islands":{"a":"Flag: Cocos (Keeling) Islands","b":"1F1E8-1F1E8","j":["flag","flag_cocos_islands","cocos","keeling","islands","nation","country","banner"]},"flag-congo--kinshasa":{"a":"Flag: Congo - Kinshasa","b":"1F1E8-1F1E9","j":["flag","flag_congo_kinshasa","congo","democratic","republic","nation","country","banner"]},"flag-central-african-republic":{"a":"Flag: Central African Republic","b":"1F1E8-1F1EB","j":["flag","central","african","republic","nation","country","banner"]},"flag-congo--brazzaville":{"a":"Flag: Congo - Brazzaville","b":"1F1E8-1F1EC","j":["flag","flag_congo_brazzaville","congo","nation","country","banner"]},"flag-switzerland":{"a":"Flag: Switzerland","b":"1F1E8-1F1ED","j":["flag","ch","nation","country","banner"]},"flag-cte-divoire":{"a":"Flag: Côte D’Ivoire","b":"1F1E8-1F1EE","j":["flag","flag_cote_d_ivoire","ivory","coast","nation","country","banner"]},"flag-cook-islands":{"a":"Flag: Cook Islands","b":"1F1E8-1F1F0","j":["flag","cook","islands","nation","country","banner"]},"flag-chile":{"a":"Flag: Chile","b":"1F1E8-1F1F1","j":["flag","nation","country","banner"]},"flag-cameroon":{"a":"Flag: Cameroon","b":"1F1E8-1F1F2","j":["flag","cm","nation","country","banner"]},"flag-china":{"a":"Flag: China","b":"1F1E8-1F1F3","j":["flag","china","chinese","prc","country","nation","banner"]},"flag-colombia":{"a":"Flag: Colombia","b":"1F1E8-1F1F4","j":["flag","co","nation","country","banner"]},"flag-clipperton-island":{"a":"Flag: Clipperton Island","b":"1F1E8-1F1F5","j":["flag"]},"flag-costa-rica":{"a":"Flag: Costa Rica","b":"1F1E8-1F1F7","j":["flag","costa","rica","nation","country","banner"]},"flag-cuba":{"a":"Flag: Cuba","b":"1F1E8-1F1FA","j":["flag","cu","nation","country","banner"]},"flag-cape-verde":{"a":"Flag: Cape Verde","b":"1F1E8-1F1FB","j":["flag","cabo","verde","nation","country","banner"]},"flag-curaao":{"a":"Flag: Curaçao","b":"1F1E8-1F1FC","j":["flag","flag_curacao","curaçao","nation","country","banner"]},"flag-christmas-island":{"a":"Flag: Christmas Island","b":"1F1E8-1F1FD","j":["flag","christmas","island","nation","country","banner"]},"flag-cyprus":{"a":"Flag: Cyprus","b":"1F1E8-1F1FE","j":["flag","cy","nation","country","banner"]},"flag-czechia":{"a":"Flag: Czechia","b":"1F1E8-1F1FF","j":["flag","cz","nation","country","banner"]},"flag-germany":{"a":"Flag: Germany","b":"1F1E9-1F1EA","j":["flag","german","nation","country","banner"]},"flag-diego-garcia":{"a":"Flag: Diego Garcia","b":"1F1E9-1F1EC","j":["flag"]},"flag-djibouti":{"a":"Flag: Djibouti","b":"1F1E9-1F1EF","j":["flag","dj","nation","country","banner"]},"flag-denmark":{"a":"Flag: Denmark","b":"1F1E9-1F1F0","j":["flag","dk","nation","country","banner"]},"flag-dominica":{"a":"Flag: Dominica","b":"1F1E9-1F1F2","j":["flag","dm","nation","country","banner"]},"flag-dominican-republic":{"a":"Flag: Dominican Republic","b":"1F1E9-1F1F4","j":["flag","dominican","republic","nation","country","banner"]},"flag-algeria":{"a":"Flag: Algeria","b":"1F1E9-1F1FF","j":["flag","dz","nation","country","banner"]},"flag-ceuta--melilla":{"a":"Flag: Ceuta & Melilla","b":"1F1EA-1F1E6","j":["flag","flag_ceuta_melilla"]},"flag-ecuador":{"a":"Flag: Ecuador","b":"1F1EA-1F1E8","j":["flag","ec","nation","country","banner"]},"flag-estonia":{"a":"Flag: Estonia","b":"1F1EA-1F1EA","j":["flag","ee","nation","country","banner"]},"flag-egypt":{"a":"Flag: Egypt","b":"1F1EA-1F1EC","j":["flag","eg","nation","country","banner"]},"flag-western-sahara":{"a":"Flag: Western Sahara","b":"1F1EA-1F1ED","j":["flag","western","sahara","nation","country","banner"]},"flag-eritrea":{"a":"Flag: Eritrea","b":"1F1EA-1F1F7","j":["flag","er","nation","country","banner"]},"flag-spain":{"a":"Flag: Spain","b":"1F1EA-1F1F8","j":["flag","spain","nation","country","banner"]},"flag-ethiopia":{"a":"Flag: Ethiopia","b":"1F1EA-1F1F9","j":["flag","et","nation","country","banner"]},"flag-european-union":{"a":"Flag: European Union","b":"1F1EA-1F1FA","j":["flag","european","union","banner"]},"flag-finland":{"a":"Flag: Finland","b":"1F1EB-1F1EE","j":["flag","fi","nation","country","banner"]},"flag-fiji":{"a":"Flag: Fiji","b":"1F1EB-1F1EF","j":["flag","fj","nation","country","banner"]},"flag-falkland-islands":{"a":"Flag: Falkland Islands","b":"1F1EB-1F1F0","j":["flag","falkland","islands","malvinas","nation","country","banner"]},"flag-micronesia":{"a":"Flag: Micronesia","b":"1F1EB-1F1F2","j":["flag","micronesia","federated","states","nation","country","banner"]},"flag-faroe-islands":{"a":"Flag: Faroe Islands","b":"1F1EB-1F1F4","j":["flag","faroe","islands","nation","country","banner"]},"flag-france":{"a":"Flag: France","b":"1F1EB-1F1F7","j":["flag","banner","nation","france","french","country"]},"flag-gabon":{"a":"Flag: Gabon","b":"1F1EC-1F1E6","j":["flag","ga","nation","country","banner"]},"flag-united-kingdom":{"a":"Flag: United Kingdom","b":"1F1EC-1F1E7","j":["flag","united","kingdom","great","britain","northern","ireland","nation","country","banner","british","UK","english","england","union jack"]},"flag-grenada":{"a":"Flag: Grenada","b":"1F1EC-1F1E9","j":["flag","gd","nation","country","banner"]},"flag-georgia":{"a":"Flag: Georgia","b":"1F1EC-1F1EA","j":["flag","ge","nation","country","banner"]},"flag-french-guiana":{"a":"Flag: French Guiana","b":"1F1EC-1F1EB","j":["flag","french","guiana","nation","country","banner"]},"flag-guernsey":{"a":"Flag: Guernsey","b":"1F1EC-1F1EC","j":["flag","gg","nation","country","banner"]},"flag-ghana":{"a":"Flag: Ghana","b":"1F1EC-1F1ED","j":["flag","gh","nation","country","banner"]},"flag-gibraltar":{"a":"Flag: Gibraltar","b":"1F1EC-1F1EE","j":["flag","gi","nation","country","banner"]},"flag-greenland":{"a":"Flag: Greenland","b":"1F1EC-1F1F1","j":["flag","gl","nation","country","banner"]},"flag-gambia":{"a":"Flag: Gambia","b":"1F1EC-1F1F2","j":["flag","gm","nation","country","banner"]},"flag-guinea":{"a":"Flag: Guinea","b":"1F1EC-1F1F3","j":["flag","gn","nation","country","banner"]},"flag-guadeloupe":{"a":"Flag: Guadeloupe","b":"1F1EC-1F1F5","j":["flag","gp","nation","country","banner"]},"flag-equatorial-guinea":{"a":"Flag: Equatorial Guinea","b":"1F1EC-1F1F6","j":["flag","equatorial","gn","nation","country","banner"]},"flag-greece":{"a":"Flag: Greece","b":"1F1EC-1F1F7","j":["flag","gr","nation","country","banner"]},"flag-south-georgia--south-sandwich-islands":{"a":"Flag: South Georgia & South Sandwich Islands","b":"1F1EC-1F1F8","j":["flag","flag_south_georgia_south_sandwich_islands","south","georgia","sandwich","islands","nation","country","banner"]},"flag-guatemala":{"a":"Flag: Guatemala","b":"1F1EC-1F1F9","j":["flag","gt","nation","country","banner"]},"flag-guam":{"a":"Flag: Guam","b":"1F1EC-1F1FA","j":["flag","gu","nation","country","banner"]},"flag-guineabissau":{"a":"Flag: Guinea-Bissau","b":"1F1EC-1F1FC","j":["flag","flag_guinea_bissau","gw","bissau","nation","country","banner"]},"flag-guyana":{"a":"Flag: Guyana","b":"1F1EC-1F1FE","j":["flag","gy","nation","country","banner"]},"flag-hong-kong-sar-china":{"a":"Flag: Hong Kong Sar China","b":"1F1ED-1F1F0","j":["flag","hong","kong","nation","country","banner"]},"flag-heard--mcdonald-islands":{"a":"Flag: Heard & Mcdonald Islands","b":"1F1ED-1F1F2","j":["flag","flag_heard_mcdonald_islands"]},"flag-honduras":{"a":"Flag: Honduras","b":"1F1ED-1F1F3","j":["flag","hn","nation","country","banner"]},"flag-croatia":{"a":"Flag: Croatia","b":"1F1ED-1F1F7","j":["flag","hr","nation","country","banner"]},"flag-haiti":{"a":"Flag: Haiti","b":"1F1ED-1F1F9","j":["flag","ht","nation","country","banner"]},"flag-hungary":{"a":"Flag: Hungary","b":"1F1ED-1F1FA","j":["flag","hu","nation","country","banner"]},"flag-canary-islands":{"a":"Flag: Canary Islands","b":"1F1EE-1F1E8","j":["flag","canary","islands","nation","country","banner"]},"flag-indonesia":{"a":"Flag: Indonesia","b":"1F1EE-1F1E9","j":["flag","nation","country","banner"]},"flag-ireland":{"a":"Flag: Ireland","b":"1F1EE-1F1EA","j":["flag","ie","nation","country","banner"]},"flag-israel":{"a":"Flag: Israel","b":"1F1EE-1F1F1","j":["flag","il","nation","country","banner"]},"flag-isle-of-man":{"a":"Flag: Isle of Man","b":"1F1EE-1F1F2","j":["flag","isle","man","nation","country","banner"]},"flag-india":{"a":"Flag: India","b":"1F1EE-1F1F3","j":["flag","in","nation","country","banner"]},"flag-british-indian-ocean-territory":{"a":"Flag: British Indian Ocean Territory","b":"1F1EE-1F1F4","j":["flag","british","indian","ocean","territory","nation","country","banner"]},"flag-iraq":{"a":"Flag: Iraq","b":"1F1EE-1F1F6","j":["flag","iq","nation","country","banner"]},"flag-iran":{"a":"Flag: Iran","b":"1F1EE-1F1F7","j":["flag","iran","islamic","republic","nation","country","banner"]},"flag-iceland":{"a":"Flag: Iceland","b":"1F1EE-1F1F8","j":["flag","is","nation","country","banner"]},"flag-italy":{"a":"Flag: Italy","b":"1F1EE-1F1F9","j":["flag","italy","nation","country","banner"]},"flag-jersey":{"a":"Flag: Jersey","b":"1F1EF-1F1EA","j":["flag","je","nation","country","banner"]},"flag-jamaica":{"a":"Flag: Jamaica","b":"1F1EF-1F1F2","j":["flag","jm","nation","country","banner"]},"flag-jordan":{"a":"Flag: Jordan","b":"1F1EF-1F1F4","j":["flag","jo","nation","country","banner"]},"flag-japan":{"a":"Flag: Japan","b":"1F1EF-1F1F5","j":["flag","japanese","nation","country","banner"]},"flag-kenya":{"a":"Flag: Kenya","b":"1F1F0-1F1EA","j":["flag","ke","nation","country","banner"]},"flag-kyrgyzstan":{"a":"Flag: Kyrgyzstan","b":"1F1F0-1F1EC","j":["flag","kg","nation","country","banner"]},"flag-cambodia":{"a":"Flag: Cambodia","b":"1F1F0-1F1ED","j":["flag","kh","nation","country","banner"]},"flag-kiribati":{"a":"Flag: Kiribati","b":"1F1F0-1F1EE","j":["flag","ki","nation","country","banner"]},"flag-comoros":{"a":"Flag: Comoros","b":"1F1F0-1F1F2","j":["flag","km","nation","country","banner"]},"flag-st-kitts--nevis":{"a":"Flag: St. Kitts & Nevis","b":"1F1F0-1F1F3","j":["flag","flag_st_kitts_nevis","saint","kitts","nevis","nation","country","banner"]},"flag-north-korea":{"a":"Flag: North Korea","b":"1F1F0-1F1F5","j":["flag","north","korea","nation","country","banner"]},"flag-south-korea":{"a":"Flag: South Korea","b":"1F1F0-1F1F7","j":["flag","south","korea","nation","country","banner"]},"flag-kuwait":{"a":"Flag: Kuwait","b":"1F1F0-1F1FC","j":["flag","kw","nation","country","banner"]},"flag-cayman-islands":{"a":"Flag: Cayman Islands","b":"1F1F0-1F1FE","j":["flag","cayman","islands","nation","country","banner"]},"flag-kazakhstan":{"a":"Flag: Kazakhstan","b":"1F1F0-1F1FF","j":["flag","kz","nation","country","banner"]},"flag-laos":{"a":"Flag: Laos","b":"1F1F1-1F1E6","j":["flag","lao","democratic","republic","nation","country","banner"]},"flag-lebanon":{"a":"Flag: Lebanon","b":"1F1F1-1F1E7","j":["flag","lb","nation","country","banner"]},"flag-st-lucia":{"a":"Flag: St. Lucia","b":"1F1F1-1F1E8","j":["flag","saint","lucia","nation","country","banner"]},"flag-liechtenstein":{"a":"Flag: Liechtenstein","b":"1F1F1-1F1EE","j":["flag","li","nation","country","banner"]},"flag-sri-lanka":{"a":"Flag: Sri Lanka","b":"1F1F1-1F1F0","j":["flag","sri","lanka","nation","country","banner"]},"flag-liberia":{"a":"Flag: Liberia","b":"1F1F1-1F1F7","j":["flag","lr","nation","country","banner"]},"flag-lesotho":{"a":"Flag: Lesotho","b":"1F1F1-1F1F8","j":["flag","ls","nation","country","banner"]},"flag-lithuania":{"a":"Flag: Lithuania","b":"1F1F1-1F1F9","j":["flag","lt","nation","country","banner"]},"flag-luxembourg":{"a":"Flag: Luxembourg","b":"1F1F1-1F1FA","j":["flag","lu","nation","country","banner"]},"flag-latvia":{"a":"Flag: Latvia","b":"1F1F1-1F1FB","j":["flag","lv","nation","country","banner"]},"flag-libya":{"a":"Flag: Libya","b":"1F1F1-1F1FE","j":["flag","ly","nation","country","banner"]},"flag-morocco":{"a":"Flag: Morocco","b":"1F1F2-1F1E6","j":["flag","ma","nation","country","banner"]},"flag-monaco":{"a":"Flag: Monaco","b":"1F1F2-1F1E8","j":["flag","mc","nation","country","banner"]},"flag-moldova":{"a":"Flag: Moldova","b":"1F1F2-1F1E9","j":["flag","moldova","republic","nation","country","banner"]},"flag-montenegro":{"a":"Flag: Montenegro","b":"1F1F2-1F1EA","j":["flag","me","nation","country","banner"]},"flag-st-martin":{"a":"Flag: St. Martin","b":"1F1F2-1F1EB","j":["flag"]},"flag-madagascar":{"a":"Flag: Madagascar","b":"1F1F2-1F1EC","j":["flag","mg","nation","country","banner"]},"flag-marshall-islands":{"a":"Flag: Marshall Islands","b":"1F1F2-1F1ED","j":["flag","marshall","islands","nation","country","banner"]},"flag-north-macedonia":{"a":"Flag: North Macedonia","b":"1F1F2-1F1F0","j":["flag","macedonia","nation","country","banner"]},"flag-mali":{"a":"Flag: Mali","b":"1F1F2-1F1F1","j":["flag","ml","nation","country","banner"]},"flag-myanmar-burma":{"a":"Flag: Myanmar (Burma)","b":"1F1F2-1F1F2","j":["flag","flag_myanmar","mm","nation","country","banner"]},"flag-mongolia":{"a":"Flag: Mongolia","b":"1F1F2-1F1F3","j":["flag","mn","nation","country","banner"]},"flag-macao-sar-china":{"a":"Flag: Macao Sar China","b":"1F1F2-1F1F4","j":["flag","macao","nation","country","banner"]},"flag-northern-mariana-islands":{"a":"Flag: Northern Mariana Islands","b":"1F1F2-1F1F5","j":["flag","northern","mariana","islands","nation","country","banner"]},"flag-martinique":{"a":"Flag: Martinique","b":"1F1F2-1F1F6","j":["flag","mq","nation","country","banner"]},"flag-mauritania":{"a":"Flag: Mauritania","b":"1F1F2-1F1F7","j":["flag","mr","nation","country","banner"]},"flag-montserrat":{"a":"Flag: Montserrat","b":"1F1F2-1F1F8","j":["flag","ms","nation","country","banner"]},"flag-malta":{"a":"Flag: Malta","b":"1F1F2-1F1F9","j":["flag","mt","nation","country","banner"]},"flag-mauritius":{"a":"Flag: Mauritius","b":"1F1F2-1F1FA","j":["flag","mu","nation","country","banner"]},"flag-maldives":{"a":"Flag: Maldives","b":"1F1F2-1F1FB","j":["flag","mv","nation","country","banner"]},"flag-malawi":{"a":"Flag: Malawi","b":"1F1F2-1F1FC","j":["flag","mw","nation","country","banner"]},"flag-mexico":{"a":"Flag: Mexico","b":"1F1F2-1F1FD","j":["flag","mx","nation","country","banner"]},"flag-malaysia":{"a":"Flag: Malaysia","b":"1F1F2-1F1FE","j":["flag","my","nation","country","banner"]},"flag-mozambique":{"a":"Flag: Mozambique","b":"1F1F2-1F1FF","j":["flag","mz","nation","country","banner"]},"flag-namibia":{"a":"Flag: Namibia","b":"1F1F3-1F1E6","j":["flag","na","nation","country","banner"]},"flag-new-caledonia":{"a":"Flag: New Caledonia","b":"1F1F3-1F1E8","j":["flag","new","caledonia","nation","country","banner"]},"flag-niger":{"a":"Flag: Niger","b":"1F1F3-1F1EA","j":["flag","ne","nation","country","banner"]},"flag-norfolk-island":{"a":"Flag: Norfolk Island","b":"1F1F3-1F1EB","j":["flag","norfolk","island","nation","country","banner"]},"flag-nigeria":{"a":"Flag: Nigeria","b":"1F1F3-1F1EC","j":["flag","nation","country","banner"]},"flag-nicaragua":{"a":"Flag: Nicaragua","b":"1F1F3-1F1EE","j":["flag","ni","nation","country","banner"]},"flag-netherlands":{"a":"Flag: Netherlands","b":"1F1F3-1F1F1","j":["flag","nl","nation","country","banner"]},"flag-norway":{"a":"Flag: Norway","b":"1F1F3-1F1F4","j":["flag","no","nation","country","banner"]},"flag-nepal":{"a":"Flag: Nepal","b":"1F1F3-1F1F5","j":["flag","np","nation","country","banner"]},"flag-nauru":{"a":"Flag: Nauru","b":"1F1F3-1F1F7","j":["flag","nr","nation","country","banner"]},"flag-niue":{"a":"Flag: Niue","b":"1F1F3-1F1FA","j":["flag","nu","nation","country","banner"]},"flag-new-zealand":{"a":"Flag: New Zealand","b":"1F1F3-1F1FF","j":["flag","new","zealand","nation","country","banner"]},"flag-oman":{"a":"Flag: Oman","b":"1F1F4-1F1F2","j":["flag","om_symbol","nation","country","banner"]},"flag-panama":{"a":"Flag: Panama","b":"1F1F5-1F1E6","j":["flag","pa","nation","country","banner"]},"flag-peru":{"a":"Flag: Peru","b":"1F1F5-1F1EA","j":["flag","pe","nation","country","banner"]},"flag-french-polynesia":{"a":"Flag: French Polynesia","b":"1F1F5-1F1EB","j":["flag","french","polynesia","nation","country","banner"]},"flag-papua-new-guinea":{"a":"Flag: Papua New Guinea","b":"1F1F5-1F1EC","j":["flag","papua","new","guinea","nation","country","banner"]},"flag-philippines":{"a":"Flag: Philippines","b":"1F1F5-1F1ED","j":["flag","ph","nation","country","banner"]},"flag-pakistan":{"a":"Flag: Pakistan","b":"1F1F5-1F1F0","j":["flag","pk","nation","country","banner"]},"flag-poland":{"a":"Flag: Poland","b":"1F1F5-1F1F1","j":["flag","pl","nation","country","banner"]},"flag-st-pierre--miquelon":{"a":"Flag: St. Pierre & Miquelon","b":"1F1F5-1F1F2","j":["flag","flag_st_pierre_miquelon","saint","pierre","miquelon","nation","country","banner"]},"flag-pitcairn-islands":{"a":"Flag: Pitcairn Islands","b":"1F1F5-1F1F3","j":["flag","pitcairn","nation","country","banner"]},"flag-puerto-rico":{"a":"Flag: Puerto Rico","b":"1F1F5-1F1F7","j":["flag","puerto","rico","nation","country","banner"]},"flag-palestinian-territories":{"a":"Flag: Palestinian Territories","b":"1F1F5-1F1F8","j":["flag","palestine","palestinian","territories","nation","country","banner"]},"flag-portugal":{"a":"Flag: Portugal","b":"1F1F5-1F1F9","j":["flag","pt","nation","country","banner"]},"flag-palau":{"a":"Flag: Palau","b":"1F1F5-1F1FC","j":["flag","pw","nation","country","banner"]},"flag-paraguay":{"a":"Flag: Paraguay","b":"1F1F5-1F1FE","j":["flag","py","nation","country","banner"]},"flag-qatar":{"a":"Flag: Qatar","b":"1F1F6-1F1E6","j":["flag","qa","nation","country","banner"]},"flag-runion":{"a":"Flag: Réunion","b":"1F1F7-1F1EA","j":["flag","flag_reunion","réunion","nation","country","banner"]},"flag-romania":{"a":"Flag: Romania","b":"1F1F7-1F1F4","j":["flag","ro","nation","country","banner"]},"flag-serbia":{"a":"Flag: Serbia","b":"1F1F7-1F1F8","j":["flag","rs","nation","country","banner"]},"flag-russia":{"a":"Flag: Russia","b":"1F1F7-1F1FA","j":["flag","russian","federation","nation","country","banner"]},"flag-rwanda":{"a":"Flag: Rwanda","b":"1F1F7-1F1FC","j":["flag","rw","nation","country","banner"]},"flag-saudi-arabia":{"a":"Flag: Saudi Arabia","b":"1F1F8-1F1E6","j":["flag","nation","country","banner"]},"flag-solomon-islands":{"a":"Flag: Solomon Islands","b":"1F1F8-1F1E7","j":["flag","solomon","islands","nation","country","banner"]},"flag-seychelles":{"a":"Flag: Seychelles","b":"1F1F8-1F1E8","j":["flag","sc","nation","country","banner"]},"flag-sudan":{"a":"Flag: Sudan","b":"1F1F8-1F1E9","j":["flag","sd","nation","country","banner"]},"flag-sweden":{"a":"Flag: Sweden","b":"1F1F8-1F1EA","j":["flag","se","nation","country","banner"]},"flag-singapore":{"a":"Flag: Singapore","b":"1F1F8-1F1EC","j":["flag","sg","nation","country","banner"]},"flag-st-helena":{"a":"Flag: St. Helena","b":"1F1F8-1F1ED","j":["flag","saint","helena","ascension","tristan","cunha","nation","country","banner"]},"flag-slovenia":{"a":"Flag: Slovenia","b":"1F1F8-1F1EE","j":["flag","si","nation","country","banner"]},"flag-svalbard--jan-mayen":{"a":"Flag: Svalbard & Jan Mayen","b":"1F1F8-1F1EF","j":["flag","flag_svalbard_jan_mayen"]},"flag-slovakia":{"a":"Flag: Slovakia","b":"1F1F8-1F1F0","j":["flag","sk","nation","country","banner"]},"flag-sierra-leone":{"a":"Flag: Sierra Leone","b":"1F1F8-1F1F1","j":["flag","sierra","leone","nation","country","banner"]},"flag-san-marino":{"a":"Flag: San Marino","b":"1F1F8-1F1F2","j":["flag","san","marino","nation","country","banner"]},"flag-senegal":{"a":"Flag: Senegal","b":"1F1F8-1F1F3","j":["flag","sn","nation","country","banner"]},"flag-somalia":{"a":"Flag: Somalia","b":"1F1F8-1F1F4","j":["flag","so","nation","country","banner"]},"flag-suriname":{"a":"Flag: Suriname","b":"1F1F8-1F1F7","j":["flag","sr","nation","country","banner"]},"flag-south-sudan":{"a":"Flag: South Sudan","b":"1F1F8-1F1F8","j":["flag","south","sd","nation","country","banner"]},"flag-so-tom--prncipe":{"a":"Flag: São Tomé & Príncipe","b":"1F1F8-1F1F9","j":["flag","flag_sao_tome_principe","sao","tome","principe","nation","country","banner"]},"flag-el-salvador":{"a":"Flag: El Salvador","b":"1F1F8-1F1FB","j":["flag","el","salvador","nation","country","banner"]},"flag-sint-maarten":{"a":"Flag: Sint Maarten","b":"1F1F8-1F1FD","j":["flag","sint","maarten","dutch","nation","country","banner"]},"flag-syria":{"a":"Flag: Syria","b":"1F1F8-1F1FE","j":["flag","syrian","arab","republic","nation","country","banner"]},"flag-eswatini":{"a":"Flag: Eswatini","b":"1F1F8-1F1FF","j":["flag","sz","nation","country","banner"]},"flag-tristan-da-cunha":{"a":"Flag: Tristan Da Cunha","b":"1F1F9-1F1E6","j":["flag"]},"flag-turks--caicos-islands":{"a":"Flag: Turks & Caicos Islands","b":"1F1F9-1F1E8","j":["flag","flag_turks_caicos_islands","turks","caicos","islands","nation","country","banner"]},"flag-chad":{"a":"Flag: Chad","b":"1F1F9-1F1E9","j":["flag","td","nation","country","banner"]},"flag-french-southern-territories":{"a":"Flag: French Southern Territories","b":"1F1F9-1F1EB","j":["flag","french","southern","territories","nation","country","banner"]},"flag-togo":{"a":"Flag: Togo","b":"1F1F9-1F1EC","j":["flag","tg","nation","country","banner"]},"flag-thailand":{"a":"Flag: Thailand","b":"1F1F9-1F1ED","j":["flag","th","nation","country","banner"]},"flag-tajikistan":{"a":"Flag: Tajikistan","b":"1F1F9-1F1EF","j":["flag","tj","nation","country","banner"]},"flag-tokelau":{"a":"Flag: Tokelau","b":"1F1F9-1F1F0","j":["flag","tk","nation","country","banner"]},"flag-timorleste":{"a":"Flag: Timor-Leste","b":"1F1F9-1F1F1","j":["flag","flag_timor_leste","timor","leste","nation","country","banner"]},"flag-turkmenistan":{"a":"Flag: Turkmenistan","b":"1F1F9-1F1F2","j":["flag","nation","country","banner"]},"flag-tunisia":{"a":"Flag: Tunisia","b":"1F1F9-1F1F3","j":["flag","tn","nation","country","banner"]},"flag-tonga":{"a":"Flag: Tonga","b":"1F1F9-1F1F4","j":["flag","to","nation","country","banner"]},"flag-turkey":{"a":"Flag: Turkey","b":"1F1F9-1F1F7","j":["flag","turkey","nation","country","banner"]},"flag-trinidad--tobago":{"a":"Flag: Trinidad & Tobago","b":"1F1F9-1F1F9","j":["flag","flag_trinidad_tobago","trinidad","tobago","nation","country","banner"]},"flag-tuvalu":{"a":"Flag: Tuvalu","b":"1F1F9-1F1FB","j":["flag","nation","country","banner"]},"flag-taiwan":{"a":"Flag: Taiwan","b":"1F1F9-1F1FC","j":["flag","tw","nation","country","banner"]},"flag-tanzania":{"a":"Flag: Tanzania","b":"1F1F9-1F1FF","j":["flag","tanzania","united","republic","nation","country","banner"]},"flag-ukraine":{"a":"Flag: Ukraine","b":"1F1FA-1F1E6","j":["flag","ua","nation","country","banner"]},"flag-uganda":{"a":"Flag: Uganda","b":"1F1FA-1F1EC","j":["flag","ug","nation","country","banner"]},"flag-us-outlying-islands":{"a":"Flag: U.S. Outlying Islands","b":"1F1FA-1F1F2","j":["flag","flag_u_s_outlying_islands"]},"flag-united-nations":{"a":"Flag: United Nations","b":"1F1FA-1F1F3","j":["flag","un","banner"]},"flag-united-states":{"a":"Flag: United States","b":"1F1FA-1F1F8","j":["flag","united","states","america","nation","country","banner"]},"flag-uruguay":{"a":"Flag: Uruguay","b":"1F1FA-1F1FE","j":["flag","uy","nation","country","banner"]},"flag-uzbekistan":{"a":"Flag: Uzbekistan","b":"1F1FA-1F1FF","j":["flag","uz","nation","country","banner"]},"flag-vatican-city":{"a":"Flag: Vatican City","b":"1F1FB-1F1E6","j":["flag","vatican","city","nation","country","banner"]},"flag-st-vincent--grenadines":{"a":"Flag: St. Vincent & Grenadines","b":"1F1FB-1F1E8","j":["flag","flag_st_vincent_grenadines","saint","vincent","grenadines","nation","country","banner"]},"flag-venezuela":{"a":"Flag: Venezuela","b":"1F1FB-1F1EA","j":["flag","ve","bolivarian","republic","nation","country","banner"]},"flag-british-virgin-islands":{"a":"Flag: British Virgin Islands","b":"1F1FB-1F1EC","j":["flag","british","virgin","islands","bvi","nation","country","banner"]},"flag-us-virgin-islands":{"a":"Flag: U.S. Virgin Islands","b":"1F1FB-1F1EE","j":["flag","flag_u_s_virgin_islands","virgin","islands","us","nation","country","banner"]},"flag-vietnam":{"a":"Flag: Vietnam","b":"1F1FB-1F1F3","j":["flag","viet","nam","nation","country","banner"]},"flag-vanuatu":{"a":"Flag: Vanuatu","b":"1F1FB-1F1FA","j":["flag","vu","nation","country","banner"]},"flag-wallis--futuna":{"a":"Flag: Wallis & Futuna","b":"1F1FC-1F1EB","j":["flag","flag_wallis_futuna","wallis","futuna","nation","country","banner"]},"flag-samoa":{"a":"Flag: Samoa","b":"1F1FC-1F1F8","j":["flag","ws","nation","country","banner"]},"flag-kosovo":{"a":"Flag: Kosovo","b":"1F1FD-1F1F0","j":["flag","xk","nation","country","banner"]},"flag-yemen":{"a":"Flag: Yemen","b":"1F1FE-1F1EA","j":["flag","ye","nation","country","banner"]},"flag-mayotte":{"a":"Flag: Mayotte","b":"1F1FE-1F1F9","j":["flag","yt","nation","country","banner"]},"flag-south-africa":{"a":"Flag: South Africa","b":"1F1FF-1F1E6","j":["flag","south","africa","nation","country","banner"]},"flag-zambia":{"a":"Flag: Zambia","b":"1F1FF-1F1F2","j":["flag","zm","nation","country","banner"]},"flag-zimbabwe":{"a":"Flag: Zimbabwe","b":"1F1FF-1F1FC","j":["flag","zw","nation","country","banner"]},"flag-england":{"a":"Flag: England","b":"1F3F4-E0067-E0062-E0065-E006E-E0067-E007F","j":["flag","english"]},"flag-scotland":{"a":"Flag: Scotland","b":"1F3F4-E0067-E0062-E0073-E0063-E0074-E007F","j":["flag","scottish"]},"flag-wales":{"a":"Flag: Wales","b":"1F3F4-E0067-E0062-E0077-E006C-E0073-E007F","j":["flag","welsh"]}},"aliases":{}}
\ No newline at end of file

From 5ee8cf7ebf6cbda0bdd292fd264f8dfe62e61027 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Apr 2021 12:38:55 +0200
Subject: [PATCH 574/578] Prepare release 1.1.4

---
 CHANGES.md                                            | 11 +----------
 .../metadata/android/en-US/changelogs/40101040.txt    |  2 ++
 2 files changed, 3 insertions(+), 10 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40101040.txt

diff --git a/CHANGES.md b/CHANGES.md
index 996e59a00c..40228f7db8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,6 @@
-Changes in Element 1.1.4 (2021-XX-XX)
+Changes in Element 1.1.4 (2021-04-09)
 ===================================================
 
-Features ✨:
- -
-
 Improvements 🙌:
  - Split network request `/keys/query` into smaller requests (250 users max) (#2925)
  - Crypto improvement | Bulk send NO_OLM withheld code
@@ -30,9 +27,6 @@ Bugfix 🐛:
  - If signout request fails, do not start LoginActivity, but restart the app (#3099)
  - Retain keyword order in emoji import script, and update the generated file (#3147)
 
-Translations 🗣:
- -
-
 SDK API changes ⚠️:
  - Several Services have been migrated to coroutines (#2449)
  - Removes filtering options on Timeline.
@@ -40,9 +34,6 @@ SDK API changes ⚠️:
 Build 🧱:
  - Properly exclude gms dependencies in fdroid build flavour which were pulled in through the jitsi SDK (#3125)
 
-Test:
- -
-
 Other changes:
  - Add version details on the login screen, in debug or developer mode
  - Migrate Retrofit interface to coroutine calls
diff --git a/fastlane/metadata/android/en-US/changelogs/40101040.txt b/fastlane/metadata/android/en-US/changelogs/40101040.txt
new file mode 100644
index 0000000000..e8977f3211
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Main changes in this version: performance improvement and bug fixes!
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.4
\ No newline at end of file

From bec6cfc46dd4f790391c66434ddd066815b10153 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Apr 2021 12:42:59 +0200
Subject: [PATCH 575/578] Version++

---
 CHANGES.md          | 27 +++++++++++++++++++++++++++
 vector/build.gradle |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 40228f7db8..a73551cc33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+Changes in Element 1.1.5 (2021-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ -
+
+Build 🧱:
+ -
+
+Test:
+ -
+
+Other changes:
+ -
+
 Changes in Element 1.1.4 (2021-04-09)
 ===================================================
 
diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..d561382e2d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 1
-ext.versionPatch = 4
+ext.versionPatch = 5
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 66db67e8571a3f3edfa7de2438e5b4a99f8d3704 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sat, 10 Apr 2021 16:43:16 +0100
Subject: [PATCH 576/578] Missed a spot

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../src/main/java/org/matrix/android/sdk/rx/RxSession.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index cac0a32232..0fe2b01576 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -141,8 +141,8 @@ class RxSession(private val session: Session) {
     }
 
     fun getRoomIdByAlias(roomAlias: String,
-                         searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = singleBuilder {
-        session.getRoomIdByAlias(roomAlias, searchOnServer, it)
+                         searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = rxSingle {
+        session.getRoomIdByAlias(roomAlias, searchOnServer)
     }
 
     fun getProfileInfo(userId: String): Single<JsonDict> = rxSingle {

From 759528f19a543b6899caf8de65415e1e42f5cad1 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 11 Apr 2021 10:54:17 +0100
Subject: [PATCH 577/578] Missed another spot

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../java/im/vector/app/features/home/HomeDetailViewModel.kt   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index c87b19f0e6..908270cb79 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -109,9 +109,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
             )
                     .map { it.roomId }
             try {
-                awaitCallback<Unit> {
-                    session.markAllAsRead(roomIds, it)
-                }
+                session.markAllAsRead(roomIds)
             } catch (failure: Throwable) {
                 Timber.d(failure, "Failed to mark all as read")
             }

From 35667db29c3c2a82cee53edcea9940d3ebec543b Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 11 Apr 2021 11:35:28 +0100
Subject: [PATCH 578/578] Lint

---
 .../main/java/im/vector/app/features/home/HomeDetailViewModel.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 908270cb79..d6a8b075f4 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -35,7 +35,6 @@ import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber